From aca9f37b845d06209a9f200477b6ade14a47a577 Mon Sep 17 00:00:00 2001 From: ljx120 <10717296+ljx120@user.noreply.gitee.com> Date: Mon, 20 Jan 2025 16:42:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=99=BD=E8=83=9A=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/http/config.ts | 6 +- pages.json | 12 ++ pages/index/index.vue | 5 + pages/whiteEmbryo/listSearch.vue | 159 ++++++++++++++++++ pages/whiteEmbryo/w-list.vue | 4 +- pages/whiteEmbryo/w-warehousing.vue | 61 ++++++- unpackage/dist/build/web.zip | Bin 390980 -> 0 bytes ...Cm.js => cshaptx4869-scancode._CC-rsEk.js} | 2 +- ....BYfep2P6.js => function-call.Q58Mvqav.js} | 2 +- .../dist/build/web/assets/index-BfALSJRh.css | 1 + .../dist/build/web/assets/index-BmHAFK97.js | 25 +++ .../dist/build/web/assets/index-BwaJlMxW.css | 1 - .../dist/build/web/assets/index-Dl2paGRZ.js | 25 --- .../{index.BU3LPdeb.js => index.CZme52sZ.js} | 2 +- .../build/web/assets/listSearch-DJOmvoU-.css | 1 + ...js => pages-Delivery-Delivery.DVZ7pxrK.js} | 2 +- ...> pages-colorBlank-colorBlank.C9Pyja_7.js} | 2 +- ...js => pages-colorBlank-defect.CR6kubOj.js} | 2 +- ... => pages-colorBlank-physical.DglhrquR.js} | 2 +- ...s => pages-colorBlank-quality.MF_7a_J2.js} | 2 +- ...pages-customOrder-customOrder.DwO5zo7D.js} | 2 +- ...s => pages-customOrder-detail.DL5WMSWT.js} | 2 +- ....js => pages-customOrder-list.CiLIBSE-.js} | 2 +- ... pages-distribution-detailCus.B5Fv9hff.js} | 2 +- ...pages-distribution-detailSpot.CtgECLuR.js} | 2 +- ...ges-distribution-distribution.C3lzk2eP.js} | 2 +- ...s => pages-documentary-detail.ChbBjwtF.js} | 2 +- ...pages-documentary-documentary.B_uPwsiI.js} | 2 +- ... pages-documentary-ex-factory.Dq3gARV3.js} | 2 +- ... => pages-documentary-history.Cnnf4Fke.js} | 2 +- .../web/assets/pages-index-index.Bss35R5Q.js | 1 + .../web/assets/pages-index-index.WV9btHFt.js | 1 - ...bMiaB.js => pages-login-login.D_8YXRgU.js} | 2 +- ...> pages-maintenance-m-factory.DvJlAK83.js} | 2 +- ...s => pages-maintenance-m-flow.C5czDF-c.js} | 2 +- ... => pages-maintenance-m-other.BGJPQf4z.js} | 2 +- ...> pages-maintenance-m-process.Dja5Rjs_.js} | 2 +- ...es-maintenance-m-requirements.DzlX9NnZ.js} | 2 +- ...> pages-maintenance-p-details.kFpy48Gm.js} | 2 +- ...ges-maintenance-processOldzmd.mT75xkfw.js} | 2 +- ...OtNn_B.js => pages-spot-audit.DRzCt327.js} | 2 +- ...zksCljd.js => pages-spot-list.Bs8hZRzR.js} | 2 +- ...-XDQ1BH.js => pages-spot-pass.BVINI8OV.js} | 2 +- ...vM4YDRE.js => pages-spot-spot.CVGo05S3.js} | 2 +- .../pages-whiteEmbryo-listSearch.lYcY7uBU.js | 1 + ... => pages-whiteEmbryo-w-level.DnpN4ark.js} | 2 +- ...whiteEmbryo-w-libraryLocation.C1N8lcK3.js} | 2 +- .../pages-whiteEmbryo-w-list.DqHunb3d.js | 1 + .../pages-whiteEmbryo-w-list.ZBDJksPb.js | 1 - ... pages-whiteEmbryo-w-scanCode.HOnx6g9y.js} | 2 +- ...pages-whiteEmbryo-w-suppliers.qQGdNPEO.js} | 2 +- ...pages-whiteEmbryo-w-warehouse.BShdN90v.js} | 2 +- ...ages-whiteEmbryo-w-warehousing.CcK8zjg7.js | 1 - ...ages-whiteEmbryo-w-warehousing.DwJNcpoY.js | 1 + ....es.Cu9bI3cZ.js => uni-app.es.CfAKT61c.js} | 2 +- .../dist/build/web/assets/w-list-DVaZ3Y5z.css | 1 + .../dist/build/web/assets/w-list-DXSQZg8J.css | 1 - .../web/assets/w-warehousing-D0htSLY6.css | 1 + .../web/assets/w-warehousing-DhCmriXf.css | 1 - unpackage/dist/build/web/index.html | 2 +- 60 files changed, 304 insertions(+), 81 deletions(-) create mode 100644 pages/whiteEmbryo/listSearch.vue delete mode 100644 unpackage/dist/build/web.zip rename unpackage/dist/build/web/assets/{cshaptx4869-scancode.BpIQd1Cm.js => cshaptx4869-scancode._CC-rsEk.js} (99%) rename unpackage/dist/build/web/assets/{function-call.BYfep2P6.js => function-call.Q58Mvqav.js} (92%) create mode 100644 unpackage/dist/build/web/assets/index-BfALSJRh.css create mode 100644 unpackage/dist/build/web/assets/index-BmHAFK97.js delete mode 100644 unpackage/dist/build/web/assets/index-BwaJlMxW.css delete mode 100644 unpackage/dist/build/web/assets/index-Dl2paGRZ.js rename unpackage/dist/build/web/assets/{index.BU3LPdeb.js => index.CZme52sZ.js} (89%) create mode 100644 unpackage/dist/build/web/assets/listSearch-DJOmvoU-.css rename unpackage/dist/build/web/assets/{pages-Delivery-Delivery.BLCH1Z8y.js => pages-Delivery-Delivery.DVZ7pxrK.js} (88%) rename unpackage/dist/build/web/assets/{pages-colorBlank-colorBlank.DLWzhdqM.js => pages-colorBlank-colorBlank.C9Pyja_7.js} (79%) rename unpackage/dist/build/web/assets/{pages-colorBlank-defect.t6MFhiYv.js => pages-colorBlank-defect.CR6kubOj.js} (95%) rename unpackage/dist/build/web/assets/{pages-colorBlank-physical.uYm4Hrel.js => pages-colorBlank-physical.DglhrquR.js} (96%) rename unpackage/dist/build/web/assets/{pages-colorBlank-quality.DaGLrAxj.js => pages-colorBlank-quality.MF_7a_J2.js} (96%) rename unpackage/dist/build/web/assets/{pages-customOrder-customOrder.CHzva3Er.js => pages-customOrder-customOrder.DwO5zo7D.js} (89%) rename unpackage/dist/build/web/assets/{pages-customOrder-detail.DFp7An4a.js => pages-customOrder-detail.DL5WMSWT.js} (84%) rename unpackage/dist/build/web/assets/{pages-customOrder-list.JnYeRHHc.js => pages-customOrder-list.CiLIBSE-.js} (83%) rename unpackage/dist/build/web/assets/{pages-distribution-detailCus.CJsW9z88.js => pages-distribution-detailCus.B5Fv9hff.js} (80%) rename unpackage/dist/build/web/assets/{pages-distribution-detailSpot.CUTLQwQU.js => pages-distribution-detailSpot.CtgECLuR.js} (80%) rename unpackage/dist/build/web/assets/{pages-distribution-distribution.DNS7vnQ5.js => pages-distribution-distribution.C3lzk2eP.js} (86%) rename unpackage/dist/build/web/assets/{pages-documentary-detail.CdOisL5S.js => pages-documentary-detail.ChbBjwtF.js} (84%) rename unpackage/dist/build/web/assets/{pages-documentary-documentary.BVXBQXkQ.js => pages-documentary-documentary.B_uPwsiI.js} (93%) rename unpackage/dist/build/web/assets/{pages-documentary-ex-factory.CyNF4AlQ.js => pages-documentary-ex-factory.Dq3gARV3.js} (83%) rename unpackage/dist/build/web/assets/{pages-documentary-history.CzHprnm4.js => pages-documentary-history.Cnnf4Fke.js} (96%) create mode 100644 unpackage/dist/build/web/assets/pages-index-index.Bss35R5Q.js delete mode 100644 unpackage/dist/build/web/assets/pages-index-index.WV9btHFt.js rename unpackage/dist/build/web/assets/{pages-login-login.CSybMiaB.js => pages-login-login.D_8YXRgU.js} (91%) rename unpackage/dist/build/web/assets/{pages-maintenance-m-factory.BxSVeD9h.js => pages-maintenance-m-factory.DvJlAK83.js} (92%) rename unpackage/dist/build/web/assets/{pages-maintenance-m-flow.C4tAAtMe.js => pages-maintenance-m-flow.C5czDF-c.js} (86%) rename unpackage/dist/build/web/assets/{pages-maintenance-m-other.DaFIkgW1.js => pages-maintenance-m-other.BGJPQf4z.js} (95%) rename unpackage/dist/build/web/assets/{pages-maintenance-m-process.CUEIHjS_.js => pages-maintenance-m-process.Dja5Rjs_.js} (84%) rename unpackage/dist/build/web/assets/{pages-maintenance-m-requirements.DtW6phxy.js => pages-maintenance-m-requirements.DzlX9NnZ.js} (69%) rename unpackage/dist/build/web/assets/{pages-maintenance-p-details.BWe_lDzq.js => pages-maintenance-p-details.kFpy48Gm.js} (97%) rename unpackage/dist/build/web/assets/{pages-maintenance-processOldzmd.CNBvdd-D.js => pages-maintenance-processOldzmd.mT75xkfw.js} (72%) rename unpackage/dist/build/web/assets/{pages-spot-audit.CSOtNn_B.js => pages-spot-audit.DRzCt327.js} (94%) rename unpackage/dist/build/web/assets/{pages-spot-list.lzksCljd.js => pages-spot-list.Bs8hZRzR.js} (85%) rename unpackage/dist/build/web/assets/{pages-spot-pass.D-XDQ1BH.js => pages-spot-pass.BVINI8OV.js} (95%) rename unpackage/dist/build/web/assets/{pages-spot-spot.WvM4YDRE.js => pages-spot-spot.CVGo05S3.js} (81%) create mode 100644 unpackage/dist/build/web/assets/pages-whiteEmbryo-listSearch.lYcY7uBU.js rename unpackage/dist/build/web/assets/{pages-whiteEmbryo-w-level.1m6i3i-f.js => pages-whiteEmbryo-w-level.DnpN4ark.js} (95%) rename unpackage/dist/build/web/assets/{pages-whiteEmbryo-w-libraryLocation.BDyJUvKN.js => pages-whiteEmbryo-w-libraryLocation.C1N8lcK3.js} (84%) create mode 100644 unpackage/dist/build/web/assets/pages-whiteEmbryo-w-list.DqHunb3d.js delete mode 100644 unpackage/dist/build/web/assets/pages-whiteEmbryo-w-list.ZBDJksPb.js rename unpackage/dist/build/web/assets/{pages-whiteEmbryo-w-scanCode.D5mop9qh.js => pages-whiteEmbryo-w-scanCode.HOnx6g9y.js} (82%) rename unpackage/dist/build/web/assets/{pages-whiteEmbryo-w-suppliers.BPDBjqvp.js => pages-whiteEmbryo-w-suppliers.qQGdNPEO.js} (90%) rename unpackage/dist/build/web/assets/{pages-whiteEmbryo-w-warehouse.BM4M2lMD.js => pages-whiteEmbryo-w-warehouse.BShdN90v.js} (99%) delete mode 100644 unpackage/dist/build/web/assets/pages-whiteEmbryo-w-warehousing.CcK8zjg7.js create mode 100644 unpackage/dist/build/web/assets/pages-whiteEmbryo-w-warehousing.DwJNcpoY.js rename unpackage/dist/build/web/assets/{uni-app.es.Cu9bI3cZ.js => uni-app.es.CfAKT61c.js} (67%) create mode 100644 unpackage/dist/build/web/assets/w-list-DVaZ3Y5z.css delete mode 100644 unpackage/dist/build/web/assets/w-list-DXSQZg8J.css create mode 100644 unpackage/dist/build/web/assets/w-warehousing-D0htSLY6.css delete mode 100644 unpackage/dist/build/web/assets/w-warehousing-DhCmriXf.css diff --git a/common/http/config.ts b/common/http/config.ts index 2a613a0..3778f11 100644 --- a/common/http/config.ts +++ b/common/http/config.ts @@ -9,9 +9,9 @@ export default { //本地服务 - // base_scm: 'http://192.168.1.23:7002', + // base_scm: 'http://192.168.1.222:7002/', // base_auth:'https://oauth.goodsilk.cn/api',//登录 - // base_mes:'http://192.168.1.23:7002/mes',//面料 - // base_process:'http://192.168.1.23:7002/mes',//工艺 + // base_mes:'https://scm.goodsilk.cn/mes',//面料 + // base_process:'https://scm.goodsilk.cn/mes',//工艺 } \ No newline at end of file diff --git a/pages.json b/pages.json index 144774f..af95dbe 100644 --- a/pages.json +++ b/pages.json @@ -401,6 +401,18 @@ "bounce": "none" } } + }, + { + "path" : "pages/whiteEmbryo/listSearch", + "style" : + { + "navigationStyle": "custom", + "enablePullDownRefresh": false, + "disableScroll": true, + "app-plus": { + "bounce": "none" + } + } } ], "globalStyle": { diff --git a/pages/index/index.vue b/pages/index/index.vue index c4ff2dd..6527ff7 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -12,6 +12,11 @@ import { getAction } from '../../common/http'; import { showFailToast } from 'vant'; const ListData =ref([ + { + path: '../whiteEmbryo/listSearch', + name: '白胚库存列表', + type:'', + }, { path: '../maintenance/processOldzmd', name: '工艺维护', diff --git a/pages/whiteEmbryo/listSearch.vue b/pages/whiteEmbryo/listSearch.vue new file mode 100644 index 0000000..f55a9b1 --- /dev/null +++ b/pages/whiteEmbryo/listSearch.vue @@ -0,0 +1,159 @@ + + + + \ No newline at end of file diff --git a/pages/whiteEmbryo/w-list.vue b/pages/whiteEmbryo/w-list.vue index b455524..0204c51 100644 --- a/pages/whiteEmbryo/w-list.vue +++ b/pages/whiteEmbryo/w-list.vue @@ -65,7 +65,9 @@ } getAction('/rawFabric/search',param).then((res:any)=>{ if(res.code===200){ - list.value = res.data.record + res.data.record.forEach((l:any)=>{ + list.value.push(l) + }) total.value = res.data.total loading.value = false; finished.value = false diff --git a/pages/whiteEmbryo/w-warehousing.vue b/pages/whiteEmbryo/w-warehousing.vue index 3e7a9ea..541c19d 100644 --- a/pages/whiteEmbryo/w-warehousing.vue +++ b/pages/whiteEmbryo/w-warehousing.vue @@ -85,6 +85,23 @@ const handleOpen = () =>{ popuList.value=djList.value.map(l=>({text:l.level,value:l.level})) } } +const searchVal = ref() +const selectValue = ref() +const searchPop = () =>{ + if (timer.value) { + clearTimeout(timer.value) + } + timer.value = setTimeout(() => { + getSeach() + }, 800) +} +function getSeach(){ + let reg = new RegExp(searchVal.value) + let a=popuList.value.find((l:any)=>reg.test(l.text)) + if(a){ + selectValue.value=[a.text] + } +} const onSubmit = () =>{ postAction('/rawFabric',form.value).then((res:any)=>{ @@ -100,8 +117,7 @@ const onSubmit = () =>{ const onClickLeft = () =>{ window.history.back() } -const onClickRight=()=>{ -} + const chooseDate = ()=>{ show.value=true } @@ -261,6 +277,7 @@ const totalMeter = computed(()=>{ }) return [ms.toFixed(1),ps] }) +