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/index.vue | 20 ++++++++------------
1 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/admin-web/src/views/foundation/material/index.vue b/admin-web/src/views/foundation/material/index.vue
index 972c790..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);
},
},
{
@@ -268,7 +268,7 @@
updState(row) {
let vm = this
let text = row.states == 0 ? "鍚敤" : "绂佺敤";
- vm.$modal.confirm('纭瑕�' + text + '"' + row.goodsName + '"鍚楋紵').then(function () {
+ vm.$modal.confirm('纭瑕�' + text + '"' + row.goodsName + '"鐗╁搧鍚楋紵').then(function () {
let params = Object.assign({}, row)
params.states = row.states == 1 ? 0 : 1
updStatus(params).then(res => {
@@ -282,7 +282,7 @@
},
del(row) {
this.$modal
- .confirm('鏄惁纭鍒犻櫎鍚嶇О涓�"' + row.goodsName + '"鐨勬満鏋勫悧锛�')
+ .confirm('鏄惁纭鍒犻櫎鍚嶇О涓�"' + row.goodsName + '"鐨勭墿鍝佸悧锛�')
.then(function () {
delGoods({id: row.id}).then((res) => {
});
@@ -294,17 +294,13 @@
.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.id = row.id;
+ this.specsSetting.goodsTemplatesId = row.id;
this.specsSetting.show = true;
},
// 鏌ヨtable鍒楄〃
--
Gitblit v1.9.1