瀏覽代碼

Merge branch 'liyangzheng'

liyangzheng 1 年之前
父節點
當前提交
74d67d7cdd

+ 34 - 17
pagesA/fire/fire_station/add_fireStation/add_fireStation.vue

@@ -19,7 +19,7 @@
 						<u-input v-model="formData.county" placeholder="请输入所属区县" />
 					</u-form-item>
 					<u-form-item label="建站日期" prop="built_on">
-						<!-- 	<u-button customStyle="background-color: rgba(76, 178, 182, 0.5);" plain shape="circle"
+						<!-- 		<u-button customStyle="background-color: rgba(76, 178, 182, 0.5);" plain shape="circle"
 							size="small" color="#fff" @click="unitTime = true" :text="builtOn"></u-button> -->
 						<uni-datetime-picker :show="unitTime" v-model="formData.builtOn" mode="date" closeOnClickOverlay
 							@confirm="ActiveUnitTime" @cancel="unitTime = false" @change="changetime"
@@ -30,19 +30,21 @@
 					</u-form-item>
 					<u-form-item label="控制室值班人数" prop="dutyer">
 						<u-input v-model="formData.dutyer" placeholder="请输入控制室值班人数	" />
+						<button @click="goWorkNum" class="manyBtn">添加值班人</button>
 					</u-form-item>
-					<!-- <button @click="goWorkNum" class="manyBtn">添加值班人</button> -->
 					<u-form-item label="报警电话">
 						<u-input v-model="formData.alarmTel" placeholder="请输入报警电话	" />
 					</u-form-item>
 					<u-form-item label="负责人">
 						<u-input v-model="formData.charger" placeholder="请输入负责人" />
+						<button @click="goBigNum" class="manyBtn">添加负责人</button>
 					</u-form-item>
-					<!-- <button @click="goBigNum" class="manyBtn">添加负责人</button> -->
+					
 					<u-form-item label="人员信息" prop="members">
 						<u-input v-model="formData.members" placeholder="请输入队员人数" />
+						<button @click="goPeopleMes" class="manyBtn">添加人员信息</button>
 					</u-form-item>
-					<!-- <button @click="goPeopleMes" class="manyBtn">添加人员信息</button> -->
+					
 					<u-form-item label="水罐车数量" prop="waterTanker">
 						<u-input v-model="formData.waterTanker" placeholder="请输入水罐车" />
 					</u-form-item>
@@ -148,6 +150,7 @@
 						message: '所填项为数字类型',
 						trigger: ['blur', 'change']
 					},
+					newEmpList: [],
 				},
 
 			};
@@ -179,7 +182,18 @@
 		onReady() {
 			this.$refs.customForm.setRules(this.customRules);
 		},
