From a0aac53bef716255f89ff62c49936c6833519468 Mon Sep 17 00:00:00 2001 From: caill <815519168@qq.com> Date: Wed, 24 Apr 2024 16:19:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/style/layout.css | 22 ++--- common/style/reset.css | 4 +- components/SearchBox.vue | 2 +- pages/management/in-storage.vue | 4 +- utils/getData2.js | 141 +------------------------------- utils/mork2.js | 138 +++++++++++++++++++++++++++++++ 6 files changed, 155 insertions(+), 156 deletions(-) create mode 100644 utils/mork2.js diff --git a/common/style/layout.css b/common/style/layout.css index 02a1877..3d25a63 100644 --- a/common/style/layout.css +++ b/common/style/layout.css @@ -420,36 +420,36 @@ uni-button{ } .pop-wraper { position: fixed; - bottom: 10%; + top: 50%; left: 10%; width: 80%; - height: 80%; padding: 1% 2%; background: center / 100% 100% url(./static/images/pop_bg.png) no-repeat; z-index: 102; - transition: all .4s; -} -.pop-wraper_1 { - bottom: 30%; - height: 40%; + transition: all .5s; } .kwcode_wraper { - height: calc(100% - 85px) + height: calc(100% - 85px); + margin: 60px auto; } .pop-title { font-size: 18px; color: #fff; font-family: 'YouSheBiaoTiHei'; line-height: 35px; + padding-left: 20px; } .pop-grid-wraper { width: calc(100% - 30px); - height: calc(100% - 125px); - margin: 20px auto; + height: calc(80vh - 105px); + margin: 0 auto 20px auto; + padding: 0 6px; overflow-y: scroll; } .zd-pop-th-wraper { - background-color: #031328 + 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 a731f57..ccb1041 100644 --- a/common/style/reset.css +++ b/common/style/reset.css @@ -151,10 +151,10 @@ input[type="button"], input[type="submit"], input[type="search"], input[type="re margin-bottom: 20px } .popshow { - transform: translateY(0); + transform: translateY(-50%); } .pophide { - transform: translateY(120%); + transform: translateY(100vh); } .scale8 { transform: scale(0.8) diff --git a/components/SearchBox.vue b/components/SearchBox.vue index 1c90815..d28f711 100644 --- a/components/SearchBox.vue +++ b/components/SearchBox.vue @@ -23,7 +23,7 @@ data() { return { cur: '', - focusState: true + focusState: false }; }, model: { diff --git a/pages/management/in-storage.vue b/pages/management/in-storage.vue index 5e54cab..42b9361 100644 --- a/pages/management/in-storage.vue +++ b/pages/management/in-storage.vue @@ -92,7 +92,7 @@ - + {{type === '1' ?'库位修改' : '库位确认'}} @@ -126,7 +126,7 @@ /> - + diff --git a/utils/getData2.js b/utils/getData2.js index 6b7d7d5..4c7d1ce 100644 --- a/utils/getData2.js +++ b/utils/getData2.js @@ -57,143 +57,4 @@ export const queryInventoryInfo = (arr) => request({ export const easOutInBillDetailUpdate = (arr) => request({ url:'/api/easOutInBillDetail/update', data: arr -}) - -// export const pdaUpdate = () => { -// let res = { -// versionName: '1.0.0', -// androidUrl: 'https://mp-e979e0eb-882b-42b3-a4a1-923ad08ea194.cdn.bspapp.com/cloudstorage/f72ec59f-7b25-487d-a034-fead1b6654c6.apk' -// } -// return res -// } -// export const getBillsCount = (area) => { -// let res = { -// "code": 1, -// "desc": "操作成功", -// "result": [ -// { -// "djlx": "CGRKD", -// "ywlx": "IN", -// "name": "采购入库", -// "counts": "1" -// }, -// { -// "djlx": "CGTHD", -// "ywlx": "OUT", -// "name": "采购退货出库", -// "counts": "0" -// }, -// { -// "djlx": "DBCKD", -// "ywlx": "OUT", -// "name": "调拨出库", -// "counts": "0" -// }, -// { -// "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" -// } -// ] -// } -// return res -// } -// 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_钱丽文'}] -// } -// 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_钱丽文'}] -// } -// } 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_钱丽文'}] -// } -// } -// 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'}] -// } -// return res -// } \ No newline at end of file +}) \ No newline at end of file diff --git a/utils/mork2.js b/utils/mork2.js new file mode 100644 index 0000000..0caff32 --- /dev/null +++ b/utils/mork2.js @@ -0,0 +1,138 @@ +export const pdaUpdate = () => { + let res = { + versionName: '1.0.0', + androidUrl: 'https://mp-e979e0eb-882b-42b3-a4a1-923ad08ea194.cdn.bspapp.com/cloudstorage/f72ec59f-7b25-487d-a034-fead1b6654c6.apk' + } + return res +} +export const getBillsCount = (area) => { + let res = { + "code": 1, + "desc": "操作成功", + "result": [ + { + "djlx": "CGRKD", + "ywlx": "IN", + "name": "采购入库", + "counts": "1" + }, + { + "djlx": "CGTHD", + "ywlx": "OUT", + "name": "采购退货出库", + "counts": "0" + }, + { + "djlx": "DBCKD", + "ywlx": "OUT", + "name": "调拨出库", + "counts": "0" + }, + { + "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" + } + ] +} + return res +} +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_钱丽文'}] + } + 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_钱丽文'}] + } + } 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_钱丽文'}] + } + } + 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'}] + } + return res +} \ No newline at end of file