From c219fdb00c62dd4cce55d75f93192eccb0ad762c Mon Sep 17 00:00:00 2001
From: Rui_Li <877258667@qq.com>
Date: Thu, 27 Jan 2022 13:16:13 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E6=9D=9F=E5=8D=B7=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=20BUG=20=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yieldReport/com_exception_reason.vue      | 32 ++++++++++++-------
 .../modules/yieldReport/com_finish_roll.vue   | 25 ++++++++++++++-
 2 files changed, 45 insertions(+), 12 deletions(-)

diff --git a/src/views/modules/yieldReport/com_exception_reason.vue b/src/views/modules/yieldReport/com_exception_reason.vue
index ce706e9..d39e89f 100644
--- a/src/views/modules/yieldReport/com_exception_reason.vue
+++ b/src/views/modules/yieldReport/com_exception_reason.vue
@@ -1,20 +1,22 @@
 <template>
   <div class="customer-css">
     <el-dialog :title="titleCon" v-drag v-bind="$attrs" v-on="$listeners"
-               width="900px" style="height: 415px;" class="customer-dialog">
-      <el-form :inline="true" label-position="top" style="height: 265px;"
+               width="360px" style="height: 300px;" class="customer-dialog">
+      <el-form :inline="true" label-position="top" style="height: 100px;"
                label-width="80px">
         <!-- 菜单信息 -->
         <el-row>
-          <el-col :span="3" >
+          <el-col :span="24" >
             <el-form-item :label="'异常原因:'">
-              <textarea rows="2"  cols="24"    placeholder="异常原因"></textarea>
+              <textarea ref="exceptionReason" v-model="pageData.exceptionReason" rows="4"  cols="44"></textarea>
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
-
-
+      <span slot="footer" class="dialog-footer" style="margin-top: -20px;">
+        <el-button type="primary" @click="addExceptionReason">确 定</el-button>
+        <el-button type="primary" @click="closeDialog">关闭</el-button>
+      </span>
     </el-dialog>
   </div>
 </template>
@@ -35,6 +37,12 @@ export default {
   methods: {
     /*初始化页面参数*/
     init() {
+      //初始化页面的数据
+      this.pageData.exceptionReason = '';
+      //自动获取焦点
+      this.$nextTick(() => {
+        this.$refs.exceptionReason.focus();
+      });
      //什么都不做
     },
 
@@ -43,10 +51,13 @@ export default {
       this.$emit('update:visible', false);
     },
 
-
-
-
-
+    /*添加异常原因的数据*/
+    addExceptionReason(){
+      //关闭当前的组件
+      this.closeDialog();
+      //处理结束卷组件的方法
+      this.$emit('initExceptionReason');
+    },
 
   },
   created() {
@@ -58,5 +69,4 @@ export default {
 
 <style scoped lang="scss">
 
-
 </style>
diff --git a/src/views/modules/yieldReport/com_finish_roll.vue b/src/views/modules/yieldReport/com_finish_roll.vue
index 82d3a64..6f8f1cc 100644
--- a/src/views/modules/yieldReport/com_finish_roll.vue
+++ b/src/views/modules/yieldReport/com_finish_roll.vue
@@ -526,6 +526,9 @@ export default {
       //初始化标题
       this.titleCon = '结束卷操作 \
        派工单号:'+scheduleData.seqNo;
+      //处理异常的原因
+      this.pageData.exceptionFlag = 'N';
+      this.pageData.exceptionReason =  '';
       //刷新当前派工单的信息
       this.refreshPageData();
     },
@@ -769,9 +772,16 @@ export default {
           this.$message.error(data.msg);
         }else if (data.resultMap.resultCode == '201'){
           //打开异常原因录入的界面
-
+          this.$confirm(data.resultMap.resultMsg, '提示', {
+            confirmButtonText: '确认',
+            celButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            this.showExceptionReasonModal();
+          });
         }else{
           //执行结束卷操作
+          this.finishRollOperation();
         }
       });
 
@@ -779,6 +789,8 @@ export default {
 
     /*结束卷的具体操作*/
     finishRollOperation(){
+      //验证通过提交到后台
+      let postData = {'pageData': JSON.stringify(this.pageData), 'materialList': JSON.stringify(this.sfdcMaterialList)};
       //处理信息
       finishRollWithNoFqc(postData).then(({data}) => {
         this.$message.error('qty_reported找不到!');
@@ -794,6 +806,17 @@ export default {
       })
     },
 
+    /*打开异常原因录入页面*/
+    showExceptionReasonModal(){
+      //1.首先调用菜单判断方式  打开生产过程的材料的页面
+      //checkProduceButton('produceMaterialFlag');
+      //打开生产过程的工具的页面
+      this.$nextTick(() => {
+        this.showExceptionFlag = true;
+        this.$refs.comExceptionReason.init();
+      });
+    },
+
     /*处理异常的原因*/
     initExceptionReason(exceptionReason){
       //处理异常的原因