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-main/src/main/java/com/jcdm/main/bs/material/service/IBsMaterialInfoService.java | 2 +-
jcdm-ui/src/views/main/bs/material/index.vue | 18 +++++++++---------
jcdm-ui/src/views/main/bs/formulaChild/index.vue | 28 +++++++++++++++-------------
3 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/material/service/IBsMaterialInfoService.java b/jcdm-main/src/main/java/com/jcdm/main/bs/material/service/IBsMaterialInfoService.java
index 33f18f0..9740a82 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/bs/material/service/IBsMaterialInfoService.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/bs/material/service/IBsMaterialInfoService.java
@@ -5,7 +5,7 @@
import java.util.List;
/**
- * 鐗╂枡淇℃伅Service鎺ュ彛
+ * Service鎺ュ彛
*
* @author yyt
* @date 2023-12-09
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">
diff --git a/jcdm-ui/src/views/main/bs/material/index.vue b/jcdm-ui/src/views/main/bs/material/index.vue
index ad04c8e..7e35df9 100644
--- a/jcdm-ui/src/views/main/bs/material/index.vue
+++ b/jcdm-ui/src/views/main/bs/material/index.vue
@@ -85,23 +85,23 @@
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="鐗╂枡缂栧彿" align="center" prop="materialCode" width="180">
</el-table-column>
- <el-table-column label="鐗╂枡鍚嶇О" align="center" prop="materialName" width="250">
+ <el-table-column label="鐗╂枡鍚嶇О" align="center" prop="materialName" width="220">
</el-table-column>
- <el-table-column label="瑙嗗浘" align="center" prop="materialView" width="180">
+<!-- <el-table-column label="瑙嗗浘" align="center" prop="materialView" width="180">
+ </el-table-column>-->
+
+ <el-table-column label="杞﹀瀷" align="center" prop="carType" width="120">
</el-table-column>
- <el-table-column label="鐗规畩浠ｇ爜" align="center" prop="mark" width="180">
- </el-table-column>
- <el-table-column label="杞﹀瀷" align="center" prop="carType" width="180">
- </el-table-column>
- <el-table-column label="绫诲瀷" align="center" prop="typeL">
+ <el-table-column label="鐗╂枡绫诲瀷" align="center" prop="typeL">
<template slot-scope="scope">
<dict-tag :options="dict.type.material_type" :value="scope.row.typeL"/>
</template>
</el-table-column>
- <el-table-column label="鍨嬪彿" align="center" prop="typeZ" width="180">
+ <el-table-column label="浜у搧鍨嬪彿" align="center" prop="typeZ" width="150">
</el-table-column>
-
+ <el-table-column label="鐗规畩浠ｇ爜" align="center" prop="mark" width="120">
+ </el-table-column>
<el-table-column label="鍗曚綅" align="center" prop="unit" width="80">
<template slot-scope="scope">
<dict-tag :options="dict.type.unit" :value="scope.row.unit"/>
--
Gitblit v1.9.3