From f2a092218ece0821351440331c90064c8cbd5241 Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期一, 25 十二月 2023 16:57:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-ui/src/views/main/bs/workshop/index.vue | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/jcdm-ui/src/views/main/bs/workshop/index.vue b/jcdm-ui/src/views/main/bs/workshop/index.vue
index eeaf92f..44c0311 100644
--- a/jcdm-ui/src/views/main/bs/workshop/index.vue
+++ b/jcdm-ui/src/views/main/bs/workshop/index.vue
@@ -77,22 +77,22 @@
<el-table v-loading="loading" border :data="workshopList" @selection-change="handleSelectionChange" v-if="workshopList.length > 0">
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="id" align="center" prop="id" />-->
- <el-table-column label="杞﹂棿缂栫爜" align="center" prop="workshopCode">
+ <el-table-column label="杞﹂棿缂栫爜" width="120" align="center" prop="workshopCode">
</el-table-column>
- <el-table-column :show-overflow-tooltip='true' label="杞﹂棿鍚嶇О" align="center" prop="workshopName">
+ <el-table-column :show-overflow-tooltip='true' width="150" label="杞﹂棿鍚嶇О" align="center" prop="workshopName">
</el-table-column>
<el-table-column label="鐘舵��" align="center" prop="status" width="80">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
</template>
</el-table-column>
- <el-table-column label="澶囨敞" align="center" prop="remarks">
+ <el-table-column label="澶囨敞" width="150" align="center" prop="remarks">
</el-table-column>
- <el-table-column label="鍒涘缓浜�" align="center" prop="createUser" width="80">
+ <el-table-column label="鍒涘缓浜�" align="center" prop="createUser" width="150">
</el-table-column>
<el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="180">
</el-table-column>
- <el-table-column label="鏇存柊浜�" align="center" prop="updateUser" width="80">
+ <el-table-column label="鏇存柊浜�" align="center" prop="updateUser" width="150">
</el-table-column>
<el-table-column label="鏇存柊鏃堕棿" align="center" prop="updateTime" width="180">
</el-table-column>
--
Gitblit v1.9.3