From c195e29835697e0380d7a4788ec9098e2cdecc40 Mon Sep 17 00:00:00 2001 From: caill <815519168@qq.com> Date: Thu, 8 Jun 2023 14:55:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/getData2.js | 2 +- src/pages/modules/workorder/index.vue | 2 +- .../workorder/work-order-assignment.vue | 34 ++++++++++--------- .../modules/workorder/work-order-query.vue | 16 ++++----- .../modules/workorder/work-report-query.vue | 14 ++++---- src/style/layout.styl | 5 +++ src/style/reset.css | 8 ++--- 7 files changed, 44 insertions(+), 37 deletions(-) diff --git a/src/config/getData2.js b/src/config/getData2.js index 6c1fbb8..779f701 100644 --- a/src/config/getData2.js +++ b/src/config/getData2.js @@ -101,7 +101,7 @@ export const getOrderList2 = (code, val, d1, d2) => post('api/produceshiftorder/ realproduceend_date: d2 }) // export const getOrderList2 = (code, val, d1, d2) => { -// let res = {'totalElements': 2, 'content': [{'material_weight': 0.000000, 'down_id': '1', 'down_time': '2023-05-26 10:32:16.706', 'plan_qty': 111, 'is_needmove': true, 'report_qty': 0, 'create_type': '1', 'confirm_id': '20', 'realproducestart_date': '2023-05-26 10:37:00', 'down_name': '管理员', 'material_spec': '清洗S15', 'create_id': '1', 'real_qty': 0, 'current_produce_person_id': '1', 'is_error': false, 'material_name': '直接\\CG\\清洗S15\\EKTC00003', 'realproduceend_date': '2023-05-26 11:07:20', 'workorder_status': '3', 'dq_real_qty': 0, 'workprocedure_id': '1535144356586065920', 'workorder_id': '1661923147433250817', 'create_time': '2023-05-26 10:32:10', 'workorder_code': '230526007', 'nok_qty': 0, 'product_area': 'A1', 'is_delete': false, 'workprocedure_name': '镗孔', 'order_status_name': '完成', 'shift_type_scode': '1', 'repare_qty': 0, 'device_code': 'A1_TK_11', 'order_type_scode': '10', 'material_id': '1528687484865744896', 'planproduceend_date': '2023-05-26 18:30:00', 'person_real_qty': 0, 'planproducestart_date': '2023-05-26 07:30:00', 'is_canupdate_update': true, 'material_code': '24007845L', 'create_name': '管理员'}, {'material_weight': 1.000000, 'down_id': '1', 'down_time': '2023-05-26 14:06:24.182', 'plan_qty': 1234, 'is_needmove': true, 'report_qty': 0, 'create_type': '1', 'confirm_id': '20', 'realproducestart_date': '2023-05-26 14:11:28', 'down_name': '管理员', 'material_spec': '清洗S15', 'create_id': '1', 'real_qty': 0, 'current_produce_person_id': '1', 'is_error': false, 'material_name': '直接\\CG\\清洗S15\\EKTC00003', 'realproduceend_date': '2023-05-26 14:52:54', 'workorder_status': '5', 'dq_real_qty': 0, 'workprocedure_id': '1535144356586065920', 'workorder_id': '1661976821887012864', 'create_time': '2023-05-26 14:05:27', 'workorder_code': '230526010', 'nok_qty': 0, 'product_area': 'A1', 'is_delete': false, 'workprocedure_name': '镗孔', 'order_status_name': '完成', 'shift_type_scode': '1', 'repare_qty': 0, 'device_code': 'A1_TK_11', 'order_type_scode': '10', 'material_id': '1528687484865744896', 'planproduceend_date': '2023-05-26 18:30:00', 'person_real_qty': 0, 'planproducestart_date': '2023-05-26 07:30:00', 'is_canupdate_update': true, 'material_code': '24007845L', 'create_name': '管理员'}], 'code': 200, 'msg': '查询成功'} +// let res = {'totalElements': 8, 'content': [{'material_weight': 25.509000, 'down_id': '1', 'down_time': '2023_06_08 08:52:47.022', 'plan_qty': 4000, 'is_needmove': true, 'report_qty': 0, 'create_type': '2', 'confirm_id': '20', 'realproducestart_date': '2023-06-08 09:40:32', 'down_name': '管理员', 'material_spec': 'L22-TW', 'create_id': '1', 'real_qty': 0, 'current_produce_person_id': '32', 'is_error': false, 'material_name': '90度等径承口弯头\\L22-TW\\ESNA0100037', 'workorder_status': '3', 'dq_real_qty': 1462, 'workprocedure_id': '1535144427977314304', 'workorder_id': '1666608983307325440', 'create_time': '2023_06_08 08:52:00', 'workorder_code': '230608994', 'nok_qty': 0, 'product_area': 'A1', 'is_delete': false, 'workprocedure_name': '推弯一体机', 'shift_type_scode': '1', 'repare_qty': 0, 'device_code': 'A1_TW_22_10', 'order_type_scode': '10', 'material_id': '1528690921384841216', 'planproduceend_date': '2023_06_08 18:30:00', 'person_real_qty': 0, 'planproducestart_date': '2023_06_08 07:30:00', 'is_canupdate_update': true, 'material_code': '24018346S', 'create_name': '导入订单'}, {'material_weight': 25.509000, 'down_id': '1', 'down_time': '2023_06_08 08:52:47.022', 'plan_qty': 4000, 'is_needmove': true, 'report_qty': 0, 'create_type': '2', 'confirm_id': '20', 'realproducestart_date': '2023-06-08 09:41:30', 'down_name': '管理员', 'material_spec': 'L22-TW', 'create_id': '1', 'real_qty': 0, 'current_produce_person_id': '32', 'is_error': false, 'material_name': '90度等径承口弯头\\L22-TW\\ESNA0100037', 'workorder_status': '3', 'dq_real_qty': 1079, 'workprocedure_id': '1535144427977314304', 'workorder_id': '1666608981923205120', 'create_time': '2023_06_08 08:52:00', 'workorder_code': '230608988', 'nok_qty': 0, 'product_area': 'A1', 'is_delete': false, 'workprocedure_name': '推弯一体机', 'shift_type_scode': '1', 'repare_qty': 0, 'device_code': 'A1_TW_22_9', 'order_type_scode': '10', 'material_id': '1528690921384841216', 'planproduceend_date': '2023_06_08 18:30:00', 'person_real_qty': 0, 'planproducestart_date': '2023_06_08 07:30:00', 'is_canupdate_update': true, 'material_code': '24018346S', 'create_name': '导入订单'}, {'material_weight': 12.300000, 'down_id': '1', 'down_time': '2023_06_08 08:52:47.022', 'plan_qty': 4500, 'is_needmove': true, 'report_qty': 0, 'create_type': '2', 'confirm_id': '20', 'realproducestart_date': '2023-06-08 09:42:52', 'down_name': '管理员', 'material_spec': 'L15-BZ', 'create_id': '1', 'real_qty': 0, 'current_produce_person_id': '32', 'is_error': false, 'material_name': '90度等径承口弯头\\L15-BZ\\ESNB0100014TH', 'workorder_status': '3', 'dq_real_qty': 881, 'workprocedure_id': '1535144427977314304', 'workorder_id': '1666608965116628992', 'create_time': '2023_06_08 08:51:56', 'workorder_code': '230608880', 'nok_qty': 0, 'product_area': 'A1', 'is_delete': false, 'workprocedure_name': '推弯一体机', 'shift_type_scode': '1', 'repare_qty': 0, 'device_code': 'A1_TW_15_14', 'order_type_scode': '10', 'material_id': '1528706525558870016', 'planproduceend_date': '2023_06_08 18:30:00', 'person_real_qty': 0, 'planproducestart_date': '2023_06_08 07:30:00', 'is_canupdate_update': true, 'material_code': '24026313S', 'create_name': '导入订单'}, {'material_weight': 12.300000, 'down_id': '1', 'down_time': '2023_06_08 08:52:47.022', 'plan_qty': 4500, 'is_needmove': true, 'report_qty': 0, 'create_type': '2', 'confirm_id': '20', 'realproducestart_date': '2023-06-08 09:42:55', 'down_name': '管理员', 'material_spec': 'L15-BZ', 'create_id': '1', 'real_qty': 0, 'current_produce_person_id': '32', 'is_error': false, 'material_name': '90度等径承口弯头\\L15-BZ\\ESNB0100014TH', 'workorder_status': '3', 'dq_real_qty': 1266, 'workprocedure_id': '1535144427977314304', 'workorder_id': '1666608964407791616', 'create_time': '2023_06_08 08:51:55', 'workorder_code': '230608874', 'nok_qty': 0, 'product_area': 'A1', 'is_delete': false, 'workprocedure_name': '推弯一体机', 'shift_type_scode': '1', 'repare_qty': 0, 'device_code': 'A1_TW_15_13', 'order_type_scode': '10', 'material_id': '1528706525558870016', 'planproduceend_date': '2023_06_08 18:30:00', 'person_real_qty': 0, 'planproducestart_date': '2023_06_08 07:30:00', 'is_canupdate_update': true, 'material_code': '24026313S', 'create_name': '导入订单'}, {'material_weight': 7.799000, 'down_id': '1', 'down_time': '2023_06_08 08:52:47.022', 'plan_qty': 4500, 'is_needmove': true, 'report_qty': 0, 'create_type': '2', 'confirm_id': '20', 'realproducestart_date': '2023-06-08 09:42:58', 'down_name': '管理员', 'material_spec': 'L15-JJ', 'create_id': '1', 'real_qty': 0, 'current_produce_person_id': '32', 'is_error': false, 'material_name': '90度等径承口弯头\\L15-JJ\\ESNF0100007TH', 'workorder_status': '3', 'dq_real_qty': 1701, 'workprocedure_id': '1535144427977314304', 'workorder_id': '1666608962956562432', 'create_time': '2023_06_08 08:51:55', 'workorder_code': '230608868', 'nok_qty': 0, 'product_area': 'A1', 'is_delete': false, 'workprocedure_name': '推弯一体机', 'shift_type_scode': '1', 'repare_qty': 0, 'device_code': 'A1_TW_15_12', 'order_type_scode': '10', 'material_id': '1528707500101210112', 'planproduceend_date': '2023_06_08 18:30:00', 'person_real_qty': 0, 'planproducestart_date': '2023_06_08 07:30:00', 'is_canupdate_update': true, 'material_code': '24026110S', 'create_name': '导入订单'}, {'material_weight': 9.595000, 'down_id': '1', 'down_time': '2023_06_08 08:52:47.022', 'plan_qty': 4500, 'is_needmove': true, 'report_qty': 0, 'create_type': '2', 'confirm_id': '20', 'realproducestart_date': '2023-06-08 10:00:18', 'down_name': '管理员', 'material_spec': 'L15-TW', 'create_id': '1', 'real_qty': 0, 'current_produce_person_id': '32', 'is_error': false, 'material_name': '90度等径承口弯头\\L15-TW\\ESNA0100036TH', 'workorder_status': '3', 'dq_real_qty': 1686, 'workprocedure_id': '1535144427977314304', 'workorder_id': '1666608962138673152', 'create_time': '2023_06_08 08:51:55', 'workorder_code': '230608862', 'nok_qty': 0, 'product_area': 'A1', 'is_delete': false, 'workprocedure_name': '推弯一体机', 'shift_type_scode': '1', 'repare_qty': 0, 'device_code': 'A1_TW_15_10', 'order_type_scode': '10', 'material_id': '1528697804778770432', 'planproduceend_date': '2023_06_08 18:30:00', 'person_real_qty': 0, 'planproducestart_date': '2023_06_08 07:30:00', 'is_canupdate_update': true, 'material_code': '24026217S', 'create_name': '导入订单'}, {'material_weight': 25.509000, 'down_id': '1', 'down_time': '2023_06_08 08:52:47.022', 'plan_qty': 4000, 'is_needmove': true, 'report_qty': 0, 'create_type': '2', 'confirm_id': '20', 'realproducestart_date': '2023-06-08 10:00:37', 'down_name': '管理员', 'material_spec': 'L22-TW', 'create_id': '1', 'real_qty': 0, 'current_produce_person_id': '32', 'is_error': false, 'material_name': '90度等径承口弯头\\L22-TW\\ESNA0100037', 'workorder_status': '3', 'dq_real_qty': 0, 'workprocedure_id': '1535144427977314304', 'workorder_id': '1666608984464953344', 'create_time': '2023_06_08 08:52:00', 'workorder_code': '2306081000', 'nok_qty': 0, 'product_area': 'A1', 'is_delete': false, 'workprocedure_name': '推弯一体机', 'shift_type_scode': '1', 'repare_qty': 0, 'device_code': 'A1_TW_22_11', 'order_type_scode': '10', 'material_id': '1528690921384841216', 'planproduceend_date': '2023_06_08 18:30:00', 'person_real_qty': 0, 'planproducestart_date': '2023_06_08 07:30:00', 'is_canupdate_update': true, 'material_code': '24018346S', 'create_name': '导入订单'}, {'material_weight': 25.509000, 'down_id': '1', 'down_time': '2023_06_08 08:52:47.022', 'plan_qty': 4000, 'is_needmove': true, 'report_qty': 0, 'create_type': '2', 'confirm_id': '20', 'realproducestart_date': '2023-06-08 10:00:41', 'down_name': '管理员', 'material_spec': 'L22-TW', 'create_id': '1', 'real_qty': 0, 'current_produce_person_id': '32', 'is_error': false, 'material_name': '90度等径承口弯头\\L22-TW\\ESNA0100037', 'workorder_status': '3', 'dq_real_qty': 23, 'workprocedure_id': '1535144427977314304', 'workorder_id': '1666608985345757184', 'create_time': '2023_06_08 08:52:00', 'workorder_code': '230608004', 'nok_qty': 0, 'product_area': 'A1', 'is_delete': false, 'workprocedure_name': '推弯一体机', 'shift_type_scode': '1', 'repare_qty': 0, 'device_code': 'A1_TW_22_12', 'order_type_scode': '10', 'material_id': '1528690921384841216', 'planproduceend_date': '2023_06_08 18:30:00', 'person_real_qty': 0, 'planproducestart_date': '2023_06_08 07:30:00', 'is_canupdate_update': true, 'material_code': '24018346S', 'create_name': '导入订单'}, {workprocedure_id: '1', 'real_qty': 0, 'plan_qty': 4500}, {workprocedure_id: '2', 'real_qty': 0, 'plan_qty': 4500}, {workprocedure_id: '3', 'real_qty': 0, 'plan_qty': 4500}, {workprocedure_id: '4', 'real_qty': 0, 'plan_qty': 4500}], 'code': 200, 'msg': '查询成功'} // return res // } diff --git a/src/pages/modules/workorder/index.vue b/src/pages/modules/workorder/index.vue index e5578fb..c978098 100644 --- a/src/pages/modules/workorder/index.vue +++ b/src/pages/modules/workorder/index.vue @@ -64,7 +64,7 @@ export default { data () { return { - userName: this.$store.getters.userInfo !== '' ? JSON.parse(this.$store.getters.userInfo).username : '', + userName: this.$store.getters.userInfo !== '' ? JSON.parse(this.$store.getters.userInfo).person_name : '', timer: null, time: '', date: '', diff --git a/src/pages/modules/workorder/work-order-assignment.vue b/src/pages/modules/workorder/work-order-assignment.vue index e2245b2..31f57de 100644 --- a/src/pages/modules/workorder/work-order-assignment.vue +++ b/src/pages/modules/workorder/work-order-assignment.vue @@ -26,31 +26,33 @@
- - - + + + - - - - - - - - + + + + + + + + + - - + - + - + + diff --git a/src/pages/modules/workorder/work-order-query.vue b/src/pages/modules/workorder/work-order-query.vue index 38048cf..c1c46ba 100644 --- a/src/pages/modules/workorder/work-order-query.vue +++ b/src/pages/modules/workorder/work-order-query.vue @@ -43,25 +43,25 @@
工单日期工单号工单日期工单号 状态设备物料名称物料规格工序计划生产待生产已生产开工时间设备物料规格计划生产电气数量待生产已生产开工时间
+
{{e.create_time}} {{e.workorder_code}} {{e.workorder_status_name}} {{e.device_code}}{{e.material_name}} {{e.material_spec}}{{e.workprocedure_name}} {{e.plan_qty}}{{ e.dq_real_qty }} {{ e.report_qty }} {{ e.real_qty }} {{ e.realproducestart_date }}
- + - - + + - - + + - - + diff --git a/src/pages/modules/workorder/work-report-query.vue b/src/pages/modules/workorder/work-report-query.vue index e0d2c83..8834cfa 100644 --- a/src/pages/modules/workorder/work-report-query.vue +++ b/src/pages/modules/workorder/work-report-query.vue @@ -44,15 +44,15 @@
工单日期 工单号 设备状态物料名称状态物料名称 物料规格 工序 工单数量 实际数量 报废数量 报修数量开始时间开始时间开始时间开始时间
+
{{e.create_time}} {{e.workorder_code}} {{e.device_code}}
- + - + - - + + @@ -60,10 +60,10 @@ - - + diff --git a/src/style/layout.styl b/src/style/layout.styl index c821c5a..4cdaec1 100644 --- a/src/style/layout.styl +++ b/src/style/layout.styl @@ -224,6 +224,7 @@ header .filter-table width 100% text-align center + user-select none th position: sticky; top -1px @@ -384,6 +385,8 @@ input::-webkit-input-placeholder .selected_icon background-color: #fff; color: $red + td + color: $red .overall_lightgreen background linear-gradient(#00d9a1 0%,#00c0a5 30%,#115fae 100%) .body-container @@ -403,5 +406,7 @@ input::-webkit-input-placeholder .selected_icon background-color: #fff; color: #008f8f + td + color: #008f8f .overall_blue background linear-gradient(#031f6d 0%,#011a60 20%,#060346 100%) \ No newline at end of file diff --git a/src/style/reset.css b/src/style/reset.css index 99874a1..936f3bc 100644 --- a/src/style/reset.css +++ b/src/style/reset.css @@ -56,8 +56,8 @@ li { } ::-webkit-scrollbar { - width: 5px; - height: 5px; + width: 15px; + height: 15px; } ::-webkit-scrollbar-track-piece { @@ -66,13 +66,13 @@ li { } ::-webkit-scrollbar-thumb:vertical { - height: 5px; + height: 15px; background-color: rgba(125, 125, 125, 0.7); -webkit-border-radius: 6px; } ::-webkit-scrollbar-thumb:horizontal { - width: 5px; + width: 15px; background-color: rgba(125, 125, 125, 0.7); -webkit-border-radius: 6px; }
工单号 设备 顺序号 班次物料名称物料名称 物料规格开始时间结束时间开始时间结束时间 电气数量 上报合格数 上报报废数操作工 状态
+
{{e.workorder_code}} {{e.device_code}} {{e.seq_number}}