From 082b572b91abd0d5ae8e409714553130448aa6d1 Mon Sep 17 00:00:00 2001
From: 张涛 <“2538313560@qq.com”>
Date: 星期五, 30 八月 2024 17:25:44 +0800
Subject: [PATCH] fix：薪资调整
---
src/views/systemSetting/silkPriceStandard/components/addDialog.vue | 39 +++++++++++++++++++++++++++++++--------
1 files changed, 31 insertions(+), 8 deletions(-)
diff --git a/src/views/systemSetting/silkPriceStandard/components/addDialog.vue b/src/views/systemSetting/silkPriceStandard/components/addDialog.vue
index 0f76dbd..5935b44 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>
@@ -26,7 +26,7 @@
style="width: 100%; margin-right: 5px;text-align:left;"
></el-input-number> -->
<el-input :disabled="this.editConfig.dialogTitle === '鏌ョ湅'" v-model="editConfig.infomitton.payStandard" :rows="4"
- style="resize: none !important;" placeholder="璇疯緭鍏ョ粍鍒�">
+ style="resize: none !important;" placeholder="璇疯緭鍏ヨ柂閰爣鍑�">
</el-input>
</el-form-item>
<el-form-item label="鍗曚綅" style="width: 100%;">
@@ -84,14 +84,19 @@
],
classList: [],
rules: {
- marketNumber: [
+ market: [
{ required: true, message: '璇烽�夋嫨搴勫彛', trigger: 'change' }
],
rawSilkGrade: [
{ required: true, message: '璇烽�夋嫨鐢熶笣绛夌骇', trigger: 'change' }
],
payStandard: [
- { required: true, message: '璇烽�夋嫨鐢熶笣绛夌骇', trigger: 'change' }
+ { required: true, message: '璇疯緭鍏ヨ柂閰爣鍑�', trigger: ["blur",'change'] },
+ {
+ validator: this.validatorNum,
+ trigger: ["blur",'change'],
+ },
+ // {pattern: /^[0-9.]*$/, message: '钖叕鏍囧噯闇�涓烘暟瀛�', trigger: 'blur'}
]
},
};
@@ -109,6 +114,22 @@
},
methods: {
+ validatorNum(rule, value, callback) {
+ if (value) {
+ if (value == undefined || value == null) {
+ callback(new Error("璇疯緭鍏ユ湁鏁堟暟瀛�"));
+ } else {
+ var reg = /^(?!(0[0-9]{0,}$))[0-9]{1,}[.]{0,}[0-9]{0,}$/;
+ if (!reg.test(value)) {
+ callback(new Error("璇峰～鍐欏ぇ浜�0鐨勬暟瀛�"));
+ } else {
+ callback();
+ }
+ }
+ } else {
+ callback();
+ }
+ },
handleClose(done) {
done();
},
@@ -121,7 +142,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 +156,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 +170,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