Merge branch 'master' of http://139.9.163.126/gitlab/jinfeng/epidemic

pages/fillIn/fillIn.vue

@@ -1126,13 +1126,13 @@
 							value: 'a',
 							label: '探亲'
 						}, {
-							value: 'b',
+							value: 'c',
 							label: '出差'
 						}, {
-							value: 'b',
+							value: 'd',
 							label: '旅游'
 						}, {
-							value: 'b',
+							value: 'e',
 							label: '其他'
 						}],
 						num: 13,
@@ -1655,7 +1655,7 @@
 					residenceAddress: '',
 					planReturnDate: ''
 				},
-				formMat:{}
+				formMat: {}
 			}
 		},
 
@@ -1685,8 +1685,9 @@
 						let list = []
 						d.object.list.forEach(item => {
 							list.push({
-								label: item.orgName,
-								value: item.id
+								label: `${item.orgName} (${item.city} ${item.district} ${item.address} ${item.park})`,
+								value: item.id,
+								desc: item.orgName
 							})
 						})
 						this.list[0].opts = list
@@ -1703,8 +1704,10 @@
 						this.isRead = true
 						const data = d.object.reportContent || {}
 						this.form = data
-						this.form['householdValues'] = data['householdProvince'] + "," +data['householdCity'] + "," +data['householdDistrict'] 
-						this.form['residenceValue'] = data['residenceProvince'] + "," + data['residenceCity'] + "," +data['residenceDistrict'] 
+						this.form['householdValues'] = data['householdProvince'] + "," + data['householdCity'] + "," + data[
+							'householdDistrict']
+						this.form['residenceValue'] = data['residenceProvince'] + "," + data['residenceCity'] + "," + data[
+							'residenceDistrict']
 						// 赋值
 						for (let k in data) {
 							const val = data[k]
@@ -1726,16 +1729,12 @@
 									}
 									if (item.type == "picker") {
 										item.opts.forEach(opt => {
-											if(opt.value == val) {
+											if (opt.value == val) {
+												if (opt.desc) {
+													this.formMat[k] = opt.desc
+												} else {
 													this.formMat[k] = opt.label
 												}
-										})
-									
-									}
-									if (item.type == "pickerAddress") {
-										item.opts.forEach(opt => {
-											if(opt.value == val) {
-												this.formMat[k] = opt.label
 											}
 										})
 
@@ -1876,7 +1875,12 @@
 					return
 				}
 				this.$set(this.form, prop, opts[val].value)
+				if (opts[val].desc) {
+					this.$set(this.formMat, prop, opts[val].desc)
+				} else {
 					this.$set(this.formMat, prop, opts[val].label)
+				}
+
 
 				if (item.show) {
 					this.showChange(event, item)

pages/fillInDay/fillInDay.vue

@@ -459,13 +459,13 @@
 							value: 'a',
 							label: '探亲'
 						}, {
-							value: 'b',
+							value: 'c',
 							label: '出差'
 						}, {
-							value: 'b',
+							value: 'd',
 							label: '旅游'
 						}, {
-							value: 'b',
+							value: 'e',
 							label: '其他'
 						}],
 						num: 13,
@@ -702,18 +702,11 @@
 									})
 
 								}
-								if (item.type == "pickerAddress") {
-									item.opts.forEach(opt => {
-										if (opt.value == val) {
-											this.formMat[k] = opt.label
-										}
-									})
 
 							}
 						}
 					}
 				}
-				}
 			})
 
 		},