From 175ea4fa71efbdbd896ce30d50ffd14232e215bd Mon Sep 17 00:00:00 2001
From: rui_li <877258667@qq.com>
Date: Tue, 28 Dec 2021 17:25:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=91=8A=E4=B8=8D=E8=89=AF=E7=9A=84?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/yieldReport/com_defect_roll.js        |  11 ++
 .../modules/yieldReport/com_defect_roll.vue   | 129 +++++++++++++-----
 .../modules/yieldReport/com_produce_down.vue  |   4 +-
 .../yieldReport/com_produce_report_normal.vue |   4 +-
 4 files changed, 109 insertions(+), 39 deletions(-)
 create mode 100644 src/api/yieldReport/com_defect_roll.js

diff --git a/src/api/yieldReport/com_defect_roll.js b/src/api/yieldReport/com_defect_roll.js
new file mode 100644
index 0000000..21f3f2f
--- /dev/null
+++ b/src/api/yieldReport/com_defect_roll.js
@@ -0,0 +1,11 @@
+import { createAPI } from '@/utils/httpRequest.js'
+
+//查询派工单的不良信息
+export const getScheduleDefectHist = data => createAPI('schedule/getScheduleDefectHist', 'POST', data)
+
+// 获取不良代码的信息
+export const checkDefectCode = data => createAPI('schedule/checkDefectCode', 'POST', data)
+
+// 获取不良代码的信息
+export const reportDefectCode = data => createAPI('schedule/reportDefectCode', 'POST', data)
+
diff --git a/src/views/modules/yieldReport/com_defect_roll.vue b/src/views/modules/yieldReport/com_defect_roll.vue
index d586c24..fc444f8 100644
--- a/src/views/modules/yieldReport/com_defect_roll.vue
+++ b/src/views/modules/yieldReport/com_defect_roll.vue
@@ -9,17 +9,18 @@
             <el-row>
               <el-col :span="6">
                 <el-form-item :label="'不良代码:'">
-                  <el-input v-model="scheduleData.seqNo" style="width: 120px"></el-input>
+                  <el-input ref="defectCode" v-model="pageData.defectCode"
+                            style="width: 120px" @keyup.enter.native="getDefectDesc" ></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item :label="'不良数量:'">
-                  <el-input v-model="scheduleData.seqNo" style="width: 120px"></el-input>
+                  <el-input v-model="pageData.defectQty" style="width: 120px"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item :label="'检验日期:'">
-                  <el-date-picker v-model="scheduleData.reportDate"
+                  <el-date-picker v-model="pageData.reportDate"
                                   style="width: 120px"  format="yyyy-MM-dd"
                                   value-format="yyyy-MM-dd">
                   </el-date-picker>
@@ -29,7 +30,7 @@
             <el-row>
               <el-col :span="18">
                 <el-form-item :label="'不良原因:'">
-                  <el-input v-model="scheduleData.seqNo" style="width: 495px"></el-input>
+                  <el-input readonly v-model="pageData.defectDesc" style="width: 495px"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -50,8 +51,8 @@
             <el-row>
               <el-col :span="6">
                 <el-form-item style="margin-top: 15px;">
-                  <el-button type="primary"
-                             style="margin-left: -10px; margin-bottom: 5px;">
+                  <el-button type="primary" style="margin-left: -10px; margin-bottom: 5px;"
+                  @click="reportDefectFun">
                     插入</el-button>
                 </el-form-item>
               </el-col>
@@ -74,7 +75,7 @@
       <el-container>
         <fieldset class="customer-fieldset" style="margin-top: -35px; margin-bottom: 15px;">
           <legend>不良记录</legend>
-          <el-container style="width: 580px;">
+          <el-container style="width: 580px;" class="customer-tab">
             <el-table
               height="250"
               :data="sfdcDefectList"
@@ -109,35 +110,53 @@
 </template>
 
 <script>
