From fc6d88eeba44956eb75ed25f93f5b05d371b4a93 Mon Sep 17 00:00:00 2001 From: zhouhaibin Date: Fri, 1 Mar 2024 17:53:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=91=A8=E6=8A=A5=E5=92=8C?= =?UTF-8?q?=E5=90=88=E5=90=8C=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectArchiveApproval.vue | 109 +++ .../component/ApprovalDetails.vue | 42 ++ .../component/ApprovalFromPage.vue | 66 ++ .../component/ApprovalPageModel.vue | 30 + .../component/PlaninfoDetails.vue | 42 ++ .../component/ProjectDetails.vue | 75 +++ .../component/UploadfileDetail.vue | 61 ++ .../initiatesProjectsApproval.vue | 164 +++++ .../childProjectsApproval.vue | 26 +- .../initiatesProjectsApproval/index.vue | 191 +----- .../planFileApproval.vue | 188 ++++++ .../planFileApproval/index.vue | 191 ++++++ .../projectPlanApproval.vue | 144 ++++ .../projectPlanApproval/index.vue | 123 +--- .../uploadfileApproval.vue | 139 ++++ .../uploadfileApproval/index.vue | 209 +----- .../RegulationLab/RegulationLab.api.ts | 23 + .../RegulationLab/RegulationLab.data.ts | 70 ++ .../Regulation/RegulationLab/addAndModify.vue | 136 ++++ src/views/Regulation/RegulationLab/index.vue | 109 +++ .../myWork/completed/complectedDetail.vue | 124 ---- src/views/myWork/completed/complete.data.ts | 18 +- src/views/myWork/completed/index.vue | 60 +- src/views/myWork/inComplete/inComplete.api.ts | 37 +- .../myWork/inComplete/inComplete.data.ts | 64 +- src/views/myWork/inComplete/index.vue | 54 +- .../initiatesProjects.data.ts | 618 ------------------ .../initiatesProjects/initiatesProjects.vue | 29 +- .../projectLib/planinfoHistory/index.vue | 12 +- .../planinfoHistory/planinfoHistory.data.ts | 33 - .../planinfoHistoryDetaillist.vue | 6 +- .../planinfoHistoryDetailpage.vue | 10 +- .../projectArchive/SubmitProjectArchive.vue | 80 +++ src/views/projectLib/projectArchive/index.vue | 141 ++++ .../projectArchive/projectArchive.api.ts | 22 + .../projectArchive/projectArchive.data.ts | 5 + .../projectContract/DetailTable.vue | 60 ++ .../projectContract/contractDetail.vue | 16 + .../projectLib/projectContract/index.vue | 119 ++++ .../projectContract/projectContract.api.ts | 26 + .../projectContract/projectContract.data.ts | 193 ++++++ .../projectContract/projectContract.vue | 136 ++++ .../projectLib/projectInfo/Detailpage.vue | 96 +-- .../projectInfo/batchImportProjects.vue | 5 +- src/views/projectLib/projectInfo/index.vue | 71 +- .../projectLib/projectInfo/projectInfo.api.ts | 5 +- .../projectInfo/projectInfo.data.ts | 35 +- .../projectLib/projectInfo/uploadFile.vue | 82 +-- .../projectInfoHistory/Detaillist.vue | 129 ++-- .../projectInfoHistory/Detailpage.vue | 111 ---- .../projectLib/projectInfoHistory/index.vue | 9 +- .../projectInfoHistory.data.ts | 36 +- src/views/projectLib/projectPlan/addPlan.vue | 3 +- .../projectLib/projectPlan/addPlanFile.vue | 23 +- .../projectLib/projectPlan/elstepchild.vue | 4 +- src/views/projectLib/projectPlan/index.vue | 104 +-- .../projectPlan/planinfoFileDetail.vue | 79 +-- .../projectLib/projectPlan/projectPlan.api.ts | 14 +- .../projectPlan/projectPlan.data.ts | 374 ++++------- .../projectLib/projectPlan/viewPlanDetail.vue | 45 +- .../workReport/addModifyWorkreport.vue | 136 ++++ src/views/projectLib/workReport/index.vue | 101 +++ .../projectLib/workReport/workReport.api.ts | 25 + .../projectLib/workReport/workReport.data.ts | 196 ++++++ src/views/system/dict/index.vue | 6 +- src/views/system/role/index.vue | 12 +- src/views/system/user/index.vue | 50 +- src/views/system/user/user.data.ts | 210 +++--- src/views/system/usersetting/BaseSetting.vue | 4 +- .../system/usersetting/UserSetting.data.ts | 78 +-- 70 files changed, 3575 insertions(+), 2469 deletions(-) create mode 100644 src/views/ProcessApprovalSubPage/ProjectArchiveApproval.vue create mode 100644 src/views/ProcessApprovalSubPage/component/ApprovalDetails.vue create mode 100644 src/views/ProcessApprovalSubPage/component/ApprovalFromPage.vue create mode 100644 src/views/ProcessApprovalSubPage/component/ApprovalPageModel.vue create mode 100644 src/views/ProcessApprovalSubPage/component/PlaninfoDetails.vue create mode 100644 src/views/ProcessApprovalSubPage/component/ProjectDetails.vue create mode 100644 src/views/ProcessApprovalSubPage/component/UploadfileDetail.vue create mode 100644 src/views/ProcessApprovalSubPage/initiatesProjectsApproval.vue create mode 100644 src/views/ProcessApprovalSubPage/planFileApproval.vue create mode 100644 src/views/ProcessApprovalSubPage/planFileApproval/index.vue create mode 100644 src/views/ProcessApprovalSubPage/projectPlanApproval.vue create mode 100644 src/views/ProcessApprovalSubPage/uploadfileApproval.vue create mode 100644 src/views/Regulation/RegulationLab/RegulationLab.api.ts create mode 100644 src/views/Regulation/RegulationLab/RegulationLab.data.ts create mode 100644 src/views/Regulation/RegulationLab/addAndModify.vue create mode 100644 src/views/Regulation/RegulationLab/index.vue delete mode 100644 src/views/myWork/completed/complectedDetail.vue delete mode 100644 src/views/projectLib/initiatesProjects/initiatesProjects.data.ts create mode 100644 src/views/projectLib/projectArchive/SubmitProjectArchive.vue create mode 100644 src/views/projectLib/projectArchive/index.vue create mode 100644 src/views/projectLib/projectArchive/projectArchive.api.ts create mode 100644 src/views/projectLib/projectArchive/projectArchive.data.ts create mode 100644 src/views/projectLib/projectContract/DetailTable.vue create mode 100644 src/views/projectLib/projectContract/contractDetail.vue create mode 100644 src/views/projectLib/projectContract/index.vue create mode 100644 src/views/projectLib/projectContract/projectContract.api.ts create mode 100644 src/views/projectLib/projectContract/projectContract.data.ts create mode 100644 src/views/projectLib/projectContract/projectContract.vue delete mode 100644 src/views/projectLib/projectInfoHistory/Detailpage.vue create mode 100644 src/views/projectLib/workReport/addModifyWorkreport.vue create mode 100644 src/views/projectLib/workReport/index.vue create mode 100644 src/views/projectLib/workReport/workReport.api.ts create mode 100644 src/views/projectLib/workReport/workReport.data.ts diff --git a/src/views/ProcessApprovalSubPage/ProjectArchiveApproval.vue b/src/views/ProcessApprovalSubPage/ProjectArchiveApproval.vue new file mode 100644 index 0000000..ef8c9f6 --- /dev/null +++ b/src/views/ProcessApprovalSubPage/ProjectArchiveApproval.vue @@ -0,0 +1,109 @@ + + + + + \ No newline at end of file diff --git a/src/views/ProcessApprovalSubPage/component/ApprovalDetails.vue b/src/views/ProcessApprovalSubPage/component/ApprovalDetails.vue new file mode 100644 index 0000000..03222fd --- /dev/null +++ b/src/views/ProcessApprovalSubPage/component/ApprovalDetails.vue @@ -0,0 +1,42 @@ + + + + \ No newline at end of file diff --git a/src/views/ProcessApprovalSubPage/component/ApprovalFromPage.vue b/src/views/ProcessApprovalSubPage/component/ApprovalFromPage.vue new file mode 100644 index 0000000..151f170 --- /dev/null +++ b/src/views/ProcessApprovalSubPage/component/ApprovalFromPage.vue @@ -0,0 +1,66 @@ + + + + \ No newline at end of file diff --git a/src/views/ProcessApprovalSubPage/component/ApprovalPageModel.vue b/src/views/ProcessApprovalSubPage/component/ApprovalPageModel.vue new file mode 100644 index 0000000..e47162f --- /dev/null +++ b/src/views/ProcessApprovalSubPage/component/ApprovalPageModel.vue @@ -0,0 +1,30 @@ + + + + \ No newline at end of file diff --git a/src/views/ProcessApprovalSubPage/component/PlaninfoDetails.vue b/src/views/ProcessApprovalSubPage/component/PlaninfoDetails.vue new file mode 100644 index 0000000..9b965c1 --- /dev/null +++ b/src/views/ProcessApprovalSubPage/component/PlaninfoDetails.vue @@ -0,0 +1,42 @@ + + + + \ No newline at end of file diff --git a/src/views/ProcessApprovalSubPage/component/ProjectDetails.vue b/src/views/ProcessApprovalSubPage/component/ProjectDetails.vue new file mode 100644 index 0000000..87899f3 --- /dev/null +++ b/src/views/ProcessApprovalSubPage/component/ProjectDetails.vue @@ -0,0 +1,75 @@ + + + + \ No newline at end of file diff --git a/src/views/ProcessApprovalSubPage/component/UploadfileDetail.vue b/src/views/ProcessApprovalSubPage/component/UploadfileDetail.vue new file mode 100644 index 0000000..c8d2d22 --- /dev/null +++ b/src/views/ProcessApprovalSubPage/component/UploadfileDetail.vue @@ -0,0 +1,61 @@ + + + + \ No newline at end of file diff --git a/src/views/ProcessApprovalSubPage/initiatesProjectsApproval.vue b/src/views/ProcessApprovalSubPage/initiatesProjectsApproval.vue new file mode 100644 index 0000000..edc8762 --- /dev/null +++ b/src/views/ProcessApprovalSubPage/initiatesProjectsApproval.vue @@ -0,0 +1,164 @@ + + + \ No newline at end of file diff --git a/src/views/ProcessApprovalSubPage/initiatesProjectsApproval/childProjectsApproval.vue b/src/views/ProcessApprovalSubPage/initiatesProjectsApproval/childProjectsApproval.vue index 3e1fdb4..8ff5030 100644 --- a/src/views/ProcessApprovalSubPage/initiatesProjectsApproval/childProjectsApproval.vue +++ b/src/views/ProcessApprovalSubPage/initiatesProjectsApproval/childProjectsApproval.vue @@ -2,23 +2,17 @@ 项目入库详情 - \ No newline at end of file diff --git a/src/views/ProcessApprovalSubPage/planFileApproval.vue b/src/views/ProcessApprovalSubPage/planFileApproval.vue new file mode 100644 index 0000000..4f4d40f --- /dev/null +++ b/src/views/ProcessApprovalSubPage/planFileApproval.vue @@ -0,0 +1,188 @@ + + + \ No newline at end of file diff --git a/src/views/ProcessApprovalSubPage/planFileApproval/index.vue b/src/views/ProcessApprovalSubPage/planFileApproval/index.vue new file mode 100644 index 0000000..32cd90f --- /dev/null +++ b/src/views/ProcessApprovalSubPage/planFileApproval/index.vue @@ -0,0 +1,191 @@ + + + \ No newline at end of file diff --git a/src/views/ProcessApprovalSubPage/projectPlanApproval.vue b/src/views/ProcessApprovalSubPage/projectPlanApproval.vue new file mode 100644 index 0000000..7dd88a8 --- /dev/null +++ b/src/views/ProcessApprovalSubPage/projectPlanApproval.vue @@ -0,0 +1,144 @@ + + + + \ No newline at end of file diff --git a/src/views/ProcessApprovalSubPage/projectPlanApproval/index.vue b/src/views/ProcessApprovalSubPage/projectPlanApproval/index.vue index e9f4cf3..ba7de03 100644 --- a/src/views/ProcessApprovalSubPage/projectPlanApproval/index.vue +++ b/src/views/ProcessApprovalSubPage/projectPlanApproval/index.vue @@ -1,8 +1,6 @@ \ No newline at end of file diff --git a/src/views/ProcessApprovalSubPage/uploadfileApproval/index.vue b/src/views/ProcessApprovalSubPage/uploadfileApproval/index.vue index 3b2d3f5..bcc75c0 100644 --- a/src/views/ProcessApprovalSubPage/uploadfileApproval/index.vue +++ b/src/views/ProcessApprovalSubPage/uploadfileApproval/index.vue @@ -1,13 +1,13 @@ + + \ No newline at end of file diff --git a/src/views/Regulation/RegulationLab/index.vue b/src/views/Regulation/RegulationLab/index.vue new file mode 100644 index 0000000..dfa776b --- /dev/null +++ b/src/views/Regulation/RegulationLab/index.vue @@ -0,0 +1,109 @@ + + + + + \ No newline at end of file diff --git a/src/views/myWork/completed/complectedDetail.vue b/src/views/myWork/completed/complectedDetail.vue deleted file mode 100644 index 9989eb9..0000000 --- a/src/views/myWork/completed/complectedDetail.vue +++ /dev/null @@ -1,124 +0,0 @@ - - - diff --git a/src/views/myWork/completed/complete.data.ts b/src/views/myWork/completed/complete.data.ts index 200fff7..de11ef6 100644 --- a/src/views/myWork/completed/complete.data.ts +++ b/src/views/myWork/completed/complete.data.ts @@ -12,7 +12,7 @@ export const columns: BasicColumn[] = [ }, { title: '项目id', - dataIndex: 'projectid', + dataIndex: 'projectId', width: 100, }, { @@ -35,21 +35,7 @@ export const columns: BasicColumn[] = [ dataIndex: 'createTime', width: 100, }, - // { - // title: '发起单位', - // dataIndex: 'workplace', - // width: 100, - // }, - // { - // title: '发起单位类型', - // dataIndex: 'workplaceTpye', - // width: 200, - // }, - // { - // title: '联系电话', - // width: 150, - // dataIndex: 'phone', - // }, + ]; export const searchFormSchema: FormSchema[] = [ diff --git a/src/views/myWork/completed/index.vue b/src/views/myWork/completed/index.vue index 8225f5a..bfa48db 100644 --- a/src/views/myWork/completed/index.vue +++ b/src/views/myWork/completed/index.vue @@ -2,17 +2,12 @@
- - - - - +
@@ -22,22 +17,18 @@ import { ref } from 'vue'; import { ActionItem, BasicTable, TableAction } from '/@/components/Table'; import { useListPage } from '/@/hooks/system/useListPage'; import { columns, searchFormSchema } from './complete.data'; -// import { list } from './address.api'; import { myCompleteTask } from '../inComplete/inComplete.api'; - import { useModal } from '/@/components/Modal'; -import { BasicModal } from '/@/components/Modal'; -import complectedDetail from './complectedDetail.vue'; +import ApprovalPageModel from '../../ProcessApprovalSubPage/component/ApprovalPageModel.vue' + -const [registerModal, { openModal, closeModal }] = useModal(); -import { useRouter, useRoute } from 'vue-router' -const route = useRoute(); -const router = useRouter(); -console.log(" const route = useRoute();", route.query) +const [register, { openModal }] = useModal();//文件上传和查看 +let rowData =ref() -let proid = ref(); -let taskid = ref() +/** + * 我的已办表格 + */ const { tableContext } = useListPage({ designScope: 'basic-table-demo-ajax', tableProps: { @@ -54,7 +45,7 @@ const { tableContext } = useListPage({ }, }); //BasicTable绑定注册 -const [registerTable, { reload }] = tableContext; +const [registerTable,{reload}] = tableContext; function getTableAction(record): ActionItem[] { return [ { @@ -66,36 +57,13 @@ function getTableAction(record): ActionItem[] { } function handleEdit(record) { record.procesType="1" //流程类型, 已办是1 代办是0 - - console.log("打开子页面", record); - // openModal(); - // proid.value =record.projectid - // record.procesType="1" //流程类型, 已办是1 代办是0 - if (record.stage == 1) { - router.push({ // push方法 - path: '/ProcessApprovalSubPage/initiatesProjectsApproval', //这里是跳转页面的name inComplectedDetail - query: record - }) - } - else if (record.stage == 2) { - router.push({ // push方法 - path: '/ProcessApprovalSubPage/uploadfileApproval', //这里是跳转页面的name inComplectedDetail - query: record - }) - } - else if(record.stage ==3){ - router.push({ // push方法 - path: '/ProcessApprovalSubPage/projectPlanApproval', //这里是跳转页面的name inComplectedDetail - query: record - }) - } - // console.log(selectedRows.value); - // console.log(selectedRowKeys.value); + //openApprovePage(record,router); + rowData.value =record + openModal(true) } -function closeModals() { - closeModal() +function exit(){ + console.log("fatheer") reload() - } diff --git a/src/views/myWork/inComplete/inComplete.api.ts b/src/views/myWork/inComplete/inComplete.api.ts index a93307b..9def650 100644 --- a/src/views/myWork/inComplete/inComplete.api.ts +++ b/src/views/myWork/inComplete/inComplete.api.ts @@ -7,15 +7,48 @@ export enum Api { myCompleteTask = '/workflow/myCompleteTask', getActionParam = '/workflow/getActionParam', approveUploadFile = "/huzhouUploadfileinfo/approveUploadFile", - modifyProjectInfo='/huzhouProject/modifyProjectInfo' - + modifyProjectInfo = '/huzhouProject/modifyProjectInfo', + approvePlanFile = "/huzhouPlaninfofile/approvePlanFile", + queryProcessInfo = '/workflow/getprocessInfo', + modifyProjectInfoApproval="/huzhouProject/modifyProjectInfoApproval" } /** * 提交入库申请流程 */ +export const queryProcessInfo = (params?) => defHttp.get({ url: Api.queryProcessInfo, params }); + export const myTaskList = (params) => defHttp.get({ url: Api.myTaskList, params }) export const submitTask = (params) => defHttp.post({ url: Api.submitTask, params }) export const myCompleteTask = (params) => defHttp.get({ url: Api.myCompleteTask, params }) export const getActionParam = (params) => defHttp.get({ url: Api.getActionParam, params }) export const approveUploadFile = (params) => defHttp.post({ url: Api.approveUploadFile, headers: { "Content-Type": "multipart/form-data" }, params }) export const modifyProjectInfo = (params) => defHttp.post({ url: Api.modifyProjectInfo, params }) +export const modifyProjectInfoApproval = (params) => defHttp.post({ url: Api.modifyProjectInfoApproval, params }) + +export const approvePlanFile = (params) => defHttp.post({ url: Api.approvePlanFile, headers: { "Content-Type": "multipart/form-data" }, params }) +export const openApprovePage = (record,router) => { + if (record.stage == 1) { + router.push({ // push方法 + path: '/ProcessApprovalSubPage/initiatesProjectsApproval', //项目入库流程详情审批页 + query: record + }) + } + else if (record.stage == 2) { + router.push({ // push方法 + path: '/ProcessApprovalSubPage/uploadfileApproval', //项目监理管理资料审批详情页面 + query: record + }) + } + else if (record.stage == 3) { + router.push({ // push方法 + path: '/ProcessApprovalSubPage/projectPlanApproval', //项目计划审批详情页面 + query: record + }) + } else if (record.stage == 4) { + router.push({ // push方法 + path: '/ProcessApprovalSubPage/planFileApproval', //项目计划文件审批详情页面 + query: record + }) + } +} + diff --git a/src/views/myWork/inComplete/inComplete.data.ts b/src/views/myWork/inComplete/inComplete.data.ts index 9022cd4..6e3eccb 100644 --- a/src/views/myWork/inComplete/inComplete.data.ts +++ b/src/views/myWork/inComplete/inComplete.data.ts @@ -4,13 +4,6 @@ import { getDictItemsByCode } from '/@/utils/dict/index'; import { useUserStore } from '/@/store/modules/user'; const userStore = useUserStore(); -const projectTypeDicts: Array = getDictItemsByCode("projectType") -function projectTypeDict() { - for (let i = 0; i < projectTypeDicts.length; i++) { - projectTypeDicts[i].label = projectTypeDicts[i].text; - } - return projectTypeDicts -} const approvalRsesults:Array = getDictItemsByCode("approvalResult") function approvalRsesult(){ @@ -19,45 +12,41 @@ function approvalRsesult(){ } return approvalRsesults } -export const columns1: BasicColumn[] = [ + +export const approveStartProcessColumns: BasicColumn[] = [ { - title: '项目编号', - width: 150, - dataIndex: 'id', + title: '节点名称', + dataIndex: 'taskName', }, { - title: '项目名称', - dataIndex: 'projectName', + title: '处理人', + dataIndex: 'operator', width: 150, }, { - title: '主要任务及标志性成果', - dataIndex: 'description', + title: '处理时间', + dataIndex: 'operateDate', width: 150, }, { - title: '责任单位', - dataIndex: 'dutyWorkplace', + title: '审批状态', + dataIndex: 'approvalStatue', width: 100, + customRender: ({ record }) => { + for (let i = 0; i < approvalRsesults.length; i++) { + if (record.approvalStatue == approvalRsesults[i].value) { + return approvalRsesults[i].text + } + } + }, }, { - title: '发起单位', - dataIndex: 'workplace', + title: '审批意见', + dataIndex: 'comment', width: 100, - }, - { - title: '发起单位类型', - dataIndex: 'workplaceTpye', - width: 200, - }, - { - title: '联系电话', - width: 150, - dataIndex: 'phone', - }, + } ]; - export const columns: BasicColumn[] = [ { @@ -77,7 +66,7 @@ export const columns: BasicColumn[] = [ }, { title: '项目编号', - dataIndex: 'projectid', + dataIndex: 'projectId', width: 100, }, { @@ -85,16 +74,7 @@ export const columns: BasicColumn[] = [ dataIndex: 'createTime', width: 100, }, - // { - // title: '发起单位类型', - // dataIndex: 'workplaceTpye', - // width: 200, - // }, - // { - // title: '联系电话', - // width: 150, - // dataIndex: 'phone', - // }, + ]; export const searchFormSchema: FormSchema[] = [ diff --git a/src/views/myWork/inComplete/index.vue b/src/views/myWork/inComplete/index.vue index cca9152..ee9aba3 100644 --- a/src/views/myWork/inComplete/index.vue +++ b/src/views/myWork/inComplete/index.vue @@ -2,44 +2,37 @@
- - - +
diff --git a/src/views/projectLib/initiatesProjects/initiatesProjects.data.ts b/src/views/projectLib/initiatesProjects/initiatesProjects.data.ts deleted file mode 100644 index cce4d94..0000000 --- a/src/views/projectLib/initiatesProjects/initiatesProjects.data.ts +++ /dev/null @@ -1,618 +0,0 @@ -import { FormSchema, FormActionType } from '/@/components/Form'; -import { getDictItemsByCode } from '/@/utils/dict/index'; -import { getWorkPlaceTypeDict, getContactorDict } from './initiatesProjects.api' - -const projectTypeDicts: Array = getDictItemsByCode("projectType") -const approvalRsesults: Array = getDictItemsByCode("approvalResult") - -let manageOrgDict = await getWorkPlaceTypeDict({ workPlaceType: "1" }) -let supervisorDict = await getWorkPlaceTypeDict({ workPlaceType: "2" }) -let contructorDict = await getWorkPlaceTypeDict({ workPlaceType: "4" }) -let ownerDict = await getWorkPlaceTypeDict({ workPlaceType: "3" }) -let controlerDict = await getWorkPlaceTypeDict({ workPlaceType: "6" }) -let consultDict = await getWorkPlaceTypeDict({ workPlaceType: "5" }) - -const reformTasksDicts: Array = getDictItemsByCode("reformTasks") -function reformTasksDict() { - for (let i = 0; i < reformTasksDicts.length; i++) { - reformTasksDicts[i].label = reformTasksDicts[i].text; - } - return reformTasksDicts -} -const roomDicts: Array = getDictItemsByCode("room") -function roomDict() { - for (let i = 0; i < roomDicts.length; i++) { - roomDicts[i].label = roomDicts[i].text; - } - return roomDicts -} -export const formSchemas: FormSchema[] = [ - { - //标题名称 - label: '项目名称', - //字段 - field: 'projectName', - //组件 支持组件详见 components/Form/src/types/index.ts 中的 ComponentType - component: 'Input', - //标题宽度,支持数字和字符串 - // labelWidth: 150, - // //标题长度,超过位数隐藏 - // labelLength: 3, - //一列占比总共24,比如一行显示2列 - colProps: { span: 12 }, - required: true, - }, - { - label: '行政区划', - field: 'adminDivision', - //子标题名称(在主标题后面) - component: 'Input', - //一列占比总共24,比如一行显示2列 - colProps: { span: 12 }, - required: true, - }, - // { - // label: '项目类型', - // field: 'projectType', - // component: 'Select', - // colProps: { span: 12 }, - - // //填写组件Select的属性 - // componentProps: { - // options: projectTypeDict() - // }, - // }, - { - label: '主要任务', - field: 'description', - //子标题名称(在主标题后面) - component: 'InputTextArea', - //一列占比总共24,比如一行显示2列 - colProps: { span: 24 }, - required: true, - }, - - { - //标题名称 - label: '责任单位', - //字段 - field: 'dutyWorkplace', - //组件 支持组件详见 components/Form/src/types/index.ts 中的 ComponentType - component: 'Input', - - //一列占比总共24,比如一行显示2列 - colProps: { span: 12 }, - required: true, - }, - { - //标题名称 - label: '单位属性', - //字段 - field: 'workplaceProperties', - //组件 支持组件详见 components/Form/src/types/index.ts 中的 ComponentType - component: 'Input', - - //一列占比总共24,比如一行显示2列 - colProps: { span: 12 }, - required: true, - }, - { - //标题名称 - label: '建设周期(月)', - //字段 - field: 'constructionPeriod', - //组件 支持组件详见 components/Form/src/types/index.ts 中的 ComponentType - component: 'InputNumber', - componentProps: { - //数值精度 - precision: 0, - //步数 - step: 0.1 - }, - //一列占比总共24,比如一行显示2列 - colProps: { span: 12 }, - required: true, - }, - { - //标题名称 - label: '总投资(元)', - //字段 - field: 'totalMoney', - //组件 支持组件详见 components/Form/src/types/index.ts 中的 ComponentType - component: 'InputNumber', - componentProps: { - //带标签的 input,设置后置标签 - addonBefore: '保留两位小数', - //数值精度 - precision: 2, - //步数 - step: 1 - }, - //一列占比总共24,比如一行显示2列 - colProps: { span: 12 }, - required: true, - }, - { - //标题名称 - label: '中央资金(元)', - //字段 - field: 'centralMoney', - //组件 支持组件详见 components/Form/src/types/index.ts 中的 ComponentType - component: 'InputNumber', - componentProps: { - //带标签的 input,设置后置标签 - addonBefore: '保留两位小数', - //数值精度 - precision: 2, - //步数 - step: 1 - }, - //一列占比总共24,比如一行显示2列 - colProps: { span: 12 }, - required: true, - }, - { - //标题名称 - label: '省级资金(元)', - //字段 - field: 'provincialMoney', - //组件 支持组件详见 components/Form/src/types/index.ts 中的 ComponentType - component: 'InputNumber', - componentProps: { - //带标签的 input,设置后置标签 - addonBefore: '保留两位小数', - //数值精度 - precision: 2, - //步数 - step: 1 - }, - //一列占比总共24,比如一行显示2列 - colProps: { span: 12 }, - required: true, - }, - { - //标题名称 - label: '市级资金(元)', - //字段 - field: 'cityMoney', - //组件 支持组件详见 components/Form/src/types/index.ts 中的 ComponentType - component: 'InputNumber', - componentProps: { - //带标签的 input,设置后置标签 - addonBefore: '保留两位小数', - - //数值精度 - precision: 2, - //步数 - step: 1 - }, - //一列占比总共24,比如一行显示2列 - colProps: { span: 12 }, - required: true, - }, - { - //标题名称 - label: '区县级资金(元)', - //字段 - field: 'countyMoney', - //组件 支持组件详见 components/Form/src/types/index.ts 中的 ComponentType - component: 'InputNumber', - componentProps: { - //带标签的 input,设置后置标签 - addonBefore: '保留两位小数', - - //数值精度 - precision: 2, - //步数 - step: 1 - }, - //一列占比总共24,比如一行显示2列 - colProps: { span: 12 }, - required: true, - }, - { - //标题名称 - label: '自筹资金(元)', - //字段 - field: 'selfMoney', - //组件 支持组件详见 components/Form/src/types/index.ts 中的 ComponentType - component: 'InputNumber', - componentProps: { - //带标签的 input,设置后置标签 - addonBefore: '保留两位小数', - - //数值精度 - precision: 2, - //步数 - step: 1 - }, - //一列占比总共24,比如一行显示2列 - colProps: { span: 12 }, - required: true, - }, - { - //标题名称 - label: '2023年支付(元)', - //字段 - field: 'payamount2023Money', - //组件 支持组件详见 components/Form/src/types/index.ts 中的 ComponentType - component: 'InputNumber', - componentProps: { - //带标签的 input,设置后置标签 - addonBefore: '保留两位小数', - - //数值精度 - precision: 2, - //步数 - step: 1 - }, - //一列占比总共24,比如一行显示2列 - colProps: { span: 12 }, - required: true, - }, - { - //标题名称 - label: '2024年支付(元)', - //字段 - field: 'payamount2024Money', - //组件 支持组件详见 components/Form/src/types/index.ts 中的 ComponentType - component: 'InputNumber', - componentProps: { - //带标签的 input,设置后置标签 - addonBefore: '保留两位小数', - - //数值精度 - precision: 2, - //步数 - step: 1 - }, - //一列占比总共24,比如一行显示2列 - colProps: { span: 12 }, - required: true, - }, { - //标题名称 - label: '2025年支付(元)', - //字段 - field: 'payamount2025Money', - //组件 支持组件详见 components/Form/src/types/index.ts 中的 ComponentType - component: 'InputNumber', - componentProps: { - //带标签的 input,设置后置标签 - addonBefore: '保留两位小数', - - //数值精度 - precision: 2, - //步数 - step: 1 - }, - //一列占比总共24,比如一行显示2列 - colProps: { span: 12 }, - required: true, - }, - - { - //标题名称 - label: '改革所属项目', - //字段 - field: 'reformName', - //组件 支持组件详见 components/Form/src/types/index.ts 中的 ComponentType - component: 'Select', - - //一列占比总共24,比如一行显示2列 - colProps: { span: 12 }, - required: true, - componentProps:{ - options:reformTasksDict() - } - }, - { - //标题名称 - label: '上级指导室', - //字段 - field: 'superLeader', - //组件 支持组件详见 components/Form/src/types/index.ts 中的 ComponentType - component: 'Select', - - //一列占比总共24,比如一行显示2列 - colProps: { span: 12 }, - required: true, - componentProps:{ - options:roomDict() - } - }, - { - //标题名称 - label: '项目联系人', - //字段 - field: 'projectContacts', - //组件 支持组件详见 components/Form/src/types/index.ts 中的 ComponentType - component: 'Input', - - //一列占比总共24,比如一行显示2列 - colProps: { span: 12 }, - required: true, - }, - { - //标题名称 - label: '联系电话', - //字段 - field: 'phone', - //组件 支持组件详见 components/Form/src/types/index.ts 中的 ComponentType - component: 'Input', - - //一列占比总共24,比如一行显示2列 - colProps: { span: 12 }, - dynamicRules: () => { - return [ - { required: true, message: '请填写手机号' }, - { pattern: /^1[3456789]\d{9}$/, message: '手机号码格式有误' }, - ]; - }, - }, - { - //标题名称 - label: '管理单位', - //字段 - field: 'manageOrg', - //组件 支持组件详见 components/Form/src/types/index.ts 中的 ComponentType - component: 'Select', - componentProps: ({ formModel, formActionType }) => { - console.log("formModel", formModel, "formActionType", formActionType) - return { - // - options: manageOrgDict, - onChange: async (value) => { - // console.log(e) - let manageContactorDict = await getContactorDict({ workPlace: value, workPlaceType: "1" }) - // formModel.manageContactor = undefined; // reset city value - const { updateSchema, setFieldsValue } = formActionType; - updateSchema({ - field: 'manageContactor', - componentProps: { - options: manageContactorDict, - }, - }); - setFieldsValue({ manageContactor: "" }) - }, - }; - }, - //一列占比总共24,比如一行显示2列 - colProps: { span: 12 }, - }, - - { - //标题名称 - label: '管理单位负责人', - //字段 - field: 'manageContactor', - //组件 支持组件详见 components/Form/src/types/index.ts 中的 ComponentType - component: 'Select', - componentProps: { - options: [], - - }, //一列占比总共24,比如一行显示2列 - colProps: { span: 12 }, - }, - { - //标题名称 - label: '监管单位', - //字段 - field: 'supervisor', - //组件 支持组件详见 components/Form/src/types/index.ts 中的 ComponentType - component: 'Select', - componentProps: ({ formModel, formActionType }) => { - console.log("formModel", formModel, "formActionType", formActionType) - return { - // - options: supervisorDict, - onChange: async (value) => { - // console.log(e) - let supervisorContactorDict = await getContactorDict({ workPlace: value, workPlaceType: "2" }) - // formModel.manageContactor = undefined; // reset city value - const { updateSchema, setFieldsValue } = formActionType; - updateSchema({ - field: 'supervisorContactor', - componentProps: { - options: supervisorContactorDict, - }, - }); - setFieldsValue({ supervisorContactor: "" }) - }, - }; - }, - //一列占比总共24,比如一行显示2列 - colProps: { span: 12 }, - }, - { - //标题名称 - label: '监管单位联系人', - //字段 - field: 'supervisorContactor', - //组件 支持组件详见 components/Form/src/types/index.ts 中的 ComponentType - component: 'Select', - componentProps: { - options: [], - - }, - //一列占比总共24,比如一行显示2列 - colProps: { span: 12 }, - }, - { - //标题名称 - label: '承建单位', - //字段 - field: 'contructor', - //组件 支持组件详见 components/Form/src/types/index.ts 中的 ComponentType - component: 'Select', - componentProps: ({ formModel, formActionType }) => { - console.log("formModel", formModel, "formActionType", formActionType) - return { - // - options: contructorDict, - onChange: async (value) => { - // console.log(e) - let contructorContactorDict = await getContactorDict({ workPlace: value, workPlaceType: "4" }) - // formModel.manageContactor = undefined; // reset city value - const { updateSchema, setFieldsValue } = formActionType; - updateSchema({ - field: 'contructorContactor', - componentProps: { - options: contructorContactorDict, - }, - }); - setFieldsValue({ contructorContactor: "" }) - }, - }; - }, - //一列占比总共24,比如一行显示2列 - colProps: { span: 12 }, - }, - { - //标题名称 - label: '承建单位负责人', - //字段 - field: 'contructorContactor', - //组件 支持组件详见 components/Form/src/types/index.ts 中的 ComponentType - component: 'Select', - componentProps: { - options: [], - - }, - //一列占比总共24,比如一行显示2列 - colProps: { span: 12 }, - }, - { - //标题名称 - label: '建设单位', - //字段 - field: 'owner', - //组件 支持组件详见 components/Form/src/types/index.ts 中的 ComponentType - component: 'Select', - componentProps: ({ formModel, formActionType }) => { - console.log("formModel", formModel, "formActionType", formActionType) - return { - // - options: ownerDict, - onChange: async (value) => { - // console.log(e) - let ownerContactorDict = await getContactorDict({ workPlace: value, workPlaceType: "3" }) - // formModel.manageContactor = undefined; // reset city value - const { updateSchema, setFieldsValue } = formActionType; - updateSchema({ - field: 'ownerContactor', - componentProps: { - options: ownerContactorDict, - } - }); - setFieldsValue({ ownerContactor: "" }) - }, - }; - }, - //一列占比总共24,比如一行显示2列 - colProps: { span: 12 }, - required: true, - }, - { - //标题名称 - label: '建设单位负责人', - //字段 - field: 'ownerContactor', - //组件 支持组件详见 components/Form/src/types/index.ts 中的 ComponentType - component: 'Select', - componentProps: { - options: [], - - }, - //一列占比总共24,比如一行显示2列 - colProps: { span: 12 }, - required: true, - }, - { - //标题名称 - label: '监理单位', - //字段 - field: 'controler', - //组件 支持组件详见 components/Form/src/types/index.ts 中的 ComponentType - component: 'Select', - componentProps: ({ formModel, formActionType }) => { - console.log("formModel", formModel, "formActionType", formActionType) - return { - // - options: controlerDict, - onChange: async (value) => { - // console.log(e) - let controlerContactorDict = await getContactorDict({ workPlace: value, workPlaceType: "6" }) - // formModel.manageContactor = undefined; // reset city value - const { updateSchema, setFieldsValue } = formActionType; - updateSchema({ - field: 'controlerContactor', - componentProps: { - options: controlerContactorDict, - } - }); - setFieldsValue({ controlerContactor: "" }) - }, - }; - }, - //一列占比总共24,比如一行显示2列 - colProps: { span: 12 }, - }, - { - //标题名称 - label: '监理单位负责人', - //字段 - field: 'controlerContactor', - //组件 支持组件详见 components/Form/src/types/index.ts 中的 ComponentType - component: 'Select', - componentProps: { - options: [], - - }, - //一列占比总共24,比如一行显示2列 - colProps: { span: 12 }, - }, - { - //标题名称 - label: '咨询单位', - //字段 - field: 'consult', - //组件 支持组件详见 components/Form/src/types/index.ts 中的 ComponentType - component: 'Select', - componentProps: ({ formModel, formActionType }) => { - console.log("formModel", formModel, "formActionType", formActionType) - return { - // - options: consultDict, - onChange: async (value) => { - // console.log(e) - let consultContactoDict = await getContactorDict({ workPlace: value, workPlaceType: "5" }) - // formModel.manageContactor = undefined; // reset city value - const { updateSchema, setFieldsValue } = formActionType; - updateSchema({ - field: 'consultContactor', - componentProps: { - options: consultContactoDict, - } - }); - setFieldsValue({ consultContactor: "" }) - }, - }; - }, - //一列占比总共24,比如一行显示2列 - colProps: { span: 12 }, - }, - { - //标题名称 - label: '咨询单位负责人', - //字段 - field: 'consultContactor', - //组件 支持组件详见 components/Form/src/types/index.ts 中的 ComponentType - component: 'Select', - componentProps: { - options: [], - - }, - //一列占比总共24,比如一行显示2列 - colProps: { span: 12 }, - }, -]; diff --git a/src/views/projectLib/initiatesProjects/initiatesProjects.vue b/src/views/projectLib/initiatesProjects/initiatesProjects.vue index 9beba1d..0748706 100644 --- a/src/views/projectLib/initiatesProjects/initiatesProjects.vue +++ b/src/views/projectLib/initiatesProjects/initiatesProjects.vue @@ -10,19 +10,13 @@ -./projectInfoHistory.data \ No newline at end of file + \ No newline at end of file diff --git a/src/views/projectLib/planinfoHistory/planinfoHistory.data.ts b/src/views/projectLib/planinfoHistory/planinfoHistory.data.ts index 0632d00..6875239 100644 --- a/src/views/projectLib/planinfoHistory/planinfoHistory.data.ts +++ b/src/views/projectLib/planinfoHistory/planinfoHistory.data.ts @@ -1,39 +1,6 @@ import { BasicColumn } from '/@/components/Table'; -// function approvalRsesult(){ -// for(let i = 0;i - ./projectInfoHistory.data \ No newline at end of file + \ No newline at end of file diff --git a/src/views/projectLib/planinfoHistory/planinfoHistoryDetailpage.vue b/src/views/projectLib/planinfoHistory/planinfoHistoryDetailpage.vue index 0bf687d..9694f14 100644 --- a/src/views/projectLib/planinfoHistory/planinfoHistoryDetailpage.vue +++ b/src/views/projectLib/planinfoHistory/planinfoHistoryDetailpage.vue @@ -4,16 +4,13 @@ -./projectInfoHistory.data \ No newline at end of file diff --git a/src/views/projectLib/projectArchive/SubmitProjectArchive.vue b/src/views/projectLib/projectArchive/SubmitProjectArchive.vue new file mode 100644 index 0000000..d16bbc4 --- /dev/null +++ b/src/views/projectLib/projectArchive/SubmitProjectArchive.vue @@ -0,0 +1,80 @@ + + + + + \ No newline at end of file diff --git a/src/views/projectLib/projectArchive/index.vue b/src/views/projectLib/projectArchive/index.vue new file mode 100644 index 0000000..db1c586 --- /dev/null +++ b/src/views/projectLib/projectArchive/index.vue @@ -0,0 +1,141 @@ + + + + + \ No newline at end of file diff --git a/src/views/projectLib/projectArchive/projectArchive.api.ts b/src/views/projectLib/projectArchive/projectArchive.api.ts new file mode 100644 index 0000000..84c45f0 --- /dev/null +++ b/src/views/projectLib/projectArchive/projectArchive.api.ts @@ -0,0 +1,22 @@ +import { defHttp } from '/@/utils/http/axios'; + +export enum Api { + submitProjectArchive = '/huzhouProject/submitProjectArchive', + approveProjectArchive="/huzhouProject/approveProjectArchive", + projectArchivePageList = '/huzhouProject/projectArchivePageList', + + queryPlanModuleDetailPage = "/huzhouPlan/queryPlanModuleDetailPage", + +} +/** + * 提交入库申请流程 + */ +export const submitProjectArchive = (params) => defHttp.post({ url: Api.submitProjectArchive, params }) +export const approveProjectArchive = (params) => defHttp.post({ url: Api.approveProjectArchive, params }) + +export const projectArchivePageList = (params) => defHttp.get({ url: Api.projectArchivePageList, params }) + +// export const submitplaninfoUploadFile = (params?) =>defHttp.post({ url: Api.submitplaninfoUploadFile,headers:{ "Content-Type": "multipart/form-data" }, params }) + + + diff --git a/src/views/projectLib/projectArchive/projectArchive.data.ts b/src/views/projectLib/projectArchive/projectArchive.data.ts new file mode 100644 index 0000000..ccd8e70 --- /dev/null +++ b/src/views/projectLib/projectArchive/projectArchive.data.ts @@ -0,0 +1,5 @@ +import { FormSchema } from '/@/components/Form'; +import { BasicColumn } from '/@/components/Table'; +import { getDictItemsByCode } from '/@/utils/dict/index'; +import { useUserStore } from '/@/store/modules/user'; +import dayjs from "dayjs"; diff --git a/src/views/projectLib/projectContract/DetailTable.vue b/src/views/projectLib/projectContract/DetailTable.vue new file mode 100644 index 0000000..7d9e5d7 --- /dev/null +++ b/src/views/projectLib/projectContract/DetailTable.vue @@ -0,0 +1,60 @@ + + + + \ No newline at end of file diff --git a/src/views/projectLib/projectContract/contractDetail.vue b/src/views/projectLib/projectContract/contractDetail.vue new file mode 100644 index 0000000..09354ad --- /dev/null +++ b/src/views/projectLib/projectContract/contractDetail.vue @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/src/views/projectLib/projectContract/index.vue b/src/views/projectLib/projectContract/index.vue new file mode 100644 index 0000000..8fb5d9b --- /dev/null +++ b/src/views/projectLib/projectContract/index.vue @@ -0,0 +1,119 @@ + + + + + \ No newline at end of file diff --git a/src/views/projectLib/projectContract/projectContract.api.ts b/src/views/projectLib/projectContract/projectContract.api.ts new file mode 100644 index 0000000..ab3d444 --- /dev/null +++ b/src/views/projectLib/projectContract/projectContract.api.ts @@ -0,0 +1,26 @@ +import { defHttp } from '/@/utils/http/axios'; +import { downloadFile } from "../../../api/common/api" + +export enum Api { + huzhouContractinfoPageList = '/huzhouContractinfo/huzhouContractinfoPageList', + addContractinfo="/huzhouContractinfo/addContractinfo", + modifyContractinfo = '/huzhouContractinfo/modifyContractinfo', + getContractinfoById="/huzhouContractinfo/getContractinfoById", + deleteContractinfo = '/huzhouContractinfo/deleteContractinfo', + isExistContractinfo="/huzhouContractinfo/isExistContractinfo", + getContractinfoListById="/huzhouContractinfo/getContractinfoListById" +} + +export const huzhouContractinfoPageList = (params) => defHttp.get({ url: Api.huzhouContractinfoPageList, params }) +export const getContractinfoById = (params) => defHttp.get({ url: Api.getContractinfoById, params }) +export const isExistContractinfo = (params) => defHttp.get({ url: Api.isExistContractinfo, params }) +export const getContractinfoListById = (params) => defHttp.get({ url: Api.getContractinfoListById, params }) + +export const addContractinfo = (params?) =>defHttp.post({ url: Api.addContractinfo,headers:{ "Content-Type": "multipart/form-data" }, params }) + +export const modifyContractinfo = (params?) =>defHttp.post({ url: Api.modifyContractinfo,headers:{ "Content-Type": "multipart/form-data" }, params }) + +export const deleteContractinfo = (params?) =>defHttp.post({ url: Api.deleteContractinfo, params }) + + + diff --git a/src/views/projectLib/projectContract/projectContract.data.ts b/src/views/projectLib/projectContract/projectContract.data.ts new file mode 100644 index 0000000..ce820c9 --- /dev/null +++ b/src/views/projectLib/projectContract/projectContract.data.ts @@ -0,0 +1,193 @@ +import { FormSchema } from '/@/components/Form'; +import { BasicColumn } from '/@/components/Table'; + + +export const contractShowcolumns: BasicColumn[] = [ + { + title: '项目名称', + dataIndex: 'projectName', + }, + + { + title: '合同总金额', + dataIndex: 'totalAmount', + }, + { + title: '文件名称', + dataIndex: 'documentName', + width: 150, + }, + { + title: '文件大小', + dataIndex: 'size', + width: 150, + customRender: ({ record }) => { + let kbNum: number = record.size / 1024 + if (kbNum < 1024) { + return kbNum.toFixed(2).toString() + "KB" + } else { + let mbNum: number = kbNum / 1024 + return mbNum.toFixed(2).toString() + "MB" + } + + }, + + }, + +]; +export const contractDetailcolumns: BasicColumn[] = [ + { + title: '合同总金额', + dataIndex: 'totalAmount', + }, + { + title: '首付时间', + dataIndex: 'downpaymentDate', + + }, + { + title: '首付比例', + dataIndex: 'downpaymentRatio', + + }, + + { + title: '初验时间', + dataIndex: 'initialDate', + }, + + { + title: '初验比例', + dataIndex: 'initialRatio', + + }, + { + title: '终验时间', + dataIndex: 'finalDate', + + }, + { + title: '终验比例', + dataIndex: 'finalRatio', + }, + { + title: '文件名称', + dataIndex: 'documentName', + width: 150, + }, + { + title: '文件大小', + dataIndex: 'size', + width: 150, + customRender: ({ record }) => { + let kbNum: number = record.size / 1024 + if (kbNum < 1024) { + return kbNum.toFixed(2).toString() + "KB" + } else { + let mbNum: number = kbNum / 1024 + return mbNum.toFixed(2).toString() + "MB" + } + + }, + + }, + +]; +export const searchFormSchema: FormSchema[] = [ + { + label: '项目名称', + field: 'projectName', + component: 'Input', + }, + { + label: '文件名称', + field: 'documentName', + component: 'Input', + } + +]; +export const contractformSchemas: FormSchema[] = [ + { + label: '首付时间', + field: 'downpaymentDate', + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD', + }, + required: true, + colProps: { span: 12}, + }, + { + label: '首付比例', + field: 'downpaymentRatio', + component:'InputNumber', + componentProps: { + //数值精度 + precision: 0, + //步数 + step: 1 + }, + required: true, + colProps: { span: 12 }, + }, + + { + label: '初验时间', + field: 'initialDate', + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD', + }, + required: true, + colProps: { span: 12}, + }, + { + label: '初验比例', + field: 'initialRatio', + component: 'InputNumber', + componentProps: { + //数值精度 + precision: 0, + //步数 + step: 1 + }, + required: true, + colProps: { span: 12 }, + }, + { + label: '终验时间', + field: 'finalDate', + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD', + }, + required: true, + colProps: { span: 12 }, + }, + { + label: '终验比例', + field: 'finalRatio', + component: 'InputNumber', + componentProps: { + //数值精度 + precision: 0, + //步数 + step: 1 + }, + required: true, + colProps: { span: 12 }, + }, + { + label: '合同总金额', + field: 'totalAmount', + component: 'InputNumber', + componentProps: { + //数值精度 + precision: 2, + //步数 + step: 1 + }, + required: true, + colProps: { span: 12 }, + } +]; diff --git a/src/views/projectLib/projectContract/projectContract.vue b/src/views/projectLib/projectContract/projectContract.vue new file mode 100644 index 0000000..0303cbc --- /dev/null +++ b/src/views/projectLib/projectContract/projectContract.vue @@ -0,0 +1,136 @@ + + + diff --git a/src/views/projectLib/projectInfo/Detailpage.vue b/src/views/projectLib/projectInfo/Detailpage.vue index 6dcb8de..8fe10ad 100644 --- a/src/views/projectLib/projectInfo/Detailpage.vue +++ b/src/views/projectLib/projectInfo/Detailpage.vue @@ -1,10 +1,7 @@ \ No newline at end of file diff --git a/src/views/projectLib/projectInfo/projectInfo.api.ts b/src/views/projectLib/projectInfo/projectInfo.api.ts index 3e59e0f..1d24e68 100644 --- a/src/views/projectLib/projectInfo/projectInfo.api.ts +++ b/src/views/projectLib/projectInfo/projectInfo.api.ts @@ -1,4 +1,4 @@ -import { update } from 'lodash-es'; +import { downloadFile } from "../../../api/common/api" import { defHttp } from '/@/utils/http/axios'; export enum Api { @@ -11,6 +11,7 @@ export enum Api { batchImportProjects="/huzhouProject/batchImportProjects", getIsbatchImportProjects = '/huzhouProject/getIsbatchImportProjects', batchImportProjectPageListByInstid = '/huzhouProject/batchImportProjectPageListByInstid', + batchdownloadProject="/huzhouProject/batchdownloadProject" } /** * 获取部门树列表 @@ -30,6 +31,8 @@ export const batchImportProjects = (params?) =>defHttp.post({ url: Api.batchImp export const getIsbatchImportProjects = (params?) =>defHttp.get({ url: Api.getIsbatchImportProjects, params }); export const batchImportProjectPageListByInstid = (params?) =>defHttp.get({ url: Api.batchImportProjectPageListByInstid, params }); +export const batchdownloadProject = (params?) => downloadFile(Api.batchdownloadProject,"项目入库数据.xlsx",params) + diff --git a/src/views/projectLib/projectInfo/projectInfo.data.ts b/src/views/projectLib/projectInfo/projectInfo.data.ts index 26274cd..8130711 100644 --- a/src/views/projectLib/projectInfo/projectInfo.data.ts +++ b/src/views/projectLib/projectInfo/projectInfo.data.ts @@ -643,7 +643,7 @@ export const formSchemas: FormSchema[] = [ }, //一列占比总共24,比如一行显示2列 colProps: { span: 12 }, - required: true, + // required: true, }, { //标题名称 @@ -747,40 +747,7 @@ export const formSchemas: FormSchema[] = [ } ]; -export const approveStartProcessColumns: BasicColumn[] = [ - { - title: '节点名称', - dataIndex: 'taskName', - }, - { - title: '处理人', - dataIndex: 'operator', - width: 150, - }, - { - title: '处理时间', - dataIndex: 'operateDate', - width: 150, - }, - { - title: '审批状态', - dataIndex: 'approvalStatue', - width: 100, - customRender: ({ record }) => { - for (let i = 0; i < approvalRsesults.length; i++) { - if (record.approvalStatue == approvalRsesults[i].value) { - return approvalRsesults[i].text - } - } - }, - }, - { - title: '审批意见', - dataIndex: 'comment', - width: 100, - } -]; export const resourcetableColumns: BasicColumn[] = [ { title: '文件名称', diff --git a/src/views/projectLib/projectInfo/uploadFile.vue b/src/views/projectLib/projectInfo/uploadFile.vue index 4b8cfe8..546a8b1 100644 --- a/src/views/projectLib/projectInfo/uploadFile.vue +++ b/src/views/projectLib/projectInfo/uploadFile.vue @@ -6,7 +6,7 @@ + :on-exceed="handleExceed" :limit="5" :on-remove="removeFile"> 选取文件
文件大小且不超过5M
@@ -17,77 +17,36 @@ 关闭窗口
- 项目入库详情 - + + - ./projectInfoHistory.data \ No newline at end of file + \ No newline at end of file diff --git a/src/views/projectLib/projectInfoHistory/Detailpage.vue b/src/views/projectLib/projectInfoHistory/Detailpage.vue deleted file mode 100644 index ad50f20..0000000 --- a/src/views/projectLib/projectInfoHistory/Detailpage.vue +++ /dev/null @@ -1,111 +0,0 @@ - - - -./projectInfoHistory.data \ No newline at end of file diff --git a/src/views/projectLib/projectInfoHistory/index.vue b/src/views/projectLib/projectInfoHistory/index.vue index fdfb14f..b2a0f08 100644 --- a/src/views/projectLib/projectInfoHistory/index.vue +++ b/src/views/projectLib/projectInfoHistory/index.vue @@ -23,13 +23,12 @@ import { useListPage } from '/@/hooks/system/useListPage'; import { BasicModal,useModal } from '/@/components/Modal'; import { searchFormSchema } from '../projectInfo/projectInfo.data'; -import {columns} from './projectInfoHistory.data' +import {columns} from '../projectInfo/projectInfo.data' // import { list } from './address.api'; import Detaillist from './Detaillist.vue'; import { projectInfoHistoryPageList } from './projectInfoHistory.api'; -import { useUserStore } from '/@/store/modules/user'; -const userStore = useUserStore(); + let proid = ref(); const [registeProjectrModal, { openModal: openModalProjectr }] = useModal();//项目详情 @@ -51,7 +50,7 @@ const { tableContext } = useListPage({ }, }); //BasicTable绑定注册 -const [registerTable, { reload }] = tableContext; +const [registerTable] = tableContext; function getTableAction(record): ActionItem[] { return [ { @@ -70,4 +69,4 @@ function handleDetailpage(record) { -./projectInfoHistory.data \ No newline at end of file + \ No newline at end of file diff --git a/src/views/projectLib/projectInfoHistory/projectInfoHistory.data.ts b/src/views/projectLib/projectInfoHistory/projectInfoHistory.data.ts index 85ae076..f31b4f9 100644 --- a/src/views/projectLib/projectInfoHistory/projectInfoHistory.data.ts +++ b/src/views/projectLib/projectInfoHistory/projectInfoHistory.data.ts @@ -632,7 +632,7 @@ export const formSchemas: FormSchema[] = [ }, //一列占比总共24,比如一行显示2列 colProps: { span: 12 }, - required: true, + // required: true, }, { //标题名称 @@ -736,40 +736,6 @@ export const formSchemas: FormSchema[] = [ } ]; -export const approveStartProcessColumns: BasicColumn[] = [ - - { - title: '节点名称', - dataIndex: 'taskName', - }, - { - title: '处理人', - dataIndex: 'operator', - width: 150, - }, - { - title: '处理时间', - dataIndex: 'operateDate', - width: 150, - }, - { - title: '审批状态', - dataIndex: 'approvalStatue', - width: 100, - customRender: ({ record }) => { - for (let i = 0; i < approvalRsesults.length; i++) { - if (record.approvalStatue == approvalRsesults[i].value) { - return approvalRsesults[i].text - } - } - }, - }, - { - title: '审批意见', - dataIndex: 'comment', - width: 100, - } -]; export const resourcetableColumns: BasicColumn[] = [ { title: '文件名称', diff --git a/src/views/projectLib/projectPlan/addPlan.vue b/src/views/projectLib/projectPlan/addPlan.vue index 54162cd..9c21eca 100644 --- a/src/views/projectLib/projectPlan/addPlan.vue +++ b/src/views/projectLib/projectPlan/addPlan.vue @@ -20,8 +20,7 @@ diff --git a/src/views/projectLib/projectPlan/index.vue b/src/views/projectLib/projectPlan/index.vue index f6ccb7b..b7caf38 100644 --- a/src/views/projectLib/projectPlan/index.vue +++ b/src/views/projectLib/projectPlan/index.vue @@ -1,31 +1,14 @@