From 813738ef392808c42db5c0482092e9d6f81ffe92 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Fri, 26 Apr 2024 08:39:47 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BF=BB=E5=8C=85=E4=BB=BB=E5=8A=A1=EF=BC=8C?=
 =?UTF-8?q?=E5=8F=91=E8=B4=A7=E5=8D=95=EF=BC=8C=E9=87=87=E8=B4=AD=E6=94=B6?=
 =?UTF-8?q?=E8=B4=A7=EF=BC=8C=E9=87=87=E8=B4=AD=E6=8B=92=E7=BB=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/request2.js                           |   6 +-
 src/pages/package/coms/comOverPackJobCard.vue |   8 +-
 src/pages/package/job/overPackageJob.vue      |   4 +-
 src/pages/point/index.vue                     | 100 +++++++++---------
 .../coms/comReceiptJobCard.vue                |  21 +---
 src/pages/purchaseReceipt/job/receiptJob.vue  |   4 +-
 .../supplierDeliver/coms/comRecordCard.vue    |  15 +--
 .../record/supplierDeliverRecord.vue          |   2 +-
 8 files changed, 67 insertions(+), 93 deletions(-)

diff --git a/src/api/request2.js b/src/api/request2.js
index 4e70267a..720170cb 100644
--- a/src/api/request2.js
+++ b/src/api/request2.js
@@ -594,7 +594,7 @@ export function getCustomerItemList(params) {
  */
 export function getSupplierDeliverRecordList(params) {
 	return request({
-		url: baseApi + "/wms/supplierdeliver-record-main/senior",
+		url: baseApi + "/wms/supplierdeliver-record-detail/senior",
 		method: "post",
 		data: params,
 	});
@@ -731,7 +731,7 @@ export function inspectRequestAddAgain(id) {
  */
 export function getPurchaseReceiptJobList(params) {
 	return request({
-		url: baseApi + "/wms/purchasereceipt-job-main/senior",
+		url: baseApi + "/wms/purchasereceipt-job-detail/senior",
 		method: "post",
 		data: params,
 	});
@@ -4047,7 +4047,7 @@ export function cancleTakeOverPageJob(id) {
  */
 export function getOverPageJobList(params) {
 	return request({
-		url: baseApi + "/wms/packageover-job-main/senior",
+		url: baseApi + "/wms/packageover-job-detail/senior",
 		method: "post",
 		data: params,
 	});
diff --git a/src/pages/package/coms/comOverPackJobCard.vue b/src/pages/package/coms/comOverPackJobCard.vue
index 41c577a8..d8a43bf2 100644
--- a/src/pages/package/coms/comOverPackJobCard.vue
+++ b/src/pages/package/coms/comOverPackJobCard.vue
@@ -1,18 +1,16 @@
 <template>
  	<job-com-main-card :dataContent="dataContent">
- 		<view class="task_item">
-			<view class="task_text">
-				申请单号  {{dataContent.requestNumber}}
-			</view>
- 		</view>
+		<jobComMainDetailCard  :dataContent="dataContent"></jobComMainDetailCard>
  	</job-com-main-card>
  </template>
 
  <script>
  	import jobComMainCard from '@/mycomponents/job/jobComMainCard.vue'
+	import jobComMainDetailCard from '@/mycomponents/job/jobComMainDetailCard.vue'
  	export default {
  		components: {
  			jobComMainCard,
+			jobComMainDetailCard
  		},
  		data() {
  			return {};
diff --git a/src/pages/package/job/overPackageJob.vue b/src/pages/package/job/overPackageJob.vue
index 5b13bdff..21bb9fb4 100644
--- a/src/pages/package/job/overPackageJob.vue
+++ b/src/pages/package/job/overPackageJob.vue
@@ -194,7 +194,7 @@
 
 			openJobDetail(item) {
 				uni.navigateTo({
-					url: './overPackageJobDetail?id=' + item.id + '&status=' + item.status
+					url: './overPackageJobDetail?id=' + item.masterId + '&status=' + item.status
 				});
 			},
 
@@ -213,7 +213,7 @@
 					this.$refs.comMessage.showQuestionMessage("确定要放弃当前任务?",
 						res => {
 							if (res) {
-								this.cancleJob(dataContent.id);
+								this.cancleJob(dataContent.masterId);
 							}
 						});
 				}
diff --git a/src/pages/point/index.vue b/src/pages/point/index.vue
index 3ce1abaf..f13c89e6 100644
--- a/src/pages/point/index.vue
+++ b/src/pages/point/index.vue
@@ -1,70 +1,70 @@
 <template>
 	<view class="content">
-		<view class="btn-wrap">
-			<kk-printer ref="kkprinter" :bufferData="bufferData" @onPrint="onPrint"></kk-printer>
+		<view class="" style="position: absolute; bottom:80px ;left: 30px;z-index: 99999;">
+			打印
 		</view>
+		<web-view src="/hybrid/html/point.html" :fullscreen='false' :webview-styles="webviewStyles"></web-view>
 	</view>
 </template>
 
 <script>
-	import util from '@/components/kk-printer/utils/util.js';
-	import * as blesdk from '@/components/kk-printer/utils/bluetoolth.js';
-	import kkPrinter from '@/components/kk-printer/index.vue';
+	const htmlFileUrl = '/hybrid/html/point.html';
 	export default {
 		data() {
 			return {
-				bufferData:''
+				webviewStyles: {
+					progress: {
+						color: '#FF3333'
+					},
+					width: '100%',
+					height: '600px',
+				}
 			}
 		},
-		components:{
-			kkPrinter
-		},
+
 		mounted() {
-			
+
 		},
 		methods: {
-			onPrint(opt){
-				let arr = ['2','3']
-				let y = 450
-				let strCmd =blesdk.CreatCPCLPage(400,y*arr.length,1,0);  
-				arr.forEach((item,index)=>{
-					strCmd += blesdk.addCPCLLine(0,210 + (y*index),400,210+ (y*index),3);
-					strCmd += blesdk.addCPCLText(10,0 + (y*index),'4','3',0,'8.14');
-					strCmd += blesdk.addCPCLBarCode(270,0 + (y*index),'128',80,0,1,1,'00051');
-					strCmd += blesdk.addCPCLText(290,80 + (y*index),'7','2',0,'00051');
-					strCmd += blesdk.addCPCLText(40,110 + (y*index),'3','0',0,'CHICKEN FEET (BONELESS)');
-					// strCmd += blesdk.addCPCLSETMAG(2,2);
-					strCmd += blesdk.addCPCLText(40,150 + (y*index),'55','0',0,'无骨鸡爪 一盒（约1.5磅）');
-					// strCmd += blesdk.addCPCLSETMAG(0,0);
-					strCmd += blesdk.addCPCLText(0,180 + (y*index),'7','2',0,'2019-08-12');
-					strCmd += blesdk.addCPCLLocation(2);//循环里之后的所有的都居中了
-					strCmd += blesdk.addCPCLQRCode(0,220 + (y*index),'M', 2, 6, 'qr code test');
-				})
-				console.log(strCmd)
-				strCmd += blesdk.addCPCLPrint();
-				this.bufferData = strCmd;
+
+			readFile(path, callback) {
+				plus.io.resolveLocalFileSystemURL(path, function(entry) {
+					entry.file(function(file) {
+						var reader = new plus.io.FileReader();
+						reader.onloadend = function(e) {
+							callback(e.target.result);
+						};
+						reader.readAsText(file);
+					}, function(e) {
+						console.log("读取文件失败：" + e.message);
+					});
+				}, function(e) {
+					console.log("获取图片资源失败：" + e.message);
+				});
 			}
-		}
+		},
+		onShow() {
+			this.readFile(htmlFileUrl, function(htmlContent) {
+			  console.log(htmlContent); // 这里是HTML文件的内容字符串
+			  console.log(typeof htmlContent); // 这里是HTML文件的内容字符串
+			});
+			// uni.request({
+			// 	url: htmlFileUrl,
+			// 	method: 'GET',
+			// 	success: function(res) {
+			// 		// res.data就是HTML文件的内容
+			// 		var htmlString = res.data;
+			// 		console.log(htmlString);
+			// 	},
+			// 	fail: function(error) {
+			// 		console.error('请求HTML文件失败:', error);
+			// 	}
+			// });
+		},
+
 	}
 </script>
 
 <style>
-	.content {
-		width: 100vw;
-		height: 100vh;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
-	}
-	.btn-wrap{
-		width:180upx;
-		height: 100upx;
-		border-radius: 16upx;
-		border: 2upx solid #333333;
-		box-sizing: border-box;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-	}
-</style>
+
+</style>
\ No newline at end of file
diff --git a/src/pages/purchaseReceipt/coms/comReceiptJobCard.vue b/src/pages/purchaseReceipt/coms/comReceiptJobCard.vue
index bb77e747..6f4e1daf 100644
--- a/src/pages/purchaseReceipt/coms/comReceiptJobCard.vue
+++ b/src/pages/purchaseReceipt/coms/comReceiptJobCard.vue
@@ -1,31 +1,16 @@
 <template>
 	<jobComMainCardAsn :dataContent="dataContent">
-		<view class="task_item">
-			<!-- <view class="task_text">
-				<view class="">
-					申请单号 : {{dataContent.requestNumber}}
-				</view>
-			</view> -->
-			<view class="task_text">
-				<view class="">
-					任务单号 : {{dataContent.number}}
-				</view>
-			</view>
-			<view class="task_text">
-				<view class="">
-					供应商代码 : {{dataContent.supplierCode}}
-					<!-- 供应商名称 : {{dataContent.supplierName}} -->
-				</view>
-			</view>
-		</view>
+		<jobComMainDetailCard  :dataContent="dataContent"></jobComMainDetailCard>
 	</jobComMainCardAsn>
 </template>
 
 <script>
 	import jobComMainCardAsn from '@/mycomponents/job/jobComMainCardAsn.vue'
+	import jobComMainDetailCard from '@/mycomponents/job/jobComMainDetailCard.vue'
 	export default {
 		components: {
 			jobComMainCardAsn,
+			jobComMainDetailCard
 		},
 		data() {
 			return {};
diff --git a/src/pages/purchaseReceipt/job/receiptJob.vue b/src/pages/purchaseReceipt/job/receiptJob.vue
index 02f0834c..73ca3f5a 100644
--- a/src/pages/purchaseReceipt/job/receiptJob.vue
+++ b/src/pages/purchaseReceipt/job/receiptJob.vue
@@ -246,7 +246,7 @@
 	
 			openJobDetail(item) {
 				uni.navigateTo({
-					url: './receiptDetail?id=' + item.id + '&status=' + item.status + '&operation=' + this.operation
+					url: './receiptDetail?id=' + item.masterId + '&status=' + item.status + '&operation=' + this.operation
 				});
 			},
 
@@ -265,7 +265,7 @@
 					this.$refs.comMessage.showQuestionMessage("确定要放弃当前任务?",
 						res => {
 							if (res) {
-								var id = dataContent.id
+								var id = dataContent.masterId
 								this.cancleJob(id);
 							}
 						});
diff --git a/src/pages/supplierDeliver/coms/comRecordCard.vue b/src/pages/supplierDeliver/coms/comRecordCard.vue
index 5e32693e..39c9d8ea 100644
--- a/src/pages/supplierDeliver/coms/comRecordCard.vue
+++ b/src/pages/supplierDeliver/coms/comRecordCard.vue
@@ -14,26 +14,17 @@
 		</view>
 	</view> -->
 	<record-com-main-card :dataContent="dataContent">
-		<view class="task_item">
-			<view class="task_text">
-				<view class="">
-					发货单号 : {{dataContent.asnNumber}}
-				</view>
-			</view>
-			<view class="task_text">
-				<view class="">
-					供应商代码 : {{dataContent.supplierCode}}
-				</view>
-			</view>
-		</view>
+		<jobComMainDetailCard  :dataContent="dataContent"></jobComMainDetailCard>
 	</record-com-main-card>
 </template>
 
 <script>
 	import recordComMainCard from '@/mycomponents/record/recordComMainCard.vue'
+	import jobComMainDetailCard from '@/mycomponents/job/jobComMainDetailCard.vue'
 	export default {
 		components: {
 			recordComMainCard,
+			jobComMainDetailCard
 		},
 		data() {
 			return {};
diff --git a/src/pages/supplierDeliver/record/supplierDeliverRecord.vue b/src/pages/supplierDeliver/record/supplierDeliverRecord.vue
index 04528f03..5f6e43f2 100644
--- a/src/pages/supplierDeliver/record/supplierDeliverRecord.vue
+++ b/src/pages/supplierDeliver/record/supplierDeliverRecord.vue
@@ -165,7 +165,7 @@
 
 			openJobDetail(item) {
 				uni.navigateTo({
-					url: './supplierDeliverRecordDetail?id=' + item.id
+					url: './supplierDeliverRecordDetail?id=' + item.masterId
 				});
 			},