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-19 14:28:00
- * @LastEditors: Please set LastEditors
+ * @LastEditTime : 2019-12-23 11:04:04
+ * @LastEditors  : Please set LastEditors
  * @Description: In User Settings Edit
  -->
 <template>
@@ -62,10 +62,12 @@ export default {
   data () {
     return {
       num: 1,
+      pagenum: 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' },
@@ -84,13 +86,39 @@ export default {
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
-
+      if (from.name === 'MyInfo') {
+        vm.searchInput = ''
+        vm.pagenum = 1
+        vm.user_bp_type = vm.$route.params.user_bp_type
+        vm.listsQuery() // 已创建合同列表查询
+      }
     })
   },
   methods: {
+    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,
+      }
+      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
+        }
+      })
+    },
     goDetails () {
       this.$router.push({
         name: 'SalesInfo',
+        params: {
+          user_bp_type: this.user_bp_type,
+        },
       })
     },
     changePage () {

src/pages/contractCreate/sales-info.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-12-20 17:03:56
- * @LastEditors: Please set LastEditors
+ * @LastEditTime : 2019-12-23 15:10:23
+ * @LastEditors  : Please set LastEditors
  * @Description: In User Settings Edit
  -->
 <template>
@@ -32,7 +32,8 @@
         </item>
         <item>
           <div slot="name" class="font-color">经销商</div>
-          <input slot="content" v-model="bp_agent_name" readonly>
+          <input v-if="user_bp_type !== 'OFFICE'" slot="content" v-model="bp_agent_name" readonly>
+          <input v-if="user_bp_type === 'OFFICE'" slot="content" placeholder="直销" readonly>
         </item>
         <item :showArrow="true">
           <div slot="name" class="font-color">销售人员</div>
@@ -69,53 +70,17 @@
         </item>
         <item>
           <div slot="name" class="font-color">主机厂业务员</div>
-          <input slot="content" placeholder="请输入业务员姓名">
+          <input slot="content" v-model="salesInfo.manu_manager" placeholder="请输入业务员姓名">
         </item>
-        <item @click.native="showTime('YYYY-MM-DD')">
-          <div slot="name" class="font-color">签约日期</div>
-          <input slot="content" v-model="salesInfo.dates" readonly>
-          <img src="@/assets/contractCreate/date.png" alt="" class="date-pic">
-        </item>
-      </list-item>
-
-      <list-item v-if="false" :item-height="44" class="second-part">
-        <item :showArrow="true">
-          <div slot="name" class="font-color">承租人</div>
-          <span slot="content">{{ '请选择' }}</span>
-        </item>
-        <item :showArrow="true">
-          <div slot="name" class="font-color">业务类型</div>
-          <input slot="content" placeholder="请选择">
-        </item>
-        <item>
-          <div slot="name" class="font-color">经销商</div>
-          <input slot="content" placeholder="上海汉得信息技术股份有限公司">
-        </item>
-        <item :showArrow="true">
-          <div slot="name" class="font-color">销售人员</div>
-          <input slot="content" readonly placeholder="请选择">
-        </item>
-        <item :showArrow="true">
-          <div slot="name" class="font-color">办事处</div>
-          <input slot="content" readonly placeholder="请选择">
-        </item>
-        <item :showArrow="true">
-          <div slot="name" class="font-color">主机厂</div>
-          <input slot="content" readonly placeholder="请选择">
-        </item>
-        <item>
-          <div slot="name" class="font-color">主机厂业务员</div>
-          <input slot="content" placeholder="请输入业务员姓名">
-        </item>
-        <item>
+        <item v-if="user_bp_type === 'AGENT'">
           <div slot="name" class="font-color">授信额度</div>
           <input slot="content" placeholder="授信额度">
         </item>
-        <item>
+        <item v-if="user_bp_type === 'AGENT'">
           <div slot="name" class="font-color">已使用授信额度</div>
           <input slot="content" placeholder="已使用授信额度">
         </item>
-        <item>
+        <item v-if="user_bp_type === 'AGENT'">
           <div slot="name" class="font-color">剩余授信额度</div>
           <input slot="content" placeholder="剩余授信额度">
         </item>
@@ -178,6 +143,7 @@ export default {
       business: '',
       showModal: false,
       showLists: [],
+      user_bp_type: '', // 客户类型
       businessLists: [], // 业务人员查询结果
       salesLists: [], // 销售人员查询结果
       officeLists: [], // 办事处查询结果
@@ -214,6 +180,7 @@ export default {
         vm.factory_name = ''
         vm.bp_agent_id = ''
         vm.bp_agent_name = ''
+        vm.user_bp_type = vm.$route.params.user_bp_type
         vm.sales = window.localStorage.bp_name
         vm.salesInfo = {
           bp_id_tenant: '', // 承租人id
@@ -360,7 +327,7 @@ export default {
         if (res.result === 'S') {
           vm.salesLists = res.lists.map(item => {
             return {
-              code: item.user_id,
+              code: item.bp_user_id,
               code_name: item.agent_username,
             }
           })

src/pages/contractInquire/repay-detail.vue

 <!--
  * @Author: your name
  * @Date: 2019-10-31 09:49:57
- * @LastEditTime: 2019-12-18 16:58:54
- * @LastEditors: Please set LastEditors
+ * @LastEditTime : 2019-12-23 14:11:26
+ * @LastEditors  : Please set LastEditors
  * @Description: 合同查询--明细
  * @FilePath:
  -->
@@ -37,6 +37,10 @@
           <div slot="name">产品名称</div>
           <div slot="content">{{ detailInfo.division_n }}</div>
         </item>
+        <item>
+          <div slot="name">设备识别号</div>
+          <div slot="content">{{ detailInfo.product_code }}</div>
+        </item>
         <item>
           <div slot="name">合同金额</div>
           <div slot="content">{{ detailInfo.total_price | currency }}</div>

src/pages/myInfo/my-info.vue

 <!--
  * @Author: your name
  * @Date: 2019-11-07 17:48:53
- * @LastEditTime: 2019-12-19 14:49:11
- * @LastEditors: Please set LastEditors
+ * @LastEditTime : 2019-12-23 10:01:15
+ * @LastEditors  : Please set LastEditors
  * @Description: In User Settings Edit
  -->
 <!-- -->
@@ -321,6 +321,9 @@ export default {
     goCreate () {
       this.$router.push({
         name: 'ContractCreateList',
+        params: {
+          user_bp_type: this.user_bp_type,
+        },
       })
     },
     // 进入待签约功能，客户类型为经销商则进入经销商功能，非经销商则进入合同签约

src/pages/userBindNew/org/bankInfo.vue

@@ -2,8 +2,8 @@
  * @Description: In User Settings Edit
  * @Author: your name
  * @Date: 2019-09-24 21:29:35
- * @LastEditTime: 2019-12-19 15:06:22
- * @LastEditors: Please set LastEditors
+ * @LastEditTime : 2019-12-23 09:26:37
+ * @LastEditors  : Please set LastEditors
  -->
 <template>
   <h-view id="bankInfo" class="public-style">
@@ -161,7 +161,7 @@ export default {
         vm.getBankInfo()
         vm.electQuery()
         if (window.localStorage.bp_identity === 'ORG_NO') {
-          vm.getOrgCertificationUrl()
+          vm.getOrgCertificationUrl() // 获取企业认证url
         } else {
           vm.getNpCertificationUrl()
         }