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

模具 #28

This commit is contained in:
xielue 2023-09-22 17:39:41 +08:00
parent 704ab4e737
commit d81defc469
2 changed files with 29 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/pages/Middle/Mold/InkjetPrinter/print.vue
View File

@ -180,15 +180,6 @@ export default {
for (let key in this.searchFormData) { for (let key in this.searchFormData) {
let value = this.searchFormData[key]; let value = this.searchFormData[key];
if (key == "inventory") {
if (value && value[0]) {
rules.push({
field: " id in (select manufactureOrderID from v_MP_ManufactureOrder_b where inventoryID = " + value[0] + ") ",
type: "sql"
});
}
} else {
if (value) { if (value) {
let mode = findMode(key); let mode = findMode(key);
rules.push({ rules.push({
@ -197,7 +188,6 @@ export default {
value: value value: value
}); });
} }
}
} }
if (this.start_time) { if (this.start_time) {

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

@ -34,7 +34,8 @@
<template #default="{ row }"> <template #default="{ row }">
<div v-if="row.id"> <div v-if="row.id">
<div v-if="row.complete_time">{{ $mk.getDateString(row.complete_time) }}</div> <div v-if="row.complete_time">{{ $mk.getDateString(row.complete_time) }}</div>
<a-button v-else :disabled="!(isComponentOutProduct() || pageIsComplete())" @click.stop="pageComplete(row)" type="primary">完成</a-button> <a-button v-else :disabled="!(isComponentOutProduct() || pageIsComplete())" @click.stop="pageComplete(row)"
type="primary">完成</a-button>
</div> </div>
</template> </template>
</vxe-column> </vxe-column>
@ -73,7 +74,7 @@
:edit-render="{ name: 'MkGridDataSelector' }"></vxe-column> :edit-render="{ name: 'MkGridDataSelector' }"></vxe-column>
<vxe-column field="department_detail" title="部门" width="160" :params="editor_department" formatter="formatRef" <vxe-column field="department_detail" title="部门" width="160" :params="editor_department" formatter="formatRef"
:edit-render="{ name: 'MkGridDataSelector' }"></vxe-column> :edit-render="{ name: 'MkGridDataSelector' }"></vxe-column>
<vxe-column field="progress" title="进度" width="160" :cellRender="{name: 'progress'}" ></vxe-column> <vxe-column field="progress" title="进度" width="160" :cellRender="{ name: 'progress' }"></vxe-column>
@ -114,8 +115,8 @@
</template> </template>
</vxe-column> </vxe-column>
<vxe-column field="send_type" v-if="getDataId() && readonly" title="发料人员类型" width="160" :params="{ data: options_user_type }" <vxe-column field="send_type" v-if="getDataId() && readonly" title="发料人员类型" width="160"
formatter='formatEnum'></vxe-column> :params="{ data: options_user_type }" formatter='formatEnum'></vxe-column>
<vxe-column field="complete_type" v-if="getDataId() && readonly" title="完工人员类型" width="160" <vxe-column field="complete_type" v-if="getDataId() && readonly" title="完工人员类型" width="160"
@ -524,8 +525,8 @@ export default {
pageAdd2(row) { pageAdd2(row) {
const $table = this.$refs.xTable2 const $table = this.$refs.xTable2
const record = { const record = {
component_line:this.detailsData[0].component_line, component_line: this.detailsData[0].component_line,
component_id:this.detailsData[0].component_id component_id: this.detailsData[0].component_id
} }
if (row) { if (row) {
this.detailsData2 = JSON.parse(JSON.stringify(this.detailsData2)) this.detailsData2 = JSON.parse(JSON.stringify(this.detailsData2))
@ -551,6 +552,11 @@ export default {
postDataUpdate() { postDataUpdate() {
let postdata = {}; let postdata = {};
this.detailsData2.forEach(item => {
item.component_line = this.detailsData[0].component_line;
})
postdata.mold_production_order_component = this.$mk.getPostFieldValue({ postdata.mold_production_order_component = this.$mk.getPostFieldValue({
rowFilter: (row) => { return row.id || row.component_id }, rowFilter: (row) => { return row.id || row.component_id },
dataId: this.getDataId_BigInt(), dataId: this.getDataId_BigInt(),
@ -585,8 +591,8 @@ export default {
} : []; } : [];
} else { } else {
let list = [ ...this.detailsData2]; let list = [...this.detailsData2];
list.forEach(item=>{ list.forEach(item => {
item.component_id = this.detailsData[0].component_id; item.component_id = this.detailsData[0].component_id;
}) })
postdata.mold_production_order_component_processes = this.$mk.getPostFieldValue({ postdata.mold_production_order_component_processes = this.$mk.getPostFieldValue({
@ -700,4 +706,5 @@ export default {
.oplinks2 i { .oplinks2 i {
margin-left: 5px; margin-left: 5px;
}</style> }
</style>