From 9b0835a7b579948608452f3d36ec03f15957205c Mon Sep 17 00:00:00 2001 From: caill <815519168@qq.com> Date: Fri, 6 Jun 2025 16:05:31 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=83=A8=E5=88=86=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/style/layout.styl | 5 +- common/style/reset.css | 3 ++ components/SearchPopup.vue | 6 +-- locale/en.json | 27 +++++++++- locale/id.json | 29 +++++++++-- locale/zh-Hans.json | 25 +++++++++- pages/SecondPhase/BoxReturn.vue | 6 +-- pages/SecondPhase/DeliveryUnbind.vue | 2 +- pages/SecondPhase/DeliveryUnbindConfirm.vue | 26 +++++----- pages/SecondPhase/EmptyBoxInStore.vue | 2 +- pages/SecondPhase/EmptyBoxOutStore.vue | 10 ++-- pages/SecondPhase/ManMaintain.vue | 4 +- pages/SecondPhase/SubRollPackUnbind.vue | 4 +- pages/SecondPhase/finished/BoxWeight.vue | 6 +-- pages/SecondPhase/finished/ReturnToStore.vue | 8 +-- pages/SecondPhase/finished/abnorToStore.vue | 10 ++-- pages/SecondPhase/lvt/EmptyBox.vue | 8 +-- pages/SecondPhase/point/ErrorOutUnlock.vue | 4 +- pages/SecondPhase/point/ManPass.vue | 8 +-- pages/SecondPhase/point/PointManage.vue | 4 +- pages/SecondPhase/production/BakeProcess.vue | 16 +++--- pages/SecondPhase/production/BoxStock.vue | 12 ++--- pages/SecondPhase/production/ManmadeBake.vue | 16 +++--- pages/SecondPhase/production/PrintTable.vue | 8 +-- pages/SecondPhase/production/SboProcess.vue | 50 +++++++++---------- .../production/SboProdProgress.vue | 28 +++++------ .../SecondPhase/production/SurfaceProcess.vue | 12 ++--- pages/SecondPhase/production/ZjCheck.vue | 14 +++--- pages/SecondPhase/production/ZjContainer.vue | 24 ++++----- pages/SecondPhase/production/ZjInStore.vue | 8 +-- 30 files changed, 229 insertions(+), 156 deletions(-) diff --git a/common/style/layout.styl b/common/style/layout.styl index c8cbaa2..701fcf6 100644 --- a/common/style/layout.styl +++ b/common/style/layout.styl @@ -391,9 +391,12 @@ uni-button:after { box-shadow: 0 0 20rpx 0 rgba(160,160,160,0.7); } .btn-submit { + display: grid; + place-items: center; /* 垂直和水平居中 */ padding: 0; font-size: 28rpx; - line-height: 73rpx; + line-height: 28rpx; + height: 73rpx; border-radius: 10rpx; border-width: 2rpx; border-style: solid; diff --git a/common/style/reset.css b/common/style/reset.css index ebd5935..52702a9 100644 --- a/common/style/reset.css +++ b/common/style/reset.css @@ -140,6 +140,9 @@ input[type="button"], input[type="submit"], input[type="search"], input[type="re .h-50 { height: 50% !important; } +.mgt40 { + margin-top: 40rpx; +} .mgb10 { margin-bottom: 10rpx; } diff --git a/components/SearchPopup.vue b/components/SearchPopup.vue index 2f833fa..eabdef4 100644 --- a/components/SearchPopup.vue +++ b/components/SearchPopup.vue @@ -1,7 +1,7 @@ diff --git a/pages/SecondPhase/DeliveryUnbind.vue b/pages/SecondPhase/DeliveryUnbind.vue index 9fa27f7..87afd44 100644 --- a/pages/SecondPhase/DeliveryUnbind.vue +++ b/pages/SecondPhase/DeliveryUnbind.vue @@ -6,7 +6,7 @@ - {{$t('filter.wooden-box-code')}} + {{$t('filter.box-no')}} diff --git a/pages/SecondPhase/DeliveryUnbindConfirm.vue b/pages/SecondPhase/DeliveryUnbindConfirm.vue index 419687e..2075456 100644 --- a/pages/SecondPhase/DeliveryUnbindConfirm.vue +++ b/pages/SecondPhase/DeliveryUnbindConfirm.vue @@ -5,7 +5,7 @@ - 木箱号 + {{$t('filter.box-no')}} @@ -23,13 +23,13 @@ - - + + - - + + - + @@ -48,9 +48,9 @@ - - - + + + @@ -60,14 +60,14 @@
木箱号点位编码{{$t('filter.box-no')}}{{$t('grid.point-code')}} 点位名称重量产品编码{{$t('grid.weight')}}{{$t('grid.product-code')}} 产品名称订单号{{$t('grid.order-number')}}
- - + + - + - + diff --git a/pages/SecondPhase/EmptyBoxInStore.vue b/pages/SecondPhase/EmptyBoxInStore.vue index 8416300..a111cba 100644 --- a/pages/SecondPhase/EmptyBoxInStore.vue +++ b/pages/SecondPhase/EmptyBoxInStore.vue @@ -6,7 +6,7 @@ - {{$t('filter.wooden-box-code')}} + {{$t('filter.box-no')}} diff --git a/pages/SecondPhase/EmptyBoxOutStore.vue b/pages/SecondPhase/EmptyBoxOutStore.vue index fb97f24..dee75ae 100644 --- a/pages/SecondPhase/EmptyBoxOutStore.vue +++ b/pages/SecondPhase/EmptyBoxOutStore.vue @@ -6,7 +6,7 @@ - 木箱号 + {{$t('filter.box-no')}} @@ -33,15 +33,15 @@
木箱号子卷号{{$t('filter.box-no')}}{{$t('grid.sub-roll-number')}} sap批次 净重 状态订单号{{$t('grid.order-number')}} 客户编码客户名称{{$t('grid.customer-name')}} 幅宽 厚度 长度
- - + + - + @@ -66,7 +66,7 @@ - + diff --git a/pages/SecondPhase/ManMaintain.vue b/pages/SecondPhase/ManMaintain.vue index aaec7ba..5742ebf 100644 --- a/pages/SecondPhase/ManMaintain.vue +++ b/pages/SecondPhase/ManMaintain.vue @@ -21,8 +21,8 @@ - - + + diff --git a/pages/SecondPhase/SubRollPackUnbind.vue b/pages/SecondPhase/SubRollPackUnbind.vue index 77ec54b..7f9ce32 100644 --- a/pages/SecondPhase/SubRollPackUnbind.vue +++ b/pages/SecondPhase/SubRollPackUnbind.vue @@ -6,7 +6,7 @@ - 子卷号 + {{$t('grid.sub-roll-number')}} - + diff --git a/pages/SecondPhase/finished/BoxWeight.vue b/pages/SecondPhase/finished/BoxWeight.vue index ef36658..3f13d36 100644 --- a/pages/SecondPhase/finished/BoxWeight.vue +++ b/pages/SecondPhase/finished/BoxWeight.vue @@ -6,14 +6,14 @@ - 木箱 + {{$t('filter.box-no')}} - 重量 + {{$t('grid.weight')}} @@ -21,7 +21,7 @@ - + diff --git a/pages/SecondPhase/finished/ReturnToStore.vue b/pages/SecondPhase/finished/ReturnToStore.vue index e336463..ebdfcbe 100644 --- a/pages/SecondPhase/finished/ReturnToStore.vue +++ b/pages/SecondPhase/finished/ReturnToStore.vue @@ -5,14 +5,14 @@ - 单据类型 + {{$t('filter.document-type')}} - 木箱号 + {{$t('filter.box-no')}} @@ -20,7 +20,7 @@ - 点位 + {{$t('grid.point-code')}} @@ -29,7 +29,7 @@ - + diff --git a/pages/SecondPhase/finished/abnorToStore.vue b/pages/SecondPhase/finished/abnorToStore.vue index 292e21c..e64029b 100644 --- a/pages/SecondPhase/finished/abnorToStore.vue +++ b/pages/SecondPhase/finished/abnorToStore.vue @@ -5,14 +5,14 @@ - 单据类型 + {{$t('filter.document-type')}} - + - 木箱号 + {{$t('filter.box-no')}} @@ -28,7 +28,7 @@ - 点位 + {{$t('grid.point-code')}} @@ -37,7 +37,7 @@ - + diff --git a/pages/SecondPhase/lvt/EmptyBox.vue b/pages/SecondPhase/lvt/EmptyBox.vue index 56e674d..32474e9 100644 --- a/pages/SecondPhase/lvt/EmptyBox.vue +++ b/pages/SecondPhase/lvt/EmptyBox.vue @@ -20,7 +20,7 @@ - 木箱号 + {{$t('filter.box-no')}} @@ -32,7 +32,7 @@
选择木箱号{{$t('grid.select')}}{{$t('filter.box-no')}} 木箱料号 木箱描述 最大子卷数 木箱长度 木箱宽度 木箱高度载具类型{{$t('filter.vehicle-type')}} 木箱重量 仓位
- + @@ -63,8 +63,8 @@ - - + + diff --git a/pages/SecondPhase/point/ErrorOutUnlock.vue b/pages/SecondPhase/point/ErrorOutUnlock.vue index 3d3759b..48000e4 100644 --- a/pages/SecondPhase/point/ErrorOutUnlock.vue +++ b/pages/SecondPhase/point/ErrorOutUnlock.vue @@ -6,7 +6,7 @@ - 木箱 + {{$t('filter.box-no')}} - 点位 + {{$t('grid.point-code')}} diff --git a/pages/SecondPhase/point/ManPass.vue b/pages/SecondPhase/point/ManPass.vue index 18d4357..fe8f47b 100644 --- a/pages/SecondPhase/point/ManPass.vue +++ b/pages/SecondPhase/point/ManPass.vue @@ -5,16 +5,16 @@ - 载具类型 + {{$t('filter.vehicle-type')}} - + - - + + diff --git a/pages/SecondPhase/point/PointManage.vue b/pages/SecondPhase/point/PointManage.vue index 56cb0e0..e6b1348 100644 --- a/pages/SecondPhase/point/PointManage.vue +++ b/pages/SecondPhase/point/PointManage.vue @@ -6,7 +6,7 @@ - 点位 + {{$t('grid.point-code')}} @@ -14,7 +14,7 @@ - 空轴/母卷 + 空轴/{{$t('filter.mother-roll')}} - 点位 + {{$t('grid.point-code')}} @@ -14,20 +14,20 @@ - 母卷 + {{$t('filter.mother-roll')}} - 温度 + {{$t('filter.temperature')}} - 时间 + {{$t('filter.time')}} @@ -35,10 +35,10 @@ - - - - + + + + diff --git a/pages/SecondPhase/production/BoxStock.vue b/pages/SecondPhase/production/BoxStock.vue index f3010a2..6e3debe 100644 --- a/pages/SecondPhase/production/BoxStock.vue +++ b/pages/SecondPhase/production/BoxStock.vue @@ -6,7 +6,7 @@ - 子卷号 + {{$t('grid.sub-roll-number')}} @@ -18,18 +18,18 @@
木箱号{{$t('filter.box-no')}} 木箱料号 木箱描述 最大子卷数
- + - + + -
木箱号{{$t('filter.box-no')}} 木箱编码点位{{$t('grid.point-code')}} 木箱规格
{{e.box_no}}{{e.material_code}} {{e.material_name}} {{e.struct_code}}{{e.material_code}}
@@ -38,8 +38,8 @@ - - + + diff --git a/pages/SecondPhase/production/ManmadeBake.vue b/pages/SecondPhase/production/ManmadeBake.vue index 2eec15e..35983ae 100644 --- a/pages/SecondPhase/production/ManmadeBake.vue +++ b/pages/SecondPhase/production/ManmadeBake.vue @@ -6,7 +6,7 @@ - 点位 + {{$t('grid.point-code')}} @@ -14,27 +14,27 @@ - 母卷 + {{$t('filter.mother-roll')}} - 温度 + {{$t('filter.temperature')}} - 时间 + {{$t('filter.time')}} - 终点 + {{$t('filter.end')}} @@ -43,9 +43,9 @@ - - - + + + diff --git a/pages/SecondPhase/production/PrintTable.vue b/pages/SecondPhase/production/PrintTable.vue index c199d4a..d7e3d59 100644 --- a/pages/SecondPhase/production/PrintTable.vue +++ b/pages/SecondPhase/production/PrintTable.vue @@ -6,7 +6,7 @@ - 子卷号 + {{$t('grid.sub-roll-number')}} @@ -15,19 +15,19 @@ 打印机 - + 标签类型 - + - + diff --git a/pages/SecondPhase/production/SboProcess.vue b/pages/SecondPhase/production/SboProcess.vue index 4a15f8e..e52cd59 100644 --- a/pages/SecondPhase/production/SboProcess.vue +++ b/pages/SecondPhase/production/SboProcess.vue @@ -5,8 +5,8 @@ - - + + @@ -15,18 +15,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + @@ -51,10 +51,10 @@ - - - - + + + + - - - - + + @@ -90,12 +88,12 @@ title: '', top: 0, initialConditions: [ - { required: false, key: 'scan', label: '点位', value: ''}, - { required: false, key: 'scan', label: '类型', value: '' } + { required: false, key: 'scan', label: this.$t('grid.point-code'), value: ''}, + { required: false, key: 'scan', label: this.$t('filter.mother-roll'), value: '' } ], conditions: [ - { required: false, key: 'scan', label: '点位', value: ''}, - { required: false, key: 'scan', label: '类型', value: '' } + { required: false, key: 'scan', label: this.$t('grid.point-code'), value: ''}, + { required: false, key: 'scan', label: this.$t('filter.mother-roll'), value: '' } ], dataList: [], pkId: '', diff --git a/pages/SecondPhase/production/SboProdProgress.vue b/pages/SecondPhase/production/SboProdProgress.vue index 5253a25..7aaf444 100644 --- a/pages/SecondPhase/production/SboProdProgress.vue +++ b/pages/SecondPhase/production/SboProdProgress.vue @@ -5,14 +5,14 @@ - 区域 + {{$t('filter.area')}} - + - 点位 + {{$t('grid.point-code')}} @@ -20,7 +20,7 @@ - 母卷 + {{$t('grid.mother-roll-number')}} @@ -32,15 +32,15 @@
状态母卷号工单号机台编码产品编码理论长度开始时间结束时间总重量车号生产区域更新时间{{$t('filter.state')}}{{$t('grid.mother-roll-number')}}{{$t('grid.work-order-number')}}{{$t('grid.machine-code')}}{{$t('grid.product-code')}}{{$t('grid.theoretical-length')}}{{$t('grid.start-time')}}{{$t('grid.end-time')}}{{$t('grid.total-weight')}}{{$t('grid.car-number')}}{{$t('grid.production-area')}}{{$t('grid.update-time')}}
- - - - - - - - - + + + + + + + + + @@ -62,7 +62,7 @@ - + diff --git a/pages/SecondPhase/production/SurfaceProcess.vue b/pages/SecondPhase/production/SurfaceProcess.vue index f2fdebd..b7f4cb7 100644 --- a/pages/SecondPhase/production/SurfaceProcess.vue +++ b/pages/SecondPhase/production/SurfaceProcess.vue @@ -6,7 +6,7 @@ - 点位 + {{$t('grid.point-code')}} - 母卷 + {{$t('filter.mother-roll')}} - - - - + + + + diff --git a/pages/SecondPhase/production/ZjCheck.vue b/pages/SecondPhase/production/ZjCheck.vue index 856b5f5..a51e373 100644 --- a/pages/SecondPhase/production/ZjCheck.vue +++ b/pages/SecondPhase/production/ZjCheck.vue @@ -6,29 +6,29 @@ - 子卷号 + {{$t('grid.sub-roll-number')}} - 管制点 + {{$t('filter.control-point')}} - + - 检验结果 + {{$t('filter.inspection-results')}} - + - - + + diff --git a/pages/SecondPhase/production/ZjContainer.vue b/pages/SecondPhase/production/ZjContainer.vue index ac42e7e..6fbc641 100644 --- a/pages/SecondPhase/production/ZjContainer.vue +++ b/pages/SecondPhase/production/ZjContainer.vue @@ -6,7 +6,7 @@ - 子卷号 + {{$t('grid.sub-roll-number')}} @@ -18,13 +18,13 @@
母卷号开始时间预计结束时间机台编码点位编码产品编码理论长度工单号剩余时间(分){{$t('grid.mother-roll-number')}}{{$t('grid.start-time')}}{{$t('grid.expected-end-time')}}{{$t('grid.machine-code')}}{{$t('grid.point-code')}}{{$t('grid.product-code')}}{{$t('grid.theoretical-length')}}{{$t('grid.work-order-number')}}{{$t('grid.remain-time')}}
- - - - - - - + + + + + + + @@ -45,7 +45,7 @@ - + @@ -55,7 +55,7 @@ - + @@ -65,7 +65,7 @@ - + @@ -90,7 +90,7 @@ - + diff --git a/pages/SecondPhase/production/ZjInStore.vue b/pages/SecondPhase/production/ZjInStore.vue index d2637b3..97d8ee7 100644 --- a/pages/SecondPhase/production/ZjInStore.vue +++ b/pages/SecondPhase/production/ZjInStore.vue @@ -6,7 +6,7 @@ - 子卷号 + {{$t('grid.sub-roll-number')}} @@ -27,9 +27,9 @@
选择订单号客户名称子卷号子卷规格子卷重量子管重量{{$t('grid.select')}}{{$t('grid.order-number')}}{{$t('grid.customer-name')}}{{$t('grid.sub-roll-number')}}{{$t('grid.sub-roll')}}{{$t('grid.specifications')}}{{$t('grid.sub-roll')}}{{$t('grid.weight')}}{{$t('grid.subtube')}}{{$t('grid.weight')}} 木箱料号
木箱规格物料名称{{$t('grid.material-name')}} 木箱长度 木箱宽度 木箱高度
- + - + @@ -56,7 +56,7 @@ - + From 1e592249931aa423a64191654a02de40390eb588 Mon Sep 17 00:00:00 2001 From: caill <815519168@qq.com> Date: Tue, 10 Jun 2025 13:24:24 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=83=98=E7=83=A4=E5=B7=A5=E5=BA=8F?= =?UTF-8?q?=E8=B4=A8=E6=A3=80=E4=B8=8D=E5=90=88=E6=A0=BC/=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=AF=8D=E5=8D=B7=E5=86=B3=E7=AD=96=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?/=E6=96=B0=E5=A2=9E=E5=86=B7=E5=8D=B4=E5=8C=BA=E7=94=9F?= =?UTF-8?q?=E7=AE=94=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 16 ++ pages/SecondPhase/production/BakeProcess.vue | 25 ++- pages/SecondPhase/production/MjMake.vue | 76 +++++++++ pages/SecondPhase/production/SboCool.vue | 160 +++++++++++++++++++ pages/SecondPhase/production/SboProcess.vue | 17 -- utils/getData1.js | 11 ++ utils/getData3.js | 22 ++- utils/mork2.js | 4 +- 8 files changed, 304 insertions(+), 27 deletions(-) create mode 100644 pages/SecondPhase/production/MjMake.vue create mode 100644 pages/SecondPhase/production/SboCool.vue diff --git a/pages.json b/pages.json index 6e40ddc..cddb6ec 100644 --- a/pages.json +++ b/pages.json @@ -719,6 +719,22 @@ } } + ,{ + "path" : "pages/SecondPhase/production/MjMake", + "style" : + { + "navigationStyle": "custom" + } + + } + ,{ + "path" : "pages/SecondPhase/production/SboCool", + "style" : + { + "navigationStyle": "custom" + } + + } ], "globalStyle": { // "pageOrientation": "landscape", diff --git a/pages/SecondPhase/production/BakeProcess.vue b/pages/SecondPhase/production/BakeProcess.vue index f52aaf2..75a683a 100644 --- a/pages/SecondPhase/production/BakeProcess.vue +++ b/pages/SecondPhase/production/BakeProcess.vue @@ -23,13 +23,19 @@ {{$t('filter.temperature')}} - + - {{$t('filter.time')}} + {{$t('filter.time')}}(分) - + + + + + 类型 + + @@ -38,7 +44,7 @@ - + @@ -46,7 +52,7 @@ \ No newline at end of file diff --git a/pages/SecondPhase/production/SboCool.vue b/pages/SecondPhase/production/SboCool.vue new file mode 100644 index 0000000..91db4fc --- /dev/null +++ b/pages/SecondPhase/production/SboCool.vue @@ -0,0 +1,160 @@ + + + + + diff --git a/pages/SecondPhase/production/SboProcess.vue b/pages/SecondPhase/production/SboProcess.vue index e52cd59..6df9ce9 100644 --- a/pages/SecondPhase/production/SboProcess.vue +++ b/pages/SecondPhase/production/SboProcess.vue @@ -63,9 +63,6 @@ @clear="handleClear" @search="searchList" > - - - @@ -175,20 +172,6 @@ this.status = 'noMore' } }, - // 新增工单 - async _createOrder () { - this.disabled1 = true - try { - let res = await createOrder(this.conditions[0].value, this.conditions[1].value) - this.disabled1 = false - uni.showToast({ - title: res.message, - icon: 'none' - }) - } catch (e) { - this.disabled1 = false - } - }, // 准备就绪 async _confirmBlanking () { this.disabled2 = true diff --git a/utils/getData1.js b/utils/getData1.js index 50297fd..8936538 100644 --- a/utils/getData1.js +++ b/utils/getData1.js @@ -142,6 +142,17 @@ export const bakingquery = (pcode) => request({ point_code: pcode } }) +// 质检不合格 +export const inCoolOrOven = (pcode, cname, temp, hours, type) => request({ + url: 'api/pda/baking/inCoolOrOven', + data: { + point_code: pcode, + container_name: cname, + temperature: temp, + hours: hours, + type: type, + } +}) /** * 人工烘烤 diff --git a/utils/getData3.js b/utils/getData3.js index 898378f..c005410 100644 --- a/utils/getData3.js +++ b/utils/getData3.js @@ -558,6 +558,26 @@ export const updatePackagePoint = (ivt, code) => request({ * 分切暂存维护(二期-分切管理) */ export const cutCacheInventory = (code, type) => request({ - url:'/api/pda/slitter/cutCacheInventory', + url:'api/pda/slitter/cutCacheInventory', data: {point_code: code, type: type} +}) +/** + * 母卷决策 + */ +export const bakingReBake = (code, type) => request({ + url:'api/pda/baking/reBake', + data: {container_name: code, type: type} +}) +/** + * 冷却区生箔详情 + */ +export const rawQuery = (pcode, cname, parea, page, size) => request({ + url:'api/pda/raw/query', + data: { + point_code: pcode, + container_name: cname, + product_area: parea, + page: page, + size: size + } }) \ No newline at end of file diff --git a/utils/mork2.js b/utils/mork2.js index 6076f02..15ebd47 100644 --- a/utils/mork2.js +++ b/utils/mork2.js @@ -82,7 +82,9 @@ export const allAuthority = () => { {menu_id: '8', title: '子卷装箱', path: '/pages/SecondPhase/production/ZjContainer'}, {menu_id: '8', title: '木箱库存', path: '/pages/SecondPhase/production/BoxStock'}, {menu_id: '8', title: '子卷入库', path: '/pages/SecondPhase/production/ZjInStore'}, - {menu_id: '8', title: '标签打印', path: '/pages/SecondPhase/production/PrintTable'} + {menu_id: '8', title: '标签打印', path: '/pages/SecondPhase/production/PrintTable'}, + {menu_id: '8', title: '母卷决策', path: '/pages/SecondPhase/production/MjMake'}, + {menu_id: '8', title: '冷却区生箔详情', path: '/pages/SecondPhase/production/SboCool'} ]}, {menu_id: '5', path: 'RF03', title: '分切管理', sonTree: [ {menu_id: '1', title: '分切上料', path: '/pages/SecondPhase/slitting/SlittingFeeding'},
木箱码{{$t('filter.box-no')}} 子卷容量产品描述{{$t('grid.product-description')}} sap批次 产品规格(幅宽) 木箱重量