修改44\45

src/pages/intoApproval/intoApproval/base.vue

@@ -181,7 +181,7 @@
               <img src="@/assets/intoApproval/introduce.png" >
               <span>{{ item.bp_name }}</span>
               <br >
-              <span>{{ item.organization_code }}</span>
+              <span>{{ item.bp_class=='NP'?item.id_card_no:item.organization_code }}</span>
             </div>
           </item>
         </list-item>
@@ -277,7 +277,7 @@
               <img src="@/assets/intoApproval/introduce.png" >
               <span :title="item.bp_name">{{ item.bp_name }}</span>
               <br >
-              <span>{{ item.organization_code }}</span>
+              <span>{{ item.bp_class=='NP'?item.id_card_no:item.organization_code }}</span>
             </div>
           </item>
         </list-item>
@@ -304,7 +304,9 @@
         <img src="@/assets/intoApproval/approve.png" >审批
       </tab-button>
     </bottom-tab>
-    <h-modal ref="modal" v-model="showModalValue" position="bottom" cus-class="sign-modal">
+    <h-modal
+      v-if="confirm_status!=='APPROVED'" ref="modal" v-model="showModalValue" position="bottom"
+      cus-class="sign-modal">
       <h-view>
         <h-content class="approveContent">
           <div class="approveBottom">
@@ -315,7 +317,7 @@
             <textarea v-model="confirm_note" cols="8" rows="20" placeholder="请输入" />
           </div>
         </h-content>
-        <bottom-tab>
+        <bottom-tab v-if="confirm_status!=='APPROVED'">
           <tab-button class="reject" @click.native="showModalValue=true;confirm_status='REJECTED';charge('拒绝')">
             <img src="@/assets/intoApproval/reject.png" >拒绝
           </tab-button>
@@ -412,7 +414,9 @@ export default {
   },
   mounted () {
     this.getBonds()
-    this.popProtocol()
+    if (this.confirm_status !== 'APPROVED') {
+      this.popProtocol()
+    }
     this.getList()
     this.isConfirm = this.$route.params.isConfirm
   },
@@ -524,31 +528,31 @@ export default {
         content: `您确认${val}吗？`,
         onConfirm: (data) => {
           console.log(data)
-          if (val === '拒绝') {
+          // if (val === '拒绝') {
 
-          } else {
-            if (data) {
-              let vm = this
-              let url = process.env.basePath + 'do_confrim_bp'
-              let param = {
-                'master': {
-                  confirm_id: window.sessionStorage.confirm_id,
-                  confirm_status: this.confirm_status,
-                  confirm_note: this.confirm_note,
-                },
-              }
-              vm.hlsPopup.showLoading('提交数据中!')
-              vm.hlsHttp.post(url, param).then(function (res) {
-                vm.hlsPopup.hideLoading()
-                vm.hlsPopup.showSuccess('审批成功')
-                if (res.result === 'S') {
-                  vm.$router.push({
-                    name: 'IntoList',
-                  })
-                }
-              })
+          // } else {
+          if (data) {
+            let vm = this
+            let url = process.env.basePath + 'do_confrim_bp'
+            let param = {
+              'master': {
+                confirm_id: window.sessionStorage.confirm_id,
+                confirm_status: this.confirm_status,
+                confirm_note: this.confirm_note,
+              },
             }
+            vm.hlsPopup.showLoading('提交数据中!')
+            vm.hlsHttp.post(url, param).then(function (res) {
+              vm.hlsPopup.hideLoading()
+              vm.hlsPopup.showSuccess(`审批成功,已${val}`)
+              if (res.result === 'S') {
+                vm.$router.push({
+                  name: 'IntoList',
+                })
+              }
+            })
           }
+          // }
         },
       })
     },
@@ -643,7 +647,7 @@ export default {
       text-overflow: ellipsis;
       white-space: nowrap;
       width: 150px;
-      margin-top: -10px;
+      // margin-top: -10px;
     }
     .right span:last-child {
       margin-top: 7px;