From 21ee08c899fbccc8a52d79e3422f9baf191b934b Mon Sep 17 00:00:00 2001 From: ljx120 <10717296+ljx120@user.noreply.gitee.com> Date: Thu, 23 Jan 2025 13:30:24 +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/interface.ts | 9 +- pages/whiteEmbryo/w-list.vue | 4 - pages/whiteEmbryo/w-scanCode.vue | 181 +++++++++++------- pages/whiteEmbryo/w-suppliers.vue | 4 +- pages/whiteEmbryo/w-warehousing.vue | 24 ++- unpackage/dist/build/web.zip | Bin 398868 -> 398785 bytes ...02.js => cshaptx4869-scancode.D4BnmIAF.js} | 2 +- .../web/assets/function-call.DSHj1ZhI.js | 1 - .../dist/build/web/assets/index-ChkATNGm.js | 25 +++ .../dist/build/web/assets/index-D2NElrYl.js | 25 --- .../dist/build/web/assets/index.Cv2D9Hyi.js | 1 - .../dist/build/web/assets/index.D3r6f1-Q.js | 1 + .../build/web/assets/listSearch-CDItvcpn.css | 1 + .../build/web/assets/listSearch-Cmk9SYLC.css | 1 - ...js => pages-Delivery-Delivery.DsMLS6WB.js} | 2 +- ...> pages-colorBlank-colorBlank.BRY3v3IT.js} | 2 +- .../pages-colorBlank-defect.BTScGuDE.js | 1 - .../pages-colorBlank-defect.SZD_Hu3b.js | 1 + ... => pages-colorBlank-physical.Bmj5TNUS.js} | 2 +- ...s => pages-colorBlank-quality.BQ5AccqQ.js} | 2 +- ...pages-customOrder-customOrder.BRyW9PZ2.js} | 2 +- .../pages-customOrder-detail.D4u7xJbH.js | 1 + .../pages-customOrder-detail.DjQp3dwl.js | 1 - ....js => pages-customOrder-list.KHEsXTvO.js} | 2 +- ... pages-distribution-detailCus.DWCIxC7s.js} | 2 +- ...pages-distribution-detailSpot.-FHVODdR.js} | 2 +- ...ges-distribution-distribution.BAxNJUHI.js} | 2 +- ...s => pages-documentary-detail.trSTqz3X.js} | 2 +- ...pages-documentary-documentary.DHYfbqn4.js} | 2 +- ... pages-documentary-ex-factory.DCUJJdN8.js} | 2 +- ... => pages-documentary-history.DyZaJ179.js} | 2 +- ...pnm11.js => pages-index-index.U0Mf8OwR.js} | 2 +- ...Zr1Lb.js => pages-login-login.CNBE7DU5.js} | 2 +- .../pages-maintenance-m-factory.CejEHjpL.js | 1 - .../pages-maintenance-m-factory.DF41hNin.js | 1 + .../pages-maintenance-m-flow.3zn9pK4f.js | 1 - .../pages-maintenance-m-flow.CvBspEX0.js | 1 + ... => pages-maintenance-m-other.PglJdQaH.js} | 2 +- .../pages-maintenance-m-process.B53d3kLN.js | 1 + .../pages-maintenance-m-process.C0zJX0G9.js | 1 - ...ges-maintenance-m-requirements.CDhDK8Qj.js | 1 - ...ges-maintenance-m-requirements.CnOV-QX_.js | 1 + ...> pages-maintenance-p-details.DgjP98jb.js} | 2 +- ...ges-maintenance-processOldzmd.CIWMRMPs.js} | 2 +- ...TR5rP8.js => pages-spot-audit.CyOxms2Q.js} | 2 +- ...wh5kR41.js => pages-spot-list.M-8UlMiY.js} | 2 +- ...YG-kbMJ.js => pages-spot-pass.H48Cxy9U.js} | 2 +- ...UvXc1r3.js => pages-spot-spot.C8UBDQBF.js} | 2 +- .../pages-whiteEmbryo-listSearch.CYHt2Enr.js | 1 - .../pages-whiteEmbryo-listSearch.CuFNk3K2.js | 1 + ... => pages-whiteEmbryo-w-level.B63ENZ-2.js} | 2 +- ...-whiteEmbryo-w-libraryLocation.ByrGrt19.js | 1 - ...-whiteEmbryo-w-libraryLocation.DH2o_tDy.js | 1 + .../pages-whiteEmbryo-w-list.DCGLxFye.js | 1 + .../pages-whiteEmbryo-w-list.MWeWL4m1.js | 1 - .../pages-whiteEmbryo-w-scanCode.CaG4mx6K.js | 1 - .../pages-whiteEmbryo-w-scanCode.Czs1ecAU.js | 1 + .../pages-whiteEmbryo-w-suppliers.BS5rdcU_.js | 1 + .../pages-whiteEmbryo-w-suppliers.BVjG1GxP.js | 1 - .../pages-whiteEmbryo-w-warehouse.Bb9bR580.js | 1 - .../pages-whiteEmbryo-w-warehouse.C0ocNo02.js | 1 + ...ages-whiteEmbryo-w-warehousing.CW7sPzQj.js | 1 - ...ages-whiteEmbryo-w-warehousing.CXR6_Fn0.js | 1 + ...-whiteEmbryo-warehouse-in-out.Dt6JR0fD.js} | 2 +- .../build/web/assets/uni-app.es.BJ8ds3I_.js | 1 + .../build/web/assets/uni-app.es.CyjALRV_.js | 1 - .../dist/build/web/assets/w-list-D10WnLei.css | 1 + .../dist/build/web/assets/w-list-rjZGiaya.css | 1 - .../build/web/assets/w-scanCode--46yf-Sp.css | 1 + .../build/web/assets/w-scanCode-xmd7GKJO.css | 1 - .../build/web/assets/w-suppliers-B_bcapg3.css | 1 + .../build/web/assets/w-suppliers-DOeu-ocu.css | 1 - .../web/assets/w-warehousing-DNmdOGbf.css | 1 - .../web/assets/w-warehousing-KN4bpXsl.css | 1 + unpackage/dist/build/web/index.html | 2 +- 75 files changed, 211 insertions(+), 154 deletions(-) rename unpackage/dist/build/web/assets/{cshaptx4869-scancode.C5bz-F02.js => cshaptx4869-scancode.D4BnmIAF.js} (99%) delete mode 100644 unpackage/dist/build/web/assets/function-call.DSHj1ZhI.js create mode 100644 unpackage/dist/build/web/assets/index-ChkATNGm.js delete mode 100644 unpackage/dist/build/web/assets/index-D2NElrYl.js delete mode 100644 unpackage/dist/build/web/assets/index.Cv2D9Hyi.js create mode 100644 unpackage/dist/build/web/assets/index.D3r6f1-Q.js create mode 100644 unpackage/dist/build/web/assets/listSearch-CDItvcpn.css delete mode 100644 unpackage/dist/build/web/assets/listSearch-Cmk9SYLC.css rename unpackage/dist/build/web/assets/{pages-Delivery-Delivery.CS7z32R2.js => pages-Delivery-Delivery.DsMLS6WB.js} (98%) rename unpackage/dist/build/web/assets/{pages-colorBlank-colorBlank.BOd9f-rH.js => pages-colorBlank-colorBlank.BRY3v3IT.js} (97%) delete mode 100644 unpackage/dist/build/web/assets/pages-colorBlank-defect.BTScGuDE.js create mode 100644 unpackage/dist/build/web/assets/pages-colorBlank-defect.SZD_Hu3b.js rename unpackage/dist/build/web/assets/{pages-colorBlank-physical.BUnCV92W.js => pages-colorBlank-physical.Bmj5TNUS.js} (96%) rename unpackage/dist/build/web/assets/{pages-colorBlank-quality.Bbk0Vnx-.js => pages-colorBlank-quality.BQ5AccqQ.js} (96%) rename unpackage/dist/build/web/assets/{pages-customOrder-customOrder.BiSIyKRB.js => pages-customOrder-customOrder.BRyW9PZ2.js} (99%) create mode 100644 unpackage/dist/build/web/assets/pages-customOrder-detail.D4u7xJbH.js delete mode 100644 unpackage/dist/build/web/assets/pages-customOrder-detail.DjQp3dwl.js rename unpackage/dist/build/web/assets/{pages-customOrder-list.CxxAwa-j.js => pages-customOrder-list.KHEsXTvO.js} (97%) rename unpackage/dist/build/web/assets/{pages-distribution-detailCus.D9rV06LZ.js => pages-distribution-detailCus.DWCIxC7s.js} (97%) rename unpackage/dist/build/web/assets/{pages-distribution-detailSpot.ZfZ66YVT.js => pages-distribution-detailSpot.-FHVODdR.js} (97%) rename unpackage/dist/build/web/assets/{pages-distribution-distribution.BDMX6Epl.js => pages-distribution-distribution.BAxNJUHI.js} (96%) rename unpackage/dist/build/web/assets/{pages-documentary-detail.tornFhOT.js => pages-documentary-detail.trSTqz3X.js} (98%) rename unpackage/dist/build/web/assets/{pages-documentary-documentary.DqzkEiJc.js => pages-documentary-documentary.DHYfbqn4.js} (98%) rename unpackage/dist/build/web/assets/{pages-documentary-ex-factory.DIS-17qo.js => pages-documentary-ex-factory.DCUJJdN8.js} (97%) rename unpackage/dist/build/web/assets/{pages-documentary-history.8zLRf77k.js => pages-documentary-history.DyZaJ179.js} (96%) rename unpackage/dist/build/web/assets/{pages-index-index.CXWpnm11.js => pages-index-index.U0Mf8OwR.js} (97%) rename unpackage/dist/build/web/assets/{pages-login-login.CE4Zr1Lb.js => pages-login-login.CNBE7DU5.js} (91%) delete mode 100644 unpackage/dist/build/web/assets/pages-maintenance-m-factory.CejEHjpL.js create mode 100644 unpackage/dist/build/web/assets/pages-maintenance-m-factory.DF41hNin.js delete mode 100644 unpackage/dist/build/web/assets/pages-maintenance-m-flow.3zn9pK4f.js create mode 100644 unpackage/dist/build/web/assets/pages-maintenance-m-flow.CvBspEX0.js rename unpackage/dist/build/web/assets/{pages-maintenance-m-other.zoVd-NWm.js => pages-maintenance-m-other.PglJdQaH.js} (95%) create mode 100644 unpackage/dist/build/web/assets/pages-maintenance-m-process.B53d3kLN.js delete mode 100644 unpackage/dist/build/web/assets/pages-maintenance-m-process.C0zJX0G9.js delete mode 100644 unpackage/dist/build/web/assets/pages-maintenance-m-requirements.CDhDK8Qj.js create mode 100644 unpackage/dist/build/web/assets/pages-maintenance-m-requirements.CnOV-QX_.js rename unpackage/dist/build/web/assets/{pages-maintenance-p-details.YnCz6YKm.js => pages-maintenance-p-details.DgjP98jb.js} (97%) rename unpackage/dist/build/web/assets/{pages-maintenance-processOldzmd.D1PBj4oT.js => pages-maintenance-processOldzmd.CIWMRMPs.js} (96%) rename unpackage/dist/build/web/assets/{pages-spot-audit.CvTR5rP8.js => pages-spot-audit.CyOxms2Q.js} (94%) rename unpackage/dist/build/web/assets/{pages-spot-list.Dwh5kR41.js => pages-spot-list.M-8UlMiY.js} (97%) rename unpackage/dist/build/web/assets/{pages-spot-pass.CYG-kbMJ.js => pages-spot-pass.H48Cxy9U.js} (95%) rename unpackage/dist/build/web/assets/{pages-spot-spot.DUvXc1r3.js => pages-spot-spot.C8UBDQBF.js} (98%) delete mode 100644 unpackage/dist/build/web/assets/pages-whiteEmbryo-listSearch.CYHt2Enr.js create mode 100644 unpackage/dist/build/web/assets/pages-whiteEmbryo-listSearch.CuFNk3K2.js rename unpackage/dist/build/web/assets/{pages-whiteEmbryo-w-level.6jP9k7wH.js => pages-whiteEmbryo-w-level.B63ENZ-2.js} (95%) delete mode 100644 unpackage/dist/build/web/assets/pages-whiteEmbryo-w-libraryLocation.ByrGrt19.js create mode 100644 unpackage/dist/build/web/assets/pages-whiteEmbryo-w-libraryLocation.DH2o_tDy.js create mode 100644 unpackage/dist/build/web/assets/pages-whiteEmbryo-w-list.DCGLxFye.js delete mode 100644 unpackage/dist/build/web/assets/pages-whiteEmbryo-w-list.MWeWL4m1.js delete mode 100644 unpackage/dist/build/web/assets/pages-whiteEmbryo-w-scanCode.CaG4mx6K.js create mode 100644 unpackage/dist/build/web/assets/pages-whiteEmbryo-w-scanCode.Czs1ecAU.js create mode 100644 unpackage/dist/build/web/assets/pages-whiteEmbryo-w-suppliers.BS5rdcU_.js delete mode 100644 unpackage/dist/build/web/assets/pages-whiteEmbryo-w-suppliers.BVjG1GxP.js delete mode 100644 unpackage/dist/build/web/assets/pages-whiteEmbryo-w-warehouse.Bb9bR580.js create mode 100644 unpackage/dist/build/web/assets/pages-whiteEmbryo-w-warehouse.C0ocNo02.js delete mode 100644 unpackage/dist/build/web/assets/pages-whiteEmbryo-w-warehousing.CW7sPzQj.js create mode 100644 unpackage/dist/build/web/assets/pages-whiteEmbryo-w-warehousing.CXR6_Fn0.js rename unpackage/dist/build/web/assets/{pages-whiteEmbryo-warehouse-in-out.DhpsS7DY.js => pages-whiteEmbryo-warehouse-in-out.Dt6JR0fD.js} (98%) create mode 100644 unpackage/dist/build/web/assets/uni-app.es.BJ8ds3I_.js delete mode 100644 unpackage/dist/build/web/assets/uni-app.es.CyjALRV_.js create mode 100644 unpackage/dist/build/web/assets/w-list-D10WnLei.css delete mode 100644 unpackage/dist/build/web/assets/w-list-rjZGiaya.css create mode 100644 unpackage/dist/build/web/assets/w-scanCode--46yf-Sp.css delete mode 100644 unpackage/dist/build/web/assets/w-scanCode-xmd7GKJO.css create mode 100644 unpackage/dist/build/web/assets/w-suppliers-B_bcapg3.css delete mode 100644 unpackage/dist/build/web/assets/w-suppliers-DOeu-ocu.css delete mode 100644 unpackage/dist/build/web/assets/w-warehousing-DNmdOGbf.css create mode 100644 unpackage/dist/build/web/assets/w-warehousing-KN4bpXsl.css diff --git a/common/http/interface.ts b/common/http/interface.ts index bd15f4a..b8f438e 100644 --- a/common/http/interface.ts +++ b/common/http/interface.ts @@ -5,7 +5,7 @@ /* */ -import { showToast } from 'vant'; +import { showDialog, showToast } from 'vant'; import myconfig from '../http/config' // 封装uni.request方法 @@ -72,7 +72,12 @@ function httpRequest(url : string, method : any, data = {}, headerCustom = {}) { }else if(res.data.code === 7777){ resolve(res.data); }else{ - showToast(res.data.msg) + showDialog({ + title: res.data.msg, + }).then(() => { + // on close + }); + // showToast(res.data.msg) } }, fail: (err) => { diff --git a/pages/whiteEmbryo/w-list.vue b/pages/whiteEmbryo/w-list.vue index 0a1f3ea..976fd50 100644 --- a/pages/whiteEmbryo/w-list.vue +++ b/pages/whiteEmbryo/w-list.vue @@ -589,10 +589,6 @@ const msps = ref({}) text-align: center; } - .floot{ - - } - .footer-button { margin: 20px; display: flex; diff --git a/pages/whiteEmbryo/w-scanCode.vue b/pages/whiteEmbryo/w-scanCode.vue index 8e8f6a5..fe67e03 100644 --- a/pages/whiteEmbryo/w-scanCode.vue +++ b/pages/whiteEmbryo/w-scanCode.vue @@ -5,32 +5,61 @@ - 扫描面料编号 + 扫描面料编号 +