From 80d8fbe3ccab24bbe0df196c72835b6fdc2a22d3 Mon Sep 17 00:00:00 2001
From: 易尊强 <306277016@qq.com>
Date: Thu, 29 Feb 2024 14:29:33 +0800
Subject: [PATCH] 2/29下午

---
 pages.json                                     |   8 ++++++++
 pages/Feedback/userAppeal/Feedback.scss        | 187 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pages/Feedback/userAppeal/userAppeal.vue       | 226 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pages/apply/dynamicModel/index.vue             |   2 +-
 pages/datain/datain.vue                        |  64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------
 pages/my/adminMessageList/adminMessageList.vue |  33 +++++++++++++++++++--------------
 pages/my/messageList/messageList.vue           |  15 ++++++++++++++-
 pages/my/userReponse/userReponse.vue           |  15 +++++++++++----
 8 files changed, 522 insertions(+), 28 deletions(-)
 create mode 100644 pages/Feedback/userAppeal/Feedback.scss
 create mode 100644 pages/Feedback/userAppeal/userAppeal.vue

diff --git a/pages.json b/pages.json
index 235d206..5c10249 100644
--- a/pages.json
+++ b/pages.json
@@ -450,6 +450,14 @@
 				"navigationBarTitleText" : "管理员信息列表",
 				"enablePullDownRefresh" : false
 			}
+		},
+		{
+			"path" : "pages/Feedback/userAppeal/userAppeal",
+			"style" : 
+			{
+				"navigationBarTitleText" : "诉求信息",
+				"enablePullDownRefresh" : false
+			}
 		}
 
 		// {
