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/ShiftSystem.vue | 41 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 36 insertions(+), 5 deletions(-)
diff --git a/src/views/mdc/base/modules/shift/ShiftSystem.vue b/src/views/mdc/base/modules/shift/ShiftSystem.vue
index bc4d4a7..c813c22 100644
--- a/src/views/mdc/base/modules/shift/ShiftSystem.vue
+++ b/src/views/mdc/base/modules/shift/ShiftSystem.vue
@@ -33,6 +33,9 @@
<a-icon type="down"/>
</a>
<a-menu slot="overlay">
+ <a-menu-item v-if="record.shiftStatus == 1">
+ <a key="0" @click="handleDefault(record)">璁剧疆涓洪粯璁�</a>
+ </a-menu-item>
<a-menu-item v-if="record.shiftStatus == 1">
<a key="1" @click="handleEdit(record)">缂栬緫</a>
</a-menu-item>
@@ -56,8 +59,9 @@
</template>
<script>
+ import qs from 'qs'
import {
- requestPut, putAction, deleteAction
+ requestPut, putAction, deleteAction,postAction
} from '@/api/manage'
import {
JeecgListMixin
@@ -78,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,7 +120,7 @@
_this.$message.success('鎿嶄綔鎴愬姛锛�')
_this.loadData()
} else {
- that.$message.warning('鎿嶄綔澶辫触锛�')
+ _this.$message.warning('鎿嶄綔澶辫触锛�')
}
})
},
@@ -123,6 +128,24 @@
this.$refs.modalForm.add()
this.$refs.modalForm.title = '鐝埗閰嶇疆'
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.warning({
+ 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){
@@ -132,10 +155,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.warning({
+ 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