Merge branch 'liuxin' into develop

src/pages/contractCreate/creat-rent-info.vue

@@ -577,31 +577,27 @@ export default {
         }
       })
     },
-    isComputedCheck () {
+    async isComputedCheck () {
       let vm = this
       let url = process.env.basePath + 'prj_product_cal_status'
       let param = {
-        master: {
-          project_id: vm.saveInfo.product_id,
-        },
+        project_id: vm.saveInfo.project_id,
       }
-      hlsPopup.showLoading('请稍候')
-      vm.$post(url, param).then(function (res) {
-        vm.hlsPopup.hideLoading()
-        if (res.result === 'S') {
-          if (res.info.success_flag === 'Y') {
-            vm.isComputed = true
-          } else {
-            vm.isComputed = false
-          }
+      // hlsPopup.showLoading('请稍候')
+      let res = await vm.$post(url, param)
+      if (res.result === 'S') {
+        if (res.info.success_flag === 'Y') {
+          return true
         } else {
-          hlsPopup.showLongCenter(res.message)
+          return false
         }
-      })
+      } else {
+        hlsPopup.showLongCenter(res.message)
+      }
     },
-    next () {
+    async next () {
       let vm = this
-      vm.isComputedCheck()
+      vm.isComputed = await vm.isComputedCheck()
       if (vm.isReadOnly) {
         vm.$router.push({
           name: 'CreateEnclosureInfo',