修改下沉干部、党员审核

api/report.js

@@ -7,10 +7,18 @@ const submitgb = async (data) => {
 	const res = await request.post({ url: `/dangjian/xiachenganbu`, data });
 	return res.data;
 }
+const updategb = async (data) => {
+	const res = await request.post({ url: `/dangjian/xiachenganbu-update`, data });
+	return res.data;
+}
 const submitdy = async (data) => {
 	const res = await request.post({ url: `/dangjian/dangyuan`, data });
 	return res.data;
 }
+const updatedy = async (data) => {
+	const res = await request.post({ url: `/dangjian/dangyuan-update`, data });
+	return res.data;
+}
 const getGbStatus = async () => {
 	const res = await request.get({ url: `/dangjian/xiachenganbu-status` });
 	return res.data;
@@ -19,4 +27,8 @@ const getDyStatus = async () => {
 	const res = await request.get({ url: `/dangjian/dangyuan-status` });
 	return res.data;
 }
-export default { getDict, submitgb, submitdy, getDyStatus, getGbStatus };
+const getCommunity = async () => {
+	const res = await request.get({ url: `/wx/addr/community` });
+	return res.data;
+}
+export default { getDict, submitgb, submitdy, getDyStatus, getGbStatus, getCommunity, updatedy, updategb };

components/picker3.vue

@@ -0,0 +1,177 @@
+<template>
+	<view class="mpvue-picker">
+		<view class="pickerMask" @click="maskClick" catchtouchmove="true"></view>
+		<view class="mpvue-picker-content mpvue-picker-view-show">
+			<view class="mpvue-picker__hd" catchtouchmove="true">
+				<view class="mpvue-picker__action" @click="pickerCancel">取消</view>
+				<view class="mpvue-picker__action" @click="pickerConfirm">确定</view>
+			</view>
+			
+			<picker-view indicator-style="height: 40px;" class="mpvue-picker-view" :value="pickerValue" @change="pickerChangeMul" @pickend="pickend">
+				<picker-view-column v-for="(item, index) in arrList" :key="index">
+					<view class="picker-item" v-for="(i, idx) in item" :key="idx">{{i.label}}
+					</view>
+				</picker-view-column>
+			</picker-view>
+			
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				pickerValue: this.pickerValueDefault,
+				arrList: [],
+				pickerChange: []
+			};
+		},
+		props: {
+			/* picker 数值 */
+			pickerValueArray: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			/* 默认值 */
+			pickerValueDefault: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+		},
+		mounted() {
+			this.disbandChildren(this.pickerValueArray, 0);
+			// 根据几个选项设置集合默认值0
+			this.arrList.forEach(e => {
+				this.pickerValue.push(0)
+			})
+		},
+		methods: {
+			// 拆解数组
+			disbandChildren(items, index) {
+				this.$set(this.arrList, index, [])
+				this.arrList[index].push(...items);
+				for (let i in items) {
+					if (items[i].children) {
+						this.disbandChildren(items[i].children, index + 1);
+						return;
+					}
+					return;
+				}
+			},
+			// 取消
+			pickerCancel() {
+				this.$emit('close')
+			},
+			// 确认
+			pickerConfirm() {
+				const list = [];
+				for (var i = 0; i < this.pickerValue.length; i++) {
+					const dataIndex = this.pickerValue[i];
+					list.push(this.arrList[i][dataIndex])
+				}
+				this.$emit('confirm', list);
+			},
+			// 滚动改变
+			pickerChangeMul(e) {
+				this.pickerChange = e.detail.value;
+			},
+			// 遮罩点击
+			maskClick() {
+				this.$emit('close')
+			},
+			// 滚动给结束
+			pickend() {
+				let index = null;
+				let data = null;
+				for (var i = 0; i < this.pickerChange.length; i++) {
+					if (this.pickerChange[i] !== this.pickerValue[i])  {
+						index = i;
+						data = this.pickerChange[i]
+					}
+				}
+				if (!index && !data) return;
+				this.pickerValue = this.pickerChange;
+				const item = this.arrList[index][data]
+				if (this.arrList.length <= index + 1) return;
+				for (var i = 0; i < this.pickerValue.length; i++) {
+					if (i > index) this.pickerValue[i] = 0;
+				}
+				this.disbandChildren(item.children, index + 1);
+			}
+		}
+	};
+</script>
+
+<style>
+	.pickerMask {
+		position: fixed;
+		z-index: 1000;
+		top: 0;
+		right: 0;
+		left: 0;
+		bottom: 0;
+		background: rgba(0, 0, 0, 0.6);
+	}
+	.mpvue-picker-content {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		width: 100%;
+		transition: all 0.3s ease;
+		transform: translateY(100%);
+		z-index: 3000;
+	}
+	.mpvue-picker-view-show {
+		transform: translateY(0);
+	}
+	.mpvue-picker__hd {
+		display: flex;
+		padding: 9px 15px;
+		background-color: #fff;
+		position: relative;
+		text-align: center;
+		font-size: 17px;
+	}
+	.mpvue-picker__hd:after {
+		content: ' ';
+		position: absolute;
+		left: 0;
+		bottom: 0;
+		right: 0;
+		height: 1px;
+		border-bottom: 1px solid #e5e5e5;
+		color: #e5e5e5;
+		transform-origin: 0 100%;
+		transform: scaleY(0.5);
+	}
+	.mpvue-picker__action {
+		display: block;
+		flex: 1;
+		color: #1aad19;
+	}
+	.mpvue-picker__action:first-child {
+		text-align: left;
+		color: #888;
+	}
+	.mpvue-picker__action:last-child {
+		text-align: right;
+	}
+	.picker-item {
+		text-align: center;
+		line-height: 40px;
+		font-size: 16px;
+	}
+	.mpvue-picker-view {
+		position: relative;
+		bottom: 0;
+		left: 0;
+		width: 100%;
+		height: 238px;
+		background-color: rgba(255, 255, 255, 1);
+	}
+</style>

env.js

@@ -1,7 +1,7 @@
 const ENV_API_URL = {
 	development: {
-		url: 'https://fuyu.scapp.cn/wx-api/api',
-		// url: 'http://192.168.0.70:7070/api',
+		// url: 'https://fuyu.scapp.cn/wx-api/api',
+		url: 'http://192.168.0.71:7070/api',
 		imgUrl: 'https://fuyu.scapp.cn/static/wxa/',
 		fileUrl: 'https://fuyu.scapp.cn'
 		// fileUrl: 'http://192.168.0.71'

manifest.json

@@ -52,7 +52,7 @@
         "appid" : "wxfb8ee68c5e9a63e8",
         "setting" : {
             "urlCheck" : false,
-            "es6" : true,
+            "es6" : false,
             "minified" : false,
             "postcss" : true
         },

pages/report/double.vue

@@ -1,5 +1,10 @@
 <template>
 	<view class="container">
+		<uni-card v-if="formData && formData.status == 1">
+			<uni-section title="驳回原因" type="line">
+				<text class="msg">{{ formData.rejectReason }}</text>
+			</uni-section>
+		</uni-card>
 		<uni-forms ref="baseForm" :modelValue="formData" :rules="rules" :label-width="80">
 			<uni-forms-item v-for="item in fileds" :label="item.title" :name="item.name"  :key="item.name" required>
 				<uni-easyinput v-if="!item.formatter && !item.type" type="text" v-model="formData[item.name]" :placeholder="`请输入${item.title}`" />
@@ -8,10 +13,12 @@
 				<view class="upVideo" v-if="item.type == 'video' && !formData[item.name]" @click="upVideo">
 					<uni-icons color="#cacaca" class="videoIcon" type="videocam" size="30"></uni-icons>
 				</view>
+				<uni-data-select v-model="formData[item.name]" v-if="item.type == 'picker'" :localdata="item.dict" placeholder="请选择社区"></uni-data-select>
+
 				<video controls v-if="item.type == 'video' && formData[item.name]" class="uploadVideo" :src="filesUrl + formData[item.name]"></video>
 			</uni-forms-item>
 		</uni-forms>
-		<button :disabled="btnText == '已报到'" class="btn" type="primary" @click="submitForm">{{ btnText }}</button>
+		<button :disabled="formData.status == 0 || formData.status == 2" class="btn" type="primary" @click="submitForm">{{ btnText }}</button>
 	</view>
 </template>
 
@@ -21,6 +28,11 @@
 	export default {
 		data() {
 			return {
+				pickerList: [],
+				pickerValue: '',
+				pickerName: '',
+				indicatorStyle: `height: 50px`,
+				visible: false,
 				btnText: '提交',
 				baseUrl: BASE_URL.url,
 				filesUrl: BASE_URL.fileUrl,
@@ -30,11 +42,11 @@
 					{ name: 'sex', title: '性别', formatter: 'dict:user_sex_type', type: 'checkbox' },
 					{ name: 'phone', title: '联系电话' },
 					{ name: 'workUnit', title: '工作单位' },
+					{ name: 'deptId', title: '报到社区', type: 'picker' },
 					{ name: 'reportLocation', title: '报到位置' },
 					{ name: 'reportType', title: '报到类别', formatter: 'dict:baodao_type', type: 'select' },
 					{ name: 'residence', title: '居住地' },
 					{ name: 'content', title: '报到内容' },
-					// { name: 'videoPath', title: '影片', type: 'video' },
 				],
 				rules: {
 					name: {
@@ -61,6 +73,9 @@
 					content: {
 						rules:[{ required: true, errorMessage: '请填写报到内容' }]
 					},
+					deptId: {
+						rules:[{ required: true, errorMessage: '请选择报到社区' }]
+					},
 					// videoPath: {
 					// 	rules:[{ required: true, errorMessage: '请上传影片' }]
 					// }
@@ -68,17 +83,31 @@
 			}
 		},
 		async mounted() {
+			const getCommunity = await request.getCommunity();
+			this.pickerList = getCommunity.rows;
 			const res = await request.getDyStatus();
 			if (res.data) {
 				this.formData = { ...res.data, sex: String(res.data.sex), reportType: String(res.data.reportType) };;
-				this.btnText = '已报到';
+				if (res.data.status == 0) this.btnText = '审核中';
+				// if (res.data.status == 1) this.btnText = '已驳回';
+				if (res.data.status == 2) this.btnText = '已报到';
 			}
 			await this.setDict();
 		},
 		onShow() {},
 		methods: {
+			// 社区选择改变
+			bindChange(e) {
+				console.log(e, '社区选择改变')
+			},
+			// 选择社区
+			pickerClick() {
+				console.log('选择社区')
+				this.visible = true;
+			},
 			async setDict() {
 				this.fileds = await Promise.all(this.fileds.map(async e => {
+					if (e.name == 'deptId') e.dict = this.pickerList.map(e => ({ ...e, text: e.deptName, value: e.deptId }));
 					if (e.formatter && e.formatter.includes('dict')) {
 						const dictType = e.formatter.split(':')[1];
 						const res = await request.getDict(dictType);
@@ -125,7 +154,12 @@
 			},
 			submitForm() {
 				this.$refs.baseForm.validate().then(async valid=>{
-					const res = await request.submitdy(this.formData);
+					let res;
+					if (this.formData.dangyuanId) {
+						res = await request.updatedy(this.formData);
+					} else {
+						res = await request.submitdy(this.formData);
+					}
 					if (res.code == 200) {
 						uni.showToast({
 							title: '提交成功',
@@ -170,4 +204,13 @@
 		width: 100px;
 		height: 100px;
 	}
+	.pickerItem {
+		text-indent: 0.5em;
+		border: 1px solid #e8e8e8;
+		line-height: 2.5em;
+	}
+	.msg {
+		color: red;
+		font-size: 12px;
+	}
 </style>

pages/report/index.vue

@@ -1,13 +1,18 @@
 <template>
 	<view class="container">
+		<uni-card v-if="formData && formData.status == 1">
+			<uni-section title="驳回原因" type="line">
+				<text class="msg">{{ formData.rejectReason }}</text>
+			</uni-section>
+		</uni-card>
 		<uni-forms ref="baseForm" :modelValue="formData" :label-width="110" :rules="rules">
 			<uni-forms-item v-for="item in fileds" :label="item.title" :name="item.name" :key="item.name" required>
 				<uni-easyinput v-if="!item.formatter && !item.type" type="text" v-model="formData[item.name]" :placeholder="`请输入${item.title}`" />
 				<uni-data-checkbox v-model="formData[item.name]" v-if="item.formatter && item.type == 'checkbox'" :multiple="item.multiple || false" :localdata="item.dict" />
-				<text class="msg" v-if="item.name == 'baobaoloudong'">例：XX社区 + XX小区 + X栋</text>
+				<uni-data-select v-model="formData[item.name]" v-if="item.type == 'picker'" :localdata="item.dict" placeholder="请选择社区"></uni-data-select>
 			</uni-forms-item>
 		</uni-forms>
-		<button :disabled="btnText == '已报到'" class="btn" type="primary" @click="submitForm">{{ btnText }}</button>
+		<button :disabled="formData.status == 0 || formData.status == 2" class="btn" type="primary" @click="submitForm">{{ btnText }}</button>
 	</view>
 </template>
 
@@ -16,12 +21,14 @@
 	export default {
 		data() {
 			return {
+				pickerList: [],
 				btnText: '提交',
 				formData: {},
 				fileds: [
 					{ name: 'name', title: '姓名' },
 					{ name: 'sex', title: '性别', formatter: 'dict:user_sex_type', type: 'checkbox' },
 					{ name: 'workUnit', title: '工作单位' },
+					{ name: 'deptId', title: '报到社区', type: 'picker' },
 					{ name: 'baobaoloudong', title: '包保楼栋' },
 					{ name: 'phone', title: '联系电话' },
 					{ name: 'jianrensanzhang', title: '是否兼任三长', formatter: 'dict:jianrensanzhang_type', type: 'checkbox' },
@@ -45,14 +52,21 @@
 					jianrensanzhang: {
 						rules:[{ required: true, errorMessage: '请选择是否兼任三长' }]
 					},
+					deptId: {
+						rules:[{ required: true, errorMessage: '请选择报到社区' }]
+					},
 				}
 			}
 		},
 		async mounted() {
+			const getCommunity = await request.getCommunity();
+			this.pickerList = getCommunity.rows;
 			const res = await request.getGbStatus();
 			if (res.data) {
 				this.formData = { ...res.data, sex: String(res.data.sex), jianrensanzhang: String(res.data.jianrensanzhang) };
-				this.btnText = '已报到';
+				if (res.data.status == 0) this.btnText = '审核中';
+				// if (res.data.status == 1) this.btnText = '已驳回';
+				if (res.data.status == 2) this.btnText = '已报到';
 			}
 			await this.setDict();
 		},
@@ -60,6 +74,7 @@
 		methods: {
 			async setDict() {
 				this.fileds = await Promise.all(this.fileds.map(async e => {
+					if (e.name == 'deptId') e.dict = this.pickerList.map(e => ({ ...e, text: e.deptName, value: e.deptId }));;
 					if (e.formatter && e.formatter.includes('dict')) {
 						const dictType = e.formatter.split(':')[1];
 						const res = await request.getDict(dictType);
@@ -70,7 +85,12 @@
 			},
 			async submitForm() {
 				this.$refs.baseForm.validate().then(async valid=>{
-					const res = await request.submitgb(this.formData);
+					let res;
+					if (this.formData.xiachenganbuId) {
+						res = await request.updategb(this.formData);
+					} else {
+						res = await request.submitgb(this.formData);
+					}
 					if (res.code == 200) {
 						uni.showToast({
 							title: '提交成功',

unpackage/dist/dev/mp-weixin/pages/report/double.json

@@ -1,6 +1,8 @@
 {
   "navigationBarTitleText": "党员“双报到”",
   "usingComponents": {
+    "uni-card": "/uni_modules/uni-card/components/uni-card/uni-card",
+    "uni-section": "/uni_modules/uni-section/components/uni-section/uni-section",
     "uni-forms": "/uni_modules/uni-forms/components/uni-forms/uni-forms",
     "uni-forms-item": "/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item",
     "uni-easyinput": "/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput",

unpackage/dist/dev/mp-weixin/pages/report/double.wxss

@@ -22,4 +22,13 @@
 	width: 100px;
 	height: 100px;
 }
+.pickerItem {
+	text-indent: 0.5em;
+	border: 1px solid #e8e8e8;
+	line-height: 2.5em;
+}
+.msg {
+	color: red;
+	font-size: 12px;
+}
 

unpackage/dist/dev/mp-weixin/pages/report/index.json

@@ -1,9 +1,12 @@
 {
   "navigationBarTitleText": "下沉干部报到",
   "usingComponents": {
+    "uni-card": "/uni_modules/uni-card/components/uni-card/uni-card",
+    "uni-section": "/uni_modules/uni-section/components/uni-section/uni-section",
     "uni-forms": "/uni_modules/uni-forms/components/uni-forms/uni-forms",
     "uni-forms-item": "/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item",
     "uni-easyinput": "/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput",
-    "uni-data-checkbox": "/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox"
+    "uni-data-checkbox": "/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox",
+    "uni-data-select": "/uni_modules/uni-data-select/components/uni-data-select/uni-data-select"
   }
 }

unpackage/dist/dev/mp-weixin/project.config.json

@@ -15,7 +15,8 @@
       "ignore": [],
       "disablePlugins": [],
       "outputPath": ""
-    }
+    },
+    "enhance": true
   },
   "compileType": "miniprogram",
   "libVersion": "",