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

src/views/ecw/customer/index.vue

@@ -66,11 +66,15 @@
     </el-form>
 
     <!-- 操作工具栏 -->
+    <div style="color: red;margin-bottom: 5px;">
+      注意：创建的客户需接收
+    </div>
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button v-if="path === '/customer/potential'" type="primary" plain icon="el-icon-plus" size="mini" @click="handleAddPotential">{{$t('新增潜在客户')}}</el-button>
         <el-button v-else type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-                   v-hasPermi="[ selectAuthorityFn('ecw:customer:create')]">{{$t('新增')}}</el-button>
+                   v-hasPermi="[ selectAuthorityFn('ecw:customer:create')]">{{$t('新增')}}
+        </el-button>
       </el-col>
       <el-col :span="1.5" >
         <el-button :disabled="selectCustomerList.length === 0"  type="primary" size="mini" @click="transferShow = true;"
@@ -170,6 +174,7 @@
           <el-button size="mini" v-has-permi="[selectAuthorityFn('ecw:customer:follow-up')]" type="text" icon="el-icon-collection" @click="followUp(scope.row)">{{$t('跟进')}}</el-button>
           <el-button size="mini" v-has-permi="[selectAuthorityFn('ecw:customer:customer-complaint')]" type="text" icon="el-icon-user" @click="complaint(scope.row)">{{$t('客诉')}}</el-button>
           <el-button :disabled="scope.row.isInOpenSea" v-has-permi="[selectAuthorityFn('ecw:customer:postpone')]" size="mini" type="text" icon="el-icon-user" @click="delay(scope.row)">{{$t('延期')}}</el-button>
+          <el-button v-has-permi="['ecw:customer:treat-recovery']"  v-if="scope.row.customerService !== null && scope.row.customerServiceAssignedTime !== null && !scope.row.isCustomerServiceConfirmed && !scope.row.isInOpenSea && path === '/customer/customer'"  size="mini"  type="text" @click="recovery(scope.row)" > {{$t('回收客户')}} </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -541,7 +546,7 @@ import {
   getCustomerDeptPage,
   changeCustomerAir,
   getPotential,
-  setChangeCustomerFcl, potentialExportExcel, deptExportExcel
+  setChangeCustomerFcl, potentialExportExcel, deptExportExcel, recycleUnconfirmedCustomer
 } from "@/api/ecw/customer";
 import { getDictDatas, DICT_TYPE } from '@/utils/dict';
 import {CommonStatusEnum} from '@/utils/constants'
@@ -688,6 +693,20 @@ export default {
     this.getList();
   },
   methods: {
+    recovery(row){
+      this.$confirm(this.$t('是否要回收当前{name}',row), '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        recycleUnconfirmedCustomer({customerId:row.id}).then(r =>{
+          this.$message.success(this.$t('回收成功。'))
+          this.getList()
+        })
+      }).catch(() => {
+        this.$message.info(this.$t('已取消'))
+      });
+    },
     // 设置整柜
     setFullContainerLoad(isFcl){
       setChangeCustomerFcl({

src/views/ecw/customerConfirm/index.vue

@@ -137,7 +137,7 @@
            </router-link>
           <el-button size="mini" type="text"   @click="handleUpdate(scope.row)"
                      v-hasPermi="['ecw:customer:treat-perfect']">{{$t('完善')}}</el-button>
-          <el-button  v-has-permi="['ecw:customer:treat-recovery']" size="mini"  type="text" @click="recovery(scope.row)" > {{$t('回收客户')}} </el-button>
+<!--          <el-button  v-has-permi="['ecw:customer:treat-recovery']" size="mini"  type="text" @click="recovery(scope.row)" > {{$t('回收客户')}} </el-button>-->
         </template>
 
       </el-table-column>
@@ -458,20 +458,20 @@ export default {
     })
   },
   methods: {
-    recovery(row){
-      console.log(row,'row')
-      this.$confirm(this.$t('是否要回收当前{name}',row), '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        recycleUnconfirmedCustomer({customerId:row.id}).then(r =>{
-          this.$message.success(this.$t('回收成功。'))
-        })
-      }).catch(() => {
-        this.$message.info(this.$t('已取消'))
-      });
-    },
+    // recovery(row){
+    //   console.log(row,'row')
+    //   this.$confirm(this.$t('是否要回收当前{name}',row), '提示', {
+    //     confirmButtonText: '确定',
+    //     cancelButtonText: '取消',
+    //     type: 'warning'
+    //   }).then(() => {
+    //     recycleUnconfirmedCustomer({customerId:row.id}).then(r =>{
+    //       this.$message.success(this.$t('回收成功。'))
+    //     })
+    //   }).catch(() => {
+    //     this.$message.info(this.$t('已取消'))
+    //   });
+    // },
     getDictDatas,
     countryFormatter(row, column, cellValue) {
       const country = this.countryList.find((e) => e.id === cellValue)