From 37b255afa2d20d3b1e660fe62a1ed8080644fbc8 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Thu, 13 Apr 2023 17:24:40 +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/pad/padPartAttribute.vue    |  4 +-
 src/views/modules/production/cancelSfdc.vue   | 19 ++++++++-
 .../production/cancelSfdcForWareHouse.vue     | 17 ++++++++
 .../modules/production/generateReport.vue     | 11 ++++-
 src/views/modules/production/inspect.vue      |  3 +-
 src/views/modules/production/searchSfdc.vue   | 19 ++++++++-
 .../modules/production/transFerPrint.vue      | 41 +++++++++++++++----
 7 files changed, 98 insertions(+), 16 deletions(-)

diff --git a/src/views/modules/pad/padPartAttribute.vue b/src/views/modules/pad/padPartAttribute.vue
index c07e6de..3054434 100644
--- a/src/views/modules/pad/padPartAttribute.vue
+++ b/src/views/modules/pad/padPartAttribute.vue
@@ -93,7 +93,7 @@
           border
           style="width: 100%;margin-top: 20px">
           <el-table-column
-            prop="partNo"
+            prop="componentPartNo"
             header-align="center"
             align="left"
             min-width="60"
@@ -118,7 +118,7 @@
             header-align="center"
             align="right"
             min-width="30"
-            label="单位用量">
+            label="单位用量/比例">
           </el-table-column>
           <el-table-column
             prop="qtyFixedScrapt"
diff --git a/src/views/modules/production/cancelSfdc.vue b/src/views/modules/production/cancelSfdc.vue
index 54dbb7c..bfcb0d3 100644
--- a/src/views/modules/production/cancelSfdc.vue
+++ b/src/views/modules/production/cancelSfdc.vue
@@ -8,7 +8,7 @@
         <el-input v-model="searchData.orderNo" style="width: 130px"></el-input>
       </el-form-item>
       <el-form-item :label="'加工中心编码'">
-        <el-input v-model="searchData.workCenterNo" style="width: 130px"></el-input>
+        <el-input v-model="searchData.workCenterNo" style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item >
         <span slot="label" style="" @click="getBaseList(5)"><a herf="#">产品编码</a></span>
@@ -450,6 +450,23 @@
             serialNumber: null,
             columnType: null,
             align: 'right'
+          }, {
+            tableId: "sfdcList",
+            tableName: this.$route.meta.title,
+            columnProp: "stopTime",
+            columnLabel: "暂停时间",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 70,
+            format: null,
+            functionId: this.$route.meta.menuId,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'right'
           }, {
             tableId: "sfdcList",
             tableName: this.$route.meta.title,
diff --git a/src/views/modules/production/cancelSfdcForWareHouse.vue b/src/views/modules/production/cancelSfdcForWareHouse.vue
index fd95a1b..93d398e 100644
--- a/src/views/modules/production/cancelSfdcForWareHouse.vue
+++ b/src/views/modules/production/cancelSfdcForWareHouse.vue
@@ -393,6 +393,23 @@
             serialNumber: null,
             columnType: null,
             align: 'right'
+          }, {
+            tableId: "sfdcList",
+            tableName: this.$route.meta.title,
+            columnProp: "stopTime",
+            columnLabel: "暂停时间",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 70,
+            format: null,
+            functionId: this.$route.meta.menuId,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'right'
           }, {
             tableId: "sfdcList",
             tableName: this.$route.meta.title,
diff --git a/src/views/modules/production/generateReport.vue b/src/views/modules/production/generateReport.vue
index 256a914..d7606ad 100644
--- a/src/views/modules/production/generateReport.vue
+++ b/src/views/modules/production/generateReport.vue
@@ -758,6 +758,12 @@
           })
           return
         }
