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

src/hybrid/html/point.html

@@ -50,15 +50,15 @@
 				border-right: 1px solid #b1b1b1;
 				width: 60px;
 				padding: 0px 5px;
-				height: 58px;
+				height: 49px;
-				line-height: 58px;
+				line-height: 49px;
 			}
 
 			.value {
 				border-bottom: 1px solid #b1b1b1;
 				border-right: 1px solid #b1b1b1;
 				padding: 0px 5px;
-				height: 58px;
+				height: 49px;
 				flex: 1;
 				width: 0px;
 				display: flex;
@@ -73,15 +73,15 @@
 
 			.image {
 				width: calc(100% - 1px);
-				height: 176px;
+				height: 149px;
 				border-bottom: 1px solid #b1b1b1;
 				border-top: 1px solid #b1b1b1;
 				border-right: 1px solid #b1b1b1;
 			}
 
 			.image img {
-				width: 172px;
+				width: 147px;
-				height: 172px;
+				height: 147px;
 				border: 1px solid #b1b1b1;
 			/* 	width: calc(100% - 4px);
 				height: calc(100% - 4px); */

src/pages/package/job/overPackageJob.vue

@@ -393,7 +393,7 @@
 						}
 						uni.navigateTo({
 							url: './overPackageJobDetail?id=' + result.masterId + '&status=' + result.status+'&title='+this.title+'&scanMessage=' +
-								scanMessage 
+								scanMessage + '&fromLocationCode=' + result.fromLocationCode
 						});
 						this.scanMessage=""
 					}

src/pages/package/job/overPackageJobDetail.vue

@@ -146,6 +146,7 @@
 				title: option.title + '详情'
 			})
 			this.id = option.id;
+			this.fromLocationCode = option.fromLocationCode;
 			this.scanMessage = option.scanMessage || '';
 			if (this.id != undefined) {
 				//新建的任务自动接收
@@ -617,6 +618,9 @@
 			showCommitSuccessMessage(hint, pointData) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
 					if (pointData.length > 0) {
+						pointData.forEach(item=>{
+							item.fromLocationCode = this.fromLocationCode
+						})
 						uni.redirectTo({
 							url: `/pages/point/index?points=${JSON.stringify(pointData)}`
 						});

src/pages/package/record/overPackageRecord.vue

@@ -137,11 +137,6 @@
 			winComScanBalance,
 			// print
 		},
-		onLoad(option){
-			uni.setNavigationBarTitle({
-				title: option.title
-			})
-		},
 		data() {
 			return {
 				id: '',
@@ -168,7 +163,10 @@
 				// templateDeafult:{}//默认的模板
 			};
 		},
-		onLoad() {
+		onLoad(option) {
+			uni.setNavigationBarTitle({
+				title: option.title
+			})
 			this.getBusinessType();
 			
 			// this.$nextTick(()=>{
@@ -539,6 +537,9 @@
 					this.toPackUnitShow ="请选择"
 					this.toPackQty = ""
 					if (pointData.length > 0) {
+						pointData.forEach(item=>{
+							item.fromLocationCode = this.fromLocationCode
+						})
 						uni.navigateTo({
 							url: `/pages/point/index?points=${JSON.stringify(pointData)}`
 						});

src/pages/point/index.vue

@@ -35,6 +35,10 @@
 					<view class="label bold-label">数量</view>
 					<view class="value bold-font font-20">{{item.qty}}</view>
 				</view>
+				<view class="left-item" v-if="item.fromLocationCode">
+					<view class="label ">来源库位</view>
+					<view class="value ">{{item.fromLocationCode}}</view>
+				</view>
 
 			</view>
 			<view class="right">
@@ -58,6 +62,10 @@
 					<view class="label">打印时间</view>
 					<view class="value">{{item.printTimes}}</view>
 				</view>
+				<view class="left-item" v-if="item.fromLocationCode">
+					<view class="label bold-label"></view>
+					<view class="value bold-font font-20"></view>
+				</view>
 			</view>
 		</view>
 		<view class="" style="position: fixed;width: 100%;bottom: 0rpx;left: 0px;" v-show="isLoadFinish">
@@ -159,8 +167,16 @@
 										<div class="left-item">
 											<div class="label">数量</div>
 											<div class="value bold-font font-30">${item.qty}</div>
+										</div>`
+						if (item.fromLocationCode && item.fromLocationCode.length > 0) {
+							str += `
+										<div class="left-item">
+											<div class="label">来源库位</div>
+											<div class="value font-20">${item.fromLocationCode}</div>
 										</div>
-									</div>
+									</div>`
+						}
+						str += `
 									<div class="right">
 										<div class="image">
 											<img id='image1' src="${item.barcodeBase64}" alt="" />
@@ -187,9 +203,20 @@
 											<div class="label">打印时间</div>
 											<div class="value font-20">${item.printTimes}</div>
 										</div>
+									`
+						if (item.fromLocationCode && item.fromLocationCode.length > 0) {
+							str += `
+										<div class="left-item">
+											<div class="label"></div>
+											<div class="value"></div>
+										</div>
 									</div>
 								</div>`
+						}
+								
 					})
+					
+					console.log('str',str)
 					this.newHtmlContent = this.newHtmlContent.replace(
 						"mainBody", str); //替换物品代码
 				});
@@ -255,6 +282,7 @@
 //     "qty": 90,
 //     "printTimes": "2024-09-06+09:29:37",
 //     "productionLineCode": null,
+// 	"fromLocationCode": "C01-190-10",
 //     "barcodeString": "HPQ;V1.0;B20240719;AASNS20240731-0002;Q90.000000;I250.832-02;L;PPN20240906-0000000001;S49000599;O49000599;L12;E;UPC;",
 //     "barcodeBase64": ""
 //   }