From b572bdc7da9c6c47df9be5939f5d3280f2127546 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 02 八月 2024 17:18:35 +0800
Subject: [PATCH] Merge branch 'test' of http://114.132.189.42:9002/r/center-lims-before into test
---
src/components/do/b1-ins-order/add.vue | 80 ++++++++++++++++++++++++----------------
1 files changed, 48 insertions(+), 32 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index e07d307..49505a1 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -461,6 +461,16 @@
</div>
</template>
</el-table-column>
+ <el-table-column prop="tell" label="瑕佹眰鎻忚堪" min-width="220px">
+ <template slot-scope="scope">
+ <el-input size="small" placeholder="瑕佹眰鎻忚堪" v-model="scope.row.tell" clearable type="textarea"
+ :autosize="{ minRows: 1, maxRows: 3}" @change="e=>requestChange(e,scope.row,'tell')"
+ v-if="active==1&&isAskOnlyRead"></el-input>
+ <span v-else>
+ <template >{{ scope.row.tell }}</template>
+ </span>
+ </template>
+ </el-table-column>
<el-table-column prop="ask" label="瑕佹眰鍊�" min-width="220px" v-if="isAskOnlyRead">
<template slot-scope="scope">
<el-input size="small" placeholder="瑕佹眰鍊�" v-model="scope.row.ask" clearable type="textarea"
@@ -477,16 +487,6 @@
</template>
<template v-else>{{ scope.row.ask }}</template> -->
<template >{{ scope.row.ask }}</template>
- </span>
- </template>
- </el-table-column>
- <el-table-column prop="tell" label="瑕佹眰鎻忚堪" min-width="220px">
- <template slot-scope="scope">
- <el-input size="small" placeholder="瑕佹眰鎻忚堪" v-model="scope.row.tell" clearable type="textarea"
- :autosize="{ minRows: 1, maxRows: 3}" @change="e=>requestChange(e,scope.row,'tell')"
- v-if="active==1&&isAskOnlyRead"></el-input>
- <span v-else>
- <template >{{ scope.row.tell }}</template>
</span>
</template>
</el-table-column>
@@ -961,7 +961,7 @@
entity: {
orderBy: {
field: 'id',
- order: 'asc'
+ order: 'desc'
}
},
isIndex: true,
@@ -1370,6 +1370,11 @@
let obj = this.productList.find(m => m.id == a.id)
if(obj){
a.state = obj.state
+ a.section = obj.section
+ a.ask = obj.ask
+ a.manHour = obj.manHour
+ a.price = obj.price
+ a.tell = obj.tell
}
})
},
@@ -1773,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,
@@ -2076,6 +2082,7 @@
this.sampleIds.push(row.id)
}
this.productList = row.insProduct
+ this.productList0 = JSON.parse(JSON.stringify(this.productList))
setTimeout(() => {
this.productList.forEach(a => {
if (a.state == 1) this.toggleSelection(a)
@@ -2103,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)
@@ -2252,7 +2258,8 @@
name: this.templateName,
thing: JSON.stringify({
addObj: this.addObj,
- sampleList: this.sampleList
+ sampleList: this.sampleList,
+ selectTree:this.selectTree
})
}, {
headers: {
@@ -2277,6 +2284,7 @@
let obj = JSON.parse(res.data)
this.addObj = obj.addObj;
this.sampleList = obj.sampleList;
+ this.selectTree = obj.selectTree
})
},
delSampleAndProduct() {
@@ -2320,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'
@@ -2661,25 +2671,31 @@
}
},
upBsmAll (item) {
- let sections = JSON.parse(item.bsmRow.section);
- let asks = JSON.parse(item.bsmRow.ask);
- let tells = JSON.parse(item.bsmRow.tell);
- let manHours = JSON.parse(item.bsmRow.manHour);
- let prices = JSON.parse(item.bsmRow.price);
- for (var a in sections) {
- if (item.bsm1Val === sections[a]) {
- this.productList.forEach(p => {
- if (p.id === item.bsmRow.id) {
- p.section = sections[a]
- p.ask = asks[a]
- p.tell = tells[a]
- p.manHour = manHours[a]
- p.price = prices[a]
- }
- })
- break
+ // console.log(1111,item,this.bsm1DiaList)
+ for (let i =0;i<this.bsm1DiaList.length;i++){
+ this.bsm1DiaList[i].bsm1Val = item.bsm1Val
+ let sections = JSON.parse(this.bsm1DiaList[i].bsmRow.section);
+ let asks = JSON.parse(this.bsm1DiaList[i].bsmRow.ask);
+ let tells = JSON.parse(this.bsm1DiaList[i].bsmRow.tell);
+ let manHours = JSON.parse(this.bsm1DiaList[i].bsmRow.manHour);
+ let prices = JSON.parse(this.bsm1DiaList[i].bsmRow.price);
+ for (var a in sections) {
+ if (this.bsm1DiaList[i].bsm1Val === sections[a]) {
+ this.productList.forEach(p => {
+ if (p.id === this.bsm1DiaList[i].bsmRow.id) {
+ p.section = sections[a]
+ p.ask = asks[a]
+ p.tell = tells[a]
+ p.manHour = manHours[a]
+ p.price = prices[a]
+ }
+ })
+ break
+ }
}
}
+ this.changeProductList0()
+ this.currentMethod.insProduct = this.productList0
},
beforeClose(done) {
// if (this.bsm1) {
--
Gitblit v1.9.3