From 74ee9afb34e6e158ef391b9372a43e97fa001750 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Fri, 17 May 2024 09:47:52 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BF=BB=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/manifest.json | 50 ++++++---- src/pages.json | 7 ++ .../package/job/overPackageJobDetail.vue | 97 +++++++++++++------ src/pages/setter/index.vue | 5 +- 4 files changed, 110 insertions(+), 49 deletions(-) diff --git a/src/manifest.json b/src/manifest.json index 2a0b15ec..6c67dff8 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -25,7 +25,6 @@ "Barcode" : {}, "Camera" : {} }, - /* 应用发布信息 */ "distribute" : { /* android打包配置 */ @@ -60,24 +59,39 @@ "sdkConfigs" : { "ad" : {} }, - "nativePlugins" : { - "TestModule" : { - "__plugin_info__" : { - "name" : "TestModule", - "description" : "打印", - "platforms" : "Android", - "url" : "", - "android_package_name" : "", - "ios_bundle_id" : "", - "isCloud" : false, - "bought" : -1, - "pid" : "", - "parameters" : {} - } - } - } + "nativePlugins" : { + "TestModule" : { + "__plugin_info__" : { + "name" : "TestModule", + "description" : "打印", + "platforms" : "Android", + "url" : "", + "android_package_name" : "", + "ios_bundle_id" : "", + "isCloud" : false, + "bought" : -1, + "pid" : "", + "parameters" : {} + } + } + } + }, + "nativePlugins" : { + "TestModule" : { + "__plugin_info__" : { + "name" : "TestModule", + "description" : "打印", + "platforms" : "Android", + "url" : "", + "android_package_name" : "", + "ios_bundle_id" : "", + "isCloud" : false, + "bought" : -1, + "pid" : "", + "parameters" : {} + } + } } - }, /* 快应用特有相关 */ "quickapp" : {}, diff --git a/src/pages.json b/src/pages.json index 0b24556e..f3a41a46 100644 --- a/src/pages.json +++ b/src/pages.json @@ -2037,6 +2037,13 @@ "navigationBarTitleText": "打印", "enablePullDownRefresh": false } + }, + { + "path": "pages/print/index", + "style": { + "navigationBarTitleText": "打印", + "enablePullDownRefresh": false + } } ], "globalStyle": { diff --git a/src/pages/package/job/overPackageJobDetail.vue b/src/pages/package/job/overPackageJobDetail.vue index 22a57698..324c66c1 100644 --- a/src/pages/package/job/overPackageJobDetail.vue +++ b/src/pages/package/job/overPackageJobDetail.vue @@ -329,17 +329,22 @@ overPageSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成翻包记录
",res.data.map(item=>({ - itemNumber: item.itemCode, // 物品代码 - itemName: item.itemName, // 物品名称 - referenceOrderRow: item.poLine, // 订单行 - referenceOrderCode: item.poNumber, // 订单号 - supplierCode: item.supplierCode, // 供应商 - packageCode: item.number, // 包装号 - amount: item.qty, // 数量 - barcodeString: '', // 标签信息 - barcodeBase64: '' - }))) + let list = []; + res.data.forEach(item => { + list.push({ + itemNumber: item.itemCode, // 物品代码 + itemName: item.itemName, // 物品名称 + referenceOrderRow: item.poLine, // 订单行 + referenceOrderCode: item.poNumber, // 订单号 + supplierCode: item.supplierCode, // 供应商 + packageCode: item.number, // 包装号 + amount: item.qty, // 数量 + barcodeString: item.barcodeString, // 标签信息 + barcodeBase64: '' + }) + }) + this.showCommitSuccessMessage("提交成功
生成翻包记录
", list) + } else { this.showErrorMessage("提交失败[" + res.msg + "]") } @@ -519,26 +524,58 @@ this.$refs.comMessage.showCommitSuccess(); }, - showCommitSuccessMessage(hint,pointData) { - Promise.all(pointData.map(item=>{ - return getPackageLabel(item.packageCode) - })).then(res=>{ - res.forEach(item=>{ - const point = pointData.find(pointItem=>pointItem.packageCode==item.data.list[0].relateNumber) - point.barcodeString = item.data.list[0].barcodeString - }) - this.$refs.comMessage.showSuccessMessage(hint, res => { - - if(pointData.length>0){ - uni.navigateTo({ - url: `/pages/point/index?points=${JSON.stringify(pointData)}` - }); - }else{ - navigateBack(1) - } - - }) + showCommitSuccessMessage(hint, pointData) { + this.$refs.comMessage.showSuccessMessage(hint, res => { + if (pointData.length > 0) { + uni.navigateTo({ + url: `/pages/point/index?points=${JSON.stringify(pointData)}` + }); + } else { + navigateBack(1) + } }) + // let packageResult = [] + // pointData.forEach( async (item) => { + // let res = await getPackageLabel(item.packageCode) + // packageResult.push(res) + // if(packageResult.length==pointData.length){ + // packageResult.forEach(item => { + // const point = pointData.find(pointItem => pointItem.packageCode == item.data.list[0] + // .relateNumber) + // point.barcodeString = item.data.list[0].barcodeString + // }) + // this.$refs.comMessage.showSuccessMessage(hint, res => { + // if (pointData.length > 0) { + // uni.navigateTo({ + // url: `/pages/point/index?points=${JSON.stringify(pointData)}` + // }); + // } else { + // navigateBack(1) + // } + // }) + // } + // }) + + // Promise.all(pointData.map(item => { + // return getPackageLabel(item.packageCode) + // })).then(res => { + // res.forEach(item => { + // const point = pointData.find(pointItem => pointItem.packageCode == item.data.list[ + // 0].relateNumber) + // point.barcodeString = item.data.list[0].barcodeString + // }) + // this.$refs.comMessage.showSuccessMessage(hint, res => { + + // if (pointData.length > 0) { + // uni.navigateTo({ + // url: `/pages/point/index?points=${JSON.stringify(pointData)}` + // }); + // } else { + // navigateBack(1) + // } + + // }) + // }) }, showRescanMessage(message) { diff --git a/src/pages/setter/index.vue b/src/pages/setter/index.vue index 3e0d4b01..a8fb8437 100644 --- a/src/pages/setter/index.vue +++ b/src/pages/setter/index.vue @@ -10,9 +10,10 @@ {{userInfo.dept.name}} {{(userInfo.posts || []).map(post => post.name).join(',')}} {{(userInfo.roles || []).map(role => role.name).join(',')}} + {{url}} - + {{version}} {{version}} @@ -55,9 +56,11 @@ import { onLoad } from "@dcloudio/uni-app"; + const app = createApp({}); // app.component({ // }); + const url =ref(import.meta.env.VITE_BASE_URL) const userName = ref(store.state.user.name); let version = ref(); From 1ccdeabc43457dad340e3fdcd18fd01e052931c6 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Fri, 17 May 2024 16:25:19 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.env.development b/.env.development index 8856dddb..4184104f 100644 --- a/.env.development +++ b/.env.development @@ -1 +1,2 @@ -VITE_BASE_URL=http://172.21.32.14:81/api/admin-api VITE_BASE_URL_IMAGE=http://172.21.32.14:81/admin-api # 租户配置 VITE_TENANT='[{"text":"长春","value":1},{"text":"成都","value":2}]' \ No newline at end of file +VITE_BASE_URL=http://dev.ccwin-in.com:25300/api/admin-api +VITE_BASE_URL_IMAGE=http://dev.ccwin-in.com:25300/admin-api # 租户配置 VITE_TENANT='[{"text":"长春","value":1},{"text":"成都","value":2}]' \ No newline at end of file