diff --git a/src/pages/Middle/Mold/Touch/Reporting.vue b/src/pages/Middle/Mold/Touch/Reporting.vue index 270750d..091b98c 100644 --- a/src/pages/Middle/Mold/Touch/Reporting.vue +++ b/src/pages/Middle/Mold/Touch/Reporting.vue @@ -41,8 +41,8 @@ 报工 - - 撤销报工 @@ -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: { diff --git a/src/pages/Middle/Mold/basic/settings.js b/src/pages/Middle/Mold/basic/settings.js index 081c506..23ebb36 100644 --- a/src/pages/Middle/Mold/basic/settings.js +++ b/src/pages/Middle/Mold/basic/settings.js @@ -5,8 +5,7 @@ var config = { options_is_send: [{ value: '0', label: '未发料' }, { value: '1', label: '已发料' }], options_user_type: [{ value: null, label: '' }, { value: 1, label: '管理员' }, { value: 2, label: '员工' }, { value: 3, label: '触控屏' }], - printTemplate: {"panels":[{"index":0,"name":1,"height":296.6,"width":210,"paperHeader":25.5,"paperFooter":810,"printElements":[{"options":{"left":489,"top":34.5,"height":70,"width":70,"field":"qrcode","fontSize":15,"fontWeight":"700","textAlign":"center","hideTitle":true,"title":"qrcode","coordinateSync":false,"widthHeightSync":false,"textType":"qrcode","qrCodeLevel":0,"right":557.5,"bottom":102.25,"vCenter":522.5,"hCenter":67.25},"printElementType":{"title":"qrcode","type":"text"}},{"options":{"left":244.5,"top":33,"height":16,"width":245,"field":"mold_master_name","fontSize":15,"title":"模具师傅","right":469.5,"bottom":49,"vCenter":363.75,"hCenter":41,"coordinateSync":false,"widthHeightSync":false,"qrCodeLevel":0},"printElementType":{"title":"模具师傅","type":"text"}},{"options":{"left":33,"top":124.5,"height":16,"width":210,"field":"progress","fontSize":15,"title":"进度","right":206.25,"bottom":137.5,"vCenter":120,"hCenter":129.5,"coordinateSync":false,"widthHeightSync":false,"qrCodeLevel":0},"printElementType":{"title":"进度","type":"text"}},{"options":{"left":34.5,"top":33,"height":16,"width":210,"field":"code","fontSize":15,"title":"编号","right":234.75,"bottom":49,"vCenter":135.75,"hCenter":41,"coordinateSync":false,"widthHeightSync":false,"qrCodeLevel":0},"printElementType":{"title":"编号","type":"text"}},{"options":{"left":244.5,"top":46.5,"height":16,"width":245,"field":"mold_name","fontSize":15,"title":"模具","coordinateSync":false,"widthHeightSync":false,"qrCodeLevel":0,"right":479.25,"bottom":37,"vCenter":339,"hCenter":29},"printElementType":{"title":"模具","type":"text"}},{"options":{"left":34.5,"top":78,"height":16,"width":210,"field":"draw2D_time","fontSize":15,"title":"出2D时间","right":576,"bottom":39.25,"vCenter":494.25,"hCenter":31.25,"coordinateSync":false,"widthHeightSync":false,"qrCodeLevel":0},"printElementType":{"title":"出2D时间","type":"text"}},{"options":{"left":34.5,"top":46.5,"height":16,"width":210,"field":"order_code","fontSize":15,"title":"订单","right":162,"bottom":26.5,"vCenter":84,"hCenter":18.5,"coordinateSync":false,"widthHeightSync":false,"qrCodeLevel":0},"printElementType":{"title":"订单编号","type":"text"}},{"options":{"left":244.5,"top":78,"height":16,"width":245,"field":"draw_start_time","fontSize":15,"title":"画图时间","right":435.75,"bottom":94,"vCenter":348,"hCenter":86,"coordinateSync":false,"widthHeightSync":false,"qrCodeLevel":0},"printElementType":{"title":"画图时间","type":"text"}},{"options":{"left":244.5,"top":61.5,"height":16,"width":245,"field":"draw_time","fontSize":15,"title":"出图时间","right":336,"bottom":54.25,"vCenter":237,"hCenter":46.25,"coordinateSync":false,"widthHeightSync":false,"qrCodeLevel":0},"printElementType":{"title":"出图时间","type":"text"}},{"options":{"left":36,"top":61.5,"height":16,"width":210,"field":"split_design_time","fontSize":15,"title":"分模设计时间","right":254.25,"bottom":74.5,"vCenter":145.5,"hCenter":66.5,"coordinateSync":false,"widthHeightSync":false,"qrCodeLevel":0},"printElementType":{"title":"分模设计时间","type":"text"}},{"options":{"left":34.5,"top":94.5,"height":16,"width":210,"field":"rubber","fontSize":15,"title":"胶件材质/缩水","right":237,"bottom":112.75,"vCenter":138,"hCenter":104.75,"coordinateSync":false,"widthHeightSync":false,"qrCodeLevel":0},"printElementType":{"title":"胶件材质/缩水","type":"text"}},{"options":{"left":244.5,"top":94.5,"height":16,"width":245,"field":"hole","fontSize":15,"title":"模具穴数","right":438,"bottom":143.5,"vCenter":333,"hCenter":135.5,"coordinateSync":false,"widthHeightSync":false,"qrCodeLevel":0},"printElementType":{"title":"模具穴数","type":"text"}},{"options":{"left":33,"top":108,"height":16,"width":210,"field":"inlay_deep_hole_time","fontSize":15,"title":"镶件深孔钻到厂","right":410.25,"bottom":90.25,"vCenter":206.25,"hCenter":82.25,"coordinateSync":false,"widthHeightSync":false,"qrCodeLevel":0},"printElementType":{"title":"镶件深孔钻到厂","type":"text"}},{"options":{"left":243,"top":108,"height":16,"width":245,"field":"water","fontSize":15,"title":"入水口类型/位置","right":463.5,"bottom":123.25,"vCenter":359.25,"hCenter":115.25,"coordinateSync":false,"widthHeightSync":false,"qrCodeLevel":0},"printElementType":{"title":"入水口类型/位置","type":"text"}},{"options":{"left":243,"top":124.5,"height":16,"width":300,"field":"problem","fontSize":15,"textAlign":"left","hideTitle":false,"title":"出现问题及建议反馈","right":463.5,"bottom":167.5,"vCenter":318.75,"hCenter":159.5},"printElementType":{"title":"出现问题及建议反馈","type":"text"}},{"options":{"left":36,"top":147,"height":87,"width":525,"tableFooterRepeat":"last","field":"details2","tableHeaderRepeat":"first","fields":[{"field":"component_detail_name","text":"部件"},{"field":"process_detail_name","text":"工序"},{"field":"department_detail_name","text":"部门"},{"field":"progress","text":"进度"},{"field":"prepare_process_time","text":"预备加工日期"},{"field":"plan_complete_time","text":"计划完成时间"},{"field":"send_time","text":"发料时间"},{"field":"complete_time","text":"实际完成时间"},{"field":"remark","text":"备注"}],"coordinateSync":false,"widthHeightSync":false,"right":564,"bottom":234,"vCenter":301.5,"hCenter":190.5,"columns":[[{"width":150,"title":"部件","field":"component_detail_name","checked":true,"columnId":"component_detail_name","fixed":false,"rowspan":1,"colspan":1,"align":"center","tableColumnHeight":30,"tableTextType":"text","tableBarcodeMode":"CODE128A","tableQRCodeLevel":0},{"width":150,"title":"工序","field":"process_detail_name","checked":true,"columnId":"process_detail_name","fixed":false,"rowspan":1,"colspan":1,"align":"center","tableColumnHeight":30,"tableTextType":"text","tableBarcodeMode":"CODE128A","tableQRCodeLevel":0},{"width":150,"title":"\n部门","field":"department_detail_name","checked":true,"columnId":"department_detail_name","fixed":false,"rowspan":1,"colspan":1,"align":"center","tableColumnHeight":"30","tableTextType":"text","tableBarcodeMode":"CODE128A","tableQRCodeLevel":0,"tableSummaryTitle":true,"tableSummary":""},{"width":129.98475,"title":"进度","field":"progress","checked":true,"columnId":"progress","fixed":false,"rowspan":1,"colspan":1,"align":"center","tableColumnHeight":30,"tableTextType":"text","tableBarcodeMode":"CODE128A","tableQRCodeLevel":0},{"width":170.01525,"title":"预备加工日期","field":"prepare_process_time","checked":true,"columnId":"prepare_process_time","fixed":false,"rowspan":1,"colspan":1,"align":"center","tableColumnHeight":30,"tableTextType":"text","tableBarcodeMode":"CODE128A","tableQRCodeLevel":0},{"width":168.12599999999998,"title":"计划完成时间","field":"plan_complete_time","checked":true,"columnId":"plan_complete_time","fixed":false,"rowspan":1,"colspan":1,"align":"center","tableColumnHeight":30,"tableTextType":"text","tableBarcodeMode":"CODE128A","tableQRCodeLevel":0},{"width":131.87400000000002,"title":"发料时间","field":"send_time","checked":true,"columnId":"send_time","fixed":false,"rowspan":1,"colspan":1,"align":"center","tableColumnHeight":30,"tableTextType":"text","tableBarcodeMode":"CODE128A","tableQRCodeLevel":0},{"width":167.41050000000004,"title":"实际完成时间","field":"complete_time","checked":true,"columnId":"complete_time","fixed":false,"rowspan":1,"colspan":1,"align":"center","tableColumnHeight":30,"tableTextType":"text","tableBarcodeMode":"CODE128A","tableQRCodeLevel":0},{"width":132.58949999999996,"title":"备注","field":"remark","checked":true,"columnId":"remark","fixed":false,"rowspan":1,"colspan":1,"align":"center","tableColumnHeight":30,"tableTextType":"text","tableBarcodeMode":"CODE128A","tableQRCodeLevel":0}]]},"printElementType":{"title":"工序列表","type":"table","editable":true,"columnDisplayEditable":true,"columnDisplayIndexEditable":true,"columnTitleEditable":true,"columnResizable":true,"columnAlignEditable":true,"isEnableEditField":true,"isEnableContextMenu":true,"isEnableInsertRow":true,"isEnableDeleteRow":true,"isEnableInsertColumn":true,"isEnableDeleteColumn":true,"isEnableMergeCell":true}}],"paperNumberLeft":541.5,"paperNumberTop":813,"watermarkOptions":{"content":"","rotate":25,"timestamp":false,"format":"YYYY-MM-DD HH:mm"}}]}, - + printTemplate: {"panels":[{"index":0,"name":1,"height":296.6,"width":210,"paperHeader":25.5,"paperFooter":810,"printElements":[{"options":{"left":244.5,"top":33,"height":16,"width":245,"field":"mold_master_name","fontSize":15,"title":"模具师傅","right":469.5,"bottom":49,"vCenter":363.75,"hCenter":41,"coordinateSync":false,"widthHeightSync":false,"qrCodeLevel":0},"printElementType":{"title":"模具师傅","type":"text"}},{"options":{"left":34.5,"top":33,"height":16,"width":210,"field":"code","fontSize":15,"title":"单据编号","right":234.75,"bottom":49,"vCenter":135.75,"hCenter":41,"coordinateSync":false,"widthHeightSync":false,"qrCodeLevel":0},"printElementType":{"title":"编号","type":"text"}},{"options":{"left":489,"top":34.5,"height":70,"width":70,"field":"qrcode","fontSize":15,"fontWeight":"700","textAlign":"center","hideTitle":true,"title":"qrcode","coordinateSync":false,"widthHeightSync":false,"textType":"qrcode","qrCodeLevel":0,"right":557.5,"bottom":102.25,"vCenter":522.5,"hCenter":67.25},"printElementType":{"title":"qrcode","type":"text"}},{"options":{"left":244.5,"top":49.5,"height":16,"width":245,"field":"project_man_name","fontSize":15,"title":"工程师傅","coordinateSync":false,"widthHeightSync":false,"qrCodeLevel":0,"right":479.25,"bottom":37,"vCenter":339,"hCenter":29},"printElementType":{"title":"模具","type":"text"}},{"options":{"left":34.5,"top":49.5,"height":16,"width":210,"field":"order_code","fontSize":15,"title":"订单编号","right":162,"bottom":26.5,"vCenter":84,"hCenter":18.5,"coordinateSync":false,"widthHeightSync":false,"qrCodeLevel":0},"printElementType":{"title":"订单编号","type":"text"}},{"options":{"left":36,"top":67.5,"height":16,"width":210,"field":"manufacture_cycle","fontSize":15,"title":"制作周期","right":254.25,"bottom":74.5,"vCenter":145.5,"hCenter":66.5,"coordinateSync":false,"widthHeightSync":false,"qrCodeLevel":0},"printElementType":{"title":"分模设计时间","type":"text"}},{"options":{"left":36,"top":115.5,"height":87,"width":525,"tableFooterRepeat":"last","field":"details2","tableHeaderRepeat":"first","fields":[{"field":"component_detail_name","text":"部件"},{"field":"process_detail_name","text":"工序"},{"field":"department_detail_name","text":"部门"},{"field":"progress","text":"进度"},{"field":"prepare_process_time","text":"预备加工日期"},{"field":"plan_complete_time","text":"计划完成时间"},{"field":"send_time","text":"发料时间"},{"field":"complete_time","text":"实际完成时间"},{"field":"remark","text":"备注"}],"coordinateSync":false,"widthHeightSync":false,"right":561,"bottom":201.75,"vCenter":298.5,"hCenter":158.25,"columns":[[{"width":150,"title":"部件","field":"component_detail_name","checked":true,"columnId":"component_detail_name","fixed":false,"rowspan":1,"colspan":1,"align":"center","tableColumnHeight":30,"tableTextType":"text","tableBarcodeMode":"CODE128A","tableQRCodeLevel":0},{"width":150,"title":"工序","field":"process_detail_name","checked":true,"columnId":"process_detail_name","fixed":false,"rowspan":1,"colspan":1,"align":"center","tableColumnHeight":30,"tableTextType":"text","tableBarcodeMode":"CODE128A","tableQRCodeLevel":0},{"width":150,"title":"\n部门","field":"department_detail_name","checked":true,"columnId":"department_detail_name","fixed":false,"rowspan":1,"colspan":1,"align":"center","tableColumnHeight":"30","tableTextType":"text","tableBarcodeMode":"CODE128A","tableQRCodeLevel":0,"tableSummaryTitle":true,"tableSummary":""},{"width":129.98475,"title":"进度","field":"progress","checked":true,"columnId":"progress","fixed":false,"rowspan":1,"colspan":1,"align":"center","tableColumnHeight":30,"tableTextType":"text","tableBarcodeMode":"CODE128A","tableQRCodeLevel":0},{"width":170.01525,"title":"预备加工日期","field":"prepare_process_time","checked":true,"columnId":"prepare_process_time","fixed":false,"rowspan":1,"colspan":1,"align":"center","tableColumnHeight":30,"tableTextType":"text","tableBarcodeMode":"CODE128A","tableQRCodeLevel":0},{"width":168.12599999999998,"title":"计划完成时间","field":"plan_complete_time","checked":true,"columnId":"plan_complete_time","fixed":false,"rowspan":1,"colspan":1,"align":"center","tableColumnHeight":30,"tableTextType":"text","tableBarcodeMode":"CODE128A","tableQRCodeLevel":0},{"width":131.87400000000002,"title":"发料时间","field":"send_time","checked":true,"columnId":"send_time","fixed":false,"rowspan":1,"colspan":1,"align":"center","tableColumnHeight":30,"tableTextType":"text","tableBarcodeMode":"CODE128A","tableQRCodeLevel":0},{"width":167.41050000000004,"title":"实际完成时间","field":"complete_time","checked":true,"columnId":"complete_time","fixed":false,"rowspan":1,"colspan":1,"align":"center","tableColumnHeight":30,"tableTextType":"text","tableBarcodeMode":"CODE128A","tableQRCodeLevel":0},{"width":132.58949999999996,"title":"备注","field":"remark","checked":true,"columnId":"remark","fixed":false,"rowspan":1,"colspan":1,"align":"center","tableColumnHeight":30,"tableTextType":"text","tableBarcodeMode":"CODE128A","tableQRCodeLevel":0}]]},"printElementType":{"title":"工序列表","type":"table","editable":true,"columnDisplayEditable":true,"columnDisplayIndexEditable":true,"columnTitleEditable":true,"columnResizable":true,"columnAlignEditable":true,"isEnableEditField":true,"isEnableContextMenu":true,"isEnableInsertRow":true,"isEnableDeleteRow":true,"isEnableInsertColumn":true,"isEnableDeleteColumn":true,"isEnableMergeCell":true}}],"paperNumberLeft":549,"paperNumberTop":810,"watermarkOptions":{"content":"","rotate":25,"timestamp":false,"format":"YYYY-MM-DD HH:mm"}}]}, printTemplateTable1: { "options": { "left": 7.5,