From a0da801f71c6ff7ec6fe5974ff3bd3a8aa61d434 Mon Sep 17 00:00:00 2001
From: rui_li <877258667@qq.com>
Date: Mon, 7 Mar 2022 09:49:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/yieldReport/com_defect_roll.vue   | 49 ++++++++++++++++++-
 .../modules/yieldReport/com_finish_roll.vue   |  3 +-
 .../yieldReport/com_produce_report_normal.vue |  1 +
 .../yieldReport/com_switch_operator.vue       | 38 +++++++++++---
 4 files changed, 79 insertions(+), 12 deletions(-)

diff --git a/src/views/modules/yieldReport/com_defect_roll.vue b/src/views/modules/yieldReport/com_defect_roll.vue
index 329b292..21a35cb 100644
--- a/src/views/modules/yieldReport/com_defect_roll.vue
+++ b/src/views/modules/yieldReport/com_defect_roll.vue
@@ -8,8 +8,9 @@
             <!-- 不良代码 和日期 -->
             <el-row>
               <el-col :span="6">
-                <el-form-item :label="'不良代码:'">
-                  <el-input ref="defectCode" v-model="pageData.defectCode" @blur="getDefectDesc"
+                <el-form-item>
+                  <span slot="label" style="" @click="getBaseList(89)"><a herf="#">不良代码:</a></span>
+                  <el-input ref="defectCode" v-model="pageData.defectCode" @blur="checkDefectDesc"
                             style="width: 120px" @keyup.enter.native="getDefectDesc" ></el-input>
                 </el-form-item>
               </el-col>
@@ -106,10 +107,13 @@
 
 
     </el-dialog>
+    <!--列表的组件-->
+    <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>
   </div>
 </template>
 
 <script>
+import Chooselist from '@/views/modules/common/Chooselist';/*列表组件*/
 import {
   getScheduleDefectHist,
   checkDefectCode,
@@ -300,6 +304,10 @@ export default {
       dataListLoading: false,
     }
   },
+  /*组件*/
+  components: {
+    Chooselist,/*列表的组件*/
+  },
   methods: {
 
     //初始化组件的参数
@@ -354,8 +362,25 @@ export default {
       })
     },
 
+    /*不提示错误信息的*/
+    checkDefectDesc(){
+      checkDefectCode(this.pageData).then(({data}) => {
+        //判断是否存在异常
+        if(data.code == 500){
+        }else{
+          let resultMap = data.resultMap;
+          this.pageData.defectDesc = resultMap.defectDesc;
+        }
+      })
+    },
+
     /*报告不良代码*/
     reportDefectFun(){
+      //判断数量是否正常
+      if(this.pageData.defectQty <= 0){
+        this.$message.error('不良数量必须大于0!');
+        return false;
+      }
       if(this.pageData.defectCode == null || this.pageData.defectCode == ''){
         this.$message.error('请扫描不良代码!');
         return false;
@@ -374,6 +399,26 @@ export default {
       });
     },
 
