From 441702f08ff76b3cf4b5ba763ef347fc39268f0e Mon Sep 17 00:00:00 2001
From: jiang <1354748262@qq.com>
Date: 星期一, 15 一月 2024 15:56:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-ui/src/views/main/bs/material/index.vue | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/jcdm-ui/src/views/main/bs/material/index.vue b/jcdm-ui/src/views/main/bs/material/index.vue
index 9a5bf4d..ad04c8e 100644
--- a/jcdm-ui/src/views/main/bs/material/index.vue
+++ b/jcdm-ui/src/views/main/bs/material/index.vue
@@ -91,6 +91,8 @@
</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">
<template slot-scope="scope">
<dict-tag :options="dict.type.material_type" :value="scope.row.typeL"/>
@@ -175,6 +177,9 @@
</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="璇疯緭鍏ョ墿鏂欏悕绉�" />
@@ -267,6 +272,7 @@
pageNum: 1,
pageSize: 10,
materialCode: null,
+ carType:null,
materialName: null,
materialView: null,
typeZ: null,
@@ -329,6 +335,7 @@
materialName: null,
materialView: null,
typeZ: null,
+ carType:null,
typeL: null,
unit: null,
matterVersion: null,
--
Gitblit v1.9.3