From 58a05bb2f205bee8854f2067193c9274385705f5 Mon Sep 17 00:00:00 2001
From: shilixia <2309368887@qq.com>
Date: Wed, 24 Nov 2021 10:37:05 +0800
Subject: [PATCH] wenti

---
 hb_client/src/views/inm/fifo.vue        |  2 +-
 hb_client/src/views/wpm/need.vue        |  2 ++
 hb_client/src/views/wpm/operationdo.vue | 34 ++++++++++-----------
 hb_client/src/views/wpm/worktask.vue    | 39 ++++++++++++++++++-------
 4 files changed, 48 insertions(+), 29 deletions(-)

diff --git a/hb_client/src/views/inm/fifo.vue b/hb_client/src/views/inm/fifo.vue
index f19051e..6d37215 100644
--- a/hb_client/src/views/inm/fifo.vue
+++ b/hb_client/src/views/inm/fifo.vue
@@ -142,7 +142,7 @@
                 label="物料："
                 :prop="'details.' + index + '.material'"
               >
-                <el-select v-model="item.material" size="small">
+                <el-select v-model="item.material" filterable size="small">
                   <el-option
                     v-for="item in materialoptions"
                     :key="item.value"
diff --git a/hb_client/src/views/wpm/need.vue b/hb_client/src/views/wpm/need.vue
index 756ad66..26910eb 100644
--- a/hb_client/src/views/wpm/need.vue
+++ b/hb_client/src/views/wpm/need.vue
@@ -431,6 +431,7 @@ export default {
           this.innerVisible = false;
           this.outerVisible = false;
           this.getList();
+           this.getList1();
         }
       });
     },
@@ -445,6 +446,7 @@ export default {
         if (res.code >= 200) {
          this.$message.success("入库成功！");
            this.dialogFormVisible=false;
+           this.getList1();
         }
       });
     }
diff --git a/hb_client/src/views/wpm/operationdo.vue b/hb_client/src/views/wpm/operationdo.vue
index e79aeff..72d69b5 100644
--- a/hb_client/src/views/wpm/operationdo.vue
+++ b/hb_client/src/views/wpm/operationdo.vue
@@ -373,6 +373,11 @@
             >
               <el-table-column type="index" width="50" />
 
+       <el-table-column label="生产计划编号">
+                <template slot-scope="scope">{{
+                  scope.row.subproduction_plan
+                }}</template>
+              </el-table-column>
               <el-table-column label="物料名称">
                 <template slot-scope="scope">{{
                   scope.row.material_.name
@@ -386,14 +391,7 @@
               <el-table-column label="应产数量">
                 <template slot-scope="scope">{{ scope.row.count }}</template>
               </el-table-column>
-              <el-table-column label="实际产出数量">
-                <template slot-scope="scope">{{
-                  scope.row.count_real
-                }}</template>
-              </el-table-column>
-              <el-table-column label="检验合格数量">
-                <template slot-scope="scope">{{ scope.row.count_ok }}</template>
-              </el-table-column>
+             
 
               <el-table-column label="本操作产出数量" width="140px">
                 <template slot-scope="scope">
@@ -588,9 +586,9 @@ export default {
     this.getList(); //边角料
     this.getpwpList(); //半成品
     this.getequList(); //设备
-    this.getrecordList(); //自定义表
-    this.getinputList(); //物料消耗
-    this.getoutputList(); //产出物料
+    this.getrecordLists(); //自定义表
+    this.getinputLists(); //物料消耗
+    this.getoutputLists(); //产出物料
     this.getwmaterialList();
     this.getprogressList(); //产出物料调出
   },
@@ -673,7 +671,7 @@ export default {
         });
     },
     //操作自定义表
