From 786a139a5855dfec193dc3e7b794127ed3e62fe2 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 12 四月 2024 15:26:45 +0800
Subject: [PATCH] 优化
---
src/views/quality/rawMaterial/rawMaterial-form.vue | 11 +++++++----
src/views/plan/customerorder/index.vue | 17 ++++++++++++-----
src/views/quality/finishedProductInspection/finishedProduct-form.vue | 2 +-
src/views/common/ztt-table.vue | 8 ++++----
src/views/quality/processInspect/processInspect-form.vue | 2 +-
5 files changed, 25 insertions(+), 15 deletions(-)
diff --git a/src/views/common/ztt-table.vue b/src/views/common/ztt-table.vue
index 794915e..f068d46 100644
--- a/src/views/common/ztt-table.vue
+++ b/src/views/common/ztt-table.vue
@@ -556,10 +556,6 @@
type: Object,
default: null
},
- expandRowKeys: {
- type: Array,
- default: ()=>[]
- }
},
render: (h, data) => {
const params = {
@@ -574,6 +570,10 @@
name: 'TTable',
components: { exSlot, advancedSearchDialog, zttdraggable },
props: {
+ expandRowKeys: {
+ type: Array,
+ default: ()=>[]
+ },
rowKey: {
type: String,
default: ()=>{
diff --git a/src/views/plan/customerorder/index.vue b/src/views/plan/customerorder/index.vue
index 70957f3..a1667e2 100644
--- a/src/views/plan/customerorder/index.vue
+++ b/src/views/plan/customerorder/index.vue
@@ -11,7 +11,6 @@
:toolbarMaxLength="4"
:paramArr="type"
ref="customerOrderTable"
- :expandRowKeys="expandRowKeys"
>
<template #toolbar>
<el-dropdown
@@ -415,7 +414,7 @@
selectTime: null,
exportTime: null,
},
- expandRowKeys: [],
+ expandRowKeys: null,
dataRule: {
exportTime: [
{ required: true, message: '瀵煎嚭鏃ユ湡涓嶈兘涓虹┖', trigger: 'change' },
@@ -1201,8 +1200,12 @@
this.getData()
},
- getData() {
- this.$refs.customerOrderTable.getDataList()
+ async getData() {
+ await this.$refs.customerOrderTable.getDataList()
+ this.$refs.customerOrderTable.tableData.forEach((ele) => {
+ this.$refs.customerOrderTable.$refs.lmesTable.toggleRowExpansion(ele,false)
+ })
+ this.expandRowKeys && this.$refs.customerOrderTable.$refs.lmesTable.toggleRowExpansion(this.expandRowKeys,true)
},
// 鑾峰彇鏁版嵁鍒楄〃鍘婚櫎宸插畬鎴愮姸鎬佺殑
handleDataList(command) {
@@ -1282,7 +1285,11 @@
this.$refs.addSampleForm.init(row ? row.contractNo : null)
})
}
- this.expandRowKeys=[row.id]
+ this.$refs.customerOrderTable.tableData.forEach((item) => {
+ if(item.children&&item.children.find(m=>m.id==row.id)){
+ this.expandRowKeys = item;
+ }
+ })
},
// 鏂板鏍峰搧璁㈠崟
addSampleCustomerOrder() {
diff --git a/src/views/quality/finishedProductInspection/finishedProduct-form.vue b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
index ca7bb5f..162fe06 100644
--- a/src/views/quality/finishedProductInspection/finishedProduct-form.vue
+++ b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
@@ -817,10 +817,10 @@
if (this.empiricalValueAddMaxNumber != this.empiricalValueAdd - 1) {
this.empiricalValueAdd = this.empiricalValueAdd - 1;
// this.changeRowResult()
- this.saveTable()
this.inspectionItems.forEach(i => {
i.empiricalValueAddss.splice(this.empiricalValueAdd, 1);
});
+ this.saveTable()
}
}
},
diff --git a/src/views/quality/processInspect/processInspect-form.vue b/src/views/quality/processInspect/processInspect-form.vue
index 59e0cf4..319b24c 100644
--- a/src/views/quality/processInspect/processInspect-form.vue
+++ b/src/views/quality/processInspect/processInspect-form.vue
@@ -858,7 +858,6 @@
if (_than.empiricalValueAddMaxNumber != _than.empiricalValueAdd - 1) {
_than.empiricalValueAdd = _than.empiricalValueAdd - 1;
// _than.changeRowResult()
- _than.saveTable();
_than.inspectionItems.forEach(i => {
if(i.children){
i.children.forEach(ele=>{
@@ -866,6 +865,7 @@
})
}
});
+ _than.saveTable();
}
}
},
diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index 8555efe..02d1bf4 100644
--- a/src/views/quality/rawMaterial/rawMaterial-form.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -773,10 +773,12 @@
if(this.list){
this.list.forEach(e=>{
if(e.children){
- e.children.forEach(i=>{
+ e.children.map(i=>{
if(i.testValueList.length>1){
- let arr = i.testValue.split(",")
- arr.splice((arr.length-1),1)
+ i.testValueList = i.testValueList.splice(i.testValueList.length-1,1)
+ return i
+ // let arr = i.testValue.split(",")
+ // arr.splice((arr.length-1),1)
// let obj = {
// deviceId: i.deviceId,
// rpId: i.rpId,
@@ -799,7 +801,7 @@
if (this.empiricalValueAdd - 1 > 0) {
if (this.empiricalValueAddMaxNumber != this.empiricalValueAdd - 1) {
this.empiricalValueAdd = this.empiricalValueAdd - 1;
- this.changeRowResult()
+ // this.changeRowResult()
this.list.forEach(i => {
if(i.children){
i.children.forEach(ele=>{
@@ -807,6 +809,7 @@
})
}
});
+ this.saveTable()
}
}
},
--
Gitblit v1.9.3