فهرست منبع

优化同质检验对话框和工作订单页面的显示及操作逻辑

yusheng 8 ماه پیش
والد
کامیت
9671983543

+ 17 - 7
src/views/productionPlan/components/homogeneityInspectDialog.vue

@@ -80,7 +80,7 @@
                 <el-input readonly v-model="planInfo.productNum"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col :span="6" v-if="produceType == 2">
               <el-form-item label="未发总数:">
                 <el-input
                   readonly
@@ -88,8 +88,7 @@
                 ></el-input>
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row>
+
             <el-col :span="6">
               <el-form-item label="库存数量:">
                 <el-input
@@ -98,7 +97,7 @@
                 ></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col :span="6" v-if="produceType == 2">
               <el-form-item label="在制总数:">
                 <el-input
                   readonly
@@ -106,7 +105,7 @@
                 ></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col :span="6" v-if="produceType == 2">
               <el-form-item label="最终缺料数量:">
                 <el-input
                   readonly
@@ -117,6 +116,11 @@
             <el-col :span="6">
               <el-form-item label="最终状态:">
                 <el-input
+                  :class="
+                    kitComInfo.finalFilledShortState == '缺料'
+                      ? 'statusRed'
+                      : 'statusGreen'
+                  "
                   readonly
                   v-model="kitComInfo.finalFilledShortState"
                 ></el-input>
@@ -166,7 +170,7 @@
                         >下发采购计划</el-button
                       >
                       <el-button
-                        v-if="produceType == 1&&formInline.bomType!=1"
+                        v-if="produceType == 1 && formInline.bomType != 1"
                         type="primary"
                         @click="issuePlan"
                         size="medium"
@@ -914,7 +918,7 @@
       },
       // 结果数据处理
       resultProcess(result) {
-        this.datasourceList=[]
+        this.datasourceList = [];
         if (!result || result.length == 0) {
           this.baseCount = '';
           this.baseUnit = '';
@@ -1210,10 +1214,16 @@
   }
   .statusRed {
     color: red;
+    :deep(.el-input__inner) {
+      color: red;
+    }
   }
 
   .statusGreen {
     color: green;
+    :deep(.el-input__inner) {
+      color: green;
+    }
   }
   .planInfo {
   }

+ 1 - 1
src/views/workOrder/components/order-search.vue

@@ -137,7 +137,7 @@
             size="mini"
             clearable
             v-model="where.searchInfo"
-            placeholder="请输入查询信息"
+            placeholder="批次号/生产工单号/计划编号/产品编码/产品名称/牌号/型号"
           />
         </el-form-item>
       </el-col>

+ 2 - 2
src/views/workOrder/index.vue

@@ -126,7 +126,7 @@
             type="primary"
             @click="toReleaseOpen(row)"
           >
-            派单
+            首工序派单
           </el-link>
           <el-link
             v-if="unpackShow(row) && row.splitResidue !== 0"
@@ -735,7 +735,7 @@
             {
               columnKey: 'action',
               label: '操作',
-              width: 140,
+              width: 200,
               align: 'center',
               resizable: false,
               fixed: 'right',