预览和变量

This commit is contained in:
xielue 2023-08-07 15:44:24 +08:00
parent addf7adad0
commit e1f160fe30
4 changed files with 37 additions and 18 deletions

View File

@ -214,7 +214,8 @@
<vxe-column field="price" title="单价" width="120"
:edit-render="{ name: '$input', props: { type: 'number' } }"></vxe-column>
<vxe-column field="amount_formula" title="金额" width="220" :edit-render="{ name: 'EditExpressions' }">
<vxe-column field="amount_formula" title="金额" width="220" :edit-render="{ name: 'EditExpressions' }"
:params="{ moreExpressionsList: getMoreExpressionsList }">
<template #default="{ row }">
<a-tooltip>
<template slot="title">

View File

@ -183,7 +183,8 @@
<vxe-column field="price" title="单价" width="120"
:edit-render="{ name: '$input', props: { type: 'number' } }"></vxe-column>
<vxe-column field="amount_formula" title="金额" width="220" :edit-render="{ name: 'EditExpressions' }">
<vxe-column field="amount_formula" title="金额" width="220" :edit-render="{ name: 'EditExpressions' }"
:params="{ moreExpressionsList: getMoreExpressionsList }">
<template #default="{ row }">
<a-tooltip>
<template slot="title">

View File

@ -4,7 +4,7 @@
<div class="topbar">
<a-button type="primary" @click="ok">保存</a-button>
<a-button type="primary" @click="ok({})">保存</a-button>
<a-button @click="selectScheme">导入方案</a-button>
<a-button @click="cancel">取消</a-button>
<a-button @click="previewScheme">预览方案</a-button>
@ -108,7 +108,8 @@
<vxe-column field="price" title="单价" width="120"
:edit-render="{ name: '$input', props: { type: 'number' } }"></vxe-column>
<vxe-column field="amount_formula" title="金额(公式)" width="220" :edit-render="{ name: 'EditExpressions' }">
<vxe-column field="amount_formula" title="金额(公式)" width="220" :edit-render="{ name: 'EditExpressions' }"
:params="{ moreExpressionsList: getMoreExpressionsList }">
</vxe-column>
</vxe-table>
@ -233,7 +234,7 @@
isEnter: false, isTab: true, isEdit: true, isChecked: true
}" :mouse-config="{ selected: true }" @pulldownSelected="expense_onPulldownSelected"
@popupSelected="expense_onPopupSelected" :export-config="{}" @edit-closed="expense_afterEditEvent"
@edit-actived="expense_beforeEditEvent"
@edit-actived="expense_beforeEditEvent"
:edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false, beforeEditMethod: expense_beforeEditMethod }">
<vxe-column width="60" v-if="!isReadonly">
<template #default="{ row }">
@ -336,7 +337,7 @@
isEnter: false, isTab: true, isEdit: true, isChecked: true
}" :mouse-config="{ selected: true }" @pulldownSelected="paintExpense_onPulldownSelected"
@popupSelected="paintExpense_onPopupSelected" :export-config="{}" @edit-closed="paintExpense_afterEditEvent"
@edit-actived="paintExpense_beforeEditEvent"
@edit-actived="paintExpense_beforeEditEvent"
:edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false, beforeEditMethod: paintExpense_beforeEditMethod }">
<vxe-column width="60" v-if="!isReadonly">
<template #default="{ row }">
@ -963,7 +964,7 @@ export default {
this.paintLabor_detailsData.push({});
}
for (let i = this.expense_detailsData.length; i < settings.table_min_count; i++) { //
this.expense_detailsData.push({});
}
@ -1239,7 +1240,7 @@ export default {
},
//
expense_onPulldownSelected({ row, name, params }) {
console.log(row, name, params);
@ -1370,7 +1371,7 @@ export default {
const $table = this.$refs.paintLabor_xTable;
this.paintLabor_detailsData.splice($table.getRowSeq(row) - 1, 1);
},
paintExpense_onPulldownSelected({ row, name, params }) {
console.log(row, name, params);
@ -1573,7 +1574,7 @@ export default {
},
//
ok() {
ok({ callback }) {
let save = () => {
@ -1609,7 +1610,7 @@ export default {
postdata.paintLaborList = postdata.paintLaborList.filter(item => item.labor && item.labor[1] ? true : false);
postdata.paintMaterialList = postdata.paintMaterialList.filter(item => item.material && item.material[1] ? true : false);
postdata.expense_list = postdata.expense_list.filter(item => item.item_name ? true : false);
postdata.paint_expenseList = postdata.paint_expenseList.filter(item => item.item_name ? true : false);
@ -1643,10 +1644,15 @@ export default {
data: postdata,
useBigInt: true,
}).then(() => { //
this.$mk.success("保存成功");
if (!this.isEdit) { //
this.back();
if (typeof (callback) == "function") {
callback();
} else {
this.$mk.success("保存成功");
if (!this.isEdit) { //
this.back();
}
}
}).catch((a) => { //
this.$mk.error(a.data.msg); //
});
@ -1705,8 +1711,19 @@ export default {
this.scheme_load();
},
previewScheme() {
let dataId = this.getDataId();
this.$openPage("/BathroomQuotation/BathroomQuotationUpdate/d" + dataId); //
this.ok({
callback: () => {
let dataId = this.getDataId();
let pageUrl = "/BathroomQuotation/BathroomQuotationUpdate/d" + dataId;
this.$closePage({
closeRoute: "/BathroomQuotation/BathroomQuotationUpdate"
});
this.$openPage(pageUrl); //
}
})
},
confirmSelectScheme() {
let row = this.$refs.scheme_grid.getCurrentRecord(); //

View File

@ -56,8 +56,8 @@ routerMap[FunName + 'Update']= {
path: `/${FunName}/${FunName}Update/:id`,
component: () => import(`@/pages/Middle/bathroom/BathroomQuotation/BathroomQuotation/Edit`),
meta: {
invisible: true,
},
invisible: true
},
authority: {
permission: [],
}