客户信息字段确认

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/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>