Merge remote-tracking branch 'origin/dev' into dev

src/api/ecw/customer.js

@@ -191,7 +191,20 @@ export function handOverCustomer(data) {
     data: data,
     })
 }
-
+export function handoverApproval(data) {
+  return request({
+    url: '/ecw/customer/handover/approval',
+    method: 'post',
+    data: data,
+    })
+}
+ export function handoverApprovalDetails(params){
+   return request({
+      url:'/ecw/customer/handover/approval',
+     method:'get',
+     params
+   })
+ }
 // 公海池客户
 export function getPublicList(query) {
   return request({

src/views/bpm/processInstance/detail.vue

@@ -408,6 +408,12 @@ export default {
           component: () => import('@/views/ecw/box/components/batchMakeUpDetail.vue'),
           processId: this.processInstance.businessKey,
           type: this.processInstance.processDefinition?.formCustomViewPath
+        },
+      //   可获移交详情
+        customer_handover_details:{
+          component: () => import('@/views/ecw/customer/components/customer-handover-details.vue'),
+          processId: this.processInstance.businessKey,
+          type: this.processInstance.processDefinition?.formCustomViewPath
         }
       }
       console.log('formCustomViewPath', this.processInstance.processDefinition.formCustomViewPath.trim())

src/views/ecw/customer/components/customer-handover-details.vue

+<template>
+   <div>
+    <div v-for="(item, index) in info.customerHandoverDetailDtoList">
+      <div> 客户编号{{index + 1}}：{{item.customerNumber}} 客户名称{{index + 1}}：{{item.customerName}} </div>
+      <div>就客户经理{{index + 1}}：{{item.oldCustomerServiceName || '-'}}</div>
+    </div>
+     <div>
+        申请理由：{{info.reason}}
+     </div>
+   </div>
+</template>
+
+<script>
+import { handoverApprovalDetails} from "@/api/ecw/customer";
+
+export default {
+  name: "customer-handover-details",
+  props: {
+    processId: {
+      type: [Number, String],
+    },
+    type: String,
+  },
+  data(){
+  return {
+    info:{
+      customerHandoverDetailDtoList:[]
+    }
+  }
+  },
+  mounted() {
+   this.handoverApprovalFn()
+    },
+  methods:{
+    handoverApprovalFn(){
+      handoverApprovalDetails({approvalId:this.processId}).then(r =>{
+        console.log(r,'rrr')
+        this.info =r.data
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/ecw/customer/edit.vue

@@ -45,7 +45,7 @@
               <el-form-item :label="$t('出货渠道')" prop="transportType">
 <!--                <dict-selector :type="DICT_TYPE.ECW_CUSTOMER_TRANSPORT_TYPE"  form-type="checkbox" multiple v-model="form.transportType"></dict-selector>-->
                 <el-checkbox-group v-model="form.transportType">
-                  <el-checkbox  v-for="item in getDictDatas(DICT_TYPE.ECW_CUSTOMER_TRANSPORT_TYPE)" :key="item.value"  :label="item.value" :disabled="item.value == 4">{{item.label}}</el-checkbox>
+                  <el-checkbox  v-for="item in getDictDatas(DICT_TYPE.ECW_CUSTOMER_TRANSPORT_TYPE)" :key="item.value"  :label="item.value" :disabled="[3,4].includes(+item.value)">{{item.label}}</el-checkbox>
                 </el-checkbox-group>
               </el-form-item>
             </el-col>

src/views/ecw/customer/index.vue

@@ -89,12 +89,15 @@
                    v-hasPermi="['ecw:customer:transport']">{{$t('设为非空运客户')}}</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button :disabled="!selectCustomerList.length" @click="setFullContainerLoad(true)" v-if="$route.path === '/customer/customer'" type="primary" plain  size="mini"  :loading="exportLoading">{{$t('设置海运整柜客户')}}</el-button>
+        <el-button v-hasPermi="['ecw:customer:fcl']" :disabled="!selectCustomerList.length" @click="setFullContainerLoad(true)" v-if="$route.path === '/customer/customer'" type="primary" plain  size="mini"  :loading="exportLoading">{{$t('设置海运整柜客户')}}</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button :disabled="!selectCustomerList.length"  @click="setFullContainerLoad(false)" v-if="$route.path === '/customer/customer'" type="primary" plain  size="mini"  :loading="exportLoading"
+        <el-button  v-hasPermi="['ecw:customer:create-potential']" :disabled="!selectCustomerList.length"  @click="setFullContainerLoad(false)" v-if="$route.path === '/customer/customer'" type="primary" plain  size="mini"  :loading="exportLoading"
         >{{$t('设置海运非整柜客户')}}</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button v-has-permi="['ecw:customer:fcl-mistake']" v-if="path === '/customer/customer'" type="primary" plain icon="el-icon-plus" size="mini" @click="handleAddPotential">{{$t('新增潜在客户')}}</el-button>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -134,7 +137,7 @@
         <template v-slot="{row}">
           +{{row.defaultContactPhone}} <br/>
           <contacts :id="row.id" >
-            <el-button type="text">更多</el-button>
+            <el-button v-if="$route.path === '/customer/customer'" type="text">更多</el-button>
           </contacts>
         </template>
       </el-table-column>

src/views/ecw/customer/transferCustomer.vue

@@ -8,6 +8,10 @@
       <el-select filterable v-model="service">
         <el-option v-for="(item,index) in customerServiceList" :key="index" :label="item.nickname" :value="item.id"></el-option>
       </el-select>
+      <div style="display: flex;margin-top: 20px;">
+        <label style="width:100px;" >申请理由</label>
+        <el-input v-model="textarea" type="textarea"></el-input>
+      </div>
     </div>
     <span slot="footer" class="dialog-footer">
     <el-button @click="$emit('update:show',false)" >{{$t('取 消')}}</el-button>
@@ -18,7 +22,7 @@
 
 <script>
 import {listServiceUser} from "@/api/system/user";
-import {handOverCustomer} from "@/api/ecw/customer";
+import {handoverApproval, handOverCustomer} from "@/api/ecw/customer";
 
 export default {
   name: "transferCustomer",
@@ -37,6 +41,7 @@ export default {
   },
   computed:{
     getCustomerIds(){
+      console.log(this.customerIds,'this.customerIds')
       if(this.customerIds instanceof Array) return this.customerIds
       else return this.customerIds.split(',')
     }
@@ -45,6 +50,7 @@ export default {
     return {
       customerServiceList:[],
       service:'',
+      textarea:''
     }
   },
   methods:{
@@ -52,13 +58,16 @@ export default {
       if(!this.service){
         return this.$message.warning(this.$t('请选择客户经理！'));
       }
-      handOverCustomer({
+      handoverApproval({
         customerServiceId:this.service,
-        customerIdList:this.getCustomerIds
+        customerIdList:this.getCustomerIds,
+        reason:this.textarea
       }).then(r=>{
         if(r.code === 0){
            this.$emit('update:show',false)
            this.$emit('update:customerIds',[])
+          this. service = '';
+           this.textarea = '';
            this.$message.success(this.$t('用户批量转移成功！'))
         }
       })

src/views/ecw/customerConfirm/index.vue

@@ -344,7 +344,7 @@
         <el-button @click="cancelHandOver">{{$t('取 消')}}</el-button>
       </div>
     </el-dialog>
-
+    <transfer-customer :show.sync="openHandOver" :customer-ids.sync="handOverForm.customerIdList"></transfer-customer>
   </div>
 </template>
 
@@ -363,6 +363,7 @@ import {CommonStatusEnum} from '@/utils/constants'
 import {handOverCustomer} from "../../../api/ecw/customer";
 import {getCountryListAll} from "@/api/ecw/country";
 import {getCreditPage} from "@/api/customer/credit";
+import transferCustomer from "@/views/ecw/customer/transferCustomer.vue";
 
 
 
@@ -380,6 +381,7 @@ export default {
     },
   },
   components: {
+    transferCustomer
   },
   data() {
     return {
@@ -570,8 +572,9 @@ export default {
     },
     /** 修改按钮操作 */
     handOver(row) {
-      this.resetHandOverForm();
+      // this.resetHandOverForm();
       this.openHandOver = true;
+
       this.handOverForm.customerIdList   = [row.id];
     },
 

src/views/ecw/customerToBeAssigned/index.vue

@@ -411,9 +411,10 @@ export default {
     },
     //分配客服
     distribution(row){
-      this.service = row.customerService;
-      this.transferData = row;
-      this.transferShow =true;
+      // this.service = row.customerService;
+      // this.transferData = row;
+      this.selectCustomerList = [row.id]
+      this.batchTransferShow =true;
     },
     transferFn(){
       if(!this.service){