客户信息字段确认

src/i18n/languages/en_US.json

@@ -4508,6 +4508,26 @@
     "角标字段": "Subscript field",
     "不清楚请留空,已设勿改": "Unclear, please leave blank. It has been set to remain unchanged",
     "退仓/已混箱品名":"Returned/mixed Box",
-    "基本":"base",
-	"国籍":"country"
+    "基本":"Base",
+    "发货信息": "Shipping Information",
+    "设置": "Setting",
+    "财务": "Finance",
+    "开票信息": "Billing Information",
+	"国籍":"country",
+    "首次成交时间": "First deal time",
+    "掉入公海时间": "Time fall to Common Customers List",
+    "获取方式": "Get method",
+    "创建入口": "Create from",
+    "捞取时间": "Catch time",
+    "归属时间": "Homing time",
+    "业务国家": "Operating country",
+    "年度发货量": "Shipment yearly",
+    "年度发货次数": "Number of shipments yearly",
+    "主要竞争对手": "Major competitors",
+    "控制无收货人": "Control not consignee",
+    "默认付款": "Default payment",
+    "默认开票": "Default Billing",
+    "请选择获取方式": "Please select customer get method",
+    "请选择创建入口": "Please select customer create from",
+    "请选择业务国家": "Please select customer operating country"
 }

src/i18n/languages/zh_CN.json

@@ -294,5 +294,25 @@
       "查看提单 {selfNo} 柜号：{cubNo} 柜型：{cabinetLabel}": "查看提单 {selfNo} 柜号：{cubNo} 柜型：{cabinetLabel}",
 	  "退仓/已混箱品名":"退仓/已混箱品名",
 		"基本":"基本",
-		"国籍":"国籍"
+		"发货信息": "发货信息",
+		"设置": "设置",
+    "财务": "财务",
+    "开票信息": "开票信息",
+		"国籍":"国籍",
+		"首次成交时间": "首次成交时间",
+    "掉入公海时间": "掉入公海时间",
+    "获取方式": "获取方式",
+    "创建入口": "创建入口",
+    "捞取时间": "捞取时间",
+    "归属时间": "归属时间",
+    "业务国家": "业务国家",
+    "年度发货量": "年度发货量",
+    "年度发货次数": "年度发货次数",
+    "主要竞争对手": "主要竞争对手",
+    "控制无收货人": "控制无收货人",
+    "默认付款": "默认付款",
+    "默认开票": "默认开票",
+		"请选择获取方式": "请选择获取方式",
+    "请选择创建入口": "请选择创建入口",
+		"请选择业务国家": "请选择业务国家"
 	}

src/views/ecw/customer/edit.vue

 <template xmlns="">
-
   <el-row
     type="flex"
     style="margin: 15px 0"
@@ -7,7 +6,17 @@
   >
     <el-col :xs="24" :sm="24" :md="24" :lg="22" :xl="20">
       <el-form ref="form" :model="form" :rules="rules" label-width="150px">
-          <h2>{{ $t('基本') }}</h2>
+        <el-card class="box-card">
+          <div slot="header" class="clearfix">
+            <span class="title-text">{{ $t('基本') }}</span>
+            <el-button
+              style="float: right"
+              size="small"
+              type="primary"
+              @click="showBaseFlag = !showBaseFlag"
+              >{{showBaseFlag ? $t('隐藏') : $t('更多')}}</el-button
+            >
+          </div>
           <el-row :gutter="10">
             <el-col :span="12">
               <el-form-item :label="$t('客户名称')" prop="name">
@@ -129,7 +138,7 @@
             </el-col>
           </el-row>
 
-          <el-row :gutter="10">
+          <el-row :gutter="10" v-show="showBaseFlag">
             <el-col :span="12">
               <el-form-item :label="$t('联系地址')" prop="address">
                 <el-input
@@ -150,7 +159,7 @@
                 </el-date-picker>
               </el-form-item>
             </el-col>
-            <!--
+        
             <el-col :span="12">
               <el-form-item :label="$t('业绩类型')">
                 <el-switch
@@ -165,7 +174,6 @@
                 <dict-selector :type="DICT_TYPE.ECW_CUSTOMER_RESOURCE_TYPE" v-model="form.resourceType" formatter="number"></dict-selector>
               </el-form-item>
             </el-col>
-            -->
 
             <el-col :span="12">
               <el-form-item :label="$t('客户等级')" prop="level">
@@ -201,29 +209,30 @@
             </el-col>
 
             <el-col :span="12">
-              <el-form-item label="首次成交时间">
+              <el-form-item :label="$t('首次成交时间')">
                 <el-date-picker
-                  v-model="form.time"
+                  v-model="form.firstDealTime"
                   type="datetime"
                   :placeholder="$t('请选择')"
+                  disabled
                 />
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="掉入公海时间">
+              <el-form-item :label="$t('掉入公海时间')">
                 <el-date-picker
-                  v-model="form.time"
+                  v-model="enterOpenSeaTime"
                   type="datetime"
                   :placeholder="$t('请选择')"
+                  disabled
                 />
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="获取方式">
+              <el-form-item :label="$t('获取方式')" prop="getMethod">
                 <el-select
                   v-model="form.getMethod"
                   :placeholder="$t('请选择')"
-                  disabled
                 >
                   <el-option
                     v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_GET_METHOD)"
@@ -235,11 +244,10 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="创建入口">
+              <el-form-item :label="$t('创建入口')" prop="createFrom">
                 <el-select
                   v-model="form.createFrom"
                   :placeholder="$t('请选择')"
-                  disabled
                 >
                   <el-option
                     v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_FROM)"
@@ -251,16 +259,17 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="捞取时间">
+              <el-form-item :label="$t('捞取时间')">
                 <el-date-picker
-                  v-model="form.time"
+                  v-model="form.catchTime"
                   type="datetime"
                   :placeholder="$t('请选择')"
+                  disabled
                 />
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="归属时间">
+              <el-form-item :label="$t('归属时间')">
                 <el-date-picker
                   v-model="form.customerServiceConfirmedTime"
                   type="datetime"
@@ -297,20 +306,8 @@
                 </el-date-picker>
               </el-form-item>
             </el-col>
-
             <el-col :span="12">
-              <el-form-item label="最后更新时间">
-                <el-date-picker
-                  v-model="form.updateTime"
-                  type="datetime"
-                  value-format="timestamp"
-                  disabled
-                >
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="最后更新人">
+              <el-form-item :label="$t('最后更新人')">
                 <el-select v-model="form.updater" disabled>
                   <el-option
                     v-for="item in allSimplList"
@@ -322,10 +319,32 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item :label="$t('最后更新时间')">
+                <el-date-picker
+                  v-model="form.updateTime"
+                  type="datetime"
+                  value-format="timestamp"
+                  disabled
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
           </el-row>
+        </el-card>
 
-          <h2>发货信息</h2>
-          <el-row :gutter="10">
+        <el-card style="margin-top: 15px">
+          <div slot="header" class="clearfix">
+            <span class="title-text">{{ $t('发货信息') }}</span>
+            <el-button
+              style="float: right"
+              size="small"
+              type="primary"
+              @click="showShippingFlag = !showShippingFlag"
+              >{{showShippingFlag ? $t('隐藏') : $t('更多')}}</el-button
+            >
+          </div>
+          <el-row :gutter="10" v-show="showShippingFlag">
             <el-col :span="12">
               <el-form-item :label="$t('客户类别')" prop="type">
                 <dict-selector
@@ -337,29 +356,19 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="角色">
+              <el-form-item :label="$t('角色')">
+                <dict-selector
+                  :type="DICT_TYPE.CUSTOMER_ROLE"
+                  form-type="checkbox"
+                  multiple
+                  v-model="form.role"
+                ></dict-selector>
               </el-form-item>
             </el-col>
   
