'冲突'

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

@@ -299,6 +299,7 @@ export default {
         pay_type_n: '',
         residual_value: '',
         division_n: '',
+        division: '',
         finance_amount: '',
       },
     }
@@ -454,6 +455,30 @@ export default {
       if (vm.isReadOnly) {
         vm.$router.push({
           name: 'CreateEnclosureInfo',
+          // vm.$router.push({
+          //   name: 'CreateEnclosureInfo',
+          // })
+        })
+      }
+      if (vm.isComputed) {
+        let url = process.env.basePath + 'prj_product_info_save'
+        let param = {
+          master: {
+            division_n: vm.saveInfo.division_n,
+            bp_name: vm.$route.params.bp_name,
+            ...vm.productInfo,
+          },
+        }
+        hlsPopup.showLoading('请稍候')
+        vm.$post(url, param).then(function (res) {
+          vm.hlsPopup.hideLoading()
+          if (res.result === 'S') {
+            vm.$router.push({
+              name: 'CreateEnclosureInfo',
+            })
+          } else {
+            hlsPopup.showLongCenter(res.message)
+          }
         })
       } else {
         if (vm.isComputed) {
@@ -660,6 +685,7 @@ export default {
         '&index' +
         `'${randomString}'`
       let param = {
+        division: vm.saveInfo.division,
         user_phone: window.localStorage.getItem('user_phone'),
         pagesize: 10,
         pagenum: vm.pagenumSearch,
@@ -701,6 +727,7 @@ export default {
         '&index' +
         `'${randomString}'`
       let param = {
+        division: vm.saveInfo.division,
         user_phone: window.localStorage.getItem('user_phone'),
         pagesize: 10,
         pagenum: vm.pagenum,

src/pages/contractCreate/create-base-info.vue

@@ -487,6 +487,7 @@ export default {
               name: 'CreateRentInfo',
               params: {
                 bp_agent_id: vm.bp_agent_id,
+                bp_name: vm.NPBaseInfo.bp_name,
               },
             })
           } else {

src/pages/contractCreate/create-enclosure-info.vue

@@ -685,6 +685,9 @@ export default {
           }
         }
   }
+  .house:nth-of-type(2) {
+    margin-top: 0
+  }
   .house:last-child {
     margin-top: 0
   }