From d91714fc275d349eae1186c6da3e8b8e6ba3b5ed Mon Sep 17 00:00:00 2001 From: caill <815519168@qq.com> Date: Thu, 25 Apr 2024 09:56:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E5=9B=BA=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/style/layout.css | 8 +- common/style/reset.css | 5 + pages/management/in-storage.vue | 6 +- utils/mork2.js | 520 ++++++++++++++++++++++++++------ 4 files changed, 446 insertions(+), 93 deletions(-) diff --git a/common/style/layout.css b/common/style/layout.css index 3d25a63..a8a66d4 100644 --- a/common/style/layout.css +++ b/common/style/layout.css @@ -190,7 +190,7 @@ uni-button{ } .zd-th-wraper{ width: 100%; - background: center / 110% 100% url(./static/images/grid_bg.png) no-repeat; + background: #001129 center / 110% 100% url(./static/images/grid_bg.png) no-repeat; overflow: hidden; } .zd-sec-th-wraper { @@ -233,7 +233,7 @@ uni-button{ align-items: center; font-size: 12px; line-height: 13px; - height: 30px; + height: 39px; color: #fff; /* padding: 0 5px; */ text-align: center; @@ -247,7 +247,7 @@ uni-button{ align-items: center; font-size: 12px; line-height: 13px; - height: 40px; + height: 52px; color: #fff; background-color: rgba(194, 86, 62, 0.2); padding: 0 5px; @@ -448,8 +448,6 @@ uni-button{ } .zd-pop-th-wraper { background-color: #031328; - position: sticky; - top: 0; } .zd-pop-td { background-color: RGBA(23, 123, 172, 0.4); diff --git a/common/style/reset.css b/common/style/reset.css index ccb1041..60ee351 100644 --- a/common/style/reset.css +++ b/common/style/reset.css @@ -161,4 +161,9 @@ input[type="button"], input[type="submit"], input[type="search"], input[type="re } .nowrap{ white-space: nowrap; +} +.sticky { + position: sticky; + top: 0; + z-index: 10; } \ No newline at end of file diff --git a/pages/management/in-storage.vue b/pages/management/in-storage.vue index 42b9361..96eb8ea 100644 --- a/pages/management/in-storage.vue +++ b/pages/management/in-storage.vue @@ -17,7 +17,7 @@ {{title}} - + 序号 选择 {{crType === 'IN'? '入库单号':'出库单号'}} @@ -66,7 +66,7 @@ {{j+1}} - {{el.code}} + {{el.code}} {{el.zzmc}} {{el.ckmc}} {{el.wlbm}} @@ -95,7 +95,7 @@ {{type === '1' ?'库位修改' : '库位确认'}} - + 序号 物料编号 物料名称 diff --git a/utils/mork2.js b/utils/mork2.js index 0caff32..05ccdfc 100644 --- a/utils/mork2.js +++ b/utils/mork2.js @@ -11,16 +11,16 @@ export const getBillsCount = (area) => { "desc": "操作成功", "result": [ { - "djlx": "CGRKD", - "ywlx": "IN", - "name": "采购入库", - "counts": "1" + "djlx": "XSCKD", + "ywlx": "OUT", + "name": "销售出库", + "counts": "0" }, { "djlx": "CGTHD", "ywlx": "OUT", "name": "采购退货出库", - "counts": "0" + "counts": "7" }, { "djlx": "DBCKD", @@ -28,41 +28,41 @@ export const getBillsCount = (area) => { "name": "调拨出库", "counts": "0" }, + { + "djlx": "WWFLD", + "ywlx": "OUT", + "name": "委外出库", + "counts": "3" + }, + { + "djlx": "LLCKD", + "ywlx": "OUT", + "name": "生产出库", + "counts": "1084" + }, + { + "djlx": "CGRKD", + "ywlx": "IN", + "name": "采购入库", + "counts": "5" + }, + { + "djlx": "LLTHD", + "ywlx": "IN", + "name": "生产退料入库", + "counts": "14" + }, { "djlx": "DBRKD", "ywlx": "IN", "name": "调拨入库", "counts": "0" }, - { - "djlx": "LLCKD", - "ywlx": "OUT", - "name": "生产出库", - "counts": "0" - }, - { - "djlx": "LLTHD", - "ywlx": "IN", - "name": "生产退料入库", - "counts": "0" - }, - { - "djlx": "WWFLD", - "ywlx": "OUT", - "name": "委外出库", - "counts": "0" - }, { "djlx": "WWRKD", "ywlx": "IN", "name": "委外入库", "counts": "0" - }, - { - "djlx": "XSCKD", - "ywlx": "OUT", - "name": "销售出库", - "counts": "0" } ] } @@ -70,69 +70,419 @@ export const getBillsCount = (area) => { } export const easOutInBillPage = (size, page, fuzzy, djlx) => { let res = { - code: 1, - desc: '', - pageNum: '1', - pageSize: '10', - totalElements: '50', - result: [ - {id: '1', code: 'IO20213', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文'}, - {id: '2', code: 'IO20214', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文'}, - {id: '3', code: 'IO20215', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文'}, - {id: '4', code: 'IO20216', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文'}, - {id: '5', code: 'IO20217', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文'}, - {id: '6', code: 'IO20218', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文'}, - {id: '7', code: 'IO20219', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文'}, - {id: '8', code: 'IO20220', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文'}, - {id: '9', code: 'IO20221', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文'}, - {id: '10', code: 'IO20222', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文'}] - } + "pageNum": 1, + "pageSize": 10, + "totalPage": 109, + "totalElements": 1084, + "result": [ + { + "id": "1783279018842394625", + "djid": "btAAAAW8Wd5QCrde", + "djbh": "SOUT04240408783", + "djlx": "LLCKD", + "ywlx": "OUT", + "zzbm": "01.09.07", + "zzmc": "四期智能工厂", + "ckmc": "智能原材料库", + "ckbm": "3.04.001", + "djzt": "提交", + "cjsj": "2024-04-25", + "ywrq": "2024-04-25", + "cjr": "系统", + "btbz": "04.2512804叉车线边库领料", + "cksj": null, + "llr": null, + "djly": "1", + "update_id": null, + "update_name": null, + "update_time": null + }, + { + "id": "1783273986298351616", + "djid": "btAAAAW8WdpQCrde", + "djbh": "SOUT04240408782", + "djlx": "LLCKD", + "ywlx": "OUT", + "zzbm": "01.09.07", + "zzmc": "四期智能工厂", + "ckmc": "智能原材料库", + "ckbm": "3.04.001", + "djzt": "提交", + "cjsj": "2024-04-25", + "ywrq": "2024-04-25", + "cjr": "系统", + "btbz": "叉车12804虚拟库1领料", + "cksj": null, + "llr": null, + "djly": "1", + "update_id": null, + "update_name": null, + "update_time": null + }, + { + "id": "1783283548866875392", + "djid": "btAAAAW8We5QCrde", + "djbh": "SOUT04240408787", + "djlx": "LLCKD", + "ywlx": "OUT", + "zzbm": "01.09.07", + "zzmc": "四期智能工厂", + "ckmc": "智能原材料库", + "ckbm": "3.04.001", + "djzt": "提交", + "cjsj": "2024-04-25", + "ywrq": "2024-04-25", + "cjr": "系统", + "btbz": "叉车12804虚拟库1领料", + "cksj": null, + "llr": null, + "djly": "1", + "update_id": null, + "update_name": null, + "update_time": null + }, + { + "id": "1783279018842394624", + "djid": "btAAAAW8WeJQCrde", + "djbh": "SOUT04240408784", + "djlx": "LLCKD", + "ywlx": "OUT", + "zzbm": "01.09.07", + "zzmc": "四期智能工厂", + "ckmc": "智能原材料库", + "ckbm": "3.04.001", + "djzt": "提交", + "cjsj": "2024-04-25", + "ywrq": "2024-04-25", + "cjr": "系统", + "btbz": "04.2512804叉车线边库领料", + "cksj": null, + "llr": null, + "djly": "1", + "update_id": null, + "update_name": null, + "update_time": null + }, + { + "id": "1783280025932533760", + "djid": "btAAAAW8WeZQCrde", + "djbh": "SOUT04240408785", + "djlx": "LLCKD", + "ywlx": "OUT", + "zzbm": "01.09.07", + "zzmc": "四期智能工厂", + "ckmc": "智能原材料库", + "ckbm": "3.04.001", + "djzt": "提交", + "cjsj": "2024-04-25", + "ywrq": "2024-04-25", + "cjr": "系统", + "btbz": "叉车12804虚拟库1领料", + "cksj": null, + "llr": null, + "djly": "1", + "update_id": null, + "update_name": null, + "update_time": null + }, + { + "id": "1783285814353072129", + "djid": "btAAAAW8Wf5QCrde", + "djbh": "SOUT04240408791", + "djlx": "LLCKD", + "ywlx": "OUT", + "zzbm": "01.09.07", + "zzmc": "四期智能工厂", + "ckmc": "智能原材料库", + "ckbm": "3.04.001", + "djzt": "提交", + "cjsj": "2024-04-25", + "ywrq": "2024-04-25", + "cjr": "系统", + "btbz": "04.2512802堆高车线边库领料", + "cksj": null, + "llr": null, + "djly": "1", + "update_id": null, + "update_name": null, + "update_time": null + }, + { + "id": "1783284303816429569", + "djid": "btAAAAW8WfJQCrde", + "djbh": "SOUT04240408788", + "djlx": "LLCKD", + "ywlx": "OUT", + "zzbm": "01.09.07", + "zzmc": "四期智能工厂", + "ckmc": "智能原材料库", + "ckbm": "3.04.001", + "djzt": "提交", + "cjsj": "2024-04-25", + "ywrq": "2024-04-25", + "cjr": "系统", + "btbz": "叉车12804虚拟库1领料", + "cksj": null, + "llr": null, + "djly": "1", + "update_id": null, + "update_name": null, + "update_time": null + }, + { + "id": "1783285310164176896", + "djid": "btAAAAW8WfdQCrde", + "djbh": "SOUT04240408790", + "djlx": "LLCKD", + "ywlx": "OUT", + "zzbm": "01.09.07", + "zzmc": "四期智能工厂", + "ckmc": "智能原材料库", + "ckbm": "3.04.001", + "djzt": "提交", + "cjsj": "2024-04-25", + "ywrq": "2024-04-25", + "cjr": "系统", + "btbz": "叉车12805门架虚拟库领料", + "cksj": null, + "llr": null, + "djly": "1", + "update_id": null, + "update_name": null, + "update_time": null + }, + { + "id": "1783285814353072130", + "djid": "btAAAAW8Wg9QCrde", + "djbh": "SOUT04240408792", + "djlx": "LLCKD", + "ywlx": "OUT", + "zzbm": "01.09.07", + "zzmc": "四期智能工厂", + "ckmc": "智能原材料库", + "ckbm": "3.04.001", + "djzt": "提交", + "cjsj": "2024-04-25", + "ywrq": "2024-04-25", + "cjr": "系统", + "btbz": "叉车12805门架虚拟库领料", + "cksj": null, + "llr": null, + "djly": "1", + "update_id": null, + "update_name": null, + "update_time": null + }, + { + "id": "1783286569814331392", + "djid": "btAAAAW8WiJQCrde", + "djbh": "SOUT04240408794", + "djlx": "LLCKD", + "ywlx": "OUT", + "zzbm": "01.09.07", + "zzmc": "四期智能工厂", + "ckmc": "智能原材料库", + "ckbm": "3.04.001", + "djzt": "提交", + "cjsj": "2024-04-25", + "ywrq": "2024-04-25", + "cjr": "系统", + "btbz": "04.2512802堆高车线边库领料", + "cksj": null, + "llr": null, + "djly": "1", + "update_id": null, + "update_name": null, + "update_time": null + } + ], + "code": 1, + "desc": "查询成功" +} return res } export const easOutInBillDetailPage = (djid, page, size) => { - let res = {} - if (page === '1') { - res = { - code: '1', - desc: '', - pageNum: '2', - pageSize: '5', - totalElements: '50', - result: [ - {id: '1', code: 'IO20213', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文'}, - {id: '2', code: 'IO20214', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文'}, - {id: '3', code: 'IO20215', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文'}, - {id: '4', code: 'IO20216', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文'}, - {id: '5', code: 'IO20217', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文'}] + let res = { + "pageNum": 1, + "pageSize": 10, + "totalPage": 1, + "totalElements": 1, + "result": [ + { + "flid": "btAAAAW8Wd8Rd0u0", + "id": null, + "djid": "btAAAAW8Wd5QCrde", + "djlx": "LLCKD", + "ywlx": "OUT", + "djbh": "SOUT04240408783", + "zzbm": "01.09.07", + "zzmc": "四期智能工厂", + "btbz": "04.2512804叉车线边库领料", + "djzt": "提交", + "cjsj": "2024-04-25", + "ywrq": "2024-04-25", + "cjr": "系统", + "flxh": "1", + "wlbm": "910200200098", + "wlmc": "螺钉GB70.1-M12x30-8.8", + "ggxh": "内六角圆柱头螺钉GB70.1-M12x30-8.8-c1B", + "pc": null, + "jldw": "PCS", + "jbjldw": "PCS", + "fzjldw": null, + "sl": 1050.00, + "jbsl": "1050", + "kcsl": 0.00, + "tjkwbm": null, + "tjkwmc": null, + "fzsl": "0", + "ckbm": "3.04.001", + "ckmc": "智能原材料库", + "kwbm": null, + "kwmc": null, + "flbz": null, + "sysl": 1050.00, + "code": "1783279018838200320", + "cksj": null, + "llr": null, + "djly": null, + "trackno": null, + "update_id": null, + "update_name": null, + "update_time": null, + "czsl": 0.00 + }, + { + "flid": "btAAAAW8Wd8Rd0u0", + "id": null, + "djid": "btAAAAW8Wd5QCrde", + "djlx": "LLCKD", + "ywlx": "OUT", + "djbh": "SOUT04240408783", + "zzbm": "01.09.07", + "zzmc": "四期智能工厂", + "btbz": "04.2512804叉车线边库领料", + "djzt": "提交", + "cjsj": "2024-04-25", + "ywrq": "2024-04-25", + "cjr": "系统", + "flxh": "1", + "wlbm": "910200200098", + "wlmc": "螺钉GB70.1-M12x30-8.8", + "ggxh": "内六角圆柱头螺钉GB70.1-M12x30-8.8-c1B", + "pc": null, + "jldw": "PCS", + "jbjldw": "PCS", + "fzjldw": null, + "sl": 1050.00, + "jbsl": "1050", + "kcsl": 0.00, + "tjkwbm": null, + "tjkwmc": null, + "fzsl": "0", + "ckbm": "3.04.001", + "ckmc": "智能原材料库", + "kwbm": null, + "kwmc": null, + "flbz": null, + "sysl": 1050.00, + "code": "1783279018838200320", + "cksj": null, + "llr": null, + "djly": null, + "trackno": null, + "update_id": null, + "update_name": null, + "update_time": null, + "czsl": 0.00 } - } else { - res = { - code: '1', - desc: '', - pageNum: '2', - pageSize: '5', - totalElements: '50', - result: [ - {id: '1', code: 'IO20213', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文'}, - {id: '2', code: 'IO20214', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文'}, - {id: '3', code: 'IO20215', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文'}] - } - } + ], + "code": 1, + "desc": "查询成功" +} return res } export const queryInventoryInfo = (arr) => { let res = { - code: '1', - desc: '', - pageNum: '2', - pageSize: '5', - totalElements: '50', - result: [ - {id: '1', code: 'IO20213', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文', qty: '1000'}, - {id: '2', code: 'IO20214', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文', qty: '1000'}, - {id: '3', code: 'IO20215', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文', qty: '1000'}, - {id: '4', code: 'IO20216', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文', qty: '1000'}, - {id: '5', code: 'IO20217', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文', qty: '1000'}] - } + "pageNum": 1, + "pageSize": 10, + "totalPage": 1, + "totalElements": 1, + "result": [ + { + "size": 10, + "page": 0, + "sort": null, + "isAsc": null, + "type": null, + "fuzzy": null, + "is_used": null, + "start_time": null, + "end_time": null, + "doP": { + "startTime": { + "k": [ + "create_time" + ], + "type": "LT" + }, + "endTime": { + "k": [ + "create_time" + ], + "type": "LE" + }, + "sort": { + "k": [ + "sort" + ], + "type": "BY" + }, + "blurry": { + "k": [ + "name" + ], + "type": "LK" + } + }, + "id": null, + "djid": "btAAAAW8Wd5QCrde", + "djlx": "LLCKD", + "ywlx": "OUT", + "djbh": "SOUT04240408783", + "zzbm": "01.09.07", + "zzmc": "四期智能工厂", + "btbz": "04.2512804叉车线边库领料", + "djzt": "提交", + "cjsj": "2024-04-25", + "ywrq": "2024-04-25", + "cjr": "系统", + "flid": "btAAAAW8Wd8Rd0u0", + "flxh": "1", + "wlbm": "910200200098", + "wlmc": "螺钉GB70.1-M12x30-8.8", + "ggxh": "内六角圆柱头螺钉GB70.1-M12x30-8.8-c1B", + "pc": null, + "jldw": "PCS", + "jbjldw": "PCS", + "fzjldw": null, + "sl": 1050, + "jbsl": "1050", + "fzsl": "0", + "ckbm": "3.04.001", + "ckmc": "智能原材料库", + "kwbm": null, + "kwmc": null, + "flbz": null, + "sysl": 1050, + "czsl": 0, + "code": "1783279018838200320", + "cksj": null, + "llr": null + } + ], + "code": 1, + "desc": "查询成功" +} return res } \ No newline at end of file