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

成本汇总

This commit is contained in:
xielue 2023-12-18 15:52:05 +08:00
parent dc232af445
commit 5b192ab987
2 changed files with 174 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/pages/Middle/Mold/MoldProductionOrder/ComponentDetail.vue
View File

@ -3,8 +3,7 @@
<vxe-table border show-overflow keep-source ref="xTable" :data="detailsData" @pulldownSelected="onPulldownSelected"
@popupSelected="onPopupSelected" :export-config="{}" @edit-closed="afterEditEvent"
@edit-actived="beforeEditEvent"
@popupSelected="onPopupSelected" :export-config="{}" @edit-closed="afterEditEvent" @edit-actived="beforeEditEvent"
:edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false, beforeEditMethod: beforeEditMethod }">
<vxe-column title="图片" width="120" align="center">
<template #default="{ row }">
@ -123,8 +122,7 @@
<vxe-column v-if="false" field="process_uid_detail" title="加工人员" width="160" :params="editor_process_uid"
formatter="formatRef" :edit-render="{ name: 'MkGridDataSelector' }"></vxe-column>
<vxe-column field="progress" v-if="isEdit" :cellRender="{ name: 'progress' }" title="进度"
width="100"></vxe-column>
<vxe-column field="progress" v-if="isEdit" :cellRender="{ name: 'progress' }" title="进度" width="100"></vxe-column>
<vxe-column field="prepare_process_time" title="预备加工日期" width="130" formatter="formatDate" align="center"
:edit-render="{ name: '$input', props: { type: 'date' } }"></vxe-column>
@ -138,8 +136,7 @@
<a-button v-if="!row.is_send" @click.stop="pageSend(row)" type="primary">发料</a-button>
<div v-if="row.is_send">
<a-tooltip placement="topLeft" :title="'发料时间：'+$mk.getDateString(row.send_time)"
arrow-point-at-center>
<a-tooltip placement="topLeft" :title="'发料时间：' + $mk.getDateString(row.send_time)" arrow-point-at-center>
<a-button v-if="!isComponentDone() && !row.is_complete" @click.stop="pageSend(row, true)">撤销
</a-button>
</a-tooltip>
@ -155,8 +152,7 @@
<a-button v-if="!row.is_complete" @click.stop="pageDone(row)" type="primary">完成</a-button>
</a-tooltip>
<div v-if="row.is_complete">
<a-tooltip placement="topLeft"
arrow-point-at-center>
<a-tooltip placement="topLeft" arrow-point-at-center>
<template #title>
{{ row.send_time ? '发料时间：' + $mk.getDateString(row.send_time) : '' }}
<br />
@ -685,7 +681,10 @@ export default {
this.postDataUpdate();
if (column.field == "processing_cost") { // 如果编辑的字段是加工成本
this.$emit("updateData");
}
},
afterEditEvent2({ column, row }) { // 编辑后事件
console.log(column, row);
@ -699,10 +698,14 @@ export default {
this.detailsData.forEach(item => { // 遍历所有的行
item.processing_cost = processing_cost; // 设置每一行的加工成本
})
this.$forceUpdate();
}
this.postDataUpdate();
if (column.field == "processing_cost") { // 如果编辑的字段是加工成本
this.$emit("updateData");
}
},
beforeEditEvent({ column, row }) {
@ -810,7 +813,8 @@ export default {
}
.imgicons {
display: none;;
display: none;
;
}
.imgbox:hover .imgicons {

29
src/pages/Middle/Mold/MoldProductionOrder/Edit.vue
View File

@ -33,8 +33,8 @@
<a-collapse-panel v-for="(info, index) in infos" :key="info.key" :header="info.header">
<a-icon slot="extra" type="delete" @click.stop="removeInfo(index)" />
<component-detail ref="componentDetail" :dataId="getDataId()" :itemData="info.data"
@reloadData="pageInit"></component-detail>
<component-detail ref="componentDetail" :dataId="getDataId()" :itemData="info.data" @reloadData="pageInit"
@updateData="pageUpdateData"></component-detail>
</a-collapse-panel>
</a-collapse>
@ -59,8 +59,7 @@
总成本：{{ ProcessingCost }} 元
</h3>
<vxe-form :data="formOptions2.data" ref="xForm2" :title-width="formOptions2.titleWidth"
:title-align="formOptions2.titleAlign" :rules="formOptions2.rules" :items="formOptions2.items"
>
:title-align="formOptions2.titleAlign" :rules="formOptions2.rules" :items="formOptions2.items">
</vxe-form>
@ -520,6 +519,28 @@ export default {
},
pageUpdateData() {
console.log(this.infos);
let processing_cost = 0;
this.infos.forEach(info => {
let list = [];
let postdata = info.data.postdata.mold_production_order_component;
if (postdata.updateList) {
list = [...postdata.insertList, ...postdata.updateList];
} else {
list = postdata;
}
list.forEach(item => {
processing_cost += parseFloat(item.processing_cost || 0)
})
})
this.ProcessingCost = processing_cost;
},
initComponentDetail() {