Merge branch 'main' of http://47.112.118.149:10082/xgxt_sd/zhxg_pc

src/api/routine/stuIdReissue.js

@@ -103,10 +103,19 @@ export function getStuIdReissueStatus(stuNo) {
   })
 }
 
-// 完成制作
+// 完成学生证补办
 export function completedStuIdReissue(id) {
   return request({
     url: '/routine/stuIdReissue/completed/' + id,
     method: 'post'
   })
 }
+
+// 导出学生证补办数据
+export function exportStuIdReissue(query) {
+  return request({
+    url: '/routine/stuIdReissue/export',
+    method: 'get',
+    params: query
+  })
+}

src/views/survey/leave/fdy.vue

@@ -39,6 +39,9 @@
             <el-col :span="1.5">
                 <el-button type="primary" icon="el-icon-view" size="mini" plain @click="willVClick">查看预计离校情况</el-button>
             </el-col>
+            <el-col :span="1.5">
+                <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleMainExport">导出</el-button>
+            </el-col>
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
         <el-table v-loading="loading" :data="itineraryList" @selection-change="handleSelectionChange">
@@ -192,8 +195,8 @@
                 <el-form-item label="是否填写" prop="isFilled">
                     <el-select v-model="lookParams.isFilled" placeholder="请选择是否填写" clearable>
                         <el-option label="全部" :value="null" />
-                        <el-option label="已填写" :value="1" />
-                        <el-option label="未填写" :value="0" />
+                        <el-option label="已提交" :value="1" />
+                        <el-option label="未提交" :value="0" />
                     </el-select>
                 </el-form-item>
                 <el-form-item>
@@ -268,8 +271,8 @@
 </template>
 
 <script>
-import { isEmpty, fullLoading } from "@/api/helpFunc";
-import { listFdy as listView, leaveAudit, manyLeaveAudit, manyLeaveReject, listFdyStuLeave, sendFdyStuLeaveMsg, countFdyClassWillLeave, updateItinerary } from "@/api/survey/itinerary";
+import { fullLoading, isEmpty } from "@/api/helpFunc";
+import { countFdyClassWillLeave, leaveAudit, listFdyStuLeave, listFdy as listView, manyLeaveAudit, manyLeaveReject, sendFdyStuLeaveMsg, updateItinerary } from "@/api/survey/itinerary";
 import { listAllSurvey } from "@/api/survey/survey";
 import XLSX from 'xlsx';
 
@@ -377,6 +380,12 @@ export default {
                 ...this.lookParams
             }, `itinerary_${new Date().getTime()}.xlsx`)
         },
+        /** 主列表导出按钮操作 */
+        handleMainExport() {
+            this.download('survey/itinerary/LeavExport', {
+                ...this.queryParams
+            }, `itinerary_${new Date().getTime()}.xlsx`)
+        },
         lookWillLeaveVClick(v) {
             this.$store.sur = {};
             this.$store.sur.willLeaveTime = v.label.replace("预计离校人数", "");