Merge branch 'hw' of http://121.41.102.225:8099/Nidong/jiufang

src/views/BasicSettings/SuppliersManage/SippliersClassify.vue

@@ -297,7 +297,7 @@ export default {
             title: this.form.title
           }
         }).then((res) => {
-          this.$Message.success(res.msg)
+          // this.$Message.success(res.msg)
           this.initData()
         }).catch((err) => { });
       } else {
@@ -310,7 +310,7 @@ export default {
             title: this.form.title
           }
         }).then((res) => {
-          this.$Message.success(res.msg)
+          // this.$Message.success(res.msg)
           this.initData()
         }).catch((err) => { });
       }

src/views/leadMatch/MatchList/matchCheck.vue

@@ -473,7 +473,7 @@ export default {
           this.productMatchedList = res.data.product_name;
           // this.matchedList = res.data.list;
           res.data.list.forEach((v,index)=>{
-                  if(v.matching_status==2&&v.produce_status==0){
+                  if(v.matching_status==2){
                     console.log(this.matchedList)
                    this.matchedList.push(v)
                     console.log(this.matchedList)