+    /*列表方法的回调*/
+    getBaseData(val){
+      if (this.tagNo === 89){
+        this.pageData.defectCode = val.DefectCode;
+        this.pageData.defectDesc = val.DefectDesc;
+      }
+    },
+
+    // 获取基础数据列表
+    getBaseList(val){
+      this.tagNo = val
+      this.$nextTick(() => {
+        let strVal = "";
+        if (val === 89){
+          strVal =  this.pageData.defectCode;
+        }
+        this.$refs.baseList.init(val, strVal)
+      })
+    },
+
   },
   created() {
     // this.factoryList()
diff --git a/src/views/modules/yieldReport/com_finish_roll.vue b/src/views/modules/yieldReport/com_finish_roll.vue
index 67af05a..fddbad7 100644
--- a/src/views/modules/yieldReport/com_finish_roll.vue
+++ b/src/views/modules/yieldReport/com_finish_roll.vue
@@ -43,7 +43,7 @@
             </el-form-item>
             <el-form-item class="customer-item" label="总良品数量:" style="margin-top: -10px;">
               <!--<el-input v-model="pageData.approvedQty" type="number"  @blur="checkValidApprovedQty"-->
-              <el-input v-model="pageData.approvedQty" type="number" style="width: 80px;" ></el-input>
+              <el-input v-model="pageData.approvedQty" @blur="checkValidApprovedQty" type="number" style="width: 80px;" ></el-input>
             </el-form-item>
             <el-form-item class="customer-item" label="总不良品数量:" style="margin-top: -10px;">
               <el-input v-model="pageData.defectedQty" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
@@ -753,7 +753,6 @@ export default {
     checkValidApprovedQty(){
       //调用刷新的方法
       this.refreshSfdcData();
-      debugger;
       this.pageData.totalQty = parseFloat(this.pageData.approvedQty) + parseFloat(this.pageData.defectedQty);
     },
 
diff --git a/src/views/modules/yieldReport/com_produce_report_normal.vue b/src/views/modules/yieldReport/com_produce_report_normal.vue
index f13b9a2..a565edf 100644
--- a/src/views/modules/yieldReport/com_produce_report_normal.vue
+++ b/src/views/modules/yieldReport/com_produce_report_normal.vue
@@ -3511,6 +3511,7 @@ export default {
 }
 
 .customer-css .customer-roll-css span{
+  margin-left: 15px;
   font-size: 16px;
   color: #387877;
 }
diff --git a/src/views/modules/yieldReport/com_switch_operator.vue b/src/views/modules/yieldReport/com_switch_operator.vue
index 05d7407..adb381d 100644
--- a/src/views/modules/yieldReport/com_switch_operator.vue
+++ b/src/views/modules/yieldReport/com_switch_operator.vue
@@ -1,9 +1,11 @@
 <template>
   <!--  展示员工切换的模块  -->
+  <div class="customer-css">
   <el-dialog :title="titleCon" v-bind="$attrs" v-on="$listeners"  width="280px">
       <el-form :inline="true" @submit.native.prevent label-position="top" label-width="100px" style="margin-top: -5px;">
         <el-row>
-          <el-form-item :label="'操作员:'">
+          <el-form-item>
+            <span slot="label" style="" @click="getBaseList(26)"><a herf="#">操作员:</a></span>
             <el-input ref="operatorId" @keyup.enter.native="saveOperatorData" @blur="checkOperatorId"
                       v-model="operatorData.operatorId"
                       style="width: 110px">
@@ -18,25 +20,23 @@
       </el-form>
       <el-form :inline="true" label-position="top" label-width="100px"
                style="margin-left: 180px; margin-top: -80px; width: 60px;">
-        <el-form-item label="">
-          <el-button type="primary">列表</el-button>
-        </el-form-item>
         <el-form-item label="" style="margin-top: 10px; margin-bottom: 0px;">
           <el-button type="primary" @click="saveOperatorData">保存</el-button>
         </el-form-item>
-        <el-form-item label="" style="margin-top: 15px; margin-bottom: 5px;">
+        <el-form-item label="" style="margin-top: 25px; margin-bottom: 15px;">
           <el-button type="primary" @click="closeDialog">关闭</el-button>
         </el-form-item>
 
       </el-form>
-    <!--列表的组件-->
-    <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>
 
     </el-dialog>
+    <!--列表的组件-->
+    <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>
+  </div>
 </template>
 
 <script>
-  import Chooselist from '@/views/modules/common/Chooselist';/*列表组件*/
+import Chooselist from '@/views/modules/common/Chooselist';/*列表组件*/
 import {
   getOperatorData,
 } from '@/api/yieldReport/produce_order.js'
@@ -153,6 +153,28 @@ export default {
         }
       });
     },
+
+
+    /*列表方法的回调*/
+    getBaseData(val){
+      if (this.tagNo === 26){
+        debugger;
+        this.operatorData.operatorId = val.OperatorID;
+        this.operatorData.operatorName = val.OperatorName;
+      }
+    },
+
+    // 获取基础数据列表
+    getBaseList(val){
+      this.tagNo = val
+      this.$nextTick(() => {
+        let strVal = "";
+        if (val === 26){
+          strVal = this.operatorData.operatorId;
+        }
+        this.$refs.baseList.init(val, strVal)
+      })
+    },
   },
   created() {
   }