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

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

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime : 2019-12-23 11:04:04
+ * @LastEditTime : 2019-12-26 13:30:22
  * @LastEditors  : Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -14,8 +14,8 @@
       </div>
     </h-header>
     <div class="tab-style has-header">
-      <div :class="{'done':num === 1,'undone':num !== 1}" @click="num = 1;"><img :src="num === 1?check1:uncheck1"><span>待签约</span></div>
-      <div :class="{'done':num === 2,'undone':num !== 2}" @click="num = 2;"><img :src="num === 2?check2:uncheck2"><span>已签约</span></div>
+      <div :class="{'done':num === 1,'undone':num !== 1}" @click="num = 1;"><img :src="num === 1?check1:uncheck1"><span>待提交</span></div>
+      <div :class="{'done':num === 2,'undone':num !== 2}" @click="num = 2;"><img :src="num === 2?check2:uncheck2"><span>已提交</span></div>
     </div>
     <!-- 搜索 -->
     <div class="search">
@@ -29,7 +29,7 @@
     >
       <div class="wrap">
         <div v-for="(item,index) in showLists" :key="index" class="contract-lists" >
-          <div class="pro-code" @click="goDetails(item)">
+          <div class="pro-code" @click="changeBase">
             <img src="@/assets/distributorSign/fileIcon.png" alt="" class="file-icon">
             <p>
               <span>合同号</span>
@@ -40,7 +40,7 @@
           <div class="box">
             <div><p>承租人</p><p>{{ item.bp_name }}</p></div>
             <div><p>合同租金</p><p class="money">{{ item.total_price|currency }}</p></div>
-            <div><p>申请时间</p><p>{{ item.confirm_start_date }}</p></div>
+            <div><p>申请时间</p><p>{{ dateConverse(item.project_start_date) }}</p></div>
           </div>
         </div>
       </div>
