add

config/dev.env.js

-'use strict'
-const merge = require('webpack-merge')
-const prodEnv = require('./prod.env')
-
-module.exports = merge(prodEnv, {
-  NODE_ENV: '"development"',
-  CONFIG_ENV: JSON.stringify(process.env.CONFIG_ENV),
-  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_UAT&apiName="',
-  rootPath: '"http://180.104.121.66:8088/r/api"',
-  filePath: '"http://180.104.121.66:8088/r/api/app/fileViewSvc?sysName=XCMG_UAT&apiName=file_view&"',
-  fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_DEV&apiName="',
-  ocrPath: '"http://180.104.121.66:8088/r/api"',
-  appId: '"com.xcmg.app.uat"',
-  currentVersion: '"1.9.5"',
-})
+// 'use strict'
+// const merge = require('webpack-merge')
+// const prodEnv = require('./prod.env')
+
+// module.exports = merge(prodEnv, {
+//   NODE_ENV: '"development"',
+//   CONFIG_ENV: JSON.stringify(process.env.CONFIG_ENV),
+//   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_UAT&apiName="',
+//   rootPath: '"http://180.104.121.66:8088/r/api"',
+//   filePath: '"http://180.104.121.66:8088/r/api/app/fileViewSvc?sysName=XCMG_UAT&apiName=file_view&"',
+//   fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_DEV&apiName="',
+//   ocrPath: '"http://180.104.121.66:8088/r/api"',
+//   appId: '"com.xcmg.app.uat"',
+//   currentVersion: '"1.9.5"',
+// })
 
 
 
+'use strict'
+module.exports = {
+  NODE_ENV: '"production"',
+  CONFIG_ENV: JSON.stringify(process.env.CONFIG_ENV),
+  debug: true,
+  isMobilePlatform: true,
+  loginPath: '"http://www.xcmgfs.com:8087/oauth/token?client_id=client2&client_secret=secret&grant_type=password&username=appadmin&password=" ',
+  basePath: '"http://www.xcmgfs.com:8087/r/api/interface?sysName=XCMG_PROD&apiName="',
+  rootPath: '"http://www.xcmgfs.com:8087/r/api"',
+  filePath: '"http://www.xcmgfs.com:8087/r/api/app/fileViewSvc?sysName=XCMG_PROD&apiName=file_view&"',
+  ocrPath:'"http://www.xcmgfs.com:8087/r/api"',
+  fileUploadSvcPath:'"http://www.xcmgfs.com:8087/r/api/app/fileUploadSvc?sysName=XCMG_PROD&apiName="',
+  appId: '"com.xcmg.app"',
+  currentVersion: '"0.1.1"'
+}
 
 
 

src/pages/contractCreate/sales-info.vue

@@ -327,6 +327,7 @@ export default {
             vm.office_name = res.info.bp_agent_name
             vm.salesInfo.office_id = res.info.bp_agent_id
             vm.salesInfo.bp_id_agent = ''
+            vm.factoryQuery()
           } else {
             vm.salesInfo.bp_id_agent = res.info.bp_agent_id
           }

src/pages/contractInquire/contract-records.vue

@@ -26,6 +26,8 @@
         <p><span :class="{'selected':selected === 'two'}" @click="isSelected('two')">首付还款中</span></p>
         <p><span :class="{'selected':selected === 'three'}" @click="isSelected('three')">还款中</span></p>
         <p><span :class="{'selected':selected === 'four'}" @click="isSelected('four')">已结清</span></p>
+        <!-- <p><span :class="{'selected':selected === 'five'}" @click="isSelected('five')">撤销</span></p>
+        <p><span :class="{'selected':selected === 'six'}" @click="isSelected('six')">其他</span></p> -->
       </div>
 
       <div class="search">
@@ -50,6 +52,8 @@
             <p v-if="item.contract_status_n === '首付还款中'" class="orange">首付还款中</p>
             <p v-if="item.contract_status_n === '还款中'" class="blue">还款中</p>
             <p v-if="item.contract_status_n === '已结清'" class="black">已结清</p>
+            <p v-if="item.contract_status_n === '撤销'" class="undo">{{ item.xcmg_contract_status_n }}</p>
+            <p v-if="item.contract_status_n === '其他'" class="other">{{ item.xcmg_contract_status_n }}</p>
           </div>
           <div class="center">
             <div><span>承租人</span><p>{{ item.bp_name }}</p></div>
