提交

src/views/index.vue

@@ -664,7 +664,7 @@ export default {
 								if (typeof route[item] == 'object') {
 									route[item] = route[item].value;
 								}
-							}tableDataalid
+							}
 						});
 					}
 

src/views/system/time/index.vue

@@ -197,10 +197,12 @@
 			<el-table-column label="姓名" align="center" prop="userName" fixed />
 			<el-table-column label="是否完成" align="center" prop="progress" fixed />
 			<el-table-column label="最后一次的接种时间" align="center" prop="vaccinationTime" width="150" />
-			<el-table-column label="下次应接时间" align="center" prop="vaccinationTimeNext" width="120"/>
-			<el-table-column label="联系方式" align="center" prop="phoneNum" />
+			<el-table-column label="下次应接时间" align="center" prop="vaccinationTimeNext" width="150"/>
+			<el-table-column label="联系方式" align="center" prop="phoneNum" width="110" />
 			<!-- <el-table-column label="性别" align="center" prop="gender" /> -->
+			<el-table-column label="受种者编号" align="center" prop="code"   width="170"/>
 			<el-table-column label="身份证号码" align="center" prop="idCard" width="180" />
+			
 			<!-- <el-table-column label="现居省份" align="center" prop="province" />
 			<el-table-column label="现居市" align="center" prop="city" />
 			<el-table-column label="现居县区" align="center" prop="region" /> -->
@@ -351,14 +353,22 @@
 					<!-- <el-col :span="12">
 						<el-form-item label="人群分类" prop="crowd_classification"><el-input v-model="form.crowd_classification" placeholder="请输入人群分类" /></el-form-item>
 					</el-col> -->
-					<el-col :span="12">
-						<el-form-item label="户主" prop="houseType">
-							<!-- <el-select v-model="form.houseType" placeholder="请选择户别"><el-option label="请选择字典生成" value="" /></el-select> -->
-							<!-- <el-input v-model="form.houseType" placeholder="请输入内容" /> -->
-							<el-select v-model="form.houseType" placeholder="户主" clearable style="width: 100%;">
-								<el-option v-for="dict in typeOptionshuuj" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
-							</el-select>
-						</el-form-item>
+					
+					<el-col :span="24">
+						<el-col :span="12">
+							<el-form-item label="户主" prop="houseType">
+								<!-- <el-select v-model="form.houseType" placeholder="请选择户别"><el-option label="请选择字典生成" value="" /></el-select> -->
+								<!-- <el-input v-model="form.houseType" placeholder="请输入内容" /> -->
+								<el-select v-model="form.houseType" placeholder="户主" clearable style="width: 100%;">
+									<el-option v-for="dict in typeOptionshuuj" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
+								</el-select>
+							</el-form-item>
+						</el-col>
+						<el-col :span="12">
+							<el-form-item label="受种者编号" prop="code">
+							<el-input v-model="form.code" placeholder="请输入受种者编号"/>
+							</el-form-item>
+						</el-col>
 					</el-col>
 					<el-col :span="24">
 						<el-row>
@@ -387,7 +397,7 @@
 						<el-row type="flex">
 							<!-- <el-col :span="4"> -->
 								<el-form-item label="疫苗名称" class="iejghiadh">
-									<el-select v-model="item.vaccineName" placeholder="疫苗名称" style="width:123px" clearable :disabled="naneme" @change="changeheu(index)">
+									<el-select v-model="item.vaccineName" placeholder="疫苗名称" style="width:123px" clearable :disabled="naneme  ||  item.disableg " @change="changeheu(index)">
 										<el-option
 											v-for="dict in typeOptionsname"
 											:key="dict.dictValue"
@@ -407,13 +417,13 @@
 										format="yyyy-MM-dd HH:mm:ss"
 										placeholder="选择接种时间"
 										style="width: 167px;"
-										:disabled="naneme"
+										:disabled="naneme ||  item.disableg"
 									></el-date-picker>
 								</el-form-item>
 							<!-- </el-col> -->
-							<el-col :span="4" class="ijeuhdy">
+							<el-col :span="5" class="ijeuhdy">
 								<el-form-item label="接种地点" >
-									<el-select :disabled="naneme" v-model="item.vaccinationPlace" placeholder="接种地点" clearable size="small" style="100%">
+									<el-select :disabled="naneme || item.disableg " v-model="item.vaccinationPlace" placeholder="接种地点" clearable size="small" style="100%">
 										<el-option v-for="dict in typeOptionsvaccinatio" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictLabel" />
 										<!-- dict.dictValue -->
 									</el-select>
@@ -422,7 +432,7 @@
 							<!-- <el-col :span="3"> -->
 								<el-form-item label="剂次"  class="jhy">
 									<!-- <el-input v-model="form.jici" placeholder="请输入剂次" /> -->
-									<el-select @change="changeheujici(index)" v-model="item.jici" placeholder="剂次" clearable style="width:75px" :disabled="naneme" >
+									<el-select @change="changeheujici(index)" v-model="item.jici" placeholder="剂次" clearable style="width:75px" :disabled="naneme ||  item.disableg" >
 										<el-option
 											v-for="dict in typeOptionstimes"
 											:key="dict.dictValue"
@@ -433,13 +443,13 @@
 								</el-form-item>
 							<!-- </el-col> -->
 
-							<el-col style="width: 135px;">
+							<!-- <el-col style="width: 135px;">
 								<el-form-item label="进度"  class="jhy">
-									<el-select v-model="item.progress" placeholder="进度" clearable style="width:100%" :disabled="naneme">
+									<el-select v-model="item.progress" placeholder="进度" clearable style="width:100%" :disabled="naneme ||  item.disableg">
 										<el-option v-for="dict in statusOptionstue" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictLabel" />
 									</el-select>
 								</el-form-item>
