From 16f0cf415ec22808e897ebff367740f6c7b20bc5 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 13 May 2024 14:10:38 +0800
Subject: [PATCH] md

---
 src/assets/styles/custom.scss                 |   6 +-
 .../emis/EmisBaseTools/CountryPicker.vue      |   2 +-
 .../EmisBaseTools/EmisUserSimplePicker.vue    |   3 +-
 src/views/emis/emisCountry/index.vue          |   3 +
 .../emis/emisWaybill/emisWaybillRecord.vue    | 573 +++++++++---------
 5 files changed, 311 insertions(+), 276 deletions(-)

diff --git a/src/assets/styles/custom.scss b/src/assets/styles/custom.scss
index 5c91f6ab..1d487303 100644
--- a/src/assets/styles/custom.scss
+++ b/src/assets/styles/custom.scss
@@ -445,11 +445,13 @@
 }
 
 .form-group-title {
-  border-left: 4px solid #b12e29;
-  padding-left: 5px;
   font-size: 14px;
   font-weight: 600;
   margin-bottom: 6px;
+  .title{
+    padding-left: 5px;
+    border-left: 4px solid #b12e29;
+  }
 }
 
 
diff --git a/src/views/emis/EmisBaseTools/CountryPicker.vue b/src/views/emis/EmisBaseTools/CountryPicker.vue
index 8496c8b2..064b486c 100644
--- a/src/views/emis/EmisBaseTools/CountryPicker.vue
+++ b/src/views/emis/EmisBaseTools/CountryPicker.vue
@@ -9,7 +9,7 @@
       @blur="onBlur"
       @change="onChange"
       >
-        <el-option v-for="item in optionItems" :key="item.code" :label="item.name+'('+item.code+'-'+item.nameEn+')'" :value="item.code" ></el-option>
+        <el-option v-for="item in optionItems" :key="item.code" :label="item.name+'('+item.nameEn+')'" :value="item.code" ></el-option>
     </el-select>
     <!-- style="width:100%" -->
 </template>
