diff --git a/src/assets/less/TableExpand.less b/src/assets/less/TableExpand.less
index 5616c98..3a18951 100644
--- a/src/assets/less/TableExpand.less
+++ b/src/assets/less/TableExpand.less
@@ -1,7 +1,16 @@
 /** [表格主题样式一] 表格强制列不换行 */
 .j-table-force-nowrap {
+
   td, th {
     white-space: nowrap;
+    // fix:80450 表格内容超出宽度时，文字溢出显示省略号
+    overflow: hidden;
+    text-overflow: ellipsis;
+    word-break: break-all;
+  }
+  // fix:80495 表格选择列不设置溢出
+  .ant-table-selection-column {
+    overflow: visible;
   }
 
   .ant-table-selection-column {
diff --git a/src/components/company/CompanySelect.vue b/src/components/company/CompanySelect.vue
index 2f89a91..2a10ec8 100644
--- a/src/components/company/CompanySelect.vue
+++ b/src/components/company/CompanySelect.vue
@@ -2,7 +2,8 @@
   <div class="company-select">
     <a-row>
       <a-col :span="20">
-        <a-tooltip v-if="isMultiple">
+        <!-- fix:80474 没有内容时不显示悬浮 -->
+        <a-tooltip v-if="isMultiple && value[valueKey]">
           <template slot="title">{{ value[valueKey] }}</template>
           <a-input @click="chooseBusiness" :value="value[valueKey]" v-bind="$attrs" :readOnly="true" unselectable="on"></a-input>
         </a-tooltip>
diff --git a/src/components/company/SelectPrincipal.vue b/src/components/company/SelectPrincipal.vue
index e88f789..ef2cd3a 100644
--- a/src/components/company/SelectPrincipal.vue
+++ b/src/components/company/SelectPrincipal.vue
@@ -6,7 +6,7 @@
             allowClear
             option-filter-prop="children"
             :filter-option="filterOption">
-    <a-select-option v-for="item in userList" :key="item.id" :value="item.id">
+    <a-select-option v-for="item in userList" :key="item.id" :value="item.id" :title="`${ item.realname }(${ item.orgCodeTxt })`">
       {{ `${ item.realname }(${ item.orgCodeTxt })` }}
     </a-select-option>
   </a-select>
diff --git a/src/components/page/GlobalLayout.vue b/src/components/page/GlobalLayout.vue
index dfec8f8..2954944 100644
--- a/src/components/page/GlobalLayout.vue
+++ b/src/components/page/GlobalLayout.vue
@@ -667,6 +667,7 @@ body {
       margin-right: 10px;
 
       .ant-form-item-control-wrapper {
+        width: 0;
         flex: 1 1;
         display: inline-block;
         vertical-align: middle;
diff --git a/src/views/dashboard/Analysis.vue b/src/views/dashboard/Analysis.vue
index 182ff09..6295892 100644
--- a/src/views/dashboard/Analysis.vue
+++ b/src/views/dashboard/Analysis.vue
@@ -34,13 +34,13 @@
     <!--    所领导 部门领导展示统计图 -->
     <template v-else>
 
-      <!-- 全所收入统计 累计-->
+      <!-- 全院经营数据统计累计-->
       <single-month-total-echarts class="single-month-total "></single-month-total-echarts>
-      <!-- 全所收入统计 累计-->
+      <!-- 全院经营数据统计累计-->
 
-      <!--  全所收入统计 单月-->
+      <!--  全院经营数据统计单月-->
       <single-month-echarts class="single-month m-t-10"></single-month-echarts>
-      <!-- 全所收入统计 单月-->
+      <!-- 全院经营数据统计单月-->
 
       <!-- 科室总体统计 -->
       <department-total-echarts class="three-year m-t-10"></department-total-echarts>
@@ -177,7 +177,7 @@ export default {
 </script>
 
 <style lang="less" scoped>
-// 全所收入统计 单月
+// 全院经营数据统计单月
 .single-month,
 .single-month-total,
 .three-year {
diff --git a/src/views/dashboard/SingleMonthEcharts.vue b/src/views/dashboard/SingleMonthEcharts.vue
index a47e971..48470c7 100644
--- a/src/views/dashboard/SingleMonthEcharts.vue
+++ b/src/views/dashboard/SingleMonthEcharts.vue
@@ -2,7 +2,7 @@
 <template>
   <div class="container">
     <!--    echarts-->
-    <div class="title">全所收入统计 (单月)</div>
+    <div class="title">全院经营数据统计(单月)</div>
     <div class="echarts-box" id="singleMonthEcharts"></div>
     <!--    echarts-->
 
@@ -139,7 +139,7 @@ export default {
           //  树形结构的数据 ，修改成table可以直接展示的数据，默认只有四行数据
           let tableData = [
             // {indexName: '年度待确收金额'},
-            {indexName: '预计到账金额'},
+            {indexName: '预估收入金额'},
             {indexName: '确认收入金额'},
             {indexName: '开票金额'},
             {indexName: '到账金额'}
@@ -149,8 +149,7 @@ export default {
             let keyItem = MonthData.find(ele => Number(ele.value) === (index + 1))
             if (keyItem) {
               let key = keyItem.key
-              tableData[0][key] = item.estimatedArrivalMoney // todo 需要替换字段 预计到账金额--也可能放在第一条
-              // tableData[0][key] = Number(item.comeAllMoney) + 100000 // todo 需要替换字段 预计到账金额--也可能放在第一条
+              tableData[0][key] = item.estimatedArrivalMoney // 预估收入金额--也可能放在第一条
               // tableData[0][key] = item.allMoney // 年度待确收金额
               tableData[1][key] = item.confirmAmount // 确认收入金额
               tableData[2][key] = item.billMoney // 开票金额
@@ -159,7 +158,7 @@ export default {
             }
             // 单月总数
             if(index === 12){
-              tableData[0].key12 = item.estimatedArrivalMoney // 预计到账金额
+              tableData[0].key12 = item.estimatedArrivalMoney // 预估收入金额
               tableData[1].key12 = item.confirmAmount // 确认收入金额
               tableData[2].key12 = item.billMoney // 开票金额
               tableData[3].key12 = item.comeAllMoney // 到账金额
@@ -186,8 +185,6 @@ export default {
         this.echartsData.billMoney.push(item.billMoney)
         this.echartsData.comeAllMoney.push(item.comeAllMoney)
         this.echartsData.estimatedArrivalMoney.push(item.estimatedArrivalMoney)
-        // todo 后端开发完以后替换掉
-        // this.echartsData.estimatedArrivalMoney.push(Number(item.comeAllMoney) + 100000)
 
       })
     },
@@ -221,7 +218,7 @@ export default {
           }
         },
         legend: {
-          data: [ '预计到账金额', '确认收入金额', '开票金额', '到账金额'],
+          data: [ '预估收入金额', '确认收入金额', '开票金额', '到账金额'],
           right: '2%'
         },
         grid: {
@@ -302,7 +299,7 @@ export default {
           //   },
           // },
           {
-            name: '预计到账金额',
+            name: '预估收入金额',
             type: 'line',
             showSymbol: false,
             symbol: 'circle',
diff --git a/src/views/dashboard/SingleMonthTotalEcharts.vue b/src/views/dashboard/SingleMonthTotalEcharts.vue
index 248d0e0..a6431fd 100644
--- a/src/views/dashboard/SingleMonthTotalEcharts.vue
+++ b/src/views/dashboard/SingleMonthTotalEcharts.vue
@@ -2,7 +2,7 @@
 <template>
   <div class="container">
     <!--    echarts-->
-    <div class="title">全所收入统计 (累计)</div>
+    <div class="title">全院经营数据统计 (累计)</div>
     <div class="echarts-box" id="singleMonthTotalEcharts"></div>
     <!--    echarts-->
 
@@ -132,7 +132,7 @@ export default {
           //  树形结构的数据 ，修改成table可以直接展示的数据，默认只有四行数据
           let tableData = [
             // {indexName: '年度待确收金额'},
-            {indexName: '预计到账金额'},
+            {indexName: '预估收入金额'},
             {indexName: '确认收入金额'},
             {indexName: '开票金额'},
             {indexName: '到账金额'}
@@ -142,8 +142,7 @@ export default {
             let keyItem = MonthDataTotal.find(ele => Number(ele.value) === (index + 1))
             if (keyItem) {
               let key = keyItem.key
-              tableData[0][key] = item.estimatedArrivalMoney // todo 需要替换字段 预计到账金额--也可能放在第一条
-              // tableData[0][key] = Number(item.comeAllMoney) + 100000 // todo 需要替换字段 预计到账金额--也可能放在第一条
+              tableData[0][key] = item.estimatedArrivalMoney // 预估收入金额--也可能放在第一条
               // tableData[0][key] = item.allMoney // 年度待确收金额
               tableData[1][key] = item.confirmAmount // 确认收入金额
               tableData[2][key] = item.billMoney // 开票金额
@@ -172,8 +171,6 @@ export default {
         this.echartsData.billMoney.push(item.billMoney)
         this.echartsData.comeAllMoney.push(item.comeAllMoney)
         this.echartsData.estimatedArrivalMoney.push(item.estimatedArrivalMoney)
-        // todo 后端开发完以后替换掉
-        // this.echartsData.estimatedArrivalMoney.push(Number(item.comeAllMoney) + 100000)
       })
     },
     initEcharts() {
@@ -206,7 +203,7 @@ export default {
           }
         },
         legend: {
-          data: ['预计到账金额', '确认收入金额', '开票金额', '到账金额'],
+          data: ['预估收入金额', '确认收入金额', '开票金额', '到账金额'],
           right: '2%'
         },
         grid: {
@@ -287,7 +284,7 @@ export default {
           //   },
           // },
           {
-            name: '预计到账金额',
+            name: '预估收入金额',
             type: 'line',
             showSymbol: false,
             symbol: 'circle',
diff --git a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
index 2b44fd8..610b6c8 100644
--- a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
+++ b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
@@ -158,9 +158,10 @@
           <span slot="action" class="action-span-cell" slot-scope="text, record">
             <!--            待审核状态显示审核按钮-->
             <!--会议项目待审核状态 待上传也显示审核 -->
+            <!-- fix:80477 管理员不显示审核按钮 adminAddFlag 是1就是管理员 -->
             <a @click="auditProof(record)"
                class="audit-btn"
-               v-if="record.checkPaymentStatus === 'toBeReviewed' ||  (record.projectType ===  3 && record.paymentStatus === 'toBeUploaded')  "
+               v-if="(record.adminAddFlag + '' !== '1') && (record.checkPaymentStatus === 'toBeReviewed' ||  (record.projectType ===  3 && record.paymentStatus === 'toBeUploaded'))  "
                v-has="'incomePaymentAndInvoiving:audit'">审核</a>
             <!--            未审核通过的会议项目不允许在这里来款-->
             <a @click="incomePayment(record)"
diff --git a/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue b/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue
index ff59ed5..7301275 100644
--- a/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue
+++ b/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue
@@ -44,7 +44,7 @@
           ref="table"
           size="middle"
           rowKey="id"
-          :scroll="{x:auto}"
+          :scroll="{x:'auto'}"
           :pagination="false"
           :columns="columns"
           :dataSource="fileList"
@@ -192,6 +192,8 @@ export default {
     },
     close() {
       this.$emit('close')
+      // fix:80439 解决弹窗下次打开时，回显历史数据
+      this.fileList = []
       this.meetingFileIds = ''
       this.type = ''
       this.visible = false
diff --git a/src/views/incomePayments/memberManage/SafeguardMemberList.vue b/src/views/incomePayments/memberManage/SafeguardMemberList.vue
index b08eed1..9bfb3bf 100644
--- a/src/views/incomePayments/memberManage/SafeguardMemberList.vue
+++ b/src/views/incomePayments/memberManage/SafeguardMemberList.vue
@@ -39,7 +39,7 @@
         <a-row :gutter="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="会员单位">
-              <a-input placeholder="请输入会员单位" v-model="queryParam.companyName"></a-input>
+              <a-input placeholder="请输入会员单位" v-model="queryParam['pmps.companyName']"></a-input>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
diff --git a/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue b/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue
index 4f179d8..33e9bc3 100644
--- a/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue
+++ b/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue
@@ -473,6 +473,19 @@ export default {
             'remark'
           )
         )
+        /* fix:80416 如果联系人找不到就回显空，而不是显示id */
+        // 查找企业联系人，找不到就置空
+        this.$refs.selectContacts.getContactsList().finally(() => {
+          if (!this.$refs.selectContacts.contactsList.find(item => item.id === this.model.companyContactId)) {
+            this.form.setFieldsValue({ companyContactId: undefined })
+          }
+        })
+        // 查找邮寄联系人，找不到就置空
+        this.$refs.selectMailContacts.getContactsList().finally(() => {
+          if (!this.$refs.selectMailContacts.contactsList.find(item => item.id === this.model.postContactId)) {
+            this.form.setFieldsValue({ postContactId: undefined })
+          }
+        })
       })
     },
     // 选择企业联系人 带出邮寄联系人
@@ -533,9 +546,19 @@ export default {
      *  选择会员单位
      * */
     companyChange(val) {
+      // 当前选中的企业和之前选中的企业一致，就不修改了
+      if (this.selectedCompany && val && this.selectedCompany.id === val.id) {
+        return
+      }
       // 清除合同号
       this.form.setFieldsValue({ contractNo: undefined })
       this.selectedCompany = Object.assign({}, val)
+
+      // fix:80417 切换企业清空两个联系人
+      this.form.setFieldsValue({
+        companyContactId: undefined,
+        postContactId: undefined
+      })
     },
     handleCancel() {
       this.selectedCompany = null
diff --git a/src/views/screen/incomePayments/SingleMonthEcharts.vue b/src/views/screen/incomePayments/SingleMonthEcharts.vue
index 1689d8c..f549f3c 100644
--- a/src/views/screen/incomePayments/SingleMonthEcharts.vue
+++ b/src/views/screen/incomePayments/SingleMonthEcharts.vue
@@ -3,7 +3,7 @@
   <div class="income-full-box">
     <img class="box-bg-img" src="../../../assets/screen/income_full_bg.png" alt="">
 
-    <div class="box-title">全所收入统计 (单月)</div>
+    <div class="box-title">全院经营数据统计(单月)</div>
     <div class="box-content">
       <div class="echarts-box" id="singleMonthEchartsScreen"></div>
       <!--   表格区域beign -->
diff --git a/src/views/screen/incomePayments/SingleMonthTotalEcharts.vue b/src/views/screen/incomePayments/SingleMonthTotalEcharts.vue
index 45dcc45..7b129b8 100644
--- a/src/views/screen/incomePayments/SingleMonthTotalEcharts.vue
+++ b/src/views/screen/incomePayments/SingleMonthTotalEcharts.vue
@@ -3,7 +3,7 @@
   <div class="income-full-box">
     <img class="box-bg-img" src="../../../assets/screen/income_full_bg.png" alt="">
 
-    <div class="box-title">全所收入统计 (累计)</div>
+    <div class="box-title">全院经营数据统计 (累计)</div>
     <div class="box-content">
       <!--    echarts-->
       <div class="echarts-box" id="singleMonthTotalEchartsScreen"></div>
diff --git a/src/views/screen/incomePayments/index.vue b/src/views/screen/incomePayments/index.vue
index 65d1bc2..07116cc 100644
--- a/src/views/screen/incomePayments/index.vue
+++ b/src/views/screen/incomePayments/index.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="screen-income-payment">
-    <!-- 全所收入统计 累计-->
+    <!-- 全院经营数据统计累计-->
     <single-month-total-echarts></single-month-total-echarts>
-    <!--  全所收入统计 单月-->
+    <!--  全院经营数据统计单月-->
     <single-month-echarts></single-month-echarts>
     <!-- 科室总体统计 -->
     <department-total-echarts ></department-total-echarts>
@@ -32,9 +32,9 @@ import AllMoneyTenEcharts from './AllMoneyTenEcharts'
 export default {
   name: 'index',
   components: {
-    // 全所收入统计 累计
+    // 全院经营数据统计累计
     SingleMonthTotalEcharts,
-    //  全所收入统计 单月
+    //  全院经营数据统计单月
     SingleMonthEcharts,
     DepartmentTotalEcharts,
     IncomeSortEcharts,