diff --git a/pages/Feedback/userAppeal/Feedback.scss b/pages/Feedback/userAppeal/Feedback.scss
new file mode 100644
index 0000000..8c4297d
--- /dev/null
+++ b/pages/Feedback/userAppeal/Feedback.scss
@@ -0,0 +1,187 @@
+.page{
+	position: absolute;
+	left: 0;
+	top: 0;
+	width: 100%;
+	height: 100%;
+	background-color: #f6f6f6;
+}
+.titleall-box {
+	display: flex;
+	justify-content: space-between;
+	padding: 40rpx 20rpx 20rpx 0;
+	.titleall-left {
+		font-size: 32rpx;
+		font-weight: bold;
+		display: flex;
+		align-items: center;
+		.titleall-left-line {
+			width: 14rpx;
+			height: 36rpx;
+			border-radius: 0 10rpx 10rpx 0;
+			background-color: #E60012;
+			box-shadow: 0 0 10rpx 5rpx #fbdadc;
+			margin-right: 20rpx;
+		}
+		text {
+			font-size: 28rpx;
+			color: #999999;
+		}
+	}
+}
+/* 反馈类型 */
+.feedback-type{
+	position: relative;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	width: 94%;
+	height: 100rpx;
+	margin: 20rpx auto;
+	background-color: #FFFFFF;
+	border-radius: 20rpx;
+	padding: 0 4%;
+	.feedback-type-left {
+		color: #909090;
+	}
+	.title{
+		display: flex;
+		align-items: center;
+		text{
+			font-size: 26rpx;
+		}
+	}
+	.picker{
+		position: absolute;
+		width: 100%;
+		height: 100%;
+		opacity: 0;
+	}
+	.more{
+		display: flex;
+		align-items: center;
+		text{
+			color: #000;
+			font-size: 34rpx;
+		}
+		image {
+			width: 20rpx;
+			height: 20rpx;
+			margin-left: 10rpx;
+		}
+	}
+	.feedback-type-right {
+		display: flex;
+		align-items: center;
+	}
+}
+.example-body {
+		padding: 10px;
+		padding-top: 0;
+	}
+
+	.custom-image-box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: space-between;
+		align-items: center;
+	}
+
+	.text {
+		font-size: 14px;
+		color: #333;
+	}
+.segmented-control {
+		margin-bottom: 15px;
+	}
+
+	.button-group {
+		margin-top: 15px;
+		display: flex;
+		justify-content: space-around;
+	}
+
+	.form-item {
+		display: flex;
+		align-items: center;
+	}
+
+	.button {
+		display: flex;
+		align-items: center;
+		height: 35px;
+		margin-left: 10px;
+	}
+/* 反馈内容 */
+.feedback-data{
+	width: 94%;
+	// height: 600rpx;
+	margin: 20rpx auto;
+	background-color: #FFFFFF;
+	border-radius: 20rpx;
+	.content{
+		padding: 20rpx;
+		textarea{
+			width: 94%;
+			height: 320rpx;
+			background-color: #f6f6f6;
+			border-radius: 20rpx;
+			padding: 20rpx;
+			font-size: 26rpx;
+			color: #222222;
+		}
+	}
+	.voucher-img{
+		display: flex;
+		align-items: center;
+		padding: 0 20rpx;
+		height: 240rpx;
+		margin-top: 20rpx;
+		.list{
+			width: 33%;
+			height: 100%;
+			image{
+				width: 160rpx;
+				height: 160rpx;
+				border-radius: 10rpx;
+			}
+		}
+	}
+}
+
+/* 联系方式 */
+.contact-way{
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	width: 94%;
+	height: 100rpx;
+	margin: 20rpx auto;
+	background-color: #FFFFFF;
+	border-radius: 20rpx;
+	input{
+		width: 100%;
+		height: 100%;
+		padding: 0 4%;
+		font-size: 26rpx;
+		color: #222222;
+	}
+}
+
+/* 提交 */
+.submit-btn{
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	width: 94%;
+	height: 80rpx;
+	margin: 30rpx auto;
+	background: #E60012;
+	border-radius: 80rpx;
+	text{
+		color: #FFFFFF;
+		font-size: 28rpx;
+	}
+}
\ No newline at end of file
diff --git a/pages/Feedback/userAppeal/userAppeal.vue b/pages/Feedback/userAppeal/userAppeal.vue
new file mode 100644
index 0000000..bfc989f
--- /dev/null
+++ b/pages/Feedback/userAppeal/userAppeal.vue
@@ -0,0 +1,226 @@
+<template>
+	<view class="page">
+		<!-- 反馈内容 -->
+		<view class="feedback-data">
+			<view class="titleall-box">
+				<view class="titleall-left">
+					<view class="titleall-left-line"></view>回复信息
+				</view>
+			</view>
+			<uni-forms ref="valiForm" :rules="rules" :modelValue="valiFormData" style="width: 96%;margin: 0 auto;">
+				<uni-forms-item label="内容" required name="title">
+					<uni-easyinput v-model="valiFormData.title" disabled  />
+				</uni-forms-item>
+				<uni-forms-item label="模块" required name="subTitle">
+					<uni-easyinput v-model="valiFormData.subTitle" disabled  />
+				</uni-forms-item>
+				<uni-forms-item label="回复内容">
+					<uni-easyinput type="textarea" disabled v-model="valiFormData.bodyContent" placeholder="请输入" />
+				</uni-forms-item>
+			</uni-forms>
+			<!-- 选择反馈类型 -->
+			<view class="feedback-type">
+				<view class="feedback-type-left">状态</view>
+				<view class="feedback-type-right">
+					<view class="title">
+						<text>{{TypeArray[TypeIndex]}}</text>
+					</view>
+					<view class="picker">
+						<picker @change="FeedbackTypeCh" :value="TypeIndex" :range="TypeArray">
+								<view class="uni-input">{{TypeArray[TypeIndex]}}</view>
+						</picker>
+					</view>
+					<view class="more">
+						<image src="../../../static/down1.png"></image>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<!-- 提交 -->
+		<!-- <view v-if="have" class="submit-btn" @click="submitContent('valiForm')">
+			<text>发布</text>
+		</view> -->
+		<!-- <view class="submit-btn" @click="updateInfo('valiForm')">
+			<text>确定</text>
+		</view> -->
+	</view>
+</template>
+
+<script>
+	import {
+		data
+	} from '../../../uview-ui/libs/mixin/mixin';
+	import request from '@/utils/request.js'
+	import utils from '../../../service/utils';
+	export default {
+		data() {
+			return {
+				userCode: {},
+				// 选择图片路径
+				filePath: [],
+				uploadPath: [],
+				type: "",
+				lastModifyUserId: '',
+				// 校验表单数据
+				valiFormData: {
+					title: '',
+					bodyContent: '',
+					subTitle: '',
+				},
+				// 通知信息标题
+				noticeTitle:'',
+				// 通知详情
+				noticeDesc:'',
+				creater: '',
+				rules: {
+					title: {
+						rules: [{
+							required: true,
+							errorMessage: '不能为空'
+						}]
+					},
+					subTitle: {
+						rules: [{
+							required: true,
+							errorMessage: '不能为空'
+						}]
+					},
+				},
+				baseUrl: "http://deyanggaoxin.fengshiyun.com",
+				// 判断是否传了id
+				isId: '',
+				have: false,
+				detailData: [],
+				// 需要通知的公司的id
+				companysId: [],
+				tellInfo:[],
+				TypeArray: ['已提交', '已处理', '忽略', '无效'],
+				TypeIndex: 0,
+				info:{}
+			};
+
+		},
+		// onShow() {
+		// 	this.getType()
+		// },
+		onUnload() {
+			uni.$off('idInfo')
+			uni.$off('tellInfo')
+		},
+		onLoad(options) {
+			console.log("options", options)
+			uni.$on('idInfo', res => {
+				console.log("选择公司页面返回的公司ID", res)
+				if(res.length > 0)
+				this.companysId = res
+			})
+			uni.$on('tellInfo', res => {
+				console.log("tell信息", res)
+				if(res.length > 0)
+				this.tellInfo = res
+			})
+			if (JSON.stringify(options) == "{}") {
+				this.have = true
+			} else {
+				this.isId = JSON.parse(options.data)
+				console.log("Id", this.isId)
+				this.getConDetail(this.isId)
+			}
+			this.getUser()
+			let user = uni.getStorageSync('user')
+			this.lastModifyUserId = user.userInfo.userId
+
+		},
+		methods: {
+			// 获取上传状态
+			select(e) {
+				console.log('选择文件：', e)
+				this.filePath = e.tempFilePaths
+			},
+			// 获取用户信息
+			getUser() {
+				if (uni.getStorageSync('user')) {
+					this.userCode = uni.getStorageSync('user').userInfo
+					// this.userInfo = this.userCode.userAccount
+					// this.userInfo = '123456'
+					console.log('用户已登录！', this.userCode)
+				} else {
+					uni.showToast({
+						title: '请登录',
+						icon: 'none'
+					})
+					setTimeout(() => {
+						uni.reLaunch({
+							url: '/pages/login/index'
+						})
+					})
+				}
+			},
+			// /**
+			//  * 反馈类型
+			//  * @param {Object} 
+			//  */
+			FeedbackTypeCh(val) {
+				console.log(val);
+				this.TypeIndex = val.detail.value;
+			},
+			// 获取信息
+			getConDetail(id) {
+				let that = this
+				let currentId = id
+				console.log(currentId)
+				request({
+					url:'/api/Extend/baseappealinformation/' + id,
+					method:'get',
+					data:{}
+				}).then(res=>{
+					if(res.code === 200){
+						console.log(res)
+						this.info = res.data
+						if(this.info.status !== null){
+							let index = this.TypeArray.findIndex(it=>it === this.info.status)
+							this.TypeIndex = index
+							console.log(index)
+						}
+						this.valiFormData.title = this.info.content
+						this.valiFormData.subTitle = this.info.plate
+						this.valiFormData.bodyContent = this.info.result
+					}
+				})
+			},
+			// 进行诉求处理
+			updateInfo(){
+				request({
+					url:'/api/Extend/baseappealinformation/' + this.isId,
+					method:'put',
+					data:{
+						content:this.info.content,
+						status:this.TypeArray[this.TypeIndex],
+						result:this.valiFormData.bodyContent,
+						plate:this.info.plate,
+						isShow:this.info.isShow,
+						type:this.info.type,
+						id:this.isId
+					}
+				}).then(res=>{
+					console.log("修改后",res)
+					if(res.code === 200){
+						uni.showToast({
+							icon:"success",
+							title:'已完成！',
+							duration:1500
+						})
+						uni.navigateBack({
+							delta:1
+						})
+					}
+				})
+			}
+		},
+	}
+</script>
+
+<style scoped lang="scss">
+	@import 'Feedback.scss';
+</style>
\ No newline at end of file
diff --git a/pages/apply/dynamicModel/index.vue b/pages/apply/dynamicModel/index.vue
index 439481a..98dbcad 100644
--- a/pages/apply/dynamicModel/index.vue
+++ b/pages/apply/dynamicModel/index.vue
@@ -50,7 +50,7 @@
 					method: 'get',
 					data: {},
 				}).then(res => {
-					console.log(res)
+					console.log("表单",res)
 					if (res.code !== 200 || !res.data) {
 						uni.showToast({
 							title: '暂无此页面',
diff --git a/pages/datain/datain.vue b/pages/datain/datain.vue
index 73e0cc3..1bb23fb 100644
--- a/pages/datain/datain.vue
+++ b/pages/datain/datain.vue
@@ -84,18 +84,18 @@
 					</view>
 				</view>
 				<view class="user-list" style="padding-top: 0;padding-bottom: 0;" v-for="(item,index) in formList">
-					<view class="list" @click="toForm(it)" v-for="(it,index) in item.children">
-						<view class="title">
+					<view class="list"  v-for="(it,index) in item.children">
+						<view class="title" @click="toForm(it)">
 							<text>{{it.fullName}}</text>
 						</view>
 						<view class="more-content">
-							<view class="buttons">
-								<button size="mini">已选择<span>0</span>家企业</button>
+							<view class="buttons" v-show="!isAdmin" style="margin-right: 20rpx;" @click="toTellInfo">
+								<button size="mini">通知填写和企业选择</button>
 							</view>
-							<view class="buttons">
+							<view class="buttons" v-show="!isAdmin" style="margin-right: 20rpx;" @click="tellNotice(it.id)">
 								<button size="mini" type="warn">通知</button>
 							</view>
-							<view class="more-content-img">
+							<view class="more-content-img" @click="toForm(it)">
 								<image src="../../static/right2.png"></image>
 							</view>
 						</view>
@@ -243,12 +243,28 @@
 							linearType: "custom"
 						}
 					}
-				}
+				},
+				companysId:[],
+				tellInfo:[]
 			}
 		},
+		onUnload() {
+			uni.$off('idInfo')
+			uni.$off('tellInfo')
+		},
 		onLoad() {
 			this.getUser()
 			this.getPostQing()
+			uni.$on('idInfo', res => {
+				console.log("选择公司页面返回的公司ID", res)
+				if(res.length > 0)
+				this.companysId = res
+			})
+			uni.$on('tellInfo', res => {
+				console.log("tell信息", res)
+				if(res.length > 0)
+				this.tellInfo = res
+			})
 		},
 		created() {
 			this.getFormList()
@@ -261,6 +277,37 @@
 				console.log(this.startDate,this.endDate)
 				this.getPostQing()
 			},
+			// 跳转到选择通知企业页面
+			toTellInfo() {
+				uni.navigateTo({
+					url: '/pages/tellInfo/tellInfo'
+				})
+			},
+			// 进行通知
+			tellNotice(id){
+				// 进行通知
+				request({
+					url:'/api/extend/demo/SendMessageByApp',
+					method:'post',
+					data:{
+						title:this.tellInfo[0],
+						companys:this.companysId,
+						desc:this.tellInfo[1],
+						reid:id,
+						type:'表单填报通知',
+						link:'/pages/apply/dynamicModel/index',
+						fangshi:'通知'
+					}
+				}).then(res=>{
+					console.log('通知结果',res)
+					if(res.code == 200){
+						uni.showToast({
+							icon:"success",
+							title:"通知成功"
+						})
+					}
+				})
+			},
 			// 获取用户信息
 			getUser() {
 				// // 获取日期
@@ -430,7 +477,8 @@
 				// 	url: `/pages/apply/dynamicModel/index?data=${JSON.stringify(it)}`
 				// })
 				uni.navigateTo({
-					url: '/pages/apply/dynamicModel/index?id=' + item.id + '&fullName=' + item.fullName,
+					// url: '/pages/apply/dynamicModel/index?id=' + item.id + '&fullName=' + item.fullName,
+					url: '/pages/apply/dynamicModel/index?id=' + item.id,
 					fail: (err) => {
 						this.$u.toast("暂无此页面")
 					}
diff --git a/pages/my/adminMessageList/adminMessageList.vue b/pages/my/adminMessageList/adminMessageList.vue
index 5895e1e..5ea4eb9 100644
--- a/pages/my/adminMessageList/adminMessageList.vue
+++ b/pages/my/adminMessageList/adminMessageList.vue
@@ -92,19 +92,22 @@
 				// 		})
 				// 	}
 				// })
-				request({
-					url:`/api/extend/demo/UpdateIsReadEnd?MessageId=${id}`,
-					method:'put',
-					data:{}
-				}).then(res=>{
-					console.log("修改已读",res)
-					if(res.code == 200){
-						console.log('成功修改')
-						uni.navigateTo({
-							url:link.link + `?data=${JSON.stringify(link.reid)}`
-						})
-					}
+				uni.navigateTo({
+					url:link.link + `?data=${JSON.stringify(link.reid)}`
 				})
+				// request({
+				// 	url:`/api/extend/demo/UpdateIsReadEnd?MessageId=${id}`,
+				// 	method:'put',
+				// 	data:{}
+				// }).then(res=>{
+				// 	console.log("修改已读",res)
+				// 	if(res.code == 200){
+				// 		console.log('成功修改')
+				// 		uni.navigateTo({
+				// 			url:link.link + `?data=${JSON.stringify(link.reid)}`
+				// 		})
+				// 	}
+				// })
 			}
 		}
 	}
@@ -113,7 +116,8 @@
 <style lang="scss" scoped>
 	.page{
 		width: 100%;
-		height: 100%;
+		height: 100vh;
+		overflow: scroll;
 		background-color: #f3f3f3;
 	}
 	.list-box{
@@ -133,7 +137,7 @@
 		.info{
 			display: flex;
 			flex-direction: column;
-			align-items: center;
+			// align-items: center;
 			.title{
 				font-size: 36rpx;
 				font-weight: bold;
@@ -143,6 +147,7 @@
 				overflow: hidden;
 				white-space: nowrap;
 				text-overflow: ellipsis;
+				margin-left: 20rpx;
 			}
 		}
 		.isRead{
diff --git a/pages/my/messageList/messageList.vue b/pages/my/messageList/messageList.vue
index eb60dce..11f94d5 100644
--- a/pages/my/messageList/messageList.vue
+++ b/pages/my/messageList/messageList.vue
@@ -117,6 +117,18 @@
 								url:link.link + `?data=${JSON.stringify(link.reid)}`
 							})
 						}
+						
+						if(link.type === '公文办理通知'){
+							this.download(link.link)
+						}else if(link.type === '表单填报通知'){
+							uni.navigateTo({
+								url:link.link + `?id=${link.reid}`
+							})
+						}else{
+							uni.navigateTo({
+								url:link.link + `?data=${JSON.stringify(link.reid)}`
+							})
+						}
 					}
 				})
 			},
