0412 新看板

src/views/modules/production/generateReport.vue

@@ -474,7 +474,7 @@
           <el-input type="number" style="width: 178px;" :disabled="approveFlag"  class="input_reight"  v-model="saveHeaderData.qtyApprove" @blur="qtyApproveBlur()"></el-input>
         </el-form-item>
         <el-form-item label="不合格/缺失数量" >
-          <el-input type="number"  class="input_left" style="width: 178px;"  v-model="saveHeaderData.qtyUnApprove" @blur="qtyReportedBlur()"></el-input>
+          <el-input type="number"  class="input_left" style="width: 178px;" :disabled="unapproveFlag"   v-model="saveHeaderData.qtyUnApprove" @blur="qtyReportedBlur()"></el-input>
         </el-form-item>
         <el-form-item label="生产模数">
           <el-input type="number" style="width: 178px;"  v-model="moQty"  @blur="moQtyBlur()"></el-input>
@@ -486,7 +486,7 @@
           <el-input type="number" style="width: 178px;"  class="input_reight" :disabled="factorFlag"  v-model="KGApprove" @blur="KGApproveBlur()"></el-input>
         </el-form-item>
         <el-form-item label="不合格/缺失重量(KG)">
-          <el-input type="number"  class="input_left" style="width: 178px;" :disabled="factorFlag"  v-model="KGReported" @blur="KGReportedBlur()"></el-input>
+          <el-input type="number"  class="input_left" style="width: 178px;" :disabled="factorFlag||unapproveFlag"  v-model="KGReported" @blur="KGReportedBlur()"></el-input>
         </el-form-item>
         <el-form-item label="模具孔数">
           <el-input type="number"  class="input_left" style="width: 178px;" disabled  v-model="cavity" ></el-input>
@@ -612,6 +612,7 @@
   </div>
 </template>
 
+
 <script>
   import {
     printTransNoLabel,
@@ -642,6 +643,18 @@
     components: {
       Chooselist
     },
+    watch: {
+      saveHeaderData: {
+        deep: true,
+        handler: function (newV, oldV) {
+         if((this.saveHeaderData.scrapQty===0||this.saveHeaderData.scrapQty===null||this.saveHeaderData.scrapQty==='')&&(this.saveHeaderData.acceptQty===0||this.saveHeaderData.acceptQty===null||this.saveHeaderData.acceptQty==='')){
+           this.unapproveFlag=true
+         }else {
+           this.unapproveFlag=false
+         }
+        }
+      }
+    },
     data () {
       return {
         pageData: {
@@ -662,6 +675,7 @@
           disabled: false
         },
         factorFlag:false,
+        unapproveFlag:false,
         KGReported:'',
         KGApprove:'',
         KGRework:'',

src/views/modules/production/scheduleForSOTask.vue

@@ -212,6 +212,13 @@
         min-width="100"
         label="加工中心">
       </el-table-column>
+      <el-table-column
+        prop="cuiHuaJi"
+        header-align="center"
+        align="left"
+        width="100"
+        label="催化剂">
+      </el-table-column>
       <el-table-column
         prop="equipment"
         header-align="center"

src/views/modules/production/scheduleForShopOrder.vue

@@ -200,6 +200,13 @@
         width="100"
         label="加工中心">
       </el-table-column>
+      <el-table-column
+        prop="cuiHuaJi"
+        header-align="center"
+        align="left"
+        width="100"
+        label="催化剂">
+      </el-table-column>
       <el-table-column
         prop="status"
         header-align="center"