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/shift/ShiftSystem.vue | 45 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 38 insertions(+), 7 deletions(-)
diff --git a/src/views/mdc/base/modules/shift/ShiftSystem.vue b/src/views/mdc/base/modules/shift/ShiftSystem.vue
index 1940cb8..3d53d7d 100644
--- a/src/views/mdc/base/modules/shift/ShiftSystem.vue
+++ b/src/views/mdc/base/modules/shift/ShiftSystem.vue
@@ -59,8 +59,9 @@
</template>
<script>
+ import qs from 'qs'
import {
- requestPut, putAction, deleteAction
+ requestPut, putAction, deleteAction,postAction
} from '@/api/manage'
import {
JeecgListMixin
@@ -81,7 +82,8 @@
url: {
list: '/mdc/mdcMdcShift/queryPageList',
changeStatus: '/mdc/mdcMdcShift/changeStatus',
- deleteBatch:'/mdc/mdcMdcShift/deleteShift'
+ deleteBatch:'/mdc/mdcMdcShift/deleteShift',
+ changeDefaultShift: '/mdc/mdcMdcShift/changeDefaultShift'
},
columns: [
{
@@ -115,10 +117,16 @@
let _this = this
putAction(this.url.changeStatus, { id: id, status: status }).then((res) => {
if (res.success) {
- _this.$message.success('鎿嶄綔鎴愬姛锛�')
+ _this.$notification.success({
+ message:'娑堟伅',
+ description:res.message
+ })
_this.loadData()
} else {
- that.$message.warning('鎿嶄綔澶辫触锛�')
+ _this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
})
},
@@ -128,7 +136,22 @@
this.$refs.modalForm.disableSubmit = false
},
handleDefault:function(record){
-
+ postAction(this.url.changeDefaultShift,qs.stringify({id:record.id})).then((res) =>{
+ if(res.success){
+ // this.$message.success(res.message);
+ this.$notification.success({
+ message:'娑堟伅',
+ description:res.message
+ });
+ this.loadData()
+ }else{
+ // this.$message.success(res.message);
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
+ }
+ })
},
handleDelete: function(record){
if(!this.url.deleteBatch){
@@ -138,10 +161,18 @@
var that = this;
deleteAction(that.url.deleteBatch, {id: record}).then((res) => {
if (res.success) {
- that.$message.success(res.message);
+ // that.$message.success(res.message);
+ that.$notification.success({
+ message:'娑堟伅',
+ description:res.message
+ });
that.loadData();
} else {
- that.$message.warning(res.message);
+ // that.$message.warning(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
});
},
--
Gitblit v1.9.3