From 76b6ceb32376db26dc2c72316e5e5e4484ea09ff Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Mon, 5 Dec 2022 17:56:02 +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/inspect.js                 |  1 +
 .../modules/board/productionBlankingBoard.vue |  6 +-
 src/views/modules/production/cancelSfdc.vue   | 94 +------------------
 .../modules/production/generateReport.vue     |  6 +-
 src/views/modules/production/inspect.vue      | 30 +++++-
 5 files changed, 39 insertions(+), 98 deletions(-)

diff --git a/src/api/production/inspect.js b/src/api/production/inspect.js
index c492d72..8b2b895 100644
--- a/src/api/production/inspect.js
+++ b/src/api/production/inspect.js
@@ -5,3 +5,4 @@ export const getInspectData = data => createAPI(`inspect/getInspectData`, 'post'
 export const inspectSave = data => createAPI(`inspect/inspectSave`, 'post', data);
 export const inspectPrint = data => createAPI(`inspect/inspectPrint`, 'post', data);
 export const cancelInspect = data => createAPI(`inspect/cancelInspect`, 'post', data);
+export const cancelInspectResult = data => createAPI(`inspect/cancelInspectResult`, 'post', data);
diff --git a/src/views/modules/board/productionBlankingBoard.vue b/src/views/modules/board/productionBlankingBoard.vue
index f184a3f..ec825a8 100644
--- a/src/views/modules/board/productionBlankingBoard.vue
+++ b/src/views/modules/board/productionBlankingBoard.vue
@@ -34,14 +34,14 @@
           prop="partDescSpec"
           header-align="center"
           align="left"
-          min-width="105"
+          min-width="102"
           label="硫化产品名称">
         </el-table-column>
         <el-table-column
           prop="compPartDescSpec"
           header-align="center"
           align="left"
-          min-width="105"
+          min-width="102"
           label="混炼胶名称">
         </el-table-column>
         <el-table-column
@@ -83,7 +83,7 @@
           prop="planStartDate"
           header-align="center"
           align="center"
-          min-width="45"
+          min-width="50"
           label="需求日期">
         </el-table-column>
       </el-table>
diff --git a/src/views/modules/production/cancelSfdc.vue b/src/views/modules/production/cancelSfdc.vue
index b034181..482b8bf 100644
--- a/src/views/modules/production/cancelSfdc.vue
+++ b/src/views/modules/production/cancelSfdc.vue
@@ -97,79 +97,6 @@
         </template>
       </el-table-column>
     </el-table>
-    <el-dialog title="操作员明细" :close-on-click-modal="false" v-drag :visible.sync="operatorModalFlag" width="450px">
-      <el-table
-        height="200"
-        :data="operatorModalList"
-        border
-        style="width: 100%">
-        <el-table-column
-          type="index"
-          header-align="center"
-          align="right"
-          min-width="60"
-          label="序号">
-        </el-table-column>
-        <el-table-column
-          prop="operatorID"
-          header-align="center"
-          align="left"
-          min-width="100"
-          label="操作员ID">
-        </el-table-column>
-        <el-table-column
-          prop="operatorName"
-          header-align="center"
-          align="left"
-          min-width="120"
-          label="操作员姓名">
-        </el-table-column>
-      </el-table>
-      <el-footer style="height:40px;margin-top: 10px;text-align:center">
-        <el-button type="primary" @click="operatorModalFlag = false">关闭</el-button>
-      </el-footer>
-    </el-dialog>
-    <el-dialog title="不良原因" :close-on-click-modal="false" v-drag :visible.sync="defectModalFlag" width="450px">
-      <el-table
-        height="200"
-        :data="defectModalList"
-        border
-        style="width: 100%">
-        <el-table-column
-          type="index"
-          header-align="center"
-          align="right"
-          min-width="60"
-          label="序号">
-        </el-table-column>
-        <el-table-column
-          prop="defectCode"
-          header-align="center"
-          align="left"
-          min-width="100"
-          label="不良代码">
-        </el-table-column>
-        <el-table-column
-          prop="defectDesc"
-          header-align="center"
-          align="left"
-          min-width="120"
-          label="不良原因">
-        </el-table-column>
-        <el-table-column
-          prop="defectQty"
-          header-align="center"
-          align="right"
-          min-width="120"
-          label="不良数量">
-        </el-table-column>
-      </el-table>
-      <el-footer style="height:40px;margin-top: 10px;text-align:center">
-        <el-button type="primary" @click="defectModalFlag = false">关闭</el-button>
-      </el-footer>
-    </el-dialog>
-
-
     <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>
   </div>
 </template>
@@ -184,9 +111,9 @@
 
 
   export default {
-    name: 'searchSOScheduleRouting',
+    name: 'cancelSfdc',
     components: {
-      Chooselist,column
+      Chooselist
     },
     data () {
       return {
@@ -506,12 +433,6 @@
           }
         ],
         visible:false,
-        queryTable: {
-          userId: this.$store.state.user.name,
-          functionId: this.$route.meta.menuId,
-          tableId: "sfdcList",
-          languageCode: this.$i18n.locale
-        },
         // 导出 end
         height: 200,
         tableData: [],
@@ -527,10 +448,6 @@
           resourceId:'',
           shiftNo:'',
         },
-        operatorModalList:[],
-        operatorModalFlag:false,
-        defectModalList:[],
-        defectModalFlag:false,
       }
     },
     mounted () {
@@ -634,12 +551,7 @@
         return Y + M + D + H + MM + S;
 
       },
