修改用户信息

src/i18n/languages/en_US.json

@@ -4529,5 +4529,13 @@
     "默认开票": "Default Billing",
     "请选择获取方式": "Please select customer get method",
     "请选择创建入口": "Please select customer create from",
-    "请选择业务国家": "Please select customer operating country"
+    "请选择业务国家": "Please select customer operating country",
+    "装柜/出仓时间": "Loading/Exit Time",
+    "卸柜/到仓时间": "Unloading/Arrival Time",
+    "提货率": "Delivery rate",
+    "业绩归属客户方": "Performance belonging customers",
+    "报价有效期": "Quotation validity period",
+    "发货评估": "Delivery evaluation",
+    "财务资料": "Finance Information",
+    "特殊设置": "Special setting"
 }

src/i18n/languages/zh_CN.json

@@ -314,5 +314,12 @@
     "默认开票": "默认开票",
 		"请选择获取方式": "请选择获取方式",
     "请选择创建入口": "请选择创建入口",
-		"请选择业务国家": "请选择业务国家"
+		"请选择业务国家": "请选择业务国家",
+		"装柜/出仓时间": "装柜/出仓时间",
+    "卸柜/到仓时间": "卸柜/到仓时间",
+    "提货率": "提货率",
+    "业绩归属客户方": "业绩归属客户方",
+		"发货评估": "发货评估",
+    "财务资料": "财务资料",
+    "特殊设置": "特殊设置"
 	}

src/views/ecw/customer/edit.vue

@@ -233,6 +233,7 @@
                 <el-select
                   v-model="form.getMethod"
                   :placeholder="$t('请选择')"
+                  disabled
                 >
                   <el-option
                     v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_GET_METHOD)"
@@ -248,6 +249,7 @@
                 <el-select
                   v-model="form.createFrom"
                   :placeholder="$t('请选择')"
+                  disabled
                 >
                   <el-option
                     v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_FROM)"
@@ -361,14 +363,14 @@
                   :type="DICT_TYPE.CUSTOMER_ROLE"
                   form-type="checkbox"
                   multiple
-                  v-model="form.role"
+                  v-model="form.roles"
                 ></dict-selector>
               </el-form-item>
             </el-col>
   
             <el-col
               :span="13"
-              v-show="form.role && form.role.indexOf('2') !== -1"
+              v-show="form.roles && form.roles.indexOf('2') !== -1"
             >
               <el-form-item :label="$t('所属代理')" prop="agentId">
                 <el-select
@@ -405,9 +407,8 @@
             </el-col>
             <el-col :span="12">
               <el-form-item :label="$t('常用提货网点')" prop="pickupPoints">
-                <el-select v-model="form.pickupPoints">
+                <el-select multiple v-model="form.pickupPoints">
                   <el-option
-                    multiple
                     v-for="item in getNodeLists"
                     :key="item.id"
                     :value="item.id"
@@ -1289,20 +1290,6 @@ export default {
             trigger: "blur",
           },
         ],
