From 51030dc9974d417485de349a51cd3dc12f8850d7 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Tue, 1 Mar 2022 14:43:13 +0800
Subject: [PATCH] jiacengbanchengpinjianyan

---
 hb_client/src/views/wpm/need.vue | 326 +++++++++++++++----------------
 1 file changed, 158 insertions(+), 168 deletions(-)

diff --git a/hb_client/src/views/wpm/need.vue b/hb_client/src/views/wpm/need.vue
index f85c028..9609745 100644
--- a/hb_client/src/views/wpm/need.vue
+++ b/hb_client/src/views/wpm/need.vue
@@ -1,38 +1,38 @@
 <template>
   <div class="app-container">
-    <el-tabs type="border-card"  v-model="activeName" @tab-click="handleClick">
+    <el-tabs type="border-card" v-model="activeName" @tab-click="handleClick">
       <el-tab-pane label="待检半成品" name="1">
         <el-card style="margin-top: 2px">
-            <el-input
-          v-model="listQuery.search"
-          placeholder="半成品名称/编号/子计划编号/工序"
-          style="width: 300px"
-          class="filter-item"
-          @keyup.enter.native="handleFilter1"
-        />
-        <el-button
-          class="filter-item"
-          type="primary"
-          icon="el-icon-search"
-          @click="handleFilter1"
-        >搜索
-        </el-button>
-        <el-button
-          class="filter-item"
-          type="primary"
-          icon="el-icon-refresh-left"
-          @click="resetFilter"
-        >重置
-        </el-button>
+          <el-input
+            v-model="listQuery.search"
+            placeholder="半成品名称/编号/子计划编号/工序"
+            style="width: 300px"
+            class="filter-item"
+            @keyup.enter.native="handleFilter1"
+          />
+          <el-button
+            class="filter-item"
+            type="primary"
+            icon="el-icon-search"
+            @click="handleFilter1"
+          >搜索
+          </el-button>
+          <el-button
+            class="filter-item"
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="resetFilter1"
+          >重置
+          </el-button>
           <el-table
             v-loading="listLoading"
             :data="wproductList.results"
             border
             fit
             stripe
-              height="100"
-         highlight-current-row
-        v-el-height-adaptive-table="{bottomOffset: 50}"
+            height="100"
+            highlight-current-row
+            v-el-height-adaptive-table="{bottomOffset: 50}"
           >
             <el-table-column type="index" width="50"/>
             <el-table-column label="半成品名称">
@@ -44,22 +44,22 @@
             <el-table-column label="规格型号">
               <template slot-scope="scope">{{ scope.row.material_.specification }}</template>
             </el-table-column>
-            
+
             <el-table-column label="检测状态"
             >
               <template slot-scope="scope">
                 {{ actstate_[scope.row.act_state] }}
               </template>
             </el-table-column>
-             <el-table-column label="子计划编号">
+            <el-table-column label="子计划编号">
               <template slot-scope="scope">{{ scope.row.subproduction_plan_.number }}</template>
             </el-table-column>
-            <el-table-column label="所在子工序"  :filters="[{ text: '切割', value: '切割' },{ text: '磨边', value: '磨边' },
+            <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: '包边' }]"
-      :filter-method="filterTag"
-      filter-placement="bottom-end">
+                             :filter-method="filterTag"
+                             filter-placement="bottom-end">
               <template slot-scope="scope">{{ scope.row.step_.name }}</template>
             </el-table-column>
             <el-table-column align="center" label="操作" width="220px">
@@ -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">
@@ -119,36 +118,36 @@
       <el-tab-pane label="复检半成品" name="2">
         <el-card style="margin-top: 2px">
           <el-input
-          v-model="listQuery2.search"
-          placeholder="半成品名称/编号/子计划编号/工序"
-          style="width: 300px"
-          class="filter-item"
-          @keyup.enter.native="handleFilter2"
-        />
-        <el-button
-          class="filter-item"
-          type="primary"
-          icon="el-icon-search"
-          @click="handleFilter2"
-        >搜索
-        </el-button>
-        <el-button
-          class="filter-item"
-          type="primary"
-          icon="el-icon-refresh-left"
-          @click="resetFilter2"
-        >重置
-        </el-button>
+            v-model="listQuery2.search"
+            placeholder="半成品名称/编号/子计划编号/工序"
+            style="width: 300px"
+            class="filter-item"
+            @keyup.enter.native="handleFilter2"
+          />
+          <el-button
+            class="filter-item"
+            type="primary"
+            icon="el-icon-search"
+            @click="handleFilter2"
+          >搜索
+          </el-button>
+          <el-button
+            class="filter-item"
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="resetFilter2"
+          >重置
+          </el-button>
           <el-table
