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/components/addDialog.vue | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/views/systemSetting/silkPriceStandard/components/addDialog.vue b/src/views/systemSetting/silkPriceStandard/components/addDialog.vue
index 0f76dbd..5e4ca50 100644
--- a/src/views/systemSetting/silkPriceStandard/components/addDialog.vue
+++ b/src/views/systemSetting/silkPriceStandard/components/addDialog.vue
@@ -4,10 +4,10 @@
:before-close="handleClose">
<el-form :inline="true" label-width="20%" style="width: 100%;" :model="editConfig.infomitton" :rules="rules"
ref="ruleForm">
- <el-form-item prop="marketNumber" label="搴勫彛" style="width: 100%;">
- <el-select :disabled="this.editConfig.dialogTitle === '鏌ョ湅'" v-model="editConfig.infomitton.marketNumber"
+ <el-form-item prop="market" label="搴勫彛" style="width: 100%;">
+ <el-select :disabled="this.editConfig.dialogTitle === '鏌ョ湅'" v-model="editConfig.infomitton.market" value-key="ID"
placeholder="璇烽�夋嫨搴勫彛">
- <el-option v-for="item in shanguchiList" :key="item.ID" :label="item.name" :value="item.ID">
+ <el-option v-for="item in shanguchiList" :key="item.name" :label="item.name" :value="item">
</el-option>
</el-select>
</el-form-item>
@@ -84,7 +84,7 @@
],
classList: [],
rules: {
- marketNumber: [
+ market: [
{ required: true, message: '璇烽�夋嫨搴勫彛', trigger: 'change' }
],
rawSilkGrade: [
@@ -121,7 +121,8 @@
},
setParams() {
let params = {
- marketNumber: this.editConfig.infomitton.marketNumber + '',
+ marketId: this.editConfig.infomitton.market.ID,
+ marketName: this.editConfig.infomitton.market.name,
unit: this.editConfig.infomitton.unit,
payStandard: Number(this.editConfig.infomitton.payStandard),
rawSilkGrade: this.editConfig.infomitton.rawSilkGrade,
@@ -134,6 +135,7 @@
this.$refs[formName].validate((valid) => {
if (valid) {
let params = this.setParams()
+ console.log(this.editConfig.infomitton.market,params,"鐪嬮偅")
if (this.editConfig.dialogTitle === "鏂板") {
savePriceStandard(params).then((res) => {
if (res && res.code === 200) {
@@ -147,7 +149,7 @@
})
} else if (this.editConfig.dialogTitle === "淇敼") {
this.editConfig.infomitton.workshopNumber = this.editConfig.infomitton.workshopNumber + ""
- savePriceStandard(this.editConfig.infomitton).then((res) => {
+ savePriceStandard({...params,id:this.editConfig.infomitton.ID}).then((res) => {
if (res && res.code === 200) {
this.editConfig.visible = false
this.$message({
--
Gitblit v1.8.0