From 78ba89a381c2ca6a745ffa0c3b6c903ed3130d5f Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期三, 24 四月 2024 11:08:15 +0800
Subject: [PATCH] 更新考勤统计的入参修改
---
src/views/employeeManage/employeeInfo/components/AddEmployee.vue | 41 +++++++++++++++++++++++++----------------
1 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/src/views/employeeManage/employeeInfo/components/AddEmployee.vue b/src/views/employeeManage/employeeInfo/components/AddEmployee.vue
index cc662c9..7980c3a 100644
--- a/src/views/employeeManage/employeeInfo/components/AddEmployee.vue
+++ b/src/views/employeeManage/employeeInfo/components/AddEmployee.vue
@@ -19,7 +19,7 @@
</el-date-picker>
</el-form-item>
<el-form-item label="杞﹂棿锛�" prop="shopNameObj">
- <el-select v-model="form.shopNameObj" filterable placeholder="璇烽�夋嫨" style="width: 100%" @change='getGroupNumber'>
+ <el-select v-model="form.shopNameObj" filterable placeholder="璇烽�夋嫨" style="width: 100%" @change="getGroupNumber(false,'shopNameObj')">
<el-option v-for="item in shopList" :key="item.number"
:label="item.name"
:value="{ value: item.number, label: item.name }">
@@ -27,15 +27,18 @@
</el-select>
</el-form-item>
<el-form-item label="缁勫埆锛�" prop="groupNumber">
- <el-select v-model="form.groupNumber" filterable placeholder="璇烽�夋嫨" style="width: 100%">
+ <el-select v-model="form.groupNumber" filterable
+ placeholder="璇峰厛閫夋嫨杞﹂棿"
+ no-data-text="璇峰厛閫夋嫨杞﹂棿"
+ style="width: 100%">
<el-option v-for="item in groupNumberList" :key="item" :label="item" :value="item">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="宸ョ锛�" prop="workTypeObj">
<el-select v-model="form.workTypeObj" filterable placeholder="璇烽�夋嫨" style="width: 100%">
- <el-option v-for="item in workTypeList" :key="item.id" :label="item.name"
- :value="{ value: item.id, label: item.name }">
+ <el-option v-for="item in workTypeList" :key="item.ID" :label="item.workName"
+ :value="{ value: item.ID, label: item.workName }">
</el-option>
</el-select>
</el-form-item>
@@ -73,7 +76,7 @@
employmentTime:'',
shopNameObj:{},
groupNumber:'',
- workTypeObj:{},
+ workTypeObj:null,
},
shopList:[],//杞﹂棿
groupNumberList:[],//缁勫埆
@@ -90,6 +93,13 @@
{
required: true,
message: "璇疯緭鍏ュ憳宸ョ紪鐮�",
+ trigger: ["blur", "change"],
+ },
+ ],
+ workTypeObj: [
+ {
+ required: true,
+ message: "璇烽�夋嫨",
trigger: ["blur", "change"],
},
],
@@ -133,18 +143,22 @@
employmentTime:'',
shopNameObj:{},
groupNumber:'',
- workTypeObj:{},
+ workTypeObj:null,
};
this.$nextTick(()=>{
this.$refs["form"].resetFields();
if (this.editRow.id) {
this.form = JSON.parse(JSON.stringify(this.editRow));
+ this.form.groupNumber=this.form.groupNumber?this.form.groupNumber:null
this.getGroupNumber(true)
}
})
}
},
- getGroupNumber(val){
+ getGroupNumber(val,name){
+ if (name == "shopNameObj") {
+ this.form.groupNumber=''
+ }
// shopName
if(this.form.shopNameObj.value){
//缁勫埆
@@ -156,21 +170,15 @@
for(let i in groupNumberList){
this.groupNumberList.push(groupNumberList[i])
}
- this.form.shopName=''
- // 缂栬緫
- if(val){
- setTimeout(()=>{
- this.$set(this.form,'shopName',this.form.shopName)
- },200)
- }
+
}
}else{
this.groupNumberList=[]
- this.form.shopName=''
+ this.form.groupNumber=''
}
});
}else{
- this.workshopGroupList =[]
+ this.groupNumberList =[]
}
},
getSelectDataList() {
@@ -208,6 +216,7 @@
form.shopName=form.shopNameObj.label
form.workTypeId=form.workTypeObj.value
form.workType=form.workTypeObj.label
+ form.groupNumber=form.groupNumber?form.groupNumber:null
if (this.editRow.type == "add") {
createWorkerInfo(form).then((res) => {
if (res.code == 200) {
--
Gitblit v1.8.0