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

模具

This commit is contained in:
xielue 2023-09-24 16:40:29 +08:00
parent e24fb705cf
commit 49512d2a48
2 changed files with 42 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/pages/Middle/Mold/Touch/Reporting.vue
View File

@ -41,8 +41,8 @@
<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)"
<a-button style="margin-left: 3px;" @click="pageReport(item, true)"
v-if="item.is_complete == 1">撤销报工</a-button>
</div>
@ -142,9 +142,9 @@ export default {
items: [
{ field: 'code', title: '编号', span: 8, itemRender: { name: 'MkFormInputShow' } },
{ field: 'code', title: '单据编号', span: 24, itemRender: { name: 'MkFormInputShow' } },
{
title: '订单号', span: 8,
title: '订单编号', span: 24,
field: 'mold_order',
itemRender: {
name: 'MkFormInputShow', props: {
@ -157,17 +157,7 @@ export default {
}
},
{ field: 'manufacture_cycle', dataRule: { type: 'timestamp' }, title: '制作周期', span: 8, itemRender: { name: 'MkFormInputShow', props: { params: { dataType: 'date' } } } },
{ field: 'draw_start_time', dataRule: { type: 'timestamp' }, title: '预计开始画图时间', span: 8, itemRender: { name: 'MkFormInputShow', props: { params: { dataType: 'date' } } } },
{ field: 'split_design_time', dataRule: { type: 'timestamp' }, title: '分模设计时间预计', span: 8, itemRender: { name: 'MkFormInputShow', props: { params: { dataType: 'date' } } } },
{ field: 'draw_time', dataRule: { type: 'timestamp' }, title: '出图时间预计', span: 8, itemRender: { name: 'MkFormInputShow', props: { params: { dataType: 'date' } } } },
{ field: 'split_design_time', dataRule: { type: 'timestamp' }, title: '分模设计时间预计', span: 8, itemRender: { name: 'MkFormInputShow', props: { params: { dataType: 'date' } } } },
{ field: 'draw_time', dataRule: { type: 'timestamp' }, title: '出图时间预计', span: 8, itemRender: { name: 'MkFormInputShow', props: { params: { dataType: 'date' } } } },
{ field: 'draw2D_time', dataRule: { type: 'timestamp' }, title: '出2D时间预计', span: 8, itemRender: { name: 'MkFormInputShow', props: { params: { dataType: 'date' } } } },
{ field: 'draw3D_time', dataRule: { type: 'timestamp' }, title: '出3D时间预计', span: 8, itemRender: { name: 'MkFormInputShow', props: { params: { dataType: 'date' } } } },
{ field: 'horizontal_frame_time', dataRule: { type: 'timestamp' }, title: '出2D时间预计', span: 8, itemRender: { name: 'MkFormInputShow', props: { params: { dataType: 'date' } } } },
{ field: 'inlay_deep_hole_time', dataRule: { type: 'timestamp' }, title: '镶件深孔钻到厂日期预计', span: 8, itemRender: { name: 'MkFormInputShow', props: { params: { dataType: 'date' } } } },
{ field: 'problem', title: '出现问题及建议反馈', span: 24, itemRender: { name: 'MkFormInputShow', props: {} } },
{ field: 'manufacture_cycle', dataRule: { type: 'timestamp' }, title: '制作周期', span: 24, itemRender: { name: 'MkFormInputShow', props: { params: { dataType: 'date' } } } },
{
field: 'progress', title: '进度', span: 24, itemRender: {
@ -205,6 +195,32 @@ export default {
{ field: 'code', title: '编号', span: 24, itemRender: { name: 'MkFormInputShow' } },
{ field: 'name', title: '名称', span: 24, itemRender: { name: 'MkFormInputShow' } },
{
title: '模具师傅', span: 24,
field: 'mold_master_user_detail',
itemRender: {
name: 'MkFormInputShow', props: {
params: {
dataType: "object",
valueField: "id",
textField: "code"
}
}
}
},
{
title: '工程师傅', span: 24,
field: 'project_user_detail',
itemRender: {
name: 'MkFormInputShow', props: {
params: {
dataType: "object",
valueField: "id",
textField: "code"
}
}
}
},
]
},
{
@ -368,7 +384,9 @@ export default {
const now = Date.now();
if (event.key === 'Enter') {
if (inputValue && inputValue.indexOf('{') > 0) {
inputValue = inputValue.substr(inputValue.indexOf('{'));
}
if (inputValue && inputValue.indexOf('{') == 0) {
inputValue = inputValue.replace(/：/g, ":");
@ -478,12 +496,14 @@ export default {
console.log(this.detailsData3)
data3.mold_master_user_detail = row.mold_master_user_detail;
this.formOptions2.data = data2
this.formOptions3.data = data3
this.current_mold_production_order_component_processes = row.mold_production_order_component_processes;
this.detailsData = [];
//this.detailsData = JSON.parse(JSON.stringify(row.mold_production_order_component_processes || []));
});
@ -562,10 +582,10 @@ export default {
if (type == 'confirm') {
this.$mk.post({
url:
isUndo ?
`${BASE_URL.BASE_URL}/MoldProductionOrder/Get/TouchScreen/v1/mold/production/order/touchScreen/cancel` :
`${BASE_URL.BASE_URL}/MoldProductionOrder/Get/TouchScreen/v1/mold/production/order/touchScreen/create`,
url:
isUndo ?
`${BASE_URL.BASE_URL}/MoldProductionOrder/Get/TouchScreen/v1/mold/production/order/touchScreen/cancel` :
`${BASE_URL.BASE_URL}/MoldProductionOrder/Get/TouchScreen/v1/mold/production/order/touchScreen/create`,
loading: "操作中...",
data: {

3
src/pages/Middle/Mold/basic/settings.js
View File

File diff suppressed because one or more lines are too long