@@ -186,7 +198,7 @@
 		.info{
 			display: flex;
 			flex-direction: column;
-			align-items: center;
+			// align-items: center;
 			.title{
 				font-size: 36rpx;
 				font-weight: bold;
@@ -196,6 +208,7 @@
 				overflow: hidden;
 				white-space: nowrap;
 				text-overflow: ellipsis;
+				margin-left: 20rpx;
 			}
 		}
 		.isRead{
diff --git a/pages/my/userReponse/userReponse.vue b/pages/my/userReponse/userReponse.vue
index 51446ae..23d690c 100644
--- a/pages/my/userReponse/userReponse.vue
+++ b/pages/my/userReponse/userReponse.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="page">
-		<view class="page" v-if="userCode === 'admin'">
+		<view class="page">
 			<view class="item-box" v-for="(it,index) in appealList" :key="index" @click="toReponse(it.id)">
 				<view class="lef">
 					{{it.content}}
@@ -129,9 +129,16 @@
 			},
 			// 跳转到查看和修改页面
 			toReponse(id){
-				uni.navigateTo({
-					url:'/pages/Feedback/reponseAppeal/reponseAppeal?data=' + JSON.stringify(id)
-				})
+				console.log("ssss")
+				if(!this.isAdmin){
+					uni.navigateTo({
+						url:'/pages/Feedback/userAppeal/userAppeal?data=' + JSON.stringify(id)
+					})
+				}else{
+					uni.navigateTo({
+						url:'/pages/Feedback/reponseAppeal/reponseAppeal?data=' + JSON.stringify(id)
+					})
+				}
 			},
 		}
 	}
--
libgit2 0.21.4