-           
+
             :data="wproductList2.results"
             border
             fit
             stripe
-           
-              height="100"
-         highlight-current-row
-        v-el-height-adaptive-table="{bottomOffset: 50}"
+
+            height="100"
+            highlight-current-row
+            v-el-height-adaptive-table="{bottomOffset: 50}"
           >
             <el-table-column type="index" width="50"/>
             <el-table-column label="半成品名称">
@@ -158,7 +157,7 @@
             <el-table-column label="半成品编号">
               <template slot-scope="scope">{{ scope.row.number }}</template>
             </el-table-column>
-             <el-table-column label="规格型号">
+            <el-table-column label="规格型号">
               <template slot-scope="scope">{{ scope.row.material_.specification }}</template>
             </el-table-column>
             <el-table-column label="检测状态">
@@ -166,15 +165,15 @@
                 {{ actstate_[scope.row.act_state] }}
               </template>
             </el-table-column>
-             <el-table-column label="子计划编号">
+            <el-table-column label="子计划编号">
               <template slot-scope="scope">{{ scope.row.subproduction_plan_.number }}</template>
             </el-table-column>
             <el-table-column label="所在子工序"
-            :filters="[{ text: '切割', value: '切割' },{ text: '磨边', value: '磨边' },
+                             :filters="[{ 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">
@@ -206,37 +205,37 @@
           <el-button type="primary" icon="el-icon-plus" @click="handleCreate">
             批量入库
           </el-button>
-            <el-input
-          v-model="listQuery1.search"
-          placeholder="半成品名称/编号/子计划编号/工序"
-          style="width: 300px"
-          class="filter-item"
-          @keyup.enter.native="handleFilter3"
-        />
-        <el-button
-          class="filter-item"
-          type="primary"
-          icon="el-icon-search"
-          @click="handleFilter3"
-        >搜索
-        </el-button>
-        <el-button
-          class="filter-item"
-          type="primary"
-          icon="el-icon-refresh-left"
-          @click="resetFilter3"
-        >重置
-        </el-button>
+          <el-input
+            v-model="listQuery1.search"
+            placeholder="半成品名称/编号/子计划编号/工序"
+            style="width: 300px"
+            class="filter-item"
+            @keyup.enter.native="handleFilter3"
+          />
+          <el-button
+            class="filter-item"
+            type="primary"
+            icon="el-icon-search"
+            @click="handleFilter3"
+          >搜索
+          </el-button>
+          <el-button
+            class="filter-item"
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="resetFilter3"
+          >重置
+          </el-button>
           <el-table
-           
+
             :data="wproductList1.results"
             ref="multipleTable"
             border
             fit
             stripe
-             height="100"
-         highlight-current-row
-        v-el-height-adaptive-table="{bottomOffset: 50}"
+            height="100"
+            highlight-current-row
+            v-el-height-adaptive-table="{bottomOffset: 50}"
 
           >
             <el-table-column
@@ -251,7 +250,7 @@
             <el-table-column label="半成品编号">
               <template slot-scope="scope">{{ scope.row.number }}</template>
             </el-table-column>
-             <el-table-column label="规格型号">
+            <el-table-column label="规格型号">
               <template slot-scope="scope">{{ scope.row.material_.specification }}</template>
             </el-table-column>
             <el-table-column label="检测状态">
@@ -259,15 +258,15 @@
                 {{ actstate_[scope.row.act_state] }}
               </template>
             </el-table-column>
- <el-table-column label="子计划编号">
+            <el-table-column label="子计划编号">
               <template slot-scope="scope">{{ scope.row.subproduction_plan_.number }}</template>
             </el-table-column>
             <el-table-column label="所在子工序"
