From 2fa578a18ed9055f8cb9863a8a0f02977cfa8350 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期二, 19 十二月 2023 17:33:53 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/quality/processInspect/index.vue | 36 ++++++++++++++++++++++++++----------
1 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/src/views/quality/processInspect/index.vue b/src/views/quality/processInspect/index.vue
index b1b35e5..2fddf58 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)
})
@@ -202,8 +217,9 @@
addOrUpdateHandle(row) {
this.$router.push({
name: 'processInspectForm',
- query: { id: row == null ? null : row.id,resultVal : row == null ? null : row.result },
- })
+ query: { id: row == null ? null : row.id },
+ params: { resultVal : row == null ? null : row.result }
+ })
},
formatResult(row, column, cellValue){
if(cellValue != undefined || cellValue != null){
--
Gitblit v1.9.3