小程序人员分级、安检维修加是否合格+备注

pages/noLogin/cityProject.vue

@@ -8,8 +8,18 @@
 			<view style="margin: 20rpx;">
 				<u-search placeholder="请输入搜索内容" v-model="nameValue" :action-style="{'font-size':'40rpx'}" @custom="getProjectList()"></u-search>
 			</view>
-			<view class="project-content" v-for="(item,index) in list" :key="index" >
-				<view v-if="item.name == '灶管阀改造'" @click="gotoindex()">
+			<view v-for="(item,index) in list" :key="index" >
+				<view class="project-content" v-if="item.name == '灶管阀改造' && civilPower.includes('pu1')" @click="gotoindex()">
+					<view>
+						<view class="font-forty-eight blue">
+							项目名称：{{item.name}}
+						</view>
+						<view class="font-forty-eight blue">
+							项目地址：{{item.address}}
+						</view>
+					</view>
+				</view>
+				<view class="project-content" v-else-if="item.name == '安检' && civilPower.includes('pu2')" @click="topage(`/pages/noLogin/data?id=${item.id}&name=${item.name}&address=${item.address}`)">
 					<view >
 						<view class="font-forty-eight blue">
 							项目名称：{{item.name}}
@@ -19,7 +29,7 @@
 						</view>
 					</view>
 				</view>
-				<view v-else-if="item.name == '安检' || item.name == '维修' || item.name == '开栓'" @click="topage(`/pages/noLogin/data?id=${item.id}&name=${item.name}&address=${item.address}`)">
+				<view class="project-content" v-else-if="item.name == '维修' && civilPower.includes('pu3')" @click="topage(`/pages/noLogin/data?id=${item.id}&name=${item.name}&address=${item.address}`)">
 					<view >
 						<view class="font-forty-eight blue">
 							项目名称：{{item.name}}
@@ -29,7 +39,7 @@
 						</view>
 					</view>
 				</view>
-				<view v-else @click="topage(`/pages/noLogin/uploadProject?id=${item.id}&name=${item.name}&address=${item.address}`)">
+				<view class="project-content" v-else-if="item.name == '开栓' && civilPower.includes('pu4')" @click="topage(`/pages/noLogin/data?id=${item.id}&name=${item.name}&address=${item.address}`)">
 					<view >
 						<view class="font-forty-eight blue">
 							项目名称：{{item.name}}
@@ -39,6 +49,23 @@
 						</view>
 					</view>
 				</view>
+				<view class="project-content" v-else-if="
+						item.name != '灶管阀改造' && 
+						item.name != '安检' && 
+						item.name != '维修' && 
+						item.name != '开栓' && 
+						civilPower.includes('pu5')"
+					@click="topage(`/pages/noLogin/uploadProject?id=${item.id}&name=${item.name}&address=${item.address}`)">
+					<view>
+						<view class="font-forty-eight blue">
+							项目名称：{{item.name}}
+						</view>
+						<view class="font-forty-eight blue">
+							项目地址：{{item.address}}
+						</view>
+					</view>
+				</view>
+				<view v-else></view>
 			</view>
 		</view>
 	</view>
@@ -51,13 +78,15 @@
 			return {
 				list:[],
 				value:'',
-				nameValue:''
+				nameValue:'',
+				civilPower:''
 			}
 		},
 		onLoad(e) {
 			console.log(e)
 			this.value = e.value
 			this.getProjectList();
+			this.getUserName();
 		},
 		methods: {
 			gotoindex(){
@@ -78,7 +107,12 @@
 					}
 					this.list = res;
 				})
-			}
+			},
+			getUserName(){
+				service.getUserName().then(res=>{
+					this.civilPower = res.civilPower;
+				})
+			},
 		},
 	}
 </script>

pages/noLogin/repair.vue

@@ -55,11 +55,12 @@
 					{{houseNumber ? houseNumber  : '选择门牌'}}
 				</view>
 			</view>
-		<!-- 	<view v-if="photo.length >= 1">
-				<view class="flex" v-for="(item,index) in photo" :key="index">
-					<image :src="item" mode="" class="project-img"></image>
+			<view>
+				<view class="font-fifty-six SourceHanSansCN choose" @click="openQualified()">
+					{{isqualified ? isqualified : '是否'+(id=='004'?'合格':'维修')}}
+					<u-select v-model="qualifiedShow" :list="qualifiedList" @confirm="qualifiedConfirm()"></u-select>
 				</view>
-			</view> -->
+			</view>
 			<view class="upload">
 				<text class="font-forty SourceHanSansCN">备注：</text>
 				<textarea value="" placeholder="请输入备注" v-model="remark"/>
@@ -126,7 +127,20 @@
 				housedata:0,
 				remark:'',
 				keyword:'',
-				loading:false
+				loading:false,
+				
+				isqualified:null,
+				qualifiedShow:false,
+				qualifiedList:[
+					{
+						value: '是',
+						label: '是',
+					},
+					{
+						value: '否',
+						label: '否',
+					}
+				]
 			}
 		},
 		onLoad(e) {
@@ -156,12 +170,17 @@
 					this.$UTILS.showPrompt('照片或视频未上传完毕，无法提交！')
 					return
 				}
+				if(this.isqualified == null || this.isqualified == '') {
+					this.$UTILS.showPrompt('请选择是否合格!')
+					return
+				}
 				let param = {
 					// photo: this.imgArr,
 					picUrl: this.imgArr,
 					serviceType: this.id,
 					houseId: this.housedata,
-					remark:this.remark
+					remark:this.remark,
+					whether:this.isqualified,
 				}
 				console.log('param', param)
 				// this.$UTILS.showPrompt('提交成功！')
@@ -542,6 +561,12 @@
 					}
 				})
 			},
+			openQualified(){
+				this.qualifiedShow = !this.qualifiedShow;
+			},
+			qualifiedConfirm(e){
+				this.isqualified = e[0].value;
+			}
 		}
 	}
 </script>

pages/noLogin/typeList.vue

@@ -3,7 +3,7 @@
 		<image src="/static/icon/background.png" mode="" class="background"></image>
 		<view style="padding-top: 300rpx;" >
 			<view v-for="(item,index) in list" :key="index">
-				<button class="background-color1 white font-forty-eight btn"
+				<button class="background-color1 white font-forty-eight btn" v-if="power.includes(item.value)"
 					@click="topage(`/pages/noLogin/cityProject?value=${item.value}`)">{{item.name}}</button>
 			</view>
 		</view>
@@ -29,6 +29,7 @@
 			return {
 				list:[],
 				name:'',
+				power:'',
 			}
 		},
 		onLoad() {
@@ -48,7 +49,8 @@
 			},
 			getUserName(){
 				service.getUserName().then(res=>{
-					this.name = res.name
+					this.name = res.name;
+					this.power = res.power;
 				})
 			},
 		},