From 1f126592e1ef2ede03fc09c6f64697fa9ecc41d0 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Wed, 15 May 2024 14:19:36 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat=20:=20=E9=A1=B9=E7=9B=AE=E5=AE=9E?=
 =?UTF-8?q?=E6=96=BD=E5=88=86=E9=A1=B5=E9=9D=A2=E5=88=9D=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../implementation/account.vue                |  90 ++++++++++++
 .../implementation/attachment.vue             |  79 +++++++++++
 .../implementation/check.vue                  | 133 +++++++++++++++++-
 .../implementation/share.vue                  |  93 ++++++++++++
 4 files changed, 391 insertions(+), 4 deletions(-)
 create mode 100644 src/views/project-management/implementation/account.vue
 create mode 100644 src/views/project-management/implementation/attachment.vue
 create mode 100644 src/views/project-management/implementation/share.vue

diff --git a/src/views/project-management/implementation/account.vue b/src/views/project-management/implementation/account.vue
new file mode 100644
index 0000000..2ac081f
--- /dev/null
+++ b/src/views/project-management/implementation/account.vue
@@ -0,0 +1,90 @@
+<template>
+  <fvSearchForm :searchConfig="searchConfig" @search="search"></fvSearchForm>
+  <fvTable ref="tableIns" :tableConfig="tableConfig">
+    <template #empty>
+      <el-empty description="暂无数据"/>
+    </template>
+  </fvTable>
+</template>
+
+<script setup lang="jsx">
+const searchConfig = reactive([
+  {
+    label: '名称',
+    prop: 'requirementName',
+    component: 'el-input',
+    props: {
+      placeholder: '请输入名称查询',
+      clearable: true,
+      filterable: true,
+      checkStrictly: true
+    }
+  },
+  {
+    label: '项目费用',
+    prop: 'requirementName',
+    component: 'el-input',
+    props: {
+      placeholder: '请输入项目费用查询',
+      clearable: true,
+      filterable: true,
+      checkStrictly: true
+    }
+  },
+  {
+    label: '起始时间',
+    prop: 'datetime',
+    component: 'el-date-picker',
+    props: {
+      placeholder: '请选择起始时间',
+      clearable: true,
+    },
+    colProps: {}
+  }
+])
+const tableConfig = reactive({
+  columns: [
+    {
+      prop: 'name',
+      type: 'index',
+      label: '序号',
+      width:'80'
+    },
+    {
+      prop: 'name',
+      label: '时间',
+      align: 'center'
+    },
+    {
+      prop: 'projectType',
+      label: '项目费用',
+      align: 'center'
+    },
+    {
+      prop: 'productMainBody',
+      label: '研发阶段',
+      align: 'center'
+    },
+    {
+      prop: 'projectEffect',
+      label: '摘要',
+      align: 'center'
+    },
+    {
+      prop: 'survey',
+      label: '税后余额(元)',
+      align: 'center'
+    }
+  ],
+  api: '',
+  params: {},
+  btns: [
+    {name: '上传费用', key: '_export', color: '#DED0B2',auth: ''}
+  ]
+})
+
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/project-management/implementation/attachment.vue b/src/views/project-management/implementation/attachment.vue
new file mode 100644
index 0000000..3063242
--- /dev/null
+++ b/src/views/project-management/implementation/attachment.vue
@@ -0,0 +1,79 @@
+<template>
+  <fvSearchForm :searchConfig="searchConfig" @search="search"></fvSearchForm>
+  <el-card style="width: 100%">
+    <file-upload @getFile="getOtherFile" :showFileList="true"/>
+    <fvTable style="width: 100%;max-height: 250px" v-if="showTable" :tableConfig="tableConfig"
+             :data="otherFileList" :isSettingCol="false" :pagination="false">
+      <template #empty>
+        <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
+      </template>
+    </fvTable>
+  </el-card>
+</template>
+
+<script setup lang="jsx">
+import fvSelect from '@/fvcomponents/fvSelect/index.vue'
+import {shallowRef} from "vue";
+
+const searchConfig = reactive([
+  {
+    label: '标签',
+    prop: 'collectType',
+    component: shallowRef(fvSelect),
+    props: {
+      placeholder: '请选择标签',
+      clearable: true,
+      filterable: true,
+    }
+  }
+])
+const tableConfig = reactive({
+  columns: [
+    {
+      prop: 'index',
+      type: 'index',
+      label: '序号',
+      align: 'center',
+      width: '80',
+    },
+    {
+      prop: 'originalFileName',
+      label: '文件名',
+      align: 'center',
+    },
+    {
+      prop: 'tag',
+      label: '标签',
+      align: 'center'
+    },
+    {
+      prop: 'size',
+      label: '文件大小',
+      align: 'center',
+      currentRender: ({row, index}) => (parseInt(row.size / 1024) + 'KB')
+    },
+    {
+      prop: 'oper',
+      label: '操作',
+      align: 'center',
+      currentRender: ({row, index}) => {
+        return (
+            <div>
+              <a style="cursor: pointer;font-size: 14px;color: #2a99ff;" href={row.url}>下载</a>
+              <el-button type="primary" size="large" link onClick={() => beforeRemove(row)}>删除</el-button>
+            </div>
+        )
+      }
+    }
+  ]
+})
+const showTable=ref(true)
+const otherFileList = ref([])
+const getOtherFile = () => {
+
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/project-management/implementation/check.vue b/src/views/project-management/implementation/check.vue
index 3832ce4..af00dac 100644
--- a/src/views/project-management/implementation/check.vue
+++ b/src/views/project-management/implementation/check.vue
@@ -1,10 +1,135 @@
 <template>
-
+  <div class="apply-block">
+    <el-form :model="formData" ref="applyForm" label-width="auto" :rules="rules">
+      <baseTitle title="项目立项申请"></baseTitle>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="前置流程">
+            <el-input v-model="formData.requirementName" clearable></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="项目验收附件" prop="attachment">
+            <file-upload @getFile="getAttachment" :showFileList="true"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="其他文件">
+            <el-card style="width: 100%">
+              <file-upload @getFile="getOtherFile" :showFileList="true"/>
+              <fvTable style="width: 100%;max-height: 250px" v-if="showTable" :tableConfig="tableConfig"
+                       :data="otherFileList" :isSettingCol="false" :pagination="false">
+                <template #empty>
+                  <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
+                </template>
+              </fvTable>
+            </el-card>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div class="oper-page-btn">
+      <el-button color="#DED0B2" @click="handleSubmit(applyForm)">提交</el-button>
+    </div>
+  </div>
 </template>
 
-<script>
-export default {
-  name: "check"
+<script setup lang="jsx">
+import FileUpload from "@/components/FileUpload.vue";
+
+const formData = ref({})
+const rules = reactive({
+  attachment: [{required: true, message: '请上传项目立项附件', trigger: 'blur'}],
+})
+const fileList = ref(null)
+const applyForm = ref()
+const showTable = ref(true)
+const otherFileList = ref([])
+const tableConfig = reactive({
+  columns: [
+    {
+      prop: 'index',
+      type: 'index',
+      label: '序号',
+      align: 'center',
+      width: '80',
+    },
+    {
+      prop: 'originalFileName',
+      label: '文件名',
+      align: 'center',
+    },
+    {
+      prop: 'tag',
+      label: '标签',
+      align: 'center'
+    },
+    {
+      prop: 'size',
+      label: '文件大小',
+      align: 'center',
+      currentRender: ({row, index}) => (parseInt(row.size / 1024) + 'KB')
+    },
+    {
+      prop: 'oper',
+      label: '操作',
+      align: 'center',
+      currentRender: ({row, index}) => {
+        return (
+            <div>
+              <a style="cursor: pointer;font-size: 14px;color: #2a99ff;" href={row.url}>下载</a>
+              <el-button type="primary" size="large" link onClick={() => beforeRemove(row)}>删除</el-button>
+            </div>
+        )
+      }
+    }
+  ]
+})
+
+const compositeParam = (item) => {
+  return {
+    fileId: item.id,
+    size: item.size,
+    originalFileName: item.originalFilename,
+    fileType: item.fileType,
+    url: item.url,
+    processNodeTag: null,
+    tag: formData.value.collectType
+  }
+}
+const getAttachment = (val) => {
+  console.log('上传文件', val)
+  showTable.value = false
+  nextTick(() => {
+    showTable.value = true
+  })
+  let fileObj = {}
+  let newFileArray = []
+  if (route.query.isAdd === undefined) {
+    val.forEach(item => {
+      fileObj = compositeParam(item)
+      newFileArray.push(fileObj)
+      formData.value.fileList.push(fileObj)
+    })
+    fileList.value = formData.value.fileList
+  } else {
+    val.forEach(item => {
+      fileObj = compositeParam(item)
+      newFileArray.push(fileObj)
+    })
+    formData.value.fileList = newFileArray
+    fileList.value = newFileArray
+  }
+}
+const getOtherFile = () => {
+
+}
+const handleSubmit = (instance) => {
+  if (!instance) return
+  instance.validate(async (valid) => {
+    if (!valid) return
+
+  })
 }
 </script>
 
diff --git a/src/views/project-management/implementation/share.vue b/src/views/project-management/implementation/share.vue
new file mode 100644
index 0000000..ea2988c
--- /dev/null
+++ b/src/views/project-management/implementation/share.vue
@@ -0,0 +1,93 @@
+<template>
+  <fvSearchForm :searchConfig="searchConfig" @search="search"></fvSearchForm>
+  <fvTable ref="tableIns" :tableConfig="tableConfig">
+    <template #empty>
+      <el-empty description="暂无数据"/>
+    </template>
+  </fvTable>
+</template>
+
+<script setup lang="jsx">
+import {reactive} from "vue";
+
+const searchConfig = reactive([
+  {
+    label: '名称',
+    prop: 'requirementName',
+    component: 'el-input',
+    props: {
+      placeholder: '请输入名称查询',
+      clearable: true,
+      filterable: true,
+      checkStrictly: true
+    }
+  },
+  {
+    label: '项目费用',
+    prop: 'requirementName',
+    component: 'el-input',
+    props: {
+      placeholder: '请输入项目费用查询',
+      clearable: true,
+      filterable: true,
+      checkStrictly: true
+    }
+  },
+  {
+    label: '起始时间',
+    prop: 'datetime',
+    component: 'el-date-picker',
+    props: {
+      placeholder: '请选择起始时间',
+      clearable: true,
+    },
+    colProps: {}
+  }
+])
+const tableIns = ref()
+const tableConfig = reactive({
+  columns: [
+    {
+      prop: 'name',
+      type: 'index',
+      label: '序号',
+      width:'80'
+    },
+    {
+      prop: 'name',
+      label: '时间',
+      align: 'center'
+    },
+    {
+      prop: 'projectType',
+      label: '项目费用',
+      align: 'center'
+    },
+    {
+      prop: 'productMainBody',
+      label: '研发阶段',
+      align: 'center'
+    },
+    {
+      prop: 'projectEffect',
+      label: '摘要',
+      align: 'center'
+    },
+    {
+      prop: 'survey',
+      label: '税后余额(元)',
+      align: 'center'
+    }
+  ],
+  api: '',
+  params: {},
+  btns: [
+    {name: '生成分摊报表', key: '_export', color: '#DED0B2',auth: ''}
+  ]
+})
+
+</script>
+
+<style scoped>
+
+</style>

From a4cb59ff9ad990dc054a7dfde82c3b019858e0c2 Mon Sep 17 00:00:00 2001
From: lilinyuan <1084668738@qq.com>
Date: Wed, 15 May 2024 16:00:24 +0800
Subject: [PATCH 2/2] =?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=AE=E9=80=BB=E8=BE=91=E5=88=A4=E6=96=AD?=
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 e68fcc8..6e74ff7 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 permissiosFlag[0] === allPermission || permissiosFlag[0] === permission
+      return permission === allPermission || permissiosFlag[0] === permission
     })
     if (!hasPermission) {
       el.parentNode && el.parentNode.removeChild(el)