【update】-联调、修改问题

src/views/incomePayments/meetManage/Attendance.vue

@@ -1360,7 +1360,7 @@ export default {
         title: '确认审核',
         content: '是否确定批量审核报名信息?',
         onOk: function () {
-          that.$refs.auditModal.title = '审核报名信息'
+          that.$refs.auditModal.title = '批量审核报名信息'
           that.$refs.auditModal.open({ batch: true, ids }, true)
         }
       })

src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue

@@ -214,7 +214,7 @@
             <a @click="handleEditAccount(record)" :disabled="isAllowEditAccount(record)" v-has="'workingGroupMember:editAccount'">调账</a>
             <a @click="handleEdit(record)" v-has="'workingGroupMember:edit'">编辑</a>
             <a @click="handleDelete(record.id)" v-has="'workingGroupMember:delete'">删除</a>
-            <a @click="confirmVoucher(record.id)" v-has="'workingGroupMember:confirmVoucher'">确认凭证</a>
+            <a @click="confirmVoucher(record.id)" v-show="!record.confirmVoucher" v-has="'workingGroupMember:confirmVoucher'">确认凭证</a>
           </span>
         </a-table>
       </div>
@@ -329,7 +329,7 @@ export default {
         exportXlsUrl: '/project/payWorkingGroupSubitem/exportXls',
         importExcelUrl: '/project/payWorkingGroupSubitem/importExcel',
         downTemplateUrl: '/project/payWorkingGroupSubitem/downloadExcelModel',
-        // todo 需要进行修改
+        // 确认凭证
         confirmVoucher: '/project/payWorkingGroupSubitem/confirmVoucher'
       },
       columns: [
@@ -679,14 +679,10 @@ export default {
           getAction(that.url.confirmVoucher, {id: id}).then((res) => {
             if (res.success) {
               that.$message.success(res.message)
-              // 判断当前删除的数据是否是最后一页的最后一条数据，如果是的话页码减一
-              if (that.ipagination.current > 1 && ((that.ipagination.current - 1) * that.ipagination.pageSize) + 1 === that.ipagination.total) {
-                that.ipagination.current -= 1
-              }
               that.loadData()
             } else {
               if (res.message.indexOf('<br/>') > -1) {
-                that.messageLineFeed('删除失败', res.message)
+                that.messageLineFeed('确认凭证失败', res.message)
               } else {
                 that.$message.warning(res.message)
               }

src/views/projectManagement/WorkingGroupProjectManagement.vue

@@ -48,7 +48,7 @@
         <a-button type="primary" icon="plus" @click="handleAdd" v-has="'workingGroupProject:add'">新增</a-button>
         <a-button type="danger" icon="delete" @click="batchDel" v-has="'workingGroupProject:batchDel'">批量删除</a-button>
         <a-button type="primary" icon="plus" @click="handleBatchAddMemberUnit" v-has="'workingGroupMember:batchAdd'">批量新增成员单位</a-button>
-        <a-button type="primary" icon="plus" @click="handleExportAllFile" v-has="'workingGroupMember:exportAllFile'">全部文件导出</a-button>
+        <a-button type="primary" icon="download" @click="handleExportAllFile" v-has="'workingGroupProject:exportAllFile'">全部文件导出</a-button>
 
         <!--      进度条tooltip-->
         <div class="tooltip">
@@ -134,7 +134,7 @@ import ProgressBar from '@comp/ProgressBar'
 import PageHeaderTitle from '@comp/layouts/PageHeaderTitle'
 import IconWorkingGruop from '@/assets/imgs/icon/icon_working_group.png'
 import { copyWorkingGroup } from '../../api/incomePaymentsApi'
-import { downloadFile, getAction } from "../../api/manage";
+import { downloadFile, getAction } from '../../api/manage'
 import WorkingGroupMemberUnitModule from '@views/projectManagement/modules/WorkingGroupMemberUnitModule'
 
 export default {

src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue

@@ -28,7 +28,7 @@
           </a-col>
         </a-row>
         <!-- 批量添加时显示） -->
-        <!--todo 样式得调整，左侧和下面的成员单位应该保持一致。-->
+        <!--样式得调整，左侧和下面的成员单位应该保持一致。-->
         <template v-if="isBatchAdd && model.workingGroupIdList && model.workingGroupIdList.length > 0">
           <a-row v-for="(_, index) in model.workingGroupIdList" :key="index + ''">
               <!-- 对齐其他表单单独设置col样式 -->
@@ -209,7 +209,8 @@
               </a-form-item>
             </a-col>
           </a-row>
-          <!--2024-07-03 去掉待确收金额相关数据--><!--<template v-if="chargeWayType === 1 || chargeWayType === 2">
+          <!--2024-07-03 去掉待确收金额相关数据-->
+          <template v-if="!isBatchAdd && (chargeWayType === 1 || chargeWayType === 2)">
             <a-row>
               <a-col :xl="12" :sm="24">
                 <a-form-item label="待确收金额" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -269,7 +270,7 @@
               </a-col>
             </a-row>
 
-          </template>-->
+          </template>
 
           <a-row>
             <a-col :xl="12" :sm="24">

src/views/projectManagement/modules/WorkingGroupProjectModule.vue

@@ -267,7 +267,7 @@ export default {
       this.model = Object.assign({}, record)
       this.visible = true
       this.$nextTick(() => {
-        this.form.setFieldsValue(pick(this.model, 'workingGroupProject', 'year', 'payFlag', 'principalIdA', 'principalIdB', 'convokeNum', 'operationCycle', 'yearChargeA', 'chargeNoticeNoA', 'chargeNoticeAId', 'yearChargeB', 'chargeNoticeNoB', 'chargeNoticeBId', 'missionAndObjectives', 'remarks'))
+        this.form.setFieldsValue(pick(this.model, 'workingGroupProject', 'sortNo', 'year', 'payFlag', 'principalIdA', 'principalIdB', 'convokeNum', 'operationCycle', 'yearChargeA', 'chargeNoticeNoA', 'chargeNoticeAId', 'yearChargeB', 'chargeNoticeNoB', 'chargeNoticeBId', 'missionAndObjectives', 'remarks'))
         if (!this.model.id) {
           this.form.setFieldsValue({
             'year': (new Date().getFullYear()).toString(),