From c2e684e0caab67573bb2df44d6f0c73bbaedd9c7 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期四, 20 二月 2025 17:04:11 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-before into dev
---
src/views/business/materialOrder/customsInspection.vue | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/src/views/business/materialOrder/customsInspection.vue b/src/views/business/materialOrder/customsInspection.vue
index f54eec2..415f92c 100644
--- a/src/views/business/materialOrder/customsInspection.vue
+++ b/src/views/business/materialOrder/customsInspection.vue
@@ -978,7 +978,6 @@
item.insProduct = this.productList
})
this.getTotal(sampleList)
- const pairing = []
let trees = this.selectTree.split(" - ")
if (trees.length < 3) {
this.$message.error('鏈�夋嫨瀵硅薄')
@@ -997,7 +996,7 @@
this.noNeedCheckLoad = true
addExemptionOrder({
insOrder: this.addObj,
- list: sampleList.map(a => {
+ sampleList: sampleList.map(a => {
if (a.modelNum) {
// 鏍规嵁x鍙峰垽鏂瀷鍙峰弬鏁颁笌鏍峰搧鍨嬪彿鐨勬嫾鎺ヤ綅缃�
// 渚嬪脳4锛屽氨涓�500ML脳4锛�4脳锛屽氨涓�4脳500ML
@@ -1015,7 +1014,6 @@
a.insProduct = a.insProduct.filter(b=>b.state === 1)
return a
}),
- pairing: pairing
}).then(res => {
this.noNeedCheckLoad = false
if (res.code == 201) return
@@ -1027,7 +1025,6 @@
})
},
saveMethod(sampleList){
- const pairing = []
let trees = this.selectTree.split(" - ")
if (trees.length < 3) {
this.$message.error('鏈�夋嫨瀵硅薄')
@@ -1046,7 +1043,7 @@
this.saveLoad = true
addInsOrder({
insOrder: this.addObj,
- list: sampleList.map(a => {
+ sampleList: sampleList.map(a => {
if (a.modelNum) {
// 鏍规嵁x鍙峰垽鏂瀷鍙峰弬鏁颁笌鏍峰搧鍨嬪彿鐨勬嫾鎺ヤ綅缃�
// 渚嬪脳4锛屽氨涓�500ML脳4锛�4脳锛屽氨涓�4脳500ML
@@ -1064,7 +1061,6 @@
a.insProduct = a.insProduct.filter(b=>b.state === 1)
return a
}),
- pairing: pairing
}).then(res => {
this.saveLoad = false
if (res.code == 201) return
--
Gitblit v1.9.3