diff --git a/.env.development b/.env.development index 9bf7280a..b0854c99 100644 --- a/.env.development +++ b/.env.development @@ -1,10 +1,11 @@ -VITE_BASE_URL=http://172.22.32.9:81/api/admin-api -VITE_BASE_URL_IMAGE=http://172.22.32.9:81/admin-api +VITE_BASE_URL=https://wmscdtest.faway-hella.com/api/admin-api +VITE_BASE_URL_IMAGE=https://wmscdtest.faway-hella.com/api/admin-api + # 租户配置 VITE_TENANT='[{"text":"成都1397","value":2},{"text":"长春2379","value":3}]' -# 是否是测试环境 +# 是否是测试环境 VITE_isDevelopment=true # 积木报表请求路径 diff --git a/src/hybrid/html/pointReceipt.html b/src/hybrid/html/pointReceipt.html new file mode 100644 index 00000000..feb3147c --- /dev/null +++ b/src/hybrid/html/pointReceipt.html @@ -0,0 +1,132 @@ + + + + + + + + + + + + mainBody + + \ No newline at end of file diff --git a/src/pages.json b/src/pages.json index 784e361d..5b5597ec 100644 --- a/src/pages.json +++ b/src/pages.json @@ -2596,6 +2596,12 @@ "navigationBarTitleText": "打印", "enablePullDownRefresh": false } + }, { + "path": "pages/pointReceipt/index", + "style": { + "navigationBarTitleText": "打印", + "enablePullDownRefresh": false + } }, { "path": "pages/pointProductReceipt/index", "style": { diff --git a/src/pages/fg/receiptByPlan.vue b/src/pages/fg/receiptByPlan.vue index a112d5c4..63bafe55 100644 --- a/src/pages/fg/receiptByPlan.vue +++ b/src/pages/fg/receiptByPlan.vue @@ -165,7 +165,12 @@ }, onShow() {}, - onLoad() { + onLoad() { + // let pointData = [{"itemCode":"015.584-017","itemName":"SagitarPA格栅灯高配左灯","packName":"内部围板箱","packageCode":"PN20250117-0000000003","batch":"20250117","parentNumber":null,"itemType":"产成品","asnNumber":null,"supplierCode":null,"qty":1,"printTimes":"2025-01-17 11:21:14","productionLineCode":"PRASL003","barcodeString":"HMQ;V1.0;DPRASL003;F;R;B20250117;PPN20250117-0000000003;I015.584-017;Q1.000000;UPC;C;","barcodeBase64":"","requestNumber":"REC1220250117-0003"},{"itemCode":"015.584-017","itemName":"SagitarPA格栅灯高配左灯","packName":"内部围板箱","packageCode":"PN20250117-0000000003","batch":"20250117","parentNumber":null,"itemType":"产成品","asnNumber":null,"supplierCode":null,"qty":1,"printTimes":"2025-01-17 11:21:14","productionLineCode":"PRASL003","barcodeString":"HMQ;V1.0;DPRASL003;F;R;B20250117;PPN20250117-0000000003;I015.584-017;Q1.000000;UPC;C;","barcodeBase64":"","requestNumber":"REC1220250117-0003"}] + + // uni.navigateTo({ + // url: `/pages/pointReceipt/index?points=${JSON.stringify(pointData)}` + // }); this.options = getRemoveOption() this.openFg(); }, @@ -498,8 +503,11 @@ // #ifdef APP if (pointData.length > 0) { - uni.navigateTo({ - url: `/pages/point/index?points=${JSON.stringify(pointData)}` + // uni.navigateTo({ + // url: `/pages/point/index?points=${JSON.stringify(pointData)}` + // }); + uni.navigateTo({ + url: `/pages/pointReceipt/index?points=${JSON.stringify(pointData)}` }); } // #endif diff --git a/src/pages/fg/receiptNoPlan.vue b/src/pages/fg/receiptNoPlan.vue index d4625d95..84924aac 100644 --- a/src/pages/fg/receiptNoPlan.vue +++ b/src/pages/fg/receiptNoPlan.vue @@ -467,12 +467,18 @@ // #ifdef APP if (pointData.length > 0) { if ( this.scanedQty + this.showList.length == this.dataContent.planQty) { + // uni.redirectTo({ + // url: `/pages/point/index?points=${JSON.stringify(pointData)}` + // }); uni.redirectTo({ - url: `/pages/point/index?points=${JSON.stringify(pointData)}` + url: `/pages/pointReceipt/index?points=${JSON.stringify(pointData)}` }); } else { + // uni.navigateTo({ + // url: `/pages/point/index?points=${JSON.stringify(pointData)}` + // }); uni.navigateTo({ - url: `/pages/point/index?points=${JSON.stringify(pointData)}` + url: `/pages/pointReceipt/index?points=${JSON.stringify(pointData)}` }); } } diff --git a/src/pages/pointReceipt/index.vue b/src/pages/pointReceipt/index.vue new file mode 100644 index 00000000..0a2c7d7d --- /dev/null +++ b/src/pages/pointReceipt/index.vue @@ -0,0 +1,331 @@ + + + + + \ No newline at end of file