6.27预报废列表新增审核与详情查看

apis/apis.js

@@ -842,6 +842,14 @@ const preCrashList = {
 			header
 		)
 	},
+	async submitCrashTask(data = {}, header = {}) {
+		return await Http.post(
+			HttpConfig.materialPath,
+			HttpConfig.serviceUrl.preCrashList.submitCrashTask,
+			data,
+			header
+		)
+	},
 }
 
 const url = HttpConfig.systemPath

apis/http.js

@@ -3,26 +3,26 @@ class HttpConfig {
 	baseUrl = "/api"
 	// #endif
 	// #ifdef APP-PLUS
-	baseUrl = "http://112.29.103.165:21624"
+	// baseUrl = "http://112.29.103.165:21624"
 	// baseUrl = "http://192.168.0.14:21624"
 	// baseUrl = "http://112.29.103.165:21626"
 	// baseUrl = "http://172.20.10.3:8080"
 	// baseUrl = "http://10.40.92.8:8080"
 	// baseUrl = "http://10.40.92.52:28080"
 	// baseUrl = "http://10.40.92.78:28080"
-	// baseUrl = "http://10.40.92.48:38080"
+	baseUrl = "http://192.168.2.122:38080"
 	// baseUrl = "https://z.csgmall.com.cn/gl"
 	// baseUrl = "http://10.40.92.141:28080"
 	// #endif
 	// 基地址
-	authPath = `${this.baseUrl}/dev-api/auth`
+	/* authPath = `${this.baseUrl}/dev-api/auth`
 	systemPath = `${this.baseUrl}/dev-api/system`
 	basePath = `${this.baseUrl}/dev-api/base`
-	materialPath = `${this.baseUrl}/dev-api/material`
+	materialPath = `${this.baseUrl}/dev-api/material` */
-	/* authPath = `${this.baseUrl}/auth`
+	authPath = `${this.baseUrl}/auth`
 	systemPath = `${this.baseUrl}/system`
 	basePath = `${this.baseUrl}/base`
-	materialPath = `${this.baseUrl}/material` */
+	materialPath = `${this.baseUrl}/material`
 	// 短链
 	serviceUrl = {
 		login: {
@@ -169,6 +169,7 @@ class HttpConfig {
 		preCrashList: {
 			fetchPreSubList: '/scrap/getScrapTaskListApp', // 获取预报废提交列表
 			fetchDeptTree: '/user/deptTree', // 获取部门树状结构
+			submitCrashTask: '/scrap/submitScrapTask', // 预报废列表提交报废
 		}
 	}
 }

pages.json

@@ -491,6 +491,14 @@
             }
             
         }
+        ,{
+            "path" : "pages/preCrashDeptList/preCrashDeptList",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "审批部门"
+            }
+            
+        }
     ],
 	"tabBar": {
 		"color": "#2c2c2c",

pages/fetchMaterialOutStoreDetail/fetchMaterialOutStoreDetail.vue

@@ -190,6 +190,11 @@
 							}
 						}
 					}
+				} else {
+					uni.showToast({
+						icon: 'none',
+						title: '此机具已完成出库，无法再操作！'
+					})
 				}
 			},
 			closePopup1 () {

pages/preCrashDeptList/preCrashDeptList.vue

@@ -0,0 +1,25 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		},
+		onLoad(params) {
+			console.log(params);
+		}
+	}
+</script>
+
+<style>
+
+</style>

pages/preCrashExamDetail/preCrashExamDetail.vue

@@ -126,6 +126,7 @@
 				</view>
 			</view>
 		</uni-popup>
+		<u-loading-page :loading="showLoading" color="#000" loading-text="提交中,请稍后..."></u-loading-page>
 	</view>
 </template>
 