diff --git a/src/views/emis/EmisBaseTools/EmisUserSimplePicker.vue b/src/views/emis/EmisBaseTools/EmisUserSimplePicker.vue
index 58b56875..084b3a67 100644
--- a/src/views/emis/EmisBaseTools/EmisUserSimplePicker.vue
+++ b/src/views/emis/EmisBaseTools/EmisUserSimplePicker.vue
@@ -227,7 +227,8 @@ import { getStaffList } from "@/api/emis/emisStaff";
      showItem(item){
       console.log(item);
 
-      this.slable=item.empCode+'-'+item.empName;
+      // this.slable=item.empCode+'-'+item.empName;
+      this.slable=item.empName;
       this.$emit("input", this.svalue);
       this.$emit("onChange",item);
       this.dispatch('ElFormItem', 'el.form.change', [this.svalue]);
diff --git a/src/views/emis/emisCountry/index.vue b/src/views/emis/emisCountry/index.vue
index 6d1e345c..16803166 100644
--- a/src/views/emis/emisCountry/index.vue
+++ b/src/views/emis/emisCountry/index.vue
@@ -357,6 +357,9 @@ export default {
         nameEn: [
           { required: true, message: "英文名称不能为空", trigger: "blur" }
         ],
+        continentId: [
+          { required: true, message: "区域不能为空", trigger: ["blur",'change'] }
+        ],
         code: [
           { required: true, message: "国家编码不能为空", trigger: "blur" },
           { validator: this.validateCountryCode, trigger: "blur" }
diff --git a/src/views/emis/emisWaybill/emisWaybillRecord.vue b/src/views/emis/emisWaybill/emisWaybillRecord.vue
index e2224150..29b3ac23 100644
--- a/src/views/emis/emisWaybill/emisWaybillRecord.vue
+++ b/src/views/emis/emisWaybill/emisWaybillRecord.vue
@@ -1,285 +1,308 @@
 <template>
   <div class="app-container">
-      <el-form ref="form"  size="small" :model="form" :rules="rules" label-width="90px">
-        <el-row :gutter="0" >
-          <el-col :span="24">
-            <div class="form-group-title">{{ $t('发货信息') }}</div>
-          </el-col>
-          <el-col :span="7">
-              <el-form-item label="运单号" prop="billCode"  >
-                <div style="display:inline-flex">
-                  <!-- @keyup.enter.native="initData" -->
-                    <div><el-input v-model="form.billCode" placeholder="运单号" style="font-weight:600;color:black" /></div>
-                    <div style="padding-left:5px"> <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" @change="checked=>handleBillCodeChange(checked)"><span style="font-size:10px">电子主单</span></el-checkbox></div>
-                </div>
-              </el-form-item>
-          </el-col>
-            <el-col :span="5">
-              <el-form-item label="目的国" prop="reciever.country">
-                  <CountryPicker0 v-model="form.reciever.country"></CountryPicker0>
-              </el-form-item>
-            </el-col>
-            <!-- <el-col :span="6">
-              <el-form-item label="线路" prop="transLine">
-                <TransLinePicker v-model="form.transLine" :countryCode="form.reciever.country" @onChange="onTransLineChange"></TransLinePicker>
-              </el-form-item>
-            </el-col> -->
-            <el-col :span="6">
-              <el-form-item label="产品类型" prop="productType">
-                <TransProductCasPicker v-model="form.productTypeSelArr" :countryCode="form.reciever.country" @onChange="onProductChange" ></TransProductCasPicker>
-                <!-- <trans-product-picker v-model="form.productType" :transLineCode="form.transLine"></trans-product-picker> -->
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item :label="$t('发货时间')" prop="sendDate">
-                <el-input v-model="form.sendDate" placeholder="" readonly="" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="报关方式" prop="customsEclaration">
-                <el-select v-model="form.customsEclaration" placeholder="请选择">
-                  <el-option
-                    v-for="dict in dict.type.emis_declare_mode"
-                    :key="dict.value"
-                    :label="dict.label"
-                    :value="dict.value"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="清关方式" prop="customsClear">
-                <el-select v-model="form.customsClear" placeholder="请选择">
-                  <el-option
-                    v-for="dict in dict.type.emis_customs_clear"
-                    :key="dict.value"
-                    :label="dict.label"
-                    :value="dict.value"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="6">
-              <el-form-item label="取件类型" prop="pickupMethod">
-                <el-select v-model="form.pickupMethod" placeholder="请选择">
-                  <el-option
-                    v-for="dict in dict.type.emis_qujian_fangshi"
-                    :key="dict.value"
-                    :label="dict.label"
-                    :value="dict.value"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item :label="$t('取件员')" prop="takePieceEmployeeCode">
-                <EmisUserSimplePicker0 :placeholder="$t('取件员')" v-model="form.takePieceEmployeeCode" postCode="RSD" ></EmisUserSimplePicker0>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item :label="$t('操作员')" prop="operateEmployeeCode">
-                <EmisUserSimplePicker1 :placeholder="$t('操作员')" v-model="form.operateEmployeeCode" postCode="OP" ></EmisUserSimplePicker1>
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="12">
-                  <el-form-item label="派件方式" prop="dispatchMethod">
-                    <el-radio-group v-model="form.dispatchMethod">
-                      <el-radio
-                        v-for="dict in dict.type.emis_tab_dispatch_mode"
-                        :key="dict.value"
-                        :label="dict.value"
-                      >
-                      <span style="font-size:10px" >{{dict.label}}</span>
-                    </el-radio>
-                    </el-radio-group>
-                  </el-form-item>
-                </el-col>
-            <!-- <el-col :span="12">
-              <div style="display:flex;padding-left: 30px;">
-
-                <el-checkbox-group v-model="form.printTypeCheckList">
-                  <el-checkbox
-                    v-for="dict in dict.type.emis_print_type"
-                    :key="dict.value"
-                    :label="dict.label"
-                  >
-                    <span style="font-size:10px" >{{dict.label}}</span>
-                  </el-checkbox>
-                </el-checkbox-group>
-              </div>
-            </el-col> -->
-
-            <!-- <el-col :xs="{span: 24}" :sm="{span: 12}" :md="{span: 12}" :lg="{span: 6}" :xl="{span: 6}">
-              <el-form-item label="寄件客户" prop="customerCode">
-                    <customer-picker0 v-model="form.customerCode"></customer-picker0>
-              </el-form-item>
-            </el-col> -->
-        </el-row>
-
-        <el-row :gutter="0" style="border: 1px dotted #f5f7fa;border-radius: 5px;margin-top:10px">
-
-          <el-col :span="12">
-            <el-row :gutter="0" style="background: #fdfdfd;padding: 10px;border-radius:10px">
-              <el-col :span="24" style="display:inline-flex">
-                <div class="form-group-title" style="width:50%">寄件人</div>
-                <div style="width:50%;text-align:right;padding-right: 15px;">
-                    <!-- icon="el-icon-edit" -->
-                  <el-button
-                  size="mini"
-                  type="text"
-                  style="cursor:hand;font-weight:700;border:1px dotted #e2d8d8;padding: 2px 5px;"
-                  class="iconfont icon-dizhibao"
-                  @click="handleSelectCustomerAddress(1)"
-                >寄件地址薄</el-button>
-                </div>
-              </el-col>
-
-              <div class="form-row-group-panel">
-                <el-col :span="12">
-                  <el-form-item label="寄件人" prop="sender.name">
-                    <CustomerAddressSimplePicker0 addressType="1" v-model="form.sender.name" @onChange="onChangeSelectSender"></CustomerAddressSimplePicker0>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="寄件电话" prop="sender.phone">
-                    <el-input v-model="form.sender.phone" placeholder="" />
-                  </el-form-item>
-                </el-col>
-                <!-- <el-col :span="12">
-                  <el-form-item label="国家" prop="sender.country">
-                    <country-picker1 v-model="form.sender.country"></country-picker1>
-                  </el-form-item>
+      <el-form ref="form"  size="small" :model="form" :rules="rules" label-width="100px">
+        <el-collapse v-model="activeNames">
+          <el-collapse-item title="" name="1">
+            <template slot="title">
+              <i class="header-icon el-icon-s-goods"></i>商品管理
+            </template>
+            <!-- <div slot="title">
+              <div class="form-group-title"><span class="title">{{ $t('发货信息') }}</span></div>
+            </div> -->
+            <div>
+              <el-row :gutter="0" >
+                <!-- <el-col :span="24">
                 </el-col> -->
-                <el-col :span="24">
-                  <el-form-item label="国家地区" prop="sender.province"  >
-                    <div style="display:inline-flex">
-                      <country-picker1 v-model="form.sender.country" ></country-picker1>
-                      <province-picker1 v-model="form.sender.province" :countryCode="form.sender.country" style="margin-left:5px"></province-picker1>
-                      <city-picker1 v-model="form.sender.city" :parentCode="form.sender.province" style="margin-left:5px"></city-picker1>
-                      <district-picker1 v-model="form.sender.county" :parentCode="form.sender.city" style="margin-left:5px"></district-picker1>
+                <el-col :span="7">
+                    <el-form-item label="运单号" prop="billCode"  >
+                      <div style="display:inline-flex">
+                        <!-- @keyup.enter.native="initData" -->
+                          <div><el-input v-model="form.billCode" placeholder="运单号" style="font-weight:600;color:black" /></div>
+                          <div style="padding-left:5px"> <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" @change="checked=>handleBillCodeChange(checked)"><span style="font-size:10px">电子主单</span></el-checkbox></div>
+                      </div>
+                    </el-form-item>
+                </el-col>
+                  <el-col :span="5">
+                    <el-form-item label="目的国" prop="reciever.country">
+                        <CountryPicker0 v-model="form.reciever.country"></CountryPicker0>
+                    </el-form-item>
+                  </el-col>
+                  <!-- <el-col :span="6">
+                    <el-form-item label="线路" prop="transLine">
+                      <TransLinePicker v-model="form.transLine" :countryCode="form.reciever.country" @onChange="onTransLineChange"></TransLinePicker>
+                    </el-form-item>
+                  </el-col> -->
+                  <el-col :span="6">
+                    <el-form-item label="产品类型" prop="productType">
+                      <TransProductCasPicker v-model="form.productTypeSelArr" :countryCode="form.reciever.country" @onChange="onProductChange" ></TransProductCasPicker>
+                      <!-- <trans-product-picker v-model="form.productType" :transLineCode="form.transLine"></trans-product-picker> -->
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item :label="$t('发货时间')" prop="sendDate">
+                      <el-input v-model="form.sendDate" placeholder="" readonly="" />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="报关方式" prop="customsEclaration">
+                      <el-select v-model="form.customsEclaration" placeholder="请选择">
+                        <el-option
+                          v-for="dict in dict.type.emis_declare_mode"
+                          :key="dict.value"
+                          :label="dict.label"
+                          :value="dict.value"
+                        ></el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="清关方式" prop="customsClear">
+                      <el-select v-model="form.customsClear" placeholder="请选择">
+                        <el-option
+                          v-for="dict in dict.type.emis_customs_clear"
+                          :key="dict.value"
+                          :label="dict.label"
+                          :value="dict.value"
+                        ></el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+
+                  <el-col :span="6">
+                    <el-form-item label="取件类型" prop="pickupMethod">
+                      <el-select v-model="form.pickupMethod" placeholder="请选择">
+                        <el-option
+                          v-for="dict in dict.type.emis_qujian_fangshi"
+                          :key="dict.value"
+                          :label="dict.label"
+                          :value="dict.value"
+                        ></el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item :label="$t('取件员')" prop="takePieceEmployeeCode">
+                      <EmisUserSimplePicker0 :placeholder="$t('取件员')" v-model="form.takePieceEmployeeCode" postCode="RSD" ></EmisUserSimplePicker0>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item :label="$t('操作员')" prop="operateEmployeeCode">
+                      <EmisUserSimplePicker1 :placeholder="$t('操作员')" v-model="form.operateEmployeeCode" postCode="OP" ></EmisUserSimplePicker1>
+                    </el-form-item>
+                  </el-col>
+
+                  <el-col :span="12">
+                        <el-form-item label="派件方式" prop="dispatchMethod">
+                          <el-radio-group v-model="form.dispatchMethod">
+                            <el-radio
+                              v-for="dict in dict.type.emis_tab_dispatch_mode"
+                              :key="dict.value"
+                              :label="dict.value"
+                            >
+                            <span style="font-size:10px" >{{dict.label}}</span>
+                          </el-radio>
+                          </el-radio-group>
+                        </el-form-item>
+                      </el-col>
+                  <!-- <el-col :span="12">
+                    <div style="display:flex;padding-left: 30px;">
+
+                      <el-checkbox-group v-model="form.printTypeCheckList">
+                        <el-checkbox
+                          v-for="dict in dict.type.emis_print_type"
+                          :key="dict.value"
+                          :label="dict.label"
+                        >
+                          <span style="font-size:10px" >{{dict.label}}</span>
+                        </el-checkbox>
+                      </el-checkbox-group>
                     </div>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24">
-                  <el-form-item label="寄件地址" prop="sender.address">
-                    <el-input v-model="form.sender.address" rows="3" type="textarea"  placeholder="" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24">
-                  <el-form-item label="寄件公司" prop="sender.company">
-                    <el-input v-model="form.sender.company" placeholder="" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="寄件网点" prop="sendSiteName">
-                    <el-input v-model="form.sendSiteName" placeholder="寄件网点" disabled />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24">
-                  <el-form-item label="" prop="blMessage">
-                    <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blMessage" :true-label="'1'" :false-label="'0'"><span style="font-size:10px">寄件/签收短信</span></el-checkbox>
-                  </el-form-item>
-                </el-col>
+                  </el-col> -->
+
+                  <!-- <el-col :xs="{span: 24}" :sm="{span: 12}" :md="{span: 12}" :lg="{span: 6}" :xl="{span: 6}">
+                    <el-form-item label="寄件客户" prop="customerCode">
+                          <customer-picker0 v-model="form.customerCode"></customer-picker0>
+                    </el-form-item>
+                  </el-col> -->
+              </el-row>
+
             </div>
-
-            </el-row>
-          </el-col>
-
-          <el-col :span="12">
-            <el-row :gutter="0" style="padding: 8px;">
-              <el-col :span="24" style="display:inline-flex">
-                <div class="form-group-title" style="width:50%">收件人</div>
-                <div style="width:50%;text-align:right;padding-right: 15px;">
-                  <el-button
-                  size="mini"
-                  type="text"
-                  style="cursor:hand;font-weight:700;border:1px dotted #e2d8d8;padding: 2px 5px;"
-                  class="iconfont icon-dizhibao"
-                  @click="handleSelectCustomerAddress(2)"
-                >收件地址薄</el-button>
-                </div>
-              </el-col>
-
-              <div class="form-row-group-panel">
-
-                <!-- <el-col :span="12">
-                  <el-form-item label="收件客户" prop="customerCode">
-                    <customer-picker1 v-model="form.receiveCustomerCode"></customer-picker1>
-                  </el-form-item>
-                </el-col> -->
-                <!-- <el-col :span="12">
-                  <el-form-item label="选择收件人" prop="customerCode">
-                  </el-form-item>
-                </el-col> -->
-                <!-- <el-col :span="12">
-                  <el-form-item label="客户名称" prop="customerName">
-                    <el-input v-model="form.customerName" placeholder="请输入客户名称" />
-                  </el-form-item>
-                </el-col> -->
+          </el-collapse-item>
+          <el-collapse-item title="" name="2">
+            <div slot="title">
+              <div class="form-group-title"><span class="title">{{ $t('收寄件信息') }}</span></div>
+            </div>
+            <el-row :gutter="0" style="border: 1px dotted #f5f7fa;border-radius: 5px;margin-top:10px">
                 <el-col :span="12">
-                  <el-form-item label="收件人" prop="reciever.name">
-                    <CustomerAddressSimplePicker1 addressType="2" v-model="form.reciever.name" @onChange="onChangeSelectReceiver"></CustomerAddressSimplePicker1>
-                  </el-form-item>
+                  <el-row :gutter="0" style="background: #fdfdfd;padding: 10px;border-radius:10px">
+                    <el-col :span="24" style="display:inline-flex">
+                      <div class="form-group-title" style="width:50%">寄件人</div>
+                      <div style="width:50%;text-align:right;padding-right: 15px;">
+                          <!-- icon="el-icon-edit" -->
+                        <el-button
+                        size="mini"
+                        type="text"
+                        style="cursor:hand;font-weight:700;border:1px dotted #e2d8d8;padding: 2px 5px;"
+                        class="iconfont icon-dizhibao"
+                        @click="handleSelectCustomerAddress(1)"
+                      >寄件地址薄</el-button>
+                      </div>
+                    </el-col>
+
+                    <div class="form-row-group-panel">
+                      <el-col :span="12">
+                        <el-form-item label="寄件人" prop="sender.name">
+                          <CustomerAddressSimplePicker0 addressType="1" v-model="form.sender.name" @onChange="onChangeSelectSender"></CustomerAddressSimplePicker0>
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="12">
+                        <el-form-item label="寄件电话" prop="sender.phone">
+                          <el-input v-model="form.sender.phone" placeholder="" />
+                        </el-form-item>
+                      </el-col>
+                      <!-- <el-col :span="12">
+                        <el-form-item label="国家" prop="sender.country">
+                          <country-picker1 v-model="form.sender.country"></country-picker1>
+                        </el-form-item>
+                      </el-col> -->
+                      <el-col :span="24">
+                        <el-form-item label="国家地区" prop="sender.province"  >
+                          <div style="display:inline-flex">
+                            <country-picker1 v-model="form.sender.country" ></country-picker1>
+                            <province-picker1 v-model="form.sender.province" :countryCode="form.sender.country" style="margin-left:5px"></province-picker1>
+                            <city-picker1 v-model="form.sender.city" :parentCode="form.sender.province" style="margin-left:5px"></city-picker1>
+                            <district-picker1 v-model="form.sender.county" :parentCode="form.sender.city" style="margin-left:5px"></district-picker1>
+                          </div>
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="24">
+                        <el-form-item label="寄件地址" prop="sender.address">
+                          <el-input v-model="form.sender.address" rows="3" type="textarea"  placeholder="" />
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="24">
+                        <el-form-item label="寄件公司" prop="sender.company">
+                          <el-input v-model="form.sender.company" placeholder="" />
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="12">
+                        <el-form-item label="寄件网点" prop="sendSiteName">
+                          <el-input v-model="form.sendSiteName" placeholder="寄件网点" disabled />
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="24">
+                        <el-form-item label="" prop="blMessage">
+                          <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blMessage" :true-label="'1'" :false-label="'0'"><span style="font-size:10px">寄件/签收短信</span></el-checkbox>
+                        </el-form-item>
+                      </el-col>
+                  </div>
+
+                  </el-row>
                 </el-col>
 
                 <el-col :span="12">
-                  <el-form-item label="收件电话" prop="reciever.phone">
-                    <el-input v-model="form.reciever.phone" placeholder="请输入收件人手机号" />
-                  </el-form-item>
-                </el-col>
+                  <el-row :gutter="0" style="padding: 8px;">
+                    <el-col :span="24" style="display:inline-flex">
+                      <div class="form-group-title" style="width:50%">收件人</div>
+                      <div style="width:50%;text-align:right;padding-right: 15px;">
+                        <el-button
+                        size="mini"
+                        type="text"
+                        style="cursor:hand;font-weight:700;border:1px dotted #e2d8d8;padding: 2px 5px;"
+                        class="iconfont icon-dizhibao"
+                        @click="handleSelectCustomerAddress(2)"
+                      >收件地址薄</el-button>
+                      </div>
+                    </el-col>
 
-                <!-- <el-col :span="12">
-                  <el-form-item label="国家" prop="reciever.country">
-                    <country-picker2 v-model="form.reciever.country"></country-picker2>
-                  </el-form-item>
-                </el-col> -->
-                <el-col :span="24">
-                  <el-form-item label="国家地区" prop="reciever.province">
-                    <div style="display:inline-flex">
-                      <country-picker2 v-model="form.reciever.country" ></country-picker2>
-                      <ProvincePicker2 v-model="form.reciever.province" :countryCode="form.reciever.country"  style="margin-left:5px"></ProvincePicker2>
-                      <city-picker2 v-model="form.reciever.city" :parentCode="form.reciever.province" style="margin-left:5px"></city-picker2>
-                      <district-picker2 v-model="form.reciever.county" :parentCode="form.reciever.city" style="margin-left:5px"></district-picker2>
+                    <div class="form-row-group-panel">
+
+                      <!-- <el-col :span="12">
+                        <el-form-item label="收件客户" prop="customerCode">
+                          <customer-picker1 v-model="form.receiveCustomerCode"></customer-picker1>
+                        </el-form-item>
+                      </el-col> -->
+                      <!-- <el-col :span="12">
+                        <el-form-item label="选择收件人" prop="customerCode">
+                        </el-form-item>
+                      </el-col> -->
+                      <!-- <el-col :span="12">
+                        <el-form-item label="客户名称" prop="customerName">
+                          <el-input v-model="form.customerName" placeholder="请输入客户名称" />
+                        </el-form-item>
+                      </el-col> -->
+                      <el-col :span="12">
+                        <el-form-item label="收件人" prop="reciever.name">
+                          <CustomerAddressSimplePicker1 addressType="2" v-model="form.reciever.name" @onChange="onChangeSelectReceiver"></CustomerAddressSimplePicker1>
+                        </el-form-item>
+                      </el-col>
+
+                      <el-col :span="12">
+                        <el-form-item label="收件电话" prop="reciever.phone">
+                          <el-input v-model="form.reciever.phone" placeholder="请输入收件人手机号" />
+                        </el-form-item>
+                      </el-col>
+
+                      <!-- <el-col :span="12">
+                        <el-form-item label="国家" prop="reciever.country">
+                          <country-picker2 v-model="form.reciever.country"></country-picker2>
+                        </el-form-item>
+                      </el-col> -->
+                      <el-col :span="24">
+                        <el-form-item label="国家地区" prop="reciever.province">
+                          <div style="display:inline-flex">
+                            <country-picker2 v-model="form.reciever.country" ></country-picker2>
+                            <ProvincePicker2 v-model="form.reciever.province" :countryCode="form.reciever.country"  style="margin-left:5px"></ProvincePicker2>
+                            <city-picker2 v-model="form.reciever.city" :parentCode="form.reciever.province" style="margin-left:5px"></city-picker2>
+                            <district-picker2 v-model="form.reciever.county" :parentCode="form.reciever.city" style="margin-left:5px"></district-picker2>
+                          </div>
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="24">
+                        <el-form-item label="收件地址" prop="reciever.address">
+                          <el-input v-model="form.reciever.address" type="textarea" rows="3" placeholder="详细地址" />
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="24">
+                        <el-form-item label="收件公司" prop="reciever.company">
+                          <el-input v-model="form.reciever.company" placeholder="请输入收件公司" />
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="12">
+                        <el-form-item label="目的地" prop="destinationCode">
+                          <DestinationPicker v-model="form.destinationCode" :countryCode="form.reciever.country" :lineCode="form.transLine" @onChange="onDestinationChange"></DestinationPicker>
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="12">
+                        <el-form-item label="派件网点" prop="dispatchSite">
+                          <el-input v-model="form.dispatchSite" placeholder="请输入派件网点" disabled />
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="24">
+                        <el-form-item label="" prop="blAcceptMessage">
+                          <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blAcceptMessage" :true-label="'1'" :false-label="'0'"><span style="font-size:10px">派件短信</span></el-checkbox>
+                        </el-form-item>
+                      </el-col>
+                      <!-- <el-col :span="12">
+                        <el-form-item label="邮编" prop="receivePostcode">
+                          <el-input v-model="form.receivePostcode" placeholder="请输入邮编" />
+                        </el-form-item>
+                      </el-col> -->
                     </div>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24">
-                  <el-form-item label="收件地址" prop="reciever.address">
-                    <el-input v-model="form.reciever.address" type="textarea" rows="3" placeholder="详细地址" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24">
-                  <el-form-item label="收件公司" prop="reciever.company">
-                    <el-input v-model="form.reciever.company" placeholder="请输入收件公司" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="目的地" prop="destinationCode">
-                    <DestinationPicker v-model="form.destinationCode" :countryCode="form.reciever.country" :lineCode="form.transLine" @onChange="onDestinationChange"></DestinationPicker>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="派件网点" prop="dispatchSite">
-                    <el-input v-model="form.dispatchSite" placeholder="请输入派件网点" disabled />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24">
-                  <el-form-item label="" prop="blAcceptMessage">
-                    <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blAcceptMessage" :true-label="'1'" :false-label="'0'"><span style="font-size:10px">派件短信</span></el-checkbox>
-                  </el-form-item>
-                </el-col>
-                <!-- <el-col :span="12">
-                  <el-form-item label="邮编" prop="receivePostcode">
-                    <el-input v-model="form.receivePostcode" placeholder="请输入邮编" />
-                  </el-form-item>
-                </el-col> -->
-              </div>
-            </el-row>
+                  </el-row>
+
+                </el-col>
+            </el-row>
+          </el-collapse-item>
+          <el-collapse-item title="标题3" name="3">
+            <div>内容3</div>
+          </el-collapse-item>
+      </el-collapse>
+
+
+
+
 
-          </el-col>
-        </el-row>
         <el-row :gutter="0" style="border-radius: 5px;margin-top:10px">
           <el-col :span="12">
             <el-col :span="24">
@@ -452,12 +475,13 @@
                     </el-col>
                     <el-col :span="12">
                       <el-form-item label="回款联系人" prop="payee" label-width="100px">
-                        <el-input v-model="form.payee" placeholder="回款联系人"  />
+                        <EmisUserSimplePicker2 :placeholder="$t('回款联系人')" v-model="form.payee"  ></EmisUserSimplePicker2>
+
                       </el-form-item>
                     </el-col>
                     <el-col :span="12">
                       <el-form-item label="销售联系人" prop="salesmen" label-width="100px">
-                        <el-input v-model="form.salesmen" placeholder="销售联系人"  />
+                        <EmisUserSimplePicker3 :placeholder="$t('销售联系人')" v-model="form.salesmen"  ></EmisUserSimplePicker3>
                       </el-form-item>
                     </el-col>
 
@@ -519,6 +543,8 @@ import DestinationPicker from '@/views/emis/EmisBaseTools/DestinationPicker.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 EmisUserSimplePicker3 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
 
 import TransLinePicker from '@/views/emis/EmisBaseTools/TransLinePicker.vue';
 import TransProductPicker from '@/views/emis/EmisBaseTools/TransProductPicker.vue';
@@ -570,6 +596,8 @@ components: {
   GoodsPicker,
   EmisUserSimplePicker0,
   EmisUserSimplePicker1,
+  EmisUserSimplePicker2,
+  EmisUserSimplePicker3,
   // CustomerPicker0,
   // CustomerPicker1,
   // CustomerPicker2,
@@ -594,6 +622,7 @@ dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
         'emis_calc_fee_type','emis_print_type'],
 data() {
   return {
+    activeNames:[0, 1, 2,3,4],
     billCode:null,
     emisWaybillOptions: [],
     addressType:null,