From 332125c247b8cec21af77479f07ef35558eb6bba Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 02 八月 2024 17:24:09 +0800
Subject: [PATCH] 合并冲突
---
src/components/do/b1-ins-order/add.vue | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index 04ca996..49505a1 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -1778,6 +1778,7 @@
},
saveMethod(sampleList){
this.saveLoad = true
+ console.log(333333,sampleList)
this.$axios.post(this.$api.insOrder.addInsOrder, {
str: JSON.stringify({
insOrder: this.addObj,
@@ -2109,7 +2110,6 @@
row.bsm1 = false
}else if(arr.length>0){
try{
- row.bsmRow = this.HaveJson(row)
let section = arr[0].section
let arr0 = JSON.parse(row.section)
let arr1 = JSON.parse(row.ask)
@@ -2328,10 +2328,12 @@
this.isAskOnlyRead = false
}
this.getProductLoad = true
+ let selectTreeList = this.selectTree.split(" - ")
+ selectTreeList[selectTreeList.length - 1] = this.addObj.model
this.$axios.post(this.$api.standardTree.selectStandardProductList, {
- model: row.model + '-' + row.modelNum,
+ model: this.addObj.model + '-' + row.modelNum,
standardMethodListId: val,
- factory: this.selectTree,
+ factory: selectTreeList.join(" - "),
}, {
headers: {
'Content-Type': 'application/json'
--
Gitblit v1.9.3