From a3094611deac91e0ec35bcfe3f3fdd3bdf993466 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期五, 26 四月 2024 16:18:40 +0800
Subject: [PATCH] 考勤统计模块 增加月份对应的星期的数据处理+对应考勤统计的样式调整
---
src/views/systemSetting/workshopManage/components/addDialog.vue | 123 +++++++++++++++++++++++-----------------
1 files changed, 71 insertions(+), 52 deletions(-)
diff --git a/src/views/systemSetting/workshopManage/components/addDialog.vue b/src/views/systemSetting/workshopManage/components/addDialog.vue
index c88406a..06b7048 100644
--- a/src/views/systemSetting/workshopManage/components/addDialog.vue
+++ b/src/views/systemSetting/workshopManage/components/addDialog.vue
@@ -5,22 +5,23 @@
:visible.sync="editConfig.visible"
width="30%"
:before-close="handleClose">
- <el-form :inline="true" label-width="20%" style="width: 100%;" :model="form" >
- <el-form-item label="杞﹂棿" style="width: 100%;" >
+ <el-form :inline="true" label-width="20%" style="width: 100%;" :model="editConfig.infomitton" :rules="rules" ref="ruleForm" >
+ <el-form-item prop="workshop" label="杞﹂棿" style="width: 100%;" >
<el-select
- :disabled="this.editConfig.dialogTitle==='鏌ョ湅'" v-model="editConfig.infomitton.workshopNumber" placeholder="璇烽�夋嫨杞﹂棿">
+ :disabled="this.editConfig.dialogTitle==='鏌ョ湅'" v-model="editConfig.infomitton.workshop" value-key="name" placeholder="璇烽�夋嫨杞﹂棿">
<el-option
v-for="item in workshopList"
:key="item.ID"
:label="item.name"
- :value="item.ID">
+ :value="item">
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="缁勫埆" style="width: 100%;" >
+ <el-form-item label="缁勫埆" style="width: 100%;"
+ prop="groupNumber" >
<!-- <el-input-number
- v-model="form.workshopNumber"
+ v-model="form.workshop"
placeholder="璇疯緭鍏ョ粍鍒�"
:controls="false"
style="width: 100%; margin-right: 5px;text-align:left;"
@@ -35,7 +36,7 @@
</el-input>
</el-form-item>
- <el-form-item label="寮�濮嬭溅鍙�" style="width: 100%;" >
+ <el-form-item label="寮�濮嬭溅鍙�" style="width: 100%;" prop="startCarNumber" >
<el-input
:disabled="this.editConfig.dialogTitle==='鏌ョ湅'"
v-model="editConfig.infomitton.startCarNumber"
@@ -45,7 +46,7 @@
>
</el-input>
</el-form-item>
- <el-form-item label="缁撴潫杞﹀彿" style="width: 100%;" >
+ <el-form-item label="缁撴潫杞﹀彿" style="width: 100%;" prop="endCarNumber" >
<el-input
:disabled="this.editConfig.dialogTitle==='鏌ョ湅'"
v-model="editConfig.infomitton.endCarNumber"
@@ -80,7 +81,7 @@
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="editConfig.visible = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="commitForm">纭� 瀹�</el-button>
+ <el-button type="primary" @click="commitForm('ruleForm')">纭� 瀹�</el-button>
</span>
</el-dialog>
</div>
@@ -98,12 +99,6 @@
dialogTitle:"娣诲姞",
isReadonly:true,
infomitton: {
- workshopNumber:null,
- groupNumber:null,
- startCarNumber:null,
- endCarNumber:null,
- carFlag:null,
- notes:null
},
}
}
@@ -112,20 +107,26 @@
data() {
return {
editConfig:this.editDiaConfig,
- form: {
- workshopNumber:null,
- groupNumber:null,
- startCarNumber:null,
- endCarNumber:null,
- carFlag:null,
- notes:null
- },
workshopList:[],
carFlagList:[
{id:1,name:"宸﹀崐杞�"},
{id:2,name:"鍙冲崐杞�"},
{id:3,name:"鍏ㄨ溅缁撴潫"},
- ]
+ ],
+ rules: {
+ workshop: [
+ { required: true, message: '璇烽�夋嫨杞﹂棿', trigger: 'change' }
+ ],
+ groupNumber: [
+ { required: true, message: '璇峰～鍐欑粍鍒�', trigger: 'change' }
+ ],
+ startCarNumber: [
+ { required: true, message: '璇峰～鍐�', trigger: 'change' }
+ ],
+ endCarNumber: [
+ { required: true, message: '璇峰～鍐�', trigger: 'change' }
+ ],
+ },
};
},
computed: {
@@ -137,7 +138,14 @@
},
watch: {
-
+ 'editConfig.visible'(newVal) {
+ if (newVal) {
+ this.$nextTick(()=>{
+ this.$refs["ruleForm"].resetFields();
+ this.editConfig=this.editDiaConfig
+ })
+ }
+ },
},
methods: {
handleClose(done) {
@@ -152,42 +160,53 @@
},
setParams(){
let params={
- workshopNumber:this.editConfig.infomitton.workshopNumber+'',
+ workshopNumber:this.editConfig.infomitton.workshop.number+"",
+ workshopName:this.editConfig.infomitton.workshop.name,
groupNumber:Number(this.editConfig.infomitton.groupNumber),
startCarNumber:Number(this.editConfig.infomitton.startCarNumber),
endCarNumber:Number(this.editConfig.infomitton.endCarNumber),
carFlag:Number(this.editConfig.infomitton.carFlag),
notes:this.editConfig.infomitton.notes,
- // id:Number(this.editConfig.infomitton.workshopId),
}
return params
},
- async commitForm(){
- let params=this.setParams()
- if(this.editConfig.dialogTitle==="鏂板"){
- await saveWorkshopManage(params).then((res)=>{
- if(res&&res.code===200){
- this.editConfig.visible=false
- this.$message({
- message: "淇濆瓨鎴愬姛!",
- type: "success",
- });
- this.$parent.getData()
+ async commitForm(formName){
+ this.$refs[formName].validate((valid) => {
+ if (valid) {
+ let params=this.setParams()
+ if(this.editConfig.dialogTitle==="鏂板"){
+ saveWorkshopManage(params).then((res)=>{
+ if(res&&res.code===200){
+ this.editConfig.visible=false
+ this.$message({
+ message: "淇濆瓨鎴愬姛!",
+ type: "success",
+ });
+ this.$parent.getData()
+ }
+ })
+ }else if(this.editConfig.dialogTitle==="淇敼"){
+ saveWorkshopManage({
+ ...params,
+ id:this.editConfig.infomitton.ID
+ }).then((res)=>{
+ if(res&&res.code===200){
+ this.editConfig.visible=false
+ this.$message({
+ message: "淇濆瓨鎴愬姛!",
+ type: "success",
+ });
+ this.$parent.getData()
+ }
+ })
}
- })
- }else if(this.editConfig.dialogTitle==="淇敼"){
- this.editConfig.infomitton.workshopNumber=this.editConfig.infomitton.workshopNumber+""
- await saveWorkshopManage(this.editConfig.infomitton).then((res)=>{
- if(res&&res.code===200){
- this.editConfig.visible=false
- this.$message({
- message: "淇濆瓨鎴愬姛!",
- type: "success",
- });
- this.$parent.getData()
- }
- })
- }
+ } else {
+ console.log('error submit!!');
+ return false;
+ }
+ });
+
+
}
},
components: {
--
Gitblit v1.8.0