Explorar o código

Merge remote-tracking branch 'remotes/origin/develop_yh14' into develop_yh15

bug
lilei %!s(int64=2) %!d(string=hai) anos
pai
achega
01fdd6f9f8

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1677650472760
+  "version": 1677650695490
 }

+ 5 - 0
src/views/common/custList.vue

@@ -39,6 +39,10 @@ export default {
       type: String || Number,
       default: undefined
     },
+    notSn:{
+      type: String || Number,
+      default: ''
+    },
     isEnabled: { // 是否只查启用状态
       type: Boolean,
       default: false
@@ -90,6 +94,7 @@ export default {
           return
         }
         this.data = res.data && res.data.list ? res.data.list : []
+        this.data = this.data.filter(item => item.customerSn != this.notSn)
         this.fetching = false
       })
     },

+ 1 - 1
src/views/customerManagement/customerInfo/mergeCustomerModal.vue

@@ -22,7 +22,7 @@
           <div>{{ mainCustomerName }}</div>
         </a-form-model-item>
         <a-form-model-item label="被合并的客户名称:" prop="customerSnSource">
-          <custList ref="custList" dealerDisabled @change="custChange" placeholder="输入客户名称搜索"></custList>
+          <custList ref="custList" :notSn="form.customerSnTarget" dealerDisabled @change="custChange" placeholder="输入客户名称搜索"></custList>
         </a-form-model-item>
       </a-form-model>
       <div class="btn-cont">