Kaynağa Gözat

Merge branch 'liyangzheng'

liyangzheng 1 yıl önce
ebeveyn
işleme
81b3665f07

+ 16 - 13
pagesA/fire/fire_station/add_fireStation/add_fireStation.vue

@@ -39,12 +39,12 @@
 						<u-input v-model="formData.charger" placeholder="请输入负责人" />
 						<button @click="goBigNum" class="manyBtn">添加负责人</button>
 					</u-form-item>
-					
+
 					<u-form-item label="人员信息" prop="members">
 						<u-input v-model="formData.members" placeholder="请输入队员人数" />
 						<button @click="goPeopleMes" class="manyBtn">添加人员信息</button>
 					</u-form-item>
-					
+
 					<u-form-item label="水罐车数量" prop="waterTanker">
 						<u-input v-model="formData.waterTanker" placeholder="请输入水罐车" />
 					</u-form-item>
@@ -188,13 +188,13 @@
 			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
+				duty: empList[0].power,
+				empName: empList[0].name,
+				mobile: empList[0].phone,
+				idcardno: empList[0].userNum
 			}
 			this.newEmpList = pack
-			console.log(pack,'pack');
+			console.log(pack, 'pack');
 		},
 		methods: {
 			submit(ref) {
@@ -203,17 +203,20 @@
 					.then(res => {
 						// 因为需要提交的数据和绑定的数据不一样,所以要转换
 						this.formData['status'] = 0;
-						this.formData.builtOn = this.formData.builtOn
-						console.log(this.formData, '222');
-						this.formData.empList = [this.newEmpList]
+						if (this.formData.builtOn) {
+							this.formData.builtOn = this.formData.builtOn
+						}
+						if (this.newEmpList) {
+							this.formData.empList = [this.newEmpList]
+						}
 						var jsdata = JSON.stringify(this.formData);
 						createStation(jsdata).then(response => {
-							console.log('response.data.msg,', response.data);
+							// console.log('response.data.msg,', response.data);
 							uni.showLoading({
 								title: response.data.msg
 							});
 							setTimeout(() => {
-								console.log('新增成功!');
+								// console.log('新增成功!');
 								uni.hideLoading();
 								uni.navigateBack({
 									delta: 1
@@ -222,7 +225,7 @@
 						});
 					})
 					.catch(err => {
-						console.log('err错误信息为:', err);
+						// console.log('err错误信息为:', err);
 						uni.showToast({
 							icon: 'none',
 							title: '错误!' + err[0].message

+ 2 - 2
pagesA/fire/fire_station/people_fireStation/people_fireStation.vue

@@ -2,7 +2,7 @@
 	<view style="position: relative;">
 		<navInfo :title="'编辑人员'"></navInfo>
 		<view class="bgTopImg" style="height:200rpx;">
-			<image slot="right" :src="`${urls}/navBg@2x.png`" class="bgTopImg" ></image>
+			<image slot="right"  class="bgTopImg" ></image>
 		</view>
 		<div class="cardBox">
 			<uni-card v-for="item in tableList" style="border: 2rpx solid #4DB1B6;">
@@ -21,7 +21,7 @@
 			</uni-card>
 		</div>
 		<!-- 新增的人员表单项 -->
-		<div v-for="(person, index) in membersList" :key="index" style="border-bottom: 1px solid black;">
+		<div v-for="(person, index) in membersList" :key="index" style="border-bottom: 1px solid black;margin-top: 100rpx;">
 			<u--form ref="forms">
 				<u-form-item class="typeStyle" :prop="'name' + (index + 1)">
 					<p style="width: 150rpx;margin-left: 20rpx;">姓名</p>

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

@@ -63,7 +63,7 @@
 						<uni-col :span="8">
 							<view class="flex direction-column">
 								<text class="padding-bottom"> 会议类型</text>
-								<text style="font-weight: bold;" class="text-1cut">{{ item.meetingType }}</text>
+								<text style="font-weight: bold;" class="text-1cut">{{ item.meetingType=='1'?"工作会议":"培训会议" }}</text>
 							</view>
 						</uni-col>
 						<button class="regsiterBtn" @click="peopleReg(item)"

+ 1 - 1
pagesA/fire/meeting_sign_in/meeting_details/meeting_details.vue

@@ -59,7 +59,7 @@
 				<uni-col :span="12">
 					<view class="flex direction-column align-center ">
 						<text class="padding-bottom">会议类型</text>
-						<text style="font-weight: bold;font-size: 30upx;">{{ formData.meetingType }}</text>
+						<text style="font-weight: bold;font-size: 30upx;">{{ formData.meetingType=='1'?"工作会议":"培训会议" }}</text>
 					</view>
 				</uni-col>
 			</uni-row>