From 585fb0bbd4a7bc7f8f333ecba7c5fecd2ee5cbc2 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 09:46:44 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/views/eam/FaultInfoList.vue | 81 ++++++++++++++++++++++++++++++----------
1 files changed, 61 insertions(+), 20 deletions(-)
diff --git a/src/views/eam/FaultInfoList.vue b/src/views/eam/FaultInfoList.vue
index d0b7c59..ef332c6 100644
--- a/src/views/eam/FaultInfoList.vue
+++ b/src/views/eam/FaultInfoList.vue
@@ -108,17 +108,30 @@
</template>
<span slot="action" slot-scope="text, record">
- <a @click="handleEdit(record)" v-if="record.isConfirm!=='yes'" v-has="'fault:update'">褰曞叆</a>
-
- <a-divider type="vertical" />
- <a @click="handleDetail(record)">璇︽儏</a>
- <a-divider type="vertical" />
+ <a @click="handleEdit(record)" v-if="record.isConfirm=='no'" v-has="'fault:update'">褰曞叆</a>
+ <a-divider type="vertical" v-if="record.isConfirm=='no'"/>
<a-popconfirm
- title="纭缁撴灉鍚庝笉鍙啀褰曞叆锛岀‘璁ゅ悧?"
+ title="纭鎻愪氦鍚�?"
+ @confirm="() => handleSubmit(record)"
+ >
+ <a v-if="record.isConfirm=='no'" v-has="'fault:update'">鎻愪氦</a>
+ </a-popconfirm>
+ <a-divider type="vertical" v-if="record.isConfirm=='no'" />
+ <a-popconfirm
+ title="纭椹冲洖鍚�?"
+ @confirm="() => handleReject(record)"
+ >
+ <a v-if="record.isConfirm=='sub'" v-has="'fault:confirm'">椹冲洖</a>
+ </a-popconfirm>
+ <a-divider type="vertical" v-if="record.isConfirm=='sub'" />
+ <a-popconfirm
+ title="纭缁撴灉骞惰繘鍏ラ獙鏀舵祦绋嬪悧?"
@confirm="() => handleConfirm(record)"
>
- <a v-if="record.isConfirm!=='yes'" v-has="'fault:confirm'">纭</a>
+ <a v-if="record.isConfirm=='sub'" v-has="'fault:confirm'">纭</a>
</a-popconfirm>
+ <a-divider type="vertical" />
+ <a @click="handleDetail(record)">璇︽儏</a>
</span>
</a-table>
@@ -134,7 +147,7 @@
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import FaultInfoModal from './modules/FaultInfoModal'
-import { putAction } from '../../api/manage'
+ import { putAction } from '../../api/manage'
export default {
name: 'FaultInfoList',
@@ -145,6 +158,7 @@
data () {
return {
description: '璁惧浜嬫晠鐧昏绠＄悊椤甸潰',
+ disableMixinCreated: true,
// 琛ㄥご
columns: [
{
@@ -170,7 +184,7 @@
{
title:'鐢熶骇鍗曚綅',
align:"center",
- dataIndex: 'departId'
+ dataIndex: 'departId_dictText'
},
{
title:'璁惧鍚嶇О',
@@ -190,7 +204,7 @@
{
title:'宸ュ尯',
align:"center",
- dataIndex: 'area1'
+ dataIndex: 'area1_dictText'
},
{
title:'鍗曞厓/宸ユ',
@@ -383,7 +397,11 @@
}
},
created() {
- this.getSuperFieldList();
+ if (this.$route.query) {
+ this.queryParam.id = this.$route.query.id;
+ }
+ this.loadData()
+ this.initDictConfig();
},
computed: {
importExcelUrl: function(){
@@ -430,15 +448,38 @@
this.superFieldList = fieldList
},
handleConfirm(record) {
- putAction(this.url.confirm, record).then(res => {
- if (res.result) {
- this.$message.success('纭鎴愬姛');
- this.loadData();
- } else {
- this.$message.error('纭鍑虹幇寮傚父')
- }
- })
- },
+ record.isConfirm = 'yes';
+ putAction(this.url.confirm, record).then(res => {
+ if (res.result) {
+ this.$message.success('纭鎴愬姛');
+ this.loadData();
+ } else {
+ this.$message.error('纭鍑虹幇寮傚父')
+ }
+ })
+ },
+ handleSubmit(record) {
+ record.isConfirm = "sub";
+ putAction(this.url.confirm, record).then(res => {
+ if (res.result) {
+ this.$message.success('鎻愪氦鎴愬姛');
+ this.loadData();
+ } else {
+ this.$message.error('鎻愪氦鍑虹幇寮傚父')
+ }
+ })
+ },
+ handleReject(record) {
+ record.isConfirm = "no";
+ putAction(this.url.confirm, record).then(res => {
+ if (res.result) {
+ this.$message.success('椹冲洖鎴愬姛');
+ this.loadData();
+ } else {
+ this.$message.error('椹冲洖鍑虹幇寮傚父')
+ }
+ })
+ },
}
}
</script>
--
Gitblit v1.9.3