From d3fe46f0bc0627a056ce8ae3dcc4ccaf4f3115b8 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Mon, 10 Jun 2024 00:25:00 +0800
Subject: [PATCH 01/19] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E6=8C=89=E9=92=AE=E6=97=81=E8=BE=B9=E7=9A=84=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E9=A1=B5=E9=9D=A2=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DetailComponent/ProjectApply.vue          |  4 ++
 src/views/expense-management/ledger/index.vue |  5 ---
 src/views/project-demand/summary/add.vue      |  4 ++
 .../project-management/filing/conclusion.vue  |  4 ++
 .../implementation/account.vue                |  6 ++-
 .../implementation/check.vue                  |  4 ++
 .../implementation/index.vue                  |  1 +
 .../implementation/share.vue                  | 41 +++++++++++++++----
 .../project-management/initiation/apply.vue   |  4 ++
 9 files changed, 59 insertions(+), 14 deletions(-)

diff --git a/src/components/DetailComponent/ProjectApply.vue b/src/components/DetailComponent/ProjectApply.vue
index d4b1edb..bc45b06 100644
--- a/src/components/DetailComponent/ProjectApply.vue
+++ b/src/components/DetailComponent/ProjectApply.vue
@@ -27,6 +27,7 @@
     <div class="oper-page-btn">
       <el-button color="#DED0B2" v-if="route.query.state==0" @click="handleSubmit(applyForm)">提交</el-button>
       <el-button color="#DED0B2" v-else-if="route.query.state==3" @click="handleSubmit(applyForm)">重新提交</el-button>
+      <el-button @click="handleBack">返回</el-button>
     </div>
   </div>
 </template>
@@ -70,6 +71,9 @@ const processDiagramViewer = ref(false)
 const name = ref(router.currentRoute.value.name)
 const applyForm = ref()
 const deploymentId = ref()
+const handleBack = () => {
+  history.back()
+}
 const compositeParam = (item) => {
   // let tag = ''
   // if (name.value === 'Initiation/apply' || route.query.state==3) {
diff --git a/src/views/expense-management/ledger/index.vue b/src/views/expense-management/ledger/index.vue
index 7bac909..052765b 100644
--- a/src/views/expense-management/ledger/index.vue
+++ b/src/views/expense-management/ledger/index.vue
@@ -122,11 +122,6 @@ const tableConfig = reactive({
         }
       }
     },
-    {
-      prop: 'digest',
-      label: '摘要',
-      align: 'center'
-    },
     {
       prop: 'afterTax',
       label: '税后余额(元)',
diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue
index 87aa3a1..6963ed8 100644
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -244,6 +244,7 @@
       <!--      <el-button type="info" @click="staging">存为草稿</el-button>-->
       <el-button color="#DED0B2" v-if="name==='Summary/add'" @click="handleSubmit(summaryForm)">发布</el-button>
       <el-button color="#DED0B2" v-else @click="handleResubmit">重新发布</el-button>
+      <el-button @click="handleBack">返回</el-button>
     </div>
   </div>
 </template>
@@ -307,6 +308,9 @@ const rules = reactive({
   contentDescription: [{required: true, message: '请输入研发项目关键内容描述', trigger: 'blur'}]
 })
 
+const handleBack = () => {
+  history.back()
+}
 const disabledDate = (time) => {
   return time.getTime() < new Date(formData.value.startTime).getTime();
 }
diff --git a/src/views/project-management/filing/conclusion.vue b/src/views/project-management/filing/conclusion.vue
index d779200..f67715f 100644
--- a/src/views/project-management/filing/conclusion.vue
+++ b/src/views/project-management/filing/conclusion.vue
@@ -12,6 +12,7 @@
     <div class="oper-page-btn">
       <el-button color="#DED0B2" v-if="name==='Filing/conclusion'" @click="handleSubmit">提交</el-button>
       <el-button color="#DED0B2" v-else @click="handleResubmit">重新提交</el-button>
+      <el-button @click="handleBack">返回</el-button>
     </div>
   </div>
 </template>
@@ -92,6 +93,9 @@ const handleDownload = (row) => {
     a.click()
   })
 }
