Mes
/
middle-admin-ant
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

报价

This commit is contained in:
xielue 2023-07-27 21:29:32 +08:00
parent dc6ab71a15
commit fca8ac3bc4
3 changed files with 34 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/application/mk/index.js
View File

@ -129,7 +129,7 @@ VXETable.formats.mixin({
if (!column.params) return ''; if (!column.params) return '';
for (let i = 0; i < column.params.length; i++) { for (let i = 0; i < column.params.length; i++) {
if (column.params[i].value == cellValue) { if (column.params[i].value == cellValue) {
return '<span>' + column.params[i].label + '</span>'; return '' + column.params[i].label + '';
} }
} }
return ''; return '';

26
src/pages/Middle/bathroom/BathroomQuotation/BathroomQuotation/Edit.vue
View File

@ -399,7 +399,7 @@
isEnter: false, isTab: true, isEdit: true, isChecked: true isEnter: false, isTab: true, isEdit: true, isChecked: true
}" :mouse-config="{ selected: true }" @pulldownSelected="material_onPulldownSelected" }" :mouse-config="{ selected: true }" @pulldownSelected="material_onPulldownSelected"
@popupSelected="material_onPopupSelected" :export-config="{}" @edit-closed="material_afterEditEvent" @popupSelected="material_onPopupSelected" :export-config="{}" @edit-closed="material_afterEditEvent"
show-footer :footer-method="material_footerMethod" :footer-cell-class-name="material_footerCellClassName" :footer-cell-class-name="material_footerCellClassName"
:edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false, beforeEditMethod: material_beforeEditMethod }"> :edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false, beforeEditMethod: material_beforeEditMethod }">
<vxe-column width="60" v-if="!isReadonly"> <vxe-column width="60" v-if="!isReadonly">
<template #default="{ row }"> <template #default="{ row }">
@ -464,7 +464,7 @@
isEnter: false, isTab: true, isEdit: true, isChecked: true isEnter: false, isTab: true, isEdit: true, isChecked: true
}" :mouse-config="{ selected: true }" @pulldownSelected="labor_onPulldownSelected" }" :mouse-config="{ selected: true }" @pulldownSelected="labor_onPulldownSelected"
@popupSelected="labor_onPopupSelected" :export-config="{}" @edit-closed="labor_afterEditEvent" @popupSelected="labor_onPopupSelected" :export-config="{}" @edit-closed="labor_afterEditEvent"
@edit-actived="labor_beforeEditEvent" show-footer :footer-method="labor_footerMethod" @edit-actived="labor_beforeEditEvent"
:footer-cell-class-name="labor_footerCellClassName" :footer-cell-class-name="labor_footerCellClassName"
:edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false, beforeEditMethod: labor_beforeEditMethod }"> :edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false, beforeEditMethod: labor_beforeEditMethod }">
<vxe-column width="60" v-if="!isReadonly"> <vxe-column width="60" v-if="!isReadonly">
@ -515,7 +515,8 @@
isEnter: false, isTab: true, isEdit: true, isChecked: true isEnter: false, isTab: true, isEdit: true, isChecked: true
}" :mouse-config="{ selected: true }" @pulldownSelected="expense_onPulldownSelected" }" :mouse-config="{ selected: true }" @pulldownSelected="expense_onPulldownSelected"
@popupSelected="expense_onPopupSelected" :export-config="{}" @edit-closed="expense_afterEditEvent" @popupSelected="expense_onPopupSelected" :export-config="{}" @edit-closed="expense_afterEditEvent"
@edit-actived="expense_beforeEditEvent" show-footer :footer-method="expense_footerMethod" @edit-actived="expense_beforeEditEvent"
:footer-cell-class-name="expense_footerCellClassName" :footer-cell-class-name="expense_footerCellClassName"
:edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false, beforeEditMethod: expense_beforeEditMethod }"> :edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false, beforeEditMethod: expense_beforeEditMethod }">
<vxe-column width="60" v-if="!isReadonly"> <vxe-column width="60" v-if="!isReadonly">
@ -569,7 +570,7 @@
isEnter: false, isTab: true, isEdit: true, isChecked: true isEnter: false, isTab: true, isEdit: true, isChecked: true
}" :mouse-config="{ selected: true }" @pulldownSelected="paintMaterial_onPulldownSelected" }" :mouse-config="{ selected: true }" @pulldownSelected="paintMaterial_onPulldownSelected"
@popupSelected="paintMaterial_onPopupSelected" :export-config="{}" @popupSelected="paintMaterial_onPopupSelected" :export-config="{}"
@edit-closed="paintMaterial_afterEditEvent" show-footer :footer-method="paintMaterial_footerMethod" @edit-closed="paintMaterial_afterEditEvent"
:footer-cell-class-name="paintMaterial_footerCellClassName" :footer-cell-class-name="paintMaterial_footerCellClassName"
:edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false, beforeEditMethod: paintMaterial_beforeEditMethod }"> :edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false, beforeEditMethod: paintMaterial_beforeEditMethod }">
<vxe-column width="60" v-if="!isReadonly"> <vxe-column width="60" v-if="!isReadonly">
@ -633,7 +634,7 @@
isEnter: false, isTab: true, isEdit: true, isChecked: true isEnter: false, isTab: true, isEdit: true, isChecked: true
}" :mouse-config="{ selected: true }" @pulldownSelected="paintLabor_onPulldownSelected" }" :mouse-config="{ selected: true }" @pulldownSelected="paintLabor_onPulldownSelected"
@popupSelected="paintLabor_onPopupSelected" :export-config="{}" @edit-closed="paintLabor_afterEditEvent" @popupSelected="paintLabor_onPopupSelected" :export-config="{}" @edit-closed="paintLabor_afterEditEvent"
@edit-actived="paintLabor_beforeEditEvent" show-footer :footer-method="paintLabor_footerMethod" @edit-actived="paintLabor_beforeEditEvent"
:footer-cell-class-name="paintLabor_footerCellClassName" :footer-cell-class-name="paintLabor_footerCellClassName"
:edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false, beforeEditMethod: paintLabor_beforeEditMethod }"> :edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false, beforeEditMethod: paintLabor_beforeEditMethod }">
<vxe-column width="60" v-if="!isReadonly"> <vxe-column width="60" v-if="!isReadonly">
@ -682,8 +683,8 @@
isEnter: false, isTab: true, isEdit: true, isChecked: true isEnter: false, isTab: true, isEdit: true, isChecked: true
}" :mouse-config="{ selected: true }" @pulldownSelected="paintExpense_onPulldownSelected" }" :mouse-config="{ selected: true }" @pulldownSelected="paintExpense_onPulldownSelected"
@popupSelected="paintExpense_onPopupSelected" :export-config="{}" @popupSelected="paintExpense_onPopupSelected" :export-config="{}"
@edit-closed="paintExpense_afterEditEvent" @edit-actived="paintExpense_beforeEditEvent" show-footer @edit-closed="paintExpense_afterEditEvent" @edit-actived="paintExpense_beforeEditEvent"
:footer-method="paintExpense_footerMethod" :footer-cell-class-name="paintExpense_footerCellClassName" :footer-cell-class-name="paintExpense_footerCellClassName"
:edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false, beforeEditMethod: paintExpense_beforeEditMethod }"> :edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false, beforeEditMethod: paintExpense_beforeEditMethod }">
<vxe-column width="60" v-if="!isReadonly"> <vxe-column width="60" v-if="!isReadonly">
<template #default="{ row }"> <template #default="{ row }">
@ -1089,8 +1090,8 @@ export default {
{ field: '报价日期', title: '报价日期', span: 12, itemRender: { name: '$input', props: { type: "date" } } }, { field: '报价日期', title: '报价日期', span: 12, itemRender: { name: '$input', props: { type: "date" } } },
{ field: '报价有效日期', title: '报价有效日期', span: 12, itemRender: { name: '$input', props: { type: "date" } } }, { field: '报价有效日期', title: '报价有效日期', span: 12, itemRender: { name: '$input', props: { type: "date" } } },
{ field: 'show_expense', title: '总费用(免漆)', span: 12, itemRender: { name: 'MkFormInputShow' } }, { field: 'show_expense', title: '总费用(免漆)', span: 12, itemRender: { name: '$input' } },
{ field: 'show_paint_expense', title: '总费用(油漆)', span: 12, itemRender: { name: 'MkFormInputShow' } }, { field: 'show_paint_expense', title: '总费用(油漆)', span: 12, itemRender: { name: '$input' } },
] ]
}, },
] ]
@ -1512,7 +1513,7 @@ export default {
this.tabKey = this.drawer_detailsData.length - 1; this.tabKey = this.drawer_detailsData.length - 1;
this.$forceUpdate(); // 强制更新 this.$forceUpdate(); // 强制更新
} else { //主柜 } else { //主柜 或者 镜柜
this.mainTabTitle = row.type == '1' ? '主柜' : '镜柜'; this.mainTabTitle = row.type == '1' ? '主柜' : '镜柜';
@ -2718,6 +2719,11 @@ export default {
let name = n.substr(1, n.length - 2); let name = n.substr(1, n.length - 2);
return this.getExpressionItemValue({ row, name, defaultValue }) return this.getExpressionItemValue({ row, name, defaultValue })
}); });
value = value.replace("/，/g",",");
value = value.replace("/？/g","?");
value = value.replace("/：/g",":");
eval("value = " + value) eval("value = " + value)
return value; return value;
} catch { } catch {

24
src/pages/Middle/bathroom/BathroomQuotation/BathroomQuotation/drawer.vue
View File

@ -338,7 +338,7 @@
isEnter: false, isTab: true, isEdit: true, isChecked: true isEnter: false, isTab: true, isEdit: true, isChecked: true
}" :mouse-config="{ selected: true }" @pulldownSelected="material_onPulldownSelected" }" :mouse-config="{ selected: true }" @pulldownSelected="material_onPulldownSelected"
@popupSelected="material_onPopupSelected" :export-config="{}" @edit-closed="material_afterEditEvent" @popupSelected="material_onPopupSelected" :export-config="{}" @edit-closed="material_afterEditEvent"
show-footer :footer-method="material_footerMethod" :footer-cell-class-name="material_footerCellClassName" :footer-cell-class-name="material_footerCellClassName"
:edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false, beforeEditMethod: material_beforeEditMethod }"> :edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false, beforeEditMethod: material_beforeEditMethod }">
<vxe-column width="60" v-if="!isReadonly"> <vxe-column width="60" v-if="!isReadonly">
<template #default="{ row }"> <template #default="{ row }">
@ -401,7 +401,7 @@
isEnter: false, isTab: true, isEdit: true, isChecked: true isEnter: false, isTab: true, isEdit: true, isChecked: true
}" :mouse-config="{ selected: true }" @pulldownSelected="labor_onPulldownSelected" }" :mouse-config="{ selected: true }" @pulldownSelected="labor_onPulldownSelected"
@popupSelected="labor_onPopupSelected" :export-config="{}" @edit-closed="labor_afterEditEvent" @popupSelected="labor_onPopupSelected" :export-config="{}" @edit-closed="labor_afterEditEvent"
@edit-actived="labor_beforeEditEvent" show-footer :footer-method="labor_footerMethod" @edit-actived="labor_beforeEditEvent"
:footer-cell-class-name="labor_footerCellClassName" :footer-cell-class-name="labor_footerCellClassName"
:edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false, beforeEditMethod: labor_beforeEditMethod }"> :edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false, beforeEditMethod: labor_beforeEditMethod }">
<vxe-column width="60" v-if="!isReadonly"> <vxe-column width="60" v-if="!isReadonly">
@ -450,7 +450,7 @@
isEnter: false, isTab: true, isEdit: true, isChecked: true isEnter: false, isTab: true, isEdit: true, isChecked: true
}" :mouse-config="{ selected: true }" @pulldownSelected="expense_onPulldownSelected" }" :mouse-config="{ selected: true }" @pulldownSelected="expense_onPulldownSelected"
@popupSelected="expense_onPopupSelected" :export-config="{}" @edit-closed="expense_afterEditEvent" @popupSelected="expense_onPopupSelected" :export-config="{}" @edit-closed="expense_afterEditEvent"
@edit-actived="expense_beforeEditEvent" show-footer :footer-method="expense_footerMethod" @edit-actived="expense_beforeEditEvent"
:footer-cell-class-name="expense_footerCellClassName" :footer-cell-class-name="expense_footerCellClassName"
:edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false, beforeEditMethod: expense_beforeEditMethod }"> :edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false, beforeEditMethod: expense_beforeEditMethod }">
<vxe-column width="60" v-if="!isReadonly"> <vxe-column width="60" v-if="!isReadonly">
@ -504,7 +504,7 @@
isEnter: false, isTab: true, isEdit: true, isChecked: true isEnter: false, isTab: true, isEdit: true, isChecked: true
}" :mouse-config="{ selected: true }" @pulldownSelected="paintMaterial_onPulldownSelected" }" :mouse-config="{ selected: true }" @pulldownSelected="paintMaterial_onPulldownSelected"
@popupSelected="paintMaterial_onPopupSelected" :export-config="{}" @edit-closed="paintMaterial_afterEditEvent" @popupSelected="paintMaterial_onPopupSelected" :export-config="{}" @edit-closed="paintMaterial_afterEditEvent"
show-footer :footer-method="paintMaterial_footerMethod"
:footer-cell-class-name="paintMaterial_footerCellClassName" :footer-cell-class-name="paintMaterial_footerCellClassName"
:edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false, beforeEditMethod: paintMaterial_beforeEditMethod }"> :edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false, beforeEditMethod: paintMaterial_beforeEditMethod }">
<vxe-column width="60" v-if="!isReadonly"> <vxe-column width="60" v-if="!isReadonly">
@ -568,7 +568,8 @@
isEnter: false, isTab: true, isEdit: true, isChecked: true isEnter: false, isTab: true, isEdit: true, isChecked: true
}" :mouse-config="{ selected: true }" @pulldownSelected="paintLabor_onPulldownSelected" }" :mouse-config="{ selected: true }" @pulldownSelected="paintLabor_onPulldownSelected"
@popupSelected="paintLabor_onPopupSelected" :export-config="{}" @edit-closed="paintLabor_afterEditEvent" @popupSelected="paintLabor_onPopupSelected" :export-config="{}" @edit-closed="paintLabor_afterEditEvent"
@edit-actived="paintLabor_beforeEditEvent" show-footer :footer-method="paintLabor_footerMethod" @edit-actived="paintLabor_beforeEditEvent"
:footer-cell-class-name="paintLabor_footerCellClassName" :footer-cell-class-name="paintLabor_footerCellClassName"
:edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false, beforeEditMethod: paintLabor_beforeEditMethod }"> :edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false, beforeEditMethod: paintLabor_beforeEditMethod }">
<vxe-column width="60" v-if="!isReadonly"> <vxe-column width="60" v-if="!isReadonly">
@ -617,7 +618,7 @@
isEnter: false, isTab: true, isEdit: true, isChecked: true isEnter: false, isTab: true, isEdit: true, isChecked: true
}" :mouse-config="{ selected: true }" @pulldownSelected="paintExpense_onPulldownSelected" }" :mouse-config="{ selected: true }" @pulldownSelected="paintExpense_onPulldownSelected"
@popupSelected="paintExpense_onPopupSelected" :export-config="{}" @edit-closed="paintExpense_afterEditEvent" @popupSelected="paintExpense_onPopupSelected" :export-config="{}" @edit-closed="paintExpense_afterEditEvent"
@edit-actived="paintExpense_beforeEditEvent" show-footer :footer-method="paintExpense_footerMethod" @edit-actived="paintExpense_beforeEditEvent"
:footer-cell-class-name="paintExpense_footerCellClassName" :footer-cell-class-name="paintExpense_footerCellClassName"
:edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false, beforeEditMethod: paintExpense_beforeEditMethod }"> :edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false, beforeEditMethod: paintExpense_beforeEditMethod }">
<vxe-column width="60" v-if="!isReadonly"> <vxe-column width="60" v-if="!isReadonly">
@ -877,8 +878,8 @@ export default {
{ field: 'name', title: '抽屉名', span: 6, itemRender: { name: '$input' } }, { field: 'name', title: '抽屉名', span: 6, itemRender: { name: '$input' } },
{ field: 'quantity', title: '数量', span: 6, itemRender: { name: '$input', props: { type: "number" }, events: { change: this.calculateAll } } }, { field: 'quantity', title: '数量', span: 6, itemRender: { name: '$input', props: { type: "number" }, events: { change: this.calculateAll } } },
{ field: 'show_expense', title: '单价(免漆)', span: 6, itemRender: { name: 'MkFormInputShow' } }, { field: 'show_expense', title: '单价(免漆)', span: 6, itemRender: { name: '$input' } },
{ field: 'show_paint_expense', title: '单价(油漆)', span: 6, itemRender: { name: 'MkFormInputShow' } }, { field: 'show_paint_expense', title: '单价(油漆)', span: 6, itemRender: { name: '$input' } },
{ field: 'long', title: '长', span: 6, itemRender: { name: '$input', events: { change: this.calculateAll } } }, { field: 'long', title: '长', span: 6, itemRender: { name: '$input', events: { change: this.calculateAll } } },
{ field: 'width', title: '宽', span: 6, itemRender: { name: '$input', events: { change: this.calculateAll } } }, { field: 'width', title: '宽', span: 6, itemRender: { name: '$input', events: { change: this.calculateAll } } },
@ -2032,6 +2033,10 @@ export default {
let name = n.substr(1, n.length - 2); let name = n.substr(1, n.length - 2);
return this.getExpressionItemValue({ row, name, defaultValue }) return this.getExpressionItemValue({ row, name, defaultValue })
}); });
value = value.replace("/，/g",",");
value = value.replace("/？/g","?");
value = value.replace("/：/g",":");
eval("value = " + value) eval("value = " + value)
return value; return value;
} catch { } catch {
@ -2078,6 +2083,8 @@ export default {
this.formOptions.data.show_expense = parseFloat(this.formOptions.data.expense || 0).toFixed(2); this.formOptions.data.show_expense = parseFloat(this.formOptions.data.expense || 0).toFixed(2);
this.formOptions.data.show_paint_expense = parseFloat(this.formOptions.data.paint_expense || 0).toFixed(2); this.formOptions.data.show_paint_expense = parseFloat(this.formOptions.data.paint_expense || 0).toFixed(2);
this.formOptions.data = JSON.parse(JSON.stringify(this.formOptions.data))
let postdata = this.item; let postdata = this.item;
@ -2121,7 +2128,6 @@ export default {
this.formatDetailsData(postdata.paint_expenseList); this.formatDetailsData(postdata.paint_expenseList);
this.$emit("update"); this.$emit("update");
}, },