From 9db0e8e9eca8b4b7eae82d506fc2ec48b83b44ef Mon Sep 17 00:00:00 2001
From: dj <1042039504@qq.com>
Date: Tue, 25 Mar 2025 15:17:08 +0800
Subject: [PATCH 1/6] =?UTF-8?q?feat(expense-management):=20=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E8=B4=B9=E7=94=A8=E5=88=86=E6=91=8A=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../expense-management/cost-detail/index.vue  | 248 ++++++++
 .../expend-detail/index.vue                   | 263 +++++++++
 .../expense-management/share-detail/add.vue   | 551 ++++++++++++++++++
 .../expense-management/share-detail/index.vue | 249 ++++++++
 4 files changed, 1311 insertions(+)
 create mode 100644 src/views/expense-management/cost-detail/index.vue
 create mode 100644 src/views/expense-management/expend-detail/index.vue
 create mode 100644 src/views/expense-management/share-detail/add.vue
 create mode 100644 src/views/expense-management/share-detail/index.vue

diff --git a/src/views/expense-management/cost-detail/index.vue b/src/views/expense-management/cost-detail/index.vue
new file mode 100644
index 0000000..c994ab8
--- /dev/null
+++ b/src/views/expense-management/cost-detail/index.vue
@@ -0,0 +1,248 @@
+<template>
+  <fvSearchForm :searchConfig="searchConfig" @search="search" style="margin-left: 16px"></fvSearchForm>
+  <fvTable ref="tableIns" :tableConfig="tableConfig">
+    <template #empty>
+      <el-empty description="暂无数据"/>
+    </template>
+  </fvTable>
+</template>
+
+<script setup lang="jsx">
+import fvSelect from '@/fvcomponents/fvSelect/index.vue'
+import {toThousands} from '@/utils/changePrice.js'
+import { getSubCompOpt } from '@/api/user/user.js';
+const router = useRouter()
+const route = useRoute()
+const searchConfig = ref([
+  {
+    label: '公司名称',
+    prop: 'affiliatedCompanyIds',
+    component: 'el-tree-select',
+    props: {
+      placeholder: '请输入公司名称查询',
+      clearable: true,
+      data: [],
+      filterable: true,
+      checkStrictly: true,
+      remote: true
+    }
+  },
+  {
+    label: '项目名称',
+    prop: 'projectName',
+    component: 'el-input',
+    props: {
+      placeholder: '请输入项目名称查询',
+      clearable: true,
+      filterable: true,
+      checkStrictly: true
+    }
+  },
+
+  {
+    label: '项目费用',
+    prop: 'projectCost',
+    component: shallowRef(fvSelect),
+    props: {
+      placeholder: '请选择项目费用查询',
+      clearable: true,
+      filterable: true,
+      cacheKey: 'project_cost',
+      remote: true
+    }
+  },
+  {
+    label: '研发阶段',
+    prop: 'researchStage',
+    component: shallowRef(fvSelect),
+    props: {
+      placeholder: '请选择研发阶段查询',
+      clearable: true,
+      filterable: true,
+      checkStrictly: true,
+      cacheKey: 'fee_stage',
+      remote: true
+    }
+  },
+
+  {
+    label: '时间',
+    prop: 'time',
+    component: 'el-date-picker',
+    props: {
+      placeholder: '请选择时间',
+      clearable: true,
+      type:'month',
+      format: 'YYYY-MM',
+      valueFormat:'YYYY-MM',
+    },
+    colProps: {}
+  },
+  {
+    label: '税后余额',
+    prop: 'afterTax',
+    component: 'el-input',
+    props: {
+      placeholder: '请输入税后余额查询',
+      clearable: true,
+      filterable: true,
+      checkStrictly: true
+    }
+  },
+  {
+    label: '摘要',
+    prop: 'digest',
+    component: 'el-input',
+    props: {
+      placeholder: '请输入摘要查询',
+      clearable: true,
+      filterable: true,
+      checkStrictly: true
+    }
+  },
+])
+const tableIns = ref()
+const tableConfig = reactive({
+  columns: [
+    // {
+    //   prop: 'name',
+    //   type: 'index',
+    //   label: '序号',
+    //   align: 'center',
+    //   width:85,
+    //   index: index => {
+    //     return (tableIns.value.getQuery().pageNum - 1) * tableIns.value.getQuery().pageSize + index + 1
+    //   }
+    // },
+    {
+      prop: 'affiliatedCompany',
+      label: '支出年份',
+      align: 'center'
+    },
+    {
+      prop: 'projectName',
+      label: '月份',
+      align: 'center'
+    },
+
+    {
+      prop: 'projectCost',
+      label: '主项目',
+      align: 'center',
+      width: 120,
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => {
+        if (row.projectCost !== null&&row.projectCost !== null&&row.projectCost!==undefined) {
+          return (<Tag dictType={'project_cost'} value={row.projectCost}/>)
+        } else {
+          return '--'
+        }
+      }
+    },
+
+    {
+      prop: 'time',
+      label: '子项目',
+      align: 'center',
+      width: 120,
+    },
+    {
+      prop: 'researchStage',
+      label: '凭证日期',
+      align: 'center',
+      width: 120,
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => {
+        if (row.researchStage&&row.researchStage !== null&&row.researchStage!==undefined) {
+          return (<Tag dictType={'research_stage'} value={row.researchStage}/>)
+        } else {
+          return '--'
+        }
+      }
+    },
+    {
+      prop: 'digest',
+      label: '凭证号',
+      align: 'center'
+    },
+    {
+      prop: 'digest',
+      label: '分录号',
+      align: 'center',
+      currentRender:({row})=>{
+        return <span>{toThousands(row.afterTax)}</span>
+      }
+    },
+    {
+      prop: 'digest',
+      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}/>)
+        } else {
+          return '--'
+        }
+      }
+    },
+    {
+      prop: 'digest',
+      label: '科目名称',
+      align: 'center',
+    },
+    {
+      prop: 'digest',
+      label: '辅助项',
+      align: 'center',
+    },
+    {
+      prop: 'digest',
+      label: '会计凭证记载金额(元)',
+      align: 'center',
+    },
+    {
+      prop: 'digest',
+      label: '归集研发费用金额(元)',
+      align: 'center',
+    },
+  ],
+  api: '',
+  params: {},
+  export:{
+    open :true,
+    fileName:`科技创新费用支出明细.xlsx`
+  }
+})
+const search = (val) => {
+  tableConfig.params = {...val}
+  tableIns.value.refresh()
+}
+const init = async () => {
+  const res = await getSubCompOpt()
+  searchConfig.value.find(item=>item.prop == 'affiliatedCompanyIds').props.data = res.data
+}
+
+// init()
+
+</script>
+<style scoped lang="scss">
+:deep(.el-table__header) {
+  .is-leaf:first-child {
+    .cell {
+      margin-left: -25px !important;
+    }
+  }
+}
+
+:deep(.el-table__body) {
+  .el-table__cell:first-child {
+    .cell {
+      margin-left: -13px !important;
+    }
+  }
+}
+:deep(.el-date-editor--month){
+  width: 100%;
+}
+</style>
diff --git a/src/views/expense-management/expend-detail/index.vue b/src/views/expense-management/expend-detail/index.vue
new file mode 100644
index 0000000..bd5aed5
--- /dev/null
+++ b/src/views/expense-management/expend-detail/index.vue
@@ -0,0 +1,263 @@
+<template>
+  <fvSearchForm :searchConfig="searchConfig" @search="search" style="margin-left: 16px"></fvSearchForm>
+  <fvTable ref="tableIns" :tableConfig="tableConfig">
+    <template #empty>
+      <el-empty description="暂无数据"/>
+    </template>
+  </fvTable>
+</template>
+
+<script setup lang="jsx">
+import fvSelect from '@/fvcomponents/fvSelect/index.vue'
+import {toThousands} from '@/utils/changePrice.js'
+import { getSubCompOpt } from '@/api/user/user.js';
+const router = useRouter()
+const route = useRoute()
+const searchConfig = ref([
+  {
+    label: '公司名称',
+    prop: 'affiliatedCompanyIds',
+    component: 'el-tree-select',
+    props: {
+      placeholder: '请输入公司名称查询',
+      clearable: true,
+      data: [],
+      filterable: true,
+      checkStrictly: true,
+      remote: true
+    }
+  },
+  {
+    label: '项目名称',
+    prop: 'projectName',
+    component: 'el-input',
+    props: {
+      placeholder: '请输入项目名称查询',
+      clearable: true,
+      filterable: true,
+      checkStrictly: true
+    }
+  },
+
+  {
+    label: '项目费用',
+    prop: 'projectCost',
+    component: shallowRef(fvSelect),
+    props: {
+      placeholder: '请选择项目费用查询',
+      clearable: true,
+      filterable: true,
+      cacheKey: 'project_cost',
+      remote: true
+    }
+  },
+  {
+    label: '研发阶段',
+    prop: 'researchStage',
+    component: shallowRef(fvSelect),
+    props: {
+      placeholder: '请选择研发阶段查询',
+      clearable: true,
+      filterable: true,
+      checkStrictly: true,
+      cacheKey: 'fee_stage',
+      remote: true
+    }
+  },
+
+  {
+    label: '时间',
+    prop: 'time',
+    component: 'el-date-picker',
+    props: {
+      placeholder: '请选择时间',
+      clearable: true,
+      type:'month',
+      format: 'YYYY-MM',
+      valueFormat:'YYYY-MM',
+    },
+    colProps: {}
+  },
+  {
+    label: '税后余额',
+    prop: 'afterTax',
+    component: 'el-input',
+    props: {
+      placeholder: '请输入税后余额查询',
+      clearable: true,
+      filterable: true,
+      checkStrictly: true
+    }
+  },
+  {
+    label: '摘要',
+    prop: 'digest',
+    component: 'el-input',
+    props: {
+      placeholder: '请输入摘要查询',
+      clearable: true,
+      filterable: true,
+      checkStrictly: true
+    }
+  },
+])
+const tableIns = ref()
+const tableConfig = reactive({
+  columns: [
+    // {
+    //   prop: 'name',
+    //   type: 'index',
+    //   label: '序号',
+    //   align: 'center',
+    //   width:85,
+    //   index: index => {
+    //     return (tableIns.value.getQuery().pageNum - 1) * tableIns.value.getQuery().pageSize + index + 1
+    //   }
+    // },
+    {
+      prop: 'affiliatedCompany',
+      label: '支出年份',
+      align: 'center'
+    },
+    {
+      prop: 'projectName',
+      label: '月份',
+      align: 'center'
+    },
+
+    {
+      prop: 'projectCost',
+      label: '主项目',
+      align: 'center',
+      width: 120,
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => {
+        if (row.projectCost !== null&&row.projectCost !== null&&row.projectCost!==undefined) {
+          return (<Tag dictType={'project_cost'} value={row.projectCost}/>)
+        } else {
+          return '--'
+        }
+      }
+    },
+
+    {
+      prop: 'time',
+      label: '子项目',
+      align: 'center',
+      width: 120,
+    },
+    {
+      prop: 'researchStage',
+      label: '项目类型',
+      align: 'center',
+      width: 120,
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => {
+        if (row.researchStage&&row.researchStage !== null&&row.researchStage!==undefined) {
+          return (<Tag dictType={'research_stage'} value={row.researchStage}/>)
+        } else {
+          return '--'
+        }
+      }
+    },
+    {
+      prop: 'digest',
+      label: 'RAD统计类型',
+      align: 'center'
+    },
+    {
+      prop: 'digest',
+      label: '付款流程类型',
+      align: 'center',
+      currentRender:({row})=>{
+        return <span>{toThousands(row.afterTax)}</span>
+      }
+    },
+    {
+      prop: 'digest',
+      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}/>)
+        } else {
+          return '--'
+        }
+      }
+    },
+    {
+      prop: 'digest',
+      label: '归档时间',
+      align: 'center',
+    },
+    {
+      prop: 'digest',
+      label: '付款流程编号',
+      align: 'center',
+    },
+    {
+      prop: '付款/请款事由',
+      label: '来源',
+      align: 'center',
+    },
+    {
+      prop: 'digest',
+      label: '付款金额',
+      align: 'center',
+    },
+    {
+      prop: 'digest',
+      label: '合同编号',
+      align: 'center',
+    },
+    {
+      prop: 'digest',
+      label: '合同名称',
+      align: 'center',
+    },
+    {
+      prop: 'digest',
+      label: '合同金额(元)',
+      align: 'center',
+    },
+  ],
+  api: '',
+  params: {},
+  export:{
+    open :true,
+    fileName:`科技创新费用支出明细.xlsx`
+  }
+})
+const search = (val) => {
+  tableConfig.params = {...val}
+  tableIns.value.refresh()
+}
+const init = async () => {
+  const res = await getSubCompOpt()
+  searchConfig.value.find(item=>item.prop == 'affiliatedCompanyIds').props.data = res.data
+}
+
+// init()
+
+</script>
+<style scoped lang="scss">
+:deep(.el-table__header) {
+  .is-leaf:first-child {
+    .cell {
+      margin-left: -25px !important;
+    }
+  }
+}
+
+:deep(.el-table__body) {
+  .el-table__cell:first-child {
+    .cell {
+      margin-left: -13px !important;
+    }
+  }
+}
+:deep(.el-date-editor--month){
+  width: 100%;
+}
+</style>
diff --git a/src/views/expense-management/share-detail/add.vue b/src/views/expense-management/share-detail/add.vue
new file mode 100644
index 0000000..d94d720
--- /dev/null
+++ b/src/views/expense-management/share-detail/add.vue
@@ -0,0 +1,551 @@
+<template>
+  <div v-loading="loading" style="padding: 0 30px">
+    <el-form :model="formData" ref="form" :rules="rules"  style="margin-left: 5px;margin-top: 18px">
+      <el-row :gutter="30">
+<!--        <el-col :span="6" style="margin-left: -15px">-->
+<!--          <el-form-item label="分摊名称" prop="shareName"  >-->
+<!--            <el-input v-model="formData.shareName" placeholder="请输入分摊名称" clearable>-->
+<!--            </el-input>-->
+<!--          </el-form-item>-->
+<!--        </el-col>-->
+        <el-col :span="6" style="margin-left: -10px">
+          <el-form-item label="分摊月份" prop="apportionmentMonth" label-width="80">
+            <el-date-picker
+                v-model="formData.apportionmentMonth"
+                type="month"
+                format="YYYY-MM"
+                value-format="YYYY-MM"
+                placeholder="选择月"
+            >
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="3" >
+              <el-button color="#DED0B2" @click="handleAdd"  style="font-size: 16px">添加一行</el-button>
+        </el-col>
+        <el-table v-if="showTable" :data="formData.tableData" style="width: 100%">
+          <el-table-column prop="projectId" label="项目名称" min-width="230">
+            <template #default="scope">
+              <el-form-item prop="time" :rules="scope.row.projectId?'1':rules.projectId">
+                <el-select v-model="scope.row.projectId" placeholder="请选择项目名称" clearable filterable @change="selectProject(scope.row,scope.$index)">
+                  <el-option
+                      v-for="item in nameOptions"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="researchPersonnelId" label="研发人员" min-width="180">
+            <template #default="scope">
+              <el-form-item prop="researchPersonnelId">
+                {{ scope.row.researchPersonnel }}
+                <el-button color="#DED0B2" @click="showPersonnelPicker(scope.row,scope.$index)"
+                           style="margin-left: 10px">
+                  {{ scope.row.researchPersonnel ? '更改' : '请选择研发人员' }}
+                </el-button>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="wagesPayable" label="当月总工时(天)" min-width="175">
+            <template #default="scope">
+              <el-form-item prop="time" :rules="scope.row.wagesPayable?'1':rules.wagesPayable">
+                <div>21.75</div>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="researchDuration" label="当月研发工时(天)" min-width="175">
+            <template #default="scope">
+              <el-form-item prop="time" :rules="scope.row.researchDuration?'1':rules.researchDuration">
+                <el-input-number v-model="scope.row.researchDuration" placeholder="请输入当月研发工时" :controls="false"/>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="oper" label="操作" min-width="130">
+            <template #default="scope">
+              <el-button type="primary" @click="handleCopy(scope.row)" link style="font-size: 16px">复制</el-button>
+              <el-button type="primary" @click="handleDelete(scope.$index)" link style="font-size: 16px">删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-row>
+    </el-form>
+    <user-picker :multiple="false" ref="userPicker" title="请选择研发人员" v-model:value="userList"
+                 @ok="selectedResearchPersonnel" @cancelOrClear="researchPersonnelPickerCancel"
+                 :setNullToSelectList="true" :isResearch="true"/>
+
+
+    <div class="oper-page-btn">
+      <el-button color="#DED0B2" v-if="routerName==='Sharedetail/add'" @click="handleSubmit(form)">提交</el-button>
+      <el-button color="#DED0B2" v-else @click="handleResubmit(form)">重新提交</el-button>
+      <el-button @click="handleBack">返回</el-button>
+    </div>
+  </div>
+</template>
+
+<script setup lang="jsx">
+import {ElNotification} from "element-plus";
+import {useTagsView} from '@/stores/tagsview.js'
+import {
+  addAllocation,
+  getAllocationDetail,
+  getAllocationProcess,
+  getResearchUser,
+  getProjectOption,
+  editAllocation,
+  getAllocationDetailList
+} from "@/api/expense-manage";
+import {useProcessStore} from '@/stores/processStore.js';
+import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';
+import OperationRender from '@/views/workflow/common/OperationRender.vue'
+import UserPicker from "@/views/workflow/process/common/UserPicker.vue";
+localStorage.removeItem('originallySelectedList')
+
+const userList = ref([])
+const changeDiagram = ref(false)
+const rules = reactive({
+  shareName: [{required: true, message: '请输入分摊名称', trigger: ['blur', 'change']}],
+  apportionmentMonth: [{required: true, message: '请选择月份', trigger: ['blur', 'change']}],
+  projectId: [{required: true, message: '请选择项目名称', trigger: ['blur', 'change']}],
+  // researchPersonnelId: [{required: true, message: '请选择研发人员', trigger:  ['blur', 'change']}],
+  wagesPayable: [{required: true, message: '请输入应发工资', trigger: ['blur', 'change']}],
+  performance: [{required: true, message: '请输入绩效', trigger: ['blur', 'change']}],
+  reserveFund: [{required: true, message: '请输入公积金', trigger: ['blur', 'change']}],
+  socialSecurity: [{required: true, message: '请输入社保', trigger: ['blur', 'change']}],
+  annuity: [{required: true, message: '请输入年金', trigger: ['blur', 'change']}],
+  workday: [{required: true, message: '请输入工作日', trigger: ['blur', 'change']}],
+  researchDuration: [{required: true, message: '请输入研发时长', trigger: ['blur', 'change']}],
+})
+const processStore = useProcessStore()
+const opentionData = ref({})
+const processInstanceData = ref()
+const processDiagramViewer = ref(false)
+const loading = ref(false)
+const isRepeatResearchPersonnel = ref(false)
+const showTable = ref(true)
+const route = useRoute()
+const router = useRouter()
+const routerName = ref(router.currentRoute.value.name)
+const tagsViewStore = useTagsView()
+const formData = ref({
+  tableData: [
+    {
+      projectId: '',
+      projectName: '',
+      researchPersonnelId: '',
+      wagesPayable: null,
+      performance: null,
+      reserveFund: null,
+      socialSecurity: null,
+      annuity: null,
+      workday: '21.75',
+      researchDuration: null,
+    }
+  ]
+})
+const userPicker = ref()
+const form = ref()
+const currentReachPerson = ref({})
+const currentRow = ref()
+const currentIndex = ref()
+const nameOptions = ref([])
+const researchOptions = ref([])
+const showPersonnelPicker = (row, index) => {
+  currentRow.value = row
+  currentIndex.value = index
+  if (row.companyName&&row.researchPersonnelId) {
+    let userObj = {
+      id: row.researchPersonnelId,
+      name: row.researchPersonnel,
+      companyName: row.companyName,
+      accountType: row.accountType,
+    }
+    userList.value = [userObj]
+  } else if (!row.researchPersonnel) {
+    userList.value = []
+  }
+  nextTick(() => {
+    userPicker.value.showUserPicker()
+  })
+}
+const selectProject=(row,index)=>{
+  console.log('row,index',row,index)
+  //先选择人员, 再选择项目: 再添加一行,重复操作
+  const projectIdArray = formData.value.tableData.map(item => item.projectId)
+  const researchPersonnelIdArray = formData.value.tableData.map(item => item.researchPersonnelId)
+  // console.log('projectIdArray',projectIdArray)
+  // console.log('researchPersonnelIdArray',researchPersonnelIdArray)
+  const projectNumObj = getSelectProjectAndResearchPersonnelNum(projectIdArray)
+  const researchPersonnelNumObj = getSelectProjectAndResearchPersonnelNum(researchPersonnelIdArray)
+  let repeatProjectName=getProjectName(row.projectId)
+  // console.log('currentRow.value',currentRow.value)
+  for (let researchPersonnelIdKey in researchPersonnelNumObj) {//先判断人员是否重复
+    if(currentRow.value.projectId){
+      if(researchPersonnelNumObj[researchPersonnelIdKey]>1){
+        ElNotification({
+          title: '警告',
+          message: `${repeatProjectName}  项目下，同一个研发人员不能分摊多次！`,
+          type: 'warning',
+        })
+        row.researchPersonnelId = ''
+        row.researchPersonnel = ''
+        row.companyName = ''
+        row.accountType = ''
+      }
+    }
+
+  }
+  // for (let projectIdKey in projectNumObj) {
+  //   // console.log('projectNumObjKey', projectIdKey, projectNumObj[projectIdKey])
+  //   if(projectNumObj[projectIdKey]>1){
+  //     // console.log('getProjectName(projectIdKey)',getProjectName(projectIdKey))
+  //     repeatProjectName=getProjectName(projectIdKey)
+  //
+  //   }
+  // }
+}
+const researchPersonnelPickerCancel = (select) => {
+  console.log('select',select)
+  if(select.length>0){
+    formData.value.tableData?.forEach((item, index) => {
+      if (index === currentIndex.value) {
+        item.researchPersonnelId = select[0].id
+        item.researchPersonnel = select[0].name
+        item.companyName = select[0].companyName
+        item.accountType = select[0].accountType
+      }
+    })
+  }else{
+    formData.value.tableData?.forEach((item, index) => {
+      if (index === currentIndex.value) {
+        item.researchPersonnelId = ''
+        item.researchPersonnel = ''
+        item.companyName = ''
+        item.accountType = ''
+      }
+    })
+  }
+}
+
+const selectedResearchPersonnel = (select) => {
+  if(select.length>0){
+    formData.value.tableData?.forEach((item, index) => {
+      if (index === currentIndex.value) {
+        item.researchPersonnelId = select[0].id
+        item.researchPersonnel = select[0].name
+        item.companyName = select[0].companyName
+        item.accountType = select[0].accountType
+      }
+    })
+  }else{
+    formData.value.tableData?.forEach((item, index) => {
+      if (index === currentIndex.value) {
+        item.researchPersonnelId = ''
+        item.researchPersonnel = ''
+        item.companyName = ''
+        item.accountType = ''
+      }
+    })
+  }
+  //以下是为" 同一项目下,同一人不能分摊多次 "
+  const projectIdArray = formData.value.tableData?.map(item => item.projectId)
+  const researchPersonnelIdArray = formData.value.tableData?.map(item => item.researchPersonnelId)
+  const projectNumObj = getSelectProjectAndResearchPersonnelNum(projectIdArray)
+  const researchPersonnelNumObj = getSelectProjectAndResearchPersonnelNum(researchPersonnelIdArray)
+  let repeatProjectName=''
+  for (let projectIdKey in projectNumObj) {
+    // console.log('projectNumObjKey', projectIdKey, projectNumObj[projectIdKey])
+    if(projectNumObj[projectIdKey]>1){
+      // console.log('getProjectName(projectIdKey)',getProjectName(projectIdKey))
+      repeatProjectName=getProjectName(projectIdKey)
+    }
+  }
+  for (let researchPersonnelIdKey in researchPersonnelNumObj) {
+    // console.log('researchPersonnelIdKey', researchPersonnelIdKey, researchPersonnelNumObj[researchPersonnelIdKey])
+    if(researchPersonnelNumObj[researchPersonnelIdKey]>1&&repeatProjectName&&currentRow.value.projectId){
+      isRepeatResearchPersonnel.value=true
+      ElNotification({
+        title: '警告',
+        message: `${repeatProjectName}  项目下，同一个研发人员不能分摊多次！`,
+        type: 'warning',
+      })
+      formData.value.tableData.forEach((item,index)=>{
+        if (index === currentIndex.value) {
+          item.researchPersonnelId = ''
+          item.researchPersonnel = ''
+          item.companyName = ''
+          item.accountType = ''
+        }
+      })
+    }else{
+      userList.value = select
+    }
+  }
+
+}
+/**
+ * 获取一个项目/研发人员的选择次数
+ * @param projectIdArray
+ * @returns {{}}
+ */
+const getSelectProjectAndResearchPersonnelNum = (projectIdArray) => {
+  const obj = {};
+  for (let i = 0, l = projectIdArray.length; i < l; i++) {
+    const item = projectIdArray[i];
+    obj[item] = (obj[item] + 1) || 1;
+  }
+  return obj;
+}
+const getResearchOptions = async () => {
+  const res = await getResearchUser()
+  researchOptions.value = res.data
+}
+const getProjectOptions = async () => {
+  const res = await getProjectOption()
+  nameOptions.value = res.data
+}
+const getProjectName = (id) => {
+  let label = ''
+  nameOptions.value.forEach(item => {
+    if (item.value == id) {
+      label = item.label
+    }
+  })
+  return label
+}
+const handleAdd = () => {
+  let row = {
+    projectId: '',
+    projectName: '',
+    researchPersonnelId: '',
+    researchPersonnel: '',
+    wagesPayable: null,
+    performance: null,
+    reserveFund: null,
+    socialSecurity: null,
+    annuity: null,
+    workday: '21.75',
+    researchDuration: null,
+  }
+  currentReachPerson.value.name = ''
+  formData.value.tableData.push(row)
+}
+const handleCopy = (row) => {
+  let copyObj = {
+    projectId: row.projectId,
+    projectName: '',
+    // accountType: row.accountType,
+    // companyName: row.companyName,
+    // researchPersonnelId: row.researchPersonnelId,
+    // researchPersonnel: row.researchPersonnel,
+    wagesPayable: row.wagesPayable,
+    performance: row.performance,
+    reserveFund: row.reserveFund,
+    socialSecurity: row.socialSecurity,
+    annuity: row.annuity,
+    workday: '21.75',
+    researchDuration: row.researchDuration,
+  }
+  formData.value.tableData.push(copyObj)
+}
+const handleDelete = (index) => {
+  formData.value.tableData.splice(index, 1)
+}
+const handleSubmit = (instance) => {
+  console.log('tableData',  formData.value.tableData)
+  if (!instance) return
+  instance.validate(async (valid) => {
+    if (!valid) {
+      ElNotification({
+        title: '提示',
+        message: '请完善数据,再提交!',
+        type: 'error'
+      })
+      return;
+    }
+    let researchPersonnelId = ''
+    formData.value.tableData.forEach(item => {
+      item.projectName = getProjectName(item.projectId)
+      researchPersonnelId = item.researchPersonnelId
+      if (item.performance == 0) {
+        item.performance = null
+      }
+    })
+    if (!researchPersonnelId) {
+      ElNotification({
+        title: '提示',
+        message: '请选择研发人员',
+        type: 'error'
+      })
+      return;
+    }
+    let params = {
+      shareName: formData.value.shareName,
+      apportionmentMonth: formData.value.apportionmentMonth,
+      usrAllocations: formData.value.tableData,
+      deploymentId: processInstanceData.value.deploymentId,
+    }
+    console.log('params', params, formData.value.tableData)
+    const {code, msg} = await addAllocation(params)
+    ElNotification({
+      title: '提示',
+      message: msg,
+      type: code === 1000 ? 'success' : 'error'
+    })
+    if (code === 1000) {
+      tagsViewStore.delVisitedViews(router.currentRoute.value.path)
+      router.push({
+        name: 'Expense/share'
+      })
+    }
+  })
+}
+const handleResubmit = (instance) => {
+  if (!instance) return
+  instance.validate(async (valid) => {
+    if (!valid) {
+      ElNotification({
+        title: '提示',
+        message: '请完善数据,再提交!',
+        type: 'error'
+      })
+      return;
+    }
+    let researchPersonnelId = ''
+    formData.value.tableData.forEach(item => {
+      item.allocationId = formData.value.allocationId
+      item.projectName = getProjectName(item.projectId)
+      researchPersonnelId = item.researchPersonnelId
+      if (item.performance == 0) {
+        item.performance = null
+      }
+    })
+    if (!researchPersonnelId) {
+      ElNotification({
+        title: '提示',
+        message: '请选择研发人员',
+        type: 'error'
+      })
+      return;
+    }
+    let params = {
+      allocationId: formData.value.allocationId,
+      shareName: formData.value.shareName,
+      apportionmentMonth: formData.value.apportionmentMonth,
+      usrAllocations: formData.value.tableData,
+      deploymentId: processInstanceData.value.deploymentId,
+    }
+    // console.log('params', params, formData.value.tableData)
+    const {code, msg} = await editAllocation(params)
+    ElNotification({
+      title: '提示',
+      message: msg,
+      type: code === 1000 ? 'success' : 'error'
+    })
+    if (code === 1000) {
+      tagsViewStore.delVisitedViews(router.currentRoute.value.path)
+      router.push({
+        name: 'Expense/share'
+      })
+    }
+  })
+}
+
+const getDetailInfo = () => {
+  loading.value = true
+  getAllocationDetail(route.query.id).then(res => {
+    ElNotification({
+      title: '提示',
+      message: res.msg,
+      type: res.code === 1000 ? 'success' : 'error'
+    })
+    if (res.code === 1000) {
+      getDetailList()
+      formData.value = res.data.formData
+      opentionData.value = res.data
+      loading.value = false
+    }
+  })
+}
+const getDetailList = async () => {
+  let params = {
+    allocationId: route.query.id
+  }
+  showTable.value = false
+  const {code, data, msg} = await getAllocationDetailList(params)
+  if (code === 1000) {
+    data.rows.forEach(item => {
+      item.researchPersonnelId = Number(item.researchPersonnelId)
+    })
+    formData.value.tableData = data.rows
+    nextTick(() => {
+      showTable.value = true
+    })
+  } else {
+    ElNotification({
+      title: '提示',
+      message: msg,
+      type: 'error'
+    })
+  }
+}
+const init = async () => {
+  processDiagramViewer.value = false
+  await getResearchOptions()
+  await getProjectOptions()
+  getAllocationProcess().then(res => {
+    if (res.code === 1000) {
+      let data = res.data
+      processInstanceData.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(() => {
+        processDiagramViewer.value = true
+      })
+    } else {
+      ElNotification({
+        title: '提示',
+        message: res.msg,
+        type: 'error'
+      })
+    }
+  })
+}
+const handleBack = () => {
+  history.back()
+}
+onMounted(() => {
+  init()
+  if (route.query.id) {
+    getDetailInfo()
+  }
+})
+</script>
+<style scoped lang="scss">
+:deep(.el-table--enable-row-transition) {
+  .el-table__body td.el-table__cell {
+    .cell {
+      .el-form-item {
+        margin-top: 20px;
+      }
+    }
+  }
+}
+:deep(.el-date-editor--month){
+  width: 100%!important;
+}
+:deep(.el-input-number) {
+  width: 100%;
+
+  .el-input__inner {
+    text-align: left;
+  }
+}
+</style>
diff --git a/src/views/expense-management/share-detail/index.vue b/src/views/expense-management/share-detail/index.vue
new file mode 100644
index 0000000..5022b5b
--- /dev/null
+++ b/src/views/expense-management/share-detail/index.vue
@@ -0,0 +1,249 @@
+<template>
+  <fvSearchForm :searchConfig="searchConfig" @search="search" style="margin-left: 16px"></fvSearchForm>
+  <fvTable ref="tableIns" :tableConfig="tableConfig" @headBtnClick="headBtnClick">
+    <template #empty>
+      <el-empty description="暂无数据"/>
+    </template>
+  </fvTable>
+</template>
+
+<script setup lang="jsx">
+import fvSelect from '@/fvcomponents/fvSelect/index.vue'
+import {toThousands} from '@/utils/changePrice.js'
+import { getSubCompOpt } from '@/api/user/user.js';
+const router = useRouter()
+const route = useRoute()
+const searchConfig = ref([
+  {
+    label: '公司名称',
+    prop: 'affiliatedCompanyIds',
+    component: 'el-tree-select',
+    props: {
+      placeholder: '请输入公司名称查询',
+      clearable: true,
+      data: [],
+      filterable: true,
+      checkStrictly: true,
+      remote: true
+    }
+  },
+  {
+    label: '项目名称',
+    prop: 'projectName',
+    component: 'el-input',
+    props: {
+      placeholder: '请输入项目名称查询',
+      clearable: true,
+      filterable: true,
+      checkStrictly: true
+    }
+  },
+
+  {
+    label: '项目费用',
+    prop: 'projectCost',
+    component: shallowRef(fvSelect),
+    props: {
+      placeholder: '请选择项目费用查询',
+      clearable: true,
+      filterable: true,
+      cacheKey: 'project_cost',
+      remote: true
+    }
+  },
+  {
+    label: '研发阶段',
+    prop: 'researchStage',
+    component: shallowRef(fvSelect),
+    props: {
+      placeholder: '请选择研发阶段查询',
+      clearable: true,
+      filterable: true,
+      checkStrictly: true,
+      cacheKey: 'fee_stage',
+      remote: true
+    }
+  },
+
+  {
+    label: '时间',
+    prop: 'time',
+    component: 'el-date-picker',
+    props: {
+      placeholder: '请选择时间',
+      clearable: true,
+      type:'month',
+      format: 'YYYY-MM',
+      valueFormat:'YYYY-MM',
+    },
+    colProps: {}
+  },
+  {
+    label: '税后余额',
+    prop: 'afterTax',
+    component: 'el-input',
+    props: {
+      placeholder: '请输入税后余额查询',
+      clearable: true,
+      filterable: true,
+      checkStrictly: true
+    }
+  },
+  {
+    label: '摘要',
+    prop: 'digest',
+    component: 'el-input',
+    props: {
+      placeholder: '请输入摘要查询',
+      clearable: true,
+      filterable: true,
+      checkStrictly: true
+    }
+  },
+])
+const tableIns = ref()
+const tableConfig = reactive({
+  columns: [
+    // {
+    //   prop: 'name',
+    //   type: 'index',
+    //   label: '序号',
+    //   align: 'center',
+    //   width:85,
+    //   index: index => {
+    //     return (tableIns.value.getQuery().pageNum - 1) * tableIns.value.getQuery().pageSize + index + 1
+    //   }
+    // },
+    {
+      prop: 'affiliatedCompany',
+      label: '支出年份',
+      align: 'center'
+    },
+    {
+      prop: 'projectName',
+      label: '月份',
+      align: 'center'
+    },
+
+    {
+      prop: 'projectCost',
+      label: '主项目',
+      align: 'center',
+      width: 120,
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => {
+        if (row.projectCost !== null&&row.projectCost !== null&&row.projectCost!==undefined) {
+          return (<Tag dictType={'project_cost'} value={row.projectCost}/>)
+        } else {
+          return '--'
+        }
+      }
+    },
+
+    {
+      prop: 'time',
+      label: '子项目',
+      align: 'center',
+      width: 120,
+    },
+    {
+      prop: 'researchStage',
+      label: '研发人员',
+      align: 'center',
+      width: 120,
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => {
+        if (row.researchStage&&row.researchStage !== null&&row.researchStage!==undefined) {
+          return (<Tag dictType={'research_stage'} value={row.researchStage}/>)
+        } else {
+          return '--'
+        }
+      }
+    },
+    {
+      prop: 'digest',
+      label: '人员性质',
+      align: 'center'
+    },
+    {
+      prop: 'digest',
+      label: '当月研发工时(天)',
+      align: 'center',
+      currentRender:({row})=>{
+        return <span>{toThousands(row.afterTax)}</span>
+      }
+    },
+    {
+      prop: 'digest',
+      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}/>)
+        } else {
+          return '--'
+        }
+      }
+    },
+    {
+      prop: 'digest',
+      label: '人工成本分摊(元)',
+      align: 'center',
+    },
+
+  ],
+  api: '',
+  params: {},
+  btns: [
+    {name: '添加分摊', key: 'add', color: '#DED0B2'}
+  ],
+  export:{
+    open :false,
+  }
+})
+const search = (val) => {
+  tableConfig.params = {...val}
+  tableIns.value.refresh()
+}
+const headBtnClick = (key) => {
+  switch (key) {
+    case 'add':
+      handleAdd()
+      break;
+  }
+}
+const handleAdd = () => {
+  router.push({
+    name: 'Sharedetail/add',
+    query: {}
+  })
+}
+const init = async () => {
+  const res = await getSubCompOpt()
+  searchConfig.value.find(item=>item.prop == 'affiliatedCompanyIds').props.data = res.data
+}
+
+// init()
+
+</script>
+<style scoped lang="scss">
+:deep(.el-table__header) {
+  .is-leaf:first-child {
+    .cell {
+      margin-left: -25px !important;
+    }
+  }
+}
+
+:deep(.el-table__body) {
+  .el-table__cell:first-child {
+    .cell {
+      margin-left: -13px !important;
+    }
+  }
+}
+:deep(.el-date-editor--month){
+  width: 100%;
+}
+</style>

