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/DailyInspectionStandardList.vue | 84 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 81 insertions(+), 3 deletions(-)
diff --git a/src/views/eam/DailyInspectionStandardList.vue b/src/views/eam/DailyInspectionStandardList.vue
index afc6879..8ce3764 100644
--- a/src/views/eam/DailyInspectionStandardList.vue
+++ b/src/views/eam/DailyInspectionStandardList.vue
@@ -83,6 +83,11 @@
</a-upload>
<a-button
type="primary"
+ @click="handleDownload"
+ icon="download"
+ >妯＄増涓嬭浇</a-button>
+ <a-button
+ type="primary"
@click="searchQuery"
icon="search"
>鏌ヨ</a-button>
@@ -137,6 +142,24 @@
:customRow='clickThenSelect'
@change='handleTableChange'
>
+ <span
+ slot="disUda1"
+ slot-scope="text"
+ >
+ <j-ellipsis
+ :value="text"
+ :length="10"
+ />
+ </span>
+ <span
+ slot="teamName"
+ slot-scope="text"
+ >
+ <j-ellipsis
+ :value="text"
+ :length="10"
+ />
+ </span>
<!-- <span
slot='action'
@@ -244,16 +267,18 @@
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-import { getAction, requestPut } from '@/api/manage'
+import { getAction, requestPut, downFile } 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'
+import JEllipsis from "@/components/jeecg/JEllipsis";
export default {
name: 'DailyInspectionStandardList',
mixins: [JeecgListMixin],
components: {
+ JEllipsis,
DailyInspectionStandardDetail,
DailylnspectionStandardModal,
AuditApprovalModal
@@ -276,6 +301,12 @@
title: '鏍囧噯缂栫爜',
align: 'center',
dataIndex: 'num',
+ },
+ {
+ title: '绠＄悊鍒跺害',
+ align: 'center',
+ dataIndex: 'disUda1',
+ scopedSlots: { customRender: 'disUda1' },
},
{
title: '绛惧鐘舵��',
@@ -307,6 +338,7 @@
title: '璐ｄ换鐝粍',
align: 'center',
dataIndex: 'teamName',
+ scopedSlots: { customRender: 'teamName' },
},
// {
// title: '娲惧伐鏂瑰紡',
@@ -314,9 +346,19 @@
// dataIndex: 'assignModeName',
// },
{
+ title: '瀹℃牳缁撴灉',
+ align: 'center',
+ dataIndex: 'disUda2',
+ },
+ {
title: '瀹℃牳鎰忚',
align: 'center',
dataIndex: 'auditFeedback',
+ },
+ {
+ title: '瀹℃壒缁撴灉',
+ align: 'center',
+ dataIndex: 'disUda3',
},
{
title: '瀹℃壒鎰忚',
@@ -403,14 +445,16 @@
versionTakeEffect: "/eam/inspectionStandard/versionTakeEffect",
importExcelUrl: "/eam/inspectionStandard/importExcel",
passBatch: '/eam/inspectionStandard/auditApprovalBatch',
+ download: '/sys/upload/downloadFile',
+ uploadList: '/sys/upload/list',
},
version: '1.0',
dictOptions: {},
/* 鍒嗛〉鍙傛暟 */
ipagination: {
current: 1,
- pageSize: 5,
- pageSizeOptions: ['5', '10', '50'],
+ pageSize: 20,
+ pageSizeOptions: ['5', '10', '20', '50'],
showTotal: (total, range) => {
return range[0] + '-' + range[1] + ' 鍏�' + total + '鏉�'
},
@@ -634,6 +678,40 @@
}
},
+ handleDownload() {
+ var params = {}//鏌ヨ鏉′欢
+ params.type = "inspection"
+ params.pageNo = 1
+ params.pageSize = 10
+ getAction(this.url.uploadList, params).then((res2) => {
+ if (res2.success) {
+ if (res2.result.records.length > 0) {
+ downFile(this.url.download, { id: res2.result.records[0].id }).then((res) => {
+ if (!res) {
+ this.$message.warning('鏂囦欢涓嬭浇澶辫触')
+ return
+ } else {
+ let fileName = res2.result.records[0].name
+ if (typeof window.navigator.msSaveBlob !== 'undefined') {
+ window.navigator.msSaveBlob(new Blob([res]), fileName)
+ } else {
+ let url = window.URL.createObjectURL(new Blob([res]))
+ let link = document.createElement('a')
+ link.style.display = 'none'
+ link.href = url
+ link.setAttribute('download', fileName)
+ document.body.appendChild(link)
+ link.click()
+ document.body.removeChild(link) //涓嬭浇瀹屾垚绉婚櫎鍏冪礌
+ window.URL.revokeObjectURL(url) //閲婃斁鎺塨lob瀵硅薄
+ }
+ }
+ })
+ }
+ }
+ })
+ },
+
}
}
</script>
--
Gitblit v1.9.3