+const handleBack = () => {
+  history.back()
+}
 const compositeParam = (item) => {
   let tag = ''
   if (name.value === 'Filing/conclusion' || name.value === 'Filing/edit') {
diff --git a/src/views/project-management/implementation/account.vue b/src/views/project-management/implementation/account.vue
index 65c724a..f1b5111 100644
--- a/src/views/project-management/implementation/account.vue
+++ b/src/views/project-management/implementation/account.vue
@@ -9,6 +9,7 @@
 
 <script setup lang="jsx">
 import fvSelect from '@/fvcomponents/fvSelect/index.vue'
+import {toThousands} from '@/utils/changePrice.js'
 
 const router = useRouter()
 const route = useRoute()
@@ -125,7 +126,10 @@ const tableConfig = reactive({
     {
       prop: 'afterTax',
       label: '税后余额(元)',
-      align: 'center'
+      align: 'center',
+      currentRender:({row})=>{
+        return <span>{toThousands(row.afterTax)}</span>
+      }
     }
   ],
   api: '/workflow/mosr/expense/ledger',
diff --git a/src/views/project-management/implementation/check.vue b/src/views/project-management/implementation/check.vue
index e219b9e..5200207 100644
--- a/src/views/project-management/implementation/check.vue
+++ b/src/views/project-management/implementation/check.vue
@@ -21,6 +21,7 @@
     <div class="oper-page-btn">
       <el-button color="#DED0B2" v-if="name==='Implementation/check'" @click="handleSubmit(applyForm)">提交</el-button>
       <el-button color="#DED0B2" v-else @click="handleResubmit(applyForm)">重新提交</el-button>
+      <el-button @click="handleBack">返回</el-button>
     </div>
   </div>
 </template>
@@ -46,6 +47,9 @@ const otherFileList = ref([])
 const processInstanceData = ref()
 const processDiagramViewer = ref(true)
 const processStore = useProcessStore()
+const handleBack = () => {
+  history.back()
+}
 const compositeParam = (item) => {
   let tag = ''
   if (name.value === 'Implementation/check' || name.value === 'Implementation/edit') {
diff --git a/src/views/project-management/implementation/index.vue b/src/views/project-management/implementation/index.vue
index 73ac41b..7541b91 100644
--- a/src/views/project-management/implementation/index.vue
+++ b/src/views/project-management/implementation/index.vue
@@ -245,6 +245,7 @@ const tableConfig = reactive({
       prop: 'oper',
       label: '操作',
       align: 'center',
+      fixed:'right',
       showOverflowTooltip: false,
       currentRender: ({row, index}) => {
         let btn = []
diff --git a/src/views/project-management/implementation/share.vue b/src/views/project-management/implementation/share.vue
index 58f5b50..200418f 100644
--- a/src/views/project-management/implementation/share.vue
+++ b/src/views/project-management/implementation/share.vue
@@ -13,6 +13,7 @@
 import fvSelect from '@/fvcomponents/fvSelect/index.vue'
 import {computed, ref} from "vue";
 import {getBaseInfoApi} from "@/components/steps/api";
+import {getResearchUser} from "@/api/expense-manage";
 
 const route = useRoute()
 const schema = computed(() => {
@@ -94,14 +95,17 @@ const tableConfig = reactive({
       width:'80'
     },
     {
-      prop: 'name',
+      prop: 'time',
       label: '时间',
       align: 'center'
     },
     {
       prop: 'researchPersonnel',
       label: '研发人员',
-      align: 'center'
+      align: 'center',
+      currentRender:({row})=>{
+        return <span>{getResearchName(row.researchPersonnel)}</span>
+      }
     },
     {
       prop: 'wagesPayable',
@@ -117,24 +121,29 @@ const tableConfig = reactive({
       prop: 'reserveFund',
       label: '公积金',
       align: 'center'
-    },{
+    },
+    {
       prop: 'socialSecurity',
       label: '社保',
       align: 'center'
-    },{
+    },
+    {
       prop: 'annuity',
       label: '年金',
       align: 'center'
-    },{
+    },
+    {
       prop: 'workday',
       label: '工作日(天)',
       align: 'center'
-    },{
+    },
+    {
       prop: 'researchDuration',
       label: '研发工时(天)',
       align: 'center'
-    },{
-      prop: 'survey',
+    },
+    {
+      prop: 'subtotal',
       label: '小计',
       align: 'center'
     }
@@ -144,6 +153,21 @@ const tableConfig = reactive({
     projectId: route.query.id
   }
 })
+const researchOptions = ref([])
+const getResearchOptions = async () => {
+  const res = await getResearchUser()
+  researchOptions.value = res.data
+}
+const getResearchName=(id)=>{
+  if(!id)return;
+  let label=''
+  researchOptions.value.forEach(item=>{
+    if(item.value==id){
+      label=item.label
+    }
+  })
+  return label
+}
 const getBaseInfo = async () => {
   try {
     const {code, data} = await getBaseInfoApi(route.query.id)
@@ -152,6 +176,7 @@ const getBaseInfo = async () => {
   }
 }
 
+getResearchOptions()
 getBaseInfo()
 </script>
 
diff --git a/src/views/project-management/initiation/apply.vue b/src/views/project-management/initiation/apply.vue
index eceacdb..5ffb219 100644
--- a/src/views/project-management/initiation/apply.vue
+++ b/src/views/project-management/initiation/apply.vue
@@ -21,6 +21,7 @@
     <div class="oper-page-btn">
       <el-button color="#DED0B2" v-if="name==='Initiation/apply'" @click="handleSubmit(applyForm)">提交</el-button>
       <el-button color="#DED0B2" v-else @click="handleResubmit">重新提交</el-button>
+      <el-button @click="handleBack">返回</el-button>
     </div>
   </div>
 </template>
@@ -87,6 +88,9 @@ const loading = ref(false)
 const processInstanceData = ref()
 const processDiagramViewer = ref(true)
 const name = ref(router.currentRoute.value.name)
+const handleBack = () => {
+  history.back()
+}
 const handleDownload = (row) => {
   downloadFile(row.fileId).then(res => {
     const blob = new Blob([res])

From cb224ab4377737139b8f491bba5767cb41e93b8e Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Mon, 10 Jun 2024 00:44:20 +0800
Subject: [PATCH 02/19] =?UTF-8?q?fix=20:=20=E4=BF=AE=E6=94=B9=E9=98=B6?=
 =?UTF-8?q?=E6=AE=B5=E5=8F=98=E6=9B=B4=E6=8A=84=E9=80=81=E4=BA=BA=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ToolToShowUserPicker.vue       |  6 +-
 .../implementation/phase.vue                  | 82 ++++++++-----------
 2 files changed, 34 insertions(+), 54 deletions(-)

diff --git a/src/views/project-management/implementation/components/ToolToShowUserPicker.vue b/src/views/project-management/implementation/components/ToolToShowUserPicker.vue
index d311c5b..4818c8b 100644
--- a/src/views/project-management/implementation/components/ToolToShowUserPicker.vue
+++ b/src/views/project-management/implementation/components/ToolToShowUserPicker.vue
@@ -1,12 +1,10 @@
 <template>
-  <el-button type="primary" link >
+  <el-button color="#DED0B2"  >
     {{ modelValue || '请选择抄送人员' }}
   </el-button>
 </template>
 
 <script setup>
-import { ref, watch, watchEffect } from 'vue';
-
 const props = defineProps({
   modelValue: {
     type: String,
@@ -22,4 +20,4 @@ const localText = ref('')
 
 <style lang="scss" scoped>
 
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/project-management/implementation/phase.vue b/src/views/project-management/implementation/phase.vue
index 346b5f0..c48946e 100644
--- a/src/views/project-management/implementation/phase.vue
+++ b/src/views/project-management/implementation/phase.vue
@@ -1,9 +1,10 @@
 <template>
   <div class="apply-block">
-    <div>
-      抄送人员:
-      <Ttsup :modelValue="chooseUserInfo()" @click="chooseUser"/>
-    </div>
+    <el-form :model="formData" label-width="auto">
+      <el-form-item label="抄送人员">
+        <Ttsup :modelValue="chooseUserInfo()" @click="chooseUser"/>
+      </el-form-item>
+    </el-form>
     <user-picker :multiple="true" ref="userPicker" title="请选择抄送人员" v-model:value="userList" @ok="selected"/>
     <AttachmentUpload ref="attachment" label="阶段变更附件" :showTable="showTable" :otherFileList="otherFileList"
                       @getAttachment="getAttachment"
@@ -62,7 +63,7 @@ const compositeParam = (item) => {
 }
 const getAttachment = (val) => {
   console.log('上传文件getAttachment', val)
-  file.value = compositeParam(val)
+  formData.value.singleFile = compositeParam(val)
 }
 const getOtherFile = (val) => {
   console.log('上传文件getOtherFile', val)
@@ -85,11 +86,11 @@ const chooseUser = () => {
   userPicker.value.showUserPicker()
 }
 const chooseUserInfo = () => {
-  if (userList.value.length > 0){
+  if (userList.value.length > 0) {
     return userList.value.map(item => {
       return item.name
-    }).join(',')
-  }else {
+    }).join('，')
+  } else {
     return "请选择抄送人员"
   }
 }
@@ -107,32 +108,27 @@ const selected = (select) => {
 }
 const handleSubmit = async () => {
   let files = []
-  let singleFile = {}
-  let fileArray
-  if (file.value.fileId !== undefined) {
-    singleFile = {
-      fileId: file.value.fileId
-    }
-  }
-  fileArray = otherFileList.value
-  fileArray.forEach(item => {
+  otherFileList.value?.forEach(item => {
     files.push(getFileParam(item))
   })
   let userIds = []
-  if (userList.value.length > 0){
-    userIds = userList.value.map(item => {
+  if (userList.value.length > 0) {
+    userIds = userList.value?.map(item => {
       return item.id
     })
   }
+  if (formData.value.singleFile !== undefined) {
+    formData.value.singleFile = getFileParam(formData.value.singleFile)
+  }
   let params = {
     deploymentId: deploymentId.value,
     requirementId: route.query.id,
     fileList: files,
-    singleFile: singleFile,
+    singleFile: formData.value.singleFile,
     projectId: route.query.projectId,
     userIds: userIds
   }
-  if (JSON.stringify(singleFile) === "{}") {
+  if (!attachment.value.isSingleFile) {
     attachment.value.validate()
     ElNotification({
       title: '提示',
@@ -157,41 +153,19 @@ const handleSubmit = async () => {
   }
 }
 const handleResubmit = (instance) => {
-  let singleFile = {}
   let otherFiles = []
-  let fileArray
-  if (attachment.value.singleFile !== null && name.value === 'Phase/edit') {
-    singleFile = {
-      fileId: attachment.value.singleFile.fileId
-    }
-    fileArray = attachment.value.allFileList
-  } else {
-    if (file.value.fileId !== undefined) {
-      singleFile = {
-        fileId: file.value.fileId
-      }
-    }
-    fileArray = otherFileList.value
+  if (name.value === 'Phase/edit') {
+    attachment.value.allFileList?.forEach(item => {
+      otherFiles.push(getFileParam(item))
+    })
   }
-  fileArray.forEach(item => {
-    otherFiles.push(getFileParam(item))
-  })
   let userIds = []
-  if (userList.value.length > 0){
-    userIds = userList.value.map(item => {
+  if (userList.value.length > 0) {
+    userIds = userList.value?.map(item => {
       return item.id
     })
   }
-  //todo requirementId
-  let params = {
-    deploymentId: deploymentId.value,
-    requirementId: route.query.id,
-    fileList: otherFiles,
-    singleFile: singleFile,
-    projectId: route.query.projectId,
-    userIds: userIds
-  }
-  if (JSON.stringify(singleFile) === "{}") {
+  if (attachment.value.singleFile == null) {
     attachment.value.validate()
     ElNotification({
       title: '提示',
@@ -202,6 +176,14 @@ const handleResubmit = (instance) => {
   } else {
     attachment.value.clearValidate()
   }
+  let params = {
+    deploymentId: deploymentId.value,
+    requirementId: route.query.id,
+    fileList: otherFiles,
+    singleFile: attachment.value.singleFile,
+    projectId: route.query.projectId,
+    userIds: userIds
+  }
   console.log('重新提交params', params)
   resubmitPhaseForm(params).then(res => {
     ElNotification({

From 07c089ed290f264e48af3c980e28e5028d8d5944 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Mon, 10 Jun 2024 15:25:28 +0800
Subject: [PATCH 03/19] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E3=80=81=E9=A1=B9=E7=9B=AE=E9=AA=8C=E6=94=B6?=
 =?UTF-8?q?=E3=80=81=E7=BB=93=E9=A1=B9=E6=93=8D=E4=BD=9C=E6=94=BE=E5=9C=A8?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DetailComponent/ProjectApply.vue          | 202 ++++++++++--------
 src/components/steps/index.vue                |  20 +-
 .../implementation/attachment.vue             |  11 +-
 .../implementation/detail.vue                 |  58 +++--
 .../implementation/share.vue                  |  11 +-
 .../implementation/uploadFee.vue              |  11 +-
 6 files changed, 178 insertions(+), 135 deletions(-)

diff --git a/src/components/DetailComponent/ProjectApply.vue b/src/components/DetailComponent/ProjectApply.vue
index bc45b06..378b6be 100644
--- a/src/components/DetailComponent/ProjectApply.vue
+++ b/src/components/DetailComponent/ProjectApply.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="apply-block">
-    <el-form :model="formData" ref="applyForm" label-width="auto" :rules="rules">
+    <el-form :model="formData" ref="formRef" label-width="auto" :rules="rules" v-if="step!=='50'">
       <el-row>
         <el-col :span="12">
           <el-form-item label="前置流程">
@@ -25,8 +25,8 @@
       <process-diagram-viewer mode="view" idName="projectApply" v-if="processDiagramViewer"/>
     </div>
     <div class="oper-page-btn">
-      <el-button color="#DED0B2" v-if="route.query.state==0" @click="handleSubmit(applyForm)">提交</el-button>
-      <el-button color="#DED0B2" v-else-if="route.query.state==3" @click="handleSubmit(applyForm)">重新提交</el-button>
+      <el-button color="#DED0B2" v-if="route.query.state==0" @click="handleSubmit">提交</el-button>
+      <el-button color="#DED0B2" v-else-if="route.query.state==3" @click="handleSubmit">重新提交</el-button>
       <el-button @click="handleBack">返回</el-button>
     </div>
   </div>
@@ -36,7 +36,20 @@
 import OperationRender from '@/views/workflow/common/OperationRender.vue'
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';
 import {ElNotification} from "element-plus";
-import {getApplyProcess, projectApply, resubmitApply, getApplyDetail} from "@/api/project-manage";
+import {
+  getApplyProcess,
+  projectApply,
+  resubmitApply,
+  getApplyDetail,
+  getProjectCheckProcess,
+  projectCheck,
+  resubmitCheck,
+  getCheckDetail,
+  projectConclusion,
+  resubmitConclusion,
+  getConclusionDetail,
+  getProjectConclusionProcess
+} from "@/api/project-manage";
 import {useProcessStore} from '@/stores/processStore.js';
 import {useTagsView} from '@/stores/tagsview.js'
 
@@ -69,16 +82,14 @@ const showTable = ref(true)
 const loading = ref(false)
 const processDiagramViewer = ref(false)
 const name = ref(router.currentRoute.value.name)
-const applyForm = ref()
+const formRef = ref()
 const deploymentId = ref()
+const projectId = ref(route.query.projectId)
+const step = ref(route.query.step)
 const handleBack = () => {
   history.back()
 }
 const compositeParam = (item) => {
-  // let tag = ''
-  // if (name.value === 'Initiation/apply' || route.query.state==3) {
-  //   tag = props.title
-  // }
   return {
     fileId: item.id,
     size: item.size,
@@ -108,10 +119,10 @@ const getFileParam = (item) => {
     tag: item.tag
   }
 }
-const handleSubmit = (instance) => {
-  if (!instance) return
-  instance.validate(async (valid) => {
-    if (!valid) return
+const handleSubmit =async () => {
+  // if (!formRef.value) return
+  // formRef.value.validate(async (valid) => {
+  //   if (!valid) return
     let files = []
     if (route.query.state === '3') {
       attachment.value.allFileList.forEach(item => {
@@ -141,14 +152,28 @@ const handleSubmit = (instance) => {
       requirementId: route.query.id,
       fileList: files,
       singleFile: formData.value.singleFile,
-      projectId: route.query.projectId,
+      projectId: projectId.value,
     }
     console.log('params', params)
     let res
-    if (route.query.state === '3') {
-      res = await resubmitApply(params)
-    } else {
-      res = await projectApply(params)
+    if (step.value === '20') {
+      if (route.query.state === '3') {
+        res = await resubmitApply(params)
+      } else {
+        res = await projectApply(params)
+      }
+    } else if (step.value === '40') {
+      if (route.query.state === '3') {
+        res = await resubmitCheck(params)
+      } else {
+        res = await projectCheck(params)
+      }
+    } else if (step.value === '50') {
+      if (route.query.state === '3') {
+        res = await resubmitConclusion(params)
+      } else {
+        res = await projectConclusion(params)
+      }
     }
     ElNotification({
       title: '提示',
@@ -157,94 +182,81 @@ const handleSubmit = (instance) => {
     })
     if (res.code === 1000) {
       tagsViewStore.delVisitedViews(router.currentRoute.value.path)
-      await router.push({
-        name: 'Initiation'
-      })
+      if (step.value === '20') {
+        await router.push({
+          name: 'Initiation'
+        })
+      }else if (step.value === '40') {
+        await router.push({
+          name: 'Implementation'
+        })
+      }else if (step.value === '50') {
+        await router.push({
+          name: 'Filing'
+        })
+      }
     }
-  })
+  // })
 }
-// const handleResubmit = async () => {
-//   let files = []
-//   if (route.query.state == 3) {
-//     attachment.value.allFileList.forEach(item => {
-//       files.push(getFileParam(item))
-//     })
-//   }
-//   if (attachment.value.singleFile == null) {
-//     attachment.value.validate()
-//     ElNotification({
-//       title: '提示',
-//       message: '请上传附件',
-//       type: 'error'
-//     })
-//     return;
-//   } else {
-//     attachment.value.clearValidate()
-//   }
-//   let params = {
-//     deploymentId: deploymentId.value,
-//     requirementId: route.query.id,
-//     fileList: files,
-//     singleFile: attachment.value.singleFile,
-//     projectId: route.query.projectId,
-//   }
-//   console.log('params', params, attachment.value.singleFile)
-//   let res = await resubmitApply(params)
-//   ElNotification({
-//     title: '提示',
-//     message: res.msg,
-//     type: res.code === 1000 ? 'success' : 'error'
-//   })
-//   if (res.code === 1000) {
-//     tagsViewStore.delVisitedViews(router.currentRoute.value.path)
-//     await router.push({
-//       name: 'Initiation'
-//     })
-//   }
-// }
-const init = () => {
-  if (!route.query.projectId) return;
+const init = async () => {
+  let id = projectId.value
+  if (!id) return;
   processDiagramViewer.value = false
-  getApplyProcess(route.query.projectId).then(res => {
-    if (res.code === 1000) {
-      let data = res.data
-      deploymentId.value = data.deploymentId
-      processStore.setDesign(data)
-      processStore.runningList.value = data.runningList;
-      processStore.endList.value = data.endList;
-      processStore.noTakeList.value = data.noTakeList;
-      processStore.refuseList.value = data.refuseList;
-      processStore.passList.value = data.passList;
-      nextTick(() => {
-        processDiagramViewer.value = true
-      })
-    } else {
-      ElNotification({
-        title: '提示',
-        message: res.msg,
-        type: 'error'
-      })
-    }
-  })
-}
-const getDetailInfo = async () => {
-  if (!route.query.projectId) return;
-  getApplyDetail(route.query.projectId).then(res => {
+  let res
+  if (step.value === '20') {
+    res = await getApplyProcess(id)
+  } else if (step.value === '40') {
+    res = await getProjectCheckProcess(id)
+  }else if (step.value === '50') {
+    res = await getProjectConclusionProcess(id)
+  }
+  if (res.code === 1000) {
+    let data = res.data
+    deploymentId.value = data.deploymentId
+    processStore.setDesign(data)
+    processStore.runningList.value = data.runningList;
+    processStore.endList.value = data.endList;
+    processStore.noTakeList.value = data.noTakeList;
+    processStore.refuseList.value = data.refuseList;
+    processStore.passList.value = data.passList;
+    nextTick(() => {
+      processDiagramViewer.value = true
+    })
+  } else {
     ElNotification({
       title: '提示',
       message: res.msg,
-      type: res.code === 1000 ? 'success' : 'error'
+      type: 'error'
     })
-    if (res.code === 1000) {
-      formData.value = res.data.formData
-      loading.value = false
-    }
-  })
+  }
+}
+const getDetailInfo = async () => {
+  let id = projectId.value
+  if (!id) return;
+  let res
+  loading.value = true
+  if (step.value === '20') {
+    res = await getApplyDetail(id)
+  } else if (step.value === '40') {
+    res = await getCheckDetail(id)
+  }else if (step.value === '50') {
+    res = await getConclusionDetail(id)
+  }
+
+  if (res.code === 1000) {
+    formData.value = res.data.formData
+    loading.value = false
+  }else {
+    ElNotification({
+      title: '提示',
+      message: res.msg,
+      type: 'error'
+    })
+  }
 }
 onMounted(async () => {
   await init()
   if (route.query.state == 3) {
-    loading.value = true
     await getDetailInfo()
   }
 })
diff --git a/src/components/steps/index.vue b/src/components/steps/index.vue
index 51723b1..6352a5f 100644
--- a/src/components/steps/index.vue
+++ b/src/components/steps/index.vue
@@ -100,15 +100,15 @@ const schema = computed(() => {
       }
     },
     {
-      label: '所属公司',
-      prop: 'affiliatedCompany',
+      label: '征集类型',
+      prop: 'collectType',
       colProps: {
         span: 12
       }
     },
     {
-      label: '征集类型',
-      prop: 'collectType',
+      label: '所属公司',
+      prop: 'affiliatedCompany',
       colProps: {
         span: 12
       }
@@ -119,7 +119,7 @@ const schema = computed(() => {
       colProps: {
         span: 12
       }
-    },
+    }
 
   ]
 })
@@ -275,6 +275,16 @@ const getBaseInfo = async () => {
   const loading = ElLoading.service({fullscreen: true})
   try {
     const {code, data} = await getBaseInfoApi(route.query.projectId)
+    console.log('data.procedure',data.procedure,route.query.step)
+    if(route.query.step==='40'){
+      if(data.procedure.indexOf('40')==-1){
+        data.procedure.push('40')
+      }
+    }else if(route.query.step==='50'){
+      if(data.procedure.indexOf('50')==-1){
+        data.procedure.push('50')
+      }
+    }
     localStepSuccess.value = formatProcedure(data.procedure)
     baseForm.value.setValues(data)
     emits('setDetail', formatActive(localActive.value))
diff --git a/src/views/project-management/implementation/attachment.vue b/src/views/project-management/implementation/attachment.vue
index 447fbf2..83e8530 100644
--- a/src/views/project-management/implementation/attachment.vue
+++ b/src/views/project-management/implementation/attachment.vue
@@ -51,8 +51,8 @@ const schema = computed(() => {
       }
     },
     {
-      label: '所属公司',
-      prop: 'affiliatedCompany',
+      label: '征集类型',
+      prop: 'collectType',
       colProps: {
         span: 12
       }
@@ -65,13 +65,12 @@ const schema = computed(() => {
       }
     },
     {
-      label: '征集类型',
-      prop: 'collectType',
+      label: '所属公司',
+      prop: 'affiliatedCompany',
       colProps: {
         span: 12
       }
-    },
-
+    }
   ]
 })
 const baseForm = ref()
diff --git a/src/views/project-management/implementation/detail.vue b/src/views/project-management/implementation/detail.vue
index 3e58448..a1f232e 100644
--- a/src/views/project-management/implementation/detail.vue
+++ b/src/views/project-management/implementation/detail.vue
@@ -7,22 +7,23 @@
           :data="commonForm"
           :processViewer="commonProvessViewer"
           v-show="showActive == '00'"
-          :loading="loading"
           v-model:value="auditOpinion"
       />
       <summary-detail v-show="showActive == '10'" :formData="commonForm.formData" :data="commonForm"
-                      :processViewer="commonProvessViewer" :loading="loading" :fileListShow="fileListShow"
+                      :processViewer="commonProvessViewer" :fileListShow="fileListShow"
                       v-model:value="auditOpinion"/>
       <ApprovalDetail type="approval" v-show="showActive == '20'&&!showApply" :formData="commonForm.formData"
-                      :data="commonForm" :processViewer="commonProvessViewer" :loading="loading"
+                      :data="commonForm" :processViewer="commonProvessViewer"
                       :fileListShow="fileListShow" v-model:value="auditOpinion"/>
-      <ApprovalDetail type="execute" v-show="showActive == '40'" :formData="commonForm.formData"
-                      :data="commonForm" :processViewer="commonProvessViewer" :loading="loading"
+      <ApprovalDetail type="execute" v-show="showActive == '40'&&!showCheck" :formData="commonForm.formData"
+                      :data="commonForm" :processViewer="commonProvessViewer"
                       :fileListShow="fileListShow" v-model:value="auditOpinion"/>
-      <ApprovalDetail type="archivist" v-show="showActive == '50'" :formData="commonForm.formData" :data="commonForm"
-                      :processViewer="commonProvessViewer" :loading="loading" :fileListShow="fileListShow"
+      <ApprovalDetail type="archivist" v-show="showActive == '50'&&!showFiling" :formData="commonForm.formData" :data="commonForm"
+                      :processViewer="commonProvessViewer" :fileListShow="fileListShow"
                       v-model:value="auditOpinion"/>
       <project-apply v-if="showApply&&showActive == '20'" :data="commonForm"/>
+      <project-apply title="项目验收" v-if="showCheck&&showActive == '40'" :data="commonForm"/>
+      <project-apply title="项目结项" v-if="showFiling&&showActive == '50'" :data="commonForm"/>
     </template>
   </steps>
   <opinion v-if="commonForm.taskId" :formData="commonForm.formData" :taskId="commonForm.taskId"
@@ -40,6 +41,8 @@ import Opinion from "@/components/DetailComponent/Opinion.vue";
 
 const route = useRoute()
 const showApply = ref(false)
+const showCheck = ref(false)
+const showFiling = ref(false)
 const loading = ref(false)
 const processStore = useProcessStore()
 const fileListShow = ref('READ')
@@ -57,11 +60,8 @@ const getAllInfo = async (state) => {
   const loading = ElLoading.service({fullscreen: true})
   try {
     commonProvessViewer.value = false
-    loading.value = true
     const {data, code, msg} = await getMapProjectStateInfo(route.query.projectId, state)
-    if (code === 1000) {
-      loading.value = false
-    } else {
+    if (code !== 1000) {
       ElNotification({
         title: '提示',
         message: msg,
@@ -92,13 +92,37 @@ const getAllInfo = async (state) => {
   }
 }
 const changeModel = (active) => {
-  if (route.query.state === '0' && active === '20') {
-    showApply.value = true
-  } else if (route.query.state === '3' && active === '20') {
-    showApply.value = true
-    getAllInfo(active)
+  if (route.query.step === '20' && active === '20') {
+    if (route.query.state === '0') {
+      showApply.value = true
+    } else if (route.query.state === '3') {
+      showApply.value = true
+      getAllInfo(active)
+    } else {
+      showApply.value = false
+      getAllInfo(active)
+    }
+  } else if (route.query.step === '40' && active === '40') {
+    if (route.query.state === '0') {
+      showCheck.value = true
+    } else if (route.query.state === '3') {
+      showCheck.value = true
+      getAllInfo(active)
+    } else {
+      showCheck.value = false
+      getAllInfo(active)
+    }
+  } else if (route.query.step === '50' && active === '50') {
+    if (route.query.state === '0') {
+      showFiling.value = true
+    } else if (route.query.state === '3') {
+      showFiling.value = true
+      getAllInfo(active)
+    } else {
+      showFiling.value = false
+      getAllInfo(active)
+    }
   } else {
-    showApply.value = false
     getAllInfo(active)
   }
 }
diff --git a/src/views/project-management/implementation/share.vue b/src/views/project-management/implementation/share.vue
index 200418f..edb71a6 100644
--- a/src/views/project-management/implementation/share.vue
+++ b/src/views/project-management/implementation/share.vue
@@ -26,8 +26,8 @@ const schema = computed(() => {
       }
     },
     {
-      label: '所属公司',
-      prop: 'affiliatedCompany',
+      label: '征集类型',
+      prop: 'collectType',
       colProps: {
         span: 12
       }
@@ -40,13 +40,12 @@ const schema = computed(() => {
       }
     },
     {
-      label: '征集类型',
-      prop: 'collectType',
+      label: '所属公司',
+      prop: 'affiliatedCompany',
       colProps: {
         span: 12
       }
-    },
-
+    }
   ]
 })
 const baseForm = ref()
diff --git a/src/views/project-management/implementation/uploadFee.vue b/src/views/project-management/implementation/uploadFee.vue
index 2930b3d..2faed30 100644
--- a/src/views/project-management/implementation/uploadFee.vue
+++ b/src/views/project-management/implementation/uploadFee.vue
@@ -103,8 +103,8 @@ const schema = computed(() => {
       }
     },
     {
-      label: '所属公司',
-      prop: 'affiliatedCompany',
+      label: '征集类型',
+      prop: 'collectType',
       colProps: {
         span: 12
       }
@@ -117,13 +117,12 @@ const schema = computed(() => {
       }
     },
     {
-      label: '征集类型',
-      prop: 'collectType',
+      label: '所属公司',
+      prop: 'affiliatedCompany',
       colProps: {
         span: 12
       }
-    },
-
+    }
   ]
 })
 const baseForm = ref()

From b05d0ff42f3d0f371a402fdbc23cbbbbdaa2ca6f Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Mon, 10 Jun 2024 15:50:26 +0800
Subject: [PATCH 04/19] =?UTF-8?q?fix=20:=20=E4=BC=98=E5=8C=96=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=E6=B1=87=E6=80=BB=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project-demand/summary/detail.vue | 64 +++++++++++----------
 1 file changed, 35 insertions(+), 29 deletions(-)

diff --git a/src/views/project-demand/summary/detail.vue b/src/views/project-demand/summary/detail.vue
index 0f007c4..156c563 100644
--- a/src/views/project-demand/summary/detail.vue
+++ b/src/views/project-demand/summary/detail.vue
@@ -28,7 +28,7 @@ import SummaryDetail from '@/components/DetailComponent/SummaryDetail.vue';
 import {useProcessStore} from '@/stores/processStore.js';
 import {getMapProjectStateInfo} from '@/components/steps/api';
 import CollectionDetail from "@/components/DetailComponent/CollectionDetail.vue";
-import {ElNotification} from "element-plus";
+import {ElLoading, ElNotification} from "element-plus";
 
 const route = useRoute()
 const summaryData = ref({})
@@ -40,36 +40,42 @@ const active = ref(route.query.state)
 const auditOpinion = ref('')
 const showActive = ref()
 const getInfo = async (state) => {
-  fileListShow.value = 'READ'
-  const projectId = route.query.projectId
-  summaryProcessViewer.value = false
-  loading.value = true
-  const {code, data, msg} = await getMapProjectStateInfo(projectId, state)
-  if (code === 1000) {
-    summaryData.value = data;
-    loading.value = false
-    processStore.setDesign(data)
-    processStore.runningList.value = data.runningList;
-    processStore.endList.value = data.endList;
-    processStore.noTakeList.value = data.noTakeList;
-    processStore.refuseList.value = data.refuseList;
-    processStore.passList.value = data.passList;
-    nextTick(() => {
-      summaryProcessViewer.value = true
-      if (data.formPermMap["fileList"]) {
-        fileListShow.value = data.formPermMap["fileList"].perm
+  const loading = ElLoading.service({fullscreen: true})
+  try {
+    fileListShow.value = 'READ'
+    const projectId = route.query.projectId
+    summaryProcessViewer.value = false
+    loading.value = true
+    const {code, data, msg} = await getMapProjectStateInfo(projectId, state)
+    if (code === 1000) {
+      summaryData.value = data;
+      loading.value = false
+      processStore.setDesign(data)
+      processStore.runningList.value = data.runningList;
+      processStore.endList.value = data.endList;
+      processStore.noTakeList.value = data.noTakeList;
+      processStore.refuseList.value = data.refuseList;
+      processStore.passList.value = data.passList;
+      nextTick(() => {
+        summaryProcessViewer.value = true
+        if (data.formPermMap["fileList"]) {
+          fileListShow.value = data.formPermMap["fileList"].perm
+        }
+      })
+      loading.close()
+    } else {
+      ElNotification({
+        title: '提示',
+        message: msg,
+        type: 'error'
+      })
+      if (msg === '查询结果为空') {
+        summaryData.value = []
       }
-    })
-  } else {
-    ElNotification({
-      title: '提示',
-      message: msg,
-      type: 'error'
-    })
-    if (msg === '查询结果为空') {
-      summaryData.value = []
+      loading.close()
     }
-    loading.value = false
+  } catch {
+    loading.close()
   }
 }
 

From 535d3f680b56bda7f14c1084f56aab05a4fe0984 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Mon, 10 Jun 2024 16:19:09 +0800
Subject: [PATCH 05/19] =?UTF-8?q?fix=20:=20=E4=BC=98=E5=8C=96=E7=9B=B4?=
 =?UTF-8?q?=E6=8E=A5=E4=B8=8A=E6=8A=A5=E6=97=B6=E9=A1=B9=E7=9B=AE=E5=BD=92?=
 =?UTF-8?q?=E6=A1=A3=E9=99=84=E4=BB=B6tab=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project-management/filing/attachment.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/views/project-management/filing/attachment.vue b/src/views/project-management/filing/attachment.vue
index db7d1c5..b4e4a3f 100644
--- a/src/views/project-management/filing/attachment.vue
+++ b/src/views/project-management/filing/attachment.vue
@@ -90,7 +90,11 @@ const upload = () => {
     })
   }
 }
-
+watchEffect(() => {
+  if (requirementId.value === '-1') {
+    paneList.value = paneList.value.slice(1)
+  }
+})
 onMounted(() => {
   if (activeName.value === '50') {
     search({})

From 9c812af394da08451dd855fbe589f7588cef5630 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Mon, 10 Jun 2024 22:34:51 +0800
Subject: [PATCH 06/19] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E6=8F=90=E4=BA=A4/=E9=87=8D=E6=96=B0=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DetailComponent/ApprovalDetail.vue        |   6 +-
 .../DetailComponent/CollectionDetail.vue      |   2 +-
 .../DetailComponent/ProjectApply.vue          | 210 +++++++++---------
 .../DetailComponent/SummaryDetail.vue         |   2 +-
 src/views/project-demand/summary/detail.vue   |   4 +
 .../project-management/filing/upload.vue      |   5 +-
 .../implementation/detail.vue                 | 153 +++++++------
 7 files changed, 192 insertions(+), 190 deletions(-)

diff --git a/src/components/DetailComponent/ApprovalDetail.vue b/src/components/DetailComponent/ApprovalDetail.vue
index 8d1bb39..27f6324 100644
--- a/src/components/DetailComponent/ApprovalDetail.vue
+++ b/src/components/DetailComponent/ApprovalDetail.vue
@@ -20,7 +20,7 @@
     <div class="approval-record">
       <baseTitle title="审批记录"></baseTitle>
       <div class="process">
-        <operation-render v-if="processViewer" :operation-list="data.operationList"
+        <operation-render v-if="processViewer && data.operationList && data.operationList.length > 0" :operation-list="data.operationList"
                           :state="data.state"/>
         <process-diagram-viewer v-if="processViewer" :id-name="idName?idName:type"/>
       </div>
@@ -40,8 +40,8 @@ const props = defineProps({
     default: {}
   },
   data: {
-    type: Array,
-    default: []
+    type: Object,
+    default: {}
   },
   processViewer: {
     type: Boolean,
diff --git a/src/components/DetailComponent/CollectionDetail.vue b/src/components/DetailComponent/CollectionDetail.vue
index c455f3d..721f7bd 100644
--- a/src/components/DetailComponent/CollectionDetail.vue
+++ b/src/components/DetailComponent/CollectionDetail.vue
@@ -59,7 +59,7 @@
       <div class="approval-record">
         <baseTitle title="审批记录"></baseTitle>
         <div class="process">
-          <operation-render v-if="processViewer" :operation-list="data.operationList"
+          <operation-render v-if="processViewer && data.operationList && data.operationList.length > 0" :operation-list="data.operationList"
                             :state="data.state"/>
           <process-diagram-viewer v-if="processViewer" id-name="collectionProcess"/>
         </div>
diff --git a/src/components/DetailComponent/ProjectApply.vue b/src/components/DetailComponent/ProjectApply.vue
index 378b6be..045b9d7 100644
--- a/src/components/DetailComponent/ProjectApply.vue
+++ b/src/components/DetailComponent/ProjectApply.vue
@@ -1,32 +1,32 @@
 <template>
   <div class="apply-block">
-    <el-form :model="formData" ref="formRef" label-width="auto" :rules="rules" v-if="step!=='50'">
+    <el-form :model="localFormData" ref="formRef" label-width="auto" :rules="rules" v-if="step!=='50'">
       <el-row>
         <el-col :span="12">
           <el-form-item label="前置流程">
-            <el-input v-model="formData.requirementName" clearable></el-input>
+            <el-input v-model="localFormData.requirementName" clearable></el-input>
           </el-form-item>
         </el-col>
       </el-row>
     </el-form>
-    <AttachmentUpload ref="attachment" :label="title+'附件'" :showTable="showTable" :otherFileList="otherFileList"
+    <AttachmentUpload ref="attachment" :label="getTitleName(title)+'附件'" :showTable="showTable"
+                      :otherFileList="otherFileList"
                       @getAttachment="getAttachment"
-                      @getOtherFile="getOtherFile" :showFileList="true" :formData="formData"
-                      :preview="route.query.state==3"/>
-    <div v-if="route.query.state==3">
+                      @getOtherFile="getOtherFile" :showFileList="true" :formData="localFormData"
+                      :preview="mode == 'resubmit'"/>
+    <div v-if="mode === 'resubmit'">
       <baseTitle title="审批记录"></baseTitle>
       <div class="process">
-        <operation-render v-if="processDiagramViewer" :operation-list="data.operationList"
-                          :state="data.state"/>
+        <operation-render :operation-list="data.operationList" :state="data.state"/>
       </div>
     </div>
     <baseTitle title="流程"></baseTitle>
     <div class="approval-record">
-      <process-diagram-viewer mode="view" idName="projectApply" v-if="processDiagramViewer"/>
+      <process-diagram-viewer mode="view" :idName="title" v-if="processDiagramViewer"/>
     </div>
     <div class="oper-page-btn">
-      <el-button color="#DED0B2" v-if="route.query.state==0" @click="handleSubmit">提交</el-button>
-      <el-button color="#DED0B2" v-else-if="route.query.state==3" @click="handleSubmit">重新提交</el-button>
+      <el-button color="#DED0B2" v-if="mode === 'submit'" @click="handleSubmit">提交</el-button>
+      <el-button color="#DED0B2" v-else-if="mode === 'resubmit'" @click="handleSubmit">重新提交</el-button>
       <el-button @click="handleBack">返回</el-button>
     </div>
   </div>
@@ -40,14 +40,11 @@ import {
   getApplyProcess,
   projectApply,
   resubmitApply,
-  getApplyDetail,
   getProjectCheckProcess,
   projectCheck,
   resubmitCheck,
-  getCheckDetail,
   projectConclusion,
   resubmitConclusion,
-  getConclusionDetail,
   getProjectConclusionProcess
 } from "@/api/project-manage";
 import {useProcessStore} from '@/stores/processStore.js';
@@ -59,15 +56,23 @@ const emit = defineEmits(["getAttachment", "getOtherFile"])
 const props = defineProps({
   title: {
     type: String,
-    default: '项目立项'
+    default: 'apply'
   },
   showTable: {
     type: Boolean,
     default: false
   },
+  mode: {
+    type: String,
+    default: "view"
+  },
   data: {
-    type: Array,
-    default: []
+    type: Object,
+    default: {}
+  },
+  formData: {
+    type: Object,
+    default: {}
   }
 })
 const rules = reactive({
@@ -76,16 +81,25 @@ const rules = reactive({
 const tagsViewStore = useTagsView()
 const processStore = useProcessStore()
 const otherFileList = ref([])
-const formData = ref({})
+const localFormData = ref({})
 const attachment = ref()
 const showTable = ref(true)
 const loading = ref(false)
 const processDiagramViewer = ref(false)
 const name = ref(router.currentRoute.value.name)
-const formRef = ref()
 const deploymentId = ref()
 const projectId = ref(route.query.projectId)
 const step = ref(route.query.step)
+const getTitleName = (type) => {
+  switch (type) {
+    case 'apply':
+      return '项目立项'
+    case 'check':
+      return '项目验收'
+    case 'filing':
+      return '项目归档'
+  }
+}
 const handleBack = () => {
   history.back()
 }
@@ -97,12 +111,12 @@ const compositeParam = (item) => {
     fileType: item.fileType,
     url: item.url,
     newFile: false,
-    tag: props.title
+    tag: getTitleName(props.title)
   }
 }
 const getAttachment = (val) => {
   console.log('上传文件getAttachment', val)
-  formData.value.singleFile = compositeParam(val)
+  localFormData.value.singleFile = compositeParam(val)
 }
 const getOtherFile = (val) => {
   console.log('上传文件getOtherFile', val)
@@ -119,23 +133,27 @@ const getFileParam = (item) => {
     tag: item.tag
   }
 }
-const handleSubmit =async () => {
+const handleSubmit = async () => {
   // if (!formRef.value) return
   // formRef.value.validate(async (valid) => {
   //   if (!valid) return
-    let files = []
-    if (route.query.state === '3') {
-      attachment.value.allFileList.forEach(item => {
-        files.push(getFileParam(item))
-      })
-    } else {
-      otherFileList.value.forEach(item => {
-        files.push(getFileParam(item))
-      })
-    }
-    // if (formData.value.singleFile !== undefined) {
-    //   formData.value.singleFile = getFileParam(formData.value.singleFile)
-    // }
+  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 (localFormData.value.singleFile !== undefined) {
+  //   localFormData.value.singleFile = getFileParam(localFormData.value.singleFile)
+  // }
+  console.log('attachment.value.singleFile',attachment.value,attachment.value.singleFile)
+  if(localFormData.value.singleFile){
+
+  }else {
     if (attachment.value.singleFile == null) {
       attachment.value.validate()
       ElNotification({
@@ -147,55 +165,57 @@ const handleSubmit =async () => {
     } else {
       attachment.value.clearValidate()
     }
-    let params = {
-      deploymentId: deploymentId.value,
-      requirementId: route.query.id,
-      fileList: files,
-      singleFile: formData.value.singleFile,
-      projectId: projectId.value,
+  }
+
+  let params = {
+    deploymentId: deploymentId.value,
+    requirementId: route.query.id,
+    fileList: files,
+    singleFile: localFormData.value.singleFile,
+    projectId: projectId.value,
+  }
+  console.log('params', params)
+  let res
+  if (step.value === '20') {
+    if (props.mode === 'resubmit') {
+      res = await resubmitApply(params)
+    } else {
+      res = await projectApply(params)
     }
-    console.log('params', params)
-    let res
+  } else if (step.value === '40') {
+    if (props.mode === 'resubmit') {
+      res = await resubmitCheck(params)
+    } else {
+      res = await projectCheck(params)
+    }
+  } else if (step.value === '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 (step.value === '20') {
-      if (route.query.state === '3') {
-        res = await resubmitApply(params)
-      } else {
-        res = await projectApply(params)
-      }
+      await router.push({
+        name: 'Initiation'
+      })
     } else if (step.value === '40') {
-      if (route.query.state === '3') {
-        res = await resubmitCheck(params)
-      } else {
-        res = await projectCheck(params)
-      }
+      await router.push({
+        name: 'Implementation'
+      })
     } else if (step.value === '50') {
-      if (route.query.state === '3') {
-        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 (step.value === '20') {
-        await router.push({
-          name: 'Initiation'
-        })
-      }else if (step.value === '40') {
-        await router.push({
-          name: 'Implementation'
-        })
-      }else if (step.value === '50') {
-        await router.push({
-          name: 'Filing'
-        })
-      }
+      await router.push({
+        name: 'Filing'
+      })
     }
+  }
   // })
 }
 const init = async () => {
@@ -207,7 +227,7 @@ const init = async () => {
     res = await getApplyProcess(id)
   } else if (step.value === '40') {
     res = await getProjectCheckProcess(id)
-  }else if (step.value === '50') {
+  } else if (step.value === '50') {
     res = await getProjectConclusionProcess(id)
   }
   if (res.code === 1000) {
@@ -230,35 +250,13 @@ const init = async () => {
     })
   }
 }
-const getDetailInfo = async () => {
-  let id = projectId.value
-  if (!id) return;
-  let res
-  loading.value = true
-  if (step.value === '20') {
-    res = await getApplyDetail(id)
-  } else if (step.value === '40') {
-    res = await getCheckDetail(id)
-  }else if (step.value === '50') {
-    res = await getConclusionDetail(id)
-  }
 
-  if (res.code === 1000) {
-    formData.value = res.data.formData
-    loading.value = false
-  }else {
-    ElNotification({
-      title: '提示',
-      message: res.msg,
-      type: 'error'
-    })
-  }
-}
+watchEffect(() => {
+  return Object.keys(props.formData).length && (localFormData.value = props.formData)
+})
+
 onMounted(async () => {
   await init()
-  if (route.query.state == 3) {
-    await getDetailInfo()
-  }
 })
 </script>
 
diff --git a/src/components/DetailComponent/SummaryDetail.vue b/src/components/DetailComponent/SummaryDetail.vue
index 8ded615..33156ee 100644
--- a/src/components/DetailComponent/SummaryDetail.vue
+++ b/src/components/DetailComponent/SummaryDetail.vue
@@ -153,7 +153,7 @@
       <div class="approval-record">
         <baseTitle title="审批记录"></baseTitle>
         <div class="process">
-          <operation-render v-if="processViewer" :operation-list="data.operationList"
+          <operation-render v-if="processViewer && data.operationList && data.operationList.length > 0" :operation-list="data.operationList"
                             :state="data.state"/>
           <process-diagram-viewer v-if="processViewer" id-name="summaryProcess"/>
         </div>
diff --git a/src/views/project-demand/summary/detail.vue b/src/views/project-demand/summary/detail.vue
index 156c563..8b6bb28 100644
--- a/src/views/project-demand/summary/detail.vue
+++ b/src/views/project-demand/summary/detail.vue
@@ -50,6 +50,10 @@ const getInfo = async (state) => {
     if (code === 1000) {
       summaryData.value = data;
       loading.value = false
+      if(data.runningList===null) {
+        loading.close()
+        return;
+      }
       processStore.setDesign(data)
       processStore.runningList.value = data.runningList;
       processStore.endList.value = data.endList;
diff --git a/src/views/project-management/filing/upload.vue b/src/views/project-management/filing/upload.vue
index 0e89e8f..1621887 100644
--- a/src/views/project-management/filing/upload.vue
+++ b/src/views/project-management/filing/upload.vue
@@ -48,7 +48,8 @@ const tableConfig = reactive({
     {
       prop: 'size',
       label: '文件大小',
-      align: 'center'
+      align: 'center',
+      currentRender: ({row, index}) => (parseInt(row.size / 1024) + 'KB')
     },
     {
       prop: 'oper',
@@ -119,7 +120,7 @@ const handleSubmit = async () => {
     })
     let params = {
       fileList: files,
-      targetState:'',
+      targetState:route.query.name,
       projectId: route.query.id,
     }
     let res = await uploadFileList(params)
diff --git a/src/views/project-management/implementation/detail.vue b/src/views/project-management/implementation/detail.vue
index a1f232e..527ac2e 100644
--- a/src/views/project-management/implementation/detail.vue
+++ b/src/views/project-management/implementation/detail.vue
@@ -2,31 +2,48 @@
   <steps :active="route.query.id==='-1'?currentStep-1:currentStep" @setDetail="setDetail" @stepChange="stepChange"
          :reportType="route.query.id==='-1'?'direct':''">
     <template #content>
-      <collection-detail
-          :formData="commonForm.formData"
-          :data="commonForm"
-          :processViewer="commonProvessViewer"
-          v-show="showActive == '00'"
-          v-model:value="auditOpinion"
+      <collection-detail :formData="detailData.formData"
+                         :data="detailData"
+                         :processViewer="commonProvessViewer"
+                         v-show="showActive == '00'"
+                         :fileListShow="fileListShow"
+                         v-model:value="auditOpinion"
       />
-      <summary-detail v-show="showActive == '10'" :formData="commonForm.formData" :data="commonForm"
-                      :processViewer="commonProvessViewer" :fileListShow="fileListShow"
+      <summary-detail v-show="showActive == '10'"
+                      :formData="detailData.formData"
+                      :data="detailData"
+                      :processViewer="commonProvessViewer"
+                      :fileListShow="fileListShow"
                       v-model:value="auditOpinion"/>
-      <ApprovalDetail type="approval" v-show="showActive == '20'&&!showApply" :formData="commonForm.formData"
-                      :data="commonForm" :processViewer="commonProvessViewer"
-                      :fileListShow="fileListShow" v-model:value="auditOpinion"/>
-      <ApprovalDetail type="execute" v-show="showActive == '40'&&!showCheck" :formData="commonForm.formData"
-                      :data="commonForm" :processViewer="commonProvessViewer"
-                      :fileListShow="fileListShow" v-model:value="auditOpinion"/>
-      <ApprovalDetail type="archivist" v-show="showActive == '50'&&!showFiling" :formData="commonForm.formData" :data="commonForm"
-                      :processViewer="commonProvessViewer" :fileListShow="fileListShow"
+      <ApprovalDetail type="approval"
+                      v-if="showActive == '20'&&!editShow"
+                      :formData="detailData.formData"
+                      :data="detailData"
+                      :processViewer="commonProvessViewer"
+                      :fileListShow="fileListShow"
                       v-model:value="auditOpinion"/>
-      <project-apply v-if="showApply&&showActive == '20'" :data="commonForm"/>
-      <project-apply title="项目验收" v-if="showCheck&&showActive == '40'" :data="commonForm"/>
-      <project-apply title="项目结项" v-if="showFiling&&showActive == '50'" :data="commonForm"/>
+      <ApprovalDetail type="execute"
+                      v-if="showActive == '40'&&!editShow"
+                      :formData="detailData.formData"
+                      :data="detailData"
+                      :processViewer="commonProvessViewer"
+                      :fileListShow="fileListShow"
+                      v-model:value="auditOpinion"/>
+      <ApprovalDetail type="archivist"
+                      v-show="showActive == '50'&&!editShow"
+                      :formData="detailData.formData"
+                      :data="detailData"
+                      :processViewer="commonProvessViewer"
+                      :fileListShow="fileListShow"
+                      v-model:value="auditOpinion"/>
+      <project-apply :title="applyTitle"
+                     v-if="editShow"
+                     :mode="mode"
+                     :data="detailData"
+                     :formData="detailData.formData"/>
     </template>
   </steps>
-  <opinion v-if="commonForm.taskId" :formData="commonForm.formData" :taskId="commonForm.taskId"
+  <opinion v-if="detailData.taskId" :formData="detailData.formData" :taskId="detailData.taskId"
            v-model:value="auditOpinion"/>
 </template>
 
@@ -40,101 +57,83 @@ import {ElLoading, ElNotification} from "element-plus";
 import Opinion from "@/components/DetailComponent/Opinion.vue";
 
 const route = useRoute()
-const showApply = ref(false)
-const showCheck = ref(false)
-const showFiling = ref(false)
+const editShow = ref(false)
+const applyTitle = ref('apply')
 const loading = ref(false)
 const processStore = useProcessStore()
 const fileListShow = ref('READ')
+const mode = ref('')
 const currentStep = ref()
 const auditOpinion = ref('')
+// const step = ref(route.query.step)
 route.query.step == '10' && (currentStep.value = 1)
 route.query.step == '20' && (currentStep.value = 2)
 route.query.step == '40' && (currentStep.value = 3)
 route.query.step == '50' && (currentStep.value = 4)
 const showActive = ref()
-const commonForm = ref({})
+const detailData = ref({})
 const commonProvessViewer = ref(true)
 
 const getAllInfo = async (state) => {
   const loading = ElLoading.service({fullscreen: true})
   try {
+    fileListShow.value = 'READ'
     commonProvessViewer.value = false
     const {data, code, msg} = await getMapProjectStateInfo(route.query.projectId, state)
-    if (code !== 1000) {
+    if (code === 1000) {
+      detailData.value = data
+      mode.value = data.formData.mode
+      processStore.setDesign(data)
+      processStore.runningList.value = data.runningList;
+      processStore.endList.value = data.endList;
+      processStore.noTakeList.value = data.noTakeList;
+      processStore.refuseList.value = data.refuseList;
+      processStore.passList.value = data.passList;
+      nextTick(() => {
+        commonProvessViewer.value = true
+        if (data.formPermMap && data.formPermMap["fileList"]) {
+          fileListShow.value = data.formPermMap["fileList"].perm
+        }
+      })
+      changeModel(state, mode.value)
+      loading.close()
+    } else {
       ElNotification({
         title: '提示',
         message: msg,
         type: 'error'
       })
       if (msg === '查询结果为空') {
-        commonForm.value = []
+        detailData.value = []
+        detailData.value.formData = {}
       }
       loading.close()
     }
-    if (data === undefined) return;
-    commonForm.value = data
-    processStore.setDesign(data)
-    processStore.runningList.value = data.runningList;
-    processStore.endList.value = data.endList;
-    processStore.noTakeList.value = data.noTakeList;
-    processStore.refuseList.value = data.refuseList;
-    processStore.passList.value = data.passList;
-    nextTick(() => {
-      commonProvessViewer.value = true
-      if (data.formPermMap && data.formPermMap["fileList"]) {
-        fileListShow.value = data.formPermMap["fileList"].perm
-      }
-    })
-    loading.close()
   } catch {
     loading.close()
   }
 }
-const changeModel = (active) => {
-  if (route.query.step === '20' && active === '20') {
-    if (route.query.state === '0') {
-      showApply.value = true
-    } else if (route.query.state === '3') {
-      showApply.value = true
-      getAllInfo(active)
-    } else {
-      showApply.value = false
-      getAllInfo(active)
+const changeModel = (active, mode) => {
+  editShow.value = false
+  nextTick(() => {
+    editShow.value = mode === 'submit' || mode === 'resubmit';
+    if (route.query.step === '20' && active === '20') {
+      applyTitle.value = 'apply'
+    } else if (route.query.step === '40' && active === '40') {
+      applyTitle.value = 'check'
+    } else if (route.query.step === '50' && active === '50') {
+      applyTitle.value = 'filing'
     }
-  } else if (route.query.step === '40' && active === '40') {
-    if (route.query.state === '0') {
-      showCheck.value = true
-    } else if (route.query.state === '3') {
-      showCheck.value = true
-      getAllInfo(active)
-    } else {
-      showCheck.value = false
-      getAllInfo(active)
-    }
-  } else if (route.query.step === '50' && active === '50') {
-    if (route.query.state === '0') {
-      showFiling.value = true
-    } else if (route.query.state === '3') {
-      showFiling.value = true
-      getAllInfo(active)
-    } else {
-      showFiling.value = false
-      getAllInfo(active)
-    }
-  } else {
-    getAllInfo(active)
-  }
+  })
 }
-
 const setDetail = (active) => {
   showActive.value = active
-  changeModel(active)
+  getAllInfo(active)
 }
 
 const stepChange = (data) => {
   showActive.value = data.active
-  changeModel(data.active)
+  getAllInfo(data.active)
 }
 </script>
 

From 15a2dda0fafe75c2edb3c0dfc77796a423531125 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Mon, 10 Jun 2024 22:36:03 +0800
Subject: [PATCH 07/19] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=E5=BE=81=E9=9B=86/=E6=B1=87=E6=80=BB=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project-demand/requirement/index.vue | 17 ++++++++++++-----
 src/views/project-demand/summary/index.vue     | 14 ++++++++------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/views/project-demand/requirement/index.vue b/src/views/project-demand/requirement/index.vue
index 7195227..926be1d 100644
--- a/src/views/project-demand/requirement/index.vue
+++ b/src/views/project-demand/requirement/index.vue
@@ -52,6 +52,13 @@ const searchConfig = reactive([
 ])
 const tableIns = ref()
 const userInfo = ref(authStore.userinfo)
+const auths = {
+  edit: ['mosr:requirement:resubmit'],
+  detail: ['mosr:requirement:info'],
+  add: ['mosr:requirement:add'],
+  del: ['mosr:requirement:del'],
+  report: ['mosr:collect:reported'],
+}
 const tableConfig = reactive({
   columns: [
     {
@@ -107,13 +114,13 @@ const tableConfig = reactive({
         let btn = []
         let buttons = new Set(Array.from(row.buttons))
         if (buttons.has("details")) {
-          btn.push({label: '详情', prem: ['mosr:requirement:info'], func: () => handleDetail(row), type: 'primary'})
+          btn.push({label: '详情', prem: auths.detail, func: () => handleDetail(row), type: 'primary'})
         }
         if (buttons.has("edit")) {
-          btn.push({label: '编辑', prem: ['mosr:requirement:resubmit'], func: () => handleEdit(row), type: 'primary'})
+          btn.push({label: '编辑', prem: auths.edit, func: () => handleEdit(row), type: 'primary'})
         }
         if (buttons.has("report")) {
-          btn.push({label: '需求上报', prem: ['mosr:requirement:info'], func: () => handleReport(row), type: 'primary'})
+          btn.push({label: '需求上报', prem: auths.report, func: () => handleReport(row), type: 'primary'})
         }
         return (
             <div style={{width: '100%'}}>
@@ -132,7 +139,7 @@ const tableConfig = reactive({
               {
                 buttons.has("delete") ?
                     <popover-delete name={row.requirementName} type={'需求征集'} btnType={'danger'}
-                                    perm={['mosr:requirement:del']}
+                                    perm={auths.del}
                                     onDelete={() => handleDelete(row)}/> : ''
               }
             </div>
@@ -142,7 +149,7 @@ const tableConfig = reactive({
   ],
   api: '/workflow/mosr/requirement',
   btns: [
-    {name: '新增', key: 'add', color: '#DED0B2'},
+    {name: '新增', key: 'add', color: '#DED0B2',auth: auths.add},
     {name: '导出', key: 'export', type: ''},
   ],
   params: {}
diff --git a/src/views/project-demand/summary/index.vue b/src/views/project-demand/summary/index.vue
index b3b055c..e43bb69 100644
--- a/src/views/project-demand/summary/index.vue
+++ b/src/views/project-demand/summary/index.vue
@@ -71,6 +71,11 @@ const searchConfig = reactive([
   //   colProps: {}
   // },
 ])
+const auths = {
+  edit: ['mosr:collect:resubmit'],
+  detail: ['mosr:collect:info'],
+  report: ['mosr:collect:reported'],
+}
 const tableConfig = reactive({
   columns: [
     {
@@ -161,14 +166,11 @@ const tableConfig = reactive({
         let btn = []
         let buttons = new Set(Array.from(row.buttons))
         if (buttons.has("details")) {
-          btn.push({label: '详情', prem: ['mosr:collect:info'], func: () => handleDetail(row), type: 'primary'})
+          btn.push({label: '详情', prem: auths.detail, func: () => handleDetail(row), type: 'primary'})
         }
         if (buttons.has("edit")) {
-          btn.push({label: '编辑', prem: ['mosr:collect:resubmit'], func: () => handleEdit(row), type: 'primary'})
+          btn.push({label: '编辑', prem: auths.edit, func: () => handleEdit(row), type: 'primary'})
         }
-        // if (buttons.has("report")) {
-        //   btn.push({label: '上报', prem: ['mosr:collect:reported'], func: () => handleAdd(row), type: 'primary'})
-        // }
         return (
             <div style={{width: '100%'}}>
               {
@@ -197,7 +199,7 @@ const tableConfig = reactive({
   api: '/workflow/mosr/requirement/collect',
   params: {},
   btns: [
-    {name: '新增上报', key: 'add', color: '#DED0B2', auth: ''},
+    {name: '新增上报', key: 'add', color: '#DED0B2', auth:auths.report},
     {name: '年度计划导出', key: '_export', auth: ''},
     {name: '经费预算生成', key: 'preMonty', auth: ''},
   ]

From 3e6c82dd19286db45487816e237c3c53745f5754 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Mon, 10 Jun 2024 22:38:26 +0800
Subject: [PATCH 08/19] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E9=A1=B5=E6=8C=89=E9=92=AE=E5=9B=BA=E5=AE=9A=E5=8F=B3?=
 =?UTF-8?q?=E4=BE=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project-demand/requirement/index.vue    | 1 +
 src/views/project-demand/summary/index.vue        | 1 +
 src/views/project-management/filing/index.vue     | 1 +
 src/views/project-management/initiation/index.vue | 1 +
 4 files changed, 4 insertions(+)

diff --git a/src/views/project-demand/requirement/index.vue b/src/views/project-demand/requirement/index.vue
index 926be1d..68830c4 100644
--- a/src/views/project-demand/requirement/index.vue
+++ b/src/views/project-demand/requirement/index.vue
@@ -109,6 +109,7 @@ const tableConfig = reactive({
       prop: 'oper',
       label: '操作',
       align: 'center',
+      fixed:'right',
       showOverflowTooltip: false,
       currentRender: ({row, index}) => {
         let btn = []
diff --git a/src/views/project-demand/summary/index.vue b/src/views/project-demand/summary/index.vue
index e43bb69..74016b4 100644
--- a/src/views/project-demand/summary/index.vue
+++ b/src/views/project-demand/summary/index.vue
@@ -161,6 +161,7 @@ const tableConfig = reactive({
       prop: 'oper',
       label: '操作',
       align: 'center',
+      fixed:'right',
       showOverflowTooltip: false,
       currentRender: ({row, index}) => {
         let btn = []
diff --git a/src/views/project-management/filing/index.vue b/src/views/project-management/filing/index.vue
index 957c4fe..6e8bcab 100644
--- a/src/views/project-management/filing/index.vue
+++ b/src/views/project-management/filing/index.vue
@@ -227,6 +227,7 @@ const tableConfig = reactive({
       prop: 'oper',
       label: '操作',
       align: 'center',
+      fixed:'right',
       showOverflowTooltip: false,
       currentRender: ({row, index}) => {
         let btn = []
diff --git a/src/views/project-management/initiation/index.vue b/src/views/project-management/initiation/index.vue
index 9c1dd36..b56acd7 100644
--- a/src/views/project-management/initiation/index.vue
+++ b/src/views/project-management/initiation/index.vue
@@ -226,6 +226,7 @@ const tableConfig = reactive({
       prop: 'oper',
       label: '操作',
       align: 'center',
+      fixed:'right',
       showOverflowTooltip: false,
       currentRender: ({row, index}) => {
         let btn = []

From 050c5cf57ad6c7a61e66ade385a0e35f0fe56c6c Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Mon, 10 Jun 2024 23:01:28 +0800
Subject: [PATCH 09/19] =?UTF-8?q?fix=20:=20=E5=88=97=E8=A1=A8=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E5=8A=A0=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AttachmentUpload.vue           | 50 +++++++++----------
 src/views/project-management/filing/index.vue |  8 +--
 .../implementation/index.vue                  | 12 ++---
 .../project-management/initiation/index.vue   |  6 +--
 4 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/src/components/AttachmentUpload.vue b/src/components/AttachmentUpload.vue
index 4a36418..0dc29f1 100644
--- a/src/components/AttachmentUpload.vue
+++ b/src/components/AttachmentUpload.vue
@@ -5,7 +5,7 @@
         <el-form-item :label="label" prop="attachment">
           <template v-if="preview&&JSON.stringify(singleFile) !== '{}'&&JSON.stringify(singleFile)!=='null'">
             <el-button type="primary" link @click="handleDownload(singleFile)" style="font-size: 16px">
-              {{ singleFile?.originalFileName }}
+              {{ singleFile ? singleFile?.originalFileName : formData.singleFile?.originalFileName }}
             </el-button>
             <el-button type="danger" link @click="deleteSingleFile(singleFile,1)">删除</el-button>
           </template>
@@ -35,7 +35,7 @@
 <script setup lang="jsx">
 import FileUpload from '@/components/FileUpload.vue'
 import {deleteFile, downloadFile} from "@/api/project-demand";
-import {ElMessage, ElMessageBox, ElNotification} from "element-plus";
+import {ElMessageBox, ElNotification} from "element-plus";
 
 const props = defineProps({
   showFileList: {
@@ -59,12 +59,11 @@ const props = defineProps({
     default: []
   },
   formData: {
-    type: Array,
-    default: []
+    type: Object,
+    default: {}
   }
 })
 const emit = defineEmits(["getAttachment", "getOtherFile"])
-const formData = ref({})
 const tableConfig = reactive({
   columns: [
     {
@@ -115,11 +114,12 @@ const tableConfig = reactive({
                 ))
               }
               {
-              row.newFile||props.preview||!props.preview ? <popover-delete name={row.originalFileName} type={'文件'} btnType={'danger'}
-                                            perm={['mosr:requirement:del']}
-                                            onDelete={() => handleDelete(row)}/>
-                  : ''
-            }
+                row.newFile || props.preview || !props.preview ?
+                    <popover-delete name={row.originalFileName} type={'文件'} btnType={'danger'}
+                                    perm={['mosr:requirement:del']}
+                                    onDelete={() => handleDelete(row)}/>
+                    : ''
+              }
             </div>
         )
       }
@@ -136,10 +136,18 @@ const allFileList = ref([])
 watch(() => props.showTable, (newVal) => {
   props.showTable = newVal
 }, {deep: true})
-watch(() => props.otherFileList, (newVal) => {
-  console.log('newotherFileList', newVal)
+watch(() => props.formData.fileList, (newVal) => {
+  console.log('newVal-fileList', newVal)
   if (props.preview) {
-    if (props.formData.fileList===null||props.formData.fileList.length===0) {
+    newVal?.forEach(item => {
+      allFileList.value.push(item)
+    })
+  }
+}, {deep: true})
+watch(() => props.otherFileList, (newVal) => {
+  console.log('newotherFileList', newVal,props.formData)
+  if (props.preview) {
+    if (props.formData.fileList === null || props.formData.fileList.length === 0) {
       allFileList.value = newVal
     } else {
       newVal?.forEach(item => {
@@ -150,14 +158,6 @@ watch(() => props.otherFileList, (newVal) => {
     allFileList.value = newVal
   }
 }, {deep: true})
-watch(() => props.formData.fileList, (newVal) => {
-  console.log('newVal-fileList', newVal)
-  if (props.preview) {
-    newVal?.forEach(item => {
-      allFileList.value.push(item)
-    })
-  }
-}, {deep: true})
 watch(() => props.formData.singleFile, (newVal) => {
   console.log('singleFile', newVal)
   singleFile.value = newVal
@@ -193,7 +193,7 @@ const deleteAttachment = (val) => {
         type: 'success'
       })
       isSingleFile.value = false
-      singleFile.value=null
+      singleFile.value = null
     }
   });
 }
@@ -210,7 +210,7 @@ const deleteSingleFile = (row, type) => {
         type: res.code === 1000 ? 'success' : 'error'
       })
       if (res.code === 1000) {
-        isSingleFile.value=false
+        isSingleFile.value = false
         if (type === 1) {
           singleFile.value = null
         } else {
@@ -249,7 +249,7 @@ defineExpose({
 </script>
 
 <style scoped>
-:deep(.el-table--fit ){
-  height: 300px!important;
+:deep(.el-table--fit ) {
+  height: 300px !important;
 }
 </style>
diff --git a/src/views/project-management/filing/index.vue b/src/views/project-management/filing/index.vue
index 6e8bcab..4dc848a 100644
--- a/src/views/project-management/filing/index.vue
+++ b/src/views/project-management/filing/index.vue
@@ -233,16 +233,16 @@ const tableConfig = reactive({
         let btn = []
         let buttons = new Set(Array.from(row.buttons))
         if (buttons.has("details")) {
-          btn.push({label: '详情', prem: ['mosr:requirement:info'], func: () => handleDetail(row), type: 'primary'})
+          btn.push({label: '详情', prem: ['project:management:filing:detail'], func: () => handleDetail(row), type: 'primary'})
         }
         if (buttons.has("attachments")) {
-          btn.push({label: '附件', prem: ['mosr:requirement:resubmit'], func: () => handleAttachment(row), type: 'primary'})
+          btn.push({label: '附件', prem: ['project:management:filing:attachment'], func: () => handleAttachment(row), type: 'primary'})
         }
         if (buttons.has("entry")) {
-          btn.push({label: '结项', prem: ['mosr:requirement:del'], func: () => handleConclusion(row), type: 'primary'})
+          btn.push({label: '结项', prem: ['project:management:filing:conclusion'], func: () => handleConclusion(row), type: 'primary'})
         }
         if (buttons.has("edit")) {
-          btn.push({label: '编辑', prem: ['mosr:requirement:info'], func: () => handleEdit(row), type: 'primary'})
+          btn.push({label: '编辑', prem: ['project:management:filing:conclusion'], func: () => handleEdit(row), type: 'primary'})
         }
         return (
             <div style={{width: '100%'}}>
diff --git a/src/views/project-management/implementation/index.vue b/src/views/project-management/implementation/index.vue
index 7541b91..4065da3 100644
--- a/src/views/project-management/implementation/index.vue
+++ b/src/views/project-management/implementation/index.vue
@@ -251,22 +251,22 @@ const tableConfig = reactive({
         let btn = []
         let buttons = new Set(Array.from(row.buttons))
         if (buttons.has("details")) {
-          btn.push({label: '详情', prem: ['mosr:requirement:info'], func: () => handleDetail(row), type: 'primary'})
+          btn.push({label: '详情', prem: ['mosr:implementation:info'], func: () => handleDetail(row), type: 'primary'})
         }
         if (buttons.has("check")) {
-          btn.push({label: '验收', prem: ['mosr:requirement:resubmit'], func: () => handleCheck(row), type: 'primary'})
+          btn.push({label: '验收', prem: ['mosr:implementation:check'], func: () => handleCheck(row), type: 'primary'})
         }
         if (buttons.has("edit")) {
-        btn.push({label: '编辑', prem: ['mosr:requirement:info'], func: () => handleEdit(row), type: 'primary'})
+        btn.push({label: '编辑', prem: ['mosr:implementation:resubmit'], func: () => handleEdit(row), type: 'primary'})
         }
         if (buttons.has("standing")) {
-          btn.push({label: '台账', prem: ['mosr:requirement:info'], func: () => handleStandingBook(row), type: 'primary'})
+          btn.push({label: '台账', prem: ['project:management:implementation:account'], func: () => handleStandingBook(row), type: 'primary'})
         }
         if (buttons.has("attachments")) {
-        btn.push({label: '附件', prem: ['mosr:requirement:info'], func: () => handleAttachment(row), type: 'primary'})
+        btn.push({label: '附件', prem: ['project:management:implementation:attachment'], func: () => handleAttachment(row), type: 'primary'})
         }
         if (buttons.has("viewAllocation")) {
-          btn.push({label: '查看分摊', prem: ['mosr:requirement:info'], func: () => handleShare(row), type: 'primary'})
+          btn.push({label: '查看分摊', prem: ['project:management:implementation:share'], func: () => handleShare(row), type: 'primary'})
         }
         if (buttons.has("phaseChange")) {
           btn.push({label: '阶段变更', prem: ['mosr:phase:change'], func: () => handlePhaseChange(row), type: 'primary'})
diff --git a/src/views/project-management/initiation/index.vue b/src/views/project-management/initiation/index.vue
index b56acd7..d80ec63 100644
--- a/src/views/project-management/initiation/index.vue
+++ b/src/views/project-management/initiation/index.vue
@@ -232,16 +232,16 @@ const tableConfig = reactive({
         let btn = []
         let buttons = new Set(Array.from(row.buttons))
         if (buttons.has("details")) {
-          btn.push({label: '详情', prem: ['mosr:requirement:info'], func: () => handleDetail(row), type: 'primary'})
+          btn.push({label: '详情', prem: ['mosr:approval:info'], func: () => handleDetail(row), type: 'primary'})
         }
         if (buttons.has("edit")) {
-          btn.push({label: '编辑', prem: ['mosr:requirement:resubmit'], func: () => handleEdit(row), type: 'primary'})
+          btn.push({label: '编辑', prem: ['mosr:approval:resubmit'], func: () => handleEdit(row), type: 'primary'})
         }
         // if (buttons.has("delete")) {
         //   btn.push({label: '删除',prem: ['mosr:requirement:del'], func: () => handleDelete(row), type: 'primary'})
         // }
         if (buttons.has("apply")) {
-          btn.push({label: '立项',prem: ['mosr:requirement:info'], func: () => handleApply(row), type: 'primary'})
+          btn.push({label: '立项',prem: ['mosr:approval:apply'], func: () => handleApply(row), type: 'primary'})
         }
         return (
             <div style={{width: '100%'}}>

From 1009cb7345110a4e5f4df0cffa2a68dd7d58cd25 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Mon, 10 Jun 2024 23:28:34 +0800
Subject: [PATCH 10/19] =?UTF-8?q?fix=20:=20=E4=BA=8C=E7=BA=A7=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=B8=8A=E5=8A=A0=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DetailComponent/CollectionDetail.vue      |  4 +--
 src/components/steps/index.vue                | 11 ++-----
 .../project-management/filing/attachment.vue  | 31 ++++++++++++++++++
 .../project-management/filing/upload.vue      | 32 +++++++++++++++++++
 .../implementation/account.vue                | 32 +++++++++++++++++++
 .../implementation/attachment.vue             | 14 --------
 .../implementation/phase.vue                  | 32 +++++++++++++++++++
 .../implementation/phaseDetail.vue            | 32 +++++++++++++++++++
 .../implementation/share.vue                  | 14 --------
 .../implementation/upload.vue                 | 32 +++++++++++++++++++
 .../implementation/uploadFee.vue              | 14 --------
 11 files changed, 195 insertions(+), 53 deletions(-)

diff --git a/src/components/DetailComponent/CollectionDetail.vue b/src/components/DetailComponent/CollectionDetail.vue
index 721f7bd..e9f01a2 100644
--- a/src/components/DetailComponent/CollectionDetail.vue
+++ b/src/components/DetailComponent/CollectionDetail.vue
@@ -2,7 +2,7 @@
   <div v-loading="loading">
     <el-form :model="formData" label-width="auto">
       <el-row>
-        <el-col :span="12">
+        <el-col :span="12" v-if="type==='singleDetail'">
           <el-form-item label="征集名称">
             <span>{{ formData.requirementName }}</span>
           </el-form-item>
@@ -17,7 +17,7 @@
             <span>{{ formData.companyIds }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="type==='singleDetail'?12:24">
+        <el-col :span="12">
           <el-form-item label="截止时间">
             <span>{{ formData.deadline }}</span>
           </el-form-item>
diff --git a/src/components/steps/index.vue b/src/components/steps/index.vue
index 6352a5f..57b02ab 100644
--- a/src/components/steps/index.vue
+++ b/src/components/steps/index.vue
@@ -99,13 +99,6 @@ const schema = computed(() => {
         span: 12
       }
     },
-    {
-      label: '征集类型',
-      prop: 'collectType',
-      colProps: {
-        span: 12
-      }
-    },
     {
       label: '所属公司',
       prop: 'affiliatedCompany',
@@ -114,8 +107,8 @@ const schema = computed(() => {
       }
     },
     {
-      label: '截止时间',
-      prop: 'deadline',
+      label: '项目名称',
+      prop: 'projectName',
       colProps: {
         span: 12
       }
diff --git a/src/views/project-management/filing/attachment.vue b/src/views/project-management/filing/attachment.vue
index b4e4a3f..a72ca42 100644
--- a/src/views/project-management/filing/attachment.vue
+++ b/src/views/project-management/filing/attachment.vue
@@ -1,4 +1,6 @@
 <template>
+  <baseTitle title="基础信息"></baseTitle>
+  <fvForm :schema="schema" @getInstance="(e)=>baseForm = e"></fvForm>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
     <el-tab-pane v-for="item in paneList" :label="item.label" :name="item.name">
       <search-files-by-tag @search="search" @upload="upload" :type="item.name==='40'?'40':''"
@@ -10,6 +12,8 @@
 <script setup lang="jsx">
 import {searchFileList} from "@/api/project-manage/attachment.js";
 import {ElNotification} from "element-plus";
+import {computed, ref} from "vue";
+import {getBaseInfoApi} from "@/components/steps/api";
 
 const route = useRoute()
 const router = useRouter()
@@ -20,6 +24,25 @@ const uploadState = ref(true)
 const fileList = ref([])
 const projectId = ref(route.query.id)
 const requirementId = ref(route.query.requirementId)
+const schema = computed(() => {
+  return [
+    {
+      label: '征集名称',
+      prop: 'requirementName',
+      colProps: {
+        span: 12
+      }
+    },
+    {
+      label: '项目名称',
+      prop: 'projectName',
+      colProps: {
+        span: 12
+      }
+    }
+  ]
+})
+const baseForm = ref()
 const paneList=ref([
   {
     label:'需求征集',
@@ -42,7 +65,15 @@ const paneList=ref([
     name:'50'
   }
 ])
+const getBaseInfo = async () => {
+  try {
+    const {code, data} = await getBaseInfoApi(route.query.id)
+    baseForm.value.setValues(data)
+  } catch {
+  }
+}
 
+getBaseInfo()
 const handleClick = (tab) => {
   activeName.value=tab.props.name
   loading.value=true
diff --git a/src/views/project-management/filing/upload.vue b/src/views/project-management/filing/upload.vue
index 1621887..a93a3cf 100644
--- a/src/views/project-management/filing/upload.vue
+++ b/src/views/project-management/filing/upload.vue
@@ -1,4 +1,6 @@
 <template>
+  <baseTitle title="基础信息"></baseTitle>
+  <fvForm :schema="schema" @getInstance="(e)=>baseForm = e"></fvForm>
   <baseTitle title="上传附件"></baseTitle>
   <el-card style="width: 100%;margin: 15px 0">
     <file-upload @getFile="getFile" />
@@ -18,6 +20,8 @@
 import {ElNotification} from "element-plus";
 import {useTagsView} from '@/stores/tagsview.js'
 import {uploadFileList} from "@/api/project-manage/attachment";
+import {computed, ref} from "vue";
+import {getBaseInfoApi} from "@/components/steps/api";
 
 const tagsViewStore = useTagsView()
 const route = useRoute()
@@ -26,6 +30,25 @@ const fileList = ref([])
 const formData = ref({
   tagName:''
 })
+const schema = computed(() => {
+  return [
+    {
+      label: '征集名称',
+      prop: 'requirementName',
+      colProps: {
+        span: 12
+      }
+    },
+    {
+      label: '项目名称',
+      prop: 'projectName',
+      colProps: {
+        span: 12
+      }
+    }
+  ]
+})
+const baseForm = ref()
 const tableConfig = reactive({
   columns: [
     {
@@ -70,6 +93,15 @@ const name = ref(router.currentRoute.value.name)
 const rules = reactive({
   tagName: [{required: true, message: '请输入标签名称', trigger: 'blur'}],
 })
+const getBaseInfo = async () => {
+  try {
+    const {code, data} = await getBaseInfoApi(route.query.id)
+    baseForm.value.setValues(data)
+  } catch {
+  }
+}
+
+getBaseInfo()
 const compositeParam = (item) => {
   let tag=''
   switch (route.query.name) {
diff --git a/src/views/project-management/implementation/account.vue b/src/views/project-management/implementation/account.vue
index f1b5111..9291a4e 100644
--- a/src/views/project-management/implementation/account.vue
+++ b/src/views/project-management/implementation/account.vue
@@ -1,4 +1,6 @@
 <template>
+  <baseTitle title="基础信息"></baseTitle>
+  <fvForm :schema="schema" @getInstance="(e)=>baseForm = e"></fvForm>
   <fvSearchForm :searchConfig="searchConfig" @search="search"></fvSearchForm>
   <fvTable ref="tableIns" :tableConfig="tableConfig" @headBtnClick="headBtnClick">
     <template #empty>
@@ -10,9 +12,30 @@
 <script setup lang="jsx">
 import fvSelect from '@/fvcomponents/fvSelect/index.vue'
 import {toThousands} from '@/utils/changePrice.js'
+import {computed, ref} from "vue";
+import {getBaseInfoApi} from "@/components/steps/api";
 
 const router = useRouter()
 const route = useRoute()
+const schema = computed(() => {
+  return [
+    {
+      label: '征集名称',
+      prop: 'requirementName',
+      colProps: {
+        span: 12
+      }
+    },
+    {
+      label: '项目名称',
+      prop: 'projectName',
+      colProps: {
+        span: 12
+      }
+    }
+  ]
+})
+const baseForm = ref()
 const searchConfig = reactive([
   {
     label: '项目名称',
@@ -141,6 +164,15 @@ const tableConfig = reactive({
   ]
 })
 const tableIns=ref()
+const getBaseInfo = async () => {
+  try {
+    const {code, data} = await getBaseInfoApi(route.query.id)
+    baseForm.value.setValues(data)
+  } catch {
+  }
+}
+
+getBaseInfo()
 const headBtnClick = (key) => {
   switch (key) {
     case 'add':
diff --git a/src/views/project-management/implementation/attachment.vue b/src/views/project-management/implementation/attachment.vue
index 83e8530..c18d945 100644
--- a/src/views/project-management/implementation/attachment.vue
+++ b/src/views/project-management/implementation/attachment.vue
@@ -50,13 +50,6 @@ const schema = computed(() => {
         span: 12
       }
     },
-    {
-      label: '征集类型',
-      prop: 'collectType',
-      colProps: {
-        span: 12
-      }
-    },
     {
       label: '项目名称',
       prop: 'projectName',
@@ -64,13 +57,6 @@ const schema = computed(() => {
         span: 12
       }
     },
-    {
-      label: '所属公司',
-      prop: 'affiliatedCompany',
-      colProps: {
-        span: 12
-      }
-    }
   ]
 })
 const baseForm = ref()
diff --git a/src/views/project-management/implementation/phase.vue b/src/views/project-management/implementation/phase.vue
index c48946e..e9a6a2d 100644
--- a/src/views/project-management/implementation/phase.vue
+++ b/src/views/project-management/implementation/phase.vue
@@ -1,5 +1,7 @@
 <template>
   <div class="apply-block">
+    <baseTitle title="基础信息"></baseTitle>
+    <fvForm :schema="schema" @getInstance="(e)=>baseForm = e"></fvForm>
     <el-form :model="formData" label-width="auto">
       <el-form-item label="抄送人员">
         <Ttsup :modelValue="chooseUserInfo()" @click="chooseUser"/>
@@ -29,6 +31,8 @@ import {getPhaseProcess, submitPhaseChange, getPhaseForm, resubmitPhaseForm} fro
 import {ElNotification} from "element-plus";
 import {useProcessStore} from '@/stores/processStore.js';
 import {useTagsView} from '@/stores/tagsview.js'
+import {computed, ref} from "vue";
+import {getBaseInfoApi} from "@/components/steps/api";
 
 const tagsViewStore = useTagsView()
 const router = useRouter()
@@ -46,6 +50,34 @@ const processInstanceData = ref()
 const processDiagramViewer = ref(true)
 const userList = ref([])
 const processStore = useProcessStore()
+const schema = computed(() => {
+  return [
+    {
+      label: '征集名称',
+      prop: 'requirementName',
+      colProps: {
+        span: 12
+      }
+    },
+    {
+      label: '项目名称',
+      prop: 'projectName',
+      colProps: {
+        span: 12
+      }
+    }
+  ]
+})
+const baseForm = ref()
+const getBaseInfo = async () => {
+  try {
+    const {code, data} = await getBaseInfoApi(route.query.projectId)
+    baseForm.value.setValues(data)
+  } catch {
+  }
+}
+
+getBaseInfo()
 const compositeParam = (item) => {
   let tag = ''
   if (name.value === 'Phase/change') {
diff --git a/src/views/project-management/implementation/phaseDetail.vue b/src/views/project-management/implementation/phaseDetail.vue
index eb87e95..7a0e078 100644
--- a/src/views/project-management/implementation/phaseDetail.vue
+++ b/src/views/project-management/implementation/phaseDetail.vue
@@ -1,4 +1,6 @@
 <template>
+  <baseTitle title="基础信息"></baseTitle>
+  <fvForm :schema="schema" @getInstance="(e)=>baseForm = e"></fvForm>
   <baseTitle title="阶段变更详情"></baseTitle>
   <div style="color: #606266;font-size: 14px">抄送人：{{copyName}}</div>
   <ApprovalDetail :formData="summaryData.formData" :data="summaryData" type="phase"
@@ -10,6 +12,8 @@
 import {ElNotification} from "element-plus";
 import {useProcessStore} from '@/stores/processStore.js';
 import {getPhaseDetail} from "@/api/project-manage";
+import {computed, ref} from "vue";
+import {getBaseInfoApi} from "@/components/steps/api";
 
 const route = useRoute()
 const summaryData = ref({})
@@ -19,6 +23,34 @@ const loading = ref(false)
 const auditOpinion = ref('')
 const copyName = ref('')
 const fileListShow = ref('READ')
+const schema = computed(() => {
+  return [
+    {
+      label: '征集名称',
+      prop: 'requirementName',
+      colProps: {
+        span: 12
+      }
+    },
+    {
+      label: '项目名称',
+      prop: 'projectName',
+      colProps: {
+        span: 12
+      }
+    }
+  ]
+})
+const baseForm = ref()
+const getBaseInfo = async () => {
+  try {
+    const {code, data} = await getBaseInfoApi(route.query.projectId)
+    baseForm.value.setValues(data)
+  } catch {
+  }
+}
+
+getBaseInfo()
 const getInfo = async () => {
   fileListShow.value = 'READ'
   const projectId = route.query.projectId
diff --git a/src/views/project-management/implementation/share.vue b/src/views/project-management/implementation/share.vue
index edb71a6..d37b65e 100644
--- a/src/views/project-management/implementation/share.vue
+++ b/src/views/project-management/implementation/share.vue
@@ -25,26 +25,12 @@ const schema = computed(() => {
         span: 12
       }
     },
-    {
-      label: '征集类型',
-      prop: 'collectType',
-      colProps: {
-        span: 12
-      }
-    },
     {
       label: '项目名称',
       prop: 'projectName',
       colProps: {
         span: 12
       }
-    },
-    {
-      label: '所属公司',
-      prop: 'affiliatedCompany',
-      colProps: {
-        span: 12
-      }
     }
   ]
 })
diff --git a/src/views/project-management/implementation/upload.vue b/src/views/project-management/implementation/upload.vue
index e518f3b..00b2448 100644
--- a/src/views/project-management/implementation/upload.vue
+++ b/src/views/project-management/implementation/upload.vue
@@ -1,4 +1,6 @@
 <template>
+  <baseTitle title="基础信息"></baseTitle>
+  <fvForm :schema="schema" @getInstance="(e)=>baseForm = e"></fvForm>
   <baseTitle title="标签名称"></baseTitle>
   <el-form :model="formData" ref="tagForm" label-width="auto" :rules="rules">
     <el-form-item label="标签名称" prop="tagName">
@@ -34,12 +36,33 @@ import {getTags} from "@/api/project-manage";
 import {ElNotification} from "element-plus";
 import {useTagsView} from '@/stores/tagsview.js'
 import {uploadFileList} from "@/api/project-manage/attachment";
+import {computed, ref} from "vue";
+import {getBaseInfoApi} from "@/components/steps/api";
 
 const tagsViewStore = useTagsView()
 const route = useRoute()
 const router = useRouter()
 const fileList = ref([])
 const showInput = ref(false)
+const schema = computed(() => {
+  return [
+    {
+      label: '征集名称',
+      prop: 'requirementName',
+      colProps: {
+        span: 12
+      }
+    },
+    {
+      label: '项目名称',
+      prop: 'projectName',
+      colProps: {
+        span: 12
+      }
+    }
+  ]
+})
+const baseForm = ref()
 const tagsOption = ref([])
 const formData = ref({
   tagName: ''
@@ -88,6 +111,15 @@ const name = ref(router.currentRoute.value.name)
 const rules = reactive({
   tagName: [{required: true, message: '请输入标签名称', trigger: ['blur', 'change']}],
 })
+const getBaseInfo = async () => {
+  try {
+    const {code, data} = await getBaseInfoApi(route.query.id)
+    baseForm.value.setValues(data)
+  } catch {
+  }
+}
+
+getBaseInfo()
 const changeInput = () => {
   showInput.value = !showInput.value;
   formData.value.tagName = '';
diff --git a/src/views/project-management/implementation/uploadFee.vue b/src/views/project-management/implementation/uploadFee.vue
index 2faed30..160e117 100644
--- a/src/views/project-management/implementation/uploadFee.vue
+++ b/src/views/project-management/implementation/uploadFee.vue
@@ -102,26 +102,12 @@ const schema = computed(() => {
         span: 12
       }
     },
-    {
-      label: '征集类型',
-      prop: 'collectType',
-      colProps: {
-        span: 12
-      }
-    },
     {
       label: '项目名称',
       prop: 'projectName',
       colProps: {
         span: 12
       }
-    },
-    {
-      label: '所属公司',
-      prop: 'affiliatedCompany',
-      colProps: {
-        span: 12
-      }
     }
   ]
 })

From ab8372405623124a0dc69b01c3d389c93a6cf539 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Tue, 11 Jun 2024 15:42:01 +0800
Subject: [PATCH 11/19] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E5=88=87=E6=8D=A2=E6=B5=81=E7=A8=8B=E5=9B=BE?=
 =?UTF-8?q?=E6=B8=B2=E6=9F=93bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/project-manage/index.js               |  7 ++
 .../DetailComponent/ProjectApply.vue          | 85 ++++++++++++++++---
 .../implementation/detail.vue                 |  1 +
 src/views/workflow/process/index.vue          |  4 +-
 4 files changed, 81 insertions(+), 16 deletions(-)

diff --git a/src/api/project-manage/index.js b/src/api/project-manage/index.js
index b983f01..37ca9e1 100644
--- a/src/api/project-manage/index.js
+++ b/src/api/project-manage/index.js
@@ -138,3 +138,10 @@ export const getProjectConclusionProcess = () => {
     method: "get"
   });
 };
+//获取前置流程
+export const getPreProcess= () => {
+  return request({
+    url: '/workflow/details/pre/process',
+    method: "get"
+  });
+};
diff --git a/src/components/DetailComponent/ProjectApply.vue b/src/components/DetailComponent/ProjectApply.vue
index 045b9d7..dc4c654 100644
--- a/src/components/DetailComponent/ProjectApply.vue
+++ b/src/components/DetailComponent/ProjectApply.vue
@@ -4,7 +4,11 @@
       <el-row>
         <el-col :span="12">
           <el-form-item label="前置流程">
-            <el-input v-model="localFormData.requirementName" clearable></el-input>
+            <div @click="handleShowPreTable">点击</div>
+            <!--            <el-select v-model="localFormData.preProcess" placeholder="请选择前置流程" clearable filterable>-->
+            <!--              <el-option v-for="item in preProcessList" :key="item.id" :label="item.label" :value="item.value">-->
+            <!--              </el-option>-->
+            <!--            </el-select>-->
           </el-form-item>
         </el-col>
       </el-row>
@@ -29,6 +33,30 @@
       <el-button color="#DED0B2" v-else-if="mode === 'resubmit'" @click="handleSubmit">重新提交</el-button>
       <el-button @click="handleBack">返回</el-button>
     </div>
+    <el-dialog title="前置流程" v-model="showPreTable" width="80%">
+      <el-form :model="searchPreProcess" label-width="auto">
+        <el-form-item label="请求名称">
+          <el-input v-model="searchPreProcess.requestName" placeholder="请输入请求名称" clearable>
+          </el-input>
+        </el-form-item>
+      </el-form>
+      <el-table :data="preProcessList"  stripe v-loading="loading">
+        <el-table-column prop="requestId" label="请求id"></el-table-column>
+        <el-table-column prop="requestName" label="请求名称"></el-table-column>
+        <el-table-column prop="lastOperatorName" label="最后操作人名称"></el-table-column>
+        <el-table-column prop="lastOperateTime" label="最后操作时间"></el-table-column>
+        <el-table-column prop="currentNodeName" label="当前节点"></el-table-column>
+        <el-table-column prop="creatorName" label="创建人"></el-table-column>
+        <el-table-column prop="createTime" label="创建时间"></el-table-column>
+        <el-table-column label="操作" align="center">
+          <template #default="scope">
+           <a :href="scope.row.baseUrl" target="_blank" style="color: #2a99ff">查看详情</a>
+          </template>
+        </el-table-column>
+      </el-table>
+<!--      <paging :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize" :page-sizes="[10, 20, 30, 40,50]"-->
+<!--              :total="total" @changeSize="handleSizeChange" @goPage="handleCurrentChange"/>-->
+    </el-dialog>
   </div>
 </template>
 
@@ -49,6 +77,7 @@ import {
 } from "@/api/project-manage";
 import {useProcessStore} from '@/stores/processStore.js';
 import {useTagsView} from '@/stores/tagsview.js'
+import {getPreProcess} from "@/api/project-manage";
 
 const router = useRouter()
 const route = useRoute()
@@ -73,8 +102,22 @@ const props = defineProps({
   formData: {
     type: Object,
     default: {}
+  },
+  step: {
+    type: String,
+    default: "20"
   }
 })
+const preProcessList = ref([])
+//暂存数据
+const currentList=ref([])
+const searchPreProcess = ref({
+  requestName:''
+})
+const pageInfo = reactive({
+  pageNum: 1,
+  pageSize: 10,
+})
 const rules = reactive({
   // requirementName: [{required: true, message: '请选择前置流程', trigger: 'blur'}],
 })
@@ -83,13 +126,26 @@ const processStore = useProcessStore()
 const otherFileList = ref([])
 const localFormData = ref({})
 const attachment = ref()
+const showPreTable = ref(false)
 const showTable = ref(true)
 const loading = ref(false)
 const processDiagramViewer = ref(false)
 const name = ref(router.currentRoute.value.name)
 const deploymentId = ref()
 const projectId = ref(route.query.projectId)
-const step = ref(route.query.step)
+const handleShowPreTable = () => {
+  showPreTable.value = true
+}
+const getPreProcessList = () => {
+  // loading.value=true
+  getPreProcess().then(res => {
+    console.log('浅灰的', res)
+    // loading.value=false
+    // baseUrl.value=res.data.baseUrl
+    // currentList.value=res.data
+    preProcessList.value = res.data.slice(0,10)
+  })
+}
 const getTitleName = (type) => {
   switch (type) {
     case 'apply':
@@ -150,10 +206,10 @@ const handleSubmit = async () => {
   // if (localFormData.value.singleFile !== undefined) {
   //   localFormData.value.singleFile = getFileParam(localFormData.value.singleFile)
   // }
-  console.log('attachment.value.singleFile',attachment.value,attachment.value.singleFile)
-  if(localFormData.value.singleFile){
+  console.log('attachment.value.singleFile', attachment.value, attachment.value.singleFile)
+  if (localFormData.value.singleFile) {
 
-  }else {
+  } else {
     if (attachment.value.singleFile == null) {
       attachment.value.validate()
       ElNotification({
@@ -176,19 +232,19 @@ const handleSubmit = async () => {
   }
   console.log('params', params)
   let res
-  if (step.value === '20') {
+  if (props.step === '20') {
     if (props.mode === 'resubmit') {
       res = await resubmitApply(params)
     } else {
       res = await projectApply(params)
     }
-  } else if (step.value === '40') {
+  } else if (props.step === '40') {
     if (props.mode === 'resubmit') {
       res = await resubmitCheck(params)
     } else {
       res = await projectCheck(params)
     }
-  } else if (step.value === '50') {
+  } else if (props.step === '50') {
     if (props.mode === 'resubmit') {
       res = await resubmitConclusion(params)
     } else {
@@ -202,15 +258,15 @@ const handleSubmit = async () => {
   })
   if (res.code === 1000) {
     tagsViewStore.delVisitedViews(router.currentRoute.value.path)
-    if (step.value === '20') {
+    if (props.step === '20') {
       await router.push({
         name: 'Initiation'
       })
-    } else if (step.value === '40') {
+    } else if (props.step === '40') {
       await router.push({
         name: 'Implementation'
       })
-    } else if (step.value === '50') {
+    } else if (props.step === '50') {
       await router.push({
         name: 'Filing'
       })
@@ -223,11 +279,11 @@ const init = async () => {
   if (!id) return;
   processDiagramViewer.value = false
   let res
-  if (step.value === '20') {
+  if (props.step === '20') {
     res = await getApplyProcess(id)
-  } else if (step.value === '40') {
+  } else if (props.step === '40') {
     res = await getProjectCheckProcess(id)
-  } else if (step.value === '50') {
+  } else if (props.step === '50') {
     res = await getProjectConclusionProcess(id)
   }
   if (res.code === 1000) {
@@ -255,6 +311,7 @@ watchEffect(() => {
   return Object.keys(props.formData).length && (localFormData.value = props.formData)
 })
 
+getPreProcessList()
 onMounted(async () => {
   await init()
 })
diff --git a/src/views/project-management/implementation/detail.vue b/src/views/project-management/implementation/detail.vue
index 527ac2e..dafc23d 100644
--- a/src/views/project-management/implementation/detail.vue
+++ b/src/views/project-management/implementation/detail.vue
@@ -39,6 +39,7 @@
       <project-apply :title="applyTitle"
                      v-if="editShow"
                      :mode="mode"
+                     :step="showActive"
                      :data="detailData"
                      :formData="detailData.formData"/>
     </template>
diff --git a/src/views/workflow/process/index.vue b/src/views/workflow/process/index.vue
index 99c3dac..3c4314e 100644
--- a/src/views/workflow/process/index.vue
+++ b/src/views/workflow/process/index.vue
@@ -18,8 +18,8 @@
         <el-button type="primary" @click="getList" :icon="Search">搜索</el-button>
         <el-button type="primary"  @click="handleAdd" :icon="Plus">新增</el-button>
         <el-button type="primary" @click="handleReset" :icon="Refresh" plain>重置</el-button>
-        <el-button type="primary"  @click="handleExport" :icon="Download" plain>导出
-        </el-button>
+<!--        <el-button type="primary"  @click="handleExport" :icon="Download" plain>导出-->
+<!--        </el-button>-->
       </el-form-item>
     </el-form>
     <div class="table">

From 3f7de153da7345d3b862e5c9fa4ec4c2b83a5f41 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Tue, 11 Jun 2024 18:47:35 +0800
Subject: [PATCH 12/19] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E7=AB=8B=E9=A1=B9/=E9=AA=8C=E6=94=B6=E5=89=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=B5=81=E7=A8=8B=E5=B1=95=E7=A4=BA=E5=8F=8A=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E9=83=A8=E5=88=86=E9=A1=B5=E9=9D=A2=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AttachmentUpload.vue           |   6 +-
 .../DetailComponent/ApprovalDetail.vue        |  22 ++-
 .../DetailComponent/ProjectApply.vue          | 130 ++++++++++++------
 .../implementation/detail.vue                 |   1 +
 src/views/rapid/regular/index.vue             |   4 +-
 src/views/rapid/source/index.vue              |   4 +-
 src/views/system/config/index.vue             |   4 +-
 src/views/workflow/about/index.vue            |   4 +-
 src/views/workflow/approve/index.vue          |   4 +-
 src/views/workflow/initiated/index.vue        |   4 +-
 src/views/workflow/listen/index.vue           |   4 +-
 src/views/workflow/process/ProcessEdit.vue    |   4 +-
 src/views/workflow/process/index.vue          |   4 +-
 src/views/workflow/task/index.vue             |   4 +-
 14 files changed, 135 insertions(+), 64 deletions(-)

diff --git a/src/components/AttachmentUpload.vue b/src/components/AttachmentUpload.vue
index 0dc29f1..34c444e 100644
--- a/src/components/AttachmentUpload.vue
+++ b/src/components/AttachmentUpload.vue
@@ -7,9 +7,9 @@
             <el-button type="primary" link @click="handleDownload(singleFile)" style="font-size: 16px">
               {{ singleFile ? singleFile?.originalFileName : formData.singleFile?.originalFileName }}
             </el-button>
-            <el-button type="danger" link @click="deleteSingleFile(singleFile,1)">删除</el-button>
+            <el-button type="danger" link @click="deleteSingleFile(singleFile?singleFile:formData.singleFile,1)">删除</el-button>
           </template>
-          <template v-else-if="!preview||JSON.stringify(singleFile) == '{}'||singleFile==null">
+          <template v-else-if="!preview||JSON.stringify(singleFile) == '{}'||singleFile==null||formData.singleFile==null">
             <file-upload @getFile="getAttachment" :showFileList="showFileList" :multiple="false" :maxSize="1"
                          :disabled="isSingleFile" @delete="deleteAttachment"/>
           </template>
@@ -130,7 +130,7 @@ const rules = reactive({
   attachment: [{required: true, message: '请上传附件', trigger: ['blur', 'change']}],
 })
 const applyForm = ref()
-const singleFile = ref()
+const singleFile = ref(props.formData.singleFile)
 const isSingleFile = ref(false)
 const allFileList = ref([])
 watch(() => props.showTable, (newVal) => {
diff --git a/src/components/DetailComponent/ApprovalDetail.vue b/src/components/DetailComponent/ApprovalDetail.vue
index 27f6324..7ac949b 100644
--- a/src/components/DetailComponent/ApprovalDetail.vue
+++ b/src/components/DetailComponent/ApprovalDetail.vue
@@ -83,7 +83,16 @@ const schema = computed(() => {
         prop: 'preProcess',
         colProps: {
           span: 24
-        }
+        },
+        component: () => (
+            <div>
+              {
+                props.formData.preProcess?
+                    <span><a target="_blank" style={{color: '#409EFF', cursor: 'pointer'}} href={props.formData.preProcessBaseUrl + props.formData.preProcess.requestId}>{props.formData.preProcess.requestName}</a> </span> :
+                    <span>{'--'}</span>
+              }
+            </div>
+        )
       },
       {
         label: '项目立项附件',
@@ -115,7 +124,16 @@ const schema = computed(() => {
         prop: 'preProcess',
         colProps: {
           span: 24
-        }
+        },
+        component: () => (
+            <div>
+              {
+                props.formData.preProcess?
+                    <span><a target="_blank" style={{color: '#409EFF', cursor: 'pointer'}} href={props.formData.preProcessBaseUrl + props.formData.preProcess.requestId}>{props.formData.preProcess.requestName}</a> </span> :
+                    <span>{'--'}</span>
+              }
+            </div>
+        )
       },
       {
         label: '项目验收附件',
diff --git a/src/components/DetailComponent/ProjectApply.vue b/src/components/DetailComponent/ProjectApply.vue
index dc4c654..fd9c177 100644
--- a/src/components/DetailComponent/ProjectApply.vue
+++ b/src/components/DetailComponent/ProjectApply.vue
@@ -3,12 +3,12 @@
     <el-form :model="localFormData" ref="formRef" label-width="auto" :rules="rules" v-if="step!=='50'">
       <el-row>
         <el-col :span="12">
-          <el-form-item label="前置流程">
-            <div @click="handleShowPreTable">点击</div>
-            <!--            <el-select v-model="localFormData.preProcess" placeholder="请选择前置流程" clearable filterable>-->
-            <!--              <el-option v-for="item in preProcessList" :key="item.id" :label="item.label" :value="item.value">-->
-            <!--              </el-option>-->
-            <!--            </el-select>-->
+          <el-form-item label="前置流程" :required="true" prop="requestName">
+            <a :href="localFormData.preProcess?.baseUrl" target="_blank"
+               style="color: #2a99ff;margin-right: 10px;cursor: pointer">{{ localFormData.preProcess?.requestName }}</a>
+            <el-button color="#DED0B2" @click="handleShowPreTable">
+              {{ localFormData.preProcess?.requestName ? '更改' : '请选择' }}
+            </el-button>
           </el-form-item>
         </el-col>
       </el-row>
@@ -34,13 +34,17 @@
       <el-button @click="handleBack">返回</el-button>
     </div>
     <el-dialog title="前置流程" v-model="showPreTable" width="80%">
-      <el-form :model="searchPreProcess" label-width="auto">
+      <el-form :model="preProcessForm" inline>
         <el-form-item label="请求名称">
-          <el-input v-model="searchPreProcess.requestName" placeholder="请输入请求名称" clearable>
+          <el-input v-model="preProcessForm.requestName" placeholder="请输入请求名称" clearable>
           </el-input>
         </el-form-item>
+        <el-form-item>
+          <el-button color="#DED0B2" @click="searchPreProcess">搜索</el-button>
+          <el-button @click="handleReset">重置</el-button>
+        </el-form-item>
       </el-form>
-      <el-table :data="preProcessList"  stripe v-loading="loading">
+      <el-table :data="preProcessList" stripe v-loading="loading">
         <el-table-column prop="requestId" label="请求id"></el-table-column>
         <el-table-column prop="requestName" label="请求名称"></el-table-column>
         <el-table-column prop="lastOperatorName" label="最后操作人名称"></el-table-column>
@@ -50,12 +54,13 @@
         <el-table-column prop="createTime" label="创建时间"></el-table-column>
         <el-table-column label="操作" align="center">
           <template #default="scope">
-           <a :href="scope.row.baseUrl" target="_blank" style="color: #2a99ff">查看详情</a>
+            <el-button @click="chooseProProcess(scope.row)">选择</el-button>
+            <a :href="scope.row.baseUrl" target="_blank" style="color: #2a99ff">查看详情</a>
           </template>
         </el-table-column>
       </el-table>
-<!--      <paging :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize" :page-sizes="[10, 20, 30, 40,50]"-->
-<!--              :total="total" @changeSize="handleSizeChange" @goPage="handleCurrentChange"/>-->
+      <paging :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize" :page-sizes="[10, 20, 30, 40,50]"
+              :total="total" @changeSize="handleSizeChange" @goPage="handleCurrentChange"/>
     </el-dialog>
   </div>
 </template>
@@ -66,18 +71,19 @@ import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.v
 import {ElNotification} from "element-plus";
 import {
   getApplyProcess,
-  projectApply,
-  resubmitApply,
+  getPreProcess,
   getProjectCheckProcess,
+  getProjectConclusionProcess,
+  projectApply,
   projectCheck,
-  resubmitCheck,
   projectConclusion,
-  resubmitConclusion,
-  getProjectConclusionProcess
+  resubmitApply,
+  resubmitCheck,
+  resubmitConclusion
 } from "@/api/project-manage";
 import {useProcessStore} from '@/stores/processStore.js';
 import {useTagsView} from '@/stores/tagsview.js'
-import {getPreProcess} from "@/api/project-manage";
+import Paging from "@/components/pagination/index.vue";
 
 const router = useRouter()
 const route = useRoute()
@@ -110,21 +116,28 @@ const props = defineProps({
 })
 const preProcessList = ref([])
 //暂存数据
-const currentList=ref([])
-const searchPreProcess = ref({
-  requestName:''
+const currentList = ref([])
+const total = ref(0)
+const preProcessForm = reactive({
+  requestName: ''
 })
 const pageInfo = reactive({
   pageNum: 1,
   pageSize: 10,
 })
 const rules = reactive({
-  // requirementName: [{required: true, message: '请选择前置流程', trigger: 'blur'}],
+  requestName: [{required: true, message: '请选择前置流程', trigger: 'blur'}],
 })
 const tagsViewStore = useTagsView()
 const processStore = useProcessStore()
 const otherFileList = ref([])
-const localFormData = ref({})
+const localFormData = ref({
+  preProcess: {
+    requestId: null,
+    requestName: '',
+    baseUrl: ''
+  }
+})
 const attachment = ref()
 const showPreTable = ref(false)
 const showTable = ref(true)
@@ -133,19 +146,55 @@ const processDiagramViewer = ref(false)
 const name = ref(router.currentRoute.value.name)
 const deploymentId = ref()
 const projectId = ref(route.query.projectId)
+const searchPreProcess = () => {
+  getPreProcessList()
+
+}
+const handleReset = () => {
+  preProcessForm.requestName = ''
+  getPreProcessList()
+}
 const handleShowPreTable = () => {
   showPreTable.value = true
+  getPreProcessList()
 }
 const getPreProcessList = () => {
-  // loading.value=true
+  loading.value = true
   getPreProcess().then(res => {
-    console.log('浅灰的', res)
-    // loading.value=false
-    // baseUrl.value=res.data.baseUrl
-    // currentList.value=res.data
-    preProcessList.value = res.data.slice(0,10)
+    loading.value = false
+    let searchArray = []
+    let regexPattern = ("%" + preProcessForm.requestName + "%").replace(/%/g, '.*').replace(/_/g, '.');
+    let regex = new RegExp('^' + regexPattern + '$');
+    res.data.filter((item) => {
+      if (regex.test(item.requestName)) {
+        searchArray.push(item)
+      }
+    })
+    total.value = searchArray.length
+    currentList.value = searchArray
+    preProcessList.value = currentList.value.slice(0, 10)
   })
 }
+const chooseProProcess = (item) => {
+  localFormData.value.preProcess = {
+    requestId: item.requestId,
+    requestName: item.requestName,
+    baseUrl: item.baseUrl
+  }
+  showPreTable.value = false
+}
+
+//切换每页显示条数
+const handleSizeChange = (val) => {
+  pageInfo.pageSize = val;
+  preProcessList.value = currentList.value.slice((pageInfo.pageNum - 1) * val, pageInfo.pageNum * val)
+};
+
+//点击页码进行分页功能
+const handleCurrentChange = (val) => {
+  pageInfo.pageNum = val;
+  preProcessList.value = currentList.value.slice((val - 1) * pageInfo.pageSize, val * pageInfo.pageSize)
+};
 const getTitleName = (type) => {
   switch (type) {
     case 'apply':
@@ -190,9 +239,13 @@ const getFileParam = (item) => {
   }
 }
 const handleSubmit = async () => {
-  // if (!formRef.value) return
-  // formRef.value.validate(async (valid) => {
-  //   if (!valid) return
+  if (localFormData.value.preProcess === undefined) {
+    ElNotification({
+      title: '提示',
+      message: '请选择前置流程',
+      type: 'error'
+    })
+  }
   let files = []
   if (props.mode === 'resubmit') {
     attachment.value.allFileList.forEach(item => {
@@ -207,9 +260,9 @@ const handleSubmit = async () => {
   //   localFormData.value.singleFile = getFileParam(localFormData.value.singleFile)
   // }
   console.log('attachment.value.singleFile', attachment.value, attachment.value.singleFile)
-  if (localFormData.value.singleFile) {
-
-  } else {
+  // if (localFormData.value.singleFile) {
+  //
+  // } else {
     if (attachment.value.singleFile == null) {
       attachment.value.validate()
       ElNotification({
@@ -221,14 +274,15 @@ const handleSubmit = async () => {
     } else {
       attachment.value.clearValidate()
     }
-  }
+  // }
 
   let params = {
     deploymentId: deploymentId.value,
     requirementId: route.query.id,
     fileList: files,
-    singleFile: localFormData.value.singleFile,
+    singleFile: attachment.value.singleFile,
     projectId: projectId.value,
+    preProcess: JSON.stringify(localFormData.value.preProcess)
   }
   console.log('params', params)
   let res
@@ -272,7 +326,6 @@ const handleSubmit = async () => {
       })
     }
   }
-  // })
 }
 const init = async () => {
   let id = projectId.value
@@ -311,7 +364,6 @@ watchEffect(() => {
   return Object.keys(props.formData).length && (localFormData.value = props.formData)
 })
 
-getPreProcessList()
 onMounted(async () => {
   await init()
 })
diff --git a/src/views/project-management/implementation/detail.vue b/src/views/project-management/implementation/detail.vue
index dafc23d..3a23cd6 100644
--- a/src/views/project-management/implementation/detail.vue
+++ b/src/views/project-management/implementation/detail.vue
@@ -82,6 +82,7 @@ const getAllInfo = async (state) => {
     commonProvessViewer.value = false
     const {data, code, msg} = await getMapProjectStateInfo(route.query.projectId, state)
     if (code === 1000) {
+      data.formData.preProcess = data.formData.preProcess ? JSON.parse(data.formData.preProcess) : undefined
       detailData.value = data
       mode.value = data.formData.mode
       processStore.setDesign(data)
diff --git a/src/views/rapid/regular/index.vue b/src/views/rapid/regular/index.vue
index 8bdd0b8..afa5ebc 100644
--- a/src/views/rapid/regular/index.vue
+++ b/src/views/rapid/regular/index.vue
@@ -269,13 +269,13 @@ const handleSelect = async (selection, row) => {
 
 //切换每页显示条数
 const handleSizeChange = async (val) => {
-  pageInfo.value.pageSize = val
+  pageInfo.pageSize = val
   await getList()
 }
 
 //点击页码进行分页功能
 const handleCurrentChange = async (val) => {
-  pageInfo.value.pageNum = val
+  pageInfo.pageNum = val
   await getList()
 }
 const handleMoreDelete=(regularId,regularNameList)=>{
diff --git a/src/views/rapid/source/index.vue b/src/views/rapid/source/index.vue
index 7cc22ef..5c53de6 100644
--- a/src/views/rapid/source/index.vue
+++ b/src/views/rapid/source/index.vue
@@ -339,13 +339,13 @@ const handleSelect = async (selection) => {
 
 //切换每页显示条数
 const handleSizeChange = async (val) => {
-  pageInfo.value.pageSize = val
+  pageInfo.pageSize = val
   await getList()
 }
 
 //点击页码进行分页功能
 const handleCurrentChange = async (val) => {
-  pageInfo.value.pageNum = val
+  pageInfo.pageNum = val
   await getList()
 }
 const handleMoreDelete = (dsId, sourceNameList) => {
diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue
index 0b311d8..0f07356 100644
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -271,13 +271,13 @@ const handleSelect = async (selection) => {
 
 //切换每页显示条数
 const handleSizeChange = async (val) => {
-  pageInfo.value.pageSize = val
+  pageInfo.pageSize = val
   await getList()
 }
 
 //点击页码进行分页功能
 const handleCurrentChange = async (val) => {
-  pageInfo.value.pageNum = val
+  pageInfo.pageNum = val
   await getList()
 }
 const handleMoreDelete = (configId, configName) => {
diff --git a/src/views/workflow/about/index.vue b/src/views/workflow/about/index.vue
index c415c85..4c05f2e 100644
--- a/src/views/workflow/about/index.vue
+++ b/src/views/workflow/about/index.vue
@@ -129,13 +129,13 @@ const getList = async () => {
 
 //切换每页显示条数
 const handleSizeChange = async (val) => {
-  pageInfo.value.pageSize = val
+  pageInfo.pageSize = val
   await getList()
 }
 
 //点击页码进行分页功能
 const handleCurrentChange = async (val) => {
-  pageInfo.value.pageNum = val
+  pageInfo.pageNum = val
   await getList()
 }
 
diff --git a/src/views/workflow/approve/index.vue b/src/views/workflow/approve/index.vue
index 3eb9c5b..87679de 100644
--- a/src/views/workflow/approve/index.vue
+++ b/src/views/workflow/approve/index.vue
@@ -151,13 +151,13 @@ const getList = async () => {
 }
 //切换每页显示条数
 const handleSizeChange = async (val) => {
-  pageInfo.value.pageSize = val
+  pageInfo.pageSize = val
   await getList()
 }
 
 //点击页码进行分页功能
 const handleCurrentChange = async (val) => {
-  pageInfo.value.pageNum = val
+  pageInfo.pageNum = val
   await getList()
 }
 
diff --git a/src/views/workflow/initiated/index.vue b/src/views/workflow/initiated/index.vue
index 0d5086f..7214352 100644
--- a/src/views/workflow/initiated/index.vue
+++ b/src/views/workflow/initiated/index.vue
@@ -131,13 +131,13 @@ const getList = async () => {
 
 //切换每页显示条数
 const handleSizeChange = async (val) => {
-  pageInfo.value.pageSize = val
+  pageInfo.pageSize = val
   await getList()
 }
 
 //点击页码进行分页功能
 const handleCurrentChange = async (val) => {
-  pageInfo.value.pageNum = val
+  pageInfo.pageNum = val
   await getList()
 }
 
diff --git a/src/views/workflow/listen/index.vue b/src/views/workflow/listen/index.vue
index 0c3b274..bc1e942 100644
--- a/src/views/workflow/listen/index.vue
+++ b/src/views/workflow/listen/index.vue
@@ -308,13 +308,13 @@ const handleSelect = async (selection) => {
 
 //切换每页显示条数
 const handleSizeChange = async (val) => {
-  pageInfo.value.pageSize = val
+  pageInfo.pageSize = val
   await getList()
 }
 
 //点击页码进行分页功能
 const handleCurrentChange = async (val) => {
-  pageInfo.value.pageNum = val
+  pageInfo.pageNum = val
   await getList()
 }
 const handleMoreDelete=(listenId,listenNameList)=>{
diff --git a/src/views/workflow/process/ProcessEdit.vue b/src/views/workflow/process/ProcessEdit.vue
index ba89649..02854ee 100644
--- a/src/views/workflow/process/ProcessEdit.vue
+++ b/src/views/workflow/process/ProcessEdit.vue
@@ -77,7 +77,7 @@ const timer = ref(null)
 const validComponents = ref(['processSetting', 'processDesign'])
 // const activeSelect = ref('formDesign')
 // const activeSelect = ref('processSetting')
-const activeSelect = ref('processDesign')
+const activeSelect = ref('processSetting')
 const validVisible = ref(false)
 const validStep = ref(0)
 const validResult = ref({})
@@ -88,7 +88,7 @@ const validOptions = ref([
   // {title: '扩展设置', description: '', icon: '', status: ''}
 ])
 onActivated(()=>{
-  activeSelect.value = 'processDesign'
+  activeSelect.value = 'processSetting'
   init()
 })
 
diff --git a/src/views/workflow/process/index.vue b/src/views/workflow/process/index.vue
index 3c4314e..bc1f3c9 100644
--- a/src/views/workflow/process/index.vue
+++ b/src/views/workflow/process/index.vue
@@ -255,13 +255,13 @@ const handleSelect = async (selection, row) => {
 
 //切换每页显示条数
 const handleSizeChange = async (val) => {
-  pageInfo.value.pageSize = val
+  pageInfo.pageSize = val
   await getList()
 }
 
 //点击页码进行分页功能
 const handleCurrentChange = async (val) => {
-  pageInfo.value.pageNum = val
+  pageInfo.pageNum = val
   await getList()
 }
 
diff --git a/src/views/workflow/task/index.vue b/src/views/workflow/task/index.vue
index 58f11c4..2d10689 100644
--- a/src/views/workflow/task/index.vue
+++ b/src/views/workflow/task/index.vue
@@ -115,13 +115,13 @@ const getList = async () => {
 
 //切换每页显示条数
 const handleSizeChange = async (val) => {
-  pageInfo.value.pageSize = val
+  pageInfo.pageSize = val
   await getList()
 }
 
 //点击页码进行分页功能
 const handleCurrentChange = async (val) => {
-  pageInfo.value.pageNum = val
+  pageInfo.pageNum = val
   await getList()
 }
 

From b425e709aab4ebfaf2812f7780301685e3f386f6 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Tue, 11 Jun 2024 19:16:35 +0800
Subject: [PATCH 13/19] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E5=9B=BE=E5=88=87=E6=8D=A2=E5=8A=9F=E8=83=BD=E5=8F=8A?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9"=E7=A0=94=E5=8F=91=E9=98=B6=E6=AE=B5"?=
 =?UTF-8?q?=E6=96=87=E5=AD=97=E4=B8=BA=E9=A1=B9=E7=9B=AE=E9=98=B6=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/index.scss                  | 27 +++++++++++++++++++
 .../DetailComponent/ApprovalDetail.vue        | 16 ++++++++---
 .../DetailComponent/CollectionDetail.vue      | 26 +++++++++---------
 .../DetailComponent/ProjectApply.vue          | 16 ++++++++---
 .../DetailComponent/SpecialFundDetail.vue     | 17 +++++++++---
 .../DetailComponent/SummaryDetail.vue         | 16 ++++++++---
 src/views/expense-management/ledger/index.vue |  9 ++++---
 src/views/expense-management/share/detail.vue | 16 ++++++++---
 src/views/expense-management/share/index.vue  |  1 +
 .../implementation/account.vue                |  6 ++---
 .../implementation/index.vue                  |  2 +-
 .../implementation/uploadFee.vue              |  6 ++---
 src/views/special-fund/index.vue              |  1 +
 13 files changed, 122 insertions(+), 37 deletions(-)

diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index c14453a..f3a4f35 100644
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -549,3 +549,30 @@ html, body, #app, .el-container, .el-aside, .el-main {
   right: 15px;
   z-index: 5;
 }
+
+.approval-record {
+  padding-bottom: 30px;
+  position: relative;
+  .approval-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+
+    .diagram {
+      display: flex;
+      align-items: center;
+
+      .base-title {
+        margin-right: 10px;
+      }
+
+      //.el-switch {
+      //  margin-left: 15px;
+      //}
+    }
+  }
+
+  .process {
+    position: relative;
+  }
+}
diff --git a/src/components/DetailComponent/ApprovalDetail.vue b/src/components/DetailComponent/ApprovalDetail.vue
index 7ac949b..34d2dd8 100644
--- a/src/components/DetailComponent/ApprovalDetail.vue
+++ b/src/components/DetailComponent/ApprovalDetail.vue
@@ -18,11 +18,20 @@
       </el-form-item>
     </div>
     <div class="approval-record">
-      <baseTitle title="审批记录"></baseTitle>
+      <div class="approval-title">
+        <baseTitle title="审批记录"></baseTitle>
+        <div class="diagram">
+          <div class="base-title">流程图</div>
+          <el-switch
+              v-model="changeDiagram"
+              style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266"
+          />
+        </div>
+      </div>
       <div class="process">
-        <operation-render v-if="processViewer && data.operationList && data.operationList.length > 0" :operation-list="data.operationList"
+        <operation-render v-if="processViewer && data.operationList && data.operationList.length > 0&&!changeDiagram" :operation-list="data.operationList"
                           :state="data.state"/>
-        <process-diagram-viewer v-if="processViewer" :id-name="idName?idName:type"/>
+        <process-diagram-viewer v-if="processViewer&&changeDiagram" :id-name="idName?idName:type"/>
       </div>
     </div>
   </div>
@@ -34,6 +43,7 @@ import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.v
 import {ElLoading} from 'element-plus';
 import {downloadFile} from "@/api/project-demand";
 
+const changeDiagram = ref(false)
 const props = defineProps({
   formData: {
     type: Object,
diff --git a/src/components/DetailComponent/CollectionDetail.vue b/src/components/DetailComponent/CollectionDetail.vue
index e9f01a2..6d41fc5 100644
--- a/src/components/DetailComponent/CollectionDetail.vue
+++ b/src/components/DetailComponent/CollectionDetail.vue
@@ -57,11 +57,21 @@
         </el-col>
       </el-row>
       <div class="approval-record">
-        <baseTitle title="审批记录"></baseTitle>
+        <div class="approval-title">
+          <baseTitle title="审批记录"></baseTitle>
+          <div class="diagram">
+            <div class="base-title">流程图</div>
+            <el-switch
+                v-model="changeDiagram"
+                style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266"
+            />
+          </div>
+        </div>
         <div class="process">
-          <operation-render v-if="processViewer && data.operationList && data.operationList.length > 0" :operation-list="data.operationList"
+          <operation-render v-if="processViewer && data.operationList && data.operationList.length > 0&&!changeDiagram"
+                            :operation-list="data.operationList"
                             :state="data.state"/>
-          <process-diagram-viewer v-if="processViewer" id-name="collectionProcess"/>
+          <process-diagram-viewer v-if="processViewer&&changeDiagram" id-name="collectionProcess"/>
         </div>
       </div>
     </el-form>
@@ -108,7 +118,7 @@ const props = defineProps({
     default: ''
   }
 })
-
+const changeDiagram = ref(false)
 const _value = computed({
   get() {
     return props.value;
@@ -142,12 +152,4 @@ watch(() => props.processViewer, (newVal) => {
 :deep(.el-empty__description) {
   margin-top: 0;
 }
-
-.approval-record {
-  padding-bottom: 30px;
-
-  .process {
-    position: relative;
-  }
-}
 </style>
diff --git a/src/components/DetailComponent/ProjectApply.vue b/src/components/DetailComponent/ProjectApply.vue
index fd9c177..c882e7a 100644
--- a/src/components/DetailComponent/ProjectApply.vue
+++ b/src/components/DetailComponent/ProjectApply.vue
@@ -18,15 +18,24 @@
                       @getAttachment="getAttachment"
                       @getOtherFile="getOtherFile" :showFileList="true" :formData="localFormData"
                       :preview="mode == 'resubmit'"/>
-    <div v-if="mode === 'resubmit'">
-      <baseTitle title="审批记录"></baseTitle>
+    <div v-if="mode === 'resubmit'&&!changeDiagram">
+      <div class="approval-title">
+        <baseTitle title="审批记录"></baseTitle>
+        <div class="diagram">
+          <div class="base-title">流程图</div>
+          <el-switch
+              v-model="changeDiagram"
+              style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266"
+          />
+        </div>
+      </div>
       <div class="process">
         <operation-render :operation-list="data.operationList" :state="data.state"/>
       </div>
     </div>
     <baseTitle title="流程"></baseTitle>
     <div class="approval-record">
-      <process-diagram-viewer mode="view" :idName="title" v-if="processDiagramViewer"/>
+      <process-diagram-viewer mode="view" :idName="title" v-if="processDiagramViewer&&changeDiagram"/>
     </div>
     <div class="oper-page-btn">
       <el-button color="#DED0B2" v-if="mode === 'submit'" @click="handleSubmit">提交</el-button>
@@ -87,6 +96,7 @@ import Paging from "@/components/pagination/index.vue";
 
 const router = useRouter()
 const route = useRoute()
+const changeDiagram = ref(false)
 const emit = defineEmits(["getAttachment", "getOtherFile"])
 const props = defineProps({
   title: {
diff --git a/src/components/DetailComponent/SpecialFundDetail.vue b/src/components/DetailComponent/SpecialFundDetail.vue
index 7806e87..56e523f 100644
--- a/src/components/DetailComponent/SpecialFundDetail.vue
+++ b/src/components/DetailComponent/SpecialFundDetail.vue
@@ -64,11 +64,21 @@
         </el-col>
       </el-row>
       <div class="approval-record">
-        <baseTitle title="审批记录"></baseTitle>
+        <div class="approval-title">
+          <baseTitle title="审批记录"></baseTitle>
+          <div class="diagram">
+            <div class="base-title">流程图</div>
+            <el-switch
+                v-model="changeDiagram"
+                style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266"
+            />
+          </div>
+        </div>
         <div class="process">
-          <operation-render v-if="processViewer" :operation-list="data.operationList"
+          <operation-render v-if="processViewer && data.operationList && data.operationList.length > 0&&!changeDiagram"
+                            :operation-list="data.operationList"
                             :state="data.state"/>
-          <process-diagram-viewer v-if="processViewer" id-name="fundProcess"/>
+          <process-diagram-viewer v-if="processViewer&&changeDiagram" id-name="fundProcess"/>
         </div>
       </div>
     </el-form>
@@ -83,6 +93,7 @@ import OperationRender from '@/views/workflow/common/OperationRender.vue'
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue'
 import {downloadFile} from "@/api/project-demand";
 
+const changeDiagram = ref(false)
 const emit = defineEmits(['getInfo', "update:formData"])
 const form = ref()
 
diff --git a/src/components/DetailComponent/SummaryDetail.vue b/src/components/DetailComponent/SummaryDetail.vue
index 33156ee..9f9ba54 100644
--- a/src/components/DetailComponent/SummaryDetail.vue
+++ b/src/components/DetailComponent/SummaryDetail.vue
@@ -151,11 +151,20 @@
         </el-col>
       </el-row>
       <div class="approval-record">
-        <baseTitle title="审批记录"></baseTitle>
+        <div class="approval-title">
+          <baseTitle title="审批记录"></baseTitle>
+          <div class="diagram">
+            <div class="base-title">流程图</div>
+            <el-switch
+                v-model="changeDiagram"
+                style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266"
+            />
+          </div>
+        </div>
         <div class="process">
-          <operation-render v-if="processViewer && data.operationList && data.operationList.length > 0" :operation-list="data.operationList"
+          <operation-render v-if="processViewer && data.operationList && data.operationList.length > 0&&!changeDiagram" :operation-list="data.operationList"
                             :state="data.state"/>
-          <process-diagram-viewer v-if="processViewer" id-name="summaryProcess"/>
+          <process-diagram-viewer v-if="processViewer&&changeDiagram" id-name="summaryProcess"/>
         </div>
       </div>
     </el-form>
@@ -202,6 +211,7 @@ const props = defineProps({
     default: ''
   }
 })
+const changeDiagram = ref(false)
 const localFormData = ref({})
 const router = useRouter()
 const fundOption = ref([])
diff --git a/src/views/expense-management/ledger/index.vue b/src/views/expense-management/ledger/index.vue
index 052765b..a9b2a48 100644
--- a/src/views/expense-management/ledger/index.vue
+++ b/src/views/expense-management/ledger/index.vue
@@ -45,11 +45,11 @@ const searchConfig = reactive([
       cacheKey: 'project_cost',
     }
   }, {
-    label: '研发阶段',
+    label: '项目阶段',
     prop: 'researchStage',
     component: shallowRef(fvSelect),
     props: {
-      placeholder: '请选择研发阶段查询',
+      placeholder: '请选择项目阶段查询',
       clearable: true,
       filterable: true,
       checkStrictly: true,
@@ -102,6 +102,7 @@ const tableConfig = reactive({
       prop: 'projectCost',
       label: '项目费用',
       align: 'center',
+      showOverflowTooltip: false,
       currentRender: ({row, index}) => {
         if (row.projectCost !== null) {
           return (<Tag dictType={'project_cost'} value={row.projectCost}/>)
@@ -112,8 +113,9 @@ const tableConfig = reactive({
     },
     {
       prop: 'researchStage',
-      label: '研发阶段',
+      label: '项目阶段',
       align: 'center',
+      showOverflowTooltip: false,
       currentRender: ({row, index}) => {
         if (row.researchStage&&row.researchStage !== null&&row.researchStage!==undefined) {
           return (<Tag dictType={'research_stage'} value={row.researchStage}/>)
@@ -134,6 +136,7 @@ const tableConfig = reactive({
       prop: 'source',
       label: '来源',
       align: 'center',
+      showOverflowTooltip: false,
       currentRender: ({row, index}) => {
         if (row.source&&row.source !== null&&row.source!==undefined) {
           return (<Tag dictType={'ledger_source'} value={row.source}/>)
diff --git a/src/views/expense-management/share/detail.vue b/src/views/expense-management/share/detail.vue
index 37cf93e..a502767 100644
--- a/src/views/expense-management/share/detail.vue
+++ b/src/views/expense-management/share/detail.vue
@@ -37,11 +37,20 @@
       </el-form-item>
     </div>
   <div class="approval-record">
-    <baseTitle title="审批记录"></baseTitle>
+    <div class="approval-title">
+      <baseTitle title="审批记录"></baseTitle>
+      <div class="diagram">
+        <div class="base-title">流程图</div>
+        <el-switch
+            v-model="changeDiagram"
+            style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266"
+        />
+      </div>
+    </div>
     <div class="process">
-      <operation-render v-if="shareProcessViewer" :operation-list="shareData.operationList"
+      <operation-render v-if="shareProcessViewer&& shareData.operationList && shareData.operationList.length > 0&&!changeDiagram" :operation-list="shareData.operationList"
                         :state="shareData.state"/>
-      <process-diagram-viewer v-if="shareProcessViewer" id-name="shareProcess"/>
+      <process-diagram-viewer v-if="shareProcessViewer&&changeDiagram" id-name="shareProcess"/>
     </div>
   </div>
   <opinion v-if="shareData.taskId" :formData="shareData.formData" :taskId="shareData.taskId"  v-model:value="auditOpinion"></opinion>
@@ -55,6 +64,7 @@ import {ElNotification} from "element-plus";
 import {useProcessStore} from '@/stores/processStore.js';
 import {getAllocationDetail} from "@/api/expense-manage";
 
+const changeDiagram = ref(false)
 const processStore = useProcessStore()
 const route = useRoute()
 const shareData = ref({})
diff --git a/src/views/expense-management/share/index.vue b/src/views/expense-management/share/index.vue
index 5d4bdaa..b513f9f 100644
--- a/src/views/expense-management/share/index.vue
+++ b/src/views/expense-management/share/index.vue
@@ -91,6 +91,7 @@ const tableConfig = reactive({
       prop: 'oper',
       label: '操作',
       align: 'center',
+      fixed:'right',
       showOverflowTooltip: false,
       currentRender: ({row, index}) => {
         let btn = []
diff --git a/src/views/project-management/implementation/account.vue b/src/views/project-management/implementation/account.vue
index 9291a4e..4c19295 100644
--- a/src/views/project-management/implementation/account.vue
+++ b/src/views/project-management/implementation/account.vue
@@ -69,11 +69,11 @@ const searchConfig = reactive([
       cacheKey: 'project_cost',
     }
   }, {
-    label: '研发阶段',
+    label: '项目阶段',
     prop: 'researchStage',
     component: shallowRef(fvSelect),
     props: {
-      placeholder: '请选择研发阶段查询',
+      placeholder: '请选择项目阶段查询',
       clearable: true,
       filterable: true,
       checkStrictly: true,
@@ -131,7 +131,7 @@ const tableConfig = reactive({
     },
     {
       prop: 'researchStage',
-      label: '研发阶段',
+      label: '项目阶段',
       align: 'center',
       currentRender: ({row, index}) => {
         if (row.researchStage&&row.researchStage !== null&&row.researchStage!==undefined) {
diff --git a/src/views/project-management/implementation/index.vue b/src/views/project-management/implementation/index.vue
index 4065da3..77b68b8 100644
--- a/src/views/project-management/implementation/index.vue
+++ b/src/views/project-management/implementation/index.vue
@@ -183,7 +183,7 @@ const tableConfig = reactive({
     },
     {
       prop: 'researchStage',
-      label: '研发阶段',
+      label: '项目阶段',
       align: 'center',
       showOverflowTooltip: false,
       currentRender: ({row, index}) => {
diff --git a/src/views/project-management/implementation/uploadFee.vue b/src/views/project-management/implementation/uploadFee.vue
index 160e117..f20c103 100644
--- a/src/views/project-management/implementation/uploadFee.vue
+++ b/src/views/project-management/implementation/uploadFee.vue
@@ -31,10 +31,10 @@
           </el-form-item>
         </template>
       </el-table-column>
-      <el-table-column prop="researchStage" label="研发阶段">
+      <el-table-column prop="researchStage" label="项目阶段">
         <template #default="scope">
           <el-form-item prop="researchStage"  :rules="scope.row.researchStage?'1':rules.researchStage">
-            <el-select v-model="scope.row.researchStage" placeholder="请选择研发阶段" clearable filterable>
+            <el-select v-model="scope.row.researchStage" placeholder="请选择项目阶段" clearable filterable>
               <el-option
                   v-for="item in cacheStore.getDict('fee_stage')"
                   :key="item.value"
@@ -115,7 +115,7 @@ const baseForm = ref()
 const rules = reactive({
   time: [{required: true, message: '请选择时间', trigger: 'blur'}],
   projectCost: [{required: true, message: '请输入项目费用', trigger: 'blur'}],
-  researchStage: [{required: true, message: '请输入研发阶段', trigger: 'blur'}],
+  researchStage: [{required: true, message: '请输入项目阶段', trigger: 'blur'}],
   digest: [{required: true, message: '请输入摘要', trigger: 'blur'}],
   afterTax: [{required: true, message: '请输入税后余额', trigger: 'blur'}]
 })
diff --git a/src/views/special-fund/index.vue b/src/views/special-fund/index.vue
index 7d43069..6ecfac6 100644
--- a/src/views/special-fund/index.vue
+++ b/src/views/special-fund/index.vue
@@ -115,6 +115,7 @@ const tableConfig = reactive({
       prop: 'oper',
       label: '操作',
       align: 'center',
+      fixed:'right',
       showOverflowTooltip: false,
       currentRender: ({row, index}) => {
         let btn = []

From 208584c34bd07d48888a5fe54f7c45ec8325db4a Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Tue, 11 Jun 2024 20:14:49 +0800
Subject: [PATCH 14/19] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E5=9B=BE=E5=88=87=E6=8D=A2=E5=8A=9F=E8=83=BD=E5=92=8C?=
 =?UTF-8?q?=E5=B1=8F=E8=94=BD=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/index.scss                  |  2 +-
 .../DetailComponent/ProjectApply.vue          | 68 +++++++++++-------
 src/components/steps/index.vue                |  2 +-
 src/views/expense-management/share/index.vue  | 12 ++--
 src/views/project-demand/requirement/add.vue  | 71 +++++++++++--------
 .../project-demand/requirement/index.vue      |  2 +-
 src/views/project-demand/summary/index.vue    |  4 +-
 src/views/special-fund/index.vue              |  2 +-
 src/views/system/config/index.vue             |  4 +-
 src/views/tool/ipblacklist/index.vue          |  2 +-
 src/views/workflow/listen/index.vue           |  4 +-
 11 files changed, 103 insertions(+), 70 deletions(-)

diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index f3a4f35..633be36 100644
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -551,7 +551,7 @@ html, body, #app, .el-container, .el-aside, .el-main {
 }
 
 .approval-record {
-  padding-bottom: 30px;
+  //padding-bottom: 30px;
   position: relative;
   .approval-title {
     display: flex;
diff --git a/src/components/DetailComponent/ProjectApply.vue b/src/components/DetailComponent/ProjectApply.vue
index c882e7a..fe26346 100644
--- a/src/components/DetailComponent/ProjectApply.vue
+++ b/src/components/DetailComponent/ProjectApply.vue
@@ -19,23 +19,38 @@
                       @getOtherFile="getOtherFile" :showFileList="true" :formData="localFormData"
                       :preview="mode == 'resubmit'"/>
     <div v-if="mode === 'resubmit'&&!changeDiagram">
-      <div class="approval-title">
-        <baseTitle title="审批记录"></baseTitle>
-        <div class="diagram">
-          <div class="base-title">流程图</div>
-          <el-switch
-              v-model="changeDiagram"
-              style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266"
-          />
+      <div class="approval-record">
+        <div class="approval-title">
+          <baseTitle title="审批记录"></baseTitle>
+          <div class="diagram">
+            <div class="base-title">流程图</div>
+            <el-switch
+                v-model="changeDiagram"
+                style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266"
+            />
+          </div>
         </div>
       </div>
       <div class="process">
         <operation-render :operation-list="data.operationList" :state="data.state"/>
       </div>
     </div>
-    <baseTitle title="流程"></baseTitle>
-    <div class="approval-record">
-      <process-diagram-viewer mode="view" :idName="title" v-if="processDiagramViewer&&changeDiagram"/>
+    <div v-if="changeDiagram">
+      <div class="approval-record">
+        <div class="approval-title">
+          <baseTitle title="审批记录"></baseTitle>
+          <div class="diagram">
+            <div class="base-title">流程图</div>
+            <el-switch
+                v-model="changeDiagram"
+                style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266"
+            />
+          </div>
+        </div>
+      </div>
+      <div class="process">
+        <process-diagram-viewer mode="view" :idName="title" v-if="processDiagramViewer"/>
+      </div>
     </div>
     <div class="oper-page-btn">
       <el-button color="#DED0B2" v-if="mode === 'submit'" @click="handleSubmit">提交</el-button>
@@ -63,8 +78,10 @@
         <el-table-column prop="createTime" label="创建时间"></el-table-column>
         <el-table-column label="操作" align="center">
           <template #default="scope">
-            <el-button @click="chooseProProcess(scope.row)">选择</el-button>
-            <a :href="scope.row.baseUrl" target="_blank" style="color: #2a99ff">查看详情</a>
+            <div style="display: flex;align-items: center">
+              <el-button type="primary" @click="chooseProProcess(scope.row)" link>选择</el-button>
+              <a :href="scope.row.baseUrl" target="_blank" style="color: #2a99ff;margin-left: 10px">查看详情</a>
+            </div>
           </template>
         </el-table-column>
       </el-table>
@@ -96,7 +113,7 @@ import Paging from "@/components/pagination/index.vue";
 
 const router = useRouter()
 const route = useRoute()
-const changeDiagram = ref(false)
+const changeDiagram = ref(true)
 const emit = defineEmits(["getAttachment", "getOtherFile"])
 const props = defineProps({
   title: {
@@ -273,17 +290,17 @@ const handleSubmit = async () => {
   // if (localFormData.value.singleFile) {
   //
   // } else {
-    if (attachment.value.singleFile == null) {
-      attachment.value.validate()
-      ElNotification({
-        title: '提示',
-        message: '请上传附件',
-        type: 'error'
-      })
-      return;
-    } else {
-      attachment.value.clearValidate()
-    }
+  if (attachment.value.singleFile == null) {
+    attachment.value.validate()
+    ElNotification({
+      title: '提示',
+      message: '请上传附件',
+      type: 'error'
+    })
+    return;
+  } else {
+    attachment.value.clearValidate()
+  }
   // }
 
   let params = {
@@ -375,6 +392,7 @@ watchEffect(() => {
 })
 
 onMounted(async () => {
+  changeDiagram.value = props.mode === 'submit';
   await init()
 })
 </script>
diff --git a/src/components/steps/index.vue b/src/components/steps/index.vue
index 57b02ab..c95f922 100644
--- a/src/components/steps/index.vue
+++ b/src/components/steps/index.vue
@@ -268,7 +268,7 @@ const getBaseInfo = async () => {
   const loading = ElLoading.service({fullscreen: true})
   try {
     const {code, data} = await getBaseInfoApi(route.query.projectId)
-    console.log('data.procedure',data.procedure,route.query.step)
+    // console.log('data.procedure',data.procedure,route.query.step)
     if(route.query.step==='40'){
       if(data.procedure.indexOf('40')==-1){
         data.procedure.push('40')
diff --git a/src/views/expense-management/share/index.vue b/src/views/expense-management/share/index.vue
index b513f9f..ddfc361 100644
--- a/src/views/expense-management/share/index.vue
+++ b/src/views/expense-management/share/index.vue
@@ -105,12 +105,12 @@ const tableConfig = reactive({
         if (buttons.has("edit")) {
           btn.push({label: '编辑', prem: ['mosr:requirement:resubmit'], func: () => handleEdit(row), type: 'primary'})
         }
-        if (buttons.has("report")) {
-          btn.push({label: '明细导出', prem: ['mosr:requirement:info'], func: () => handleReport(row), type: 'primary'})
-        }
-        if (buttons.has("report")) {
-          btn.push({label: '汇总导出', prem: ['mosr:requirement:info'], func: () => handleReport(row), type: 'primary'})
-        }
+        // if (buttons.has("report")) {
+        //   btn.push({label: '明细导出', prem: ['mosr:requirement:info'], func: () => handleReport(row), type: 'primary'})
+        // }
+        // if (buttons.has("report")) {
+        //   btn.push({label: '汇总导出', prem: ['mosr:requirement:info'], func: () => handleReport(row), type: 'primary'})
+        // }
         return (
             <div style={{width: '100%'}}>
               {
diff --git a/src/views/project-demand/requirement/add.vue b/src/views/project-demand/requirement/add.vue
index db0359f..c57c30a 100644
--- a/src/views/project-demand/requirement/add.vue
+++ b/src/views/project-demand/requirement/add.vue
@@ -2,35 +2,44 @@
   <div v-loading="loading" class="add-block">
     <baseTitle title="需求征集信息录入"></baseTitle>
     <el-form :model="formData" inline class="query-form" ref="demandForm" :rules="rules">
-      <el-form-item label="名称" prop="requirementName">
-        <el-input v-model="formData.requirementName" placeholder="请输入名称" clearable></el-input>
-      </el-form-item>
-      <el-form-item label="所属公司" prop="companyIds">
-        <el-tree-select v-model="formData.companyIds" :data="companyOption" style="width: 100%;"
-                        filterable clearable :check-strictly="true" multiple/>
-      </el-form-item>
-      <el-form-item label="征集类型" prop="collectType">
-        <el-select v-model="formData.collectType" placeholder="征集类型" clearable filterable>
-          <el-option
-              v-for="item in typeOption"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="截止时间" prop="deadline">
-        <el-config-provider>
-          <el-date-picker
-              v-model="formData.deadline"
-              type="date"
-              placeholder="截止时间"
-              value-format="YYYY-MM-DD"
-          />
-        </el-config-provider>
-      </el-form-item>
       <el-row>
-        <el-col :span="5">
+        <el-col :span="6">
+          <el-form-item label="名称" prop="requirementName">
+            <el-input v-model="formData.requirementName" placeholder="请输入名称" clearable></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="征集类型" prop="collectType">
+            <el-select v-model="formData.collectType" placeholder="征集类型" clearable filterable>
+              <el-option
+                  v-for="item in typeOption"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="截止时间" prop="deadline">
+            <el-config-provider>
+              <el-date-picker
+                  v-model="formData.deadline"
+                  type="date"
+                  placeholder="截止时间"
+                  value-format="YYYY-MM-DD"
+              />
+            </el-config-provider>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="所属公司" prop="companyIds" class="tree-select">
+            <el-button @click="showCompany">请选择</el-button>
+<!--            <el-tree-select v-model="formData.companyIds" :data="companyOption"-->
+<!--                            filterable clearable :check-strictly="true" multiple/>-->
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
           <el-form-item label="是否专项资金" prop="isSpecialFund">
             <el-radio-group v-model="formData.isSpecialFund" size="mini">
               <el-radio :label="true">是</el-radio>
@@ -380,6 +389,12 @@ onMounted(async () => {
 :deep(.el-empty__description) {
   margin-top: 0;
 }
+.tree-select{
+  :deep(.el-form-item__content .el-select__wrapper ) {
+    width: 750px;
+  }
+
+}
 
 :deep(.el-table--fit ) {
   height: 300px !important;
diff --git a/src/views/project-demand/requirement/index.vue b/src/views/project-demand/requirement/index.vue
index 68830c4..aac9045 100644
--- a/src/views/project-demand/requirement/index.vue
+++ b/src/views/project-demand/requirement/index.vue
@@ -151,7 +151,7 @@ const tableConfig = reactive({
   api: '/workflow/mosr/requirement',
   btns: [
     {name: '新增', key: 'add', color: '#DED0B2',auth: auths.add},
-    {name: '导出', key: 'export', type: ''},
+    // {name: '导出', key: 'export', type: ''},
   ],
   params: {}
 })
diff --git a/src/views/project-demand/summary/index.vue b/src/views/project-demand/summary/index.vue
index 74016b4..9525468 100644
--- a/src/views/project-demand/summary/index.vue
+++ b/src/views/project-demand/summary/index.vue
@@ -201,8 +201,8 @@ const tableConfig = reactive({
   params: {},
   btns: [
     {name: '新增上报', key: 'add', color: '#DED0B2', auth:auths.report},
-    {name: '年度计划导出', key: '_export', auth: ''},
-    {name: '经费预算生成', key: 'preMonty', auth: ''},
+    // {name: '年度计划导出', key: '_export', auth: ''},
+    // {name: '经费预算生成', key: 'preMonty', auth: ''},
   ]
 })
 const headBtnClick = (key) => {
diff --git a/src/views/special-fund/index.vue b/src/views/special-fund/index.vue
index 6ecfac6..ee3e509 100644
--- a/src/views/special-fund/index.vue
+++ b/src/views/special-fund/index.vue
@@ -156,7 +156,7 @@ const tableConfig = reactive({
   params: {},
   btns: [
     {name: '新增', key: 'add', color: '#DED0B2', auth: ''},
-    {name: '导出', key: '_export', color: '#DED0B2', auth: ''},
+    // {name: '导出', key: '_export', color: '#DED0B2', auth: ''},
   ]
 })
 const tableIns = ref()
diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue
index 0f07356..f1ec30d 100644
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -28,8 +28,8 @@
                  :icon="Delete" plain
                  :disabled="disabled">删除
       </el-button>
-      <el-button type="warning" v-perm="['admin:config:export']" @click="handleExport" :icon="Download" plain>导出
-      </el-button>
+<!--      <el-button type="warning" v-perm="['admin:config:export']" @click="handleExport" :icon="Download" plain>导出-->
+<!--      </el-button>-->
     </div>
     <div class="table">
       <el-table
diff --git a/src/views/tool/ipblacklist/index.vue b/src/views/tool/ipblacklist/index.vue
index ff5266e..f506ef1 100644
--- a/src/views/tool/ipblacklist/index.vue
+++ b/src/views/tool/ipblacklist/index.vue
@@ -25,7 +25,7 @@
   <div class="table">
     <div class="table-header-btn">
       <el-button type="primary" :icon="Plus" @click="handleAdd" plain>新增</el-button>
-      <el-button type="warning" @click="handleExport" :icon="Download" plain>导出</el-button>
+<!--      <el-button type="warning" @click="handleExport" :icon="Download" plain>导出</el-button>-->
     </div>
     <el-table :data="list" ref="" :lazy="true" v-loading="loading" v-tabh>
       <el-table-column prop="ipAddr" label="IP地址"></el-table-column>
diff --git a/src/views/workflow/listen/index.vue b/src/views/workflow/listen/index.vue
index bc1e942..0835c6f 100644
--- a/src/views/workflow/listen/index.vue
+++ b/src/views/workflow/listen/index.vue
@@ -34,8 +34,8 @@
       <el-button type="danger" v-perm="['code:listener:del']" @click="handleMoreDelete(listenId,listenNameList)" :icon="Delete" plain
                  :disabled="disabled">删除
       </el-button>
-      <el-button type="warning" v-perm="['code:listener:export']" @click="handleExport" :icon="Download" plain>导出
-      </el-button>
+<!--      <el-button type="warning" v-perm="['code:listener:export']" @click="handleExport" :icon="Download" plain>导出-->
+<!--      </el-button>-->
     </div>
     <div class="table">
       <el-table

From 78ab1ddc45813a65fe42e800ac39b296e9d487a0 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Tue, 11 Jun 2024 20:32:20 +0800
Subject: [PATCH 15/19] =?UTF-8?q?fix=20:=20=E5=B1=8F=E8=94=BD=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project-management/implementation/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/project-management/implementation/index.vue b/src/views/project-management/implementation/index.vue
index 77b68b8..cd9ee63 100644
--- a/src/views/project-management/implementation/index.vue
+++ b/src/views/project-management/implementation/index.vue
@@ -299,7 +299,7 @@ const tableConfig = reactive({
   api: '/workflow/mosr/project/implementation',
   params: {},
   btns: [
-    {name: '生成分摊报表', key: '_export', color: '#DED0B2', auth: ''}
+    // {name: '生成分摊报表', key: '_export', color: '#DED0B2', auth: ''}
   ]
 })
 

From a2977d07021adcd48fa22cae9ad76a44391c54fd Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Tue, 11 Jun 2024 20:56:22 +0800
Subject: [PATCH 16/19] =?UTF-8?q?fix=20:=20=E5=B1=8F=E8=94=BD=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E4=BF=AE=E5=A4=8D=E8=A7=92=E8=89=B2=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/special-fund/add.vue  |  3 --
 src/views/system/role/add.vue   | 20 ++++++------
 src/views/system/role/index.vue | 56 ++++++++++++++++++++-------------
 src/views/system/user/index.vue |  4 +--
 4 files changed, 47 insertions(+), 36 deletions(-)

diff --git a/src/views/special-fund/add.vue b/src/views/special-fund/add.vue
index 4a4a5a6..e45826d 100644
--- a/src/views/special-fund/add.vue
+++ b/src/views/special-fund/add.vue
@@ -52,7 +52,6 @@ const router = useRouter()
 const route = useRoute()
 const processStore = useProcessStore()
 const loading = ref(false)
-const showTinymce = ref(true)
 const showTable = ref(true)
 const processInstanceData = ref()
 const fundForm = ref()
@@ -249,10 +248,8 @@ const getDetailInfo = async () => {
     })
     if (res.code === 1000) {
       formData.value = res.data
-      showTinymce.value = false
       showTable.value = false
       nextTick(() => {
-        showTinymce.value = true
         showTable.value = true
       })
     }
diff --git a/src/views/system/role/add.vue b/src/views/system/role/add.vue
index e794815..86d6c9a 100644
--- a/src/views/system/role/add.vue
+++ b/src/views/system/role/add.vue
@@ -4,9 +4,9 @@
     <fvForm :schema="schame" @getInstance="getInstance" :rules="rules"></fvForm>
     <div class="assign-menu-title" >
       <baseTitle title="分配菜单"></baseTitle>
-      <fvSelect 
+      <fvSelect
         :options="localData.tempRoleOpt"
-        v-model="localData.tempRoleSelect" 
+        v-model="localData.tempRoleSelect"
         style="width: 200px;"
         placeholder="请选择模版角色"
         @change="roleTempChange"
@@ -15,14 +15,14 @@
     <fvCheckbox :options="localData.checkOptions" v-model="localData.checkList" @change="checkBoxChange" />
     <el-input v-model="localData.filterText" placeholder="请输入关键词" style="width: 400px;" />
     <div class="menu-assign">
-      <el-tree 
+      <el-tree
         ref="menuTree"
         :data="localData.menuData"
         :filter-node-method="filterMenu"
         :props="localData.menuTreeProps"
         :check-strictly="!localData.checkStrictly"
         show-checkbox
-        node-key="menuId"
+        node-key="value"
         @check-change="checkChange"
       />
     </div>
@@ -38,7 +38,7 @@ import { useTagsView } from '@/stores/tagsview.js'
 import { useAuthStore } from '@/stores/userstore.js'
 import fvRadio from '@/fvcomponents/fvRadio/index.vue'
 import { ElLoading, ElNotification } from 'element-plus';
-import { getMenuList } from '@/api/system/menuman.js'
+import { getMenuOpt } from '@/api/system/menuman.js'
 import { getRoleDetail, operate, getTemRoleOption } from "@/api/role/role";
 
 const tagsViewStore = useTagsView()
@@ -55,8 +55,8 @@ const localData = reactive({
   filterText: '',
   menuData: [],
   menuTreeProps: {
-    value: "menuId",
-    label: 'menuName',
+    value: "value",
+    label: 'label',
     children: 'children'
   },
   checkStrictly: true,
@@ -143,7 +143,7 @@ const init = async () => {
   form.value.setValues({state: '1', template: false})
   const res = await getTemRoleOption()
   localData.tempRoleOpt = res.data
-  const { data } = await getMenuList()
+  const { data } = await getMenuOpt(0)
   localData.menuData = data
 }
 
@@ -171,7 +171,7 @@ const roleTempChange = async (val) => {
   } catch (error) {
     loading.value = false
   }
-  
+
 }
 
 const filterMenu = (value, data) => {
@@ -261,4 +261,4 @@ onMounted( async ()=>{
   max-height: 500px;
   overflow: auto;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index c4c2eca..bc7a9b7 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -9,6 +9,7 @@ import Tag from '@/components/Tag.vue'
 import { ElMessageBox, ElNotification } from 'element-plus';
 import { deleteRole } from "@/api/role/role";
 import { useAuthStore } from '@/stores/userstore.js'
+import {getSubCompOpt} from "@/api/user/user";
 
 const authStore = useAuthStore()
 const router = useRouter()
@@ -43,7 +44,19 @@ const shortcuts = [
   },
 ]
 
-const searchConfig = reactive([
+const searchConfig = ref([
+  {
+    label: '子公司名称',
+    prop: 'subCompanyId',
+    component: 'el-tree-select',
+    props: {
+      placeholder: '请输入',
+      clearable: true,
+      data: [],
+      filterable: true,
+      checkStrictly: true
+    },
+  },
   {
     label: '角色名称',
     prop: 'roleName',
@@ -108,6 +121,11 @@ const tableConfig = reactive({
       label: '角色权限',
       align: 'center'
     },
+    {
+      prop: 'companyName',
+      label: '公司名称',
+      align: 'center'
+    },
     {
       prop: 'template',
       label: '是否为模版角色',
@@ -144,7 +162,7 @@ const tableConfig = reactive({
         //   }
         // )
         if(authStore.roles.includes('superAdmin')) {
-          btn.push({label: '删除', auth: auths.del, func: ()=>handleDel(row) , type: 'danger'}) 
+          btn.push({label: '删除', auth: auths.del, func: ()=>handleDel(row) , type: 'danger'})
         } else if(!row.template) {
           btn.push({label: '删除', auth: auths.del, func: ()=>handleDel(row) , type: 'danger'})
         }
@@ -152,9 +170,9 @@ const tableConfig = reactive({
           <div>
             {
               btn.map(item=>(
-                <el-button 
-                  type={item.type} 
-                  v-perm={item.auth} 
+                <el-button
+                  type={item.type}
+                  v-perm={item.auth}
                   onClick={()=>item.func()}
                   link
                   >
@@ -183,20 +201,6 @@ const search = (val) => {
   tableIns.value.refresh()
 }
 
-const formatDataScope = (dataScope) => {
-  let text = '--'
-  switch(dataScope) {
-    case '1': text = '所有数据权限'
-      break
-    case '2': text = '自定义数据权限'
-      break
-    case '3': text = '本部门数据权限'
-      break
-    case '4': text = '本部门及以下数据权限'
-      break
-  }
-  return text
-}
 
 const handleAdd = () => {
   router.push({
@@ -229,7 +233,7 @@ const handleDel = (row) => {
   //   })
   //   return
   // }
-  
+
   ElMessageBox.confirm('确定删除该条数据吗?', '确定删除', {
     type: 'warning',
     confirmButtonText: '确定',
@@ -252,8 +256,18 @@ const headBtnClick = (key) => {
   }
 }
 
+const init = async () => {
+  if(!authStore.roles.includes('superAdmin')) {
+    searchConfig.value = searchConfig.value.slice(1)
+  }
+  searchConfig.value = searchConfig.value
+  const res = await getSubCompOpt()
+  searchConfig.value.find(item=>item.prop == 'subCompanyId').props.data = res.data
+}
+init()
+
 </script>
 
 <style lang="scss" scoped>
 
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 5c18142..fd09c91 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -15,7 +15,7 @@ const router = useRouter()
 
 const searchConfig = ref([
   {
-    label: '子公司ID',
+    label: '子公司名称',
     prop: 'subCompanyId',
     component: 'el-tree-select',
     props: {
@@ -33,7 +33,7 @@ const searchConfig = ref([
     }
   },
   {
-    label: '部门ID',
+    label: '部门名称',
     prop: 'departmentId',
     component: 'el-tree-select',
     props: {

From e64b7fe0aeb28c1cfe2f9dfee9d5f0681b4063b8 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Tue, 11 Jun 2024 20:58:47 +0800
Subject: [PATCH 17/19] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E9=9C=80=E6=B1=82=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project-demand/requirement/add.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/project-demand/requirement/add.vue b/src/views/project-demand/requirement/add.vue
index c57c30a..a7578b7 100644
--- a/src/views/project-demand/requirement/add.vue
+++ b/src/views/project-demand/requirement/add.vue
@@ -34,9 +34,9 @@
         </el-col>
         <el-col :span="24">
           <el-form-item label="所属公司" prop="companyIds" class="tree-select">
-            <el-button @click="showCompany">请选择</el-button>
-<!--            <el-tree-select v-model="formData.companyIds" :data="companyOption"-->
-<!--                            filterable clearable :check-strictly="true" multiple/>-->
+<!--            <el-button @click="showCompany">请选择</el-button>-->
+            <el-tree-select v-model="formData.companyIds" :data="companyOption"
+                            filterable clearable :check-strictly="true" multiple/>
           </el-form-item>
         </el-col>
         <el-col :span="6">

From 90a26f2e1edfb58db972afc3a84dc801ba6d8505 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Tue, 11 Jun 2024 21:05:31 +0800
Subject: [PATCH 18/19] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E9=9C=80=E6=B1=82=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DetailComponent/ProjectApply.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/DetailComponent/ProjectApply.vue b/src/components/DetailComponent/ProjectApply.vue
index fe26346..0386b10 100644
--- a/src/components/DetailComponent/ProjectApply.vue
+++ b/src/components/DetailComponent/ProjectApply.vue
@@ -392,7 +392,7 @@ watchEffect(() => {
 })
 
 onMounted(async () => {
-  changeDiagram.value = props.mode === 'submit';
+  // changeDiagram.value = props.mode === 'submit';
   await init()
 })
 </script>

From 3db0f3bd5bf97b085b7a31cd20839baf8e323c36 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Tue, 11 Jun 2024 21:14:09 +0800
Subject: [PATCH 19/19] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E7=BB=86?=
 =?UTF-8?q?=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DetailComponent/ProjectApply.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/components/DetailComponent/ProjectApply.vue b/src/components/DetailComponent/ProjectApply.vue
index 0386b10..3fcac73 100644
--- a/src/components/DetailComponent/ProjectApply.vue
+++ b/src/components/DetailComponent/ProjectApply.vue
@@ -38,13 +38,13 @@
     <div v-if="changeDiagram">
       <div class="approval-record">
         <div class="approval-title">
-          <baseTitle title="审批记录"></baseTitle>
+          <baseTitle title="流程图"></baseTitle>
           <div class="diagram">
-            <div class="base-title">流程图</div>
-            <el-switch
-                v-model="changeDiagram"
-                style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266"
-            />
+<!--            <div class="base-title">流程图</div>-->
+<!--            <el-switch-->
+<!--                v-model="changeDiagram"-->
+<!--                style="&#45;&#45;el-switch-on-color: #13ce66; &#45;&#45;el-switch-off-color:#BEA266"-->
+<!--            />-->
           </div>
         </div>
       </div>