Merge branch 'master' of http://git.cc-lotus.info/Information/cxyy-web2

src/components/custom/custom-export.vue

@@ -0,0 +1,108 @@
+<template>
+  <div class="button" @click="toDownload">导出数据</div>
+  <el-dialog title="导出数据" v-model="show" :destroy-on-close="true" @close="toClose">
+    <el-row>
+      <el-col :span="24" class="one">
+        <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">全选</el-checkbox>
+      </el-col>
+      <el-col :span="24" class="two">
+        <el-checkbox-group v-model="checkedExport" @change="checkedExportChange">
+          <el-checkbox v-for="i in ecList" :label="i.column" :key="i.model">{{ i.zh }}</el-checkbox>
+        </el-checkbox-group>
+      </el-col>
+      <el-col :span="24" class="btn">
+        <el-button type="primary" size="mini" @click="toFile()">导出</el-button>
+      </el-col>
+    </el-row>
+  </el-dialog>
+</template>
+
+<script setup>
+import { ElMessage } from 'element-plus'
+import { UserStore } from '@/store/user'
+const userStore = UserStore()
+const user = computed(() => userStore.user)
+const $checkRes = inject('$checkRes')
+import { get } from 'lodash-es'
+import { ExportConfigStore } from '@/store/api/exportConfig'
+const ecStore = ExportConfigStore()
+const props = defineProps({
+  table: { type: String, required: true }
+})
+const show = ref(false)
+const checkedExport = ref([])
+const checkAll = ref(false)
+const isIndeterminate = ref(false)
+// 全选
+const handleCheckAllChange = (val) => {
+  if (val) {
+    checkedExport.value = ecList.value.map((i) => i.column)
+  } else {
+    checkedExport.value = []
+  }
+  isIndeterminate.value = false
+}
+// 选择
+const checkedExportChange = (value) => {
+  checkedExport.value = value
+  let checkedCount = value.length
+  const isCheckAll = checkedCount === ecList.value.length
+  checkAll.value = isCheckAll
+  if (value.length <= 0) isIndeterminate.value = false
+  else if (isCheckAll) isIndeterminate.value = false
+  else isIndeterminate.value = true
+}
+// 导出数据
+const toFile = async () => {
+  if (checkedExport.value.length > 0) {
+    const reqData = { table: props.table, config: checkedExport.value, user: user.value.id }
+    const res = await ecStore.mission(reqData)
+    if ($checkRes(res)) {
+      ElMessage({ type: `success`, message: `数据正在导出,请进入 导出管理 中查看` })
+    }
+    toClose()
+  } else {
+    ElMessage({ type: `warning`, message: `请选择导出信息字段` })
+  }
+}
+const toClose = () => {
+  show.value = false
+  checkedExport.value = []
+  checkAll.value = false
+  isIndeterminate.value = false
+}
+
+const ecList = ref([])
+const toDownload = async () => {
+  show.value = true
+  const result = await ecStore.fetch(props.table)
+  if ($checkRes(result)) {
+    ecList.value = get(result, 'data.config', [])
+  }
+}
+</script>
+<style scoped>
+.button {
+  background: #1875df;
+  padding: 0 10px;
+  height: 30px;
+  color: #fff;
+  line-height: 30px;
+  text-align: center;
+  cursor: default;
+  margin: 0 10px 0 0;
+}
+.one {
+  margin: 0 0 10px 0;
+}
+.two {
+  margin: 0 0 10px 0;
+  :deep(.el-checkbox) {
+    padding: 0 0 20px 0;
+  }
+}
+.btn {
+  text-align: center;
+  margin: 20px 0 0 0;
+}
+</style>

src/store/api/exportConfig.js

@@ -0,0 +1,29 @@
+import { defineStore } from 'pinia'
+import { AxiosWrapper } from '@/utils/axios-wrapper'
+const url = '/ec'
+const axios = new AxiosWrapper()
+
+export const ExportConfigStore = defineStore('exportConfig', () => {
+  const dict = async (payload) => {
+    const res = await axios.$get(`${url}/dict`)
+    return res
+  }
+  const update = async (payload) => {
+    const table = get(payload, 'table')
+    const res = await axios.$post(`${url}/${table}`, payload)
+    return res
+  }
+  const fetch = async (payload) => {
+    const res = await axios.$get(`${url}/user/${payload}`)
+    return res
+  }
+  const mission = async (payload) => {
+    const res = await axios.$post(`/asyncExport`, payload)
+    return res
+  }
+
+  return {
+    fetch,
+    mission
+  }
+})

src/views/center/achievement.vue

@@ -6,7 +6,8 @@
           <div class="one_left">
             <div class="button" @click="toAdd">发布成果</div>
             <div class="button" @click="toExpert">导入数据</div>