@@ -133,6 +134,7 @@
 	export default {
 		data() {
 			return {
+				showLoading: false,
 				allChecked: false,
 				taskId: '',
 				preDetailList: [],
@@ -166,10 +168,12 @@
 			},
 			submitExam (obj) {
 				let that = this
+				that.showLoading = true
 				// 提交审核/驳回
 				that.$api.preCrashExam.submitPreExam(obj).then(res => {
 					console.log(res);
 					if (res.data.code == 200) {
+						that.showLoading = false
 						uni.showToast({
 							icon: 'none',
 							title: res.data.msg,
@@ -178,6 +182,7 @@
 							}
 						})
 					} else {
+						that.showLoading = false
 						uni.showToast({
 							icon: 'none',
 							title: res.data.msg
@@ -287,7 +292,7 @@
 			clickPass () {
 				let that = this
 				let subList = that.preDetailList.filter(item => {
-					return item.checked == true
+					return item.checked == true && item.status == 0
 				}).map(subItem => {
 					return {
 						auditBy: uni.getStorageSync('userInfo').userid,
@@ -322,7 +327,7 @@
 			clickReject () {
 				let that = this
 				let subList = that.preDetailList.filter(item => {
-					return item.checked == true
+					return item.checked == true && item.status == 0
 				}).map(subItem => {
 					return {
 						auditBy: uni.getStorageSync('userInfo').userid,

pages/preCrashList/preCrashList.vue

@@ -9,13 +9,13 @@
 			:key="index"
 		>
 			<view class="fetch-upper">
-				<!-- <checkbox-group 
+				<checkbox-group 
-					v-show="pre.taskStatus == 58" 
+					v-show="pre.taskStatus == 124" 
 					style="margin-right: 15rpx;"
 					@change="checkClick(pre)"
 				>
 					<checkbox :checked="pre.checked" />
-				</checkbox-group> -->
+				</checkbox-group>
 				<view class="upper-lef">
 					{{ pre.createBy == null ? '' : pre.createBy.slice(0, 1) }}
 				</view>
@@ -52,12 +52,23 @@
 				</view>
 				<view 
 					style="background-color: #FCA30D;" 
+					v-show="pre.taskStatus == '61'"
 				>
 					<uni-icons style="color: #fff;" type="auth"></uni-icons>
-					审核
+					编辑
+				</view>
+				<view
+					style="background-color: #09dcfc;" 
+					v-show="pre.taskStatus == '58'"
+					@click="seeListExamDetail(pre.scrapAuditorSetList)"
+				>
+					<uni-icons style="color: #fff;" type="chat"></uni-icons>
+					审批详情
 				</view>
 				<view
 					style="background-color: #1BD30B;" 
+					v-show="pre.taskStatus == '124'"
+					@click="subSingle(pre)"
 				>
 					<uni-icons style="color: #fff;" type="paperplane"></uni-icons>
 					提交
@@ -69,6 +80,7 @@
 				<image src="/static/noExam.png" v-show="pre.taskStatus == 58" mode=""></image> -->
 				<h4
 					v-show="pre.taskStatus == '124'"
+					style="border: 1px solid #ff9717; color: #ff9717;"
 				>
 					待提交
 				</h4>
@@ -91,15 +103,138 @@
 				</h4>
 			</view>
 		</view>
+		<view class="btm-sticky">
+			<view class="checked">
+				<checkbox-group @tap="checkAll" style="margin-right: 15rpx;">
+					<checkbox :checked="allChecked" />
+				</checkbox-group>
+				<text>全选</text>
+			</view>
+			<view style="display: flex;">
+				<view 
+					class="exam"
+					@click="clickSubmit"
+					style="margin-right: 15rpx;"
+				>
+					提交
+				</view>
+				<!-- <view
+					class="exam"
+					style="background-color: #fff; color: #000; border: 1px solid #EBEBEB;"
+					@click="clickReject"
+				>
+					驳回
+				</view> -->
+			</view>
+		</view>
+		<uni-popup
+			ref="popup1" 
+			type="center"
+			:mask-click="false"
+		>
+			<view class="popup1">
+				<view class="pop-top">
+					<h4>选择审批部门</h4>
+					<uni-icons 
+						style="color: #AAAAAA; font-weight: bold;" 
+						type="closeempty" 
+						@click="closePopup1"
+					>
+					</uni-icons>
+				</view>
+				<view class="select-area">
+					<!-- <uni-easyinput v-model="rejectReason" placeholder="请填写驳回原因"></uni-easyinput> -->
+					<custom-tree-select
+						:listData="deptList"
+						v-model="deptArr"
+						:mutiple="true"
+						:search="true"
+						:choseParent="false"
+						:pathMode="true"
+					></custom-tree-select>
+					<view class="btn" @click="confirmDeptList">确定</view>
+				</view>
+			</view>
+		</uni-popup>
+		<uni-popup
+			ref="popup2" 
+			type="center"
+			:mask-click="false"
+		>
+			<view class="popup2">
+				<view class="pop-top">
+					<h4>审批详情</h4>
+					<uni-icons 
+						style="color: #AAAAAA; font-weight: bold;" 
+						type="closeempty" 
+						@click="closePopup2"
+					>
+					</uni-icons>
+				</view>
+				<view class="select-area">
+					<!-- <view class="area-top">
+						<span>审批部门</span>
+						<span>审批状态</span>
+						<span>审批意见</span>
+					</view> -->
+					<uni-table ref="table" border stripe emptyText="暂无更多数据">
+						<uni-tr>
+							<uni-th align="center">审批部门</uni-th>
+							<uni-th align="center" width="150">审批状态</uni-th>
+							<uni-th align="center">审批意见</uni-th>
+						</uni-tr>
+						<uni-tr 
+							v-for="(dept, index) in examDetailList" 
+							:key="dept.id"
+						>
+							<uni-td align="center">
+								{{ dept.deptName }}
+							</uni-td>
+							<uni-td align="center">
+								<view 
+									:class="[
+										{ 'orange': dept.status == '0' },
+										{ 'green': dept.status == '1' },
+										{ 'red': dept.status == '2' }
+									]"
+								>
+									{{ dept.mark }}
+								</view>
+							</uni-td>
+							<uni-td align="center">
+								{{ dept.reasonRejection == null ? '--' : dept.reasonRejection }}
+							</uni-td>
+						</uni-tr>
+					</uni-table>
+					<!-- <view 
+						class="single-dept"
+						v-for="(dept, index) in examDetailList"
+						:key="dept.id"
+					>
+						<span>{{ dept.deptName }}</span>
+						<span>{{ dept.mark }}</span>
+						<span>{{ dept.reasonRejection == null ? '--' : dept.reasonRejection }}</span>
+					</view> -->
+				</view>
+			</view>
+		</uni-popup>
+		<u-loading-page :loading="showLoading" color="#000" loading-text="提交中,请稍后..."></u-loading-page>
 	</view>
 </template>
 
 <script>
+	import QS from 'qs'
 	export default {
 		data() {
 			return {
+				showLoading: false,
+				allChecked: false,
 				preCrashList: [],
-				subIpt: ''
+				subIpt: '',
+				deptList: [],
+				deptArr: [],
+				taskIdList: [],
+				examDetailList: []
 			}
 		},
 		methods: {
@@ -113,6 +248,9 @@
 				}).then(res => {
 					console.log(res);
 					if (res.data.code == 200) {
+						res.data.data.forEach(item => {
+							item.checked = false
+						})
 						that.preCrashList = res.data.data
 					} else {
 						uni.showToast({
@@ -124,15 +262,165 @@
 					console.log(err);
 				})
 			},
+			getDeptTree () {
+				let that = this
+				that.$api.preCrashList.fetchDeptTree().then(res => {
+					that.deptList = that.veri(res.data.data)
+					console.log(that.deptList);
+				}).catch(err => {
+					console.log(err);
+				})
+			},
+			veri (data) {
+				let that = this
+				if (!data || data.length <= 0) {
+					return null;
+				}
+				return data.map(x => {
+					const model = {
+						name: x.label,
+						id: x.id
+					}
+				    
+				    const children = that.veri(x.children);
+						
+				    if (children) { 
+					    model.children = children;
+				    }
+					
+					return model;
+				});
+			},
 			seeListDetail (taskId) {
 				console.log(taskId);
 				uni.navigateTo({
 					url: `/pages/preCrashListDetail/preCrashListDetail?taskId=${taskId}`
 				})
+			},
+			seeListExamDetail (examList) {
+				console.log(examList);
+				examList.forEach(item => {
+					switch (item.status) {
+						case '0':
+							item.mark = '待审批'
+							break;
+						case '1':
+							item.mark = '通过'
+							break;
+						case '2':
+							item.mark = '已驳回'
+							break;
+					}
+				})
+				this.examDetailList = examList
+				this.$refs.popup2.open()
+				/* let transList = QS.stringify(examList)
+				uni.navigateTo({
+					url: `/pages/preCrashDeptList/preCrashDeptList?list=${transList}`
+				}) */
+			},
+			checkClick(item) {
+				item.checked = !item.checked
+				if (!item.checked) {
+					this.allChecked = false
+				} else {
+					const goods = this.preCrashList.every(item => {
+						return item.checked === true
+					})
+					if (goods) {
+						this.allChecked = true
+					} else {
+						this.allChecked = false
+					}
+				}
+			},
+			checkAll() {
+				this.allChecked = !this.allChecked
+				if (this.allChecked) {
+					this.preCrashList.map(item => {
+						if (item.checked == false) {
+							item.checked = true
+						}
+					})
+				} else {
+					this.preCrashList.map(item => {
+						if (item.checked == true) {
+							item.checked = false
+						}
+					})
+				}
+			},
+			clickSubmit () {
+				let that = this
+				that.taskIdList = []
+				let subList = that.preCrashList.filter(item => {
+					return item.checked == true && item.taskStatus == 124
+				})
+				if (subList.length == 0) {
+					uni.showToast({
+						icon: 'none',
+						title: '未选中提交项！'
+					})
+				} else {
+					// that.taskIdList = subList
+					subList.forEach(item => {
+						that.taskIdList.push(item.taskId)
+					})
+					console.log(that.taskIdList);
+					that.$refs.popup1.open()
+				}
+			},
+			subSingle (list) {
+				let that = this
+				that.taskIdList = []
+				that.taskIdList.push(list.taskId)
+				console.log(that.taskIdList);
+				that.$refs.popup1.open()
+			},
+			closePopup1 () {
+				this.$refs.popup1.close()
+			},
+			closePopup2 () {
+				this.$refs.popup2.close()
+			},
+			confirmDeptList () {
+				let that = this
+				that.showLoading = true
+				console.log(that.deptArr, that.taskIdList);
+				that.$api.preCrashList.submitCrashTask({
+					taskIdList: that.taskIdList,
+					deptIds: that.deptArr
+				}).then(res => {
+					if (res.data.code == 200) {
+						that.showLoading = false
+						uni.showToast({
+							icon: 'none',
+							title: res.data.msg,
+							success: () => {
+								uni.redirectTo({
+									url: '/pages/preCrashList/preCrashList'
+								})
+							}
+						})
+					} else {
+						that.showLoading = false
+						uni.showToast({
+							icon: 'none',
+							title: res.data.msg
+						})
+					}
+				}).catch(err => {
+					that.showLoading = false
+					uni.showToast({
+						icon: 'none',
+						title: '网络异常，请稍后再试！'
+					})
+				})
 			}
 		},
 		onShow() {
 			this.getSubList('')
+			this.getDeptTree()
 		}
 	}
 </script>
@@ -249,4 +537,99 @@
 			}
 		}
 	}
+	.btm-sticky{
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		width: 100%;
+		box-sizing: border-box;
+		padding: 15rpx 30rpx;
+		background-color: #fff;
+		display: flex;
+		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{
+		width: 80vw;
+		height: 80vh;
+		background-color: #fff;
+		border-radius: 15rpx;
+		overflow-y: auto;
+		background: linear-gradient(#D9E7FE, #fff, #fff, #fff);
+		.pop-top{
+			width: 100%;
+			height: 5vh;
+			box-sizing: border-box;
+			padding: 0 25rpx;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+		}
+		.select-area{
+			width: 85%;
+			margin: 40rpx auto;
+			.btn{
+				width: 30%;
+				box-sizing: border-box;
+				padding: 10rpx 0;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				background-color: #3788FF;
+				color: #fff;
+				font-size: 14px;
+				border-radius: 15rpx;
+				margin: 40rpx auto;
+			}
+		}
+	}
+	.popup2{
+		width: 80vw;
+		height: 80vh;
+		background-color: #fff;
+		border-radius: 15rpx;
+		overflow-y: auto;
+		background: linear-gradient(#D9E7FE, #fff, #fff, #fff);
+		.pop-top{
+			width: 100%;
+			height: 5vh;
+			box-sizing: border-box;
+			padding: 0 25rpx;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+		}
+		.select-area{
+			width: 85%;
+			margin: 40rpx auto;
+			font-size: 14px;
+			.red, .orange, .green{
+				width: 50%;
+				margin-left: 25%;
+				color: #fff;
+				border-radius: 10rpx;
+			}
+			.red{
+				background-color: #FF4141;
+			}
+			.orange{
+				background-color: #FCA20D;
+			}
+			.green{
+				background-color: #1BD30B;
+			}
+		}
+	}
 </style>

pages/preCrashListDetail/preCrashListDetail.vue

@@ -81,6 +81,15 @@
 				</h6> -->
 			</view>
 		</view>
+		<!-- <custom-tree-select
+			:listData="deptList"
+			v-model="deptArr"
+			:mutiple="true"
+			:search="true"
+			:choseParent="false"
+			:pathMode="true"
+			@selectChange="treeChange"
+		></custom-tree-select> -->
 	</view>
 </template>
 
@@ -92,10 +101,16 @@
 				showBtn: '',
 				taskId: '',
 				preDetailList: [],
-				deptList: []
+				deptList: [],
+				deptArr: []
 			}
 		},
 		methods: {
+			treeChange () {
+				let that = this
+				// console.log(e, index);
+				console.log(that.deptArr);
+			},
 			fetchPreDetail (taskId) {
 				let that = this
 				that.$api.preCrashExam.fetchPreCrashDetail({

pages/workSpace/workSpace.vue

@@ -102,7 +102,7 @@
 						pic: '/static/fix.png',
 						url: 'fix'
 					},
-					/* {
+					{
 						name: '预报废审核',
 						pic: '/static/preCrashExam.png',
 						url: 'preCrashExam'
@@ -111,7 +111,7 @@
 						name: '预报废列表',
 						pic: '/static/preCrashList.png',
 						url: 'preCrashList'
-					}, */
+					},
 					{
 						name: '报废审核',
 						pic: '/static/crashExam.png',

router.js

@@ -447,6 +447,13 @@ const router = createRouter({
 		    "meta": {
 		    	"needAuth": "true"
 		    }
+		},
+		{
+		    "path" : "/pages/preCrashDeptList/preCrashDeptList",
+		    "name": 'preCrashDeptList',
+		    "meta": {
+		    	"needAuth": "true"
+		    }
 		}
 	]
 })