Merge branch 'ren' into develop

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,

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 = '全部'