Merge branch 'develop' of https://hel.hand-china.com/xugong/hls-xcmg-vue-app into develop

src/pages/carConfirm/confirm-detail.vue

@@ -416,6 +416,7 @@ export default {
         master: {
           project_id: this.$route.params.project_id,
           confirm_status: 'APPROVED',
+          confirm_note: '同意',
         },
       }
       hlsPopup.showLoading('请稍候')

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

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime : 2019-12-26 17:27:43
+ * @LastEditTime : 2019-12-27 09:44:12
  * @LastEditors  : Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -75,18 +75,13 @@ export default {
       approvedLists: [], // 已签约
       showLists: [],
       approvedFlag: false,
-      // showLists: [
-      //   { project_number: '201903022001', bp_name: '张三', total_price: '1000000', confirm_start_date: '2019-12-18' },
-      //   { project_number: '201903022001', bp_name: '张三', total_price: '1000000', confirm_start_date: '2019-12-18' },
-      //   { project_number: '201903022001', bp_name: '张三', total_price: '1000000', confirm_start_date: '2019-12-18' },
-      // ],
     }
   },
   watch: {
     'num': {
       handler (newVal, oldVal) {
         this.$refs.scroll.scrollToTop()
-        this.$refs.scroll.update(false)
+        // this.$refs.scroll.update(false)
         if (newVal === 2) {
           if (!this.approvedFlag) {
             this.contractList()
@@ -124,7 +119,6 @@ export default {
         vm.$refs.scroll.update(false)
         vm.$refs.scroll.scrollToTop()
         vm.contractList()
-        // vm.listsQuery()
       }
     })
   },
@@ -132,26 +126,7 @@ export default {
     dateConverse (date) {
       return date.replace(/\//g, '-')
     },
-    // listsQuery () {
-    //   let vm = this
-    //   let url = process.env.basePath + 'prj_submit_list'
-    //   let param = {
-    //     user_phone: window.localStorage.user_phone,
-    //     pagesize: 10,
-    //     searchInput: vm.searchInput,
-    //     pagenum: vm.pagenum,
-    //     project_status: 'APPROVED',
-    //   }
-    //   vm.hlsPopup.showLoading('请稍候')
-    //   vm.hlsHttp.post(url, param).then(function (res) {
-    //     vm.hlsPopup.hideLoading()
-    //     console.log('已创建合同列表查询', res)
-    //     if (res.result === 'S') {
-    //       // vm.showLists = res.lists
-    //     }
-    //   })
-    // },
-    // 合同查询
+    // 合同列表查询
     contractList () {
       let vm = this
       if (vm.num === 1) {
@@ -179,7 +154,7 @@ export default {
           }
         })
       } else if (vm.num === 2) {
-        let url = $config.basePath + 'prj_confirm_list_query'
+        let url = $config.basePath + 'prj_submit_list'
         let param = {
           pagesize: 10,
           pagenum: vm.approvedPagenum,
@@ -210,7 +185,7 @@ export default {
       let vm = this
       if (vm.num === 1) {
         vm.submitPagenum++
-        let url = $config.basePath + 'prj_confirm_list_query'
+        let url = $config.basePath + 'prj_submit_list'
         let param = {
           user_phone: window.localStorage.user_phone,
           pagesize: 10,
@@ -244,7 +219,7 @@ export default {
         })
       } else if (vm.num === 2) {
         vm.approvedPagenum++
-        let url = $config.basePath + 'prj_confirm_list_query'
+        let url = $config.basePath + 'prj_submit_list'
         let param = {
           user_phone: window.localStorage.user_phone,
           pagesize: 10,
@@ -281,7 +256,7 @@ export default {
     async submitSearch () {
       let vm = this
       vm.submitPagenum = 1
-      let url = $config.basePath + 'prj_confirm_list_query'
+      let url = $config.basePath + 'prj_submit_list'
       let param = {
         user_phone: window.localStorage.user_phone,
         pagesize: 10,
@@ -311,7 +286,7 @@ export default {
     },
     approvedearch () {
       let vm = this
-      let url = $config.basePath + 'prj_confirm_list_query'
+      let url = $config.basePath + 'prj_submit_list'
       vm.approvedPagenum = 1
       let param = {
         user_phone: window.localStorage.user_phone,
@@ -348,10 +323,14 @@ export default {
     changeBase (item) {
       if (this.num === 1) {
         window.localStorage.setItem('contractReadonly', false)
-        window.localStorage.setItem('formPage', 'list')
+        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('formPage', 'list')
+        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

@@ -330,7 +330,6 @@ export default {
       if (vm.fromPage === 'sale') {
         vm.fromList = false
       } else if (vm.fromPage === 'list') {
-        debugger
         vm.fromList = true
         vm.rentInfoQuery()
       }
@@ -378,6 +377,8 @@ export default {
           vm.productInfo.product_num = res.info.product_num
           vm.productInfo.product_id = res.info.product_id
           vm.productInfo.product_id_n = res.info.product_id_n
+          vm.saveInfo.product_plan_name = res.info.product_plan_id_n
+          vm.saveInfo.division_n = res.info.product_name
         } else {
           hlsPopup.showLongCenter(res.message)
         }
@@ -403,9 +404,6 @@ export default {
     },
     save () {
       let vm = this
-      vm.$router.push({
-        name: 'CreateEnclosureInfo',
-      })
       let url = process.env.basePath + 'prj_lease_info_save'
       vm.saveInfo.down_payment_ratio = (vm.saveInfo.down_payment_ratio_n.replace('%', '') / 100).toFixed(2)
       vm.saveInfo.lease_charge_ratio = (vm.saveInfo.lease_charge_ratio_n.replace('%', '') / 100).toFixed(2)
@@ -419,6 +417,8 @@ export default {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
           vm.isComputed = true
+          hlsPopup.showLongCenter('计算成功')
+          vm.goPlan()
         } else {
           hlsPopup.showLongCenter(res.message)
         }
@@ -426,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/pages/contractInquire/contract-records.vue

@@ -2,8 +2,8 @@
 <!--
  * @Author: your name
  * @Date: 2019-10-31 09:49:57
- * @LastEditTime: 2019-12-18 17:14:47
- * @LastEditors: Please set LastEditors
+ * @LastEditTime : 2019-12-27 09:09:37
+ * @LastEditors  : Please set LastEditors
  * @Description: 合同查询--记录
  * @FilePath:
  -->
@@ -103,7 +103,7 @@ export default {
   computed: {},
   watch: {
     selected () {
-      this.$refs.scroll.update(false)
+      // this.$refs.scroll.update(false)
       this.$refs.scroll.scrollToTop()
       if (this.selected === 'all') {
         this.contract_status_n = '全部'

src/pages/pay/firstPay/pay-entry.vue

@@ -312,7 +312,7 @@ export default {
         info: {
           order_id: vm.$route.params.order_id,
           fee: vm.serviceCharge,
-          bank_account_id: '9099',
+          bank_account_id: '0',
           pay_type: vm.payTypeObj.payType,
         },
       }

src/pages/pay/payment/pay-entry.vue

@@ -275,7 +275,7 @@ export default {
         info: {
           order_id: vm.$route.params.order_id,
           fee: vm.serviceCharge,
-          bank_account_id: '9099',
+          bank_account_id: '0',
           pay_type: vm.payTypeObj.payType,
         },
       }

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}},