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();