From 4062e6df79a5a0a02ddcb05162916b257d61f0c7 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期日, 28 四月 2024 15:04:30 +0800
Subject: [PATCH] 设置满勤，设置野纤生丝标准 2个模块保存接口增加对应的id
---
src/views/employeeSalary/salaryPlan/components/SilkSetDialog.vue | 2 +-
src/views/employeeSalary/salaryPlan/components/ConstantSetDialog.vue | 10 +++++-----
src/views/employeeSalary/salaryPlan/components/addDialog.vue | 36 ++++++++++++++++++++++++++++--------
3 files changed, 34 insertions(+), 14 deletions(-)
diff --git a/src/views/employeeSalary/salaryPlan/components/ConstantSetDialog.vue b/src/views/employeeSalary/salaryPlan/components/ConstantSetDialog.vue
index 27e2bd6..cd67aca 100644
--- a/src/views/employeeSalary/salaryPlan/components/ConstantSetDialog.vue
+++ b/src/views/employeeSalary/salaryPlan/components/ConstantSetDialog.vue
@@ -87,14 +87,14 @@
if (newVal) {
this.$nextTick(() => {
this.$refs["form"].resetFields();
+ this.form.absenteeism=this.editRow.absenteeism.value||1
+ this.form.number=null
});
- this.form.absenteeism=this.editRow.absenteeism
- this.form.number=null
}
},
- 'editRow.absenteeism': function () {
- this.form.absenteeism=this.editRow.absenteeism
- }
+ // 'editRow.absenteeism': function () {
+ // this.form.absenteeism=this.editRow.absenteeism.value
+ // }
},
methods: {
validatorNum(rule, value, callback) {
diff --git a/src/views/employeeSalary/salaryPlan/components/SilkSetDialog.vue b/src/views/employeeSalary/salaryPlan/components/SilkSetDialog.vue
index 740ac25..94c2546 100644
--- a/src/views/employeeSalary/salaryPlan/components/SilkSetDialog.vue
+++ b/src/views/employeeSalary/salaryPlan/components/SilkSetDialog.vue
@@ -61,8 +61,8 @@
if (newVal) {
this.$nextTick(() => {
this.$refs["form"].resetFields();
+ this.form.wildSilkList=this.editRow.wildSilkList.value||['閲庣氦']
});
- this.form=this.editRow
}
},
},
diff --git a/src/views/employeeSalary/salaryPlan/components/addDialog.vue b/src/views/employeeSalary/salaryPlan/components/addDialog.vue
index 5ed0a6c..44695b5 100644
--- a/src/views/employeeSalary/salaryPlan/components/addDialog.vue
+++ b/src/views/employeeSalary/salaryPlan/components/addDialog.vue
@@ -227,9 +227,9 @@
error: "",
},
// 婊″嫟濂栬缃�
- absenteeism:1,
+ absenteeism:{value:1,id:null},
// 璁剧疆閲庣氦鐨勭敓涓濇爣鍑�
- wildSilkList: ['閲庣氦'],
+ wildSilkList: {value:'閲庣氦',id:null},
activeName: 1,
formulaName: [
{
@@ -496,14 +496,20 @@
},
confirmValueSave(form, type) {
if (type == 9) {
- this.wildSilkList = form.wildSilkList;
+ let wildSilkList = form.wildSilkList;
this.handleConfirmSave([
- {name:this.wildSilkList.join(',')}
+ {
+ name:wildSilkList.join(','),
+ id:this.wildSilkList.id
+ }
],type)
} else if (type == 10) {
- this.absenteeism = form.absenteeism + "";
+ let absenteeism = form.absenteeism + "";
this.handleConfirmSave([
- {name:this.absenteeism}
+ {
+ name:absenteeism,
+ id:this.absenteeism.id
+ }
],type)
} else if (type == 3) {
this.formulaClick(
@@ -567,9 +573,23 @@
handleGetBomKindDictList(val) {
getSalaryTypeList({ type: val?val:8 }).then((res) => {
if(val==9){
- this.wildSilkList=(res.data&&res.data.length>0)?res.data[0].name.split(','):['閲庣氦']
+ // 閲庣氦鐨勭敓涓濇爣鍑嗛厤缃�
+ this.wildSilkList=(res.data&&res.data.length>0)?{
+ ...res.data[0],
+ value:res.data[0].name.split(',')||[]
+ }:{
+ id:null,
+ value:['閲庣氦']
+ }
}else if(val==10){
- this.absenteeism=(res.data&&res.data.length>0)?res.data[0].name:1
+ // 鑰冨嫟閰嶇疆
+ this.absenteeism=(res.data&&res.data.length>0)?{
+ ...res.data[0],
+ value:res.data[0].name||1
+ }:{
+ id:null,
+ value:1
+ }
}else{
this.unitList = res.data;
}
--
Gitblit v1.8.0