From c2812152b36a1673b1c79057ddf65c2c8fef503e Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Wed, 5 Jan 2022 15:07:26 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/MessagePage/PaymentVoucher.vue            | 13 ++++++++-----
 .../MessagePage/modules/PaymentVoucherModal.vue     |  7 ++++++-
 src/views/MessagePage/modules/ProofInfoModal.vue    |  7 ++++---
 src/views/subBidCommittee/SubBidCommittee.vue       |  9 +++++++++
 .../subBidCommittee/SubBidCommitteeDetailPage.vue   | 13 ++++++-------
 src/views/workTeam/WorkTeam.vue                     | 10 ++++------
 src/views/workTeam/WorkTeamDetail.vue               |  3 +--
 7 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/src/views/MessagePage/PaymentVoucher.vue b/src/views/MessagePage/PaymentVoucher.vue
index 7150ac9..d7bc391 100644
--- a/src/views/MessagePage/PaymentVoucher.vue
+++ b/src/views/MessagePage/PaymentVoucher.vue
@@ -2,7 +2,6 @@
   <div class="main-box">
     <page-header-title :is-level-one="false" level-two-title="申请开票"></page-header-title>
     <a-card :bordered="false">
-      <!--查询区域begin-->
       <div class="table-page-search-wrapper">
         <a-row :gutter="24">
           <a-col :xl="12" :lg="8" :md="8" :sm="24">
@@ -17,7 +16,7 @@
             <span>应付金额：{{ receivableAmount }}元</span>
           </a-col>
           <a-col :xl="6" :lg="8" :md="8" :sm="24">
-            <span>已付金额：{{ paidAmount }}元</span>
+            <span>已付金额：{{ paidAmount || '0' }}元</span>
           </a-col>
         </a-row>
       </div>
@@ -44,6 +43,10 @@
             <j-ellipsis :value="text" :length="20"></j-ellipsis>
           </template>
 
+          <template slot="money" slot-scope="text, record">
+            <j-ellipsis :value="`${text}元`" :length="20"></j-ellipsis>
+          </template>
+
           <!--          阶段-->
           <template slot="steg" slot-scope="text, record">
             <j-ellipsis :value="text" :length="20"></j-ellipsis>
@@ -73,7 +76,7 @@
 
       <!--      审核记录-->
       <div class="audit-info">
-        <div class="audit-info-title">审核信息</div>
+        <div class="audit-info-title">审核记录</div>
         <a-spin :spinning="proofLoading">
           <template v-if="auditInfo && auditInfo.length > 0">
             <div class="audit-info-item-box" v-for="(item, index) in auditInfo" :key="index">
@@ -93,7 +96,7 @@
                 <a-col :span="8">
                   <div class="audit-info-item">
                     <span class="audit-info-item-title">缴费金额：</span>
-                    <span class="audit-info-item-content">{{ item.amountReceived }}</span>
+                    <span class="audit-info-item-content">{{ item.amountReceived }}元</span>
                   </div>
                 </a-col>
               </a-row>
