From b6785975c82c03c58fdf6d90aaa4cbd124d31525 Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Tue, 22 Feb 2022 10:04:06 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=90=88=E5=90=8C=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E7=AD=BE=E8=AE=A2=E5=8D=95=E4=BD=8D=E6=A8=A1=E7=B3=8A=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=EF=BC=8C=E5=88=97=E8=A1=A8=E5=AD=97=E6=AE=B5=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=E5=85=B3=E8=81=94=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ExpenditureContractList.vue               |  5 ++++
 .../revenueContract/RevenueContractList.vue   | 30 ++++++++++++-------
 .../WorkingGroupProjectManagement.vue         | 21 +++++++++----
 3 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/src/views/contractManagement/expenditureContract/ExpenditureContractList.vue b/src/views/contractManagement/expenditureContract/ExpenditureContractList.vue
index b1c086c..6a61d52 100644
--- a/src/views/contractManagement/expenditureContract/ExpenditureContractList.vue
+++ b/src/views/contractManagement/expenditureContract/ExpenditureContractList.vue
@@ -16,6 +16,11 @@
                 <a-input placeholder="请输入合同名称" v-model="queryParam.contractName" :maxLength='50'></a-input>
               </a-form-item>
             </a-col>
+            <a-col :xxl="4" :xl="10" :lg="12" :md="12" :sm="24">
+              <a-form-item label="签订单位" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <a-input placeholder="请输入签订单位" v-model="queryParam.signedCompanyTemporaryName" :maxLength='50'></a-input>
+              </a-form-item>
+            </a-col>
             <a-col :xxl="8" :xl="10" :lg="12" :md="12" :sm="24">
               <a-form-item label="创建时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <j-date
diff --git a/src/views/contractManagement/revenueContract/RevenueContractList.vue b/src/views/contractManagement/revenueContract/RevenueContractList.vue
index 87ce8e3..c63247a 100644
--- a/src/views/contractManagement/revenueContract/RevenueContractList.vue
+++ b/src/views/contractManagement/revenueContract/RevenueContractList.vue
@@ -16,9 +16,14 @@
                 <a-input placeholder="请输入合同名称" v-model="queryParam.contractName" :maxLength='50'></a-input>
               </a-form-item>
             </a-col>
+            <!--            <a-col :xl="8" :lg="9" :md="10" :sm="24">-->
+            <!--              <a-form-item label="关联项目" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+            <!--                <a-input placeholder="请输入关联项目" v-model="queryParam.projectName" :maxLength='50'></a-input>-->
+            <!--              </a-form-item>-->
+            <!--            </a-col>-->
             <a-col :xl="8" :lg="9" :md="10" :sm="24">
-              <a-form-item label="关联项目" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <a-input placeholder="请输入关联项目" v-model="queryParam.projectName" :maxLength='50'></a-input>
+              <a-form-item label="签订单位" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <a-input placeholder="请输入签订单位" v-model="queryParam.signedCompanyTemporaryName" :maxLength='50'></a-input>
               </a-form-item>
             </a-col>
             <a-col :xl="8" :lg="9" :md="10" :sm="24">
@@ -143,7 +148,8 @@
                v-has="'revenueContract:delete'">删除</a>
             <!-- <a :disabled="true" v-if="record.status === 5">已存档</a> -->
             <!--            待存档、已存档-->
-            <a v-if="record.status === 3 || record.status === 5" @click="handleCancellation(record)" v-has="'revenueContract:cancellation'">作废</a>
+            <a v-if="record.status === 3 || record.status === 5" @click="handleCancellation(record)"
+               v-has="'revenueContract:cancellation'">作废</a>
           </span>
         </a-table>
       </div>
@@ -219,13 +225,15 @@ export default {
           dataIndex: 'contractName',
           width: 240,
           scopedSlots: { customRender: 'text' }
-        }, {
-          title: '关联项目',
-          align: 'center',
-          dataIndex: 'associatedProject',
-          width: 280,
-          scopedSlots: { customRender: 'text' }
-        }, {
+        },
+        // {
+        //   title: '关联项目',
+        //   align: 'center',
+        //   dataIndex: 'associatedProject',
+        //   width: 280,
+        //   scopedSlots: { customRender: 'text' }
+        // },
+        {
           title: '签订单位',
           align: 'center',
           dataIndex: 'signedCompanyTemporaryName',
@@ -258,7 +266,7 @@ export default {
           dataIndex: 'action',
           align: 'center',
           fixed: 'right',
-          width: 200,
+          width: 170,
           scopedSlots: { customRender: 'action' }
         }
       ],
diff --git a/src/views/projectManagement/WorkingGroupProjectManagement.vue b/src/views/projectManagement/WorkingGroupProjectManagement.vue
index 7c3b04d..b51639b 100644
--- a/src/views/projectManagement/WorkingGroupProjectManagement.vue
+++ b/src/views/projectManagement/WorkingGroupProjectManagement.vue
@@ -75,11 +75,15 @@
 
           <!--        工作组名称-->
           <template slot="projectName" slot-scope="text, record">
-            <j-ellipsis
-              class="primary-color"
-              @click="goMemberUnitMaintenance(record)"
-              :value="text"
-              :length="20"></j-ellipsis>
+            <a-tooltip>
+              <template slot="title">{{ text }}</template>
+              <div class="primary-color text-over">{{ text }}</div>
+            </a-tooltip>
+            <!--            <j-ellipsis-->
+            <!--              class="primary-color"-->
+            <!--              @click="goMemberUnitMaintenance(record)"-->
+            <!--              :value="text"-->
+            <!--              :length="20"></j-ellipsis>-->
           </template>
 
           <!--        进度-->
@@ -332,7 +336,7 @@ export default {
       this.$refs.modalForm.edit(record)
       this.$refs.modalForm.title = '基本信息维护'
       this.$refs.modalForm.disableSubmit = false
-    },
+    }
   }
 }
 </script>
@@ -373,4 +377,9 @@ export default {
     background: #e8e8e8;
   }
 }
+
+.text-over {
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
 </style>