-
+		onShow() {
+			let empList = localStorage.getItem('empList')
+			empList = JSON.parse(empList)
+			let pack = {
+				duty:empList[0].power,
+				empName:empList[0].name,
+				mobile:empList[0].phone,
+				idcardno:empList[0].userNum
+			}
+			this.newEmpList = pack
+			console.log(pack,'pack');
+		},
 		methods: {
 			submit(ref) {
 				this.$refs[ref]
@@ -188,7 +202,8 @@
 						// 因为需要提交的数据和绑定的数据不一样,所以要转换
 						this.formData['status'] = 0;
 						this.formData.builtOn = new Date(this.formData.builtOn).getTime()
-						console.log(this.formData);
+						console.log(this.formData, '222');
+						this.formData.empList = [this.newEmpList]
 						var jsdata = JSON.stringify(this.formData);
 						createStation(jsdata).then(response => {
 							console.log('response.data.msg,', response.data);
@@ -262,21 +277,21 @@
 				this.showCheckboxShow(this.pageNo);
 			},
 			// 值班
-			goWorkNum(){
+			goWorkNum() {
 				uni.navigateTo({
-					url:"/pagesA/fire/fire_station/people_fireStation/people_fireStation?addId=1"
+					url: "/pagesA/fire/fire_station/people_fireStation/people_fireStation"
 				})
 			},
 			// 负责人
-			goBigNum(){
+			goBigNum() {
 				uni.navigateTo({
-					url:"/pagesA/fire/fire_station/people_fireStation/people_fireStation?addId=2"
+					url: "/pagesA/fire/fire_station/people_fireStation/people_fireStation"
 				})
 			},
 			// 普通人
-			goPeopleMes(){
+			goPeopleMes() {
 				uni.navigateTo({
-					url:"/pagesA/fire/fire_station/people_fireStation/people_fireStation?addId=0"
+					url: "/pagesA/fire/fire_station/people_fireStation/people_fireStation"
 				})
 			}
 		}
@@ -482,18 +497,20 @@
 	.example {
 		overflow-y: auto;
 	}
-	/deep/ .antherBtn{
+
+	/deep/ .antherBtn {
 		width: 200rpx !important;
 		height: 80rpx;
 		font-size: 30rpx;
 		text-align: center;
 		line-height: 80rpx;
 	}
-	.manyBtn{
-		width: 200rpx;
-		height: 40rpx;
+
+	.manyBtn {
+		width: 150rpx;
+		height: 60rpx;
 		font-size: 20rpx;
-		line-height: 40rpx;
+		line-height: 60rpx;
 		text-align: center;
 		border-radius: 20rpx;
 		background-color: #4DB1B6;

+ 92 - 65
pagesA/fire/fire_station/people_fireStation/people_fireStation.vue

@@ -39,10 +39,10 @@
 					<u-input v-model="person.phone" @blur="phoneBlur" :placeholder="'请输入电话号'" />
 					<span class="erroring" v-if="phoneRules">电话号有误</span>
 				</u-form-item>
-				<u-form-item class="typeStyle" :prop="'age' + (index + 1)">
+				<!-- <u-form-item class="typeStyle" :prop="'age' + (index + 1)">
 					<p style="width: 150rpx;margin-left: 20rpx;">人员类型</p>
 					<u-input v-model="person.worker" :placeholder="'请输入人员类型'" />
-				</u-form-item>
+				</u-form-item> -->
 				<u-form-item class="antherStyle">
 					<p style="width: 150rpx;">职务</p>
 					<uni-data-select v-model="person.power" :localdata="range" @change="change"></uni-data-select>
@@ -71,10 +71,10 @@
 							ref="item1">
 							<u--input class="insides" v-model="formbox.fuserNum" border="none"></u--input>
 						</u-form-item>
-						<u-form-item style="width: 350rpx;" label="人员类型" prop="userInfo.fworker" borderBottom
+						<!-- 		<u-form-item style="width: 350rpx;" label="人员类型" prop="userInfo.fworker" borderBottom
 							ref="item1">
 							<u--input class="insides" v-model="formbox.fworker" border="none"></u--input>
-						</u-form-item>
+						</u-form-item> -->
 					</u--form>
 					<div class="useBox">
 						<button class="antherBtn" @click="makeSureEdit">确认修改</button>
@@ -83,6 +83,15 @@
 				</view>
 			</u-popup>
 		</div>
+		<div>
+			<u-popup :show="showDel" title="确认删除?" mode="center" >
+				<div style="width: 300rpx;height: 200rpx;">
+					<p>是否删除该内容?</p>
+					<button class="antherBtn" @click="makeSureDel">确认</button>
+					<button class="antherBtn" @click="showDel = false">取消</button>
+				</div>
+			</u-popup>
+		</div>
 		<button @click="addNewPeople" class="circleBtn">+</button>
 	</view>
 </template>
@@ -147,6 +156,8 @@
 				nameRules: false, //对name的正则验证
 				userRules: false, //对身份证的正则验证
 				phoneRules: false, //对电话的正则验证
+				showDel: false,
+				delId: '',
 			}
 		},
 		methods: {
@@ -180,47 +191,52 @@
 			},
 
 			addSure() {
-				if (!this.userRules && !this.phoneRules && !this.nameRules) {
-					creatFirePeople({
-						duty: this.membersList[0].power,
-						empName: this.membersList[0].name,
-						empType: this.membersList[0].worker,
-						idcardno: this.membersList[0].userNum,
-						microstationid: this.fireStationId - 0,
-						mobile: this.membersList[0].phone,
-					}).then(res => {
-						if (res.data) {
-							this.getAllFire()
-							uni.showToast({
-								title: '添加成功',
-								icon: 'success', // 图标类型,可选值:'success', 'loading', 'none'
-								duration: 2000, // 持续时间,单位为毫秒,默认值为 1500
-								mask: false, // 是否显示透明蒙层,防止触摸穿透,默认值为 false
-								success() {
-									console.log('toast消息提示显示成功');
-								},
-								fail(err) {
-									console.error('toast消息提示显示失败', err);
-								}
-							});
-							this.membersList = []
-						}
-						console.log(res, 'r11111');
-					})
-					// console.log(this.membersList, 'memberList');
+				if (this.$route.query.addId) {
+					if (!this.userRules && !this.phoneRules && !this.nameRules) {
+						creatFirePeople({
+							duty: this.membersList[0].power,
+							empName: this.membersList[0].name,
+							// empType: this.membersList[0].worker,
+							idcardno: this.membersList[0].userNum,
+							microstationid: this.fireStationId - 0,
+							mobile: this.membersList[0].phone,
+						}).then(res => {
+							if (res.data) {
+								this.getAllFire()
+								uni.showToast({
+									title: '添加成功',
+									icon: 'success', // 图标类型,可选值:'success', 'loading', 'none'
+									duration: 2000, // 持续时间,单位为毫秒,默认值为 1500
+									mask: false, // 是否显示透明蒙层,防止触摸穿透,默认值为 false
+									success() {
+										console.log('toast消息提示显示成功');
+									},
+									fail(err) {
+										console.error('toast消息提示显示失败', err);
+									}
+								});
+								this.membersList = []
+							}
+						})
+					} else {
+						uni.showToast({
+							title: '请检查表单项',
+							icon: 'none', // 图标类型,可选值:'success', 'loading', 'none'
+							duration: 2000, // 持续时间,单位为毫秒,默认值为 1500
+							mask: false, // 是否显示透明蒙层,防止触摸穿透,默认值为 false
+							success() {
+								console.log('toast消息提示显示成功');
+							},
+							fail(err) {
+								console.error('toast消息提示显示失败', err);
+							}
+						});
+					}
 				} else {
-					uni.showToast({
-						title: '请检查表单项',
-						icon: 'none', // 图标类型,可选值:'success', 'loading', 'none'
-						duration: 2000, // 持续时间,单位为毫秒,默认值为 1500
-						mask: false, // 是否显示透明蒙层,防止触摸穿透,默认值为 false
-						success() {
-							console.log('toast消息提示显示成功');
-						},
-						fail(err) {
-							console.error('toast消息提示显示失败', err);
-						}
-					});
+					localStorage.setItem("empList", JSON.stringify(this.membersList))
+					uni.navigateBack({
+						delta: 1
+					})
 				}
 			},
 			change(e) {
@@ -264,7 +280,7 @@
 						// console.log(res, '888');
 						this.tableList = res.data.list
 					})
-				} else {
+				} else if (this.$route.query.addId === '0') {
 					num = '0'
 					getfirepage({
 						pageNo: 1,
@@ -279,7 +295,12 @@
 
 			},
 			delUser(row) {
-				delFirePeople(row.id).then(res => {
+				this.showDel = true
+				this.delId = row.id
+
+			},
+			makeSureDel() {
+				delFirePeople(this.delId).then(res => {
 					if (res.data) {
 						uni.showToast({
 							title: '删除成功',
@@ -294,6 +315,7 @@
 							}
 						});
 						this.getAllFire()
+						this.showDel = false
 					}
 				})
 			},
@@ -306,7 +328,7 @@
 						this.formbox.fname = res.data.empName
 						this.formbox.fphone = res.data.mobile
 						this.formbox.fpower = res.data.duty
-						this.formbox.fworker = res.data.empType
+						// this.formbox.fworker = res.data.empType
 						this.formbox.fuserNum = res.data.idcardno
 						this.showModal = true
 
@@ -320,7 +342,7 @@
 				editFirePeople({
 					duty: this.formbox.fpower,
 					empName: this.formbox.fname,
-					empType: this.formbox.fworker,
+					// empType: this.formbox.fworker,
 					id: this.editPeopleId,
 					idcardno: this.formbox.fuserNum,
 					microstationid: this.fireStationId - 0,
@@ -375,25 +397,30 @@
 			}
 		},
 		onLoad(options) {
-			console.log(options, 'options')
-			this.resultId = this.$route.query.addId
-			if (this.resultId === '2') {
-				this.tomole = '添加负责人'
-			} else if (this.resultId === '1') {
-				this.tomole = '添加值班人'
-			} else {
-				this.tomole = '添加人员信息'
-			}
-			let ids = localStorage.getItem("fireId")
-			if (ids) {
-				this.fireStationId = ids
-				// console.log(this.fireStationId, 'fireid');
-			}
-			// console.log(this.$route.query, 'query'); // 输出传递的参数值
+
 		},
 		onShow() {
-			this.getAllFire()
-			this.getbackid()
+			if (this.$route.query.addId) {
+				this.getAllFire()
+				this.getbackid()
+				console.log(options, 'options')
+				this.resultId = this.$route.query.addId
+				if (this.resultId === '2') {
+					this.tomole = '添加负责人'
+				} else if (this.resultId === '1') {
+					this.tomole = '添加值班人'
+				} else {
+					this.tomole = '添加人员信息'
+				}
+				let ids = localStorage.getItem("fireId")
+				if (ids) {
+					this.fireStationId = ids
+					// console.log(this.fireStationId, 'fireid');
+				}
+				// console.log(this.$route.query, 'query'); // 输出传递的参数值
+			} else {
+				return
+			}
 		},
 		computed: {
 			getDuty() {

+ 26 - 3
pagesA/fire/metting_regsiter/metting_sigin.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="bigBox">
-			<div class="cardBox">
+			<div class="cardBox" v-if="tableSure">
 				<uni-card v-for="item in tableList" class="mesCard">
 					<div style="display: flex;justify-content: space-between;align-items: center;">
 						<div>
@@ -10,12 +10,15 @@
 							<text>职务:{{item.ppDuty}}</text>
 						</div>
 						<div style="display: flex;justify-content: space-around;align-items: center;">
-							<button @click="delUser(item)" class="editBtn">删除</button>
+							<button @click="delUser(item)" class="editBtn" style="background-color: red;">删除</button>
 							<button @click="editUser(item)" class="editBtn">编辑</button>
 						</div>
 					</div>
 				</uni-card>
 			</div>
+			<div class="noMesBox" v-if="tableSure1">
+				<span style="border: 5rpx solid #4DB1B6;font-size: 30rpx;padding: 10rpx;">暂无数据</span>
+			</div>
 			<div class="useBox">
 				<!-- <button class="useBtn" @click="addNewPeople">新增参会人员</button> -->
 				<!-- <button class="useBtn" @click="sureAdd">确认新增</button> -->
@@ -49,6 +52,7 @@
 					</u-form-item>
 					<u-form-item class="antherStyle">
 						<button class="useBtn" @click="sureAdd">确认新增</button>
+						<button class="useBtn" @click="noAdd">取消新增</button>
 					</u-form-item>
 				</u--form>
 			</div>
@@ -129,6 +133,8 @@
 				nameRules: false,
 				userRules: false,
 				phoneRules: false,
+				tableSure: true,
+				tableSure1: false,
 			}
 		},
 		methods: {
@@ -143,7 +149,14 @@
 					pageNo: 1,
 					pageSize: 10
 				}).then(res => {
-					this.tableList = res.data.list
+					if(res.data.list.length != 0){
+						this.tableList = res.data.list
+						this.tableSure = true
+						this.tableSure1 = false
+					}else{
+						this.tableSure = false
+						this.tableSure1 = true
+					}
 					console.log(res, 'all');
 				})
 			},
@@ -324,6 +337,9 @@
 					this.phoneRules = true
 				}
 			},
+			noAdd() {
+				this.meetList = []
+			}
 		},
 		onShow() {
 			this.getUser()
@@ -456,4 +472,11 @@
 		/* background-color: red; */
 		border: 2rpx solid #4DB1B6;
 	}
+	.noMesBox{
+		width: 400rpx;
+		height: 400rpx;
+		margin: 0 auto;
+		text-align: center;
+		line-height: 400rpx;
+	}
 </style>

+ 1 - 1
pagesA/fire/staff_info/index.vue

@@ -42,7 +42,7 @@
 					</view>
 					<view v-else class="grid-text"><text class="name-align-task">岗位:</text>{{ item.empGw }}</view>
 					<view class="grid-text"><text class="name-align-task">联系电话:</text>{{ item.linkTel }}</view>
-					<view class="grid-text"><text class="name-align-task">职业资格证书:</text>{{ item.empGw }}</view>
+					<view class="grid-text"><text class="name-align-task" style="width: 200rpx;">职业资格证书:</text>{{ item.empGw }}</view>
 				</uni-card>
 				</uni-card>
 			</view>

+ 46 - 50
pagesA/fire/staff_info/staff_details/staff_details.vue

@@ -3,69 +3,65 @@
 		<view class="example container" :style="'height: ' + (screenHeight - wheight - 75) + 'px'">
 			<!-- 自定义表单校验 1-->
 			<u--form ref="customForm" :model="formData" labelPosition="top" labelWidth="150" labelAlign="left">
-					<u-form-item label="手机号" prop="linkTel" :required="true">
-						<u-input v-model="formData.linkTel" placeholder="系统登录用户名" disabled/>
-					</u-form-item>
+				<u-form-item label="手机号" prop="linkTel" :required="true">
+					<u-input v-model="formData.linkTel" placeholder="系统登录用户名" disabled />
+				</u-form-item>
 
-					<u-form-item label="真实姓名" prop="empRyxm" :required="true">
-						<u-input v-model="formData.empRyxm" placeholder="真实姓名" disabled/>
-					</u-form-item>
-					<u-form-item label="岗位" prop="empGw" :required="true">
-						<u-input v-model="formData.empGw" placeholder="岗位" disabled/>
-					</u-form-item>
-					<u-form-item label="主管单位" prop="zgdwid" :required="true"><u-input v-model="formData.zgdwid"
-							placeholder="主管单位" disabled/></u-form-item>
+				<u-form-item label="真实姓名" prop="empRyxm" :required="true">
+					<u-input v-model="formData.empRyxm" placeholder="真实姓名" disabled />
+				</u-form-item>
+				<u-form-item label="岗位" prop="empGw" :required="true">
+					<u-input v-model="formData.empGw" placeholder="岗位" disabled />
+				</u-form-item>
+				<u-form-item label="主管单位" prop="zgdwid" :required="true"><u-input v-model="formData.zgdwid"
+						placeholder="主管单位" disabled /></u-form-item>
 
-					<u-form-item label="所属机构" :required="true" prop="orgName">
-						<u--input v-model="formData.orgName" disabled 
-							placeholder="所属机构"></u--input>
-					</u-form-item>
-					<u-form-item label="人员编号">
-						<u-input v-model="formData.empRybh" disabled placeholder="人员编号	" />
-					</u-form-item>
-					<u-form-item label="部门职别"><u-input v-model="formData.bmzb" disabled placeholder="部门职别" /></u-form-item>
-					<u-form-item label="毕业学校"><u-input v-model="formData.byxx" disabled placeholder="毕业学校" /></u-form-item>
-					<u-form-item label="人员性别" prop="empGender">
-						<u--input v-model="formData.empGender" disabled 
-							placeholder="人员性别"></u--input>
-					</u-form-item>
+				<u-form-item label="所属机构" :required="true" prop="orgName">
+					<u--input v-model="formData.orgName" disabled placeholder="所属机构"></u--input>
+				</u-form-item>
+				<u-form-item label="人员编号">
+					<u-input v-model="formData.empRybh" disabled placeholder="人员编号	" />
+				</u-form-item>
+				<u-form-item label="部门职别"><u-input v-model="formData.bmzb" disabled placeholder="部门职别" /></u-form-item>
+				<u-form-item label="毕业学校"><u-input v-model="formData.byxx" disabled placeholder="毕业学校" /></u-form-item>
+				<u-form-item label="人员性别" prop="empGender">
+					<u--input v-model="formData.empGender" disabled placeholder="人员性别"></u--input>
+				</u-form-item>
 
-					<u-form-item label="学历">
-						<u--input v-model="formData.empXl" prop="empXl" disabled
-							placeholder="选择学历"></u--input>
-					</u-form-item>
-					<u-form-item label="专业	"><u-input v-model="formData.empZy" disabled placeholder="专业" /></u-form-item>
-					<u-form-item label="婚姻情况	"><u-input v-model="formData.hyqk" disabled placeholder="婚姻情况" /></u-form-item>
+				<u-form-item label="学历">
+					<u--input v-model="formData.empXl" prop="empXl" disabled placeholder="选择学历"></u--input>
+				</u-form-item>
+				<u-form-item label="专业	"><u-input v-model="formData.empZy" disabled placeholder="专业" /></u-form-item>
+				<u-form-item label="婚姻情况	"><u-input v-model="formData.hyqk" disabled placeholder="婚姻情况" /></u-form-item>
 
-					<u-form-item label="籍贯">
-						<u-input v-model="formData.jgdm" disabled placeholder="籍贯" @click.native="showPickerJiguan" />
-					</u-form-item>
-					<u-form-item label="民族">
-						<u-input v-model="formData.mzdm" disabled placeholder="请选择民族" @click.native="showPicker" />
-					</u-form-item>
-					<u-form-item label="区域编码	"><u-input disabled v-model="formData.qybm" placeholder="区域编码" /></u-form-item>
-					<u-form-item label="身份证号"><u-input disabled v-model="formData.sfzid" placeholder="身份证号" /></u-form-item>
-					<u-form-item label="通讯地址"><u-input disabled v-model="formData.txdz" placeholder="通讯地址" /></u-form-item>
-					<u-form-item label="现在单位"><u-input disabled v-model="formData.xzdw" placeholder="现在单位" /></u-form-item>
-					<u-form-item label="邮政编码"><u-input disabled v-model="formData.yzbm" placeholder="邮政编码" /></u-form-item>
-					<u-form-item label="出生日期">
-						<uni-datetime-picker v-model="formData.empBirthday" disabled type="date"
-							closeOnClickOverlay></uni-datetime-picker>
-					</u-form-item>
+				<u-form-item label="籍贯">
+					<u-input v-model="formData.jgdm" disabled placeholder="籍贯" @click.native="showPickerJiguan" />
+				</u-form-item>
+				<u-form-item label="民族">
+					<u-input v-model="formData.mzdm" disabled placeholder="请选择民族" @click.native="showPicker" />
+				</u-form-item>
+				<u-form-item label="区域编码	"><u-input disabled v-model="formData.qybm" placeholder="区域编码" /></u-form-item>
+				<u-form-item label="身份证号"><u-input disabled v-model="formData.sfzid" placeholder="身份证号" /></u-form-item>
+				<u-form-item label="通讯地址"><u-input disabled v-model="formData.txdz" placeholder="通讯地址" /></u-form-item>
+				<u-form-item label="现在单位"><u-input disabled v-model="formData.xzdw" placeholder="现在单位" /></u-form-item>
+				<u-form-item label="邮政编码"><u-input disabled v-model="formData.yzbm" placeholder="邮政编码" /></u-form-item>
+				<u-form-item label="职业资格证书"><u-input disabled v-model="formData.zyzgzs" placeholder="职业资格证书" /></u-form-item>
+				<u-form-item label="出生日期">
+					<uni-datetime-picker v-model="formData.empBirthday" disabled type="date"
+						closeOnClickOverlay></uni-datetime-picker>
+				</u-form-item>
 			</u--form>
 		</view>
 		<view style="display: flex;width: 80%;margin-left: 10%;" class="heigthButton">
-			<u-button @click="gotoEditArc(formData)" shape="circle" size="large" color="#4cb2b6"
-				text="修改信息"></u-button>
-			<u-button @click.native="showModal(formData)" customStyle="margin-left:20px" shape="circle"
-				size="large" color="#ff3737" text="删除人员"></u-button>
+			<u-button @click="gotoEditArc(formData)" shape="circle" size="large" color="#4cb2b6" text="修改信息"></u-button>
+			<u-button @click.native="showModal(formData)" customStyle="margin-left:20px" shape="circle" size="large"
+				color="#ff3737" text="删除人员"></u-button>
 		</view>
 		<u-modal :show="show" @confirm="confirm" @cancel="cancel" @close="close" asyncClose closeOnClickOverlay
 			showCancelButton confirmColor="red" :title="title" :content="content" ref="uModal"></u-modal>
 	</view>
 </template>
 <script>
-	
 	import {
 		delStaff, //删除人员信息
 	} from '@/api/staff_info';