From 4bfd13fa088bfa6ea9940d84f9d7126b35650c9e Mon Sep 17 00:00:00 2001 From: ljx120 <10717296+ljx120@user.noreply.gitee.com> Date: Tue, 21 Jan 2025 17:28:38 +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 | 2 +- common/http/interface.ts | 6 +- pages.json | 12 + pages/Delivery/Delivery.vue | 5 + pages/colorBlank/colorBlank.vue | 10 + pages/customOrder/customOrder.vue | 38 +- pages/customOrder/detail.vue | 5 + pages/customOrder/list.vue | 5 + pages/distribution/distribution.vue | 10 + pages/index/index.vue | 2 +- pages/whiteEmbryo/listSearch.vue | 26 +- pages/whiteEmbryo/w-list.vue | 186 ++++++-- pages/whiteEmbryo/w-scanCode.vue | 36 +- pages/whiteEmbryo/w-warehousing.vue | 5 + pages/whiteEmbryo/warehouse-in-out.vue | 409 ++++++++++++++++++ unpackage/dist/build/web.zip | Bin 0 -> 397430 bytes .../build/web/assets/Delivery-BGmobVJ2.css | 1 + .../build/web/assets/Delivery-CunMR5Jf.css | 1 - .../build/web/assets/colorBlank-BIOKnrVw.css | 1 - .../build/web/assets/colorBlank-C8YF1u6y.css | 1 + ...Ek.js => cshaptx4869-scancode.B3yK47M6.js} | 2 +- .../build/web/assets/customOrder-DCoANw-5.css | 1 + .../build/web/assets/customOrder-TR3mfHnO.css | 1 - .../dist/build/web/assets/detail-D75oF3Xv.css | 1 + .../dist/build/web/assets/detail-YJKEnkos.css | 1 - .../web/assets/distribution-Bie2yIR-.css | 1 - .../web/assets/distribution-CYMa3fsB.css | 1 + ....Q58Mvqav.js => function-call.BxuSyXbr.js} | 2 +- .../dist/build/web/assets/index-BfALSJRh.css | 1 - .../dist/build/web/assets/index-BmHAFK97.js | 25 -- .../dist/build/web/assets/index-BmnJ93Po.js | 25 ++ .../dist/build/web/assets/index-BzlKIp2j.css | 1 + .../dist/build/web/assets/index.BXTZ2GXu.js | 1 + .../dist/build/web/assets/index.CZme52sZ.js | 1 - .../dist/build/web/assets/list-DNevJgzU.css | 1 + .../dist/build/web/assets/list-DbLTLna5.css | 1 - .../build/web/assets/listSearch-CF-C1oPd.css | 1 + .../build/web/assets/listSearch-DJOmvoU-.css | 1 - ...js => pages-Delivery-Delivery.JZJjqA55.js} | 2 +- ...> pages-colorBlank-colorBlank.-t2tQ9-g.js} | 2 +- ...js => pages-colorBlank-defect.0tWtWdgQ.js} | 2 +- ... => pages-colorBlank-physical.C7l2QHuh.js} | 2 +- ...s => pages-colorBlank-quality.BQHwMvgw.js} | 2 +- ...pages-customOrder-customOrder.G9Nco1d-.js} | 2 +- ...s => pages-customOrder-detail.6bMRYe_W.js} | 2 +- ....js => pages-customOrder-list.FOSwzQ18.js} | 2 +- ... pages-distribution-detailCus.AE_Bpocr.js} | 2 +- ...pages-distribution-detailSpot.BLJ-gfn6.js} | 2 +- ...ges-distribution-distribution.BJNtyGJv.js} | 2 +- ...s => pages-documentary-detail.DEDF97Z6.js} | 2 +- ...pages-documentary-documentary.D5RLax83.js} | 2 +- ... pages-documentary-ex-factory.ZPBSfxWT.js} | 2 +- ... => pages-documentary-history.DFDv0n75.js} | 2 +- .../web/assets/pages-index-index.Bss35R5Q.js | 1 - .../web/assets/pages-index-index.D_SnVb_3.js | 1 + ...YXRgU.js => pages-login-login.kdl8Xxex.js} | 2 +- ...> pages-maintenance-m-factory.DH33TjjV.js} | 2 +- ...s => pages-maintenance-m-flow.CeYAXqfA.js} | 2 +- ... => pages-maintenance-m-other.Bc-Ay1sI.js} | 2 +- ...> pages-maintenance-m-process.Cf83vzHC.js} | 2 +- ...es-maintenance-m-requirements.DqKVD7k7.js} | 2 +- ...> pages-maintenance-p-details.BIUlmFck.js} | 2 +- ...ges-maintenance-processOldzmd.Cw8g1y8z.js} | 2 +- ...zCt327.js => pages-spot-audit.lSIWYJ4J.js} | 2 +- ...s8hZRzR.js => pages-spot-list.KBqIwSNF.js} | 2 +- ...VINI8OV.js => pages-spot-pass.C35Gi9cc.js} | 2 +- ...VGo05S3.js => pages-spot-spot.h3SYkIao.js} | 2 +- .../pages-whiteEmbryo-listSearch.UOkb8oBQ.js | 1 + .../pages-whiteEmbryo-listSearch.lYcY7uBU.js | 1 - ... => pages-whiteEmbryo-w-level.Pdc9cCQ3.js} | 2 +- ...whiteEmbryo-w-libraryLocation.6O1cHmMP.js} | 2 +- .../pages-whiteEmbryo-w-list.BFzmBY0Q.js | 1 + .../pages-whiteEmbryo-w-list.DqHunb3d.js | 1 - .../pages-whiteEmbryo-w-scanCode.D6gSr2BP.js | 1 + .../pages-whiteEmbryo-w-scanCode.HOnx6g9y.js | 1 - ...pages-whiteEmbryo-w-suppliers.D4-ca8hk.js} | 2 +- ...pages-whiteEmbryo-w-warehouse.BXevYpVV.js} | 2 +- ...ages-whiteEmbryo-w-warehousing.DoqbWM2I.js | 1 + ...ages-whiteEmbryo-w-warehousing.DwJNcpoY.js | 1 - ...s-whiteEmbryo-warehouse-in-out.CHpvVYld.js | 1 + ....es.CfAKT61c.js => uni-app.es.C4qf4Coy.js} | 2 +- .../dist/build/web/assets/w-list-CcLL3EG8.css | 1 + .../dist/build/web/assets/w-list-DVaZ3Y5z.css | 1 - .../web/assets/w-warehousing-BYCt1LJX.css | 1 + .../web/assets/w-warehousing-D0htSLY6.css | 1 - .../web/assets/warehouse-in-out-C2WxzJsp.css | 1 + unpackage/dist/build/web/index.html | 2 +- 87 files changed, 752 insertions(+), 159 deletions(-) create mode 100644 pages/whiteEmbryo/warehouse-in-out.vue create mode 100644 unpackage/dist/build/web.zip create mode 100644 unpackage/dist/build/web/assets/Delivery-BGmobVJ2.css delete mode 100644 unpackage/dist/build/web/assets/Delivery-CunMR5Jf.css delete mode 100644 unpackage/dist/build/web/assets/colorBlank-BIOKnrVw.css create mode 100644 unpackage/dist/build/web/assets/colorBlank-C8YF1u6y.css rename unpackage/dist/build/web/assets/{cshaptx4869-scancode._CC-rsEk.js => cshaptx4869-scancode.B3yK47M6.js} (99%) create mode 100644 unpackage/dist/build/web/assets/customOrder-DCoANw-5.css delete mode 100644 unpackage/dist/build/web/assets/customOrder-TR3mfHnO.css create mode 100644 unpackage/dist/build/web/assets/detail-D75oF3Xv.css delete mode 100644 unpackage/dist/build/web/assets/detail-YJKEnkos.css delete mode 100644 unpackage/dist/build/web/assets/distribution-Bie2yIR-.css create mode 100644 unpackage/dist/build/web/assets/distribution-CYMa3fsB.css rename unpackage/dist/build/web/assets/{function-call.Q58Mvqav.js => function-call.BxuSyXbr.js} (92%) delete mode 100644 unpackage/dist/build/web/assets/index-BfALSJRh.css delete mode 100644 unpackage/dist/build/web/assets/index-BmHAFK97.js create mode 100644 unpackage/dist/build/web/assets/index-BmnJ93Po.js create mode 100644 unpackage/dist/build/web/assets/index-BzlKIp2j.css create mode 100644 unpackage/dist/build/web/assets/index.BXTZ2GXu.js delete mode 100644 unpackage/dist/build/web/assets/index.CZme52sZ.js create mode 100644 unpackage/dist/build/web/assets/list-DNevJgzU.css delete mode 100644 unpackage/dist/build/web/assets/list-DbLTLna5.css create mode 100644 unpackage/dist/build/web/assets/listSearch-CF-C1oPd.css delete mode 100644 unpackage/dist/build/web/assets/listSearch-DJOmvoU-.css rename unpackage/dist/build/web/assets/{pages-Delivery-Delivery.DVZ7pxrK.js => pages-Delivery-Delivery.JZJjqA55.js} (81%) rename unpackage/dist/build/web/assets/{pages-colorBlank-colorBlank.C9Pyja_7.js => pages-colorBlank-colorBlank.-t2tQ9-g.js} (81%) rename unpackage/dist/build/web/assets/{pages-colorBlank-defect.CR6kubOj.js => pages-colorBlank-defect.0tWtWdgQ.js} (66%) rename unpackage/dist/build/web/assets/{pages-colorBlank-physical.DglhrquR.js => pages-colorBlank-physical.C7l2QHuh.js} (92%) rename unpackage/dist/build/web/assets/{pages-colorBlank-quality.MF_7a_J2.js => pages-colorBlank-quality.BQHwMvgw.js} (96%) rename unpackage/dist/build/web/assets/{pages-customOrder-customOrder.DwO5zo7D.js => pages-customOrder-customOrder.G9Nco1d-.js} (82%) rename unpackage/dist/build/web/assets/{pages-customOrder-detail.DL5WMSWT.js => pages-customOrder-detail.6bMRYe_W.js} (98%) rename unpackage/dist/build/web/assets/{pages-customOrder-list.CiLIBSE-.js => pages-customOrder-list.FOSwzQ18.js} (82%) rename unpackage/dist/build/web/assets/{pages-distribution-detailCus.B5Fv9hff.js => pages-distribution-detailCus.AE_Bpocr.js} (93%) rename unpackage/dist/build/web/assets/{pages-distribution-detailSpot.CtgECLuR.js => pages-distribution-detailSpot.BLJ-gfn6.js} (88%) rename unpackage/dist/build/web/assets/{pages-distribution-distribution.C3lzk2eP.js => pages-distribution-distribution.BJNtyGJv.js} (78%) rename unpackage/dist/build/web/assets/{pages-documentary-detail.ChbBjwtF.js => pages-documentary-detail.DEDF97Z6.js} (82%) rename unpackage/dist/build/web/assets/{pages-documentary-documentary.B_uPwsiI.js => pages-documentary-documentary.D5RLax83.js} (90%) rename unpackage/dist/build/web/assets/{pages-documentary-ex-factory.Dq3gARV3.js => pages-documentary-ex-factory.ZPBSfxWT.js} (81%) rename unpackage/dist/build/web/assets/{pages-documentary-history.Cnnf4Fke.js => pages-documentary-history.DFDv0n75.js} (96%) delete mode 100644 unpackage/dist/build/web/assets/pages-index-index.Bss35R5Q.js create mode 100644 unpackage/dist/build/web/assets/pages-index-index.D_SnVb_3.js rename unpackage/dist/build/web/assets/{pages-login-login.D_8YXRgU.js => pages-login-login.kdl8Xxex.js} (91%) rename unpackage/dist/build/web/assets/{pages-maintenance-m-factory.DvJlAK83.js => pages-maintenance-m-factory.DH33TjjV.js} (56%) rename unpackage/dist/build/web/assets/{pages-maintenance-m-flow.C5czDF-c.js => pages-maintenance-m-flow.CeYAXqfA.js} (82%) rename unpackage/dist/build/web/assets/{pages-maintenance-m-other.BGJPQf4z.js => pages-maintenance-m-other.Bc-Ay1sI.js} (95%) rename unpackage/dist/build/web/assets/{pages-maintenance-m-process.Dja5Rjs_.js => pages-maintenance-m-process.Cf83vzHC.js} (84%) rename unpackage/dist/build/web/assets/{pages-maintenance-m-requirements.DzlX9NnZ.js => pages-maintenance-m-requirements.DqKVD7k7.js} (76%) rename unpackage/dist/build/web/assets/{pages-maintenance-p-details.kFpy48Gm.js => pages-maintenance-p-details.BIUlmFck.js} (97%) rename unpackage/dist/build/web/assets/{pages-maintenance-processOldzmd.mT75xkfw.js => pages-maintenance-processOldzmd.Cw8g1y8z.js} (77%) rename unpackage/dist/build/web/assets/{pages-spot-audit.DRzCt327.js => pages-spot-audit.lSIWYJ4J.js} (94%) rename unpackage/dist/build/web/assets/{pages-spot-list.Bs8hZRzR.js => pages-spot-list.KBqIwSNF.js} (59%) rename unpackage/dist/build/web/assets/{pages-spot-pass.BVINI8OV.js => pages-spot-pass.C35Gi9cc.js} (95%) rename unpackage/dist/build/web/assets/{pages-spot-spot.CVGo05S3.js => pages-spot-spot.h3SYkIao.js} (83%) create mode 100644 unpackage/dist/build/web/assets/pages-whiteEmbryo-listSearch.UOkb8oBQ.js delete mode 100644 unpackage/dist/build/web/assets/pages-whiteEmbryo-listSearch.lYcY7uBU.js rename unpackage/dist/build/web/assets/{pages-whiteEmbryo-w-level.DnpN4ark.js => pages-whiteEmbryo-w-level.Pdc9cCQ3.js} (78%) rename unpackage/dist/build/web/assets/{pages-whiteEmbryo-w-libraryLocation.C1N8lcK3.js => pages-whiteEmbryo-w-libraryLocation.6O1cHmMP.js} (88%) create mode 100644 unpackage/dist/build/web/assets/pages-whiteEmbryo-w-list.BFzmBY0Q.js delete mode 100644 unpackage/dist/build/web/assets/pages-whiteEmbryo-w-list.DqHunb3d.js create mode 100644 unpackage/dist/build/web/assets/pages-whiteEmbryo-w-scanCode.D6gSr2BP.js delete mode 100644 unpackage/dist/build/web/assets/pages-whiteEmbryo-w-scanCode.HOnx6g9y.js rename unpackage/dist/build/web/assets/{pages-whiteEmbryo-w-suppliers.qQGdNPEO.js => pages-whiteEmbryo-w-suppliers.D4-ca8hk.js} (80%) rename unpackage/dist/build/web/assets/{pages-whiteEmbryo-w-warehouse.BShdN90v.js => pages-whiteEmbryo-w-warehouse.BXevYpVV.js} (99%) create mode 100644 unpackage/dist/build/web/assets/pages-whiteEmbryo-w-warehousing.DoqbWM2I.js delete mode 100644 unpackage/dist/build/web/assets/pages-whiteEmbryo-w-warehousing.DwJNcpoY.js create mode 100644 unpackage/dist/build/web/assets/pages-whiteEmbryo-warehouse-in-out.CHpvVYld.js rename unpackage/dist/build/web/assets/{uni-app.es.CfAKT61c.js => uni-app.es.C4qf4Coy.js} (67%) create mode 100644 unpackage/dist/build/web/assets/w-list-CcLL3EG8.css delete mode 100644 unpackage/dist/build/web/assets/w-list-DVaZ3Y5z.css create mode 100644 unpackage/dist/build/web/assets/w-warehousing-BYCt1LJX.css delete mode 100644 unpackage/dist/build/web/assets/w-warehousing-D0htSLY6.css create mode 100644 unpackage/dist/build/web/assets/warehouse-in-out-C2WxzJsp.css diff --git a/common/http/config.ts b/common/http/config.ts index 3778f11..c45f4b3 100644 --- a/common/http/config.ts +++ b/common/http/config.ts @@ -9,7 +9,7 @@ export default { //本地服务 - // base_scm: 'http://192.168.1.222:7002/', + // base_scm: 'http://192.168.1.222:7002', // base_auth:'https://oauth.goodsilk.cn/api',//登录 // base_mes:'https://scm.goodsilk.cn/mes',//面料 // base_process:'https://scm.goodsilk.cn/mes',//工艺 diff --git a/common/http/interface.ts b/common/http/interface.ts index b9896c0..bd15f4a 100644 --- a/common/http/interface.ts +++ b/common/http/interface.ts @@ -5,6 +5,7 @@ /* */ +import { showToast } from 'vant'; import myconfig from '../http/config' // 封装uni.request方法 @@ -71,10 +72,7 @@ function httpRequest(url : string, method : any, data = {}, headerCustom = {}) { }else if(res.data.code === 7777){ resolve(res.data); }else{ - uni.showToast({ - icon:'error', - title:res.data.msg - }) + showToast(res.data.msg) } }, fail: (err) => { diff --git a/pages.json b/pages.json index af95dbe..6369dd1 100644 --- a/pages.json +++ b/pages.json @@ -413,6 +413,18 @@ "bounce": "none" } } + }, + { + "path" : "pages/whiteEmbryo/warehouse-in-out", + "style" : + { + "navigationStyle": "custom", + "enablePullDownRefresh": false, + "disableScroll": true, + "app-plus": { + "bounce": "none" + } + } } ], "globalStyle": { diff --git a/pages/Delivery/Delivery.vue b/pages/Delivery/Delivery.vue index 8f7c15e..97ad436 100644 --- a/pages/Delivery/Delivery.vue +++ b/pages/Delivery/Delivery.vue @@ -542,6 +542,11 @@ height: 30px; padding: 10px 16px 0; } + ::v-deep .select-model .van-picker__confirm, + .select-model .van-picker__confirm { + height: 30px; + padding: 10px 16px 0; + } .search-btn { padding: 1px 8px; diff --git a/pages/colorBlank/colorBlank.vue b/pages/colorBlank/colorBlank.vue index d6fc366..25b2e34 100644 --- a/pages/colorBlank/colorBlank.vue +++ b/pages/colorBlank/colorBlank.vue @@ -539,6 +539,11 @@ height: 30px; padding: 10px 16px 0; } + ::v-deep .select-model .van-picker__confirm, + .select-model .van-picker__confirm { + height: 30px; + padding: 10px 16px 0; + } .search-btn { padding: 1px 8px; @@ -620,6 +625,11 @@ height: 30px; padding: 10px 16px 0; } + ::v-deep .select-model .van-picker__confirm, + .select-model .van-picker__confirm { + height: 30px; + padding: 10px 16px 0; + } .search-btn { padding: 1px 8px; diff --git a/pages/customOrder/customOrder.vue b/pages/customOrder/customOrder.vue index 66f951c..843a168 100644 --- a/pages/customOrder/customOrder.vue +++ b/pages/customOrder/customOrder.vue @@ -124,18 +124,18 @@ form.value.customOrder[typeData.value] = val.selectedOptions[0].value } else if (typeData.value === 'extraOptions') { form.value.orderItems[indexData.value][typeData.value][indexData1.value].value = val.selectedValues[0] - } else if(typeData.value === 'craftFlow'){ - let url='/craftFlows/byName?name='+val.selectedValues[0] - getAction(url).then((res:any)=>{ - if(res.code===200){ - form.value.orderItems[indexData.value].process=JSON.stringify(res.data) + } else if (typeData.value === 'craftFlow') { + let url = '/craftFlows/byName?name=' + val.selectedValues[0] + getAction(url).then((res : any) => { + if (res.code === 200) { + form.value.orderItems[indexData.value].process = JSON.stringify(res.data) form.value.orderItems[indexData.value][typeData.value] = val.selectedValues[0] - }else{ + } else { showToast('请重新选择工艺流程!') form.value.orderItems[indexData.value][typeData.value] = '' } }) - } else{ + } else { form.value.customOrder[typeData.value] = val.selectedValues[0] } showPickerCancel() @@ -154,19 +154,19 @@ popuList.value = nameList.value } else if (typeData.value === 'extraOptions') { popuList.value = otherList.value[indexData.value].options.map((l : any) => ({ text: l.name, value: l.name })) - }else if (typeData.value === 'craftFlow') { - let item={} as any - craftList.value.forEach((l:any)=>{ - if(l.craftName===form.value.orderItems[indexData.value].craft){ - item=l; + } else if (typeData.value === 'craftFlow') { + let item = {} as any + craftList.value.forEach((l : any) => { + if (l.craftName === form.value.orderItems[indexData.value].craft) { + item = l; } }) popuList.value = [] - if(item.flows){ + if (item.flows) { item.flows.forEach((l : any) => { - if(l.bind==='通用') { - popuList.value.push({ value: l.name, text: l.name} ) - } + if (l.bind === '通用') { + popuList.value.push({ value: l.name, text: l.name }) + } }) } } @@ -613,6 +613,12 @@ padding: 10px 16px 0; } + ::v-deep .select-model .van-picker__confirm, + .select-model .van-picker__confirm { + height: 30px; + padding: 10px 16px 0; + } + .search-btn { padding: 1px 8px; border: none; diff --git a/pages/customOrder/detail.vue b/pages/customOrder/detail.vue index 5dd869c..813026e 100644 --- a/pages/customOrder/detail.vue +++ b/pages/customOrder/detail.vue @@ -756,6 +756,11 @@ height: 30px; padding: 10px 16px 0; } + ::v-deep .select-model .van-picker__confirm, + .select-model .van-picker__confirm { + height: 30px; + padding: 10px 16px 0; + } .search-btn { padding: 1px 8px; diff --git a/pages/customOrder/list.vue b/pages/customOrder/list.vue index 194c832..94fc0bc 100644 --- a/pages/customOrder/list.vue +++ b/pages/customOrder/list.vue @@ -299,6 +299,11 @@ height: 30px; padding: 10px 16px 0; } + ::v-deep .select-model .van-picker__confirm, + .select-model .van-picker__confirm { + height: 30px; + padding: 10px 16px 0; + } .search-btn { padding: 1px 8px; diff --git a/pages/distribution/distribution.vue b/pages/distribution/distribution.vue index 8a1aa03..1b30bc4 100644 --- a/pages/distribution/distribution.vue +++ b/pages/distribution/distribution.vue @@ -347,6 +347,11 @@ height: 30px; padding: 10px 16px 0; } + ::v-deep .select-model .van-picker__confirm, + .select-model .van-picker__confirm { + height: 30px; + padding: 10px 16px 0; + } .search-btn { padding: 1px 8px; @@ -428,6 +433,11 @@ height: 30px; padding: 10px 16px 0; } + ::v-deep .select-model .van-picker__confirm, + .select-model .van-picker__confirm { + height: 30px; + padding: 10px 16px 0; + } .search-btn { padding: 1px 8px; diff --git a/pages/index/index.vue b/pages/index/index.vue index 6527ff7..8987879 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -15,7 +15,7 @@ const ListData =ref([ { path: '../whiteEmbryo/listSearch', name: '白胚库存列表', - type:'', + type:'rawFabric', }, { path: '../maintenance/processOldzmd', diff --git a/pages/whiteEmbryo/listSearch.vue b/pages/whiteEmbryo/listSearch.vue index f55a9b1..2d5225b 100644 --- a/pages/whiteEmbryo/listSearch.vue +++ b/pages/whiteEmbryo/listSearch.vue @@ -1,10 +1,9 @@