From f1d9df303a33ef98066e4bf044b1114e1f3f629d Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期二, 16 一月 2024 09:22:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-ui/src/views/main/bs/formulaChild/index.vue | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 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..4134b5e 100644
--- a/jcdm-ui/src/views/main/bs/formulaChild/index.vue
+++ b/jcdm-ui/src/views/main/bs/formulaChild/index.vue
@@ -148,29 +148,31 @@
</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">
--
Gitblit v1.9.3