From 575a75a0519e53ceec6bb5d31f682124596c3bae Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期二, 24 十月 2023 10:57:34 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/views/mdc/base/modules/shift/ShiftInfoModel.vue | 123 ++++++++++++++++++++++-------------------
1 files changed, 66 insertions(+), 57 deletions(-)
diff --git a/src/views/mdc/base/modules/shift/ShiftInfoModel.vue b/src/views/mdc/base/modules/shift/ShiftInfoModel.vue
index 1ed89ef..a6b2897 100644
--- a/src/views/mdc/base/modules/shift/ShiftInfoModel.vue
+++ b/src/views/mdc/base/modules/shift/ShiftInfoModel.vue
@@ -1,6 +1,6 @@
<template>
<a-modal :title="title" :width="800" :visible="visible" :confirmLoading="confirmLoading"
- @ok="handleOk" @cancel="handleCancel" cancelText="鍏抽棴">
+ @ok="handleOk" @cancel="handleCancel" cancelText="鍏抽棴">
<a-spin :spinning="confirmLoading">
<a-form :form="form">
<a-row :gutter="24">
@@ -12,7 +12,7 @@
</a-col>
<a-col :span="12">
<a-form-item label="鐝鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-input allow-clear placeholder="璇疯緭鍏ョ彮鍒跺悕绉�" v-decorator="['shiftSubName',validatorRules.shiftSubName]"/>
+ <a-input allow-clear placeholder="璇疯緭鍏ョ彮娆″悕绉�" v-decorator="['shiftSubName',validatorRules.shiftSubName]"/>
</a-form-item>
</a-col>
</a-row>
@@ -72,7 +72,6 @@
JeecgListMixin
} from '@/mixins/JeecgListMixin'
-
export default {
name: 'ShiftInfoModel',
mixins: [JeecgListMixin],
@@ -105,20 +104,35 @@
confirmLoading: false,
form: this.$form.createForm(this),
validatorRules: {
- shiftSubName:[
- {
- required:true,
- message:'璇疯緭鍏ュ瓧娈甸暱搴�',
- },{
- validator:this.checkshiftSuName,
- trigger:'blur'
- }
- ]
+ shiftSubName: {
+ rules: [
+ {
+ required: true,
+ message: '璇疯緭鍏ョ彮娆″悕绉�'
+ }
+ ]
+ },
+ startDate: {
+ rules: [
+ {
+ required: true,
+ message: '璇烽�夋嫨寮�濮嬫椂闂�'
+ }
+ ]
+ },
+ endDate: {
+ rules: [
+ {
+ required: true,
+ message: '璇烽�夋嫨缁撴潫鏃堕棿'
+ }
+ ]
+ }
},
url: {
add: '/mdc/mdcShiftSub/addShiftSub',
edit: '/mdc/mdcShiftSub/editMdcShiftSub',
- list: '/mdc/mdcMdcShift/queryPageList',
+ list: '/mdc/mdcMdcShift/queryPageList'
},
disableSubmit: true
}
@@ -129,27 +143,27 @@
methods: {
//鑷畾涔夋牎楠屽嚱鏁帮紝瑕佹眰鍚嶅瓧涓嶈兘閲嶅 value鏄〃鍗曠殑鍊硷紝callback鏄洖璋冨嚱鏁� 蹇呴』璋冪敤鎵嶅彲楠岃瘉
- checkshiftSuName(rule,value,callback){
- if(!value){
- alert("涓嶈兘涓虹┖锛�")
+ checkshiftSuName(rule, value, callback) {
+ if (!value) {
+ alert('涓嶈兘涓虹┖锛�')
return
}
// debugger
// let NameSelf = value;
- this.loadData()
+ this.loadData()
// console.log(dataSource);
- callback();
+ callback()
},
loadData() {
- if(!this.url.list){
- this.$message.error("璇疯缃畊rl.list灞炴��!")
+ if (!this.url.list) {
+ this.$message.error('璇疯缃畊rl.list灞炴��!')
return
}
//鍔犺浇鏁版嵁 鑻ヤ紶鍏ュ弬鏁�1鍒欏姞杞界涓�椤电殑鍐呭
// if (arg === 1) {
// this.ipagination.current = 1;
// }
- var params = this.getQueryParams();//鏌ヨ鏉′欢
+ var params = this.getQueryParams()//鏌ヨ鏉′欢
//
// if(!params){
// return false;
@@ -160,7 +174,7 @@
if (res.success) {
// console.log(res)
//update-begin---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
- this.dataSource = res.result.records||res.result;
+ this.dataSource = res.result.records || res.result
// if(res.result.total)
// {
// this.ipagination.total = res.result.total;
@@ -168,12 +182,12 @@
// this.ipagination.total = 0;
// }
//update-end---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
- }else{
+ } else {
// this.$message.warning(res.message)
this.$notification.warning({
- message:'娑堟伅',
- description:res.message
- });
+ message: '娑堟伅',
+ description: res.message
+ })
}
}).finally(() => {
this.loading = false
@@ -230,28 +244,23 @@
that.confirmLoading = true
let formData = Object.assign(this.model, values)
formData.isDaySpan = that.isDaySpan
- console.log(formData.isDaySpan);
- if(formData.isDaySpan == false){
- formData.startDate = moment(formData.startDate).format('HH:mm:ss');
- formData.endDate = moment(formData.endDate).format('HH:mm:ss');
- formData.sleepStartDate = moment(formData.sleepStartDate).format('HH:mm:ss');
- formData.sleepEndDate = moment(formData.sleepEndDate).format('HH:mm:ss');
- let startTimeOne = formData.startDate.replace(/:/g,'');
- let endTimeOne = formData.endDate.replace(/:/g,'');
- if(startTimeOne > endTimeOne){
+ console.log(formData.isDaySpan)
+ formData.startDate = moment(formData.startDate).format('HH:mm:ss')
+ formData.endDate = moment(formData.endDate).format('HH:mm:ss')
+ if (formData.sleepStartDate) formData.sleepStartDate = moment(formData.sleepStartDate).format('HH:mm:ss')
+ if (formData.sleepEndDate) formData.sleepEndDate = moment(formData.sleepEndDate).format('HH:mm:ss')
+ if (formData.isDaySpan == false) {
+ let startTimeOne = formData.startDate.replace(/:/g, '')
+ let endTimeOne = formData.endDate.replace(/:/g, '')
+ if (startTimeOne > endTimeOne) {
// that.$message.warning("闈炶法澶╃彮娆＄粨鏉熸椂闂翠笉鑳藉皬浜庣瓑浜庡紑濮嬫椂闂达紒")
that.$notification.warning({
- message:'娑堟伅',
- description:"闈炶法澶╃彮娆＄粨鏉熸椂闂翠笉鑳藉皬浜庣瓑浜庡紑濮嬫椂闂达紒"
- });
- // that.$message.success("淇濆瓨澶辫触")
- that.$notification.error({
- message:'娑堟伅',
- description:"淇濆瓨澶辫触锛�"
- });
+ message: '娑堟伅',
+ description: '闈炶法澶╃彮娆＄粨鏉熸椂闂翠笉鑳藉皬浜庣瓑浜庡紑濮嬫椂闂达紒'
+ })
that.confirmLoading = false
that.close()
- }else{
+ } else {
formData.shiftSubStatus = 1
let obj
if (!this.model.id) {
@@ -265,23 +274,23 @@
if (res.success) {
// that.$message.success("淇濆瓨鎴愬姛")
that.$notification.success({
- message:'娑堟伅',
- description:"淇濆瓨鎴愬姛"
- });
+ message: '娑堟伅',
+ description: '淇濆瓨鎴愬姛'
+ })
that.$emit('ok', res.result)
} else {
// that.$message.warning(res.message)
that.$notification.warning({
- message:'娑堟伅',
- description:res.message
- });
+ message: '娑堟伅',
+ description: res.message
+ })
}
}).finally(() => {
that.confirmLoading = false
that.close()
})
}
- }else{
+ } else {
formData.shiftSubStatus = 1
let obj
if (!this.model.id) {
@@ -295,16 +304,16 @@
if (res.success) {
// that.$message.success
that.$notification.success({
- message:'娑堟伅',
- description:"淇濆瓨鎴愬姛"
- });
+ message: '娑堟伅',
+ description: '淇濆瓨鎴愬姛'
+ })
that.$emit('ok', res.result)
} else {
// that.$message.warning(res.message)
that.$notification.warning({
- message:'娑堟伅',
- description:res.message
- });
+ message: '娑堟伅',
+ description: res.message
+ })
}
}).finally(() => {
that.confirmLoading = false
--
Gitblit v1.9.3