From f3d4c717fafd3e0ff686d38d71e61a7c90eb64cf Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Sat, 9 Oct 2021 16:10:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=90=8C=E8=AF=A6=E6=83=85=EF=BC=8C?=
 =?UTF-8?q?=E8=B5=84=E6=96=99=E4=B8=8B=E8=BD=BD=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/MessagePage/ProjectDetailModal.vue  |  6 +---
 src/views/dataDownload/DataDownload.vue       |  4 +--
 .../modules/MineContractModule.vue            | 30 ++++++++++++++++---
 3 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/src/views/MessagePage/ProjectDetailModal.vue b/src/views/MessagePage/ProjectDetailModal.vue
index 7a74b3d..52caacf 100644
--- a/src/views/MessagePage/ProjectDetailModal.vue
+++ b/src/views/MessagePage/ProjectDetailModal.vue
@@ -298,11 +298,7 @@ export default {
       if (this.basicInfo.contractId) {
         this.contractId = this.basicInfo.contractId
         this.contractDetailVisible = true
-        // this.$router.push({
-        //   path: '/contractManagement/RevenueContractDetail', query: {
-        //     revenueId: this.basicInfo.contractId
-        //   }
-        // })
+        this.handleCancel()
       } else {
         this.$message.warn('该项目未与合同关联')
       }
diff --git a/src/views/dataDownload/DataDownload.vue b/src/views/dataDownload/DataDownload.vue
index 8b77514..5382af0 100644
--- a/src/views/dataDownload/DataDownload.vue
+++ b/src/views/dataDownload/DataDownload.vue
@@ -7,7 +7,7 @@
           <a-row :gutter="24">
             <a-col :xl="6" :lg="8" :md="8" :sm="24">
               <a-form-item label="文件名称">
-                <a-input placeholder="请输入文件名称" v-model="queryParam.meetingName"></a-input>
+                <a-input placeholder="请输入文件名称" v-model="queryParam.fileName"></a-input>
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="8" :md="8" :sm="24">
@@ -93,7 +93,7 @@ export default {
         }, {
           title: '文件来源',
           align: 'center',
-          width: 220,
+          width: 280,
           dataIndex: 'fileCome',
           scopedSlots: { customRender: 'text' }
         }, {
diff --git a/src/views/mineContract/modules/MineContractModule.vue b/src/views/mineContract/modules/MineContractModule.vue
index d670d1b..3b7fbd9 100644
--- a/src/views/mineContract/modules/MineContractModule.vue
+++ b/src/views/mineContract/modules/MineContractModule.vue
@@ -149,8 +149,11 @@ export default {
       this.loading = true
       this.logisticsInfoList = []
       getContractDetailById({ id: this.contractId }).then(res => {
-        res.result.payMailContract.contractNum = res.result.contractNum
-        this.logisticsInfoList.push(res.result.payMailContract)
+        // 给邮寄信息放入合同号
+        if (res.result.payMailContract && Object.keys(res.result.payMailContract).length > 0) {
+          res.result.payMailContract.contractNum = res.result.contractNum
+          this.logisticsInfoList.push(res.result.payMailContract)
+        }
         this.associatedProjectList = res.result.listProject
         this.contractDetail = res.result
       }).finally(() => {
@@ -161,12 +164,11 @@ export default {
     * 打开项目详情模态框
     * */
     openDetailModal(record) {
-      console.log(this.contractId)
-      console.log(record)
       // 用projectId替换id
       let param = JSON.parse(JSON.stringify(record))
       param.id = param.projectId
       this.$refs.projectDetail.open(param)
+      this.close()
     },
     lookLogistics() {
       window.open('https://www.ems.com.cn/', '_blank')
@@ -200,4 +202,24 @@ h3.title::before {
   color: #069f99;
   cursor: pointer;
 }
+
+.wrap-table {
+  border: 1px solid #ccc;
+  border-bottom: none;
+}
+
+/deep/ .ant-table-thead {
+  tr > th {
+    color: #fff;
+    background: #a2e6e4;
+    border: none;
+  }
+}
+
+/deep/ .ant-table-tbody {
+  tr > td {
+    border: none;
+    border-bottom: 1px solid #ccc;
+  }
+}
 </style>
\ No newline at end of file