From 185c03ebd1dd8127df2aed18f575f39cd3e352ec Mon Sep 17 00:00:00 2001 From: 王震 <10952869+daywangzhen@user.noreply.gitee.com> Date: 星期四, 23 十一月 2023 14:30:50 +0800 Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before --- src/views/quality/processInspect/index.vue | 26 ++++++++++++++++++++++---- 1 files changed, 22 insertions(+), 4 deletions(-) diff --git a/src/views/quality/processInspect/index.vue b/src/views/quality/processInspect/index.vue index fdc05d8..952ef6c 100644 --- a/src/views/quality/processInspect/index.vue +++ b/src/views/quality/processInspect/index.vue @@ -20,11 +20,12 @@ import ttable from '@/views/common/ztt-table.vue' import * as fecha from 'element-ui/lib/utils/date' import processInspectForm from './processInspect-form' - import { page,deleteById } from '@/api/quality/processInspect' + import { transform } from '@/util/fileTransform' + import { page,deleteById,exportProcessInsProduct } from '@/api/quality/processInspect' export default { components: { processInspectForm, - ttable + ttable, }, data() { return { @@ -55,12 +56,20 @@ column: [ { minWidth: '120', - prop: 'orderNumber', - label: '璁㈠崟缂栧彿', + prop: 'proInsNo', + label: '杩囩▼妫�楠岀紪鍙�', isTrue: true, isSearch: true, searchInfoType: 'text', render: { fun: this.addOrUpdateHandle } + }, + { + minWidth: '120', + prop: 'orderNumber', + label: '璁㈠崟缂栧彿', + isTrue: true, + isSearch: true, + searchInfoType: 'text' }, { minWidth: '120', @@ -153,6 +162,7 @@ }, { text: '瀵煎嚭', + fun: this.exportExcel } ], operator: [{ @@ -172,6 +182,14 @@ }, created() { }, methods: { + exportExcel(){ + let queryParam=this.$refs.processInspect.getQueryParam(); + delete queryParam.criteria + console.log(queryParam); + exportProcessInsProduct(queryParam).then((res)=>{ + transform(res) + }) + }, deleteHandle(row){ this.$confirm('纭鍒犻櫎璇ユ暟鎹悧锛�', '鎻愮ず', { confirmButtonText: '纭畾', -- Gitblit v1.9.3