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/radar/components/Bidding/index.vue

@@ -823,9 +823,9 @@ export default {
 		api.getUipIdByCid(params).then(res=>{
 					if (res.code==200) {
 							if(res.data&&res.data.length>0&&res.data[0].uipId){
-								this.$router.push({path: '/enterprise/'+this.encodeStr(res.data[0].uipId)})
+								this.$router.push({path: '/enterprise/'+res.data[0].uipId})
 							}else{
-								this.$router.push({path: '/company/'+this.encodeStr(res.data[0].companyId)})
+								this.$router.push({path: '/company/'+this.encodeStr(companyId)})
 							}
 							
 					}

dsk-operate-ui/src/views/radar/components/Establishment/index.vue

@@ -1078,9 +1078,9 @@
 				api.getUipIdByCid(params).then(res=>{
 							if (res.code==200) {
 									if(res.data&&res.data.length>0&&res.data[0].uipId){
-										this.$router.push({path: '/enterprise/'+this.encodeStr(res.data[0].uipId)})
+										this.$router.push({path: '/enterprise/'+res.data[0].uipId})
 									}else{
-										this.$router.push({path: '/company/'+this.encodeStr(res.data[0].companyId)})
+										this.$router.push({path: '/company/'+this.encodeStr(companyId)})
 									}
 									
 							}

dsk-operate-ui/src/views/radar/components/Land/index.vue

@@ -925,9 +925,9 @@
 				api.getUipIdByCid(params).then(res=>{
 							if (res.code==200) {
 									if(res.data&&res.data.length>0&&res.data[0].uipId){
-										this.$router.push({path: '/enterprise/'+this.encodeStr(res.data[0].uipId)})
+										this.$router.push({path: '/enterprise/'+res.data[0].uipId})
 									}else{
-										this.$router.push({path: '/company/'+this.encodeStr(res.data[0].companyId)})
+										this.$router.push({path: '/company/'+this.encodeStr(companyId)})
 									}
 									
 							}

dsk-operate-ui/src/views/radar/components/Tender/index.vue

@@ -1107,9 +1107,9 @@
 				api.getUipIdByCid(params).then(res=>{
 							if (res.code==200) {
 									if(res.data&&res.data.length>0&&res.data[0].uipId){
-										this.$router.push({path: '/enterprise/'+this.encodeStr(res.data[0].uipId)})
+										this.$router.push({path: '/enterprise/'+res.data[0].uipId})
 									}else{
-										this.$router.push({path: '/company/'+this.encodeStr(res.data[0].companyId)})
+										this.$router.push({path: '/company/'+this.encodeStr(companyId)})
 									}
 									
 							}

dsk-operate-ui/src/views/radar/components/bxprozbgg/index.vue

@@ -1680,9 +1680,9 @@
 	  	api.getUipIdByCid(params).then(res=>{
 	  				if (res.code==200) {
 	  						if(res.data&&res.data.length>0&&res.data[0].uipId){
-	  							this.$router.push({path: '/enterprise/'+this.encodeStr(res.data[0].uipId)})
+	  							this.$router.push({path: '/enterprise/'+res.data[0].uipId})
 	  						}else{
-	  							this.$router.push({path: '/company/'+this.encodeStr(res.data[0].companyId)})
+	  							this.$router.push({path: '/company/'+this.encodeStr(companyId)})
 	  						}
 	  						
 	  				}

dsk-operate-ui/src/views/radar/components/debtProject/index.vue

@@ -548,9 +548,9 @@
 				api.getUipIdByCid(params).then(res=>{
 							if (res.code==200) {
 									if(res.data&&res.data.length>0&&res.data[0].uipId){
-										this.$router.push({path: '/enterprise/'+this.encodeStr(res.data[0].uipId)})
+										this.$router.push({path: '/enterprise/'+res.data[0].uipId})
 									}else{
-										this.$router.push({path: '/company/'+this.encodeStr(res.data[0].companyId)})
+										this.$router.push({path: '/company/'+this.encodeStr(companyId)})
 									}
 									
 							}