From a1ff69f228b7a0d08959e6b25eff2dac6085df8d Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期四, 21 九月 2023 17:59:23 +0800
Subject: [PATCH] 1、优化数据报表模块页面布局 2、修复因时间选择器的showTime属性导致的布局混乱 3、删除假期管理页面中重复的导出按钮组件
---
src/views/mdc/base/modules/deviceRepair/DeviceRepairModelEdit.vue | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 51 insertions(+), 8 deletions(-)
diff --git a/src/views/mdc/base/modules/deviceRepair/DeviceRepairModelEdit.vue b/src/views/mdc/base/modules/deviceRepair/DeviceRepairModelEdit.vue
index 2e61fa6..f2c0d43 100644
--- a/src/views/mdc/base/modules/deviceRepair/DeviceRepairModelEdit.vue
+++ b/src/views/mdc/base/modules/deviceRepair/DeviceRepairModelEdit.vue
@@ -120,6 +120,22 @@
},
],
},
+ startTime:{
+ rules:[
+ {
+ required:true,
+ message: "璇烽�夋嫨寮�濮嬫椂闂�"
+ },
+ ],
+ },
+ endTime:{
+ rules:[
+ {
+ required:true,
+ message: "璇烽�夋嫨缁撴潫鏃堕棿"
+ },
+ ],
+ },
// mdcRepairType:{
// rules:[
// {
@@ -248,11 +264,19 @@
let dataStart = stertDate.replace(/:/g,'');
if(this.editStart != startOne){
if(startOne < dataStart) {
- that.$message.warning("寮�濮嬫椂闂翠笉鑳藉皬浜庡綋鍓嶆椂闂�")
+ // that.$message.warning("寮�濮嬫椂闂翠笉鑳藉皬浜庡綋鍓嶆椂闂�")
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:"寮�濮嬫椂闂翠笉鑳藉皬浜庡綋鍓嶆椂闂�"
+ });
that.confirmLoading = false
}else{
if(startOne>=endOne){
- that.$message.warning("缁撴潫鏃堕棿涓嶈兘灏忎簬寮�濮嬫椂闂�");
+ // that.$message.warning("缁撴潫鏃堕棿涓嶈兘灏忎簬寮�濮嬫椂闂�");
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:"缁撴潫鏃堕棿涓嶈兘灏忎簬褰撳墠鏃堕棿"
+ });
// console.log(this.model)
// this.endTime = ''
that.confirmLoading = false
@@ -272,10 +296,18 @@
obj.then((res) => {
if (res.success) {
// that.$message.success("淇敼鎴愬姛")
- that.$message.success(res.message)
+ // that.$message.success(res.message)
+ that.$notification.success({
+ 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
@@ -285,13 +317,16 @@
}
}else{
if(startOne>=endOne){
- that.$message.warning("缁撴潫鏃堕棿涓嶈兘灏忎簬寮�濮嬫椂闂�");
+ // 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)
@@ -305,10 +340,18 @@
obj.then((res) => {
if (res.success) {
// that.$message.success("淇敼鎴愬姛")
- that.$message.success(res.message)
+ // that.$message.success(res.message)
+ that.$notification.success({
+ 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