From 12ef895481038a7bec06a2c6cb47748a6353e848 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 11 五月 2023 17:35:04 +0800
Subject: [PATCH] 1.生产进度报表提交

---
 src/views/zzmx/jpgj.vue |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/views/zzmx/jpgj.vue b/src/views/zzmx/jpgj.vue
index 2656b6a..fc1bd8c 100644
--- a/src/views/zzmx/jpgj.vue
+++ b/src/views/zzmx/jpgj.vue
@@ -16,7 +16,7 @@
           style="display: flex;justify-content: space-between"
         >
           <div class="elForm">
-            <el-form-item label-width="70px" label="浜у搧鍚嶇О" style=" display: flex;">
+            <el-form-item label="浜у搧鍚嶇О/缂栫爜" style=" display: flex;">
               <el-select
                 v-model="form.partcode"
                 filterable
@@ -30,7 +30,7 @@
                 <el-option
                   v-for="item in partArr"
                   :key="item.partcode"
-                  :label="item.partname"
+                  :label="item.partname+' / ' + item.partcode"
                   :value="item.partcode"
                 />
               </el-select>
@@ -132,6 +132,7 @@
             prop="partname"
             label="浜у搧鍚嶇О"
             min-width="200"
+            show-tooltip-when-overflow
             sortable="custom"
           />
           <el-table-column
@@ -618,17 +619,20 @@
       this.form.routecode = ''
       this.form.stepcode = ''
       this.form.eqpcode = ''
+      this.search()
     },
     async routeChange(val) {
       const { data: res } = await RouteSelectStep({ routecode: val })
       this.stepArr = res
       this.form.stepcode = ''
       this.form.eqpcode = ''
+      this.search()
     },
     async stepChange(val) {
       const { data: res } = await StepSelectEqp({ stepcode: val })
       this.eqpArr = res
       this.form.eqpcode = ''
+      this.search()
     },
     // 閲嶇疆
     reset() {
@@ -696,7 +700,7 @@
     },
     // 淇濆瓨琛�
     async saveRow(row) {
-      if (parseFloat(row.unprice) <= 0) {
+      if (parseFloat(row.unprice) <= 0 && this.eqpTable.steptype !== 'W') {
         return this.$message.info('璁′欢鍗曚环蹇呴』澶т簬闆讹紒')
       }
       const data = {

--
Gitblit v1.9.3