695593266@qq.com пре 8 месеци
родитељ
комит
cad6e81e02

+ 9 - 0
src/views/produce/components/feeding/components/instanceBom.vue

@@ -20,6 +20,7 @@
           size="mini"
           class="content_num"
           v-model="row.batchNo"
+          :disabled="isDetails"
           placeholder="批次号"
         >
         </el-input>
@@ -29,6 +30,7 @@
           size="mini"
           class="content_num"
           v-model="row.feedQuantity"
+          :disabled="isDetails"
           placeholder="数量"
         >
           <template slot="append">{{ row.unit }}</template>
@@ -39,6 +41,7 @@
           size="mini"
           class="content_num"
           v-model="row.extInfo.position"
+          :disabled="isDetails"
           placeholder="位置"
         />
       </template>
@@ -66,6 +69,7 @@
           class="content_num"
           filterable
           v-model="row.deviceId"
+          :disabled="isDetails"
           placeholder="请选择"
           @change="(e) => selectVal(e, row, $index)"
           size="mini"
@@ -84,6 +88,7 @@
           size="mini"
           class="content_num"
           v-model="row.extInfo.heatNumber"
+          :disabled="isDetails"
           placeholder="请输入炉次号"
         />
       </template>
@@ -284,6 +289,10 @@
       }
     },
 
+    created() {
+      this.currentTaskDiagram.isFirstTask = this.workInfo.isFirstTask;
+    },
+
     data() {
       return {
         deviceList: [],

+ 42 - 4
src/views/produce/components/jobBooking/components/detailPackagingGrouping.vue

@@ -111,12 +111,24 @@
                       class="uni-el-input"
                       v-model="item.packageCell"
                       disabled
-                      style="width: 200px"
+                      style="width: 160px"
                     ></el-input>
                     <div class="unit">{{ item.packageUnit }}</div
                     >/<div class="unit">{{ item.conversionUnit }}</div>
                   </div>
                 </div>
+
+                <div class="rx ww55" v-if="isReelSpecification">
+                  <div class="lable lable200 rx-cc">盘具规格:</div>
+                  <div class="content content_num">
+                    <el-input
+                      class="uni-el-input"
+                      v-model="item.reelSpecification"
+                      style="width: 160px"
+                      disabled
+                    ></el-input>
+                  </div>
+                </div>
               </div>
             </div>
 
@@ -230,6 +242,18 @@
                 >/<div class="unit">{{ item.minimumConversionUnit }}</div>
               </div>
             </div>
+
+            <div class="rx ww55" v-if="isReelSpecification">
+              <div class="lable lable200 rx-cc">盘具规格:</div>
+              <div class="content content_num">
+                <el-input
+                  class="uni-el-input"
+                  v-model="item.reelSpecification"
+                  style="width: 160px"
+                  disabled
+                ></el-input>
+              </div>
+            </div>
           </div>
 
           <div class="title_box rx-bc mt6">
@@ -319,6 +343,8 @@
     getPackingList
   } from '@/api/produce/workOrder';
 
+  import { parameterGetByCode } from '@/api/system/dictionary-data';
+
   // import {
   // 	getByCode
   // } from '@/api/pda/common.js'
@@ -415,7 +441,8 @@
           }
         ],
         cacheKeyUrlMin: 'cacheKeyUrlMin',
-        totalNumber: 0
+        totalNumber: 0,
+        isReelSpecification: false
         // clientEnvironmentId: uni.getStorageSync("userInfo") && uni.getStorageSync("userInfo").clientEnvironmentId,
       };
     },
@@ -680,6 +707,7 @@
     },
 
     created() {
+      this.getReelSpecification();
       console.log(this.objData, 'objDataobjDataobjData');
       if (this.objData.packInfo && !this.storeType) {
         this.warehouseId = this.objData.packInfo.tier;
@@ -689,7 +717,8 @@
             splitList: this.objData.packInfo.minimumPackage,
             packageCell: this.objData.packInfo.minimumPackageCell,
             packageUnit: this.objData.packInfo.minimumPackageUnit,
-            conversionUnit: this.objData.packInfo.minimumConversionUnit
+            conversionUnit: this.objData.packInfo.minimumConversionUnit,
+            reelSpecification: this.objData.packInfo.reelSpecification
           });
         } else if (this.objData.packInfo.isNewUnpack == 1) {
           this.DispositionList.push({
@@ -715,7 +744,8 @@
             outsideConversionUnit: this.objData.packInfo.outsideConversionUnit,
             outsideFormedNumLast: this.objData.packInfo.outsideFormedNumLast,
             formedNumLast: this.objData.formingNum,
-            packageUnit: this.objData.unit
+            packageUnit: this.objData.unit,
+            reelSpecification: this.objData.packInfo.reelSpecification
           });
         }
       } else {
@@ -777,6 +807,14 @@
         }, {});
       },
 
+      async getReelSpecification() {
+        await parameterGetByCode({
+          code: 'dishware_specifications'
+        }).then((res) => {
+          this.isReelSpecification = res.value == '1' ? true : false;
+        });
+      },
+
       async packageDispositionFn() {
         console.log();
         if (!this.newCategoryId) return;