From fd5845de8d0200ae55710e07e19fc31e3e67b422 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 14 十二月 2023 18:32:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/quality/processInspect/index.vue | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/src/views/quality/processInspect/index.vue b/src/views/quality/processInspect/index.vue
index b1b35e5..bc7e979 100644
--- a/src/views/quality/processInspect/index.vue
+++ b/src/views/quality/processInspect/index.vue
@@ -25,7 +25,7 @@
export default {
components: {
processInspectForm,
- ttable
+ ttable,
},
data() {
return {
@@ -56,12 +56,28 @@
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',
+ prop: 'materialCode',
+ label: '浜у搧缂栧彿',
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text'
},
{
minWidth: '120',
@@ -152,10 +168,10 @@
type: 'primary',
fun: this.addOrUpdateHandle
},
- {
- text: '瀵煎嚭',
- fun: this.exportExcel
- }
+ // {
+ // text: '瀵煎嚭',
+ // fun: this.exportExcel
+ // }
],
operator: [{
text: '浣滃簾',
@@ -177,7 +193,6 @@
exportExcel(){
let queryParam=this.$refs.processInspect.getQueryParam();
delete queryParam.criteria
- console.log(queryParam);
exportProcessInsProduct(queryParam).then((res)=>{
transform(res)
})
--
Gitblit v1.9.3