From b1dbfd44f6bafaa4d24e0c1c3a0f7ae548e77f60 Mon Sep 17 00:00:00 2001 From: 王震 <10952869+daywangzhen@user.noreply.gitee.com> Date: 星期三, 27 十二月 2023 17:41:06 +0800 Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before --- src/views/quality/processconfiguration/index.vue | 143 +++++++++++++++++++---------------------------- 1 files changed, 57 insertions(+), 86 deletions(-) diff --git a/src/views/quality/processconfiguration/index.vue b/src/views/quality/processconfiguration/index.vue index b5b64a4..b364506 100644 --- a/src/views/quality/processconfiguration/index.vue +++ b/src/views/quality/processconfiguration/index.vue @@ -3,14 +3,13 @@ <basic-container> <ttable :table="table" - :resultData="resultData" - @change ="costPlannedAmountChange" @handleSelectionChange="handleSelectionChange" :uploadInfo="uploadInfo" :isShowHide="true" :prelang="prelang" :options="options" :ajaxFun="ajaxFun" + @queryParam="getQueryParam($event)" ref="processconfiguration" > <template #toolbar></template> @@ -74,16 +73,21 @@ </template> <script> -import { UnqualifiedList,pullInsUnapi,AuditSuggestion +import { + UnqualifiedList, + pullInsUnapi, + AuditSuggestion, + exportData } from '@/api/quality/unqualifiedprocess' import TableForm from './table-form' import { mapGetters } from 'vuex' // import { remote } from '@/api/admin/dict' +import { transform } from '@/util/fileTransform' import ttable from '@/views/common/ztt-table.vue' export default { data() { return { - resultData:[], + queryParam: {}, checkList: "", // WayIdea:'', UserId:{}, @@ -259,65 +263,16 @@ // return this.processModeOptions // } // }, - //鍙戣捣浜� - // { - // minWidth: '200', - // prop: 'originator', - // label: '鍙戣捣浜�', - // sort: true, - // isTrue: true, - // isSearch: true, - // searchInfoType: 'text' - // }, - // 瀹℃牳浜� - // { - // minWidth: '140', - // prop: 'examiner', - // label: '瀹℃牳浜�', - // sort: true, - // isTrue: true, - // isSearch: true, - // searchInfoType: 'text' - // }, - // 澶勭悊浜� - // { - // minWidth: '120', - // prop: 'handler', - // label: '澶勭悊浜�', - // sort: true, - // isTrue: true, - // isSearch: true, - // searchInfoType: 'text' - // }, ], toolbar: [ - { - text: '瀵煎嚭', - type: 'primary', - fun: this.handleExcel - }, - ], - operator: [ // { - // text: '鍒犻櫎', - // type: 'text', - // size: 'small', - // fun: this.deleteHandle + // text: '瀵煎嚭', + // type: 'primary', + // fun: this.handleExport // }, - { - text: '鎻愪氦瀹℃牳', - type: 'text', - size: 'small', - fun: this.Submitreview - }, - { - text: '瀹℃牳缁撴灉', - type: 'text', - size: 'small', - fun: this.AuditResult - } ], + operator: null, operatorConfig: { fixed: 'right', label: '鎿嶄綔', @@ -325,7 +280,7 @@ minWidth: 100 } }, - materialType: [{label:'鍘熸潗鏂欐楠�',value:'鍘熸潗鏂欐楠�'},{label:'杩囩▼妫�楠�',value:'杩囩▼妫�楠�'},{label:'浜у搧妫�楠�',value:'浜у搧妫�楠�'}], + materialType: [{label:'鍘熸潗鏂欐楠�',value:'鍘熸潗鏂欐楠�'},{label:'杩囩▼妫�楠�',value:'杩囩▼妫�楠�'},{label:'浜у搧妫�楠�',value:'浜у搧妫�楠�'},{label:'鍖呰妫�楠�',value:'鍖呰妫�楠�'}], StateList: [{label:'鍏ㄩ儴',value:''},{label:'宸叉彁浜ゅ鏍�',value:'1'},{label:'寰呭鐞�',value:'0'},{label:'宸插鐞�',value:'2'}], insStateList: [{label:'鍏朵粬',value:''},{label:'鐟曠柕',value:'1'}], } @@ -340,35 +295,53 @@ }, created() { // this.getType() + let arr = [] + if(this.permissions.quality_processconfiguration_submit){ + arr.push({ + text: '鎻愪氦瀹℃牳', + type: 'text', + size: 'small', + fun: this.Submitreview + }) + } + if(this.permissions.quality_processconfiguration_result){ + arr.push({ + text: '瀹℃牳缁撴灉', + type: 'text', + size: 'small', + fun: this.AuditResult + }) + } + this.table.operator = arr.length>0 ? arr : null }, methods: { - async costPlannedAmountChange(value){ - this.resultData= value - }, - handleExcel() { - console.log(this.resultData); - console.log(this.table.column); - let arr = this.table.column.filter(item => item.isTrue == true).map(item => { - return{ - prop:item.prop, - label:item.label - } - }) - let opt = { - title: '鏂囨。鏍囬', - column: [{ - label:'涓嶅悎鏍煎缃�', - prop:'header', - children:arr - }], - data: this.resultData + getQueryParam(data){ + this.queryParam = data + }, + handleExport(){ + exportData(this.queryParam).then(res=>{ + this.downloadFun(res) + }).catch(error=>{ + console.log(error); + }) + }, + downloadFun(result){ + if(result == null || result == undefined){ + return; } - this.$Export.excel({ - title: opt.title, - columns: opt.column, - data: opt.data - }); - }, + var nameList = result.headers['content-disposition']; + nameList = decodeURI(nameList); + var fileName = nameList.split('=')[1]; + const blob = new Blob([result.data], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' }) + const downloadElement = document.createElement('a') // 鏂板缓涓�涓狣OM鑺傜偣 + const href = window.URL.createObjectURL(blob) // 鍒涘缓涓嬭浇鐨勯摼鎺� + downloadElement.href = href + downloadElement.download = fileName // 涓嬭浇鍚庢枃浠跺悕 + document.body.appendChild(downloadElement) // 灏嗘柊澧炵殑鑺傜偣鎸傝浇鍒伴〉闈笂 + downloadElement.click() // 鐐瑰嚮涓嬭浇 + document.body.removeChild(downloadElement) // 涓嬭浇瀹屾垚绉婚櫎鍏冪礌 + window.URL.revokeObjectURL(href) + }, //瀹℃牳缁撴灉 AuditResult(row){ this.UserId = row.id @@ -392,9 +365,7 @@ }, //鎻愪氦瀹℃牳 Submitreview(row){ - console.log(row.id); pullInsUnapi({id:row.id}).then(res =>{ - console.log(res); this.$refs.processconfiguration.refreshData() }) }, -- Gitblit v1.9.3