This commit is contained in:
parent
7d3db0078a
commit
d808d777a5
|
|
@ -1,6 +1,6 @@
|
|||
<template>
|
||||
<div>
|
||||
<div class="page-body">
|
||||
<div class="page-body page-body-touch">
|
||||
<vxe-input ref="inputx" style="width:400px" v-model="searchName" placeholder="搜索工艺布产等信息"
|
||||
@keydown="keydownEvent"></vxe-input>
|
||||
<a-icon type="scan" :style="{ fontSize: '22px', color: '#08c', marginLeft: '10px' }" @click="inputFocus" />
|
||||
|
|
@ -26,16 +26,16 @@
|
|||
<div class="gx-item-col">
|
||||
<div>
|
||||
<a-button type="primary" @click="pageSend(item)" v-if="item.is_send !== 1">发料</a-button>
|
||||
<a-button @click="pageSend(item, true)" v-else-if="!item.is_complete">撤销发料</a-button>
|
||||
<a-button @click="pageSend(item, true)" v-else-if="!item.is_complete">撤销发料</a-button>
|
||||
|
||||
<a-button style="margin-left: 3px;" type="primary" @click="pageReport(item)"
|
||||
v-if="item.is_send && item.is_complete !== 1">报工</a-button>
|
||||
<a-button style="margin-left: 3px;" type="primary" @click="pageReport(item)"
|
||||
v-if="item.is_send && item.is_complete !== 1">报工</a-button>
|
||||
|
||||
<a-button style="margin-left: 3px;" @click="pageReport(item, true)"
|
||||
v-if="item.is_complete == 1">撤销报工</a-button>
|
||||
<a-button style="margin-left: 3px;" @click="pageReport(item, true)"
|
||||
v-if="item.is_complete == 1">撤销报工</a-button>
|
||||
</div>
|
||||
<div style="margin-top: 10px;;" v-if="item.complete_time">
|
||||
{{ getDateValueString(item.complete_time) }}
|
||||
{{ getDateValueString(item.complete_time) }}
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
|
@ -68,20 +68,55 @@
|
|||
</div>
|
||||
<div class="right">
|
||||
|
||||
<div class="card">
|
||||
<h4>工艺布产信息</h4>
|
||||
<vxe-form :data="formOptions2.data" ref="xForm" :title-width="formOptions2.titleWidth"
|
||||
:title-align="formOptions2.titleAlign" :rules="formOptions2.rules" :items="formOptions2.items" titleColon>
|
||||
</vxe-form>
|
||||
</div>
|
||||
<a-tabs v-model="tabKey" @change="tabChange">
|
||||
<a-tab-pane key="1" tab="布产详情">
|
||||
|
||||
<div class="card">
|
||||
<h4>工艺布产信息</h4>
|
||||
<vxe-form :data="formOptions2.data" ref="xForm" :title-width="formOptions2.titleWidth"
|
||||
:title-align="formOptions2.titleAlign" :rules="formOptions2.rules" :items="formOptions2.items"
|
||||
titleColon>
|
||||
</vxe-form>
|
||||
</div>
|
||||
|
||||
<div class="card">
|
||||
<h4>模具信息</h4>
|
||||
|
||||
<vxe-form :data="formOptions3.data" ref="xForm" :title-width="formOptions3.titleWidth"
|
||||
:title-align="formOptions3.titleAlign" :rules="formOptions3.rules" :items="formOptions3.items"
|
||||
titleColon>
|
||||
</vxe-form>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
</a-tab-pane>
|
||||
<a-tab-pane key="2" tab="即将超时布产列表" force-render>
|
||||
<vxe-table border show-overflow keep-source ref="xTable3" :height="400" :row-config="{height: 60}" :data="poData">
|
||||
<vxe-column field="code" title="编码" width="130"></vxe-column>
|
||||
<vxe-column field="mold_master_name" title="模具师傅" width="130"></vxe-column>
|
||||
<vxe-column field="engineer_name" title="工程师傅" width="130"></vxe-column>
|
||||
<vxe-column field="complete_time" formatter="formatDate" title="要求完成时间" width="160"></vxe-column>
|
||||
<vxe-column field="mold_detail" formatter="formatRef" :params="{ dataType: 'object', textField: 'name' }"
|
||||
title="模具" width="130"></vxe-column>
|
||||
<vxe-column title="模具图片" width="110">
|
||||
<template #default="{ row }">
|
||||
<img v-if="row.mold_detail.image" style="width:50px;height:50px;" :src="row.mold_detail.image" />
|
||||
<span v-else></span>
|
||||
</template>
|
||||
</vxe-column>
|
||||
<vxe-column title="操作" width="90">
|
||||
<template #default="{ row }">
|
||||
<a-button @click="selectPoInfo(row)">选择</a-button>
|
||||
</template>
|
||||
</vxe-column>
|
||||
</vxe-table>
|
||||
|
||||
|
||||
</a-tab-pane>
|
||||
</a-tabs>
|
||||
|
||||
<div class="card">
|
||||
<h4>模具信息</h4>
|
||||
|
||||
<vxe-form :data="formOptions3.data" ref="xForm" :title-width="formOptions3.titleWidth"
|
||||
:title-align="formOptions3.titleAlign" :rules="formOptions3.rules" :items="formOptions3.items" titleColon>
|
||||
</vxe-form>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
|
|
@ -140,13 +175,14 @@ export default {
|
|||
|
||||
actions: {
|
||||
},
|
||||
|
||||
tabKey: '2',
|
||||
keyName: 'id',
|
||||
// 是否编辑模式
|
||||
isEdit: false,
|
||||
currentId: 0,
|
||||
detailsData: [],
|
||||
detailsData3: [],
|
||||
poData: [],
|
||||
tips: ["点一", "点二", "点三"],
|
||||
current_mold_production_order_component_processes: [],
|
||||
formOptions2: {
|
||||
|
|
@ -179,7 +215,7 @@ export default {
|
|||
},
|
||||
|
||||
{ field: 'manufacture_cycle', dataRule: { type: 'timestamp' }, title: '制作周期', span: 24, itemRender: { name: 'MkFormInputShow', props: { params: { dataType: 'date' } } } },
|
||||
{ field: 'remark', title: '备注', span: 24, itemRender: { name: 'MkFormInputShow', props: { params: { isTextarea:true } } } },
|
||||
{ field: 'remark', title: '备注', span: 24, itemRender: { name: 'MkFormInputShow', props: { params: { isTextarea: true } } } },
|
||||
{
|
||||
field: 'progress', title: '进度', span: 24, itemRender: {
|
||||
name: 'MkFormProgress', props: {
|
||||
|
|
@ -201,7 +237,7 @@ export default {
|
|||
data: {
|
||||
},
|
||||
// 标题宽度
|
||||
titleWidth: 100,
|
||||
titleWidth: 150,
|
||||
// 标题对齐方式
|
||||
titleAlign: 'right',
|
||||
// 表单校验规则
|
||||
|
|
@ -327,6 +363,7 @@ export default {
|
|||
setTimeout(() => {
|
||||
this.$refs.inputx.focus();
|
||||
|
||||
this.loadPoData();
|
||||
}, 200)
|
||||
|
||||
//149433255169363968
|
||||
|
|
@ -340,7 +377,40 @@ export default {
|
|||
this.$refs.inputx.focus();
|
||||
},
|
||||
|
||||
|
||||
tabChange() {
|
||||
if (this.tabKey == '2') {
|
||||
this.loadPoData();
|
||||
}
|
||||
},
|
||||
loadPoData() {
|
||||
this.$mk.post({
|
||||
url: `${BASE_URL.BASE_URL}/MoldProductionOrder/Get/TouchScreen/v1/mold/production/order/touchScreen/order/list`,
|
||||
loading: "搜索中...",
|
||||
data: {
|
||||
"ptyid": 0,
|
||||
"company_id": parseInt(process.env.VUE_APP_COMPANY_ID),
|
||||
"search_rules": [
|
||||
],
|
||||
"end_time": 0,
|
||||
"company_token": process.env.VUE_APP_COMPANYTOKEN,
|
||||
"store_id": 0,
|
||||
"order_bys": [
|
||||
],
|
||||
"limit": 0,
|
||||
"project_token": process.env.VUE_APP_APPTOKEN,
|
||||
"beid": parseInt(process.env.VUE_APP_BEID),
|
||||
"page": 1,
|
||||
"start_time": 0
|
||||
},
|
||||
useBigInt: true,
|
||||
}).then(a => {
|
||||
this.poData = JSON.parse(JSON.stringify(a.data.MoldProductionOrder));
|
||||
console.log(this.poData)
|
||||
});
|
||||
},
|
||||
selectPoInfo(row) {
|
||||
this.loadProductionOrder({ id: row.id })
|
||||
},
|
||||
|
||||
loadData({ key }) {
|
||||
|
||||
|
|
@ -562,6 +632,8 @@ export default {
|
|||
loadProductionOrder({ id, resetProcesses }) {
|
||||
|
||||
this.currentId = id;
|
||||
this.tabKey = '1';
|
||||
|
||||
this.loading = true
|
||||
this.$mk.get({
|
||||
url: `${BASE_URL.BASE_URL}/MoldProductionOrder/Get/TouchScreen/v1/mold/production/order/touchScreen/getMoldProductionOrder/${process.env.VUE_APP_BEID}/${process.env.VUE_APP_PTYID}/${process.env.VUE_APP_COMPANY_ID}/0/${process.env.VUE_APP_APPTOKEN}/${process.env.VUE_APP_COMPANYTOKEN}/${id}`,
|
||||
|
|
@ -587,7 +659,7 @@ export default {
|
|||
|
||||
if (resetProcesses === true) {
|
||||
this.resetProcesses();
|
||||
}else{
|
||||
} else {
|
||||
|
||||
this.detailsData = [];
|
||||
}
|
||||
|
|
@ -604,7 +676,7 @@ export default {
|
|||
}).then(a => {
|
||||
|
||||
let row = a.data.mold_production_order_component_processes;
|
||||
this.loadProductionOrder({id:row.production_id});
|
||||
this.loadProductionOrder({ id: row.production_id });
|
||||
|
||||
});
|
||||
},
|
||||
|
|
@ -667,7 +739,7 @@ export default {
|
|||
if (a.code == 200) {
|
||||
this.$mk.success("操作成功");
|
||||
|
||||
this.loadProductionOrder({ id: this.currentId , resetProcesses: true });
|
||||
this.loadProductionOrder({ id: this.currentId, resetProcesses: true });
|
||||
|
||||
} else {
|
||||
|
||||
|
|
@ -737,6 +809,17 @@ export default {
|
|||
padding: 30px;
|
||||
background: #f4f4f4;
|
||||
}
|
||||
.page-body-touch{
|
||||
font-size: 22px;
|
||||
}
|
||||
.page-body-touch
|
||||
.vxe-form{
|
||||
font-size: 22px;
|
||||
}
|
||||
.page-body-touch
|
||||
.vxe-table--render-default{
|
||||
font-size: 22px;
|
||||
}
|
||||
|
||||
.formtabs .ant-tabs-tabpane {
|
||||
/* background: white; */
|
||||
|
|
@ -812,7 +895,7 @@ export default {
|
|||
|
||||
.card h4 {
|
||||
font-weight: bold;
|
||||
font-size: 17px;
|
||||
font-size: 22px;
|
||||
}
|
||||
|
||||
.left {
|
||||
|
|
@ -834,7 +917,7 @@ export default {
|
|||
|
||||
.formtitle {
|
||||
font-weight: bold;
|
||||
font-size: 14px;
|
||||
font-size: 22px;
|
||||
}
|
||||
|
||||
.gx-item {
|
||||
|
|
@ -864,7 +947,7 @@ export default {
|
|||
padding: 10px;
|
||||
box-sizing: border-box;
|
||||
text-align: center;
|
||||
font-size: 14px;
|
||||
font-size: 15px;
|
||||
color: #333;
|
||||
}
|
||||
</style>
|
||||
Loading…
Reference in New Issue