From d3de91b8a5658c9e4e3ca539e9f18f444af94332 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Tue, 6 Dec 2022 17:35:33 +0800
Subject: [PATCH] =?UTF-8?q?0412=20=E6=96=B0=E7=9C=8B=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/board/SeqNoForLiuHua.vue    |  8 +-
 src/views/modules/board/transFerBoard.vue     | 15 +++-
 .../modules/board/transFerBoardForHunlian.vue | 19 ++++-
 .../modules/production/dailyPlanReport.vue    |  7 --
 src/views/modules/production/inspect.vue      | 77 ++++++++++++++++++-
 .../modules/production/searchHunlianTask.vue  |  7 --
 6 files changed, 104 insertions(+), 29 deletions(-)

diff --git a/src/views/modules/board/SeqNoForLiuHua.vue b/src/views/modules/board/SeqNoForLiuHua.vue
index 3e3eb0b..4feaaa2 100644
--- a/src/views/modules/board/SeqNoForLiuHua.vue
+++ b/src/views/modules/board/SeqNoForLiuHua.vue
@@ -18,7 +18,7 @@
           prop="site"
           header-align="center"
           align="left"
-          min-width="25"
+          min-width="20"
           style="font-size: 20px"
           label="工厂">
         </el-table-column>
@@ -42,14 +42,14 @@
           prop="partNo"
           header-align="center"
           align="left"
-          min-width="50"
+          min-width="35"
           label="产品编号">
         </el-table-column>
         <el-table-column
           prop="partDesc"
           header-align="center"
           align="left"
-          min-width="100"
+          min-width="90"
           label="产品名称">
         </el-table-column>
         <el-table-column
@@ -98,7 +98,7 @@
           prop="resourceId"
           header-align="center"
           align="left"
-          min-width="25"
+          min-width="45"
           label="机台">
         </el-table-column>
       </el-table>
diff --git a/src/views/modules/board/transFerBoard.vue b/src/views/modules/board/transFerBoard.vue
index 14a7508..cbd734f 100644
--- a/src/views/modules/board/transFerBoard.vue
+++ b/src/views/modules/board/transFerBoard.vue
@@ -42,9 +42,9 @@
           prop="site"
           header-align="center"
           align="left"
-          min-width="65"
+          min-width="40"
           style="font-size: 20px"
-          label="工厂编号">
+          label="工厂">
         </el-table-column>
         <el-table-column
           prop="transDate"
@@ -57,14 +57,14 @@
           prop="partNo"
           header-align="center"
           align="left"
-          min-width="105"
+          min-width="100"
           label="产品编号">
         </el-table-column>
         <el-table-column
           prop="partDesc"
           header-align="center"
           align="left"
-          min-width="180"
+          min-width="150"
           label="产品名称">
         </el-table-column>
         <el-table-column
@@ -74,6 +74,13 @@
           min-width="60"
           label="未入库数量">
         </el-table-column>
+        <el-table-column
+          prop="needReceiveFlag"
+          header-align="center"
+          align="left"
+          min-width="60"
+          label="检验通过">
+        </el-table-column>
         <el-table-column
           prop="seqNo"
           header-align="center"
diff --git a/src/views/modules/board/transFerBoardForHunlian.vue b/src/views/modules/board/transFerBoardForHunlian.vue
index 57944e1..14d1771 100644
--- a/src/views/modules/board/transFerBoardForHunlian.vue
+++ b/src/views/modules/board/transFerBoardForHunlian.vue
@@ -34,9 +34,9 @@
           prop="site"
           header-align="center"
           align="left"
-          min-width="65"
+          min-width="40"
           style="font-size: 20px"
-          label="工厂编号">
+          label="工厂">
         </el-table-column>
         <el-table-column
           prop="transDate"
@@ -49,14 +49,14 @@
           prop="partNo"
           header-align="center"
           align="left"
-          min-width="105"
+          min-width="100"
           label="产品编号">
         </el-table-column>
         <el-table-column
           prop="partDesc"
           header-align="center"
           align="left"
-          min-width="180"
+          min-width="150"
           label="产品名称">
         </el-table-column>
         <el-table-column
@@ -66,6 +66,17 @@
           min-width="60"
           label="未入库数量">
         </el-table-column>
+        <el-table-column
+          prop="needReceiveFlag"
+          header-align="center"
+          align="left"
+          min-width="60"
+          label="检验通过">
+          <template slot-scope="scope">
+          {{scope.row.needReceiveFlag=='Y'?'是':'否'}}
+        </template>
+        </el-table-column>
+
         <el-table-column
           prop="seqNo"
           header-align="center"
diff --git a/src/views/modules/production/dailyPlanReport.vue b/src/views/modules/production/dailyPlanReport.vue
index c596a54..d4b21f3 100644
--- a/src/views/modules/production/dailyPlanReport.vue
+++ b/src/views/modules/production/dailyPlanReport.vue
@@ -150,13 +150,6 @@
           min-width="100"
           label="混炼胶名称">
         </el-table-column>
-        <el-table-column
-          prop="orderNo"
-          header-align="center"
-          align="left"
-          min-width="70"
-          label="周计划号">
-        </el-table-column>
         <el-table-column
           prop="orderQty"
           header-align="center"
