From ed892500022adbfa8da4bcb5982079533b22a58a Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 09 十一月 2022 14:01:58 +0800
Subject: [PATCH] 1.生产开报工新增生产类型

---
 src/views/zzmx/jpgj.vue |   22 +++++++++++++++++-----
 1 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/views/zzmx/jpgj.vue b/src/views/zzmx/jpgj.vue
index 21bd725..2acb554 100644
--- a/src/views/zzmx/jpgj.vue
+++ b/src/views/zzmx/jpgj.vue
@@ -150,6 +150,7 @@
             prop="wksp_name"
             label="鐢熶骇杞﹂棿"
             min-width="110"
+            show-tooltip-when-overflow
             sortable="custom"
           />
           <el-table-column
@@ -163,12 +164,13 @@
             prop="stepname"
             label="鍔犲伐宸ュ簭"
             sortable="custom"
-            min-width="110"
+            min-width="90"
           />
           <el-table-column
             prop="eqp_name"
-            label="鍔犲伐璁惧"
+            label="鍔犲伐璁惧/渚涙柟"
             min-width="110"
+            show-tooltip-when-overflow
             sortable="custom"
           />
           <el-table-column
@@ -344,23 +346,25 @@
           />
           <el-table-column
             prop="eqpcode"
-            label="璁惧缂栫爜"
+            :label="eqpTable.steptype==='Z'?'璁惧缂栫爜':'澶栧崗渚涙柟缂栫爜'"
             sortable="custom"
             min-width="110"
           />
           <el-table-column
             prop="eqpname"
-            label="璁惧鍚嶇О"
+            :label="eqpTable.steptype==='Z'?'璁惧鍚嶇О':'澶栧崗渚涙柟鍚嶇О'"
             min-width="110"
             sortable="custom"
           />
           <el-table-column
+            v-if="eqpTable.steptype==='Z'"
             prop="wksp_name"
             sortable="custom"
             label="鐢熶骇杞﹂棿"
             min-width="110"
           />
           <el-table-column
+            v-if="eqpTable.steptype==='Z'"
             sortable="custom"
             prop="eqp_value"
             label="璁惧鑺傛媿"
@@ -380,6 +384,7 @@
             </template>
           </el-table-column>
           <el-table-column
+            v-if="eqpTable.steptype==='Z'"
             prop="stand_value"
             label="鐢熶骇鑺傛媿"
             sortable="custom"
@@ -390,6 +395,7 @@
             </template>
           </el-table-column>
           <el-table-column
+            v-if="eqpTable.steptype==='Z'"
             prop="cavity_qty"
             label="鑵斿瀷鏁�"
             sortable="custom"
@@ -533,10 +539,11 @@
         partcode: '',
         routecode: '',
         stepcode: '',
+        steptype: '',
         page: 1,
         rows: 10,
         prop: 'eqpcode',
-        order: 'desc'
+        order: 'asc'
       },
       eqpTableLength: 0,
       isEqpTableEdit: true,
@@ -665,10 +672,15 @@
     },
     async getEqpTable(val) {
       if (typeof val === 'string') {
+        console.log('鎵ц1')
+        this.eqpTable.steptype = this.stepDialogArr.find(item => item.name === val).flag
         this.eqpTable.partcode = this.dialogForm.partcode
         this.eqpTable.routecode = this.dialogForm.routecode
         this.eqpTable.stepcode = this.stepDialogArr.find(item => item.name === val).code
       } else if (typeof val === 'number') {
+        console.log('鎵ц2')
+        // console.log(this.stepDialogArr)
+        this.eqpTable.steptype = this.stepDialogArr[0].flag
         this.eqpTable.partcode = this.dialogForm.partcode
         this.eqpTable.routecode = this.dialogForm.routecode
         this.eqpTable.stepcode = this.stepDialogArr[0].code

--
Gitblit v1.9.3