@@ -86,17 +90,23 @@ export default {
       unRepayLists: [], // 首付还款中
       repayingLists: [], // 还款中
       repayedLists: [], // 已结清
+      undoLists: [], // 撤销
+      otherLists: [], // 其他
       pagenum: 1, // 全部列表页码
       unSigned_pagenum: 1, // 待首付页码
       unRepay_pagenum: 1, // 首付还款中页码
       repaying_pagenum: 1, // 还款中页码
       repayed_pagenum: 1, // 已结清页码
+      undo_pagenum: 1, // 已撤销页码
+      other_pagenum: 1, // 其他页码
       searchInput: '', // 搜索内容
       contract_status_n: '全部', // 全部/待首付/首付还款中/还款中/已结清
       unSigned_flag: false, // 控制tab切换时再次请求
       unRepay_flag: false,
       repaying_flag: false,
       repayed_flag: false,
+      undo_flag: false,
+      other_flag: false,
       bp_type: '', // 用户类型
     }
   },
@@ -137,6 +147,20 @@ export default {
         if (!this.repayed_flag) {
           this.recordQuery('已结清', this.repayedLists)
         }
+      } else if (this.selected === 'five') {
+        this.contract_status_n = '撤销'
+        // this.pageNum = this.repayed_pagenum
+        this.showLists = this.undoLists
+        if (!this.undo_flag) {
+          this.recordQuery('撤销', this.undoLists)
+        }
+      } else if (this.selected === 'six') {
+        this.contract_status_n = '其他'
+        // this.pageNum = this.repayed_pagenum
+        this.showLists = this.otherLists
+        if (!this.other_flag) {
+          this.recordQuery('其他', this.otherLists)
+        }
       }
     },
     searchInput () {
@@ -158,6 +182,8 @@ export default {
         vm.unRepay_pagenum = 1
         vm.repaying_pagenum = 1
         vm.repayed_pagenum = 1
+        vm.undo_pagenum = 1
+        vm.other_pagenum = 1
         vm.searchInput = ''
         vm.contract_status_n = '全部'
         vm.lists = []
@@ -165,10 +191,14 @@ export default {
         vm.unRepayLists = []
         vm.repayingLists = []
         vm.repayedLists = []
+        vm.undoLists = []
+        vm.otherLists = []
         vm.unSigned_flag = false
         vm.unRepay_flag = false
         vm.repaying_flag = false
         vm.repayed_flag = false
+        vm.other_flag = false
+        vm.undo_flag = false
         if (window.localStorage.multipleRole === 'TENANT') {
           vm.bp_type = 'TENANT'
         } else if (window.localStorage.bp_type === 'TENANT' && !window.localStorage.multipleRole) {
@@ -184,6 +214,8 @@ export default {
         vm.unRepay_pagenum = 1
         vm.repaying_pagenum = 1
         vm.repayed_pagenum = 1
+        vm.undo_pagenum = 1
+        vm.other_pagenum = 1
         vm.searchInput = ''
         vm.contract_status_n = '全部'
         vm.lists = []
@@ -191,10 +223,14 @@ export default {
         vm.unRepayLists = []
         vm.repayingLists = []
         vm.repayedLists = []
+        vm.undoLists = []
+        vm.otherLists = []
         vm.unSigned_flag = false
         vm.unRepay_flag = false
         vm.repaying_flag = false
         vm.repayed_flag = false
+        vm.other_flag = false
+        vm.undo_flag = false
         vm.bp_type = vm.$route.params.bp_type
         vm.recordQuery('全部', vm.lists)
       }
@@ -264,6 +300,12 @@ export default {
             } else if (status === '已结清') {
               vm.repayed_flag = true
               vm.$refs.scroll.update(true)
+            } else if (status === '撤销') {
+              vm.undo_flag = true
+              vm.$refs.scroll.update(true)
+            } else if (status === '其他') {
+              vm.other_flag = true
+              vm.$refs.scroll.update(true)
             }
           } else if (res.lists.length === 10) {
             if (status === '全部') {
@@ -280,6 +322,12 @@ export default {
             } else if (status === '已结清') {
               vm.repayed_flag = true
               vm.$refs.scroll.update(false)
+            } else if (status === '撤销') {
+              vm.undo_flag = true
+              vm.$refs.scroll.update(false)
+            } else if (status === '其他') {
+              vm.other_flag = true
+              vm.$refs.scroll.update(false)
             }
           }
         } else {
@@ -305,6 +353,12 @@ export default {
       } else if (vm.selected === 'four') {
         vm.repayed_pagenum++
         vm.pageNum = vm.repayed_pagenum
+      } else if (vm.selected === 'five') {
+        vm.undo_pagenum++
+        vm.pageNum = vm.undo_pagenum
+      } else if (vm.selected === 'six') {
+        vm.other_pagenum++
+        vm.pageNum = vm.other_pagenum
       }
       let name = ''
       if (vm.bp_type === 'TENANT') {
@@ -345,6 +399,10 @@ export default {
                 vm.repayingLists.push(array[index])
               } else if (vm.selected === 'four') {
                 vm.repayedLists.push(array[index])
+              } else if (vm.selected === 'five') {
+                vm.undoLists.push(array[index])
+              } else if (vm.selected === 'six') {
+                vm.otherLists.push(array[index])
               }
             })
             vm.$refs.scroll.update(true)
@@ -360,6 +418,10 @@ export default {
                 vm.repayingLists.push(array[index])
               } else if (vm.selected === 'four') {
                 vm.repayedLists.push(array[index])
+              } else if (vm.selected === 'five') {
+                vm.undoLists.push(array[index])
+              } else if (vm.selected === 'six') {
+                vm.otherLists.push(array[index])
               }
             })
             vm.$refs.scroll.update(true)
@@ -382,11 +444,17 @@ export default {
         this.searchRepaying()
       } else if (vm.selected === 'four') {
         this.searchRepayed()
+      } else if (vm.selected === 'five') {
+        this.searchUndo()
+      } else if (vm.selected === 'six') {
+        this.searchOther()
       }
       vm.unSigned_flag = false
       vm.unRepay_flag = false
       vm.repaying_flag = false
       vm.repayed_flag = false
+      vm.undo_flag = false
+      vm.other_flag = false
       // let resAll = await this.searchAll()
       // if (resAll) {
       //   let res = await this.searchUnsign() // 待首付结果
@@ -595,6 +663,74 @@ export default {
         }
       })
     },