+         if(this.saveHeaderData.printQty>30){
+           this.$alert('打印标签数最多为30张！', '错误信息', {
+             confirmButtonText: '确定'
+           })
+           return
+         }
         if(this.moQty==null||this.moQty==''){
           this.saveHeaderData.moldQty=0
         }else {
@@ -769,9 +775,10 @@
         }
         if(this.KGApprove!=null&&this.KGApprove!=''&&this.KGApprove>=0){
           this.saveHeaderData.approveWeight=Number(this.KGApprove)-boxWeightKG
-          if(this.KGReported!=null&&this.KGReported!=''&&this.KGReported>=0){
-            this.saveHeaderData.reportWeight=Number(this.KGApprove)-boxWeightKG+Number(this.KGReported)
+          if(this.KGReported!=null&&this.KGReported!=''){
+            this.KGReported=0
           }
+          this.saveHeaderData.reportWeight=Number(this.KGApprove)-boxWeightKG+Number(this.KGReported)
         }
          saveGenerateReportForSchedule(this.saveHeaderData).then(({data}) => {
           if (data.code == 0) {
diff --git a/src/views/modules/production/inspect.vue b/src/views/modules/production/inspect.vue
index f252b9a..e158e2e 100644
--- a/src/views/modules/production/inspect.vue
+++ b/src/views/modules/production/inspect.vue
@@ -497,9 +497,10 @@
         inspectSave(this.inspectData).then(({data}) => {
           if (data && data.code === 0) {
             this.search ();
+            debugger
             let printData=data.row
             printData.userId=this.$store.state.user.name
-            if(printData.toTypeFlagDb!='S'){
+            if(this.inspectData.toTypeFlagDb=='S'){
               let array=[];
               array.push(printData)
               printInspectStockLabel(array)
diff --git a/src/views/modules/production/searchSfdc.vue b/src/views/modules/production/searchSfdc.vue
index 360309d..f2f5736 100644
--- a/src/views/modules/production/searchSfdc.vue
+++ b/src/views/modules/production/searchSfdc.vue
@@ -8,7 +8,7 @@
         <el-input v-model="searchData.orderNo" style="width: 130px"></el-input>
       </el-form-item>
       <el-form-item :label="'加工中心编码'">
-        <el-input v-model="searchData.workCenterNo" style="width: 130px"></el-input>
+        <el-input v-model="searchData.workCenterNo" style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item >
         <span slot="label" style="" @click="getBaseList(5)"><a herf="#">产品编码</a></span>
@@ -438,6 +438,23 @@
             serialNumber: null,
             columnType: null,
             align: 'right'
+          }, {
+            tableId: "sfdcList",
+            tableName: this.$route.meta.title,
+            columnProp: "stopTime",
+            columnLabel: "暂停时间",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 70,
+            format: null,
+            functionId: this.$route.meta.menuId,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'right'
           }, {
             tableId: "sfdcList",
             tableName: this.$route.meta.title,
diff --git a/src/views/modules/production/transFerPrint.vue b/src/views/modules/production/transFerPrint.vue
index 9151748..959624f 100644
--- a/src/views/modules/production/transFerPrint.vue
+++ b/src/views/modules/production/transFerPrint.vue
@@ -30,6 +30,21 @@
       </el-form-item>
       <el-form-item :label="' '">
         <el-button @click="search()" style="margin-left: 0px;margin-top:0px" type="primary">查询</el-button>
+        <download-excel
+          :fields="exportDataStandard"
+          :data="tableData"
+          type="xlsx"
+          :name="exportName"
+          :header="exportHeader"
+          :footer="exportFooter"
+          :defaultValue="exportDefaultValue"
+          :fetch="createExportData"
+          :before-generate="startDownload"
+          :before-finish="finishDownload"
+          worksheet="导出信息"
+          class="el-button el-button--primary el-button--medium">
+          {{'导出'}}
+        </download-excel>
       </el-form-item>
     </el-form>
     <el-table
@@ -71,14 +86,6 @@
         style="font-size: 20px"
         label="生产订单号">
       </el-table-column>
-      <el-table-column
-        prop="site"
-        header-align="center"
-        align="left"
-        min-width="65"
-        style="font-size: 20px"
-        label="工厂编号">
-      </el-table-column>
       <el-table-column
         prop="transDate"
         header-align="center"
@@ -138,7 +145,23 @@
     },
     data () {
       return {
-
+        // 导出 start
+        exportData: [],
+        exportDataStandard: {
+          "工厂编号": "site",
+          "入库通知单号": "transNo",
+          "生产订单": "orderNo",
+          "报工日期": "transDate",
+          "产品编号": "partNo",
+          "产品名称": "partDesc",
+          "通知单数量": "transQty",
+          "派工单号": "seqNo",
+        },
+        exportName: "入库通知单"+this.getStrDate(),
+        exportHeader: ["入库通知单"],
+        exportFooter: [],
+        exportDefaultValue: "",
+        // 导出 end
         site: this.$store.state.user.site,
         operatorType: 0,