Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator

src/views/ecw/box/ladingBill/index.vue

@@ -65,6 +65,7 @@
             <template v-if="scope.row.status === 3">
               {{$t('审核拒绝')}}
               <el-button type="text" size="small" @click="handleCommand('queryBill',scope.row)">{{$t('重新制作')}}</el-button>
+              <el-button type="text" size="small" @click="handleCommand('resetBill',scope.row)" style="color:#333333">{{$t('重置')}}</el-button>
             </template>
           </template>
         </el-table-column>

src/views/ecw/customer/edit.vue

@@ -446,7 +446,7 @@ export default {
     CustomerLineTable,
     MemberSelector
   },
-  created() {
+   created() {
     this.isCustomerServiceConfirmed =  this.$route.query.isCustomerServiceConfirmed ? true : false
     this.getCustomerSelect()
     this.reset()
@@ -479,7 +479,6 @@ export default {
 
         // 获取重泡货路线
         getCustomerLines(this.customerId).then(res => {
-          console.log({getCustomerLines: res})
           this.zhongLines = res.data.filter(item => item.zhongPaoType == 1)
           this.paoLines = res.data.filter(item => item.zhongPaoType == 2)
           if(this.zhongLines.length)this.showZhong1 = true
@@ -489,6 +488,7 @@ export default {
         })
       })
     } else {
+      this.getZhongPao()
       // 新建客户
       this.handleAddContact()
       if(this.isCustomerServiceConfirmed){
@@ -517,7 +517,6 @@ export default {
     getCountryListAll().then(r => {
       this.countryList = r.data
     })
-    this.getZhongPao()
   },
   data(){
     return {
@@ -761,6 +760,7 @@ export default {
         this.form = { ...this.form, ...response.data, id: this.customerId };
         this.open = true;
         this.title = this.$t('修改客户');
+        this.getZhongPao()
       });
     },
     updateCustomerLines() {
@@ -805,8 +805,8 @@ export default {
         // departureId: this.departureId,
         // objectiveId: this.objectiveId
       }).then(r => {
-        this.form.weightUnit = r.data.zhongEdge
-        this.form.lightUnit = r.data.paoEdge
+        if(!this.form.weightUnit) this.form.weightUnit = r.data.zhongEdge
+        if(!this.form.lightUnit) this.form.lightUnit = r.data.paoEdge
       })
     }
   },

src/views/ecw/customer/index.vue

@@ -83,7 +83,13 @@
         type="selection"
         width="55">
       </el-table-column>
-      <el-table-column :label="$t('客户编号')" align="center" prop="number" />
+      <el-table-column :label="$t('客户编号')" align="center" prop="number" >
+        <template v-slot="{row}">
+          <router-link :to="'/customer/query/' + row.id">
+            {{row.number}}
+          </router-link>
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('客户名称')" align="center" prop="name">
         <template slot-scope="{row}">
           {{row.name}} <el-tag v-if="row.isInOpenSea" size="mini">公</el-tag>
@@ -514,6 +520,7 @@ import {listServiceUser} from "@/api/system/user";
 import { getCountryListAll } from '@/api/ecw/country'
 import {getCreditPage} from "@/api/customer/credit";
 import transferCustomer from "@/views/ecw/customer/transferCustomer";
+import Template from "@/views/cms/template/index.vue";
 
 export default {
   name: "Customer",
@@ -525,6 +532,7 @@ export default {
     }
   },
   components: {
+    Template,
     upload,
     CustomerFollowList,
     customerComplaints,

src/views/ecw/customer/query.vue

@@ -9,7 +9,7 @@
             <el-button @click="$router.push('/offer/create')" type="primary" size="small">{{$t('报价')}}</el-button>
             <el-button type="primary" size="small" @click="$refs['customerFollow'].customerFollow.dialogVisible = true">{{$t('跟进')}}</el-button>
             <el-button type="primary" size="small" @click="$refs['customerComplaint'].handleAdd()">{{$t('客诉')}}</el-button>
-            <el-button type="danger" size="small">{{$t('删除')}}</el-button>
+            <el-button  v-hasPermi="['ecw:customer:delete']" type="danger" size="small" @click="deleteCustomerFn()">{{$t('删除')}}</el-button>
           </div>
         </div>
         <el-card style="margin-top: 15px;">
@@ -19,7 +19,7 @@
             <el-descriptions-item :label="$t('结算方式')">{{ getDictDataLabel(DICT_TYPE.CUSTOMER_BALANCE, customer.balance) }}</el-descriptions-item>
             <el-descriptions-item :label="$t('客户生日')">{{ parseTime(customer.birthday, '{y}-{m}-{d}') }}</el-descriptions-item>
             <el-descriptions-item :label="$t('出货渠道')">
-              <dict-tag v-if="customer.transportType" v-for="item in customer.transportType.split(',')" :type="DICT_TYPE.ECW_CUSTOMER_TRANSPORT_TYPE" :value="item"></dict-tag>
+              <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('资源类型')">
               <dict-tag :type="DICT_TYPE.ECW_CUSTOMER_RESOURCE_TYPE" :value="customer.resourceType"></dict-tag>
@@ -414,7 +414,8 @@ import {
   orderStatistics,
   creditLogCreate,
   creditScoreStatistic,
-  infoListReceiptPage, userMemberUserList, memberUserList
+  infoListReceiptPage, userMemberUserList, memberUserList, deleteCustomer,
+
 } from '@/api/ecw/customer'
 import { DICT_TYPE, getDictDataLabel, getDictDatas2 } from '@/utils/dict'
 import { getProductTypeList } from '@/api/ecw/productType'
@@ -710,8 +711,21 @@ export default {
           this.infoListReceiptTotal = r.data.total;
         }
       })
