Merge branch 'redUrgent' into allTestUrgent

src/Form/salerPrivatecustomer/add.vue

@@ -544,6 +544,7 @@ export default {
     onCheck() {
       this.$refs.form.validate((valid) => {
         if (!valid) return false
+        this.$refs.check.creatShow = false
         this.$refs.check.queryRule()
       })
     },

src/Form/salerPrivatecustomer/edit.vue

@@ -520,6 +520,7 @@ export default {
     onCheck(){
       this.$refs.form.validate((valid) => {
         if (!valid) return false
+        this.$refs.check.creatShow = false
         this.$refs.check.queryRule()
       })
     },

src/SManagement/orderclue_detail/components/changeCustomer.vue

@@ -467,6 +467,7 @@ export default {
       this.form.source = this.form.cluesource
       this.value = [this.form.province,this.form.city,this.form.county]
       this.form.contactsinfo.name = this.data.name
+      this.form.enterprisename = this.form.enterprisename_customer
       /*this.form.contactsinfo.phonenumber = this.data.phonenumber*/
       if (this.data.phonenumber.indexOf('-') != '-1'){
         this.isPhone = false
@@ -491,6 +492,7 @@ export default {
     onCheck(){
       this.$refs.form.validate((valid) => {
         if (!valid) return false
+        this.$refs.check.creatShow = false
         this.$refs.check.queryRule()
       })
     },

src/components/duplicatesCheck/customerCheck.vue

@@ -38,20 +38,17 @@
         </el-pagination>
       </div>
       <span slot="footer" class="dialog-footer" v-if="creatShow">
-        <div style="display: flex;justify-content: space-between">
+        <div style="display: flex;justify-content: space-between" v-if="isBack">
           <div style="color: red" v-if="isBack">当前有重复客户归属回收站，请联系管理处理</div>
           <el-button @click="dialogTableVisible = false" size="small" type="primary" class="normal-btn-width">确 定</el-button>
         </div>
-
-<!--        <el-button :type="buttonTitle === '确定保存'?'warning':'primary'" @click="onCheck" size="small" class="normal-btn-width">{{buttonTitle}}</el-button>-->
+         <el-button v-else @click="dialogTableVisible = false" size="small" type="primary" class="normal-btn-width">确 定</el-button>
       </span>
       <span slot="footer" class="dialog-footer" v-if="isBack && !creatShow">
         <div style="display: flex;justify-content: space-between">
           <div style="color: red">当前有重复客户归属回收站，请联系管理处理</div>
           <el-button  @click="dialogTableVisible = false;isBack = false" size="small" type="primary" class="normal-btn-width">确 定</el-button>
         </div>
-
-        <!--        <el-button :type="buttonTitle === '确定保存'?'warning':'primary'" @click="onCheck" size="small" class="normal-btn-width">{{buttonTitle}}</el-button>-->
       </span>
     </el-dialog>
   </div>
@@ -234,7 +231,7 @@ export default {
     isCheck(){
       this.$emit('onCheck')
     },
-    async queryRule(callback){
+    async queryRule(){
       const res = await this.$api.requested({
         "id": "20230410090502",
         "content": {},
@@ -243,7 +240,6 @@ export default {
       this.fields2 = res.data.custcheckrule.fields2
       this.fields3 = res.data.custcheckrule.fields3
       this.listData()
-      callback && callback()
     }
   },
   created() {