From 18bbb57a7b3de94b24041e7713037e6adfb98cc2 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Sun, 12 Nov 2023 15:15:56 +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/production/cancelSfdc.vue   | 55 ++++++++++++--
 .../production/cancelSfdcForWareHouse.vue     | 55 ++++++++++++--
 .../modules/production/closeSchedule.vue      |  2 +-
 .../modules/production/generateReport.vue     | 71 +++++++------------
 src/views/modules/production/searchSfdc.vue   | 39 +++++++---
 5 files changed, 152 insertions(+), 70 deletions(-)

diff --git a/src/views/modules/production/cancelSfdc.vue b/src/views/modules/production/cancelSfdc.vue
index 5ae0478..be45139 100644
--- a/src/views/modules/production/cancelSfdc.vue
+++ b/src/views/modules/production/cancelSfdc.vue
@@ -454,12 +454,29 @@
           }, {
             tableId: "sfdcList",
             tableName: this.$route.meta.title,
-            columnProp: "defectDesc",
-            columnLabel: "不良处理方式",
+            columnProp: "scrapQty",
+            columnLabel: "报废数量",
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
-            columnWidth: 85,
+            columnWidth: 60,
+            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,
+            columnProp: "scrapRemark",
+            columnLabel: "报废原因",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 100,
             format: null,
             functionId: this.$route.meta.menuId,
             sortLv: 0,
@@ -471,12 +488,29 @@
           }, {
             tableId: "sfdcList",
             tableName: this.$route.meta.title,
-            columnProp: "defectRemark",
-            columnLabel: "不良处理备注",
+            columnProp: "acceptQty",
+            columnLabel: "瑕疵数量",
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
-            columnWidth: 150,
+            columnWidth: 60,
+            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,
+            columnProp: "acceptRemark",
+            columnLabel: "瑕疵原因",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 100,
             format: null,
             functionId: this.$route.meta.menuId,
             sortLv: 0,
@@ -673,12 +707,19 @@
         })
       },
       cancelSfdc(row){
+        let inData={
+          site:row.site,
+          orderNo:row.orderNo,
+          itemNo:row.itemNo,
+          seqNo:row.seqNo,
+          userName:this.$store.state.user.name
+        }
         this.$confirm(`确定取消此报工记录`, '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          cancelSfdc(row).then(({data}) => {
+          cancelSfdc(inData).then(({data}) => {
             if (data && data.code === 0) {
               this.search ();
               this.$message({
diff --git a/src/views/modules/production/cancelSfdcForWareHouse.vue b/src/views/modules/production/cancelSfdcForWareHouse.vue
index 101fb29..ccaf3c4 100644
--- a/src/views/modules/production/cancelSfdcForWareHouse.vue
+++ b/src/views/modules/production/cancelSfdcForWareHouse.vue
@@ -395,12 +395,29 @@
           }, {
             tableId: "sfdcList",
             tableName: this.$route.meta.title,
-            columnProp: "defectDesc",
-            columnLabel: "不良处理方式",
+            columnProp: "scrapQty",
+            columnLabel: "报废数量",
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
-            columnWidth: 85,
+            columnWidth: 60,
+            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,
+            columnProp: "scrapRemark",
+            columnLabel: "报废原因",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 100,
             format: null,
             functionId: this.$route.meta.menuId,
             sortLv: 0,
@@ -412,12 +429,29 @@
           }, {
             tableId: "sfdcList",
             tableName: this.$route.meta.title,
-            columnProp: "defectRemark",
-            columnLabel: "不良处理备注",
+            columnProp: "acceptQty",
+            columnLabel: "瑕疵数量",
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
-            columnWidth: 150,
+            columnWidth: 60,
+            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,
+            columnProp: "acceptRemark",
+            columnLabel: "瑕疵原因",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 100,
             format: null,
             functionId: this.$route.meta.menuId,
             sortLv: 0,
@@ -611,12 +645,19 @@
         })
       },
       cancelSfdc(row){
+        let inData={
+          site:row.site,
+          orderNo:row.orderNo,
+          itemNo:row.itemNo,
+          seqNo:row.seqNo,
+          userName:this.$store.state.user.name,
+        }
         this.$confirm(`确定取消此报工记录`, '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          cancelSfdc(row).then(({data}) => {
+          cancelSfdc(inData).then(({data}) => {
             if (data && data.code === 0) {
               this.search ();
               this.$message({
diff --git a/src/views/modules/production/closeSchedule.vue b/src/views/modules/production/closeSchedule.vue
index 22e35d2..a7b7c69 100644
--- a/src/views/modules/production/closeSchedule.vue
+++ b/src/views/modules/production/closeSchedule.vue
@@ -109,7 +109,7 @@
         label="操作">
         <template slot-scope="scope" class="foo_container">
           <a v-if="scope.row.circulationSeqNo===null&&scope.row.closedFlag=='N'"  type="text" size="small" @click="circulation(scope.row)">流转</a>
-          <a v-if="scope.row.circulationSeqNo===null&&scope.row.closedFlag=='N'"  type="text" size="small" @click="closeSchedule(scope.row)">关闭派工单</a>
+          <a v-if="scope.row.circulationSeqNo===null&&scope.row.closedFlag=='N'"  type="text" size="small" @click="closeSchedule(scope.row)">结束派工单</a>
           <a v-if="scope.row.circulationSeqNo!=null" type="text" size="small" >派工单已流转</a>
         </template>
       </el-table-column>
diff --git a/src/views/modules/production/generateReport.vue b/src/views/modules/production/generateReport.vue
index ced742d..8923e5a 100644
--- a/src/views/modules/production/generateReport.vue
+++ b/src/views/modules/production/generateReport.vue
@@ -487,33 +487,20 @@
       </el-form>
       <fieldset class="customer-fieldset" style="width: 597px;margin-left: -3px;">
         <legend class="customer-legend">不良处理</legend>
-<!--        <el-form :inline="true" label-position="top">-->
-<!--          <el-form-item>-->
-<!--            <span slot="label" style="" @click="getBaseList(26 ,2)"><a herf="#">操作员</a></span>-->
-<!--            <el-input style="width: 178px;"  v-model="saveHeaderData.operatorId2"></el-input>-->
-<!--          </el-form-item>-->
-<!--          <el-form-item label="操作员姓名">-->
-<!--            <el-input style="width: 178px;"  v-model="saveHeaderData.operatorIdName2"></el-input>-->
-<!--          </el-form-item>-->
-<!--          <el-form-item label="报废原因">-->
-<!--            <el-input style="width: 178px;"  v-model="saveHeaderData.scrapReason"></el-input>-->
-<!--          </el-form-item>-->
-<!--        </el-form>-->
         <el-form :inline="true" label-position="top">
-          <el-form-item label="处理方式">
-            <el-select v-model="saveHeaderData.badCodeNo" style="width: 120px"
-                       placeholder="请选择">
-              <el-option label="无" value=""></el-option>
-              <el-option v-for="item in badCodeList " :key="index" :label="item.defectDesc"
-                         :value="item.defectCode">
-              </el-option>
-            </el-select>
+          <el-form-item label="报废数量">
+            <el-input style="width: 80px;" type="number"  v-model="saveHeaderData.scrapQty"></el-input>
           </el-form-item>
-          <el-form-item label="让步接收数量">
-            <el-input style="width: 120px;" type="number"  v-model="saveHeaderData.badQty"></el-input>
+          <el-form-item label="报废原因">
+            <el-input style="width: 480px;"  v-model="saveHeaderData.scrapRemark"></el-input>
           </el-form-item>
-          <el-form-item label="不良原因">
-            <el-input style="width: 300px;"  v-model="saveHeaderData.badRemark"></el-input>
+        </el-form>
+        <el-form :inline="true" label-position="top">
+          <el-form-item label="接收数量">
+            <el-input style="width: 80px;" type="number"  v-model="saveHeaderData.acceptQty"></el-input>
+          </el-form-item>
+          <el-form-item label="瑕疵原因">
+            <el-input style="width: 480px;"  v-model="saveHeaderData.acceptRemark"></el-input>
           </el-form-item>
         </el-form>
       </fieldset>
@@ -639,8 +626,10 @@
         tvId:'',
         badCodeList:'',
         saveHeaderData: {
-          badCodeNo:'',
-          badRemark:'',
+          scrapQty:0,
+          scrapRemark:'',
+          acceptQty:'',
+          acceptRemark:0,
           wasteWeight:0,
           printQty:'',
           boxWeight:0,
@@ -676,7 +665,6 @@
           reportWeight:'',
           approveWeight:'',
           moldQty:'',
-          badQty:'',
         },
         scanSeqNo:'',
         previousSeqNo:'',
@@ -833,20 +821,7 @@
           })
           return
         }
-         if (this.saveHeaderData.badCodeNo == 'PQ003' ) {
-           if(this.saveHeaderData.badQty==''||this.saveHeaderData.badQty==null||this.saveHeaderData.badQty<=0){
-             this.$alert('让步接收数量必须大于0！', '错误信息', {
-               confirmButtonText: '确定'
-             })
-             return
-           }
-           if(this.saveHeaderData.badQty>this.saveHeaderData.qtyUnApprove){
-             this.$alert('让步接收数量不能大于不合格数量！', '错误信息', {
-               confirmButtonText: '确定'
-             })
-             return
-           }
-         }
+
          if(this.saveHeaderData.printQty>30){
            this.$alert('打印标签数最多为30张！', '错误信息', {
              confirmButtonText: '确定'
@@ -870,6 +845,13 @@
           this.saveHeaderData.reportWeight=Number(this.KGApprove)-boxWeightKG+Number(this.KGReported)
         }
          this.setUp.saveButton=true;
+
+        if(this.saveHeaderData.scrapQty==null||this.saveHeaderData.scrapQty==''){
+          this.saveHeaderData.scrapQty=0
+        }
+         if(this.saveHeaderData.acceptQty==null||this.saveHeaderData.acceptQty==''){
+           this.saveHeaderData.acceptQty=0
+         }
          saveGenerateReportForSchedule(this.saveHeaderData).then(({data}) => {
           if (data.code == 0) {
             this.$message.success(data.msg)
@@ -1138,9 +1120,10 @@
             this.KGRework=0
             this.saveHeaderData.qtyApprove=0
             this.saveHeaderData.qtyUnApprove=0
-            this.saveHeaderData.badCodeNo=''
-            this.saveHeaderData.badRemark= ''
-            this.saveHeaderData.badQty= 0
+            this.saveHeaderData.acceptRemark= ''
+            this.saveHeaderData.acceptQty= 0
+            this.saveHeaderData.scrapRemark= ''
+            this.saveHeaderData.scrapQty= 0
             this.saveHeaderData.qtyRework=0
             this.saveHeaderData.moldQty=0
             this.saveHeaderData.reportWeight=0
diff --git a/src/views/modules/production/searchSfdc.vue b/src/views/modules/production/searchSfdc.vue
index 33f8ca8..8c4937e 100644
--- a/src/views/modules/production/searchSfdc.vue
+++ b/src/views/modules/production/searchSfdc.vue
@@ -81,7 +81,7 @@
         width="100"
         label="操作">
         <template slot-scope="scope" class="foo_container">
-          <a type="text" size="small" v-if="scope.row.defectCode==='PQ003'" @click="printCard(scope.row)">让步接收标签</a>
+          <a type="text" size="small" v-if="scope.row.acceptQty>0" @click="printCard(scope.row)">让步接收标签</a>
         </template>
       </el-table-column>
       <el-table-column
@@ -455,12 +455,12 @@
           }, {
             tableId: "sfdcList",
             tableName: this.$route.meta.title,
-            columnProp: "defectDesc",
-            columnLabel: "不良处理方式",
+            columnProp: "scrapQty",
+            columnLabel: "报废数量",
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
-            columnWidth: 85,
+            columnWidth: 60,
             format: null,
             functionId: this.$route.meta.menuId,
             sortLv: 0,
@@ -468,16 +468,16 @@
             fixed: '',
             serialNumber: null,
             columnType: null,
-            align: 'left'
+            align: 'right'
           }, {
             tableId: "sfdcList",
             tableName: this.$route.meta.title,
-            columnProp: "defectQty",
-            columnLabel: "处理数量",
+            columnProp: "scrapRemark",
+            columnLabel: "报废原因",
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
-            columnWidth: 85,
+            columnWidth: 100,
             format: null,
             functionId: this.$route.meta.menuId,
             sortLv: 0,
@@ -489,12 +489,29 @@
           }, {
             tableId: "sfdcList",
             tableName: this.$route.meta.title,
-            columnProp: "defectRemark",
-            columnLabel: "不良处理原因",
+            columnProp: "acceptQty",
+            columnLabel: "瑕疵数量",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 60,
+            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,
+            columnProp: "acceptRemark",
+            columnLabel: "瑕疵原因",
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
-            columnWidth: 150,
+            columnWidth: 100,
             format: null,
             functionId: this.$route.meta.menuId,
             sortLv: 0,