@@ -63,56 +63,291 @@ export default {
     return {
       num: 1,
       pagenum: 1,
+      submitPagenum: 1,
+      approvedPagenum: 1,
       check1: Check1,
       check2: Check2,
       uncheck1: unCheck1,
       uncheck2: unCheck2,
       user_bp_type: '', // 客户类型
       searchInput: '', // 搜索内容
-      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' },
-      ],
+      submitLists: [], // 待签约
+      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: {
-  },
-  activated () {
-
-  },
-  created () {
-
+    'num': {
+      handler (newVal, oldVal) {
+        this.$refs.scroll.update(false)
+        if (newVal === 2) {
+          if (!this.approvedFlag) {
+            this.contractList()
+          }
+          this.$refs.scroll.scrollToTop()
+          this.showLists = this.approvedLists
+        } else if (newVal === 1) {
+          this.showLists = this.submitLists
+          this.$refs.scroll.scrollToTop()
+        }
+      },
+    },
+    searchInput () {
+      let vm = this
+      if (vm.timeout) {
+        clearTimeout(vm.timeout)
+      }
+      vm.timeout = setTimeout(() => {
+        vm.search()
+      }, 1000)
+    },
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
       if (from.name === 'MyInfo') {
         vm.searchInput = ''
         vm.pagenum = 1
+        vm.num = 1
+        vm.submitPagenum = 1
+        vm.approvedPagenum = 1
         vm.user_bp_type = vm.$route.params.user_bp_type
-        vm.listsQuery() // 已创建合同列表查询
+        vm.approvedFlag = false
+        vm.submitLists = []
+        vm.approvedLists = []
+        vm.$refs.scroll.update(false)
+        vm.$refs.scroll.scrollToTop()
+        vm.contractList()
+        // vm.listsQuery()
       }
     })
   },
   methods: {
-    listsQuery () {
+    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) {
+        let url = $config.basePath + 'prj_submit_list'
+        let param = {
+          user_phone: window.localStorage.user_phone,
+          pagesize: 10,
+          pagenum: vm.submitPagenum,
+          project_status: 'NEW',
+          searchInput: vm.searchInput,
+        }
+        vm.hlsPopup.showLoading('数据加载中')
+        vm.hlsHttp.post(url, param).then(function (res) {
+          vm.hlsPopup.hideLoading()
+          if (res.result === 'S') {
+            vm.submitLists = res.lists
+            vm.showLists = vm.submitLists
+            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)
+            }
+          } else {
+            hlsPopup.showLongCenter(res.message)
+          }
+        })
+      } else if (vm.num === 2) {
+        let url = $config.basePath + 'prj_confirm_list_query'
+        let param = {
+          pagesize: 10,
+          pagenum: vm.approvedPagenum,
+          searchInput: vm.searchInput,
+          project_status: 'APPROVED',
+          user_phone: window.localStorage.user_phone,
+        }
+        vm.hlsPopup.showLoading('数据加载中')
+        vm.hlsHttp.post(url, param).then(function (res) {
+          vm.hlsPopup.hideLoading()
+          if (res.result === 'S') {
+            console.log(res.lists)
+            vm.approvedLists = res.lists
+            vm.approvedFlag = true
+            vm.showLists = vm.approvedLists
+            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)
+            }
+          } else {
+            hlsPopup.showLongCenter(res.message)
+          }
+        })
+      }
+    },
+    loadMore () {
+      let vm = this
+      if (vm.num === 1) {
+        vm.submitPagenum++
+        let url = $config.basePath + 'prj_confirm_list_query'
+        let param = {
+          user_phone: window.localStorage.user_phone,
+          pagesize: 10,
+          pagenum: vm.submitPagenum,
+          project_status: 'NEW',
+          searchInput: vm.searchInput,
+        }
+        vm.hlsPopup.showLoading('请稍后')
+        vm.hlsHttp.post(url, param).then(function (res) {
+          vm.hlsPopup.hideLoading()
+          let returnData = []
+          if (res.result === 'S') {
+            returnData = res.lists
+            if (returnData.length === 0) {
+              vm.$refs.scroll.update(true)
+            } else if (returnData.length > 0 && returnData.length < 10) {
+              returnData.forEach((data, index, array) => {
+                vm.submitLists.push(array[index])
+              })
+              vm.$refs.scroll.update(true)
+            } else if (returnData.length === 10) {
+              returnData.forEach((data, index, array) => {
+                vm.submitLists.push(array[index])
+              })
+              vm.$refs.scroll.update(false)
+            }
+            vm.showLists = vm.submitLists
+          } else {
+            hlsPopup.showLongCenter(res.message)
+          }
+        })
+      } else if (vm.num === 2) {
+        vm.approvedPagenum++
+        let url = $config.basePath + 'prj_confirm_list_query'
+        let param = {
+          user_phone: window.localStorage.user_phone,
+          pagesize: 10,
+          pagenum: vm.approvedPagenum,
+          project_status: 'APPROVED',
+          searchInput: vm.searchInput,
+        }
+        vm.hlsPopup.showLoading('请稍后')
+        vm.hlsHttp.post(url, param).then(function (res) {
+          vm.hlsPopup.hideLoading()
+          let returnData = []
+          if (res.result === 'S') {
+            returnData = res.lists
+            if (returnData.length === 0) {
+              vm.$refs.scroll.update(true)
+            } else if (returnData.length > 0 && returnData.length < 10) {
+              returnData.forEach((data, index, array) => {
+                vm.approvedLists.push(array[index])
+              })
+              vm.$refs.scroll.update(true)
+            } else if (returnData.length === 10) {
+              returnData.forEach((data, index, array) => {
+                vm.approvedLists.push(array[index])
+              })
+              vm.$refs.scroll.update(false)
+            }
+            vm.showLists = vm.approvedLists
+          } else {
+            hlsPopup.showLongCenter(res.message)
+          }
+        })
+      }
+    },
+    async submitSearch () {
       let vm = this
-      let url = process.env.basePath + 'prj_submit_list'
+      vm.submitPagenum = 1
+      let url = $config.basePath + 'prj_confirm_list_query'
       let param = {
         user_phone: window.localStorage.user_phone,
         pagesize: 10,
+        pagenum: vm.submitPagenum,
+        project_status: 'NEW',
         searchInput: vm.searchInput,
-        pagenum: vm.pagenum,
       }
-      vm.hlsPopup.showLoading('请稍候')
-      vm.hlsHttp.post(url, param).then(function (res) {
+      vm.hlsPopup.showLoading('请稍后')
+      let res = await vm.$post(url, param)
+      if (res.result === 'S') {
         vm.hlsPopup.hideLoading()
-        console.log('已创建合同列表查询', res)
-        if (res.result === 'S') {
-          // vm.showLists = res.lists
+        vm.submitLists = res.lists
+        if (vm.num === 1) {
+          vm.showLists = vm.submitLists
+        }
+        // vm.showLists = vm.submitLists
+        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)
+        }
+        return true
+      } else {
+        hlsPopup.showLongCenter(res.message)
+        return false
+      }
+    },
+    approvedearch () {
+      let vm = this
+      let url = $config.basePath + 'prj_confirm_list_query'
+      vm.approvedPagenum = 1
+      let param = {
+        user_phone: window.localStorage.user_phone,
+        pagesize: 10,
+        pagenum: vm.approvedPagenum,
+        project_status: 'APPROVED',
+        searchInput: vm.searchInput,
+      }
+      vm.hlsHttp.post(url, param).then(function (res) {
+        vm.approvedLists = res.lists
+        if (vm.num === 2) {
+          vm.showLists = vm.approvedLists
+        }
+        // vm.showLists = vm.approvedLists
+        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)
         }
       })
     },
