From d3ae08fbd8634429150f8a54bc779efdfd9aa1e2 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期三, 13 十二月 2023 19:02:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin-web/src/views/foundation/material/edit.vue | 6 +-----
admin-web/src/views/foundation/material/index.vue | 14 +++++---------
2 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/admin-web/src/views/foundation/material/edit.vue b/admin-web/src/views/foundation/material/edit.vue
index 7d271d5..8a5061d 100644
--- a/admin-web/src/views/foundation/material/edit.vue
+++ b/admin-web/src/views/foundation/material/edit.vue
@@ -9,10 +9,6 @@
style="width: 100%"/>
</el-form-item>
<el-form-item label="鐗╁搧鍒嗙被" prop="categoryId">
- <!-- <el-select v-model="formData.categoryId" clearable placeholder="璇烽�夋嫨" style="width: 100%">
- <el-option v-for="item in categoryList" :key="item.id" :label="item.categoryName"
- :value="item.id"></el-option>
- </el-select>-->
<el-cascader
clearable
filterable
@@ -25,7 +21,7 @@
<el-row :gutter="20" v-for="(m, i) in formData.models">
<el-col :span="9">
<el-form-item label="瑙勬牸鍨嬪彿" :prop="`models.${i}.modelName`" :rules="rules.modelName">
- <el-input v-model="m.modelName" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙峰悕绉�" clearable maxlength="20" show-word-limit
+ <el-input :disabled="!!setting.id" v-model="m.modelName" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙峰悕绉�" clearable maxlength="20" show-word-limit
style="width: 100%"/>
</el-form-item>
</el-col>
diff --git a/admin-web/src/views/foundation/material/index.vue b/admin-web/src/views/foundation/material/index.vue
index e436695..a946c1c 100644
--- a/admin-web/src/views/foundation/material/index.vue
+++ b/admin-web/src/views/foundation/material/index.vue
@@ -218,7 +218,7 @@
{
title: '缂栬緫',
events: (row) => {
- this.showAudit(row);
+ this.showAdd(row.id);
},
},
{
@@ -294,14 +294,10 @@
.catch(() => {
});
},
- showAdd() {
- // if (!this.editSetting.orgId) {
- // this.$message.warning('璇峰厛閫夋嫨宸︿晶鏈烘瀯')
- // } else {
- this.editSetting.id = null;
- this.editSetting.title = '鏂板';
- this.editSetting.show = true;
- // }
+ showAdd(id) {
+ this.editSetting.id = id;
+ this.editSetting.title = id?'缂栬緫':'鏂板';
+ this.editSetting.show = true;
},
showSpecs(row) {
this.specsSetting.goodsTemplatesId = row.id;
--
Gitblit v1.9.1