diff --git a/api/request2.js b/api/request2.js
index dfbf8ad3..0c7bb977 100644
--- a/api/request2.js
+++ b/api/request2.js
@@ -634,7 +634,7 @@ export function purchaseReturnRequestClose(id) {
  * 采购退货申请 提交审批
  * @param {*} params 
  */
-export function purchaseReturnRequestSubmitApprove(id) {
+export function purchaseReturnRequestApprove(id) {
 	return request({
 		url: baseApi + "/wms/purchasereturn-request-main/submit?id="+id,
 		method: "put",
@@ -646,7 +646,7 @@ export function purchaseReturnRequestSubmitApprove(id) {
  * 采购退货申请 提交审批通过
  * @param {*} params 
  */
-export function purchaseReturnRequestSubmitApproveAgree(id) {
+export function purchaseReturnRequestApproveAgree(id) {
 	return request({
 		url: baseApi + "/wms/purchasereturn-request-main/agree?id="+id,
 		method: "put",
@@ -658,7 +658,7 @@ export function purchaseReturnRequestSubmitApproveAgree(id) {
  * 采购退货申请 审批驳回
  * @param {*} params 
  */
-export function purchaseReturnRequestSubmitApproveRefused(id) {
+export function purchaseReturnRequestApproveRefused(id) {
 	return request({
 		url: baseApi + "/wms/purchasereturn-request-main/refused?id="+id,
 		method: "put",
@@ -1373,6 +1373,67 @@ export function unPlannedIssueRequestSubmit(params) {
 	});
 }
 
+/**
+ * 计划外出库申请 提交审批
+ * @param {*} params 
+ */
+export function unPlannedIssueRequestApprove(id) {
+	return request({
+		url: baseApi + "/wms/unplannedissue-request-main/submit?id="+id,
+		method: "put",
+		data: {},
+	});
+}
+
+/**
+ * 计划外出库申请 关闭
+ * @param {*} params 
+ */
+export function unPlannedIssueRequestClose(id) {
+	return request({
+		url: baseApi + "/wms/unplannedissue-request-main/close?id="+id,
+		method: "put",
+		data: {},
+	});
+}
+
+/**
+ * 计划外出库申请 审批通过
+ * @param {*} params 
+ */
+export function unPlannedIssueRequestApproveAgree(id) {
+	return request({
+		url: baseApi + "/wms/unplannedissue-request-main/agree?id="+id,
+		method: "put",
+		data: {},
+	});
+}
+
+/**
+ * 计划外出库申请 审批驳回
+ * @param {*} params 
+ */
+export function unPlannedIssueRequestApproveRefused(id) {
+	return request({
+		url: baseApi + "/wms/unplannedissue-request-main/refused?id="+id,
+		method: "put",
+		data: {},
+	});
+}
+
+/**
+ * 计划外出库申请 处理
+ * @param {*} params 
+ */
+export function unPlannedIssueRequestHandle(id) {
+	return request({
+		url: baseApi + "/wms/unplannedissue-request-main/handle?id="+id,
+		method: "put",
+		data: {},
+	});
+}
+
+
 /**
  * 计划外出库记录 提交
  * @param {*} params 
diff --git a/common/label.js b/common/label.js
index 60824ee0..ddecb4dd 100644
--- a/common/label.js
+++ b/common/label.js
@@ -14,7 +14,7 @@ export function getLabelInfo(scanMsg, callBack) {
 	let items = scanMsg.split(';');
 	let header = items[0];
 	let version = items[1];
-	if (header != '' && version != '') {
+	if ((header != undefined) && (version!=undefined)) {
 		//解析扫描的是一维码还是二维码
 		let type = header.substring(header.length - 1, header.length);
 		if (type == 'Q') //qrcode
@@ -26,6 +26,18 @@ export function getLabelInfo(scanMsg, callBack) {
 		} else { //直接输入文本
 			getBarCodeInfo('text', 'V1.0', scanMsg, callBack);
 		}
+	}else {
+		let labelResult = {
+			label: {
+				labelType: "",
+				barType: '',
+				code:""
+			},
+			package: null,
+			sucess: false,
+			message: '标签格式不正确',
+		}
+		callBack(labelResult);
 	}
 }
 
diff --git a/mycomponents/scan/winComScan.vue b/mycomponents/scan/winComScan.vue
index 9616a0f8..b8757707 100644
--- a/mycomponents/scan/winComScan.vue
+++ b/mycomponents/scan/winComScan.vue
@@ -157,6 +157,7 @@
 								// that.getfocus();//不能自动获取焦点
 								that.$emit("getResult", scanResult);
 							} else {
+								that.clear();
 								this.$refs.comMessage.showErrorMessage(scanResult.message, res => {
 									if (res) {
 										that.getfocus();
diff --git a/pages/purchaseReturn/request/returnRequest.vue b/pages/purchaseReturn/request/returnRequest.vue
index 5893250f..9af7f141 100644
--- a/pages/purchaseReturn/request/returnRequest.vue
+++ b/pages/purchaseReturn/request/returnRequest.vue
@@ -41,9 +41,9 @@
 	import {
 		getPurchaseReturnRequestList,
 		purchaseReturnRequestClose,
-		purchaseReturnRequestSubmitApprove,
-		purchaseReturnRequestSubmitApproveAgree,
-		purchaseReturnRequestSubmitApproveRefused,
+		purchaseReturnRequestApprove,
+		purchaseReturnRequestApproveAgree,
+		purchaseReturnRequestApproveRefused,
 		purchaseReturnRequestHandle
 	} from '@/api/request2.js';
 	import {
@@ -215,15 +215,15 @@
 					})
 				} else if (text == "提交审批") {
 					this.showQuestionMessage("确定要审批当前申请吗?",res=>{
-						this.purchaseReturnRequestSubmitApprove(dataContent.id)
+						this.purchaseReturnRequestApprove(dataContent.id)
 					})
 				} else if (text=="审批通过") {
 					this.showQuestionMessage("确定要审批通过当前申请吗?",res=>{
-						this.purchaseReturnRequestSubmitApproveAgree(dataContent.id)
+						this.purchaseReturnRequestApproveAgree(dataContent.id)
 					})
 				} else if (text == "审批驳回") {
 					this.showQuestionMessage("确定要审批驳回当前申请吗?",res=>{
-						this.purchaseReturnRequestSubmitApproveRefused(dataContent.id)
+						this.purchaseReturnRequestApproveRefused(dataContent.id)
 					})
 				} else if (text == "关闭") {
 					this.showQuestionMessage("确定要关闭当前申请吗?",res=>{
@@ -290,9 +290,8 @@
 			},
 
 
-
-			purchaseReturnRequestSubmitApprove(id) {
-				purchaseReturnRequestSubmitApprove(id).then(res => {
+			purchaseReturnRequestApprove(id) {
+				purchaseReturnRequestApprove(id).then(res => {
 					if (res.data) {
 						this.getList("refresh")
 						uni.showToast({
@@ -323,8 +322,8 @@
 					this.showMessage(error)
 				})
 			},
-			purchaseReturnRequestSubmitApproveAgree(id) {
-				purchaseReturnRequestSubmitApproveAgree(id).then(res => {
+			purchaseReturnRequestApproveAgree(id) {
+				purchaseReturnRequestApproveAgree(id).then(res => {
 					if (res.data) {
 						this.getList("refresh")
 						uni.showToast({
@@ -338,8 +337,8 @@
 					this.showMessage(error)
 				})
 			},
-			purchaseReturnRequestSubmitApproveRefused(id) {
-				purchaseReturnRequestSubmitApproveRefused(id).then(res => {
+			purchaseReturnRequestApproveRefused(id) {
+				purchaseReturnRequestApproveRefused(id).then(res => {
 					if (res.data) {
 						this.getList("refresh")
 						uni.showToast({
@@ -354,7 +353,7 @@
 				})
 			},
 			purchaseReturnRequestHandle(id) {
-				purchaseReturnRequestSubmitApproveRefused(id).then(res => {
+				purchaseReturnRequestHandle(id).then(res => {
 					if (res.data) {
 						this.getList("refresh")
 						uni.showToast({
diff --git a/pages/putaway/job/putawayDetail.vue b/pages/putaway/job/putawayDetail.vue
index a64d98c8..9f12ec84 100644
--- a/pages/putaway/job/putawayDetail.vue
+++ b/pages/putaway/job/putawayDetail.vue
@@ -301,6 +301,7 @@
 											if (res) {
 												itemDetail.scaned = true;
 												itemDetail.handleQty = Number(result.balance.qty) ;
+												itemDetail.toInventoryStatus =result.balance.inventoryStatus
 												itemDetail.balance = result.balance;
 												itemDetail.balance.balanceQty = result.balance.qty;
 												itemDetail.balance.stdPackQty = result.package.stdPackQty
@@ -313,6 +314,7 @@
 								} else {
 									itemDetail.scaned = true;
 									itemDetail.handleQty = Number(result.balance.qty) ;
+									itemDetail.toInventoryStatus =itemDetail.inventoryStatus
 									itemDetail.balance = result.balance;
 									itemDetail.balance.balanceQty = result.balance.qty;
 									itemDetail.balance.stdPackQty = result.package.stdPackQty
@@ -439,8 +441,6 @@
 							detail.toPackingNumber = info.packingNumber;
 							detail.toBatch = info.batch;
 							detail.toContainerNumber = '';
-							detail.toInventoryStatus = detail.inventoryStatus;
-
 
 							detail.singlePrice = detail.balance.singlePrice;
 							detail.amount = detail.balance.singlePrice * detail.handleQty;
@@ -448,9 +448,6 @@
 							detail.arriveDate = detail.balance.arriveDate;
 							detail.produceDate = detail.balance.produceDate;
 							detail.expireDate = detail.balance.expireDate;
-							// "arriveDate": 1694591614000,
-							// "produceDate": 1694591615000,
-							// "expireDate": 1694591617000,
 							subList.push(detail)
 						}
 					})
diff --git a/pages/unPlanned/request/issueRequest.vue b/pages/unPlanned/request/issueRequest.vue
index ff2ffc7a..7d974e7d 100644
--- a/pages/unPlanned/request/issueRequest.vue
+++ b/pages/unPlanned/request/issueRequest.vue
@@ -33,13 +33,19 @@
 
 	import {
 		goHome,
-		updateTitle
+		updateTitle,
+		clearTirmAndWrap
 	} from '@/common/basic.js';
 	import {
 		getBusinessType,
 	} from '@/common/record.js';
 	import {
 		getUnPlannedIssueRequestList,
+		unPlannedIssueRequestApprove,
+		unPlannedIssueRequestClose,
+		unPlannedIssueRequestApproveAgree,
+		unPlannedIssueRequestApproveRefused,
+		unPlannedIssueRequestHandle
 	} from '@/api/request2.js';
 	import {
 		getDetailOption,
@@ -82,7 +88,7 @@
 			this.detailOptions = getDetailOption();
 			this.detailAndApproveOptions = getDetailAndApproveOption()
 			this.detailAndApprovePassAndApproveNoOption = getDetailAndApprovePassAndApproveNoOption(),
-				this.detailAndHandleOption = getDetailAndHandleOption()
+			this.detailAndHandleOption = getDetailAndHandleOption()
 			this.detailAndCloseOption = getDetailAndCloseOption()
 
 		},
@@ -204,21 +210,39 @@
 			},
 
 			swipeClick(e, dataContent) {
-				if (e.content.text == "详情") {
-					console.log("详情", dataContent.id)
+				var text = clearTirmAndWrap(e.content.text)
+				if (text == "详情") {
 					this.openRequestInfoPopup(dataContent);
-				} else if (e.content.text == "处理") {
-					console.log("处理")
-				} else if (e.content.text == "审批") {
-					console.log("审批")
-				} else if (e.content.text == "审批通过") {
-					console.log("审批通过")
-				} else if (e.content.text == "审批驳回") {
-					console.log("审批驳回")
-				} else if (e.content.text == "关闭") {
-					console.log("关闭")
+				} else if (text == "处理") {
+					this.showQuestionMessage("确定要处理当前申请吗?",res=>{
+						this.unPlannedIssueRequestHandle(dataContent.id)
+					})
+				} else if (text == "提交审批") {
+					this.showQuestionMessage("确定要审批当前申请吗?",res=>{
+						this.unPlannedIssueRequestApprove(dataContent.id)
+					})
+				} else if (text == "审批通过") {
+					this.showQuestionMessage("确定要审批通过当前申请吗?",res=>{
+						this.unPlannedIssueRequestApproveAgree(dataContent.id)
+					})
+				} else if (text == "审批驳回") {
+					this.showQuestionMessage("确定要审批驳回当前申请吗?",res=>{
+						this.unPlannedIssueRequestApproveRefused(dataContent.id)
+					})
+				} else if (text == "关闭") {
+					this.showQuestionMessage("确定要关闭当前申请吗?",res=>{
+						this.unPlannedIssueRequestClose(dataContent.id)
+					})
 				}
 			},
+			showQuestionMessage(hint,callBack){
+				this.$refs.comMessage.showQuestionMessage(hint,
+					res => {
+						if (res) {
+							callBack()
+						}
+					});
+			},
 			switchChangeWait(state, jobStatus) {
 				this.checkedWaitTask = state;
 				this.status = jobStatus;
@@ -267,6 +291,84 @@
 					}
 				});
 			},
+			
+			unPlannedIssueRequestApprove(id) {
+				unPlannedIssueRequestApprove(id).then(res => {
+					if (res.data) {
+						this.getList("refresh")
+						uni.showToast({
+							title: "申请提交审批成功"
+						})
+					} else {
+						this.showMessage("申请提交审批失败")
+					}
+			
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			
+			},
+			
+			unPlannedIssueRequestClose(id) {
+				unPlannedIssueRequestClose(id).then(res => {
+					if (res.data) {
+						this.getList("refresh")
+						uni.showToast({
+							title: "申请关闭成功"
+						})
+					} else {
+						this.showMessage("申请关闭失败")
+					}
+			
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+			unPlannedIssueRequestApproveAgree(id) {
+				unPlannedIssueRequestApproveAgree(id).then(res => {
+					if (res.data) {
+						this.getList("refresh")
+						uni.showToast({
+							title: "申请审批通过成功"
+						})
+					} else {
+						this.showMessage("申请审批通过失败")
+					}
+			
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+			unPlannedIssueRequestApproveRefused(id) {
+				unPlannedIssueRequestApproveRefused(id).then(res => {
+					if (res.data) {
+						this.getList("refresh")
+						uni.showToast({
+							title: "申请审批驳回成功"
+						})
+					} else {
+						this.showMessage("申请审批驳回失败")
+					}
+			
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+			unPlannedIssueRequestHandle(id) {
+				unPlannedIssueRequestHandle(id).then(res => {
+					if (res.data) {
+						this.getList("refresh")
+						uni.showToast({
+							title: "申请处理成功"
+						})
+					} else {
+						this.showMessage("申请处理失败")
+					}
+			
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
 
 		}
 	}
diff --git a/pages/unPlanned/request/issueRequestCreate.vue b/pages/unPlanned/request/issueRequestCreate.vue
index eb6dedbc..065e3cfb 100644
--- a/pages/unPlanned/request/issueRequestCreate.vue
+++ b/pages/unPlanned/request/issueRequestCreate.vue
@@ -57,8 +57,7 @@
 	import comMessage from '@/mycomponents/common/comMessage.vue'
 	import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
 	import {
-		unPlannedIssueRequestSubmit,
-		unPlannedIssueRecordSubmit
+		unPlannedIssueRequestCreate,
 	} from '@/api/request2.js';
 
 	import {
@@ -233,7 +232,7 @@
 				uni.showLoading({
 					title:"提交中"
 				})
-				unPlannedIssueRequestSubmit(params).then(res => {
+				unPlannedIssueRequestCreate(params).then(res => {
 					uni.hideLoading()
 					if (res.data) {
 						this.showCommitSuccessMessage("提交成功<br>生成计划外出库申请<br>" + res.data)
diff --git a/static/config.json b/static/config.json
index 4a668deb..4f688e61 100644
--- a/static/config.json
+++ b/static/config.json
@@ -18,7 +18,7 @@
 
 		"request_url": {
 			"name": "request_url",
-			"value": "http://192.168.0.106:12080/admin-api",
+			"value": "http://dev.ccwin-in.com:25100/api/admin-api",
 			"dev2": "http://192.168.0.157:12080/admin-api",
 			"chefang": "http://192.168.0.178:12080/admin-api",
 			"chenxinming": "http://192.168.0.230:12080/admin-api",