+    searchUndo () {
+      let vm = this
+      let name = ''
+      if (vm.bp_type === 'TENANT') {
+        name = 'con_contract_list_tenant'
+      } else if (vm.bp_type === 'AGENT' || vm.bp_type === 'OFFICE') {
+        name = 'con_contract_list_saleman'
+      } else if (vm.bp_type === 'GUTA') {
+        name = 'con_contract_list_guta'
+      }
+      let url = $config.basePath + name
+      // let url = $config.basePath + 'con_contract_list'
+      let param = {
+        contract_status_n: '撤销',
+        user_phone: window.localStorage.user_phone,
+        searchInput: vm.searchInput,
+        // bp_type: vm.bp_type,
+        pagenum: 1,
+        pagesize: 10,
+      }
+      vm.hlsPopup.showLoading('请稍后')
+      vm.hlsHttp.post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        vm.undoLists = res.lists
+        if (vm.selected === 'five') {
+          vm.showLists = vm.undoLists
+        }
+        if (res.lists.length >= 0 && res.lists.length < 10) {
+          vm.$refs.scroll.update(true)
+        } else if (res.lists.length === 10) {
+          vm.$refs.scroll.update(false)
+        }
+      })
+    },
+    searchOther () {
+      let vm = this
+      let name = ''
+      if (vm.bp_type === 'TENANT') {
+        name = 'con_contract_list_tenant'
+      } else if (vm.bp_type === 'AGENT' || vm.bp_type === 'OFFICE') {
+        name = 'con_contract_list_saleman'
+      } else if (vm.bp_type === 'GUTA') {
+        name = 'con_contract_list_guta'
+      }
+      let url = $config.basePath + name
+      // let url = $config.basePath + 'con_contract_list'
+      let param = {
+        contract_status_n: '其他',
+        user_phone: window.localStorage.user_phone,
+        searchInput: vm.searchInput,
+        // bp_type: vm.bp_type,
+        pagenum: 1,
+        pagesize: 10,
+      }
+      vm.hlsPopup.showLoading('请稍后')
+      vm.hlsHttp.post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        vm.otherLists = res.lists
+        if (vm.selected === 'six') {
+          vm.showLists = vm.otherLists
+        }
+        if (res.lists.length >= 0 && res.lists.length < 10) {
+          vm.$refs.scroll.update(true)
+        } else if (res.lists.length === 10) {
+          vm.$refs.scroll.update(false)
+        }
+      })
+    },
   },
 }
 </script>
@@ -729,6 +865,14 @@ export default {
           color: #4B4A4B;
           border: 1px solid #4B4A4B;
         }
+         p.undo {
+          color: #333399;
+          border: 1px solid #333399;
+        }
+         p.other {
+          color: #33CCCC;
+          border: 1px solid #33CCCC;
+        }
       }
 
       .center {