From 67da82f0b0c24df5f19bbfcfec63801d9ae902d8 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期三, 13 十二月 2023 16:22:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/quality/processInspect/index.vue | 46 ++++++++++++++--------------------------------
1 files changed, 14 insertions(+), 32 deletions(-)
diff --git a/src/views/quality/processInspect/index.vue b/src/views/quality/processInspect/index.vue
index 349f765..8c7a8b7 100644
--- a/src/views/quality/processInspect/index.vue
+++ b/src/views/quality/processInspect/index.vue
@@ -12,19 +12,6 @@
<template #toolbar></template>
</ttable>
</basic-container>
- <el-dialog
- top="10vh"
- title="鎵撳嵃棰勮"
- :visible.sync="printDialogVisible"
- width="60%">
- <div style="width:100%;height: 60vh;overflow-y: scroll;">
- <printTemplate id="printRaw" :formData="printFormData"></printTemplate>
- </div>
- <span slot="footer" class="dialog-footer">
- <el-button @click="()=>{printDialogVisible = false;this.printFormData=null}">鍙� 娑�</el-button>
- <el-button type="primary" @click="printFun()">鎵� 鍗�</el-button>
- </span>
- </el-dialog>
</div>
</div>
</template>
@@ -35,17 +22,13 @@
import processInspectForm from './processInspect-form'
import { transform } from '@/util/fileTransform'
import { page,deleteById,exportProcessInsProduct } from '@/api/quality/processInspect'
- import printTemplate from './processInspect-print.vue'
export default {
components: {
processInspectForm,
ttable,
- printTemplate
},
data() {
return {
- printFormData: null,
- printDialogVisible: false,
result:[{label:'鍏ㄩ儴',value: ''},{label:'鍚堟牸',value: '1'},{label:'涓嶅悎鏍�',value: '0'}],
type: [1],
prelang: 'processInspect',
@@ -73,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',
@@ -169,17 +160,12 @@
type: 'primary',
fun: this.addOrUpdateHandle
},
- {
- text: '瀵煎嚭',
- fun: this.exportExcel
- }
+ // {
+ // text: '瀵煎嚭',
+ // fun: this.exportExcel
+ // }
],
operator: [{
- text: '鎵撳嵃',
- type: 'text',
- size: 'small',
- fun: this.showPrint
- },{
text: '浣滃簾',
type: 'text',
size: 'small',
@@ -196,13 +182,9 @@
},
created() { },
methods: {
- showPrint(){
- this.printDialogVisible = true
- },
exportExcel(){
let queryParam=this.$refs.processInspect.getQueryParam();
delete queryParam.criteria
- console.log(queryParam);
exportProcessInsProduct(queryParam).then((res)=>{
transform(res)
})
--
Gitblit v1.9.3