From 8e75a78f55d60565eb48b25eafd4eb07939ce2cc Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期四, 28 九月 2023 14:09:05 +0800
Subject: [PATCH] Merge branch 'master' into develop
---
src/views/mdc/base/modules/shift/ShiftSystemModel.vue | 44 ++++++++++++++++++++++++++------------------
1 files changed, 26 insertions(+), 18 deletions(-)
diff --git a/src/views/mdc/base/modules/shift/ShiftSystemModel.vue b/src/views/mdc/base/modules/shift/ShiftSystemModel.vue
index 7d7b66c..83bce49 100644
--- a/src/views/mdc/base/modules/shift/ShiftSystemModel.vue
+++ b/src/views/mdc/base/modules/shift/ShiftSystemModel.vue
@@ -1,20 +1,20 @@
<template>
- <a-modal :title="title" :width="800" :visible="visible" :confirmLoading="confirmLoading"
+ <a-modal :title="title" :width="500" :visible="visible" :confirmLoading="confirmLoading"
@ok="handleOk" @cancel="handleCancel" cancelText="鍏抽棴">
<a-spin :spinning="confirmLoading">
<a-form :form="form">
<a-row :gutter="24">
- <a-col :span="12">
+ <a-col :span="24">
<a-form-item label="鐝埗鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input allow-clear placeholder="璇疯緭鍏ョ彮鍒跺悕绉�" v-decorator="['shiftName',validatorRules.shiftName]"/>
</a-form-item>
</a-col>
- <a-col :span="12">
- <a-form-item label="鏄惁榛樿鐝埗" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-switch v-model="defaultShift" checked-children="鏄�" un-checked-children="鍚�"/>
- </a-form-item>
- </a-col>
+ <!--<a-col :span="12">-->
+ <!--<a-form-item label="鏄惁榛樿鐝埗" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+ <!--<a-switch v-model="defaultShift" checked-children="鏄�" un-checked-children="鍚�"/>-->
+ <!--</a-form-item>-->
+ <!--</a-col>-->
</a-row>
</a-form>
@@ -50,7 +50,7 @@
span: 24
},
sm: {
- span: 6
+ span: 4
}
},
wrapperCol: {
@@ -58,7 +58,7 @@
span: 24
},
sm: {
- span: 18
+ span: 20
}
},
confirmLoading: false,
@@ -90,11 +90,11 @@
this.visible = true
this.$nextTick(() => {
this.form.setFieldsValue(pick(this.model, 'shiftName'))
- if (record.defaultShift == 'true') {
- this.defaultShift = true
- } else {
- this.defaultShift = false
- }
+ // if (record.defaultShift == 'true') {
+ // this.defaultShift = true
+ // } else {
+ // this.defaultShift = false
+ // }
})
},
close() {
@@ -109,8 +109,8 @@
if (!err) {
that.confirmLoading = true
let formData = Object.assign(this.model, values)
- formData.shiftStatus = 1
- formData.defaultShift = that.defaultShift
+ // formData.shiftStatus = 1
+ // formData.defaultShift = that.defaultShift
let obj
if (!this.model.id) {
obj = postAction(this.url.add, formData)
@@ -121,10 +121,18 @@
}
obj.then((res) => {
if (res.success) {
- that.$message.success(res.message)
+ // that.$message.success(res.message)
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
that.$emit('ok', res.result)
} else {
- that.$message.warning(res.message)
+ // that.$message.warning(res.message)
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
that.confirmLoading = false
--
Gitblit v1.9.3