Merge branch 'pre-release' of...

Merge branch 'pre-release' of http://110.41.143.128:8081/lanbaoming/jiedao-app-operator-master into pre-release

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

@@ -17,7 +17,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item :label="$t('客户编号')">
-            <el-input v-model="form.customerId" :placeholder="$t('请输入客户编号')" disabled />
+            <el-input v-model="customerNumber" :placeholder="$t('请输入客户编号')" disabled />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -187,6 +187,7 @@ export default {
       type: Boolean,
       default: false
     },
+    customerNumber: String,
     customerService: Number
   },
   components: {

src/views/ecw/customer/index.vue

@@ -1342,6 +1342,7 @@
       :customer-id="customerId"
       :id="customerId"
       :customer-service="customerService"
+      :customer-number="customerNumber"
       ref="CustomerFollowList"
       v-if="customerFollowVisible"
     ></customer-follow-list>
@@ -1563,6 +1564,7 @@ export default {
       currentisNew: false,
       userId: undefined, //lanbm 2024-05-23 add
       customerService: undefined,
+      customerNumber: undefined,
       customerFollowVisible: false,
       customerMergeVisible: false,
       enterOpenSeaTime: [],
@@ -1799,8 +1801,9 @@ export default {
       this.$router.push({ path: "/customer/delay", query: { id: row.id } });
     },
     followUp(row) {
-      this.customerId = row.id;
-      this.customerService = row.customerService;
+      this.customerId = row.id
+      this.customerService = row.customerService
+      this.customerNumber = row.number
       this.customerFollowVisible = true
       this.$nextTick(_ => {
         // this.$refs.CustomerFollowList.customerFollow.dialogVisible = true;

src/views/ecw/customer/query.vue

@@ -812,7 +812,6 @@
           </el-tab-pane>
         </el-tabs>
 
-        
       </el-col>
     </el-row>
     <el-dialog
@@ -840,7 +839,7 @@
       </div>
     </el-dialog>
 
-    <customer-follow ref="customerFollow" v-if="customerFollowVisible" :id="id" :customer-id="id" :customer-service="customer.customerService" @refresh="getCustomerFollowList" />
+    <customer-follow ref="customerFollow" v-if="customerFollowVisible" :id="id" :customer-id="id" :customer-service="customer.customerService" :customer-number="customer.number" @refresh="getCustomerFollowList" />
   </div>
 </template>
 

src/views/ecw/myCustomerService/index.vue

@@ -933,6 +933,7 @@ export default {
       //lanbm 2024-05-26 添加参数
       userId:undefined,
       customerService: undefined,
+      customerNumber: undefined,
       customerFollowVisible: false,
       enterOpenSeaTime: [],
       customerServiceConfirmedTime: [],
@@ -1224,6 +1225,7 @@ export default {
       this.customerId = row.id;
       // this.$refs["customerFollowList"].customerFollow.dialogVisible = true;
       this.customerService = row.customerService;
+      this.customerNumber = row.number;
       this.customerFollowVisible = true
       this.$nextTick(_ => {
         this.$refs['customerFollowList'].init()