From 2a922b25e71b4e9926ac8758c9404190e3ceb134 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期三, 10 四月 2024 17:47:33 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/silk/silk-web
---
src/views/systemSetting/silkPriceStandard/index.vue | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/src/views/systemSetting/silkPriceStandard/index.vue b/src/views/systemSetting/silkPriceStandard/index.vue
index d6957a9..31693d2 100644
--- a/src/views/systemSetting/silkPriceStandard/index.vue
+++ b/src/views/systemSetting/silkPriceStandard/index.vue
@@ -54,7 +54,7 @@
tableList: {},
showCol: ["搴勫彛", "鐢熶笣绛夌骇", "钖叕鏍囧噯", "鍗曚綅", "澶囨敞"],
tableColumn: [
- { label: "搴勫彛", prop: "marketNumber",},
+ { label: "搴勫彛", prop: "marketName",},
{ label: "鐢熶笣绛夌骇", prop: "rawSilkGrade", },
{ label: "钖叕鏍囧噯", prop: "payStandard" },
{ label: "鍗曚綅", prop: "unit" },
@@ -86,9 +86,9 @@
},
// 鏂板
addBtnClick() {
+ this.editConfig.infomitton={}
this.editConfig.dialogTitle="鏂板"
this.editConfig.visible=true
- this.editConfig.infomitton={}
},
// 淇濆瓨
saveBtnClick(){
@@ -157,16 +157,18 @@
})
},
handleClick(row,type){
- if(type==="鏌ョ湅"){
- this.editConfig.infomitton=row
- this.editConfig.dialogTitle=type
- this.editConfig.visible=true
- }else if(type==="淇敼"){
- this.editConfig.infomitton=row
+ if(type!=="鍒犻櫎"){
+ this.editConfig.infomitton={
+ ...row,
+ market:{
+ ID:row.marketId,
+ name:row.marketName,
+ }
+ }
this.editConfig.dialogTitle=type
this.editConfig.visible=true
}else if(type==="鍒犻櫎"){
- this.$confirm(`纭鍒犻櫎${row.name}鍚�?`, '鎻愮ず', {
+ this.$confirm(`纭鍒犻櫎鍚�?`, '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
type: 'warning'
@@ -180,7 +182,9 @@
});
}
})
- })
+ }).catch(() => {
+ console.log("鍙栨秷鍒犻櫎")
+ });
}
}
}
--
Gitblit v1.8.0