Merge branch 'master' of http://182.92.169.222:3000/zhc077/zmd_kejiju
commit
2ce6dcacb2
9 changed files with 313 additions and 383 deletions
@ -1,190 +1,61 @@ |
||||
<template> |
||||
<div> |
||||
<!--引用表格--> |
||||
<BasicTable @register="registerTable" :rowSelection="rowSelection"> |
||||
<!--插槽:table标题--> |
||||
<template #tableTitle> |
||||
<a-button type="primary" v-auth="'projectLog:project_log:add'" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button> |
||||
<a-button type="primary" v-auth="'projectLog:project_log:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button> |
||||
<j-upload-button type="primary" v-auth="'projectLog:project_log:importExcel'" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button> |
||||
<a-dropdown v-if="selectedRowKeys.length > 0"> |
||||
<template #overlay> |
||||
<a-menu> |
||||
<a-menu-item key="1" @click="batchHandleDelete"> |
||||
<Icon icon="ant-design:delete-outlined"></Icon> |
||||
删除 |
||||
</a-menu-item> |
||||
</a-menu> |
||||
</template> |
||||
<a-button v-auth="'projectLog:project_log:deleteBatch'">批量操作 |
||||
<Icon icon="mdi:chevron-down"></Icon> |
||||
</a-button> |
||||
</a-dropdown> |
||||
<!-- 高级查询 --> |
||||
<super-query :config="superQueryConfig" @search="handleSuperQuery" /> |
||||
</template> |
||||
<!--操作栏--> |
||||
<template #action="{ record }"> |
||||
<TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/> |
||||
</template> |
||||
<!--字段回显插槽--> |
||||
<template v-slot:bodyCell="{ column, record, index, text }"> |
||||
</template> |
||||
</BasicTable> |
||||
<!-- 表单区域 --> |
||||
<ProjectLogModal @register="registerModal" @success="handleSuccess"></ProjectLogModal> |
||||
</div> |
||||
<BasicModal @register="registerProjectLogModal" title="日志" width="1024px" @ok="onOk"> |
||||
<a-card :current="2" title="流程进度" :bordered="true"> |
||||
<a-steps size="small"> |
||||
<a-step title="申请人提交"/> |
||||
<a-step title="申请单位提交"/> |
||||
<a-step title="科技主管提交"/> |
||||
<a-step title="市科技局提交"/> |
||||
<a-step title="财政主管处理"/> |
||||
</a-steps> |
||||
</a-card> |
||||
<BasicTable @register="projectLog"/> |
||||
</BasicModal> |
||||
</template> |
||||
|
||||
<script lang="ts" name="projectLog-projectLog" setup> |
||||
import {ref, reactive, computed, unref} from 'vue'; |
||||
import {BasicTable, useTable, TableAction} from '/@/components/Table'; |
||||
import {useModal} from '/@/components/Modal'; |
||||
import { useListPage } from '/@/hooks/system/useListPage' |
||||
import ProjectLogModal from './components/ProjectLogModal.vue' |
||||
import {columns, searchFormSchema, superQuerySchema} from './ProjectLog.data'; |
||||
import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './ProjectLog.api'; |
||||
import { downloadFile } from '/@/utils/common/renderUtils'; |
||||
import { useUserStore } from '/@/store/modules/user'; |
||||
const queryParam = reactive<any>({}); |
||||
const checkedKeys = ref<Array<string | number>>([]); |
||||
const userStore = useUserStore(); |
||||
//注册model |
||||
const [registerModal, {openModal}] = useModal(); |
||||
//注册table数据 |
||||
const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({ |
||||
tableProps:{ |
||||
title: '项目操作日志', |
||||
api: list, |
||||
columns, |
||||
canResize:false, |
||||
formConfig: { |
||||
//labelWidth: 120, |
||||
schemas: searchFormSchema, |
||||
autoSubmitOnEnter:true, |
||||
showAdvancedButton:true, |
||||
fieldMapToNumber: [ |
||||
], |
||||
fieldMapToTime: [ |
||||
], |
||||
}, |
||||
actionColumn: { |
||||
width: 120, |
||||
fixed:'right' |
||||
}, |
||||
beforeFetch: (params) => { |
||||
return Object.assign(params, queryParam); |
||||
}, |
||||
}, |
||||
exportConfig: { |
||||
name:"项目操作日志", |
||||
url: getExportUrl, |
||||
params: queryParam, |
||||
}, |
||||
importConfig: { |
||||
url: getImportUrl, |
||||
success: handleSuccess |
||||
}, |
||||
}) |
||||
<script lang="ts"> |
||||
import {defineComponent,defineProps} from 'vue'; |
||||
import {useAttrs} from '/@/hooks/core/useAttrs'; |
||||
import {BasicModal, useModalInner} from '/@/components/Modal'; |
||||
import PageWrapper from "@/components/Page/src/PageWrapper.vue"; |
||||
import {BasicTable, useTable} from '/@/components/Table'; |
||||
import {columns} from "@/views/projectLog/ProjectLog.data"; |
||||
import {list} from "@/views/projectLog/ProjectLog.api"; |
||||
import {useRoute} from "vue-router"; |
||||
import {defHttp} from "@/utils/http/axios"; |
||||
const props = defineProps(['projectId']) |
||||
const route = useRoute(); |
||||
|
||||
const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext |
||||
const list2 = () =>{ |
||||
// console.log("projectId",props.projectId) |
||||
let params = {projectId:'1849284130146025473'} |
||||
return defHttp.get({url: '/projectLog/projectLog/list', params}); |
||||
} |
||||
|
||||
// 高级查询配置 |
||||
const superQueryConfig = reactive(superQuerySchema); |
||||
|
||||
/** |
||||
* 高级查询事件 |
||||
*/ |
||||
function handleSuperQuery(params) { |
||||
Object.keys(params).map((k) => { |
||||
queryParam[k] = params[k]; |
||||
}); |
||||
reload(); |
||||
} |
||||
/** |
||||
* 新增事件 |
||||
*/ |
||||
function handleAdd() { |
||||
openModal(true, { |
||||
isUpdate: false, |
||||
showFooter: true, |
||||
}); |
||||
} |
||||
/** |
||||
* 编辑事件 |
||||
*/ |
||||
function handleEdit(record: Recordable) { |
||||
openModal(true, { |
||||
record, |
||||
isUpdate: true, |
||||
showFooter: true, |
||||
}); |
||||
} |
||||
/** |
||||
* 详情 |
||||
*/ |
||||
function handleDetail(record: Recordable) { |
||||
openModal(true, { |
||||
record, |
||||
isUpdate: true, |
||||
showFooter: false, |
||||
}); |
||||
} |
||||
/** |
||||
* 删除事件 |
||||
*/ |
||||
async function handleDelete(record) { |
||||
await deleteOne({id: record.id}, handleSuccess); |
||||
} |
||||
/** |
||||
* 批量删除事件 |
||||
*/ |
||||
async function batchHandleDelete() { |
||||
await batchDelete({ids: selectedRowKeys.value}, handleSuccess); |
||||
} |
||||
/** |
||||
* 成功回调 |
||||
*/ |
||||
function handleSuccess() { |
||||
(selectedRowKeys.value = []) && reload(); |
||||
} |
||||
/** |
||||
* 操作栏 |
||||
*/ |
||||
function getTableAction(record){ |
||||
return [ |
||||
{ |
||||
label: '编辑', |
||||
onClick: handleEdit.bind(null, record), |
||||
auth: 'projectLog:project_log:edit' |
||||
} |
||||
] |
||||
} |
||||
/** |
||||
* 下拉操作栏 |
||||
*/ |
||||
function getDropDownAction(record){ |
||||
return [ |
||||
{ |
||||
label: '详情', |
||||
onClick: handleDetail.bind(null, record), |
||||
}, { |
||||
label: '删除', |
||||
popConfirm: { |
||||
title: '是否确认删除', |
||||
confirm: handleDelete.bind(null, record), |
||||
placement: 'topLeft', |
||||
}, |
||||
auth: 'projectLog:project_log:delete' |
||||
} |
||||
] |
||||
} |
||||
export default defineComponent({ |
||||
name: 'ProjectLogModal', |
||||
inheritAttrs: false, |
||||
components: {BasicTable, PageWrapper, BasicModal}, |
||||
setup() { |
||||
const attrs = useAttrs(); |
||||
const [registerProjectLogModal, {closeModal}] = useModalInner(); |
||||
|
||||
const [projectLog] = useTable({ |
||||
label: '项目日志', |
||||
columns: columns, |
||||
pagination: false, |
||||
// dataSource: null, |
||||
api: list2, |
||||
showIndexColumn: false, |
||||
scroll: {y: 300}, |
||||
}); |
||||
|
||||
</script> |
||||
function onOk() { |
||||
closeModal(); |
||||
} |
||||
|
||||
<style lang="less" scoped> |
||||
:deep(.ant-picker),:deep(.ant-input-number){ |
||||
width: 100%; |
||||
} |
||||
</style> |
||||
return {attrs, registerProjectLogModal, projectLog, onOk}; |
||||
}, |
||||
}); |
||||
</script> |
||||
|
@ -1,199 +1,221 @@ |
||||
<template> |
||||
<div> |
||||
<a-card :current="null" title="流程进度" :bordered="false"> |
||||
<a-steps size="small"> |
||||
<a-step title="申请人提交"/> |
||||
<a-step title="申请单位提交"/> |
||||
<a-step title="科技主管提交"/> |
||||
<a-step title="市科技局提交"/> |
||||
<a-step title="财政主管处理"/> |
||||
</a-steps> |
||||
</a-card> |
||||
<!--引用表格--> |
||||
<BasicTable @register="registerTable" :rowSelection="rowSelection"> |
||||
<!--插槽:table标题--> |
||||
<!-- <template #tableTitle> |
||||
<a-button type="primary" v-auth="'projectLog:project_log:add'" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button> |
||||
<a-button type="primary" v-auth="'projectLog:project_log:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button> |
||||
<j-upload-button type="primary" v-auth="'projectLog:project_log:importExcel'" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button> |
||||
<a-dropdown v-if="selectedRowKeys.length > 0"> |
||||
<template #overlay> |
||||
<a-menu> |
||||
<a-menu-item key="1" @click="batchHandleDelete"> |
||||
<Icon icon="ant-design:delete-outlined"></Icon> |
||||
删除 |
||||
</a-menu-item> |
||||
</a-menu> |
||||
</template> |
||||
<a-button v-auth="'projectLog:project_log:deleteBatch'">批量操作 |
||||
<Icon icon="mdi:chevron-down"></Icon> |
||||
</a-button> |
||||
</a-dropdown> |
||||
<!– 高级查询 –> |
||||
<super-query :config="superQueryConfig" @search="handleSuperQuery" /> |
||||
</template> |
||||
<!–操作栏–> |
||||
<template #action="{ record }"> |
||||
<TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/> |
||||
</template> |
||||
<!–字段回显插槽–> |
||||
<template v-slot:bodyCell="{ column, record, index, text }"> |
||||
</template>--> |
||||
<BasicTable @register="registerTable" :rowSelection="rowSelection"> |
||||
<!--插槽:table标题--> |
||||
<!-- <template #tableTitle> |
||||
<a-button type="primary" v-auth="'projectLog:project_log:add'" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button> |
||||
<a-button type="primary" v-auth="'projectLog:project_log:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button> |
||||
<j-upload-button type="primary" v-auth="'projectLog:project_log:importExcel'" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button> |
||||
<a-dropdown v-if="selectedRowKeys.length > 0"> |
||||
<template #overlay> |
||||
<a-menu> |
||||
<a-menu-item key="1" @click="batchHandleDelete"> |
||||
<Icon icon="ant-design:delete-outlined"></Icon> |
||||
删除 |
||||
</a-menu-item> |
||||
</a-menu> |
||||
</template> |
||||
<a-button v-auth="'projectLog:project_log:deleteBatch'">批量操作 |
||||
<Icon icon="mdi:chevron-down"></Icon> |
||||
</a-button> |
||||
</a-dropdown> |
||||
<!– 高级查询 –> |
||||
<super-query :config="superQueryConfig" @search="handleSuperQuery" /> |
||||
</template> |
||||
<!–操作栏–> |
||||
<template #action="{ record }"> |
||||
<TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/> |
||||
</template> |
||||
<!–字段回显插槽–> |
||||
<template v-slot:bodyCell="{ column, record, index, text }"> |
||||
</template>--> |
||||
</BasicTable> |
||||
<!-- 表单区域 --> |
||||
<ProjectLogModal @register="registerModal" @success="handleSuccess"></ProjectLogModal> |
||||
</div> |
||||
<div class="button-container"> |
||||
<a-button type="primary" @click="router.back()">返回</a-button> |
||||
</div> |
||||
</template> |
||||
|
||||
<script lang="ts" name="projectLog-projectLog" setup> |
||||
import {ref, reactive, computed, unref} from 'vue'; |
||||
import {BasicTable, useTable, TableAction} from '/@/components/Table'; |
||||
import {useModal} from '/@/components/Modal'; |
||||
import { useListPage } from '/@/hooks/system/useListPage' |
||||
import ProjectLogModal from './components/ProjectLogModal.vue' |
||||
import {columns, searchFormSchema, superQuerySchema} from './ProjectLog.data'; |
||||
import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './ProjectLog.api'; |
||||
import { downloadFile } from '/@/utils/common/renderUtils'; |
||||
import { useUserStore } from '/@/store/modules/user'; |
||||
import {useRoute} from "vue-router"; |
||||
import {defHttp} from "@/utils/http/axios"; |
||||
const queryParam = reactive<any>({}); |
||||
const checkedKeys = ref<Array<string | number>>([]); |
||||
const userStore = useUserStore(); |
||||
//注册model |
||||
const [registerModal, {openModal}] = useModal(); |
||||
|
||||
const route = useRoute(); |
||||
const listByProjectId = () =>{ |
||||
// console.log("projectId",props.projectId) |
||||
let params = {projectId: route.query.id} |
||||
return defHttp.get({url: '/projectLog/projectLog/list', params}); |
||||
} |
||||
//注册table数据 |
||||
const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({ |
||||
tableProps:{ |
||||
title: '项目操作日志', |
||||
api: listByProjectId, |
||||
columns, |
||||
canResize:false, |
||||
formConfig: { |
||||
//labelWidth: 120, |
||||
schemas: searchFormSchema, |
||||
autoSubmitOnEnter:true, |
||||
showAdvancedButton:true, |
||||
fieldMapToNumber: [ |
||||
], |
||||
fieldMapToTime: [ |
||||
], |
||||
}, |
||||
actionColumn: { |
||||
width: 120, |
||||
fixed:'right' |
||||
}, |
||||
beforeFetch: (params) => { |
||||
return Object.assign(params, queryParam); |
||||
}, |
||||
|
||||
import {reactive, ref} from 'vue'; |
||||
import {BasicTable} from '/@/components/Table'; |
||||
import {useModal} from '/@/components/Modal'; |
||||
import {useListPage} from '/@/hooks/system/useListPage' |
||||
import ProjectLogModal from './components/ProjectLogModal.vue' |
||||
import {columns, searchFormSchema, superQuerySchema} from './ProjectLog.data'; |
||||
import {batchDelete, deleteOne, getExportUrl, getImportUrl} from './ProjectLog.api'; |
||||
import {useUserStore} from '/@/store/modules/user'; |
||||
import {useRoute, useRouter} from "vue-router"; |
||||
import {defHttp} from "@/utils/http/axios"; |
||||
|
||||
const queryParam = reactive<any>({}); |
||||
const checkedKeys = ref<Array<string | number>>([]); |
||||
const userStore = useUserStore(); |
||||
const router = useRouter(); |
||||
//注册model |
||||
const [registerModal, {openModal}] = useModal(); |
||||
|
||||
const route = useRoute(); |
||||
const listByProjectId = () => { |
||||
let params = {projectId: route.query.id} |
||||
return defHttp.get({url: '/projectLog/projectLog/list', params}); |
||||
} |
||||
//注册table数据 |
||||
const {prefixCls, tableContext, onExportXls, onImportXls} = useListPage({ |
||||
tableProps: { |
||||
title: '', |
||||
api: listByProjectId, |
||||
columns, |
||||
canResize: false, |
||||
formConfig: { |
||||
//labelWidth: 120, |
||||
schemas: searchFormSchema, |
||||
autoSubmitOnEnter: true, |
||||
showAdvancedButton: true, |
||||
fieldMapToNumber: [], |
||||
fieldMapToTime: [], |
||||
}, |
||||
actionColumn: { |
||||
width: 120, |
||||
fixed: 'right' |
||||
}, |
||||
beforeFetch: (params) => { |
||||
return Object.assign(params, queryParam); |
||||
}, |
||||
}, |
||||
exportConfig: { |
||||
name: "项目操作日志", |
||||
url: getExportUrl, |
||||
params: queryParam, |
||||
}, |
||||
importConfig: { |
||||
url: getImportUrl, |
||||
success: handleSuccess |
||||
}, |
||||
}) |
||||
|
||||
const [registerTable, {reload}, {rowSelection, selectedRowKeys}] = tableContext |
||||
|
||||
// 高级查询配置 |
||||
const superQueryConfig = reactive(superQuerySchema); |
||||
|
||||
/** |
||||
* 高级查询事件 |
||||
*/ |
||||
function handleSuperQuery(params) { |
||||
Object.keys(params).map((k) => { |
||||
queryParam[k] = params[k]; |
||||
}); |
||||
reload(); |
||||
} |
||||
|
||||
/** |
||||
* 新增事件 |
||||
*/ |
||||
function handleAdd() { |
||||
openModal(true, { |
||||
isUpdate: false, |
||||
showFooter: true, |
||||
}); |
||||
} |
||||
|
||||
/** |
||||
* 编辑事件 |
||||
*/ |
||||
function handleEdit(record: Recordable) { |
||||
openModal(true, { |
||||
record, |
||||
isUpdate: true, |
||||
showFooter: true, |
||||
}); |
||||
} |
||||
|
||||
/** |
||||
* 详情 |
||||
*/ |
||||
function handleDetail(record: Recordable) { |
||||
openModal(true, { |
||||
record, |
||||
isUpdate: true, |
||||
showFooter: false, |
||||
}); |
||||
} |
||||
|
||||
/** |
||||
* 删除事件 |
||||
*/ |
||||
async function handleDelete(record) { |
||||
await deleteOne({id: record.id}, handleSuccess); |
||||
} |
||||
|
||||
/** |
||||
* 批量删除事件 |
||||
*/ |
||||
async function batchHandleDelete() { |
||||
await batchDelete({ids: selectedRowKeys.value}, handleSuccess); |
||||
} |
||||
|
||||
/** |
||||
* 成功回调 |
||||
*/ |
||||
function handleSuccess() { |
||||
(selectedRowKeys.value = []) && reload(); |
||||
} |
||||
|
||||
/** |
||||
* 操作栏 |
||||
*/ |
||||
function getTableAction(record) { |
||||
return [ |
||||
{ |
||||
label: '编辑', |
||||
onClick: handleEdit.bind(null, record), |
||||
auth: 'projectLog:project_log:edit' |
||||
} |
||||
] |
||||
} |
||||
|
||||
/** |
||||
* 下拉操作栏 |
||||
*/ |
||||
function getDropDownAction(record) { |
||||
return [ |
||||
{ |
||||
label: '详情', |
||||
onClick: handleDetail.bind(null, record), |
||||
}, { |
||||
label: '删除', |
||||
popConfirm: { |
||||
title: '是否确认删除', |
||||
confirm: handleDelete.bind(null, record), |
||||
placement: 'topLeft', |
||||
}, |
||||
exportConfig: { |
||||
name:"项目操作日志", |
||||
url: getExportUrl, |
||||
params: queryParam, |
||||
}, |
||||
importConfig: { |
||||
url: getImportUrl, |
||||
success: handleSuccess |
||||
}, |
||||
}) |
||||
|
||||
const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext |
||||
|
||||
// 高级查询配置 |
||||
const superQueryConfig = reactive(superQuerySchema); |
||||
|
||||
/** |
||||
* 高级查询事件 |
||||
*/ |
||||
function handleSuperQuery(params) { |
||||
Object.keys(params).map((k) => { |
||||
queryParam[k] = params[k]; |
||||
}); |
||||
reload(); |
||||
} |
||||
/** |
||||
* 新增事件 |
||||
*/ |
||||
function handleAdd() { |
||||
openModal(true, { |
||||
isUpdate: false, |
||||
showFooter: true, |
||||
}); |
||||
} |
||||
/** |
||||
* 编辑事件 |
||||
*/ |
||||
function handleEdit(record: Recordable) { |
||||
openModal(true, { |
||||
record, |
||||
isUpdate: true, |
||||
showFooter: true, |
||||
}); |
||||
} |
||||
/** |
||||
* 详情 |
||||
*/ |
||||
function handleDetail(record: Recordable) { |
||||
openModal(true, { |
||||
record, |
||||
isUpdate: true, |
||||
showFooter: false, |
||||
}); |
||||
} |
||||
/** |
||||
* 删除事件 |
||||
*/ |
||||
async function handleDelete(record) { |
||||
await deleteOne({id: record.id}, handleSuccess); |
||||
} |
||||
/** |
||||
* 批量删除事件 |
||||
*/ |
||||
async function batchHandleDelete() { |
||||
await batchDelete({ids: selectedRowKeys.value}, handleSuccess); |
||||
} |
||||
/** |
||||
* 成功回调 |
||||
*/ |
||||
function handleSuccess() { |
||||
(selectedRowKeys.value = []) && reload(); |
||||
} |
||||
/** |
||||
* 操作栏 |
||||
*/ |
||||
function getTableAction(record){ |
||||
return [ |
||||
{ |
||||
label: '编辑', |
||||
onClick: handleEdit.bind(null, record), |
||||
auth: 'projectLog:project_log:edit' |
||||
} |
||||
] |
||||
} |
||||
/** |
||||
* 下拉操作栏 |
||||
*/ |
||||
function getDropDownAction(record){ |
||||
return [ |
||||
{ |
||||
label: '详情', |
||||
onClick: handleDetail.bind(null, record), |
||||
}, { |
||||
label: '删除', |
||||
popConfirm: { |
||||
title: '是否确认删除', |
||||
confirm: handleDelete.bind(null, record), |
||||
placement: 'topLeft', |
||||
}, |
||||
auth: 'projectLog:project_log:delete' |
||||
} |
||||
] |
||||
} |
||||
auth: 'projectLog:project_log:delete' |
||||
} |
||||
] |
||||
} |
||||
|
||||
|
||||
</script> |
||||
|
||||
<style lang="less" scoped> |
||||
:deep(.ant-picker),:deep(.ant-input-number){ |
||||
width: 100%; |
||||
} |
||||
:deep(.ant-picker), :deep(.ant-input-number) { |
||||
width: 100%; |
||||
} |
||||
.button-container { |
||||
text-align: center; |
||||
} |
||||
</style> |
||||
|
Loading…
Reference in new issue