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

模具

This commit is contained in:
xielue 2023-08-27 23:36:02 +08:00
parent 0cfbae5279
commit 45025bc28d
5 changed files with 206 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/application/mk/libs/function/funs.js
View File

@ -35,6 +35,7 @@ export default {
if (dataRule) { if (dataRule) {
list.forEach(item => { list.forEach(item => {
dataRule.forEach(rule => { dataRule.forEach(rule => {
let value = item[rule.field]; let value = item[rule.field];
if (rule.type == "integer") { if (rule.type == "integer") {
@ -46,6 +47,12 @@ export default {
else if (rule.type == "timestamp") { else if (rule.type == "timestamp") {
item[rule.field] = parseInt(new Date(value).getTime() / 1000); item[rule.field] = parseInt(new Date(value).getTime() / 1000);
} }
else if (rule.type == "bigint") {
if(typeof(item[rule.field]) == 'string'){
item[rule.field] = JSONbig.parse(`{"v":${item[rule.field]}}`).v;
}
}
}) })
}) })

8
src/pages/Middle/Mold/MoldComponent/Edit.vue
View File

@ -195,7 +195,7 @@ export default {
this.formOptions.data = this.$mk.formatDetailData({ data: a.data[this.detailDataFieldName] }); this.formOptions.data = this.$mk.formatDetailData({ data: a.data[this.detailDataFieldName] });
this.detailsData = a.data[this.detailDataFieldName].mold_component_processes || []; this.detailsData = JSON.parse(JSON.stringify(a.data[this.detailDataFieldName].mold_component_processes || []));
this.detailsDataInit(); this.detailsDataInit();
}); });
@ -294,7 +294,11 @@ export default {
deletedList: this.deletedDetailsData, deletedList: this.deletedDetailsData,
fieldName: 'component_id', fieldName: 'component_id',
dataRule:[ dataRule:[
{field:'sort',type:'integer'} {field:'id',type:'bigint'} ,
{field:'sort',type:'integer'},
{field:'update_uid',type:'bigint'} ,
{field:'mes_processes_id',type:'bigint'} ,
{field:'create_uid',type:'bigint'}
] ]
}); });

13
src/pages/Middle/Mold/MoldOrder/Edit.vue
View File

@ -24,7 +24,7 @@
</div> </div>
</template> </template>
</vxe-column> </vxe-column>
<vxe-column field="mold_id" title="模型" width="160" :params="editor_scheme" formatter="formatRef" <vxe-column field="mold_scheme" title="模型" width="160" :params="editor_scheme" formatter="formatRef"
:edit-render="{ name: 'MkGridDataSelector' }"></vxe-column> :edit-render="{ name: 'MkGridDataSelector' }"></vxe-column>
<vxe-column field="production_type" title="布产类型" width="160" :params="options_production_type" formatter = 'formatEnum' <vxe-column field="production_type" title="布产类型" width="160" :params="options_production_type" formatter = 'formatEnum'
:edit-render="{ name: '$select',props:{options:options_production_type} }"></vxe-column> :edit-render="{ name: '$select',props:{options:options_production_type} }"></vxe-column>
@ -166,7 +166,7 @@ export default {
textField: "name", textField: "name",
listdataFieldName: 'MoldScheme', listdataFieldName: 'MoldScheme',
mapper: [ mapper: [
{ fromField: "id", field: "mes_scheme_id" } { fromField: "id", field: "mold_id" }
], ],
dataUrl: `${BASE_URL.BASE_URL}/MoldScheme/v1/mold/scheme/list` dataUrl: `${BASE_URL.BASE_URL}/MoldScheme/v1/mold/scheme/list`
}, },
@ -216,9 +216,10 @@ export default {
this.formOptions.data = this.$mk.formatDetailData({ data: a.data[this.detailDataFieldName] }); this.formOptions.data = this.$mk.formatDetailData({ data: a.data[this.detailDataFieldName] });
this.detailsData = a.data[this.detailDataFieldName].order_molds || []; this.detailsData = JSON.parse(JSON.stringify(a.data[this.detailDataFieldName].order_molds || []));
this.detailsDataInit(); this.detailsDataInit();
}); });
this.isEdit = true; this.isEdit = true;
@ -315,6 +316,7 @@ export default {
deletedList: this.deletedDetailsData, deletedList: this.deletedDetailsData,
fieldName: 'order_id', fieldName: 'order_id',
dataRule:[ dataRule:[
{field:'id',type:'bigint'} ,
{field:'production_type',type:'integer'}, {field:'production_type',type:'integer'},
{field:'manufacture_cycle',type:'timestamp'}, {field:'manufacture_cycle',type:'timestamp'},
{field:'draw_start_time',type:'timestamp'}, {field:'draw_start_time',type:'timestamp'},
@ -323,7 +325,10 @@ export default {
{field:'draw2D_time',type:'timestamp'}, {field:'draw2D_time',type:'timestamp'},
{field:'draw3D_time',type:'timestamp'}, {field:'draw3D_time',type:'timestamp'},
{field:'horizontal_frame_time',type:'timestamp'}, {field:'horizontal_frame_time',type:'timestamp'},
{field:'inlay_deep_hole_time',type:'timestamp'} {field:'inlay_deep_hole_time',type:'timestamp'} ,
{field:'update_uid',type:'bigint'} ,
{field:'mold_id',type:'bigint'} ,
{field:'create_uid',type:'bigint'}
] ]
}); });

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

