Merge pull request 'master' (#281) from master into prod

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/281

src/api/project-demand/index.js

@@ -82,18 +82,3 @@ export const deleteDemand = (id) => {
     method: "delete"
   });
 };
-//需求征集附件列表(归档)
-export const getRequirementAttachment = (params) => {
-  return request({
-    url: '/workflow/mosr/requirement/attachments',
-    method: "get",
-    params:params
-  });
-};
-export const uploadRequirementAttachment= (data) => {
-  return request({
-    url: '/workflow/mosr/requirement/upload',
-    method: "post",
-    data: data
-  });
-};

src/api/project-manage/attachment.js

@@ -8,3 +8,10 @@ export const searchFileList = (params) => {
         params: params
     });
 };
+export const uploadFileList = (data) => {
+    return request({
+        url: '/workflow/mosr/attachment/upload',
+        method: "post",
+        data: data
+    });
+};

src/api/project-manage/index.js

@@ -34,13 +34,6 @@ export const getInitiationAttachment = (params) => {
     params:params
   });
 };
-export const uploadInitiationAttachment= (data) => {
-  return request({
-    url: '/workflow/mosr/project/approval/upload',
-    method: "post",
-    data: data
-  });
-};
 //项目实施
 export const getCheckDetail = (projectId) => {
   return request({
@@ -69,20 +62,7 @@ export const getProjectCheckProcess = (projectId) => {
     method: "get"
   });
 };
-export const getImplementationAttachment = (params) => {
+
-  return request({
-    url: '/workflow/mosr/project/implementation/attachments',
-    method: "get",
-    params:params
-  });
-};
-export const uploadAttachment= (data) => {
-  return request({
-    url: '/workflow/mosr/project/implementation/upload',
-    method: "post",
-    data: data
-  });
-};
 export const addLedger = (data) => {
   return request({
     url: '/workflow/mosr/expense/ledger',
@@ -97,6 +77,39 @@ export const getTags = (projectId) => {
     method: "get"
   });
 };
+export const getPhaseProcess = () => {
+  return request({
+    url: '/workflow/phase/change/process',
+    method: "get"
+  });
+};
+export const submitPhaseChange = (data) => {
+  return request({
+    url: '/workflow/phase/change',
+    method: "post",
+    data: data
+  });
+};
+export const getPhaseDetail = (projectId) => {
+  return request({
+    url: `/workflow/phase/change/info/${projectId}`,
+    method: "get"
+  });
+};
+export const getPhaseForm = (projectId) => {
+  return request({
+    url: `/workflow/phase/change/from/${projectId}`,
+    method: "get"
+  });
+};
+export const resubmitPhaseForm = (data) => {
+  return request({
+    url: '/workflow/phase/change/resubmit',
+    method: "post",
+    data: data
+  });
+};
+
 //项目归档
 export const getConclusionDetail = (ProjectId) => {
   return request({
@@ -125,17 +138,3 @@ export const getProjectConclusionProcess = () => {
     method: "get"
   });
 };
-export const getFilingAttachment = (params) => {
-  return request({
-    url: '/workflow/mosr/project/filing/attachments',
-    method: "get",
-    params:params
-  });
-};
-export const uploadFilingAttachment= (data) => {
-  return request({
-    url: '/workflow/mosr/project/filing/upload',
-    method: "post",
-    data: data
-  });
-};

src/assets/styles/index.scss

@@ -377,8 +377,8 @@ html, body, #app, .el-container, .el-aside, .el-main {
 //放大缩小按钮上外边距
 .scale {
   margin-top: 10px;
-  z-index: 666;
+  //z-index: 666;
-  position: static;
+  //position: static;
   //top: -20px;
 }
 

src/components/AttachmentUpload.vue

@@ -4,12 +4,12 @@
       <el-col :span="24">
         <el-form-item :label="label" prop="attachment">
           <template v-if="preview&&JSON.stringify(singleFile) !== '{}'&&JSON.stringify(singleFile)!=='null'">
-            <el-button type="primary" link @click="handleDownload(singleFile)" style="font-size: 18px">
+            <el-button type="primary" link @click="handleDownload(singleFile)" style="font-size: 16px">
               {{ singleFile?.originalFileName }}
             </el-button>
-            <el-button type="danger" link @click="deleteOtherFile(singleFile,1)">删除</el-button>
+            <el-button type="danger" link @click="deleteSingleFile(singleFile,1)">删除</el-button>
           </template>
-          <template v-else-if="!preview||JSON.stringify(singleFile) === '{}'||singleFile==null">
+          <template v-else-if="!preview||JSON.stringify(singleFile) == '{}'||singleFile==null">
             <file-upload @getFile="getAttachment" :showFileList="showFileList" :multiple="false" :maxSize="1"
                          :disabled="isSingleFile" @delete="deleteAttachment"/>
           </template>
@@ -133,14 +133,13 @@ watch(() => props.showTable, (newVal) => {
 watch(() => props.otherFileList, (newVal) => {
   console.log('newotherFileList', newVal)
   if (props.preview) {
-    if (props.formData.fileList == null) {
+    if (props.formData.fileList.length===0) {
       allFileList.value = newVal
     } else {
       newVal?.forEach(item => {
         allFileList.value.push(item)
       })
     }
-
   } else {
     allFileList.value = newVal
   }
@@ -176,7 +175,7 @@ const deleteAttachment = (val) => {
     }
   });
 }
-const deleteOtherFile = (row, type) => {
+const deleteSingleFile = (row, type) => {
   ElMessageBox.confirm(`确认删除名称为${row.originalFileName}的表格吗?`, '系统提示', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
@@ -189,6 +188,7 @@ const deleteOtherFile = (row, type) => {
         type: res.code === 1000 ? 'success' : 'error'
       })
       if (res.code === 1000) {
+        isSingleFile.value=false
         if (type === 1) {
           singleFile.value = {}
         } else {

src/components/DetailComponent/ApprovalDetail.vue

@@ -55,19 +55,9 @@ const props = defineProps({
     default: false
   }
 })
-watch(() => props.loading, (newVal) => {
-  props.loading = newVal
-}, {deep: true})
 const form = ref()
-
-const localData = reactive({
-  fileList: props.formData.fileList,
-  singleFile: props.formData.singleFile
-})
-
 const schema = computed(()=>{
   let arr
-
   if(props.type == 'approval') {
     arr = [
       {
@@ -86,7 +76,7 @@ const schema = computed(()=>{
         component: ()=>(
           <div>
             {
-              props.formData.singleFile?.originalFileName ?
+              props.formData.singleFile?.originalFileName?
               <span
                 style={{color: '#409EFF', cursor: 'pointer'}}
                 onClick={()=>handleDownload(props.formData.singleFile)}
@@ -118,7 +108,7 @@ const schema = computed(()=>{
         component: ()=>(
             <div>
               {
-                props.formData.singleFile?.originalFileName ?
+                props.formData.singleFile?.originalFileName?
                     <span
                         style={{color: '#409EFF', cursor: 'pointer'}}
                         onClick={()=>handleDownload(props.formData.singleFile)}
@@ -143,7 +133,7 @@ const schema = computed(()=>{
         component: ()=>(
             <div>
               {
-                props.formData.singleFile?.originalFileName ?
+                props.formData.singleFile?.originalFileName?
                     <span
                         style={{color: '#409EFF', cursor: 'pointer'}}
                         onClick={()=>handleDownload(props.formData.singleFile)}
@@ -172,10 +162,13 @@ const handleDownload = (row) => {
     loading.close()
   })
 }
-
 watchEffect(()=>{
   Object.keys(props.formData).length && (form.value.setValues(props.formData))
 })
+
+watch(() => props.loading, (newVal) => {
+  props.loading = newVal
+}, {deep: true})
 </script>
 
 <style lang="scss" scoped>

src/components/DetailComponent/CollectionDetail.vue

@@ -1,27 +1,32 @@
 <template>
   <div v-loading="loading">
-    <el-form :model="formData" ref="form" label-width="auto">
+    <el-form :model="formData" label-width="auto">
       <el-row>
         <el-col :span="12">
-          <el-form-item label="名称">
+          <el-form-item label="征集名称">
             <span>{{ formData.requirementName }}</span>
           </el-form-item>
         </el-col>
-<!--        <el-col :span="12">-->
-<!--          <el-form-item label="所属公司">-->
-<!--            <span>{{ formData.companyIds }}</span>-->
-<!--          </el-form-item>-->
-<!--        </el-col>-->
         <el-col :span="12">
           <el-form-item label="征集类型">
             <span>{{ formData.collectType }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="24">
+        <el-col :span="12" v-if="type==='singleDetail'">
+          <el-form-item label="所属公司">
+            <span>{{ formData.companyIds }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="type==='singleDetail'?12:24">
           <el-form-item label="截止时间">
             <span>{{ formData.deadline }}</span>
           </el-form-item>
         </el-col>
+        <el-col :span="24" v-if="formData.isSpecialFund">
+          <el-form-item label="专项资金">
+            <span>{{ formData.specialFund }}</span>
+          </el-form-item>
+        </el-col>
         <baseTitle title="征集说明"></baseTitle>
         <el-col :span="24">
           <el-form-item>
@@ -31,29 +36,11 @@
             </el-card>
           </el-form-item>
         </el-col>
-        <baseTitle title="附件列表"></baseTitle>
+        <baseTitle v-if="fileListShow === 'READ' || fileListShow === 'EDIT'" title="附件列表"></baseTitle>
         <el-col :span="24">
-          <el-form-item>
+          <file-component title="" tag="需求征集"
-            <fvTable style="width: 100%;max-height: 200px" v-if="processViewer" :tableConfig="tableConfig"
+                          v-model:value="formData.fileList" :processViewer="processViewer"
-                     :data="formData.fileList" :isSettingCol="false" :pagination="false">
+                          :file-list-show="fileListShow"/>
-              <template #empty>
-                <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
-              </template>
-            </fvTable>
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <div v-if="formData.taskId">
-            <baseTitle title="审核意见"></baseTitle>
-            <el-form-item prop="auditOpinion">
-              <el-input
-                  v-model="formData.auditOpinion"
-                  :rows="3"
-                  type="textarea"
-                  placeholder="请输入审核意见"
-              />
-            </el-form-item>
-          </div>
         </el-col>
       </el-row>
       <div class="approval-record">
@@ -73,10 +60,6 @@ import OperationRender from '@/views/workflow/common/OperationRender.vue'
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue'
 import {downloadFile} from "@/api/project-demand";
 
-const emit = defineEmits(['getInfo',"update:formData"])
-const form = ref()
-const showTable = ref(false)
-
 const props = defineProps({
   formData: {
     type: Array,
@@ -93,48 +76,20 @@ const props = defineProps({
   companyOption: {
     type: Array,
     default: []
-  }, loading: {
+  },
+  loading: {
     type: Boolean,
     default: false
+  },
+  fileListShow: {
+    type: String,
+    default: ''
+  },
+  type: {
+    type: String,
+    default: ''
   }
 })
-const tableConfig = reactive({
-  columns: [
-    {
-      prop: 'index',
-      type: 'index',
-      label: '序号',
-      align: 'center',
-      width: '80',
-    },
-    {
-      prop: 'originalFileName',
-      label: '文件名',
-      align: 'center',
-    },
-    {
-      prop: 'tag',
-      label: '标签',
-      align: 'center'
-    },
-    {
-      prop: 'size',
-      label: '文件大小',
-      align: 'center',
-      currentRender: ({row, index}) => (parseInt(row.size / 1024) + 'KB')
-    },
-    {
-      prop: 'oper',
-      label: '操作',
-      align: 'center',
-      currentRender: ({row, index}) => {
-        return (
-            <el-button type="primary" link onClick={() => handleDownload(row)}>下载</el-button>
-        )
-      }
-    }
-  ]
-})
 const handleDownload = (row) => {
   downloadFile(row.fileId).then(res => {
     const blob = new Blob([res])
@@ -154,6 +109,16 @@ watch(() => props.processViewer, (newVal) => {
 }, {deep: true})
 </script>
 
-<style scoped>
+<style scoped lang="scss">
+:deep(.el-empty__description) {
+  margin-top: 0;
+}
 
+.approval-record {
+  padding-bottom: 30px;
+
+  .process {
+    position: relative;
+  }
+}
 </style>

src/components/DetailComponent/FileComponent.vue

@@ -1,7 +1,7 @@
 <template>
-  <el-form-item label="需求上报附件" v-if="fileListShow === 'READ' || fileListShow === 'EDIT'">
+  <el-form-item :label="title" v-if="fileListShow === 'READ' || fileListShow === 'EDIT'">
     <file-upload @getFile="getOtherFile" v-if="fileListShow === 'EDIT'"/>
-    <fvTable style="width: 100%;max-height: 400px;" v-if="processViewer" :tableConfig="tableConfig"
+    <fvTable style="width: 100%;max-height: 300px;" v-if="processViewer" :tableConfig="tableConfig"
              :data="_value" :isSettingCol="false" :pagination="false">
       <template #empty>
         <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
@@ -11,10 +11,8 @@
 </template>
 
 <script setup lang="jsx">
-
 import {downloadFile, deleteFile} from "@/api/project-demand";
-import {ElMessage, ElMessageBox} from "element-plus";
+import {ElMessageBox, ElNotification} from "element-plus";
-
 
 const props = defineProps({
   title: {
@@ -38,9 +36,7 @@ const props = defineProps({
     default: false
   },
 })
-
+const emit = defineEmits(['update:value'])
-
-
 const tableConfig = reactive({
   columns: [
     {
@@ -123,11 +119,18 @@ const compositeParam = (item, type) => {
     fileType: item.fileType,
     url: item.url,
     newFile: true,
-    tag: '需求上报'
+    tag: props.tag
   }
 }
-
+const handleDownload = (row) => {
-
+  downloadFile(row.fileId).then(res => {
+    const blob = new Blob([res])
+    let a = document.createElement('a')
+    a.href = URL.createObjectURL(blob)
+    a.download = row.originalFileName
+    a.click()
+  })
+}
 const handleDelete = (row) => {
   ElMessageBox.confirm(`确认删除名称为${row.originalFileName}的表格吗?`, '系统提示', {
     confirmButtonText: '确定',
@@ -135,13 +138,21 @@ const handleDelete = (row) => {
     type: 'warning'
   }).then(() => {
     deleteFile(row.fileId).then(res => {
+      ElNotification({
+        title: '提示',
+        message: res.msg,
+        type: res.code === 1000 ? 'success' : 'error'
+      })
       if (res.code === 1000) {
-        ElMessage.success("删除成功");
+        _value.value.splice(_value.value.findIndex((item) => item.id === row.fileId), 1);
-        _value.splice(_value.findIndex((item) => item.id === row.fileId), 1);
       }
     });
   }).catch(() => {
-    ElMessage.warning("用户取消删除! ");
+    ElNotification({
+      title: '提示',
+      message: '用户取消删除! ',
+      type: 'warning'
+    })
   })
 }
 
@@ -151,5 +162,7 @@ watch(() => props.processViewer, (newVal) => {
 </script>
 
 <style scoped>
-
+:deep(.el-table--fit ) {
+  height: 300px !important;
+}
 </style>

src/components/DetailComponent/Opinion.vue

@@ -10,7 +10,6 @@
 <script setup lang="jsx">
 import {ElNotification} from 'element-plus';
 import {agreeTask, rejectTask} from "@/api/project-demand/index.js";
-
 import {useTagsView} from '@/stores/tagsview.js'
 
 const tagsViewStore = useTagsView()
@@ -94,6 +93,9 @@ const back = () => {
     case 'Share/detail':
       router.push({name: 'Expense/share'})
       break;
+    case 'Phase/detail':
+      router.push({name: 'Implementation'})
+      break;
   }
 }
 // 驳回

src/components/DetailComponent/SummaryDetail.vue

@@ -126,7 +126,7 @@
         </el-col>
         <el-col :span="24">
           <el-form-item label="需求上报申请书">
-            <el-button type="primary" link @click="handleDownload(localFormData.singleFile)">
+            <el-button type="primary" link @click="handleDownload(localFormData.singleFile)" style="font-size: 16px">
               {{ localFormData.singleFile?.originalFileName }}
             </el-button>
           </el-form-item>

src/components/SearchFilesByTag.vue

@@ -20,7 +20,7 @@
   </el-form>
   <el-card style="width: 100%">
     <fvTable style="width: 100%;max-height: 250px" v-if="showTable" :tableConfig="tableConfig"
-             :data="otherFileList" :isSettingCol="false" :pagination="false">
+             :data="fileList" :isSettingCol="false" :pagination="false">
       <template #empty>
         <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
       </template>
@@ -38,7 +38,7 @@ const router = useRouter()
 const attachment = reactive({})
 const emit = defineEmits(['search'])
 const props = defineProps({
-  otherFileList: {
+  fileList: {
     type: Array,
     default: []
   },
@@ -61,7 +61,7 @@ const tableConfig = reactive({
     },
     {
       prop: 'tag',
-      label: '自定义标签',
+      label: '标签',
       align: 'center'
     },
     {
@@ -123,12 +123,12 @@ const handleDownload = (row) => {
 watch(() => props.type, (val) => {
   props.type = val
 })
-watch(() => props.otherFileList, (val) => {
+watch(() => props.fileList, (val) => {
   showTable.value = false
   nextTick(() => {
     showTable.value = true
   })
-  props.otherFileList = val
+  props.fileList = val
 })
 if (props.type === '40') {
   getTagsOption()

src/components/steps/index.vue

@@ -220,7 +220,6 @@ const formatActive = (val) => {
 }
 
 const stepClass = (val) => {
-  console.log('localStepSuccess.value',localStepSuccess.value,val)
   if (localStepSuccess.value.includes(val)) {
     return 'step-success'
   }
@@ -228,7 +227,6 @@ const stepClass = (val) => {
 }
 
 const handleStep = (key, index) => {
-  console.log('key, index',key, index)
   if (localStepSuccess.value.includes(index)) {
     let active = ''
     localActive.value = index

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

@@ -1,229 +1,45 @@
 <template>
-  <div class="detail-block" v-loading="loading">
+  <baseTitle title="需求征集详情"></baseTitle>
-    <el-form :model="formData" ref="demandForm" label-width="auto" :rules="rules">
+  <collection-detail :formData="collectData.formData" :data="collectData" type="singleDetail"
-      <baseTitle title="需求征集详情"></baseTitle>
+                     :fileListShow="fileListShow"
-      <el-row>
+                     :processViewer="processViewer" :loading="loading"/>
-        <el-col :span="12">
+  <opinion v-if="collectData.taskId" :formData="formData" :taskId="collectData.taskId"></opinion>
-          <el-form-item label="名称">
-            <span>{{ formData.requirementName }}</span>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="所属公司">
-            <span>{{ formData.companyIds }}</span>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="征集类型">
-            <span>{{ formData.collectType }}</span>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="截止时间">
-            <span>{{ formData.deadline }}</span>
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" v-if="formData.isSpecialFund">
-          <el-form-item label="专项资金">
-            <span>{{ formData.specialFund }}</span>
-          </el-form-item>
-        </el-col>
-        <baseTitle title="征集说明"></baseTitle>
-        <el-col :span="24">
-          <el-form-item>
-            <el-card style="width: 100%">
-              <div v-html="formData.collectExplain">
-              </div>
-            </el-card>
-          </el-form-item>
-        </el-col>
-        <baseTitle v-if="fileListShow === 'READ' || fileListShow === 'EDIT'" title="附件列表"></baseTitle>
-        <el-col :span="24" v-if="fileListShow === 'READ' || fileListShow === 'EDIT'">
-          <el-form-item>
-            <file-upload v-if="fileListShow === 'EDIT'" @getFile="getFile"/>
-            <fvTable style="width: 100%;max-height: 600px;height: 600px" v-if="showTable" :tableConfig="tableConfig"
-                     :data="formData.fileList" :isSettingCol="false"
-                     :pagination="false">
-              <template #empty>
-                <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
-              </template>
-            </fvTable>
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <div class="approval-record">
-            <baseTitle title="审批记录"></baseTitle>
-            <div class="process">
-              <operation-render v-if="processDiagramViewer" :operation-list="processInstanceData.operationList"
-                                :state="processInstanceData.state"/>
-              <process-diagram-viewer v-if="processDiagramViewer"/>
-            </div>
-          </div>
-        </el-col>
-        <el-col :span="24">
-          <div v-if="processInstanceData.taskId">
-            <baseTitle title="审核意见"></baseTitle>
-            <el-form-item prop="auditOpinion">
-              <el-input
-                  v-model="formData.auditOpinion"
-                  :rows="3"
-                  type="textarea"
-                  placeholder="请输入审核意见"
-              />
-            </el-form-item>
-          </div>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div class="oper-page-btn" v-if="processInstanceData.state === '1' && processInstanceData.taskId">
-      <el-button type="danger" @click="handleReject(demandForm)">驳回</el-button>
-      <el-button color="#DED0B2" @click="handleSubmit">同意</el-button>
-    </div>
-  </div>
 </template>
 
 <script setup lang="jsx">
-import OperationRender from '@/views/workflow/common/OperationRender.vue'
+import {useProcessStore} from '@/stores/processStore.js'
-import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue'
+import {getInfo} from "@/api/project-demand/index.js";
-import {useProcessStore} from '@/stores/processStore.js';
+import {ElNotification} from "element-plus";
-import {getInfo, agreeTask, rejectTask,
-  deleteFile,downloadFile} from "@/api/project-demand/index.js";
-import {getSubCompOpt} from '@/api/user/user.js'
-import {ElMessage, ElMessageBox, ElNotification} from "element-plus";
 import {useTagsView} from '@/stores/tagsview.js'
-import {matterTree} from '@/utils/matterTree.js';
 import {getFundOption} from "@/api/special-fund";
-
+import {getSubCompOpt} from "@/api/user/user";
+import {matterTree} from "@/utils/matterTree";
 
 const tagsViewStore = useTagsView()
 const router = useRouter()
 const route = useRoute()
 const form = ref();
 const loading = ref(false)
-const demandForm = ref()
 const processStore = useProcessStore()
-const companyOption = ref([])
 const specialFundOption = ref([])
 const processInstanceData = ref({})
 const fileListShow = ref("READ")
 const showTable = ref(false)
-const processDiagramViewer = ref(false)
+const processViewer = ref(false)
 const processTree = ref()
-const companyNameArray = ref([])
+const collectData = ref([])
 const formData = ref({})
-const rules = reactive({
+const companyOption = ref([])
-  auditOpinion: [{required: true, message: '请输入审核意见', trigger: 'blur'}],
+const companyNameArray = ref([])
-})
-const tableConfig = reactive({
-  columns: [
-    {
-      prop: 'index',
-      type: 'index',
-      label: '序号',
-      align: 'center',
-      width: '80',
-    },
-    {
-      prop: 'originalFileName',
-      label: '文件名',
-      align: 'center',
-    },
-    {
-      prop: 'tag',
-      label: '标签',
-      align: 'center'
-    },
-    {
-      prop: 'size',
-      label: '文件大小',
-      align: 'center',
-      currentRender: ({row, index}) => (parseInt(row.size / 1024) + 'KB')
-    },
-    {
-      prop: 'oper',
-      label: '操作',
-      align: 'center',
-      showOverflowTooltip: false,
-      currentRender: ({row, index}) => {
-        let btn = []
-        btn.push({label: '下载', func: () => handleDownload(row), type: 'primary'})
-        if (row.newFile){
-          btn.push({label: '删除', func: () => handleDelete(row), type: 'primary'})
-        }
-
-        return (
-            <div style={{width: '100%'}}>
-              {
-                btn.map(item => (
-                    <el-button
-                        type={item.type}
-                        onClick={() => item.func()}
-                        link
-                    >
-                      {item.label}
-                    </el-button>
-                ))
-              }
-            </div>
-        )
-      }
-    }
-  ]
-})
-
-
-const handleSubmit = () => {
-  let approve = {
-    taskId: processInstanceData.value.taskId,
-    auditOpinion: formData.value.auditOpinion,
-    formData: formData.value
-  }
-  agreeTask(approve).then(res => {
-    ElNotification({
-      title: '提示',
-      message: res.msg,
-      type: res.code === 1000 ? 'success' : 'error'
-    })
-    if (res.code === 1000) {
-      tagsViewStore.delVisitedViews(router.currentRoute.value.path)
-      router.push({
-        name: 'Requirement'
-      })
-    }
-  })
-}
-const handleReject = (instance) => {
-  if (!instance) return
-  instance.validate(async (valid) => {
-    if (!valid) return
-    let approve = {
-      taskId: processInstanceData.value.taskId,
-      auditOpinion: formData.value.auditOpinion,
-    }
-    rejectTask(approve).then(res => {
-      ElNotification({
-        title: '提示',
-        message: res.msg,
-        type: res.code === 1000 ? 'success' : 'error'
-      })
-      if (res.code === 1000) {
-        tagsViewStore.delVisitedViews(router.currentRoute.value.path)
-        router.push({
-          name: 'Requirement'
-        })
-      }
-    })
-  })
-}
-const getCompanyOption = async () => {
-  const res = await getSubCompOpt()
-  companyOption.value = res.data
-}
 const getFundOptions = async () => {
   const res = await getFundOption()
   specialFundOption.value = res.data
 }
 
+const getCompanyOption = async () => {
+  const res = await getSubCompOpt()
+  companyOption.value = res.data
+}
 const getCompanyOptionItem = (val) => {
   if (val !== undefined) {
     val.forEach(item => {
@@ -232,20 +48,10 @@ const getCompanyOptionItem = (val) => {
   }
   return companyNameArray.value.join('，');
 }
-
-const handleDownload = (row) => {
-  downloadFile(row.fileId).then(res => {
-    const blob = new Blob([res])
-    let a = document.createElement('a')
-    a.href = URL.createObjectURL(blob)
-    a.download = row.originalFileName
-    a.click()
-  })
-}
 const init = async () => {
   if (!route.query.id) return;
-  await getCompanyOption()
   await getFundOptions()
+  await getCompanyOption()
   getInfo(route.query.id).then(res => {
     if (res.code !== 1000) {
       ElNotification({
@@ -256,8 +62,9 @@ const init = async () => {
     }
     loading.value = false
     let data = res.data
-    formData.value = data.formData;
     data.formData.companyIds = getCompanyOptionItem(data.formData.companyIds)
+    collectData.value = data
+    formData.value = data.formData;
     if (data.formData.specialFund) {
       specialFundOption.value.forEach(item => {
         if (data.formData.specialFund == item.value) {
@@ -273,7 +80,7 @@ const init = async () => {
     processStore.refuseList.value = data.refuseList;
     processStore.passList.value = data.passList;
     nextTick(() => {
-      processDiagramViewer.value = true
+      processViewer.value = true
       showTable.value = true
       if (data.formPermMap["fileList"]) {
         fileListShow.value = data.formPermMap["fileList"].perm
@@ -285,55 +92,6 @@ onMounted(async () => {
   loading.value = true
   await init()
 })
-
-
-const getFile = (val) => {
-  showTable.value = false
-  let fileObj = compositeParam(val)
-  formData.value.fileList.push(fileObj)
-  nextTick(() => {
-    showTable.value = true
-  })
-}
-
-
-const compositeParam = (item) => {
-  let tag = ''
-  if (!formData.value.collectType && routerName.value === 'Requirement/add') {
-    tag = '需求征集'
-  }else if(!formData.value.collectType &&routerName.value === 'Requirement/edit'){
-    tag = '需求征集'
-  }if (formData.value.collectType) {
-    tag = formData.value.collectType
-  }
-  return {
-    fileId: item.id,
-    size: item.size,
-    originalFileName: item.originalFilename,
-    fileType: item.fileType,
-    url: item.url,
-    processNodeTag: null,
-    newFile: true,
-    tag: tag,
-  }
-}
-
-const handleDelete = (row) => {
-  ElMessageBox.confirm(`确认删除名称为${row.originalFileName}的表格吗?`, '系统提示', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning'
-  }).then(() => {
-    deleteFile(row.fileId).then(res => {
-      if (res.code === 1000) {
-        ElMessage.success("删除成功");
-        formData.value.fileList.splice(formData.value.fileList.findIndex((item) => item.id === row.fileId), 1);
-      }
-    });
-  }).catch(() => {
-    ElMessage.warning("用户取消删除! ");
-  })
-}
 </script>
 
 <style lang="scss" scoped>
@@ -344,34 +102,35 @@ const handleDelete = (row) => {
 :deep(.el-table--fit ) {
   height: 300px !important;
 }
+
 .detail-block {
   overflow: hidden;
   padding-right: 10px;
 
-  .info {
+  //.info {
-    display: flex;
+  //  display: flex;
-    flex-wrap: wrap;
+  //  flex-wrap: wrap;
+  //
+  //  > div {
+  //    width: 350px;
+  //    margin-bottom: 15px;
+  //    margin-right: 10px;
+  //
+  //    > span:first-child {
+  //      color: black;
+  //      font-size: 16px;
+  //      font-weight: bold;
+  //    }
+  //  }
+  //}
 
-    > div {
+  //.approval-record {
-      width: 350px;
+  //  padding-bottom: 30px;
-      margin-bottom: 15px;
+  //
-      margin-right: 10px;
+  //  .process {
-
+  //    position: relative;
-      > span:first-child {
+  //  }
-        color: black;
+  //}
-        font-size: 16px;
-        font-weight: bold;
-      }
-    }
-  }
-
-  .approval-record {
-    padding-bottom: 30px;
-
-    .process {
-      position: relative;
-    }
-  }
 }
 
 </style>

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

@@ -18,11 +18,11 @@ const authStore = useAuthStore()
 const router = useRouter()
 const searchConfig = reactive([
   {
-    label: '需求名称',
+    label: '征集名称',
     prop: 'requirementName',
     component: 'el-input',
     props: {
-      placeholder: '请输入需求名称查询',
+      placeholder: '请输入征集名称查询',
       clearable: true,
       filterable: true,
       checkStrictly: true
@@ -60,7 +60,7 @@ const tableConfig = reactive({
     },
     {
       prop: 'requirementName',
-      label: '需求名称',
+      label: '征集名称',
       align: 'center'
     },
     {

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

@@ -1,133 +0,0 @@
-<template>
-<!--  <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"/>-->
-<!--    </el-form-item>-->
-<!--  </el-form>-->
-  <baseTitle title="上传附件"></baseTitle>
-  <el-card style="width: 100%;margin: 15px 0">
-    <file-upload @getFile="getFile" />
-    <fvTable style="width: 100%;max-height: 250px;height: 250px" v-if="showTable" :tableConfig="tableConfig"
-             :data="fileList" :isSettingCol="false" :pagination="false">
-      <template #empty>
-        <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
-      </template>
-    </fvTable>
-  </el-card>
-  <div class="oper-page-btn">
-    <el-button color="#DED0B2" @click="handleSubmit">提交</el-button>
-  </div>
-</template>
-
-<script setup lang="jsx">
-import {ElNotification} from "element-plus";
-import {useTagsView} from '@/stores/tagsview.js'
-import {uploadRequirementAttachment} from "@/api/project-demand";
-
-const tagsViewStore = useTagsView()
-const route = useRoute()
-const router = useRouter()
-const fileList = ref([])
-const formData = ref({
-  tagName:''
-})
-const tableConfig = reactive({
-  columns: [
-    {
-      prop: 'index',
-      type: 'index',
-      label: '序号',
-      align: 'center',
-      width: '80',
-    },
-    {
-      prop: 'originalFileName',
-      label: '附件名称',
-      align: 'center',
-    },
-    {
-      prop: 'tag',
-      label: '标签',
-      align: 'center'
-    },
-    {
-      prop: 'size',
-      label: '文件大小',
-      align: 'center'
-    },
-    {
-      prop: 'oper',
-      label: '操作',
-      align: 'center',
-      currentRender: ({row, index}) => {
-        return (
-            <div>
-              <el-button type="primary" link onClick={() => handleDownload(row)}>下载</el-button>
-            </div>
-        )
-      }
-    }
-  ]
-})
-const showTable = ref(true)
-const name = ref(router.currentRoute.value.name)
-const rules = reactive({
-  tagName: [{required: true, message: '请输入标签名称', trigger: 'blur'}],
-})
-const compositeParam = (item) => {
-  return {
-    fileId: item.id,
-    size: item.size,
-    originalFileName: item.originalFilename,
-    fileType: item.fileType,
-    url: item.url,
-    newFile: true,
-    tag:'需求征集'
-  }
-}
-const getFile = (val) => {
-  showTable.value = false
-  let fileObj = compositeParam(val)
-  fileList.value.push(fileObj)
-  nextTick(() => {
-    showTable.value = true
-  })
-}
-const getFileParam = (item) => {
-  return {
-    fileId: item.fileId,
-    tag:item.tag
-  }
-}
-const handleSubmit = async () => {
-    let files = []
-    fileList.value.forEach(item => {
-      files.push(getFileParam(item))
-    })
-    let params = {
-      mosrUserFileDtoList: files,
-      projectId: route.query.id,
-    }
-    console.log('params', params)
-    let res = await uploadRequirementAttachment(params)
-    ElNotification({
-      title: '提示',
-      message: res.msg,
-      type: res.code === 1000 ? 'success' : 'error'
-    })
-    if (res.code === 1000) {
-      tagsViewStore.delVisitedViews(router.currentRoute.value.path)
-      await router.push({
-        name: 'Filing/attachment',
-        query:{
-          id: route.query.id
-        }
-      })
-    }
-}
-</script>
-
-<style scoped>
-
-</style>

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

@@ -247,7 +247,7 @@
 
 <script setup lang="jsx">
 import {debounce} from 'lodash'
-import {getDetail, getProcessInfo, requirementReported, resubmitReported} from "./api";
+import {getDetail, getProcessInfo, requirementReported, resubmitReported} from "@/api/project-demand/summary";
 import {ElNotification} from "element-plus";
 import {useTagsView} from '@/stores/tagsview.js'
 import {useCacheStore} from '@/stores/cache.js'
@@ -417,7 +417,7 @@ const handleSubmit = debounce(async (instance) => {
     // }
     let params = {
       ...formData.value,
-      isSpecialFund: formData.value.isSpecialFund ? formData.value.isSpecialFund : false,
+      isSpecialFund: formData.value.isSpecialFund? formData.value.isSpecialFund : false,
       deploymentId: deploymentId.value,
       fileList: otherFiles,
       singleFile: singleFile,
@@ -472,6 +472,7 @@ const handleResubmit = debounce(() => {
   //todo requirementId
   let params = {
     ...formData.value,
+    isSpecialFund: formData.value.isSpecialFund? formData.value.isSpecialFund : false,
     deploymentId: deploymentId.value,
     fileList: otherFiles,
     singleFile: singleFile,

src/views/project-demand/summary/components/FileUpload.vue

@@ -1,75 +0,0 @@
-<template>
-  <el-upload
-    ref="uploadRef"
-    class="upload-demo"
-    v-bind="$attrs"
-    drag
-    :action="url"
-    multiple
-    :on-change="change"
-    :on-progress="progress"
-    :on-remove="remove"
-    :before-remove="beforeRemove"
-    v-model:file-list="fileList"
-    :http-request="uploadRequest"
-    style="width: 50%;"
-  >
-    <el-icon class="el-icon--upload"><upload-filled /></el-icon>
-    <div class="el-upload__text">
-      拖拽上传/<em>点击上传</em>
-    </div>
-    <template #tip>
-      <div class="el-upload__tip">
-        {{ tip }}
-      </div>
-    </template>
-  </el-upload>
-</template>
-
-<script setup lang="jsx">
-import { reactive, ref } from 'vue';
-import { fileUp } from '../api';
-
-const props = defineProps({
-  url: {
-    type: String,
-    default: ''
-  },
-  tip: {
-    type: String,
-    default: ''
-  }
-})
-
-const fileList = ref([])
-const uploadRef = ref()
-
-const localData = reactive({
-
-})
-
-const change = (file, files) => {
-  console.log(file, 'file');
-}
-
-const progress = (UploadProgressEvent, UploadFile, UploadFiles) => {
-
-}
-
-const remove = (file, files) => {}
-
-const beforeRemove = (file, files) => {}
-
-const uploadRequest = (UploadRequestOptions) => {
-  console.log(UploadRequestOptions, 'UploadRequestOptions');
-  // UploadRequestOptions.data = {}
-  const formData = new FormData()
-  formData.append('file', UploadRequestOptions.file)
-  // formData.append('params', UploadRequestOptions.data)
-  fileUp(url, formData)
-}
-
-</script>
-
-<style lang="scss" scoped>
-</style>

src/views/project-demand/summary/detail.vue

@@ -2,7 +2,7 @@
   <steps :active="route.query.id==='-1'?0:1" @setDetail="setDetail" @stepChange="stepChange" :reportType="route.query.id==='-1'?'direct':''">
     <template #content>
       <collection-detail v-show="showActive == '00'" :formData="summaryData.formData" :data="summaryData"
-                         :processViewer="summaryProcessViewer"  :loading="loading"/>
+                         :processViewer="summaryProcessViewer"  :loading="loading" :fileListShow="fileListShow"/>
       <summary-detail v-show="showActive == '10'" :formData="summaryData.formData" :data="summaryData"
                       :processViewer="summaryProcessViewer" :loading="loading" :fileListShow="fileListShow"/>
       <ApprovalDetail v-show="showActive == '20'" :formData="summaryData.formData" :data="summaryData"
@@ -32,11 +32,11 @@ const processStore = useProcessStore()
 const active = ref(route.query.state)
 const showActive = ref()
 const getInfo = async (state) => {
+  fileListShow.value='READ'
   const projectId = route.query.projectId
   summaryProcessViewer.value = false
   loading.value = true
   const {code, data,msg} = await getMapProjectStateInfo(projectId, state)
-  if(data===undefined)return;
   if(code===1000){
     summaryData.value = data;
     loading.value = false
@@ -48,7 +48,6 @@ const getInfo = async (state) => {
     processStore.passList.value = data.passList;
     nextTick(() => {
       summaryProcessViewer.value = true
-      console.log('data.formPermMap["fileList"]',data.formPermMap["fileList"])
       if (data.formPermMap["fileList"]) {
         fileListShow.value = data.formPermMap["fileList"].perm
       }
@@ -59,6 +58,10 @@ const getInfo = async (state) => {
       message: msg,
       type:  'error'
     })
+    if(msg==='查询结果为空'){
+      summaryData.value=[]
+    }
+    loading.value = false
   }
 }
 
@@ -72,7 +75,3 @@ const stepChange = (data) => {
   getInfo(data.active)
 }
 </script>
-
-<style scoped>
-
-</style>

src/views/project-demand/summary/index.vue

@@ -4,11 +4,7 @@
 </template>
 
 <script setup lang="jsx">
-import {reactive, ref, shallowRef} from 'vue';
 import fvSelect from '@/fvcomponents/fvSelect/index.vue'
-import {useRouter} from 'vue-router';
-
-const localData = reactive({})
 
 const tableIns = ref()
 const router = useRouter()

src/views/project-demand/summary/upload.vue

@@ -1,135 +0,0 @@
-<template>
-<!--  <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"/>-->
-<!--    </el-form-item>-->
-<!--  </el-form>-->
-  <baseTitle title="上传附件"></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"
-             :data="fileList" :isSettingCol="false" :pagination="false">
-      <template #empty>
-        <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
-      </template>
-    </fvTable>
-  </el-card>
-  <div class="oper-page-btn">
-    <el-button color="#DED0B2" @click="handleSubmit">提交</el-button>
-  </div>
-</template>
-
-<script setup lang="jsx">
-import {ElNotification} from "element-plus";
-import {useTagsView} from '@/stores/tagsview.js'
-import {uploadCollectAttachment} from "./api";
-
-const tagsViewStore = useTagsView()
-const route = useRoute()
-const router = useRouter()
-const fileList = ref([])
-const formData = ref({
-  tagName:''
-})
-const tableConfig = reactive({
-  columns: [
-    {
-      prop: 'index',
-      type: 'index',
-      label: '序号',
-      align: 'center',
-      width: '80',
-    },
-    {
-      prop: 'originalFileName',
-      label: '附件名称',
-      align: 'center',
-    },
-    {
-      prop: 'tag',
-      label: '标签',
-      align: 'center'
-    },
-    {
-      prop: 'size',
-      label: '文件大小',
-      align: 'center'
-    },
-    {
-      prop: 'oper',
-      label: '操作',
-      align: 'center',
-      currentRender: ({row, index}) => {
-        return (
-            <div>
-              <el-button type="primary" link onClick={() => handleDownload(row)}>下载</el-button>
-            </div>
-        )
-      }
-    }
-  ]
-})
-const showTable = ref(true)
-const name = ref(router.currentRoute.value.name)
-const rules = reactive({
-  tagName: [{required: true, message: '请输入标签名称', trigger: 'blur'}],
-})
-const compositeParam = (item) => {
-  return {
-    fileId: item.id,
-    size: item.size,
-    originalFileName: item.originalFilename,
-    fileType: item.fileType,
-    url: item.url,
-    newFile: true,
-    tag:'需求上报',
-  }
-}
-const getFile = (val) => {
-  showTable.value = false
-  let fileObj = compositeParam(val)
-  fileList.value.push(fileObj)
-  nextTick(() => {
-    showTable.value = true
-  })
-}
-const getFileParam = (item) => {
-  return {
-    fileId: item.fileId,
-    tag:item.tag
-  }
-}
-const handleSubmit = async () => {
-    let files = []
-    fileList.value.forEach(item => {
-      files.push(getFileParam(item))
-    })
-    let params = {
-      mosrUserFileDtoList: files,
-      projectId: route.query.id,
-    }
-    console.log('params', params)
-    let res = await uploadCollectAttachment(params)
-    ElNotification({
-      title: '提示',
-      message: res.msg,
-      type: res.code === 1000 ? 'success' : 'error'
-    })
-    if (res.code === 1000) {
-      tagsViewStore.delVisitedViews(router.currentRoute.value.path)
-      await router.push({
-        name: 'Filing/attachment',
-        query:{
-          id: route.query.id
-        }
-      })
-    }
-}
-</script>
-
-<style scoped>
-:deep(.el-table--fit ){
-  height: 300px!important;
-}
-</style>

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

@@ -132,27 +132,14 @@ const upload = () => {
     })
   } else {
     router.push({
-      name: switchUpload(activeName.value),
+      name: 'Filing/upload',
       query: {
-        id: route.query.id
+        id: route.query.id,
+        name: activeName.value
       }
     })
   }
 }
-const switchUpload = (index) => {
-  switch (index) {
-    case '00':
-      return 'Requirement/upload';
-    case '10':
-      return 'Summary/upload';
-    case '20':
-      return 'Initiation/upload';
-    case '40':
-      return 'Implementation/upload';
-    case '50':
-      return 'Filing/upload';
-  }
-}
 </script>
 
 <style scoped lang="scss">

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

@@ -1,214 +0,0 @@
-<template>
-  <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane label="需求征集" name="0">
-      <search-files-by-tag @search="searchRequirement" @upload="upload"
-                           :otherFileList="otherFileList"/>
-    </el-tab-pane>
-    <el-tab-pane label="需求上报" name="1">
-      <search-files-by-tag @search="searchReport" @upload="upload"
-                           :otherFileList="otherFileList"/>
-    </el-tab-pane>
-    <el-tab-pane label="项目立项" name="2">
-      <search-files-by-tag @search="searchInitiation" @upload="upload"
-                           :otherFileList="otherFileList"/>
-    </el-tab-pane>
-    <el-tab-pane label="项目实施" name="3">
-      <search-files-by-tag type="3" @search="searchImplementation" @upload="upload" ref="implementation"
-                           :otherFileList="otherFileList"/>
-    </el-tab-pane>
-    <el-tab-pane label="项目归档" name="4">
-      <search-files-by-tag @search="searchFiling" @upload="upload"
-                           :otherFileList="otherFileList"/>
-    </el-tab-pane>
-  </el-tabs>
-</template>
-
-<script setup lang="jsx">
-import {ElNotification} from "element-plus";
-import {getImplementationAttachment} from "@/api/project-manage";
-import {getRequirementAttachment} from "@/api/project-demand";
-import {getCollectAttachment} from "@/views/project-demand/summary/api";
-import {getFilingAttachment, getInitiationAttachment} from "@/api/project-manage";
-
-const route = useRoute()
-const router = useRouter()
-const activeName = ref('4')
-const attachment = ref({})
-const showTable = ref(true)
-const implementation = ref()
-const otherFileList = ref([])
-const handleClick = (tab) => {
-  let name = {}
-  switchSearch(name, tab.index)
-}
-const getParams = (param, type) => {
-  let targetId
-  let params
-  if (type === 1) {
-    targetId = route.query.requirementId
-    params = {
-      targetId: targetId,
-      ...param
-    }
-  } else if (type === 2){
-    targetId = route.query.id
-    if(JSON.stringify(param) !== '{}'){
-      if (param.tag &&!param.name) {
-        implementation.value.tagsOption?.forEach(item => {
-          if (item.value === param.tag) {
-            param.tag = item.label
-          }
-        })
-        params = {
-          targetId: targetId,
-          tag:param.tag
-        }
-      }else if(!param.tag &&param.name){
-        params = {
-          targetId: targetId,
-          ...param
-        }
-      } else if (!param.tag &&!param.name) {
-        params = {
-          targetId: targetId,
-        }
-      }
-    }else {
-      params = {
-        targetId: targetId
-      }
-    }
-  }else {
-    targetId = route.query.id
-    params = {
-      targetId: targetId,
-      ...param
-    }
-  }
-  return params;
-}
-
-const searchRequirement = async (param) => {
-  await search(param)
-}
-const search = async (param, type) => {
-  const res = await getRequirementAttachment(getParams(param, type))
-  changeFileList(res)
-}
-const searchReport = async (param) => {
-  const res = await getCollectAttachment(getParams(param))
-  changeFileList(res)
-}
-const searchInitiation = async (param) => {
-  const res = await getInitiationAttachment(getParams(param))
-  changeFileList(res)
-}
-const searchImplementation = async (param) => {
-  const res = await getImplementationAttachment(getParams(param,2))
-  changeFileList(res)
-}
-const searchFiling = async (param) => {
-  const res = await getFilingAttachment(getParams(param))
-  changeFileList(res)
-}
-const changeFileList = (res) => {
-  showTable.value = false
-  if (res.code === 1000) {
-    otherFileList.value = res.data
-    nextTick(() => {
-      showTable.value = true
-    })
-  } else {
-    ElNotification({
-      title: '提示',
-      message: res.msg,
-      type: 'error'
-    })
-  }
-}
-const upload = () => {
-  if(activeName.value==='3'){
-    router.push({
-      name: 'Implementation/upload',
-      query: {
-        id: route.query.id,
-        type:'3'
-      }
-    })
-  }else {
-    router.push({
-      name: switchUpload(activeName.value),
-      query: {
-        id: route.query.id
-      }
-    })
-  }
-}
-const switchUpload=(index)=>{
-  switch (index) {
-    case '0':
-      return 'Requirement/upload';
-    case '1':
-      return 'Summary/upload';
-    case '2':
-      return 'Initiation/upload';
-    case '3':
-      return 'Implementation/upload';
-    case '4':
-      return 'Filing/upload';
-  }
-}
-const switchSearch = (name, index) => {
-  switch (index) {
-    case '0':
-      search(name, 1)
-      break
-    case '1':
-      searchReport(name)
-      break
-    case '2':
-      searchInitiation(name)
-      break
-    case '3':
-      searchImplementation(name)
-      break
-    case '4':
-      searchFiling(name)
-      break
-  }
-}
-onMounted(() => {
-  if (activeName.value === '4') {
-    let name = {
-      name: ''
-    }
-    searchFiling(name)
-  }
-})
-</script>
-
-<style scoped lang="scss">
-:deep(.el-tabs__header) {
-  margin: 15px 0 30px 0;
-}
-
-:deep(.el-tabs__nav-scroll) {
-  width: 100%;
-  display: flex;
-
-  .el-tabs__nav {
-    display: flex;
-    flex: 1;
-
-    .el-tabs__item {
-      flex: 1;
-      font-size: 16px;
-    }
-
-    .is-active {
-      color: black;
-      //background-color: #DED0B2;
-    }
-  }
-}
-</style>

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

@@ -1,94 +0,0 @@
-<template>
-  <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane label="需求征集" name="00">
-      <search-files-by-tag @search="searchRequirement" @upload="upload"
-                           :otherFileList="otherFileList"/>
-    </el-tab-pane>
-    <el-tab-pane label="需求上报" name="10">
-      <search-files-by-tag @search="searchReport" @upload="upload"
-                           :otherFileList="otherFileList"/>
-    </el-tab-pane>
-    <el-tab-pane label="项目立项" name="20">
-      <search-files-by-tag @search="searchInitiation" @upload="upload"
-                           :otherFileList="otherFileList"/>
-    </el-tab-pane>
-    <el-tab-pane label="项目实施" name="40">
-      <search-files-by-tag type="3" @search="searchImplementation" @upload="upload" ref="implementation"
-                           :otherFileList="otherFileList"/>
-    </el-tab-pane>
-    <el-tab-pane label="项目归档" name="50">
-      <search-files-by-tag @search="searchFiling" @upload="upload"
-                           :otherFileList="otherFileList"/>
-    </el-tab-pane>
-  </el-tabs>
-</template>
-
-<script setup lang="jsx">
-import {searchFileList} from "@/api/project-manage/attachment.js";
-
-const route = useRoute()
-const router = useRouter()
-const activeName = ref('4')
-const attachment = ref({})
-const showTable = ref(true)
-const implementation = ref()
-const otherFileList = ref([])
-const handleClick = (tab) => {
-  let name = {}
-  switchSearch(name, tab.index)
-}
-
-const switchSearch = (name, index) => {
-  switch (index) {
-    case '0':
-      search(name, 1)
-      break
-    case '1':
-      searchReport(name)
-      break
-    case '2':
-      searchInitiation(name)
-      break
-    case '3':
-      searchImplementation(name)
-      break
-    case '4':
-      searchFiling(name)
-      break
-  }
-}
-onMounted(() => {
-  if (activeName.value === '4') {
-    let name = {
-      name: ''
-    }
-    searchFiling(name)
-  }
-})
-</script>
-
-<style scoped lang="scss">
-:deep(.el-tabs__header) {
-  margin: 15px 0 30px 0;
-}
-
-:deep(.el-tabs__nav-scroll) {
-  width: 100%;
-  display: flex;
-
-  .el-tabs__nav {
-    display: flex;
-    flex: 1;
-
-    .el-tabs__item {
-      flex: 1;
-      font-size: 16px;
-    }
-
-    .is-active {
-      color: black;
-      //background-color: #DED0B2;
-    }
-  }
-}
-</style>

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

@@ -103,13 +103,14 @@ const compositeParam = (item) => {
     originalFileName: item.originalFilename,
     fileType: item.fileType,
     url: item.url,
-    newFile: true,
+    newFile: false,
     tag: tag
   }
 }
 const getAttachment = (val) => {
   console.log('上传文件getAttachment', val)
   file.value = compositeParam(val)
+  formData.value.singleFile = compositeParam(val)
 }
 const getOtherFile = (val) => {
   console.log('上传文件getOtherFile', val)

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

@@ -1,112 +0,0 @@
-<template>
-  <steps :active="4" @setDetail="setDetail" @stepChange="stepChange">
-    <template #content>
-      <collection-detail
-          :formData="commonForm.formData"
-          :data="commonForm"
-          :processViewer="commonProvessViewer"
-          v-show="showActive == '00'"
-          :loading="loading"
-      />
-      <summary-detail v-show="showActive == '10'" :formData="commonForm.formData" :data="commonForm"
-                      :processViewer="commonProvessViewer" :loading="loading" :fileListShow="fileListShow"/>
-      <ApprovalDetail type="approval" v-show="showActive == '20'" :formData="commonForm.formData" :data="commonForm"
-                      :processViewer="commonProvessViewer" :loading="loading" :fileListShow="fileListShow"/>
-      <ApprovalDetail type="execute" v-show="showActive == '40'" :formData="commonForm.formData" :data="commonForm"
-                      :processViewer="commonProvessViewer" :loading="loading" :fileListShow="fileListShow"/>
-      <ApprovalDetail type="archivist" v-show="showActive == '50'" :formData="commonForm.formData" :data="commonForm"
-                      :processViewer="commonProvessViewer" :loading="loading" :fileListShow="fileListShow"/>
-    </template>
-  </steps>
-  <opinion v-if="commonForm.taskId" :formData="commonForm.formData" :taskId="commonForm.taskId"/>
-
-</template>
-
-<script setup lang="jsx">
-import {useProcessStore} from '@/stores/processStore.js';
-import CollectionDetail from "@/components/DetailComponent/CollectionDetail.vue";
-import SummaryDetail from "@/components/DetailComponent/SummaryDetail.vue";
-import ApprovalDetail from "@/components/DetailComponent/ApprovalDetail.vue";
-import {getMapProjectStateInfo} from '@/components/steps/api';
-import {ElLoading, ElNotification} from "element-plus";
-
-const route = useRoute()
-const showActive = ref()
-const loading = ref(false)
-const processStore = useProcessStore()
-const activeName = ref('first')
-const commonForm = ref({})
-const fileListShow = ref('READ')
-const commonProvessViewer = ref(true)
-
-const getAllInfo = async (state) => {
-  const loading = ElLoading.service({fullscreen: true})
-  try {
-    commonProvessViewer.value = false
-    loading.value = true
-    const {data, code, msg} = await getMapProjectStateInfo(route.query.projectId, state)
-    if (code === 1000) {
-      loading.value = false
-    } else {
-      ElNotification({
-        title: '提示',
-        message: msg,
-        type: 'error'
-      })
-    }
-    if (data === undefined) return;
-    commonForm.value = data
-    processStore.setDesign(data)
-    processStore.runningList.value = data.runningList;
-    processStore.endList.value = data.endList;
-    processStore.noTakeList.value = data.noTakeList;
-    processStore.refuseList.value = data.refuseList;
-    processStore.passList.value = data.passList;
-    nextTick(() => {
-      commonProvessViewer.value = true
-      if (data.formPermMap["fileList"]) {
-        fileListShow.value = data.formPermMap["fileList"].perm
-      }
-    })
-    loading.close()
-  } catch {
-    loading.close()
-  }
-}
-
-const setDetail = (active) => {
-  showActive.value = active
-  getAllInfo(active)
-}
-
-const stepChange = (data) => {
-  showActive.value = data.active
-  getAllInfo(data.active)
-}
-</script>
-
-<style scoped lang="scss">
-.detail-block {
-  padding-top: 15px;
-
-  :deep(.el-tabs__nav-scroll) {
-    width: 100%;
-    display: flex;
-
-    .el-tabs__nav {
-      display: flex;
-      flex: 1;
-
-      .el-tabs__item {
-        flex: 1;
-        font-size: 16px;
-      }
-
-      .is-active {
-        color: black;
-        background-color: #DED0B2;
-      }
-    }
-  }
-}
-</style>

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

@@ -106,7 +106,7 @@ const searchConfig = reactive([
     props: {
       placeholder: '请选择状态',
       clearable: true,
-      cacheKey: 'project_initiation'
+      cacheKey: 'project_filing'
     }
   },
   // {
@@ -137,7 +137,7 @@ const tableConfig = reactive({
   columns: [
     {
       prop: 'projectName',
-      label: '名称',
+      label: '项目名称',
       align: 'center'
     },
     {

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

@@ -1,10 +1,4 @@
 <template>
-<!--  <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"/>-->
-<!--    </el-form-item>-->
-<!--  </el-form>-->
   <baseTitle title="上传附件"></baseTitle>
   <el-card style="width: 100%;margin: 15px 0">
     <file-upload @getFile="getFile" />
@@ -23,7 +17,7 @@
 <script setup lang="jsx">
 import {ElNotification} from "element-plus";
 import {useTagsView} from '@/stores/tagsview.js'
-import {uploadFilingAttachment} from "@/api/project-manage";
+import {uploadFileList} from "@/api/project-manage/attachment";
 
 const tagsViewStore = useTagsView()
 const route = useRoute()
@@ -76,6 +70,24 @@ const rules = reactive({
   tagName: [{required: true, message: '请输入标签名称', trigger: 'blur'}],
 })
 const compositeParam = (item) => {
+  let tag=''
+  switch (route.query.name) {
+    case '00':
+      tag='需求征集'
+      break
+    case '10':
+      tag='需求上报'
+      break
+    case '20':
+      tag='项目立项'
+      break
+    case '40':
+      tag='项目实施'
+      break
+    case '50':
+      tag='项目归档'
+      break
+  }
   return {
     fileId: item.id,
     size: item.size,
@@ -83,7 +95,7 @@ const compositeParam = (item) => {
     fileType: item.fileType,
     url: item.url,
     newFile: true,
-    tag: '项目归档',
+    tag: tag,
   }
 }
 const getFile = (val) => {
@@ -106,10 +118,11 @@ const handleSubmit = async () => {
       files.push(getFileParam(item))
     })
     let params = {
-      mosrUserFileDtoList: files,
+      fileList: files,
+      targetState:'',
       projectId: route.query.id,
     }
-    let res = await uploadFilingAttachment(params)
+    let res = await uploadFileList(params)
     ElNotification({
       title: '提示',
       message: res.msg,

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

@@ -110,9 +110,7 @@ const tableConfig = reactive({
       label: '研发阶段',
       align: 'center',
       currentRender: ({row, index}) => {
-        console.log('row.researchStage',row.researchStage)
         if (row.researchStage&&row.researchStage !== null&&row.researchStage!==undefined) {
-          console.log('ull',row.researchStage)
           return (<Tag dictType={'research_stage'} value={row.researchStage}/>)
         } else {
           return '--'

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

@@ -12,7 +12,7 @@
     </el-form-item>
     <el-form-item>
       <el-button @click="handleSearch" color="#DED0B2">搜索</el-button>
-      <el-button color="#DED0B2" @click="handleUpload">上传附件</el-button>
+      <el-button v-if="uploadState" color="#DED0B2" @click="handleUpload">上传附件</el-button>
     </el-form-item>
   </el-form>
   <el-card style="width: 100%">
@@ -27,11 +27,13 @@
 
 <script setup lang="jsx">
 import {downloadFile} from "@/api/project-demand";
-import {getTags,getImplementationAttachment} from "@/api/project-manage";
+import {searchFileList} from "@/api/project-manage/attachment.js";
+import {getTags} from "@/api/project-manage";
 import {ElNotification} from "element-plus";
 
 const route = useRoute()
 const router = useRouter()
+const uploadState = ref(true)
 const attachment = reactive({
   tag: ''
 })
@@ -80,49 +82,45 @@ const showTable = ref(true)
 const otherFileList = ref([])
 const getTagsOption = () => {
   if (!route.query.id) return
-  let params={
+  getTags(route.query.id).then(res => {
-    projectId: route.query.id
-  }
-  getTags(params).then(res => {
-    ElNotification({
-      title: '提示',
-      message: res.msg,
-      type: res.code === 1000 ? 'success' : 'error'
-    })
     if (res.code === 1000) {
       tagsOption.value = res.data
+    }else{
+      ElNotification({
+        title: '提示',
+        message: res.msg,
+        type: 'error'
+      })
     }
   })
 }
 const handleSearch = () => {
-  let params
+  let params = {
+    targetId: route.query.id,
+    targetState: "30"
+  }
   if (attachment.tag) {
     tagsOption.value.forEach(item => {
       if (item.value === attachment.tag) {
         attachment.tag = item.label
       }
     })
-    params = {
+    params.tag = attachment.tag
-      targetId: route.query.id,
-      tag: attachment.tag
-    }
-  } else {
-    params = {
-      targetId: route.query.id
-    }
   }
-  getImplementationAttachment(params).then(res => {
+  searchFileList(params).then(res => {
-    ElNotification({
-      title: '提示',
-      message: res.msg,
-      type: res.code === 1000 ? 'success' : 'error'
-    })
     showTable.value = false
     if (res.code === 1000) {
-      otherFileList.value = res.data
+      otherFileList.value = res.data.fileList
+      uploadState.value = res.data.upload
       nextTick(() => {
         showTable.value = true
       })
+    }else{
+      ElNotification({
+        title: '提示',
+        message: res.msg,
+        type: 'error'
+      })
     }
   })
 }
@@ -143,8 +141,9 @@ const handleDownload = (row) => {
     a.click()
   })
 }
-getTagsOption()
+
 handleSearch()
+getTagsOption()
 </script>
 
 <style scoped>

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

@@ -56,13 +56,14 @@ const compositeParam = (item) => {
     originalFileName: item.originalFilename,
     fileType: item.fileType,
     url: item.url,
-    newFile: true,
+    newFile: false,
     tag: tag
   }
 }
 const getAttachment = (val) => {
   console.log('上传文件getAttachment', val)
   file.value=compositeParam(val)
+  formData.value.singleFile = compositeParam(val)
 }
 const getOtherFile = (val) => {
   console.log('上传文件getOtherFile', val)

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

@@ -62,6 +62,9 @@ const getAllInfo = async (state) => {
         message: msg,
         type: 'error'
       })
+      if(msg==='查询结果为空'){
+        commonForm.value=[]
+      }
       loading.close()
     }
     if (data === undefined) return;

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

@@ -107,7 +107,7 @@ const searchConfig = reactive([
     props: {
       placeholder: '请选择状态',
       clearable: true,
-      cacheKey: 'project_initiation'
+      cacheKey: 'project_implementation'
     }
   },
   // {
@@ -142,7 +142,7 @@ const tableConfig = reactive({
     },
     {
       prop: 'projectName',
-      label: '名称',
+      label: '项目名称',
       align: 'center'
     },
     {
@@ -181,6 +181,19 @@ const tableConfig = reactive({
         }
       }
     },
+    {
+      prop: 'researchStage',
+      label: '研发阶段',
+      align: 'center',
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => {
+        if (row.researchStage&&row.researchStage !== null&&row.researchStage!==undefined) {
+          return (<Tag dictType={'research_stage'} value={row.researchStage}/>)
+        } else {
+          return '--'
+        }
+      }
+    },
     {
       prop: 'projectImpact',
       label: '项目影响',
@@ -219,7 +232,7 @@ const tableConfig = reactive({
       showOverflowTooltip: false,
       currentRender: ({row, index}) => {
         if (row.state !== null) {
-          return (<Tag dictType={'project_initiation'} value={row.state}/>)
+          return (<Tag dictType={'project_implementation'} value={row.state}/>)
         } else {
           return '--'
         }
@@ -252,7 +265,13 @@ const tableConfig = reactive({
           btn.push({label: '查看分摊', prem: ['mosr:requirement:info'], func: () => handleShare(row), type: 'primary'})
         }
         if (buttons.has("phaseChange")) {
-          btn.push({label: '阶段变更', prem: ['mosr:requirement:info'], func: () => handlePhaseChange(row), type: 'primary'})
+          btn.push({label: '阶段变更', prem: ['mosr:phase:change'], func: () => handlePhaseChange(row), type: 'primary'})
+        }
+        if (buttons.has("phaseChangeInfo")) {
+          btn.push({label: '阶段变更详情', prem: ['mosr:phase:info'], func: () => handlePhaseChangeDetail(row), type: 'primary'})
+        }
+        if (buttons.has("phaseChangeEdit")) {
+          btn.push({label: '阶段变更编辑', prem: ['mosr:phase:resubmit'], func: () => handlePhaseChangeEdit(row), type: 'primary'})
         }
         return (
             <div style={{width: '100%'}}>
@@ -321,6 +340,7 @@ const handleEdit = (row) => {
   })
 }
 const handleStandingBook = (row) => {
+  localStorage.setItem('projectName', row.projectName)
   router.push({
     name: 'Implementation/account',
     query: {
@@ -348,8 +368,27 @@ const handlePhaseChange = (row) => {
   router.push({
     name: 'Phase/change',
     query: {
-      id: row.requirementId
+      id: row.requirementId,
+      projectId:row.projectId
     }
   })
 }
+const handlePhaseChangeDetail = (row) => {
+  router.push({
+    name: 'Phase/detail',
+    query: {
+      projectId:row.projectId
+    }
+  })
+}
+
+const handlePhaseChangeEdit = (row) => {
+  router.push({
+    name: 'Phase/edit',
+    query: {
+      projectId:row.projectId
+    }
+  })
+}
+
 </script>

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

@@ -2,21 +2,21 @@
   <div class="apply-block">
     <AttachmentUpload ref="attachment" label="阶段变更附件" :showTable="showTable" :otherFileList="otherFileList"
                       @getAttachment="getAttachment"
-                      @getOtherFile="getOtherFile" :showFileList="true" :formData="formData"
+                      @getOtherFile="getOtherFile" :showFileList="true" :formData="formData" :preview="name === 'Phase/edit'"/>
-                      :preview="name === 'Implementation/edit'"/>
     <div class="approval-record">
       <baseTitle title="流程"></baseTitle>
       <process-diagram-viewer mode="view" v-if="processDiagramViewer"/>
     </div>
     <div class="oper-page-btn">
-      <el-button color="#DED0B2" @click="handleSubmit(applyForm)">提交</el-button>
+      <el-button color="#DED0B2" v-if="name==='Phase/change'" @click="handleSubmit">提交</el-button>
+      <el-button color="#DED0B2" v-else @click="handleResubmit">重新提交</el-button>
     </div>
   </div>
 </template>
 
 <script setup lang="jsx">
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';
-import {getProjectCheckProcess, projectCheck, getCheckDetail, resubmitCheck} from "@/api/project-manage";
+import {getPhaseProcess,submitPhaseChange,getPhaseForm,resubmitPhaseForm} from "@/api/project-manage";
 import {ElNotification} from "element-plus";
 import {useProcessStore} from '@/stores/processStore.js';
 import {useTagsView} from '@/stores/tagsview.js'
@@ -29,7 +29,6 @@ const name = ref(router.currentRoute.value.name)
 const loading = ref(false)
 const formData = ref({})
 const file = ref({})
-const applyForm = ref()
 const deploymentId = ref()
 const showTable = ref(true)
 const otherFileList = ref([])
@@ -47,7 +46,7 @@ const compositeParam = (item) => {
     originalFileName: item.originalFilename,
     fileType: item.fileType,
     url: item.url,
-    newFile: true,
+    newFile: false,
     tag: tag
   }
 }
@@ -71,27 +70,16 @@ const getFileParam = (item) => {
     tag: item.tag
   }
 }
-const handleSubmit = (instance) => {
+const handleSubmit =async () => {
-  if (!instance) return
-  instance.validate(async (valid) => {
-    if (!valid) return
-    if (JSON.stringify(file.value) === "{}") {
-      attachment.value.validate()
-    } else {
-      attachment.value.clearValidate()
-    }
-    if (!valid) return
     let files = []
     let singleFile = {}
     let fileArray
-
     if (file.value.fileId !== undefined) {
       singleFile = {
         fileId: file.value.fileId
       }
     }
     fileArray = otherFileList.value
-
     fileArray.forEach(item => {
       files.push(getFileParam(item))
     })
@@ -102,24 +90,87 @@ const handleSubmit = (instance) => {
       singleFile: singleFile,
       projectId: route.query.projectId,
     }
+    if (JSON.stringify(singleFile) === "{}") {
+      attachment.value.validate()
+      ElNotification({
+        title: '提示',
+        message: '请上传附件',
+        type: 'error'
+      })
+      return;
+    }else {
+      attachment.value.clearValidate()
+    }
     console.log('params-提交', params)
-    // let res = await projectCheck(params)
+    let res = await submitPhaseChange(params)
-    // ElNotification({
+    ElNotification({
-    //   title: '提示',
+      title: '提示',
-    //   message: res.msg,
+      message: res.msg,
-    //   type: res.code === 1000 ? 'success' : 'error'
+      type: res.code === 1000 ? 'success' : 'error'
-    // })
+    })
-    // if (res.code === 1000) {
+    if (res.code === 1000) {
-    //   tagsViewStore.delVisitedViews(router.currentRoute.value.path)
+      tagsViewStore.delVisitedViews(router.currentRoute.value.path)
-    //   await router.push({
+      await router.push({
-    //     name: 'Implementation'
+        name: 'Implementation'
-    //   })
+      })
-    // }
+    }
-  })
+}
+const handleResubmit = (instance) => {
+    let singleFile = {}
+    let otherFiles = []
+    let fileArray
+    if (attachment.value.singleFile!==null&&name.value === 'Phase/edit') {
+      singleFile = {
+        fileId: attachment.value.singleFile.fileId
+      }
+      fileArray = attachment.value.allFileList
+    } else {
+      if (file.value.fileId !== undefined) {
+        singleFile = {
+          fileId: file.value.fileId
+        }
+      }
+      fileArray = otherFileList.value
+    }
+    fileArray.forEach(item => {
+      otherFiles.push(getFileParam(item))
+    })
+    //todo requirementId
+    let params = {
+      deploymentId: deploymentId.value,
+      requirementId: route.query.id,
+      fileList: otherFiles,
+      singleFile: singleFile,
+      projectId: route.query.projectId,
+    }
+    if (JSON.stringify(singleFile) === "{}") {
+      attachment.value.validate()
+      ElNotification({
+        title: '提示',
+        message: '请上传附件',
+        type: 'error'
+      })
+      return;
+    }else {
+      attachment.value.clearValidate()
+    }
+    console.log('重新提交params', params)
+    resubmitPhaseForm(params).then(res => {
+      ElNotification({
+        title: '提示',
+        message: res.msg,
+        type: res.code === 1000 ? 'success' : 'error'
+      })
+      if (res.code === 1000) {
+        tagsViewStore.delVisitedViews(router.currentRoute.value.path)
+        router.push({
+          name: 'Implementation'
+        })
+      }
+    })
 }
-
 const init = async () => {
-  const {msg, code,data} = await getProjectCheckProcess(route.query.projectId)
+  const {msg, code,data} = await getPhaseProcess()
   processDiagramViewer.value = false
   if (code === 1000) {
     deploymentId.value = data.deploymentId
@@ -141,8 +192,25 @@ const init = async () => {
     })
   }
 }
+const getDetailInfo = async () => {
+  getPhaseForm(route.query.projectId).then(res => {
+    ElNotification({
+      title: '提示',
+      message: res.msg,
+      type: res.code === 1000 ? 'success' : 'error'
+    })
+    if (res.code === 1000) {
+      formData.value = res.data
+      loading.value=false
+    }
+  })
+}
 onMounted(async () => {
-  // await init()
+  await init()
+  if (name.value === 'Phase/edit'){
+    loading.value=true
+    await getDetailInfo()
+  }
 })
 </script>
 

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

@@ -0,0 +1,55 @@
+<template>
+  <ApprovalDetail :formData="summaryData.formData" :data="summaryData"
+                  :processViewer="summaryProcessViewer" :loading="loading" :fileListShow="fileListShow"/>
+  <opinion v-if="summaryData.taskId" :formData="summaryData.formData" :taskId="summaryData.taskId"></opinion>
+</template>
+
+<script setup lang="jsx">
+import {ElNotification} from "element-plus";
+import {useProcessStore} from '@/stores/processStore.js';
+import {getPhaseDetail} from "@/api/project-manage";
+const route = useRoute()
+const summaryData = ref({})
+const summaryProcessViewer = ref(true)
+const processStore = useProcessStore()
+const loading = ref(false)
+const fileListShow = ref('READ')
+const getInfo = async () => {
+  fileListShow.value='READ'
+  const projectId = route.query.projectId
+  summaryProcessViewer.value = false
+  loading.value = true
+  const {code, data,msg} = await getPhaseDetail(projectId)
+  if(code===1000){
+    summaryData.value = data;
+    loading.value = false
+    processStore.setDesign(data)
+    processStore.runningList.value = data.runningList;
+    processStore.endList.value = data.endList;
+    processStore.noTakeList.value = data.noTakeList;
+    processStore.refuseList.value = data.refuseList;
+    processStore.passList.value = data.passList;
+    nextTick(() => {
+      summaryProcessViewer.value = true
+      if (data.formPermMap["fileList"]) {
+        fileListShow.value = data.formPermMap["fileList"].perm
+      }
+    })
+  }else {
+    ElNotification({
+      title: '提示',
+      message: msg,
+      type:  'error'
+    })
+    if(msg==='查询结果为空'){
+      summaryData.value=[]
+    }
+    loading.value = false
+  }
+}
+getInfo()
+</script>
+
+<style scoped>
+
+</style>

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

@@ -12,37 +12,36 @@ import fvSelect from '@/fvcomponents/fvSelect/index.vue'
 
 const searchConfig = reactive([
   {
-    label: '需求名称',
+    label: '关键词',
     prop: 'requirementName',
     component: 'el-input',
     props: {
-      placeholder: '请输入需求名称查询',
+      placeholder: '请输入关键词查询',
       clearable: true,
       filterable: true,
       checkStrictly: true
     }
   },
   {
-    label: '项目费用',
+    label: '项目人员',
     prop: 'projectCost',
     component: shallowRef(fvSelect),
     props: {
-      placeholder: '请选择项目费用查询',
+      placeholder: '请选择项目人员查询',
       clearable: true,
       filterable: true,
       checkStrictly: true,
-      cacheKey: 'project_cost'
+      cacheKey: ''
     }
   },
   {
-    label: '起始时间',
+    label: '时间',
     prop: 'datetime',
     component: 'el-date-picker',
     props: {
-      placeholder: '请选择起始时间',
+      placeholder: '请选择时间',
       clearable: true,
-    },
+    }
-    colProps: {}
   }
 ])
 const tableIns = ref()
@@ -52,6 +51,7 @@ const tableConfig = reactive({
       prop: 'name',
       type: 'index',
       label: '序号',
+      align: 'center',
       width:'80'
     },
     {
@@ -100,7 +100,7 @@ const tableConfig = reactive({
       align: 'center'
     }
   ],
-  api: '',
+  api: '/workflow/mosr/cost/allocation/usr',
   params: {},
 })
 

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

@@ -11,7 +11,7 @@
             :value="item.value"
         />
       </el-select>
-      <el-button type="primary" link  @click="changeInput">{{showInput? '选择': '输入'}}</el-button>
+      <el-button type="primary" link @click="changeInput">{{ showInput ? '选择' : '输入' }}</el-button>
     </el-form-item>
   </el-form>
   <baseTitle title="其他文件"></baseTitle>
@@ -30,9 +30,10 @@
 </template>
 
 <script setup lang="jsx">
-import {uploadAttachment,getTags} from "@/api/project-manage";
+import {getTags} from "@/api/project-manage";
 import {ElNotification} from "element-plus";
 import {useTagsView} from '@/stores/tagsview.js'
+import {uploadFileList} from "@/api/project-manage/attachment";
 
 const tagsViewStore = useTagsView()
 const route = useRoute()
@@ -41,7 +42,7 @@ const fileList = ref([])
 const showInput = ref(false)
 const tagsOption = ref([])
 const formData = ref({
-  tagName:''
+  tagName: ''
 })
 const tableConfig = reactive({
   columns: [
@@ -87,16 +88,13 @@ const name = ref(router.currentRoute.value.name)
 const rules = reactive({
   tagName: [{required: true, message: '请输入标签名称', trigger: ['blur', 'change']}],
 })
-const changeInput=()=>{
+const changeInput = () => {
-  showInput.value=!showInput.value;
+  showInput.value = !showInput.value;
-  formData.value.tagName='';
+  formData.value.tagName = '';
 }
 const getTagsOption = () => {
   if (!route.query.id) return
-  let params={
+  getTags(route.query.id).then(res => {
-    projectId: route.query.id
-  }
-  getTags(params).then(res => {
     ElNotification({
       title: '提示',
       message: res.msg,
@@ -134,26 +132,17 @@ const getFile = (val) => {
     showTable.value = true
   })
 }
-const getFileParam = (item) => {
-  return {
-    fileId: item.fileId
-  }
-}
 const handleSubmit = async (instance) => {
   if (!instance) return
   instance.validate(async (valid) => {
     if (!valid) return
-    let files = []
-    fileList.value.forEach(item => {
-      files.push(getFileParam(item))
-    })
     let params = {
-      fileList: files,
+      fileList: fileList.value,
       projectId: route.query.id,
-      tag: formData.value.tagName
+      tag: formData.value.tagName,
+      targetState: "30"
     }
-    console.log('params', params)
+    let res = await uploadFileList(params)
-    let res = await uploadAttachment(params)
     ElNotification({
       title: '提示',
       message: res.msg,
@@ -161,17 +150,17 @@ const handleSubmit = async (instance) => {
     })
     if (res.code === 1000) {
       tagsViewStore.delVisitedViews(router.currentRoute.value.path)
-      if(route.query.type==='40'){
+      if (route.query.type === '40') {
         await router.push({
           name: 'Filing/attachment',
-          query:{
+          query: {
             id: route.query.id
           }
         })
-      }else {
+      } else {
         await router.push({
           name: 'Implementation/attachment',
-          query:{
+          query: {
             id: route.query.id
           }
         })
@@ -183,7 +172,7 @@ getTagsOption()
 </script>
 
 <style scoped>
-:deep(.el-table--fit ){
+:deep(.el-table--fit ) {
-  height: 300px!important;
+  height: 300px !important;
 }
 </style>

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

@@ -1,6 +1,9 @@
 <template>
   <baseTitle title="上传费用"></baseTitle>
-  <el-form :model="tableForm" ref="form">
+  <el-form :model="tableForm" ref="form" class="query-form">
+    <el-form-item label="项目名称">
+      <span>{{projectName}}</span>
+    </el-form-item>
     <el-table :data="tableForm.tableData" style="width: 100%">
       <el-table-column prop="time" label="时间">
         <template #default="scope">
@@ -89,6 +92,7 @@ const router = useRouter()
 const tagsViewStore = useTagsView()
 const formData = ref({})
 const form = ref()
+const projectName=ref(localStorage.getItem('projectName'))
 const rules = reactive({
   time: [{required: true, message: '请选择时间', trigger: 'blur'}],
   projectCost: [{required: true, message: '请输入项目费用', trigger: 'blur'}],
@@ -127,7 +131,9 @@ const handleSubmit = (instance) => {
   instance.validate(async (valid) => {
     if (!valid) return
     instance.clearValidate()
-    console.log('params', tableForm.tableData)
+    tableForm.tableData.forEach(item=>{
+      item.projectName=projectName.value
+    })
     const res =await addLedger(tableForm.tableData)
     ElNotification({
       title: '提示',

src/views/project-management/initiation/apply.vue

@@ -108,13 +108,14 @@ const compositeParam = (item) => {
     originalFileName: item.originalFilename,
     fileType: item.fileType,
     url: item.url,
-    newFile: true,
+    newFile: false,
     tag: tag
   }
 }
 const getAttachment = (val) => {
   console.log('上传文件getAttachment', val)
   file.value = compositeParam(val)
+  formData.value.singleFile = compositeParam(val)
 }
 const getOtherFile = (val) => {
   console.log('上传文件getOtherFile', val)
@@ -163,7 +164,6 @@ const handleSubmit = (instance) => {
       singleFile: singleFile,
       projectId: route.query.projectId,
     }
-
     console.log('params', params)
     let res = await projectApply(params)
     ElNotification({

src/views/project-management/initiation/detail.vue

@@ -1,123 +0,0 @@
-<template>
-  <steps :active="2" @setDetail="setDetail" @stepChange="stepChange">
-    <template #content>
-      <collection-detail
-        :formData="commonForm.formData"
-        :data="commonForm"
-        :processViewer="commonProvessViewer"
-        v-show="showActive == '00'"
-        :loading="loading"
-      />
-      <summary-detail v-show="showActive == '10'" :formData="commonForm.formData" :data="commonForm"
-                      :processViewer="commonProvessViewer" :loading="loading" :fileListShow="fileListShow"/>
-      <ApprovalDetail v-show="showActive == '20'" :formData="commonForm.formData" :data="commonForm"
-                      :processViewer="commonProvessViewer" :loading="loading" :fileListShow="fileListShow"/>
-      <ApprovalDetail type="execute" v-show="showActive == '40'" :formData="commonForm.formData" :data="commonForm"
-                      :processViewer="commonProvessViewer" :loading="loading" :fileListShow="fileListShow"/>
-      <ApprovalDetail type="archivist" v-show="showActive == '50'" :formData="commonForm.formData" :data="commonForm"
-                      :processViewer="commonProvessViewer" :loading="loading" :fileListShow="fileListShow"/>
-
-    </template>
-  </steps>
-  <opinion v-if="commonForm.taskId" :formData="commonForm.formData" :taskId="commonForm.taskId"/>
-</template>
-
-<script setup lang="jsx">
-import {useProcessStore} from '@/stores/processStore.js';
-import CollectionDetail from "@/components/DetailComponent/CollectionDetail.vue";
-import SummaryDetail from "@/components/DetailComponent/SummaryDetail.vue";
-import ApprovalDetail from "@/components/DetailComponent/ApprovalDetail.vue";
-import { getMapProjectStateInfo } from '@/components/steps/api';
-import {ElLoading, ElNotification} from "element-plus";
-import Opinion from "@/components/DetailComponent/Opinion.vue";
-
-const route = useRoute()
-const activeName = ref('first')
-const fileListShow = ref('READ')
-const loading = ref(false)
-const active = ref(route.query.state)
-const processStore = useProcessStore()
-const showActive = ref()
-const commonForm = ref({})
-const commonProvessViewer = ref(true)
-
-const getAllInfo = async (state) => {
-  const loading = ElLoading.service({fullscreen: true})
-  try {
-    commonProvessViewer.value = false
-    loading.value = true
-    const { data, code,msg } = await getMapProjectStateInfo(route.query.projectId, state)
-    if(code===1000){
-      loading.value = false
-    }else {
-      ElNotification({
-        title: '提示',
-        message: msg,
-        type:  'error'
-      })
-    }
-    if(data===undefined)return;
-    commonForm.value = data
-    processStore.setDesign(data)
-    processStore.runningList.value = data.runningList;
-    processStore.endList.value = data.endList;
-    processStore.noTakeList.value = data.noTakeList;
-    processStore.refuseList.value = data.refuseList;
-    processStore.passList.value = data.passList;
-    nextTick(() => {
-      commonProvessViewer.value = true
-      if (data.formPermMap["fileList"]) {
-        fileListShow.value = data.formPermMap["fileList"].perm
-      }
-    })
-    loading.close()
-  } catch {
-    loading.close()
-  }
-}
-
-
-const setDetail = (active) => {
-  showActive.value = active
-  getAllInfo(active)
-}
-
-const stepChange = (data) => {
-  showActive.value = data.active
-  getAllInfo(data.active)
-}
-</script>
-
-<style scoped lang="scss">
-.detail-block {
-  padding-top: 15px;
-
-  :deep(.el-tabs__nav-scroll) {
-    width: 100%;
-    display: flex;
-
-    .el-tabs__nav {
-      display: flex;
-      flex: 1;
-
-      .el-tabs__item {
-        flex: 1;
-        font-size: 16px;
-      }
-
-      .is-active {
-        color: black;
-        background-color: #DED0B2;
-      }
-    }
-  }
-}
-
-.approval-record {
-  padding-bottom: 30px;
-
-  .process {
-    position: relative;
-  }
-}
-</style>

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

@@ -136,7 +136,7 @@ const tableConfig = reactive({
   columns: [
     {
       prop: 'projectName',
-      label: '名称',
+      label: '项目名称',
       align: 'center'
     },
     {

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

@@ -1,133 +0,0 @@
-<template>
-<!--  <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"/>-->
-<!--    </el-form-item>-->
-<!--  </el-form>-->
-  <baseTitle title="上传附件"></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"
-             :data="fileList" :isSettingCol="false" :pagination="false">
-      <template #empty>
-        <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
-      </template>
-    </fvTable>
-  </el-card>
-  <div class="oper-page-btn">
-    <el-button color="#DED0B2" @click="handleSubmit">提交</el-button>
-  </div>
-</template>
-
-<script setup lang="jsx">
-import {ElNotification} from "element-plus";
-import {useTagsView} from '@/stores/tagsview.js'
-import {uploadInitiationAttachment} from "@/api/project-manage";
-
-const tagsViewStore = useTagsView()
-const route = useRoute()
-const router = useRouter()
-const fileList = ref([])
-const formData = ref({
-  tagName:''
-})
-const tableConfig = reactive({
-  columns: [
-    {
-      prop: 'index',
-      type: 'index',
-      label: '序号',
-      align: 'center',
-      width: '80',
-    },
-    {
-      prop: 'originalFileName',
-      label: '附件名称',
-      align: 'center',
-    },
-    {
-      prop: 'tag',
-      label: '标签',
-      align: 'center'
-    },
-    {
-      prop: 'size',
-      label: '文件大小',
-      align: 'center'
-    },
-    {
-      prop: 'oper',
-      label: '操作',
-      align: 'center',
-      currentRender: ({row, index}) => {
-        return (
-            <div>
-              <el-button type="primary" link onClick={() => handleDownload(row)}>下载</el-button>
-            </div>
-        )
-      }
-    }
-  ]
-})
-const showTable = ref(true)
-const name = ref(router.currentRoute.value.name)
-const rules = reactive({
-  tagName: [{required: true, message: '请输入标签名称', trigger: 'blur'}],
-})
-const compositeParam = (item) => {
-  return {
-    fileId: item.id,
-    size: item.size,
-    originalFileName: item.originalFilename,
-    fileType: item.fileType,
-    url: item.url,
-    tag: '项目立项',
-  }
-}
-const getFile = (val) => {
-  showTable.value = false
-  let fileObj = compositeParam(val)
-  fileList.value.push(fileObj)
-  nextTick(() => {
-    showTable.value = true
-  })
-}
-const getFileParam = (item) => {
-  return {
-    fileId: item.fileId,
-    tag:item.tag
-  }
-}
-const handleSubmit = async () => {
-    let files = []
-    fileList.value.forEach(item => {
-      files.push(getFileParam(item))
-    })
-    let params = {
-      mosrUserFileDtoList: files,
-      projectId: route.query.id,
-    }
-    let res = await uploadInitiationAttachment(params)
-    ElNotification({
-      title: '提示',
-      message: res.msg,
-      type: res.code === 1000 ? 'success' : 'error'
-    })
-    if (res.code === 1000) {
-      tagsViewStore.delVisitedViews(router.currentRoute.value.path)
-      await router.push({
-        name: 'Filing/attachment',
-        query:{
-          id: route.query.id
-        }
-      })
-    }
-}
-</script>
-
-<style scoped>
-:deep(.el-table--fit ){
-  height: 300px!important;
-}
-</style>

src/views/system/menu/index.vue

@@ -36,6 +36,7 @@
       <el-table-column prop="orderNum" label="排序" width="60px"/>
       <el-table-column prop="perms" label="权限标识"/>
       <el-table-column prop="component" label="组件路径"/>
+      <el-table-column prop="path" label="路由地址"/>
       <el-table-column prop="state" label="状态" width="80px">
         <template #default="scope">
           <tag dict-type="normal_disable" :value="scope.row.state"/>

src/views/system/user/index.vue

@@ -131,7 +131,7 @@ const tableConfig = reactive({
               <el-button type="danger" v-perm={auths.del} link onClick={()=>handleDel(row)}>删除</el-button> :
               null
             }
-            
+
           </div>
         )
       }
@@ -166,7 +166,7 @@ const search = (val) => {
 
 const handleAdd = () => {
   router.push({
-    path: '/system/useradd',
+    name: 'Useradd',
     query: {
       isAdd: 1
     }
@@ -175,7 +175,7 @@ const handleAdd = () => {
 
 const handleEdit = (row) => {
   router.push({
-    path: '/system/useredit',
+    name: 'Useredit',
     query: {
       id: row.userId,
       userType: row.userType
@@ -189,7 +189,7 @@ const handleDel = (row) => {
     confirmButtonText: '确定',
     cancelButtonText: '取消'
   }).then(async res => {
-    // const { code } = await 
+    // const { code } = await
   }).catch(()=>{})
 }
 
@@ -203,4 +203,4 @@ const headBtnClick = (key) => {
 
 <style lang="scss" scoped>
 
-</style>
+</style>

src/views/workflow/common/ProcessDiagramViewer.vue

@@ -1,13 +1,13 @@
 <template>
   <div>
     <div class="scale">
-      <el-button icon="Plus" size="mini" @click="scale += 10" :disabled="scale >= 150" circle></el-button>
-      <span>{{ scale }}%</span>
       <el-button icon="Minus" size="mini" @click="scale -= 10" :disabled="scale <= 40" circle></el-button>
+      <span>{{ scale }}%</span>
+      <el-button icon="Plus" size="mini" @click="scale += 10" :disabled="scale >= 150" circle></el-button>
     </div>
   </div>
-  <div style="margin-top: 40px">
+  <div>
-    <div :style="'transform: scale('+ scale / 100 +');'">
+    <div :style="'transform: scale('+ scale / 100 +');margin-top: 100px'">
       <div :id="idName">
         <process-tree :mode="mode" ref="processTreePreview" :id-name="idName"/>
       </div>
@@ -24,13 +24,14 @@ const props = defineProps({
   mode: {
     type: String,
     default: 'preview'
-  },idName:{
+  },
-    type:String,
+  idName: {
-    default:'previewProcess'
+    type: String,
+    default: 'previewProcess'
   }
 })
 
-nextTick(()=>{
+nextTick(() => {
   processTreePreview.value.init()
 })
 </script>

vite.config.js

@@ -68,26 +68,26 @@ export default defineConfig({
     strictPort: false,
     open: true,
     proxy: {
-      // '/api/workflow': {
+      '/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/, '')
+      },
+      // '/summary/admin': {
       //   // 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/, '')
+      //   rewrite: (path) => path.replace(/^\/summary/, '')
-      // },
-      // '/api/admin': {
-      //   // 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': {
         target: 'http://mosr.feashow.cn',
         changeOrigin: true,
       },
-      // '/api/notice-ws': {
+      // '/summary/notice-ws': {
-      //   target: 'ws://mosr.feashow.cn/api/notice-ws',
+      //   target: 'ws://mosr.feashow.cn/summary/notice-ws',
       //   ws: true,
       //   changeOrigin: true,
       // }