From 60884524aba674d2368d2169b057f0d806acc0f6 Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期四, 10 十月 2024 12:14:24 +0800
Subject: [PATCH] 1

---
 src/views/console/workstation/CollDialog.vue |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/views/console/workstation/CollDialog.vue b/src/views/console/workstation/CollDialog.vue
index 8733eb6..d274661 100644
--- a/src/views/console/workstation/CollDialog.vue
+++ b/src/views/console/workstation/CollDialog.vue
@@ -11,7 +11,7 @@
 
         <scFormTable v-show="type" ref="table1" v-model="tabledata" stripe hideDelete :hideAdd="!type"
             :addTemplate="addTemplate">
-            <el-table-column v-for="item in cols" :key="item.prop" :prop="item.prop" :label="item.label">
+            <el-table-column width="200" v-for="item in cols" :key="item.prop" :prop="item.prop" :label="item.label">
                 <template #header="scope">
                     <span v-show="item.isRequired" style="color: red;">*</span>
                     <span>{{ scope.column.label }}</span>
@@ -33,12 +33,12 @@
                     <el-switch :disabled="!scope.row.status" size="small" v-model="scope.row[item.prop]"
                         v-else-if="item.type === 'boolean'" />
                     <el-input size="small" v-model="scope.row[item.prop]" placeholder="" v-else-if="scope.row.status"
-                        :disabled="(item.prop == 'dpLabel' && 'Other' !== scope.row.dpCategory)"></el-input>
+                        :disabled="(['dpLabel', 'dpName'].includes(item.prop) && 'Other' !== scope.row.dpCategory)"></el-input>
                     <span v-else>{{ scope.row[item.prop] }}</span>
                 </template>
             </el-table-column>
 
-            <el-table-column label="鎿嶄綔" prop="state" width="200">
+            <el-table-column label="鎿嶄綔" prop="state" width="200" fixed="right">
                 <template #default="scope">
                     <el-button-group>
                         <el-button text type="primary" size="small" @click="table_edit(scope.row)">缂栬緫</el-button>
@@ -106,8 +106,10 @@
                     value: 'Alarm'
                 }].find(v => v.value === e).label
                 this.tabledata[index].dpLabel = label
+                this.tabledata[index].dpName = e
             } else if (prop === 'dpCategory' && e === 'Other') {
                 this.tabledata[index].dpLabel = ''
+                this.tabledata[index].dpName = ''
             }
         },
         changeType(val) {

--
Gitblit v1.9.3