From 7a1652cf61e65a2dd2ad1b52c4b383207f3a6956 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期五, 01 九月 2023 14:03:00 +0800
Subject: [PATCH] 加班管理
---
src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementModal.vue | 61 +++++++++++-------------------
1 files changed, 23 insertions(+), 38 deletions(-)
diff --git a/src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementModal.vue b/src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementModal.vue
index ba6250a..ff5ad89 100644
--- a/src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementModal.vue
+++ b/src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementModal.vue
@@ -5,45 +5,30 @@
<a-form :form="form">
<a-row :gutter="24">
<a-col :span="24">
- <a-form-item label="璁惧缁�" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
- <a-input-search :readOnly="true" v-decorator="['equipmentIds', validatorRules.equipmentIds]"
+ <a-form-item label="鐝閫夋嫨" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
+ <a-input-search :readOnly="true" v-decorator="['ids', validatorRules.ids]"
@search="deviceSearch" enter-button/>
</a-form-item>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="12">
- <a-form-item label="鏃ユ湡" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="璇烽�夋嫨鏃堕棿"
- v-decorator="['torqueDate', validatorRules.torqueDate]"></j-date>
- </a-form-item>
- </a-col>
- <!--<a-col :span="12">-->
- <!--<a-form-item label="鎵煩鍊�" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
- <!--<a-input-number :min="0" :disabled="disableSubmit" placeholder="璇疯緭鍏ユ壄鐭╁��"-->
- <!--v-decorator="['torqueValue', validatorRules.torqueValue]"/>-->
- <!--</a-form-item>-->
- <!--</a-col>-->
- <a-col :span="12">
<a-form-item label="鍔犵彮寮�濮嬫椂闂�" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-time-picker :disabled="disableSubmit" :readOnly="disableSubmit" allow-clear
- v-decorator="['startDate',validatorRules.startDate]"/>
+ v-decorator="['startTime',validatorRules.startTime]"/>
</a-form-item>
</a-col>
- </a-row>
- <a-row :gutter="24">
-
<a-col :span="12">
<a-form-item label="鍔犵彮缁撴潫鏃堕棿" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-time-picker :disabled="disableSubmit" :readOnly="disableSubmit"
- v-decorator="['endDate',validatorRules.endDate]"/>
+ v-decorator="['endTime',validatorRules.endTime]"/>
</a-form-item>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="24">
<a-form-item label="澶囨敞" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
- <a-textarea :maxLength="20" v-decorator="['notes', validatorRules.notes]" placeholder="璇疯緭鍏ュ娉�" ></a-textarea>
+ <a-textarea :maxLength="20" v-decorator="['remark', validatorRules.remark]" placeholder="璇疯緭鍏ュ娉�" ></a-textarea>
</a-form-item>
</a-col>
</a-row>
@@ -129,8 +114,8 @@
},
url: {
- add: '/mdc/MdcTorqueConfig/addMdcTorqueConfig',
- edit: '/mdc/MdcTorqueConfig/editMdcTorqueConfig'
+ add: '/mdc/mdcEquipmentOvertime/add',
+ edit: '/mdc/mdcEquipmentOvertime/edit'
},
disableSubmit: true,
@@ -161,17 +146,17 @@
this.endTime = dateStrings[0];
},
getDeviceRows(val) {
- var equipmentIds;
+ var calendarId;
for(var i = 0;i<val.length;i++){
if (i == 0) {
- equipmentIds = val[i].equipmentId;
+ calendarId = val[i].id;
} else {
- equipmentIds = equipmentIds + "," + val[i].equipmentId;
+ calendarId = ids + "," + val[i].id;
}
}
// console.log("========",equipmentIds);
this.form.setFieldsValue({
- equipmentIds: equipmentIds,
+ ids: calendarId,
})
// this.form.setFieldsValue({
// equipmentId: val.equipmentId,
@@ -234,23 +219,23 @@
if (!err) {
that.confirmLoading = true
let formData = Object.assign(this.model, values)
- // let start = moment(formData.startTime).format('YYYY-MM-DD HH:mm:ss');
- // let end = moment(formData.endTime).format('YYYY-MM-DD HH:mm:ss');
- // let startOne = start.replace(/:/g,'');
- // let endOne = end.replace(/:/g,'');
+ let start = moment(formData.startTime).format('HH:mm:ss');
+ let end = moment(formData.endTime).format('HH:mm:ss');
+ let startOne = start.replace(/:/g,'');
+ let endOne = end.replace(/:/g,'');
// var data = new Date();
- // let stertDate = moment(data).format("YYYY-MM-DD HH:mm:ss");
+ // let stertDate = moment(data).format("HH:mm:ss");
// let dataStart = stertDate.replace(/:/g,'');
// if(startOne < dataStart){
// that.$message.warning("寮�濮嬫椂闂翠笉鑳藉皬浜庡綋鍓嶆椂闂�")
// that.confirmLoading = false
// }else{
- // if(startOne>=endOne){
- // that.$message.warning("缁撴潫鏃堕棿涓嶈兘灏忎簬寮�濮嬫椂闂�");
- // // console.log(this.model)
- // // this.endTime = ''
- // that.confirmLoading = false
- // }else{
+ if(startOne>=endOne){
+ that.$message.warning("缁撴潫鏃堕棿涓嶈兘灏忎簬寮�濮嬫椂闂�");
+ // console.log(this.model)
+ // this.endTime = ''
+ that.confirmLoading = false
+ }else{
let obj
if (!this.model.id) {
obj = postAction(this.url.add, formData)
@@ -280,7 +265,7 @@
that.close()
})
}
- // }
+ }
// }
})
--
Gitblit v1.9.3