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/material/index.vue | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
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