md

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;
+  }
 }
 
 

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>

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]);

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" }

src/views/emis/emisWaybill/emisWaybillRecord.vue

@@ -1,10 +1,18 @@
 <template>
   <div class="app-container">
-      <el-form ref="form"  size="small" :model="form" :rules="rules" label-width="90px">
+      <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 :span="24">
-            <div class="form-group-title">{{ $t('发货信息') }}</div>
+                </el-col> -->
-          </el-col>
                 <el-col :span="7">
                     <el-form-item label="运单号" prop="billCode"  >
                       <div style="display:inline-flex">
@@ -118,8 +126,13 @@
                   </el-col> -->
               </el-row>
 
+            </div>
+          </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-row :gutter="0" style="background: #fdfdfd;padding: 10px;border-radius:10px">
                     <el-col :span="24" style="display:inline-flex">
@@ -280,6 +293,16 @@
 
                 </el-col>
             </el-row>
+          </el-collapse-item>
+          <el-collapse-item title="标题3" name="3">
+            <div>内容3</div>
+          </el-collapse-item>
+      </el-collapse>
+
+
+
+
+
         <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,