From 997835429a1d66643364091e8437ebbbeb8ff97a Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期四, 28 九月 2023 14:09:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into develop
---
src/views/mdc/base/modules/deviceRepair/DeviceRepairModelEdit.vue | 347 +++++++++++++++++++++++++++++++++++----------------------
1 files changed, 210 insertions(+), 137 deletions(-)
diff --git a/src/views/mdc/base/modules/deviceRepair/DeviceRepairModelEdit.vue b/src/views/mdc/base/modules/deviceRepair/DeviceRepairModelEdit.vue
index 32cf083..adac88d 100644
--- a/src/views/mdc/base/modules/deviceRepair/DeviceRepairModelEdit.vue
+++ b/src/views/mdc/base/modules/deviceRepair/DeviceRepairModelEdit.vue
@@ -6,8 +6,10 @@
<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="璇烽�夋嫨寮�濮嬫椂闂�" :disabledDate="disabledDate"
- class="query-group-cust" v-decorator="['startTime', validatorRules.startTime]"></j-date>
+ <j-date :show-time="{hideDisabledOptions:true}" date-format="YYYY-MM-DD HH:mm:ss"
+ placeholder="璇烽�夋嫨寮�濮嬫椂闂�" :disabledDate="disabledDate"
+ class="query-group-cust" v-decorator="['startTime', validatorRules.startTime]"
+ :disabledTime="disabledDateTime" :showToday="false"></j-date>
</a-form-item>
</a-col>
@@ -21,8 +23,11 @@
<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="璇烽�夋嫨缁撴潫鏃堕棿" :disabledDate="disabledDate"
- class="query-group-cust" v-decorator="['endTime', validatorRules.endTime]"></j-date>
+ <j-date :show-time="{hideDisabledOptions:true}" date-format="YYYY-MM-DD HH:mm:ss"
+ placeholder="璇烽�夋嫨缁撴潫鏃堕棿"
+ :disabledDate="disabledDate"
+ class="query-group-cust" v-decorator="['endTime', validatorRules.endTime]"
+ :disabledTime="disabledDateTime" :showToday="false"></j-date>
</a-form-item>
</a-col>
<a-col :span="12">
@@ -36,7 +41,8 @@
</a-form>
</a-spin>
<!--<device-repair-list-model ref="deviceRepairListModel" @sendSelectionRows="getDeviceRows"></device-repair-list-model>-->
- <device-repair-edit-list-model ref="deviceRepairListModel" @sendSelectionRows="getDeviceRows"></device-repair-edit-list-model>
+ <device-repair-edit-list-model ref="deviceRepairListModel"
+ @sendSelectionRows="getDeviceRows"></device-repair-edit-list-model>
</a-modal>
</template>
@@ -57,18 +63,18 @@
export default {
name: 'DeviceRepairModelEdit',
- components: {DeviceRepairListModel,JDate,DeviceRepairEditListModel},
+ components: { DeviceRepairListModel, JDate, DeviceRepairEditListModel },
props: {},
data() {
return {
- readOnly:true,
+ readOnly: true,
title: '',
visible: false,
show: false,
model: {},
checked: false,
- startData:"",
- endData:"",
+ startData: '',
+ endData: '',
labelCol: {
xs: {
span: 24
@@ -104,22 +110,38 @@
confirmLoading: false,
form: this.$form.createForm(this),
validatorRules: {
- equipmentId:{
- rules:[
+ equipmentId: {
+ rules: [
{
- required:true,
- message: ""
- },
- ],
+ required: true,
+ message: ''
+ }
+ ]
},
- equipmentName:{
- rules:[
+ equipmentName: {
+ rules: [
{
- required:true,
- message: ""
- },
- ],
+ required: true,
+ message: ''
+ }
+ ]
},
+ startTime: {
+ rules: [
+ {
+ required: true,
+ message: '璇烽�夋嫨寮�濮嬫椂闂�'
+ }
+ ]
+ },
+ endTime: {
+ rules: [
+ {
+ required: true,
+ message: '璇烽�夋嫨缁撴潫鏃堕棿'
+ }
+ ]
+ }
// mdcRepairType:{
// rules:[
// {
@@ -139,17 +161,17 @@
disableSubmit: true,
partCategoryCascade: [],
cascadeDefaultValue: [],
- editStart:''
+ editStart: ''
}
},
created() {
},
methods: {
- disabledDate(current){
+ disabledDate(current) {
//Can not slect days before today and today
// return current && current < moment().endOf("day");
- return current < moment().subtract(+1, 'day')//浠婂ぉ涔嬪墠鐨勫勾鏈堟棩涓嶅彲閫夛紝涓嶅寘鎷粖澶�
+ return current < moment().subtract(+2, 'day').endOf('day')//鍓嶄竴澶╀箣鍓嶇殑骞存湀鏃ヤ笉鍙�夛紝涓嶅寘鎷墠涓�澶�
},
moment,
// onChange(dates) {
@@ -161,17 +183,17 @@
// // this.endData = dateStrings[1];
// // console.log(this.startData,this.endData);
// },
- onChangeEnd(dates, dateStrings){
- this.endTime = dateStrings[0];
+ onChangeEnd(dates, dateStrings) {
+ this.endTime = dateStrings[0]
},
getDeviceRows(val) {
this.form.setFieldsValue({
equipmentId: val.equipmentId,
- equipmentName: val.equipmentName,
- // // equipmentModel: val.equipmentModel,
- // // equipmentIp: val.equipmentIp,
- // // dataPort: val.dataPort,
- // // driveType: val.driveType
+ equipmentName: val.equipmentName
+ // // equipmentModel: val.equipmentModel,
+ // // equipmentIp: val.equipmentIp,
+ // // dataPort: val.dataPort,
+ // // driveType: val.driveType
})
// var equipmentIds;
// for(var i = 0;i<val.length;i++){
@@ -220,10 +242,10 @@
edit(record) {
this.form.resetFields()
this.model = Object.assign({}, record)
- this.editStart = (this.model.startTime).replace(/:/g,'');
+ this.editStart = (this.model.startTime).replace(/:/g, '')
this.visible = true
this.$nextTick(() => {
- this.form.setFieldsValue(pick(this.model, 'tierType', 'parentName', 'equipmentId', 'equipmentName','startTime', 'endTime',
+ this.form.setFieldsValue(pick(this.model, 'tierType', 'parentName', 'equipmentId', 'equipmentName', 'startTime', 'endTime'
))
})
},
@@ -239,113 +261,148 @@
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,'');
- var data = new Date();
- let stertDate = moment(data).format("YYYY-MM-DD HH:mm:ss");
- let dataStart = stertDate.replace(/:/g,'');
- if(this.editStart != startOne){
- if(startOne < dataStart) {
- // that.$message.warning("寮�濮嬫椂闂翠笉鑳藉皬浜庡綋鍓嶆椂闂�")
- that.$notification.warning({
- message:'娑堟伅',
- description:"寮�濮嬫椂闂翠笉鑳藉皬浜庡綋鍓嶆椂闂�"
- });
- that.confirmLoading = false
- }else{
- if(startOne>=endOne){
- // that.$message.warning("缁撴潫鏃堕棿涓嶈兘灏忎簬寮�濮嬫椂闂�");
- that.$notification.warning({
- message:'娑堟伅',
- description:"缁撴潫鏃堕棿涓嶈兘灏忎簬褰撳墠鏃堕棿"
- });
- // console.log(this.model)
- // this.endTime = ''
- that.confirmLoading = false
-
- }else{
-
- let obj
- if (!this.model.id) {
- obj = postAction(this.url.add, formData)
- } else {
-
- obj = requestPut(this.url.edit, formData, {
- id: this.model.id
- })
- let shijian = startOne
- }
- obj.then((res) => {
- if (res.success) {
- // that.$message.success("淇敼鎴愬姛")
- // that.$message.success(res.message)
- that.$notification.warning({
- message:'娑堟伅',
- description: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()
- })
- }
- }
- }else{
- if(startOne>=endOne){
- // that.$message.warning("缁撴潫鏃堕棿涓嶈兘灏忎簬寮�濮嬫椂闂�");
- that.$notification.warning({
- message:'娑堟伅',
- description:"缁撴潫鏃堕棿涓嶈兘灏忎簬寮�濮嬫椂闂�"
- });
- // console.log(this.model)
- // this.endTime = ''
- that.confirmLoading = false
-
- }else{
-
- let obj
- if (!this.model.id) {
- obj = postAction(this.url.add, formData)
- } else {
-
- obj = requestPut(this.url.edit, formData, {
- id: this.model.id
- })
- let shijian = startOne
- }
- obj.then((res) => {
- if (res.success) {
- // that.$message.success("淇敼鎴愬姛")
- // that.$message.success(res.message)
- that.$notification.warning({
- message:'娑堟伅',
- description: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()
+ 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, '')
+ var data = new Date()
+ let stertDate = moment(data).format('YYYY-MM-DD HH:mm:ss')
+ let dataStart = stertDate.replace(/:/g, '')
+ // if (this.editStart != startOne) {
+ // if (startOne < dataStart) {
+ // // that.$message.warning("寮�濮嬫椂闂翠笉鑳藉皬浜庡綋鍓嶆椂闂�")
+ // that.$notification.warning({
+ // message: '娑堟伅',
+ // description: '寮�濮嬫椂闂翠笉鑳藉皬浜庡綋鍓嶆椂闂�'
+ // })
+ // that.confirmLoading = false
+ // } else {
+ // if (startOne >= endOne) {
+ // // that.$message.warning("缁撴潫鏃堕棿涓嶈兘灏忎簬寮�濮嬫椂闂�");
+ // that.$notification.warning({
+ // message: '娑堟伅',
+ // description: '缁撴潫鏃堕棿涓嶈兘灏忎簬褰撳墠鏃堕棿'
+ // })
+ // // console.log(this.model)
+ // // this.endTime = ''
+ // that.confirmLoading = false
+ //
+ // } else {
+ // let obj
+ // if (!this.model.id) {
+ // obj = postAction(this.url.add, formData)
+ // } else {
+ //
+ // obj = requestPut(this.url.edit, formData, {
+ // id: this.model.id
+ // })
+ // let shijian = startOne
+ // }
+ // obj.then((res) => {
+ // if (res.success) {
+ // // that.$message.success("淇敼鎴愬姛")
+ // // that.$message.success(res.message)
+ // that.$notification.success({
+ // message: '娑堟伅',
+ // description: 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()
+ // })
+ // }
+ // }
+ // } else {
+ // if (startOne >= endOne) {
+ // // that.$message.warning("缁撴潫鏃堕棿涓嶈兘灏忎簬寮�濮嬫椂闂�");
+ // that.$notification.warning({
+ // message: '娑堟伅',
+ // description: '缁撴潫鏃堕棿涓嶈兘灏忎簬寮�濮嬫椂闂�'
+ // })
+ // // console.log(this.model)
+ // // this.endTime = ''
+ // that.confirmLoading = false
+ //
+ // } else {
+ // let obj
+ // if (!this.model.id) {
+ // obj = postAction(this.url.add, formData)
+ // } else {
+ //
+ // obj = requestPut(this.url.edit, formData, {
+ // id: this.model.id
+ // })
+ // let shijian = startOne
+ // }
+ // obj.then((res) => {
+ // if (res.success) {
+ // // that.$message.success("淇敼鎴愬姛")
+ // // that.$message.success(res.message)
+ // that.$notification.success({
+ // message: '娑堟伅',
+ // description: 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()
+ // })
+ // }
+ // }
+ if (startOne >= endOne) {
+ // that.$message.warning("缁撴潫鏃堕棿涓嶈兘灏忎簬寮�濮嬫椂闂�");
+ that.$notification.warning({
+ message: '娑堟伅',
+ description: '缁撴潫鏃堕棿涓嶈兘灏忎簬寮�濮嬫椂闂�'
+ })
+ // console.log(this.model)
+ // this.endTime = ''
+ that.confirmLoading = false
+ } else {
+ let obj
+ if (!this.model.id) {
+ obj = postAction(this.url.add, formData)
+ } else {
+ 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()
+ })
}
-
-
}
})
},
@@ -385,6 +442,22 @@
},
checkboxChange(e) {
this.checked = e.target.checked
+ },
+ range(start, end) {
+ const result = []
+ for (let i = start; i < end; i++) {
+ result.push(i)
+ }
+ return result
+ },
+ /**
+ * 绂佺敤鏃ユ湡閫夋嫨鍣ㄤ腑鐨勬椂闂撮�夋嫨
+ * @returns {{disabledSeconds: (function(): number[])}} 杩斿洖鍊间负涓�涓璞★紝鍙互绂佹灏忔椂銆佸垎閽熴�佺锛岀洰鍓嶄粎绂佹鎵�鏈夌鏁�,鏈�浣庝粠1寮�濮嬶紝浠�0寮�濮嬬‘瀹氭寜閽皢琚鐢�
+ */
+ disabledDateTime() {
+ return {
+ disabledSeconds: () => this.range(1, 60)
+ }
}
}
}
--
Gitblit v1.9.3