From 109c83570a6c052c4c83633a0bce8ae81af97af2 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期四, 20 二月 2025 17:04:07 +0800
Subject: [PATCH] 检验任务90%
---
src/views/business/materialOrder/copperOrder.vue | 52 +++++++++++++++++++---------------------------------
1 files changed, 19 insertions(+), 33 deletions(-)
diff --git a/src/views/business/materialOrder/copperOrder.vue b/src/views/business/materialOrder/copperOrder.vue
index ad0d97d..467bc40 100644
--- a/src/views/business/materialOrder/copperOrder.vue
+++ b/src/views/business/materialOrder/copperOrder.vue
@@ -515,8 +515,6 @@
bsm2: false,
bsm2Val: null,
bsm2Dia: false,
- bsm2Val2: [],
- bsm2Val3: [],
bsmRow3: null,
bsm3Val: null,
bsm3Dia: false,
@@ -649,7 +647,6 @@
item.quantity = 1
})
this.count++
- this.computationalPairing(this.sampleList.length)
},
noNeedCheck () {
this.$refs['addObj'].validate((valid) => {
@@ -902,10 +899,6 @@
this.$message.error('璇烽�夋嫨妫�楠屾爣鍑�')
return
}
- // if (!this.sampleList.every(m => m.quantity)) {
- // this.$message.error('璇烽�夋嫨寰呮椤规暟閲�')
- // return
- // }
const sampleList = this.HaveJson(this.sampleList)
sampleList.forEach(item => {
item.quantity = 1
@@ -1148,25 +1141,27 @@
saveMethod(sampleList){
this.saveLoad = true
addRawCopperOrder({
- str: JSON.stringify({
- insOrder: this.addObj,
- list: JSON.stringify(sampleList.map(a => {
- if (a.modelNum) {
- const index = a.modelNum.indexOf('脳')
- if (index === 0) {
- a.model = a.model + a.modelNum
- } else if (index === -1) {
- a.model = a.model + '-' + a.modelNum
- } else {
- a.model = a.modelNum + a.model
- }
+ copperInsOrder: this.addObj,
+ sampleList: sampleList.map(a => {
+ if (a.insProduct.length > 0) {
+ a.insProduct.forEach(c => {
+ delete c.id
+ })
+ }
+ if (a.modelNum) {
+ const index = a.modelNum.indexOf('脳')
+ if (index === 0) {
+ a.model = a.model + a.modelNum
+ } else if (index === -1) {
+ a.model = a.model + '-' + a.modelNum
} else {
- a.model = a.model + ((a.modelNum == null || a.modelNum == '' || a.modelNum == 'null') ? '' : ('-' + a.modelNum))
+ a.model = a.modelNum + a.model
}
- a.insProduct = a.insProduct.filter(b=>b.state === 1)
- return a
- })),
- pairing: JSON.stringify(this.bsm2Val2)
+ } 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 => {
this.saveLoad = false
@@ -1333,8 +1328,6 @@
this.sampleList.push(this.HaveJson(this.sample))
// this.count++
}
- this.computationalPairing(this.sampleList.length)
- this.bsm2Val2 = this.HaveJson(this.bsm2Val3)
},
selectSample(val) {
this.sampleIds = []
@@ -1463,13 +1456,6 @@
}
backtrack([], nums);
return result;
- },
- computationalPairing(n) {
- const nums = [];
- for (let i = 1; i <= n; i++) {
- nums.push(i);
- }
- this.bsm2Val3 = this.HaveJson(this.permute(nums))
},
tableRowClassName({row, rowIndex}) {
if (row.state === 0) {
--
Gitblit v1.9.3