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 | 203 +++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 156 insertions(+), 47 deletions(-)
diff --git a/src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementModalEdit.vue b/src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementModalEdit.vue
index 1086fea..9236b92 100644
--- a/src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementModalEdit.vue
+++ b/src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementModalEdit.vue
@@ -5,37 +5,43 @@
<a-form :form="form">
<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="璇烽�夋嫨鏃堕棿"
- class="query-group-cust" v-decorator="['torqueDate', validatorRules.torqueDate]"></j-date>
+ <a-form-item label="璁惧缂栧彿" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <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-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]" 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-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-input :disabled="disableSubmit" :readOnly="readOnly" allow-clear placeholder="璇疯緭鍏ヨ澶囩紪鍙�"
- v-decorator="['equipmentId',validatorRules.equipmentId]"/>
+ <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="['notes', validatorRules.notes]" placeholder="璇疯緭鍏ュ娉�" ></a-textarea>
+ <a-textarea :maxLength="20" :disabled="disableSubmit" v-decorator="['remark', validatorRules.remark]" placeholder="璇疯緭鍏ュ娉�"></a-textarea>
</a-form-item>
</a-row>
</a-form>
@@ -62,6 +68,7 @@
export default {
name: 'TorqueconfigurationModalEdit',
+ components: { },
// components: {DeviceRepairListModel,JDate,DeviceRepairEditListModel},
props: {},
data() {
@@ -79,7 +86,7 @@
span: 24
},
sm: {
- span: 6
+ span: 8
}
},
wrapperCol: {
@@ -87,7 +94,7 @@
span: 24
},
sm: {
- span: 18
+ span: 16
}
},
labelColLong: {
@@ -95,7 +102,7 @@
span: 24
},
sm: {
- span: 3
+ span: 4
}
},
wrapperColLong: {
@@ -103,7 +110,7 @@
span: 24
},
sm: {
- span: 21
+ span: 20
}
},
confirmLoading: false,
@@ -125,6 +132,30 @@
},
],
},
+ startTime:{
+ rules:[
+ {
+ required:true,
+ message: "璇烽�夋嫨鍔犵彮寮�濮嬫椂闂�"
+ },
+ ],
+ },
+ endTime:{
+ rules:[
+ {
+ required:true,
+ message: "璇烽�夋嫨鍔犵彮缁撴潫鏃堕棿"
+ },
+ ],
+ },
+ theDate:{
+ rules:[
+ {
+ required:true,
+ message: "璇烽�夋嫨鍔犵彮鏃ユ湡"
+ },
+ ],
+ }
// mdcRepairType:{
// rules:[
// {
@@ -144,13 +175,28 @@
disableSubmit: true,
partCategoryCascade: [],
cascadeDefaultValue: [],
- editStart:''
+ editStart:'',
+ endTimeSHI:'',
+ startTimeSHI:'',
+ startEdit:'',
+ endEdit:''
}
},
created() {
},
methods: {
+ changeStartTime(data,dataStrings){
+ console.log(data);
+ console.log(dataStrings)
+ this.startTimeSHI = dataStrings
+ },
+ changeEndTime(data,dataStrings){
+ console.log(data);
+ console.log(dataStrings)
+ this.endTimeSHI = dataStrings
+ },
+
disabledDate(current){
//Can not slect days before today and today
// return current && current < moment().endOf("day");
@@ -223,19 +269,42 @@
})
},
edit(record) {
+ console.log(record)
+ // record.endTime = moment(record.endTime).format("HH:mm:ss")
+ this.startEdit = record.startTime;
+ this.endEdit = record.endTime
this.form.resetFields()
this.model = Object.assign({}, record)
+
// this.editStart = (this.model.startTime).replace(/:/g,'');
this.visible = true
this.$nextTick(() => {
- this.form.setFieldsValue(pick(this.model,'equipmentId', 'equipmentName','torqueDate', 'torqueValue','notes'
+ this.form.setFieldsValue(pick(this.model,'equipmentId', 'equipmentName','startTime', 'endTime','theDate','remark'
))
+ this.form.setFieldsValue({
+ startTime: moment(this.model.startTime, 'HH:mm:ss'),
+ endTime: moment(this.model.endTime, 'HH:mm:ss')
+ })
+ // console.log(this.model)
})
},
close() {
this.$emit('close')
this.visible = false
this.show = false
+ },
+ fun(obj) {
+ if(obj){
+ if (obj = obj.split("T")) {
+ var tim = obj[1];
+ if(tim = tim.split(".")){
+ var tim0 = tim[0];
+ }
+ var dd = tim0
+ return dd;
+ }
+ }
+
},
handleOk() {
const that = this
@@ -244,34 +313,74 @@
if (!err) {
that.confirmLoading = true
let formData = Object.assign(this.model, values)
- let obj
- if (!this.model.id) {
- obj = postAction(this.url.add, formData)
- } else {
- obj = requestPut(this.url.edit, formData, {
- id: this.model.id
+ if(this.startTimeSHI != ''){
+ formData.startTime = this.startTimeSHI
+ }else{
+ formData.startTime = this.startEdit
+ }
+ if(this.endTimeSHI != ''){
+ formData.endTime = this.endTimeSHI
+ }else{
+ formData.endTime = this.endEdit
+ }
+
+
+ console.log(formData)
+ // let start = moment(formData.startTime).format('HH:mm:ss');
+ // let end = moment(formData.endTime).format('HH:mm:ss');
+ let startOne = formData.startTime.replace(/:/g,'');
+ let endOne = formData.endTime.replace(/:/g,'');
+ // var data = new Date();
+ // 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{
+ let obj
+
+ if (!this.model.id) {
+ formData.startTime = this.fun(JSON.stringify(formData.startTime));
+ formData.endTime = this.fun(JSON.stringify(formData.endTime))
+ obj = postAction(this.url.add, formData)
+ } else {
+ console.log(1111)
+ // formData.startTime = this.fun(JSON.stringify(formData.startTime));
+ // formData.endTime = this.fun(JSON.stringify(formData.endTime))
+ obj = requestPut(this.url.edit, formData, {
+ id: this.model.id
+ })
+ }
+ obj.then((res) => {
+ if (res.success) {
+ // that.$message.success("娣诲姞鎴愬姛")
+ that.$notification.success({
+ message:'娑堟伅',
+ description:"淇敼鎴愬姛"
+ });
+ // that.$message.success(res.message)
+ that.$emit('ok', res.result)
+ } else {
+ // that.$message.warning(res.message)
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
+ }
+ }).finally(() => {
+ that.confirmLoading = false
+ that.close()
})
}
- obj.then((res) => {
- if (res.success) {
- // that.$message.success("淇敼鎴愬姛")
- that.$notification.success({
- message:'娑堟伅',
- description:"淇敼鎴愬姛"
- });
- // that.$message.success(res.message)
- that.$emit('ok', res.result)
- } else {
- // that.$message.warning(res.message)
- that.$notification.warning({
- message:'娑堟伅',
- description:res.message
- });
- }
- }).finally(() => {
- that.confirmLoading = false
- that.close()
- })
+ // }
+
}
})
},
--
Gitblit v1.9.3