Merge branch 'test' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-qms

src/views/inspectionPlan/components/baseInfo.vue

@@ -511,9 +511,12 @@ export default {
       this.form.isConsumable = val.isConsumable; //0 单件 1 批量
       this.form.productId = val.id;
       this.form.netWeight = val.netWeight; //净重
+      // console.log(this.form.type)
       this.getProductDetails(this.form.productId)
       this.$emit('changesMainNumberModal', this.form.productNumber);
-      this.$emit('getQualityTemplate', val.code)
+      if(this.form.type!=3){
+        this.$emit('getQualityTemplate', val.code)
+      }
     },
 
     //库存台账根据来源得到产品
@@ -542,7 +545,9 @@ export default {
       this.form.batchNo = val.batchNo; //批次号
       this.getProductDetails(this.form.productId);
       this.$emit('changesStokledgerNumberModal', list, dimension);
-      this.$emit('getQualityTemplate', val.categoryCode)
+      if(this.form.type!=3){
+        this.$emit('getQualityTemplate', val.categoryCode)
+      }
     },
 
     //   根据来源得到产品
@@ -575,6 +580,7 @@ export default {
       let batchNo = val.batchNo;
       let productCategoryId = val.productCategoryId;
       let productCategoryName = val.productCategoryName;
+     
       if (receiveNo && categoryCode && categoryid) {
         this.$emit('getList', receiveNo, categoryCode, productCategoryId, productCategoryName, categoryid, batchNo, val.supplierName, val.supplierMark);
       }