Merge branch 'liuin' into develop

config/dev.env.js

@@ -8,9 +8,9 @@ module.exports = merge(prodEnv, {
   debug: true,
   isMobilePlatform: false,
   loginPath: '"http://180.104.121.66:8088/oauth/token?client_id=client2&client_secret=secret&grant_type=password&username=appadmin&password=" ',
-  basePath: '"http://180.104.121.66:8088/r/api/interface?sysName=XCMG_DEV&apiName="',
+  basePath: '"http://180.104.121.66:8088/r/api/interface?sysName=XCMG_UAT&apiName="',
   rootPath: '"http://180.104.121.66:8088/r/api"',
-  filePath: '"http://180.104.121.66:8088/r/api/app/fileViewSvc?sysName=XCMG_DEV&apiName=file_view&"',
+  filePath: '"http://180.104.121.66:8088/r/api/app/fileViewSvc?sysName=XCMG_UAT&apiName=file_view&"',
   ocrPath: '"http://180.104.121.66:8088/r/api"',
   appId: '"com.xcmg.app.dev"',
   currentVersion: '"1.8.1"',

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

@@ -399,6 +399,7 @@ export default {
     keyWordProduct (newVal, oldVal) {
       this.searchProduct()
     },
+
     'saveInfo.equip_price' () {
       this.saveInfo.down_payment = (this.saveInfo.equip_price * this.saveInfo.down_payment_ratio_n.replace('%', '') / 100).toFixed(2)
       this.saveInfo.deposit = (this.saveInfo.equip_price * this.saveInfo.deposit_ratio_n.replace('%', '') / 100).toFixed(2)
@@ -429,6 +430,7 @@ export default {
       vm.divisionLists = []
       vm.pagenum = 1
       vm.pagenumPolicy = 1
+      vm.setTime()
       vm.fromPage = window.localStorage.fromPage
       vm.saveInfo.project_id = window.localStorage.project_id // 重新赋值，防止缓存
       // vm.productInfo['project_id'] = window.localStorage.project_id // 重新赋值，防止缓存
@@ -443,7 +445,6 @@ export default {
         if (vm.fromPage === 'sale') {
           vm.fromList = false
           vm.isReadOnly = false
-          vm.rentInfoQuery()
         } else if (vm.fromPage === 'list') {
           if (window.localStorage.contractReadonly === 'true') {
             vm.isReadOnly = true
@@ -454,7 +455,7 @@ export default {
           vm.rentInfoQuery()
         }
         Object.keys(vm.saveInfo).forEach(i => { // 置空saveInfo
-          if (i !== 'project_id' && i !== 'bp_name') {
+          if (i !== 'project_id' && i !== 'bp_name' && i !== 'lease_start_date') {
             vm.saveInfo[i] = ''
           }
         })
@@ -796,13 +797,23 @@ export default {
                }
              }
            }, */
+    setTime () {
+      if (!this.saveInfo.lease_start_date) {
+        let signDate = new Date(window.localStorage.getItem('signDate').replace(/-/, '/'))
+        let iToDay = signDate.getDate()
+        let iToMon = signDate.getMonth()
+        let iToYear = signDate.getFullYear()
+        let newDay = new Date(iToYear, iToMon, (iToDay + 30))
+        this.saveInfo.lease_start_date = `${newDay.getFullYear()}-${(newDay.getMonth()).length === 2 ? newDay.getMonth() : '0' + newDay.getMonth()}-${(newDay.getDate()).length === 2 ? newDay.getDate() : '0' + newDay.getDate()}`
+      }
+    },
     showTime (format) { // 预计付款日
       let vm = this
       let signDate = new Date(window.localStorage.getItem('signDate').replace(/-/, '/'))
-      var iToDay = signDate.getDate()
-      var iToMon = signDate.getMonth()
-      var iToYear = signDate.getFullYear()
-      var newDay = new Date(iToYear, iToMon, (iToDay + 30))
+      let iToDay = signDate.getDate()
+      let iToMon = signDate.getMonth()
+      let iToYear = signDate.getFullYear()
+      let newDay = new Date(iToYear, iToMon, (iToDay + 30))
       hlsPopup.showTime({
         nowDate: newDay.format('yyyy-MM-dd'),
         format: format,