diff --git a/src/views/emis/emisCustomerAddress/recipientAddressForm.vue b/src/views/emis/emisCustomerAddress/recipientAddressForm.vue
new file mode 100644
index 00000000..dc6f9ac8
--- /dev/null
+++ b/src/views/emis/emisCustomerAddress/recipientAddressForm.vue
@@ -0,0 +1,243 @@
+<template>
+  <div >
+    <el-row :gutter="0">
+        <el-form ref="form" :model="form" size="mini" :rules="rules" label-width="90px">
+          <!-- <el-col :span="24">
+            <el-form-item label="客户user_id" prop="userId">
+              <el-input v-model="form.userId" placeholder="请输入客户user_id" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="别名" prop="alias">
+              <el-input v-model="form.alias" placeholder="请输入别名" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="地址类型" prop="addressType">
+              <el-input v-model="form.addressType" placeholder="请输入地址类型" />
+            </el-form-item>
+          </el-col> -->
+          <el-col :span="12">
+            <el-form-item label="收件人" prop="name">
+              <el-input v-model="form.name" placeholder="请输入姓名" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="电话" prop="phone">
+              <el-input v-model="form.phone" placeholder="请输入电话" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="所属国家" prop="country">
+                <CountryPicker :placeholder="$t('所属国家')" v-model="form.country" ></CountryPicker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="16">
+            <el-form-item label="省市区" prop="province">
+              <div style="display: inline-flex">
+                <ProvincePicker v-model="form.province" :countryCode="form.country" ></ProvincePicker>
+                <CityPicker v-model="form.city" :parentCode="form.province" ></CityPicker>
+                <DistrictPicker v-model="form.county" :parentCode="form.city" ></DistrictPicker>
+                <!-- <TownPicker v-model="form.town" :parentCode="form.county" ></TownPicker> -->
+              </div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="地址" prop="address">
+              <el-input v-model="form.address" type="textarea" placeholder="请输入地址" />
+            </el-form-item>
+          </el-col>
+
+
+          <el-col :span="12">
+            <el-form-item label="邮编(选填)" prop="postCode">
+              <el-input v-model="form.postCode" placeholder="请输入邮编" />
+            </el-form-item>
+          </el-col>
+
+
+          <el-col :span="12">
+            <el-form-item label="邮箱(选填)" prop="email">
+              <el-input v-model="form.email" placeholder="请输入email" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="公司(选填" prop="company">
+              <el-input v-model="form.company" placeholder="请输入公司" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="智能填写" prop="parseAddress" style="position: relative">
+              <el-input v-model="form.parseAddress" type="textarea" rows="5" placeholder="粘贴整段地址，自动识别姓名，公司名称（输入需包含“公司”两个字），手机号码、固话和地址，每项用逗号隔开更准确“例如XXX,XX公司，188****8888,021-88****88，上海上海市xxx区xx路1080号" >
+              </el-input>
+              <el-button @click="handleParseAddress" type="primary" size="mini" style="position:absolute;bottom:8px;right:8px" >智能识别</el-button>
+            </el-form-item>
+          </el-col>
+
+          <!-- <el-col :span="24">
+            <el-form-item label="是否默认" prop="blDefaultFlag">
+              <el-input v-model="form.blDefaultFlag" placeholder="请输入是否默认" />
+            </el-form-item>
+          </el-col> -->
+          <!-- <el-col :span="24">
+            <el-form-item label="排序" prop="orderNum">
+              <el-input v-model="form.orderNum" placeholder="请输入排序" />
+            </el-form-item>
+          </el-col> -->
+        <!-- <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+            </el-form-item>
+        </el-col> -->
+        </el-form>
+      </el-row>
+      <div style="text-align: center;margin-bottom: 10px;">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+
+  </div>
+</template>
+
+<script>
+import { listEmisCustomerAddress, getEmisCustomerAddress, delEmisCustomerAddress, addEmisCustomerAddress, updateEmisCustomerAddress } from "@/api/emis/emisCustomerAddress";
+import { parseAddress } from "@/api/emis/emisCommon";
+
+
+import CountryPicker from '@/views/emis/EmisBaseTools/CountryPicker.vue';
+import ProvincePicker from '@/views/emis/EmisBaseTools/ProvincePicker.vue';
+import CityPicker from '@/views/emis/EmisBaseTools/CityPicker.vue';
+import DistrictPicker from '@/views/emis/EmisBaseTools/DistrictPicker.vue';
+export default {
+  name: "emisCustomerAddressForm",
+  props:{
+    id:undefined
+  },
+  components: { CountryPicker,ProvincePicker,CityPicker,DistrictPicker },
+  dicts: [
+  ],
+  data() {
+    return {
+      emisCustomerAddressOptions: [],
+      // 遮罩层
+      loading: true,
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        country: [
+          { required: true, message: "国家不能为空", trigger: "blur" }
+        ],
+        name: [
+          { required: true, message: "姓名不能为空", trigger: "blur" }
+        ],
+        phone: [
+          { required: true, message: "电话不能为空", trigger: "blur" }
+        ],
+        province: [
+          { required: true, message: "省不能为空", trigger: "blur" }
+        ],
+        address: [
+          { required: true, message: "地址不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+   watch: {
+      "id": {
+        handler (newValue, oldValue) {
+          this.id = newValue;
+          this.initData();
+        },
+        deep: true
+      }
+  },
+  created() {
+    this.initData();
+  },
+
+  methods: {
+    handleParseAddress(){
+        this.loading = true;
+        if(this.form.parseAddress){
+          parseAddress(this.form.parseAddress).then(response => {
+            // this.form = response.data;
+            this.loading = false;
+            let rst=response.data;
+            this.form.name=rst.name;
+            this.form.country=rst.country;
+            this.form.province=rst.province;
+            this.form.county=rst.county;
+            this.form.phone=rst.phone;
+            this.form.address=rst.address;
+          });
+      }
+
+    },
+    initData() {
+        this.reset();
+        if(this.id !=undefined) {
+          this.loading = true;
+          getEmisCustomerAddress(this.id).then(response => {
+            this.form = response.data;
+            this.loading = false;
+          });
+        }
+    },
+    // 取消按钮
+    cancel() {
+      this.reset();
+      this.$emit("on-cancel");
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        userId: null,
+        alias: null,
+        addressType: 2,
+        province: null,
+        city: null,
+        county: null,
+        town: null,
+        address: null,
+        postCode: null,
+        name: null,
+        phone: null,
+        country: null,
+        email: null,
+        company: null,
+        blDefaultFlag: null,
+        orderNum: null,
+        delFlag: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        remark: null,
+        parseAddress:null,
+      };
+      this.resetForm("form");
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateEmisCustomerAddress(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.$emit("on-changed");
+            });
+          } else {
+            addEmisCustomerAddress(this.form).then(response => {
+               this.$modal.msgSuccess("修改成功");
+               this.$emit("on-changed");
+            });
+          }
+        }
+      });
+    },
+
+  }
+};
+</script>
diff --git a/src/views/emis/emisCustomerAddress/senderAddress.vue b/src/views/emis/emisCustomerAddress/senderAddress.vue
new file mode 100644
index 00000000..abd7ed33
--- /dev/null
+++ b/src/views/emis/emisCustomerAddress/senderAddress.vue
@@ -0,0 +1,557 @@
+<template>
+  <div class="app-container">
+    <SearchForm  :model="queryParams" ref="queryForm"   size="small" :maxShow="3"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+      <el-form-item label="寄件人" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          :placeholder="$t('寄件人')"
+          clearable
+          @keyup.enter.native="handleQuery"
+          @input="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="寄件电话" prop="phone">
+        <el-input
+          v-model="queryParams.phone"
+          :placeholder="$t('寄件电话')"
+          clearable
+          @keyup.enter.native="handleQuery"
+          @input="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item :label="$t('所属国家')" prop="country">
+            <CountryPicker :placeholder="$t('所属国家')" v-model="queryParams.country" @onChange="handleQuery"></CountryPicker>
+       </el-form-item>
+      <!-- <el-form-item label="" prop="customerCode">
+        <el-input
+          v-model="queryParams.customerCode"
+          :placeholder="$t('客户编码')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item> -->
+      <!-- <el-form-item label="" prop="shortName">
+        <el-input
+          v-model="queryParams.shortName"
+          :placeholder="$t('客户名称')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item> -->
+      <!-- <el-form-item label="" prop="alias">
+        <el-input
+          v-model="queryParams.alias"
+          :placeholder="$t('地址别名')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="addressType">
+        <el-input
+          v-model="queryParams.addressType"
+          :placeholder="$t('地址类型')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="country">
+        <el-input
+          v-model="queryParams.country"
+          :placeholder="$t('国家')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+
+      <el-form-item label="" prop="province">
+        <el-input
+          v-model="queryParams.province"
+          :placeholder="$t('省')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="city">
+        <el-input
+          v-model="queryParams.city"
+          :placeholder="$t('市')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="county">
+        <el-input
+          v-model="queryParams.county"
+          :placeholder="$t('区')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="town">
+        <el-input
+          v-model="queryParams.town"
+          :placeholder="$t('城镇')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="address">
+        <el-input
+          v-model="queryParams.address"
+          :placeholder="$t('地址')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="postCode">
+        <el-input
+          v-model="queryParams.postCode"
+          :placeholder="$t('邮编')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="email">
+        <el-input
+          v-model="queryParams.email"
+          :placeholder="$t('email')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="company">
+        <el-input
+          v-model="queryParams.company"
+          :placeholder="$t('公司')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="blDefaultFlag">
+        <el-input
+          v-model="queryParams.blDefaultFlag"
+          :placeholder="$t('是否默认')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="orderNum">
+        <el-input
+          v-model="queryParams.orderNum"
+          :placeholder="$t('排序')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="blSiteDefaultFlag">
+        <el-input
+          v-model="queryParams.blSiteDefaultFlag"
+          :placeholder="$t('使用站点是否默认')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="useSite">
+        <el-input
+          v-model="queryParams.useSite"
+          :placeholder="$t('使用站点名称')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="useSiteCode">
+        <el-input
+          v-model="queryParams.useSiteCode"
+          :placeholder="$t('使用站点代码')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="delFlag">
+        <el-input
+          v-model="queryParams.delFlag"
+          :placeholder="$t('删除标志（0代表存在')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="remark">
+        <el-input
+          v-model="queryParams.remark"
+          :placeholder="$t('备注')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item> -->
+    </SearchForm>
+
+
+    <XdTable v-loading="loading"
+           border stripe
+           size="small"
+           :data="emisCustomerAddressList"
+           :showSearch.sync="showSearch"
+           :queryParams="queryParams"
+           :total="total"
+           @queryTable="getList"
+           @selection-change="handleSelectionChange"
+           @sort-change="handleSortChange"
+           >
+
+      <div slot="toolbar">
+        <el-row :gutter="10" class="mb8">
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  plain
+                  icon="el-icon-plus"
+                  size="mini"
+                  @click="handleAdd"
+                  v-hasPermi="['emis:emisCustomerAddress:add']"
+                >新增</el-button>
+              </el-col>
+              <!--
+              <el-col :span="1.5">
+                <el-button
+                  type="success"
+                  plain
+                  icon="el-icon-edit"
+                  size="mini"
+                  :disabled="single"
+                  @click="handleUpdate"
+                  v-hasPermi="['emis:emisCustomerAddress:edit']"
+                >修改</el-button>
+              </el-col> -->
+              <el-col :span="1.5">
+                <el-button
+                  type="danger"
+                  plain
+                  icon="el-icon-delete"
+                  size="mini"
+                  :disabled="multiple"
+                  @click="handleDelete"
+                  v-hasPermi="['emis:emisCustomerAddress:remove']"
+                >删除</el-button>
+              </el-col>
+              <!-- <el-col :span="1.5">
+                <el-button
+                  type="warning"
+                  plain
+                  icon="el-icon-download"
+                  size="mini"
+                  @click="handleExport"
+                  v-hasPermi="['emis:emisCustomerAddress:export']"
+                >导出</el-button>
+              </el-col> -->
+          </el-row>
+      </div>
+
+      <el-table-column type="selection" width="55" align="center" />
+      <!--
+      <el-table-column label="序号" align="center" min-width="60">
+             <template slot-scope="scope">
+                <span v-text="getIndex(scope.$index)"> </span>
+             </template>
+      </el-table-column>
+
+       <el-table-column label="xxx" align="left" prop="xxx" min-width="180">
+        <template slot-scope="scope">
+            <div  class="link-type" @click="handleView(scope.row)">{{scope.row.orderSn}}</div>
+         </template>
+      </el-table-column>
+
+
+      -->
+
+      <!-- <el-table-column :label="$t('客户编码')" align="center" prop="customerCode" min-width="100" /> -->
+      <el-table-column :label="$t('寄件人')" align="left" prop="name" width="100" >
+        <template slot-scope="scope">
+            <div  class="link-type" @click="handleUpdate(scope.row)">{{scope.row.name}}</div>
+         </template>
+      </el-table-column>
+      <el-table-column :label="$t('寄件电话')" align="center" prop="phone" min-width="100" />
+
+      <!-- <el-table-column :label="$t('客户名称')" align="center" prop="shortName" min-width="100" /> -->
+      <!-- <el-table-column :label="$t('地址别名')" align="center" prop="alias" min-width="100" /> -->
+      <!-- <el-table-column :label="$t('地址类型')" align="center" prop="addressType" min-width="100" /> -->
+      <el-table-column :label="$t('国家')" align="center" prop="countryName" width="80" />
+      <el-table-column :label="$t('地区')" align="center" prop="provinceName" width="100" :show-overflow-tooltip="true">
+      <template slot-scope="scope">
+            <div>{{scope.row.provinceName}} {{scope.row.cityName}} {{scope.row.countyName}} </div>
+         </template>
+      </el-table-column>
+      <!-- <el-table-column :label="$t('市')" align="center" prop="city" min-width="100" /> -->
+      <!-- <el-table-column :label="$t('区')" align="center" prop="county" min-width="100" /> -->
+      <!-- <el-table-column :label="$t('城镇')" align="center" prop="town" min-width="100" /> -->
+      <el-table-column :label="$t('地址')" align="left" prop="address" min-width="200"  :show-overflow-tooltip="true" />
+      <!-- <el-table-column :label="$t('邮编')" align="center" prop="postCode" min-width="100" /> -->
+      <el-table-column :label="$t('公司')" align="center" prop="company" min-width="100" />
+      <el-table-column :label="$t('email')" align="center" prop="email" min-width="100" />
+      <!-- <el-table-column :label="$t('是否默认')" align="center" prop="blDefaultFlag" min-width="100" /> -->
+      <!-- <el-table-column :label="$t('排序')" align="center" prop="orderNum" min-width="100" /> -->
+      <!-- <el-table-column :label="$t('使用站点是否默认')" align="center" prop="blSiteDefaultFlag" min-width="100" /> -->
+      <el-table-column :label="$t('所属站点')" align="center" prop="useSite" min-width="100" />
+      <el-table-column :label="$t('创建时间')" align="center" prop="createTime" min-width="170" />
+      <!-- <el-table-column :label="$t('使用站点代码')" align="center" prop="useSiteCode" min-width="100" /> -->
+      <!-- <el-table-column :label="$t('删除标志（0代表存在')" align="center" prop="delFlag" min-width="100" /> -->
+      <!-- <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" /> -->
+      <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['emis:emisCustomerAddress:edit']"
+          >修改</el-button>
+          <!--
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['emis:emisCustomerAddress:remove']"
+          >删除</el-button> -->
+        </template>
+      </el-table-column>
+    </XdTable>
+
+    <el-dialog :title="titleForm" :visible.sync="openForm" width="50%" :destroy-on-close="true" v-dialogDrag append-to-body>
+      <senderAddressForm :id="currentId"   @on-changed="handleFormChanged" @on-cancel="cancelForm"></senderAddressForm>
+    </el-dialog>
+
+
+    <!--
+    <el-dialog :title="titleView" :visible.sync="openView" width="60%" :close-on-click-modal="false"  v-dialogDrag append-to-body>
+        <emisCustomerAddressView :id="id" ></EmisCustomerAddressView>
+    </el-dialog>
+    -->
+
+  </div>
+</template>
+
+<script>
+import { listEmisCustomerAddress, getEmisCustomerAddress, delEmisCustomerAddress, addEmisCustomerAddress, updateEmisCustomerAddress } from "@/api/emis/emisCustomerAddress";
+import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
+import senderAddressForm from '@/views/emis/emisCustomerAddress/senderAddressForm';
+import CountryPicker from '@/views/emis/EmisBaseTools/CountryPicker.vue';
+
+export default {
+  name: "SenderAddress",
+  components: { elDateSimplePicker,senderAddressForm ,CountryPicker},
+  dicts: [
+  ],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 创建时间搜索
+      dateTimeRange:[],
+      // 总条数
+      total: 0,
+      // 客户寄寄件地址表格数据
+      emisCustomerAddressList: [],
+
+      currentId:null,
+      openForm: false,
+      titleForm: "",
+
+      // 弹出展示层
+      id:null,
+      titleView:"",
+      openView: false,
+      // 更新网点时间范围
+      daterangeCreateTime: [],
+      // 更新网点时间范围
+      daterangeUpdateTime: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        customerCode: null,
+        shortName: null,
+        alias: null,
+        addressType: 1,
+        country: null,
+        name: null,
+        phone: null,
+        province: null,
+        city: null,
+        county: null,
+        town: null,
+        address: null,
+        postCode: null,
+        email: null,
+        company: null,
+        blDefaultFlag: null,
+        orderNum: null,
+        blSiteDefaultFlag: null,
+        useSite: null,
+        useSiteCode: null,
+        delFlag: null,
+        remark: null,
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询客户寄寄件地址列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.params = {};
+      if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
+        this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
+        this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
+      }
+      if (null != this.daterangeUpdateTime && '' != this.daterangeUpdateTime) {
+        this.queryParams.params["beginUpdateTime"] = this.daterangeUpdateTime[0];
+        this.queryParams.params["endUpdateTime"] = this.daterangeUpdateTime[1];
+      }
+      listEmisCustomerAddress(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
+        this.emisCustomerAddressList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    // 排序 查询字段是表格中字段名字 动态取值排序顺序
+    handleSortChange(column) {
+      this.queryParams.orderByColumn = column.prop;
+      this.queryParams.isAsc = column.order;
+      this.getList();
+    },
+    /** 新增按钮操作 */
+    handleAdd(row) {
+      this.currentId=null;
+      this.openForm= true;
+      this.titleForm = "新增";
+    },
+    handleShowMoreInput(){
+      this.moreInputVisible = !this.moreInputVisible;
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+       this.currentId= row.id;
+       this.openForm = true;
+       this.titleForm = "修改";
+    },
+    handleView(row) {
+       this.id=row.id;
+       this.titleView="查看";
+       this.openView=true;
+    //   this.router.push({ path: '/emis/emisCustomerAddress/viewDetail', query: { id: row.id }})
+    },
+    handleFormChanged(){
+        this.openForm = false;
+        this.getList();
+    },
+    cancelForm(){
+      this.openForm = false;
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除').then(function() {
+        return delEmisCustomerAddress(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+    //   this.download('emis/emisCustomerAddress/export', {
+    //     ...this.queryParams
+    //   }, `emisCustomerAddress_${new Date().getTime()}.xlsx`)
+     const loadingInstance = this.$loading({
+            text: '正在导出...'
+        })
+       var qParam = {...this.queryParams};
+       qParam.pageNum=1;
+       qParam.pageSize=5000;
+
+       listEmisCustomerAddress(this.addDateRange(qParam, this.dateTimeRange)).then(response => {
+        this.downloadLoading = false
+        if (response.code === 200) {
+                const curList = response.rows
+                import('@/vendor/Export2Excel').then(excel => {
+                  const tHeader = ['id','客户user_id','客户编码','客户名称','地址别名','地址类型','国家','姓名','电话','省','市','区','城镇','地址','邮编','email','公司','是否默认','排序','使用站点是否默认','使用站点名称','使用站点代码','删除标志（0代表存在','创建者','创建时间','更新者','update_time','备注','创建网点','更新网点',];
+                  const filterVal = ['id','userId','customerCode','shortName','alias','addressType','country','name','phone','province','city','county','town','address','postCode','email','company','blDefaultFlag','orderNum','blSiteDefaultFlag','useSite','useSiteCode','delFlag','createBy','createTime','updateBy','updateTime','remark','createSite','updateSite',];
+                  const data = this.formatJson(filterVal, curList, response.rows)
+                  excel.export_json_to_excel({
+                    header: tHeader,
+                    data,
+                    filename: '客户寄寄件地址',
+                    autoWidth: true
+                  })
+                  loadingInstance.close()
+                })
+        }
+      });
+    },
+    formatJson(filterVal, jsonData, resData) {
+      let index = 0
+      return jsonData.map(v => filterVal.map(j => {
+        if (j === 'index') {
+          return ++index
+        }
+        if (j === 'status') {
+          var statusStr='xxx'
+          if(v[j] == 10){
+              statusStr='xxx'
+          }
+          return statusStr;
+        }
+        return v[j]
+      }))
+    },
+    /** 列索引函数  */
+    getIndex($index) {
+          return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
+    },
+    /** 时间搜索响应函数 */
+    dateTimeChange(value){
+        this.dateTimeRange=value;
+    },
+  }
+};
+</script>
+
+<style scoped>
+  .el-divider{
+    margin-top: 0px;
+    background: 0 0;
+    border-top: 1px solid #E6EBF5;
+  }
+  .el-divider__text {
+    color: #0955ee;
+    cursor: pointer;
+  }
+</style>
diff --git a/src/views/emis/emisCustomerAddress/senderAddressForm.vue b/src/views/emis/emisCustomerAddress/senderAddressForm.vue
new file mode 100644
index 00000000..2b916194
--- /dev/null
+++ b/src/views/emis/emisCustomerAddress/senderAddressForm.vue
@@ -0,0 +1,242 @@
+<template>
+  <div >
+    <el-row :gutter="0">
+        <el-form ref="form" :model="form" size="mini" :rules="rules" label-width="90px">
+          <!-- <el-col :span="24">
+            <el-form-item label="客户user_id" prop="userId">
+              <el-input v-model="form.userId" placeholder="请输入客户user_id" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="别名" prop="alias">
+              <el-input v-model="form.alias" placeholder="请输入别名" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="地址类型" prop="addressType">
+              <el-input v-model="form.addressType" placeholder="请输入地址类型" />
+            </el-form-item>
+          </el-col> -->
+          <el-col :span="12">
+            <el-form-item label="寄件人" prop="name">
+              <el-input v-model="form.name" placeholder="请输入姓名" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="寄件电话" prop="phone">
+              <el-input v-model="form.phone" placeholder="请输入电话" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="所属国家" prop="country">
+                <CountryPicker :placeholder="$t('所属国家')" v-model="form.country" ></CountryPicker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="16">
+            <el-form-item label="省市区" prop="province">
+              <div style="display: inline-flex">
+                <ProvincePicker v-model="form.province" :countryCode="form.country" ></ProvincePicker>
+                <CityPicker v-model="form.city" :parentCode="form.province" ></CityPicker>
+                <DistrictPicker v-model="form.county" :parentCode="form.city" ></DistrictPicker>
+                <!-- <TownPicker v-model="form.town" :parentCode="form.county" ></TownPicker> -->
+              </div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="地址" prop="address">
+              <el-input v-model="form.address" type="textarea" placeholder="请输入地址" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="邮编(选填)" prop="postCode">
+              <el-input v-model="form.postCode" placeholder="请输入邮编" />
+            </el-form-item>
+          </el-col>
+
+
+          <el-col :span="12">
+            <el-form-item label="邮箱(选填)" prop="email">
+              <el-input v-model="form.email" placeholder="请输入email" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="公司(选填" prop="company">
+              <el-input v-model="form.company" placeholder="请输入公司" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="智能填写" prop="parseAddress" style="position: relative">
+              <el-input v-model="form.parseAddress" type="textarea" rows="5" placeholder="粘贴整段地址，自动识别姓名，公司名称（输入需包含“公司”两个字），手机号码、固话和地址，每项用逗号隔开更准确“例如XXX,XX公司，188****8888,021-88****88，上海上海市xxx区xx路1080号" >
+              </el-input>
+              <el-button @click="handleParseAddress" type="primary" size="mini" style="position:absolute;bottom:8px;right:8px" >智能识别</el-button>
+            </el-form-item>
+          </el-col>
+
+          <!-- <el-col :span="24">
+            <el-form-item label="是否默认" prop="blDefaultFlag">
+              <el-input v-model="form.blDefaultFlag" placeholder="请输入是否默认" />
+            </el-form-item>
+          </el-col> -->
+          <!-- <el-col :span="24">
+            <el-form-item label="排序" prop="orderNum">
+              <el-input v-model="form.orderNum" placeholder="请输入排序" />
+            </el-form-item>
+          </el-col> -->
+        <!-- <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+            </el-form-item>
+        </el-col> -->
+        </el-form>
+      </el-row>
+      <div style="text-align: center;margin-bottom: 10px;">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+
+  </div>
+</template>
+
+<script>
+import { listEmisCustomerAddress, getEmisCustomerAddress, delEmisCustomerAddress, addEmisCustomerAddress, updateEmisCustomerAddress } from "@/api/emis/emisCustomerAddress";
+import { parseAddress } from "@/api/emis/emisCommon";
+
+
+import CountryPicker from '@/views/emis/EmisBaseTools/CountryPicker.vue';
+import ProvincePicker from '@/views/emis/EmisBaseTools/ProvincePicker.vue';
+import CityPicker from '@/views/emis/EmisBaseTools/CityPicker.vue';
+import DistrictPicker from '@/views/emis/EmisBaseTools/DistrictPicker.vue';
+export default {
+  name: "emisCustomerAddressForm",
+  props:{
+    id:undefined
+  },
+  components: { CountryPicker,ProvincePicker,CityPicker,DistrictPicker },
+  dicts: [
+  ],
+  data() {
+    return {
+      emisCustomerAddressOptions: [],
+      // 遮罩层
+      loading: true,
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        country: [
+          { required: true, message: "国家不能为空", trigger: "blur" }
+        ],
+        name: [
+          { required: true, message: "姓名不能为空", trigger: "blur" }
+        ],
+        phone: [
+          { required: true, message: "电话不能为空", trigger: "blur" }
+        ],
+        province: [
+          { required: true, message: "省不能为空", trigger: "blur" }
+        ],
+        address: [
+          { required: true, message: "地址不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+   watch: {
+      "id": {
+        handler (newValue, oldValue) {
+          this.id = newValue;
+          this.initData();
+        },
+        deep: true
+      }
+  },
+  created() {
+    this.initData();
+  },
+
+  methods: {
+    handleParseAddress(){
+        this.loading = true;
+        if(this.form.parseAddress){
+          parseAddress(this.form.parseAddress).then(response => {
+            // this.form = response.data;
+            this.loading = false;
+            let rst=response.data;
+            this.form.name=rst.name;
+            this.form.country=rst.country;
+            this.form.province=rst.province;
+            this.form.county=rst.county;
+            this.form.phone=rst.phone;
+            this.form.address=rst.address;
+          });
+      }
+
+    },
+    initData() {
+        this.reset();
+        if(this.id !=undefined) {
+          this.loading = true;
+          getEmisCustomerAddress(this.id).then(response => {
+            this.form = response.data;
+            this.loading = false;
+          });
+        }
+    },
+    // 取消按钮
+    cancel() {
+      this.reset();
+      this.$emit("on-cancel");
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        userId: null,
+        alias: null,
+        addressType: 1,
+        province: null,
+        city: null,
+        county: null,
+        town: null,
+        address: null,
+        postCode: null,
+        name: null,
+        phone: null,
+        country: null,
+        email: null,
+        company: null,
+        blDefaultFlag: null,
+        orderNum: null,
+        delFlag: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        remark: null,
+        parseAddress:null,
+      };
+      this.resetForm("form");
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateEmisCustomerAddress(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.$emit("on-changed");
+            });
+          } else {
+            addEmisCustomerAddress(this.form).then(response => {
+               this.$modal.msgSuccess("修改成功");
+               this.$emit("on-changed");
+            });
+          }
+        }
+      });
+    },
+
+  }
+};
+</script>
diff --git a/src/views/emis/emisCustomerUser/batchUpdateForm.vue b/src/views/emis/emisCustomerUser/batchUpdateForm.vue
new file mode 100644
index 00000000..7957d03c
--- /dev/null
+++ b/src/views/emis/emisCustomerUser/batchUpdateForm.vue
@@ -0,0 +1,271 @@
+<template>
+  <div >
+        <el-form ref="form" size="mini" :model="form" :rules="rules" label-width="100px">
+          <el-row :gutter="0"  style="display: flex;flex-wrap: wrap;">
+          <el-col :span="12">
+            <el-form-item label="结算类型" prop="settledType">
+              <el-select v-model="form.settledType" placeholder="请选择">
+                      <el-option
+                        v-for="dict in dict.type.emis_cus_settled_type"
+                        :key="dict.value"
+                        :label="dict.label"
+                        :value="dict.value"
+                      ></el-option>
+                    </el-select>
+            </el-form-item>
+          </el-col>
+
+
+          <el-col :span="12">
+            <el-form-item label="专属业务员" prop="opEmpCode" >
+              <EmisUserSimplePicker0 :placeholder="$t('专属业务员')" v-model="form.opEmpCode"  ></EmisUserSimplePicker0>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="回款联系人" prop="payee" >
+              <EmisUserSimplePicker1 :placeholder="$t('回款联系人')" v-model="form.payee"  ></EmisUserSimplePicker1>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="销售联系人" prop="salesmen" >
+              <EmisUserSimplePicker2 :placeholder="$t('销售联系人')" v-model="form.salesmen"  ></EmisUserSimplePicker2>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="业务网点范围" prop="bizSite" >
+              <div @click="handleSelectSite">选择网点</div>
+              <el-input v-model="form.bizSiteName" rows="5" type="textarea" disabled placeholder="" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="开通OMS" prop="blOpenOms" >
+              <el-radio-group v-model="form.blOpenOms">
+                <el-radio :label="1">是</el-radio>
+                <el-radio :label="0">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="是否短信" prop="blSms">
+              <el-radio-group v-model="form.blSms">
+                <el-radio :label="1">是</el-radio>
+                <el-radio :label="0">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否启用" prop="status">
+              <el-radio-group v-model="form.status">
+                <el-radio :label="1">是</el-radio>
+                <el-radio :label="0">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+
+        </el-form>
+
+      <div style="text-align: center;margin-bottom: 10px;">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+
+      <el-dialog title="选择网点" :visible.sync="openSiteSelectTreeForm" width="40%" :destroy-on-close="true" v-dialogDrag append-to-body>
+        <EmisSiteSelectTreePicker  :selectSiteCode="form.bizSite" :selectSiteName="form.bizSiteName" @on-changed="onSelectSiteTreeCheckChange" ></EmisSiteSelectTreePicker>
+      </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import { listEmisCustomerUser, getEmisCustomerUser, delEmisCustomerUser, addEmisCustomerUser, updateEmisCustomerUser } from "@/api/emis/emisCustomerUser";
+import CountryPicker from '@/views/emis/EmisBaseTools/CountryPicker.vue';
+import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
+import ProvincePicker from '@/views/emis/EmisBaseTools/ProvincePicker.vue';
+import CityPicker from '@/views/emis/EmisBaseTools/CityPicker.vue';
+import DistrictPicker from '@/views/emis/EmisBaseTools/DistrictPicker.vue';
+
+
+import EmisUserSimplePicker0 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
+import EmisUserSimplePicker1 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
+import EmisUserSimplePicker2 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
+
+import EmisSiteSelectTreePicker from '@/views/emis/EmisBaseTools/EmisSiteSelectTreePicker.vue';
+
+export default {
+  name: "emisCustomerUserForm",
+  props:{
+    ids:{
+        type:[Number,Array]
+    },
+  },
+  components: {
+    CountryPicker,
+    EmisSiteSimplePicker,ProvincePicker,CityPicker,DistrictPicker,
+    EmisUserSimplePicker0,EmisUserSimplePicker1,EmisUserSimplePicker2,
+    EmisSiteSelectTreePicker
+  },
+  dicts: ['emis_cus_settled_type'],
+  data() {
+    return {
+      openSiteSelectTreeForm:false,
+      emisCustomerUserOptions: [],
+      // 遮罩层
+      loading: true,
+      // 表单参数
+      form: {},
+      isDataChangeCount:0,
+      // 表单校验
+      rules: {
+
+      }
+    };
+  },
+   watch: {
+      "ids": {
+        handler (newValue, oldValue) {
+          this.id = newValue;
+        },
+        deep: true
+      },
+      form: {
+        handler (n, o) {
+          this.isDataChangeCount++
+        },
+        deep: true
+      }
+
+  },
+  created() {
+    this.isDataChangeCount=0;
+    this.reset();
+  },
+
+  methods: {
+    handleSelectSite(){
+      this.openSiteSelectTreeForm=true;
+    },
+    onSelectSiteTreeCheckChange(item){
+        this.openSiteSelectTreeForm=false;
+        this.form.bizSiteName=item.selectSiteNameStr;
+        this.form.bizSite=item.selectSiteCodeStr;
+        // console.log(item)
+    },
+    // 取消按钮
+    cancel() {
+      this.reset();
+      this.$emit("on-cancel");
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        customerCode: null,
+        customerName: null,
+        customerNameEn: null,
+        simpleName: null,
+        phone: null,
+        mobile: null,
+        customerType: null,
+        settledType: null,
+        userType: null,
+        company: null,
+        deptId: null,
+        avatar: null,
+        sex: null,
+        invitationInfo: null,
+        loginIp: null,
+        loginDate: null,
+        nickName: null,
+        unionId: null,
+        openid: null,
+        monthlyPayCode: null,
+        userName: null,
+        password: null,
+        ownerSite: null,
+        bizSite: null,
+        bizSiteName: null,
+        country: null,
+        province: null,
+        city: null,
+        county: null,
+        town: null,
+        address: null,
+        email: null,
+        sendCountry: null,
+        sendProvince: null,
+        sendCity: null,
+        sendCounty: null,
+        sendTown: null,
+        postCode: null,
+        status: null,
+        realName: null,
+        idNo: null,
+        payee: null,
+        salesmen: null,
+        dataFrom: null,
+        blOpenOms: null,
+        blSms: null,
+        opEmpCode: null,
+        orderNum: null,
+        remark: null,
+        delFlag: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        createSite: null,
+        updateSite: null
+      };
+      this.resetForm("form");
+    },
+    /** 提交按钮 */
+    async submitForm() {
+      // 判断是否有变动
+      if (this.isDataChangeCount>0 ) {
+          console.log(this.ids);
+          if(this.ids.length==0){
+            this.form.id=item;
+            await updateEmisCustomerUser(this.form).then(response => {
+                console.log(response);
+              });
+          }else{
+            this.ids.forEach(async item => {
+                this.form.id=item;
+                await updateEmisCustomerUser(this.form).then(response => {
+                  console.log(response);
+                });
+            });
+          }
+          this.$modal.msgSuccess("修改成功");
+          this.$emit("on-changed");
+
+      }else{
+        this.$modal.msgSuccess("无变动，无需修改");
+      }
+    },
+
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+// .el-row{
+//   display:flex;
+//   flex-wrap: wrap;
+// }
+
+// .el-col{
+//     min-height: 1px;
+// }
+
+</style>