Merge remote-tracking branch 'origin/master'

anrui-riskcenter-ui/src/views/homevisitdatareview/homevisitdatareviewInfo.vue

@@ -1,10 +1,12 @@
 <template>
   <div class="app-container">
+    <div v-show="viewState == 1">
       <div class="tab-header webtop">
         <!--标题-->
         <div>{{ viewTitle }}</div>
         <!--start 添加修改按钮-->
         <div>
+          <el-button type="primary" size="small" @click="lookReport()">家访考察报告</el-button>
           <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
         </div>
       </div>
@@ -173,6 +175,7 @@
           </el-collapse>
         </el-form>
       </div>
+    </div>
     <!-- 查看公司合同类 附件 -->
     <el-dialog :visible.sync="dialogGSVisible" :append-to-body="true">
       <el-image style="width: 150px; height: 150px" v-for="(item,index) in dialogGS_list" :key="index" :src="item" :preview-src-list="dialogGS_list">
@@ -183,17 +186,24 @@
       <el-image style="width: 150px; height: 150px" v-for="(item,index) in dialogZF_list" :key="index" :src="item" :preview-src-list="dialogZF_list">
       </el-image>
     </el-dialog>
+    <!-- 查看家访考察报告 -->
+    <homevisitreport v-show="viewState == 2" ref="divReport" @doback="resetState" />
   </div>
 </template>
 
 <script>
 import req from '@/api/homevisitdatareview/homevisitdatareview'
+import homevisitreport from '../overduevehicle/relation/homevisitreport'
 
 export default {
   name: 'HomeVisitDataReviewInfo',
+  components: {
+    homevisitreport
+  },
   data() {
     return {
       viewTitle: '',
+      viewState: 1,
       tableKey: 0,
       tableZfKey: 1,
       index: 0,
@@ -249,6 +259,13 @@ export default {
       this.dialogZFVisible = true
       this.dialogZF_list = row
     },
+    lookReport() {
+      this.viewState = 2
+      this.$refs['divReport'].showInfo({ kcbgSid: this.formobj.homeVisitSid })
+    },
+    resetState() {
+      this.viewState = 1
+    },
     handleReturn() {
       this.formobj = {
         carProperty: [],

anrui-riskcenter-ui/src/views/homevisitdatareview/homevisitdatatobereviewed.vue

@@ -152,6 +152,7 @@ import ButtonBar from '@/components/ButtonBar'
 import homevisitdatareview from './homevisitdatareview'
 import homevisitdatareviewAdd from './homevisitdatareviewAdd'
 import homevisitdatareviewInfo from './homevisitdatareviewInfo'
+import { getButtonPermissions } from '@/api/Common/dictcommons'
 
 export default {
   name: 'HomeVisitDataToBeReviewed',
@@ -223,7 +224,18 @@ export default {
     this.getList()
   },
   mounted() {
+    getButtonPermissions({ userSid: window.sessionStorage.getItem('userSid'), url: this.$route.path, type: 0 }).then((res) => {
+      if (res.success) {
+        for (var i = 0; i < res.data.length; i++) {
+          for (var k = 0; k < this.btnList.length; k++) {
+            if (res.data[i].buttonId === this.btnList[k].btnKey) {
+              this.btnList.splice(k, 1)
+            }
+          }
+        }
         this.$refs['btnbar'].setButtonList(this.btnList)
+      }
+    })
   },
   methods: {
     // 搜索条件效果