返乡统计增加类型

src/projects/business/views/Other/Return/Questionnaire.vue

@@ -39,6 +39,11 @@
 					<textarea v-model="subForm.liveDetailAddress" name="liveDetailAddress" rows="2" placeholder="请填写详细地址信息"
 					 autocomplete="off"></textarea>
 				</div>
+				<div @click="selectType" class="mui-input-row">
+					<label><i class="colorfe616c">*</i>&nbsp;返乡类型</label>
+					<button v-text="typeName" class="mui-btn mui-btn-block mui-navigate-right" type='button' style="width:65%">
+					</button>
+				</div>
 				<div @click="selectOriginId" class="mui-input-row">
 					<label><i class="colorfe616c">*</i>&nbsp;始发地</label>
 					<button v-text="originIdName" class="mui-btn mui-btn-block mui-navigate-right" type='button' style="width:65%">
@@ -146,6 +151,7 @@
 					phone: '',
 					liveRegionId: '',
 					liveDetailAddress: '',
+					type: '',
 					originId: '',
 					originDetailAddress: '',
 					avenuePlace: '',
@@ -167,6 +173,23 @@
 
 				liveRegionIdList: [],
 				originIdList: [],
+				typeList: [{
+						value: '1',
+						text: '境外返乡'
+					},
+					{
+						value: '2',
+						text: '国内中高风险地区'
+					},
+					{
+						value: '3',
+						text: '省内从事冷链行业'
+					},
+					{
+						value: '4',
+						text: '其他'
+					},
+				]
 
 			}
 		},
@@ -308,6 +331,19 @@
 				} else if (!this.subForm.arriveTime) {
 					mui.toast('请选择返乡时间');
 					return false;
+				} else if (this.subForm.type != '4') {
+					if (!this.subForm.checkImageUrl) {
+						mui.toast('请上传7日内核酸检测报告');
+						return false;
+					} else if (!this.subForm.travelImageUrl) {
+						mui.toast('请上传“行程卡”截图');
+						return false;
+					} else if (!this.subForm.healthCodeUrl) {
+						mui.toast('请上传本人健康码截图');
+						return false;
+					} else {
+						return true;
+					}
 				} else {
 					return true;
 				}
@@ -319,8 +355,10 @@
 					API_return.submitReturnInfo(this.subForm).then(response => {
 						this.isLoading = false;
 
-						mui.toast('提交成功');
-						this.getInfo();
+						var _this = this;
+						mui.alert('提交成功', '提示', function() {
+							_this.getInfo();
+						});
 
 					}).catch(error => {
 						this.isLoading = false;
@@ -407,6 +445,16 @@
 					}
 				})
 			},
+			//选择返乡类型
+			selectType() {
+				var _this = this;
+				var picker = new mui.PopPicker();
+				picker.setData(this.typeList);
+				picker.pickers[0].setSelectedValue(_this.subForm.type);
+				picker.show(function(selectItems) {
+					_this.subForm.type = selectItems[0].value;
+				})
+			},
 			asynCallBack() {
 				//赋值
 				this.subForm.openId = this.openId;
@@ -465,6 +513,14 @@
 				}
 				return '点击选择';
 			},
+			typeName: function() {
+				for (var i = 0; i < this.typeList.length; i++) {
+					if (this.typeList[i]['value'] == this.subForm.type) {
+						return this.typeList[i]['text'];
+					}
+				}
+				return '点击选择';
+			},
 			...mapGetters({
 				openId: 'wx_openid',
 				token: 'token',