7.18宁夏新增完成退料

apis/http.js

@@ -10,7 +10,7 @@ class HttpConfig {
 	// baseUrl = "http://10.40.92.8:8080"
 	// baseUrl = "http://10.40.92.52:28080"
 	// baseUrl = "http://10.40.92.78:28080"
-	// baseUrl = "http://192.168.2.248:28080"
+	// baseUrl = "http://192.168.2.167:28080"
 	// baseUrl = "https://z.csgmall.com.cn/gl"
 	// baseUrl = "http://10.40.92.141:28080"
 	// #endif
@@ -115,7 +115,7 @@ class HttpConfig {
 		},
 		backMaterialReceive: {
 			backMaterialReceiveList: '/backReceive/getbackReceiveList', // 获取退料接收列表
-			backMaterialReceiveDetail: '/backReceive/receiveView',
+			backMaterialReceiveDetail: '/backReceive/receiveViewWeb',
 			backMaterialSetNumBack: '/backReceive/setNumBack',
 		    backMaterialQrcodeQuery:'/backReceive/qrcodeQuery',
 		    backMaterialSetCodeBack:'/backReceive/setCodeBack',

pages.json

@@ -286,8 +286,8 @@
 		}, {
 			"path": "pages/backMaterialReceiveDetail/backMaterialReceiveDetail",
 			"style": {
-				"navigationBarTitleText": "退料接收明细",
+				"navigationBarTitleText": "退料接收明细"
-				"app-plus": {
+				/* "app-plus": {
 					"titleNView": {
 						"buttons": [ 
 							{
@@ -298,7 +298,7 @@
 							}
 						]
 					}
-				}
+				} */
 			}
 
 		}, {

pages/backMaterialReceive/backMaterialReceive.vue

@@ -277,7 +277,8 @@ import { basePath } from '../../public'
 			}
 		},
 		onShow() {
-			this.getList('')
+			this.fetchMaterialList = []
+			this.searchKeyword(this.exitIpt)
 		},
 		onReachBottom() {
 			if (this.fetchMaterialList.length >= this.pageTotal) return;

pages/backMaterialReceiveDetail/backMaterialReceiveDetail.vue

@@ -9,6 +9,7 @@
 				<checkbox-group
 					@change="checkClick(fetch)"
 					style="margin-right: 15rpx;"
+					v-show="fetch.backStatus == '0' && Number(fetch.num) == 0"
 				>
 					<checkbox :checked="fetch.checked" />
 				</checkbox-group>
@@ -40,6 +41,12 @@
 				</checkbox-group>
 				<text>全选</text>
 			</view>
+			<view
+				class="exam"
+				@click="totalBack"
+			>
+				完成退料
+			</view>
 		</view>
 		<uni-popup ref="popup1" type="center" :mask-click="false">
 			<view class="popup1">
@@ -111,6 +118,9 @@
 	export default {
 		data() {
 			return {
+				pageNum: 1,
+				pageSize: 10,
+				pageTotal: 0,
 				allChecked: false,
 				fetchList: [
 
@@ -326,17 +336,21 @@
 				let that = this
 				console.log(that.detailsId);
 				that.$api.backMaterialReceive.backMaterialReceiveDetail({
-					id: that.detailsId
+					id: that.detailsId,
+					taskId: that.taskId,
+					pageNum: that.pageNum,
+					pageSize: that.pageSize
 				}).then(res => {
 					console.log(res);
 					if (res.data.code == 200) {
-						res.data.data.forEach(item => {
+						that.pageTotal = res.data.data.total
-							item.checked = false
+						res.data.data.rows.forEach(item => {
+							if (item.backStatus == '0') item.checked = false
 						})
-						/* for (let i = 0; i < res.data.data.length; i++) {
+						/* res.data.data.forEach(item => {
-							res.data.data[i].num = res.data.data[i].num.split('.')[0]
+							item.checked = false
-						} */
+						}) */
-						that.fetchList = res.data.data
+						that.fetchList = [...that.fetchList, ...res.data.data.rows]
 						console.log(that.fetchList);
 					}
 				}).catch(err => {
@@ -394,6 +408,61 @@
 				}, 0);
 				console.log("numaccumulator", sum)
 				return sum
+			},
+			endBackMaFn (obj) {
+				let that = this
+				console.log(obj);
+				// 完成退料
+				that.$api.backMaterialReceive.backReceiveEndBack(obj).then(res => {
+					console.log(res)
+					if (res.data.code == 200) {
+						uni.showToast({
+							icon: 'none',
+							title: res.data.msg
+						})
+						uni.navigateBack()
+					} else {
+						uni.showToast({
+							icon: 'none',
+							title: res.data.msg
+						})
+					}
+				}).catch(err=>{
+					console.log(err);
+				})
+			},
+			totalBack () {
+				let that = this
+				let submitList = that.fetchList.filter(item => item.checked == true && Number(item.num) == 0)
+				if (submitList.length != 0) {
+					console.log(submitList);
+					let typeIdStr
+					let typeIdArr = []
+					submitList.forEach(item => {
+						typeIdArr.push(item.modelId)
+					})
+					typeIdStr = typeIdArr.join(',')
+					console.log(typeIdStr);
+					uni.showModal({
+						title: '完成退料',
+						content: '确认完成退料吗？',
+						success: (res) => {
+							if (res.confirm) {
+								that.endBackMaFn({
+									createBy: uni.getStorageSync('userInfo').userid,
+									parentId: submitList[0].id,
+									taskId: submitList[0].taskId,
+									typeId: typeIdStr
+								})
+							}
+						}
+					})
+				} else {
+					uni.showToast({
+						icon: 'none',
+						title: '未选中完成退料项！'
+					})
+				}
 			}
 		},
 		onLoad(params) {
@@ -403,6 +472,7 @@
 			this.taskStatus = params.taskStatus
 		},
 		onShow() {
+			this.fetchList = []
 			this.initListData()
 		},
 		onNavigationBarButtonTap(ev) {
@@ -426,6 +496,11 @@
 					title: '未选中完成退料项！'
 				})
 			}
+		},
+		onReachBottom() {
+			if (this.fetchList.length >= this.pageTotal) return;
+			this.pageNum++
+			this.initListData()
 		}
 	}
 </script>
