From befa26d95457c184f0bc4165be6664fcf82e796d Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Wed, 17 Aug 2022 18:04:38 +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/api/production/generateReport.js          |  1 +
 .../modules/production/generateReport.vue     | 31 +++++++++-
 .../modules/production/scheduleForSOTask.vue  | 60 +++++++++----------
 3 files changed, 58 insertions(+), 34 deletions(-)

diff --git a/src/api/production/generateReport.js b/src/api/production/generateReport.js
index 27fe9f7..f22fe6b 100644
--- a/src/api/production/generateReport.js
+++ b/src/api/production/generateReport.js
@@ -14,3 +14,4 @@ export const getSOScheduleRoutingData = data => createAPI(`dailyPlan/getSOSchedu
 export const saveGenerateReportForSchedule = data => createAPI(`dailyPlan/saveGenerateReportForSchedule`, 'post', data);
 
 export const cancelJob = data => createAPI(`dailyPlan/cancelJob`, 'post', data);
+export const searchReportedQty= data => createAPI(`dailyPlan/searchReportedQty`, 'post', data);
diff --git a/src/views/modules/production/generateReport.vue b/src/views/modules/production/generateReport.vue
index 70a9602..285f118 100644
--- a/src/views/modules/production/generateReport.vue
+++ b/src/views/modules/production/generateReport.vue
@@ -91,10 +91,11 @@
         prop=""
         header-align="center"
         align="center"
-        min-width="50"
+        min-width="100"
         label="操作">
         <template slot-scope="scope" class="foo_container">
-          <a type="text" size="small" @click="initReportModal(scope.row)">报告</a>
+          <a type="text" size="small" @click="initReportModal(scope.row)">报工</a>
+          <a type="text" size="small" @click="SOPModal2(scope.row)">查看SOP</a>
         </template>
       </el-table-column>
       <el-table-column
@@ -266,6 +267,14 @@
           </el-date-picker>
         </el-form-item>
       </el-form>
+      <el-form :inline="true" label-position="top">
+        <el-form-item label="本工序报工数">
+          <el-input style="width: 130px;" :disabled="setUp.disabled"  v-model="qty1"></el-input>
+        </el-form-item>
+        <el-form-item label="上工序报工数">
+          <el-input style="width: 130px;" :disabled="setUp.disabled"  v-model="qty2"></el-input>
+        </el-form-item>
+      </el-form>
       <el-form :inline="true" label-position="top">
         <el-form-item label="报告数量">
           <el-input type="number" oninput="value=value.replace(/[^\d]/g,'')" class="input_left" style="width: 178px;"  v-model="saveHeaderData.qtyReported"></el-input>
@@ -376,7 +385,8 @@
 <script>
   import {
     getSOScheduleRoutingData
-    , saveGenerateReportForSchedule
+    , saveGenerateReportForSchedule,
+    searchReportedQty
   } from '@/api/production/generateReport.js'
   import Chooselist from '@/views/modules/common/Chooselist'
   import {
@@ -423,6 +433,8 @@
           scheduleType:'',
           userId:'',
         },
+        qty1:'',
+        qty2:'',
         sopFlag:false,
         site: this.$store.state.user.site,
         operatorType: 0,
@@ -613,6 +625,10 @@
         this.saveHeaderData.userId=this.$store.state.user.name
         this.saveHeaderData.planFinishTime = this.dayjs(new Date()).format('YYYY-MM-DD 00:00:00')
         this.saveHeaderData.planStartTime = this.dayjs(new Date()).format('YYYY-MM-DD 00:00:00')
+        searchReportedQty(this.saveHeaderData).then(({data}) => {
+          this.qty1 = data.row.qtyReported;
+          this.qty2 =data.row.lastApproveQty;
+        })
       },
       closeDialog () {
         Object.assign(this.$data.saveHeaderData, this.$options.data.call(this).saveHeaderData)
@@ -651,6 +667,15 @@
         this.getPhoto();
         this.sopFlag=true;
       },
+      SOPModal2(row){
+        this.sopData.partNo = row.partNo;
+        this.sopData.site=  row.site;
+        this.partDescription= row.partDesc;
+        // var div1=document.getElementById("padPhoto");
+        // div1.style.cssText= "height:"+this.height2+"px;";
+        this.getPhoto();
+        this.sopFlag=true;
+      },
       getPhoto(){
         getPhotoAddressData(this.sopData).then(({data}) => {
           this.photoDatas = data.rows;
diff --git a/src/views/modules/production/scheduleForSOTask.vue b/src/views/modules/production/scheduleForSOTask.vue
index 160a655..b07d522 100644
--- a/src/views/modules/production/scheduleForSOTask.vue
+++ b/src/views/modules/production/scheduleForSOTask.vue
@@ -83,7 +83,7 @@
         fixed="left"
         header-align="center"
         align="center"
-        width="60"
+        min-width="60"
         label="操作">
         <template slot-scope="scope">
           <a type="text" size="small" @click="openScheduleModel(scope.row)">派工</a>
@@ -93,112 +93,112 @@
         prop="orderNo"
         header-align="center"
         align="left"
-        width="120"
+        min-width="120"
         label="日计划号">
       </el-table-column>
       <el-table-column
         prop="itemNo"
         header-align="center"
         align="left"
-        width="60"
+        min-width="60"
         label="工序号">
       </el-table-column>
       <el-table-column
         prop="operationDesc"
         header-align="center"
         align="left"
-        width="160"
+        min-width="160"
         label="工序名称">
       </el-table-column>
       <el-table-column
         prop="partNo"
         header-align="center"
         align="left"
-        width="120"
+        min-width="120"
         label="物料编码">
       </el-table-column>
       <el-table-column
         prop="partDescription"
         header-align="center"
         align="left"
-        width="200"
+        min-width="200"
         label="物料名称">
       </el-table-column>
       <el-table-column
         prop="workCenterNo"
         header-align="center"
         align="left"
-        width="100"
+        min-width="100"
         label="加工中心">
       </el-table-column>
       <el-table-column
         prop="status"
         header-align="center"
         align="left"
-        width="60"
+        min-width="60"
         label="状态">
       </el-table-column>
       <el-table-column
         prop="orderDate"
         header-align="center"
         align="left"
-        width="130"
+        min-width="130"
         label="计划日期">
       </el-table-column>
       <el-table-column
         prop="orderRef1"
         header-align="center"
         align="left"
-        width="130"
+        min-width="130"
         label="生产订单号">
       </el-table-column>
       <el-table-column
         prop="lotSize"
         header-align="center"
         align="right"
-        width="80"
+        min-width="80"
         label="订单数量">
       </el-table-column>
       <el-table-column
         prop="scheduledQty"
         header-align="center"
         align="right"
-        width="80"
+        min-width="80"
         label="已派工数量">
       </el-table-column>
-      <el-table-column
-        prop="qtyReported"
-        header-align="center"
-        align="right"
-        width="80"
-        label="已报工数量">
-      </el-table-column>
-      <el-table-column
-        prop="qtyApprove"
-        header-align="center"
-        align="right"
-        width="80"
-        label="合格数量">
-      </el-table-column>
+<!--      <el-table-column-->
+<!--        prop="qtyReported"-->
+<!--        header-align="center"-->
+<!--        align="right"-->
+<!--        width="80"-->
+<!--        label="已报工数量">-->
+<!--      </el-table-column>-->
+<!--      <el-table-column-->
+<!--        prop="qtyApprove"-->
+<!--        header-align="center"-->
+<!--        align="right"-->
+<!--        width="80"-->
+<!--        label="合格数量">-->
+<!--      </el-table-column>-->
       <el-table-column
         prop="machSetupTime"
         header-align="center"
         align="right"
-        width="80"
+        min-width="80"
         label="调机时间">
       </el-table-column>
       <el-table-column
         prop="machRunFactor"
         header-align="center"
         align="right"
-        width="80"
+        min-width="80"
         label="单位产出量">
       </el-table-column>
       <el-table-column
         prop="factorUnit"
         header-align="center"
         align="left"
-        width="80"
+        min-width="80"
         label="产出单位">
       </el-table-column>
     </el-table>
@@ -399,8 +399,6 @@
           "计划日期": "orderDate",
           "日计划数量": "lotSize",
           "已派工数量": "scheduledQty",
-          "已报工数量": "qtyReported",
-          "合格数量": "qtyApprove",
           "生产订单号": "orderRef1",
           "调机时间": "machSetupTime",
           "单位产出量": "machRunFactor",