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

src/hybrid/html/point.html

@@ -17,6 +17,7 @@
 			.box {
 				font-size: 14px;
 				display: flex;
+				margin-top: 60px;
 
 			}
 
@@ -35,38 +36,41 @@
 				border-right: 1px solid #b1b1b1;
 				width: 60px;
 				padding: 0px 5px;
-				height: 67px;
+				height: 58px;
-				line-height: 67px;
+				line-height: 58px;
 			}
 
 			.value {
 				border-bottom: 1px solid #b1b1b1;
 				border-right: 1px solid #b1b1b1;
 				padding: 0px 5px;
-				height: 67px;
+				height: 58px;
 				flex: 1;
 				width: 0px;
 				display: flex;
 				align-items: center;
-				word-wrap: break-word;
+				word-break: break-all;
 			}
 
 			.right {
-				width: 200px;
+				width: 300px;
 			}
 
 			.image {
-				width: 100%;
+				width: calc(100% - 1px);
-				height: 202px;
+				height: 176px;
 				border-bottom: 1px solid #b1b1b1;
 				border-top: 1px solid #b1b1b1;
 				border-right: 1px solid #b1b1b1;
 			}
 
 			.image img {
-				width: calc(100% - 4px);
+				width: 172px;
-				height: calc(100% - 4px);
+				height: 172px;
-				margin: 2px;
+				border: 1px solid #b1b1b1;
+			/* 	width: calc(100% - 4px);
+				height: calc(100% - 4px); */
+				margin: 1px;
 			}
 		</style>
 	</head>

src/pages/point/index.vue

@@ -185,35 +185,19 @@
 		async onShow() {
 			// 获取数据
 			// this.data = [{
-			// 	itemNumber: '555555',
+			// 	itemCode:'065.051-01M', // 物品代码
-			// 	itemName: 'hahah',
+			// 	itemName: 'PCCLARNATEA1225BLACK9999', // 物品名称
-			// 	referenceOrderRow: '55',
+			// 	packName: '包装名称',// 包装名称
-			// 	referenceOrderCode: '55',
+			// 	packageCode: 'PS0513-000003', // 包装号
-			// 	supplierCode: '555',
+			// 	batch:'20240514',//批次
-			// 	packageCode: '9999-8888',
+			// 	parentNumber:'PS0513-000003',//父包装号
-			// 	amount: '55',
+			// 	itemType:'物料类型',//物料类型
+			// 	asnNumber:'123232',//ASN
+			// 	supplierCode: 'Fewewq', // 供应商
+			// 	qty: '100', // 数量
+			// 	printTimes:'2019-09-09 09:09:00', // 打印时间
 			// 	barcodeString: 'HMQ;V1.0;Dwork1-line1;F;R2024-04-03T08:28:41;B20240403;PPN0403-000005;I399.960-12;Q5.000000;UEA;',
 			// 	barcodeBase64: ''
-			// }, {
-			// 	itemNumber: '66',
-			// 	itemName: 'hahah',
-			// 	referenceOrderRow: '66',
-			// 	referenceOrderCode: '666',
-			// 	supplierCode: '66',
-			// 	packageCode: '66666',
-			// 	amount: '666666',
-			// 	barcodeString: 'HMQ;V1.0;Dwork1-line1;F;R2024-04-03T08:28:41;B20240403;PPN0403-000005;I399.960-12;Q5.000000;UEA;',
-			// 	barcodeBase64: ''
-			// }, {
-			// 	itemNumber: '66',
-			// 	itemName: 'hahah',
-			// 	referenceOrderRow: '66',
-			// 	referenceOrderCode: '666',
-			// 	supplierCode: '66',
-			// 	packageCode: '66666',
-			// 	amount: '666666',
-			// 	barcodeString: 'HMQ;V1.0;Dwork1-line1;F;R2024-04-03T08:28:41;',
-			// 	barcodeBase64: ''
 			// }]
 			this.$nextTick(async () => {
 				// 获取二维码图片临时路径
@@ -280,7 +264,7 @@
 		width: 0px;
 		display: flex;
 		align-items: center;
-		word-wrap: break-word;
+		word-break: break-all;
 	}
 
 	.right {

src/pages/purchaseReceipt/job/receiptJob.vue

@@ -20,7 +20,7 @@
 			<receipt-job-list-popup ref="jobListPopup" @selectedItem="selectedItem"></receipt-job-list-popup>
 		</view>
 		<win-scan-button @goScan='openScanPopup' v-if="jobList.length>0"></win-scan-button>
-		<winScanPackJob :title="scanTitle" ref="scanPopup" @getResult='getScanResult' >
+		<winScanPackJob title="箱标签" ref="scanPopup" @getResult='getScanResult' >
 		</winScanPackJob>
 		<jobList ref="jobList" @selectItem="selectItem"></jobList>
 		<comMessage ref="comMessage"></comMessage>