fixConflict

src/pages/contractCreate/sales-info.vue

@@ -186,6 +186,12 @@ export default {
       },
       immediate: true,
     },
+    // '$route' (to, from) {
+    //   debugger
+    //   if (from.fullPath !== '/contract-create-list' && to.fullPath === '/sales-info') {
+    //     this.$router.go(0)
+    //   }
+    // },
   },
   activated () {
 
@@ -222,7 +228,8 @@ export default {
         }
         vm.businessQuery().then(res => {
           vm.agentQuery().then(res => {
-            vm.factoryQuery()
+            vm.factoryQuery().then(res => {
+            })
           })
         })
       } else if (from.name === 'CreateBaseInfo') {
@@ -327,7 +334,7 @@ export default {
         phone: window.localStorage.getItem('user_phone'),
       }
       vm.hlsPopup.showLoading('请稍候')
-      vm.hlsHttp.post(url, param).then(function (res) {
+      return vm.hlsHttp.post(url, param).then(function (res) {
         vm.hlsPopup.hideLoading()
         vm.factoty = res.lists
         if (res.result === 'S') {