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/deviceCalendar/DeviceCalendarModel.vue | 62 +++++++++++++++++++------------
1 files changed, 38 insertions(+), 24 deletions(-)
diff --git a/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarModel.vue b/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarModel.vue
index cb49c1c..f48a441 100644
--- a/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarModel.vue
+++ b/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarModel.vue
@@ -115,11 +115,18 @@
},
confirmLoading: false, form: this.$form.createForm(this),
validatorRules: {
- // shiftId:{
- // rules: [{
- // required: true, message: '璇烽�夋嫨鐝埗!',
- // }],
- // },
+ equipmentId:{
+ rules:[
+ {
+ required:true,message:'璇烽�夋嫨璁惧缁�!'
+ }
+ ]
+ },
+ shiftId:{
+ rules: [{
+ required: true, message: '璇烽�夋嫨鐝埗!',
+ }],
+ }
},
url: {
add: '/mdc/mdcDeviceCalendar/add',
@@ -300,27 +307,34 @@
if (!err) {
that.confirmLoading = true
let formData = Object.assign(this.model, values)
-
formData.dateList = this.sendDte
- postAction(this.url.settingCalendar, formData).then((res) => {
- if (res.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(() => {
+ if(formData.dateList&&formData.dateList.length>0){
+ postAction(this.url.settingCalendar, formData).then((res) => {
+ if (res.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{
that.confirmLoading = false
- that.close()
- })
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:'璇烽�夋嫨鐢熸晥鏃堕棿!'
+ });
+ }
}
})
},
--
Gitblit v1.9.3