From 9a90543b32701590952806ed583347460bc04f76 Mon Sep 17 00:00:00 2001
From: jiang <1354748262@qq.com>
Date: 星期一, 22 一月 2024 13:14:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-ui/src/views/main/bs/formulaChild/index.vue | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/jcdm-ui/src/views/main/bs/formulaChild/index.vue b/jcdm-ui/src/views/main/bs/formulaChild/index.vue
index da173fb..078864e 100644
--- a/jcdm-ui/src/views/main/bs/formulaChild/index.vue
+++ b/jcdm-ui/src/views/main/bs/formulaChild/index.vue
@@ -148,34 +148,36 @@
</el-table-column>
<el-table-column label="浜у搧缂栧彿" width="150" align="center" prop="productCode">
</el-table-column>
- <el-table-column label="鎿嶄綔鍐呭" :show-overflow-tooltip='true' width="150" align="center" prop="operationSteps">
+<!-- <el-table-column label="鎿嶄綔鍐呭" :show-overflow-tooltip='true' width="150" align="center" prop="operationSteps">
+ </el-table-column>-->
+ <el-table-column label="鎺掑簭" width="90" align="center" prop="stepSort">
</el-table-column>
- <el-table-column label="鎶�鏈姹�" width="150" :show-overflow-tooltip='true' align="center" prop="techRequirement">
+ <el-table-column label="鎶�鏈姹�" width="380" :show-overflow-tooltip='true' align="center" prop="techRequirement">
+ </el-table-column>
+ <el-table-column label="鍥剧墖" :show-overflow-tooltip='true' width="130" align="center" prop="picture">
+ <!-- <template slot-scope="scope">-->
+ <!-- <el-image-->
+ <!-- style="width: 100px; height: 100px"-->
+ <!-- :src="pjtUrl+scope.row.picture"-->
+ <!-- :fit="fit">-->
+ <!-- </el-image>-->
+ <!-- </template>-->
</el-table-column>
<el-table-column label="绫诲瀷" width="90" align="center" prop="operationType">
</el-table-column>
- <el-table-column label="鎺掑簭" width="90" align="center" prop="stepSort">
- </el-table-column>
+
<el-table-column label="鍙傛暟缂栫爜" width="130" align="center" prop="paramCode">
</el-table-column>
<el-table-column label="鐗╂枡缂栫爜" width="130" align="center" prop="materialCode">
</el-table-column>
<el-table-column label="閰嶆柟缂栫爜" width="130" align="center" prop="formulaCode">
</el-table-column>
- <el-table-column label="鍥剧墖" :show-overflow-tooltip='true' width="130" align="center" prop="picture">
-<!-- <template slot-scope="scope">-->
-<!-- <el-image-->
-<!-- style="width: 100px; height: 100px"-->
-<!-- :src="pjtUrl+scope.row.picture"-->
-<!-- :fit="fit">-->
-<!-- </el-image>-->
-<!-- </template>-->
- </el-table-column>
+
<el-table-column label="澶囨敞" width="130" align="center" prop="remarks">
</el-table-column>
<el-table-column label="鍒涘缓鐢ㄦ埛" width="130" align="center" prop="createUser">
</el-table-column>
- <el-table-column label="鍒涘缓鏃堕棿" width="150" align="center" prop="createTime">
+ <el-table-column label="鍒涘缓鏃堕棿" width="160" align="center" prop="createTime">
</el-table-column>
<el-table-column label="鏇存敼鐢ㄦ埛" width="130" align="center" prop="updateUser">
</el-table-column>
--
Gitblit v1.9.3