From 585fb0bbd4a7bc7f8f333ecba7c5fecd2ee5cbc2 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 09:46:44 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementModalEdit.vue | 82 ++++++++++++++++++++++++++++------------
1 files changed, 57 insertions(+), 25 deletions(-)
diff --git a/src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementModalEdit.vue b/src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementModalEdit.vue
index a8995f5..9236b92 100644
--- a/src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementModalEdit.vue
+++ b/src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementModalEdit.vue
@@ -9,32 +9,39 @@
<a-input :disabled="disableSubmit" :readOnly="readOnly" allow-clear placeholder="璇疯緭鍏ヨ澶囩紪鍙�"
v-decorator="['equipmentId',validatorRules.equipmentId]"/>
</a-form-item>
-
</a-col>
+ <a-col :span="12">
+ <a-form-item label="鍔犵彮寮�濮嬫椂闂�" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-time-picker :disabled="disableSubmit" :readOnly="disableSubmit" @change="changeStartTime"
+ v-decorator="['startTime',validatorRules.startTime]" style="width: 100%"/>
+ </a-form-item>
+ </a-col>
+ </a-row>
+ <a-row :gutter="24">
<a-col :span="12">
<a-form-item label="璁惧鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input :disabled="disableSubmit" :readOnly="readOnly" allow-clear placeholder="璇疯緭鍏ヨ澶囧悕绉�"
v-decorator="['equipmentName',validatorRules.equipmentName]"/>
</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" @change="changeStartTime"
- v-decorator="['startTime',validatorRules.startTime]"/>
- </a-form-item>
- </a-col>
<a-col :span="12">
<a-form-item label="鍔犵彮缁撴潫鏃堕棿" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-time-picker :disabled="disableSubmit" :readOnly="disableSubmit" @change="changeEndTime"
- v-decorator="['endTime',validatorRules.endTime]"/>
+ v-decorator="['endTime',validatorRules.endTime]" style="width: 100%"/>
+ </a-form-item>
+ </a-col>
+ </a-row>
+ <a-row :gutter="24">
+ <a-col :span="12">
+ <a-form-item label="鏃ユ湡" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-date-picker :disabled="disableSubmit" :readOnly="disableSubmit"
+ v-decorator="['theDate',validatorRules.theDate]" format="YYYYMMDD" valueFormat="YYYYMMDD" style="width: 100%" placeholder="璇烽�夋嫨鍔犵彮鏃ユ湡"/>
</a-form-item>
</a-col>
</a-row>
<a-row :gutter="24">
<a-form-item label="澶囨敞" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
- <a-textarea :maxLength="20" :disabled="disableSubmit" v-decorator="['remark', validatorRules.remark]" placeholder="璇疯緭鍏ュ娉�" ></a-textarea>
+ <a-textarea :maxLength="20" :disabled="disableSubmit" v-decorator="['remark', validatorRules.remark]" placeholder="璇疯緭鍏ュ娉�"></a-textarea>
</a-form-item>
</a-row>
</a-form>
@@ -61,6 +68,7 @@
export default {
name: 'TorqueconfigurationModalEdit',
+ components: { },
// components: {DeviceRepairListModel,JDate,DeviceRepairEditListModel},
props: {},
data() {
@@ -78,7 +86,7 @@
span: 24
},
sm: {
- span: 6
+ span: 8
}
},
wrapperCol: {
@@ -86,7 +94,7 @@
span: 24
},
sm: {
- span: 18
+ span: 16
}
},
labelColLong: {
@@ -94,7 +102,7 @@
span: 24
},
sm: {
- span: 3
+ span: 4
}
},
wrapperColLong: {
@@ -102,7 +110,7 @@
span: 24
},
sm: {
- span: 21
+ span: 20
}
},
confirmLoading: false,
@@ -124,6 +132,30 @@
},
],
},
+ startTime:{
+ rules:[
+ {
+ required:true,
+ message: "璇烽�夋嫨鍔犵彮寮�濮嬫椂闂�"
+ },
+ ],
+ },
+ endTime:{
+ rules:[
+ {
+ required:true,
+ message: "璇烽�夋嫨鍔犵彮缁撴潫鏃堕棿"
+ },
+ ],
+ },
+ theDate:{
+ rules:[
+ {
+ required:true,
+ message: "璇烽�夋嫨鍔犵彮鏃ユ湡"
+ },
+ ],
+ }
// mdcRepairType:{
// rules:[
// {
@@ -247,7 +279,7 @@
// this.editStart = (this.model.startTime).replace(/:/g,'');
this.visible = true
this.$nextTick(() => {
- this.form.setFieldsValue(pick(this.model,'equipmentId', 'equipmentName','startTime', 'endTime','remark'
+ this.form.setFieldsValue(pick(this.model,'equipmentId', 'equipmentName','startTime', 'endTime','theDate','remark'
))
this.form.setFieldsValue({
startTime: moment(this.model.startTime, 'HH:mm:ss'),
@@ -305,13 +337,13 @@
// 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) {
@@ -331,7 +363,7 @@
// that.$message.success("娣诲姞鎴愬姛")
that.$notification.success({
message:'娑堟伅',
- description:"娣诲姞鎴愬姛"
+ description:"淇敼鎴愬姛"
});
// that.$message.success(res.message)
that.$emit('ok', res.result)
@@ -349,7 +381,7 @@
}
// }
- // }
+ }
})
},
handleCancel() {
--
Gitblit v1.9.3