From 79c983e7fa924e43f9f2a2a11b6f69c546f051a6 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 10 四月 2025 13:06:50 +0800
Subject: [PATCH] 不合格复测
---
src/views/business/materialOrder/customsInspection.vue | 31 ++++++++++++++-----------------
1 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/src/views/business/materialOrder/customsInspection.vue b/src/views/business/materialOrder/customsInspection.vue
index a33ebbc..bd454b1 100644
--- a/src/views/business/materialOrder/customsInspection.vue
+++ b/src/views/business/materialOrder/customsInspection.vue
@@ -302,7 +302,7 @@
</span>
</template>
</el-table-column>
- <el-table-column label="鏉′欢" min-width="140" prop="radius" show-overflow-tooltip></el-table-column>
+ <el-table-column label="璇曢獙鏉′欢" min-width="140" prop="radius" show-overflow-tooltip></el-table-column>
<el-table-column label="璇曢獙鏂规硶" min-width="120" prop="methodS" show-overflow-tooltip>
<template slot="header" slot-scope="scope">
<div style="display: flex;align-items: center;flex-direction: column;font-size: 14px">
@@ -915,7 +915,7 @@
item.insProduct = this.productList
})
this.getTotal(sampleList)
- let projectNum = this.totalArr.filter(a => a.state == 1).length
+ let projectNum = this.totalArr.length
if (projectNum == 0) {
this.$confirm('妫�楠岄」鐩负绌猴紝鏄惁纭鎻愪氦?', "鎻愮ず", {
confirmButtonText: "纭畾",
@@ -1055,14 +1055,13 @@
delete this.addObj.createTime
}
addInsOrder({
- insOrder: this.addObj,
+ insOrder: {
+ ...this.addObj,
+ workShopId: this.addObj.workShopId || '' // 纭繚 workShopId 浼犻�掔粰鍚庣
+ },
sampleList: sampleList.map(a => {
a.standardMethodListId = JSON.stringify(a.standardMethodListId)
- if (a.insProduct.length > 0) {
- a.insProduct.forEach(c => {
- delete c.id
- })
- }
+ a.insProduct = this.fullProductList
if (a.modelNum) {
// 鏍规嵁x鍙峰垽鏂瀷鍙峰弬鏁颁笌鏍峰搧鍨嬪彿鐨勬嫾鎺ヤ綅缃�
// 渚嬪脳4锛屽氨涓�500ML脳4锛�4脳锛屽氨涓�4脳500ML
@@ -1077,7 +1076,6 @@
} else {
a.model = a.model + ((a.modelNum == null || a.modelNum == '' || a.modelNum == 'null') ? '' : ('-' + a.modelNum))
}
- a.insProduct = a.insProduct.filter(b => b.state === 1)
return a
}),
}).then(res => {
@@ -1482,11 +1480,11 @@
this.sample.insulating = null
this.sample.sheath = null
this.sample.quantity = 1
- if (codeLevel === '[5]') {
+ if (codeLevel === '[7]') {
this.sample.model = this.addObj.sample
- } else if (codeLevel === '[4]') {
+ } else if (codeLevel === '[6]') {
this.models = data.children2
- } else if (codeLevel === '[3]') {
+ } else if (codeLevel === '[5]') {
this.models = data.children1
}
this.sampleList.push(this.HaveJson(this.sample))
@@ -1603,11 +1601,10 @@
ifsInventoryId: this.customsInspection.id
}).then(res => {
this.getProductLoad = false
- res.data.forEach(a => {
- a.state = 0
- })
- this.productList = this.HaveJson(res.data)
- this.productList0 = JSON.parse(JSON.stringify(this.productList))
+ // 鐩存帴灏嗘煡璇㈢粨鏋滆祴鍊肩粰 productList
+ this.fullProductList = res.data
+ this.productList = res.data
+ this.productList0 = res.data
this.$refs.sampleTable.setCurrentRow(row)
setTimeout(() => {
this.productList.forEach(a => {
--
Gitblit v1.9.3