diff --git a/pages/modules/wire-board.vue b/pages/modules/wire-board.vue index 8a63860..bdf419c 100644 --- a/pages/modules/wire-board.vue +++ b/pages/modules/wire-board.vue @@ -19,13 +19,13 @@ - 点位1: + 点位1: {{e.point_name1}} {{e.point_name2}} - 点位2: + 点位2: {{e.point_name3}} {{e.point_name4}} diff --git a/utils/getData2.js b/utils/getData2.js index f188ea6..24b94b7 100644 --- a/utils/getData2.js +++ b/utils/getData2.js @@ -26,55 +26,55 @@ export const handLogin = (user, password) => request({ * 人工排产 */ // 工单 -export const manualSortingOrders = () => request({ - url:'api/pda/manualSorting/orders', - data: {} -}) -// export const manualSortingOrders = () => { -// let res = [ -// { -// "workorder_code": "231117001", -// "material_code": "ZJB", -// "material_name": "正极板", -// "workorder_status": "1", -// "operator": null, -// "create_name": "管理员", -// "plan_qty": "1111", -// "real_qty": "0" -// }, -// { -// "workorder_code": "231128002", -// "material_code": "FJB", -// "material_name": "负极板", -// "workorder_status": "3", -// "operator": null, -// "create_name": "管理员", -// "plan_qty": "2222", -// "real_qty": "0" -// }, -// { -// "workorder_code": "231128003", -// "material_code": "BFJB", -// "material_name": "边负极板", -// "workorder_status": "4", -// "operator": 'admin', -// "create_name": "管理员", -// "plan_qty": "1111", -// "real_qty": "0" -// }, -// { -// "workorder_code": "231212003", -// "material_code": "BFJB", -// "material_name": "边负极板", -// "workorder_status": "1", -// "operator": null, -// "create_name": "管理员", -// "plan_qty": "8989767", -// "real_qty": "0" -// } -// ] -// return res -// } +// export const manualSortingOrders = () => request({ +// url:'api/pda/manualSorting/orders', +// data: {} +// }) +export const manualSortingOrders = () => { + let res = [ + { + "workorder_code": "231117001", + "material_code": "ZJB", + "material_name": "正极板", + "workorder_status": "1", + "operator": null, + "create_name": "管理员", + "plan_qty": "1111", + "real_qty": "0" + }, + { + "workorder_code": "231128002", + "material_code": "FJB", + "material_name": "负极板", + "workorder_status": "3", + "operator": null, + "create_name": "管理员", + "plan_qty": "2222", + "real_qty": "0" + }, + { + "workorder_code": "231128003", + "material_code": "BFJB", + "material_name": "边负极板", + "workorder_status": "4", + "operator": 'admin', + "create_name": "管理员", + "plan_qty": "1111", + "real_qty": "0" + }, + { + "workorder_code": "231212003", + "material_code": "BFJB", + "material_name": "边负极板", + "workorder_status": "1", + "operator": null, + "create_name": "管理员", + "plan_qty": "8989767", + "real_qty": "0" + } +] + return res +} // 开工 export const productionScheduling = (code, user) => request({ url:'api/pda/manualSorting/productionScheduling', @@ -96,14 +96,14 @@ export const productionComplete = (code, user) => request({ * 涂板线 */ // 数据 -export const coatedWireIntoStorageTaskShow = () => request({ - url:'api/pda/manualSorting/coatedWireIntoStorageTaskShow', - data: {} -}) -// export const coatedWireIntoStorageTaskShow = () => { -// let res = [{"point_name1":"普涂线01对接位01","point_name2":'普涂线01对接位01',"point_name3":'普涂线01对接位01',"point_name4":'普涂线01对接位01',"task_status":"1","remark":"普涂线01对接位01"}, {"point_name1":"普涂线01对接位01","point_name2":'普涂线01对接位01',"point_name3":'普涂线01对接位01',"point_name4":'普涂线01对接位01',"task_status":"2","remark":"普涂线01对接位01"}, {"point_name1":"普涂线01对接位01","point_name2":'普涂线01对接位01',"point_name3":'普涂线01对接位01',"point_name4":'普涂线01对接位01',"task_status":"3","remark":"普涂线01对接位01"}, {"point_name1":"普涂线01对接位01","point_name2":'普涂线01对接位01',"point_name3":'普涂线01对接位01',"point_name4":'普涂线01对接位01',"task_status":"4","remark":"普涂线01对接位01"}] -// return res -// } +// export const coatedWireIntoStorageTaskShow = () => request({ +// url:'api/pda/manualSorting/coatedWireIntoStorageTaskShow', +// data: {} +// }) +export const coatedWireIntoStorageTaskShow = () => { + let res = [{"point_name1":"普涂线01对接位01","point_name2":'普涂线01对接位01',"point_name3":'普涂线01对接位01',"point_name4":'普涂线01对接位01',"task_status":"1","remark":"普涂线01对接位01"}, {"point_name1":"普涂线01对接位01","point_name2":'普涂线01对接位01',"point_name3":'普涂线01对接位01',"point_name4":'普涂线01对接位01',"task_status":"2","remark":"普涂线01对接位01"}, {"point_name1":"普涂线01对接位01","point_name2":'普涂线01对接位01',"point_name3":'普涂线01对接位01',"point_name4":'普涂线01对接位01',"task_status":"3","remark":"普涂线01对接位01"}, {"point_name1":"普涂线01对接位01","point_name2":'普涂线01对接位01',"point_name3":'普涂线01对接位01',"point_name4":'普涂线01对接位01',"task_status":"4","remark":"普涂线01对接位01"}] + return res +} // 入库 export const coatedWireIntoStorageTask = (code, qty) => request({ url:'api/pda/manualSorting/coatedWireIntoStorageTask', @@ -117,22 +117,22 @@ export const coatedWireIntoStorageTask = (code, qty) => request({ * 物料库存 */ // 物料下拉框 -export const materialList = () => request({ - url:'api/pda/materialList', - data: {} -}) -// export const materialList = () => { -// let res = [{"value":"BFJB","text":"边负极板"},{"value":"FJB","text":"负极板"},{"value":"ZJB","text":"正极板"}] -// return res -// } +// export const materialList = () => request({ +// url:'api/pda/materialList', +// data: {} +// }) +export const materialList = () => { + let res = [{"value":"BFJB","text":"边负极板"},{"value":"FJB","text":"负极板"},{"value":"ZJB","text":"正极板"}] + return res +} // 根据物料获取库存数据 -export const getInventoryMaterialInfo = (code) => request({ - url:'api/pda/getInventoryMaterialInfo', - data: { - material_code: code - } -}) -// export const getInventoryMaterialInfo = (code) => { -// let res = [{"material_code":"FJB","material_name":"负极板","point_code":"01-09-01","point_name":"01排09列01层","vehicle_code":"T202312060006","vehicle_type":"1"}] -// return res -// } \ No newline at end of file +// export const getInventoryMaterialInfo = (code) => request({ +// url:'api/pda/getInventoryMaterialInfo', +// data: { +// material_code: code +// } +// }) +export const getInventoryMaterialInfo = (code) => { + let res = [{"material_code":"FJB","material_name":"负极板","point_code":"01-09-01","point_name":"01排09列01层","vehicle_code":"T202312060006","vehicle_type":"1"}] + return res +} \ No newline at end of file