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

api/request2.js

@@ -618,6 +618,67 @@ export function getPurchaseReturnRequestDetail(id) {
 	});
 }
 
+/**
+ * 采购退货申请 关闭任务
+ * @param {*} params 
+ */
+export function purchaseReturnRequestClose(id) {
+	return request({
+		url: baseApi + "/wms/purchasereturn-request-main/close?id="+id,
+		method: "put",
+		data: {},
+	});
+}
+
+/**
+ * 采购退货申请 提交审批
+ * @param {*} params 
+ */
+export function purchaseReturnRequestSubmitApprove(id) {
+	return request({
+		url: baseApi + "/wms/purchasereturn-request-main/submit?id="+id,
+		method: "put",
+		data: {},
+	});
+}
+
+/**
+ * 采购退货申请 提交审批通过
+ * @param {*} params 
+ */
+export function purchaseReturnRequestSubmitApproveAgree(id) {
+	return request({
+		url: baseApi + "/wms/purchasereturn-request-main/agree?id="+id,
+		method: "put",
+		data: {},
+	});
+}
+
+/**
+ * 采购退货申请 审批驳回
+ * @param {*} params 
+ */
+export function purchaseReturnRequestSubmitApproveRefused(id) {
+	return request({
+		url: baseApi + "/wms/purchasereturn-request-main/refused?id="+id,
+		method: "put",
+		data: {},
+	});
+}
+
+/**
+ * 采购退货申请 处理
+ * @param {*} params 
+ */
+export function purchaseReturnRequestHandle(id) {
+	return request({
+		url: baseApi + "/wms/purchasereturn-request-main/handle?id="+id,
+		method: "put",
+		data: {},
+	});
+}
+
+
 /**
  * 采购退货申请 提交
  * @param {*} params 
@@ -630,6 +691,8 @@ export function purchaseReturnRequestSubmit(params) {
 	});
 }
 
+
+
 /**
  * 采购退货 记录提交
  * @param {*} params 
@@ -2059,6 +2122,67 @@ export function issueRequestSubmit(params) {
 	});
 }
 
+/**
+ * 发料申请 处理
+ * @param {*} params 
+ */
+export function issueRequestHandle(id) {
+	return request({
+		url: baseApi + "/wms/issue-request-main/handle?id="+id,
+		method: "put",
+		data: {},
+	});
+}
+
+
+/**
+ * 发料申请 提交审批
+ * @param {*} params 
+ */
+export function issueRequestSubmitApprove(id) {
+	return request({
+		url: baseApi + "/wms/issue-request-main/submit?id="+id,
+		method: "put",
+		data: {},
+	});
+}
+
+/**
+ * 发料申请 审批通过
+ * @param {*} params 
+ */
+export function issueRequestSubmitApproveAgree(id) {
+	return request({
+		url: baseApi + "/wms/issue-request-main/agree?id="+id,
+		method: "put",
+		data: {},
+	});
+}
+
+/**
+ * 发料申请 审批驳回
+ * @param {*} params 
+ */
+export function issueRequestSubmitApproveRefused(id) {
+	return request({
+		url: baseApi + "/wms/issue-request-main/refused?id="+id,
+		method: "put",
+		data: {},
+	});
+}
+
+/**
+ * 发料申请 申请关闭
+ * @param {*} params 
+ */
+export function issueRequestClose(id) {
+	return request({
+		url: baseApi + "/wms/issue-request-main/close?id="+id,
+		method: "put",
+		data: {},
+	});
+}
+
 /**
  * 发料记录 提交
  * @param {*} params 

common/array.js

@@ -7,10 +7,16 @@ export function getDetailAndApproveOption() {
 			}
 		},
 		{
-			text: '审批',
+			text: '提交\n审批',
 			style: {
 				backgroundColor: '#00CC33'
 			}
+		},
+		{
+			text: '关闭',
+			style: {
+				backgroundColor: '#ff0000'
+			}
 		}
 	];
 	return option_detail;

common/basic.js

@@ -875,3 +875,7 @@ export function updateTitle(title) {
 		title: title
 	})
 }
+
+export function clearTirmAndWrap(content) {
+	return content.replace(/<\/?.+?\/?>|\r|\n|\s*/g,'')
+}