+import {
+  getScheduleDefectHist,
+  checkDefectCode,
+  reportDefectCode,
+}
+from '@/api/yieldReport/com_defect_roll.js';
 export default {
   name: "com_defect_roll",
   data() {
     return {
       titleCon: '报告不良',
-      sfdcTimeList: [],
       scheduleData: {
         site: this.$store.state.user.site,
         userName: this.$store.state.user.name,
         seqNo: '',
         orderNo: '',
+        itemNo: 0,
         partNo: '',
+        workCenterNo: '',
+        workCenterDesc: '',
+        resourceDesc: '',
         rollNo: '',
         partDesc: '',
-        reportDate: this.dayjs(new Date()).format('YYYY-MM-DD'),
-        reportedFlag: 'N',
+        planStartTime: '',
+        planFinishTime: '',
         qtyRequiredOriginal: 0,
         scheduledDate: '',
         shiftNo: '',
         preItemDesc: '',
         nextItemDesc: '',
         nextItemNo: 0,
+        operatorId: '',
+        functionName: '',
         currentRollFlag: false
       },
-      currentRollOps: {
+      pageData: {
         site: this.$store.state.user.site,
+        userName: this.$store.state.user.name,
+        orderNo: '',
+        itemNo: '',
         seqNo: '',
         rollNo: '',
-        finishedFlag: '',
+        operatorId: '',
+        reportDate: this.dayjs(new Date()).format('YYYY-MM-DD'),
+        defectCode: '',
+        defectDesc: '',
+        defectQty: 0,
       },
       operatorData: {
         site: this.$store.state.user.site,
@@ -277,29 +296,79 @@ export default {
           fixed: false
         }
       ],
-      buttonTags:{
-        createRollFlag: true,
-        switchRollFlag: true,
-        separatorRollFlag: true,
-        finishRollFlag: true,
-        mergeRollFlag: true,
-        tuningFlag: true,
-        produceFlag: true,
-        defectFlag: true,
-        toolFlag: true,
-        materialFlag: true,
-        downTimeFlag: true
-      },
       dataListLoading: false,
     }
   },
   methods: {
 
+    //初始化组件的参数
+    init(scheduleData, operatorData) {
+      //初始化参数
+      this.scheduleData = scheduleData;
+      //初始化操作员对象
+      this.operatorData = JSON.parse(JSON.stringify(operatorData));
+      //设置参数
+      this.pageData.orderNo = scheduleData.orderNo;
+      this.pageData.itemNo = scheduleData.itemNo;
+      this.pageData.seqNo = scheduleData.seqNo;
+      this.pageData.rollNo = scheduleData.rollNo;
+      this.pageData.operatorId = operatorData.operatorId;
+      //清空数据
+      this.pageData.defectQty = 0;
+      this.pageData.defectCode = '';
+      this.pageData.defectDesc = '';
+      //自动获取焦点
+      this.$nextTick(() => {
+        this.$refs.defectCode.focus();
+      });
+      //刷新当前不良记录列表
+      this.refreshPageTable();
+    },
+
     /*关闭modal*/
     closeDialog(){
       this.$emit('update:visible', false);
     },
 
+    /*刷新页面的table数据*/
+    refreshPageTable(){
+      getScheduleDefectHist(this.pageData).then(({data}) => {
+        this.sfdcDefectList = data.rows;
+      });
+    },
+
+    /*检查不良代码*/
+    getDefectDesc(){
+      if(this.pageData.defectCode == null || this.pageData.defectCode == ''){
+        this.$message.error('请扫描不良代码!');
+        return false;
+      }
+      checkDefectCode(this.pageData).then(({data}) => {
+        //判断是否存在异常
+        if(data.code == 500){
+          this.$message.error(data.msg);
+        }else{
+          let resultMap = data.resultMap;
+          this.pageData.defectDesc = resultMap.defectDesc;
+        }
+      })
+    },
+
+    /*报告不良代码*/
+    reportDefectFun(){
+      reportDefectCode(this.pageData).then(({data}) => {
+        if(data.code == 500){
+          this.$message.error(data.msg);
+        }else{
+         //清空信息二次报告
+          this.pageData.defectQty = 0;
+          this.pageData.defectCode = '';
+          this.pageData.defectDesc = '';
+          //刷新列表
+          this.refreshPageTable();
+        }
+      });
+    },
 
 
 
@@ -310,16 +379,6 @@ export default {
 
 
 
-    init(seqNo, operatorData) {
-      //初始化参数
-      this.scheduleData.seqNo = seqNo;
-      //初始化操作员对象
-      this.operatorData = JSON.parse(JSON.stringify(operatorData));
-      // this.currentRollOps.seqNo = seqNo;
-      // this.currentRollOps.rollNo = rollNo;
-      //刷新当前派工单的信息
-      //this.refreshPageData();
-    },
 
   },
   created() {
diff --git a/src/views/modules/yieldReport/com_produce_down.vue b/src/views/modules/yieldReport/com_produce_down.vue
index 20987d5..8cd847b 100644
--- a/src/views/modules/yieldReport/com_produce_down.vue
+++ b/src/views/modules/yieldReport/com_produce_down.vue
@@ -43,7 +43,7 @@
               </el-col>
               <el-col :span="16">
                 <el-form-item :label="'停机描述:'">
-                  <el-input v-model="pageData.downTimeDesc" style="width: 180px"></el-input>
+                  <el-input readonly v-model="pageData.downTimeDesc" style="width: 180px"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -185,7 +185,7 @@ export default {
     /*检查停机代码*/
     getDownTimeDesc(){
       if(this.pageData.downTimeCode == null || this.pageData.downTimeCode == ''){
-        this.$message.error('请扫描不凉代码!');
+        this.$message.error('请扫描停机代码!');
         return false;
       }
       checkDownTimeCode(this.pageData).then(({data}) => {
diff --git a/src/views/modules/yieldReport/com_produce_report_normal.vue b/src/views/modules/yieldReport/com_produce_report_normal.vue
index efdd0f6..06226e2 100644
--- a/src/views/modules/yieldReport/com_produce_report_normal.vue
+++ b/src/views/modules/yieldReport/com_produce_report_normal.vue
@@ -3063,7 +3063,7 @@ export default {
       //打开不良卷的页面
       this.$nextTick(() => {
         this.showDefectFlag = true;
-        this.$refs.comDefectRoll.init(this.scheduleData.seqNo, this.operatorData)
+        this.$refs.comDefectRoll.init(this.scheduleData, this.operatorData)
       });
     },
 
@@ -3074,7 +3074,7 @@ export default {
       //打开生产过程的工具的页面
       this.$nextTick(() => {
         this.showToolFlag = true;
-        this.$refs.comProduceTool.init(this.scheduleData.seqNo, this.operatorData)
+        this.$refs.comProduceTool.init(this.scheduleData, this.operatorData)
       });
     },