修改收货接口

api/request2.js

@@ -1573,26 +1573,26 @@ export function getDeliverDetail(id) {
 }
 
 /**
- * 制品发货 任务承接
+ * 制品发货任务 承接
  * @param {*} id
  * 
  */
 export function takeDeliverJob(id) {
 	return request({
-		url: baseApi + "/wms/purchasereceipt-job-main/accept?id=" + id,
+		url: baseApi + "/wms/deliver-job-main/accept?id=" + id,
 		method: "put",
 		data: {},
 	});
 }
 
 /**
- * 制品发货 放弃承接
+ * 制品发货任务 放弃承接
  * @param {*} id
  * 
  */
 export function cancleTakeDeliverJob(id) {
 	return request({
-		url: baseApi + "/wms/purchasereceipt-job-main/abandon?id=" + id,
+		url: baseApi + "/wms/deliver-job-main/abandon?id=" + id,
 		method: "put",
 		data: {},
 	});
@@ -1604,14 +1604,16 @@ export function cancleTakeDeliverJob(id) {
  * @param {*}  任务id
  *
  */
+
 export function deliverJobSubmit( params) {
 	return request({
-		url: baseApi + "/magic-api/pda/job/purchasereceipt/jobSubmit?id=" + id,
+		url: baseApi + "/wms/deliver-job-main/execute",
 		method: "put",
 		data: params,
 	});
 }
 
+
 /**
  * 制品发货申请
  *  任务状态 
@@ -1642,19 +1644,19 @@ export function getDeliverRequestDetail(id) {
 }
 
 /**
- * 制品发货申请 申请提交
+ * 制品发货申请 提交
  * @param {*} params 
  */
 export function deliverRequestSubmit(params) {
 	return request({
-		url: baseApi + "/wms/purchasereturn-request-main/submit",
+		url: baseApi + "/wms/deliver-request-main/create",
-		method: "put",
+		method: "post",
 		data: params,
 	});
 }
 
 /**
- * 制品发货 记录提交
+ * 制品发货记录 提交
  * @param {*} params 
  */
 export function deliverRecordSubmit(params) {
@@ -1696,39 +1698,39 @@ export function getCustomerReturnJobDetail(id) {
 
 
 /**
- * 客户退货 任务承接
+ * 客户退货任务 承接
  * @param {*} id
  * 
  */
 export function takeCustomerReturnJob(id) {
 	return request({
-		url: baseApi + "/wms/purchasereceipt-job-main/accept?id=" + id,
+		url: baseApi + "/wms/customerreturn-job-main/accept?id=" + id,
 		method: "put",
 		data: {},
 	});
 }
 
 /**
- * 客户退货 放弃承接
+ * 客户退货任务 放弃承接
  * @param {*} id
  * 
  */
 export function cancleTakeCustomerReturnJob(id) {
 	return request({
-		url: baseApi + "/wms/purchasereceipt-job-main/abandon?id=" + id,
+		url: baseApi + "/wms/customerreturn-job-main/abandon?id=" + id,
 		method: "put",
 		data: {},
 	});
 }
 
 /**
- * 客户退货 任务提交
+ * 客户退货任务 提交
  * @param {*}  任务id
  *
  */
 export function customerReturnJobSubmit(params) {
 	return request({
-		url: baseApi + "/magic-api/pda/job/purchasereceipt/jobSubmit",
+		url: baseApi + "/wms/customerreturn-job-main/execute",
 		method: "put",
 		data: params,
 	});
@@ -1767,13 +1769,13 @@ export function getCustomerReturnRequestDetail(id) {
 
 
 /**
- * 客户退货 申请提交
+ * 客户退货申请 提交
  * @param {*} params 
  */
 export function customerReturnRequestSubmit(params) {
 	return request({
-		url: baseApi + "/wms/purchasereturn-request-main/submit",
+		url: baseApi + "/wms/customerreturn-request-main/create",
-		method: "put",
+		method: "post",
 		data: params,
 	});
 }

pages/customerReturn/job/returnDetail.vue

@@ -100,15 +100,14 @@
 			this.id = option.id;
 			if (this.id != undefined) {
 				//新建的任务自动接收
-				// if (option.status == "JOB_PENDING") {
+				if (option.status == "1") {
-				// 	this.receive((callback => {
+					this.receive((callback => {
-				// 		this.received = true;
+						this.received = true;
-				// 		this.getDetail();
+						this.getDetail();
-				// 	}));
+					}));
-				// } else {
+				} else {
-				// 	this.getDetail();
+					this.getDetail();
-				// }
+				}
-				this.getDetail();
 			}
 		},
 		//返回首页

pages/customerReturn/record/returnRecord.vue

@@ -120,10 +120,13 @@
 		},
 		onLoad(option) {
 			this.fromType = option.fromType
-			if(this.fromType=="requestType"){
				updateTitle("客户退货申请")
+			if(this.fromType=="requestType"){
-				this.showToLoaction = false;
			}else {
				updateTitle("客户退货记录")
+				var typeCode = "CustomerreturnRequest"
				updateTitle("客户退货申请")
+				this.showToLoaction = false;
			}else {
+				var typeCode = "CustomerreturnRecord"
+				updateTitle("客户退货记录")
 				this.showToLoaction = true;
			}
-			var typeCode = "Customerreturn"
+			
 			getBusinessType(typeCode, res => {
 				if (res.success) {
 					this.businessType = res.businessType;

pages/customerReturn/request/customerReturnRequest.vue

@@ -16,6 +16,7 @@
 			<uni-load-more :status="loadingType" v-if="requestList.length>0" />
 			<request-info-popup ref='requestInfoPopup'></request-info-popup>
 		</view>
+		<requestButton @goScan='openScanDetailPopup'></requestButton>
 		<comMessage ref="comMessage"></comMessage>
 	</view>
 </template>

pages/deliver/job/deliverDetail.vue

@@ -104,18 +104,17 @@
 		},
 		onLoad(option) {
 			this.id = option.id;
-			// if (this.id != undefined) {
+			if (this.id != undefined) {
-			// 	//新建的任务自动接收
+				//新建的任务自动接收
-			// 	if (option.status == "JOB_PENDING") {
+				if (option.status == "1") {
-			// 		this.receive((callback => {
+					this.receive((callback => {
-			// 			this.received = true;
+						this.received = true;
-			// 			this.getDetail();
+						this.getDetail();
-			// 		}));
+					}));
-			// 	} else {
+				} else {
-			// 		this.getDetail();
+					this.getDetail();
-			// 	}
+				}
-			// }
+			}
-			this.getDetail();
 		},
 		//返回首页
 		onNavigationBarButtonTap(e) {