From 55e5a6816cd83f0ff378cea04137079eb25999ca Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Thu, 23 Dec 2021 10:52:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=B0=E8=B4=A6=E5=BC=80=E7=A5=A8=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/imgs/icon/icon_back.png            | Bin 0 -> 258 bytes
 src/components/layouts/PageHeaderTitle.vue    |  77 ++++++++++++++++++
 src/views/MessagePage/PaymentVoucher.vue      |   6 +-
 src/views/MessagePage/ProjectDetailModal.vue  |   3 -
 .../modules/PaymentVoucherModal.vue           |   1 +
 .../MessagePage/modules/ProofInfoModal.vue    |  33 ++++----
 src/views/dataMember/DataMember.vue           |   2 +-
 src/views/mineContract/MineContract.vue       |  11 ++-
 .../modules/MineContractModule.vue            |   3 -
 src/views/mineProject/MineProject.vue         |   2 +-
 src/views/workTeam/WorkTeam.vue               |   2 +-
 11 files changed, 111 insertions(+), 29 deletions(-)
 create mode 100644 src/assets/imgs/icon/icon_back.png
 create mode 100644 src/components/layouts/PageHeaderTitle.vue

diff --git a/src/assets/imgs/icon/icon_back.png b/src/assets/imgs/icon/icon_back.png
new file mode 100644
index 0000000000000000000000000000000000000000..7346afcd0b72822de684798aac6990cb40ceccdd
GIT binary patch
literal 258
zcmV+d0sa1oP)<h;3K|Lk000e1NJLTq000R9000mO1^@s6#7I>`0002VNkl<ZC{uNj
z>q-Mr5QCFP)Q8v^@Pbw>;{8@^g=)nMC;PII1$SxPv-5NK$Yc`QAPJ)~ZQCww?{f;0
z^a|jd<cc)~Nh<(z+i#h9Hi9I*0Js3~9uc!nWC!X2+ndZh?XL`wqy>OW0Go&yfI&&p
zGk`0SA5GJo{P)RH$`i?J+n<?vTziC)?f~4|{>jXPD%34YDGwxX0enZq;pkkykn{-P
z2EbQD9BqR;5ls23g*p0ks+J+Mriob<>ilfgvz~<hzy*oDUx18Y1u~4krvLx|07*qo
IM6N<$f-Z1vZvX%Q

literal 0
HcmV?d00001

diff --git a/src/components/layouts/PageHeaderTitle.vue b/src/components/layouts/PageHeaderTitle.vue
new file mode 100644
index 0000000..125ce38
--- /dev/null
+++ b/src/components/layouts/PageHeaderTitle.vue
@@ -0,0 +1,77 @@
+<template>
+  <div class="page-header">
+    <!--    页面-->
+    <template v-if="isLevelOne">
+      <img :src="imgForIcon" class="page-header-icon">
+      <span class="page-header-title">{{ $route.meta.title }}</span>
+    </template>
+    <!--    需要有返回操作的页面-->
+    <template v-else>
+      <img :src="IconBack" class="page-header-icon page-header-icon-back" @click="backPage">
+      <img :src="imgForIcon" class="page-header-icon">
+      <span class="page-header-title">{{ levelTwoTitle }}</span>
+    </template>
+  </div>
+</template>
+
+<script>
+import IconBack from '@/assets/imgs/icon/icon_back.png'
+
+export default {
+  name: 'PageHeaderTitle',
+  props: {
+    // 是否为一级菜单
+    isLevelOne: {
+      type: Boolean,
+      default: true
+    },
+    // 图标图片
+    imgForIcon: {
+      type: String,
+      default: ''
+    },
+    // 有返回页面的标题
+    levelTwoTitle: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      IconBack
+    }
+  },
+  methods: {
+    backPage() {
+      this.$router.go(-1)
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+.page-header {
+  height: 60px;
+  background: #ffffff;
+  margin-bottom: 2px;
+  display: flex;
+  align-items: center;
+  padding-left: 20px;
+
+  &-icon {
+    height: 20px;
+    max-width: 30px;
+    margin-right: 10px;
+  }
+
+  &-icon-back {
+    cursor: pointer;
+  }
+
+  &-title {
+    font-size: 16px;
+    font-family: PingFang SC, PingFang SC-Medium;
+    color: #666666;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/MessagePage/PaymentVoucher.vue b/src/views/MessagePage/PaymentVoucher.vue
index 7fe4799..4a3be95 100644
--- a/src/views/MessagePage/PaymentVoucher.vue
+++ b/src/views/MessagePage/PaymentVoucher.vue
@@ -1,5 +1,6 @@
 <template>
   <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">
@@ -128,7 +129,7 @@
                     <span class="audit-info-item-content">{{ item.reviewTime }}</span>
                   </div>
                 </a-col>
-                <a-col :span="8">
+                <a-col :span="8" v-if="item.paymentStatus !== 'completed'">
                   <div class="audit-info-item">
                     <span class="audit-info-item-title">说明：</span>
                     <span class="audit-info-item-content">{{ item.reviewInstructions }}</span>
@@ -163,6 +164,7 @@ import PreviewImgModal from '@views/MessagePage/modules/PreviewImgModal'
 import ProofInfoModal from '@views/MessagePage/modules/ProofInfoModal'
 import { getAuditProofRecords } from '@api/incomePaymentsApi'
 import { convertToChinaNum } from '@/utils/util'
+import PageHeaderTitle from '@/components/layouts/PageHeaderTitle'
 
 const columns = [
   {
@@ -211,7 +213,7 @@ const columns = [
 
 export default {
   name: 'PaymentVoucher',
-  components: { PaymentVoucherModal, PreviewImgModal, ProofInfoModal },
+  components: { PaymentVoucherModal, PreviewImgModal, ProofInfoModal, PageHeaderTitle },
   mixins: [JeroListMixin],
   data() {
     return {
diff --git a/src/views/MessagePage/ProjectDetailModal.vue b/src/views/MessagePage/ProjectDetailModal.vue
index 227e6bc..ab63691 100644
--- a/src/views/MessagePage/ProjectDetailModal.vue
+++ b/src/views/MessagePage/ProjectDetailModal.vue
@@ -230,9 +230,6 @@ export default {
     PreviewFile,
     FileList
   },
-  created() {
-    console.log('xiangmuxiangqing')
-  },
   methods: {
     open(record) {
       this.visible = true
diff --git a/src/views/MessagePage/modules/PaymentVoucherModal.vue b/src/views/MessagePage/modules/PaymentVoucherModal.vue
index 1d76a5c..f12c215 100644
--- a/src/views/MessagePage/modules/PaymentVoucherModal.vue
+++ b/src/views/MessagePage/modules/PaymentVoucherModal.vue
@@ -154,6 +154,7 @@ export default {
       this.close()
     },
     close() {
+      this.form.resetFields()
       this.visible = false
     },
     /**
diff --git a/src/views/MessagePage/modules/ProofInfoModal.vue b/src/views/MessagePage/modules/ProofInfoModal.vue
index ca4b58d..08f5ca1 100644
--- a/src/views/MessagePage/modules/ProofInfoModal.vue
+++ b/src/views/MessagePage/modules/ProofInfoModal.vue
@@ -11,21 +11,25 @@
     <div>
       <div class="project-name">{{ projectName }}</div>
 
-      <h3 class="title">审核信息</h3>
-      <div>
-        <div class="info-item">
-          <label>审核结果：</label>
-          <div>{{ proofInfo.paymentStatus_dictText }}</div>
+      <!-- 待审核状态不显示审核信息 -->
+      <template v-if="proofInfo.paymentStatus !== 'toBeReviewed'">
+        <h3 class="title">审核信息</h3>
+        <div>
+          <div class="info-item">
+            <label>审核结果：</label>
+            <div>{{ proofInfo.paymentStatus_dictText }}</div>
+          </div>
+          <div class="info-item">
+            <label>审核人：</label>
+            <div>{{ proofInfo.reviewerName }}</div>
+          </div>
+          <div class="info-item">
+            <label>审核时间：</label>
+            <div>{{ proofInfo.reviewTime }}</div>
+          </div>
         </div>
-        <div class="info-item">
-          <label>审核人：</label>
-          <div>{{ proofInfo.reviewerName }}</div>
-        </div>
-        <div class="info-item">
-          <label>审核时间：</label>
-          <div>{{ proofInfo.reviewTime }}</div>
-        </div>
-      </div>
+      </template>
+    
 
       <h3 class="title">凭证信息</h3>
       <div>
@@ -87,7 +91,6 @@ export default {
      */
     open(record) {
       this.proofInfo = record
-      console.log(this.proofInfo)
       this.visible = true
     },
     handleCancel() {
diff --git a/src/views/dataMember/DataMember.vue b/src/views/dataMember/DataMember.vue
index a881d8b..446462e 100644
--- a/src/views/dataMember/DataMember.vue
+++ b/src/views/dataMember/DataMember.vue
@@ -115,7 +115,7 @@
 
           <!--          缴费凭证-->
           <span slot="action" class="action-span-cell" slot-scope="text,record">
-            <a @click="paymentVoucher(record)">缴费凭证</a>
+            <a @click="paymentVoucher(record)" :disabled="Number(record.amountReceivable) === 0">缴费凭证</a>
           </span>
         </a-table>
       </div>
diff --git a/src/views/mineContract/MineContract.vue b/src/views/mineContract/MineContract.vue
index 74cb71f..0888512 100644
--- a/src/views/mineContract/MineContract.vue
+++ b/src/views/mineContract/MineContract.vue
@@ -42,12 +42,12 @@
 
           <!--        作废-->
           <template slot="invalid" slot-scope="text, record">
-            <j-ellipsis :value="text" :length="18"></j-ellipsis>
+            <j-ellipsis :value="text" :length="15"></j-ellipsis>
             <a-tag color="red" v-if="record.status === 6">已作废</a-tag>
           </template>
 
           <template slot="text" slot-scope="text, record">
-            <j-ellipsis :value="text" :length="18"></j-ellipsis>
+            <j-ellipsis :value="text" :length="20"></j-ellipsis>
           </template>
 
           <template slot="action" slot-scope="text, record">
@@ -92,26 +92,31 @@ export default {
           title: '合同编号',
           dataIndex: 'contractNum',
           align: 'center',
+          width: 280,
           scopedSlots: { customRender: 'text' }
         }, {
           title: '合同名称',
           dataIndex: 'contractName',
           align: 'center',
+          width: 280,
           scopedSlots: { customRender: 'invalid' }
         }, {
           title: '关联项目',
           dataIndex: 'associatedProject',
           align: 'center',
+          width: 280,
           scopedSlots: { customRender: 'text' }
         }, {
           title: '签订单位',
           dataIndex: 'signedCompanyTemporaryName',
           align: 'center',
+          width: 280,
           scopedSlots: { customRender: 'text' }
         }, {
           title: '签订单位联系人',
           dataIndex: 'signedContactsTemporaryName',
           align: 'center',
+          width: 280,
           scopedSlots: { customRender: 'text' }
         }, {
           title: '合同总金额',
@@ -123,7 +128,7 @@ export default {
           title: '创建时间',
           dataIndex: 'createTime',
           align: 'center',
-          width: 160,
+          width: 200,
           scopedSlots: { customRender: 'text' }
         }, {
           title: '邮寄信息',
diff --git a/src/views/mineContract/modules/MineContractModule.vue b/src/views/mineContract/modules/MineContractModule.vue
index 0fea1cc..106b044 100644
--- a/src/views/mineContract/modules/MineContractModule.vue
+++ b/src/views/mineContract/modules/MineContractModule.vue
@@ -145,9 +145,6 @@ export default {
       associatedProjectList: [] // 关联项目信息
     }
   },
-  created() {
-    console.log(11111111)
-  },
   methods: {
     /**
      * 获取详情信息
diff --git a/src/views/mineProject/MineProject.vue b/src/views/mineProject/MineProject.vue
index 8920d29..16b7b94 100644
--- a/src/views/mineProject/MineProject.vue
+++ b/src/views/mineProject/MineProject.vue
@@ -63,7 +63,7 @@
 
           <!--          缴费凭证-->
           <span slot="action" class="action-span-cell" slot-scope="text,record">
-            <a @click="paymentVoucher(record)">缴费凭证</a>
+            <a @click="paymentVoucher(record)" :disabled="Number(record.receivableAmount) === 0">缴费凭证</a>
           </span>
         </a-table>
       </div>
diff --git a/src/views/workTeam/WorkTeam.vue b/src/views/workTeam/WorkTeam.vue
index 63c7e75..c5c4f56 100644
--- a/src/views/workTeam/WorkTeam.vue
+++ b/src/views/workTeam/WorkTeam.vue
@@ -63,7 +63,7 @@
 
           <!--          缴费凭证-->
           <span slot="action" class="action-span-cell" slot-scope="text,record">
-            <a @click="paymentVoucher(record)">缴费凭证</a>
+            <a @click="paymentVoucher(record)" :disabled="Number(record.receivableAmount) === 0">缴费凭证</a>
           </span>
         </a-table>
       </div>