-    getrecordList() {
+    getrecordLists() {
       getrecordList({ operation: this.id, page: 0 }).then((response) => {
         if (response.data) {
           this.recordData = response.data;
@@ -707,15 +705,16 @@ export default {
       this.record.record_data = _this.record_data;
       createRecord(this.formID, this.record).then((res) => {
         if (res.code >= 200) {
+           this.getrecordLists();
           this.$message.success("创建成功！");
-          this.getrecordList();
+         
           this.dialogVisibleForm = false;
         }
       });
     },
 
     //操作消耗物料列表
-    getinputList() {
+    getinputLists() {
       getinputList({ operation: this.id, page: 0 }).then((response) => {
         if (response.data) {
           this.inputData = response.data;
@@ -740,13 +739,13 @@ export default {
       createInput(this.picks).then((res) => {
         if (res.code >= 200) {
           this.$message.success("创建成功！");
-          this.getinputList();
+          this.getinputLists();
           this.dialogTablepick = false;
         }
       });
     },
     //操作产出物料列表
-    getoutputList() {
+    getoutputLists() {
       getoutputList({ operation: this.id, page: 0 }).then((response) => {
         if (response.data) {
           this.outputData = response.data;
@@ -772,8 +771,9 @@ export default {
       this.output.count = scope.row.output_count;
       createOutput(this.output).then((res) => {
         if (res.code >= 200) {
+           this.getoutputLists();
           this.$message.success("创建成功！");
-          this.getoutputList();
+         
           this.dialogTableoutput = false;
         }
       });
diff --git a/hb_client/src/views/wpm/worktask.vue b/hb_client/src/views/wpm/worktask.vue
index c78513e..972f565 100644
--- a/hb_client/src/views/wpm/worktask.vue
+++ b/hb_client/src/views/wpm/worktask.vue
@@ -18,7 +18,17 @@
           @current-change="handleCurrentChange"
         >
           <el-table-column type="index" width="50" />
-
+          
+           <el-table-column label="生产计划编号">
+            <template slot-scope="scope">{{
+              scope.row.number
+            }}</template>
+          </el-table-column>
+            <el-table-column label="生产主产品">
+            <template slot-scope="scope" >{{
+              scope.row.main_product_.name
+            }}</template>
+          </el-table-column>
           <el-table-column label="名称">
             <template slot-scope="scope">{{
               scope.row.subproduction_.name
@@ -59,15 +69,13 @@
               <el-tag v-else>已领料</el-tag>
             </template>
           </el-table-column>
-          <el-table-column label="生产主产品">
-            <template slot-scope="scope" >{{
-              scope.row.main_product_.name
-            }}</template>
-          </el-table-column>
-          <el-table-column label="生产进度">
+        
+          <el-table-column label="计划/生产/合格">
             <template slot-scope="scope"
-              >{{ scope.row.main_count_real }}/{{
+              >{{
                 scope.row.main_count
+              }}/{{ scope.row.main_count_real }}/{{
+                scope.row.main_count_ok
               }}</template
             >
           </el-table-column>
@@ -131,6 +139,9 @@
               >
                 <el-table-column type="selection" width="55"> </el-table-column>
                 <el-table-column type="index" width="50" />
+                  <el-table-column label="子计划编号">
+                  <template slot-scope="scope">{{scope.row.subproduction_plan}}</template>
+                </el-table-column>
 
                 <el-table-column label="半成品编号">
                   <template slot-scope="scope">{{ scope.row.number }}</template>
@@ -176,7 +187,11 @@
                 max-height="400"
               >
                 <el-table-column type="index" width="50" />
-
+                  <el-table-column label="子计划编号">
+                  <template slot-scope="scope">{{
+                    scope.row.subproduction_plan
+                  }}</template>
+                </el-table-column>
                 <el-table-column label="物料名称">
                   <template slot-scope="scope">{{
                     scope.row.material_.name
@@ -201,6 +216,7 @@
     </el-tabs>
 <el-dialog title="领半成品" :visible.sync="dialogTableVisiblepick">
   <el-table :data="bcplist" style="width: 100%">
+   
             <el-table-column prop="material_.name" label="物料名称">
             </el-table-column>
             <el-table-column prop="material_.number" label="物料编号">
@@ -250,6 +266,7 @@
       >
        <el-table-column type="selection" width="55"> </el-table-column>
         <el-table-column type="index" width="50" />
+        
         <el-table-column label="半成品编号">
           <template slot-scope="scope">{{ scope.row.number }}</template>
         </el-table-column>
@@ -317,9 +334,9 @@
             <el-table-column prop="warehouse_.name" label="物料所在仓库">
             </el-table-column>
             <el-table-column prop="count" label="物料总数量"> </el-table-column>
-            <el-table-column label="输入领料数量" width="140px">
+            <el-table-column label="输入领料数量" width="140px" >
               <template slot-scope="scope">
-                <el-form :model="scope.row" widht="100px">
+                <el-form :model="scope.row" v-if="scope.row.material_.type!=2" widht="100px">
                   <el-form-item size="mini">
                     <el-input-number
                       v-model="scope.row.pick_count"