Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp into master_hella

# Conflicts:
#	.env.development

.env.development

@@ -1 +1,6 @@
+<<<<<<< HEAD
 VITE_BASE_URL=http://dev.ccwin-in.com:25300/api/admin-api
VITE_BASE_URL_IMAGE=http://dev.ccwin-in.com:25300/api/admin-api

# 租户配置
VITE_TENANT='[{"text":"长春","value":1},{"text":"成都","value":2}]'
+=======
+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}]'
+>>>>>>> 1ccdeabc43457dad340e3fdcd18fd01e052931c6

src/pages.json

@@ -2037,6 +2037,13 @@
 				"navigationBarTitleText": "打印",
 				"enablePullDownRefresh": false
 			}
+		},
+		{
+			"path": "pages/print/index",
+			"style": {
+				"navigationBarTitleText": "打印",
+				"enablePullDownRefresh": false
+			}
 		}
 	],
 	"globalStyle": {

src/pages/package/job/overPackageJobDetail.vue

@@ -329,7 +329,9 @@
 				overPageSubmit(params).then(res => {
 					uni.hideLoading()
 					if (res.data) {
-						this.showCommitSuccessMessage("提交成功<br>生成翻包记录<br>",res.data.map(item=>({
+						let list = [];
+						res.data.forEach(item => {
+							list.push({
 								itemNumber: item.itemCode, // 物品代码
 								itemName: item.itemName, // 物品名称
 								referenceOrderRow: item.poLine, // 订单行
@@ -337,9 +339,12 @@
 								supplierCode: item.supplierCode, // 供应商
 								packageCode: item.number, // 包装号
 								amount: item.qty, // 数量
-							barcodeString: '', // 标签信息
+								barcodeString: item.barcodeString, // 标签信息
 								barcodeBase64: ''
-						})))
+							})
+						})
+						this.showCommitSuccessMessage("提交成功<br>生成翻包记录<br>", 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
-					})
+			showCommitSuccessMessage(hint, pointData) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-							
-						if(pointData.length>0){
+					if (pointData.length > 0) {
 						uni.navigateTo({
 							url: `/pages/point/index?points=${JSON.stringify(pointData)}`
 						});
-						}else{
+					} 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) {

src/pages/setter/index.vue

@@ -10,9 +10,10 @@
 				<u-cell-item v-if="userInfo!=null" icon="file-text" title="部门" :arrow="false">{{userInfo.dept.name}}</u-cell-item>
 				<u-cell-item v-if="userInfo!=null" icon="photo" title="岗位" :arrow="false">{{(userInfo.posts || []).map(post => post.name).join(',')}}</u-cell-item>
 				<u-cell-item icon="level" v-if="userInfo!=null" title="角色" :arrow="false">{{(userInfo.roles || []).map(role => role.name).join(',')}}</u-cell-item>
+				<u-cell-item  icon="file-text" title="访问地址" :arrow="false">{{url}}</u-cell-item>
 				<u-cell-item icon="trash" title="清除缓存" @click="clear()" ></u-cell-item>
 				<u-cell-item icon="edit-pen" title="修改密码" @click="modifiedPassWord()" ></u-cell-item>
-				<u-cell-item icon="edit-pen" title="打印" @click="print()" ></u-cell-item>
+				<!-- <u-cell-item icon="edit-pen" title="打印" @click="print()" ></u-cell-item> -->
 				<u-cell-item icon="order" title="版本号" :arrow="false">{{version}}</u-cell-item>
 				<!-- #ifdef APP -->
 				<u-cell-item icon="reload" title="检查更新" @click="update">{{version}}</u-cell-item>
@@ -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();