Merge branch 'ren' into develop

src/pages/contractSigning/contract-detail.vue

+<!--
+ * @Author: your name
+ * @Date: 2019-09-29 10:02:11
+ * @LastEditTime: 2019-10-21 11:16:28
+ * @LastEditors: Please set LastEditors
+ * @Description: In User Settings Edit
+ -->
 <template>
   <h-view id="contract-details" class="public-style">
     <div v-show="isshow" class="all">
@@ -23,51 +30,51 @@
       <list-item :item-height="44" class="second-part">
         <item>
           <div slot="name" >商务政策</div>
-          <section slot="content">零手续费产品</section>
+          <section slot="content">{{ conditionInfo.product_plan_id_n }}</section>
         </item>
         <item>
           <div slot="name" >设备总价</div>
-          <section slot="content">150,0000.00</section>
+          <section slot="content">{{ conditionInfo.equip_price | currency }}</section>
         </item>
         <item>
           <div slot="name" >融资金额</div>
-          <section slot="content">100,000.00</section>
+          <section slot="content">{{ Math.round(conditionInfo.finance_amount) | currency }}</section>
         </item>
         <item>
           <div slot="name" >首付款</div>
-          <section slot="content">100,000.00</section>
+          <section slot="content">{{ Math.round(conditionInfo.down_payment) | currency }}</section>
         </item>
         <item>
           <div slot="name" >保证金比例</div>
-          <section slot="content">10%</section>
+          <section slot="content">{{ conditionInfo.deposit_ratio_n }}</section>
         </item>
         <item>
           <div slot="name" >保证金</div>
-          <section slot="content">150,000.00</section>
+          <section slot="content">{{ Math.round(conditionInfo.deposit) | currency }}</section>
         </item>
         <item>
           <div slot="name" >手续费比例</div>
-          <section slot="content">5%</section>
+          <section slot="content">{{ conditionInfo.lease_charge_ratio_n }}</section>
         </item>
         <item>
           <div slot="name" >手续费</div>
-          <section slot="content">7,500.00</section>
+          <section slot="content">{{ Math.round(conditionInfo.lease_charge) | currency }}</section>
         </item>
         <item>
           <div slot="name" >预计付款日</div>
-          <section slot="content">2019-08-01</section>
+          <section slot="content">{{ conditionInfo.lease_start_date }}</section>
         </item>
         <item>
           <div slot="name" >还款周期</div>
-          <section slot="content">月</section>
+          <section slot="content">{{ conditionInfo.annual_pay_times_n }}</section>
         </item>
         <item>
           <div slot="name" >租赁期数</div>
-          <section slot="content">6</section>
+          <section slot="content">{{ conditionInfo.lease_times }}</section>
         </item>
         <item>
           <div slot="name" >年利率</div>
-          <section slot="content">6.5%</section>
+          <section slot="content">{{ conditionInfo.int_rate_n }}</section>
         </item>
       </list-item>
       <div class="repay-plan">
@@ -77,15 +84,15 @@
       <list-item :item-height="44" class="second-part">
         <item>
           <div slot="name" >参数项</div>
-          <section slot="content">GTZ226</section>
+          <section slot="content">{{ conditionInfo.product_code }}</section>
         </item>
         <item>
           <div slot="name" >产品线</div>
-          <section slot="content">起重机</section>
+          <section slot="content">{{ conditionInfo.product_name }}</section>
         </item>
         <item>
           <div slot="name" >产品数量</div>
-          <section slot="content">10</section>
+          <section slot="content">{{ conditionInfo.product_num }}</section>
         </item>
       </list-item>
 
@@ -94,8 +101,8 @@
           <img src="@/assets/constractSigning/work.png" alt="" style="width:32px">
         </div>
         <div class="center">