+    },
+    deleteCustomerFn(){
+      this.$confirm(`${this.$t('是否要删除当前客户')}《${this.customer.name}》?`, `${this.$t('提示')}`, {
+        confirmButtonText: this.$t('确定'),
+        cancelButtonText: this.$t('取消'),
+        type: 'warning'
+      }).then(() => {
+        deleteCustomer(this.customerId).then(r => {
+          this.$modal.msgSuccess(this.$t('删除成功'));
+          this.$router.back()
+        })
+      })
     }
-  }
+  },
+
 }
 </script>
 

src/views/ecw/customerConfirm/index.vue

@@ -75,7 +75,13 @@
 
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
-      <el-table-column :label="$t('客户编号')" align="center" prop="number" />
+      <el-table-column :label="$t('客户编号')" align="center" prop="number" >
+        <template v-slot="{row}">
+          <router-link :to="'/customer/query/' + row.id">
+            {{row.number}}
+          </router-link>
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('客户名称')" align="center" prop="name" />
       <el-table-column :label="$t('客户等级')" align="center" prop="vipLevelNameZh">
         <template slot-scope="scope">
@@ -97,6 +103,11 @@
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
+      <el-table-column :label="$t('预计入公海时间')" align="center" prop="createTime" width="180">
+        <template  v-slot = {row}>
+          <span>{{ parseTime(row.estimateEnterOpenSeaTime ) }}</span>
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('客户经理')" align="center" prop="customerServiceName">
       </el-table-column>
       <el-table-column :label="$t('国家')" align="center" prop="country" :formatter="countryFormatter"></el-table-column>

src/views/ecw/customerToBeAssigned/index.vue

@@ -86,7 +86,13 @@
         type="selection"
         width="55">
       </el-table-column>
-      <el-table-column :label="$t('客户编号')" align="center" prop="number" />
+      <el-table-column :label="$t('客户编号')" align="center" prop="number" >
+        <template v-slot="{row}">
+          <router-link :to="'/customer/query/' + row.id">
+            {{row.number}}
+          </router-link>
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('客户名称')" align="center" prop="name" />
       <el-table-column :label="$t('客户等级')" align="center" prop="vipLevelNameZh">
         <template slot-scope="scope">

src/views/ecw/myCustomerService/index.vue

@@ -44,6 +44,7 @@
         <el-date-picker clearable  v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
                         type="daterange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
       </el-form-item>
+
       <el-form-item :label="$t('信用等级')" prop="department">
         <el-select clearable  v-model="queryParams.creditLevel" >
           <el-option  v-for="(item,index) in creditList" :label="item.nameZh" :key="index" :value="item.id" ></el-option>
@@ -74,7 +75,13 @@
         type="selection"
         width="55">
       </el-table-column>
-      <el-table-column :label="$t('客户编号')" align="center" prop="number" />
+      <el-table-column :label="$t('客户编号')" align="center" prop="number" >
+        <template v-slot="{row}">
+          <router-link :to="'/customer/query/' + row.id">
+            {{row.number}}
+          </router-link>
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('客户名称')" align="center" prop="name" />
       <el-table-column :label="$t('客户等级')" align="center" prop="vipLevelNameZh">
         <template slot-scope="scope">
@@ -98,6 +105,11 @@
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
+      <el-table-column :label="$t('预计入公海时间')" align="center" prop="createTime" width="180">
+        <template  v-slot = {row}>
+          <span>{{ parseTime(row.estimateEnterOpenSeaTime )  }}</span>
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('客户经理')" align="center" prop="customerServiceName">
       </el-table-column>
       <el-table-column :label="$t('国家')" align="center" prop="country" :formatter="countryFormatter"></el-table-column>

src/views/ecw/oceanCustomer/index.vue

@@ -80,7 +80,13 @@
         type="selection"
         width="55">
       </el-table-column>
-      <el-table-column :label="$t('客户编号')" align="center" prop="number" />
+      <el-table-column :label="$t('客户编号')" align="center" prop="number" >
+        <template v-slot="{row}">
+          <router-link :to="'/customer/query/' + row.id">
+            {{row.number}}
+          </router-link>
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('客户名称')" align="center" prop="name" />
       <el-table-column :label="$t('客户等级')" align="center" prop="vipLevelNameZh">
         <template slot-scope="scope">
@@ -114,8 +120,8 @@
       <el-table-column :label="$t('国家')" align="center" prop="country" :formatter="countryFormatter"></el-table-column>
       <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button size="mini" type="text" icon="el-icon-folder-add" @click="distribution(scope.row)">{{$t('移交')}}</el-button>
-          <el-button size="mini" type="text" icon="el-icon-crop" @click="fishingFn(scope.row)">{{$t('捞取')}}</el-button>
+<!--          <el-button size="mini" type="text"  @click="distribution(scope.row)">{{$t('移交')}}</el-button>-->
+          <el-button size="mini" type="text"  @click="fishingFn(scope.row)">{{$t('捞取')}}</el-button>
         </template>
       </el-table-column>
     </el-table>