From eb48d3bada053e26def2a94d46dbe115a5a7bb2f Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期六, 18 十一月 2023 16:46:18 +0800
Subject: [PATCH] 问题项修改
---
src/views/eam/DailyInspectionStandardList.vue | 184 ++++++++++++++++++++++++++++++++++------------
1 files changed, 136 insertions(+), 48 deletions(-)
diff --git a/src/views/eam/DailyInspectionStandardList.vue b/src/views/eam/DailyInspectionStandardList.vue
index 463d03b..2ba59ba 100644
--- a/src/views/eam/DailyInspectionStandardList.vue
+++ b/src/views/eam/DailyInspectionStandardList.vue
@@ -67,9 +67,19 @@
type='primary'
icon='plus'
v-has="'dailyInspectionStandard:add'"
- >鏂板</a-button>
- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
- <a-button type="primary" icon="import">瀵煎叆</a-button>
+ >缂栧埗</a-button>
+ <a-upload
+ name="file"
+ :showUploadList="false"
+ :multiple="false"
+ :headers="tokenHeader"
+ :action="importExcelUrl"
+ @change="handleImportExcel"
+ >
+ <a-button
+ type="primary"
+ icon="import"
+ >瀵煎叆</a-button>
</a-upload>
<a-button
type="primary"
@@ -102,7 +112,7 @@
size='middle'
bordered
rowKey='id'
- :scroll="{ x: 'calc(1600px + 50%)', y: 900 }"
+ :scroll="{ x: 'calc(2300px + 50%)', y: 900 }"
:columns='columns'
:dataSource='dataSource'
:pagination='ipagination'
@@ -138,32 +148,51 @@
slot="action"
slot-scope="text, record"
>
+
<a
- v-if="record.versionStatus == '2'"
- @click="handleRevise(record)"
- v-has="'dailyInspectionStandard:revise'"
- >鍗囩増</a>
+ v-show="record.versionStatus == '1' && record.approvalStatus == '1' "
+ @click="handleAuditApproval(record)"
+ v-has="'dailyInspectionStandard:audit'"
+ >瀹℃牳</a>
<a-divider type="vertical" />
<a
- v-if="record.versionStatus == '1'"
- @click="handleTakeEffect(record)"
- v-has="'dailyInspectionStandard:takeEffect'"
- >鐢熸晥</a>
+ v-show="record.versionStatus == '1' && record.approvalStatus == '4'"
+ @click="handleAuditApproval(record)"
+ v-has="'dailyInspectionStandard:againAudit'"
+ >閲嶆柊瀹℃牳</a>
<a-divider type="vertical" />
<a
- v-if="record.versionStatus == '1'"
+ v-show="record.versionStatus == '1'&& record.approvalStatus == '3' "
+ @click="handleAuditApproval(record)"
+ v-has="'dailyInspectionStandard:approval'"
+ >瀹℃壒</a>
+ <a-divider type="vertical" />
+ <a
+ v-show="record.versionStatus == '1' && (record.approvalStatus == '1' || record.approvalStatus == '2')"
@click="handleEdit(record)"
v-has="'dailyInspectionStandard:edit'"
>缂栬緫</a>
<a-divider type="vertical" />
<a-popconfirm
- v-if="record.versionStatus == '1'"
+ v-show="record.versionStatus == '1' && (record.approvalStatus == '1' || record.approvalStatus == '2')"
title="纭畾鍒犻櫎鍚�?"
@confirm="() => handleDelete(record.id)"
v-has="'dailyInspectionStandard:delete'"
>
<a>鍒犻櫎</a>
</a-popconfirm>
+ <a-divider type="vertical" />
+ <a
+ v-show="record.versionStatus != '1'"
+ @click="handleRevise(record)"
+ v-has="'dailyInspectionStandard:revise'"
+ >鍗囩増</a>
+ <a-divider type="vertical" />
+ <a
+ v-show="record.versionStatus == '2'"
+ @click="handleTakeEffect(record)"
+ v-has="'dailyInspectionStandard:loseEfficacy'"
+ >澶辨晥</a>
</span>
</a-table>
@@ -187,6 +216,11 @@
ref='modalForm'
@ok='modalFormOk'
></dailylnspection-standard-modal>
+
+ <audit-approval-modal
+ ref='auditApprovalModal'
+ @ok='modalFormOk'
+ ></audit-approval-modal>
</a-card>
</template>
@@ -197,6 +231,7 @@
import { getAction, requestPut } from '@/api/manage'
import DailyInspectionStandardDetail from './modules/dailyInspectionStandard/DailyInspectionStandardDetail'
import DailylnspectionStandardModal from './modules/dailyInspectionStandard/DailylnspectionStandardModal'
+import AuditApprovalModal from './modules/dailyInspectionStandard/AuditApprovalModal'
import '@/assets/less/TableExpand.less'
export default {
@@ -204,7 +239,8 @@
mixins: [JeecgListMixin],
components: {
DailyInspectionStandardDetail,
- DailylnspectionStandardModal
+ DailylnspectionStandardModal,
+ AuditApprovalModal
},
data() {
return {
@@ -226,10 +262,11 @@
dataIndex: 'num',
},
{
- title: '浣跨敤閮ㄩ棬',
+ title: '绛惧鐘舵��',
align: 'center',
- dataIndex: 'useDepartName',
+ dataIndex: 'approvalStatusName',
},
+
{
title: '缁熶竴缂栫爜',
align: 'center',
@@ -246,6 +283,11 @@
dataIndex: 'equipmentModel',
},
{
+ title: '浣跨敤閮ㄩ棬',
+ align: 'center',
+ dataIndex: 'useDepartName',
+ },
+ {
title: '璐ｄ换鐝粍',
align: 'center',
dataIndex: 'teamName',
@@ -255,16 +297,54 @@
align: 'center',
dataIndex: 'assignModeName',
},
- // {
- // title: '鐢熸晥鏃堕棿',
- // align: 'center',
- // dataIndex: 'takeEffectTime',
- // },
- // {
- // title: '澶辨晥鏃堕棿',
- // align: 'center',
- // dataIndex: 'loseEfficacyTime',
- // },
+ {
+ title: '瀹℃牳鎰忚',
+ align: 'center',
+ dataIndex: 'auditFeedback',
+ },
+ {
+ title: '瀹℃壒鎰忚',
+ align: 'center',
+ dataIndex: 'approvalFeedback',
+ },
+ {
+ title: '缂栧埗浜�',
+ align: 'center',
+ dataIndex: 'writePerson',
+ },
+ {
+ title: '瀹℃牳浜�',
+ align: 'center',
+ dataIndex: 'auditPerson',
+ },
+ {
+ title: '瀹℃壒浜�',
+ align: 'center',
+ dataIndex: 'approvalPerson',
+ },
+ {
+ title: '澶辨晥浜�',
+ align: 'center',
+ dataIndex: 'loseEfficacyPerson',
+ },
+ {
+ title: '缂栧埗鏃ユ湡',
+ align: 'center',
+ dataIndex: 'createTime',
+ width: 150,
+ },
+ {
+ title: '鐢熸晥鏃堕棿',
+ align: 'center',
+ dataIndex: 'takeEffectTime',
+ width: 150,
+ },
+ {
+ title: '澶辨晥鏃堕棿',
+ align: 'center',
+ dataIndex: 'loseEfficacyTime',
+ width: 150,
+ },
{
title: '鐗堟湰',
align: 'center',
@@ -275,16 +355,12 @@
align: 'center',
dataIndex: 'versionStatusName',
},
- {
- title: '鍒涘缓浜�',
- align: 'center',
- dataIndex: 'createBy',
- },
- {
- title: '鍒涘缓鏃ユ湡',
- align: 'center',
- dataIndex: 'createTime',
- },
+ // {
+ // title: '鍒涘缓浜�',
+ // align: 'center',
+ // dataIndex: 'createBy',
+ // },
+
// {
// title: '鏇存柊浜�',
// align: 'center',
@@ -329,10 +405,10 @@
}
},
computed: {
- importExcelUrl: function(){
- return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
- }
- },
+ importExcelUrl: function () {
+ return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+ }
+ },
methods: {
clickThenSelect(record) {
return {
@@ -371,6 +447,12 @@
this.$refs.modalForm.isRevise = false;
},
+ //瀹℃牳瀹℃壒
+ handleAuditApproval: function (record) {
+ this.$refs.auditApprovalModal.showModals(record);
+ this.$refs.auditApprovalModal.title = "瀹℃牳";
+ },
+
//鍗囩増
handleRevise: function (record) {
this.$refs.modalForm.edit(record);
@@ -378,23 +460,22 @@
this.$refs.modalForm.disableSubmit = false;
this.$refs.modalForm.isRevise = true;
},
-
- //鐢熸晥
+ //澶辨晥
handleTakeEffect(record) {
const that = this;
that.confirmLoading = true;
this.$confirm({
- title: '鏃ュ父鐐规鏍囧噯鐗堟湰鐢熸晥锛�',
- content: '鎻愮ず锛氱増鏈敓鏁堝悗涓婁竴鐗堟湰灏嗚嚜鍔ㄥけ鏁堬紝璇疯皑鎱庢搷浣滐紒',
+ title: '鏃ュ父鐐规鏍囧噯鐗堟湰澶辨晥锛�',
+ content: '鎻愮ず锛氱増鏈け鏁堝悗灏嗙姝娇鐢紝璇疯皑鎱庢搷浣滐紒',
okText: '纭',
cancelText: '鍙栨秷',
onOk() {
- requestPut(that.url.versionTakeEffect, { id: record.id, num: record.num, versionStatus: '2' }).then((res) => {
+ requestPut(that.url.versionTakeEffect, { id: record.id, num: record.num, versionStatus: '3' }).then((res) => {
if (res.success) {
- that.$message.success("鐗堟湰鐢熸晥鎴愬姛锛�")
+ that.$message.success("鐗堟湰澶辨晥鎴愬姛锛�")
that.loadData(1)
} else {
- that.$message.warning("鐗堟湰鐢熸晥澶辫触锛�")
+ that.$message.warning("鐗堟湰澶辨晥澶辫触锛�")
}
}).finally(() => {
that.confirmLoading = false;
@@ -436,6 +517,13 @@
this.queryParam = {}
this.loadData(1);
},
+ modalFormOk() {
+ // 鏂板/淇敼 鎴愬姛鏃讹紝閲嶈浇鍒楄〃
+ this.loadData();
+ //娓呯┖鍒楄〃閫変腑
+ // this.onClearSelected()
+ },
+
}
}
</script>
--
Gitblit v1.9.3