Merge remote-tracking branch 'origin/master'

src/views/bg/bgpartymatter/BgPartymatterList.vue

@@ -19,14 +19,20 @@
               <JInput v-model:value="queryParam.content" type="like" placeholder="请输入会议决议" allow-clear trim />
             </a-form-item>
           </a-col>
-<!--          <a-col :lg="6" :md="8" :sm="12">-->
+          <!--          <a-col :lg="6" :md="8" :sm="12">-->
-<!--            <a-form-item label="事项目录编码" name="matterCode">-->
+          <!--            <a-form-item label="事项目录编码" name="matterCode">-->
-<!--              <JInput v-model:value="queryParam.matterCode" type="like" placeholder="请输入事项目录编码" allow-clear trim />-->
+          <!--              <JInput v-model:value="queryParam.matterCode" type="like" placeholder="请输入事项目录编码" allow-clear trim />-->
-<!--            </a-form-item>-->
+          <!--            </a-form-item>-->
-<!--          </a-col>-->
+          <!--          </a-col>-->
           <a-col :lg="6" :md="6" :sm="8">
             <a-form-item label="完成状态" name="bpmStatus">
-              <JDictSelectTag v-model:value="queryParam.bpmStatus" dictCode="super_status" placeholder="请选择完成状态" allow-clear @change="searchQuery" />
+              <JDictSelectTag
+                v-model:value="queryParam.bpmStatus"
+                dictCode="super_status"
+                placeholder="请选择完成状态"
+                allow-clear
+                @change="searchQuery"
+              />
             </a-form-item>
           </a-col>
           <a-col :lg="3" :md="8" :sm="12">
@@ -43,11 +49,17 @@
       <BasicTable @register="registerTable" :rowSelection="rowSelection" :expandedRowKeys="expandedRowKeys" @expand="handleExpand">
         <!--插槽:table标题-->
         <template #tableTitle>
-          <a-button type="primary" v-auth="actionAuth.add"  @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <a-button type="primary" v-auth="actionAuth.add" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
-          <a-button type="primary" v-auth="actionAuth.exportXls"  preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+          <a-button type="primary" v-auth="actionAuth.exportXls" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
-<a-button type="primary" v-auth="actionAuth.exportXls" preIcon="ant-design:download-outlined" @click="handleDownloadTemplate">下载模板</a-button>
+          <a-button type="primary" v-auth="actionAuth.exportXls" preIcon="ant-design:download-outlined" @click="handleDownloadTemplate"
-          <j-upload-button type="primary" v-auth="actionAuth.importExcel" preIcon="ant-design:check-outlined" @click="handleCheckExcel">模板校验</j-upload-button>
+            >下载模板</a-button
-          <j-upload-button type="primary" v-auth="actionAuth.importExcel" preIcon="ant-design:import-outlined" @click="handleImportByTemplate">模板导入</j-upload-button>
+          >
+          <j-upload-button type="primary" v-auth="actionAuth.importExcel" preIcon="ant-design:check-outlined" @click="handleCheckExcel"
+            >模板校验</j-upload-button
+          >
+          <j-upload-button type="primary" v-auth="actionAuth.importExcel" preIcon="ant-design:import-outlined" @click="handleImportByTemplate"
+            >模板导入</j-upload-button
+          >
           <a-dropdown v-if="selectedRowKeys.length > 0">
             <template #overlay>
               <a-menu>
@@ -70,8 +82,7 @@
           <TableAction stopButtonPropagation :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
         </template>
         <!--字段回显插槽-->
-        <template v-slot:bodyCell="{ column, record, index, text }">
+        <template v-slot:bodyCell="{ column, record, index, text }"> </template>
-        </template>
         <!--嵌套子表-->
         <template #expandedRowRender="{ record }">
           <div class="feedback-expand-table">
@@ -120,8 +131,8 @@
     </div>
     <!-- 表单区域 -->
     <BgPartymatterModal ref="registerModal" @success="handleSuccess" />
-      <!-- 审批记录 -->
+    <!-- 审批记录 -->
-      <BpmPictureModal @register="registerBpmModal" />
+    <BpmPictureModal @register="registerBpmModal" />
     <FlowScheduleStartModalForBG ref="flowScheduleModalRef" @confirm="handleFlowScheduleConfirm" />
     <BusinessProcessListModal ref="businessProcessListModalRef" />
   </div>
@@ -619,7 +630,7 @@
   });
 
   async function handleDownloadTemplate() {
-    const data = await defHttp.get({ url: getExportXlsHeadersUrl, params: {}, responseType: 'blob', timeout: 60000 }, { isTransformResponse: false });
+    const data = await defHttp.get({ url: getExportXlsHeadersUrl, params: { meetingType: props.meetingType }, responseType: 'blob', timeout: 60000 }, { isTransformResponse: false });
     if (!data) {
       createMessage.warning('文件下载失败');
       return;
@@ -648,7 +659,7 @@
         // ignore
       }
     };
-    await defHttp.uploadFile({ url: getCheckExcelByEasyExcelUrl }, { file: data.file }, { success: isReturn });
+    await defHttp.uploadFile({ url: getCheckExcelByEasyExcelUrl + '?meetingType=' + props.meetingType }, { file: data.file }, { success: isReturn });
   }
 
   async function handleImportByTemplate(data) {
@@ -669,7 +680,7 @@
         reload();
       }
     };
-    await defHttp.uploadFile({ url: getImportExcelByEasyExcelUrl }, { file: data.file }, { success: isReturn });
+    await defHttp.uploadFile({ url: getImportExcelByEasyExcelUrl + '?meetingType=' + props.meetingType }, { file: data.file }, { success: isReturn });
   }
 
   /**
@@ -705,10 +716,10 @@
       margin-bottom: 24px;
       white-space: nowrap;
     }
-    .query-group-cust{
+    .query-group-cust {
       min-width: 100px !important;
     }
-    .query-group-split-cust{
+    .query-group-split-cust {
       width: 30px;
       display: inline-block;
       text-align: center;