add

src/pages/contractCreate/contract-create-list.vue

@@ -325,10 +325,12 @@ export default {
         window.localStorage.setItem('contractReadonly', false)
         window.localStorage.setItem('fromPage', 'list')
         window.localStorage.setItem('project_id', item.project_id)
+        window.localStorage.setItem('bp_class_tenant', item.bp_class)
       } else if (this.num === 2) {
         window.localStorage.setItem('contractReadonly', true)
         window.localStorage.setItem('fromPage', 'list')
         window.localStorage.setItem('project_id', item.project_id)
+        window.localStorage.setItem('bp_class_tenant', item.bp_class)
       }
       this.$router.push({
         name: 'CreateBaseInfo',

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

@@ -417,7 +417,8 @@ export default {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
           vm.isComputed = true
-          hlsPopup.showLongCenter(res.message)
+          hlsPopup.showLongCenter('计算成功')
+          vm.goPlan()
         } else {
           hlsPopup.showLongCenter(res.message)
         }
@@ -425,9 +426,6 @@ export default {
     },
     next () {
       let vm = this
-      vm.$router.push({
-        name: 'CreateEnclosureInfo',
-      })
       if (vm.isComputed) {
         let url = process.env.basePath + 'prj_product_info_save'
         let param = {

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

@@ -358,7 +358,7 @@ export default {
       saveInfo: {// 需要保存的信息
         project_id: window.localStorage.project_id,
         bp_id: '',
-        bp_class: window.localStorage.bp_class,
+        bp_class: window.localStorage.bp_class_tenant,
         equip_num: '',
         equip_num_n: '',
         equip_value: '',
@@ -409,7 +409,8 @@ export default {
       vm.pageNum = 1
       vm.pageNumSearch = 1
       vm.undertakeList = []
-      vm.bp_class = window.localStorage.bp_class
+      vm.bp_class = 'NP'
+      // vm.bp_class = window.localStorage.bp_class_tenant
       if (from.name === 'SalesInfo') {
         vm.fromPutted = false
         Object.keys(vm.saveInfo).forEach(i => {
@@ -533,7 +534,6 @@ export default {
         this.getHouseInfo()
         this.getAgentInfo()
       } else if (this.bp_class === 'ORG') {
-        debugger
         this.getORGInfo()
         this.getORGEquipInfo()
         this.getORGEnge()

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

@@ -467,6 +467,9 @@ export default {
         vm.hlsPopup.hideLoading()
         console.log('项目提交审批', res)
         if (res.result === 'S') {
+          vm.$router.push({
+            name: 'MyInfo',
+          })
           // vm.showLists = res.lists
         }
       })

src/pages/contractCreate/sales-info.vue

@@ -431,30 +431,40 @@ export default {
       this.salesInfo.bp_id_tenant = item.bp_id
       this.showModal = false
       window.localStorage.setItem('bp_id_tenant', this.salesInfo.bp_id_tenant)
+      window.localStorage.setItem('bp_class_tenant', item.bp_class)
     },
     hideModal () {
       this.showModal = false
+    },
+    check () {
+
     },
     // 销售信息保存
     confirmCreate () {
       let vm = this
       let url = process.env.basePath + 'prj_sales_info_save'
+      window.localStorage.setItem('bp_id_tenant', this.salesInfo.bp_id_tenant)
       let param = {
         master: vm.salesInfo,
       }
-      vm.hlsPopup.showLoading('请稍候')
-      vm.hlsHttp.post(url, param).then(function (res) {
-        vm.hlsPopup.hideLoading()
-        if (res.result === 'S') {
-          hlsPopup.showLongCenter('创建成功！')
-          window.localStorage.setItem('project_id', res.project_id)
-          vm.$router.push({
-            name: 'CreateBaseInfo',
-          })
-        }
-      })
+      if (!this.lessee) {
+        hlsPopup.showLongCenter('请选择承租人')
+      } else {
+        vm.hlsPopup.showLoading('请稍候')
+        vm.hlsHttp.post(url, param).then(function (res) {
+          vm.hlsPopup.hideLoading()
+          if (res.result === 'S') {
+            hlsPopup.showLongCenter('创建成功！')
+            window.localStorage.setItem('project_id', res.project_id)
+            vm.$router.push({
+              name: 'CreateBaseInfo',
+            })
+          }
+        })
+      }
     },
   },
+
 }
 </script>
 

src/router/index.js

@@ -57,7 +57,7 @@ import ContractDetail from '@/pages/ContractSigning/contract-detail'
 import ContractContent from '@/pages/ContractSigning/contract-content'
 import EntryInfo from '@/pages/ContractSigning/entry-info'
 import ElectronicSign from '@/pages/ContractSigning/electronic-sign'
-/*import BodyCheck from '@/pages/ContractSigning/body-check'*/
+/* import BodyCheck from '@/pages/ContractSigning/body-check' */
 import ContractRepayPlan from '@/pages/ContractSigning/contract-repay-plan'
 
 // 首付款支付
@@ -233,7 +233,7 @@ export default new Router({
     {path: '/entry-info', component: EntryInfo, name: 'EntryInfo', meta: {keepAlive: true}},
     {path: '/contract-repay-plan', component: ContractRepayPlan, name: 'ContractRepayPlan', meta: {keepAlive: true}},
     {path: '/electronic-sign', component: ElectronicSign, name: 'ElectronicSign', meta: {keepAlive: true}},
-   /* {path: '/body-check', component: BodyCheck, name: 'BodyCheck', meta: {keepAlive: true}},*/
+    /* {path: '/body-check', component: BodyCheck, name: 'BodyCheck', meta: {keepAlive: true}}, */
 
     // 首付款支付
     {path: '/first-pay', component: FirstPay, name: 'FirstPay', meta: {keepAlive: true}},
@@ -247,7 +247,7 @@ export default new Router({
     {path: '/margin-first-pay', component: MarginFirstPay, name: 'MarginFirstPay', meta: {keepAlive: true}},
     {path: '/margin-pay-entry', component: MarginPayEntry, name: 'MarginPayEntry', meta: {keepAlive: true}},
     // 支付页
-    {path: '/pay-page', component: PayPage, name: 'PayPage', meta: {keepAlive: true}},
+    {path: '/pay-page', component: PayPage, name: 'PayPage', meta: {keepAlive: false}},
     // 产品查询
     {path: '/query-home', component: QueryHome, name: 'QueryHome', meta: {keepAlive: true}},
     {path: '/product-detailed', component: ProDetailed, name: 'ProDetailed', meta: {keepAlive: true}},