diff --git a/.gitignore b/.gitignore
index 489daa6..9b5fbd9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@ node_modules
/dist/
dist-electron
.cache
+localDoc
tests/server/static
tests/server/static/upload
diff --git a/src/components/semri/process/FlowScheduleStartModal.vue b/src/components/semri/process/FlowScheduleStartModal.vue
index 6ffc007..9b937bd 100644
--- a/src/components/semri/process/FlowScheduleStartModal.vue
+++ b/src/components/semri/process/FlowScheduleStartModal.vue
@@ -36,7 +36,27 @@
-
+
+
+
+
+
+
@@ -79,7 +99,9 @@
import JModal from '/src/components/Modal/src/JModal/JModal.vue';
import JDictSelectTag from '/src/components/Form/src/jeecg/components/JDictSelectTag.vue';
import JSwitch from '/src/components/Form/src/jeecg/components/JSwitch.vue';
- import JSelectUser from '/src/components/Form/src/jeecg/components/JSelectUser.vue';
+ import SzUserSelectByDeptRoleSecurityModal from '/src/components/semri/userComponent/modal/SzUserSelectByDeptRoleSecurityModal.vue';
+ import { SearchOutlined } from '@ant-design/icons-vue';
+ import { getUserList } from '/src/api/common/api';
import { useMessage } from '/src/hooks/web/useMessage';
interface ModalPayload {
@@ -89,6 +111,7 @@
showSuoleaderFields?: boolean;
isNeedAppro?: string | number;
supDeptleaderid?: string | string[];
+ supDeptleaderName?: string;
showDeadlineField?: boolean;
deadline?: string | Date;
}
@@ -107,6 +130,44 @@
const deptOptions = ref([]);
const showSuoleaderFields = ref(false);
const showDeadlineField = ref(false);
+
+ // 所党委领导选人弹窗
+ const sdwLeaderModalOpen = ref(false);
+ const supDeptleaderName = ref('');
+ const sdwLeaderDeptId = ref('2044677562460508161');
+ const sdwLeaderRoleId = ref('2044676455280570370');
+ const sdwLeaderSecurityValue = ref(5);
+
+ function openSdwLeaderModal() {
+ if (String(formData.isNeedAppro) !== '1') return;
+ sdwLeaderModalOpen.value = true;
+ }
+
+ function handleClearSdwLeader() {
+ formData.supDeptleaderid = '';
+ supDeptleaderName.value = '';
+ }
+
+ function handleSdwLeaderConfirm(rows: Array<{ id: string; realname: string }>) {
+ if (rows && rows.length > 0) {
+ formData.supDeptleaderid = rows.map((r) => r.username).join(',');
+ supDeptleaderName.value = rows.map((r) => r.realname).join(',');
+ } else {
+ formData.supDeptleaderid = '';
+ supDeptleaderName.value = '';
+ }
+ }
+
+ async function resolveSdwLeaderNames(ids: string) {
+ try {
+ const res = await getUserList({ username: ids, pageSize: 999 });
+ const records = res?.records || res?.result?.records || [];
+ supDeptleaderName.value = records.map((u: any) => u.realname).join(',');
+ } catch {
+ supDeptleaderName.value = '';
+ }
+ }
+
const formData = reactive({
triggerMode: 'immediate',
intervalType: undefined as number | string | undefined,
@@ -126,6 +187,7 @@
formData.deptIds = [];
formData.isNeedAppro = '0';
formData.supDeptleaderid = '';
+ supDeptleaderName.value = '';
formData.deadline = undefined;
deptOptions.value = [];
showSuoleaderFields.value = false;
@@ -169,6 +231,10 @@
showSuoleaderFields.value = !!data.showSuoleaderFields;
formData.isNeedAppro = String(data.isNeedAppro ?? '0');
formData.supDeptleaderid = data.supDeptleaderid || '';
+ supDeptleaderName.value = data.supDeptleaderName || '';
+ if (!supDeptleaderName.value && formData.supDeptleaderid) {
+ resolveSdwLeaderNames(formData.supDeptleaderid as string);
+ }
showDeadlineField.value = !!data.showDeadlineField;
formData.deadline = normalizeDeadlineValue(data.deadline);
if (String(formData.isNeedAppro) !== '1') {
@@ -228,6 +294,7 @@
(value) => {
if (String(value) !== '1') {
formData.supDeptleaderid = '';
+ supDeptleaderName.value = '';
}
}
);
diff --git a/src/components/semri/userComponent/modal/SzUserSelectByDeptRoleSecurityModal.vue b/src/components/semri/userComponent/modal/SzUserSelectByDeptRoleSecurityModal.vue
index f78a699..44f3810 100644
--- a/src/components/semri/userComponent/modal/SzUserSelectByDeptRoleSecurityModal.vue
+++ b/src/components/semri/userComponent/modal/SzUserSelectByDeptRoleSecurityModal.vue
@@ -1,6 +1,6 @@
-
-
+
+
-
-
diff --git a/src/views/dj/inspectimprove/components/DjInspectImproveForm.vue b/src/views/dj/inspectimprove/components/DjInspectImproveForm.vue
deleted file mode 100644
index 106d711..0000000
--- a/src/views/dj/inspectimprove/components/DjInspectImproveForm.vue
+++ /dev/null
@@ -1,70 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/src/views/dj/inspectimprove/components/DjInspectImproveModal.vue b/src/views/dj/inspectimprove/components/DjInspectImproveModal.vue
deleted file mode 100644
index adffd7c..0000000
--- a/src/views/dj/inspectimprove/components/DjInspectImproveModal.vue
+++ /dev/null
@@ -1,119 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/views/dq/inspectProgress/DqInspectProgress.api.ts b/src/views/dq/inspectProgress/DqInspectProgress.api.ts
new file mode 100644
index 0000000..5fd070e
--- /dev/null
+++ b/src/views/dq/inspectProgress/DqInspectProgress.api.ts
@@ -0,0 +1,79 @@
+import { defHttp } from '/@/utils/http/axios';
+import { useMessage } from "/@/hooks/web/useMessage";
+
+const { createConfirm } = useMessage();
+
+enum Api {
+ list = '/dqinspecttask/dqInspectTask/listDqInspectProgressByMainId',
+ save='/dqinspecttask/dqInspectTask/addDqInspectProgress',
+ edit='/dqinspecttask/dqInspectTask/editDqInspectProgress',
+ deleteOne = '/dqinspecttask/dqInspectTask/deleteDqInspectProgress',
+ deleteBatch = '/dqinspecttask/dqInspectTask/deleteBatchDqInspectProgress',
+ importExcel = '/dqinspecttask/dqInspectTask/importDqInspectProgress',
+ exportXls = '/dqinspecttask/dqInspectTask/exportDqInspectProgress',
+ queryById = '/dqinspecttask/dqInspectTask/queryDqInspectProgressById',
+}
+
+/**
+ * 导出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 });
+
+/**
+ * 删除单个
+ * @param params
+ * @param handleSuccess
+ */
+export const deleteOne = (params,handleSuccess) => {
+ return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+ handleSuccess();
+ });
+}
+
+/**
+ * 批量删除
+ * @param params
+ * @param handleSuccess
+ */
+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
+ * @param isUpdate
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+ let url = isUpdate ? Api.edit : Api.save;
+ return defHttp.post({ url: url, params }, { isTransformResponse: false });
+}
+
+/**
+ * 根据id查询数据
+ * @param id
+ */
+export const queryById = (id) => defHttp.get({ url: Api.queryById, params: { id } });
diff --git a/src/views/dq/inspectProgress/DqInspectProgress.data.ts b/src/views/dq/inspectProgress/DqInspectProgress.data.ts
new file mode 100644
index 0000000..5bdf4ab
--- /dev/null
+++ b/src/views/dq/inspectProgress/DqInspectProgress.data.ts
@@ -0,0 +1,64 @@
+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: '反馈部门ID',
+ align: "center",
+ dataIndex: 'feedbackDeptId'
+ },
+ {
+ title: '反馈部门名称',
+ align: "center",
+ dataIndex: 'feedbackDeptName'
+ },
+ {
+ title: '反馈人ID',
+ align: "center",
+ dataIndex: 'feedbackPersonId'
+ },
+ {
+ title: '反馈人姓名',
+ align: "center",
+ dataIndex: 'feedbackPersonName'
+ },
+ {
+ title: '实际完成时间',
+ align: "center",
+ dataIndex: 'actualTime',
+ customRender:({text}) =>{
+ text = !text ? "" : (text.length > 10 ? text.substr(0,10) : text);
+ return text;
+ },
+ },
+ {
+ title: '工作进展',
+ align: "center",
+ dataIndex: 'workProgress'
+ },
+ {
+ title: '进展状态',
+ align: "center",
+ dataIndex: 'bpmStatus'
+ },
+ {
+ title: '整改措施任务ID',
+ align: "center",
+ dataIndex: 'mainId'
+ },
+];
+
+// 高级查询数据
+export const superQuerySchema = {
+ feedbackDeptId: {title: '反馈部门ID',order: 0,view: 'text', type: 'string',},
+ feedbackDeptName: {title: '反馈部门名称',order: 1,view: 'text', type: 'string',},
+ feedbackPersonId: {title: '反馈人ID',order: 2,view: 'text', type: 'string',},
+ feedbackPersonName: {title: '反馈人姓名',order: 3,view: 'text', type: 'string',},
+ actualTime: {title: '实际完成时间',order: 4,view: 'date', type: 'string',},
+ workProgress: {title: '工作进展',order: 5,view: 'text', type: 'string',},
+ bpmStatus: {title: '进展状态',order: 6,view: 'text', type: 'string',},
+ mainId: {title: '整改措施任务ID',order: 8,view: 'text', type: 'string',},
+};
diff --git a/src/views/dq/inspectProgress/DqInspectProgressList.vue b/src/views/dq/inspectProgress/DqInspectProgressList.vue
new file mode 100644
index 0000000..7c719ae
--- /dev/null
+++ b/src/views/dq/inspectProgress/DqInspectProgressList.vue
@@ -0,0 +1,303 @@
+
+
+
+
+
+
+
+
+
+ 新增
+
+ 导出
+ 导入
+
+
+
+
+
+ 删除
+
+
+
+ 批量操作
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+