From 9c5ce6d05798da90d130ddf42d366fab369735e7 Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期六, 06 一月 2024 19:26:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-ui/src/views/main/bs/material/index.vue | 64 +++++++++++++++++---------------
1 files changed, 34 insertions(+), 30 deletions(-)
diff --git a/jcdm-ui/src/views/main/bs/material/index.vue b/jcdm-ui/src/views/main/bs/material/index.vue
index 9d7ffd3..f32dc96 100644
--- a/jcdm-ui/src/views/main/bs/material/index.vue
+++ b/jcdm-ui/src/views/main/bs/material/index.vue
@@ -83,41 +83,48 @@
<el-table v-loading="loading" border :data="materialList" @selection-change="handleSelectionChange" v-if="materialList.length > 0">
<el-table-column type="selection" width="55" align="center" />
- <el-table-column label="鐗╂枡缂栧彿" width="130" align="center" prop="materialCode">
+ <el-table-column label="鐗╂枡缂栧彿" align="center" prop="materialCode" width="180">
</el-table-column>
- <el-table-column label="鐗╂枡鍚嶇О" align="center" prop="materialName">
+ <el-table-column label="鐗╂枡鍚嶇О" align="center" prop="materialName" width="250">
</el-table-column>
- <el-table-column label="瑙嗗浘" align="center" prop="materialView">
+ <el-table-column label="瑙嗗浘" align="center" prop="materialView" width="180">
</el-table-column>
-<!-- <el-table-column label="绉嶇被" align="center" prop="typeZ">-->
-<!-- </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"/>
</template>
</el-table-column>
- <el-table-column label="鍗曚綅" align="center" prop="unit">
+
+ <el-table-column label="鍨嬪彿" align="center" prop="typeZ" width="180">
+ </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"/>
</template>
</el-table-column>
<!-- <el-table-column label="ERP瑙勬牸" align="center" prop="erpSpec">-->
<!-- </el-table-column>-->
- <el-table-column label="鏁版嵁鏉ユ簮" align="center" prop="dataSource">
- </el-table-column>
- <el-table-column label="鐘舵��" align="center" prop="status">
+
+ <el-table-column label="鐘舵��" align="center" prop="status" width="80">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
</template>
</el-table-column>
- <el-table-column label="鍘傚晢" align="center" prop="supplier">
+
+<!-- <el-table-column label="鍘傚晢" align="center" prop="supplier">
+ </el-table-column>-->
+ <el-table-column label="澶囨敞" align="center" prop="remarks" width="180">
</el-table-column>
- <el-table-column label="澶囨敞" align="center" prop="remarks">
+ <el-table-column label="鍒涘缓浜�" align="center" prop="createUser" width="150">
</el-table-column>
- <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="180">
- <template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
- </template>
+ <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="170">
+ </el-table-column>
+ <el-table-column label="鏇存柊浜�" align="center" prop="updateUser" width="150">
+ </el-table-column>
+ <el-table-column label="鏇存柊鏃堕棿" align="center" prop="updateTime" width="170">
+ </el-table-column>
+ <el-table-column label="鏁版嵁鏉ユ簮" align="center" prop="dataSource">
</el-table-column>
<el-table-column fixed="right" label="鎿嶄綔" width="200" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
@@ -167,14 +174,8 @@
<el-form-item label="鐗╂枡鍚嶇О" prop="materialName">
<el-input v-model="form.materialName" placeholder="璇疯緭鍏ョ墿鏂欏悕绉�" />
</el-form-item>
- <el-form-item label="瑙嗗浘" prop="materialView">
- <el-input v-model="form.materialView" placeholder="璇疯緭鍏ヨ鍥�" />
- </el-form-item>
-<!-- <el-form-item label="绉嶇被" prop="typeZ">-->
-<!-- <el-input v-model="form.typeZ" placeholder="璇疯緭鍏ョ绫�" />-->
-<!-- </el-form-item>-->
- <el-form-item label="绫诲瀷" prop="typeL">
-<!-- <el-input v-model="form.typeL" placeholder="璇疯緭鍏ョ被鍨�" />-->
+ <el-form-item label="鐗╂枡绫诲瀷" prop="typeL">
+ <!-- <el-input v-model="form.typeL" placeholder="璇疯緭鍏ョ被鍨�" />-->
<el-select v-model="form.typeL" style="width: 204px;" placeholder="璇烽�夋嫨鍗曚綅" clearable>
<el-option
v-for="dict in dict.type.material_type"
@@ -183,6 +184,12 @@
:value="dict.value"
/>
</el-select>
+ </el-form-item>
+ <el-form-item label="鐗╂枡鍨嬪彿" prop="typeZ">
+ <el-input v-model="form.typeZ" placeholder="璇疯緭鍏ョ绫�" />
+ </el-form-item>
+ <el-form-item label="瑙嗗浘" prop="materialView">
+ <el-input v-model="form.materialView" placeholder="璇疯緭鍏ヨ鍥�" />
</el-form-item>
<el-form-item label="鍗曚綅" prop="unit">
<!-- <el-input v-model="form.unit" placeholder="璇疯緭鍏ュ崟浣�" />-->
@@ -198,12 +205,12 @@
<el-form-item label="澶囨敞" prop="remarks">
<el-input v-model="form.remarks" placeholder="璇疯緭鍏ュ娉�" />
</el-form-item>
- <el-form-item label="ERP瑙勬牸" prop="erpSpec">
+<!-- <el-form-item label="ERP瑙勬牸" prop="erpSpec">
<el-input v-model="form.erpSpec" placeholder="璇疯緭鍏RP瑙勬牸" />
- </el-form-item>
- <el-form-item label="鍘傚晢" prop="supplier">
+ </el-form-item>-->
+<!-- <el-form-item label="鍘傚晢" prop="supplier">
<el-input v-model="form.supplier" placeholder="璇疯緭鍏ュ巶鍟�" />
- </el-form-item>
+ </el-form-item>-->
<el-form-item label="鐘舵��" prop="status">
<el-radio-group v-model="form.status">
<el-radio
@@ -286,9 +293,6 @@
],
typeL: [
{ required: true, message: "绫诲瀷涓嶈兘涓虹┖", trigger: "blur" }
- ],
- unit: [
- { required: true, message: "鍗曚綅涓嶈兘涓虹┖", trigger: "blur" }
],
}
};
--
Gitblit v1.9.3