|
@@ -189,25 +189,26 @@
|
|
n.value++
|
|
n.value++
|
|
}
|
|
}
|
|
function addPriceItem(list){
|
|
function addPriceItem(list){
|
|
- console.log('addPriceItem',list)
|
|
|
|
- fileFlow.priceLists = list.reverse()
|
|
|
|
|
|
+ fileFlow.priceLists = list
|
|
let priceSchema = [],valueObj = {},count=0
|
|
let priceSchema = [],valueObj = {},count=0
|
|
- let manMade = []
|
|
|
|
- list.map((ele,index) => {
|
|
|
|
|
|
+ let manMade = [],countIndex = 0
|
|
|
|
+ console.log('addPriceItem',fileFlow.priceLists)
|
|
|
|
+ fileFlow.priceLists.map((ele,index) => {
|
|
if(ele.type == 1){//人工费
|
|
if(ele.type == 1){//人工费
|
|
manMade.push(ele.partId)
|
|
manMade.push(ele.partId)
|
|
count = count + ele.count*ele.price
|
|
count = count + ele.count*ele.price
|
|
}else{//备件
|
|
}else{//备件
|
|
|
|
+ countIndex++
|
|
let price = ele.discount == 1?ele.priceDiscount:ele.price
|
|
let price = ele.discount == 1?ele.priceDiscount:ele.price
|
|
valueObj[`priceList${ele.priceListId}`] = ele.count || 0
|
|
valueObj[`priceList${ele.priceListId}`] = ele.count || 0
|
|
valueObj[`priceListText${ele.priceListId}`] = `${ele.name} ${ele.price} 元/次`
|
|
valueObj[`priceListText${ele.priceListId}`] = `${ele.name} ${ele.price} 元/次`
|
|
- valueObj[`priceList${ele.priceListId}`] = ele.count || 0
|
|
|
|
- valueObj[`discount${ele.priceListId}`] = [0]
|
|
|
|
|
|
+ valueObj[`discount${ele.priceListId}`] = ele.discount == 1?[0]:[]
|
|
count = count + ele.count*price
|
|
count = count + ele.count*price
|
|
- priceSchema.unshift({
|
|
|
|
|
|
+ priceSchema.push({
|
|
|
|
+ // priceSchema.unshift({
|
|
field: 'priceListText' + ele.priceListId,
|
|
field: 'priceListText' + ele.priceListId,
|
|
component: 'InputNumber',
|
|
component: 'InputNumber',
|
|
- label: index+1,
|
|
|
|
|
|
+ label: countIndex,
|
|
labelWidth:20,
|
|
labelWidth:20,
|
|
slot: 'text',
|
|
slot: 'text',
|
|
// labelWidth:300,
|
|
// labelWidth:300,
|
|
@@ -366,7 +367,7 @@
|
|
closeModal();
|
|
closeModal();
|
|
emit('update');
|
|
emit('update');
|
|
loading.value = false
|
|
loading.value = false
|
|
- // clearInfo()
|
|
|
|
|
|
+ clearInfo()
|
|
},
|
|
},
|
|
onCancel: () => {
|
|
onCancel: () => {
|
|
loading.value = false
|
|
loading.value = false
|