@ -39,16 +39,34 @@
: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="160" formatter="formatDate" <vxe-column field="plan_complete_time" title="计划完成日期" width="160" formatter="formatDate"
:edit-render="{ name: '$input', props: { type: 'date' } }"></vxe-column> :edit-render="{ name: '$input', props: { type: 'date' } }"></vxe-column>
<vxe-column field="is_send" title="是否发料" width="160" :params="options_is_send"
formatter='formatEnum'
:edit-render="{ name: '$select', props: { options: options_is_send } }"></vxe-column>
<vxe-column field="send_time" title="发料时间" width="160" formatter="formatDate" <vxe-column field="send_time" title="发料时间" width="160" formatter="formatDate"
:edit-render="{ name: '$input', props: { type: 'date' } }"></vxe-column> :edit-render="{ name: '$input', props: { type: 'date' } }"></vxe-column>
<vxe-column field="send_uid" title="发料人员" width="160" :params="editor_staff" formatter="formatRef" <vxe-column field="send_uid" title="发料人员" width="160" :params="editor_staff" formatter="formatRef"
:edit-render="{ name: 'MkGridDataSelector' }"></vxe-column> :edit-render="{ name: 'MkGridDataSelector' }"></vxe-column>
<vxe-column field="is_complete" title="是否完成" width="160" :params="options_is_complete"
formatter='formatEnum'
:edit-render="{ name: '$select', props: { options: options_is_complete } }"></vxe-column>
<vxe-column field="complete_time" title="实际完成时间" width="160" formatter="formatDate" <vxe-column field="complete_time" title="实际完成时间" width="160" formatter="formatDate"
:edit-render="{ name: '$input', props: { type: 'date' } }"></vxe-column> :edit-render="{ name: '$input', props: { type: 'date' } }"></vxe-column>
<vxe-column field="send_type" title="发料人员类型" width="160" :params="options_user_type"
formatter='formatEnum'
:edit-render="{ name: '$select', props: { options: options_user_type } }"></vxe-column>
<vxe-column field="complete_type" title="完工人员类型" width="160" :params="options_user_type"
formatter='formatEnum'
:edit-render="{ name: '$select', props: { options: options_user_type } }"></vxe-column>
<vxe-column field="remark" title="备注" width="160" :edit-render="{ name: '$input', props: {} }"></vxe-column> <vxe-column field="remark" title="备注" width="160" :edit-render="{ name: '$input', props: {} }"></vxe-column>
</vxe-table> </vxe-table>
@ -88,10 +106,28 @@
: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="160" formatter="formatDate" <vxe-column field="plan_complete_time" title="计划完成日期" width="160" formatter="formatDate"
:edit-render="{ name: '$input', props: { type: 'date' } }"></vxe-column> :edit-render="{ name: '$input', props: { type: 'date' } }"></vxe-column>
<vxe-column field="is_send" title="是否发料" width="160" :params="options_is_send"
formatter='formatEnum'
:edit-render="{ name: '$select', props: { options: options_is_send } }"></vxe-column>
<vxe-column field="send_time" title="发料时间" width="160" formatter="formatDate" <vxe-column field="send_time" title="发料时间" width="160" formatter="formatDate"
:edit-render="{ name: '$input', props: { type: 'date' } }"></vxe-column> :edit-render="{ name: '$input', props: { type: 'date' } }"></vxe-column>
<vxe-column field="is_complete" title="是否完成" width="160" :params="options_is_complete"
formatter='formatEnum'
:edit-render="{ name: '$select', props: { options: options_is_complete } }"></vxe-column>
<vxe-column field="complete_time" title="实际完成时间" width="160" formatter="formatDate" <vxe-column field="complete_time" title="实际完成时间" width="160" formatter="formatDate"
:edit-render="{ name: '$input', props: { type: 'date' } }"></vxe-column> :edit-render="{ name: '$input', props: { type: 'date' } }"></vxe-column>
<vxe-column field="send_type" title="发料人员类型" width="160" :params="options_user_type"
formatter='formatEnum'
:edit-render="{ name: '$select', props: { options: options_user_type } }"></vxe-column>
<vxe-column field="complete_type" title="完工人员类型" width="160" :params="options_user_type"
formatter='formatEnum'
:edit-render="{ name: '$select', props: { options: options_user_type } }"></vxe-column>
<vxe-column field="remark" title="备注" width="160" :edit-render="{ name: '$input', props: {} }"></vxe-column> <vxe-column field="remark" title="备注" width="160" :edit-render="{ name: '$input', props: {} }"></vxe-column>
@ -133,11 +169,21 @@ export default {
data() { data() {
const options_production_type = [{ value: '1', label: '正常布产' }, { value: '2', label: '委托布产' }]; const options_production_type = [{ value: '1', label: '正常布产' }, { value: '2', label: '委托布产' }];
const options_is_complete = [{ value: '0', label: '未完成' }, { value: '1', label: '已完成' }];
const options_is_send = [{ value: '0', label: '未发料' }, { value: '1', label: '已发料' }];
const options_user_type = [{ value: '1', label: '管理员' }, { value: '2', label: '员工' }, { value: '3', label: '触控屏' }];
//let _this = this; //let _this = this;
// 页面数据变量 // 页面数据变量
var pageData = { var pageData = {
options_production_type: options_production_type, options_production_type: options_production_type,
options_is_complete: options_is_complete,
options_is_send: options_is_send,
options_user_type: options_user_type,
// 当前项目名称 // 当前项目名称
currentConfigName: "", currentConfigName: "",
// 当前项目ID // 当前项目ID
@ -320,8 +366,8 @@ export default {
this.formOptions.data = this.$mk.formatDetailData({ data: a.data[this.detailDataFieldName] }); this.formOptions.data = this.$mk.formatDetailData({ data: a.data[this.detailDataFieldName] });
this.detailsData = a.data[this.detailDataFieldName].mold_scheme_components || []; this.detailsData = JSON.parse(JSON.stringify(a.data[this.detailDataFieldName].mold_production_order_component || []));
this.detailsData2 = a.data[this.detailDataFieldName].mold_scheme_processes || []; this.detailsData2 = JSON.parse(JSON.stringify(a.data[this.detailDataFieldName].mold_production_order_component_processes || []));
@ -431,7 +477,15 @@ export default {
deletedList: this.deletedDetailsData, deletedList: this.deletedDetailsData,
fieldName: 'production_id', fieldName: 'production_id',
dataRule: [ dataRule: [
{ field: 'production_type', type: 'integer' } { field: 'production_type', type: 'integer' },
{ field: 'id', type: 'bigint' },
{ field: 'update_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: 'send_uid', type: 'bigint' },
] ]
}); });
postdata.mold_production_order_component_processes = this.$mk.getPostFieldValue({ postdata.mold_production_order_component_processes = this.$mk.getPostFieldValue({
@ -441,6 +495,12 @@ export default {
deletedList: this.deletedDetailsData2, deletedList: this.deletedDetailsData2,
fieldName: 'production_id', fieldName: 'production_id',
dataRule: [ dataRule: [
{ field: 'id', type: 'bigint' },
{ field: 'update_uid', type: 'bigint' },
{ field: 'create_uid', type: 'bigint' },
{ field: 'component_id', type: 'bigint' },
{ field: 'process_uid', type: 'bigint' },
] ]
}); });

64
src/pages/Middle/Mold/MoldScheme/Edit.vue
View File

@ -25,8 +25,13 @@
</vxe-column> </vxe-column>
<vxe-column field="mold_component" title="部件" width="160" :params="editor_component" formatter="formatRef" <vxe-column field="mold_component" title="部件" width="160" :params="editor_component" formatter="formatRef"
:edit-render="{ name: 'MkGridDataSelector' }"></vxe-column> :edit-render="{ name: 'MkGridDataSelector' }"></vxe-column>
<vxe-column field="production_type" title="布产类型" width="160" :params="options_production_type" formatter = 'formatEnum' <vxe-column field="production_type" title="布产类型" width="160" :params="options_production_type"
:edit-render="{ name: '$select',props:{options:options_production_type} }"></vxe-column> formatter='formatEnum'
:edit-render="{ name: '$select', props: { options: options_production_type } }"></vxe-column>
<vxe-column field="process_uid" title="加工人员" width="160" :params="editor_staff" formatter="formatRef"
:edit-render="{ name: 'MkGridDataSelector' }"></vxe-column>
</vxe-table> </vxe-table>
</a-tab-pane> </a-tab-pane>
@ -34,7 +39,7 @@
<a-tab-pane key="2" tab="工序设置"> <a-tab-pane key="2" tab="工序设置">
<vxe-table border show-overflow keep-source ref="xTable2" :height="table1Height" :data="detailsData2" <vxe-table border show-overflow keep-source ref="xTable2" :height="table1Height" :data="detailsData2"
@pulldownSelected="onPulldownSelected" @popupSelected="onPopupSelected" :export-config="{}" @pulldownSelected="onPulldownSelected" @popupSelected="onPopupSelected" :export-config="{}"
@edit-closed="afterEditEvent" @edit-actived="beforeEditEvent" @edit-closed="afterEditEvent" @edit-actived="beforeEditEvent"
:edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false, beforeEditMethod: beforeEditMethod }"> :edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false, beforeEditMethod: beforeEditMethod }">
@ -54,8 +59,8 @@
:edit-render="{ name: 'MkGridDataSelector' }"></vxe-column> :edit-render="{ name: 'MkGridDataSelector' }"></vxe-column>
<vxe-column field="mes_processes" title="工序" width="160" :params="editor_processes" formatter="formatRef" <vxe-column field="mes_processes" title="工序" width="160" :params="editor_processes" formatter="formatRef"
:edit-render="{ name: 'MkGridDataSelector' }"></vxe-column> :edit-render="{ name: 'MkGridDataSelector' }"></vxe-column>
</vxe-table> </vxe-table>
</a-tab-pane> </a-tab-pane>
</a-tabs> </a-tabs>
@ -95,7 +100,7 @@ export default {
// 页面数据变量 // 页面数据变量
var pageData = { var pageData = {
options_production_type:[{value:'1',label:'正常布产'},{value:'2',label:'委托布产'}], options_production_type: [{ value: '1', label: '正常布产' }, { value: '2', label: '委托布产' }],
// 当前项目名称 // 当前项目名称
currentConfigName: "", currentConfigName: "",
// 当前项目ID // 当前项目ID
@ -207,6 +212,18 @@ export default {
}, },
editor_staff: {
dataType: "object",
valueField: "id",
textField: "name",
listdataFieldName: 'MesStaff',
mapper: [
{ fromField: "id", field: "process_uid" }
],
dataUrl: `${BASE_URL.BASE_URL}/MesStaff/v1/mes/staff/list`
},
}; };
@ -234,16 +251,15 @@ export default {
this.$mk.post({ this.$mk.post({
url: this.actions.get, url: this.actions.get,
loading: "加载中...", loading: "加载中...",
data: {id : this.$mk.toBigInt(dataId)}, data: { id: this.$mk.toBigInt(dataId) },
useBigInt : true useBigInt: true
}).then(a => { }).then(a => {
this.formOptions.data = this.$mk.formatDetailData({data: a.data[this.detailDataFieldName] }); this.formOptions.data = this.$mk.formatDetailData({ data: a.data[this.detailDataFieldName] });
this.detailsData = a.data[this.detailDataFieldName].mold_scheme_components || [];
this.detailsData2 = a.data[this.detailDataFieldName].mold_scheme_processes || [];
this.detailsData = JSON.parse(JSON.stringify(a.data[this.detailDataFieldName].mold_scheme_components || []));
this.detailsData2 = JSON.parse(JSON.stringify(a.data[this.detailDataFieldName].mold_scheme_processes || []));
@ -351,17 +367,25 @@ export default {
list: this.detailsData, list: this.detailsData,
deletedList: this.deletedDetailsData, deletedList: this.deletedDetailsData,
fieldName: 'mold_id', fieldName: 'mold_id',
dataRule:[ dataRule: [
{field:'production_type',type:'integer'} { field: 'production_type', type: 'integer' },
{ field: 'id', type: 'bigint' },
{ field: 'update_uid', type: 'bigint' },
{ field: 'component_id', type: 'bigint' },
{ field: 'create_uid', type: 'bigint' }
] ]
}); });
postdata.mold_scheme_processes = this.$mk.getPostFieldValue({ postdata.mold_scheme_processes = this.$mk.getPostFieldValue({
rowFilter: (row) => { return row.id || ( row.component_id && row.mes_processes_id) }, rowFilter: (row) => { return row.id || (row.component_id && row.mes_processes_id) },
dataId: this.getDataId_BigInt(), dataId: this.getDataId_BigInt(),
list: this.detailsData2, list: this.detailsData2,
deletedList: this.deletedDetailsData2, deletedList: this.deletedDetailsData2,
fieldName: 'mold_id', fieldName: 'mold_id',
dataRule:[ dataRule: [
{ field: 'id', type: 'bigint' },
{ field: 'update_uid', type: 'bigint' },
{ field: 'component_id', type: 'bigint' },
{ field: 'create_uid', type: 'bigint' }
] ]
}); });
@ -454,17 +478,17 @@ export default {
beforeEditMethod({ column, row }) { beforeEditMethod({ column, row }) {
console.log(column,row); console.log(column, row);
return true; return true;
}, },
afterEditEvent({ column, row }) { afterEditEvent({ column, row }) {
console.log(column,row); console.log(column, row);
}, },
beforeEditEvent({ column, row }) { beforeEditEvent({ column, row }) {
console.log(column,row); console.log(column, row);
}, },
onPulldownSelected({ row, name, params }) { onPulldownSelected({ row, name, params }) {
console.log(row, name, params ); console.log(row, name, params);
}, },
onPopupSelected({ rows, name, params }) { onPopupSelected({ rows, name, params }) {