mycomponents/request/requestListCommonInfo.vue

@@ -50,11 +50,11 @@
 							type:"dateTime"
 						},{
 							title: '最后更新时间',
-							content: this.dataContent.lastModificationTime,
+							content: this.dataContent.updateTime,
 							type:"dateTime"
 						},{
-							title: '最后更新者Id',
+							title: '最后更新者用户名',
-							content: this.dataContent.lastModiferName
+							content: this.dataContent.updater
 						},
 						{
 							title: '并发乐观锁',

pages/count/job/countJob.vue

@@ -278,7 +278,7 @@
 			},
 
 			showMessage(message) {
-				this.$refs.comMessage.showWaringMessage(message, res => {
+				this.$refs.comMessage.showErrorMessage(message, res => {
 					if (res) {
 
 					}

pages/customerReturn/job/returnDetail.vue

@@ -14,8 +14,6 @@
 			</scroll-view>
 		</view>
 
-
-
 		<view class="page-footer">
 			<view class="uni-flex u-col-center space-between padding_10"
 				style="background-color:ghostwhite; width: 100%; ">
@@ -97,6 +95,8 @@
 			};
 		},
 		onLoad(option) {
+			console.log("任务id",option.id)
+			console.log("任务状态",option.status)
 			this.id = option.id;
 			if (this.id != undefined) {
 				//新建的任务自动接收

pages/inventoryMove/coms/comInventoryDetailCard.vue

@@ -13,8 +13,8 @@
 							<recommend :detail="item"  :isShowFromLocation="true" :isShowToLocation="true"></recommend>
 						</uni-swipe-action-item>
 					</uni-swipe-action>
-					<u-line />
 				</view>
+				<u-line />
 			</uni-collapse-item>
 		</uni-collapse>
 		<balance-qty-edit ref="qtyEdit" :settingParam="settingParam" @confirm="confirm"></balance-qty-edit>

pages/issue/request/issueRequest.vue

@@ -32,7 +32,8 @@
 	import requestButton from '@/mycomponents/button/requestButton.vue'
 	import {
 		goHome,
-		updateTitle
+		updateTitle,
+		clearTirmAndWrap
 	} from '@/common/basic.js';
 
 	import {
@@ -40,6 +41,11 @@
 	} from '@/common/record.js';
 	import {
 		getIssueRequestList,
+		issueRequestClose,
+		issueRequestSubmitApproveRefused,
+		issueRequestSubmitApproveAgree,
+		issueRequestSubmitApprove,
+		issueRequestHandle
 	} from '@/api/request2.js';
 	import {
 		getDetailOption,
@@ -201,23 +207,41 @@
 				})
 			},
 			
-
 			swipeClick(e, dataContent) {
-				if (e.content.text == "详情") {
+				var text = clearTirmAndWrap(e.content.text)
-					console.log("详情", dataContent.id)
+				if (text == "详情") {
 					this.openRequestInfoPopup(dataContent);
-				} else if (e.content.text == "处理") {
+				} else if (text == "处理") {
-					console.log("处理")
+					this.showQuestionMessage("确定要处理当前申请吗?",res=>{
-				} else if (e.content.text == "审批") {
+						this.issueRequestHandle(dataContent.id)
-					console.log("审批")
+					})
-				} else if (e.content.text == "审批通过") {
+				} else if (text == "提交审批") {
-					console.log("审批通过")
+					this.showQuestionMessage("确定要审批当前申请吗?",res=>{
-				} else if (e.content.text == "审批驳回") {
+						this.issueRequestSubmitApprove(dataContent.id)
-					console.log("审批驳回")
+					})
-				} else if (e.content.text == "关闭") {
+				} else if (text.includes("审批通过")) {
-					console.log("关闭")
+					this.showQuestionMessage("确定要审批通过当前申请吗?",res=>{
+						this.issueRequestSubmitApproveAgree(dataContent.id)
+					})
+				} else if (text == "审批驳回") {
+					this.showQuestionMessage("确定要审批驳回当前申请吗?",res=>{
+						this.issueRequestSubmitApproveRefused(dataContent.id)
+					})
+				} else if (text == "关闭") {
+					this.showQuestionMessage("确定要关闭当前申请吗?",res=>{
+						this.issueRequestClose(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,86 @@
 				});
 			},
 			
+			issueRequestSubmitApprove(id) {
+				issueRequestSubmitApprove(id).then(res => {
+					if (res.data) {
+						this.getList("refresh")
+						uni.showToast({
+							title: "申请提交审批成功"
+						})
+					} else {
+						this.showMessage("申请提交审批失败")
+					}
+			
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			
+			},
+			
+			issueRequestClose(id) {
+				issueRequestClose(id).then(res => {
+					if (res.data) {
+						this.getList("refresh")
+						uni.showToast({
+							title: "申请关闭成功"
+						})
+					} else {
+						this.showMessage("申请关闭失败")
+					}
+			
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+			
+			issueRequestSubmitApproveAgree(id) {
+				issueRequestSubmitApproveAgree(id).then(res => {
+					if (res.data) {
+						this.getList("refresh")
+						uni.showToast({
+							title: "申请审批通过成功"
+						})
+					} else {
+						this.showMessage("申请审批通过失败")
+					}
+			
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+			
+			issueRequestSubmitApproveRefused(id) {
+				issueRequestSubmitApproveRefused(id).then(res => {
+					if (res.data) {
+						this.getList("refresh")
+						uni.showToast({
+							title: "申请审批驳回成功"
+						})
+					} else {
+						this.showMessage("申请审批驳回失败")
+					}
+			
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+			issueRequestHandle(id) {
+				issueRequestHandle(id).then(res => {
+					if (res.data) {
+						this.getList("refresh")
+						uni.showToast({
+							title: "申请处理成功"
+						})
+					} else {
+						this.showMessage("申请处理失败")
+					}
+			
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+
 		}
 	}
 </script>

pages/purchaseReturn/job/returnJob.vue

@@ -199,8 +199,7 @@
 					this.$refs.comMessage.showQuestionMessage("确定要放弃当前任务?",
 						res => {
 							if (res) {
-								var id = dataContent.id
+								this.cancleJob(dataContent.id);
-								this.cancleJob(id);
 							}
 						});
 				}

pages/purchaseReturn/request/returnRequest.vue

@@ -36,9 +36,15 @@
 	import {
 		goHome,
 		updateTitle,
+		clearTirmAndWrap
 	} from '@/common/basic.js';
 	import {
 		getPurchaseReturnRequestList,
+		purchaseReturnRequestClose,
+		purchaseReturnRequestSubmitApprove,
+		purchaseReturnRequestSubmitApproveAgree,
+		purchaseReturnRequestSubmitApproveRefused,
+		purchaseReturnRequestHandle
 	} from '@/api/request2.js';
 	import {
 		getDetailOption,
@@ -81,7 +87,7 @@
 			this.detailOptions = getDetailOption();
 			this.detailAndApproveOptions = getDetailAndApproveOption()
 			this.detailAndApprovePassAndApproveNoOption = getDetailAndApprovePassAndApproveNoOption(),
-			this.detailAndHandleOption = getDetailAndHandleOption()
+				this.detailAndHandleOption = getDetailAndHandleOption()
 			this.detailAndCloseOption = getDetailAndCloseOption()
 
 		},
@@ -113,8 +119,6 @@
 
 		},
 		methods: {
-			requestConfirm(action, item) {},
-
 			openRequestDetail(item) {
 				uni.navigateTo({
 					url: './returnRequestDetail?id=' + item.id + '&fromType=' + this.fromType
@@ -170,12 +174,12 @@
 					updateTitle("采购退货申请(" + this.totalCount + ")");
 
 				}).catch(error => {
+					uni.hideLoading();
 					if (type === "refresh") {
 						uni.stopPullDownRefresh();
 					}
 					updateTitle("采购退货申请");
 					this.loadingType = "";
-					uni.hideLoading();
 					that.showMessage(error)
 				})
 			},
@@ -202,21 +206,40 @@
 			},
 
 			swipeClick(e, dataContent) {
-				if (e.content.text == "详情") {
+				var text = clearTirmAndWrap(e.content.text)
-					console.log("详情", dataContent.id)
+				if (text == "详情") {
 					this.openRequestInfoPopup(dataContent);
-				} else if (e.content.text == "处理") {
+				} else if (text == "处理") {
-					console.log("处理")
+					this.showQuestionMessage("确定要处理当前申请吗?",res=>{
-				} else if (e.content.text == "审批") {
+						this.purchaseReturnRequestHandle(dataContent.id)
-					console.log("审批")
+					})
-				} else if (e.content.text == "审批通过") {
+				} else if (text == "提交审批") {
-					console.log("审批通过")
+					this.showQuestionMessage("确定要审批当前申请吗?",res=>{
-				} else if (e.content.text == "审批驳回") {
+						this.purchaseReturnRequestSubmitApprove(dataContent.id)
-					console.log("审批驳回")
+					})
-				} else if (e.content.text == "关闭") {
+				} else if (text=="审批通过") {
-					console.log("关闭")
+					this.showQuestionMessage("确定要审批通过当前申请吗?",res=>{
+						this.purchaseReturnRequestSubmitApproveAgree(dataContent.id)
+					})
+				} else if (text == "审批驳回") {
+					this.showQuestionMessage("确定要审批驳回当前申请吗?",res=>{
+						this.purchaseReturnRequestSubmitApproveRefused(dataContent.id)
+					})
+				} else if (text == "关闭") {
+					this.showQuestionMessage("确定要关闭当前申请吗?",res=>{
+						this.purchaseReturnRequestClose(dataContent.id)
+					})
 				}
 			},
+			showQuestionMessage(hint,callBack){
+				this.$refs.comMessage.showQuestionMessage(hint,
+					res => {
+						if (res) {
+							callBack()
+						}
+					});
+			},
+			
 			switchChangeWait(state, jobStatus) {
 				this.checkedWaitTask = state;
 				this.status = jobStatus;
@@ -266,6 +289,88 @@
 				});
 			},
 
+
+
+			purchaseReturnRequestSubmitApprove(id) {
+				purchaseReturnRequestSubmitApprove(id).then(res => {
+					if (res.data) {
+						this.getList("refresh")
+						uni.showToast({
+							title: "申请提交审批成功"
+						})
+					} else {
+						this.showMessage("申请提交审批失败")
+					}
+
+				}).catch(error => {
+					this.showMessage(error)
+				})
+
+			},
+
+			purchaseReturnRequestClose(id) {
+				purchaseReturnRequestClose(id).then(res => {
+					if (res.data) {
+						this.getList("refresh")
+						uni.showToast({
+							title: "申请关闭成功"
+						})
+					} else {
+						this.showMessage("申请关闭失败")
+					}
+
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+			purchaseReturnRequestSubmitApproveAgree(id) {
+				purchaseReturnRequestSubmitApproveAgree(id).then(res => {
+					if (res.data) {
+						this.getList("refresh")
+						uni.showToast({
+							title: "申请审批通过成功"
+						})
+					} else {
+						this.showMessage("申请审批通过失败")
+					}
+			
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+			purchaseReturnRequestSubmitApproveRefused(id) {
+				purchaseReturnRequestSubmitApproveRefused(id).then(res => {
+					if (res.data) {
+						this.getList("refresh")
+						uni.showToast({
+							title: "申请审批驳回成功"
+						})
+					} else {
+						this.showMessage("申请审批驳回失败")
+					}
+			
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+			purchaseReturnRequestHandle(id) {
+				purchaseReturnRequestSubmitApproveRefused(id).then(res => {
+					if (res.data) {
+						this.getList("refresh")
+						uni.showToast({
+							title: "申请处理成功"
+						})
+					} else {
+						this.showMessage("申请处理失败")
+					}
+			
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+			
+			
+
 		}
 	}
 </script>

pages/purchaseReturn/request/returnRequestDetail.vue

@@ -20,6 +20,7 @@
 <script>
 	import {
 		getPurchaseReturnRequestDetail,
+		
 	} from '@/api/request2.js';
 
 	import {

pages/putaway/job/putawayDetail.vue

@@ -170,6 +170,7 @@
 					} else {
 						if (res.data.subList.length > 0) {
 							that.jobContent = res.data;
+							that.jobContent.outInventoryStatuses='INSP'
 							that.subList = res.data.subList;
 							that.detailSource = getDataSource(that.subList)