-            <el-col :span="12">
-              <el-form-item :label="$t('出货渠道')" prop="transportType">
-                <!--                <dict-selector :type="DICT_TYPE.ECW_CUSTOMER_TRANSPORT_TYPE"  form-type="checkbox" multiple v-model="form.transportType"></dict-selector>-->
-                <el-checkbox-group v-model="form.transportType">
-                  <el-checkbox
-                    v-for="item in getDictDatas(
-                      DICT_TYPE.ECW_CUSTOMER_TRANSPORT_TYPE
-                    )"
-                    :key="item.value"
-                    :label="item.value"
-                    :disabled="[3].includes(+item.value)"
-                    >{{ item.label }}</el-checkbox
-                  >
-                </el-checkbox-group>
-              </el-form-item>
-            </el-col>
             <el-col
               :span="13"
-              v-show="form.type && form.type.indexOf('2') !== -1"
+              v-show="form.role && form.role.indexOf('2') !== -1"
             >
               <el-form-item :label="$t('所属代理')" prop="agentId">
                 <el-select
@@ -377,18 +386,55 @@
                 </el-select>
               </el-form-item>
             </el-col>
+  
+            <el-col :span="12">
+              <el-form-item :label="$t('出货渠道')" prop="transportType">
+                <!--                <dict-selector :type="DICT_TYPE.ECW_CUSTOMER_TRANSPORT_TYPE"  form-type="checkbox" multiple v-model="form.transportType"></dict-selector>-->
+                <el-checkbox-group v-model="form.transportType">
+                  <el-checkbox
+                    v-for="item in getDictDatas(
+                      DICT_TYPE.ECW_CUSTOMER_TRANSPORT_TYPE
+                    )"
+                    :key="item.value"
+                    :label="item.value"
+                    :disabled="[3].includes(+item.value)"
+                    >{{ item.label }}</el-checkbox
+                  >
+                </el-checkbox-group>
+              </el-form-item>
+            </el-col>
             <el-col :span="12">
               <el-form-item :label="$t('常用提货网点')" prop="pickupPoints">
-                <el-select v-model="pickupPoints">
+                <el-select v-model="form.pickupPoints">
                   <el-option
                     multiple
                     v-for="item in getNodeLists"
+                    :key="item.id"
                     :value="item.id"
                     :label="isChinese ? item.titleZh : item.titleEn"
                   ></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
+
+            <el-col :span="12">
+              <el-form-item :label="$t('业务国家')" prop="busiCountryIds">
+                <el-select
+                  multiple
+                  filterable
+                  clearable
+                  v-model="form.busiCountryIds"
+                  :placeholder="$t('请选择')"
+                >
+                  <el-option
+                    v-for="dict in countryList"
+                    :key="dict.id"
+                    :label="isChinese ? dict.nameZh : dict.nameEn"
+                    :value="parseInt(dict.id)"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
             <el-col :span="12">
               <el-form-item :label="$t('主营类别')" prop="productType">
                 <el-row :gutter="10">
@@ -408,7 +454,10 @@
                   </el-col>
                   <el-col :span="11">
                     <el-select
-                      v-model="productIds"
+                      multiple
+                      filterable
+                      clearable
+                      v-model="form.productIds"
                       :placeholder="$t('请选择')"
                     >
                       <el-option
@@ -423,30 +472,40 @@
               </el-form-item>
             </el-col>
 
+            
             <el-col :span="12">
-              <el-form-item label="业务国家">
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="年度发货量">
+              <el-form-item :label="$t('年度发货量')">
                 <el-input-number v-model="form.weightYearly" :min="1" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="主要竞争对手" prop="competitorIds">
+              <el-form-item :label="$t('主要竞争对手')" prop="competitorId">
+                <el-input
+                  v-model="form.competitorId"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="年度发货次数">
+              <el-form-item :label="$t('年度发货次数')">
                 <el-input-number v-model="form.numYearly" :min="1" />
               </el-form-item>
             </el-col>
 
-            
           </el-row>
+        </el-card>
 
