flx：冲突

manifest.json

@@ -2,8 +2,8 @@
     "name" : "智慧安全", //中建四局
     "appid" : "__UNI__4AA4101",
     "description" : "",
-    "versionName" : "1.5.8",
+    "versionName" : "1.5.9",
-    "versionCode" : 158,
+    "versionCode" : 159,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages/personLocation/exam/beginexam/beginexam.vue

@@ -13,7 +13,9 @@
 			<view class="beginexam" v-for="(item,index) in stList" :key="index" v-show="index == stIndex">
 				<view class="questionTitle">
 					<text class="text">{{index + 1}}、</text>
-					<text class="text">{{item.questionName}}({{item.score||0}}分)</text>
+					<!-- <text class="text">{{item.questionName}}({{item.score||0}}分)</text> -->
+					<text class="text" v-html="item.questionName"></text>
+					<text>({{item.score||0}}分)</text>
 				</view>
 				<view class="radio-content">
 					<radio-group @change="radioChange" class="radio-boxs" v-if="item.type == 1">

pages/projectEnd/dangerBigProject/control.vue

@@ -28,20 +28,27 @@
 
 <script>
 	export default {
-		props:['detailId','detailData'],
+		props:['detailId','info'],
 		data(){
 			return{
 				listData:[],
 				checkNum: 0,
 				dangerEngineering: {},
-				isDisabled: false
+				isDisabled: false,
+				userInfo:{}
 			}
 		},
+		mounted() {
+			this.userInfo = JSON.parse(uni.getStorageSync('userInfo'))
+		},
 		created(){
 			this.initData()
 			this.getDEById()
 			this.getApply()
 		},
+		onShow() {
+			this.getApply()
+		},
 		methods:{
 			initData(){
 				this.sendRequest({
@@ -76,13 +83,19 @@
 						uni.hideLoading()
 						console.log("xmgl/xzDangerousEngineeringAcceptance/list",res);
 						let result = res.result
-						if(res.result.length>0){
+						console.log(this.info,"8888888888888888888888888888888");
-							if(res.result[0].acceptanceResult === null) this.isDisabled = true
+						if(this.userInfo.accountType != 6 || this.userInfo.userId == this.info.personLiableId){
-							if(res.result[0].acceptanceResult === 1) this.isDisabled = true
+							if(res.result.length>0){
-							if(res.result[0].acceptanceResult === 2) this.isDisabled = false
+								if(res.result[0].acceptanceResult === null) this.isDisabled = true
+								if(res.result[0].acceptanceResult === 1) this.isDisabled = true
+								if(res.result[0].acceptanceResult === 2) this.isDisabled = false
+							}else{
+								this.isDisabled = false
+							}
 						}else{
-							this.isDisabled = false
+							this.isDisabled = true
 						}
+						console.log(this.isDisabled,"999999999999999999999999999");
 					}
 				})
 			},
@@ -123,17 +136,26 @@
 				})
 			},
 			disabledTip(){
-				if(this.dangerEngineering.finalAcceptanceStatus === 2){
+				if(this.userInfo.accountType != 6 || this.userInfo.userId == this.info.personLiableId){
+					if(this.dangerEngineering.finalAcceptanceStatus === 2){
+						uni.showToast({
+							title: '该项危大工程已闭合，请勿重复操作',
+							icon: "none",
+							duration: 2000
+						});
+						return;
+					}
+					if(this.isDisabled){
+						uni.showToast({
+							title: '等待验收中，请勿重复操作',
+							icon: "none",
+							duration: 2000
+						});
+						return;
+					}
+				}else{
 					uni.showToast({
-					    title: '该项危大工程已闭合，请勿重复操作',
+						title: '您没有权限操作！',
-						icon: "none",
-						duration: 2000
-					});
-					return;
-				}
-				if(this.isDisabled){
-					uni.showToast({
-					    title: '等待验收中，请勿重复操作',
 						icon: "none",
 						duration: 2000
 					});

pages/projectEnd/dangerBigProject/details.vue

@@ -68,7 +68,8 @@
 					</view>
 					<!-- <view class="add-btn" v-if="activeIndex != 7 && activeIndex != 2 && !(activeIndex == 1 && detailData.engineeringState == 3) -->
 					<view class="add-btn" v-if="activeIndex != 7 && activeIndex != 2 
-					&& COMPANY != 'longguang' && detailData.finalAcceptanceStatus !== 2 && isShowBtn && btnAuth"
+					&& COMPANY != 'longguang' && detailData.finalAcceptanceStatus !== 2 && isShowBtn && btnAuth 
+					&& userInfo.accountType != 6 || userInfo.userId == detailData.personLiableId"
 					@click="addForm">
 						<uni-icons v-if="activeIndex == 5" type="camera" size="30" color="#fff"></uni-icons>
 						<uni-icons v-else type="plusempty" size="30" color="#fff"></uni-icons>
@@ -135,7 +136,8 @@
 				detailId: "",
 				detailData:{},
 				isShowBtn: null,
-				btnAuth: true
+				btnAuth: true,
+				userInfo:{},
 			}
 		},
 		onReachBottom() {
@@ -163,6 +165,7 @@
 			// this.initData()
 		},
 		mounted() {
+			this.userInfo = JSON.parse(uni.getStorageSync('userInfo'))
 		},
 		methods:{
 			initData(){