From c31301e1f593f1571cbece935bb02a0b483fa02c Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Tue, 16 Aug 2022 17:19:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=8D=B7=E7=B3=BB=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionLineOperatorRegistration.vue    | 32 +++++++++++++++----
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/src/views/modules/shopOrder/productionReport/productionLineOperatorRegistration.vue b/src/views/modules/shopOrder/productionReport/productionLineOperatorRegistration.vue
index 90b09b8..faf8b9e 100644
--- a/src/views/modules/shopOrder/productionReport/productionLineOperatorRegistration.vue
+++ b/src/views/modules/shopOrder/productionReport/productionLineOperatorRegistration.vue
@@ -42,7 +42,7 @@
         :show-overflow-tooltip="item.showOverflowTooltip"
         :align="item.align"
         :fixed="item.fixed==''?false:item.fixed"
-        :width="item.columnWidth"
+        :min-width="item.columnWidth"
         :label="item.columnLabel">
         <template slot-scope="scope">
           <span v-if="!item.columnHidden"> {{scope.row[item.columnProp]}}</span>
@@ -84,26 +84,26 @@
       </el-form>
       <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item :label="'是否是检验员：'">
-          <el-select filterable v-model="modelData.fQCFlag" style="width: 130px">
+          <el-select filterable v-model="modelData.fQCFlag" :disabled="modelInputFlag" style="width: 130px">
             <el-option label="Y" value="Y"></el-option>
             <el-option label="N" value="N"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item >
           <span slot="label" style="" @click="getBaseList(24)"><a herf="#">加工中心编码：</a></span>
-          <el-input v-model="modelData.workCenterNo" @change="getWorkCenterDetail" style="width: 130px" onblur="this.value=this.value.toUpperCase()"></el-input>
+          <el-input v-model="modelData.workCenterNo" :disabled="modelInputFlag" @change="getWorkCenterDetail" style="width: 130px" onblur="this.value=this.value.toUpperCase()"></el-input>
         </el-form-item>
         <el-form-item :label="'加工中心名称：'">
-          <el-input v-model="modelData.workCenterDesc" disabled style="width: 130px"></el-input>
+          <el-input v-model="modelData.workCenterDesc"  disabled style="width: 130px"></el-input>
         </el-form-item>
       </el-form>
       <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item >
           <span slot="label" style="" @click="getBaseList(91)"><a herf="#">工作日历：</a></span>
-          <el-input v-model="modelData.calendarID"  style="width: 130px" onblur="this.value=this.value.toUpperCase()"></el-input>
+          <el-input v-model="modelData.calendarID"   style="width: 130px" onblur="this.value=this.value.toUpperCase()"></el-input>
         </el-form-item>
         <el-form-item :label="'效率：'">
-          <el-input v-model="modelData.efficiency" type="number" style="width: 130px"></el-input>
+          <el-input v-model="modelData.efficiency"  type="number" style="width: 130px"></el-input>
         </el-form-item>
       </el-form>
       <el-footer  style="height:40px;margin-top: 20px;text-align:center">
@@ -497,6 +497,26 @@
         if(this.modelData.efficiency==''||this.modelData.efficiency==null){
           this.modelData.efficiency=0;
         }
+        if(this.modelData.fQCFlag=='Y'){
+          if(this.modelData.workCenterNo==''||this.modelData.workCenterNo==null){
+            this.$alert("请选择加工中心！",'错误',{
+              confirmButtonText:'确定'
+            })
+            return false;
+          }
+          if(this.modelData.calendarID==''||this.modelData.calendarID==null){
+            this.$alert("请选择工作日历！",'错误',{
+              confirmButtonText:'确定'
+            })
+            return false;
+          }
+          if(this.modelData.efficiency==''||this.modelData.efficiency==null){
+            this.$alert("请输入效率！",'错误',{
+              confirmButtonText:'确定'
+            })
+            return false;
+          }
+        }
         this.modelData.user=this.$store.state.user.name;
 
         saveProductionLineOperatorRegistration(this.modelData).then(({data}) => {