-      userSetting() {
-        this.visible = true;
-        this.$nextTick(() => {
-          this.$refs.column.init(this.queryTable);
-        });
-      },
+
 
     },
     created () {
diff --git a/src/views/modules/production/generateReport.vue b/src/views/modules/production/generateReport.vue
index 314f3be..33467dc 100644
--- a/src/views/modules/production/generateReport.vue
+++ b/src/views/modules/production/generateReport.vue
@@ -989,7 +989,7 @@
       },
       KGReportedBlur(){
         if(this.qty3&&this.qty3!=0&&this.qty3!='erp未维护数据'&&this.KGReported!=''){
-          this.saveHeaderData.qtyUnApprove=(this.KGReported/this.qty3).toFixed(1)
+          this.saveHeaderData.qtyUnApprove=(this.KGReported/this.qty3).toFixed(0)
         }
         if(this.KGReported==''){
           this.saveHeaderData.qtyUnApprove=''
@@ -997,7 +997,7 @@
       },
       KGApproveBlur(){
         if(this.qty3&&this.qty3!=0&&this.qty3!='erp未维护数据'&&this.KGApprove!=''){
-          this.saveHeaderData.qtyApprove=(this.KGApprove/this.qty3).toFixed(1)
+          this.saveHeaderData.qtyApprove=(this.KGApprove/this.qty3).toFixed(0)
           this.moQty=''
         }
         if(this.KGApprove==''){
@@ -1006,7 +1006,7 @@
       },
       KGReworkBlur(){
         if(this.qty3&&this.qty3!=0&&this.qty3!='erp未维护数据'&&this.KGRework!=''){
-          this.saveHeaderData.qtyRework=(this.KGRework/this.qty3).toFixed(1)
+          this.saveHeaderData.qtyRework=(this.KGRework/this.qty3).toFixed(0)
         }
         if(this.KGRework==''){
           this.saveHeaderData.qtyRework=''
diff --git a/src/views/modules/production/inspect.vue b/src/views/modules/production/inspect.vue
index e13030c..6a29d36 100644
--- a/src/views/modules/production/inspect.vue
+++ b/src/views/modules/production/inspect.vue
@@ -91,8 +91,9 @@
         fixed="left"
         label="操作">
         <template slot-scope="scope" class="foo_container">
-          <a v-if="scope.row.needReceiveFlag=='N'" type="text" size="small" @click="inspectModal(scope.row)">检验</a>
+          <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=='硫化检验单'&&scope.row.inspectedFlag=='N'" type="text" size="small" @click="cancelInspect(scope.row)">删除检验单</a>
         </template>
       </el-table-column>
@@ -225,6 +226,7 @@
           <el-select v-model="inspectData.inspectResult" style="width: 120px">
             <el-option label="合格" value="合格"></el-option>
             <el-option label="不合格" value="不合格"></el-option>
+            <el-option label="让步接收" value="让步接收"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="检验备注">
@@ -247,6 +249,7 @@
     inspectSave,
     inspectPrint,
     cancelInspect,
+    cancelInspectResult,
   } from '@/api/production/inspect.js'
   import Chooselist from '@/views/modules/common/Chooselist'
   import {
@@ -410,6 +413,31 @@
           }
         })
       },
+      cancelInspectResult(row){
+        this.$confirm(`是否取消检验结果?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          cancelInspectResult(row).then(({data}) => {
+            if (data && data.code === 0) {
+              this.search ();
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                }
+              })
+            }else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        }).catch(() => {
+        })
+      },
       cancelInspect(row){
         this.$confirm(`是否删除这条检验单?`, '提示', {
           confirmButtonText: '确定',