cheeckTableChange

hb_client/src/components/customForm/index.vue

@@ -9,7 +9,7 @@
       <el-row>
         <el-col
           v-for="(item, $index) in formData"
-          v-show="filterBlock(item.parent,item.display_expression,$index,item.field_key)"
+          v-show="filterBlock(item.display_expression,$index,item.field_key)"
           :key="$index"
           :span="12"
           style="position: relative"
@@ -281,13 +281,10 @@
       }
     },
     methods:{
-      filterBlock(parent,rule,index,field_key){
+      filterBlock(rule,index,field_key){
         let that = this;
-        if(parent!==''&&parent!==null&&parent!==undefined){
         if(rule!==''&&rule!==null&&rule!==undefined){
           let reg = /\{(.+?)\}/g;
-            //let str = rule.replace(temp,'').replace('$','');//=='有'
-            //let y = that.checkForm[key];
           if(rule.indexOf('||')>-1||rule.indexOf('&&')>-1){
             let tam = '', arr = [];
             if(rule.indexOf('||')>-1){
@@ -350,11 +347,6 @@
             }
             return eval(eval(a));
           }
-          }else{
-            that.formData[index].is_hidden = true;
-            that.checkForm[field_key] = null;
-            return false;
-          }
         }else{
           that.formData[index].is_hidden = false;
           return true;

hb_client/src/components/customForm/review.vue

@@ -9,7 +9,7 @@
       <el-row>
         <el-col
           v-for="(item, $index) in formData"
-          v-show="filterBlock(item.parent,item.display_expression,$index,item.field_key)"
+          v-show="filterBlock(item.display_expression,$index,item.field_key)"
           :key="$index"
           :span="12"
           style="position: relative"
@@ -375,12 +375,12 @@
       }
     },
     methods:{
-      filterBlock(parent,rule,index,field_key){
+      filterBlock(rule,index,field_key){
         // debugger;
         let that = this;
-        if(parent!==''&&parent!==null&&parent!==undefined){
         if(rule!==''&&rule!==null&&rule!==undefined){
           let reg = /\{(.+?)\}/g;
+          debugger;
           if(rule.indexOf('||')>-1||rule.indexOf('&&')>-1){
             let tam = '', arr = [];
             if(rule.indexOf('||')>-1){
@@ -443,11 +443,6 @@
             }
             return eval(eval(a));
           }
-          }else{
-            that.formData[index].is_hidden = true;
-            that.checkForm[field_key] = null;
-            return false;
-          }
         }else{
           that.formData[index].is_hidden = false;
           return true;

hb_client/src/views/statistics/materialStatistics.vue

@@ -202,14 +202,6 @@
           xAxisData: ["供应商1", "供应商2", "供应商3", "供应商4", "供应商5", "供应商6", "供应商7"],
           seriesData:[2, 2, 4, 5,1, 0,1],
         },
-        xAxisData1: ["气泡", "破点", "划伤", "其他"],
-        xAxisbar21: ["物料1", "物料2", "物料3", "物料4", "物料5", "物料6", "物料7"],
-        xAxisbar22: ["供应商1", "供应商2", "供应商3", "供应商4", "供应商5", "供应商6", "供应商7"],
-        xAxisbar3: ["供应商1", "供应商2", "供应商3", "供应商4", "供应商5", "供应商6", "供应商7"],
-        barData1: [30, 25, 35, 10],
-        barData21: [800, 950, 960, 906, 600, 800, 900],
-        barData22: [5, 20, 15, 25,10, 10,15],
-        barData: [80, 95, 96, 96, 96, 98, 99],
         list: [
           {id: 1, name: 'HIehd91', card: '3331', sco: 'REF-31', num: 2, reason: "气泡"},
           {id: 2, name: 'HIehd92', card: '3332', sco: 'REF-32', num: 1, reason: "划痕"},

hb_client/src/views/wpm/need.vue

@@ -1008,25 +1008,23 @@
       handleInspection(scope, index) {
         //调该物料对应的检查表
         let that = this;
-        this.innerIndex = index;
+        that.innerIndex = index;
         // this.outerVisible = true;
-        this.wproduct = scope.row.id;//半成品ID
+        that.wproduct = scope.row.id;//半成品ID
-        debugger;
+        that.listQueryrecordform.material = scope.row.material;
-        console.log(scope.row.material_check);
+        that.listQueryrecordform.type = 20;
-        this.listQueryrecordform.material = scope.row.material_check!==null ? scope.row.material_check :scope.row.material;//
+        that.listQueryrecordform.enabled = true;
-        this.listQueryrecordform.type = 2;
+        that.recordform = null;
-         this.listQueryrecordform.enabled = true;
+        getrecordformList(that.listQueryrecordform).then((response) => {
-        this.recordform = null;
-        getrecordformList(this.listQueryrecordform).then((response) => {
           if (response.data) {
-            this.recordformList = response.data;
+            that.recordformList = response.data;
             if (response.data.length === 1) {
               that.recordform = response.data[0].id;
               that.formName = response.data[0].name;
               that.submitrecordform(index);
             } else {
               //弹出列表选择框
-              this.outerVisible = true;
+              that.outerVisible = true;
             }
           }
         });
@@ -1038,8 +1036,6 @@
           return item.id === that.recordform;
         });
         that.formName = arr[0].name;
-        // this.outerVisible = false;
-        // that.submitrecordform(that.innerIndex);
       },
       //检验记录
       checkRecord(scope, index) {