-							</el-col>
+							</el-col> -->
 							<el-col :span="3">
 								<el-form-item class="jdueuh">
 									<div class="jdidur  jdoier">
@@ -696,6 +706,7 @@ export default {
 			form: {
 				nowIn: '',
 				age:'',
+				code:'',
 				vaccineInfoUserList: [
 					{
 						vaccineName: '',
@@ -703,7 +714,8 @@ export default {
 						vaccinationPlace: '',
 						jici: '',
 						progress: '',
-						url:null
+						url:null,
+						disableg:false
 					}
 				]
 			},
@@ -712,7 +724,10 @@ export default {
 				region: [{ required: true, message: '区不能为空', trigger: 'blur' }],
 				idCard: [{ required: true, message: '身份证号码不能为空', trigger: 'blur' }],
 				userName: [{ required: true, message: '姓名不能为空', trigger: 'blur' }],
-				villageTowns:[{ required: true, message: '户籍地址不能为空或不能只选潜山市', trigger: 'blur' }]
+				villageTowns:[{ required: true, message: '户籍地址不能为空或不能只选潜山市', trigger: 'blur' }],
+				code:[{
+					required: true, message: '受种者编号不能为空', trigger: 'blur'
+				}]
 			},
 			selected: ['安徽省', '安庆市', '潜山市'],
 			selectedtwo: [],
@@ -852,6 +867,7 @@ export default {
 		this.form.province = this.selected[0];
 		this.form.city = this.selected[1];
 		this.form.region = this.selected[2];
+		console.log(this.form.vaccineInfoUserList,456)
 		// this.queryParams.province = this.selectedtwo[0];
 		// this.queryParams.city = this.selectedtwo[1];
 		// this.queryParams.region = this.selectedtwo[2];
@@ -975,6 +991,7 @@ export default {
 				this.form.gender = response.data.gender;
 				// this.form.birthday = response.data.birthday;
 				this.form.age = response.data.age
+				this.form.code = response.data.code
 				if (response.data.userName == null) {
 					this.form.userName = undefined;
 				} else {
@@ -1364,6 +1381,7 @@ export default {
 				villageTowns: null,
 				village: null,
 				age:'',
+				code:'',
 				villagerGroup: null,
 				houseType: null,
 				domicile: null,
@@ -1398,7 +1416,8 @@ export default {
 						vaccinationPlace: '',
 						jici: '',
 						progress: '',
-						url:null
+						url:null,
+						disableg:false
 					}
 				]
 			};
@@ -1474,6 +1493,7 @@ export default {
 				}
 				if (this.form.vaccineInfoUserList !== null) {
 					if (this.form.vaccineInfoUserList.length == 0) {
+						
 						this.form.vaccineInfoUserList = [
 							{
 								vaccineName: '',
@@ -1481,16 +1501,19 @@ export default {
 								vaccinationPlace: '',
 								jici: '',
 								progress: '',
-								url:null
+								url:null,
+								disableg:false
 							}
 						];
 					}else {
+						this.form.isVaccination = '是'
 						this.form.vaccineInfoUserList.filter(router =>{
 							if(router.url == undefined){
 								router.url = null
 							}else if(router.url == []){
 								router.url = null
 							}
+							router.disableg = true
 						})
 					}
 				}
@@ -1529,7 +1552,7 @@ export default {
 			// this.queryParams.villageTowns = data[1];
 			// this.queryParams.village = data[2];
 			// this.queryParams.villagerGroup = data[3];
-			this.queryParams.deptId = data[data.length - 1]
+			this.queryParams.deptId = data[ data.length - 1]
 		},
 		/** 提交按钮 */
 		submitForm() {
@@ -1641,16 +1664,65 @@ export default {
 				vaccinationPlace: '',
 				jici: '',
 				progress: '',
-				url:null
+				url:null,
+				disableg:false
 			});
 		},
 		// 点击删除
 		naeyrfakjf(index, item) {
+			var that = this
+			this.$confirm('是否确认删除疫苗信息?', '警告', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			})
+				.then(function() {
+					return that.delseeug(index,item)
+				})
+				.then(() => {
+					// this.getList();
+					this.msgSuccess('删除成功');
+				});
 			
+		},
+		delseeug(index,item){
+			console.log(234)
 			if (this.form.vaccineInfoUserList.length == 1) {
+				// if (this.jdourdjoaj == true) {
+				// 	// 新增
+				// 	this.form.vaccineInfoUserList = [{
+				// 		vaccineName: '',
+				// 		vaccinationTime: '',
+				// 		vaccinationPlace: '',
+				// 		jici: '',
+				// 		progress: '',
+				// 		url:null,
+				// 		disableg:false
+				// 	}]
+				// } else {
+				// 	// 修改
+				// 	let ide = this.form.vaccineInfoUserList[index].id;
+				// 	console.log(this.form.vaccineInfoUserList[index]);
+				// 	// ()
+				// 	console.log(ide);
+				// 	if (ide !== undefined) {
+				// 		console.log(234);
+				// 		delInfort(ide).then(response => {
+				// 			this.msgSuccess('操作成功');
+				// 		});
+				// 	}
+				// 	this.form.vaccineInfoUserList = [{
+				// 		vaccineName: '',
+				// 		vaccinationTime: '',
+				// 		vaccinationPlace: '',
+				// 		jici: '',
+				// 		progress: '',
+				// 		url:null,
+				// 		disableg:false
+				// 	}]
+				// }
 				return false;
 			}
-			
 			if (this.jdourdjoaj == true) {
 				// 新增
 				this.form.vaccineInfoUserList.splice(index, 1);