-             :filters="[{ text: '切割', value: '切割' },{ text: '磨边', value: '磨边' },
+                             :filters="[{ 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>
 
@@ -297,36 +296,36 @@
       </el-tab-pane>
       <el-tab-pane label="不合格半成品" name="4">
         <el-card style="margin-top: 2px">
-           <el-input
-          v-model="listQuery4.search"
-          placeholder="半成品名称/编号/子计划编号/工序"
-          style="width: 300px"
-          class="filter-item"
-          @keyup.enter.native="handleFilter4"
-        />
-        <el-button
-          class="filter-item"
-          type="primary"
-          icon="el-icon-search"
-          @click="handleFilter4"
-        >搜索
-        </el-button>
-        <el-button
-          class="filter-item"
-          type="primary"
-          icon="el-icon-refresh-left"
-          @click="resetFilter4"
-        >重置
-        </el-button>
+          <el-input
+            v-model="listQuery4.search"
+            placeholder="半成品名称/编号/子计划编号/工序"
+            style="width: 300px"
+            class="filter-item"
+            @keyup.enter.native="handleFilter4"
+          />
+          <el-button
+            class="filter-item"
+            type="primary"
+            icon="el-icon-search"
+            @click="handleFilter4"
+          >搜索
+          </el-button>
+          <el-button
+            class="filter-item"
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="resetFilter4"
+          >重置
+          </el-button>
           <el-table
-         
+
             :data="wproductList4.results"
             border
             fit
             stripe
             height="100"
-         highlight-current-row
-        v-el-height-adaptive-table="{bottomOffset: 50}"
+            highlight-current-row
+            v-el-height-adaptive-table="{bottomOffset: 50}"
           >
             <el-table-column type="index" width="50"/>
             <el-table-column label="半成品名称">
@@ -341,14 +340,14 @@
                 {{ actstate_[scope.row.act_state] }}
               </template>
             </el-table-column>
-             <el-table-column label="规格型号">
+            <el-table-column label="规格型号">
               <template slot-scope="scope">{{ scope.row.material_.specification }}</template>
             </el-table-column>
             <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: '包边' }]"
-      :filter-method="filterTag">
+                             :filter-method="filterTag">
               <template slot-scope="scope">{{ scope.row.step_.name }}</template>
             </el-table-column>
             <el-table-column label="不合格标记">
@@ -356,7 +355,7 @@
                 {{ ng_sign_[scope.row.ng_sign] }}
               </template>
             </el-table-column>
-             <el-table-column label="子计划编号">
+            <el-table-column label="子计划编号">
               <template slot-scope="scope">{{ scope.row.subproduction_plan_.number }}</template>
             </el-table-column>
             <el-table-column align="center" label="操作" width="220px">
@@ -390,26 +389,23 @@
       <el-tab-pane label="夹层半成品" name="5">
         <el-card style="margin-top: 2px">
           <el-table
-         
+
             :data="wproductList3.results"
             border
             fit
             stripe
-              height="100"
-         highlight-current-row
-        v-el-height-adaptive-table="{bottomOffset: 50}"
+            height="100"
+            highlight-current-row
+            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>
-             <el-table-column label="规格型号">
+            <el-table-column label="规格型号">
               <template slot-scope="scope">{{ scope.row.material_.specification }}</template>
             </el-table-column>
             <el-table-column label="检测状态">
@@ -417,26 +413,25 @@
                 {{ actstate_[scope.row.act_state] }}
               </template>
             </el-table-column>
- <el-table-column label="子计划编号">
+            <el-table-column label="子计划编号">
               <template slot-scope="scope">{{ scope.row.subproduction_plan_.number }}</template>
             </el-table-column>
-            <el-table-column label="所在子工序"  :filters="[{ text: '切割', value: '切割' },{ text: '磨边', value: '磨边' },
+            <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: '包边' }]"
-      :filter-method="filterTag">
+            { text: '夹层', value: '夹层' }, { text: '包边', value: '包边' }]" :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'])"
-                  @click="handleInspection(scope)"
+                  v-if="scope.row.test===null"
+                  @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>
@@ -779,8 +774,8 @@
   import checkPermission from "@/utils/permission";
   import customForm from '@/components/customForm/index';
   import reviewForm from '@/components/customForm/review';
