Merge branch 'master' of http://gitea.biutag.com/police-mailbox/mailbox-lan-vue

src/views/work/Query.vue

@@ -110,11 +110,7 @@
                     <div>
                         <el-button type="primary" @click="checkMail">信件核对</el-button>
                         <el-button type="primary" @click="outputSelectedMail" class="ml-4">信件导出</el-button>
-                        <el-popconfirm title="是否导出当前筛选条件的所有信件?" @confirm="exportLedger">
-                            <template #reference>
-                                <el-button type="primary" @click="getList" class="ml-4">台账导出</el-button>
-                            </template>
-                        </el-popconfirm>
+
                     </div>
                     <div>
                         <el-button type="primary" @click="getList">查询</el-button>
@@ -364,8 +360,17 @@ const outputSelectedMail = () => {
 }
 
 const exportLedger = () => {
-    console.log("exportLedger", query.value);
-    axios.post('/lan-api/api/work/exportLedger', query.value, {
+    delete query.value.size
+    delete query.value.current
+
+    const data = query.value
+    if(data.flowKey)
+        data.flowKey = data.flowKey.join(',')
+    if(data.mailLabels)
+        data.mailLabels = data.mailLabels.join(',')
+    
+    console.log("exportLedger", data);
+    axios.post('/lan-api/api/work/exportLedger', data, {
         headers: {
             'Content-Type': 'application/json',
             'Accept': 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
@@ -465,9 +470,6 @@ function getList() {
         //清除隐藏参数
         delete query.value.signDeptId
         delete query.value.signRoleId
-        return new Promise((res) => {
-
-        })
     });
 }