-        getMethod: [
-          {
-            required: true,
-            message: this.$t("请选择获取方式"),
-            trigger: "change",
-          },
-        ],
-        createFrom: [
-          {
-            required: true,
-            message: this.$t("请选择创建入口"),
-            trigger: "change",
-          },
-        ],
         busiCountryIds: [
           {
             required: true,
@@ -1369,7 +1356,7 @@ export default {
       row.splice(index, 1);
     },
     change(val) {
-      this.form.productId = "";
+      this.form.productIds = [];
       this.getProductListFn(val);
     },
     getProductListFn(val) {
@@ -1540,9 +1527,10 @@ export default {
               type: this.form.type?.join(","),
               transportType: (this.form.transportType || [])?.join(","),
               taxRate: Number(this.form.taxRate),
-              pickupPoints: this.form.pickupPoints?.join(","),
-              productIds: this.form.productIds?.join(","),
-              busiCountryIds: this.form.busiCountryIds?.join(","),
+              roles: (this.form.roles || [])?.join(","),
+              pickupPoints: (this.form.pickupPoints || [])?.join(","),
+              productIds: (this.form.productIds || [])?.join(","),
+              busiCountryIds: (this.form.busiCountryIds || [])?.join(","),
             };
             form.customerContacts = JSON.parse(
               JSON.stringify(this.form.customerContacts)
@@ -1622,8 +1610,8 @@ export default {
         productType: undefined,
         // productId: undefined,
         // pickupPoint: undefined,
-        pickupPoints: undefined,
-        productIds: undefined,
+        pickupPoints: [],
+        productIds: [],
         memberId: undefined,
         birthday: undefined,
         balance: undefined,
@@ -1662,8 +1650,8 @@ export default {
         customerServiceConfirmedTime: undefined,//归属时间
         updater: this.$store.getters.userId,// 更新人
         updateTime: undefined,// 更新时间
-        role: undefined,// 客户角色
-        busiCountryIds: undefined,// 业务国家
+        roles: undefined,// 客户角色
+        busiCountryIds: [],// 业务国家
         competitorId: undefined,// 主要竞争对手
         weightYearly: undefined,// 年度发货量
         numYearly: undefined,// 年度发货次数
@@ -1687,17 +1675,33 @@ export default {
               ? response.data.transportType.split(",")
               : [],
           customerBanks: response.data.customerBankBackVOList,
+          roles: response.data.roles? response.data.roles.split(",") : [],
+          pickupPoints: this.stringArrToNumberArr(response.data.pickupPoints),
+          productIds: this.stringArrToNumberArr(response.data.productIds),
+          busiCountryIds: this.stringArrToNumberArr(response.data.busiCountryIds)
         };
         if (this.form.productType) {
           console.log("1231", this.form.productType);
           this.getProductListFn(this.form.productType);
         }
 
+        console.log(this.form)
+
         this.open = true;
         this.title = this.$t("修改客户");
+        this.$forceUpdate()
         this.getZhongPao();
       });
     },
+    stringArrToNumberArr(data) {
+      if (data) {
+        const strArr = data.split(",")
+        const numArr = strArr.map(item => Number(item))
+        return numArr
+      } else {
+        return []
+      }
+    },
     updateCustomerLines() {
       let zhongLines = [],
         paoLines = [];

src/views/ecw/customer/query.vue

@@ -104,6 +104,7 @@
                     </router-link>
                   </template>
                 </el-table-column>
+                <el-table-column :label="$t('报价单号')" align="center" prop="offerNumbers" />
                 <el-table-column :label="$t('唛头')" align="center" prop="marks" />
                 <el-table-column :label="$t('总箱数/入仓箱数')" align="center" prop="sumNum">
                   <template slot-scope="{row}">
@@ -150,11 +151,21 @@
 <!--                    <dict-tag :type="DICT_TYPE.ORDER_STATUS" :value="scope.row.status" />-->
 <!--                  </template>-->
                 </el-table-column>
+                <el-table-column :label="$t('创建时间')" align="center" prop="createTime" />
                 <el-table-column :label="$t('入仓时间')">
                   <template v-slot="{row}">
                     {{parseTime(row.rucangTime)}}
                   </template>
                 </el-table-column>
+                <el-table-column :label="$t('装柜/出仓时间')" align="center" prop="loadTime" />
+                <el-table-column :label="$t('卸柜/到仓时间')" align="center" prop="unloadTime" />
+                <el-table-column :label="$t('提货率')" align="center">
+                  <template v-slot="{row}">
+                    {{row.pickNum | deliveryRate(row.sumNum)}}
+                  </template>
+                </el-table-column>
+                <el-table-column :label="$t('客户经理')" align="center" prop="customerName" />
+                <el-table-column :label="$t('业绩归属客户方')" align="center" prop="customerName" />
                 </el-table>
               <pagination @pagination="getorderList" :page.sync="queryParams.page" :limit.sync="queryParams.rows"  :total="orderTotal" ></pagination>
             </el-card>
@@ -179,6 +190,7 @@
                 :label="$t('订单号')"
               >
               </el-table-column>
+              <!--
               <el-table-column
                 prop="consignorName"
                 :label="$t('客户名称')"
@@ -187,6 +199,19 @@
                   {{customer.name}}
                 </template>
               </el-table-column>
+              -->
+              <el-table-column
+                prop="relationName"
+                :label="$t('联系人')"
+              >
+              </el-table-column>
+              <el-table-column
+                :label="$t('联系方式')"
+              >
+                <template v-slot="{row}">
+                  +{{ row.relationAreaCode }}{{ row.relationPhone }}
+                </template>
+              </el-table-column>
               <el-table-column
                 prop="objectiveName"
                 :label="$t('目的地')"
@@ -209,6 +234,29 @@
                 :label="$t('负责人')"
               >
               </el-table-column>
+              <el-table-column
+                prop="importance"
+                :label="$t('重要程度')"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="importance"
+                :label="$t('报价有效期')"
+              >
+                <template v-slot="{row}">
+                  {{ row.startTime }} - {{ row.endTime }}
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="businessManagerName"
+                :label="$t('客户经理')"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="createTime"
+                :label="$t('创建时间')"
+              >
+              </el-table-column>
             </el-table>
             <pagination @pagination="getInfoListOfferPage" :page.sync="infoListOfferFrom.pageNo" :limit.sync="infoListOfferFrom.pageSize"  :total="infoListOfferTotal" ></pagination>
           </el-tab-pane>
@@ -249,13 +297,13 @@
             <pagination v-show="infoListReceiptList.length" :total="infoListReceiptTotal" :page.sync="infoListReceiptFrom.pageNo" :limit.sync="infoListReceiptFrom.pageSize"
                         @pagination="infoListReceiptFn"/>
           </el-tab-pane>
-          <el-tab-pane name="deliver" label="发货评估">
+          <el-tab-pane name="deliver" :label="$t('发货评估')">
             <el-descriptions :column="2">
               <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(', ')}}
+                {{ getDictDatas2(DICT_TYPE.CUSTOMER_ROLE, (customer.roles||'').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(', ') }}
@@ -263,7 +311,7 @@
               </el-descriptions-item>
               <el-descriptions-item :label="$t('常提货网点')">{{ $l(customer,'pickupPointName') }}</el-descriptions-item>
               <el-descriptions-item :label="$t('业务国家')">
-                {{$l(customer,'countryName')}}
+                {{ isChinese ? customer.busiCountryNameZh : customer.busiCountryNameEn}}
               </el-descriptions-item>
               <el-descriptions-item :label="$t('主营类别')">{{ $l(customer,'productTypeName') }}</el-descriptions-item>
               <el-descriptions-item :label="$t('年度发货量')">{{ customer.weightYearly }}</el-descriptions-item>
@@ -271,7 +319,7 @@
               <el-descriptions-item :label="$t('年度发货次数')">{{ customer.numYearly }}</el-descriptions-item>
             </el-descriptions>
           </el-tab-pane>
-          <el-tab-pane name="financial" label="财务资料">
+          <el-tab-pane name="financial" :label="$t('财务资料')">
             <el-descriptions :column="2">
               <el-descriptions-item :label="$t('公司名称')">{{ customer.company }}</el-descriptions-item>
               <el-descriptions-item :label="$t('公司英文名称')">{{ customer.companyEn }}</el-descriptions-item>
@@ -298,7 +346,7 @@
             
           </el-tab-pane>
           
-          <el-tab-pane name="special" label="特殊设置">
+          <el-tab-pane name="special" :label="$t('特殊设置')">
             <el-descriptions :column="2">
               <el-descriptions-item :label="$t('是否显示提单价格')">
                 <el-switch v-model="customer.isShowTidanPrice" disabled></el-switch>
@@ -792,6 +840,16 @@ export default {
       }
     }
   },
+  filters: {
+    deliveryRate(pickNum, sumNum) {
+      if (pickNum == 0) {
+        return 0
+      } else if (pickNum && sumNum) {
+        return Math.round(pickNum / sumNum * 10000) / 100 + "%"
+      }
+      return null
+    }
+  },
   methods:{
     customerFollowFn(val){
       this.activeName = val