@@ -510,12 +585,20 @@
 		padding: 15rpx 30rpx;
 		background-color: #fff;
 		display: flex;
-		justify-content: left;
+		justify-content: space-between;
 		align-items: center;
 		.checked{
 			display: flex;
 			align-items: center;
 		}
+		.exam{
+			box-sizing: border-box;
+			padding: 10rpx 50rpx;
+			border-radius: 30rpx;
+			background-color: #3788FF;
+			font-size: 14px;
+			color: #fff;
+		}
 	}
 
 	.popup1 {

pages/fetchMaterialOutStoreDetail/fetchMaterialOutStoreDetail.vue

@@ -329,41 +329,48 @@
 			},
 			finishOut () {
 				let that = this
-				uni.showModal({
+				if (that.infoList.outNum > 0) {
-					title: '完成出库',
+					uni.showToast({
-					content: '确定将此种机具完成出库吗？',
+						icon: 'none',
-					confirmText: '出库',
+						title: '该设备待出库数量不为0！'
-					success: (res) => {
+					})
-						if (res.confirm) {
+				} else {
-							that.showLoading = true
+					uni.showModal({
-							console.log(that.infoList);
+						title: '完成出库',
-							that.$api.fetchMaterialOutStore.directOutStore({
+						content: '确定将此种机具完成出库吗？',
-								id: that.infoList.parentId,
+						confirmText: '出库',
-								typeId: that.infoList.typeId
+						success: (res) => {
-							}).then(res => {
+							if (res.confirm) {
-								console.log(res);
+								that.showLoading = true
-								if (res.data.code == 200) {
+								console.log(that.infoList);
-									that.showLoading = false
+								that.$api.fetchMaterialOutStore.directOutStore({
-									uni.showToast({
+									id: that.infoList.parentId,
-										icon: 'none',
+									typeId: that.infoList.typeId
-										title: res.data.msg,
+								}).then(res => {
-										success: () => {
+									console.log(res);
-											uni.navigateBack()
+									if (res.data.code == 200) {
-										}
+										that.showLoading = false
-									})
+										uni.showToast({
-								} else {
+											icon: 'none',
-									that.showLoading = false
+											title: res.data.msg,
-									uni.showToast({
+											success: () => {
-										icon: 'none',
+												uni.navigateBack()
-										title: res.data.msg
+											}
-									})
+										})
-								}
+									} else {
-							}).catch(err => {
+										that.showLoading = false
-								console.log(err);
+										uni.showToast({
-							})
+											icon: 'none',
+											title: res.data.msg
+										})
+									}
+								}).catch(err => {
+									console.log(err);
+								})
+							}
 						}
-					}
+					})
-				})
+				}
 			}
 		},
 		onLoad(params) {