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

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

@@ -167,10 +167,14 @@ export default {
   },
   beforeRouteEnter(to, from, next) {
     next(vm => {
-      if (to.query.customerId){
-        let customerId = to.query.customerId
-        vm.association(customerId)
-        vm.currentPath.pathName = to.query.path
+      if(from.name){
+        if (to.query.customerId){
+          let customerId = to.query.customerId
+          if(to.query.path){
+            vm.currentPath.pathName = to.query.path
+          }
+          vm.association(customerId)
+        }
       }
     })
   },

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

@@ -185,7 +185,7 @@ export default {
           companyName:this.companyInfo.companyName,
           creditLevel:this.companyInfo.bratingSubjectLevel || '',
           legalPerson:this.companyInfo.corporatePerson || '',
-          registerCapital:this.companyInfo.regCapital || '',
+          registerCapital:this.companyInfo.registeredCapital || '',
           provinceId:this.companyInfo.provinceId || '',
           cityId:this.companyInfo.cityId || '',
           districtId:this.companyInfo.districtCode || '',

dsk-operate-ui/src/views/macro/urban/index.vue

@@ -615,7 +615,7 @@ export default {
             companyId:item.companyId,
             creditLevel:item.bratingSubjectLevel,
             legalPerson:res.data.corporatePerson,
-            registerCapital:res.data.regCapital,
+            registerCapital:res.data.registeredCapital,
             provinceId:res.data.provinceId || '',
             cityId:res.data.cityId || '',
             districtId:res.data.districtCode || '',