Merge pull request 'fix : 修复费用分摊复制功能、数字框默认值为null、项目归档显示是哪个流程的上传附件' (#329) from dj into master

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/329
2024-06-14 05:04:56 +00:00
parent 6d56c4702b f240016e44
commit 49b64c177f
11 changed files with 523 additions and 75 deletions
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -551,7 +551,7 @@ html, body, #app, .el-container, .el-aside, .el-main {
 }

 .approval-record {
-  //padding-bottom: 30px;
+  padding-bottom: 30px;
  position: relative;
  .approval-title {
    display: flex;
@@ -561,6 +561,7 @@ html, body, #app, .el-container, .el-aside, .el-main {
    .diagram {
      display: flex;
      align-items: center;
+      float: right;

      .base-title {
        margin-right: 10px;
--- a/src/components/DetailComponent/CompanyPicker.vue
+++ b/src/components/DetailComponent/CompanyPicker.vue
@@ -0,0 +1,401 @@
+<template>
+  <el-dialog custom-class="custom-dialog" class="border" :border="false" closeFree width="1000px" style="height: 676px"
+             :title="title" :visible.sync="visible" v-model="visible" append-to-body :close-on-click-modal="true"
+             :destroy-on-close="true">
+    <div class="picker">
+      <div class="candidate" v-loading="loading">
+        <el-input v-model="filterText" @change="getList(1)"
+                  clearable placeholder="输入部门/昵称进行搜索">
+          <template #append>
+            <el-button @click="getList(1)">搜索</el-button>
+          </template>
+        </el-input>
+        <!-- 人员选择 -->
+        <el-empty :image-size="100" description="似乎没有数据" v-show="dataList.length === 0"/>
+        <el-scrollbar style="height:90%;">
+          <div class="tree">
+            <el-tree :data="dataList" ref="tree" :props="defaultProps" empty-text="" node-key="value"
+                     :default-expanded-keys="expandedKeys" lazy accordion
+                     @node-click="handleChange" @node-expand="handleChange">
+              <template #default="{ node, data }">
+                <div class="tree-node">
+                  <div v-if="data.type === 0" style="display: flex;align-items: center;padding: 3px 0">
+                    <el-icon>
+                      <UserFilled/>
+                    </el-icon>
+                    {{ node.label }}-{{ data.companyName }}
+                  </div>
+                  <div v-else-if="data.type ===1">
+                    <el-icon>
+                      <UserFilled/>
+                    </el-icon>
+                    {{ node.label }}
+                  </div>
+                  <div v-else>
+                    <el-icon>
+                      <FolderOpened/>
+                    </el-icon>
+                    {{ node.label }}
+                  </div>
+                </div>
+              </template>
+            </el-tree>
+          </div>
+        </el-scrollbar>
+      </div>
+      <div class="selected">
+        <div class="count">
+          <span>已选 {{ selectList.length }} 项</span>
+          <span @click="clearSelected">清空</span>
+        </div>
+        <div class="org-items">
+          <el-empty :image-size="100" description="请点击左侧列表选择数据" v-show="selectList.length === 0"/>
+          <div v-for="(selectItem, selectIndex) in selectList" :key="selectIndex" class="org-item">
+            {{ selectItem.name }}-{{ selectItem.companyName }}
+            <el-icon @click="noSelected(selectItem)" size="20" style="margin-left: 10px;cursor: pointer;">
+              <CircleClose/>
+            </el-icon>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="footer">
+      <el-button size="mini" @click="visible = false">取 消</el-button>
+      <el-button size="mini" color="#DED0B2" @click="selectConfirm">确 定</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script setup>
+import {computed, defineProps, defineExpose} from "vue";
+import {ElMessageBox} from "element-plus";
+import {getMosrDept} from "@/api/workflow/process-user";
+
+const props = defineProps({
+  value: {
+    type: Array,
+    default: () => {
+      return [];
+    }
+  },
+  multiple: { //是否多选
+    default: true,
+    type: Boolean
+  },
+  showCheckbox: { //是否显示左侧选择框
+    default: true,
+    type: Boolean
+  }
+});
+const radio = ref(0);
+const chooseId = ref(0);
+let selectItem = reactive({
+  type: -1,
+  value: "0"
+});
+const activeNames = ref(["1"]);
+const visible = ref(false);
+const loading = ref(false);
+const title = ref("请选择");
+const selectList = ref([]);
+const filterText = ref("");
+const dataList = ref([]);
+const tree = ref([]);
+const isSearch = ref(false);
+const expandedKeys = ref([]);
+const defaultProps = {
+  value: "value",
+  label: "name",
+  children: "children",
+  isLeaf: (data) => {
+    if (data.type === 0) {
+      return true
+    }
+  }
+};
+const emit = defineEmits();
+
+const _value = computed({
+  get() {
+    return props.value;
+  },
+  set(val) {
+    emit("input", val);
+  }
+});
+
+watch(() => filterText.value, (newVal) => {
+  console.log('filterText.value', newVal)
+  filterText.value = newVal
+});
+
+const getList = (flag) => {
+  let params = {}
+  if (flag === 1) {
+    isSearch.value = true;
+    params = {
+      chooseId: 0,
+      chooseName: filterText.value
+    }
+    selectItem = {
+      type: -1,
+      value: "0"
+    };
+  } else {
+
+    params = {
+      chooseId: radio.value,
+      chooseName: filterText.value
+    }
+  }
+  getMosrDept(params).then(res => {
+    console.log('selectItem.type', selectItem.type)
+    // if (res.data) {
+    if (selectItem.type === -1) {
+      dataList.value = res.data;
+    } else if (selectItem.type === 1) {
+      selectItem.children = res.data;
+      if (res.data.length === 0) {
+        selectItem.children = [{
+          type: 1,
+          name: '暂无数据'
+        }]
+      }
+    } else if (selectItem.type === 2) {
+      selectItem.children = res.data;
+    }
+    // }
+  });
+};
+
+const setData = (source) => {
+  // for (let item of source) {
+  //   this.$set(item, "value", selectItem.value + "-" + item.id)
+  // }
+  return source;
+};
+
+//通过关键字过滤树节点
+// filterNode(value, data) {
+//   if (!value) return true;
+//   return data.name.indexOf(value) !== -1;
+// },
+//用于用户选择
+const showUserPicker = () => {
+  selectItem = {
+    type: -1,
+    value: "0"
+  };
+  dataList.value = [];
+  selectList.value = []
+  chooseId.value = 0;
+  radio.value = 0;
+  visible.value = true;
+  expandedKeys.value = [];
+  getList();
+};
+const handleChange = (item, data) => {
+  selectItem = item;
+  if (isSearch.value && item.type !== 0) {
+    filterText.value = ""
+    radio.value = item.id;
+    getList();
+    return;
+  } else if (!isSearch.value) {
+    //渲染子节点用户或部门及用户数据
+    if (data.expanded) {
+      if (expandedKeys.value.indexOf(item.value) === -1) {
+        expandedKeys.value.push(item.value);
+        if (item.type !== 0) {
+          radio.value = item.id;
+          getList();
+          return;
+        }
+      }
+    }
+  }
+
+  // if(expandedKeys.value.indexOf(item.value)==-1){
+  //   expandedKeys.value.push(item.value);
+  // }else {
+  //   if (data.expanded === true) {
+  //     if (item.type !== 0) {
+  //       chooseId.value = item.id;
+  //       getList();
+  //       return;
+  //     }
+  //   }
+  // }
+
+  //仅选择用户
+  if (item.type === 0) {
+    if (props.multiple) {
+      //不添加重复的数据到右边
+      for (let i = 0; i < selectList.value.length; i++) {
+        if (selectList.value[i].id === item.id) {
+          selectList.value.splice(i, 1);
+          break;
+        }
+      }
+      selectList.value.push(item);
+    } else {
+      selectList.value = [item];
+    }
+  }
+  // _value = selectList.value
+};
+
+const noSelected = (selectItem) => {
+  //右侧的x
+  for (let i = 0; i < selectList.value.length; i++) {
+    if (selectList.value[i].value === selectItem.value) {
+      selectList.value.splice(i, 1);
+      break;
+    }
+  }
+  selectItem.selected = false;
+};
+const clearSelected = () => {
+  //清空
+  ElMessageBox.confirm("您确定要清空已选中的项?", "提示", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+    type: "warning"
+  }).then(() => {
+    selectList.value = [];
+  });
+};
+const selectConfirm = () => {
+  //确定按钮
+  emit("ok", selectList.value);
+  dataList.value = []
+  visible.value = false;
+};
+defineExpose({
+  showUserPicker
+});
+</script>
+
+<style lang="scss" scoped>
+$containWidth: 480px;
+:deep(.tree) {
+  .el-tree-node__content {
+    height: 34px;
+
+    .tree-node {
+      font-size: 18px;
+    }
+  }
+
+  //.el-tree-node {
+  //  .is-leaf + .el-checkbox .el-checkbox__inner {
+  //    display: inline-block;
+  //  }
+  //
+  //  .el-checkbox .el-checkbox__inner {
+  //    display: none;
+  //  }
+  //}
+}
+
+.footer {
+  float: right;
+}
+
+.picker {
+  height: 560px;
+  position: relative;
+  text-align: left;
+
+  .candidate {
+    position: absolute;
+    display: inline-block;
+    width: $containWidth;
+    height: 98%;
+    border: 1px solid #e8e8e8;
+
+    :deep(.el-input) {
+      height: 40px;
+
+      .el-input__inner, .el-input-group__append {
+        font-size: 16px;
+      }
+    }
+  }
+
+  .selected {
+    right: 0;
+    top: 0;
+    position: absolute;
+    display: inline-block;
+    width: 450px;
+    height: 98%;
+    border: 1px solid #e8e8e8;
+
+    .count {
+      width: 100%;
+      padding: 10px;
+      display: inline-block;
+      border-bottom: 1px solid #e8e8e8;
+      margin-bottom: 5px;
+      font-size: 16px;
+
+      > span:nth-child(2) {
+        float: right;
+        color: #c75450;
+        cursor: pointer;
+        margin-left: 10px;
+      }
+    }
+
+    .org-items {
+      overflow-y: auto;
+      height: 90%;
+
+      .el-icon-close {
+        position: absolute;
+        right: 5px;
+        cursor: pointer;
+        font-size: larger;
+      }
+
+      .org-item {
+        margin: 0 5px;
+        border-radius: 5px;
+        position: relative;
+        padding: 7px 5px;
+        display: flex;
+        align-items: center;
+        font-size: 16px;
+
+        &:hover {
+          background: #f1f1f1;
+        }
+
+        > span {
+          margin-left: 5px;
+        }
+      }
+    }
+
+  }
+
+}
+
+.el-scrollbar .el-scrollbar__wrap {
+  overflow-x: hidden;
+}
+
+::-webkit-scrollbar {
+  float: right;
+  width: 4px;
+  height: 4px;
+  background-color: white;
+}
+
+::-webkit-scrollbar-thumb {
+  border-radius: 16px;
+  background-color: #efefef;
+}
+
+</style>
--- a/src/components/DetailComponent/ProjectApply.vue
+++ b/src/components/DetailComponent/ProjectApply.vue
@@ -18,10 +18,11 @@
                      @getAttachment="getAttachment"
                      @getOtherFile="getOtherFile" :showFileList="true" :formData="localFormData"
                      :preview="mode == 'resubmit'"/>
-    <div v-if="mode === 'resubmit'&&!changeDiagram">
+    <div>
      <div class="approval-record">
        <div class="approval-title">
-          <baseTitle title="审批记录"></baseTitle>
+          <baseTitle title="审批记录" v-if="mode === 'resubmit'"></baseTitle>
+          <div v-else></div>
          <div class="diagram">
            <div class="base-title">流程图</div>
            <el-switch
@@ -30,28 +31,30 @@
            />
          </div>
        </div>
-      </div>
-      <div class="process">
-        <operation-render :operation-list="data.operationList" :state="data.state"/>
-      </div>
-    </div>
-    <div v-if="changeDiagram">
-      <div class="approval-record">
-        <div class="approval-title">
-          <baseTitle title="流程图"></baseTitle>
-          <div class="diagram">
-<!--            <div class="base-title">流程图</div>-->
-<!--            <el-switch-->
-<!--                v-model="changeDiagram"-->
-<!--                style="&#45;&#45;el-switch-on-color: #13ce66; &#45;&#45;el-switch-off-color:#BEA266"-->
-<!--            />-->
-          </div>
+        <div class="process">
+          <operation-render  v-if="mode === 'resubmit'&&!changeDiagram" :operation-list="data.operationList" :state="data.state"/>
+          <process-diagram-viewer mode="view" :idName="title" v-if="processDiagramViewer&&changeDiagram"/>
        </div>
      </div>
-      <div class="process">
-        <process-diagram-viewer mode="view" :idName="title" v-if="processDiagramViewer"/>
-      </div>
+
    </div>
+<!--    <div v-if="changeDiagram">-->
+<!--      <div class="approval-record">-->
+<!--        <div class="approval-title">-->
+<!--          <baseTitle title="流程图"></baseTitle>-->
+<!--          <div class="diagram">-->
+<!--&lt;!&ndash;            <div class="base-title">流程图</div>&ndash;&gt;-->
+<!--&lt;!&ndash;            <el-switch&ndash;&gt;-->
+<!--&lt;!&ndash;                v-model="changeDiagram"&ndash;&gt;-->
+<!--&lt;!&ndash;                style="&#45;&#45;el-switch-on-color: #13ce66; &#45;&#45;el-switch-off-color:#BEA266"&ndash;&gt;-->
+<!--&lt;!&ndash;            />&ndash;&gt;-->
+<!--          </div>-->
+<!--        </div>-->
+<!--      </div>-->
+<!--      <div class="process">-->
+<!--        <process-diagram-viewer mode="view" :idName="title" v-if="processDiagramViewer"/>-->
+<!--      </div>-->
+<!--    </div>-->
    <div class="oper-page-btn">
      <el-button color="#DED0B2" v-if="mode === 'submit'" @click="handleSubmit">提交</el-button>
      <el-button color="#DED0B2" v-else-if="mode === 'resubmit'" @click="handleSubmit">重新提交</el-button>
@@ -80,7 +83,7 @@
          <template #default="scope">
            <div style="display: flex;align-items: center">
              <el-button type="primary" @click="chooseProProcess(scope.row)" link>选择</el-button>
-              <a :href="scope.row.baseUrl" target="_blank" style="color: #2a99ff;margin-left: 10px">查看详情</a>
+              <a :href="scope.row.baseUrl" target="_blank" style="color: #2a99ff;margin-left: 10px">查看流程</a>
            </div>
          </template>
        </el-table-column>
@@ -113,7 +116,7 @@ import Paging from "@/components/pagination/index.vue";

 const router = useRouter()
 const route = useRoute()
-const changeDiagram = ref(true)
+const changeDiagram = ref(false)
 const emit = defineEmits(["getAttachment", "getOtherFile"])
 const props = defineProps({
  title: {
@@ -392,7 +395,6 @@ watchEffect(() => {
 })

 onMounted(async () => {
-  // changeDiagram.value = props.mode === 'submit';
  await init()
 })
 </script>
--- a/src/components/TagAndFileUpload.vue
+++ b/src/components/TagAndFileUpload.vue
@@ -70,7 +70,8 @@ const tableConfig = reactive({
    {
      prop: 'tag',
      label: '文件大小',
-      align: 'center'
+      align: 'center',
+      currentRender: ({row, index}) => (parseInt(row.size / 1024) + 'KB')
    },
    {
      prop: 'oper',
--- a/src/views/expense-management/share/add.vue
+++ b/src/views/expense-management/share/add.vue
@@ -125,8 +125,14 @@
      <el-button type="primary" @click="handleAdd" link style="font-size: 18px">添加一行</el-button>
    </div>
    <div class="approval-record">
-      <baseTitle title="流程"></baseTitle>
-      <process-diagram-viewer mode="view" v-if="processDiagramViewer"/>
+      <div style="display: flex;align-items: center;margin-bottom: 20px">
+        <baseTitle title="流程图"></baseTitle>
+        <el-switch
+            v-model="changeDiagram"
+            style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266;margin-left: 10px"
+        />
+      </div>
+      <process-diagram-viewer mode="view" v-if="processDiagramViewer&&changeDiagram"/>
    </div>
    <div class="oper-page-btn">
      <el-button color="#DED0B2" v-if="routerName==='Share/add'" @click="handleSubmit(form)">提交</el-button>
@@ -143,6 +149,7 @@ import {addAllocation, getAllocationDetail, getAllocationProcess, getResearchUse
 import {useProcessStore} from '@/stores/processStore.js';
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';

+const changeDiagram = ref(false)
 const rules = reactive({
  shareName: [{required: true, message: '请输入分摊名称', trigger: 'blur'}],
  apportionmentMonth: [{required: true, message: '请选择月份', trigger: 'blur'}],
@@ -171,13 +178,13 @@ const formData = ref({
      projectId:'',
      projectName: '',
      researchPersonnel:'',
-      wagesPayable:'',
-      performance:'',
-      reserveFund:'',
-      socialSecurity:'',
-      annuity:'',
-      workday:'',
-      researchDuration:''
+      wagesPayable:null,
+      performance:null,
+      reserveFund:null,
+      socialSecurity:null,
+      annuity:null,
+      workday:'21.75',
+      researchDuration:null,
    }
  ]
 })
@@ -207,19 +214,30 @@ const handleAdd = () => {
    projectId: '',
    projectName: '',
    researchPersonnel: '',
-    wagesPayable: '',
-    performance: '',
-    reserveFund: '',
-    socialSecurity: '',
-    annuity: '',
-    workday: '',
-    researchDuration: '',
-    // subtotal: '',
+    wagesPayable:null,
+    performance:null,
+    reserveFund:null,
+    socialSecurity:null,
+    annuity:null,
+    workday:'21.75',
+    researchDuration:null,
  }
  formData.value.tableData.push(row)
 }
 const handleCopy = (row) => {
-  formData.value.tableData.push(row)
+  let copyObj = {
+    projectId: row.projectId,
+    projectName: '',
+    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)
@@ -243,7 +261,7 @@ const handleSubmit = (instance) => {
      usrAllocations: formData.value.tableData,
      deploymentId: processInstanceData.value.deploymentId,
    }
-    console.log('params',params)
+    // console.log('params',params)
    const {code, msg} = await addAllocation(params)
    ElNotification({
      title: '提示',
@@ -279,7 +297,7 @@ const handleResubmit = (instance) => {
      usrAllocations: formData.value.tableData,
      deploymentId: processInstanceData.value.deploymentId,
    }
-    console.log('params',params)
+    // console.log('params',params)
    const {code, msg} = await editAllocation(params)
    ElNotification({
      title: '提示',
@@ -321,7 +339,6 @@ const getDetailList = async () => {
      item.researchPersonnel = Number(item.researchPersonnel)
    })
    formData.value.tableData = data.rows
-    console.log('formData.value.tableData',formData.value.tableData)
    nextTick(() => {
      showTable.value = true
    })
--- a/src/views/project-demand/requirement/add.vue
+++ b/src/views/project-demand/requirement/add.vue
@@ -34,7 +34,7 @@
        </el-col>
        <el-col :span="24">
          <el-form-item label="所属公司" prop="companyIds" class="tree-select">
-<!--            <el-button @click="showCompany">请选择</el-button>-->
+            <!--            <el-button @click="showCompany">请选择</el-button>-->
            <el-tree-select v-model="formData.companyIds" :data="companyOption"
                            filterable clearable :check-strictly="true" multiple/>
          </el-form-item>
@@ -79,8 +79,14 @@
      </template>
    </fvTable>
    <div class="approval-record">
-      <baseTitle title="流程"></baseTitle>
-      <process-diagram-viewer mode="view" v-if="processDiagramViewer"/>
+      <div style="display: flex;align-items: center;margin-bottom: 20px">
+        <baseTitle title="流程图"></baseTitle>
+        <el-switch
+            v-model="changeDiagram"
+            style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266;margin-left: 10px"
+        />
+      </div>
+      <process-diagram-viewer mode="view" v-if="processDiagramViewer&&changeDiagram"/>
    </div>
    <div class="oper-page-btn">
      <el-button color="#DED0B2" v-if="routerName==='Requirement/add'" @click="handleSubmit(demandForm)">提交</el-button>
@@ -109,6 +115,7 @@ import {getSubCompOpt} from '@/api/user/user.js'
 import {useTagsView} from '@/stores/tagsview.js'
 import {getFundOption} from "@/api/special-fund";

+const changeDiagram = ref(false)
 const tagsViewStore = useTagsView()
 const authStore = useAuthStore()
 const router = useRouter()
@@ -389,7 +396,8 @@ onMounted(async () => {
 :deep(.el-empty__description) {
  margin-top: 0;
 }
-.tree-select{
+
+.tree-select {
  :deep(.el-form-item__content .el-select__wrapper ) {
    width: 750px;
  }
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -237,8 +237,14 @@
                      @getOtherFile="getOtherFile" :showFileList="true" :formData="formData"
                      :preview="name === 'Summary/edit'"/>
    <div class="approval-record">
-      <baseTitle title="流程"></baseTitle>
-      <process-diagram-viewer mode="view" v-if="processDiagramViewer"/>
+      <div style="display: flex;align-items: center;margin-bottom: 20px">
+        <baseTitle title="流程图"></baseTitle>
+        <el-switch
+            v-model="changeDiagram"
+            style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266;margin-left: 10px"
+        />
+      </div>
+      <process-diagram-viewer mode="view" v-if="processDiagramViewer&&changeDiagram"/>
    </div>
    <div class="oper-page-btn">
      <!--      <el-button type="info" @click="staging">存为草稿</el-button>-->
@@ -261,6 +267,7 @@ import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.v
 import {getFormInfo} from "@/api/project-demand";
 import {getFundOption} from "@/api/special-fund";

+const changeDiagram = ref(false)
 const cacheStore = useCacheStore()
 const processStore = useProcessStore()
 const router = useRouter()
--- a/src/views/project-management/filing/upload.vue
+++ b/src/views/project-management/filing/upload.vue
@@ -1,7 +1,7 @@
 <template>
  <baseTitle title="基础信息"></baseTitle>
  <fvForm :schema="schema" @getInstance="(e)=>baseForm = e"></fvForm>
-  <baseTitle title="上传附件"></baseTitle>
+  <baseTitle :title="getName()+'-上传附件'"></baseTitle>
  <el-card style="width: 100%;margin: 15px 0">
    <file-upload @getFile="getFile" />
    <fvTable style="width: 100%;max-height: 300px;" v-if="showTable" :tableConfig="tableConfig"
@@ -102,25 +102,21 @@ const getBaseInfo = async () => {
 }

 getBaseInfo()
-const compositeParam = (item) => {
-  let tag=''
+const getName=()=>{
  switch (route.query.name) {
    case '00':
-      tag='需求征集'
-      break
+      return '需求征集'
    case '10':
-      tag='需求上报'
-      break
+      return '需求上报'
    case '20':
-      tag='项目立项'
-      break
+      return '项目立项'
    case '40':
-      tag='项目实施'
-      break
+      return '项目实施'
    case '50':
-      tag='项目归档'
-      break
+      return '项目归档'
  }
+}
+const compositeParam = (item) => {
  return {
    fileId: item.id,
    size: item.size,
@@ -128,7 +124,7 @@ const compositeParam = (item) => {
    fileType: item.fileType,
    url: item.url,
    newFile: true,
-    tag: tag,
+    tag: getName(),
  }
 }
 const getFile = (val) => {
--- a/src/views/project-management/implementation/phase.vue
+++ b/src/views/project-management/implementation/phase.vue
@@ -13,8 +13,14 @@
                      @getOtherFile="getOtherFile" :showFileList="true" :formData="formData"
                      :preview="name === 'Phase/edit'"/>
    <div class="approval-record">
-      <baseTitle title="流程"></baseTitle>
-      <process-diagram-viewer mode="view" v-if="processDiagramViewer"/>
+      <div style="display: flex;align-items: center;margin-bottom: 20px">
+        <baseTitle title="流程图"></baseTitle>
+        <el-switch
+            v-model="changeDiagram"
+            style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266;margin-left: 10px"
+        />
+      </div>
+      <process-diagram-viewer mode="view" v-if="processDiagramViewer&&changeDiagram"/>
    </div>
    <div class="oper-page-btn">
      <el-button color="#DED0B2" v-if="name==='Phase/change'" @click="handleSubmit">提交</el-button>
@@ -34,6 +40,7 @@ import {useTagsView} from '@/stores/tagsview.js'
 import {computed, ref} from "vue";
 import {getBaseInfoApi} from "@/components/steps/api";

+const changeDiagram = ref(false)
 const tagsViewStore = useTagsView()
 const router = useRouter()
 const route = useRoute()
--- a/src/views/project-management/implementation/upload.vue
+++ b/src/views/project-management/implementation/upload.vue
@@ -1,7 +1,7 @@
 <template>
  <baseTitle title="基础信息"></baseTitle>
  <fvForm :schema="schema" @getInstance="(e)=>baseForm = e"></fvForm>
-  <baseTitle title="标签名称"></baseTitle>
+  <baseTitle title="项目实施-上传附件"></baseTitle>
  <el-form :model="formData" ref="tagForm" label-width="auto" :rules="rules">
    <el-form-item label="标签名称" prop="tagName">
      <el-input v-model="formData.tagName" placeholder="请输入标签名称" style="width: 300px" v-if="showInput"/>
@@ -87,9 +87,10 @@ const tableConfig = reactive({
      align: 'center'
    },
    {
-      prop: 'tag',
+      prop: 'size',
      label: '文件大小',
-      align: 'center'
+      align: 'center',
+      currentRender: ({row, index}) => (parseInt(row.size / 1024) + 'KB')
    },
    {
      prop: 'oper',
--- a/src/views/special-fund/add.vue
+++ b/src/views/special-fund/add.vue
@@ -27,8 +27,14 @@
      </template>
    </fvTable>
    <div class="approval-record">
-      <baseTitle title="流程"></baseTitle>
-      <process-diagram-viewer mode="view" v-if="processDiagramViewer"/>
+      <div style="display: flex;align-items: center;margin-bottom: 20px">
+        <baseTitle title="流程图"></baseTitle>
+        <el-switch
+            v-model="changeDiagram"
+            style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266;margin-left: 10px"
+        />
+      </div>
+      <process-diagram-viewer mode="view" v-if="processDiagramViewer&&changeDiagram"/>
    </div>
    <div class="oper-page-btn">
      <el-button color="#DED0B2" v-if="routerName === 'Fund/add'" @click="handleSubmit(fundForm)">提交</el-button>
@@ -47,6 +53,7 @@ import {useTagsView} from '@/stores/tagsview.js'
 import {useProcessStore} from '@/stores/processStore.js';
 import {downloadFile, deleteFile} from "@/api/project-demand";

+const changeDiagram = ref(false)
 const tagsViewStore = useTagsView()
 const router = useRouter()
 const route = useRoute()
@@ -58,7 +65,7 @@ const fundForm = ref()
 const processDiagramViewer = ref(false)
 const formData = ref({
  name: '',
-  fundAmount: '',
+  fundAmount: null,
  introduce: '',
  files: []
 })