Merge remote-tracking branch 'origin/pre-release' into pre-release

src/api/ecw/customer.js

@@ -530,7 +530,7 @@ export function changeCustomerDefaultBilling(data){
 
 export function customerSettingButton(data){
   return request({
-    url:'ecw/customer/change-customer-arrival-confirm',
+    url:'ecw/customer/update-customer-setup',
     method:'put',
     data
   })

src/i18n/languages/en_US.json

@@ -4707,6 +4707,5 @@
   "下次跟进时间": "Next follow-up time",
   "提交结果": "Submit result",
   "增加计划": "add plan",
-  "是否确认导出客户跟进记录数据项?": "Are you sure to export all customer follow-up record data items?",
-  "请选择需要核销的收款明细": "Please select the collection details that need to be written off"
+  "是否确认导出客户跟进记录数据项?": "Are you sure to export all customer follow-up record data items?"
 }

src/views/ecw/customer/components/customerFollowSelectOffer.vue

@@ -37,6 +37,9 @@
         </template>
       </el-table-column>
       <el-table-column :label="$t('客户编号')" align="center" min-width="100">
+        <template slot-scope="{row}">
+          <el-link type="primary" @click.native="$router.push('/customer/query/' + row.relationId)">{{row.customerNumber}}</el-link>
+        </template>
       </el-table-column>
       <el-table-column :label="$t('客户名称')" align="center" prop="relationName" min-width="100" />
       <el-table-column :label="$t('联系方式')">
@@ -49,9 +52,9 @@
           <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="scope.row.transportId" />
         </template>
       </el-table-column>
-      <el-table-column :label="$t('渠道')" align="center" min-width="120">
+      <el-table-column :label="$t('渠道')" align="center" min-width="120" prop="channelName">
       </el-table-column>
-      <el-table-column :label="$t('始发地')" align="center" min-width="120">
+      <el-table-column :label="$t('始发地')" align="center" min-width="120" prop="departureName">
       </el-table-column>
       <el-table-column :label="$t('目的地')" align="center" prop="objectiveName" min-width="120" />
       <el-table-column :label="$t('预计销售额')" min-width="160">
@@ -89,7 +92,7 @@ export default {
     UserSelector
   },
   props: {
-    customerId: Number,
+    customerId: Number
   },
   data() {
     return {

src/views/ecw/customer/components/customerSetting.vue

@@ -106,6 +106,7 @@ export default {
     return {
       dialogVisible: false,
       form: {
+        id: 0,
         isShowTidanPrice: false,
         arrivalConfirm: 0,
         weightUnit: null,
@@ -123,7 +124,7 @@ export default {
       zhongLines: [],
       warehouseList: [], // 仓库列表
       importCityList: [], // 进口地址
-      zhongLines: [],
+      paoLines: [],
       paoLines: [],
     }
   },
@@ -136,22 +137,16 @@ export default {
     });
   },
   methods: {
-    getZhongPao() {
-      getZhongPaoBest({
-        customerId: this.customerId,
-        // departureId: this.departureId,
-        // objectiveId: this.objectiveId
-      }).then((r) => {
-        if (!this.form.weightUnit) this.form.weightUnit = r.data.zhongEdge;
-        if (!this.form.lightUnit) this.form.lightUnit = r.data.paoEdge;
-      });
-    },
     init(id) {
       this.customerId = id
+      this.showZhong = false
+      this.showPao = false
+      this.showZhong1 = false
+      this.showPao1 = false
       getCustomer(this.customerId).then((response) => {
         const row = response.data
         this.form = {
-          customerId: row.id,
+          id: row.id,
           isShowTidanPrice: row.isShowTidanPrice,
           arrivalConfirm: row.arrivalConfirm,
           weightUnit: row.weightUnit,
@@ -177,6 +172,16 @@ export default {
         this.getZhongPao()
       })
     },
+    getZhongPao() {
+      getZhongPaoBest({
+        customerId: this.customerId,
+        // departureId: this.departureId,
+        // objectiveId: this.objectiveId
+      }).then((r) => {
+        if (!this.form.weightUnit) this.form.weightUnit = r.data.zhongEdge;
+        if (!this.form.lightUnit) this.form.lightUnit = r.data.paoEdge;
+      });
+    },
     handleClose() {
       this.resetForm("form")
       this.dialogVisible = false

src/views/ecw/customer/index.vue

@@ -69,15 +69,6 @@
           @input="queryParams.defaultContactPhone=queryParams.defaultContactPhone.replace(/\s+/g, '')"
         ></el-input>
       </el-form-item>
-      <el-form-item :label="$t('客户类别')" prop="level">
-        <dict-selector
-          multiple
-          clearable
-          :type="DICT_TYPE.CUSTOMER_TYPE"
-          v-model="queryParams.type"
-          @change="handleQuery"
-        ></dict-selector>
-      </el-form-item>
       <el-form-item :label="$t('部门')" v-if="path != '/customer/department-customers'">
         <el-select v-model="queryParams.deptIds" :placeholder="$t('请选择部门')">
           <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id"/>
@@ -117,7 +108,44 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item :label="$t('国籍')" prop="source">
+      <el-form-item :label="$t('客户类别')" prop="level">
+        <dict-selector
+          multiple
+          clearable
+          :type="DICT_TYPE.CUSTOMER_TYPE"
+          v-model="queryParams.type"
+          @change="handleQuery"
+        ></dict-selector>
+      </el-form-item>
+      <el-form-item :label="$t('角色')">
+        <dict-selector
+          multiple
+          clearable
+          :type="DICT_TYPE.CUSTOMER_ROLE"
+          v-model="queryParams.role"
+          formatter="number"
+          @change="handleQuery"
+          :placeholder="$t('请选择')"
+        ></dict-selector>
+      </el-form-item>
+      <el-form-item :label="$t('客户状态')" prop="status">
+        <el-select
+         multiple
+          clearable
+          v-model="queryParams.status"
+          :placeholder="$t('请选择客户状态')"
+          size="small"
+          @change="handleQuery"
+        >
+          <el-option
+            v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_STATUS)"
+            :key="dict.value"
+            :label="isChinese ? dict.label : dict.labelEn"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item :label="$t('国籍')" prop="country">
         <el-select
           multiple
           clearable
@@ -133,23 +161,43 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item :label="$t('客户状态')" prop="status">
+      <el-form-item :label="$t('出货渠道')">
+        <dict-selector
+          multiple
+          clearable
+          :type="DICT_TYPE.ECW_CUSTOMER_TRANSPORT_TYPE"
+          v-model="queryParams.transportType"
+          formatter="number"
+          @change="handleQuery"
+        ></dict-selector>
+      </el-form-item>
+
+      <el-form-item :label="$t('业务国家')" v-show="showSearch">
         <el-select
           multiple
           clearable
-          v-model="queryParams.status"
-          :placeholder="$t('请选择客户状态')"
-          size="small"
+          v-model="queryParams.busiCountryIds"
+          :placeholder="$t('请选择')"
           @change="handleQuery"
         >
           <el-option
-            v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_STATUS)"
-            :key="dict.value"
-            :label="isChinese ? dict.label : dict.labelEn"
-            :value="dict.value"
+            v-for="dict in countryList"
+            :key="dict.id"
+            :label="isChinese ? dict.nameZh : dict.nameEn"
+            :value="parseInt(dict.id)"
           />
         </el-select>
       </el-form-item>
+      <el-form-item :label="$t('常用提货网点')" v-show="showSearch">
+        <el-select multiple v-model="queryParams.pickupPoints">
+          <el-option
+            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-form-item :label="$t('创建人')" v-show="showSearch">
         <el-select v-model="queryParams.founder">
           <el-option
@@ -225,54 +273,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      -->
-      <el-form-item :label="$t('角色')">
-        <dict-selector
-          multiple
-          clearable
-          :type="DICT_TYPE.CUSTOMER_ROLE"
-          v-model="queryParams.role"
-          formatter="number"
-          @change="handleQuery"
-          :placeholder="$t('请选择')"
-        ></dict-selector>
-      </el-form-item>
-      <el-form-item :label="$t('出货渠道')">
-        <dict-selector
-          multiple
-          clearable
-          :type="DICT_TYPE.ECW_CUSTOMER_TRANSPORT_TYPE"
-          v-model="queryParams.transportType"
-          formatter="number"
-          @change="handleQuery"
-        ></dict-selector>
-      </el-form-item>
-      <el-form-item :label="$t('业务国家')" v-show="showSearch">
-        <el-select
-          multiple
-          clearable
-          v-model="queryParams.busiCountryIds"
-          :placeholder="$t('请选择')"
-          @change="handleQuery"
-        >
-          <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-form-item :label="$t('常用提货网点')" v-show="showSearch">
-        <el-select multiple v-model="queryParams.pickupPoints">
-          <el-option
-            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-form-item :label="$t('入公海时间')" v-show="showSearch">
         <el-date-picker
           type="datetimerange"
@@ -314,7 +315,7 @@
           @change="handleSelectProductType"
           multiple
           v-model="queryParams.productTypes"
-          :placeholder="$t('请选择产品类别')"
+          :placeholder="$t('请选择')"
         >
           <el-option
             :label="item.titleZh"
@@ -591,42 +592,6 @@
           >{{ $t("合并客户") }}</el-button
         >
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          :disabled="!selectCustomerList.length"
-          @click="setDefaultPay"
-          v-hasPermi="['ecw:customer:change-customer-default-pay']"
-          >{{ $t("设置默认付款") }}</el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          :disabled="!selectCustomerList.length"
-          @click="setNoConsignee"
-          v-hasPermi="['ecw:customer:change-customer-no-consignee']"
-          >{{ $t("设置默认控货无收货人") }}</el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          :disabled="!selectCustomerList.length"
-          @click="setDefaultBilling"
-          v-hasPermi="['ecw:customer:change-customer-default-billing']"
-          >{{ $t("设置默认开票") }}</el-button
-        >
-      </el-col>
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
@@ -664,14 +629,7 @@
       </el-table-column>
       <el-table-column :label="$t('信用等级')" :prop="isChinese ? 'creditLevelNameZh' : 'creditLevelNameEn'"></el-table-column>
       -->
-      <el-table-column :label="$t('客户状态')" align="center" prop="status">
-        <template slot-scope="scope">
-          <dict-tag
-            :type="DICT_TYPE.CUSTOMER_STATUS"
-            :value="scope.row.status"
-          />
-        </template>
-      </el-table-column>
+      
       <el-table-column
         :label="$t('主联系人')"
         prop="defaultContactName"
@@ -889,7 +847,7 @@
             >{{ $t("报价") }}</el-button
           >
           <el-button
-            v-has-permi="[selectAuthorityFn('ecw:customer:treat-quoted-price')]"
+            v-has-permi="['ecw:customer:setting']"
             size="mini"
             type="text"
             icon="el-icon-user"
@@ -1401,7 +1359,7 @@
     <customer-setting
       ref="customerSetting"
       @refresh="getList"
-    />
+    ></customer-setting>
     <!--业绩类型   -->
     <el-dialog title="业绩类型" :visible.sync="dialogVisible" width="30%">
       <div>
@@ -2119,6 +2077,12 @@ export default {
         this.getList()
       })
     },
+    handleSetting(row) {
+      this.$refs['customerSetting'].dialogVisible = true
+      this.$nextTick(_ => {
+        this.$refs['customerSetting'].init(row.id)
+      })
+    },
     getBusiCountryNames(ids) {
       if (ids) {
         const idsArr = ids.split(',')
@@ -2133,12 +2097,6 @@ export default {
         return null
       }
     },
-    handleSetting(row) {
-      this.$refs['customerSetting'].dialogVisible = true
-      this.$nextTick(_ => {
-        this.$refs['customerSetting'].init(row.id)
-      })
-    },
     getBusiCountryNames(ids) {
       if (ids) {
         const idsArr = ids.split(',')

src/views/ecw/customer/query.vue

@@ -50,13 +50,72 @@
             <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="$t('最后更新人')">{{ customer.updater }}</el-descriptions-item>
+            <el-descriptions-item :label="$t('最后更新人')">{{ customer.updaterName }}</el-descriptions-item>
             <el-descriptions-item :label="$t('最后更新时间')">{{ customer.updateTime }}</el-descriptions-item>
             </template>
           </el-descriptions>
         </el-card>
 
         <el-tabs v-model="activeName" style="margin-top: 15px" type="border-card">
+          <el-tab-pane name="contact" :label="$t('联系人')">
+            <el-table
+              :data="customerContacts"
+              style="width: 100%"
+              border
+            >
+              <el-table-column
+                prop="department"
+                :label="$t('部门')"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="position"
+                :label="$t('职位')"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="name"
+                :label="$t('联系人')"
+              >
+
+              </el-table-column>
+              <el-table-column
+                prop="nameEn"
+                :label="$t('联系人英文名称')"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="phoneNew"
+                :label="$t('联系方式')"
+              >
+                <template v-slot="{row}">
+                +{{ row.areaCode}}  {{row.phoneNew}}
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="userid"
+                :label="$t('关联账号')"
+                :formatter="userIdFormatter"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="social"
+                :label="$t('社交软件')"
+                :formatter="(row, column, cellValue) => getDictDataLabel(DICT_TYPE.SOCIAL, cellValue)"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="socialNumber"
+                :label="$t('社交软件号码')"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="email"
+                :label="$t('邮箱')"
+              >
+              </el-table-column>
+            </el-table>
+          </el-tab-pane>
           <el-tab-pane name="order" :label="$t('订单')">
             <el-card class="box-card">
               <div slot="header" class="clearfix">
@@ -633,9 +692,7 @@
               <el-descriptions-item :label="$t('付款人姓名')">{{ customer.payerName  }}</el-descriptions-item>
             </el-descriptions>
             <el-card class="box-card">
-              <div slot="header">
-                开票信息
-              </div>
+              <div slot="header">{{$t('开票信息')}}</div>
               <el-descriptions :column="2">
                 <el-descriptions-item :label="$t('发票抬头')">{{ customer.invoiceTitle }}</el-descriptions-item>
                 <el-descriptions-item :label="$t('纳税人识别号')">{{ customer.licenseNumber }}</el-descriptions-item>
@@ -647,6 +704,32 @@
                 <el-descriptions-item :label="$t('税率')">{{ customer.taxRate  }}</el-descriptions-item>
               </el-descriptions>
             </el-card>
+            <el-card style="margin-top: 15px;">
+              <div slot="header">{{$t('银行账户')}}</div>
+              <el-table :data="customer.customerBankBackVOList" border>
+                <el-table-column :label="$t('编号')" type="index"></el-table-column>
+                <el-table-column :label="$t('账户名称')" prop="accountName"></el-table-column>
+                <el-table-column :label="$t('币别')">
+                  <template v-slot="{row}">
+                   {{$l(currecyList.find(i => row.currency == i.id),'title')}}
+                  </template>
+                </el-table-column>
+                <el-table-column :label="$t('银行名称')" prop="bankName"></el-table-column>
+                <el-table-column :label="$t('银行账户')" prop="bankAccount"></el-table-column>
+                <el-table-column :label="$t('银行代码')" prop="bankCode"></el-table-column>
+                <el-table-column :label="$t('账户类型')">
+                  <template v-slot="{row}">
+                    {{Number(row.accountType) === 1 ? $t('公账') : $t('私账')}}
+                  </template>
+                </el-table-column>
+                <el-table-column :label="$t('状态')">
+                <template v-slot="{row}">
+                  {{row.status ? $t('正常') : $t('停用')}}
+                </template>
+                </el-table-column>
+                <el-table-column :label="$t('银行地址')" prop="bankAddress"></el-table-column>
+              </el-table>
+            </el-card>
           </el-tab-pane>
 
           <el-tab-pane name="special" :label="$t('特殊设置')">
@@ -724,93 +807,7 @@
           </el-tab-pane>
         </el-tabs>
 
-        <el-card style="margin-top: 15px;">
-          <h3>{{$t('银行账户')}}</h3>
-          <el-table :data="customer.customerBankBackVOList" border>
-            <el-table-column :label="$t('编号')" type="index"></el-table-column>
-            <el-table-column :label="$t('账户名称')" prop="accountName"></el-table-column>
-            <el-table-column :label="$t('币别')">
-              <template v-slot="{row}">
-               {{$l(currecyList.find(i => row.currency == i.id),'title')}}
-              </template>
-            </el-table-column>
-            <el-table-column :label="$t('银行名称')" prop="bankName"></el-table-column>
-            <el-table-column :label="$t('银行账户')" prop="bankAccount"></el-table-column>
-            <el-table-column :label="$t('银行代码')" prop="bankCode"></el-table-column>
-            <el-table-column :label="$t('账户类型')">
-              <template v-slot="{row}">
-                {{Number(row.accountType) === 1 ? $t('公账') : $t('私账')}}
-              </template>
-            </el-table-column>
-            <el-table-column :label="$t('状态')">
-            <template v-slot="{row}">
-              {{row.status ? $t('正常') : $t('停用')}}
-            </template>
-            </el-table-column>
-            <el-table-column :label="$t('银行地址')" prop="bankAddress"></el-table-column>
-          </el-table>
-        </el-card>
-        <el-card style="margin-top: 15px">
-          <h3>{{$t('联系人')}}</h3>
-          <el-table
-            :data="customerContacts"
-            style="width: 100%"
-            border
-          >
-            <el-table-column
-              prop="department"
-              :label="$t('部门')"
-            >
-            </el-table-column>
-            <el-table-column
-              prop="position"
-              :label="$t('职位')"
-            >
-            </el-table-column>
-            <el-table-column
-              prop="name"
-              :label="$t('联系人')"
-            >
-
-            </el-table-column>
-            <el-table-column
-              prop="nameEn"
-              :label="$t('联系人英文名称')"
-            >
-            </el-table-column>
-            <el-table-column
-              prop="phoneNew"
-              :label="$t('联系方式')"
-            >
-              <template v-slot="{row}">
-               +{{ row.areaCode}}  {{row.phoneNew}}
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="userid"
-              :label="$t('关联账号')"
-              :formatter="userIdFormatter"
-            >
-            </el-table-column>
-            <el-table-column
-              prop="social"
-              :label="$t('社交软件')"
-              :formatter="(row, column, cellValue) => getDictDataLabel(DICT_TYPE.SOCIAL, cellValue)"
-            >
-            </el-table-column>
-            <el-table-column
-              prop="socialNumber"
-              :label="$t('社交软件号码')"
-            >
-            </el-table-column>
-            <el-table-column
-              prop="email"
-              :label="$t('邮箱')"
-            >
-            </el-table-column>
-          </el-table>
-        </el-card>
-
+        
       </el-col>
     </el-row>
     <el-dialog

src/views/ecw/order/exception/index.vue

@@ -8,6 +8,22 @@
       :inline="true"
       label-width="100px"
     >
+      <el-form-item :label="$t('订单号') + ':'">
+        <el-input
+          v-model="queryParams.orderNo"
+          :placeholder="$t('请输入订单号')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        >
+          <template slot="prepend">
+            <dict-selector
+              :type="DICT_TYPE.EXCEPTION_SELECT_FILED"
+              v-model="queryParams.orderNoKey"
+              class="w-50"
+            />
+          </template>
+        </el-input>
+      </el-form-item>
       <el-form-item>
         <el-select
           v-model="queryParams.dateType"
@@ -170,23 +186,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('订单号') + ':'">
-        <el-input
-          v-model="queryParams.orderNo"
-          :placeholder="$t('请输入订单号')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        >
-          <template slot="prepend">
-            <dict-selector
-              :type="DICT_TYPE.EXCEPTION_SELECT_FILED"
-              v-model="queryParams.orderNoKey"
-              class="w-50"
-            />
-          </template>
-        </el-input>
-      </el-form-item>
-
       <!-- <el-form-item :label="$t('发货人')+':'">
           <customer-selector v-model="queryParams.consignor" :clearable="true" @change="consignor = $event" />
       </el-form-item>