Merge branch 'master' of http://git.feashow.cn/clay/mosr-web

src/api/workflow/process-user.js

@@ -29,3 +29,11 @@ export function getMosrUser(params) {
         params:params
     })
 }
+
+export function getOrganizationStructure(params) {
+    return request({
+        url: '/admin/organizational/structure/choose',
+        method: 'get',
+        params:params
+    })
+}

src/assets/styles/index.scss

@@ -415,7 +415,13 @@ html, body, #app, .el-container, .el-aside, .el-main {
   overflow: hidden;
   margin-right: 5px;
 }
+.oran-icon{
+  width: 1em;
+  height: 1em;
+  margin-right: 4px;
+  vertical-align: -0.21em;
 
+}
 .svg-icon {
   width: 1.2em;
   height: 1.2em;

src/assets/svg/oran.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1720946136639" class="icon" viewBox="0 0 1025 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4221" xmlns:xlink="http://www.w3.org/1999/xlink" width="128.125" height="128"><path d="M992.090881 443.129l-388.66-404.16C579.320881 13.934 546.998881 0.023 512.424881 0.023s-66.896 13.776-91.006 38.946L32.889881 443.129c-40.138 41.728-34.972 77.759-28.348 92.86 4.769 10.731 20.665 40.005 66.63 40.005l56.961 0 0 310.902c0 70.604 50.736 137.104 122.797 137.104l165.454 0L416.383881 694.949c0-35.236-5.298-54.974 30.733-54.974l130.745 0c36.031 0 30.733 19.605 30.733 54.974L608.594881 1024l165.321 0c72.063 0 122.797-66.499 122.797-137.104L896.712881 575.994l56.961 0c45.966 0 61.862-29.407 66.63-40.005C1026.927881 520.888 1032.094881 484.856 992.090881 443.129L992.090881 443.129zM953.676881 512.013 832.601881 512.013l0 374.884c0 35.237-22.784 72.99-58.815 72.99L672.446881 959.887 672.446881 694.949c0-70.604-22.652-118.956-94.717-118.956L446.985881 575.993c-72.063 0-94.717 48.352-94.717 118.956l0 265.069L250.929881 960.018c-36.031 0-58.816-37.754-58.816-72.99L192.113881 512.145 71.038881 512.145c-1.191 0-2.118-4.371-3.047-4.503 2.253-3.843 6.094-13.646 12.452-20.269l388.66-403.895c11.525-12.187 27.95-19.473 43.848-19.34 15.895-0.132 31.262 7.285 42.919 19.34L944.398881 487.24c6.358 6.623 10.199 16.426 12.32 20.269-0.796 0.132-1.856 4.503-3.047 4.503L953.676881 512.013z" fill="#909399" p-id="4222"></path></svg>

src/components/AttachmentUpload.vue

@@ -28,10 +28,10 @@
         <el-form-item label="其他文件" label-width="125">
           <file-upload @getFile="getOtherFile"/>
           <!--          <el-card style="width: 100%;box-shadow: none">-->
-          <fvTable style="width: 100%;max-height: 300px;" v-if="showTable" height="300"  :tableConfig="tableConfig"
+          <fvTable style="width: 100%;max-height: 162px;" v-if="showTable" height="162"  :tableConfig="tableConfig"
                    :data="allFileList" :isSettingCol="false" :pagination="false">
             <template #empty>
-              <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
+              <el-empty :image-size="55" description="暂无数据" style="padding: 0"/>
             </template>
           </fvTable>
           <!--          </el-card>-->

src/components/DetailComponent/FileComponent.vue

@@ -2,10 +2,10 @@
   <el-form :label-position="labelAlign">
     <el-form-item :label="title?'其他文件':''" v-if="fileListShow === 'READ' || fileListShow === 'EDIT'" :label-position="labelAlign" :label-width="title?95:''">
       <file-upload @getFile="getOtherFile" v-if="fileListShow === 'EDIT'"/>
-      <fvTable style="width: 100%;max-height: 300px;" v-if="processViewer"  height="300" :tableConfig="tableConfig"
+      <fvTable style="width: 100%;max-height: 162px;" v-if="processViewer"  height="162" :tableConfig="tableConfig"
               :data="_value" :isSettingCol="false" :pagination="false">
         <template #empty>
-          <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
+          <el-empty :image-size="55" description="暂无数据" style="padding: 0"/>
         </template>
       </fvTable>
     </el-form-item>

src/components/DetailComponent/ProjectApply.vue

@@ -32,13 +32,13 @@
         </el-col>
         <el-col :span="24">
           <el-form-item label="前置流程" :required="preProcessRequired" prop="preProcess" label-width="125">
+            <el-button color="#DED0B2" @click="handleShowPreTable" style="margin-right: 10px">
+              {{ localFormData.preProcess ? '更改' : '请选择' }}
+            </el-button>
             <div v-for="item in localFormData.preProcess" :key="item.requestId">
               <a :href="item.baseUrl" target="_blank"
                  style="color: #2a99ff;margin-right: 10px;cursor: pointer">{{ item.requestName }}</a>
             </div>
-            <el-button color="#DED0B2" @click="handleShowPreTable">
-              {{ localFormData.preProcess ? '更改' : '请选择' }}
-            </el-button>
           </el-form-item>
         </el-col>
       </el-row>
@@ -135,7 +135,7 @@ import UserPicker from "@/views/workflow/process/common/UserPicker.vue";
 const router = useRouter()
 const route = useRoute()
 const changeDiagram = ref(false)
-const preProcessTable = ref()
+const formRef = ref()
 const showSingleTable = ref(false)
 const projectChargePersonUserList = ref([])
 const projectChargePersonUserPicker = ref()
@@ -257,6 +257,8 @@ const handleShowProjectChargePersonTable = () => {
   projectChargePersonUserPicker.value.showUserPicker()
 }
 const projectChargePersonUserPickerOk = (userList) => {
+  console.log('dsfsdfs',formRef.value,formRef.value?.validateField('projectChargePerson'))
+
   projectChargePersonUserList.value = userList
 }
 const handleShowProjectPersonTable = () => {
@@ -375,92 +377,103 @@ const getFileParam = (item) => {
   }
 }
 const handleSubmit = async () => {
-  if (deploymentData.value.deploymentName === '重大项目立项' || deploymentData.value.deploymentName === '重大项目验收') {
+  // if (!instance) return
-    if (localFormData.value.preProcess === undefined) {
+  // instance.validate(async (valid) => {
+  //   if (!valid) {
+  //     ElNotification({
+  //       title: '提示',
+  //       message: '请完善数据,再提交!',
+  //       type: 'error'
+  //     })
+  //     return;
+  //   }
+    if (deploymentData.value.deploymentName === '重大项目立项' || deploymentData.value.deploymentName === '重大项目验收') {
+      if (localFormData.value.preProcess === undefined) {
+        ElNotification({
+          title: '提示',
+          message: '请选择前置流程!',
+          type: 'error'
+        })
+      }
+    }
+    let files = []
+    if (props.mode === 'resubmit') {
+      attachment.value.allFileList.forEach(item => {
+        files.push(getFileParam(item))
+      })
+    } else {
+      otherFileList.value.forEach(item => {
+        files.push(getFileParam(item))
+      })
+    }
+    if (attachment.value.singleFile == null) {
+      attachment.value.validate()
       ElNotification({
         title: '提示',
-        message: '请选择前置流程!',
+        message: '请上传附件',
         type: 'error'
       })
+      return;
+    } else {
+      attachment.value.clearValidate()
+    }
+    let projectPersonIds = []
+    for (const item of projectPersonUserList.value) {
+      projectPersonIds.push(parseInt(item.id))
+    }
+    let params = {
+      deploymentId: deploymentId.value,
+      requirementId: route.query.id,
+      fileList: files,
+      singleFile: attachment.value.singleFile,
+      projectId: projectId.value,
+      preProcess: JSON.stringify(localFormData.value.preProcess)
+    }
+    console.log(params)
+    let res
+    if (props.step === '20') {
+      params.projectChargePerson = parseInt(projectChargePersonUserList.value[0].id)
+      params.projectPersonIds = projectPersonIds
+      if (props.mode === 'resubmit') {
+        res = await resubmitApply(params)
+      } else {
+        res = await projectApply(params)
+      }
+    } else if (props.step === '40') {
+      if (props.mode === 'resubmit') {
+        res = await resubmitCheck(params)
+      } else {
+        res = await projectCheck(params)
+      }
+    } else if (props.step === '50') {
+      if (props.mode === 'resubmit') {
+        res = await resubmitConclusion(params)
+      } else {
+        res = await projectConclusion(params)
+      }
     }
-  }
-  let files = []
-  if (props.mode === 'resubmit') {
-    attachment.value.allFileList.forEach(item => {
-      files.push(getFileParam(item))
-    })
-  } else {
-    otherFileList.value.forEach(item => {
-      files.push(getFileParam(item))
-    })
-  }
-  if (attachment.value.singleFile == null) {
-    attachment.value.validate()
     ElNotification({
       title: '提示',
-      message: '请上传附件',
+      message: res.msg,
-      type: 'error'
+      type: res.code === 1000 ? 'success' : 'error'
     })
-    return;
+    if (res.code === 1000) {
-  } else {
+      tagsViewStore.delVisitedViews(router.currentRoute.value.path)
-    attachment.value.clearValidate()
+      if (props.step === '20') {
-  }
+        await router.push({
-  let projectPersonIds = []
+          name: 'Initiation'
-  for (const item of projectPersonUserList.value) {
+        })
-    projectPersonIds.push(parseInt(item.id))
+      } else if (props.step === '40') {
-  }
+        await router.push({
-  let params = {
+          name: 'Implementation'
-    deploymentId: deploymentId.value,
+        })
-    requirementId: route.query.id,
+      } else if (props.step === '50') {
-    fileList: files,
+        await router.push({
-    singleFile: attachment.value.singleFile,
+          name: 'Filing'
-    projectId: projectId.value,
+        })
-    preProcess: JSON.stringify(localFormData.value.preProcess)
+      }
-  }
-  console.log(params)
-  let res
-  if (props.step === '20') {
-    params.projectChargePerson = parseInt(projectChargePersonUserList.value[0].id)
-    params.projectPersonIds = projectPersonIds
-    if (props.mode === 'resubmit') {
-      res = await resubmitApply(params)
-    } else {
-      res = await projectApply(params)
     }
-  } else if (props.step === '40') {
+  // })
-    if (props.mode === 'resubmit') {
-      res = await resubmitCheck(params)
-    } else {
-      res = await projectCheck(params)
-    }
-  } else if (props.step === '50') {
-    if (props.mode === 'resubmit') {
-      res = await resubmitConclusion(params)
-    } else {
-      res = await projectConclusion(params)
-    }
-  }
-  ElNotification({
-    title: '提示',
-    message: res.msg,
-    type: res.code === 1000 ? 'success' : 'error'
-  })
-  if (res.code === 1000) {
-    tagsViewStore.delVisitedViews(router.currentRoute.value.path)
-    if (props.step === '20') {
-      await router.push({
-        name: 'Initiation'
-      })
-    } else if (props.step === '40') {
-      await router.push({
-        name: 'Implementation'
-      })
-    } else if (props.step === '50') {
-      await router.push({
-        name: 'Filing'
-      })
-    }
-  }
 }
 const init = async () => {
   let id = projectId.value

src/components/DetailComponent/SpecialFundDetail.vue

@@ -30,10 +30,10 @@
         <baseTitle title="关联项目"></baseTitle>
         <el-col :span="24">
           <el-form-item>
-            <fvTable style="width: 100%;max-height:300px" v-if="showTable" :tableConfig="projectTable"
+            <fvTable style="width: 100%;max-height:162px" height="162" v-if="showTable" :tableConfig="projectTable"
                      :data="formData.projects" :isSettingCol="false" :pagination="false">
               <template #empty>
-                <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
+                <el-empty :image-size="55" description="暂无数据" style="padding: 0"/>
               </template>
             </fvTable>
           </el-form-item>
@@ -41,10 +41,10 @@
         <baseTitle title="附件列表"></baseTitle>
         <el-col :span="24">
           <el-form-item>
-            <fvTable style="width: 100%;max-height: 300px;"  height="300"  v-if="showTable" :tableConfig="fileTable"
+            <fvTable style="width: 100%;max-height: 162px;"  height="162"  v-if="showTable" :tableConfig="fileTable"
                      :data="formData.files" :isSettingCol="false" :pagination="false">
               <template #empty>
-                <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
+                <el-empty :image-size="55" description="暂无数据" style="padding: 0"/>
               </template>
             </fvTable>
           </el-form-item>

src/components/SearchFilesByTag.vue

@@ -21,10 +21,10 @@
       </el-form-item>
     </el-form>
     <el-card style="width: 100%">
-      <fvTable style="width: 100%;max-height: 250px" v-if="showTable" height="250"  :tableConfig="tableConfig"
+      <fvTable style="width: 100%;max-height: 162px" v-if="showTable" height="162"  :tableConfig="tableConfig"
                :data="fileList" :isSettingCol="false" :pagination="false">
         <template #empty>
-          <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
+          <el-empty :image-size="55" description="暂无数据" style="padding: 0"/>
         </template>
       </fvTable>
     </el-card>

src/components/TagAndFileUpload.vue

@@ -16,10 +16,10 @@
   <baseTitle title="其他文件"></baseTitle>
   <el-card style="width: 100%;margin: 15px 0">
     <file-upload @getFile="getFiles"/>
-    <fvTable style="width: 100%;max-height: 250px;height: 250px"  height="250"  v-if="showTable" :tableConfig="tableConfig"
+    <fvTable style="width: 100%;max-height: 162px;height: 162px"  height="162"  v-if="showTable" :tableConfig="tableConfig"
              :data="fileList" :isSettingCol="false" :pagination="false">
       <template #empty>
-        <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
+        <el-empty :image-size="55" description="暂无数据" style="padding: 0"/>
       </template>
     </fvTable>
   </el-card>

src/components/organizationalStructure/Department.vue

@@ -0,0 +1,154 @@
+<template>
+  <baseTitle title="基础信息"></baseTitle>
+  <fv-Form :schema="schema" @getInstance="(e)=>form = e"></fv-Form>
+  <UserPicker ref="usrPickershipIds"  @ok="editshipIds"></UserPicker>
+  <UserPicker ref="usrPickerHeadIds" @ok="editheadIds"></UserPicker>
+  <UserPicker ref="usrPickerDeputyIds" @ok="editdeputyIds"></UserPicker>
+</template>
+
+<script setup lang="jsx">
+import UserPicker from '@/views/workflow/process/common/UserPicker.vue';
+import Ttsup from '@/views/system/department/components/ToolToShowUserPicker.vue'
+import {getInfoById,setDeptInfo} from '@/views/system/department/api'
+const props=defineProps({
+  value:{
+    type:String,
+    default:''
+  }
+})
+const form = ref()
+const usrPickershipIds = ref()
+const usrPickerHeadIds = ref()
+const usrPickerDeputyIds = ref()
+const departmentChargeLeadershipNames = ref()
+const departmentHeadNames = ref()
+const departmentalDeputyNames = ref()
+const departmentChargeLeadershipIds = ref()
+const departmentHeadIds = ref()
+const departmentalDeputyIds = ref()
+const schema = reactive([
+  {
+    label: '部门名字：',
+    prop: 'departmentName',
+  },
+  {
+    label: '部门标志：',
+    prop: 'departmentMark'
+  },
+  {
+    label: '部门分管领导：',
+    prop: 'departmentChargeLeadershipIds',
+    component: ()=><Ttsup modelValue={departmentChargeLeadershipNames.value} onClick={()=>{usrPickershipIds.value.showUserPicker()} } />
+  },
+  {
+    label: '部门负责人：',
+    prop: 'departmentHeadIds',
+    component: ()=><Ttsup modelValue={departmentHeadNames.value} onClick={()=>{usrPickerHeadIds.value.showUserPicker()} } />
+  },
+  {
+    label: '部门副职用户：',
+    prop: 'departmentalDeputyIds',
+    component: ()=><Ttsup modelValue={departmentalDeputyNames.value} onClick={()=>{departmentalDeputyIds.value.showUserPicker()} } />
+  },
+  {
+    label: '创建时间：',
+    prop: 'createTime'
+  }
+])
+const emit = defineEmits(['update:value'])
+const _value = computed({
+  get() {
+    return props.value;
+  },
+  set(value) {
+    emit('update:value', value)
+  }
+})
+
+const getInfo = async () => {
+  const { data } = await getInfoById(_value.value)
+  const params = {
+    createTime: data.createTime,
+    departmentMark: data.departmentMark,
+    departmentName: data.departmentName
+  }
+  departmentChargeLeadershipIds.value = data.departmentChargeLeadershipIds
+  departmentHeadIds.value = data.departmentHeadIds
+  departmentalDeputyIds.value = data.departmentalDeputyIds
+  params.departmentChargeLeadershipIds = formatIdsToNames(data.departmentChargeLeadershipIds, data.departmentChargeLeadershipInfo, 'userId', 'nickName')
+  departmentChargeLeadershipNames.value = params.departmentChargeLeadershipIds
+  params.departmentHeadIds = formatIdsToNames(data.departmentHeadIds, data.departmentHeadInfo, 'userId', 'nickName')
+  departmentHeadNames.value = params.departmentHeadIds
+  params.departmentalDeputyIds = formatIdsToNames(data.departmentalDeputyIds, data.departmentalDeputyInfo, 'userId', 'nickName')
+  departmentalDeputyNames.value = params.departmentalDeputyIds
+  form.value.setValues(params)
+
+}
+
+getInfo()
+
+const formatIdsToNames = (ids, infoList, key, viewKey) => {
+  const resArr = []
+  if(!ids?.length) return
+  ids.forEach(item=>{
+    infoList.forEach(v=>{
+      item == v[key] && resArr.push(v[viewKey])
+    })
+  })
+  return resArr.join(',')
+}
+
+const editshipIds = (list) => {
+  // console.log("🚀 ~ editshipIds ~ list:", list)
+  const arr = list.map(item=>item.name)
+  departmentChargeLeadershipIds.value = list.map(item=>item.id)
+  departmentChargeLeadershipNames.value = arr.join(',')
+  setDeptmentInfo({
+    departmentChargeLeadershipIds: departmentChargeLeadershipIds.value,
+    departmentalDeputyIds: departmentalDeputyIds.value,
+    departmentHeadIds: departmentHeadIds.value
+  })
+}
+
+const editheadIds = (list) => {
+  // console.log("🚀 ~ editshipIds ~ list:", list)
+  const arr = list.map(item=>item.name)
+  departmentHeadIds.value = list.map(item=>item.id)
+  departmentHeadNames.value = arr.join(',')
+  setDeptmentInfo({
+    departmentChargeLeadershipIds: departmentChargeLeadershipIds.value,
+    departmentalDeputyIds: departmentalDeputyIds.value,
+    departmentHeadIds: departmentHeadIds.value
+  })
+}
+
+const editdeputyIds = (list) => {
+  // console.log("🚀 ~ editshipIds ~ list:", list)
+  const arr = list.map(item=>item.name)
+  departmentalDeputyIds.value = list.map(item=>item.id)
+  departmentalDeputyNames.value = arr.join(',')
+  setDeptmentInfo({
+    departmentChargeLeadershipIds: departmentChargeLeadershipIds.value,
+    departmentalDeputyIds: departmentalDeputyIds.value,
+    departmentHeadIds: departmentHeadIds.value
+  })
+}
+
+const setDeptmentInfo = async ({ departmentChargeLeadershipIds = [], departmentHeadIds = [], departmentalDeputyIds = []}) => {
+
+  const params = {
+    departmentChargeLeadershipIds,
+    departmentHeadIds,
+    departmentalDeputyIds,
+    departmentId: _value.value
+  }
+  const res = await setDeptInfo(params)
+  // console.log(res.data);
+}
+
+
+</script>
+
+<style lang="scss" scoped>
+
+</style>

src/layout/navbar/index.vue

@@ -77,6 +77,7 @@ const tagsViewStore = useTagsView()
 const userInfo = ref({})
 const visitedP = ref(false)
 const accountList = ref([])
+const route = useRoute()
 const router = useRouter()
 onMounted(() => {
   setUserInfo()
@@ -117,8 +118,12 @@ const accountChange = (userId) => {
       visitedP.value = !visitedP.value
       authStore.userLogout()
       setToken(res.data)
-      router.push('/')
+      console.log('router',route)
+      if(route.path!=='/'){
+
+      }
       location.reload()
+      // router.push('/home')
       visitedP.value = false
     }
   })

src/views/expense-management/share/add.vue

@@ -24,7 +24,7 @@
           <el-table-column prop="projectId" label="项目名称" min-width="230">
             <template #default="scope">
               <el-form-item prop="time" :rules="scope.row.projectId?'1':rules.projectId">
-                <el-select v-model="scope.row.projectId" placeholder="请选择项目名称" clearable>
+                <el-select v-model="scope.row.projectId" placeholder="请选择项目名称" clearable filterable>
                   <el-option
                       v-for="item in nameOptions"
                       :key="item.value"

src/views/project-demand/requirement/add.vue

@@ -80,13 +80,15 @@
         type="textarea"
         placeholder="请输入征集说明"
     />
-    <baseTitle title="申请文件"></baseTitle>
+    <div style="display: flex;align-items: center">
-    <file-upload v-if="checkFormPrem('fileList')" @getFile="getFile"/>
+      <baseTitle title="申请文件" style="margin-right: 10px"></baseTitle>
-    <fvTable style="width: 100%;max-height: 300px;" height="300" v-if="showTable"
+      <file-upload v-if="checkFormPrem('fileList')" @getFile="getFile"/>
+    </div>
+    <fvTable style="width: 100%;max-height: 162px;" height="162" v-if="showTable"
              :tableConfig="tableConfig" :data="formData.fileList"
              :isSettingCol="false" :pagination="false" perm="EDIT">
       <template #empty>
-        <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
+        <el-empty :image-size="55" description="暂无数据" style="padding: 0"/>
       </template>
     </fvTable>
     <div class="approval-record">

src/views/project-management/filing/upload.vue

@@ -4,10 +4,10 @@
   <baseTitle :title="getName()+'-上传附件'"></baseTitle>
   <el-card style="width: 100%;margin: 15px 0">
     <file-upload @getFile="getFile" />
-    <fvTable style="width: 100%;max-height: 300px;" v-if="showTable" height="300"  :tableConfig="tableConfig"
+    <fvTable style="width: 100%;max-height: 162px;" v-if="showTable" height="162"  :tableConfig="tableConfig"
              :data="fileList" :isSettingCol="false" :pagination="false">
       <template #empty>
-        <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
+        <el-empty :image-size="55" description="暂无数据" style="padding: 0"/>
       </template>
     </fvTable>
   </el-card>

src/views/project-management/implementation/account.vue

@@ -94,7 +94,6 @@ const schema = computed(() => {
 const baseForm = ref()
 const tableIns = ref()
 const btns = ref([
-  {name: '表格更新', key: 'update', color: '#DED0B2', auth: ''},
   {name: '导出', key: 'export', color: '#DED0B2', auth: ''}
 ])
 const searchConfig = reactive([
@@ -221,10 +220,7 @@ const tableConfig = reactive({
   },
   btns: btns.value
 })
-if (route.query.state !== '4') {
+  // const exportIds=ref([])
-  btns.value.push({name: '上传费用', key: 'add', color: '#DED0B2', auth: ''})
-}
-const exportIds=ref([])
 const selectionChange=(data)=>{
   console.log('data',data)
   console.log(' data.forEach(item=>item.id)', data.forEach(item=>item.id))
@@ -248,6 +244,9 @@ const init = async () => {
   const {code, msg, data} = await searchUpdateLedgerData(route.query.id)
   if (code===1000) {
     tableData.value = data
+    if(!data.view){
+      btns.value.push({name: '上传费用', key: 'add', color: '#DED0B2', auth: ''},{name: '表格更新', key: 'update', color: '#DED0B2', auth: ''},)
+    }
     baseForm.value.setValues(data)
   }
   // if (code !== 1000) {
@@ -283,7 +282,7 @@ const handleUploadFee = () => {
 }
 
 const exportExcelHandler = () => {
-  console.log('exportIds.value',exportIds.value)
+  // console.log('exportIds.value',exportIds.value)
   let data = {
     projectId: route.query.id
   }

src/views/project-management/implementation/index.vue

@@ -347,8 +347,7 @@ const handleStandingBook = (row) => {
   router.push({
     name: 'Implementation/account',
     query: {
-      id: row.projectId,
+      id: row.projectId
-      state:row.state
     }
   })
 }

src/views/project-management/implementation/upload.vue

@@ -19,10 +19,10 @@
   <baseTitle title="其他文件"></baseTitle>
   <el-card style="width: 100%;margin: 15px 0">
     <file-upload @getFile="getFile" :disabled="!formData.tagName" :title="!formData.tagName?'请先选择/输入标签！':''"/>
-    <fvTable style="width: 100%;max-height: 300px;" v-if="showTable" height="300"  :tableConfig="tableConfig"
+    <fvTable style="width: 100%;max-height: 162px;" v-if="showTable" height="162"  :tableConfig="tableConfig"
              :data="fileList" :isSettingCol="false" :pagination="false">
       <template #empty>
-        <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
+        <el-empty :image-size="55" description="暂无数据" style="padding: 0"/>
       </template>
     </fvTable>
   </el-card>

src/views/project-management/mobledetail/SpecialFundDetailMobile.vue

@@ -33,10 +33,10 @@
         <baseTitle title="关联项目"></baseTitle>
         <el-col :span="24">
           <el-form-item>
-            <fvTable style="width: 100%;max-height:300px" v-if="showTable" :tableConfig="projectTable"
+            <fvTable style="width: 100%;max-height:162px" height="162" v-if="showTable" :tableConfig="projectTable"
                      :data="formData.projects" :isSettingCol="false" :pagination="false">
               <template #empty>
-                <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
+                <el-empty :image-size="55" description="暂无数据" style="padding: 0"/>
               </template>
             </fvTable>
           </el-form-item>
@@ -44,10 +44,10 @@
         <baseTitle title="附件列表"></baseTitle>
         <el-col :span="24">
           <el-form-item>
-            <fvTable style="width: 100%;max-height: 300px;" height="300"  v-if="showTable" :tableConfig="fileTable"
+            <fvTable style="width: 100%;max-height: 162px;" height="162"  v-if="showTable" :tableConfig="fileTable"
                      :data="formData.files" :isSettingCol="false" :pagination="false">
               <template #empty>
-                <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
+                <el-empty :image-size="55" description="暂无数据" style="padding: 0"/>
               </template>
             </fvTable>
           </el-form-item>

src/views/special-fund/add.vue

@@ -19,11 +19,11 @@
     />
     <baseTitle title="申请文件"></baseTitle>
     <file-upload @getFile="getFile"/>
-    <fvTable style="width: 100%;max-height: 300px;" v-if="showTable"
+    <fvTable style="width: 100%;max-height: 162px;" v-if="showTable"
-             :tableConfig="tableConfig" height="300"  :data="formData.files"
+             :tableConfig="tableConfig" height="162"  :data="formData.files"
              :isSettingCol="false" :pagination="false">
       <template #empty>
-        <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
+        <el-empty :image-size="55" description="暂无数据" style="padding: 0"/>
       </template>
     </fvTable>
     <div class="approval-record">

src/views/system/organizationalStructure/index.vue

@@ -0,0 +1,269 @@
+<template>
+  <div class="organization-layout">
+    <div class="layout-left">
+      <div class="candidate" v-loading="loading">
+        <el-form :model="queryType" @submit.prevent="getList(1)">
+          <el-form-item prop="dictName">
+            <el-input v-model="queryType.chooseName" @change="getList(1)"
+                      clearable placeholder="输入公司或部门名称进行搜索">
+              <template #append>
+                <el-button @click="getList(1)">搜索</el-button>
+              </template>
+            </el-input>
+          </el-form-item>
+        </el-form>
+        <el-empty :image-size="100" description="似乎没有数据" v-show="dataList.length === 0"/>
+        <el-scrollbar>
+          <div class="tree scrollbar-dict">
+            <el-tree :data="dataList" ref="tree" :props="defaultProps" empty-text="" node-key="value"
+                     :default-expanded-keys="expandedKeys" lazy
+                     @node-click="handleChange" @node-expand="handleChange">
+              <template #default="{ node, data }">
+                <div class="tree-node">
+                  <div style="display: flex;align-items: center;padding: 3px 0">
+                    <svg-icon name="oran" v-if="data.type===0" class-name="oran-icon"/>
+                    <el-icon v-else-if="data.type===1" :color="data.matrix?'#67C23A':'#fa3534'" style="margin-right: 4px;">
+                      <FolderOpened/>
+                    </el-icon>
+                    {{ data.organizationalStructureName }}
+                  </div>
+                </div>
+              </template>
+            </el-tree>
+          </div>
+        </el-scrollbar>
+      </div>
+    </div>
+
+    <div class="layout-right">
+      <depart-component v-if="showDept" v-model:value="deptId"/>
+      <!--      <department v-if="selectItem.type===2" :id="selectItem.value"></department>-->
+    </div>
+  </div>
+
+</template>
+
+<script setup>
+import SvgIcon from '@/components/svgIcon/index.vue'
+import {ElNotification} from "element-plus";
+import {getOrganizationStructure} from "@/api/workflow/process-user";
+import DepartComponent from "@/components/organizationalStructure/Department.vue";
+
+const queryType = reactive({
+  chooseName: ""
+});
+const chooseId = ref(0);
+const deptId = ref(0);
+const showDept = ref(false);
+const organizationStructureType = ref(0);
+let selectItem = reactive({
+  type: -1,
+  value: "0"
+});
+const loading = ref(false);
+const dataList = ref([]);
+const tree = ref([]);
+const isSearch = ref(false);
+const expandedKeys = ref([]);
+const defaultProps = {
+  value: "value",
+  label: "organizationalStructureName",
+  children: "children",
+  isLeaf: (data) => {
+    // if (data.isLeaf) {
+    //   return true
+    // }
+  }
+};
+const emit = defineEmits();
+
+const _value = computed({
+  get() {
+    return props.value;
+  },
+  set(val) {
+    emit("input", val);
+  }
+});
+
+const getList = (flag, type) => {
+  let params = {}
+  if (flag === 1) {
+    isSearch.value = true;
+    params = {
+      chooseId: 0,
+      type: 0,
+      chooseName: queryType.chooseName
+    }
+    selectItem = {
+      type: -1,
+      value: "0"
+    };
+  } else {
+    params = {
+      chooseId: chooseId.value,
+      type: organizationStructureType.value,
+      chooseName: queryType.chooseName
+    }
+  }
+  getOrganizationStructure(params).then(res => {
+    if (selectItem.type === -1) {
+      dataList.value = res.data;
+    } else if (type === 2) {
+      selectItem.children = res.data;
+      if (res.data.length === 0) {
+        selectItem.isLeaf = true
+        //   selectItem.children = [{
+        //     type: 2
+        //   }
+      }
+    }
+  });
+};
+const init = () => {
+  selectItem = {
+    type: -1,
+    value: "0"
+  };
+  dataList.value = [];
+  chooseId.value = 0;
+  expandedKeys.value = [];
+  queryType.chooseName = ""
+  getList();
+};
+const handleChange = (item, data) => {
+  console.log('expandedKeys.value',expandedKeys.value)
+  if (item.type === 1) {
+    showDept.value = false
+    nextTick(() => {
+      showDept.value = true
+    })
+    deptId.value = item.organizationalStructureId
+  }
+  selectItem = item;
+  if (isSearch.value) {
+    queryType.chooseName = ""
+    chooseId.value = item.organizationalStructureId;
+    getList('', 2);
+    return;
+  } else {
+    //渲染子节点用户或部门及用户数据
+    if (data.expanded) {
+      if (expandedKeys.value.indexOf(item.value) === -1) {
+        expandedKeys.value.push(item.value);
+        organizationStructureType.value = item.type
+        chooseId.value = item.organizationalStructureId;
+        getList('', 2);
+        return;
+      }
+    }
+  }
+};
+init()
+
+</script>
+
+<style lang="scss" scoped>
+$containWidth: 550px;
+.organization-layout {
+  display: flex;
+  justify-content: space-between;
+
+  .layout-left {
+    width: $containWidth;
+    //border: 1px solid #ebeef5;
+    padding: 10px;
+    margin-top: 5px;
+
+    .candidate {
+      position: absolute;
+      display: inline-block;
+      width: $containWidth;
+      //height: 80%;
+      //border: 1px solid #e8e8e8;
+
+      :deep(.el-input) {
+        height: 40px;
+
+        .el-input__inner, .el-input-group__append {
+          font-size: 16px;
+        }
+      }
+
+      .scrollbar-dict {
+        border: 1px solid #ebeef5;
+        //min-height: 30vh;
+        //height: 60vh;
+        height: calc(100vh - 250px);
+        overflow-y: auto;
+        overflow-x: hidden;
+
+        &::-webkit-scrollbar {
+          width: 6px;
+          height: 6px;
+        }
+
+        // 滚动条轨道
+        &::-webkit-scrollbar-track {
+          background: rgb(239, 239, 239);
+          border-radius: 2px;
+        }
+
+        // 小滑块
+        &::-webkit-scrollbar-thumb {
+          background: rgba(80, 81, 82, 0.29);
+          border-radius: 10px;
+        }
+
+        .el-tree--highlight-current
+        .el-tree-node.is-current
+        > .el-tree-node__content {
+          // 设置颜色
+          background-color: rgba(135, 206, 235, 0.2); // 透明度为0.2的skyblue，作者比较喜欢的颜色
+          color: #409eff; // 节点的字体颜色
+          font-weight: bold; // 字体加粗
+        }
+      }
+
+    }
+
+  }
+
+  .layout-right {
+    flex: 1;
+    //width: 70%;
+    //border: 1px solid #ebeef5;
+    margin-left: 30px;
+    padding: 0 10px;
+    border: none;
+  }
+}
+
+:deep(.tree) {
+  .el-tree-node__content {
+    height: 34px;
+
+    .tree-node {
+      font-size: 18px;
+    }
+  }
+}
+
+
+.el-scrollbar .el-scrollbar__wrap {
+  overflow-x: hidden;
+}
+
+::-webkit-scrollbar {
+  float: right;
+  width: 4px;
+  height: 4px;
+  background-color: white;
+}
+
+::-webkit-scrollbar-thumb {
+  border-radius: 16px;
+  background-color: #efefef;
+}
+
+</style>

src/views/tool/dict/index.vue

@@ -13,10 +13,10 @@
                      @click.stop="handleDeleteType" :disabled="disabledDelete" plain>删除
           </el-button>
         </div>
-        <el-form :model="queryType">
+        <el-form :model="queryType" @submit.prevent="getTreeList">
           <el-form-item prop="dictName">
             <el-input v-model="queryType.dictName" placeholder="请输入字典类型" :suffix-icon="Search"
-                      clearable @clear="getTreeList" @input="getTreeList"></el-input>
+                      clearable @clear="getTreeList" title="请按回车或enter键进行搜索！"></el-input>
           </el-form-item>
         </el-form>
         <div class="scrollbar-dict">
@@ -173,7 +173,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="标签主题" prop="theme">
-              <el-select v-model="dataForm.theme" placeholder="请选择显示样式">
+              <el-select v-model="dataForm.theme" placeholder="请选择显示样式" clearable filterable>
                 <el-option
                     v-for="item in tagThemeList"
                     :key="item.value"
@@ -185,7 +185,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="标签样式" prop="listClass">
-              <el-select v-model="dataForm.listClass" placeholder="请选择显示样式" v-if="dataForm.isType">
+              <el-select v-model="dataForm.listClass" placeholder="请选择显示样式" v-if="dataForm.isType" clearable filterable>
                 <el-option
                     v-for="item in tagTypeList"
                     :key="item.value"

src/views/workflow/common/Comment.vue

@@ -16,7 +16,7 @@
     <!--显示退回节点弹出框-->
     <div v-if="type === 4" style="margin-bottom: 10px">
       <span>回退节点：</span>
-      <el-select v-if="userTaskOption.length >0 " v-model="rollBackId" slot="prepend" placeholder="选择要回退到的节点" filterable>
+      <el-select v-if="userTaskOption.length >0 " v-model="rollBackId" slot="prepend" placeholder="选择要回退到的节点" filterable clearable>
         <el-option v-for="(option,index) in userTaskOption" :key="index"
                    :label="option.label" :value="option.value"/>
       </el-select>

src/views/workflow/form/components/MultipleSelect.vue

@@ -1,6 +1,6 @@
 <template>
     <template v-if="mode === 'DESIGN'">
-      <el-select class="max-fill" v-if="!expanding" size="medium" multiple v-model="_value" disabled :placeholder="placeholder" filterable/>
+      <el-select class="max-fill" v-if="!expanding" size="medium" multiple v-model="_value" disabled :placeholder="placeholder" filterable clearable/>
       <el-checkbox-group v-else v-model="_value">
         <el-checkbox disabled v-for="(op, index) in options" :key="index" :label="op">{{op}}</el-checkbox>
       </el-checkbox-group>

src/views/workflow/form/components/SelectInput.vue

@@ -1,6 +1,6 @@
 <template>
     <template v-if="mode === 'DESIGN'">
-      <el-select class="max-fill" v-if="!expanding" size="medium" v-model="_value" disabled :placeholder="placeholder"  filterable/>
+      <el-select class="max-fill" v-if="!expanding" size="medium" v-model="_value" disabled :placeholder="placeholder"  filterable clearable/>
       <el-radio-group v-model="_value" v-else>
         <el-radio disabled v-for="(op, index) in options" :key="index" :label="op">{{op}}</el-radio>
       </el-radio-group>

src/views/workflow/form/config/DateTimeConfig.vue

@@ -4,7 +4,7 @@
       <el-input size="small" v-model="value.placeholder" placeholder="请设置日期提示"/>
     </el-form-item>
     <el-form-item label="日期格式">
-      <el-select size="small" v-model="value.format" filterable>
+      <el-select size="small" v-model="value.format" filterable clearable>
         <el-option value="yyyy" label="年"></el-option>
         <el-option value="yyyy-MM" label="年-月"></el-option>
         <el-option value="yyyy-MM-dd" label="年-月-日"></el-option>

src/views/workflow/form/config/DateTimeRangeConfig.vue

@@ -5,7 +5,7 @@
       <el-input size="small" v-model="placeholder[1]" @change="placeholderChange" placeholder="结束日期提示"/>
     </el-form-item>
     <el-form-item label="日期格式">
-      <el-select size="small" v-model="value.format" filterable>
+      <el-select size="small" v-model="value.format" filterable clearable>
         <el-option value="yyyy" label="年"></el-option>
         <el-option value="yyyy-MM" label="年-月"></el-option>
         <el-option value="yyyy-MM-dd" label="年-月-日"></el-option>

src/views/workflow/listen/index.vue

@@ -2,7 +2,7 @@
   <div>
     <el-form :model="queryParams" inline class="query-form" ref="queryForm">
       <el-form-item label="监听器类型" prop="listenerType">
-        <el-select v-model="queryParams.listenerType" placeholder="请选择监听器类型"  filterable>
+        <el-select v-model="queryParams.listenerType" placeholder="请选择监听器类型"  filterable clearable>
           <el-option
               v-for="item in cacheStore.getDict('process_listen_type')"
               :key="item.value"
@@ -15,7 +15,7 @@
         <el-input v-model="queryParams.listenerName" placeholder="请输入监听器名称"></el-input>
       </el-form-item>
       <el-form-item label="监听器数据类型" prop="listenerValueType">
-        <el-select v-model="queryParams.listenerValueType" placeholder="请选择监听器数据类型"  filterable>
+        <el-select v-model="queryParams.listenerValueType" placeholder="请选择监听器数据类型"  filterable clearable>
           <el-option
               v-for="item in cacheStore.getDict('process_data_type')"
               :key="item.value"
@@ -86,7 +86,7 @@
           <el-col :span="11" :offset="2">
             <el-form-item label="监听器类型" prop="eventType" class="listen">
               <el-select placeholder="请选择监听器类型" @change="form.eventType = []"
-                         v-model="form.listenerType"  filterable>
+                         v-model="form.listenerType"  filterable clearable>
                 <el-option :value="'1'" label="任务监听"/>
                 <el-option :value="'2'" label="执行监听"/>
               </el-select>
@@ -94,7 +94,7 @@
           </el-col>
           <el-col :span="11">
             <el-form-item label="事件类型" prop="listenerType" class="listen">
-              <el-select multiple placeholder="请选择事件类型" v-model="form.eventType"  filterable>
+              <el-select multiple placeholder="请选择事件类型" v-model="form.eventType"  filterable clearable>
                 <el-option value="create" label="create"/>
                 <el-option v-if="form.listenerType === '2'" value="end" label="end"/>
                 <el-option v-if="form.listenerType === '2'" value="take" label="take"/>

src/views/workflow/process/ProcessSetting.vue

@@ -5,7 +5,7 @@
     </p>
   </div>
   <div v-if="!processData.processDefinitionKey">
-    <el-select v-model="processData.processKey" @change="processKeyChange" placeholder="请选择流程环节">
+    <el-select v-model="processData.processKey" @change="processKeyChange" placeholder="请选择流程环节" clearable filterable>
       <el-option v-for="item in optionList" :label="item.label" :value="item.value"/>
     </el-select>
   </div>

src/views/workflow/process/common/UserPicker.vue

@@ -72,7 +72,7 @@
 <script setup>
 import {ElMessageBox, ElNotification} from "element-plus";
 import {getMosrUser} from "@/api/workflow/process-user";
-import {checkMatrix} from "../../../../api/user/user";
+import {checkMatrix} from "@/api/user/user";
 
 const props = defineProps({
   value: {

src/views/workflow/process/config/ApprovalNodeConfig.vue

@@ -59,7 +59,7 @@
       <div v-else-if="nodeProps.assignedType === 'FORM_USER'">
         <el-form-item label="选择表单联系人项" prop="text" class="approve-end">
           <el-select style="width: 80%;" size="small" v-model="nodeProps.formUser" placeholder="请选择包含联系人的表单项"
-                     filterable>
+                     filterable clearable>
             <el-option v-for="(op,i) in forms" :label="op.title" :value="op.id" :key="i"></el-option>
           </el-select>
         </el-form-item>

src/views/workflow/process/config/ConditionGroupItemConfig.vue

@@ -38,13 +38,13 @@
             <ellipsis slot="label" hover-tip :content="condition.title"/>
             <span v-if="condition.valueType === ValueType.string">
                 <el-select placeholder="判断符" style="width: 120px;" v-model="condition.compare"
-                           @change="condition.value = []" filterable>
+                           @change="condition.value = []" filterable clearable>
                   <el-option label="等于" value="="></el-option>
                   <el-option label="包含在" value="IN"></el-option>
                 </el-select>
                  <span v-if="isSelect(condition.id)" style="margin-left: 10px">
                    <el-select v-if="condition.compare === 'IN'" style="width: 280px;" clearable multiple size="small"
-                              v-model="condition.value" placeholder="选择值" filterable>
+                              v-model="condition.value" placeholder="选择值" filterable >
                      <el-option v-for="(option, oi) in getOptions(condition.id)" :key="oi" :label="option"
                                 :value="option"></el-option>
                    </el-select>
@@ -62,13 +62,13 @@
                  </span>
               </span>
             <span v-else-if="condition.valueType === ValueType.number">
-                <el-select size="small" placeholder="判断符" style="width: 120px;" v-model="condition.compare" filterable>
+                <el-select size="small" placeholder="判断符" style="width: 120px;" v-model="condition.compare" filterable clearable>
                   <el-option :label="exp.label" :value="exp.value" :key="exp.value" v-for="exp in explains"></el-option>
                 </el-select>
                 <span style="margin-left: 10px">
                   <el-input style="width: 280px;" v-if="conditionValType(condition.compare) === 0"
                             placeholder="输入比较值" type="number" v-model="condition.value[0]"/>
-                  <el-select style="width: 280px;" multiple filterable allow-create
+                  <el-select style="width: 280px;" multiple filterable allow-create clearable
                              v-else-if="conditionValType(condition.compare) === 1"
                              v-model="condition.value" placeholder="输入可能包含的值"></el-select>
                   <span v-else>

src/views/workflow/process/config/DelayNodeConfig.vue

@@ -10,7 +10,7 @@
     <div v-if="config.type === 'FIXED'">
       <el-input style="width: 180px;" placeholder="时间单位" type="number" v-model="config.time">
       </el-input>
-      <el-select style="width: 75px;" v-model="config.unit" slot="append" placeholder="请选择" filterable>
+      <el-select style="width: 75px;" v-model="config.unit" slot="append" placeholder="请选择" filterable clearable>
         <el-option label="天" value="D"></el-option>
         <el-option label="小时" value="H"></el-option>
         <el-option label="分钟" value="M"></el-option>

src/views/workflow/process/config/TriggerNodeConfig.vue

@@ -10,7 +10,7 @@
       <div v-if="config.type === 'WEBHOOK'">
         <el-form-item label="请求地址" prop="text">
           <el-input placeholder="请输入URL地址" v-model="config.http.url">
-            <el-select v-model="config.http.method" style="width: 85px;" slot="prepend" placeholder="URL" filterable>
+            <el-select v-model="config.http.method" style="width: 85px;" slot="prepend" placeholder="URL" filterable clearable>
               <el-option label="GET" value="GET"></el-option>
               <el-option label="POST" value="POST"></el-option>
               <el-option label="PUT" value="PUT"></el-option>
@@ -31,7 +31,7 @@
               <el-radio-button :label="false">固定</el-radio-button>
             </el-radio-group>
             <el-select v-if="header.isField" style="width: 180px;" v-model="header.value"
-                       placeholder="请选择表单字段" filterable>
+                       placeholder="请选择表单字段" filterable clearable>
               <el-option v-for="form in forms" :key="form.id" :label="form.title" :value="form.title"></el-option>
             </el-select>
             <el-input v-else placeholder="请设置字段值" v-model="header.value" style="width: 180px;"/>
@@ -57,7 +57,7 @@
               <el-radio-button :label="false">固定</el-radio-button>
             </el-radio-group>
             <el-select v-if="param.isField" style="width: 180px;" v-model="param.value"
-                       placeholder="请选择表单字段" filterable>
+                       placeholder="请选择表单字段" filterable clearable>
               <el-option v-for="form in forms" :key="form.id" :label="form.title" :value="form.id"></el-option>
             </el-select>
             <el-input v-else placeholder="请设置字段值" v-model="param.value" style="width: 180px;"/>
@@ -108,13 +108,13 @@
           <el-input placeholder="请输入邮件主题" v-model="config.email.subject"/>
         </el-form-item>
         <el-form-item label="收件方" prop="text">
-          <el-select style="width: 100%;" v-model="config.email.to" filterable multiple allow-create
+          <el-select style="width: 100%;" v-model="config.email.to" filterable multiple allow-create clearable
                      default-first-option placeholder="请输入收件人">
             <el-option v-for="sender in config.email.to" :key="sender" :label="sender" :value="sender"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="抄送方" prop="text">
-          <el-select style="width: 100%;" v-model="config.email.cc" filterable multiple allow-create
+          <el-select style="width: 100%;" v-model="config.email.cc" filterable multiple allow-create clearable
                      default-first-option placeholder="请输入收件人">
             <el-option v-for="item in config.email.cc" :key="item" :label="item" :value="item"></el-option>
           </el-select>