From e06876cbcf772622b3094be0d4c571e8268b57fe Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Fri, 18 Nov 2022 09:37:32 +0800
Subject: [PATCH] eventhandleSubmit

---
 manifest.json                     |  4 ++--
 pages/home/detail/eventHandle.vue | 10 ++++------
 pages/home/list/event.vue         | 16 +++++++++++++---
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/manifest.json b/manifest.json
index dbcdd84..818f030 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "曲阳金隅EHS",
     "appid" : "__UNI__B00D419",
     "description" : "曲阳金隅EHS",
-    "versionName" : "1.01.17",
-    "versionCode" : 101017,
+    "versionName" : "1.01.18",
+    "versionCode" : 101018,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages/home/detail/eventHandle.vue b/pages/home/detail/eventHandle.vue
index 696b402..542e019 100644
--- a/pages/home/detail/eventHandle.vue
+++ b/pages/home/detail/eventHandle.vue
@@ -102,7 +102,7 @@
 					</label>
 				</radio-group>
 			</view>
-			<view class="btn" style="display: flex;justify-content: space-between;margin-top: 20rpx;">
+			<view class="btn" v-if="type=='handle'" style="display: flex;justify-content: space-between;margin-top: 20rpx;">
 				<button class="mini-btn" size="mini" type="primary" @click="eventHandle">处理</button>
 			</view>
 			<img-view ref="imgPreView" :imgSrc="preImgSrc" @cancelPreView="cancelPreView"></img-view>
@@ -139,13 +139,14 @@
 		},
 		onLoad(params) {
 			this.eventId = params.eventId;
+			this.type = params.type;
 		},
 		onShow() {
 			this.getEventItem();
 		},
 		methods: {
 			radioChange(val) {
-				this.form.mark=val
+				this.form.mark=val.detail.value;
 			},
 			cancelPreView(){
 				this.preImgSrc = '';
@@ -159,10 +160,6 @@
 					current: 0,
 				});
 			},
-			// preView(srcImg){
-			// 	this.preImgSrc = srcImg;
-			// 	this.$refs.imgPreView.open();
-			// },
 			cancelPreImg(){
 				this.preImg = false;
 			},
@@ -183,6 +180,7 @@
 			eventHandle() {
 				debugger;
 				console.log(this.form)
+				this.mark = parseInt(this.form.mark);
 				this.$u.api.eventtHandle(this.eventId, this.form).then(res => {
 					this.goBack()
 				})
diff --git a/pages/home/list/event.vue b/pages/home/list/event.vue
index 7af06a5..6b21a57 100644
--- a/pages/home/list/event.vue
+++ b/pages/home/list/event.vue
@@ -29,10 +29,14 @@
 						<view class="info-details">触发时间：{{event.create_time}} </view>
 					</view>
 					<view class="bottom-btns">
-						<view class="shenhezhong bottom-btn" @click="eventHandle(event,'handle')">
+						<view class="shenhezhong bottom-btn" v-if="event.handle_user == null" @click="eventHandle(event,'handle')">
 							<image src="../../../static/my/my_apply/blue-time.png" mode=""></image>
 							处理
 						</view>
+						<view class="shenhejieshu bottom-btn" @click="eventHandle(event,'show')">
+							<image src="../../../static/my/my_apply/tongguo.png" mode=""></image>
+							查看
+						</view>
 					</view>
 				</view>
 			</view>
@@ -102,8 +106,8 @@
 					}
 				})
 			},
-			eventHandle(val) {
-				let params = `?eventId=${val.id}`;
+			eventHandle(val,type) {
+				let params = `?eventId=${val.id}&type=${type}`;
 				uni.navigateTo({
 					url: '../detail/eventHandle' + params,
 				})
@@ -184,6 +188,8 @@
 		font-family: PingFang-SC-Medium;
 		font-size: 28rpx;
 		line-height: 83rpx;
+		display: flex;
+		justify-content: space-around;
 	}
 
 	.shenhezhong {
@@ -256,4 +262,8 @@
 		margin-right: 10rpx;
 		vertical-align: middle;
 	}
+	.shenhejieshu {
+		color: #15a306;
+	}
+	
 </style>