diff --git a/src/views/modules/production/inspect.vue b/src/views/modules/production/inspect.vue
index 6a29d36..89b331c 100644
--- a/src/views/modules/production/inspect.vue
+++ b/src/views/modules/production/inspect.vue
@@ -87,13 +87,14 @@
         prop=""
         header-align="center"
         align="center"
-        min-width="130"
+        min-width="180"
         fixed="left"
         label="操作">
         <template slot-scope="scope" class="foo_container">
           <a v-if="scope.row.inspectedFlag=='N'" type="text" size="small" @click="inspectModal(scope.row)">检验</a>
           <a v-if="scope.row.inspectedFlag=='Y'" type="text" size="small" @click="toPrint(scope.row)">补打结果</a>
           <a v-if="scope.row.inspectedFlag=='Y'" type="text" size="small" @click="cancelInspectResult(scope.row)">取消检验结果</a>
+          <a v-if="scope.row.toTypeFlag=='混炼胶入库'" type="text" size="small" @click="detailModal(scope.row)">混炼明细</a>
           <a v-if="scope.row.toTypeFlag=='硫化检验单'&&scope.row.inspectedFlag=='N'" type="text" size="small" @click="cancelInspect(scope.row)">删除检验单</a>
         </template>
       </el-table-column>
@@ -205,7 +206,7 @@
 
     </el-table>
     <el-dialog title="录入检验结果" :close-on-click-modal="false" v-drag :visible.sync="inspectFlag" width="480px">
-      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;" @submit.native.prevent>
         <el-form-item :label="'检验单号：'">
           <el-input v-model="inspectData.transNo" disabled style="width: 130px"></el-input>
         </el-form-item>
@@ -221,7 +222,7 @@
           <el-input v-model="inspectData.partDescSpec" disabled style="width: 417px;"  ></el-input>
         </el-form-item>
       </el-form>
-      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: 0px;">
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: 0px;"  @submit.native.prevent>
         <el-form-item :label="'检验结果：'">
           <el-select v-model="inspectData.inspectResult" style="width: 120px">
             <el-option label="合格" value="合格"></el-option>
@@ -238,12 +239,68 @@
         <el-button type="primary" @click="inspectFlag = false">关闭</el-button>
       </el-footer>
     </el-dialog>
+    <el-dialog  :close-on-click-modal="false" :close-on-press-escape="false" v-drag title="周计划清单" :visible.sync="detailFlag" width="600px">
+      <el-table
+        height="300"
+        :data="detailList"
+        border
+        style="width: 100%">
+        <el-table-column
+          prop="taskNo"
+          header-align="center"
+          align="left"
+          min-width="80"
+          label="混炼任务单号">
+        </el-table-column>
+        <el-table-column
+          prop="orderNo"
+          header-align="center"
+          align="left"
+          min-width="70"
+          label="周计划号">
+        </el-table-column>
+        <el-table-column
+          prop="partDesc"
+          header-align="center"
+          align="left"
+          min-width="100"
+          label="混炼胶名称">
+        </el-table-column>
+        <el-table-column
+          prop="orderQty"
+          header-align="center"
+          align="right"
+          min-width="70"
+          label="周计划数量">
+        </el-table-column>
+        <el-table-column
+          prop="hunlianQty"
+          header-align="center"
+          align="right"
+          min-width="70"
+          label="混炼胶数量">
+        </el-table-column>
+        <el-table-column
+          prop="orderDate"
+          header-align="center"
+          align="left"
+          min-width="100"
+          label="周计划日期">
+        </el-table-column>
 
+      </el-table>
+      <span slot="footer" class="dialog-footer">
+      <el-button @click="detailFlag = false" type="primary">关闭</el-button>
+    </span>
+    </el-dialog>
    <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>
   </div>
 </template>
 
 <script>
+  import {
+    getHunlianTaskData,getHunlianTaskDetailData
+  } from "@/api/production.js"
   import {
     getInspectData,
     inspectSave,
@@ -262,6 +319,8 @@
     },
     data () {
       return {
+        detailList:[],
+        detailFlag:false,
         // 导出 start
         exportData: [],
         exportDataStandard: {
@@ -287,6 +346,7 @@
         exportHeader: ['派工单列表'],
         exportFooter: [],
         exportDefaultValue: '这一行这一列没有数据',
+
         // 导出 end
         height: 200,
         tableData: [],
@@ -325,6 +385,17 @@
       })
     },
     methods: {
+      detailModal(row){
+        let inData={
+          site:row.site,
+          taskNo:row.orderNo,
+        }
+        getHunlianTaskDetailData(inData).then(({data}) => {
+          this.detailList = data.rows;
+        })
+        this.detailFlag=true;
+
+      },
       // 获取基础数据列表S
       getBaseList (val, type) {
         this.tagNo = val
diff --git a/src/views/modules/production/searchHunlianTask.vue b/src/views/modules/production/searchHunlianTask.vue
index 860df68..6ac2c90 100644
--- a/src/views/modules/production/searchHunlianTask.vue
+++ b/src/views/modules/production/searchHunlianTask.vue
@@ -147,13 +147,6 @@
           min-width="100"
           label="混炼胶名称">
         </el-table-column>
-        <el-table-column
-          prop="orderNo"
-          header-align="center"
-          align="left"
-          min-width="70"
-          label="周计划号">
-        </el-table-column>
         <el-table-column
           prop="orderQty"
           header-align="center"