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/material/index.vue | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/jcdm-ui/src/views/main/bs/material/index.vue b/jcdm-ui/src/views/main/bs/material/index.vue
index e21bb38..640c5c6 100644
--- a/jcdm-ui/src/views/main/bs/material/index.vue
+++ b/jcdm-ui/src/views/main/bs/material/index.vue
@@ -85,21 +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="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"/>
@@ -172,6 +174,12 @@
<el-form ref="form" inline :model="form" :rules="rules" label-width="80px">
<el-form-item label="鐗╂枡缂栧彿" prop="materialCode">
<el-input v-model="form.materialCode" placeholder="璇疯緭鍏ョ墿鏂欑紪鍙�" />
+ </el-form-item>
+ <el-form-item label="鐗规畩浠ｇ爜" prop="mark">
+ <el-input v-model="form.mark" placeholder="璇疯緭鍏ョ壒娈婁唬鐮�" />
+ </el-form-item>
+ <el-form-item label="杞﹀瀷" prop="carType">
+ <el-input v-model="form.carType" placeholder="璇疯緭鍏ョ壒娈婁唬鐮�" />
</el-form-item>
<el-form-item label="鐗╂枡鍚嶇О" prop="materialName">
<el-input v-model="form.materialName" placeholder="璇疯緭鍏ョ墿鏂欏悕绉�" />
@@ -264,6 +272,7 @@
pageNum: 1,
pageSize: 10,
materialCode: null,
+ carType:null,
materialName: null,
materialView: null,
typeZ: null,
@@ -326,6 +335,7 @@
materialName: null,
materialView: null,
typeZ: null,
+ carType:null,
typeL: null,
unit: null,
matterVersion: null,
--
Gitblit v1.9.3