Merge branch 'mergeBranch' into allTestUrgent

# Conflicts:
#	src/SManagement/orderclue_detail/index.vue
#	src/components/duplicatesCheck/projectChangeCheck.vue

src/HManagement/clueManage/m_activity/modules/addClue.vue

@@ -127,7 +127,7 @@
 
             <el-col :span="24">
               <el-form-item label="市场活动:" prop="activityName">
-                <el-input disabled type="text" size="small" v-model="activityName"></el-input>
+                <el-input disabled type="text" size="small" v-model="form.activityName"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -296,7 +296,7 @@ export default {
   methods:{
     onShow () {
       this.drawer = true
-      this.activityName = this.data.name
+      this.form.activityName = this.data.name
       this.siteid = JSON.parse(sessionStorage.getItem('active_account')).siteid
       this.queryTradefield()
       this.queryUnitname()

src/SManagement/orderclue_detail/components/changeProject.vue

@@ -504,9 +504,19 @@ export default {
       //   }
       // }
       this.$refs.form.validate((valid) => {
-        if (!valid) return false
+        if (!valid) {
+          this.$notify({
+            title: '警告',
+            message: '请按照要求输入信息',
+            type: 'warning'
+          });
+          return false
+        }
+        this.$store.commit('setLoading',true)
         this.$refs.check.creatShow = true
-        this.$refs.check.queryRule()
+        this.$refs.check.queryRule(()=>{
+          this.$store.commit('setLoading',false)
+        })
       })
     },
     onSubmit(){

src/components/duplicatesCheck/projectChangeCheck.vue

@@ -72,6 +72,7 @@ export default {
       fields1:[],
       fields2:[],
       fields3:[],
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid
     }
   },
   methods:{
@@ -94,8 +95,12 @@ export default {
           this.list = res.data
           this.total = res.total
           this.currentPage = res.pageNumber
-          this.dialogTableVisible = true
           this.$emit('isDuplicate','重复')
+          if (this.siteid == 'HY'){
+            this.onCheck()
+          }else {
+            this.dialogTableVisible = true
+          }
         }else {
           if (this.creatShow){
             this.onSubmit()