@@ -181,7 +184,7 @@ const columns = [
     title: '缴费金额',
     dataIndex: 'amountReceived',
     align: 'center',
-    scopedSlots: { customRender: 'text' }
+    scopedSlots: { customRender: 'money' }
   }, {
     title: '缴费凭证',
     dataIndex: 'proof',
diff --git a/src/views/MessagePage/modules/PaymentVoucherModal.vue b/src/views/MessagePage/modules/PaymentVoucherModal.vue
index f12c215..e56b2bf 100644
--- a/src/views/MessagePage/modules/PaymentVoucherModal.vue
+++ b/src/views/MessagePage/modules/PaymentVoucherModal.vue
@@ -25,6 +25,11 @@
             <label>审核时间：</label>
             <div>{{ model.reviewTime }}</div>
           </div>
+          <!--          只有被拒绝的情况下才需要拒绝说明-->
+          <div class="info-item" v-if="model.paymentStatus === 'rejected'">
+            <label>说明：</label>
+            <div>{{ model.reviewInstructions }}</div>
+          </div>
         </div>
 
         <h3 class="title">凭证信息</h3>
@@ -100,7 +105,7 @@ export default {
         edit: '/paymentCheck/payPaymentCheck/edit'
       },
       projectId: '',
-      projectType: '',
+      projectType: ''
     }
   },
   methods: {
diff --git a/src/views/MessagePage/modules/ProofInfoModal.vue b/src/views/MessagePage/modules/ProofInfoModal.vue
index 08f5ca1..11fd4b3 100644
--- a/src/views/MessagePage/modules/ProofInfoModal.vue
+++ b/src/views/MessagePage/modules/ProofInfoModal.vue
@@ -29,7 +29,7 @@
           </div>
         </div>
       </template>
-    
+
 
       <h3 class="title">凭证信息</h3>
       <div>
@@ -39,13 +39,14 @@
         </div>
         <div class="info-item">
           <label>缴费日期：</label>
-          <div>{{ proofInfo.paymentDate }}元</div>
+          <div>{{ proofInfo.paymentDate }}</div>
         </div>
         <div class="info-item">
           <label>付款凭证：</label>
-          <div class="proof-img">
+          <div class="proof-img" v-if="!!proofInfo.proof">
             <img :src="proofSrc(proofInfo.proof)" @click="previewProofImg(proofInfo.proof)">
           </div>
+          <span v-else>无</span>
         </div>
       </div>
     </div>
diff --git a/src/views/subBidCommittee/SubBidCommittee.vue b/src/views/subBidCommittee/SubBidCommittee.vue
index 38704ff..66ac879 100644
--- a/src/views/subBidCommittee/SubBidCommittee.vue
+++ b/src/views/subBidCommittee/SubBidCommittee.vue
@@ -69,6 +69,15 @@ export default {
     return {
       columns: [
         {
+          title: '序号',
+          dataIndex: '',
+          key: 'rowIndex',
+          width: 60,
+          align: 'center',
+          customRender: function (t, r, index) {
+            return parseInt(index) + 1
+          }
+        }, {
           title: '分标委名称',
           align: 'center',
           dataIndex: 'name',
diff --git a/src/views/subBidCommittee/SubBidCommitteeDetailPage.vue b/src/views/subBidCommittee/SubBidCommitteeDetailPage.vue
index 0dfecd2..7738ea1 100644
--- a/src/views/subBidCommittee/SubBidCommitteeDetailPage.vue
+++ b/src/views/subBidCommittee/SubBidCommitteeDetailPage.vue
@@ -27,6 +27,7 @@
           :dataSource="dataSource"
           :pagination="ipagination"
           :loading="loading"
+          @change="handleTableChange"
           class="j-table-force-nowrap">
 
           <template slot="text" slot-scope="text">
@@ -221,6 +222,7 @@ export default {
      * 获取在研项目
      */
     getUnderStudyProjectList() {
+      this.loading = true
       let param = {
         abbreviation: this.$route.query.abbreviation,
         pageNo: this.ipagination.current,
@@ -235,6 +237,8 @@ export default {
             this.ipagination.total = 0
           }
         }
+      }).finally(() => {
+        this.loading = false
       })
     },
     /**
@@ -270,13 +274,8 @@ export default {
      * @param filters
      * @param sorter
      */
-    handleTableChange(pagination, filters, sorter) {
-      //分页、排序、筛选变化时触发
-      //TODO 筛选
-      if (Object.keys(sorter).length > 0) {
-        this.isorter.column = sorter.field
-        this.isorter.order = 'ascend' === sorter.order ? 'asc' : 'desc'
-      }
+    handleTableChange(pagination) {
+      //分页变化时触发
       this.ipagination = pagination
       this.getUnderStudyProjectList()
     }
diff --git a/src/views/workTeam/WorkTeam.vue b/src/views/workTeam/WorkTeam.vue
index 1dd7fd5..01f14f4 100644
--- a/src/views/workTeam/WorkTeam.vue
+++ b/src/views/workTeam/WorkTeam.vue
@@ -54,11 +54,11 @@
 
           <!--        项目名称-->
           <template slot="projectName" slot-scope="text, record">
-            <j-ellipsis :value="text" :length="20" class="project-name" @click="toDetail(record)"></j-ellipsis>
+            <j-ellipsis :value="text" :length="11" class="project-name" @click="toDetail(record)"></j-ellipsis>
           </template>
 
           <template slot="text" slot-scope="text, record">
-            <j-ellipsis :value="text" :length="20"></j-ellipsis>
+            <j-ellipsis :value="text" :length="11"></j-ellipsis>
           </template>
 
           <!--          缴费凭证-->
@@ -102,7 +102,6 @@ export default {
           title: '项目名称',
           dataIndex: 'chargeProject',
           align: 'center',
-          width: 200,
           scopedSlots: { customRender: 'projectName' }
         }, {
           title: '项目负责人',
@@ -120,19 +119,18 @@ export default {
           title: '负责人邮箱',
           dataIndex: 'principalEmail',
           align: 'center',
-          width: 200,
+          width: 140,
           scopedSlots: { customRender: 'text' }
         }, {
           title: '运行周期',
           dataIndex: 'operationCycle',
           align: 'center',
-          width: 200,
+          width: 140,
           scopedSlots: { customRender: 'text' }
         }, {
           title: '任务及目标',
           dataIndex: 'missionAndObjectives',
           align: 'center',
-          width: 200,
           scopedSlots: { customRender: 'text' }
         }, {
           title: '缴费凭证状态',
diff --git a/src/views/workTeam/WorkTeamDetail.vue b/src/views/workTeam/WorkTeamDetail.vue
index 51a0c55..04b37a4 100644
--- a/src/views/workTeam/WorkTeamDetail.vue
+++ b/src/views/workTeam/WorkTeamDetail.vue
@@ -23,8 +23,7 @@
               </a-col>
 
               <!--        合同-->
-              <!--            v-if="detail.chargeWay === 2"-->
-              <a-col :span="8" class="basic-info-item">
+              <a-col :span="8" class="basic-info-item" v-if="detail.chargeWay === 2">
                 <label>合同编号：</label>
                 <span>{{ detail.contractNum }}</span>
               </a-col>