BUG 30899

src/apps/AppMonitoringObject/Detail.vue

@@ -58,7 +58,7 @@
                 }})</i>
             </div>
             <span
-                @click="linkTo(`./MonitorFamilySituation?id=${info.id}&girdId=${girdInfo.girdId}&girdName=${girdInfo.girdName}`)">编辑</span>
+                @click="linkTo(`./MonitorFamilySituation?id=${info.id}&girdId=${user.girdId}&girdName=${user.girdName}`)">编辑</span>
           </div>
           <div class="item-info">
             <label>是否危房</label>
@@ -75,7 +75,7 @@
               <h2>家庭风险情况</h2>
               <i :style="{color: isFamilyRisk ? '#2EA222' : '#FF4466'}">({{ isFamilyRisk ? '已填写' : '未填写' }})</i>
             </div>
-            <span @click="linkTo(`./familyRisk?id=${info.id}&girdId=${girdInfo.girdId}&girdName=${girdInfo.girdName}`)">编辑</span>
+            <span @click="linkTo(`./familyRisk?id=${info.id}&girdId=${user.girdId}&girdName=${user.girdName}`)">编辑</span>
           </div>
           <div class="item-info">
             <label>监测对象类型</label>
@@ -93,7 +93,7 @@
               <i :style="{color: familyIncome ? '#2EA222' : '#FF4466'}">({{ familyIncome ? '已填写' : '未填写' }})</i>
             </div>
             <span
-                @click="linkTo(`./MonitorIncome?id=${info.id}&girdId=${girdInfo.girdId}&girdName=${girdInfo.girdName}`)">编辑</span>
+                @click="linkTo(`./MonitorIncome?id=${info.id}&girdId=${user.girdId}&girdName=${user.girdName}`)">编辑</span>
           </div>
           <div class="item-info">
             <label>家庭纯收入</label>
@@ -112,7 +112,7 @@
               <i :style="{color: moveRisk ? '#2EA222' : '#FF4466'}">({{ moveRisk ? '已填写' : '未填写' }})</i>
             </div>
             <span
-                @click="linkTo(`./MonitorPoorStatus?id=${info.id}&girdId=${girdInfo.girdId}&girdName=${girdInfo.girdName}`)">编辑</span>
+                @click="linkTo(`./MonitorPoorStatus?id=${info.id}&girdId=${user.girdId}&girdName=${user.girdName}`)">编辑</span>
           </div>
           <div class="item-info">
             <label>信息采集人</label>
@@ -124,7 +124,7 @@
           </div>
         </div>
       </div>
-      <div class="item-wrapper" v-if="info.status==4">
+      <div class="item-wrapper" v-if="info.auditUserName">
         <AiItem label="审批人" :border="false">{{ info.auditUserName }}</AiItem>
         <AiItem label="驳回日期" :border="false">{{ info.auditTime }}</AiItem>
         <AiItem label="驳回理由" :border="false" top-label>{{ info.auditOpinion }}</AiItem>
@@ -214,8 +214,6 @@ export default {
       list: [],
       isFrom: false,
       viewAll: false,
-      checkType: '',
-      girdInfo: {},
       userInfo: {},
       id: '',
       basicNum: [],
@@ -225,6 +223,7 @@ export default {
 
   computed: {
     ...mapState(['user']),
+    checkType: v => v.user.girdCheckType,
     isIncome() {
       if (!this.info.id) {
         return false
@@ -279,7 +278,6 @@ export default {
     }
     this.$dict.load(['fpType', 'riskEliminationMethod', 'fpRiskType', 'fpYesOrNo', 'fpNation', 'fpEducation', 'fpStudentsInSchool', 'fpHealth',
       'fpLaborSkills', 'fpPoliticalOutlook', 'fpIndustrialAssistance', 'fpHealthAssistance', 'fpAssistanceMeasures']).then(() => {
-      this.isGirdUser()
       this.getInfo()
     })
 
@@ -294,19 +292,9 @@ export default {
   },
 
   methods: {
-    isGirdUser() {
-      this.$http.post('/app/appgirdmemberinfo/checkLogOnUser').then((res) => {
-        if (res.code == 0) {
-          this.checkType = res.data.checkType
-          this.girdInfo = res.data
-        }
-      })
-    },
-
     callPhone(phone) {
       uni.makePhoneCall({phoneNumber: phone})
     },
-
     linkTo(url) {
       uni.navigateTo({url})
     },