From c96cb749fc131b5d220ac40a9134ce544e9ef070 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期二, 07 五月 2024 18:32:07 +0800
Subject: [PATCH] 应发工资报表模块 接口联调+增加日期的筛选和限制+重组数据得到动态表头和动态数据的逻辑处理
---
src/views/employeeManage/employeeInfo/components/AddEmployee.vue | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/src/views/employeeManage/employeeInfo/components/AddEmployee.vue b/src/views/employeeManage/employeeInfo/components/AddEmployee.vue
index 576d73c..3a3fd14 100644
--- a/src/views/employeeManage/employeeInfo/components/AddEmployee.vue
+++ b/src/views/employeeManage/employeeInfo/components/AddEmployee.vue
@@ -4,8 +4,8 @@
<div slot="title" class="tac drawerHeader">{{ editRow.title }}浜哄憳</div>
<div class="dialog-content-box">
<el-form class="form-box" ref="form" :rules="rules" :model="form" label-width="120px" label-position="right">
- <el-form-item label="鍛樺伐缂栫爜锛�" prop="id">
- <el-input v-model="form.id" placeholder="璇疯緭鍏�"></el-input>
+ <el-form-item label="鍛樺伐缂栫爜锛�" prop="id" >
+ <el-input v-model="form.id" placeholder="璇疯緭鍏�" :disabled="editRow.title=='缂栬緫'?true:false"></el-input>
</el-form-item>
<el-form-item label="浜哄憳濮撳悕锛�" prop="name">
<el-input v-model="form.name" placeholder="璇疯緭鍏�"></el-input>
@@ -15,6 +15,7 @@
</el-form-item>
<el-form-item label="鍏ヨ亴鏃堕棿锛�" prop="employmentTime">
<el-date-picker v-model="form.employmentTime" style="width:100%;" type="date" placeholder="閫夋嫨鏃ユ湡"
+ :picker-options="pickerOptions"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
@@ -76,11 +77,16 @@
employmentTime:'',
shopNameObj:{},
groupNumber:'',
- workTypeObj:{},
+ workTypeObj:null,
},
shopList:[],//杞﹂棿
groupNumberList:[],//缁勫埆
workTypeList:[], //宸ョ
+ pickerOptions: {
+ disabledDate(time) {
+ return time.getTime() > new Date().getTime();
+ },
+ },
rules: {
id: [
{
@@ -93,6 +99,13 @@
{
required: true,
message: "璇疯緭鍏ュ憳宸ョ紪鐮�",
+ trigger: ["blur", "change"],
+ },
+ ],
+ workTypeObj: [
+ {
+ required: true,
+ message: "璇烽�夋嫨",
trigger: ["blur", "change"],
},
],
@@ -136,12 +149,13 @@
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)
}
})
@@ -208,6 +222,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