-            <div class="button" @click="toDownload">导出数据</div>
+            <!-- <div class="button" @click="toDownload">导出数据</div> -->
+            <custom-export table="Achievement"></custom-export>
           </div>
           <div class="one_right">
             <el-input v-model="searchForm.name" style="width: 250px" size="large" placeholder="搜索" @change="search" :suffix-icon="Search" />
@@ -515,6 +516,7 @@ const sizeChange = (limits) => {
 </script>
 <style scoped lang="scss">
 .main {
+  height:85vh;
   .one {
     height: 50px;
     display: flex;

src/views/center/demand.vue

@@ -6,7 +6,8 @@
           <div class="one_left">
             <div class="button" @click="toAdd">发布需求</div>
             <div class="button" @click="toExpert">导入数据</div>
-            <div class="button" @click="toDownload">导出数据</div>
+            <custom-export table="Demand"></custom-export>
+            <!-- <div class="button" @click="toDownload">导出数据</div> -->
           </div>
           <div class="one_right">
             <el-input v-model="searchForm.name" style="width: 250px" size="large" placeholder="搜索" @change="search" :suffix-icon="Search" />
@@ -493,6 +494,7 @@ const sizeChange = (limits) => {
 </script>
 <style scoped lang="scss">
 .main {
+  height: 85vh;
   .one {
     height: 50px;
     display: flex;

src/views/center/project.vue

@@ -6,7 +6,8 @@
           <div class="one_left">
             <div class="button" @click="toAdd">发布项目</div>
             <div class="button" @click="toExpert">导入数据</div>
-            <div class="button" @click="toDownload">导出数据</div>
+            <!-- <div class="button" @click="toDownload">导出数据</div> -->
+            <custom-export table="Project"></custom-export>
           </div>
           <div class="one_right">
             <el-input v-model="searchForm.name" style="width: 250px" size="large" placeholder="搜索" @change="search" :suffix-icon="Search" />
@@ -502,6 +503,7 @@ const sizeChange = (limits) => {
 </script>
 <style scoped lang="scss">
 .main {
+  height: 80vh;
   .one {
     height: 50px;
     display: flex;

src/views/center/supply.vue

@@ -6,7 +6,8 @@
           <div class="one_left">
             <div class="button" @click="toAdd">发布供给</div>
             <div class="button" @click="toExpert">导入数据</div>
-            <div class="button" @click="toDownload">导出数据</div>
+            <!-- <div class="button" @click="toDownload">导出数据</div> -->
+            <custom-export table="Supply"></custom-export>
           </div>
           <div class="one_right">
             <el-input v-model="searchForm.name" style="width: 250px" size="large" placeholder="搜索" @change="search" :suffix-icon="Search" />
@@ -101,19 +102,6 @@
             </el-col>
           </el-col>
         </transition>
-        <el-col :span="24" class="dialog_thr" v-if="dialog.type == '3'">
-          <el-col :span="24" class="one">
-            <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">全选</el-checkbox>
-          </el-col>
-          <el-col :span="24" class="two">
-            <el-checkbox-group v-model="checkedExport" @change="checkedExportChange">
-              <el-checkbox v-for="i in formFields" :label="i" :key="i.model">{{ i.label }}</el-checkbox>
-            </el-checkbox-group>
-          </el-col>
-          <el-col :span="24" class="btn">
-            <el-button type="primary" size="mini" @click="toFile()">导出</el-button>
-          </el-col>
-        </el-col>
         <el-col :span="24" class="dialog_four" v-if="dialog.type == '4'">
           <el-row justify="center">
             <el-col :span="16">
@@ -425,10 +413,7 @@ const checkedExportChange = (value) => {
 const toExpert = () => {
   dialog.value = { type: '4', show: true, title: '导入数据' }
 }
-// 导出数据
-const toDownload = () => {
-  dialog.value = { type: '3', show: true, title: '导出数据' }
-}
+// 导出数据转到组件
 
 // 下载导入模板
 const toTemplate = () => {
@@ -463,21 +448,6 @@ const onImport = async () => {
     msgbox.close()
   }
 }
-
-// 导出数据
-const toFile = async () => {
-  if (checkedExport.value.length > 0) {
-    const reqData = { table: 'supply', config: checkedExport.value, user: user.value.id }
-    const res = await utilStore.toExport(reqData)
-    if (res.errcode == '0') {
-      ElMessage({ type: `success`, message: `导出成功` })
-      window.open(res.data)
-    }
-    toClose()
-  } else {
-    ElMessage({ type: `warning`, message: `请选择导出信息字段` })
-  }
-}
 // 分页
 const changePage = (page = currentPage.value) => {
   search({ skip: (page - 1) * limit, limit: limit })
@@ -490,6 +460,7 @@ const sizeChange = (limits) => {
 </script>
 <style scoped lang="scss">
 .main {
+  height:85vh;
   .one {
     height: 50px;
     display: flex;