Merge branch 'master' of http://192.168.60.201/root/dsk-operate-sys

dsk-operate-ui/src/views/detail/party-a/component/Sidebar.vue

@@ -4,13 +4,15 @@
       placeholder="搜索"
       class="side-input"
       v-model="searchText"
-      @keyup.enter.native="handleSearch">
-      <i slot="prefix" class="el-input__icon el-icon-search" @click="handleSearch"></i>
+      clearable
+      @input="handleSearch(true)"
+      @keyup.enter.native="handleSearch()">
+      <i slot="prefix" class="el-input__icon el-icon-search" @click="handleSearch()"></i>
     </el-input>
     <el-menu
       ref="sideMenu"
       :unique-opened="true"
-      :default-active="routeIndex"
+      :default-active="searchIndex?searchIndex:routeIndex"
       class="detail-menu"
       @open="handleOpen">
       <template v-for="(item, index) in sideRoute">
@@ -96,6 +98,7 @@ export default {
         {title: '决策链条', pathName: 'decisionMaking'},
         {title: '跟进记录', pathName: 'gjjl'}
       ],
+      defaultRoute: [],
       customer:[
         'business',
         'preference',
@@ -103,6 +106,7 @@ export default {
         'decisionMaking',
         'gjjl'
       ],
+      searchIndex: ''
     }
   },
   computed: {
@@ -111,7 +115,7 @@ export default {
       if(this.partBoxHeight<bowerHeight) {
         sideHeight = bowerHeight
       }else{
-        sideHeight = this.partBoxHeight
+        sideHeight = '1222'/*this.partBoxHeight*/
       }
       return sideHeight
     },
@@ -121,25 +125,35 @@ export default {
     }
   },
   created() {
+    this.defaultRoute = JSON.parse(JSON.stringify(this.sideRoute))
   },
   methods: {
     handleOpen(key, keyPath) {
-      console.log(key, keyPath)
+
     },
     handleItem(item){
       this.$emit("currentPath", item)
     },
-    handleSearch(){
-      if(this.searchText){
+    handleSearch(flag){
+      if((this.searchText&&!flag) || (!this.searchText&&flag)){
         let idx = this.getRouteIdx(this.searchText)
-        if(idx&&idx.includes('-')){
-          let openIdx = idx.slice(0, 1)
-          this.$refs.sideMenu.open(openIdx)
+        if(idx){
+          if(idx.includes('-')){
+            let openIdx = idx.slice(0, 1)
+            this.sideRoute = [this.defaultRoute[openIdx]]
+            this.$refs.sideMenu.open(openIdx)
+          }else{
+            this.sideRoute = [this.defaultRoute[idx]]
+          }
+          this.searchIndex = '-1'
+        }else{
+          this.sideRoute = this.defaultRoute
+          this.searchIndex = ''
         }
       }
     },
     getRouteIdx(pathTitle, pathName){
-      let idx = '', sideArr = this.sideRoute
+      let idx = '', sideArr = this.sideRoute==this.defaultRoute?this.sideRoute:this.defaultRoute
       for(let i=0; i < sideArr.length; i++){
         if(sideArr[i].title == pathTitle || sideArr[i].pathName == pathName){
           idx = i.toString()

dsk-operate-ui/src/views/detail/party-a/index.vue

@@ -180,9 +180,6 @@ export default {
       this.currentPath.pathName = this.$route.query.path
     }
   },
-  mounted() {
-    console.log('进入了mounted')
-  },
   methods: {
     showPartPage(e){
       this.currentPath = e

dsk-operate-ui/src/views/detail/party-a/overview/component/infoheader.vue

@@ -179,7 +179,19 @@ export default {
     async handleClaim(){
       if(this.companyInfo.uipId){
         this.claimLoading = true
-        let param = {companyId:this.companyId, uipId:this.companyInfo.uipId, companyName:this.companyInfo.companyName}
+        let param = {
+          companyId:this.companyId,
+          uipId:this.companyInfo.uipId,
+          companyName:this.companyInfo.companyName,
+          creditLevel:this.companyInfo.bratingSubjectLevel || '',
+          legalPerson:this.companyInfo.corporatePerson || '',
+          registerCapital:this.companyInfo.regCapital || '',
+          provinceId:this.companyInfo.provinceId || '',
+          cityId:this.companyInfo.cityId || '',
+          districtId:this.companyInfo.districtCode || '',
+          registerAddress:this.companyInfo.provinceName+this.companyInfo.provinceName?'-'+this.companyInfo.provinceName:''+this.companyInfo.districtName?'-'+this.companyInfo.districtName:'',
+          creditCode:this.companyInfo.creditCode
+        }
         let res = await claim(param)
         this.claimLoading = false
         if(res.code==200){

dsk-operate-ui/src/views/detail/party-a/overview/component/risk.vue

@@ -107,6 +107,14 @@ export default {
           tz:'',
           bl:''
         },
+        {
+          name:'失信被执行人',
+          value:'',
+          category:'credit',
+          field:'dishonestExecutor',
+          tz:'',
+          bl:''
+        },
         {
           name:'行政处罚',
           value:'',