From e0f77f2e76d87d80241ad0d0f5508dbed20055d2 Mon Sep 17 00:00:00 2001
From: wsm <2746563060@侵权。>
Date: Mon, 18 May 2026 15:44:50 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E6=96=B0=E5=BB=BAdj=E5=B7=A1=E8=A7=86?=
=?UTF-8?q?=E6=95=B4=E6=94=B9=E5=8F=B0=E8=B4=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../DjInspectImprove.api.ts} | 26 +-
.../inspectimprove/DjInspectImprove.data.ts | 252 +++++++++++++
.../inspectimprove/DjInspectImproveList.vue | 336 ++++++++++++++++++
.../components/DjInspectImproveForm.vue} | 10 +-
.../components/DjInspectImproveModal.vue} | 31 +-
5 files changed, 611 insertions(+), 44 deletions(-)
rename src/views/dj/{rectify/DjInspectionRectifyList.api.ts => inspectimprove/DjInspectImprove.api.ts} (59%)
create mode 100644 src/views/dj/inspectimprove/DjInspectImprove.data.ts
create mode 100644 src/views/dj/inspectimprove/DjInspectImproveList.vue
rename src/views/dj/{rectify/components/DjInspectionRectifyListForm.vue => inspectimprove/components/DjInspectImproveForm.vue} (88%)
rename src/views/dj/{rectify/components/DjInspectionRectifyListModal.vue => inspectimprove/components/DjInspectImproveModal.vue} (81%)
diff --git a/src/views/dj/rectify/DjInspectionRectifyList.api.ts b/src/views/dj/inspectimprove/DjInspectImprove.api.ts
similarity index 59%
rename from src/views/dj/rectify/DjInspectionRectifyList.api.ts
rename to src/views/dj/inspectimprove/DjInspectImprove.api.ts
index 161e2e9..6dc5993 100644
--- a/src/views/dj/rectify/DjInspectionRectifyList.api.ts
+++ b/src/views/dj/inspectimprove/DjInspectImprove.api.ts
@@ -4,15 +4,15 @@ import { useMessage } from "/@/hooks/web/useMessage";
const { createConfirm } = useMessage();
enum Api {
- list = '/rectifylist/djInspectionRectifyList/rootList',
- save='/rectifylist/djInspectionRectifyList/add',
- edit='/rectifylist/djInspectionRectifyList/edit',
- deleteDjInspectionRectifyList = '/rectifylist/djInspectionRectifyList/delete',
- importExcel = '/rectifylist/djInspectionRectifyList/importExcel',
- exportXls = '/rectifylist/djInspectionRectifyList/exportXls',
- loadTreeData = '/rectifylist/djInspectionRectifyList/loadTreeRoot',
- getChildList = '/rectifylist/djInspectionRectifyList/childList',
- getChildListBatch = '/rectifylist/djInspectionRectifyList/getChildListBatch',
+ list = '/dj/inspectimprove/djInspectImprove/rootList',
+ save='/dj/inspectimprove/djInspectImprove/add',
+ edit='/dj/inspectimprove/djInspectImprove/edit',
+ deleteDjInspectImprove = '/dj/inspectimprove/djInspectImprove/delete',
+ importExcel = '/dj/inspectimprove/djInspectImprove/importExcel',
+ exportXls = '/dj/inspectimprove/djInspectImprove/exportXls',
+ loadTreeData = '/dj/inspectimprove/djInspectImprove/loadTreeRoot',
+ getChildList = '/dj/inspectimprove/djInspectImprove/childList',
+ getChildListBatch = '/dj/inspectimprove/djInspectImprove/getChildListBatch',
}
/**
@@ -34,8 +34,8 @@ export const list = (params) =>
/**
* 删除
*/
-export const deleteDjInspectionRectifyList = (params,handleSuccess) => {
- return defHttp.delete({url: Api.deleteDjInspectionRectifyList, params}, {joinParamsToUrl: true}).then(() => {
+export const deleteDjInspectImprove = (params,handleSuccess) => {
+ return defHttp.delete({url: Api.deleteDjInspectImprove, params}, {joinParamsToUrl: true}).then(() => {
handleSuccess();
});
}
@@ -43,7 +43,7 @@ export const deleteDjInspectionRectifyList = (params,handleSuccess) => {
* 批量删除
* @param params
*/
-export const batchDeleteDjInspectionRectifyList = (params, handleSuccess) => {
+export const batchDeleteDjInspectImprove = (params, handleSuccess) => {
createConfirm({
iconType: 'warning',
title: '确认删除',
@@ -51,7 +51,7 @@ export const batchDeleteDjInspectionRectifyList = (params, handleSuccess) => {
okText: '确认',
cancelText: '取消',
onOk: () => {
- return defHttp.delete({url: Api.deleteDjInspectionRectifyList, data: params}, {joinParamsToUrl: true}).then(() => {
+ return defHttp.delete({url: Api.deleteDjInspectImprove, data: params}, {joinParamsToUrl: true}).then(() => {
handleSuccess();
});
}
diff --git a/src/views/dj/inspectimprove/DjInspectImprove.data.ts b/src/views/dj/inspectimprove/DjInspectImprove.data.ts
new file mode 100644
index 0000000..37a8a57
--- /dev/null
+++ b/src/views/dj/inspectimprove/DjInspectImprove.data.ts
@@ -0,0 +1,252 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+ import { getWeekMonthQuarterYear } from '/@/utils';
+ import { filterDictTextByCache } from '/@/utils/dict/JDictSelectUtil';
+//列表数据
+export const columns: BasicColumn[] = [
+ {
+ title: '树形表单父id',
+ align: 'center',
+ dataIndex: 'pid'
+ },
+ {
+ title: '问题分类',
+ align: 'center',
+ dataIndex: 'questionCategory',
+ customRender: ({text}) => filterDictTextByCache('inspect_improve_type', text),
+ },
+ {
+ title: '面上问题',
+ align: 'center',
+ dataIndex: 'mianshangQuestion'
+ },
+ {
+ title: '具体问题',
+ align: 'left',
+ dataIndex: 'specicalQuestion'
+ },
+ {
+ title: '巡视建议',
+ align: 'center',
+ dataIndex: 'inspectAdvice'
+ },
+ {
+ title: '整改措施',
+ align: 'center',
+ dataIndex: 'improveMeasure'
+ },
+ {
+ title: '完成时限',
+ align: 'center',
+ dataIndex: 'deadline',
+ customRender:({text}) =>{
+ text = !text ? "" : (text.length > 10 ? text.substr(0,10) : text);
+ return text;
+ },
+ },
+ {
+ title: '目标节点',
+ align: 'center',
+ dataIndex: 'targetNode'
+ },
+ {
+ title: '问题责任领导',
+ align: 'center',
+ dataIndex: 'questionResLeader'
+ },
+ {
+ title: '问题责任部门',
+ align: 'center',
+ dataIndex: 'questionResDept'
+ },
+ {
+ title: '措施责任领导',
+ align: 'center',
+ dataIndex: 'measureResLeader'
+ },
+ {
+ title: '措施责任部门',
+ align: 'center',
+ dataIndex: 'measureResDept'
+ },
+ {
+ title: '整改交付成果',
+ align: 'center',
+ dataIndex: 'rectificationEvidence'
+ },
+ {
+ title: '成效评价标准',
+ align: 'center',
+ dataIndex: 'evaluationCriterion'
+ },
+ {
+ title: '工作进展',
+ align: 'center',
+ dataIndex: 'workProgress'
+ },
+ {
+ title: '检查情况',
+ align: 'center',
+ dataIndex: 'inspectionStatus'
+ },
+ {
+ title: '监督意见',
+ align: 'center',
+ dataIndex: 'supervisoryOpinion'
+ },
+ {
+ title: '措施数量',
+ align: 'center',
+ dataIndex: 'measureCount'
+ },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+ {
+ label: '树形表单父id',
+ field: 'pid',
+ component: 'JTreeSelect',
+ componentProps: {
+ dict: "dj_inspect_improve,specical_question,id",
+ pidField: "pid",
+ pidValue: "0",
+ hasChildField: "has_child",
+ },
+ },
+ {
+ label: '问题分类',
+ field: 'questionCategory',
+ component: 'JDictSelectTag',
+ componentProps: {
+ dictCode: 'inspect_improve_type',
+ stringToNumber: true,
+ },
+ },
+ {
+ label: '面上问题',
+ field: 'mianshangQuestion',
+ component: 'Input',
+ },
+ {
+ label: '具体问题',
+ field: 'specicalQuestion',
+ component: 'Input',
+ },
+ {
+ label: '巡视建议',
+ field: 'inspectAdvice',
+ component: 'Input',
+ },
+ {
+ label: '整改措施',
+ field: 'improveMeasure',
+ component: 'Input',
+ },
+ {
+ label: '完成时限',
+ field: 'deadline',
+ component: 'DatePicker',
+ componentProps: {
+ valueFormat: 'YYYY-MM-DD'
+ },
+ },
+ {
+ label: '目标节点',
+ field: 'targetNode',
+ component: 'Input',
+ },
+ {
+ label: '问题责任领导',
+ field: 'questionResLeader',
+ component: 'Input',
+ },
+ {
+ label: '问题责任部门',
+ field: 'questionResDept',
+ component: 'Input',
+ },
+ {
+ label: '措施责任领导',
+ field: 'measureResLeader',
+ component: 'Input',
+ },
+ {
+ label: '措施责任部门',
+ field: 'measureResDept',
+ component: 'Input',
+ },
+ {
+ label: '整改交付成果',
+ field: 'rectificationEvidence',
+ component: 'Input',
+ },
+ {
+ label: '成效评价标准',
+ field: 'evaluationCriterion',
+ component: 'Input',
+ },
+ {
+ label: '工作进展',
+ field: 'workProgress',
+ component: 'Input',
+ },
+ {
+ label: '检查情况',
+ field: 'inspectionStatus',
+ component: 'Input',
+ },
+ {
+ label: '监督意见',
+ field: 'supervisoryOpinion',
+ component: 'Input',
+ },
+ {
+ label: '措施数量',
+ field: 'measureCount',
+ component: 'InputNumber',
+ },
+ // TODO 主键隐藏字段,目前写死为ID
+ {
+ label: '',
+ field: 'id',
+ component: 'Input',
+ show: false
+ },
+];
+
+// 高级查询数据
+export const superQuerySchema = {
+ pid: {title: '树形表单父id',order: 0,view: 'text', type: 'string',},
+ questionCategory: {title: '问题分类',order: 1,view: 'number', type: 'number',},
+ mianshangQuestion: {title: '面上问题',order: 2,view: 'text', type: 'string',},
+ specicalQuestion: {title: '具体问题',order: 3,view: 'text', type: 'string',},
+ inspectAdvice: {title: '巡视建议',order: 4,view: 'text', type: 'string',},
+ improveMeasure: {title: '整改措施',order: 5,view: 'text', type: 'string',},
+ deadline: {title: '完成时限',order: 6,view: 'date', type: 'string',},
+ targetNode: {title: '目标节点',order: 7,view: 'text', type: 'string',},
+ questionResLeader: {title: '问题责任领导',order: 8,view: 'text', type: 'string',},
+ questionResDept: {title: '问题责任部门',order: 9,view: 'text', type: 'string',},
+ measureResLeader: {title: '措施责任领导',order: 10,view: 'text', type: 'string',},
+ measureResDept: {title: '措施责任部门',order: 11,view: 'text', type: 'string',},
+ rectificationEvidence: {title: '整改交付成果',order: 12,view: 'text', type: 'string',},
+ evaluationCriterion: {title: '成效评价标准',order: 13,view: 'text', type: 'string',},
+ workProgress: {title: '工作进展',order: 14,view: 'text', type: 'string',},
+ inspectionStatus: {title: '检查情况',order: 15,view: 'text', type: 'string',},
+ supervisoryOpinion: {title: '监督意见',order: 16,view: 'text', type: 'string',},
+ measureCount: {title: '措施数量',order: 17,view: 'number', type: 'number',},
+};
+
+
+/**
+* 流程表单调用这个方法获取formSchema
+* @param param
+*/
+export function getBpmFormSchema(_formData): FormSchema[]{
+ // 默认和原始表单保持一致 如果流程中配置了权限数据,这里需要单独处理formSchema
+ return formSchema;
+}
diff --git a/src/views/dj/inspectimprove/DjInspectImproveList.vue b/src/views/dj/inspectimprove/DjInspectImproveList.vue
new file mode 100644
index 0000000..c08cc5e
--- /dev/null
+++ b/src/views/dj/inspectimprove/DjInspectImproveList.vue
@@ -0,0 +1,336 @@
+
+
+
+
+
+
+ 新增
+ 导出
+ 导入
+
+
+
+
+
+ 删除
+
+
+
+ 批量操作
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/dj/rectify/components/DjInspectionRectifyListForm.vue b/src/views/dj/inspectimprove/components/DjInspectImproveForm.vue
similarity index 88%
rename from src/views/dj/rectify/components/DjInspectionRectifyListForm.vue
rename to src/views/dj/inspectimprove/components/DjInspectImproveForm.vue
index e79df31..106d711 100644
--- a/src/views/dj/rectify/components/DjInspectionRectifyListForm.vue
+++ b/src/views/dj/inspectimprove/components/DjInspectImproveForm.vue
@@ -12,11 +12,11 @@
import {computed, defineComponent} from 'vue';
import {defHttp} from '/@/utils/http/axios';
import { propTypes } from '/@/utils/propTypes';
- import {getBpmFormSchema} from '../DjInspectionRectifyList.data';
- import {saveOrUpdateDict} from '../DjInspectionRectifyList.api';
+ import {getBpmFormSchema} from '../DjInspectImprove.data';
+ import {saveOrUpdateDict} from '../DjInspectImprove.api';
export default defineComponent({
- name: "DjInspectionRectifyListForm",
+ name: "DjInspectImproveForm",
components:{
BasicForm
},
@@ -40,7 +40,7 @@
});
let formData = {};
- const queryByIdUrl = '/rectifylist/djInspectionRectifyList/queryById';
+ const queryByIdUrl = '/dj/inspectimprove/djInspectImprove/queryById';
async function initFormData(){
let params = {id: props.formData.dataId};
const data = await defHttp.get({url: queryByIdUrl, params});
@@ -67,4 +67,4 @@
}
}
});
-
+
\ No newline at end of file
diff --git a/src/views/dj/rectify/components/DjInspectionRectifyListModal.vue b/src/views/dj/inspectimprove/components/DjInspectImproveModal.vue
similarity index 81%
rename from src/views/dj/rectify/components/DjInspectionRectifyListModal.vue
rename to src/views/dj/inspectimprove/components/DjInspectImproveModal.vue
index b1ae800..adffd7c 100644
--- a/src/views/dj/rectify/components/DjInspectionRectifyListModal.vue
+++ b/src/views/dj/inspectimprove/components/DjInspectImproveModal.vue
@@ -1,19 +1,15 @@
-
+
+
\ No newline at end of file
From 2fa084569fbd209bd3cc5ee8a34dbcf7fff226b3 Mon Sep 17 00:00:00 2001
From: wsm <2746563060@侵权。>
Date: Mon, 18 May 2026 15:45:32 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8D=95=E6=8C=91?=
=?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=88=A0=E9=99=A4=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../process/BusinessProcessListModal.vue | 29 +++++++++++++++++--
1 file changed, 27 insertions(+), 2 deletions(-)
diff --git a/src/components/semri/process/BusinessProcessListModal.vue b/src/components/semri/process/BusinessProcessListModal.vue
index 3ec7c2f..be3e4a5 100644
--- a/src/components/semri/process/BusinessProcessListModal.vue
+++ b/src/components/semri/process/BusinessProcessListModal.vue
@@ -31,6 +31,7 @@
businessId?: string;
title?: string;
columns?: BasicColumn[];
+ onDeleteProcess?: (record: Recordable, reload: () => Promise) => Promise;
}
const title = ref('流程列表');
@@ -38,6 +39,7 @@
const currentBusinessId = ref('');
const defaultColumns = columns;
const { createMessage } = useMessage();
+ const onDeleteProcessRef = ref();
const [registerBpmModal, { openModal: bpmPicModal }] = useModal();
const [registerTable, { setColumns, setTableData, setLoading, clearSelectedRowKeys }] = useTable({
@@ -51,7 +53,7 @@
actionColumn: {
title: '操作',
dataIndex: 'action',
- width: 120,
+ width: 180,
fixed: 'right',
slots: { customRender: 'action' },
},
@@ -85,6 +87,7 @@
async function open(params: OpenParams = {}) {
currentBusinessId.value = params.businessId || '';
title.value = params.title || '流程列表';
+ onDeleteProcessRef.value = params.onDeleteProcess;
visible.value = true;
await nextTick();
setColumns(params.columns?.length ? params.columns : defaultColumns);
@@ -94,6 +97,7 @@
function handleCancel() {
visible.value = false;
currentBusinessId.value = '';
+ onDeleteProcessRef.value = undefined;
setColumns(defaultColumns);
setTableData([]);
clearSelectedRowKeys();
@@ -106,13 +110,34 @@
});
}
+ async function handleDeleteProcess(record) {
+ if (typeof onDeleteProcessRef.value === 'function') {
+ await onDeleteProcessRef.value(record, loadData);
+ } else {
+ createMessage.warning('未配置删除流程回调');
+ }
+ }
+
function getTableAction(record) {
- return [
+ const actions: any[] = [
{
label: '审批历史',
onClick: handlePreviewPic.bind(null, record),
},
];
+
+ if (typeof onDeleteProcessRef.value === 'function') {
+ actions.push({
+ label: '删除流程',
+ popConfirm: {
+ title: '确定删除该流程吗?',
+ confirm: handleDeleteProcess.bind(null, record),
+ placement: 'topLeft',
+ },
+ });
+ }
+
+ return actions;
}
defineExpose({
From 4e8b044edc3b12b26d4e6b76e1f0eea00ce79d8c Mon Sep 17 00:00:00 2001
From: wsm <2746563060@侵权。>
Date: Mon, 18 May 2026 15:46:03 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8E=9F=E6=9C=89?=
=?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/dj/check/DjCheck.api.ts | 64 ---
src/views/dj/check/DjCheck.data.ts | 170 --------
src/views/dj/check/DjCheckList.vue | 223 ----------
src/views/dj/check/components/DjCheckForm.vue | 70 ----
.../dj/check/components/DjCheckModal.vue | 97 -----
.../dj/demoMetting/DjDemoLifeMeeting.api.ts | 64 ---
.../dj/demoMetting/DjDemoLifeMeeting.data.ts | 200 ---------
.../dj/demoMetting/DjDemoLifeMeetingList.vue | 223 ----------
.../components/DjDemoLifeMeetingForm.vue | 70 ----
.../components/DjDemoLifeMeetingModal.vue | 99 -----
.../dj/peopleService/DjPeopleService.api.ts | 64 ---
.../dj/peopleService/DjPeopleService.data.ts | 138 -------
.../dj/peopleService/DjPeopleServiceList.vue | 221 ----------
.../components/DjPeopleServiceForm.vue | 70 ----
.../components/DjPeopleServiceModal.vue | 99 -----
.../rectify/DjInspectionRectifyList.data.ts | 222 ----------
.../rectify/DjInspectionRectifyListList.vue | 387 ------------------
src/views/dj/tzMetting/DjMeetingRecord.api.ts | 63 ---
.../dj/tzMetting/DjMeetingRecord.data.ts | 138 -------
.../dj/tzMetting/DjMeetingRecordList.vue | 217 ----------
.../components/DjMeetingRecordForm.vue | 70 ----
.../components/DjMeetingRecordModal.vue | 99 -----
22 files changed, 3068 deletions(-)
delete mode 100644 src/views/dj/check/DjCheck.api.ts
delete mode 100644 src/views/dj/check/DjCheck.data.ts
delete mode 100644 src/views/dj/check/DjCheckList.vue
delete mode 100644 src/views/dj/check/components/DjCheckForm.vue
delete mode 100644 src/views/dj/check/components/DjCheckModal.vue
delete mode 100644 src/views/dj/demoMetting/DjDemoLifeMeeting.api.ts
delete mode 100644 src/views/dj/demoMetting/DjDemoLifeMeeting.data.ts
delete mode 100644 src/views/dj/demoMetting/DjDemoLifeMeetingList.vue
delete mode 100644 src/views/dj/demoMetting/components/DjDemoLifeMeetingForm.vue
delete mode 100644 src/views/dj/demoMetting/components/DjDemoLifeMeetingModal.vue
delete mode 100644 src/views/dj/peopleService/DjPeopleService.api.ts
delete mode 100644 src/views/dj/peopleService/DjPeopleService.data.ts
delete mode 100644 src/views/dj/peopleService/DjPeopleServiceList.vue
delete mode 100644 src/views/dj/peopleService/components/DjPeopleServiceForm.vue
delete mode 100644 src/views/dj/peopleService/components/DjPeopleServiceModal.vue
delete mode 100644 src/views/dj/rectify/DjInspectionRectifyList.data.ts
delete mode 100644 src/views/dj/rectify/DjInspectionRectifyListList.vue
delete mode 100644 src/views/dj/tzMetting/DjMeetingRecord.api.ts
delete mode 100644 src/views/dj/tzMetting/DjMeetingRecord.data.ts
delete mode 100644 src/views/dj/tzMetting/DjMeetingRecordList.vue
delete mode 100644 src/views/dj/tzMetting/components/DjMeetingRecordForm.vue
delete mode 100644 src/views/dj/tzMetting/components/DjMeetingRecordModal.vue
diff --git a/src/views/dj/check/DjCheck.api.ts b/src/views/dj/check/DjCheck.api.ts
deleted file mode 100644
index 278118c..0000000
--- a/src/views/dj/check/DjCheck.api.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import {defHttp} from '/@/utils/http/axios';
-import { useMessage } from "/@/hooks/web/useMessage";
-
-const { createConfirm } = useMessage();
-
-enum Api {
- list = '/check/djCheck/list',
- save='/check/djCheck/add',
- edit='/check/djCheck/edit',
- deleteOne = '/check/djCheck/delete',
- deleteBatch = '/check/djCheck/deleteBatch',
- importExcel = '/check/djCheck/importExcel',
- exportXls = '/check/djCheck/exportXls',
-}
-/**
- * 导出api
- * @param params
- */
-export const getExportUrl = Api.exportXls;
-/**
- * 导入api
- */
-export const getImportUrl = Api.importExcel;
-/**
- * 列表接口
- * @param params
- */
-export const list = (params) =>
- defHttp.get({url: Api.list, params});
-
-/**
- * 删除单个
- */
-export const deleteOne = (params,handleSuccess) => {
- return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
- handleSuccess();
- });
-}
-/**
- * 批量删除
- * @param params
- */
-export const batchDelete = (params, handleSuccess) => {
- createConfirm({
- iconType: 'warning',
- title: '确认删除',
- content: '是否删除选中数据',
- okText: '确认',
- cancelText: '取消',
- onOk: () => {
- return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
- handleSuccess();
- });
- }
- });
-}
-/**
- * 保存或者更新
- * @param params
- */
-export const saveOrUpdate = (params, isUpdate) => {
- let url = isUpdate ? Api.edit : Api.save;
- return defHttp.post({url: url, params});
-}
diff --git a/src/views/dj/check/DjCheck.data.ts b/src/views/dj/check/DjCheck.data.ts
deleted file mode 100644
index 82d1eaf..0000000
--- a/src/views/dj/check/DjCheck.data.ts
+++ /dev/null
@@ -1,170 +0,0 @@
-import { BasicColumn } from '/@/components/Table';
-import { FormSchema } from '/@/components/Table';
-import { rules } from '/@/utils/helper/validator';
-import { render } from '/@/utils/common/renderUtils';
-import { getWeekMonthQuarterYear } from '/@/utils';
-//列表数据
-export const columns: BasicColumn[] = [
- {
- title: '序号',
- align: 'center',
- dataIndex: 'sortNo',
- },
- {
- title: '一级指标',
- align: 'center',
- dataIndex: 'primaryIndex',
- },
- {
- title: '评价要点',
- align: 'center',
- dataIndex: 'evalPoints',
- },
- {
- title: '评价内容',
- align: 'center',
- dataIndex: 'evalContent',
- },
- {
- title: '问题表现',
- align: 'center',
- dataIndex: 'problemManifestation',
- },
- {
- title: '整改措施',
- align: 'center',
- dataIndex: 'rectificationMeasures',
- },
- {
- title: '完成时限',
- align: 'center',
- dataIndex: 'completionDeadline',
- customRender: ({ text }) => {
- text = !text ? '' : text.length > 10 ? text.substr(0, 10) : text;
- return text;
- },
- },
- {
- title: '责任部门',
- align: 'center',
- dataIndex: 'responsibleDept_dictText',
- },
- {
- title: '完成情况',
- align: 'center',
- dataIndex: 'completionStatus',
- },
- {
- title: '是否可发起',
- width: 150,
- dataIndex: 'isLaunchable_dictText',
- },
-];
-//查询数据
-export const searchFormSchema: FormSchema[] = [];
-//表单数据
-export const formSchema: FormSchema[] = [
- {
- label: '序号',
- field: 'sortNo',
- component: 'InputNumber',
- },
- {
- label: '一级指标',
- field: 'primaryIndex',
- component: 'Input',
- },
- {
- label: '评价要点',
- field: 'evalPoints',
- component: 'Input',
- },
- {
- label: '评价内容',
- field: 'evalContent',
- component: 'Input',
- },
- {
- label: '问题表现',
- field: 'problemManifestation',
- component: 'Input',
- },
- {
- label: '整改措施',
- field: 'rectificationMeasures',
- component: 'Input',
- },
- {
- label: '完成时限',
- field: 'completionDeadline',
- component: 'DatePicker',
- componentProps: {
- valueFormat: 'YYYY-MM-DD',
- },
- },
- {
- label: '责任部门',
- field: 'responsibleDept',
- component: 'JSelectDept',
- componentProps: ({ formActionType, formModel }) => {
- return {
- sync: false,
- checkStrictly: true,
- defaultExpandLevel: 2,
-
- onSelect: (options, values) => {
- const { updateSchema } = formActionType;
- //所属部门修改后更新负责部门下拉框数据
- updateSchema([
- {
- field: 'departIds',
- componentProps: { options },
- },
- ]);
- //update-begin---author:wangshuai---date:2024-05-11---for:【issues/1222】用户编辑界面“所属部门”与“负责部门”联动出错整---
- if (!values) {
- formModel.departIds = [];
- return;
- }
- //update-end---author:wangshuai---date:2024-05-11---for:【issues/1222】用户编辑界面“所属部门”与“负责部门”联动出错整---
- //所属部门修改后更新负责部门数据
- formModel.departIds && (formModel.departIds = formModel.departIds.filter((item) => values.value.indexOf(item) > -1));
- },
- };
- },
- },
- {
- label: '完成情况',
- field: 'completionStatus',
- component: 'Input',
- },
- // TODO 主键隐藏字段,目前写死为ID
- {
- label: '',
- field: 'id',
- component: 'Input',
- show: false,
- },
-];
-
-// 高级查询数据
-export const superQuerySchema = {
- sortNo: { title: '序号', order: 0, view: 'number', type: 'number' },
- primaryIndex: { title: '一级指标', order: 1, view: 'text', type: 'string' },
- evalPoints: { title: '评价要点', order: 2, view: 'text', type: 'string' },
- evalContent: { title: '评价内容', order: 3, view: 'text', type: 'string' },
- problemManifestation: { title: '问题表现', order: 4, view: 'text', type: 'string' },
- rectificationMeasures: { title: '整改措施', order: 5, view: 'text', type: 'string' },
- completionDeadline: { title: '完成时限', order: 6, view: 'date', type: 'string' },
- responsibleDept: { title: '责任部门', order: 7, view: 'text', type: 'string' },
- completionStatus: { title: '完成情况', order: 8, view: 'text', type: 'string' },
-};
-
-/**
- * 流程表单调用这个方法获取formSchema
- * @param param
- */
-export function getBpmFormSchema(_formData): FormSchema[] {
- // 默认和原始表单保持一致 如果流程中配置了权限数据,这里需要单独处理formSchema
- return formSchema;
-}
diff --git a/src/views/dj/check/DjCheckList.vue b/src/views/dj/check/DjCheckList.vue
deleted file mode 100644
index 41a8005..0000000
--- a/src/views/dj/check/DjCheckList.vue
+++ /dev/null
@@ -1,223 +0,0 @@
-
-
-
-
-
-
- 新增
- 导出
- 导入
-
-
-
-
-
-
-
- 删除
-
-
-
- 批量操作
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/dj/check/components/DjCheckForm.vue b/src/views/dj/check/components/DjCheckForm.vue
deleted file mode 100644
index 1027728..0000000
--- a/src/views/dj/check/components/DjCheckForm.vue
+++ /dev/null
@@ -1,70 +0,0 @@
-
-
-
-
-
diff --git a/src/views/dj/check/components/DjCheckModal.vue b/src/views/dj/check/components/DjCheckModal.vue
deleted file mode 100644
index 805e186..0000000
--- a/src/views/dj/check/components/DjCheckModal.vue
+++ /dev/null
@@ -1,97 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/src/views/dj/demoMetting/DjDemoLifeMeeting.api.ts b/src/views/dj/demoMetting/DjDemoLifeMeeting.api.ts
deleted file mode 100644
index 0059bb5..0000000
--- a/src/views/dj/demoMetting/DjDemoLifeMeeting.api.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import {defHttp} from '/@/utils/http/axios';
-import { useMessage } from "/@/hooks/web/useMessage";
-
-const { createConfirm } = useMessage();
-
-enum Api {
- list = '/demoMetting/djDemoLifeMeeting/list',
- save='/demoMetting/djDemoLifeMeeting/add',
- edit='/demoMetting/djDemoLifeMeeting/edit',
- deleteOne = '/demoMetting/djDemoLifeMeeting/delete',
- deleteBatch = '/demoMetting/djDemoLifeMeeting/deleteBatch',
- importExcel = '/demoMetting/djDemoLifeMeeting/importExcel',
- exportXls = '/demoMetting/djDemoLifeMeeting/exportXls',
-}
-/**
- * 导出api
- * @param params
- */
-export const getExportUrl = Api.exportXls;
-/**
- * 导入api
- */
-export const getImportUrl = Api.importExcel;
-/**
- * 列表接口
- * @param params
- */
-export const list = (params) =>
- defHttp.get({url: Api.list, params});
-
-/**
- * 删除单个
- */
-export const deleteOne = (params,handleSuccess) => {
- return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
- handleSuccess();
- });
-}
-/**
- * 批量删除
- * @param params
- */
-export const batchDelete = (params, handleSuccess) => {
- createConfirm({
- iconType: 'warning',
- title: '确认删除',
- content: '是否删除选中数据',
- okText: '确认',
- cancelText: '取消',
- onOk: () => {
- return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
- handleSuccess();
- });
- }
- });
-}
-/**
- * 保存或者更新
- * @param params
- */
-export const saveOrUpdate = (params, isUpdate) => {
- let url = isUpdate ? Api.edit : Api.save;
- return defHttp.post({url: url, params});
-}
diff --git a/src/views/dj/demoMetting/DjDemoLifeMeeting.data.ts b/src/views/dj/demoMetting/DjDemoLifeMeeting.data.ts
deleted file mode 100644
index 2b8b5cb..0000000
--- a/src/views/dj/demoMetting/DjDemoLifeMeeting.data.ts
+++ /dev/null
@@ -1,200 +0,0 @@
-import { BasicColumn } from '/@/components/Table';
-import { FormSchema } from '/@/components/Table';
-import { rules } from '/@/utils/helper/validator';
-import { render } from '/@/utils/common/renderUtils';
-import { getWeekMonthQuarterYear } from '/@/utils';
-//列表数据
-export const columns: BasicColumn[] = [
- {
- title: '序号',
- align: 'center',
- dataIndex: 'sortNo',
- },
- {
- title: '问题分类',
- align: 'center',
- dataIndex: 'problemType',
- },
- {
- title: '问题清单',
- align: 'center',
- dataIndex: 'problemList',
- },
- {
- title: '问题表现',
- align: 'center',
- dataIndex: 'problemManifestation',
- },
- {
- title: '责任领导',
- align: 'center',
- dataIndex: 'responsibleLeader',
- },
- {
- title: '责任部门',
- width: 150,
- dataIndex: 'responsibleDept_dictText',
- },
- {
- title: '整改措施',
- align: 'center',
- dataIndex: 'rectificationMeasures',
- },
- {
- title: '完成时限',
- align: 'center',
- dataIndex: 'completionDeadline',
- customRender: ({ text }) => {
- text = !text ? '' : text.length > 10 ? text.substr(0, 10) : text;
- return text;
- },
- },
- {
- title: '完成时间',
- align: 'center',
- dataIndex: 'completionDate',
- customRender: ({ text }) => {
- text = !text ? '' : text.length > 10 ? text.substr(0, 10) : text;
- return text;
- },
- },
- {
- title: '输出成果',
- align: 'center',
- dataIndex: 'outputResults',
- },
- {
- title: '完成情况',
- align: 'center',
- dataIndex: 'completionStatus',
- },
- {
- title: '是否可发起',
- align: 'center',
- width: 150,
- dataIndex: 'isLaunchable_dictText',
- },
-];
-//查询数据
-export const searchFormSchema: FormSchema[] = [];
-//表单数据
-export const formSchema: FormSchema[] = [
- {
- label: '序号',
- field: 'sortNo',
- component: 'InputNumber',
- },
- {
- label: '问题分类',
- field: 'problemType',
- component: 'InputNumber',
- },
- {
- label: '问题清单',
- field: 'problemList',
- component: 'Input',
- },
- {
- label: '问题表现',
- field: 'problemManifestation',
- component: 'Input',
- },
- {
- label: '责任领导',
- field: 'responsibleLeader',
- component: 'Input',
- },
- {
- label: '责任部门',
- field: 'responsibleDept',
- component: 'JSelectDept',
- componentProps: ({ formActionType, formModel }) => {
- return {
- sync: false,
- checkStrictly: true,
- defaultExpandLevel: 2,
-
- onSelect: (options, values) => {
- const { updateSchema } = formActionType;
- //所属部门修改后更新负责部门下拉框数据
- updateSchema([
- {
- field: 'departIds',
- componentProps: { options },
- },
- ]);
- //update-begin---author:wangshuai---date:2024-05-11---for:【issues/1222】用户编辑界面“所属部门”与“负责部门”联动出错整---
- if (!values) {
- formModel.departIds = [];
- return;
- }
- //update-end---author:wangshuai---date:2024-05-11---for:【issues/1222】用户编辑界面“所属部门”与“负责部门”联动出错整---
- //所属部门修改后更新负责部门数据
- formModel.departIds && (formModel.departIds = formModel.departIds.filter((item) => values.value.indexOf(item) > -1));
- },
- };
- },
- },
- {
- label: '整改措施',
- field: 'rectificationMeasures',
- component: 'Input',
- },
- {
- label: '完成时限',
- field: 'completionDeadline',
- component: 'DatePicker',
- componentProps: {
- valueFormat: 'YYYY-MM-DD',
- },
- },
- {
- label: '完成时间',
- field: 'completionDate',
- component: 'DatePicker',
- componentProps: {
- valueFormat: 'YYYY-MM-DD',
- },
- },
- {
- label: '输出成果',
- field: 'outputResults',
- component: 'Input',
- },
- {
- label: '完成情况',
- field: 'completionStatus',
- component: 'Input',
- },
- // TODO 主键隐藏字段,目前写死为ID
- {
- label: '',
- field: 'id',
- component: 'Input',
- show: false,
- },
-];
-
-// 高级查询数据
-export const superQuerySchema = {
- sortNo: { title: '序号', order: 0, view: 'number', type: 'number' },
- problemType: { title: '问题分类', order: 1, view: 'number', type: 'number' },
- problemList: { title: '问题清单', order: 2, view: 'text', type: 'string' },
- problemManifestation: { title: '问题表现', order: 3, view: 'text', type: 'string' },
- responsibleLeader: { title: '责任领导', order: 4, view: 'text', type: 'string' },
- responsibleDept: { title: '责任部门', order: 5, view: 'text', type: 'string' },
- rectificationMeasures: { title: '整改措施', order: 6, view: 'text', type: 'string' },
- completionDeadline: { title: '完成时限', order: 7, view: 'date', type: 'string' },
- completionDate: { title: '完成时间', order: 8, view: 'date', type: 'string' },
- outputResults: { title: '输出成果', order: 9, view: 'text', type: 'string' },
- completionStatus: { title: '完成情况', order: 10, view: 'text', type: 'string' },
-};
-
-/**
- * 流程表单调用这个方法获取formSchema
- * @param param
- */
-export function getBpmFormSchema(_formData): FormSchema[] {
- // 默认和原始表单保持一致 如果流程中配置了权限数据,这里需要单独处理formSchema
- return formSchema;
-}
diff --git a/src/views/dj/demoMetting/DjDemoLifeMeetingList.vue b/src/views/dj/demoMetting/DjDemoLifeMeetingList.vue
deleted file mode 100644
index 16d6e22..0000000
--- a/src/views/dj/demoMetting/DjDemoLifeMeetingList.vue
+++ /dev/null
@@ -1,223 +0,0 @@
-
-
-
-
-
-
-
- 新增
-
- 导出
- 导入
-
-
-
-
-
-
- 删除
-
-
-
- 批量操作
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/dj/demoMetting/components/DjDemoLifeMeetingForm.vue b/src/views/dj/demoMetting/components/DjDemoLifeMeetingForm.vue
deleted file mode 100644
index a3c7a03..0000000
--- a/src/views/dj/demoMetting/components/DjDemoLifeMeetingForm.vue
+++ /dev/null
@@ -1,70 +0,0 @@
-
-
-
-
-
diff --git a/src/views/dj/demoMetting/components/DjDemoLifeMeetingModal.vue b/src/views/dj/demoMetting/components/DjDemoLifeMeetingModal.vue
deleted file mode 100644
index b2ebf5d..0000000
--- a/src/views/dj/demoMetting/components/DjDemoLifeMeetingModal.vue
+++ /dev/null
@@ -1,99 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/src/views/dj/peopleService/DjPeopleService.api.ts b/src/views/dj/peopleService/DjPeopleService.api.ts
deleted file mode 100644
index e543c7e..0000000
--- a/src/views/dj/peopleService/DjPeopleService.api.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import {defHttp} from '/@/utils/http/axios';
-import { useMessage } from "/@/hooks/web/useMessage";
-
-const { createConfirm } = useMessage();
-
-enum Api {
- list = '/peopleService/djPeopleService/list',
- save='/peopleService/djPeopleService/add',
- edit='/peopleService/djPeopleService/edit',
- deleteOne = '/peopleService/djPeopleService/delete',
- deleteBatch = '/peopleService/djPeopleService/deleteBatch',
- importExcel = '/peopleService/djPeopleService/importExcel',
- exportXls = '/peopleService/djPeopleService/exportXls',
-}
-/**
- * 导出api
- * @param params
- */
-export const getExportUrl = Api.exportXls;
-/**
- * 导入api
- */
-export const getImportUrl = Api.importExcel;
-/**
- * 列表接口
- * @param params
- */
-export const list = (params) =>
- defHttp.get({url: Api.list, params});
-
-/**
- * 删除单个
- */
-export const deleteOne = (params,handleSuccess) => {
- return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
- handleSuccess();
- });
-}
-/**
- * 批量删除
- * @param params
- */
-export const batchDelete = (params, handleSuccess) => {
- createConfirm({
- iconType: 'warning',
- title: '确认删除',
- content: '是否删除选中数据',
- okText: '确认',
- cancelText: '取消',
- onOk: () => {
- return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
- handleSuccess();
- });
- }
- });
-}
-/**
- * 保存或者更新
- * @param params
- */
-export const saveOrUpdate = (params, isUpdate) => {
- let url = isUpdate ? Api.edit : Api.save;
- return defHttp.post({url: url, params});
-}
diff --git a/src/views/dj/peopleService/DjPeopleService.data.ts b/src/views/dj/peopleService/DjPeopleService.data.ts
deleted file mode 100644
index 5e89c3b..0000000
--- a/src/views/dj/peopleService/DjPeopleService.data.ts
+++ /dev/null
@@ -1,138 +0,0 @@
-import { BasicColumn } from '/@/components/Table';
-import { FormSchema } from '/@/components/Table';
-import { rules } from '/@/utils/helper/validator';
-import { render } from '/@/utils/common/renderUtils';
-import { getWeekMonthQuarterYear } from '/@/utils';
-//列表数据
-export const columns: BasicColumn[] = [
- {
- title: '序号',
- align: 'center',
- dataIndex: 'sortNo',
- },
- {
- title: '问题分类',
- align: 'center',
- dataIndex: 'problemType',
- },
- {
- title: '具体措施',
- align: 'center',
- dataIndex: 'specificMeasure',
- },
- {
- title: '完成时限',
- align: 'center',
- dataIndex: 'completionDeadline',
- customRender: ({ text }) => {
- text = !text ? '' : text.length > 10 ? text.substr(0, 10) : text;
- return text;
- },
- },
- {
- title: '责任部门',
- align: 'center',
- dataIndex: 'responsibleDept_dictText',
- },
- {
- title: '完成情况',
- align: 'center',
- dataIndex: 'completionStatus',
- },
- {
- title: '是否可发起',
- align: 'center',
- width: 150,
- dataIndex: 'isLaunchable_dictText',
- },
-];
-//查询数据
-export const searchFormSchema: FormSchema[] = [];
-//表单数据
-export const formSchema: FormSchema[] = [
- {
- label: '序号',
- field: 'sortNo',
- component: 'InputNumber',
- },
- {
- label: '问题分类',
- field: 'problemType',
- component: 'Input',
- },
- {
- label: '具体措施',
- field: 'specificMeasure',
- component: 'Input',
- },
- {
- label: '完成时限',
- field: 'completionDeadline',
- component: 'DatePicker',
- componentProps: {
- valueFormat: 'YYYY-MM-DD',
- },
- },
- {
- label: '责任部门',
- field: 'responsibleDept',
- component: 'JSelectDept',
- componentProps: ({ formActionType, formModel }) => {
- return {
- sync: false,
- checkStrictly: true,
- defaultExpandLevel: 2,
-
- onSelect: (options, values) => {
- const { updateSchema } = formActionType;
- //所属部门修改后更新负责部门下拉框数据
- updateSchema([
- {
- field: 'departIds',
- componentProps: { options },
- },
- ]);
- //update-begin---author:wangshuai---date:2024-05-11---for:【issues/1222】用户编辑界面“所属部门”与“负责部门”联动出错整---
- if (!values) {
- formModel.departIds = [];
- return;
- }
- //update-end---author:wangshuai---date:2024-05-11---for:【issues/1222】用户编辑界面“所属部门”与“负责部门”联动出错整---
- //所属部门修改后更新负责部门数据
- formModel.departIds && (formModel.departIds = formModel.departIds.filter((item) => values.value.indexOf(item) > -1));
- },
- };
- },
- },
- {
- label: '完成情况',
- field: 'completionStatus',
- component: 'Input',
- },
- // TODO 主键隐藏字段,目前写死为ID
- {
- label: '',
- field: 'id',
- component: 'Input',
- show: false,
- },
-];
-
-// 高级查询数据
-export const superQuerySchema = {
- sortNo: { title: '序号', order: 0, view: 'number', type: 'number' },
- problemType: { title: '问题分类', order: 1, view: 'text', type: 'string' },
- specificMeasure: { title: '具体措施', order: 2, view: 'text', type: 'string' },
- completionDeadline: { title: '完成时限', order: 3, view: 'date', type: 'string' },
- responsibleDept: { title: '责任部门', order: 4, view: 'text', type: 'string' },
- completionStatus: { title: '完成情况', order: 5, view: 'text', type: 'string' },
-};
-
-/**
- * 流程表单调用这个方法获取formSchema
- * @param param
- */
-export function getBpmFormSchema(_formData): FormSchema[] {
- // 默认和原始表单保持一致 如果流程中配置了权限数据,这里需要单独处理formSchema
- return formSchema;
-}
diff --git a/src/views/dj/peopleService/DjPeopleServiceList.vue b/src/views/dj/peopleService/DjPeopleServiceList.vue
deleted file mode 100644
index ff8d936..0000000
--- a/src/views/dj/peopleService/DjPeopleServiceList.vue
+++ /dev/null
@@ -1,221 +0,0 @@
-
-
-
-
-
-
- 新增
-
- 导出
- 导入
-
-
-
-
-
-
- 删除
-
-
-
- 批量操作
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/dj/peopleService/components/DjPeopleServiceForm.vue b/src/views/dj/peopleService/components/DjPeopleServiceForm.vue
deleted file mode 100644
index 908c955..0000000
--- a/src/views/dj/peopleService/components/DjPeopleServiceForm.vue
+++ /dev/null
@@ -1,70 +0,0 @@
-
-
-
-
-
diff --git a/src/views/dj/peopleService/components/DjPeopleServiceModal.vue b/src/views/dj/peopleService/components/DjPeopleServiceModal.vue
deleted file mode 100644
index a1be314..0000000
--- a/src/views/dj/peopleService/components/DjPeopleServiceModal.vue
+++ /dev/null
@@ -1,99 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/src/views/dj/rectify/DjInspectionRectifyList.data.ts b/src/views/dj/rectify/DjInspectionRectifyList.data.ts
deleted file mode 100644
index e5f612f..0000000
--- a/src/views/dj/rectify/DjInspectionRectifyList.data.ts
+++ /dev/null
@@ -1,222 +0,0 @@
-import { BasicColumn } from '/@/components/Table';
-import { FormSchema } from '/@/components/Table';
-import { rules } from '/@/utils/helper/validator';
-import { render } from '/@/utils/common/renderUtils';
-import { getWeekMonthQuarterYear } from '/@/utils';
-//列表数据
-export const columns: BasicColumn[] = [
- {
- title: '问题名称',
- align: 'left',
- dataIndex: 'issueName',
- },
- {
- title: '问题分类',
- align: 'center',
- dataIndex: 'problemType',
- },
- {
- title: '面上问题',
- align: 'center',
- dataIndex: 'msIssue',
- },
- {
- title: '具体问题',
- align: 'center',
- dataIndex: 'specificIssue',
- },
- {
- title: '整改措施',
- align: 'center',
- dataIndex: 'rectificationMeasures',
- },
- {
- title: '完成时限',
- align: 'center',
- dataIndex: 'completionDeadline',
- customRender: ({ text }) => {
- text = !text ? '' : text.length > 10 ? text.substr(0, 10) : text;
- return text;
- },
- },
- {
- title: '责任部门',
- align: 'center',
- dataIndex: 'responsibleDept_dictText',
- },
- {
- title: '分管所领导',
- align: 'center',
- dataIndex: 'supervisingLeader',
- },
- {
- title: '标志性成果',
- align: 'center',
- dataIndex: 'landmarkAchievement',
- },
- {
- title: '完成时间',
- align: 'center',
- dataIndex: 'completionDate',
- customRender: ({ text }) => {
- text = !text ? '' : text.length > 10 ? text.substr(0, 10) : text;
- return text;
- },
- },
- {
- title: '监督意见',
- align: 'center',
- dataIndex: 'supervisionOpinion',
- },
- {
- title: '措施数量',
- align: 'center',
- dataIndex: 'measureCount',
- },
- {
- title: '是否可发起',
- align: 'center',
- width: 150,
- dataIndex: 'isLaunchable_dictText',
- },
-];
-//查询数据
-export const searchFormSchema: FormSchema[] = [];
-//表单数据
-export const formSchema: FormSchema[] = [
- {
- label: '父级节点',
- field: 'pid',
- component: 'JTreeSelect',
- componentProps: {
- dict: 'dj_inspection_rectify_list,issue_name,id',
- pidField: 'pid',
- pidValue: '0',
- hasChildField: 'has_child',
- },
- },
- {
- label: '问题名称',
- field: 'issueName',
- component: 'Input',
- },
- {
- label: '问题分类',
- field: 'problemType',
- component: 'InputNumber',
- },
- {
- label: '面上问题',
- field: 'msIssue',
- component: 'Input',
- },
- {
- label: '具体问题',
- field: 'specificIssue',
- component: 'Input',
- },
- {
- label: '整改措施',
- field: 'rectificationMeasures',
- component: 'Input',
- },
- {
- label: '完成时限',
- field: 'completionDeadline',
- component: 'DatePicker',
- componentProps: {
- valueFormat: 'YYYY-MM-DD',
- },
- },
- {
- label: '责任部门',
- field: 'responsibleDept',
- component: 'JSelectDept',
- componentProps: ({ formActionType, formModel }) => {
- return {
- sync: false,
- checkStrictly: true,
- defaultExpandLevel: 2,
-
- onSelect: (options, values) => {
- const { updateSchema } = formActionType;
- //所属部门修改后更新负责部门下拉框数据
- updateSchema([
- {
- field: 'departIds',
- componentProps: { options },
- },
- ]);
- //update-begin---author:wangshuai---date:2024-05-11---for:【issues/1222】用户编辑界面“所属部门”与“负责部门”联动出错整---
- if (!values) {
- formModel.departIds = [];
- return;
- }
- //update-end---author:wangshuai---date:2024-05-11---for:【issues/1222】用户编辑界面“所属部门”与“负责部门”联动出错整---
- //所属部门修改后更新负责部门数据
- formModel.departIds && (formModel.departIds = formModel.departIds.filter((item) => values.value.indexOf(item) > -1));
- },
- };
- },
- },
- {
- label: '分管所领导',
- field: 'supervisingLeader',
- component: 'Input',
- },
- {
- label: '标志性成果',
- field: 'landmarkAchievement',
- component: 'Input',
- },
- {
- label: '完成时间',
- field: 'completionDate',
- component: 'DatePicker',
- componentProps: {
- valueFormat: 'YYYY-MM-DD',
- },
- },
- {
- label: '监督意见',
- field: 'supervisionOpinion',
- component: 'Input',
- },
- {
- label: '措施数量',
- field: 'measureCount',
- component: 'InputNumber',
- },
- // TODO 主键隐藏字段,目前写死为ID
- {
- label: '',
- field: 'id',
- component: 'Input',
- show: false,
- },
-];
-
-// 高级查询数据
-export const superQuerySchema = {
- issueName: { title: '问题名称', order: 1, view: 'text', type: 'string' },
- problemType: { title: '问题分类', order: 2, view: 'number', type: 'number' },
- msIssue: { title: '面上问题', order: 3, view: 'text', type: 'string' },
- specificIssue: { title: '具体问题', order: 4, view: 'text', type: 'string' },
- rectificationMeasures: { title: '整改措施', order: 5, view: 'text', type: 'string' },
- completionDeadline: { title: '完成时限', order: 6, view: 'date', type: 'string' },
- responsibleDept: { title: '责任部门', order: 7, view: 'text', type: 'string' },
- supervisingLeader: { title: '分管所领导', order: 8, view: 'text', type: 'string' },
- landmarkAchievement: { title: '标志性成果', order: 9, view: 'text', type: 'string' },
- completionDate: { title: '完成时间', order: 10, view: 'date', type: 'string' },
- supervisionOpinion: { title: '监督意见', order: 11, view: 'text', type: 'string' },
- measureCount: { title: '措施数量', order: 12, view: 'number', type: 'number' },
-};
-
-/**
- * 流程表单调用这个方法获取formSchema
- * @param param
- */
-export function getBpmFormSchema(_formData): FormSchema[] {
- // 默认和原始表单保持一致 如果流程中配置了权限数据,这里需要单独处理formSchema
- return formSchema;
-}
diff --git a/src/views/dj/rectify/DjInspectionRectifyListList.vue b/src/views/dj/rectify/DjInspectionRectifyListList.vue
deleted file mode 100644
index 134b20e..0000000
--- a/src/views/dj/rectify/DjInspectionRectifyListList.vue
+++ /dev/null
@@ -1,387 +0,0 @@
-
-
-
-
-
-
-
- 新增
-
- 导出
- 导入
-
-
-
-
-
- 删除
-
-
-
- 批量操作
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/dj/tzMetting/DjMeetingRecord.api.ts b/src/views/dj/tzMetting/DjMeetingRecord.api.ts
deleted file mode 100644
index cb8205c..0000000
--- a/src/views/dj/tzMetting/DjMeetingRecord.api.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-import { defHttp } from '/@/utils/http/axios';
-import { useMessage } from '/@/hooks/web/useMessage';
-
-const { createConfirm } = useMessage();
-
-enum Api {
- list = '/tzMetting/djMeetingRecord/list',
- save = '/tzMetting/djMeetingRecord/add',
- edit = '/tzMetting/djMeetingRecord/edit',
- deleteOne = '/tzMetting/djMeetingRecord/delete',
- deleteBatch = '/tzMetting/djMeetingRecord/deleteBatch',
- importExcel = '/tzMetting/djMeetingRecord/importExcel',
- exportXls = '/tzMetting/djMeetingRecord/exportXls',
-}
-/**
- * 导出api
- * @param params
- */
-export const getExportUrl = Api.exportXls;
-/**
- * 导入api
- */
-export const getImportUrl = Api.importExcel;
-/**
- * 列表接口
- * @param params
- */
-export const list = (params) => defHttp.get({ url: Api.list, params });
-
-/**
- * 删除单个
- */
-export const deleteOne = (params, handleSuccess) => {
- return defHttp.delete({ url: Api.deleteOne, params }, { joinParamsToUrl: true }).then(() => {
- handleSuccess();
- });
-};
-/**
- * 批量删除
- * @param params
- */
-export const batchDelete = (params, handleSuccess) => {
- createConfirm({
- iconType: 'warning',
- title: '确认删除',
- content: '是否删除选中数据',
- okText: '确认',
- cancelText: '取消',
- onOk: () => {
- return defHttp.delete({ url: Api.deleteBatch, data: params }, { joinParamsToUrl: true }).then(() => {
- handleSuccess();
- });
- },
- });
-};
-/**
- * 保存或者更新
- * @param params
- */
-export const saveOrUpdate = (params, isUpdate) => {
- let url = isUpdate ? Api.edit : Api.save;
- return defHttp.post({ url: url, params });
-};
diff --git a/src/views/dj/tzMetting/DjMeetingRecord.data.ts b/src/views/dj/tzMetting/DjMeetingRecord.data.ts
deleted file mode 100644
index 7816ab6..0000000
--- a/src/views/dj/tzMetting/DjMeetingRecord.data.ts
+++ /dev/null
@@ -1,138 +0,0 @@
-import { BasicColumn } from '/@/components/Table';
-import { FormSchema } from '/@/components/Table';
-import { rules } from '/@/utils/helper/validator';
-import { render } from '/@/utils/common/renderUtils';
-import { getWeekMonthQuarterYear } from '/@/utils';
-//列表数据
-export const columns: BasicColumn[] = [
- {
- title: '序号',
- align: 'center',
- dataIndex: 'sortNo',
- },
- {
- title: '问题分类',
- align: 'center',
- dataIndex: 'problemType',
- },
- {
- title: '具体措施',
- align: 'center',
- dataIndex: 'specificMeasure',
- },
- {
- title: '完成时限',
- align: 'center',
- dataIndex: 'completionDeadline',
- customRender: ({ text }) => {
- text = !text ? '' : text.length > 10 ? text.substr(0, 10) : text;
- return text;
- },
- },
- {
- title: '责任部门',
- align: 'center',
- dataIndex: 'responsibleDept_dictText',
- },
- {
- title: '完成情况',
- align: 'center',
- dataIndex: 'completionStatus',
- },
- {
- title: '是否可发起',
- align: 'center',
- width: 150,
- dataIndex: 'isLaunchable_dictText',
- },
-];
-//查询数据
-export const searchFormSchema: FormSchema[] = [];
-//表单数据
-export const formSchema: FormSchema[] = [
- {
- label: '序号',
- field: 'sortNo',
- component: 'InputNumber',
- },
- {
- label: '问题分类',
- field: 'problemType',
- component: 'InputNumber',
- },
- {
- label: '具体措施',
- field: 'specificMeasure',
- component: 'Input',
- },
- {
- label: '完成时限',
- field: 'completionDeadline',
- component: 'DatePicker',
- componentProps: {
- valueFormat: 'YYYY-MM-DD',
- },
- },
- {
- label: '责任部门',
- field: 'responsibleDept',
- component: 'JSelectDept',
- componentProps: ({ formActionType, formModel }) => {
- return {
- sync: false,
- checkStrictly: true,
- defaultExpandLevel: 2,
-
- onSelect: (options, values) => {
- const { updateSchema } = formActionType;
- //所属部门修改后更新负责部门下拉框数据
- updateSchema([
- {
- field: 'departIds',
- componentProps: { options },
- },
- ]);
- //update-begin---author:wangshuai---date:2024-05-11---for:【issues/1222】用户编辑界面“所属部门”与“负责部门”联动出错整---
- if (!values) {
- formModel.departIds = [];
- return;
- }
- //update-end---author:wangshuai---date:2024-05-11---for:【issues/1222】用户编辑界面“所属部门”与“负责部门”联动出错整---
- //所属部门修改后更新负责部门数据
- formModel.departIds && (formModel.departIds = formModel.departIds.filter((item) => values.value.indexOf(item) > -1));
- },
- };
- },
- },
- {
- label: '完成情况',
- field: 'completionStatus',
- component: 'Input',
- },
- // TODO 主键隐藏字段,目前写死为ID
- {
- label: '',
- field: 'id',
- component: 'Input',
- show: false,
- },
-];
-
-// 高级查询数据
-export const superQuerySchema = {
- sortNo: { title: '序号', order: 0, view: 'number', type: 'number' },
- problemType: { title: '问题分类', order: 1, view: 'number', type: 'number' },
- specificMeasure: { title: '具体措施', order: 2, view: 'text', type: 'string' },
- completionDeadline: { title: '完成时限', order: 3, view: 'date', type: 'string' },
- responsibleDept: { title: '责任部门', order: 4, view: 'text', type: 'string' },
- completionStatus: { title: '完成情况', order: 5, view: 'text', type: 'string' },
-};
-
-/**
- * 流程表单调用这个方法获取formSchema
- * @param param
- */
-export function getBpmFormSchema(_formData): FormSchema[] {
- // 默认和原始表单保持一致 如果流程中配置了权限数据,这里需要单独处理formSchema
- return formSchema;
-}
diff --git a/src/views/dj/tzMetting/DjMeetingRecordList.vue b/src/views/dj/tzMetting/DjMeetingRecordList.vue
deleted file mode 100644
index f059263..0000000
--- a/src/views/dj/tzMetting/DjMeetingRecordList.vue
+++ /dev/null
@@ -1,217 +0,0 @@
-
-
-
-
-
-
- 新增
-
- 导出
- 导入
-
-
-
-
-
-
- 删除
-
-
-
- 批量操作
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/dj/tzMetting/components/DjMeetingRecordForm.vue b/src/views/dj/tzMetting/components/DjMeetingRecordForm.vue
deleted file mode 100644
index 7599135..0000000
--- a/src/views/dj/tzMetting/components/DjMeetingRecordForm.vue
+++ /dev/null
@@ -1,70 +0,0 @@
-
-
-
-
-
diff --git a/src/views/dj/tzMetting/components/DjMeetingRecordModal.vue b/src/views/dj/tzMetting/components/DjMeetingRecordModal.vue
deleted file mode 100644
index 9b70649..0000000
--- a/src/views/dj/tzMetting/components/DjMeetingRecordModal.vue
+++ /dev/null
@@ -1,99 +0,0 @@
-
-
-
-
-
-
-
-
-
From 38c93bf64a7027475afbcfd850c1e5c125cafeb8 Mon Sep 17 00:00:00 2001
From: wsm <2746563060@侵权。>
Date: Mon, 18 May 2026 15:46:26 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E4=B8=89=E5=85=83=E7=AE=A1=E7=90=86?=
=?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8F=AF=E8=A7=81=E8=8C=83=E5=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/three-admin/role/config/rolePermession.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/three-admin/role/config/rolePermession.ts b/src/views/three-admin/role/config/rolePermession.ts
index 29d0afd..79426ac 100644
--- a/src/views/three-admin/role/config/rolePermession.ts
+++ b/src/views/three-admin/role/config/rolePermession.ts
@@ -1,3 +1,3 @@
export const ROLE_SCOPE_CONFIG = {
- DEFAULT_PERMESSION_IDS: '2035916880060223489,2026041610467690430',
+ DEFAULT_PERMESSION_IDS: '2035916880060223489,2026041610467690430,2026051809451730260',
};
From b586fe8a53e2f96b4bde98ae0f5c8e438abac980 Mon Sep 17 00:00:00 2001
From: wsm <2746563060@侵权。>
Date: Mon, 18 May 2026 15:48:00 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E6=96=B0=E5=A2=9Eddl=E5=AD=97=E6=AE=B5?=
=?UTF-8?q?=E5=B9=B6=E5=86=99=E5=85=A5=E4=B8=AD=E9=97=B4=E8=A1=A8=EF=BC=8C?=
=?UTF-8?q?=E5=9C=A8=E5=BE=85=E5=8A=9E=E9=87=8C=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/bg/xispeak/BgXiSpeak.data.ts | 19 ++++++++-
src/views/bg/xispeak/BgXiSpeakList.vue | 40 ++++++++----------
.../xispeak/components/BgXiSpeakBPMForm.vue | 41 +++++++++++++++----
.../bg/xispeak/components/BgXiSpeakForm.vue | 6 +++
4 files changed, 76 insertions(+), 30 deletions(-)
diff --git a/src/views/bg/xispeak/BgXiSpeak.data.ts b/src/views/bg/xispeak/BgXiSpeak.data.ts
index 56b38b2..adaae39 100644
--- a/src/views/bg/xispeak/BgXiSpeak.data.ts
+++ b/src/views/bg/xispeak/BgXiSpeak.data.ts
@@ -89,6 +89,22 @@ export const columns: BasicColumn[] = [
align: 'center',
dataIndex: 'completionStatus_dictText',
},
+ {
+ title: '截止日期',
+ align: 'center',
+ dataIndex: 'deadline',
+ customRender: ({ text }) => {
+ if (!text) return '';
+ if (text instanceof Date) {
+ const y = text.getFullYear();
+ const m = String(text.getMonth() + 1).padStart(2, '0');
+ const d = String(text.getDate()).padStart(2, '0');
+ return `${y}-${m}-${d}`;
+ }
+ text = String(text);
+ return text.length > 10 ? text.substr(0, 10) : text;
+ },
+ },
{
title: '落实部门',
align: 'center',
@@ -251,7 +267,8 @@ export const superQuerySchema = {
isCompletionRisk: { title: '是否存在完成风险(0不存在,1存在)', order: 14, view: 'number', type: 'number' },
delayRiskMitigation: { title: '拖期风险应对措施', order: 15, view: 'text', type: 'string' },
completionStatus: { title: '完成状态(督办中,1已完成)', order: 16, view: 'number', type: 'number' },
- implDept: { title: '落实部门id', order: 17, view: 'sel_depart', type: 'string' },
+ deadline: { title: '截止日期', order: 17, view: 'date', type: 'string' },
+ implDept: { title: '落实部门id', order: 18, view: 'sel_depart', type: 'string' },
treeDepth: { title: '层深(最顶层节点层深为0)', order: 18, view: 'number', type: 'number' },
sortOrder: { title: '同级数据排序号', order: 19, view: 'number', type: 'number' },
bpmStatus: { title: '流程引擎状态字段', order: 21, view: 'number', type: 'number' },
diff --git a/src/views/bg/xispeak/BgXiSpeakList.vue b/src/views/bg/xispeak/BgXiSpeakList.vue
index 1676970..df792f9 100644
--- a/src/views/bg/xispeak/BgXiSpeakList.vue
+++ b/src/views/bg/xispeak/BgXiSpeakList.vue
@@ -1,6 +1,6 @@
-
+
新增
@@ -137,6 +137,7 @@
const flowScheduleModalRef = ref();
const feedbackRightNowModalRef = ref();
const businessProcessListModalRef = ref();
+ const currentBusinessId = ref('');
const pendingFeedbackRightNow = ref(0);
const processColumns = taskTaskColumns;
const selectedFeedbackId = ref(null);
@@ -160,7 +161,6 @@
const showSdwLeaderSelect = computed(() => queryParam.value.needSdwApproval === '1');
const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
- designScope: 'bg-xispeak-template',
tableProps: {
title: '习总书记重要讲话指示批示情况',
api: list,
@@ -168,30 +168,14 @@
canResize: false,
useSearchForm: false,
isTreeTable: true,
- clickToRowSelect: true,
actionColumn: {
- width: 120,
+ width: 240,
fixed: 'right',
},
beforeFetch: async (params) => {
params.hasQuery = 'true';
return Object.assign(params, queryParam.value);
},
- afterFetch: (result) => {
- if (result && result.length > 0) {
- result.forEach((item) => {
- if (item.hasChild == '1' && (!item.children || item.children.length === 0)) {
- item.children = [{ id: item.id + '_loadChild', name: 'loading...', isLoading: true }];
- }
- });
- }
- return result;
- },
- pagination: {
- current: 1,
- pageSize: 10,
- pageSizeOptions: ['10', '20', '30'],
- },
},
exportConfig: {
name: '习总书记重要讲话指示批示情况',
@@ -203,7 +187,7 @@
},
});
- const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { selectedRowKeys }] = tableContext;
+ const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
const mainId = computed(() => (unref(selectedRowKeys).length > 0 ? unref(selectedRowKeys)[0] : ''));
provide('mainId', mainId);
@@ -565,13 +549,25 @@
}
function handleQueryProcess(record) {
+ currentBusinessId.value = record.id;
businessProcessListModalRef.value?.open({
title: '流程列表',
businessId: record.id,
columns: '',
+ onDeleteProcess: handleDeleteProcess,
});
}
+ async function handleDeleteProcess(processRecord, reload) {
+ const res = await withDrawXiSpeak({ id: currentBusinessId.value });
+ if (res.success) {
+ createMessage.success(res.message || '删除流程成功');
+ await reload();
+ } else {
+ createMessage.error(res.message || '删除流程失败');
+ }
+ }
+
async function handleFlowScheduleConfirm({ payload, options }) {
const record = payload?.record || {};
const flowCode = payload?.flowCode || FLOW_CODE;
@@ -627,7 +623,7 @@
deptId: deptId,
deptLeaderId: deptId,
requireFinishDate: formatDate(record.time, 'YYYY-MM-DD'),
- deadline: formatDate(record.time, 'YYYY-MM-DD HH:mm:ss'),
+ deadline: record.deadline || formatDate(record.time, 'YYYY-MM-DD HH:mm:ss'),
},
};
@@ -664,7 +660,7 @@
deptId: options.deptId || record.leadDepartment,
deptLeaderId: record.responsiblePerson,
requireFinishDate: formatDate(record.time, 'YYYY-MM-DD'),
- deadline: formatDate(record.time, 'YYYY-MM-DD HH:mm:ss'),
+ deadline: record.deadline || formatDate(record.time, 'YYYY-MM-DD HH:mm:ss'),
},
};
diff --git a/src/views/bg/xispeak/components/BgXiSpeakBPMForm.vue b/src/views/bg/xispeak/components/BgXiSpeakBPMForm.vue
index 1c78f20..9023efd 100644
--- a/src/views/bg/xispeak/components/BgXiSpeakBPMForm.vue
+++ b/src/views/bg/xispeak/components/BgXiSpeakBPMForm.vue
@@ -16,9 +16,9 @@
-
+
-
+
@@ -27,9 +27,9 @@
-
+
-
+
@@ -82,11 +82,37 @@
+
+
+
+
+
+
+
+
+ 不存在
+ 存在
+
+
+
+
+
+
+ 是
+ 否
+
+
+
+
+
+
+
+
@@ -226,7 +252,7 @@
const loading = ref(false);
const savingMain = ref(false);
const savingSubApproveUser = ref(false);
- const showBaseInfoDetail = ref(false);
+ const showBaseInfoDetail = ref(true);
const feedbackList = ref([]);
const subApproveUser = ref('');
const isEnd = ref(0);
@@ -239,7 +265,7 @@
elmComment: '',
status: '',
responsiblePerson: '',
- needSdwApproval: '',
+ needSdwApproval: 0,
sdwLeaderList: '',
implPlan: '',
leadDepartment: '',
@@ -251,7 +277,8 @@
reportFeedbackStatus: '',
isCompletionRisk: undefined,
delayRiskMitigation: '',
- completionStatus: '',
+ completionStatus: undefined,
+ deadline: '',
implDept: '',
treeDepth: undefined,
sortOrder: undefined,
diff --git a/src/views/bg/xispeak/components/BgXiSpeakForm.vue b/src/views/bg/xispeak/components/BgXiSpeakForm.vue
index 44fae12..78e38e6 100644
--- a/src/views/bg/xispeak/components/BgXiSpeakForm.vue
+++ b/src/views/bg/xispeak/components/BgXiSpeakForm.vue
@@ -100,6 +100,11 @@
+
+
+
+
+
@@ -175,6 +180,7 @@
isCompletionRisk: undefined,
delayRiskMitigation: '',
completionStatus: undefined,
+ deadline: '',
implDept: '',
treeDepth: undefined,
sortOrder: undefined,