成本汇总
This commit is contained in:
parent
dc232af445
commit
5b192ab987
|
|
@ -3,24 +3,23 @@
|
|||
|
||||
|
||||
<vxe-table border show-overflow keep-source ref="xTable" :data="detailsData" @pulldownSelected="onPulldownSelected"
|
||||
@popupSelected="onPopupSelected" :export-config="{}" @edit-closed="afterEditEvent"
|
||||
@edit-actived="beforeEditEvent"
|
||||
:edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false, beforeEditMethod: beforeEditMethod }">
|
||||
@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 }">
|
||||
<div v-if="row.component_img" style="position: relative;" class="imgbox">
|
||||
<img style="width:50px;height:50px;" :src="row.component_img"
|
||||
@click.stop="$hevueImgPreview(row.component_img)"/>
|
||||
@click.stop="$hevueImgPreview(row.component_img)" />
|
||||
<div class="imgicons" style="position:absolute;right:0px;top:0px;">
|
||||
<div>
|
||||
<a @click="imgDel({ row })">
|
||||
<a-icon type="close-circle"/>
|
||||
<a-icon type="close-circle" />
|
||||
</a>
|
||||
</div>
|
||||
<div>
|
||||
<a-upload name="file" accept="image/*" :before-upload="beforeUpload" :show-upload-list="false">
|
||||
<a @click="uploadClick({ row })">
|
||||
<a-icon type="edit"/>
|
||||
<a-icon type="edit" />
|
||||
</a>
|
||||
</a-upload>
|
||||
</div>
|
||||
|
|
@ -38,7 +37,7 @@
|
|||
</vxe-column>
|
||||
|
||||
<vxe-column field="component_num" title="数量" width="70" align="center"
|
||||
:edit-render="{ name: '$input', props: { type: 'number' } }"></vxe-column>
|
||||
:edit-render="{ name: '$input', props: { type: 'number' } }"></vxe-column>
|
||||
<vxe-column field="production_type" title="布产类型" width="100" align="center" :edit-render="{}">
|
||||
<template #default="{ row }">
|
||||
<span>{{ $mk.formatEnum(row.production_type, options_production_type) }}</span>
|
||||
|
|
@ -46,32 +45,32 @@
|
|||
<template #edit="{ row }">
|
||||
<vxe-select v-model="row.production_type" transfer>
|
||||
<vxe-option v-for="item in options_production_type" :key="item.value" :value="item.value"
|
||||
:label="item.label"></vxe-option>
|
||||
:label="item.label"></vxe-option>
|
||||
</vxe-select>
|
||||
</template>
|
||||
</vxe-column>
|
||||
|
||||
<vxe-column v-if="false" field="process_detail" title="加工人员" width="160" :params="editor_d1_process"
|
||||
formatter="formatRef" :edit-render="{ name: 'MkGridDataSelector' }"></vxe-column>
|
||||
formatter="formatRef" :edit-render="{ name: 'MkGridDataSelector' }"></vxe-column>
|
||||
|
||||
|
||||
<vxe-column field="prepare_process_time" title="预备加工日期" width="130" formatter="formatDate" align="center"
|
||||
:edit-render="{ name: '$input', props: { type: 'date' } }"></vxe-column>
|
||||
:edit-render="{ name: '$input', props: { type: 'date' } }"></vxe-column>
|
||||
<vxe-column field="plan_complete_time" title="计划完成日期" width="130" formatter="formatDate" align="center"
|
||||
:edit-render="{ name: '$input', props: { type: 'date' } }"></vxe-column>
|
||||
:edit-render="{ name: '$input', props: { type: 'date' } }"></vxe-column>
|
||||
|
||||
|
||||
<vxe-column title="完成" width="100" align="center" v-if="getDataId()">
|
||||
<template #default="{ row }">
|
||||
<div v-if="row.id">
|
||||
<div v-if="row.complete_time">
|
||||
<a-tooltip placement="topLeft" :title="'完成时间：'+$mk.getDateString(row.complete_time)"
|
||||
arrow-point-at-center>
|
||||
<a-tooltip placement="topLeft" :title="'完成时间：' + $mk.getDateString(row.complete_time)"
|
||||
arrow-point-at-center>
|
||||
{{ $mk.getDate(row.complete_time) }}
|
||||
</a-tooltip>
|
||||
</div>
|
||||
<a-button v-else :disabled="!(isComponentOutProduct() || pageIsComplete())" @click.stop="pageComplete(row)"
|
||||
type="primary">完成
|
||||
type="primary">完成
|
||||
</a-button>
|
||||
</div>
|
||||
</template>
|
||||
|
|
@ -83,53 +82,52 @@
|
|||
|
||||
|
||||
<vxe-column field="spec" title="规格" align="center" width="140"
|
||||
:edit-render="{ name: '$input', props: {} }"></vxe-column>
|
||||
:edit-render="{ name: '$input', props: {} }"></vxe-column>
|
||||
<vxe-column field="surface" title="表面工艺" align="center" width="140"
|
||||
:edit-render="{ name: '$input', props: {} }"></vxe-column>
|
||||
:edit-render="{ name: '$input', props: {} }"></vxe-column>
|
||||
<vxe-column field="inlay" title="镶件材料" align="center" width="140"
|
||||
:edit-render="{ name: '$input', props: {} }"></vxe-column>
|
||||
:edit-render="{ name: '$input', props: {} }"></vxe-column>
|
||||
|
||||
<vxe-column field="processing_cost" title="成本价" align="center" width="auto"
|
||||
:edit-render="{ name: '$input', props: {type: 'number' } }"></vxe-column>
|
||||
:edit-render="{ name: '$input', props: { type: 'number' } }"></vxe-column>
|
||||
<vxe-column field="remark" title="备注" align="center" width="auto"
|
||||
:edit-render="{ name: '$input', props: {} }"></vxe-column>
|
||||
:edit-render="{ name: '$input', props: {} }"></vxe-column>
|
||||
|
||||
|
||||
</vxe-table>
|
||||
|
||||
<vxe-table v-if="!isComponentOutProduct()" border show-overflow keep-source ref="xTable2" :data="detailsData2"
|
||||
@pulldownSelected="onPulldownSelected" @popupSelected="onPopupSelected" :export-config="{}"
|
||||
@edit-closed="afterEditEvent2" @edit-actived="beforeEditEvent"
|
||||
:edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false, beforeEditMethod: beforeEditMethod }">
|
||||
@pulldownSelected="onPulldownSelected" @popupSelected="onPopupSelected" :export-config="{}"
|
||||
@edit-closed="afterEditEvent2" @edit-actived="beforeEditEvent"
|
||||
:edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false, beforeEditMethod: beforeEditMethod }">
|
||||
<vxe-column width="60" v-if="!readonly">
|
||||
<template #default="{ row }">
|
||||
<div class="oplinks2">
|
||||
<a @click.stop="pageAdd2(row)" title="新增">
|
||||
<a-icon class="icon" type="plus-circle"/>
|
||||
<a-icon class="icon" type="plus-circle" />
|
||||
</a>
|
||||
<a @click.stop="pageDelete2(row)" title="删除">
|
||||
<a-icon class="icon" type="delete"/>
|
||||
<a-icon class="icon" type="delete" />
|
||||
</a>
|
||||
</div>
|
||||
</template>
|
||||
</vxe-column>
|
||||
<vxe-column field="process_detail" title="工序" width="130" :params="editor_processes" formatter="formatRef"
|
||||
:edit-render="{ name: 'MkGridDataSelector' }"></vxe-column>
|
||||
:edit-render="{ name: 'MkGridDataSelector' }"></vxe-column>
|
||||
<vxe-column field="department_detail" title="部门" width="120" :params="editor_department" formatter="formatRef"
|
||||
:edit-render="{ name: 'MkGridDataSelector' }"></vxe-column>
|
||||
:edit-render="{ name: 'MkGridDataSelector' }"></vxe-column>
|
||||
<vxe-column field="progress" title="进度" width="120" :cellRender="{ name: 'progress' }"></vxe-column>
|
||||
|
||||
|
||||
<vxe-column v-if="false" field="process_uid_detail" title="加工人员" width="160" :params="editor_process_uid"
|
||||
formatter="formatRef" :edit-render="{ name: 'MkGridDataSelector' }"></vxe-column>
|
||||
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>
|
||||
:edit-render="{ name: '$input', props: { type: 'date' } }"></vxe-column>
|
||||
<vxe-column field="plan_complete_time" title="计划完成日期" width="130" formatter="formatDate" align="center"
|
||||
:edit-render="{ name: '$input', props: { type: 'date' } }"></vxe-column>
|
||||
:edit-render="{ name: '$input', props: { type: 'date' } }"></vxe-column>
|
||||
|
||||
|
||||
<vxe-column title="发料" width="100" align="center" v-if="getDataId()">
|
||||
|
|
@ -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>
|
||||
|
|
@ -151,15 +148,14 @@
|
|||
<vxe-column title="完成" width="100" align="center" v-if="getDataId()">
|
||||
<template #default="{ row }">
|
||||
<div v-if="row.id && 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="!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/>
|
||||
<br />
|
||||
{{ row.complete_time ? '完成时间：' + $mk.getDateString(row.complete_time) : '' }}
|
||||
</template>
|
||||
<a-button v-if="!isComponentDone()" @click.stop="pageDone(row, true)">撤销</a-button>
|
||||
|
|
@ -170,14 +166,14 @@
|
|||
</vxe-column>
|
||||
|
||||
<vxe-column field="send_type" v-if="getDataId() && readonly" title="发料人员" width="80" align="center"
|
||||
:params="{ data: options_user_type }" formatter='formatEnum'></vxe-column>
|
||||
:params="{ data: options_user_type }" formatter='formatEnum'></vxe-column>
|
||||
|
||||
|
||||
<vxe-column field="complete_type" v-if="getDataId() && readonly" title="完工人员" width="80" align="center"
|
||||
:params="{ data: options_user_type }" formatter='formatEnum'></vxe-column>
|
||||
:params="{ data: options_user_type }" formatter='formatEnum'></vxe-column>
|
||||
|
||||
<vxe-column field="processing_cost" title="加工成本(元)" width="130"
|
||||
:edit-render="{ name: '$input', props: {type: 'number' } }"></vxe-column>
|
||||
:edit-render="{ name: '$input', props: { type: 'number' } }"></vxe-column>
|
||||
<vxe-column field="remark" title="备注" width="auto" :edit-render="{ name: '$input', props: {} }"></vxe-column>
|
||||
|
||||
|
||||
|
|
@ -264,7 +260,7 @@ export default {
|
|||
textField: "name",
|
||||
listdataFieldName: 'MoldComponent',
|
||||
mapper: [
|
||||
{fromField: "id", field: "component_id"}
|
||||
{ fromField: "id", field: "component_id" }
|
||||
],
|
||||
dataUrl: `${BASE_URL.BASE_URL}/MoldComponent/v1/mold/component/list`
|
||||
},
|
||||
|
|
@ -274,7 +270,7 @@ export default {
|
|||
textField: "name",
|
||||
listdataFieldName: 'BaseDepartment',
|
||||
mapper: [
|
||||
{fromField: "id", field: "department_id"}
|
||||
{ fromField: "id", field: "department_id" }
|
||||
],
|
||||
dataUrl: `${BASE_URL.BASE_URL}/BaseDepartment/v1/base/department/list`
|
||||
},
|
||||
|
|
@ -285,7 +281,7 @@ export default {
|
|||
textField: "name",
|
||||
listdataFieldName: 'MesProcesses',
|
||||
mapper: [
|
||||
{fromField: "id", field: "process_id"}
|
||||
{ fromField: "id", field: "process_id" }
|
||||
],
|
||||
dataUrl: `${BASE_URL.BASE_URL}/MesProcesses/v1/mes/processes/list`
|
||||
},
|
||||
|
|
@ -296,7 +292,7 @@ export default {
|
|||
textField: "name",
|
||||
listdataFieldName: 'MesStaff',
|
||||
mapper: [
|
||||
{fromField: "id", field: "process_uid"}
|
||||
{ fromField: "id", field: "process_uid" }
|
||||
],
|
||||
dataUrl: `${BASE_URL.BASE_URL}/MesStaff/v1/mes/staff/list`
|
||||
},
|
||||
|
|
@ -306,7 +302,7 @@ export default {
|
|||
textField: "name",
|
||||
listdataFieldName: 'MesStaff',
|
||||
mapper: [
|
||||
{fromField: "id", field: "send_uid"}
|
||||
{ fromField: "id", field: "send_uid" }
|
||||
],
|
||||
dataUrl: `${BASE_URL.BASE_URL}/MesStaff/v1/mes/staff/list`
|
||||
},
|
||||
|
|
@ -316,7 +312,7 @@ export default {
|
|||
textField: "name",
|
||||
listdataFieldName: 'MesStaff',
|
||||
mapper: [
|
||||
{fromField: "id", field: "process_uid"}
|
||||
{ fromField: "id", field: "process_uid" }
|
||||
],
|
||||
dataUrl: `${BASE_URL.BASE_URL}/MesStaff/v1/mes/staff/list`
|
||||
},
|
||||
|
|
@ -495,8 +491,8 @@ export default {
|
|||
if (type == 'confirm') {
|
||||
this.$mk.post({
|
||||
url: isUndo ?
|
||||
`${BASE_URL.BASE_URL}/MoldProductionOrder/v1/mold/production/order/component/processes/CancelReporting` :
|
||||
`${BASE_URL.BASE_URL}/MoldProductionOrder/v1/mold/production/order/component/processes/Reporting`,
|
||||
`${BASE_URL.BASE_URL}/MoldProductionOrder/v1/mold/production/order/component/processes/CancelReporting` :
|
||||
`${BASE_URL.BASE_URL}/MoldProductionOrder/v1/mold/production/order/component/processes/Reporting`,
|
||||
data: {
|
||||
id: this.$mk.toBigInt(row.id)
|
||||
},
|
||||
|
|
@ -519,8 +515,8 @@ export default {
|
|||
if (type == 'confirm') {
|
||||
this.$mk.post({
|
||||
url: isUndo ?
|
||||
`${BASE_URL.BASE_URL}/MoldProductionOrder/v1/mold/production/order/component/processes/CancelSendMaterial` :
|
||||
`${BASE_URL.BASE_URL}/MoldProductionOrder/v1/mold/production/order/component/processes/SendMaterial`,
|
||||
`${BASE_URL.BASE_URL}/MoldProductionOrder/v1/mold/production/order/component/processes/CancelSendMaterial` :
|
||||
`${BASE_URL.BASE_URL}/MoldProductionOrder/v1/mold/production/order/component/processes/SendMaterial`,
|
||||
data: {
|
||||
id: this.$mk.toBigInt(row.id)
|
||||
},
|
||||
|
|
@ -606,23 +602,23 @@ export default {
|
|||
deletedList: this.deletedDetailsData,
|
||||
fieldName: 'production_id',
|
||||
dataRule: [
|
||||
{field: 'production_type', type: 'integer'},
|
||||
{field: 'component_num', type: 'integer'},
|
||||
{field: 'prepare_process_time', type: 'timestamp'},
|
||||
{field: 'plan_complete_time', type: 'timestamp'},
|
||||
{ field: 'production_type', type: 'integer' },
|
||||
{ field: 'component_num', type: 'integer' },
|
||||
{ field: 'prepare_process_time', type: 'timestamp' },
|
||||
{ field: 'plan_complete_time', type: 'timestamp' },
|
||||
|
||||
{field: 'order_id', type: 'bigint'},
|
||||
{field: 'id', type: 'bigint'},
|
||||
{field: 'update_uid', type: 'bigint'},
|
||||
{field: 'complete_uid', type: 'bigint'},
|
||||
{field: 'create_uid', type: 'bigint'},
|
||||
{field: 'mold_id', type: 'bigint'},
|
||||
{field: 'component_id', type: 'bigint'},
|
||||
{field: 'process_uid', type: 'bigint'},
|
||||
{field: 'send_uid', type: 'bigint'},
|
||||
{field: 'process_id', type: 'bigint'},
|
||||
{field: 'purchase_cost', type: 'bigint'},
|
||||
{field: 'processing_cost', type: 'bigint'},
|
||||
{ field: 'order_id', type: 'bigint' },
|
||||
{ field: 'id', type: 'bigint' },
|
||||
{ field: 'update_uid', type: 'bigint' },
|
||||
{ field: 'complete_uid', type: 'bigint' },
|
||||
{ field: 'create_uid', type: 'bigint' },
|
||||
{ field: 'mold_id', type: 'bigint' },
|
||||
{ field: 'component_id', type: 'bigint' },
|
||||
{ field: 'process_uid', type: 'bigint' },
|
||||
{ field: 'send_uid', type: 'bigint' },
|
||||
{ field: 'process_id', type: 'bigint' },
|
||||
{ field: 'purchase_cost', type: 'bigint' },
|
||||
{ field: 'processing_cost', type: 'bigint' },
|
||||
]
|
||||
});
|
||||
|
||||
|
|
@ -649,22 +645,22 @@ export default {
|
|||
fieldName: 'production_id',
|
||||
dataRule: [
|
||||
|
||||
{field: 'id', type: 'bigint'},
|
||||
{field: 'prepare_process_time', type: 'timestamp'},
|
||||
{field: 'plan_complete_time', type: 'timestamp'},
|
||||
{ field: 'id', type: 'bigint' },
|
||||
{ field: 'prepare_process_time', type: 'timestamp' },
|
||||
{ field: 'plan_complete_time', type: 'timestamp' },
|
||||
|
||||
|
||||
{field: 'order_id', type: 'bigint'},
|
||||
{field: 'send_uid', type: 'bigint'},
|
||||
{field: 'complete_uid', type: 'bigint'},
|
||||
{field: 'update_uid', type: 'bigint'},
|
||||
{field: 'create_uid', type: 'bigint'},
|
||||
{field: 'component_id', type: 'bigint'},
|
||||
{field: 'department_id', type: 'bigint'},
|
||||
{field: 'process_id', type: 'bigint'},
|
||||
{field: 'process_uid', type: 'bigint'},
|
||||
{field: 'purchase_cost', type: 'bigint'},
|
||||
{field: 'processing_cost', type: 'bigint'},
|
||||
{ field: 'order_id', type: 'bigint' },
|
||||
{ field: 'send_uid', type: 'bigint' },
|
||||
{ field: 'complete_uid', type: 'bigint' },
|
||||
{ field: 'update_uid', type: 'bigint' },
|
||||
{ field: 'create_uid', type: 'bigint' },
|
||||
{ field: 'component_id', type: 'bigint' },
|
||||
{ field: 'department_id', type: 'bigint' },
|
||||
{ field: 'process_id', type: 'bigint' },
|
||||
{ field: 'process_uid', type: 'bigint' },
|
||||
{ field: 'purchase_cost', type: 'bigint' },
|
||||
{ field: 'processing_cost', type: 'bigint' },
|
||||
]
|
||||
});
|
||||
}
|
||||
|
|
@ -673,21 +669,24 @@ export default {
|
|||
this.itemData.postdata = postdata;
|
||||
},
|
||||
|
||||
beforeEditMethod({column, row}) {
|
||||
beforeEditMethod({ column, row }) {
|
||||
if (this.readonly) {
|
||||
return false;
|
||||
}
|
||||
console.log(column, row);
|
||||
return true;
|
||||
},
|
||||
afterEditEvent({column, row}) {
|
||||
afterEditEvent({ column, row }) {
|
||||
console.log(column, row);
|
||||
|
||||
this.postDataUpdate();
|
||||
|
||||
if (column.field == "processing_cost") { // 如果编辑的字段是加工成本
|
||||
|
||||
this.$emit("updateData");
|
||||
}
|
||||
},
|
||||
afterEditEvent2({column, row}) { // 编辑后事件
|
||||
afterEditEvent2({ column, row }) { // 编辑后事件
|
||||
console.log(column, row);
|
||||
|
||||
if (column.field == "processing_cost") { // 如果编辑的字段是加工成本
|
||||
|
|
@ -699,19 +698,23 @@ 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}) {
|
||||
beforeEditEvent({ column, row }) {
|
||||
console.log(column, row);
|
||||
if (this.readonly) {
|
||||
return false;
|
||||
}
|
||||
},
|
||||
onPulldownSelected({row, selectedData, column}) {
|
||||
onPulldownSelected({ row, selectedData, column }) {
|
||||
console.log(selectedData);
|
||||
|
||||
|
||||
|
|
@ -720,7 +723,7 @@ export default {
|
|||
row.department_id = selectedData.department_id;
|
||||
}
|
||||
},
|
||||
onPopupSelected({rows, name, params}) {
|
||||
onPopupSelected({ rows, name, params }) {
|
||||
console.log(rows, name, params);
|
||||
},
|
||||
|
||||
|
|
@ -734,7 +737,7 @@ export default {
|
|||
if (this.currentRow.id) {
|
||||
this.$mk.post({
|
||||
url: `${BASE_URL.BASE_URL}/MoldProductionOrder/v1/mold/production/order/upload`,
|
||||
data: {id: this.currentRow.id, image: url},
|
||||
data: { id: this.currentRow.id, image: url },
|
||||
useBigInt: true
|
||||
}).then(a => {
|
||||
console.log(a);
|
||||
|
|
@ -745,12 +748,12 @@ export default {
|
|||
return false
|
||||
},
|
||||
|
||||
imgDel({row}) {
|
||||
imgDel({ row }) {
|
||||
|
||||
row.component_img = "";
|
||||
this.$mk.post({
|
||||
url: `${BASE_URL.BASE_URL}/MoldProductionOrder/v1/mold/production/order/upload`,
|
||||
data: {id: row.id, image: ""},
|
||||
data: { id: row.id, image: "" },
|
||||
useBigInt: true
|
||||
}).then(a => {
|
||||
console.log(a);
|
||||
|
|
@ -758,7 +761,7 @@ export default {
|
|||
},
|
||||
|
||||
|
||||
uploadClick({row}) {
|
||||
uploadClick({ row }) {
|
||||
this.currentRow = row;
|
||||
}
|
||||
|
||||
|
|
@ -810,7 +813,8 @@ export default {
|
|||
}
|
||||
|
||||
.imgicons {
|
||||
display: none;;
|
||||
display: none;
|
||||
;
|
||||
}
|
||||
|
||||
.imgbox:hover .imgicons {
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
<a-button v-if="!getDataId()" @click="pageSelectOrder" :disabled="pageStatus == 'approved'">选择订单</a-button>
|
||||
<a-button type="primary" @click="ok" :disabled="pageStatus == 'approved'">保存</a-button>
|
||||
<a-button v-if="false" @click="pageApproved" type="primary"
|
||||
:disabled="!this.getDataId() || pageStatus == 'approved'">审批
|
||||
:disabled="!this.getDataId() || pageStatus == 'approved'">审批
|
||||
</a-button>
|
||||
|
||||
<a-button @click="back">关闭</a-button>
|
||||
|
|
@ -19,7 +19,7 @@
|
|||
</div>
|
||||
|
||||
<vxe-form :data="formOptions.data" ref="xForm" :title-width="formOptions.titleWidth"
|
||||
:title-align="formOptions.titleAlign" :rules="formOptions.rules" :items="formOptions.items" titleColon>
|
||||
:title-align="formOptions.titleAlign" :rules="formOptions.rules" :items="formOptions.items" titleColon>
|
||||
</vxe-form>
|
||||
|
||||
<a-tabs>
|
||||
|
|
@ -32,9 +32,9 @@
|
|||
|
||||
<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>
|
||||
<a-icon slot="extra" type="delete" @click.stop="removeInfo(index)" />
|
||||
<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>
|
||||
|
||||
|
||||
|
|
@ -83,7 +82,7 @@ const settings = require('../basic/settings.js');
|
|||
export default {
|
||||
|
||||
name: '',
|
||||
components: {ComponentDetail},
|
||||
components: { ComponentDetail },
|
||||
props: {
|
||||
pageMode: {
|
||||
type: String,
|
||||
|
|
@ -145,13 +144,13 @@ export default {
|
|||
// 表单校验规则
|
||||
rules: {
|
||||
code: [
|
||||
{required: true, message: '请输入编号'}
|
||||
{ required: true, message: '请输入编号' }
|
||||
],
|
||||
mold_order: [
|
||||
{required: true, message: '请选择订单'}
|
||||
{ required: true, message: '请选择订单' }
|
||||
],
|
||||
mold_detail: [
|
||||
{required: true, message: '请选择模具'}
|
||||
{ required: true, message: '请选择模具' }
|
||||
],
|
||||
},
|
||||
// 表单项
|
||||
|
|
@ -182,86 +181,86 @@ export default {
|
|||
}
|
||||
}
|
||||
},
|
||||
{field: 'code', title: '编号', span: 6, itemRender: {name: '$input'}},
|
||||
{ field: 'code', title: '编号', span: 6, itemRender: { name: '$input' } },
|
||||
|
||||
{
|
||||
field: 'production_type',
|
||||
dataRule: {type: 'integer'},
|
||||
dataRule: { type: 'integer' },
|
||||
title: '布产类型',
|
||||
span: 6,
|
||||
itemRender: {name: '$select', props: {options: options_production_type}}
|
||||
itemRender: { name: '$select', props: { options: options_production_type } }
|
||||
},
|
||||
|
||||
|
||||
{field: 'rubber', title: '胶件材质/缩水', span: 6, itemRender: {name: '$input'}},
|
||||
{field: 'hole', title: '模具穴数', span: 6, itemRender: {name: '$input'}},
|
||||
{field: 'water', title: '入水口类型/位置', span: 6, itemRender: {name: '$input'}},
|
||||
{ field: 'rubber', title: '胶件材质/缩水', span: 6, itemRender: { name: '$input' } },
|
||||
{ field: 'hole', title: '模具穴数', span: 6, itemRender: { name: '$input' } },
|
||||
{ field: 'water', title: '入水口类型/位置', span: 6, itemRender: { name: '$input' } },
|
||||
|
||||
|
||||
{
|
||||
field: 'manufacture_cycle',
|
||||
dataRule: {type: 'timestamp'},
|
||||
dataRule: { type: 'timestamp' },
|
||||
title: '制作周期',
|
||||
span: 6,
|
||||
itemRender: {name: '$input', props: {type: 'date'}}
|
||||
itemRender: { name: '$input', props: { type: 'date' } }
|
||||
},
|
||||
{
|
||||
field: 'draw_start_time',
|
||||
dataRule: {type: 'timestamp'},
|
||||
dataRule: { type: 'timestamp' },
|
||||
title: '预计开始画图时间',
|
||||
span: 6,
|
||||
itemRender: {name: '$input', props: {type: 'date'}}
|
||||
itemRender: { name: '$input', props: { type: 'date' } }
|
||||
},
|
||||
{
|
||||
field: 'split_design_time',
|
||||
dataRule: {type: 'timestamp'},
|
||||
dataRule: { type: 'timestamp' },
|
||||
title: '分模设计时间预计',
|
||||
span: 6,
|
||||
itemRender: {name: '$input', props: {type: 'date'}}
|
||||
itemRender: { name: '$input', props: { type: 'date' } }
|
||||
},
|
||||
{
|
||||
field: 'draw_time',
|
||||
dataRule: {type: 'timestamp'},
|
||||
dataRule: { type: 'timestamp' },
|
||||
title: '出图时间预计',
|
||||
span: 6,
|
||||
itemRender: {name: '$input', props: {type: 'date'}}
|
||||
itemRender: { name: '$input', props: { type: 'date' } }
|
||||
},
|
||||
|
||||
{
|
||||
field: 'draw2D_time',
|
||||
dataRule: {type: 'timestamp'},
|
||||
dataRule: { type: 'timestamp' },
|
||||
title: '出2D时间预计',
|
||||
span: 6,
|
||||
itemRender: {name: '$input', props: {type: 'date'}}
|
||||
itemRender: { name: '$input', props: { type: 'date' } }
|
||||
},
|
||||
{
|
||||
field: 'draw3D_time',
|
||||
dataRule: {type: 'timestamp'},
|
||||
dataRule: { type: 'timestamp' },
|
||||
title: '出3D时间预计',
|
||||
span: 6,
|
||||
itemRender: {name: '$input', props: {type: 'date'}}
|
||||
itemRender: { name: '$input', props: { type: 'date' } }
|
||||
},
|
||||
{
|
||||
field: 'inlay_deep_hole_time',
|
||||
dataRule: {type: 'timestamp'},
|
||||
dataRule: { type: 'timestamp' },
|
||||
title: '镶件深孔钻到厂日期预计',
|
||||
span: 6,
|
||||
itemRender: {name: '$input', props: {type: 'date'}}
|
||||
itemRender: { name: '$input', props: { type: 'date' } }
|
||||
},
|
||||
{
|
||||
field: 'horizontal_frame_time',
|
||||
dataRule: {type: 'timestamp'},
|
||||
dataRule: { type: 'timestamp' },
|
||||
title: '横架到厂日期预计',
|
||||
span: 6,
|
||||
itemRender: {name: '$input', props: {type: 'date'}}
|
||||
itemRender: { name: '$input', props: { type: 'date' } }
|
||||
},
|
||||
|
||||
{
|
||||
field: 'complete_time',
|
||||
dataRule: {type: 'timestamp'},
|
||||
dataRule: { type: 'timestamp' },
|
||||
title: '要求完成时间',
|
||||
span: 6,
|
||||
itemRender: {name: '$input', props: {type: 'date'}}
|
||||
itemRender: { name: '$input', props: { type: 'date' } }
|
||||
},
|
||||
{
|
||||
title: '模具师傅', span: 6,
|
||||
|
|
@ -312,7 +311,7 @@ export default {
|
|||
}
|
||||
}
|
||||
},
|
||||
{field: 'customer_name', title: '客户名称', span: 6, itemRender: {name: '$input'}},
|
||||
{ field: 'customer_name', title: '客户名称', span: 6, itemRender: { name: '$input' } },
|
||||
{
|
||||
field: 'progress', title: '进度', span: 18, itemRender: {
|
||||
name: 'MkFormProgress', props: {
|
||||
|
|
@ -339,8 +338,8 @@ export default {
|
|||
items: [
|
||||
|
||||
|
||||
{field: 'problem', title: '出现问题及建议反馈', span: 24, itemRender: {name: '$input', props: {}}},
|
||||
{field: 'remark', title: '备注', span: 24, itemRender: {name: '$textarea', props: {}}},
|
||||
{ field: 'problem', title: '出现问题及建议反馈', span: 24, itemRender: { name: '$input', props: {} } },
|
||||
{ field: 'remark', title: '备注', span: 24, itemRender: { name: '$textarea', props: {} } },
|
||||
|
||||
|
||||
]
|
||||
|
|
@ -363,7 +362,7 @@ export default {
|
|||
textField: "name",
|
||||
listdataFieldName: 'MoldComponent',
|
||||
mapper: [
|
||||
{fromField: "id", field: "component_id"}
|
||||
{ fromField: "id", field: "component_id" }
|
||||
],
|
||||
dataUrl: `${BASE_URL.BASE_URL}/MoldComponent/v1/mold/component/list`
|
||||
},
|
||||
|
|
@ -373,7 +372,7 @@ export default {
|
|||
textField: "name",
|
||||
listdataFieldName: 'BaseDepartment',
|
||||
mapper: [
|
||||
{fromField: "id", field: "department_id"}
|
||||
{ fromField: "id", field: "department_id" }
|
||||
],
|
||||
dataUrl: `${BASE_URL.BASE_URL}/BaseDepartment/v1/base/department/list`
|
||||
},
|
||||
|
|
@ -384,7 +383,7 @@ export default {
|
|||
textField: "name",
|
||||
listdataFieldName: 'MesProcesses',
|
||||
mapper: [
|
||||
{fromField: "id", field: "process_id"}
|
||||
{ fromField: "id", field: "process_id" }
|
||||
],
|
||||
dataUrl: `${BASE_URL.BASE_URL}/MesProcesses/v1/mes/processes/list`
|
||||
},
|
||||
|
|
@ -395,7 +394,7 @@ export default {
|
|||
textField: "name",
|
||||
listdataFieldName: 'MesStaff',
|
||||
mapper: [
|
||||
{fromField: "id", field: "process_uid"}
|
||||
{ fromField: "id", field: "process_uid" }
|
||||
],
|
||||
dataUrl: `${BASE_URL.BASE_URL}/MesStaff/v1/mes/staff/list`
|
||||
},
|
||||
|
|
@ -405,7 +404,7 @@ export default {
|
|||
textField: "name",
|
||||
listdataFieldName: 'MesStaff',
|
||||
mapper: [
|
||||
{fromField: "id", field: "send_uid"}
|
||||
{ fromField: "id", field: "send_uid" }
|
||||
],
|
||||
dataUrl: `${BASE_URL.BASE_URL}/MesStaff/v1/mes/staff/list`
|
||||
},
|
||||
|
|
@ -415,7 +414,7 @@ export default {
|
|||
textField: "name",
|
||||
listdataFieldName: 'MesStaff',
|
||||
mapper: [
|
||||
{fromField: "id", field: "process_uid"}
|
||||
{ fromField: "id", field: "process_uid" }
|
||||
],
|
||||
dataUrl: `${BASE_URL.BASE_URL}/MesStaff/v1/mes/staff/list`
|
||||
},
|
||||
|
|
@ -470,7 +469,7 @@ export default {
|
|||
this.$mk.post({
|
||||
url: this.actions.get,
|
||||
loading: "加载中...",
|
||||
data: {id: this.$mk.toBigInt(dataId)},
|
||||
data: { id: this.$mk.toBigInt(dataId) },
|
||||
useBigInt: true
|
||||
}).then(a => {
|
||||
|
||||
|
|
@ -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() {
|
||||
|
||||
|
|
@ -574,7 +595,7 @@ export default {
|
|||
if (!v) return '';
|
||||
return XEUtils.toDateString(new Date(v * 1000), 'yyyy-MM-dd');
|
||||
},
|
||||
existComonent({component_id}) {
|
||||
existComonent({ component_id }) {
|
||||
let exist = false;
|
||||
this.infos.forEach(info => {
|
||||
info.data.mold_production_order_component.forEach(row => {
|
||||
|
|
@ -587,14 +608,14 @@ export default {
|
|||
|
||||
},
|
||||
pageSelectComponent() {
|
||||
let {width, height} = this.$mk.getWindowSize();
|
||||
let { width, height } = this.$mk.getWindowSize();
|
||||
this.$mk.dialog.open({
|
||||
page: () => import("../MoldComponent/selector"),
|
||||
title: "选择部件",
|
||||
showFooter: true,
|
||||
width: width * 0.9,
|
||||
height: height * 0.9,
|
||||
callback: ({data}) => {
|
||||
callback: ({ data }) => {
|
||||
if (!data || !data.row1) {
|
||||
this.$mk.error("未选择行");
|
||||
return;
|
||||
|
|
@ -622,14 +643,14 @@ export default {
|
|||
component_line: component_line,
|
||||
component_id: row.id,
|
||||
component_num: 1,
|
||||
component_detail: {id: row.id, name: row.name},
|
||||
component_detail: { id: row.id, name: row.name },
|
||||
})
|
||||
mold_component_processes.forEach(pitem => {
|
||||
currentAddRows2.push({
|
||||
component_line: component_line,
|
||||
component_id: row.id,
|
||||
process_id: pitem.mes_processes_id,
|
||||
process_detail: {id: pitem.mes_processes_id, name: pitem.mes_processes.name},
|
||||
process_detail: { id: pitem.mes_processes_id, name: pitem.mes_processes.name },
|
||||
})
|
||||
|
||||
});
|
||||
|
|
@ -651,7 +672,7 @@ export default {
|
|||
this.collapseActiveKey = [];
|
||||
this.infos = [];
|
||||
},
|
||||
addInfo({rows1, rows2, header}) {
|
||||
addInfo({ rows1, rows2, header }) {
|
||||
let key = this.infos.length + '';
|
||||
let info = {
|
||||
key: key, data: {
|
||||
|
|
@ -664,14 +685,14 @@ export default {
|
|||
this.infos = [...this.infos, info];
|
||||
},
|
||||
pageSelectOrder() {
|
||||
let {width, height} = this.$mk.getWindowSize();
|
||||
let { width, height } = this.$mk.getWindowSize();
|
||||
this.$mk.dialog.open({
|
||||
page: () => import("../MoldOrder/selector"),
|
||||
title: "选择订单",
|
||||
showFooter: true,
|
||||
width: width * 0.9,
|
||||
height: height * 0.9,
|
||||
callback: ({data}) => {
|
||||
callback: ({ data }) => {
|
||||
if (!data || !data.row2) {
|
||||
this.$mk.error("未选择明细行");
|
||||
return;
|
||||
|
|
@ -755,7 +776,7 @@ export default {
|
|||
currentAddRows1.push({
|
||||
component_id: pitem.component_id.toString(),
|
||||
component_num: 1,
|
||||
component_detail: {id: pitem.mold_component.id, name: pitem.mold_component.name},
|
||||
component_detail: { id: pitem.mold_component.id, name: pitem.mold_component.name },
|
||||
})
|
||||
}
|
||||
|
||||
|
|
@ -763,7 +784,7 @@ export default {
|
|||
currentAddRows2.push({
|
||||
component_id: pitem.component_id.toString(),
|
||||
process_id: pitem.mes_processes_id,
|
||||
process_detail: {id: pitem.mes_processes_id, name: pitem.mes_processes.name},
|
||||
process_detail: { id: pitem.mes_processes_id, name: pitem.mes_processes.name },
|
||||
})
|
||||
});
|
||||
|
||||
|
|
@ -841,7 +862,7 @@ export default {
|
|||
let postdata = Object.assign({}, this.formOptions.data, this.formOptions2.data);
|
||||
|
||||
// 格式化提交的数据
|
||||
this.$mk.formatFormData({data: postdata, rules: this.formOptions.items});
|
||||
this.$mk.formatFormData({ data: postdata, rules: this.formOptions.items });
|
||||
|
||||
|
||||
if (postdata.id) {
|
||||
|
|
@ -868,7 +889,7 @@ export default {
|
|||
postdata.engineer_name = postdata.engineer_detail.name || '';
|
||||
}
|
||||
|
||||
postdata.mold_production_order_component = !this.isEdit ? [] : {insertList: [], deleteList: [], updateList: []};
|
||||
postdata.mold_production_order_component = !this.isEdit ? [] : { insertList: [], deleteList: [], updateList: [] };
|
||||
postdata.mold_production_order_component_processes = !this.isEdit ? [] : {
|
||||
insertList: [],
|
||||
deleteList: [],
|
||||
|
|
@ -953,7 +974,7 @@ export default {
|
|||
|
||||
|
||||
// 验证表单
|
||||
this.$mk.validateForm({form: this.$refs.xForm}).then(() => { // 验证表单
|
||||
this.$mk.validateForm({ form: this.$refs.xForm }).then(() => { // 验证表单
|
||||
|
||||
save(); // 提交保存
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue