From ed4092c436d92b8e773a1ef9f1ad0142b552bbac Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Wed, 15 Dec 2021 20:38:55 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E5=B7=A5=E4=BD=9C=E7=BB=84=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=AD=97=E6=AE=B5=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/workTeam/WorkTeam.vue | 38 +++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/src/views/workTeam/WorkTeam.vue b/src/views/workTeam/WorkTeam.vue
index 84ba284..dbba7db 100644
--- a/src/views/workTeam/WorkTeam.vue
+++ b/src/views/workTeam/WorkTeam.vue
@@ -10,18 +10,18 @@
                 <a-input placeholder="请输入项目名称" v-model="queryParam.chargeProject" :maxLength="50"></a-input>
               </a-form-item>
             </a-col>
-<!--            <a-col :xl="6" :lg="8" :md="8" :sm="24">-->
-<!--              <a-form-item label="需要发票">-->
-<!--                <j-dict-select-tag dict-code="invoice_type" placeholder="请选择是否需要发票"-->
-<!--                                   v-model="queryParam.needInvoice"></j-dict-select-tag>-->
-<!--              </a-form-item>-->
-<!--            </a-col>-->
-<!--            <a-col :xl="6" :lg="8" :md="8" :sm="24">-->
-<!--              <a-form-item label="打包项目">-->
-<!--                <j-dict-select-tag dict-code="yn" placeholder="请选择是否打包"-->
-<!--                                   v-model="queryParam.pack"></j-dict-select-tag>-->
-<!--              </a-form-item>-->
-<!--            </a-col>-->
+            <!--            <a-col :xl="6" :lg="8" :md="8" :sm="24">-->
+            <!--              <a-form-item label="需要发票">-->
+            <!--                <j-dict-select-tag dict-code="invoice_type" placeholder="请选择是否需要发票"-->
+            <!--                                   v-model="queryParam.needInvoice"></j-dict-select-tag>-->
+            <!--              </a-form-item>-->
+            <!--            </a-col>-->
+            <!--            <a-col :xl="6" :lg="8" :md="8" :sm="24">-->
+            <!--              <a-form-item label="打包项目">-->
+            <!--                <j-dict-select-tag dict-code="yn" placeholder="请选择是否打包"-->
+            <!--                                   v-model="queryParam.pack"></j-dict-select-tag>-->
+            <!--              </a-form-item>-->
+            <!--            </a-col>-->
             <a-col :xl="6" :lg="8" :md="8" :sm="24">
               <a-form-item label="运行年份">
                 <j-year-date style="width:100%" placeholder="请选择运行年份" v-model="queryParam.year"></j-year-date>
@@ -115,12 +115,22 @@ export default {
           scopedSlots: { customRender: 'text' }
         }, {
           title: '负责人邮箱',
-          dataIndex: 'principalMail',
+          dataIndex: 'principalEmail',
+          align: 'center',
+          scopedSlots: { customRender: 'text' }
+        }, {
+          title: '运行周期',
+          dataIndex: 'operationCycle',
+          align: 'center',
+          scopedSlots: { customRender: 'text' }
+        }, {
+          title: '任务及目标',
+          dataIndex: 'missionAndObjectives',
           align: 'center',
           scopedSlots: { customRender: 'text' }
         }, {
           title: '缴费凭证状态',
-          dataIndex: 'status',
+          dataIndex: 'paymentStatus_dictText',
           align: 'center',
           scopedSlots: { customRender: 'text' }
         }, {