6.25宁夏提交

apis/http.js

@@ -4,25 +4,25 @@ class HttpConfig {
 	// #endif
 	// #ifdef APP-PLUS
 	// baseUrl = "http://112.29.103.165:21624"
-	// baseUrl = "http://192.168.0.14: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://10.40.92.48: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: {

pages/fetchMaterialOutStoreDetail/fetchMaterialOutStoreDetail.vue

@@ -174,17 +174,23 @@
 							this.$refs.popup1.open()
 						}
 					} else {
-						if (this.infoList.outNum == 0) {
+						if (this.infoList.status == 2) {
 							uni.showToast({
 								icon: 'none',
-								title: '无法再出库！'
+								title: '此机具已完成出库，无法再操作！'
 							})
 						} else {
-							this.$refs.popup2.open()
+							if (this.infoList.outNum == 0) {
+								uni.showToast({
+									icon: 'none',
+									title: '无法再出库！'
+								})
+							} else {
+								this.$refs.popup2.open()
+							}
 						}
 					}
 				}
-				
 			},
 			closePopup1 () {
 				this.$refs.popup1.close()
@@ -333,7 +339,10 @@
 								if (res.data.code == 200) {
 									uni.showToast({
 										icon: 'none',
-										title: res.data.msg
+										title: res.data.msg,
+										success: () => {
+											uni.navigateBack()
+										}
 									})
 								}
 							}).catch(err => {

pages/preCrashExamDetail/preCrashExamDetail.vue

@@ -347,6 +347,7 @@
 		},
 		onShow() {
 			this.imgPrefix = this.$api.url
+			console.log(this.imgPrefix);
 			this.fetchPreDetail(this.taskId)
 		}
 	}
@@ -366,6 +367,7 @@
 		position: relative;
 		display: flex;
 		align-items: center;
+		border-bottom: 1px solid #D7D7D7;
 		.info-cont{
 			width: 100%;
 			display: flex;

pages/preCrashList/preCrashList.vue

@@ -114,6 +114,11 @@
 					console.log(res);
 					if (res.data.code == 200) {
 						that.preCrashList = res.data.data
+					} else {
+						uni.showToast({
+							icon: 'none',
+							title: res.data.msg
+						})
 					}
 				}).catch(err => {
 					console.log(err);

pages/preCrashListDetail/preCrashListDetail.vue

@@ -1,6 +1,86 @@
 <template>
 	<view>
-		
+		<view
+			class="single-pre"
+			v-for="(list, index) in preDetailList"
+			:key="list.id"
+		>
+		<view>
+			<checkbox-group
+				v-show="list.status == '0' && showBtn == '0'" 
+				style="margin-right: 15rpx;"
+				@change="checkClick(list)"
+			>
+				<checkbox :checked="list.checked" />
+			</checkbox-group>
+		</view>
+			<view class="info-cont">
+				<view>
+					<h4>设备类型</h4>
+					<h5>{{ list.machineTypeName }}</h5>
+				</view>
+				<view>
+					<h4>规格型号</h4>
+					<h5>{{ list.specificationType }}</h5>
+				</view>
+				<view>
+					<h4>设备编码</h4>
+					<h5>{{ list.maCode == null ? '-' : list.maCode }}</h5>
+				</view>
+				<view>
+					<h4>报废数量</h4>
+					<h5>{{ list.scrapNum }}</h5>
+				</view>
+				<view>
+					<h4>损坏原因</h4>
+					<h5>{{ list.scrapType == '0' ? '自然' : '人为' }}</h5>
+				</view>
+				<view>
+					<h4>报废图片</h4>
+					<h5>
+						<image 
+							v-for="(img, index) in list.fileUrl"
+							:key="index"
+							:src="imgPrefix + img[index]" 
+							mode=""
+						></image>
+					</h5>
+				</view>
+				<!-- <h3 v-show="list.status == '0' && showBtn == '0'">
+					<text
+						@click="togglePass(list)"
+					>
+						通过
+					</text>
+					<text
+						style="background-color: #fff; color: #000; border: 1px solid #EBEBEB;"
+						@click="toggleRefuse(list)"
+					>
+						驳回
+					</text>
+				</h3> -->
+				<!-- <h6 class="sticky-area">
+					<h4
+						v-show="list.status == '0'"
+						style="background-color: #FFF6E7; color: #FCAA23;"
+					>
+						待审核
+					</h4>
+					<h4
+						v-show="list.status == '1'"
+						style="background-color: #E9FBE7; color: #3CD92E;"
+					>
+						已通过
+					</h4>
+					<h4
+						v-show="list.status == '2'"
+						style="background-color: #FFECEC; color: #FF4C4C;"
+					>
+						驳回
+					</h4>
+				</h6> -->
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -8,6 +88,8 @@
 	export default {
 		data() {
 			return {
+				imgPrefix: '',
+				showBtn: '',
 				taskId: '',
 				preDetailList: [],
 				deptList: []
@@ -66,13 +148,94 @@
 		},
 		onLoad(params) {
 			console.log(params);
+			this.showBtn = params.showBtn
 			this.taskId = params.taskId
 			this.fetchPreDetail(this.taskId)
 			this.getDeptTree()
+		},
+		onShow() {
+			this.imgPrefix = this.$api.url
 		}
 	}
 </script>
 
-<style>
+<style lang="scss">
-
+	body{
+		background-color: #FAFDFF;
+		box-sizing: border-box;
+		padding-bottom: 10vh;
+	}
+	.single-pre{
+		width: 100%;
+		box-sizing: border-box;
+		padding: 30rpx;
+		background-color: #fff;
+		position: relative;
+		display: flex;
+		align-items: center;
+		.info-cont{
+			width: 100%;
+			display: flex;
+			flex-direction: column;
+			view{
+				display: flex;
+				align-items: center;
+				margin-bottom: 25rpx;
+				h4{
+					font-weight: normal;
+					font-size: 30rpx;
+					color: #ADADAD;
+					padding-right: 20rpx;
+				}
+				h5{
+					font-weight: normal;
+					font-size: 30rpx;
+					image{
+						width: 20%;
+						height: 100rpx;
+					}
+				}
+			}
+			view:last-child{
+				margin-bottom: 0;
+			}
+		}
+		h3{
+			width: 100%;
+			box-sizing: border-box;
+			padding: 20rpx;
+			margin-top: 50rpx;
+			font-size: 14px;
+			font-weight: normal;
+			display: flex;
+			align-items: center;
+			justify-content: right;
+			text{
+				width: 20%;
+				box-sizing: border-box;
+				padding: 10rpx 0;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				border-radius: 30rpx;
+				background-color: #3888FF;
+				font-weight: normal;
+				margin-right: 30rpx;
+				color: #fff;
+			}
+			text:last-child{
+				margin-right: 0;
+			}
+		}
+		/* .sticky-area{
+			font-size: 16px;
+			position: absolute;
+			top: 20rpx;
+			right: 20rpx;
+			h4{
+				box-sizing: border-box;
+				padding: 10rpx 25rpx;
+			}
+		} */
+	}
 </style>