yahyahy 3 jaren geleden
bovenliggende
commit
ee4a7f6874
2 gewijzigde bestanden met toevoegingen van 19 en 9 verwijderingen
  1. 1 1
      src/views/index.vue
  2. 18 8
      src/views/system/time/index.vue

+ 1 - 1
src/views/index.vue

@@ -2,7 +2,7 @@
 	<div class="app-container home">
 		<el-row :gutter="5">
 			<el-col :sm="24" :lg="17">
-				<div class="index_heade index_headeNav" v-show="true">
+				<div class="index_heade index_headeNav" >
 					<div  style="padding-top: 20px;">
 						<el-table height="500" max-height="500" :data="tjsli" style="width: 100%;margin-top: 10px;" :stripe="true">
 							<el-table-column  fixed prop="xz" label="乡镇" align="center" ></el-table-column>

+ 18 - 8
src/views/system/time/index.vue

@@ -74,7 +74,8 @@
 						<el-col :span="8">
 							<el-form-item label="接种地点" prop="vaccinationPlace">
 								<el-select v-model="queryParams.vaccinationPlace" placeholder="接种地点" style="width:240px;" clearable :disabled="shouwestwo">
-									<el-option v-for="dict in typeOptionsvaccinatio" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
+									<el-option v-for="dict in typeOptionsvaccinatio" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictLabel" />
+									<!-- dictValue -->
 								</el-select>
 							</el-form-item>
 						</el-col>
@@ -89,7 +90,7 @@
 									:options="options"
 									filterable
 									@change="chahetwo"
-									:props="optionProps"
+									:props="optionPropstwo"
 									style="width: 110%;"
 									@keyup.enter.native="handleQuery"
 									clearable
@@ -318,14 +319,14 @@
 					<el-col :span="24">
 						<el-row>
 							<el-col :span="12">
-								<el-form-item label="户籍地址" prop="villagerGroup">
+								<el-form-item label="户籍地址" prop="villageTowns">
 									<!-- <el-input v-model="form.villageTowns" type="textarea" placeholder="请输入内容" /> -->
 									<!-- <treeselect v-model="form.parentId" :options="deptOptionstwo" :normalizer="normalizer" :flat="true" :maxHeight="150" @select="djieskle" :multiple=true placeholder="点击选择户籍地" /> -->
 									<el-cascader
 										placeholder="点击选择户籍地址"
 										:options="options"
 										:filterable="true"
-										separator=","
+										separator="/"
 										@change="chahe"
 										v-model="villageTownshy"
 										:props="optionProps"
@@ -710,7 +711,8 @@ export default {
 			rules: {
 				region: [{ required: true, message: '区不能为空', trigger: 'blur' }],
 				idCard: [{ required: true, message: '身份证号码不能为空', trigger: 'blur' }],
-				userName: [{ required: true, message: '姓名不能为空', trigger: 'blur' }]
+				userName: [{ required: true, message: '姓名不能为空', trigger: 'blur' }],
+				villageTowns:[{ required: true, message: '户籍地址不能为空或不能只选潜山市', trigger: 'blur' }]
 			},
 			selected: ['安徽省', '安庆市', '潜山市'],
 			selectedtwo: [],
@@ -752,6 +754,12 @@ export default {
 				children: 'children',
 				checkStrictly: true
 			},
+			optionPropstwo: {
+				value: 'id',
+				label: 'label',
+				children: 'children',
+				checkStrictly: true
+			},
 			heuiq: [],
 			typeOptions: [],
 			typeOptionsty: [
@@ -1517,9 +1525,11 @@ export default {
 			this.form.domicile = '';
 		},
 		chahetwo(data) {
-			this.queryParams.villageTowns = data[1];
-			this.queryParams.village = data[2];
-			this.queryParams.villagerGroup = data[3];
+			console.log(data)
+			// this.queryParams.villageTowns = data[1];
+			// this.queryParams.village = data[2];
+			// this.queryParams.villagerGroup = data[3];
+			this.queryParams.deptId = data[data.length - 1]
 		},
 		/** 提交按钮 */
 		submitForm() {