From e3f6f75938f45f2672bf0f0320cb92a4f96ff696 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 01 七月 2024 14:56:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 64 ++++++++++++++++++++------------
1 files changed, 40 insertions(+), 24 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 454ee55..9526916 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -1251,8 +1251,10 @@
})
})
if (item.v.ps != undefined && item.v.ps.value == '缁撹') {
- if (this.currentSample.insProduct.find(m => m.id == item.i)) {
+ try {
+ if (this.currentSample.insProduct.find(m => m.id == item.i)) {
let ask = this.currentSample.insProduct.find(m => m.id == item.i).ask?this.currentSample.insProduct.find(m => m.id == item.i).ask.split('&'):null;
+ console.log(comValue)
let res = Object.values(comValue)[0]
let comp = []
console.log(res, ask)
@@ -1303,6 +1305,10 @@
}
this.saveInsContext()
}
+ } catch (error) {
+
+ }
+
} else {
let comResult = ''
try {
@@ -1409,26 +1415,34 @@
// }
// break;
// }
- list.forEach(a => {
- if (a[0].r == item.r && comResult !== '') {
- for (var b in a) {
- if (a[b].c == item.c) {
- try{
- let val = parseFloat(comResult.toFixed(3))
- a[b].v.v = isNaN(val) ? '' : val
- }catch(e){
- a[b].v.v = comResult
+ try {
+ list.forEach(a => {
+ if (a[0].r == item.r && comResult !== '') {
+ for (var b in a) {
+ if (a[b].c == item.c) {
+ try{
+ let val = parseFloat(comResult.toFixed(3))
+ a[b].v.v = isNaN(val) ? '' : val
+ }catch(e){
+ a[b].v.v = comResult
+ }
+ break
}
- break
}
}
- }
- })
- this.changeInput(comResult, `${id}-${item.r}-${item.c}-${pId}`) //鏀瑰彉鏈�缁堝��
+ })
+ this.changeInput(comResult, `${id}-${item.r}-${item.c}-${pId}`) //鏀瑰彉鏈�缁堝��
+ } catch (error) {
+
+ }
}
}
})
- this.getCurrentInsProduct(pId)
+ try {
+ this.getCurrentInsProduct(pId)
+ } catch (error) {
+
+ }
},
getCurrentInsProduct(pId) {
if (!this.tableList[0].insProductResult) {
@@ -1743,15 +1757,17 @@
return
},
saveInsContext() {
- this.$axios.post(this.$api.insOrderPlan.saveInsContext, {
- param: JSON.stringify(this.param)
- }).then(res => {
- if (res.code == 201) {
- this.$message.error('淇濆瓨澶辫触')
- return
- }
- this.$message.success('宸蹭繚瀛�')
- })
+ if(this.param){
+ this.$axios.post(this.$api.insOrderPlan.saveInsContext, {
+ param: JSON.stringify(this.param)
+ }).then(res => {
+ if (res.code == 201) {
+ this.$message.error('淇濆瓨澶辫触')
+ return
+ }
+ this.$message.success('宸蹭繚瀛�')
+ })
+ }
},
changeEquip(val, n) {
for (let i in this.equipOptions) {
--
Gitblit v1.9.3