-  import { createTicket, getWorkflowInit} from "@/api/workflow";
-  import { getrecordformList, getrffieldList} from "@/api/mtm";
+  import {createTicket, getWorkflowInit} from "@/api/workflow";
+  import {getrecordformList, getrffieldList} from "@/api/mtm";
   import {getwproductList, wproductPutin, createputins, testInit, scrap, getRetrial} from "@/api/wpm";
   import {getTestRecord, getTestRecordItem, putTestRecordItem, delTestRecordItem, subTestRecordItem} from "@/api/qm";
   // import {genTree} from "@/utils";
@@ -829,7 +824,7 @@
           page: 1,
           page_size: 20,
         },
-         activeName: "1",
+        activeName: "1",
         create_by_: '',
         update_time: '',
         formLabelWidth: '',
@@ -943,30 +938,21 @@
     },
     methods: {
       checkPermission,
-       handleClick(tab) {
+      handleClick(tab) {
         this.listLoading = true;
         this.listQuery.type = tab.name;
-        if(tab.name==1)
-        {
-           this.getList();
+        if (tab.name == 1) {
+          this.getList();
+        } else if (tab.name == 2) {
+          this.getList2();
+        } else if (tab.name == 3) {
+          this.getList1();
+        } else if (tab.name == 4) {
+          this.getList4();
+        } else if (tab.name == 5) {
+          this.getList3();
         }
-        else if(tab.name==2)
-        {
-           this.getList2();
-        }
-          else if(tab.name==3)
-        {
-           this.getList1();
-        }
-          else if(tab.name==4)
-        {
-           this.getList4();
-        }
-          else if(tab.name==5)
-        {
-           this.getList3();
-        }
-       
+
       },
       //待检半成品列表
       getList() {
@@ -979,12 +965,12 @@
           this.listLoading = false;
         });
       },
-        handleFilter1() {
+      handleFilter1() {
         this.listQuery.page = 1;
         this.getList();
       },
       resetFilter1() {
-      
+
         this.listQuery = {
           page: 1,
           page_size: 20,
@@ -1019,12 +1005,12 @@
           }
         });
       },
-        handleFilter2() {
+      handleFilter2() {
         this.listQuery2.page = 1;
         this.getList2();
       },
       resetFilter2() {
-       
+
         this.listQuery2 = {
           page: 1,
           page_size: 20,
@@ -1042,12 +1028,12 @@
 
         });
       },
-        handleFilter3() {
+      handleFilter3() {
         this.listQuery1.page = 1;
         this.getList1();
       },
       resetFilter3() {
-       
+
         this.listQuery1 = {
           page: 1,
           page_size: 20,
@@ -1065,12 +1051,12 @@
 
         });
       },
-        handleFilter4() {
+      handleFilter4() {
         this.listQuery4.page = 1;
         this.getList4();
       },
       resetFilter4() {
-       
+
         this.listQuery4 = {
           page: 1,
           page_size: 20,
@@ -1152,7 +1138,7 @@
         });
       },
       //筛选
-        filterTag(value, row) {
+      filterTag(value, row) {
         return row.step_.name === value;
       },
       //夹层半成品列表
@@ -1204,7 +1190,11 @@
         // this.outerVisible = true;
         that.wproduct = scope.row.id;//半成品ID
         that.listQueryrecordform.material = scope.row.material;
-        that.listQueryrecordform.type = 20;
+        if (index === '3') {
+          that.listQueryrecordform.type = 40;
+        } else {
+          that.listQueryrecordform.type = 20;
+        }
         that.listQueryrecordform.enabled = true;
         that.recordform = null;
         getrecordformList(that.listQueryrecordform).then((response) => {
@@ -1251,8 +1241,8 @@
         that.recordId = scope.row.id;
         that.recordform = scope.row.form;
         that.formName = scope.row.form_.name;
-        if(that.innerIndex==='1'){//非复检
-          getrffieldList({form: this.recordform,enabled:true, page: 1, page_size: 100}).then((response) => {
+        if (that.innerIndex === '1') {//非复检
+          getrffieldList({form: this.recordform, enabled: true, page: 1, page_size: 100}).then((response) => {
             if (response.data) {
               that.hasPicture = false;
               let fieldList = response.data.results;
@@ -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;