jiacengbanchengpinjianyan

hb_client/src/views/wpm/need.vue

@@ -21,7 +21,7 @@
             class="filter-item"
             type="primary"
             icon="el-icon-refresh-left"
-          @click="resetFilter"
+            @click="resetFilter1"
           >重置
           </el-button>
           <el-table
@@ -90,7 +90,6 @@
             :limit.sync="listQuery.page_size"
             @pagination="getList"
           />
-
           <el-dialog title="半成品报废" :close-on-click-modal="false" :visible.sync="dialogFormVisiblebcp">
             <el-form :model="formbcp">
               <el-form-item label="甩片原因" :label-width="formLabelWidth">
@@ -400,12 +399,9 @@
             v-el-height-adaptive-table="{bottomOffset: 50}"
           >
             <el-table-column type="index" width="50"/>
-            
-              
             <el-table-column label="半成品名称">
               <template slot-scope="scope">{{ scope.row.material_.name }}</template>
             </el-table-column>
-
             <el-table-column label="半成品编号">
               <template slot-scope="scope">{{ scope.row.number }}</template>
             </el-table-column>
@@ -423,20 +419,19 @@
             <el-table-column label="所在子工序" :filters="[{ text: '切割', value: '切割' },{ text: '磨边', value: '磨边' },
             { text: '清洗', value: '清洗' }, { text: '热弯成型', value: '热弯成型' },{ text: '化学钢化', value: '化学钢化' },
             { text: '镀膜', value: '镀膜' }, { text: '断膜', value: '断膜' },{ text: '汇流条制备', value: '汇流条制备' },
-            { text: '夹层', value: '夹层' }, { text: '包边', value: '包边' }]"
+            { text: '夹层', value: '夹层' }, { text: '包边', value: '包边' }]" :filter-method="filterTag">
-      :filter-method="filterTag">
               <template slot-scope="scope">{{ scope.row.step_.name }}</template>
             </el-table-column>
             <el-table-column align="center" label="操作" width="220px">
               <template slot-scope="scope">
                 <el-link
-                  v-if="checkPermission(['warehouse_update'])"
+                  v-if="scope.row.test===null"
-                  @click="handleInspection(scope)"
+                  @click="handleInspection(scope,'3')"
                 >检验
                 </el-link>
                 <el-link
                   v-if="scope.row.test!==null"
-                  @click="checkRecord(scope,'1')"
+                  @click="checkRecord(scope,'3')"
                 >检验记录
                 </el-link>
               </template>
@@ -946,24 +941,15 @@
       handleClick(tab) {
         this.listLoading = true;
         this.listQuery.type = tab.name;
-        if(tab.name==1)
+        if (tab.name == 1) {
-        {
           this.getList();
-        }
+        } else if (tab.name == 2) {
-        else if(tab.name==2)
-        {
           this.getList2();
-        }
+        } else if (tab.name == 3) {
-          else if(tab.name==3)
-        {
           this.getList1();
-        }
+        } else if (tab.name == 4) {
-          else if(tab.name==4)
-        {
           this.getList4();
-        }
+        } else if (tab.name == 5) {
-          else if(tab.name==5)
-        {
           this.getList3();
         }
 
@@ -1204,7 +1190,11 @@
         // this.outerVisible = true;
         that.wproduct = scope.row.id;//半成品ID
         that.listQueryrecordform.material = scope.row.material;
+        if (index === '3') {
+          that.listQueryrecordform.type = 40;
+        } else {
           that.listQueryrecordform.type = 20;
+        }
         that.listQueryrecordform.enabled = true;
         that.recordform = null;
         getrecordformList(that.listQueryrecordform).then((response) => {
@@ -1378,7 +1368,7 @@
         this.outerVisible = false;
         that.fieldList = [];
         if (that.recordform != "") {
-          if (index === '1') {//非复检
+          if (index !== '2') {//非复检
             testInit({wproduct: that.wproduct, form: that.recordform}).then((response) => {
               if (response.data) {
                 that.hasPicture = false;