Merge branch 'ren' into develop

src/pages/contractSigning/contract-detail.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-11-05 13:36:11
+ * @LastEditTime: 2019-11-05 17:00:59
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -264,11 +264,40 @@
         </div>
       </div> -->
     </h-content>
-    <bottom-tab v-if="con_confirm_status == 'SUBMIT'">
+    <!-- <bottom-tab v-if="con_confirm_status == 'SUBMIT'">
       <tab-button class="footer" @click.native="inSure">
-        确认签约
+        审批
+      </tab-button>
+    </bottom-tab> -->
+    <bottom-tab v-if="con_confirm_status!=='APPROVED'" class="footer-button">
+      <!-- <tab-button class="approve" @click.native="showModalValue=true"> -->
+      <tab-button class="approve" @click.native="inSure">
+        <img src="@/assets/intoApproval/approve.png" >审批
       </tab-button>
     </bottom-tab>
+    <h-modal
+      v-if="con_confirm_status!=='APPROVED'" ref="modal" v-model="showModalValue" position="bottom"
+      cus-class="sign-modal">
+      <h-view>
+        <h-content class="approveContent">
+          <div class="approveBottom">
+            <span>
+              审批意见
+              <img src="@/assets/intoApproval/close1.png" @click="showModalValue=false" >
+            </span>
+            <textarea v-model="confirm_note" cols="8" rows="20" placeholder="请输入" />
+          </div>
+        </h-content>
+        <bottom-tab>
+          <tab-button class="reject" @click.native="showModalValue=true;charge('拒绝','REJECTED')">
+            <img src="@/assets/intoApproval/reject.png" >拒绝
+          </tab-button>
+          <tab-button class="same" @click.native="showModalValue=true;charge('同意','APPROVED')">
+            <img src="@/assets/intoApproval/approve.png" >同意
+          </tab-button>
+        </bottom-tab>
+      </h-view>
+    </h-modal>
   </h-view>
 </template>
 
@@ -293,6 +322,7 @@ export default {
       bp_flag: false, // 判断自然人和法人
       num: 0,
       bp_name: '',
+      showModalValue: false,
       guarantorInfo: [], // 担保人信息
       bp_class: this.$route.params.item.bp_class, // 承租人性质(自然人，企业)
       info: {}, // 租赁信息
@@ -303,6 +333,7 @@ export default {
       confirm_id: '',
       conditionInfo: {},
       check1: Check1,
+      confirm_note: '',
       ischecked: false,
       check2: Check2,
       check3: Check3,
@@ -367,6 +398,37 @@ export default {
     }
   },
   methods: {
+    charge (val, status) {
+      this.hlsPopup.showConfirm({
+        title: '提示',
+        content: `您确认${val}吗？`,
+        onConfirm: (data) => {
+          if (data) {
+            let vm = this
+            let url = process.env.basePath + 'do_confrim_bp'
+            let param = {
+              'master': {
+                confirm_id: vm.confirm_id,
+                confirm_status: status,
+                confirm_note: this.confirm_note,
+              },
+            }
+            vm.hlsPopup.showLoading('提交数据中!')
+            vm.hlsHttp.post(url, param).then(function (res) {
+              vm.hlsPopup.hideLoading()
+              if (res.result === 'S') {
+                vm.hlsPopup.showSuccess(`审批成功,已${val}`)
+                vm.$router.push({
+                  name: 'ContractSigning',
+                })
+              } else {
+                vm.hlsPopup.showSuccess(res.message)
+              }
+            })
+          }
+        },
+      })
+    },
     popProtocol () {
       let modal = document.querySelector('.myModal')
       let alpha = 0
@@ -487,26 +549,27 @@ export default {
     },
     inSure () {
       if (this.bank_flag) {
-        hlsPopup.showLoading('请稍候')
-        // this.entry_info_flag = true
-        let vm = this
-        let url = $config.basePath + 'con_bp_confirm'
-        let param = {
-          master: {
-            confirm_id: vm.confirm_id,
-            con_confirm_status: 'APPROVED',
-          },
-        }
-        vm.hlsHttp.post(url, param).then(function (res) {
-          hlsPopup.hideLoading()
-          if (res.result === 'S') {
-            vm.$router.push({
-              name: 'ContractSigning',
-            })
-          } else {
-            hlsPopup.showLongCenter(res.message)
-          }
-        })
+        // hlsPopup.showLoading('请稍候')
+        // // this.entry_info_flag = true
+        // let vm = this
+        // let url = $config.basePath + 'con_bp_confirm'
+        // let param = {
+        //   master: {
+        //     confirm_id: vm.confirm_id,
+        //     con_confirm_status: 'APPROVED',
+        //   },
+        // }
+        // vm.hlsHttp.post(url, param).then(function (res) {
+        //   hlsPopup.hideLoading()
+        //   if (res.result === 'S') {
+        //     vm.$router.push({
+        //       name: 'ContractSigning',
+        //     })
+        //   } else {
+        //     hlsPopup.showLongCenter(res.message)
+        //   }
+        // })
+        this.showModalValue = true
       } else {
         this.isshow = true
         // this.entry_info_flag = false
@@ -539,6 +602,23 @@ export default {
 </script>
 <style lang='less' type="text/less">
 #contract-details {
+  .footer-button {
+    .approve {
+      width: 358.6px;
+      height: 44px;
+      background: #00469c;
+      border-radius: 4px;
+      color: #fff;
+      font-family: PingFangSC-Semibold;
+      font-size: 15px;
+      line-height: 20px;
+      letter-spacing: 10px;
+      img {
+        width: 16.8px;
+        height: 16.8px;
+      }
+    }
+  }
   .name-box {
       display: inline-block;
       text-align: center;
@@ -1142,5 +1222,70 @@ export default {
       }
     }
   }
+  .approveContent {
+    position: absolute;
+    top: 50%;
+    background-color: #fafafa;
+    overflow-y: scroll;
+  }
+  .approveBottom {
+    width: 343px;
+    margin: 0 auto;
+    span {
+      display: block;
+      width: 100%;
+      font-family: PingFangSC-Semibold;
+      font-size: 15px;
+      color: #00469c;
+      height: 21px;
+      line-height: 21px;
+      margin: 16px 0;
+      img {
+        float: right;
+      }
+    }
+    textarea {
+      width: 343px;
+      height: 178px;
+      border-radius: 2px;
+      padding: 10px;
+    }
+    span::after {
+      content: "";
+      display: block;
+      position: relative;
+      left: 70px;
+      top: -17px;
+      width: 14px;
+      height: 14px;
+      background: url("../../assets/intoApproval/approv.png");
+      background-size: 14px 14px;
+    }
+  }
+  .reject,
+  .same {
+    width: 175px;
+    height: 40px;
+    border-radius: 4px;
+    font-family: PingFangSC-Semibold;
+    font-size: 15px;
+    img {
+      width: 13px;
+      height: 13px;
+    }
+  }
+  .reject {
+    color: #656464;
+    border: 1px solid #656464;
+  }
+  .same {
+    color: #ffffff;
+    background: #00469c;
+    border: 1px solid #00469c;
+  }
+}
+.modal {
+  background-color: rgba(0, 0, 0, 0) !important;
+
 }
 </style>