-          <h2>设置</h2>
-          <el-row :gutter="10">
+        <el-card class="box-card" style="margin-top: 15px;">
+          <div slot="header" class="clearfix">
+            <span class="title-text">{{ $t('设置') }}</span>
+            <el-button
+              style="float: right"
+              size="small"
+              type="primary"
+              @click="showSettingFlag = !showSettingFlag"
+              >{{showSettingFlag ? $t('隐藏') : $t('更多')}}</el-button
+            >
+          </div>
+          <el-row :gutter="10" v-if="showSettingFlag">
             <el-col :span="12">
               <el-form-item :label="$t('是否显示提单价格')" prop="isShowTidanPrice">
                 <el-switch v-model="form.isShowTidanPrice"></el-switch>
@@ -513,25 +572,36 @@
             </el-col>
 
             <el-col :span="12">
-              <el-form-item label="控货无收货人">
-                <el-switch v-model="form.noConsignee" />
+              <el-form-item :label="$t('控货无收货人')">
+                <el-switch v-model="form.noConsignee" disabled />
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="默认付款">
-                <el-switch v-model="form.defaultPay" />
+              <el-form-item :label="$t('默认付款')">
+                <el-switch v-model="form.defaultPay" disabled />
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="默认开票">
-                <el-switch v-model="form.defaultBilling" />
+              <el-form-item :label="$t('默认开票')">
+                <el-switch v-model="form.defaultBilling" disabled />
               </el-form-item>
             </el-col>
 
           </el-row>
+        </el-card>
 
-          <h2>财务</h2>
-          <el-row :gutter="10">
+        <el-card class="box-card" style="margin-top: 15px;">
+          <div slot="header" class="clearfix">
+            <span class="title-text">{{ $t('财务') }}</span>
+            <el-button
+              style="float: right"
+              size="small"
+              type="primary"
+              @click="showFinanceFlag = !showFinanceFlag"
+              >{{showFinanceFlag ? $t('隐藏') : $t('更多')}}</el-button
+            >
+          </div>
+          <el-row :gutter="10" v-if="showFinanceFlag">
             <el-col :span="12">
               <el-form-item :label="$t('公司名称')" prop="company">
                 <el-input
@@ -590,9 +660,9 @@
                 <el-input v-model="form.carName"></el-input>
               </el-form-item>
             </el-col>
-          </el-row>
-          <h3>开票信息</h3>
-          <el-row :gutter="10" style="margin-top: 15px">
+    
+            <h3>{{$t('开票信息')}}</h3>
+
             <el-col :span="12">
               <el-form-item :label="$t('发票抬头')" prop="invoiceTitle">
                 <el-input
@@ -660,9 +730,10 @@
               </el-form-item>
             </el-col>
           </el-row>
+        </el-card>
       </el-form>
 
-        <el-card>
+      <el-card class="box-card" style="margin-top: 15px;">
         <div slot="header" class="clearfix">
           <span>{{ $t("银行信息") }}</span>
           <el-button
@@ -1022,7 +1093,6 @@
       </div>
     </el-col>
   </el-row>
-
 </template>
 
 <script>