From ca9e281119a804260fea675260805a07bd71facd Mon Sep 17 00:00:00 2001
From: dj <1042039504@qq.com>
Date: Sat, 29 Mar 2025 20:24:53 +0800
Subject: [PATCH 2/6] =?UTF-8?q?feat(project-manage):=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=99=84=E4=BB=B6=E6=A0=87=E7=AD=BE=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/project-manage/index.js               |  29 ++
 .../DetailComponent/ProjectAttachment.vue     | 286 ++++++++++++------
 2 files changed, 215 insertions(+), 100 deletions(-)

diff --git a/src/api/project-manage/index.js b/src/api/project-manage/index.js
index 8faa1b3..6e6eeae 100644
--- a/src/api/project-manage/index.js
+++ b/src/api/project-manage/index.js
@@ -85,6 +85,35 @@ export const getTags = (projectId) => {
         method: "get"
     });
 };
+export const getTagList = (projectId) => {
+    return request({
+        url: `/workflow/mosr/file/tag/list`,
+        method: "get",
+        params:{
+            projectId: projectId
+        }
+    });
+};
+export const addTag = (data) => {
+    return request({
+        url: '/workflow/mosr/file/tag/add',
+        method: "post",
+        data:data
+    });
+};
+export const updateTag = (data) => {
+    return request({
+        url: '/workflow/mosr/file/tag/update',
+        method: "post",
+        data:data
+    });
+};
+export const delTag = (tageId) => {
+    return request({
+        url: `/workflow/mosr/file/tag/${tageId}`,
+        method: "delete"
+    });
+};
 export const getPhaseProcess = () => {
     return request({
         url: '/workflow/phase/change/process',
diff --git a/src/components/DetailComponent/ProjectAttachment.vue b/src/components/DetailComponent/ProjectAttachment.vue
index 43beee8..10e37b0 100644
--- a/src/components/DetailComponent/ProjectAttachment.vue
+++ b/src/components/DetailComponent/ProjectAttachment.vue
@@ -1,56 +1,64 @@
 <template>
-  <el-row >
+  <el-row>
     <el-col :span="24">
       <baseTitle :title="'项目附件'"></baseTitle>
     </el-col>
-      <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleTabClick" style="margin-left: 15px;margin-top: -10px">
-        <el-tab-pane v-for="item in tagsOption"
-                     :key="item.value"
-                     :label="item.label"
-                     :name="item.value">
-            <div class="tag-title">
-              <div></div>
-              {{item.label}}
-            </div>
-        </el-tab-pane>
-        <el-tab-pane name="plus" v-if="uploadState">
-          <template #label>
-            <div style="margin-top: 4px;">
-              <el-icon color="#BEA266">
-                <Plus/>
-              </el-icon>
-            </div>
-          </template>
-        </el-tab-pane>
-      </el-tabs>
+    <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleTabClick" @tab-remove="tabRemove"
+             style="margin-left: 15px;margin-top: -10px">
+      <el-tab-pane name="all" :closable="false" label="全部">
+      </el-tab-pane>
+      <el-tab-pane v-for="item in tagsOption" :closable="item.isClose==1"
+                   :key="item.tagId"
+                   :label="item.fileTag"
+                   :name="item.tagId">
+        <div class="tag-title">
+          <div></div>
+          {{ item.fileTag }}
+        </div>
+      </el-tab-pane>
+
+      <el-tab-pane name="plus" v-if="uploadState" :closable="false">
+        <template #label>
+          <div style="margin-top: 4px;">
+            <el-icon color="#BEA266">
+              <Plus/>
+            </el-icon>
+          </div>
+        </template>
+      </el-tab-pane>
+    </el-tabs>
   </el-row>
   <div style="margin-top:10px;margin-bottom: 8px;margin-left: 15px;display: flex">
-<!--      <el-button   color="#DED0B2" @click="handleUpload">上传附件</el-button>-->
-    <file-upload v-if="!isLineBtn&&uploadState" @getFile="getFile"   />
+    <!--      <el-button   color="#DED0B2" @click="handleUpload">上传附件</el-button>-->
+    <file-upload v-if="!isLineBtn&&uploadState" @getFile="getFile"/>
 
-<!--          <el-button  color="#DED0B2" @click="handleEditTag" style="margin-left: 10px;">编辑</el-button>-->
+    <el-button color="#DED0B2" @click="handleEditTag" v-if="activeName!='all'" style="margin-left: 10px;">编辑
+    </el-button>
   </div>
-    <fvTable style="width: 100%;min-height:311px;max-height: 311px" v-if="showAttachmentTable" height="311"
-             :tableConfig="executeTableConfig" class="execute-apply-table"
-             :data="otherAttachmentList" :isSettingCol="false" :pagination="false">
-      <template #empty>
-        <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
-      </template>
-    </fvTable>
+  <fvTable style="width: 100%;min-height:311px;max-height: 311px" v-if="showAttachmentTable" height="311"
+           :tableConfig="executeTableConfig" class="execute-apply-table"
+           :data="otherAttachmentList" :isSettingCol="false" :pagination="false">
+    <template #empty>
+      <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
+    </template>
+  </fvTable>
   <file-preview ref="filePreviewRef" :fullscreen="false" v-if="filePreviewShow" :fileName="filePreviewParam.fileName"
                 :fileUrl="filePreviewParam.fileUrl"
                 :fileType="filePreviewParam.fileType"/>
-<el-dialog v-model="tagNameShow"  center width="450" top="450px">
-  标签：<el-input v-model="fileParam.tagName" placeholder="请输入标签名称" style="width: 335px;" clearable/>
-  <div class="oper" style="display: flex;justify-content: flex-end;margin-top: 10px">
-    <el-button color="#DED0B2" @click="changeTag()">确定</el-button>
-    <el-button @click="tagNameShow=false">取消</el-button>
-  </div>
-</el-dialog>
+  <el-dialog v-model="tagNameShow" center width="450" top="450px">
+    <div style="display: flex;align-items: center">标签：
+      <el-input v-model="fileParam.tagName" placeholder="请输入标签名称" style="width: 335px;" clearable/>
+    </div>
+
+    <div class="oper" style="display: flex;justify-content: flex-end;margin-top: 10px">
+      <el-button color="#DED0B2" @click="changeTag()">确定</el-button>
+      <el-button @click="tagNameShow=false">取消</el-button>
+    </div>
+  </el-dialog>
 </template>
 
 <script setup lang="jsx">
-import {getTags} from "@/api/project-manage";
+import {addTag, delTag, getTagList, getTags, updateTag} from "@/api/project-manage";
 import {ElLoading, ElMessageBox, ElNotification} from "element-plus";
 import {searchImplementationFileList, uploadFileList} from "@/api/project-manage/attachment";
 import {deleteFile} from "@/api/project-demand";
@@ -61,7 +69,7 @@ const attachmentParam = reactive({
   tag: ''
 })
 const fileParam = ref({
-  tagName:''
+  tagName: ''
 })
 const uploadState = ref(false)
 const tagNameShow = ref(false)
@@ -69,7 +77,7 @@ const tagsOption = ref([])
 const fileList = ref([])
 const allFiles = ref([])
 const showAttachmentTable = ref(true)
-const activeName = ref('测试2')
+const activeName = ref('all')
 
 const props = defineProps({
   fileNameTableWidth: {
@@ -119,9 +127,9 @@ const executeTableConfig = reactive({
             <div>
               <el-button type="primary" link onClick={() => handleDownload(row)}>下载</el-button>
               {
-                row.newFile?
+                row.newFile ?
                     <popover-delete name={row.originalFileName} type={'文件'} btnType={'danger'}
-                                    onDelete={() => deleteSingleFile(row)}/>  : ''
+                                    onDelete={() => deleteSingleFile(row)}/> : ''
               }
             </div>
         )
@@ -137,38 +145,98 @@ const filePreviewParam = ref({
   fileType: 'pdf'
 })
 const filePreviewShow = ref(false)
+const isEdit = ref(false)
+const isCloseByList = (index) => {
+  // otherAttachmentList.length>0?false:true
+  return otherAttachmentList.value.length == 0;
+}
 const deleteSingleFile = (row) => {
-    deleteFile(row.fileId).then(res => {
-      ElNotification({
-        title: '提示',
-        message: res.msg,
-        type: res.code === 1000 ? 'success' : 'error'
-      })
-      if (res.code === 1000) {
-          otherAttachmentList.value.splice(otherAttachmentList.value.findIndex((item) => item.fileId === row.fileId), 1);
-      }
-    });
+  deleteFile(row.fileId).then(res => {
+    ElNotification({
+      title: '提示',
+      message: res.msg,
+      type: res.code === 1000 ? 'success' : 'error'
+    })
+    if (res.code === 1000) {
+      otherAttachmentList.value.splice(otherAttachmentList.value.findIndex((item) => item.fileId === row.fileId), 1);
+    }
+  });
 }
 
-const changeTag=()=>{
-  tagsOption.value.push({
-    value: fileParam.value.tagName,
-    label: fileParam.value.tagName
-  })
-  tagNameShow.value=false;
-  fileParam.value.tagName=''
-}
-const handleTabClick=(item)=>{
-  console.log('item.props.name',item.props.name)
-  tagNameShow.value = item.props.name == 'plus';
-  if(item.props.name!='plus'){
-    console.log()
-    otherAttachmentList.value=allFiles.value.filter(item1=>item1.tag==item.props.name)
-    showAttachmentTable.value = false
-      nextTick(() => {
-        showAttachmentTable.value = true
-      })
+const changeTag = async () => {
+  let res = null
+  if (isEdit.value) {
+    res = await updateTag({
+      tagId: activeName.value,
+      fileTag: fileParam.value.tagName,
+      projectId: route.query.projectId,
+    })
+  } else {
+    res = await addTag({
+      projectId: route.query.projectId,
+      fileTag: fileParam.value.tagName
+    })
   }
+  ElNotification({
+    title: '提示',
+    message: res.msg,
+    type: res.code === 1000 ? 'success' : 'error'
+  })
+  getTagsOption()
+  // tagsOption.value.push({
+  //   value: fileParam.value.tagName,
+  //   label: fileParam.value.tagName
+  // })
+  tagNameShow.value = false;
+  fileParam.value.tagName = ''
+  activeName.value = 'all'
+}
+const tabRemove = async (val) => {
+  ElMessageBox.confirm(`确认删除名称为${getFileName(val)}的标签吗?`, '系统提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(async () => {
+    let res = await delTag(val)
+    ElNotification({
+      title: '提示',
+      message: res.msg,
+      type: res.code === 1000 ? 'success' : 'error'
+    })
+    if (res.code === 1000) {
+      getTagsOption()
+    }
+  })
+}
+const handleEditTag = () => {
+  tagNameShow.value = true
+  fileParam.value.tagName = getFileName(activeName.value)
+  isEdit.value = true
+}
+const getFileName = (name) => {
+  const tagArray = tagsOption.value.filter((item1) => item1.tagId == name)
+  let tagName = ''
+  if (tagArray && tagArray.length > 0) {
+    tagName = tagArray[0].fileTag
+  }
+  return tagName
+}
+const handleTabClick = (item) => {
+  tagNameShow.value = item.props.name == 'plus';
+  if (item.props.name == 'plus') {
+    isEdit.value = false
+  }
+  if (item.props.name != 'plus') {
+    if (item.props.name == 'all') {
+      otherAttachmentList.value = allFiles.value
+    } else {
+      otherAttachmentList.value = allFiles.value.filter(item1 => item1.tag == getFileName(item.props.name))
+    }
+  }
+  showAttachmentTable.value = false
+  nextTick(() => {
+    showAttachmentTable.value = true
+  })
 }
 const compositeParam = (item) => {
   return {
@@ -190,17 +258,17 @@ const getFile = (val) => {
 }
 
 const handleSubmit = async (list) => {
-    let params = {
-      fileList: list,
-      projectId: route.query.projectId,
-      targetState: "30"
-    }
-    let res = await uploadFileList(params)
-    // ElNotification({
-    //   title: '提示',
-    //   message: res.msg,
-    //   type: res.code === 1000 ? 'success' : 'error'
-    // })
+  let params = {
+    fileList: list,
+    projectId: route.query.projectId,
+    targetState: "30"
+  }
+  let res = await uploadFileList(params)
+  // ElNotification({
+  //   title: '提示',
+  //   message: res.msg,
+  //   type: res.code === 1000 ? 'success' : 'error'
+  // })
 }
 const clickToPreview = (row) => {
   filePreviewShow.value = false
@@ -231,9 +299,11 @@ const handleSearch = () => {
     showAttachmentTable.value = false
     if (res.code === 1000) {
       // otherAttachmentList.value = res.data.fileList
-      otherAttachmentList.value= res.data.fileList.filter(item1=>item1.tag==activeName.value)
+      otherAttachmentList.value = res.data.fileList
       allFiles.value = res.data.fileList
       uploadState.value = res.data.upload
+
+      getTagsOption()
       nextTick(() => {
         showAttachmentTable.value = true
       })
@@ -250,10 +320,22 @@ const handleSearch = () => {
 }
 const getTagsOption = () => {
   if (!route.query.projectId) return
-  getTags(route.query.projectId).then(res => {
+  getTagList(route.query.projectId).then(res => {
     if (res.code === 1000) {
-      tagsOption.value = res.data
-      activeName.value=res.data[0].value
+      res.data.rows[0].isClose = 1
+      tagsOption.value = res.data.rows
+      otherAttachmentList.value.forEach(item => {
+        tagsOption.value.forEach(tag => {
+          // console.log(tag.fileTag,item.tag)
+          if (tag.fileTag == item.tag) {
+            tag.isClose = 0
+          } else {
+            tag.isClose = 1
+          }
+        })
+      })
+      if (!res.data.rows || res.data.rows.length == 0) return;
+      // activeName.value=res.data.rows[0].tagId
     } else {
       ElNotification({
         title: '提示',
@@ -274,10 +356,8 @@ const handleUpload = () => {
     }
   })
 }
-getTagsOption()
 handleSearch()
 onActivated(() => {
-  getTagsOption()
   handleSearch()
 })
 </script>
@@ -314,29 +394,35 @@ onActivated(() => {
 }
 </style>
 <style scoped lang="scss">
-:deep(.el-dialog__body){
-  padding: 0!important;
+:deep(.el-dialog__body) {
+  padding: 0 !important;
 }
-.tag-title{
+
+.tag-title {
   display: flex;
   align-items: center;
   margin-top: 15px;
->div{
-  margin-right: 5px;
-  width: 4px;
-  height: 20px;
-  background-color: #BEA266;
-}
+
+  > div {
+    margin-right: 5px;
+    width: 4px;
+    height: 20px;
+    background-color: #BEA266;
+  }
 }
+
 :deep(.el-table--fit ) {
   height: 311px !important;
 }
-:deep(.el-tabs__nav){
+
+:deep(.el-tabs__nav) {
   //width: 75vw;
 }
-:deep(.el-tabs__item){
-  flex: none!important;
+
+:deep(.el-tabs__item) {
+  flex: none !important;
 }
+
 :deep(.el-tabs__header) {
   margin-bottom: 0;
 }

From ebd7fa385112c6f0ceca75dc95dc8c9a6ee29e8f Mon Sep 17 00:00:00 2001
From: dj <1042039504@qq.com>
Date: Sun, 30 Mar 2025 15:06:39 +0800
Subject: [PATCH 3/6] =?UTF-8?q?feat(project-manage):=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=99=84=E4=BB=B6=E6=A0=87=E7=AD=BE=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DetailComponent/ProjectAttachment.vue     | 96 +++++++++++--------
 vite.config.js                                | 14 +--
 2 files changed, 64 insertions(+), 46 deletions(-)

diff --git a/src/components/DetailComponent/ProjectAttachment.vue b/src/components/DetailComponent/ProjectAttachment.vue
index 10e37b0..221b4ec 100644
--- a/src/components/DetailComponent/ProjectAttachment.vue
+++ b/src/components/DetailComponent/ProjectAttachment.vue
@@ -32,7 +32,7 @@
     <!--      <el-button   color="#DED0B2" @click="handleUpload">上传附件</el-button>-->
     <file-upload v-if="!isLineBtn&&uploadState" @getFile="getFile"/>
 
-    <el-button color="#DED0B2" @click="handleEditTag" v-if="activeName!='all'" style="margin-left: 10px;">编辑
+    <el-button color="#DED0B2" @click="handleEditTag" v-if="activeName!='all'&&activeName!='plus'" style="margin-left: 10px;">编辑
     </el-button>
   </div>
   <fvTable style="width: 100%;min-height:311px;max-height: 311px" v-if="showAttachmentTable" height="311"
@@ -127,9 +127,9 @@ const executeTableConfig = reactive({
             <div>
               <el-button type="primary" link onClick={() => handleDownload(row)}>下载</el-button>
               {
-                row.newFile ?
-                    <popover-delete name={row.originalFileName} type={'文件'} btnType={'danger'}
-                                    onDelete={() => deleteSingleFile(row)}/> : ''
+                uploadState.value ?
+                <popover-delete name={row.originalFileName} type={'文件'} btnType={'danger'}
+                                onDelete={() => deleteSingleFile(row)}/>:''
               }
             </div>
         )
@@ -137,6 +137,7 @@ const executeTableConfig = reactive({
     }
   ]
 })
+// row.newFile ?: ''
 const otherAttachmentList = ref([])
 
 const filePreviewParam = ref({
@@ -159,6 +160,8 @@ const deleteSingleFile = (row) => {
     })
     if (res.code === 1000) {
       otherAttachmentList.value.splice(otherAttachmentList.value.findIndex((item) => item.fileId === row.fileId), 1);
+      getAttachmentList()
+      activeName.value = 'all'
     }
   });
 }
@@ -176,6 +179,9 @@ const changeTag = async () => {
       projectId: route.query.projectId,
       fileTag: fileParam.value.tagName
     })
+    getAttachmentList()
+    fileParam.value.tagName = ''
+    activeName.value = 'all'
   }
   ElNotification({
     title: '提示',
@@ -188,11 +194,9 @@ const changeTag = async () => {
   //   label: fileParam.value.tagName
   // })
   tagNameShow.value = false;
-  fileParam.value.tagName = ''
-  activeName.value = 'all'
 }
 const tabRemove = async (val) => {
-  ElMessageBox.confirm(`确认删除名称为${getFileName(val)}的标签吗?`, '系统提示', {
+  ElMessageBox.confirm(`确认删除名称为${getTagName(val)}的标签吗?`, '系统提示', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
     type: 'warning'
@@ -205,15 +209,16 @@ const tabRemove = async (val) => {
     })
     if (res.code === 1000) {
       getTagsOption()
+      otherAttachmentList.value = allFiles.value
     }
   })
 }
 const handleEditTag = () => {
   tagNameShow.value = true
-  fileParam.value.tagName = getFileName(activeName.value)
+  fileParam.value.tagName = getTagName(activeName.value)
   isEdit.value = true
 }
-const getFileName = (name) => {
+const getTagName = (name) => {
   const tagArray = tagsOption.value.filter((item1) => item1.tagId == name)
   let tagName = ''
   if (tagArray && tagArray.length > 0) {
@@ -227,16 +232,17 @@ const handleTabClick = (item) => {
     isEdit.value = false
   }
   if (item.props.name != 'plus') {
-    if (item.props.name == 'all') {
-      otherAttachmentList.value = allFiles.value
-    } else {
-      otherAttachmentList.value = allFiles.value.filter(item1 => item1.tag == getFileName(item.props.name))
-    }
+    changeFileList(getTagName(item.props.name))
+    // if (item.props.name == 'all') {
+    //   otherAttachmentList.value = allFiles.value
+    // } else {
+    //   otherAttachmentList.value = allFiles.value.filter(item1 => item1.tag == getTagName(item.props.name))
+    // }
   }
-  showAttachmentTable.value = false
-  nextTick(() => {
-    showAttachmentTable.value = true
-  })
+  // showAttachmentTable.value = false
+  // nextTick(() => {
+  //   showAttachmentTable.value = true
+  // })
 }
 const compositeParam = (item) => {
   return {
@@ -246,7 +252,7 @@ const compositeParam = (item) => {
     fileType: item.fileType,
     url: item.url,
     newFile: true,
-    tag: activeName.value,
+    tag: getTagName(activeName.value),
   }
 }
 const getFile = (val) => {
@@ -264,11 +270,14 @@ const handleSubmit = async (list) => {
     targetState: "30"
   }
   let res = await uploadFileList(params)
-  // ElNotification({
-  //   title: '提示',
-  //   message: res.msg,
-  //   type: res.code === 1000 ? 'success' : 'error'
-  // })
+  if(res.code !== 1000){
+    ElNotification({
+      title: '提示',
+      message: res.msg,
+      type: 'error'
+    })
+  }
+  getTagsOption()
 }
 const clickToPreview = (row) => {
   filePreviewShow.value = false
@@ -281,12 +290,29 @@ const clickToPreview = (row) => {
     filePreviewShow.value = true
   })
 }
-const handleSearch = () => {
+const changeFileList=(tag)=>{
+  showAttachmentTable.value = false
+  let params = {
+    targetId: route.query.projectId,
+    targetState: "30",
+    tag:tag
+  }
+  searchImplementationFileList(params).then(res => {
+    if (res.code === 1000) {
+      otherAttachmentList.value = res.data.fileList
+      nextTick(() => {
+        showAttachmentTable.value = true
+      })
+    }
+  })
+}
+const getAttachmentList = () => {
   const loading = ElLoading.service({fullscreen: true})
   let params = {
     targetId: route.query.projectId,
     targetState: "30"
   }
+  showAttachmentTable.value = false
   if (attachmentParam.tag) {
     tagsOption.value.forEach(item => {
       if (item.value === attachmentParam.tag) {
@@ -296,7 +322,6 @@ const handleSearch = () => {
     params.tag = attachmentParam.tag
   }
   searchImplementationFileList(params).then(res => {
-    showAttachmentTable.value = false
     if (res.code === 1000) {
       // otherAttachmentList.value = res.data.fileList
       otherAttachmentList.value = res.data.fileList
@@ -322,19 +347,12 @@ const getTagsOption = () => {
   if (!route.query.projectId) return
   getTagList(route.query.projectId).then(res => {
     if (res.code === 1000) {
-      res.data.rows[0].isClose = 1
       tagsOption.value = res.data.rows
-      otherAttachmentList.value.forEach(item => {
-        tagsOption.value.forEach(tag => {
-          // console.log(tag.fileTag,item.tag)
-          if (tag.fileTag == item.tag) {
-            tag.isClose = 0
-          } else {
-            tag.isClose = 1
-          }
-        })
+      tagsOption.value.forEach((tag, index) => {
+        const filterArray = otherAttachmentList.value.filter(item => tag.fileTag == item.tag)
+        tagsOption.value[index].isClose = filterArray.length > 0 ? 0 : 1
       })
-      if (!res.data.rows || res.data.rows.length == 0) return;
+      // if (!res.data.rows || res.data.rows.length == 0) return;
       // activeName.value=res.data.rows[0].tagId
     } else {
       ElNotification({
@@ -356,9 +374,9 @@ const handleUpload = () => {
     }
   })
 }
-handleSearch()
+getAttachmentList()
 onActivated(() => {
-  handleSearch()
+  getAttachmentList()
 })
 </script>
 <style lang="scss">
diff --git a/vite.config.js b/vite.config.js
index 1f5f9c2..291e5d8 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -68,13 +68,13 @@ export default defineConfig({
         strictPort: false,
         open: true,
         proxy: {
-            // '/api/workflow': {
-            //   // target: 'http://frp.feashow.cn:31800/',
-            //   target: 'http://clay.frp.feashow.cn/',
-            //   // target: 'http://192.168.31.175:8000',
-            //   changeOrigin: true,
-            //   rewrite: (path) => path.replace(/^\/api/, '')
-            // },
+            '/api/workflow': {
+              target: 'http://frp.feashow.cn:31800/',
+              // target: 'http://clay.frp.feashow.cn/',
+              // target: 'http://192.168.31.175:8000',
+              changeOrigin: true,
+              rewrite: (path) => path.replace(/^\/api/, '')
+            },
             // '/api/admin': {
             //     // target: 'http://frp.feashow.cn:31800/',
             //     target: 'http://clay.frp.feashow.cn/',

From f9aa6191cebc3cf69fecd4d5c28d9bf1e83129ac Mon Sep 17 00:00:00 2001
From: dj <1042039504@qq.com>
Date: Sun, 30 Mar 2025 15:06:56 +0800
Subject: [PATCH 4/6] =?UTF-8?q?feat(project-manage):=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=99=84=E4=BB=B6=E6=A0=87=E7=AD=BE=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vite.config.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/vite.config.js b/vite.config.js
index 291e5d8..0bb55cf 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -68,13 +68,13 @@ export default defineConfig({
         strictPort: false,
         open: true,
         proxy: {
-            '/api/workflow': {
-              target: 'http://frp.feashow.cn:31800/',
-              // target: 'http://clay.frp.feashow.cn/',
-              // target: 'http://192.168.31.175:8000',
-              changeOrigin: true,
-              rewrite: (path) => path.replace(/^\/api/, '')
-            },
+            // '/api/workflow': {
+            //   target: 'http://frp.feashow.cn:31800/',
+            //   // target: 'http://clay.frp.feashow.cn/',
+            //   // target: 'http://192.168.31.175:8000',
+            //   changeOrigin: true,
+            //   rewrite: (path) => path.replace(/^\/api/, '')
+            // },
             // '/api/admin': {
             //     // target: 'http://frp.feashow.cn:31800/',
             //     target: 'http://clay.frp.feashow.cn/',

From 244f2e72b45d63fae4d77b75bcae0e53e2fceb5f Mon Sep 17 00:00:00 2001
From: dj <1042039504@qq.com>
Date: Mon, 31 Mar 2025 14:12:28 +0800
Subject: [PATCH 5/6] =?UTF-8?q?feat:=20=E9=A1=B9=E7=9B=AE=E5=9F=BA?=
 =?UTF-8?q?=E6=9C=AC=E4=BF=A1=E6=81=AF=E6=96=B0=E5=A2=9E=E5=AE=9E=E9=99=85?=
 =?UTF-8?q?=E7=BB=8F=E8=B4=B9=E9=A2=84=E7=AE=97=E5=92=8C=E4=B8=93=E9=A1=B9?=
 =?UTF-8?q?=E8=B5=84=E9=87=91=E7=9B=B8=E5=85=B3=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DetailComponent/ProjectApply.vue          | 12 +++-
 src/components/steps/index.vue                | 32 +++++++++
 .../expend-detail/index.vue                   | 68 +++++++------------
 .../project-demand/requirement/index.vue      |  5 ++
 src/views/project-demand/summary/add.vue      |  8 +--
 src/views/project-demand/summary/index.vue    |  9 ++-
 .../project-management/filing/attachment.vue  | 39 ++++++++++-
 .../implementation/account.vue                | 39 +++++++++++
 .../implementation/phase.vue                  | 39 ++++++++++-
 .../implementation/phaseDetail.vue            | 39 ++++++++++-
 .../implementation/share.vue                  | 38 +++++++++++
 .../implementation/uploadFee.vue              | 39 +++++++++++
 12 files changed, 313 insertions(+), 54 deletions(-)

diff --git a/src/components/DetailComponent/ProjectApply.vue b/src/components/DetailComponent/ProjectApply.vue
index efca74e..12e2991 100644
--- a/src/components/DetailComponent/ProjectApply.vue
+++ b/src/components/DetailComponent/ProjectApply.vue
@@ -10,6 +10,13 @@
             </el-input>
             </el-form-item>
         </el-col>
+        <el-col :span="6" v-if="title==='apply'">
+          <!--          label-width="106"-->
+          <el-form-item label="实际专项资金"  prop="specialFundAmount" label-width="121" >
+            <el-input v-model="localFormData.specialFundAmount" placeholder="请输入实际专项资金">
+            </el-input>
+            </el-form-item>
+        </el-col>
 <!--        <el-col :span="6" v-if="title==='apply'">-->
 <!--          &lt;!&ndash;          label-width="106"&ndash;&gt;-->
 <!--          <el-form-item label="实际专项资金"  prop="budget" label-width="120">-->
@@ -230,7 +237,7 @@ const pageInfo = reactive({
 })
 const rules = reactive({
   actualEconomicEstimate: [{required: true, message: '请输入实际经费预算', trigger: ['blur','change']}],
-  // projectChargePerson: [{required: true, message: '请选择项目负责人', trigger: 'blur'}],
+  specialFundAmount: [{required: true, message: '请输入实际专项资金', trigger: 'blur'}],
   // projectPerson: [{required: true, message: '请选择项目成员', trigger: 'blur'}],
 })
 const tagsViewStore = useTagsView()
@@ -549,7 +556,8 @@ const handleSubmit = async (instance) => {
       fileList: files,
       // singleFile: attachment.value.singleFile,
       projectId: projectId.value,
-      actualEconomicEstimate: localFormData.value.actualEconomicEstimate,
+      actualEconomicEstimate: parseFloat(localFormData.value.actualEconomicEstimate),
+      specialFundAmount: parseFloat(localFormData.value.specialFundAmount),
       preProcess: JSON.stringify(localFormData.value.preProcess)
     }
     if (sessionParams.value.preProcess && !localFormData.value.preProcess) {
diff --git a/src/components/steps/index.vue b/src/components/steps/index.vue
index fa1d023..9035fc4 100644
--- a/src/components/steps/index.vue
+++ b/src/components/steps/index.vue
@@ -294,6 +294,22 @@ const schema = computed(() => {
           </div>
       )
     },
+    {
+      label: '实际经费预算',
+      prop: 'actualEconomicEstimate',
+      colProps: {
+        span: 6
+      },
+      component: () => (
+          <div>
+            {
+              baseFormData.value?.actualEconomicEstimate ?
+                  <span>{toThousands(baseFormData.value?.actualEconomicEstimate)}</span>
+                  : <span>{'--'}</span>
+            }
+          </div>
+      )
+    },
     {
       label: '产学研联合',
       prop: 'industryUniversityResearch',
@@ -335,6 +351,22 @@ const schema = computed(() => {
     },
     {
       label: '预估专项资金(元)',
+      prop: 'forecastSpecialFundAmount',
+      colProps: {
+        span: 6
+      },
+      component: () => (
+          <div>
+            {
+              baseFormData.value?.forecastSpecialFundAmount ?
+                  <span>{toThousands(baseFormData.value?.forecastSpecialFundAmount)}</span>
+                  : <span>{'--'}</span>
+            }
+          </div>
+      )
+    },
+    {
+      label: '实际专项资金(元)',
       prop: 'specialFundAmount',
       colProps: {
         span: 6
diff --git a/src/views/expense-management/expend-detail/index.vue b/src/views/expense-management/expend-detail/index.vue
index bd5aed5..7a24eac 100644
--- a/src/views/expense-management/expend-detail/index.vue
+++ b/src/views/expense-management/expend-detail/index.vue
@@ -1,6 +1,6 @@
 <template>
-  <fvSearchForm :searchConfig="searchConfig" @search="search" style="margin-left: 16px"></fvSearchForm>
-  <fvTable ref="tableIns" :tableConfig="tableConfig">
+<!--  <fvSearchForm :searchConfig="searchConfig" @search="search" style="margin-left: 16px"></fvSearchForm>-->
+  <fvTable ref="tableIns" :tableConfig="tableConfig" style="margin-top: 15px">
     <template #empty>
       <el-empty description="暂无数据"/>
     </template>
@@ -115,114 +115,96 @@ const tableConfig = reactive({
     //   }
     // },
     {
-      prop: 'affiliatedCompany',
+      prop: 'paymentYear',
       label: '支出年份',
       align: 'center'
     },
     {
-      prop: 'projectName',
+      prop: 'paymentMonth',
       label: '月份',
       align: 'center'
     },
 
     {
-      prop: 'projectCost',
+      prop: 'masterProjectName',
       label: '主项目',
       align: 'center',
       width: 120,
-      showOverflowTooltip: false,
-      currentRender: ({row, index}) => {
-        if (row.projectCost !== null&&row.projectCost !== null&&row.projectCost!==undefined) {
-          return (<Tag dictType={'project_cost'} value={row.projectCost}/>)
-        } else {
-          return '--'
-        }
-      }
     },
 
     {
-      prop: 'time',
+      prop: 'subProjectName',
       label: '子项目',
       align: 'center',
       width: 120,
     },
     {
-      prop: 'researchStage',
+      prop: 'projectType',
       label: '项目类型',
       align: 'center',
       width: 120,
       showOverflowTooltip: false,
       currentRender: ({row, index}) => {
-        if (row.researchStage&&row.researchStage !== null&&row.researchStage!==undefined) {
-          return (<Tag dictType={'research_stage'} value={row.researchStage}/>)
+        if (row.projectType&&row.projectType !== null&&row.projectType!==undefined) {
+          return (<Tag dictType={'project_type'} value={row.projectType}/>)
         } else {
           return '--'
         }
       }
     },
     {
-      prop: 'digest',
+      prop: 'rdType',
       label: 'RAD统计类型',
       align: 'center'
     },
     {
-      prop: 'digest',
+      prop: 'paymentProcessType',
       label: '付款流程类型',
       align: 'center',
-      currentRender:({row})=>{
-        return <span>{toThousands(row.afterTax)}</span>
-      }
     },
     {
-      prop: 'digest',
+      prop: 'processState',
       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}/>)
-        } else {
-          return '--'
-        }
-      }
     },
     {
-      prop: 'digest',
+      prop: 'filingTime',
       label: '归档时间',
       align: 'center',
     },
     {
-      prop: 'digest',
+      prop: 'paymentProcessNum',
       label: '付款流程编号',
       align: 'center',
     },
     {
-      prop: '付款/请款事由',
-      label: '来源',
-      align: 'center',
-    },
-    {
-      prop: 'digest',
+      prop: 'paymentAmount',
       label: '付款金额',
       align: 'center',
     },
     {
-      prop: 'digest',
+      prop: 'paymentSubject',
+      label: '付款/请款事由',
+      align: 'center',
+    },
+
+    {
+      prop: 'contractNum',
       label: '合同编号',
       align: 'center',
     },
     {
-      prop: 'digest',
+      prop: 'contractName',
       label: '合同名称',
       align: 'center',
     },
     {
-      prop: 'digest',
+      prop: 'contractSumAmount',
       label: '合同金额(元)',
       align: 'center',
     },
   ],
-  api: '',
+  api: '/workflow/mosr/payment/list',
   params: {},
   export:{
     open :true,
diff --git a/src/views/project-demand/requirement/index.vue b/src/views/project-demand/requirement/index.vue
index 3e71bb0..7f10059 100644
--- a/src/views/project-demand/requirement/index.vue
+++ b/src/views/project-demand/requirement/index.vue
@@ -46,6 +46,11 @@ const tableConfig = reactive({
         return (tableIns.value.getQuery().pageNum - 1) * tableIns.value.getQuery().pageSize + index + 1
       }
     },
+    {
+      prop: 'processNumber',
+      label: '编号',
+      align: 'center',
+    },
     {
       prop: 'requirementName',
       label: '征集名称',
diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue
index 94e3218..d4a2820 100644
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -183,15 +183,15 @@
           </el-form-item>
         </el-col>
         <el-col :span="6" v-if="formData.isSpecialFund">
-          <el-form-item label="预估专项资金(元)" prop="specialFundAmount">
+          <el-form-item label="预估专项资金(元)" prop="forecastSpecialFundAmount">
             <el-input
-                v-model="formData.specialFundAmount"
+                v-model="formData.forecastSpecialFundAmount"
                 placeholder="请输入预估专项资金"
                 clearable
                 :formatter="(value) => value.replace(/\B(?=(\d{3})+(?!\d))/g, ',')"
                 :parser="(value) => value.replace(/\$\s?|(,*)+[^0-9.]/g, '')" @change="changeCollectData"
             />
-            <!--            <el-input-number v-model="formData.specialFundAmount" placeholder="请输入预估专项资金" :controls="false"/>-->
+            <!--            <el-input-number v-model="formData.forecastSpecialFundAmount" placeholder="请输入预估专项资金" :controls="false"/>-->
           </el-form-item>
         </el-col>
         <el-col :span="6" :style="{marginLeft:!formData.isSpecialFund?'0':'-40px'}">
@@ -447,7 +447,7 @@ const rules = reactive({
   economicEstimate: [{required: true, message: '请输入预估经费预算', trigger: ['blur', 'change']}],
   isSpecialFund: [{required: true, message: '请选择是否为专项资金', trigger: ['blur', 'change']}],
   isWithinBudget: [{required: true, message: '请选择是否在预算内', trigger: ['blur', 'change']}],
-  specialFundAmount: [{required: true, message: '请输入专项资金', trigger: ['blur', 'change']}],
+  forecastSpecialFundAmount: [{required: true, message: '请输入专项资金', trigger: ['blur', 'change']}],
   serviceDescription: [{required: true, message: '请输入现有业务描述', trigger: ['blur', 'change']}],
   contentDescription: [{required: true, message: '请输入研发项目关键内容描述', trigger: ['blur', 'change']}]
 })
diff --git a/src/views/project-demand/summary/index.vue b/src/views/project-demand/summary/index.vue
index 990d8da..240a2ae 100644
--- a/src/views/project-demand/summary/index.vue
+++ b/src/views/project-demand/summary/index.vue
@@ -88,7 +88,7 @@ const searchConfig = ref([
   },
   {
     label: '承办单位',
-    prop: 'undertaker',
+    prop: 'affiliatedCompanyId',
     component: 'el-tree-select',
     props: {
       placeholder: '请输入承办单位查询',
@@ -218,6 +218,11 @@ const tableConfig = reactive({
         return (tableIns.value.getQuery().pageNum - 1) * tableIns.value.getQuery().pageSize + index + 1
       }
     },
+    {
+      prop: 'processNumber',
+      label: '编号',
+      align: 'center',
+    },
     {
       prop: 'requirementName',
       label: '征集名称',
@@ -441,7 +446,7 @@ const handleDetail = (row) => {
 }
 const init = async () => {
   const res = await getSubCompOpt()
-  searchConfig.value.find(item=>item.prop == 'undertaker').props.data = res.data
+  searchConfig.value.find(item=>item.prop == 'affiliatedCompanyId').props.data = res.data
 }
 
 init()
diff --git a/src/views/project-management/filing/attachment.vue b/src/views/project-management/filing/attachment.vue
index ed272ae..7444de8 100644
--- a/src/views/project-management/filing/attachment.vue
+++ b/src/views/project-management/filing/attachment.vue
@@ -171,6 +171,21 @@ const schema = computed(() => {
             }
           </div>
       )
+    }, {
+      label: '实际经费预算',
+      prop: 'actualEconomicEstimate',
+      colProps: {
+        span: 6
+      },
+      component: () => (
+          <div>
+            {
+              baseFormData.value?.actualEconomicEstimate ?
+                  <span>{toThousands(baseFormData.value?.actualEconomicEstimate)}</span>
+                  : <span>{'--'}</span>
+            }
+          </div>
+      )
     },
     {
       label: '产学研联合',
@@ -210,9 +225,24 @@ const schema = computed(() => {
       colProps: {
         span: 6
       }
+    },{
+      label: '预估专项资金(元)',
+      prop: 'forecastSpecialFundAmount',
+      colProps: {
+        span: 6
+      },
+      component: () => (
+          <div>
+            {
+              baseFormData.value?.forecastSpecialFundAmount ?
+                  <span>{toThousands(baseFormData.value?.forecastSpecialFundAmount)}</span>
+                  : <span>{'--'}</span>
+            }
+          </div>
+      )
     },
     {
-      label: '预估专项资金(元)',
+      label: '实际专项资金(元)',
       prop: 'specialFundAmount',
       colProps: {
         span: 6
@@ -249,6 +279,13 @@ const schema = computed(() => {
       colProps: {
         span: 6
       }
+    },
+    {
+      label: '主项目',
+      prop: 'masterProjectName',
+      colProps: {
+        span: 6
+      }
     }
   ]
 })
diff --git a/src/views/project-management/implementation/account.vue b/src/views/project-management/implementation/account.vue
index 725df77..2904a49 100644
--- a/src/views/project-management/implementation/account.vue
+++ b/src/views/project-management/implementation/account.vue
@@ -178,6 +178,22 @@ const schema = computed(() => {
           </div>
       )
     },
+    {
+      label: '实际经费预算',
+      prop: 'actualEconomicEstimate',
+      colProps: {
+        span: 6
+      },
+      component: () => (
+          <div>
+            {
+              basicData.value?.actualEconomicEstimate ?
+                  <span>{toThousands(basicData.value?.actualEconomicEstimate)}</span>
+                  : <span>{'--'}</span>
+            }
+          </div>
+      )
+    },
     {
       label: '产学研联合',
       prop: 'industryUniversityResearch',
@@ -219,6 +235,22 @@ const schema = computed(() => {
     },
     {
       label: '预估专项资金(元)',
+      prop: 'forecastSpecialFundAmount',
+      colProps: {
+        span: 6
+      },
+      component: () => (
+          <div>
+            {
+              basicData.value?.forecastSpecialFundAmount ?
+                  <span>{toThousands(basicData.value?.forecastSpecialFundAmount)}</span>
+                  : <span>{'--'}</span>
+            }
+          </div>
+      )
+    },
+    {
+      label: '实际专项资金(元)',
       prop: 'specialFundAmount',
       colProps: {
         span: 6
@@ -255,6 +287,13 @@ const schema = computed(() => {
       colProps: {
         span: 6
       }
+    },
+    {
+      label: '主项目',
+      prop: 'masterProjectName',
+      colProps: {
+        span: 6
+      }
     }
   ]
 })
diff --git a/src/views/project-management/implementation/phase.vue b/src/views/project-management/implementation/phase.vue
index f391f61..4a94545 100644
--- a/src/views/project-management/implementation/phase.vue
+++ b/src/views/project-management/implementation/phase.vue
@@ -244,6 +244,21 @@ const schema = computed(() => {
             }
           </div>
       )
+    }, {
+      label: '实际经费预算',
+      prop: 'actualEconomicEstimate',
+      colProps: {
+        span: 6
+      },
+      component: () => (
+          <div>
+            {
+              baseFormData.value?.actualEconomicEstimate ?
+                  <span>{toThousands(baseFormData.value?.actualEconomicEstimate)}</span>
+                  : <span>{'--'}</span>
+            }
+          </div>
+      )
     },
     {
       label: '产学研联合',
@@ -283,9 +298,24 @@ const schema = computed(() => {
       colProps: {
         span: 6
       }
+    }, {
+      label: '预估专项资金(元)',
+      prop: 'forecastSpecialFundAmount',
+      colProps: {
+        span: 6
+      },
+      component: () => (
+          <div>
+            {
+              baseFormData.value?.forecastSpecialFundAmount ?
+                  <span>{toThousands(baseFormData.value?.forecastSpecialFundAmount)}</span>
+                  : <span>{'--'}</span>
+            }
+          </div>
+      )
     },
     {
-      label: '预估专项资金(元)',
+      label: '实际专项资金(元)',
       prop: 'specialFundAmount',
       colProps: {
         span: 6
@@ -322,6 +352,13 @@ const schema = computed(() => {
       colProps: {
         span: 6
       }
+    },
+    {
+      label: '主项目',
+      prop: 'masterProjectName',
+      colProps: {
+        span: 6
+      }
     }
   ]
 })
diff --git a/src/views/project-management/implementation/phaseDetail.vue b/src/views/project-management/implementation/phaseDetail.vue
index 3772162..1d5f1bf 100644
--- a/src/views/project-management/implementation/phaseDetail.vue
+++ b/src/views/project-management/implementation/phaseDetail.vue
@@ -184,6 +184,21 @@ const schema = computed(() => {
             }
           </div>
       )
+    },{
+      label: '实际经费预算',
+      prop: 'actualEconomicEstimate',
+      colProps: {
+        span: 6
+      },
+      component: () => (
+          <div>
+            {
+              baseFormData.value?.actualEconomicEstimate ?
+                  <span>{toThousands(baseFormData.value?.actualEconomicEstimate)}</span>
+                  : <span>{'--'}</span>
+            }
+          </div>
+      )
     },
     {
       label: '产学研联合',
@@ -223,9 +238,24 @@ const schema = computed(() => {
       colProps: {
         span: 6
       }
+    }, {
+      label: '预估专项资金(元)',
+      prop: 'forecastSpecialFundAmount',
+      colProps: {
+        span: 6
+      },
+      component: () => (
+          <div>
+            {
+              baseFormData.value?.forecastSpecialFundAmount ?
+                  <span>{toThousands(baseFormData.value?.forecastSpecialFundAmount)}</span>
+                  : <span>{'--'}</span>
+            }
+          </div>
+      )
     },
     {
-      label: '预估专项资金(元)',
+      label: '实际专项资金(元)',
       prop: 'specialFundAmount',
       colProps: {
         span: 6
@@ -262,6 +292,13 @@ const schema = computed(() => {
       colProps: {
         span: 6
       }
+    },
+    {
+      label: '主项目',
+      prop: 'masterProjectName',
+      colProps: {
+        span: 6
+      }
     }
   ]
 })
diff --git a/src/views/project-management/implementation/share.vue b/src/views/project-management/implementation/share.vue
index 12a99ea..e985f27 100644
--- a/src/views/project-management/implementation/share.vue
+++ b/src/views/project-management/implementation/share.vue
@@ -159,6 +159,21 @@ const schema = computed(() => {
             }
           </div>
       )
+    }, {
+      label: '实际经费预算',
+      prop: 'actualEconomicEstimate',
+      colProps: {
+        span: 6
+      },
+      component: () => (
+          <div>
+            {
+              baseFormData.value?.actualEconomicEstimate ?
+                  <span>{toThousands(baseFormData.value?.actualEconomicEstimate)}</span>
+                  : <span>{'--'}</span>
+            }
+          </div>
+      )
     },
     {
       label: '产学研联合',
@@ -201,6 +216,22 @@ const schema = computed(() => {
     },
     {
       label: '预估专项资金(元)',
+      prop: 'forecastSpecialFundAmount',
+      colProps: {
+        span: 6
+      },
+      component: () => (
+          <div>
+            {
+              baseFormData.value?.forecastSpecialFundAmount ?
+                  <span>{toThousands(baseFormData.value?.forecastSpecialFundAmount)}</span>
+                  : <span>{'--'}</span>
+            }
+          </div>
+      )
+    },
+    {
+      label: '实际专项资金(元)',
       prop: 'specialFundAmount',
       colProps: {
         span: 6
@@ -237,6 +268,13 @@ const schema = computed(() => {
       colProps: {
         span: 6
       }
+    },
+    {
+      label: '主项目',
+      prop: 'masterProjectName',
+      colProps: {
+        span: 6
+      }
     }
   ]
 })
diff --git a/src/views/project-management/implementation/uploadFee.vue b/src/views/project-management/implementation/uploadFee.vue
index 3b8dadd..b54e9d3 100644
--- a/src/views/project-management/implementation/uploadFee.vue
+++ b/src/views/project-management/implementation/uploadFee.vue
@@ -268,6 +268,22 @@ const schema = computed(() => {
           </div>
       )
     },
+    {
+      label: '实际经费预算',
+      prop: 'actualEconomicEstimate',
+      colProps: {
+        span: 6
+      },
+      component: () => (
+          <div>
+            {
+              baseFormData.value?.actualEconomicEstimate ?
+                  <span>{toThousands(baseFormData.value?.actualEconomicEstimate)}</span>
+                  : <span>{'--'}</span>
+            }
+          </div>
+      )
+    },
     {
       label: '产学研联合',
       prop: 'industryUniversityResearch',
@@ -316,6 +332,22 @@ const schema = computed(() => {
     },
     {
       label: '预估专项资金(元)',
+      prop: 'forecastSpecialFundAmount',
+      colProps: {
+        span: 6
+      },
+      component: () => (
+          <div>
+            {
+              baseFormData.value?.forecastSpecialFundAmount ?
+                  <span>{toThousands(baseFormData.value?.forecastSpecialFundAmount)}</span>
+                  : <span>{'--'}</span>
+            }
+          </div>
+      )
+    },
+    {
+      label: '实际专项资金(元)',
       prop: 'specialFundAmount',
       colProps: {
         span: 6
@@ -352,6 +384,13 @@ const schema = computed(() => {
       colProps: {
         span: 6
       }
+    },
+    {
+      label: '主项目',
+      prop: 'masterProjectName',
+      colProps: {
+        span: 6
+      }
     }
   ]
 })

From 98d8ea4805eda4f6d9349a5c81328f3dee8c3653 Mon Sep 17 00:00:00 2001
From: dj <1042039504@qq.com>
Date: Mon, 31 Mar 2025 23:14:54 +0800
Subject: [PATCH 6/6] =?UTF-8?q?feat(expense-management):=20=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E8=B4=B9=E7=94=A8=E5=88=86=E6=91=8A=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=B9=B6=E4=BC=98=E5=8C=96=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/expense-manage/index.js               |  7 ++++
 .../expend-detail/index.vue                   |  2 +-
 .../expense-management/share-detail/add.vue   | 32 +++++++++----------
 src/views/project-demand/summary/add.vue      |  2 +-
 src/views/project-management/filing/index.vue |  6 ++++
 .../implementation/index.vue                  |  6 ++++
 .../project-management/initiation/index.vue   |  5 +++
 7 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/src/api/expense-manage/index.js b/src/api/expense-manage/index.js
index 523ebdd..2391872 100644
--- a/src/api/expense-manage/index.js
+++ b/src/api/expense-manage/index.js
@@ -9,6 +9,13 @@ export const addAllocation = (data) => {
     data
   });
 };
+export const addShare = (data) => {
+  return request({
+    url:'/workflow/mosr/cost/share',
+    method: "post",
+    data
+  });
+};
 export const getAllocationDetail = (allocationId) => {
   return request({
     url: `/workflow/mosr/cost/allocation/info/${allocationId}`,
diff --git a/src/views/expense-management/expend-detail/index.vue b/src/views/expense-management/expend-detail/index.vue
index 7a24eac..bb67237 100644
--- a/src/views/expense-management/expend-detail/index.vue
+++ b/src/views/expense-management/expend-detail/index.vue
@@ -208,7 +208,7 @@ const tableConfig = reactive({
   params: {},
   export:{
     open :true,
-    fileName:`科技创新费用支出明细.xlsx`
+    fileName:`科研项日现金支出明细表`
   }
 })
 const search = (val) => {
diff --git a/src/views/expense-management/share-detail/add.vue b/src/views/expense-management/share-detail/add.vue
index d94d720..40cc870 100644
--- a/src/views/expense-management/share-detail/add.vue
+++ b/src/views/expense-management/share-detail/add.vue
@@ -96,7 +96,7 @@ import {
   getResearchUser,
   getProjectOption,
   editAllocation,
-  getAllocationDetailList
+  getAllocationDetailList, addShare
 } from "@/api/expense-manage";
 import {useProcessStore} from '@/stores/processStore.js';
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';
@@ -107,16 +107,16 @@ localStorage.removeItem('originallySelectedList')
 const userList = ref([])
 const changeDiagram = ref(false)
 const rules = reactive({
-  shareName: [{required: true, message: '请输入分摊名称', trigger: ['blur', 'change']}],
+  // shareName: [{required: true, message: '请输入分摊名称', trigger: ['blur', 'change']}],
   apportionmentMonth: [{required: true, message: '请选择月份', trigger: ['blur', 'change']}],
   projectId: [{required: true, message: '请选择项目名称', trigger: ['blur', 'change']}],
   // researchPersonnelId: [{required: true, message: '请选择研发人员', trigger:  ['blur', 'change']}],
-  wagesPayable: [{required: true, message: '请输入应发工资', trigger: ['blur', 'change']}],
-  performance: [{required: true, message: '请输入绩效', trigger: ['blur', 'change']}],
-  reserveFund: [{required: true, message: '请输入公积金', trigger: ['blur', 'change']}],
-  socialSecurity: [{required: true, message: '请输入社保', trigger: ['blur', 'change']}],
-  annuity: [{required: true, message: '请输入年金', trigger: ['blur', 'change']}],
-  workday: [{required: true, message: '请输入工作日', trigger: ['blur', 'change']}],
+  // wagesPayable: [{required: true, message: '请输入应发工资', trigger: ['blur', 'change']}],
+  // performance: [{required: true, message: '请输入绩效', trigger: ['blur', 'change']}],
+  // reserveFund: [{required: true, message: '请输入公积金', trigger: ['blur', 'change']}],
+  // socialSecurity: [{required: true, message: '请输入社保', trigger: ['blur', 'change']}],
+  // annuity: [{required: true, message: '请输入年金', trigger: ['blur', 'change']}],
+  // workday: [{required: true, message: '请输入工作日', trigger: ['blur', 'change']}],
   researchDuration: [{required: true, message: '请输入研发时长', trigger: ['blur', 'change']}],
 })
 const processStore = useProcessStore()
@@ -135,12 +135,12 @@ const formData = ref({
     {
       projectId: '',
       projectName: '',
-      researchPersonnelId: '',
-      wagesPayable: null,
-      performance: null,
-      reserveFund: null,
-      socialSecurity: null,
-      annuity: null,
+      // researchPersonnelId: '',
+      // wagesPayable: null,
+      // performance: null,
+      // reserveFund: null,
+      // socialSecurity: null,
+      // annuity: null,
       workday: '21.75',
       researchDuration: null,
     }
@@ -383,13 +383,11 @@ const handleSubmit = (instance) => {
       return;
     }
     let params = {
-      shareName: formData.value.shareName,
       apportionmentMonth: formData.value.apportionmentMonth,
       usrAllocations: formData.value.tableData,
-      deploymentId: processInstanceData.value.deploymentId,
     }
     console.log('params', params, formData.value.tableData)
-    const {code, msg} = await addAllocation(params)
+    const {code, msg} = await addShare(params)
     ElNotification({
       title: '提示',
       message: msg,
diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue
index d4a2820..bfaff07 100644
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -232,7 +232,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="6" :style="{marginLeft:!formData.isSpecialFund?route.query.id?'-10px':'0':'0'}">
-          <el-form-item label="需求征集" prop="requirementId" required>
+          <el-form-item label="需求征集" prop="" required>
             <template v-if="formData.requirementDefaultName">{{ formData.requirementDefaultName }}</template>
             <el-select v-else v-model="formData.requirementId" clearable placeholder="请选择需求征集"
                        @change="changeCollectData">
diff --git a/src/views/project-management/filing/index.vue b/src/views/project-management/filing/index.vue
index 45fd58a..78f2ab5 100644
--- a/src/views/project-management/filing/index.vue
+++ b/src/views/project-management/filing/index.vue
@@ -216,6 +216,12 @@ const tableConfig = reactive({
         return (tableIns.value.getQuery().pageNum - 1) * tableIns.value.getQuery().pageSize + index + 1
       }
     },
+
+    {
+      prop: 'processNumber',
+      label: '编号',
+      align: 'center',
+    },
     {
       prop: 'requirementName',
       label: '征集名称',
diff --git a/src/views/project-management/implementation/index.vue b/src/views/project-management/implementation/index.vue
index f12e1c2..cb440d3 100644
--- a/src/views/project-management/implementation/index.vue
+++ b/src/views/project-management/implementation/index.vue
@@ -219,6 +219,12 @@ const tableConfig = reactive({
         return (tableIns.value.getQuery().pageNum - 1) * tableIns.value.getQuery().pageSize + index + 1
       }
     },
+
+    {
+      prop: 'processNumber',
+      label: '编号',
+      align: 'center',
+    },
     {
       prop: 'requirementName',
       label: '征集名称',
diff --git a/src/views/project-management/initiation/index.vue b/src/views/project-management/initiation/index.vue
index c7f9f5a..8089ba1 100644
--- a/src/views/project-management/initiation/index.vue
+++ b/src/views/project-management/initiation/index.vue
@@ -214,6 +214,11 @@ const tableConfig = reactive({
         return (tableIns.value.getQuery().pageNum - 1) * tableIns.value.getQuery().pageSize + index + 1
       }
     },
+    {
+      prop: 'processNumber',
+      label: '编号',
+      align: 'center',
+    },
     {
       prop: 'requirementName',
       label: '征集名称',