|
@@ -275,6 +275,7 @@
|
|
}
|
|
}
|
|
function addPriceItem(list) {
|
|
function addPriceItem(list) {
|
|
fileFlow.priceLists = list;
|
|
fileFlow.priceLists = list;
|
|
|
|
+ console.log('addPriceItem', fileFlow.priceLists);
|
|
let priceSchema = [],
|
|
let priceSchema = [],
|
|
valueObj = {},
|
|
valueObj = {},
|
|
count = 0;
|
|
count = 0;
|
|
@@ -380,7 +381,8 @@
|
|
);
|
|
);
|
|
} else {
|
|
} else {
|
|
//人工费
|
|
//人工费
|
|
- let addName = addSchemas(n.value, ele.type == 3);
|
|
|
|
|
|
+ countIndex++;
|
|
|
|
+ let addName = addSchemas(n.value, ele.type == 3, countIndex);
|
|
priceSchema.push(...addName);
|
|
priceSchema.push(...addName);
|
|
valueObj[`deviceTypeId${n.value}`] = ele.name;
|
|
valueObj[`deviceTypeId${n.value}`] = ele.name;
|
|
valueObj[`deduction${n.value}`] = ele.name;
|
|
valueObj[`deduction${n.value}`] = ele.name;
|
|
@@ -392,6 +394,7 @@
|
|
});
|
|
});
|
|
fileFlow.priceCount = count.toFixed(2);
|
|
fileFlow.priceCount = count.toFixed(2);
|
|
valueObj.manMade = manMade;
|
|
valueObj.manMade = manMade;
|
|
|
|
+ console.log('priceSchema', priceSchema);
|
|
priceSchema.map((item) => {
|
|
priceSchema.map((item) => {
|
|
appendSchemaByField(item, '');
|
|
appendSchemaByField(item, '');
|
|
});
|
|
});
|
|
@@ -399,12 +402,13 @@
|
|
setFieldsValue(valueObj);
|
|
setFieldsValue(valueObj);
|
|
}, 10);
|
|
}, 10);
|
|
}
|
|
}
|
|
- function addSchemas(number, isJm = false) {
|
|
|
|
|
|
+ function addSchemas(number, isJm = false, index) {
|
|
|
|
+ console.log('addSchemas', number, n.value);
|
|
let priceListsLength = fileFlow.priceLists.filter((ele) => ele.type == 0).length;
|
|
let priceListsLength = fileFlow.priceLists.filter((ele) => ele.type == 0).length;
|
|
let parentList: FormSchema[] = [
|
|
let parentList: FormSchema[] = [
|
|
{
|
|
{
|
|
field: 'deviceType' + number,
|
|
field: 'deviceType' + number,
|
|
- label: number + priceListsLength,
|
|
|
|
|
|
+ label: index || number + priceListsLength,
|
|
labelWidth: 40,
|
|
labelWidth: 40,
|
|
component: 'Input',
|
|
component: 'Input',
|
|
slot: 'text',
|
|
slot: 'text',
|