+    async search () {
+      let res = await this.submitSearch()
+      if (res) {
+        this.approvedearch()
+      }
+    },
+    changeBase () {
+      if (this.num === 1) {
+        window.localStorage.setItem('contractReadonly', false)
+      } else if (this.num === 2) {
+        window.localStorage.setItem('contractReadonly', true)
+      }
+      this.$router.push({
+        name: 'CreateBaseInfo',
+      })
+    },
     goDetails () {
       this.$router.push({
         name: 'SalesInfo',
@@ -121,12 +356,6 @@ export default {
         },
       })
     },
-    changePage () {
-      this.$router.push({
-        name: 'SalesInfo',
-      })
-    },
-    loadMore () {},
   },
 }
 </script>

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

@@ -304,14 +304,28 @@ export default {
       vm.pagenumSearch = 1
       vm.pagenumSearchPolicy = 1
       vm.policyKeyWord = ''
+      vm.keyWordProduct = ''
+      vm.businessLists = []
+      vm.divisionLists = []
+      vm.pagenum = 1
+      vm.pagenumPolicy = 1
       if (from.name === 'CreateBaseInfo') {
-        vm.businessLists = []
-        vm.pagenum = 1
-        vm.pagenumPolicy = 1
         vm.isComputed = false
-        vm.getProductLine() // 产品线查询
-        vm.repayPeriod()// 还款周期查询
-        vm.getPayWay()// 支付方式查询
+        Object.keys(vm.saveInfo).forEach(i => {
+          if (i !== 'project_id') {
+            vm.saveInfo[i] = ''
+          }
+        })
+        Object.keys(vm.productInfo).forEach(i => {
+          if (i !== 'project_id') {
+            vm.saveInfo[i] = ''
+          }
+        })
+        setTimeout(() => {
+          vm.getProductLine() // 产品线查询
+          vm.repayPeriod()// 还款周期查询
+          vm.getPayWay()// 支付方式查询
+        }, 0)
       }
     })
   },