-          <p>业务经办：张三</p>
-          <p>联系电话：17890765336</p>
+          <p>业务经办：{{ conditionInfo.bp_user_id_n }}</p>
+          <p>联系电话：{{ conditionInfo.agent_phone }}</p>
         </div>
         <div class="right">
           <img src="@/assets/constractSigning/phone.png" alt="" style="width:30px">
@@ -164,6 +171,7 @@ export default {
     return {
       isshow: false, // 提示框的显示与隐藏
       num: 1,
+      conditionInfo: {},
       check1: Check1,
       check2: Check2,
       uncheck1: unCheck1,
@@ -172,7 +180,31 @@ export default {
   },
   computed: {},
   watch: {},
+  beforeRouteEnter (to, from, next) {
+    if (from.name === 'ContractSigning') {
+      next(vm => {
+        vm.conditionQuery()
+      })
+    }
+    next()
+  },
   methods: {
+    // 合同商务条件查询
+    conditionQuery () {
+      let vm = this
+      let url = $config.basePath + 'con_business_query'
+      let param = {
+        project_id: this.$route.params.project_id,
+      }
+      vm.hlsHttp.post(url, param).then(function (res) {
+        console.log('商务条件', res)
+        if (res.result === 'S') {
+          vm.conditionInfo = res.info
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
     // 跳转合同详情
     goContractContent (name) {
       this.$router.push({

src/pages/contractSigning/contract-signing.vue

+<!--
+ * @Author: your name
+ * @Date: 2019-09-29 10:02:11
+ * @LastEditTime: 2019-10-21 11:09:20
+ * @LastEditors: Please set LastEditors
+ * @Description: In User Settings Edit
+ -->
 <template>
   <h-view class="contract-signing">
     <h-header :proportion="[5,1,1]" class="bar-custom">
@@ -17,26 +24,51 @@
       </div>
     </div>
 
-    <h-content>
-      <div v-for="(item,index) in contractMsg" :key="index" class="contract-list">
+    <h-content v-if="num === 1">
+      <div v-for="(item,index) in submitLists" :key="index" class="contract-list">
         <div class="item">
           <img src="@/assets/constractSigning/Incoming.png" alt="" style="height:18px">
           <p class="incoming-num">进件号</p>
-          <p class="code">{{ item.code }}</p>
+          <p class="code">{{ item.project_number }}</p>
         </div>
-        <div class="details">
+        <div class="details" @click="goDetails(item.project_id)">
           <div class="option">
             <p class="name">承租人</p>
-            <p class="full-name normal">{{ item.name }}</p>
+            <p class="full-name normal">{{ item.bp_name }}</p>
           </div>
-          <div class="option" @click="goDetails(index)">
+          <div class="option">
+            <p class="name">合同租金</p>
+            <p class="normal money">{{ item.total_price | currency }}</p>
+            <img src="@/assets/distributorSign/goDetails.png" alt="">
+          </div>
+          <div class="option">
+            <p class="name">申请时间</p>
+            <p class="normal">{{ item.confirm_start_date }}</p>
+          </div>
+        </div>
+      </div>
+    </h-content>
+
+    <h-content v-if="num === 2">
+      <div v-for="(item,index) in approvedLists" :key="index" class="contract-list">
+        <div class="item">
+          <img src="@/assets/constractSigning/Incoming.png" alt="" style="height:18px">
+          <p class="incoming-num">进件号</p>
+          <p class="code">{{ item.project_number }}</p>
+        </div>
+        <div class="details" @click="goDetails(item.project_id)">
+          <div class="option">
+            <p class="name">承租人</p>
+            <p class="full-name normal">{{ item.bp_name }}</p>
+          </div>
+          <div class="option">
             <p class="name">合同租金</p>
-            <p class="normal money">{{ item.money | currency }}</p>
+            <p class="normal money">{{ item.total_price | currency }}</p>
             <img src="@/assets/distributorSign/goDetails.png" alt="">
           </div>
           <div class="option">
             <p class="name">申请时间</p>
-            <p class="normal">{{ item.date }}</p>
+            <p class="normal">{{ item.confirm_start_date }}</p>
           </div>
         </div>
       </div>
@@ -58,25 +90,47 @@ export default {
       check2: Check2,
       uncheck1: unCheck1,
       uncheck2: unCheck2,
-      contractMsg: [
-        {name: '张三', money: 90000, date: '2019-03-1', code: '201903022001'},
-        {name: '李四', money: 90000, date: '2019-03-1', code: '201903022002'},
-        {name: '王五', money: 90000, date: '2019-03-1', code: '201903022003'},
-        {name: '赵六', money: 90000, date: '2019-03-1', code: '201903022004'},
-        {name: '张三', money: 90000, date: '2019-03-1', code: '201903022001'},
-        {name: '李四', money: 90000, date: '2019-03-1', code: '201903022002'},
-        {name: '王五', money: 90000, date: '2019-03-1', code: '201903022003'},
-        {name: '赵六', money: 90000, date: '2019-03-1', code: '201903022004'},
-      ],
+      submitLists: [],
+      approvedLists: [],
     }
   },
   activated () {
 
+  },
+  created () {
+
+  },
+  beforeRouteEnter (to, from, next) {
+    if (from.name === 'HomePage') {
+      next(vm => {
+        vm.contractList()
+      })
+    }
+    next()
   },
   methods: {
-    goDetails (index) {
+    contractList () {
+      let vm = this
+      let url = $config.basePath + 'con_confirm_list_query'
+      let param = {
+        user_phone: window.localStorage.user_phone,
+      }
+      vm.hlsHttp.post(url, param).then(function (res) {
+        console.log(res)
+        if (res.result === 'S') {
+          vm.submitLists = res.lists.filter(item => item.confirm_status === 'SUBMIT')
+          vm.approvedLists = res.lists.filter(item => item.confirm_status === 'APPROVED')
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
+    goDetails (val) {
       this.$router.push({
         name: 'ContractDetail',
+        params: {
+          project_id: val,
+        },
       })
     },
   },
@@ -187,8 +241,7 @@ export default {
       height: 120px;
       // border: 1px solid #ccc;
       background: #fff;
-    margin-top: 8px;
-
+      //margin-bottom: 8px;
       .item {
         width: 100%;
         height: 34px;
@@ -218,7 +271,7 @@ export default {
           font-size: 14px;
           color: #00469C;
           margin-left: 8px;
-        font-weight: 700;
+          font-weight: bolder
         }
       }
 
@@ -228,17 +281,18 @@ export default {
         display: flex;
         flex-direction: column;
         justify-content: space-around;
+        padding: 6px 0;
 
         .option {
           width: 100%;
-        // flex: 1;
+          height: 18px;
           display: flex;
-        flex-basis: row;
+          flex-direction: row;
 
           .name {
             font-family: PingFangSC-Regular;
             font-size: 13px;
-          color: rgba(56,63,69,0.60);
+            color: rgba(56, 63, 69, 0.60);
             width: 80px;
             height: 18px;
             line-height: 18px;
@@ -259,7 +313,15 @@ export default {
           }
 
           img {
-            margin-left: 55%
+            margin-left: 47%
+          }
+
+        }
+        .option:nth-of-type(2) {
+          position: relative;
+          img{
+            position: absolute;
+            right: 10px;
           }
         }
       }

src/pages/productQuery/product-list.vue

@@ -149,8 +149,11 @@ export default {
        // margin-left: 30px;
         margin-top: 16px;
     }
+    // .hls-item .contents .add-name {
+    //   flex: none!important;
+    // }
     .item-pic {
-          width: 110px;
+          width: 100px;
           //height: 110px;
           img {
               width: 100%;

src/scripts/filter.js

+
 export default (Vue) => {
   Vue.filter('currency', function (val) {
     if (!val) return '0.00'