@@ -1109,6 +1179,9 @@ export default {
         if (this.form.lightUnit) {
           this.showPao = true;
         }
+        // 掉入公海时间
+        this.enterOpenSeaTime = this.form.estimateEnterOpenSeaTime || this.form.enterOpenSeaTime || undefined
+
         if (customerId) {
           // 获取重泡货路线
           getCustomerLines(customerId).then((res) => {
@@ -1216,6 +1289,27 @@ export default {
             trigger: "blur",
           },
         ],
+        getMethod: [
+          {
+            required: true,
+            message: this.$t("请选择获取方式"),
+            trigger: "change",
+          },
+        ],
+        createFrom: [
+          {
+            required: true,
+            message: this.$t("请选择创建入口"),
+            trigger: "change",
+          },
+        ],
+        busiCountryIds: [
+          {
+            required: true,
+            message: this.$t("请选择业务国家"),
+            trigger: "change",
+          },
+        ],
       },
       contactRules: {
         name: [
@@ -1259,8 +1353,11 @@ export default {
       serviceNetworkList: [], //网点列表
       allSimplList: [],
       currecyList: [],
-      pickupPoints: [],// 常用提货网点
-      productIds: [],// 主营产品
+      enterOpenSeaTime: undefined,
+      showBaseFlag: true,
+      showShippingFlag: true,
+      showSettingFlag: true,
+      showFinanceFlag: true,
     };
   },
 
@@ -1445,6 +1542,7 @@ export default {
               taxRate: Number(this.form.taxRate),
               pickupPoints: this.form.pickupPoints?.join(","),
               productIds: this.form.productIds?.join(","),
+              busiCountryIds: this.form.busiCountryIds?.join(","),
             };
             form.customerContacts = JSON.parse(
               JSON.stringify(this.form.customerContacts)
@@ -1471,6 +1569,8 @@ export default {
               this.form.customerContacts.forEach((e) => {
                 e.customerId = this.customerId;
               });
+
+              console.log(this.form)
               if (this.$route.name === "perfect") {
                 fillupCustomeInfo(form).then((r) => {
                   this.$modal.msgSuccess(this.$t("修改成功"));
@@ -1520,8 +1620,10 @@ export default {
         payerName: undefined,
         address: undefined,
         productType: undefined,
-        productId: undefined,
-        pickupPoint: undefined,
+        // productId: undefined,
+        // pickupPoint: undefined,
+        pickupPoints: undefined,
+        productIds: undefined,
         memberId: undefined,
         birthday: undefined,
         balance: undefined,
@@ -1551,8 +1653,26 @@ export default {
         carName: undefined,
         carNo: undefined,
         customerBanks: [],
+        isNew: true,// 业绩类型
+        firstDealTime: undefined,// 首次成交时间
+        // estimateEnterOpenSeaTime: undefined,// 掉入公海时间
+        getMethod: undefined,// 获取方式
+        createFrom: undefined,// 创建入口
+        catchTime: undefined,//捞取时间
+        customerServiceConfirmedTime: undefined,//归属时间
+        updater: this.$store.getters.userId,// 更新人
+        updateTime: undefined,// 更新时间
+        role: undefined,// 客户角色
+        busiCountryIds: undefined,// 业务国家
+        competitorId: undefined,// 主要竞争对手
+        weightYearly: undefined,// 年度发货量
+        numYearly: undefined,// 年度发货次数
+        noConsignee: false,// 控制无收货人
+        defaultPay: false,// 默认付款
+        defaultBilling: false,// 默认开票
       };
       this.form.createTime = new Date().getTime();
+      this.form.updateTime = new Date().getTime();
       this.resetForm("form");
     },
     getCustomer(id) {
@@ -1688,4 +1808,8 @@ export default {
     }
   }
 }
+.title-text {
+  font-size: 18px; 
+  color: #111;
+}
 </style>

src/views/ecw/customer/query.vue

@@ -9,7 +9,7 @@
             <el-button v-has-permi="['ecw:customer:query-quoted-price']" @click="$router.push('/offer/create')" type="primary" size="small">{{$t('报价')}}</el-button>
             <el-button v-has-permi="['ecw:customer:query-follow-up']" type="primary" size="small" @click="customerFollowFn('follow')">{{$t('跟进')}}</el-button>
             <el-button v-has-permi="['ecw:customer:query-customer-complaint']" type="primary" size="small" @click="customerFollowFn('complain')">{{$t('客诉')}}</el-button>
-            <el-button  v-hasPermi="['ecw:customer:query-delete']" type="danger" size="small" @click="deleteCustomerFn()">{{$t('删除')}}</el-button>
+            <el-button v-has-permi="['ecw:customer:query-delete']" type="danger" size="small" @click="deleteCustomerFn()">{{$t('删除')}}</el-button>
           </div>
         </div>
         <el-card style="margin-top: 15px;" v-show="false">
@@ -65,16 +65,12 @@
             <template slot="extra">
               <el-button type="primary" size="small" @click="showMore = !showMore">{{showMore ? $t('隐藏') : $t('更多')}}</el-button>
             </template>
-
             <el-descriptions-item :label="$t('客户编号')">{{ customer.number }}</el-descriptions-item>
             <el-descriptions-item :label="$t('客户名称')"><span style="white-space: pre-wrap;">{{ customer.name}}</span></el-descriptions-item>
-            <el-descriptions-item :label="$t('国籍')">{{$l(customer,'countryName')}}{{customer.countryName}}</el-descriptions-item>
-            
-            
+            <el-descriptions-item :label="$t('国籍')">{{$l(customer,'countryName')}}</el-descriptions-item>
             <el-descriptions-item :label="$t('客户来源')">{{ getDictDataLabel(DICT_TYPE.CUSTOMER_SOURCE, customer.source) }}</el-descriptions-item>
-            <el-descriptions-item :label="$t('客户状态')">{{ getDictDataLabel(DICT_TYPE.CUSTOMER_STATUS, customer.status)}}</el-descriptions-item>
+            <el-descriptions-item :label="$t('客户状态')">{{ getDictDataLabel(DICT_TYPE.CUSTOMER_STATUS, customer.status) }}</el-descriptions-item>
             <el-descriptions-item :label="$t('客户经理')">{{customer.customerServiceName }}</el-descriptions-item>
-
             <el-descriptions-item :label="$t('询盘信息')">{{ customer.inquiry }}</el-descriptions-item>
             <el-descriptions-item :label="$t('备注')">{{ customer.remarks  }}</el-descriptions-item>
             <el-descriptions-item :label="$t('图片')">
@@ -87,28 +83,22 @@
             <el-descriptions-item :label="$t('客户等级')">{{ getDictDataLabel(DICT_TYPE.CUSTOMER_LEVEL, customer.level) }}</el-descriptions-item>
             <el-descriptions-item :label="$t('推介人')">{{ customer.promoterName }}</el-descriptions-item>
             <el-descriptions-item :label="$t('客户生日')">{{ parseTime(customer.birthday, '{y}-{m}-{d}') }}</el-descriptions-item>
-
             <el-descriptions-item :label="$t('业绩类型')">{{ customer.isNew ?$t('新客户') : $t('老客户')  }}</el-descriptions-item>
             <el-descriptions-item :label="$t('资源类型')">
               <dict-tag :type="DICT_TYPE.ECW_CUSTOMER_RESOURCE_TYPE" :value="customer.resourceType"></dict-tag>
             </el-descriptions-item>
             <el-descriptions-item :label="$t('客户英文名称')">{{customer.nameEn }}</el-descriptions-item>
-
-            
-
             <el-descriptions-item :label="$t('联系地址')">{{ customer.address }}</el-descriptions-item>
-            <el-descriptions-item label="首次成交时间"></el-descriptions-item>
-            <el-descriptions-item label="掉入公海时间"></el-descriptions-item>
-            <el-descriptions-item label="获取方式"></el-descriptions-item>
-            <el-descriptions-item label="创建入口"></el-descriptions-item>
-            <el-descriptions-item label="捞取时间"></el-descriptions-item>
-            <el-descriptions-item label="归属时间"></el-descriptions-item>
-     
+            <el-descriptions-item :label="$t('首次成交时间')">{{ customer.firstDealTime  }}</el-descriptions-item>
+            <el-descriptions-item :label="$t('掉入公海时间')">{{ customer.estimateEnterOpenSeaTime || customer.enterOpenSeaTime }}</el-descriptions-item>
+            <el-descriptions-item :label="$t('获取方式')">{{ getDictDataLabel(DICT_TYPE.CUSTOMER_GET_METHOD, customer.getMethod) }}</el-descriptions-item>
+            <el-descriptions-item :label="$t('创建入口')">{{ getDictDataLabel(DICT_TYPE.CUSTOMER_FROM, customer.createFrom) }}</el-descriptions-item>
+            <el-descriptions-item :label="$t('捞取时间')">{{ customer.catchTime  }}</el-descriptions-item>
+            <el-descriptions-item :label="$t('归属时间')">{{ customer.customerServiceConfirmedTime  }}</el-descriptions-item>
             <el-descriptions-item :label="$t('创建人')">{{ customer.founderName }}</el-descriptions-item>
             <el-descriptions-item :label="$t('创建时间')">{{ parseTime(customer.createTime) }}</el-descriptions-item>
-
-            <el-descriptions-item label="最后更新人"></el-descriptions-item>
-            <el-descriptions-item label="最后更新时间"></el-descriptions-item>
+            <el-descriptions-item :label="$t('最后更新人')">{{ customer.updater }}</el-descriptions-item>
+            <el-descriptions-item :label="$t('最后更新时间')">{{ customer.updateTime }}</el-descriptions-item>
             </template>
           </el-descriptions>
         </el-card>
@@ -358,12 +348,21 @@
               <el-descriptions-item :label="$t('客户类别')">
                 {{ getDictDatas2(DICT_TYPE.CUSTOMER_TYPE, (customer.type||'').split(',')).map(e => isChinese ? e.label : e.labelEn).join(', ')}}
               </el-descriptions-item>
+              <el-descriptions-item :label="$t('角色')">
+                {{ getDictDatas2(DICT_TYPE.CUSTOMER_ROLE, (customer.role||'').split(',')).map(e => isChinese ? e.label : e.labelEn).join(', ')}}
+              </el-descriptions-item>
               <el-descriptions-item :label="$t('出货渠道')">
                 {{ getDictDatas2(DICT_TYPE.ECW_CUSTOMER_TRANSPORT_TYPE, (customer.transportType||'').split(',')).map(e => isChinese ? e.label : e.labelEn).join(', ') }}
   <!--              <dict-tag v-if="customer.transportType" v-for="item in (customer.transportType || '').split(',')" :type="DICT_TYPE.ECW_CUSTOMER_TRANSPORT_TYPE" :value="item"></dict-tag>-->
               </el-descriptions-item>
               <el-descriptions-item :label="$t('常提货网点')">{{ $l(customer,'pickupPointName') }}</el-descriptions-item>
+              <el-descriptions-item :label="$t('业务国家')">
+                {{$l(customer,'countryName')}}
+              </el-descriptions-item>
               <el-descriptions-item :label="$t('主营类别')">{{ $l(customer,'productTypeName') }}</el-descriptions-item>
+              <el-descriptions-item :label="$t('年度发货量')">{{ customer.weightYearly }}</el-descriptions-item>
+              <el-descriptions-item :label="$t('主要竞争对手')">{{ customer.competitorId }}</el-descriptions-item>
+              <el-descriptions-item :label="$t('年度发货次数')">{{ customer.numYearly }}</el-descriptions-item>
             </el-descriptions>
           </el-tab-pane>
           <el-tab-pane name="financial" label="财务资料">
@@ -401,6 +400,15 @@
               <el-descriptions-item :label="$t('到仓确认')">{{ customer.arrivalConfirm }}</el-descriptions-item>
               <el-descriptions-item :label="$t('重货标准')">{{ customer.weightUnit }}</el-descriptions-item>
               <el-descriptions-item :label="$t('泡货标准')">{{ customer.lightUnit }}</el-descriptions-item>
+              <el-descriptions-item :label="$t('控制无收货人')">
+                <el-switch v-model="customer.noConsignee" disabled />
+              </el-descriptions-item>
+              <el-descriptions-item :label="$t('默认付款')">
+                <el-switch v-model="customer.defaultPay" disabled />
+              </el-descriptions-item>
+              <el-descriptions-item :label="$t('默认开票')">
+                <el-switch v-model="customer.defaultBilling" disabled />
+              </el-descriptions-item>
             </el-descriptions>
           </el-tab-pane>