From 2700ab0406da708b10127e5a146bb71faea15b11 Mon Sep 17 00:00:00 2001
From: fengchenchen <fengchenchen@syxysoft.com>
Date: Sun, 9 Jul 2023 16:08:21 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90update=E3=80=91-=E9=97=AB=E5=B7=A5?=
 =?UTF-8?q?=E6=8F=90=E5=87=BA=E6=9C=80=E6=96=B0=E9=9C=80=E6=B1=82=E7=9A=84?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../incomePayments/meetManage/Attendance.vue  |  4 +
 .../modules/UploadMeetFileModal.vue           | 73 +++++++++++++------
 .../WorkingGroupMemberUnitMaintenance.vue     | 19 +++--
 3 files changed, 66 insertions(+), 30 deletions(-)

diff --git a/src/views/incomePayments/meetManage/Attendance.vue b/src/views/incomePayments/meetManage/Attendance.vue
index 5091d42..8406187 100644
--- a/src/views/incomePayments/meetManage/Attendance.vue
+++ b/src/views/incomePayments/meetManage/Attendance.vue
@@ -236,6 +236,9 @@
         <a-button type="danger" icon="delete" @click="batchDel" v-has:[authorCode.batchDel]="'attendance:batchDel'">
           批量删除
         </a-button>
+        <a-button type="danger" icon="delete" v-has:[authorCode.batchDel]="'attendance:batchDel'">
+          批量设置资料状态
+        </a-button>
         <!--当会议费用为0不需要合并开票  -->
         <!-- 变更将此功能添加到到账开票了 暂时注释 2021-09-16 -->
         <!-- <a-button type="primary" @click="batchInvoice" v-show="currentMeetingInfo.meetingCosts !== 0">合并开票</a-button>-->
@@ -310,6 +313,7 @@
           <a @click="handleEdit(record)" v-if="record.registerCheckResult !== 2" v-has:[authorCode.edit]="'attendance:edit'">编辑</a>
             <!--删除参会人需要判断改参会人是否与合同关联-->
           <a @click="handleDelete(record.id)" v-has:[authorCode.delete]="'attendance:delete'">删除</a>
+          <a  v-has:[authorCode.delete]="'attendance:delete'">资料状态</a>
         </span>
         </a-table>
       </div>
diff --git a/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue b/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue
index ac1be89..c20b553 100644
--- a/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue
+++ b/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue
@@ -8,26 +8,28 @@
     @cancel="handleCancel"
     cancelText="关闭">
     <a-spin :spinning="confirmLoading">
-      <a-form :form="form">
-        <a-row>
-          <a-col :span="24">
-            <!--上传会议资料显示 -->
-            <a-form-item label="会议文件" :labelCol="labelCol" :wrapperCol="wrapperCol" v-if="type === '2' ">
-              <j-upload file-type-error-message="请上传会议文件" :multiple="true"
-                        :return-id="true"
-                        v-decorator="['fileIds']"
-                        :trigger-change="true"></j-upload>
-            </a-form-item>
-            <!--上传会议纪要显示 -->
-            <a-form-item label="会议纪要" :labelCol="labelCol" :wrapperCol="wrapperCol" v-if="type === '1' ">
-              <j-upload file-type-error-message="请上传会议纪要" :multiple="true"
-                        :return-id="true"
-                        v-decorator="['fileIds']"
-                        :trigger-change="true"></j-upload>
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </a-form>
+      <div class="table-operator">
+        <a-button type="primary" icon="plus"  >新增</a-button>
+        <a-button type="danger" icon="delete" >
+          批量删除
+        </a-button>
+      </div>
+      <a-table
+        ref="table"
+        size="middle"
+        rowKey="id"
+        :scroll="{x:auto}"
+        :pagination="false"
+        :columns="columns"
+        :dataSource="fileList"
+        class="j-table-force-nowrap"
+      >
+      <span slot="action" slot-scope="record" class="action-span-cell">
+        <a class="color-blue" >下载</a>
+        <a class="color-blue" >查看</a>
+        <a class="color-blue" >删除</a>
+      </span>
+      </a-table>
     </a-spin>
     <email-error-msg-modal ref="emailError"></email-error-msg-modal>
   </j-modal>
@@ -38,6 +40,28 @@ import JUpload from '@comp/jero/JUpload'
 import {httpAction} from '@api/manage'
 import EmailErrorMsgModal from '@views/projectManagement/modules/EmailErrorMsgModal'
 
+const columns = [
+  {
+    title: '文件名',
+    align: 'center',
+    dataIndex: 'name',
+    width: 200
+  },
+  {
+    title: '上传人',
+    align: 'center',
+    dataIndex: 'createTime',
+    width: 100
+  },
+  {
+    title: '操作',
+    align: 'center',
+    dataIndex: '',
+    scopedSlots: {customRender: 'action'},
+    width: 100
+  }
+]
+
 export default {
   name: 'UploadMeetFileModal',
   components: {
@@ -47,7 +71,7 @@ export default {
   data() {
     return {
       title: '上传文件',
-      width: 400,
+      width: 1000,
       visible: false,
       confirmLoading: false,
       form: this.$form.createForm(this),
@@ -66,7 +90,9 @@ export default {
       // 已经上传的会议文件
       meetingFileIds: '',
       validatorRules: {},
-      url: {}
+      url: {},
+      columns,
+      fileList: [{}]
     }
   },
   methods: {
@@ -204,6 +230,7 @@ export default {
 }
 </script>
 
-<style scoped>
+<style scoped lang="less">
+@import '~@assets/less/common.less';
 
 </style>
diff --git a/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue b/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue
index 0330323..50c1efe 100644
--- a/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue
+++ b/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue
@@ -288,13 +288,6 @@ export default {
           width: 120,
           dataIndex: 'contactsTemporaryNameOne',
           scopedSlots: { customRender: 'text' }
-        }, {
-          // 2021-10-22需求变更新加
-          title: '收费通知号',
-          align: 'center',
-          width: 280,
-          dataIndex: 'chargeNoticeNo',
-          scopedSlots: { customRender: 'text' }
         }, {
           title: '应收金额',
           align: 'center',
@@ -311,33 +304,45 @@ export default {
           customRender: (text, record) => (
             <j-ellipsis value={ record.paidAmount + '元' } length={ 15 }></j-ellipsis>
           )
+        }, {
+          // 2021-10-22需求变更新加
+          title: '收费通知号',
+          align: 'center',
+          width: 280,
+          dataIndex: 'chargeNoticeNo',
+          scopedSlots: { customRender: 'text' }
         }, {
           title: '打包',
           align: 'center',
+          fixed: 'right',
           width: 80,
           dataIndex: 'pack',
           scopedSlots: { customRender: 'status-pack' }
         }, {
           title: '需要发票',
           align: 'center',
+          fixed: 'right',
           width: 80,
           dataIndex: 'needInvoice',
           scopedSlots: { customRender: 'status-pack' }
         }, {
           title: '到账',
           align: 'center',
+          fixed: 'right',
           width: 80,
           dataIndex: 'inAccount',
           scopedSlots: { customRender: 'status' }
         }, {
           title: '开票',
           align: 'center',
+          fixed: 'right',
           width: 80,
           dataIndex: 'makeInvoice',
           scopedSlots: { customRender: 'status-bill' }
         }, {
           title: '邮寄',
           align: 'center',
+          fixed: 'right',
           width: 80,
           dataIndex: 'mail',
           scopedSlots: { customRender: 'status-mail' }