@@ -336,6 +350,7 @@ export default {
       vm.saveInfo.int_rate = e.int_rate
       vm.saveInfo.int_rate_n = e.int_rate_n
       vm.saveInfo.penalty_rate_n = e.penalty_rate_n
+      vm.saveInfo.penalty_rate = e.penalty_rate
       vm.saveInfo.deposit_ratio = e.deposit_ratio
       vm.saveInfo.deposit_ratio_n = e.deposit_ratio_n
       setTimeout(() => {

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

@@ -281,6 +281,7 @@ export default {
       bp_agent_id: '',
       pageNum: 1,
       pageNumSearch: 1,
+      status: window.localStorage.contractReadonly,
       BussinessSituationList: [], // 行业情况
       jobSituationList: [], // 职业情况
       houseInfonList: [], // 房产信息
@@ -293,7 +294,7 @@ export default {
       ORGBaseInfo: {}, // 企业基本信息
       saveInfo: {// 需要保存的信息
         project_id: window.localStorage.project_id,
-        bp_id: window.localStorage.bp_id,
+        bp_id: window.localStorage.bp_id_tenant,
         bp_class: window.localStorage.bp_class,
         equip_num: '',
         equip_num_n: '',
@@ -344,8 +345,21 @@ export default {
       vm.showModalValue = false
       vm.pageNum = 1
       vm.pageNumSearch = 1
+      vm.undertakeList = []
       vm.bp_class = window.localStorage.bp_class
       if (from.name === 'SalesInfo') {
+        Object.keys(vm.saveInfo).forEach(i => {
+          if (i !== 'project_id' && i !== 'bp_id' && i !== 'bp_class' && i !== 'abc_deduction_flag' && i !== 'special_flag') {
+            vm.saveInfo[i] = ''
+          } else if (i === 'abc_deduction_flag' && i === 'special_flag') {
+            vm.saveInfo[i] = 'N'
+          }
+        })
+        vm.selectUdertake = []
+        setTimeout(() => {
+          vm.getBaseInfo()
+        }, 0)
+      } else if (from.name === 'SalesInfo' && !this.status) {
         vm.getBaseInfo()
       }
     })
@@ -447,7 +461,7 @@ export default {
       let randomString = Math.floor(Math.random() * 21)
       let url =
         process.env.basePath +
-        'car_confirm_list_query' +
+        'prj_bp_guta_query' +
         '&index' +
         `'${randomString}'`
       let param = {
@@ -487,7 +501,7 @@ export default {
       let randomString = Math.floor(Math.random() * 21)
       let url =
         process.env.basePath +
-        'car_confirm_list_query' +
+        'prj_bp_guta_query' +
         '&index' +
         `'${randomString}'`
       let param = {
@@ -526,7 +540,7 @@ export default {
       let vm = this
       let url = process.env.basePath + 'bp_np_info_query'
       let param = {
-        bp_id: window.localStorage.getItem('bp_id'),
+        bp_id: window.localStorage.getItem('bp_id_tenant'),
       }
       hlsPopup.showLoading('请稍候')
       vm.$post(url, param).then(function (res) {
@@ -542,7 +556,7 @@ export default {
       let vm = this
       let url = process.env.basePath + 'bp_org_info_query'
       let param = {
-        bp_id: window.localStorage.bp_id,
+        bp_id: window.localStorage.bp_id_tenant,
       }
       hlsPopup.showLoading('请稍候')
       vm.$post(url, param).then(function (res) {

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

@@ -3,7 +3,7 @@
     <h-header :proportion="[5,1,1]" class="bar-custom">
       <div slot="left" class="h-header-btn">
         <img src="@/assets/userBind/arrow.png" @click="$routeGo()" >
-        <span>基本信息</span>
+        <span>附件信息</span>
       </div>
     </h-header>
     <h-content>
@@ -73,11 +73,11 @@
       <div class="userInfo">补充资料</div>
       <div class="house">
         <p class="titles">特批申请书</p>
-        <div v-if="!applicationImg" class="card-upload" @click="ocrShow('CAR_CARD', '')">
+        <div v-if="!applicationImg" class="card-upload" @click="ocrShow('特批申请书', checkId)">
           <img src="@/assets/userBind/camera.png" class="upload-btn" >
         </div>
         <div v-if="applicationImg && status !== 'APPROVED'" class="card-upload">
-          <img :src="applicationImg" @click="ocrShow('', '')">
+          <img :src="applicationImg" @click="ocrShow('特批申请书', checkId)">
         </div>
         <div v-if="applicationImg && status === 'APPROVED'" class="card-upload">
           <img :src="applicationImg" @click="showBigPicture(applicationImg)">
@@ -85,7 +85,7 @@
       </div>
     </h-content>
     <bottom-tab class="add-box">
-      <tab-button class="before" @click.native="$routeGo()">保存</tab-button>
+      <tab-button class="before" @click.native="handSave">保存</tab-button>
       <tab-button class="next" @click.native="handleSubmit">提交</tab-button>
     </bottom-tab>
   </h-view>
@@ -139,20 +139,114 @@ export default {
       })
     },
     // ocr识别入口
-    ocrShow (ocrType, type) {
+    ocrShow (desc, checkId) {
       let vm = this
       hlsPopup.showActionSheet({
         titleText: '请选择照片',
         buttonArray: ['拍照', '从相册取'],
         callback: index => {
           if (index === 0) {
-            vm.openCamera(ocrType, type)
+            vm.openCamera(desc, checkId)
           } else {
-            vm.takePicture(ocrType, type)
+            vm.takePicture(desc, checkId)
           }
         },
       })
     },
+    openCamera (desc, checkId) {
+      let vm = this
+      let obj = {
+        'pkvalue': checkId,
+        'source_type': 'PRJ_CDD_ITEM_CHECK',
+        'picture': '',
+        'check_id': checkId,
+        'filePath': '',
+        'attachment_id': '',
+        'user_id': 1,
+        'fileName': desc + '_' + new Date().getTime(),
+      }
+      let cameraoptions = {
+        quality: 100,
+      }
+      let success = function (imgdata) {
+        obj.picture = imgdata
+        obj.filePath = imgdata
+        let list = []
+        list.push(obj)
+        // 拍完一张立马执行保存图片逻辑
+        vm.save_picture(list)
+      }
+      let error = function () {
+        hlsPopup.showLongCenter('请拍照')
+      }
+      hlsUtil.openCamera(cameraoptions, success, error)
+    },
+    takePicture (desc, checkId) {
+      let vm = this
+      let cameraoptions = {
+        quality: 100,
+      }
+      let success = function (imgUrl) {
+        var list = []
+        for (let i = 0; i < imgUrl.length; i++) {
+          let obj = {
+            'pkvalue': checkId,
+            'source_type': 'PRJ_CDD_ITEM_CHECK',
+            'picture': '',
+            'check_id': checkId,
+            'filePath': '',
+            'attachment_id': '',
+            'user_id': 1,
+            'fileName': desc + '_' + new Date().getTime(),
+          }
+          obj.picture = imgUrl[i]
+          obj.filePath = imgUrl[i]
+          list.push(obj)
+        }
+        vm.save_picture(list)
+      }
+      let error = function () {
+      }
+      vm.hlsUtil.takePicture(cameraoptions, success, error)
+    },
+    // 图片保存
+    save_picture (list) {
+      let vm = this
+      if (list.length) {
+        // hlsPopup.showLoading('图片上传请稍候')
+        var alreadyUploadNum = 0
+        var attLength = 0
+        var recordUploadInterval = setInterval(function () {
+          if (alreadyUploadNum === attLength) {
+            clearInterval(recordUploadInterval)
+            /*  hlsPopup.hideLoading()
+                hlsPopup.showLongCenter('图片上传成功') */
+          }
+        }, 500)
+        for (var i = 0; i < list.length; i++) {
+          let uploadSuccess = function (res) {
+            if (res.result === 'S') {
+              alreadyUploadNum++
+              for (var j = 0; j < list.length; j++) {
+                if (list[j].filePath === res.response.filePath) {
+                  list[j].attachment_id = res.response.attachment_id
+                  vm.upload_list.push(list[j])
+                  break
+                }
+              }
+            } else {
+              hlsPopup.hideLoading()
+            }
+          }
+          if (!list[i].attachment_id) {
+            attLength++
+            hlsUtil.fileUploadSvc(list[i], uploadSuccess)
+          }
+        }
+      } else {
+        hlsPopup.hideLoading()
+      }
+    },
     loadItemList () {
       let vm = this
       vm.dowload_list = []
@@ -180,24 +274,24 @@ export default {
           let listTemp = [...res.lists]
           listTemp.forEach(item => {
             switch (item.cdd_item) {
-              case 'NP_ID_CARD_F': // 自然人身份证正面
-                vm.idCardFrontCheck_id = item.check_id
-                break
-              case 'LEGAL_ID_CARD_F': // 法人代表身份证正面
-                vm.idCardFrontCheck_id = item.check_id
-                break
-              case 'NP_ID_CARD_B': // 身份证背面
-                vm.idCardBackCheck_id = item.check_id
-                break
-              case 'LEGAL_ID_CARD_B': // 身份证背面
-                vm.idCardBackCheck_id = item.check_id
-                break
-              case 'HOUSE_CARD': // 房产证
-                vm.house_id = item.check_id
-                break
-              case 'CAR_CARD': // 行驶证
-                vm.car_id = item.check_id
-                break
+              // case 'NP_ID_CARD_F': // 自然人身份证正面
+              //   vm.idCardFrontCheck_id = item.check_id
+              //   break
+              // case 'LEGAL_ID_CARD_F': // 法人代表身份证正面
+              //   vm.idCardFrontCheck_id = item.check_id
+              //   break
+              // case 'NP_ID_CARD_B': // 身份证背面
+              //   vm.idCardBackCheck_id = item.check_id
+              //   break
+              // case 'LEGAL_ID_CARD_B': // 身份证背面
+              //   vm.idCardBackCheck_id = item.check_id
+              //   break
+              // case 'HOUSE_CARD': // 房产证
+              //   vm.house_id = item.check_id
+              //   break
+              // case 'CAR_CARD': // 行驶证
+              //   vm.car_id = item.check_id
+              //   break
               case 'ORG_CODE': // 营业执照
                 vm.license_id = item.check_id
                 break
@@ -282,26 +376,16 @@ export default {
         }
       })
     },
-    // 获取项目id
-    getPrjId () {
-      let vm = this
-      let url = process.env.basePath + 'get_project_id'
-      let param = { }
-      vm.hlsPopup.showLoading('请稍候')
-      vm.hlsHttp.post(url, param).then(function (res) {
-        vm.hlsPopup.hideLoading()
-        console.log('获取项目id', res)
-        if (res.result === 'S') {
-          // vm.showLists = res.lists
-        }
-      })
+    // 保存
+    handSave () {
+      hlsPopup.showLongCenter('保存成功！')
     },
     // 项目提交审批
     handleSubmit () {
       let vm = this
       let url = process.env.basePath + 'prj_project_submit'
       let param = {
-        project_id: vm.project_id,
+        project_id: window.localStorage.project_id,
       }
       vm.hlsPopup.showLoading('请稍候')
       vm.hlsHttp.post(url, param).then(function (res) {

src/pages/contractCreate/sales-info.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime : 2019-12-23 16:14:57
+ * @LastEditTime : 2019-12-26 12:05:03
  * @LastEditors  : Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -74,15 +74,15 @@
         </item>
         <item v-if="user_bp_type === 'AGENT'">
           <div slot="name" class="font-color">授信额度</div>
-          <input slot="content" placeholder="授信额度">
+          <input slot="content" v-model="inflow_line" readonly placeholder="授信额度">
         </item>
         <item v-if="user_bp_type === 'AGENT'">
           <div slot="name" class="font-color">已使用授信额度</div>
-          <input slot="content" placeholder="已使用授信额度">
+          <input slot="content" v-model="inflow_used" readonly placeholder="已使用授信额度">
         </item>
         <item v-if="user_bp_type === 'AGENT'">
           <div slot="name" class="font-color">剩余授信额度</div>
-          <input slot="content" placeholder="剩余授信额度">
+          <input slot="content" v-model="inflow_reset" readonly placeholder="剩余授信额度">
         </item>
         <item @click.native="showTime('YYYY-MM-DD')">
           <div slot="name" class="font-color">签约日期</div>
@@ -280,7 +280,13 @@ export default {
         if (res.result === 'S') {
           vm.bp_agent_name = res.info.bp_agent_name
           vm.bp_agent_id = res.info.bp_agent_id
-          vm.salesInfo.bp_id_agent = res.info.bp_agent_id
+          if (window.localStorage.bp_type === 'OFFICE') {
+            vm.office_name = res.info.bp_agent_name
+            vm.salesInfo.office_id = res.info.bp_agent_id
+            vm.salesInfo.bp_id_agent = ''
+          } else {
+            vm.salesInfo.bp_id_agent = res.info.bp_agent_id
+          }
           vm.salesInfo.bp_user_id = res.info.bp_user_id
           vm.lesseeQuery()
           vm.salesQuery()
@@ -420,6 +426,7 @@ export default {
       this.lessee = item.bp_name
       this.salesInfo.bp_id_tenant = item.bp_id
       this.showModal = false
+      window.localStorage.setItem('bp_id_tenant', this.salesInfo.bp_id_tenant)
     },
     hideModal () {
       this.showModal = false

src/pages/contractSigning/contract-detail.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-12-19 10:38:35
- * @LastEditors: Please set LastEditors
+ * @LastEditTime : 2019-12-26 12:08:25
+ * @LastEditors  : Please set LastEditors
  * @Description: In User Settings Edit
  -->
 <template>
@@ -241,7 +241,7 @@
       </div>
       <list-item :item-height="44" class="second-part">
         <item>
-          <div slot="name" class="font-color">参数项</div>
+          <div slot="name" class="font-color">设备识别号</div>
           <input slot="content" v-model="info.product_code" readonly >
         </item>
         <item>

src/pages/contractSigning/contract-signing.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-12-19 11:11:37
- * @LastEditors: Please set LastEditors
+ * @LastEditTime : 2019-12-26 13:39:32
+ * @LastEditors  : Please set LastEditors
  * @Description: In User Settings Edit
  -->
 <template>
@@ -80,7 +80,7 @@ export default {
   watch: {
     'num': {
       handler (newVal, oldVal) {
-        this.$refs.scroll.update(false)
+        // this.$refs.scroll.update(false)
         if (newVal === 2) {
           if (!this.approvedFlag) {
             this.contractList()

src/pages/distributorSign/contract-details.vue

@@ -2,8 +2,8 @@
  * @Description: 合同详情
  * @Author: your name
  * @Date: 2019-09-25 15:38:21
- * @LastEditTime: 2019-12-20 15:36:19
- * @LastEditors: Please set LastEditors
+ * @LastEditTime : 2019-12-26 12:08:42
+ * @LastEditors  : Please set LastEditors
  -->
 <template>
   <h-view id="details" class="public-style" title="经销商签约">
@@ -127,7 +127,7 @@
       <p>设备清单</p></div>
       <list-item :item-height="44" class="second-part">
         <item>
-          <div slot="name" class="font-color">参数项</div>
+          <div slot="name" class="font-color">设备识别号</div>
           <input slot="content" v-model="info.product_code" readonly>
         </item>
         <item>

src/pages/financingTrial/financing-details.vue

@@ -72,7 +72,7 @@
           <span v-if="equip_price" slot="content">{{ parseFloat(equip_price*info.down_payment_ratio_n.replace("%","")/100 + equip_price*info.deposit_ratio_n.replace("%","")/100 + (equip_price - equip_price*info.down_payment_ratio_n.replace("%","")/100)*(info.lease_charge_ratio_n.replace("%","")/100) + Number(gps_fee) + Number(insurance_fee)).toFixed(2) | currency }}</span>
         </item>
         <item @click.native="showTime('YYYY-MM-DD')">
-          <div slot="name" class="font-color">预计付款日</div>
+          <div slot="name" class="fo             nt-color">预计付款日</div>
           <div slot="content" class="autoColor">{{ price_date_to }}</div>
           <img src="@/assets/trial/date.png" alt="" class="date-pic">
         </item>