From a5822ca276f2d33d9151e23c3d916467857eeeee Mon Sep 17 00:00:00 2001
From: wenhua <1084668738@qq.com>
Date: Sat, 11 May 2024 00:14:03 +0800
Subject: [PATCH 1/9] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E6=8C=89=E9=92=AEbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/directives/permission.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/directives/permission.js b/src/directives/permission.js
index 65ea03a..e68fcc8 100644
--- a/src/directives/permission.js
+++ b/src/directives/permission.js
@@ -8,7 +8,7 @@ export const hasPerm = (el, binding, vnode) => {
   if (value && value instanceof Array && value.length > 0) {
     const permissiosFlag = value
     const hasPermission = permisstions.some(permission => {
-      return allPermission === permission || permissiosFlag.includes(permission)
+      return permissiosFlag[0] === allPermission || permissiosFlag[0] === permission
     })
     if (!hasPermission) {
       el.parentNode && el.parentNode.removeChild(el)

From 3ba7845893295f84813f97c41ca0d4017bb26b01 Mon Sep 17 00:00:00 2001
From: wenhua <1084668738@qq.com>
Date: Sat, 11 May 2024 00:14:25 +0800
Subject: [PATCH 2/9] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=E4=B8=8A=E6=8A=A5=E9=83=A8=E5=88=86=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectdemand/demandsummary/add.vue | 168 ++++++++++++++++++
 .../projectdemand/demandsummary/index.vue     |  53 +++++-
 2 files changed, 214 insertions(+), 7 deletions(-)
 create mode 100644 src/views/projectdemand/demandsummary/add.vue

diff --git a/src/views/projectdemand/demandsummary/add.vue b/src/views/projectdemand/demandsummary/add.vue
new file mode 100644
index 0000000..b806bde
--- /dev/null
+++ b/src/views/projectdemand/demandsummary/add.vue
@@ -0,0 +1,168 @@
+<template>
+  <fvForm :schema="schame" @getInstance="getInstance"></fvForm>
+  <div class="oper-page-btn">
+      <el-button type="primary" @click="staging">存为草稿</el-button>
+      <el-button type="primary" @click="handleSubmit">发布</el-button>
+    </div>
+</template>
+
+<script setup lang="jsx">
+import fvSelect from '@/fvcomponents/fvSelect/index.vue'
+
+const localData = reactive({
+  form: null
+})
+
+const schame = computed(()=>{
+  let arr = [
+    {
+      label: '名称',
+      prop: 'name',
+      component: 'el-input',
+      props: {},
+      colProps: {
+        span: 12
+      }
+    },
+    {
+      label: '开始时间',
+      prop: 'startTime',
+      component: 'el-date-picker',
+      props: {},
+      colProps: {
+        span: 12
+      }
+    },
+    {
+      label: '所属公司',
+      prop: 'company',
+      component: 'el-input',
+      props: {},
+      colProps: {
+        span: 12
+      }
+    },
+    {
+      label: '项目类型',
+      prop: 'projectType',
+      component: markRaw(fvSelect),
+      props: {},
+      colProps: {
+        span: 12
+      }
+    },
+    {
+      label: '结束时间',
+      prop: 'endTime',
+      component: 'el-date-picker',
+      props: {},
+      colProps: {
+        span: 12
+      }
+    },
+    {
+      label: '出资类型',
+      prop: 'monenyType',
+      component: markRaw(fvSelect),
+      props: {},
+      colProps: {
+        span: 12
+      }
+    },
+    {
+      label: '项目影响',
+      prop: 'projectEffect',
+      component: markRaw(fvSelect),
+      props: {},
+      colProps: {
+        span: 12
+      }
+    },
+    {
+      label: '所属业务板块',
+      prop: 'ywbank',
+      component: markRaw(fvSelect),
+      props: {},
+      colProps: {
+        span: 12
+      }
+    },
+    {
+      label: '预期成果形式',
+      prop: 'yuqichengg',
+      component: markRaw(fvSelect),
+      props: {},
+      colProps: {
+        span: 12
+      }
+    },
+    {
+      label: '预期技术标准制定',
+      prop: 'yuqizhidingbiaozhu',
+      component: markRaw(fvSelect),
+      props: {},
+      colProps: {
+        span: 12
+      }
+    },
+    {
+      label: '产学研联合',
+      prop: 'chanxue',
+      component: markRaw(fvSelect),
+      props: {},
+      colProps: {
+        span: 12
+      }
+    },
+    {
+      label: '开展政府申报',
+      prop: 'zhengfushenbao',
+      component: markRaw(fvSelect),
+      props: {},
+      colProps: {
+        span: 12
+      }
+    },
+    {
+      label: '知识产权状况',
+      prop: 'zhishichanquan',
+      component: markRaw(fvSelect),
+      props: {},
+      colProps: {
+        span: 12
+      }
+    },
+    {
+      label: '现有业务描述',
+      prop: 'yewudes',
+      component: 'el-input',
+      props: {
+        type: 'textarea'
+      },
+      colProps: {
+        span: 24
+      }
+    },
+    {
+      label: '研发项目关键内容描述',
+      prop: 'contentnesss',
+      component: 'el-input',
+      props: {
+        type: 'textarea'
+      },
+      colProps: {
+        span: 24
+      }
+    },
+  ]
+  return arr
+})
+
+const getInstance = (e) => {
+  localData.form = e
+}
+
+const handleSubmit = async () => {}
+
+const staging = async () => {}
+</script>
\ No newline at end of file
diff --git a/src/views/projectdemand/demandsummary/index.vue b/src/views/projectdemand/demandsummary/index.vue
index f43b74c..be505a6 100644
--- a/src/views/projectdemand/demandsummary/index.vue
+++ b/src/views/projectdemand/demandsummary/index.vue
@@ -1,21 +1,28 @@
 <template>
-  <fvSearchForm :searchConfig="searchConfig"></fvSearchForm>
-  <fvTable :table-config="tableConfig"></fvTable>
+  <fvSearchForm :searchConfig="searchConfig" @search="search"></fvSearchForm>
+  <fvTable ref="tableIns" :tableConfig="tableConfig" @headBtnClick="headBtnClick"></fvTable>
 </template>
 
 <script setup lang="jsx">
-import { reactive, shallowRef } from 'vue';
-import fvSelect from './../../../fvcomponents/fvSelect/index.vue'
+import { reactive, ref, shallowRef } from 'vue';
+import fvSelect from '@/fvcomponents/fvSelect/index.vue'
+import { useRouter } from 'vue-router';
 
 const localData = reactive({
-  // 表格配置
   
 })
 
+const tableIns= ref()
+const router = useRouter()
+
+
 const searchConfig = reactive([
   {
     label: '名称',
     prop: 'name',
+    props: {
+      placeholder: '请输入'
+    },
     component: 'el-input',
     colProps: {}
   },
@@ -114,14 +121,46 @@ const tableConfig = reactive({
       currentRender: ({row, index}) => {
         return (
           <div>
-            <el-button type={'primary'} link onClick={()=>{}}>详情</el-button>
-            <el-button type={'primary'} link onClick={()=>{}}>上报</el-button>
+            <el-button type={'primary'} link onClick={()=>{}} >详情</el-button>
+            <el-button type={'primary'} link onClick={()=>{}} >上报</el-button>
           </div>
         )
       }
     }
+  ],
+  api: '',
+  params: {},
+  btns: [
+    {name: '新增上报', key: 'add', type: 'primary', auth: ''},
+    {name: '年度计划导出', key: '_export', type: 'primary', auth: ''},
+    {name: '经费预算生成', key: 'preMonty', type: 'primary', auth: ''},
   ]
 }) 
+
+const search = (val) => {
+  let obj = {...val}
+  if(obj.time) {
+    obj.startTime = obj.time[0]
+    obj.endTime = obj.time[1]
+    delete obj.dateValue
+  }
+  tableConfig.params = obj
+  tableIns.value.refresh()
+}
+
+const headBtnClick = (key) => {
+  switch(key) {
+    case 'add': handleAdd()
+      break;
+  }
+}
+
+const handleAdd = () => {
+  router.push({
+    name: 'Demandsummaryadd',
+    query: {}
+  })
+}
 </script>
 
 <style lang="scss" scoped>

From ce2752af9bed60d99e35eb224fa463c3e1f2484e Mon Sep 17 00:00:00 2001
From: wenhua <1084668738@qq.com>
Date: Sun, 12 May 2024 01:29:49 +0800
Subject: [PATCH 3/9] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=8A=E4=BC=A0=E7=BB=84=E4=BB=B6=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/request.js                          |  2 -
 src/views/projectdemand/demandsummary/add.vue | 14 ++++
 .../projectdemand/demandsummary/api/index.js  | 12 +++
 .../demandsummary/components/FileUpload.vue   | 75 +++++++++++++++++++
 4 files changed, 101 insertions(+), 2 deletions(-)
 create mode 100644 src/views/projectdemand/demandsummary/api/index.js
 create mode 100644 src/views/projectdemand/demandsummary/components/FileUpload.vue

diff --git a/src/utils/request.js b/src/utils/request.js
index 9c580c1..d95c00b 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -29,8 +29,6 @@ serveice.interceptors.response.use(response => {
     if (response.request.responseType === 'blob' || response.request.responseType === 'arraybuffer') {
         return response.data
     }
-    console.log("window.location.pathname", window.location.pathname)
-    console.log("windows", window.location.search)
     return response.data
 }, error => {
     let response = error.response
diff --git a/src/views/projectdemand/demandsummary/add.vue b/src/views/projectdemand/demandsummary/add.vue
index b806bde..9591b33 100644
--- a/src/views/projectdemand/demandsummary/add.vue
+++ b/src/views/projectdemand/demandsummary/add.vue
@@ -8,6 +8,8 @@
 
 <script setup lang="jsx">
 import fvSelect from '@/fvcomponents/fvSelect/index.vue'
+import { markRaw } from 'vue';
+import FileUpload from './components/FileUpload.vue';
 
 const localData = reactive({
   form: null
@@ -154,6 +156,18 @@ const schame = computed(()=>{
         span: 24
       }
     },
+    {
+      label: '',
+      prop: 'fileList',
+      component: markRaw(FileUpload),
+      props: {
+        url: '',
+        tip: '上传txt文件'
+      },
+      colProps: {
+        span: 24
+      }
+    }
   ]
   return arr
 })
diff --git a/src/views/projectdemand/demandsummary/api/index.js b/src/views/projectdemand/demandsummary/api/index.js
new file mode 100644
index 0000000..e7636c7
--- /dev/null
+++ b/src/views/projectdemand/demandsummary/api/index.js
@@ -0,0 +1,12 @@
+import request from '@/utils/request'
+
+export const fileUp = (url, data) => {
+  return request({
+    url,
+    method: 'post',
+    data,
+    headers: {
+      'Content-Type': 'multipart/form-data'
+    }
+  })
+}
\ No newline at end of file
diff --git a/src/views/projectdemand/demandsummary/components/FileUpload.vue b/src/views/projectdemand/demandsummary/components/FileUpload.vue
new file mode 100644
index 0000000..241e812
--- /dev/null
+++ b/src/views/projectdemand/demandsummary/components/FileUpload.vue
@@ -0,0 +1,75 @@
+<template>
+  <el-upload
+    ref="uploadRef"
+    class="upload-demo"
+    v-bind="$attrs"
+    drag
+    :action="url"
+    multiple
+    :on-change="change"
+    :on-progress="progress"
+    :on-remove="remove"
+    :before-remove="beforeRemove"
+    v-model:file-list="fileList"
+    :http-request="uploadRequest"
+    style="width: 50%;"
+  >
+    <el-icon class="el-icon--upload"><upload-filled /></el-icon>
+    <div class="el-upload__text">
+      拖拽上传/<em>点击上传</em>
+    </div>
+    <template #tip>
+      <div class="el-upload__tip">
+        {{ tip }}
+      </div>
+    </template>
+  </el-upload>
+</template>
+
+<script setup lang="jsx">
+import { reactive, ref } from 'vue';
+import { fileUp } from '../api';
+
+const props = defineProps({
+  url: {
+    type: String,
+    default: ''
+  },
+  tip: {
+    type: String,
+    default: ''
+  }
+})
+
+const fileList = ref([])
+const uploadRef = ref()
+
+const localData = reactive({
+
+})
+
+const change = (file, files) => {
+  console.log(file, 'file');
+}
+
+const progress = (UploadProgressEvent, UploadFile, UploadFiles) => {
+
+}
+
+const remove = (file, files) => {}
+
+const beforeRemove = (file, files) => {}
+
+const uploadRequest = (UploadRequestOptions) => {
+  console.log(UploadRequestOptions, 'UploadRequestOptions');
+  // UploadRequestOptions.data = {}
+  const formData = new FormData()
+  formData.append('file', UploadRequestOptions.file)
+  // formData.append('params', UploadRequestOptions.data)
+  fileUp(url, formData)
+}
+
+</script>
+
+<style lang="scss" scoped>
+</style>
\ No newline at end of file

From acc38adae1375ae849d5d98a94ce481f57cff1c1 Mon Sep 17 00:00:00 2001
From: clay <20932067@zju.edu.cn>
Date: Mon, 13 May 2024 22:15:58 +0800
Subject: [PATCH 4/9] =?UTF-8?q?feat=20:=20workflow=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=99=A8=20=E6=97=A0=E7=94=A8=E5=8A=9F=E8=83=BD=E5=B1=8F?=
 =?UTF-8?q?=E8=94=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/workflow/process/config/ApprovalNodeConfig.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/views/workflow/process/config/ApprovalNodeConfig.vue b/src/views/workflow/process/config/ApprovalNodeConfig.vue
index f1a9219..ed024a2 100644
--- a/src/views/workflow/process/config/ApprovalNodeConfig.vue
+++ b/src/views/workflow/process/config/ApprovalNodeConfig.vue
@@ -96,6 +96,9 @@
 <!--        <i class="el-icon-question" style="margin-left: 10px; font-size: medium; color: #b0b0b1"></i>-->
 <!--      </el-tooltip>-->
 <!--    </el-form-item>-->
+    <el-form-item label="是否使用矩阵审批" prop="text">
+      <el-switch inactive-text="不用" active-text="使用" v-model="nodeProps.matrixApproval"></el-switch>
+    </el-form-item>
     <el-form-item label="审批期限（为 0 则不生效）" prop="timeLimit">
       <el-input style="width: 180px;" placeholder="时长" type="number"
                 v-model="nodeProps.timeLimit.timeout.value">
@@ -236,7 +239,7 @@ const approvalTypes = reactive([
   // {name: "角色", type: "ROLE"},
   {name: "发起人自己", type: "SELF"},
   // {name: "表单内联系人", type: "FORM_USER"},
-  {name: "矩阵审批", type: "MATRIX_APPROVAL"},
+  // {name: "矩阵审批", type: "MATRIX_APPROVAL"},
 ])
 const listenerOption = ref([])
 const selectListen = ref({})

From bdc9c244a4d96dfdbc2f14947348da209cceccf4 Mon Sep 17 00:00:00 2001
From: lilinyuan <1084668738@qq.com>
Date: Mon, 13 May 2024 22:22:55 +0800
Subject: [PATCH 5/9] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E5=88=97=E5=B1=95=E7=A4=BA=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/fvcomponents/fvTable/index.vue | 143 +++++++++++++++++++++++++----
 1 file changed, 124 insertions(+), 19 deletions(-)

diff --git a/src/fvcomponents/fvTable/index.vue b/src/fvcomponents/fvTable/index.vue
index 1b42ff2..c90af06 100644
--- a/src/fvcomponents/fvTable/index.vue
+++ b/src/fvcomponents/fvTable/index.vue
@@ -2,15 +2,48 @@
   <div class="fv-table-container">
     <!-- 表格头部按钮 -->
     <div class="fv-table-btn" v-if="tableConfig.btns">
-      <el-button 
-        v-for="btn in tableConfig.btns"
-        :key="btn.key" 
-        :type="btn.type || ''"
-        v-perm="btn.auth || ['*:*:*']"
-        @click="handleClickBtns(btn.key)"
-      >
-        {{ btn.name }}
-      </el-button>
+      <div class="table-head-btn">
+        <el-button 
+          v-for="btn in tableConfig.btns"
+          :key="btn.key" 
+          :type="btn.type || ''"
+          v-perm="btn.auth || ['*:*:*']"
+          @click="handleClickBtns(btn.key)"
+        >
+          {{ btn.name }}
+        </el-button>
+      </div>
+      <!-- 列显示配置 -->
+      <div v-if="isSettingCol">
+        <el-tooltip effect="dark" content="列配置" placement="bottom">
+          <el-button ref="buttonRef" link>
+            <el-icon size="18"><Setting /></el-icon>
+          </el-button>
+        </el-tooltip>
+        <el-popover 
+          placement="bottom" 
+          :width="200" 
+          ref="popoverRef"
+          :virtual-ref="buttonRef"
+          virtual-triggering
+          trigger="click">
+          <div class="col-setting-checkall">
+            <el-checkbox label="列展示" v-model="localData.allColShow" :indeterminate="localData.indeterminate" @change="changeIsShowAll"></el-checkbox>
+          </div>
+          <div class="col-setting-list">
+            <el-checkbox-group v-model="localData.checkGroup" @change="changeColShow">
+              <el-space direction="vertical" alignment="flex-start" :size="0">
+                <el-checkbox 
+                  v-for="item in tableConfig.columns" 
+                  :key="item.prop" 
+                  :label="item.label" 
+                  :value="item.prop"
+                />
+              </el-space>
+            </el-checkbox-group>
+          </div>
+        </el-popover>
+      </div>
     </div>
     <!-- 表格部分 -->
     <div class="fv-table">
@@ -30,7 +63,7 @@
         ref="tableInstance"
       >
         <template #default>
-          <fvTableColumn v-for="column in tableConfig.columns" :key="column.prop" :columns="column">
+          <fvTableColumn v-for="column in localData.columns" :key="column.prop" :columns="column">
             <template v-if="column?.slots?.header" #[column?.slots?.header]="params">
               <slot :name="column?.slots?.header" v-bind="params || {}"></slot>
             </template>
@@ -80,10 +113,17 @@ const props = defineProps({
   pagination: {
     type: Boolean,
     default: true
+  },
+  // 是否显示列配置
+  isSettingCol: {
+    type: Boolean,
+    default: true
   }
 })
 
 const tableInstance = ref()
+const buttonRef = ref()
+const popoverRef = ref()
 
 const localData = reactive({
   list: [], // 表格数据
@@ -92,7 +132,12 @@ const localData = reactive({
     pageNum: 1
   },
   total: 0,
-  loading: false
+  loading: false,
+  // 列展示设置
+  columns: [],
+  allColShow: true, // 默认全部列都展示
+  indeterminate: false,
+  checkGroup: []
 })
 
 const emits = defineEmits(['headBtnClick', 'selectionChange', 'rowClick', 'rowDblclick', 'getBaseQuery', 'cellClick'])
@@ -101,6 +146,52 @@ const handleClickBtns = (key) => {
   emits('headBtnClick', key)
 }
 
+const filterColumns = () => {
+  localData.columns = props.tableConfig.columns.map(item=>{
+    if(item.prop) {
+      return {
+        ...item
+      }
+    }
+  })
+}
+
+const changeIsShowAll = (val) => {
+  if(val) {
+    filterColumns()
+    localData.indeterminate = false
+    localData.checkGroup = props.tableConfig.columns.map(item=>item.prop)
+  } else {
+    localData.columns.length = 0
+    localData.checkGroup.length = 0
+    localData.indeterminate = false
+  }
+}
+
+const changeColShow = (val) => {
+  if(val.length == props.tableConfig.columns.length) {
+    localData.indeterminate = false
+    localData.allColShow = true
+  } else if(val.length !== props.tableConfig.columns.length && val.length != 0) {
+    localData.allColShow = false
+    localData.indeterminate = true
+  } else {
+    localData.indeterminate = false
+    localData.allColShow = false
+  }
+  const template = []
+  props.tableConfig.columns.forEach(item=>{
+    val.forEach(v=>{
+      if(item.prop == v) {
+        template.push(item)
+      }
+    })
+  })
+  localData.columns = template
+}
+
+filterColumns()
+
 const getList = async () => {
   const { api, params } = props.tableConfig
   const queryParmas = {...localData.query, ...params}
@@ -154,13 +245,11 @@ const handleCurrentChange = (val) => {
   getList()
 }
 
-// watchEffect(()=>{
-//   if(!props.tableConfig.api) {
-//     localData.list = props.data
-//   }else {
-//     getList()
-//   }
-// })
+watchEffect(()=>{
+  if(localData.allColShow) {
+    localData.checkGroup = props.tableConfig.columns.map(item=>item.prop)
+  }
+})
 //刷新
 const refresh = ({resetPage=false}={}) => {
   resetPage ? localData.query.pageNum = 1 : null
@@ -184,5 +273,21 @@ onMounted(() => {
 </script>
 
 <style lang="scss" scoped>
-
+.col-setting-checkall {
+  border-bottom: 1px solid rgb(210, 210, 213);
+}
+.col-setting-list {
+  max-height: 45vh;
+  overflow-y: auto;
+}
+.table-head-btn {
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+}
+.fv-table-btn {
+  display: flex;
+  justify-content: space-between;
+  align-content: center;
+}
 </style>
\ No newline at end of file

From ad3fa0e688a9eada29d3d508b01b1a075a34234e Mon Sep 17 00:00:00 2001
From: lilinyuan <1084668738@qq.com>
Date: Mon, 13 May 2024 22:25:37 +0800
Subject: [PATCH 6/9] =?UTF-8?q?feat:=20=E8=A1=A8=E6=A0=BC=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/fvcomponents/fvTable/index.vue | 143 +++++++++++++++++++++++++----
 1 file changed, 124 insertions(+), 19 deletions(-)

diff --git a/src/fvcomponents/fvTable/index.vue b/src/fvcomponents/fvTable/index.vue
index 1b42ff2..c90af06 100644
--- a/src/fvcomponents/fvTable/index.vue
+++ b/src/fvcomponents/fvTable/index.vue
@@ -2,15 +2,48 @@
   <div class="fv-table-container">
     <!-- 表格头部按钮 -->
     <div class="fv-table-btn" v-if="tableConfig.btns">
-      <el-button 
-        v-for="btn in tableConfig.btns"
-        :key="btn.key" 
-        :type="btn.type || ''"
-        v-perm="btn.auth || ['*:*:*']"
-        @click="handleClickBtns(btn.key)"
-      >
-        {{ btn.name }}
-      </el-button>
+      <div class="table-head-btn">
+        <el-button 
+          v-for="btn in tableConfig.btns"
+          :key="btn.key" 
+          :type="btn.type || ''"
+          v-perm="btn.auth || ['*:*:*']"
+          @click="handleClickBtns(btn.key)"
+        >
+          {{ btn.name }}
+        </el-button>
+      </div>
+      <!-- 列显示配置 -->
+      <div v-if="isSettingCol">
+        <el-tooltip effect="dark" content="列配置" placement="bottom">
+          <el-button ref="buttonRef" link>
+            <el-icon size="18"><Setting /></el-icon>
+          </el-button>
+        </el-tooltip>
+        <el-popover 
+          placement="bottom" 
+          :width="200" 
+          ref="popoverRef"
+          :virtual-ref="buttonRef"
+          virtual-triggering
+          trigger="click">
+          <div class="col-setting-checkall">
+            <el-checkbox label="列展示" v-model="localData.allColShow" :indeterminate="localData.indeterminate" @change="changeIsShowAll"></el-checkbox>
+          </div>
+          <div class="col-setting-list">
+            <el-checkbox-group v-model="localData.checkGroup" @change="changeColShow">
+              <el-space direction="vertical" alignment="flex-start" :size="0">
+                <el-checkbox 
+                  v-for="item in tableConfig.columns" 
+                  :key="item.prop" 
+                  :label="item.label" 
+                  :value="item.prop"
+                />
+              </el-space>
+            </el-checkbox-group>
+          </div>
+        </el-popover>
+      </div>
     </div>
     <!-- 表格部分 -->
     <div class="fv-table">
@@ -30,7 +63,7 @@
         ref="tableInstance"
       >
         <template #default>
-          <fvTableColumn v-for="column in tableConfig.columns" :key="column.prop" :columns="column">
+          <fvTableColumn v-for="column in localData.columns" :key="column.prop" :columns="column">
             <template v-if="column?.slots?.header" #[column?.slots?.header]="params">
               <slot :name="column?.slots?.header" v-bind="params || {}"></slot>
             </template>
@@ -80,10 +113,17 @@ const props = defineProps({
   pagination: {
     type: Boolean,
     default: true
+  },
+  // 是否显示列配置
+  isSettingCol: {
+    type: Boolean,
+    default: true
   }
 })
 
 const tableInstance = ref()
+const buttonRef = ref()
+const popoverRef = ref()
 
 const localData = reactive({
   list: [], // 表格数据
@@ -92,7 +132,12 @@ const localData = reactive({
     pageNum: 1
   },
   total: 0,
-  loading: false
+  loading: false,
+  // 列展示设置
+  columns: [],
+  allColShow: true, // 默认全部列都展示
+  indeterminate: false,
+  checkGroup: []
 })
 
 const emits = defineEmits(['headBtnClick', 'selectionChange', 'rowClick', 'rowDblclick', 'getBaseQuery', 'cellClick'])
@@ -101,6 +146,52 @@ const handleClickBtns = (key) => {
   emits('headBtnClick', key)
 }
 
+const filterColumns = () => {
+  localData.columns = props.tableConfig.columns.map(item=>{
+    if(item.prop) {
+      return {
+        ...item
+      }
+    }
+  })
+}
+
+const changeIsShowAll = (val) => {
+  if(val) {
+    filterColumns()
+    localData.indeterminate = false
+    localData.checkGroup = props.tableConfig.columns.map(item=>item.prop)
+  } else {
+    localData.columns.length = 0
+    localData.checkGroup.length = 0
+    localData.indeterminate = false
+  }
+}
+
+const changeColShow = (val) => {
+  if(val.length == props.tableConfig.columns.length) {
+    localData.indeterminate = false
+    localData.allColShow = true
+  } else if(val.length !== props.tableConfig.columns.length && val.length != 0) {
+    localData.allColShow = false
+    localData.indeterminate = true
+  } else {
+    localData.indeterminate = false
+    localData.allColShow = false
+  }
+  const template = []
+  props.tableConfig.columns.forEach(item=>{
+    val.forEach(v=>{
+      if(item.prop == v) {
+        template.push(item)
+      }
+    })
+  })
+  localData.columns = template
+}
+
+filterColumns()
+
 const getList = async () => {
   const { api, params } = props.tableConfig
   const queryParmas = {...localData.query, ...params}
@@ -154,13 +245,11 @@ const handleCurrentChange = (val) => {
   getList()
 }
 
-// watchEffect(()=>{
-//   if(!props.tableConfig.api) {
-//     localData.list = props.data
-//   }else {
-//     getList()
-//   }
-// })
+watchEffect(()=>{
+  if(localData.allColShow) {
+    localData.checkGroup = props.tableConfig.columns.map(item=>item.prop)
+  }
+})
 //刷新
 const refresh = ({resetPage=false}={}) => {
   resetPage ? localData.query.pageNum = 1 : null
@@ -184,5 +273,21 @@ onMounted(() => {
 </script>
 
 <style lang="scss" scoped>
-
+.col-setting-checkall {
+  border-bottom: 1px solid rgb(210, 210, 213);
+}
+.col-setting-list {
+  max-height: 45vh;
+  overflow-y: auto;
+}
+.table-head-btn {
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+}
+.fv-table-btn {
+  display: flex;
+  justify-content: space-between;
+  align-content: center;
+}
 </style>
\ No newline at end of file

From f55059eed7c06b3c30f6cd88390c50763c0dd602 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Mon, 13 May 2024 22:28:44 +0800
Subject: [PATCH 7/9] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/index.vue                      |  4 +-
 .../projectdemand/demandcollection/add.vue    | 95 +++++++++++--------
 .../projectdemand/demandcollection/detail.vue | 14 ++-
 3 files changed, 67 insertions(+), 46 deletions(-)

diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 51d3347..f69f611 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -148,11 +148,11 @@ const tableConfig = reactive({
 })
 const handleView = (row) => {
   console.log('row', row)
-  if(row.targetState=='00'&&row.taskId){
+  if(row.targetState=='00'&&row.targetId){
     router.push({
       path: '/projectdemand/demanddetail',
       query: {
-        id: row.taskId
+        id: row.targetId
       }
     })
   }
diff --git a/src/views/projectdemand/demandcollection/add.vue b/src/views/projectdemand/demandcollection/add.vue
index 61ca417..0e64c42 100644
--- a/src/views/projectdemand/demandcollection/add.vue
+++ b/src/views/projectdemand/demandcollection/add.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-loading="loading" class="add-block">
     <baseTitle title="需求征集信息录入"></baseTitle>
-    <el-form :model="formData" inline class="query-form" ref="demandForm">
+    <el-form :model="formData" inline class="query-form" ref="demandForm" :rules="rules">
       <div class="left-info">
         <el-form-item label="名称" prop="requirementName">
           <el-input v-model="formData.requirementName" placeholder="请输入名称" clearable></el-input>
@@ -20,7 +20,7 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="截止时间" prop="time">
+        <el-form-item label="截止时间" prop="deadline">
           <el-config-provider>
             <el-date-picker
                 v-model="formData.deadline"
@@ -38,7 +38,7 @@
     <file-upload @getFile="getFile"/>
     <el-table :data="formData.fileList" style="width: 100%">
       <el-table-column label="序号" type="index" align="center" width="80"/>
-      <el-table-column prop="fileName" label="文件名" align="center"/>
+      <el-table-column prop="originalFileName" label="文件名" align="center"/>
       <el-table-column prop="tag" label="标签" align="center"/>
       <el-table-column prop="size" label="文件大小" align="center">
         <template #default="scope">
@@ -64,7 +64,7 @@
       <!--      </div>-->
     </div>
     <div class="oper-page-btn">
-      <el-button color="#DED0B2" @click="handleSubmit">提交</el-button>
+      <el-button color="#DED0B2" @click="handleSubmit(demandForm)">提交</el-button>
       <el-button color="#DED0B2" @click="handleResubmit">重新提交</el-button>
       <el-button @click="handleBack">返回</el-button>
     </div>
@@ -80,10 +80,13 @@ import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.v
 import {ElMessage, ElMessageBox} from "element-plus";
 import {useRoute, useRouter} from 'vue-router'
 import {getSubCompOpt} from '@/api/user/user.js'
+import {useTagsView} from '@/stores/tagsview.js'
 
+const tagsViewStore = useTagsView()
 const authStore = useAuthStore()
 const router = useRouter()
 const route = useRoute()
+const demandForm = ref()
 const dateValue = ref()
 const formData = ref({
   requirementName: '',
@@ -92,41 +95,30 @@ const formData = ref({
   deadline: '',
   collectExplain: ''
 })
-const showTable = ref(false)
 const processDiagramViewer = ref(false)
-
 const typeOption = ref([
   {
     label: "需求征集",
     value: '需求征集'
   }
 ])
-const companyOption = ref([
-  {
-    label: "测试公司1",
-    value: 22
-  },
-  {
-    label: "测试公司2",
-    value: 23
-  },
-  {
-    label: "测试公司3",
-    value: 24
-  }
-])
+const companyOption = ref([])
 const form = ref(null)
 const fileList = ref(null)
-const menuTree = ref(null)
 const loading = ref(false)
 const processStore = useProcessStore()
 const processInstanceData = ref()
-
+const rules = reactive({
+  requirementName: [{required: true, message: '请输入名称', trigger: 'blur'}],
+  companyIds: [{required: true, message: '请选择所属公司', trigger: 'blur'}],
+  collectType: [{required: true, message: '请选择征集类型', trigger: 'blur'}],
+  deadline: [{required: true, message: '请选择截止时间', trigger: 'blur'}],
+})
 const compositeParam=(item)=>{
     return  {
       fileId: item.id,
       size: item.size,
-      fileName: item.fileName,
+      originalFileName: item.originalFilename,
       fileType: item.fileType,
       url: item.url,
       processNodeTag: null,
@@ -135,6 +127,7 @@ const compositeParam=(item)=>{
     }
 }
 const getFile = (val) => {
+  console.log('上传文件',val)
   let fileObj = {}
   let newFileArray = []
   if (route.query.isAdd === undefined) {
@@ -172,27 +165,45 @@ const init = async () => {
   })
 }
 
-const handleSubmit = async () => {
-  let params = {
+const handleSubmit = async (instance) => {
+  console.log('fileList.value',fileList.value)
+  if (!instance) return
+  instance.validate(async (valid) => {
+    if (!valid) return
+    let params = {
+      ...formData.value,
+      requirementId: 0,
+      files: fileList.value,
+      deploymentId: processInstanceData.value.deploymentId
+    }
+    let res = await addRequirement(params)
+    if (res.code === 1000) {
+      ElMessage.success(res.msg)
+      await router.push({
+        path: '/projectdemand/demandcollection'
+      })
+      tagsViewStore.delVisitedViews(router.currentRoute.value.path)
+    } else {
+      ElMessage.error(res.msg)
+    }
+  })
+}
+const handleResubmit = () => {
+  resubmit({
     ...formData.value,
-    requirementId: 0,
     files: fileList.value,
     deploymentId: processInstanceData.value.deploymentId
-  }
-  let res
-  if (route.query.isAdd === undefined) {
-    res = await resubmit(params)
-  } else {
-    res = await addRequirement(params)
-  }
-  if (res.code === 1000) {
-    ElMessage.success(res.msg)
-    await router.push({
-      path: '/projectdemand/demandcollection'
-    })
-  } else {
-    ElMessage.error(res.msg)
-  }
+  }).then(res => {
+    if (res.code === 1000) {
+      ElMessage.success(res.msg)
+      formData.value = res.data.formData
+      router.push({
+        path: '/projectdemand/demandcollection'
+      })
+    } else {
+      ElMessage.error(res.msg)
+    }
+  })
 }
 const getDetailInfo = async () => {
   getFormInfo(route.query.id).then(res => {
@@ -210,7 +221,7 @@ const handleBack = () => {
   history.back()
 }
 const beforeRemove = (row) => {
-  ElMessageBox.confirm(`确认删除名称为${row.filename}的表格吗?`, '系统提示', {
+  ElMessageBox.confirm(`确认删除名称为${row.originalFileName}的表格吗?`, '系统提示', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
     type: 'warning'
diff --git a/src/views/projectdemand/demandcollection/detail.vue b/src/views/projectdemand/demandcollection/detail.vue
index e83bf85..5ea2c9e 100644
--- a/src/views/projectdemand/demandcollection/detail.vue
+++ b/src/views/projectdemand/demandcollection/detail.vue
@@ -38,7 +38,7 @@
             <el-form-item>
               <el-table :data="formData.fileList" style="width: 100%">
                 <el-table-column label="序号" type="index" align="center" width="80"/>
-                <el-table-column prop="fileName" label="文件名" align="center"/>
+                <el-table-column prop="originalFileName" label="文件名" align="center"/>
                 <el-table-column prop="tag" label="标签" align="center"/>
                 <el-table-column prop="size" label="文件大小" align="center">
                   <template #default="scope">
@@ -92,7 +92,9 @@ import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.v
 import {useProcessStore} from '@/stores/processStore.js';
 import {getInfo, agreeTask, rejectTask} from "@/api/project-demand/index.js";
 import {getSubCompOpt} from '@/api/user/user.js'
-
+import {ElMessage} from "element-plus";
+import {useRouter} from "vue-router";
+const router = useRouter()
 const route = useRoute()
 const form = ref();
 const processStore = useProcessStore()
@@ -120,6 +122,14 @@ const handleReject = () => {
   }
   rejectTask(approve).then(res => {
     console.log(res)
+    if (res.code === 1000) {
+      ElMessage.success(res.msg)
+      router.push({
+        path: '/projectdemand/demandcollection'
+      })
+    }else {
+      ElMessage.error(res.msg)
+    }
   })
 }
 const getCompanyOption = async () => {

From f46f95c4ad7c3815d601acd2a72945b6ba14af4a Mon Sep 17 00:00:00 2001
From: lilinyuan <1084668738@qq.com>
Date: Mon, 13 May 2024 22:29:07 +0800
Subject: [PATCH 8/9] =?UTF-8?q?fix:=20=E5=88=A0=E9=99=A4=E8=AF=A5=E5=88=86?=
 =?UTF-8?q?=E6=94=AF=E8=A1=A8=E6=A0=BC=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/fvcomponents/fvTable/index.vue | 293 -----------------------------
 1 file changed, 293 deletions(-)
 delete mode 100644 src/fvcomponents/fvTable/index.vue

diff --git a/src/fvcomponents/fvTable/index.vue b/src/fvcomponents/fvTable/index.vue
deleted file mode 100644
index c90af06..0000000
--- a/src/fvcomponents/fvTable/index.vue
+++ /dev/null
@@ -1,293 +0,0 @@
-<template>
-  <div class="fv-table-container">
-    <!-- 表格头部按钮 -->
-    <div class="fv-table-btn" v-if="tableConfig.btns">
-      <div class="table-head-btn">
-        <el-button 
-          v-for="btn in tableConfig.btns"
-          :key="btn.key" 
-          :type="btn.type || ''"
-          v-perm="btn.auth || ['*:*:*']"
-          @click="handleClickBtns(btn.key)"
-        >
-          {{ btn.name }}
-        </el-button>
-      </div>
-      <!-- 列显示配置 -->
-      <div v-if="isSettingCol">
-        <el-tooltip effect="dark" content="列配置" placement="bottom">
-          <el-button ref="buttonRef" link>
-            <el-icon size="18"><Setting /></el-icon>
-          </el-button>
-        </el-tooltip>
-        <el-popover 
-          placement="bottom" 
-          :width="200" 
-          ref="popoverRef"
-          :virtual-ref="buttonRef"
-          virtual-triggering
-          trigger="click">
-          <div class="col-setting-checkall">
-            <el-checkbox label="列展示" v-model="localData.allColShow" :indeterminate="localData.indeterminate" @change="changeIsShowAll"></el-checkbox>
-          </div>
-          <div class="col-setting-list">
-            <el-checkbox-group v-model="localData.checkGroup" @change="changeColShow">
-              <el-space direction="vertical" alignment="flex-start" :size="0">
-                <el-checkbox 
-                  v-for="item in tableConfig.columns" 
-                  :key="item.prop" 
-                  :label="item.label" 
-                  :value="item.prop"
-                />
-              </el-space>
-            </el-checkbox-group>
-          </div>
-        </el-popover>
-      </div>
-    </div>
-    <!-- 表格部分 -->
-    <div class="fv-table">
-      <el-table
-        :data="localData.list"
-        v-loading="localData.loading"
-        :row-key="tableConfig?.rowKey || 'id'"
-        v-bind="$attrs"
-        table-layout="auto"
-        :show-overflow-tooltip="true"
-        highlight-current-row
-        @selection-change="selectionChange"
-        @row-click="rowClick"
-        @row-dblclick="rowDblclick"
-        @cell-click="cellClick"
-        v-tabh
-        ref="tableInstance"
-      >
-        <template #default>
-          <fvTableColumn v-for="column in localData.columns" :key="column.prop" :columns="column">
-            <template v-if="column?.slots?.header" #[column?.slots?.header]="params">
-              <slot :name="column?.slots?.header" v-bind="params || {}"></slot>
-            </template>
-            <template v-if="column?.slots?.default" #[column?.slots?.default]="params">
-              <slot :name="column?.slots?.default" v-bind="params || {}"></slot>
-            </template>
-          </fvTableColumn>
-        </template>
-        <template #empty>
-          <slot name="empty"></slot>
-        </template>
-        <template #append>
-          <slot name="append"></slot>
-        </template>
-      </el-table>
-      <!-- 分页 -->
-      <fvPagination 
-        v-if="pagination"
-        :current-page="localData.query.pageNum"
-        :page-size="localData.query.pageSize"
-        :page-sizes="[10, 20, 30, 40,50]"
-        :total="localData.total"
-        @changeSize="handleSizeChange"
-        @goPage="handleCurrentChange"
-        >
-      </fvPagination>
-    </div>
-  </div>
-</template>
-
-<script setup>
-import { ElMessage } from 'element-plus';
-import { requestList } from '../../api/common';
-
-const props = defineProps({
-  //表格配置
-  tableConfig: {
-    type: Object,
-    default: {}
-  },
-  //若使用外部数据
-  data: {
-    type: Array,
-    default: []
-  },
-  //是否使用分页
-  pagination: {
-    type: Boolean,
-    default: true
-  },
-  // 是否显示列配置
-  isSettingCol: {
-    type: Boolean,
-    default: true
-  }
-})
-
-const tableInstance = ref()
-const buttonRef = ref()
-const popoverRef = ref()
-
-const localData = reactive({
-  list: [], // 表格数据
-  query: {
-    pageSize: 10,
-    pageNum: 1
-  },
-  total: 0,
-  loading: false,
-  // 列展示设置
-  columns: [],
-  allColShow: true, // 默认全部列都展示
-  indeterminate: false,
-  checkGroup: []
-})
-
-const emits = defineEmits(['headBtnClick', 'selectionChange', 'rowClick', 'rowDblclick', 'getBaseQuery', 'cellClick'])
-
-const handleClickBtns = (key) => {
-  emits('headBtnClick', key)
-}
-
-const filterColumns = () => {
-  localData.columns = props.tableConfig.columns.map(item=>{
-    if(item.prop) {
-      return {
-        ...item
-      }
-    }
-  })
-}
-
-const changeIsShowAll = (val) => {
-  if(val) {
-    filterColumns()
-    localData.indeterminate = false
-    localData.checkGroup = props.tableConfig.columns.map(item=>item.prop)
-  } else {
-    localData.columns.length = 0
-    localData.checkGroup.length = 0
-    localData.indeterminate = false
-  }
-}
-
-const changeColShow = (val) => {
-  if(val.length == props.tableConfig.columns.length) {
-    localData.indeterminate = false
-    localData.allColShow = true
-  } else if(val.length !== props.tableConfig.columns.length && val.length != 0) {
-    localData.allColShow = false
-    localData.indeterminate = true
-  } else {
-    localData.indeterminate = false
-    localData.allColShow = false
-  }
-  const template = []
-  props.tableConfig.columns.forEach(item=>{
-    val.forEach(v=>{
-      if(item.prop == v) {
-        template.push(item)
-      }
-    })
-  })
-  localData.columns = template
-}
-
-filterColumns()
-
-const getList = async () => {
-  const { api, params } = props.tableConfig
-  const queryParmas = {...localData.query, ...params}
-  if(api) {
-    localData.loading = true
-    try {
-      const { code, data, msg } = await requestList(api, queryParmas)
-      if ( code === 1000 ) {
-        localData.list = data.rows
-        localData.total = data.total
-        localData.loading = false
-      } else {
-        ElMessage.error(msg)
-        localData.loading = false
-      }
-    } catch (error) {
-      ElMessage.error('请求数据失败')
-      localData.loading = false
-    }
-  } else {
-    localData.list = props.data
-  }
-}
-
-const selectionChange = (data) => {
-  emits('selectionChange', data)
-}
-
-const rowClick = (row, column) => {
-  emits('rowClick', row, column)
-}
-
-const rowDblclick = (row, column) => {
-  emits('rowDblclick', row, column)
-}
-
-const cellClick = (row, column) => {
-  emits('cellClick', row, column)
-}
-
-//切换每页显示条数
-const handleSizeChange = (val) => {
-  localData.query.pageSize = val
-  emits('getBaseQuery', localData.query)
-  getList()
-}
-//点击页码进行分页功能
-const handleCurrentChange = (val) => {
-  localData.query.pageNum = val
-  emits('getBaseQuery', localData.query)
-  getList()
-}
-
-watchEffect(()=>{
-  if(localData.allColShow) {
-    localData.checkGroup = props.tableConfig.columns.map(item=>item.prop)
-  }
-})
-//刷新
-const refresh = ({resetPage=false}={}) => {
-  resetPage ? localData.query.pageNum = 1 : null
-  getList()
-}
-//改变loading状态
-const updateLoading = (status) => {
-  localData.loading = status
-}
-//获取基础查询条件
-const getQuery = () => {
-  return localData.query
-}
-
-defineExpose({ refresh, updateLoading, getQuery, tableInstance })
-
-onMounted(() => {
-  getList()
-})
- 
-</script>
-
-<style lang="scss" scoped>
-.col-setting-checkall {
-  border-bottom: 1px solid rgb(210, 210, 213);
-}
-.col-setting-list {
-  max-height: 45vh;
-  overflow-y: auto;
-}
-.table-head-btn {
-  display: flex;
-  justify-content: flex-start;
-  align-items: center;
-}
-.fv-table-btn {
-  display: flex;
-  justify-content: space-between;
-  align-content: center;
-}
-</style>
\ No newline at end of file

From 31a88c232f035a52ba6c2c8b75b57c453c416c8b Mon Sep 17 00:00:00 2001
From: lilinyuan <1084668738@qq.com>
Date: Mon, 13 May 2024 22:30:50 +0800
Subject: [PATCH 9/9] =?UTF-8?q?feat:=20=E9=87=8D=E6=96=B0=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E8=A1=A8=E6=A0=BC=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/fvcomponents/fvTable/index.vue | 293 +++++++++++++++++++++++++++++
 1 file changed, 293 insertions(+)
 create mode 100644 src/fvcomponents/fvTable/index.vue

diff --git a/src/fvcomponents/fvTable/index.vue b/src/fvcomponents/fvTable/index.vue
new file mode 100644
index 0000000..9c4b81c
--- /dev/null
+++ b/src/fvcomponents/fvTable/index.vue
@@ -0,0 +1,293 @@
+<template>
+  <div class="fv-table-container">
+    <!-- 表格头部按钮 -->
+    <div class="fv-table-btn" v-if="tableConfig.btns">
+      <div class="table-head-btn">
+        <el-button 
+          v-for="btn in tableConfig.btns"
+          :key="btn.key" 
+          :type="btn.type || ''"
+          v-perm="btn.auth || ['*:*:*']"
+          @click="handleClickBtns(btn.key)"
+        >
+          {{ btn.name }}
+        </el-button>
+      </div>
+      <!-- 列显示配置 -->
+      <div v-if="isSettingCol">
+        <el-tooltip effect="dark" content="列配置" placement="bottom">
+          <el-button ref="buttonRef" link>
+            <el-icon size="18"><Setting /></el-icon>
+          </el-button>
+        </el-tooltip>
+        <el-popover 
+          placement="bottom" 
+          :width="200" 
+          ref="popoverRef"
+          :virtual-ref="buttonRef"
+          virtual-triggering
+          trigger="click">
+          <div class="col-setting-checkall">
+            <el-checkbox label="列展示" v-model="localData.allColShow" :indeterminate="localData.indeterminate" @change="changeIsShowAll"></el-checkbox>
+          </div>
+          <div class="col-setting-list">
+            <el-checkbox-group v-model="localData.checkGroup" @change="changeColShow">
+              <el-space direction="vertical" alignment="flex-start" :size="0">
+                <el-checkbox 
+                  v-for="item in tableConfig.columns" 
+                  :key="item.prop" 
+                  :label="item.label" 
+                  :value="item.prop"
+                />
+              </el-space>
+            </el-checkbox-group>
+          </div>
+        </el-popover>
+      </div>
+    </div>
+    <!-- 表格部分 -->
+    <div class="fv-table">
+      <el-table
+        :data="localData.list"
+        v-loading="localData.loading"
+        :row-key="tableConfig?.rowKey || 'id'"
+        v-bind="$attrs"
+        table-layout="auto"
+        :show-overflow-tooltip="true"
+        highlight-current-row
+        @selection-change="selectionChange"
+        @row-click="rowClick"
+        @row-dblclick="rowDblclick"
+        @cell-click="cellClick"
+        v-tabh
+        ref="tableInstance"
+      >
+        <template #default>
+          <fvTableColumn v-for="column in localData.columns" :key="column.prop" :columns="column">
+            <template v-if="column?.slots?.header" #[column?.slots?.header]="params">
+              <slot :name="column?.slots?.header" v-bind="params || {}"></slot>
+            </template>
+            <template v-if="column?.slots?.default" #[column?.slots?.default]="params">
+              <slot :name="column?.slots?.default" v-bind="params || {}"></slot>
+            </template>
+          </fvTableColumn>
+        </template>
+        <template #empty>
+          <slot name="empty"></slot>
+        </template>
+        <template #append>
+          <slot name="append"></slot>
+        </template>
+      </el-table>
+      <!-- 分页 -->
+      <fvPagination
+        v-if="pagination"
+        :current-page="localData.query.pageNum"
+        :page-size="localData.query.pageSize"
+        :page-sizes="[10, 20, 30, 40,50]"
+        :total="localData.total"
+        @changeSize="handleSizeChange"
+        @goPage="handleCurrentChange"
+        >
+      </fvPagination>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { ElMessage } from 'element-plus';
+import { requestList } from '../../api/common';
+
+const props = defineProps({
+  //表格配置
+  tableConfig: {
+    type: Object,
+    default: {}
+  },
+  //若使用外部数据
+  data: {
+    type: Array,
+    default: []
+  },
+  //是否使用分页
+  pagination: {
+    type: Boolean,
+    default: true
+  },
+  // 是否显示列配置
+  isSettingCol: {
+    type: Boolean,
+    default: true
+  }
+})
+
+const tableInstance = ref()
+const buttonRef = ref()
+const popoverRef = ref()
+
+const localData = reactive({
+  list: [], // 表格数据
+  query: {
+    pageSize: 10,
+    pageNum: 1
+  },
+  total: 0,
+  loading: false,
+  // 列展示设置
+  columns: [],
+  allColShow: true, // 默认全部列都展示
+  indeterminate: false,
+  checkGroup: []
+})
+
+const emits = defineEmits(['headBtnClick', 'selectionChange', 'rowClick', 'rowDblclick', 'getBaseQuery', 'cellClick'])
+
+const handleClickBtns = (key) => {
+  emits('headBtnClick', key)
+}
+
+const filterColumns = () => {
+  localData.columns = props.tableConfig.columns.map(item=>{
+    if(item.prop) {
+      return {
+        ...item
+      }
+    }
+  })
+}
+
+const changeIsShowAll = (val) => {
+  if(val) {
+    filterColumns()
+    localData.indeterminate = false
+    localData.checkGroup = props.tableConfig.columns.map(item=>item.prop)
+  } else {
+    localData.columns.length = 0
+    localData.checkGroup.length = 0
+    localData.indeterminate = false
+  }
+}
+
+const changeColShow = (val) => {
+  if(val.length == props.tableConfig.columns.length) {
+    localData.indeterminate = false
+    localData.allColShow = true
+  } else if(val.length !== props.tableConfig.columns.length && val.length != 0) {
+    localData.allColShow = false
+    localData.indeterminate = true
+  } else {
+    localData.indeterminate = false
+    localData.allColShow = false
+  }
+  const template = []
+  props.tableConfig.columns.forEach(item=>{
+    val.forEach(v=>{
+      if(item.prop == v) {
+        template.push(item)
+      }
+    })
+  })
+  localData.columns = template
+}
+
+filterColumns()
+
+const getList = async () => {
+  const { api, params } = props.tableConfig
+  const queryParmas = {...localData.query, ...params}
+  if(api) {
+    localData.loading = true
+    try {
+      const { code, data, msg } = await requestList(api, queryParmas)
+      if ( code === 1000 ) {
+        localData.list = data.rows
+        localData.total = data.total
+        localData.loading = false
+      } else {
+        ElMessage.error(msg)
+        localData.loading = false
+      }
+    } catch (error) {
+      ElMessage.error('请求数据失败')
+      localData.loading = false
+    }
+  } else {
+    localData.list = props.data
+  }
+}
+
+const selectionChange = (data) => {
+  emits('selectionChange', data)
+}
+
+const rowClick = (row, column) => {
+  emits('rowClick', row, column)
+}
+
+const rowDblclick = (row, column) => {
+  emits('rowDblclick', row, column)
+}
+
+const cellClick = (row, column) => {
+  emits('cellClick', row, column)
+}
+
+//切换每页显示条数
+const handleSizeChange = (val) => {
+  localData.query.pageSize = val
+  emits('getBaseQuery', localData.query)
+  getList()
+}
+//点击页码进行分页功能
+const handleCurrentChange = (val) => {
+  localData.query.pageNum = val
+  emits('getBaseQuery', localData.query)
+  getList()
+}
+
+watchEffect(()=>{
+  if(localData.allColShow) {
+    localData.checkGroup = props.tableConfig.columns.map(item=>item.prop)
+  }
+})
+//刷新
+const refresh = ({resetPage=false}={}) => {
+  resetPage ? localData.query.pageNum = 1 : null
+  getList()
+}
+//改变loading状态
+const updateLoading = (status) => {
+  localData.loading = status
+}
+//获取基础查询条件
+const getQuery = () => {
+  return localData.query
+}
+
+defineExpose({ refresh, updateLoading, getQuery, tableInstance })
+
+onMounted(() => {
+  getList()
+})
+
+</script>
+
+<style lang="scss" scoped>
+.col-setting-checkall {
+  border-bottom: 1px solid rgb(210, 210, 213);
+}
+.col-setting-list {
+  max-height: 45vh;
+  overflow-y: auto;
+}
+.table-head-btn {
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+}
+.fv-table-btn {
+  display: flex;
+  justify-content: space-between;
+  align-content: center;
+}
+</style>