fix

apps/web-ele/src/components/knowledgemain/index.vue

@@ -27,7 +27,7 @@ const KnowledgeDetails = ref({}) as any;
 const chapterDatafn = async () => {
   chapterDataloading.value = true;
   try {
-    const res = await queryKnowledgeContentlist(props.classId);
+    const res = await queryKnowledgeContentlist(props.classId||{});
     if (res.code === 200) {
       console.log('章节数据', res.data);
       chapterData.value = res.data || [];
@@ -44,7 +44,7 @@ const chapterDatafn = async () => {
 // 查询知识分类详情
 const queryKnowledgeCategoryDetailfn = async () => {
   try {
-    const res = await queryKnowledgeCategoryDetail(props.classId);
+    const res = await queryKnowledgeCategoryDetail(props.classId||{});
     KnowledgeDetails.value = res;
   } catch (error) {
     console.log(error);

apps/web-ele/src/views/system/taskDesign/taskTemplate/index.vue

@@ -113,6 +113,7 @@ async function handleView(row: any) {
         isTiming: String(res.isTiming),
         level: String(res.level),
         repel: Number(res.repel),
+        isCycleEnd: res?.isCycleEnd === 1 ? [true] : [],
       })
       .open();
   } catch (error) {
@@ -125,6 +126,7 @@ async function handleView(row: any) {
 async function handleEdit(row: any) {
   try {
     const res = await xiangqigApi(row.id);
+    console.log('编辑数据', res);
     drawerApi
       .setData({
         ...res,
@@ -139,6 +141,7 @@ async function handleEdit(row: any) {
         isTiming: String(res.isTiming),
         level: String(res.level),
         repel: Number(res.repel),
+        isCycleEnd: res?.isCycleEnd === 1 ? [true] : [],
       })
       .open();
   } catch (error) {
@@ -180,14 +183,18 @@ function handleExport() {
 
 const handleConfirm = async (data: any) => {
   console.log('提交数据', data);
-
   drawerApi.drawerLoading(true);
   try {
     data.standardGuideline = '14,17';
     data.files = data?.attachment
       ?.map((item: any) => item.response.data.fileName)
       .join(',');
-
+    if (Array.isArray(data.executePosition) && data.executePosition.length) {
+      data.executePosition = data?.executePosition?.join(',');
+    }
+    if (Array.isArray(data.isCycleEnd)) {
+      data.isCycleEnd = data.isCycleEnd[0] === true ? 1 : 0;
+    }
     // 根据是否包含 id 来决定调用新增接口还是编辑接口
     if (data.id) {
       // 编辑操作

apps/web-ele/src/views/system/taskDesign/taskTemplate/taskTemplate-data.tsx

@@ -1,8 +1,9 @@
 import type { FormSchemaGetter } from '#/adapter/form';
 import type { VxeGridProps } from '#/adapter/vxe-table';
-
+import { ElButton } from 'element-plus';
 import { getPopupContainer } from '@vben/utils';
-
+// @ts-ignore
+import {useVbenModal } from '@vben/common-ui';
 import { ElMessage } from 'element-plus';
 
 // import type { SelectProps } from '#/adapter/form';
@@ -715,7 +716,7 @@ export const drawerFormSchema: FormSchemaGetter = (props?: any) => [
     defaultValue: '00',
     componentProps: {
       clearable: true,
-      placeholder: '请输入结束时间（小时）',
+      placeholder: '请输入开始时间（小时）',
       options: Array.from({ length: 24 }, (_, i) => ({
         label: i.toString().padStart(2, '0'),
         value: i,
@@ -749,8 +750,12 @@ export const drawerFormSchema: FormSchemaGetter = (props?: any) => [
     dependencies: {
       show: (values: any) => values.taskFrequency !== 'yearly',
       disabled: (values: any) =>
-        Array.isArray(values.endoftheperiod) &&
-        values.endoftheperiod.length > 0,
+        (Array.isArray(values.endoftheperiod) &&
+          values.endoftheperiod.length > 0) ||
+        (values.taskFrequency !== 'daily' &&
+          values.taskFrequency !== 'yearly' &&
+          Array.isArray(values.isCycleEnd) &&
+          values.isCycleEnd[0] === true),
       componentProps(values: any) {
         const startDay = parseInt(values.startTimeDay) || 1;
 
@@ -811,7 +816,12 @@ export const drawerFormSchema: FormSchemaGetter = (props?: any) => [
           defaultValue: '1',
         };
       },
-      triggerFields: ['endoftheperiod', 'taskFrequency', 'startTimeDay'],
+      triggerFields: [
+        'endoftheperiod',
+        'isCycleEnd',
+        'taskFrequency',
+        'startTimeDay',
+      ],
     },
     componentProps: {
       clearable: true,
@@ -832,14 +842,18 @@ export const drawerFormSchema: FormSchemaGetter = (props?: any) => [
     dependencies: {
       show: (values: any) => values.taskFrequency !== 'yearly',
       disabled: (values: any) =>
-        Array.isArray(values.endoftheperiod) &&
-        values.endoftheperiod.length > 0,
+        (Array.isArray(values.endoftheperiod) &&
+          values.endoftheperiod.length > 0) ||
+        (values.taskFrequency !== 'daily' &&
+          values.taskFrequency !== 'yearly' &&
+          Array.isArray(values.isCycleEnd) &&
+          values.isCycleEnd[0] === true),
       componentProps(values: any) {
         return {
           defaultValue: '23',
         };
       },
-      triggerFields: ['endoftheperiod', 'taskFrequency'],
+      triggerFields: ['endoftheperiod', 'isCycleEnd', 'taskFrequency'],
     },
     componentProps: {
       clearable: true,
@@ -913,8 +927,12 @@ export const drawerFormSchema: FormSchemaGetter = (props?: any) => [
     dependencies: {
       show: (values: any) => values.taskFrequency === 'yearly',
       disabled: (values: any) =>
-        Array.isArray(values.endoftheperiod) &&
-        values.endoftheperiod.length > 0,
+        (Array.isArray(values.endoftheperiod) &&
+          values.endoftheperiod.length > 0) ||
+        (values.taskFrequency !== 'daily' &&
+          values.taskFrequency !== 'yearly' &&
+          Array.isArray(values.isCycleEnd) &&
+          values.isCycleEnd[0] === true),
       componentProps(values: any) {
         const startMonth = parseInt(values.startTimeMonth) || 1;
         const startDay = parseInt(values.startTimeYearDay) || 1;
@@ -927,7 +945,12 @@ export const drawerFormSchema: FormSchemaGetter = (props?: any) => [
           defaultValue: startMonth.toString(),
         };
       },
-      triggerFields: ['endoftheperiod', 'taskFrequency', 'startTimeMonth'],
+      triggerFields: [
+        'endoftheperiod',
+        'isCycleEnd',
+        'taskFrequency',
+        'startTimeMonth',
+      ],
     },
     componentProps: {
       clearable: true,
@@ -947,8 +970,12 @@ export const drawerFormSchema: FormSchemaGetter = (props?: any) => [
     dependencies: {
       show: (values: any) => values.taskFrequency === 'yearly',
       disabled: (values: any) =>
-        Array.isArray(values.endoftheperiod) &&
-        values.endoftheperiod.length > 0,
+        (Array.isArray(values.endoftheperiod) &&
+          values.endoftheperiod.length > 0) ||
+        (values.taskFrequency !== 'daily' &&
+          values.taskFrequency !== 'yearly' &&
+          Array.isArray(values.isCycleEnd) &&
+          values.isCycleEnd[0] === true),
       componentProps(values: any) {
         const startDay = parseInt(values.startTimeYearDay) || 1;
         const month = parseInt(values.endTimeMonth) || 1;
@@ -972,6 +999,7 @@ export const drawerFormSchema: FormSchemaGetter = (props?: any) => [
       },
       triggerFields: [
         'endoftheperiod',
+        'isCycleEnd',
         'taskFrequency',
         'startTimeYearDay',
         'endTimeMonth',
@@ -987,12 +1015,23 @@ export const drawerFormSchema: FormSchemaGetter = (props?: any) => [
     },
     // rules: 'required',
   },
+  //是否周期末0否1是
   {
     component: 'CheckboxGroup',
-    fieldName: 'endoftheperiod',
+    fieldName: 'isCycleEnd',
     label: '周期末',
     componentProps: {
-      options: [{ label: '', value: '1' }],
+      options: [
+        {
+          label: '',
+          value: true,
+        },
+      ],
+    },
+    dependencies: {
+      show: (values: any) =>
+        values.taskFrequency !== 'daily' && values.taskFrequency !== 'yearly',
+      triggerFields: ['taskFrequency'],
     },
     formItemClass: 'col-span-2 items-baseline',
   },
@@ -1027,6 +1066,7 @@ export const drawerFormSchema: FormSchemaGetter = (props?: any) => [
     component: 'InputNumber',
     fieldName: 'invalidDays',
     label: '失效天数',
+    defaultValue: 0,
     componentProps: {
       placeholder: '请输入失效天数',
       min: 0,
@@ -1052,6 +1092,7 @@ export const drawerFormSchema: FormSchemaGetter = (props?: any) => [
     component: 'InputNumber',
     fieldName: 'daysInterval',
     label: '间隔天数',
+    defaultValue: 0,
     componentProps: {
       placeholder: '请输入间隔天数',
       min: 0,
@@ -1067,6 +1108,7 @@ export const drawerFormSchema: FormSchemaGetter = (props?: any) => [
     component: 'InputNumber',
     fieldName: 'warningTime',
     label: '预警时间',
+    defaultValue: 0,
     componentProps: {
       placeholder: '请输入预警时间',
       min: 0,
@@ -1125,75 +1167,29 @@ export const drawerFormSchema: FormSchemaGetter = (props?: any) => [
     formItemClass: 'col-span-2 items-baseline',
   },
   {
-    component: 'ApiTreeSelect',
+    component: 'InputTag',
     fieldName: 'standardGuideline',
     label: '标准指引',
     componentProps: {
       placeholder: '请选择标准指引',
-      // api: async () => {
-      //   try {
-      //     const res = await queryKnowledgeCategory({});
-      //     if (res?.rows && res.rows.length > 0) {
-      //       // 使用Promise.all等待所有异步操作完成
-      //       const treeData = await Promise.all(
-      //         res.rows.map(async (item:any) => {
-      //           let children = [];
-      //           try {
-      //             // 获取子项数据
-      //             const childrenRes = await queryKnowledgeContentlist(item.id);
-      //             // 由于isTransformResponse为false，childrenRes直接是数据数组
-      //             const actualData = Array.isArray(childrenRes)
-      //               ? childrenRes
-      //               : childrenRes?.data || [];
-      //             // 递归处理嵌套的children数组
-      //             const processChildItem = (item: any) => {
-      //               const processedItem = {
-      //                 ...item,
-      //                 label: item.title || item.id,
-      //                 value: item.id,
-      //               };
-      //               // 如果item有children数组，递归处理
-      //               if (
-      //                 item.children &&
-      //                 Array.isArray(item.children) &&
-      //                 item.children.length > 0
-      //               ) {
-      //                 processedItem.children =
-      //                   item.children.map(processChildItem);
-      //               }
-      //               return processedItem;
-      //             };
-
-      //             if (actualData.length > 0) {
-      //               children = actualData.map(processChildItem);
-      //             }
-      //           } catch (error) {
-      //             console.error('获取子项数据失败:', error);
-      //           }
-      //           return {
-      //             ...item,
-      //             label: item.name,
-      //             value: item.id,
-      //             children: children,
-      //           };
-      //         }),
-      //       );
-
-      //       console.log('最终树形数据:', treeData);
-      //       return treeData;
-      //     }
-      //   } catch (error) {
-      //     console.error('获取分类数据失败:', error);
-      //   }
-      //   return [];
-      // },
-      getPopupContainer,
-      labelField: 'label',
-      valueField: 'id',
-      childrenField: 'children',
-      checkStrictly: true,
       clearable: true,
     },
+    renderComponentContent: (row: any, formApi: any) => {
+      return {
+        suffix: () => {
+          return (
+              <ElButton
+                onClick={() => {
+                  props?.quoteModalApi?.open();
+                }}
+                type="primary"
+              >
+                选择
+              </ElButton>
+          );
+        },
+      };
+    },
     formItemClass: 'col-span-2 items-baseline',
   },
   {
@@ -1237,26 +1233,6 @@ export const drawerFormSchema: FormSchemaGetter = (props?: any) => [
     rules: 'required',
     formItemClass: 'col-span-2 items-baseline',
   },
-  // {
-  //   component: 'Select',
-  //   fieldName: 'archiveList',
-  //   label: '归档列表',
-  //   componentProps: {
-  //     placeholder: '请选择归档列表',
-  //     showSearch: true,
-  //     filterOption: (input, option) =>
-  //       (option?.label || '').toLowerCase().includes(input.toLowerCase()),
-  //     // 模拟归档列表数据
-  //     options: [
-  //       { label: '日常巡检归档', value: '日常巡检归档' },
-  //       { label: '安全检查归档', value: '安全检查归档' },
-  //       { label: '财务报表归档', value: '财务报表归档' },
-  //       { label: '市场调研归档', value: '市场调研归档' },
-  //       { label: '人事档案归档', value: '人事档案归档' },
-  //     ],
-  //   },
-  //   rules: 'required',
-  // },
 ];
 
 export const formActions = [
@@ -1273,145 +1249,3 @@ export const formActions = [
     buttonProps: { type: 'primary', ghost: true },
   },
 ];
-
-// export const mockData = [
-//   {
-//     id: '1',
-//     taskName: '日常巡检任务',
-//     taskType: '运营',
-//     formType: '检查任务',
-//     taskResponsible: '张三',
-//     executivePost: '巡检员',
-//     taskFrequency: '每天一次',
-//     status: '启用',
-//     timedDistribution: '是',
-//     taskSource: '新增',
-//     operator: '系统管理员',
-//     operationTime: '2023-10-01 10:00:00',
-//     // 示例附件数据
-//     attachment: [
-//       {
-//         name: '设备巡检记录表.xlsx',
-//         url: '#',
-//         size: 204800,
-//         type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-//         uid: '1622547135000_1',
-//         status: 'success',
-//       },
-//       {
-//         name: '巡检操作规范.pdf',
-//         url: '#',
-//         size: 153600,
-//         type: 'application/pdf',
-//         uid: '1622547135000_2',
-//         status: 'success',
-//       },
-//     ],
-//     taskDescription: '这是一个日常巡检任务，需要检查设备运行状态和环境安全。',
-//     archiveList: '日常巡检归档',
-//   },
-//   {
-//     id: '2',
-//     taskName: '安全培训任务',
-//     taskType: '安全',
-//     formType: '表单任务',
-//     taskResponsible: '李四',
-//     executivePost: '安全员',
-//     taskFrequency: '每月一次',
-//     status: '启用',
-//     timedDistribution: '是',
-//     taskSource: '新增',
-//     operator: '系统管理员',
-//     operationTime: '2023-10-02 14:30:00',
-//     // 示例附件数据
-//     attachment: [
-//       {
-//         name: '安全培训教材.pdf',
-//         url: '#',
-//         size: 307200,
-//         type: 'application/pdf',
-//         uid: '1622547135000_3',
-//         status: 'success',
-//       },
-//       {
-//         name: '培训签到表.xlsx',
-//         url: '#',
-//         size: 51200,
-//         type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-//         uid: '1622547135000_4',
-//         status: 'success',
-//       },
-//     ],
-//     taskDescription: '这是一个安全培训任务，需要组织员工进行安全知识学习。',
-//     archiveList: '安全检查归档',
-//   },
-//   {
-//     id: '3',
-//     taskName: '财务报表提交',
-//     taskType: '财务',
-//     formType: '上传附件任务',
-//     taskResponsible: '王五',
-//     executivePost: '财务人员',
-//     taskFrequency: '每月一次',
-//     status: '启用',
-//     timedDistribution: '否',
-//     taskSource: '默认',
-//     operator: '系统管理员',
-//     operationTime: '2023-10-03 09:15:00',
-//     // 示例附件数据
-//     attachment: [
-//       {
-//         name: '财务报表模板.xlsx',
-//         url: '#',
-//         size: 102400,
-//         type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-//         uid: '1622547135000_5',
-//         status: 'success',
-//       },
-//     ],
-//     taskDescription: '这是一个财务报表提交任务，需要按时提交月度财务报表。',
-//     archiveList: '财务报表归档',
-//   },
-//   {
-//     id: '4',
-//     taskName: '市场调研任务',
-//     taskType: '市场',
-//     formType: '表单任务',
-//     taskResponsible: '赵六',
-//     executivePost: '市场专员',
-//     taskFrequency: '每周一次',
-//     status: '启用',
-//     timedDistribution: '是',
-//     taskSource: '新增',
-//     operator: '系统管理员',
-//     operationTime: '2023-10-04 16:45:00',
-//   },
-//   {
-//     id: '5',
-//     taskName: '人事档案更新',
-//     taskType: '人事',
-//     formType: '确认任务',
-//     taskResponsible: '孙七',
-//     executivePost: '人事专员',
-//     taskFrequency: '每三月一次',
-//     status: '关闭',
-//     timedDistribution: '是',
-//     taskSource: '默认',
-//     operator: '系统管理员',
-//     operationTime: '2023-10-05 11:20:00',
-//   },
-//   {
-//     id: '6',
-//     taskName: '合规检查任务',
-//     taskType: '合规',
-//     formType: '检查任务',
-//     taskResponsible: '周八',
-//     executivePost: '合规专员',
-//     taskFrequency: '每六月一次',
-//     status: '启用',
-//     timedDistribution: '否',
-//     taskSource: '新增',
-//     operator: '系统管理员',
-//     operationTime: '2023-10-06 15:10:00',
-//   },
-// ];

apps/web-ele/src/views/system/taskDesign/taskTemplate/taskTemplate-drawer.vue

@@ -1,22 +1,18 @@
 <script setup lang="ts">
 import { computed, onMounted, ref } from 'vue';
-
 // @ts-ignore
-import { useVbenDrawer, useVbenForm } from '@vben/common-ui';
+import { useVbenDrawer, useVbenForm, useVbenModal } from '@vben/common-ui';
 import { useAccessStore } from '@vben/stores';
-
 import { Plus } from '@element-plus/icons-vue';
 import { ElIcon, ElUpload } from 'element-plus';
-
 import { selectAllSysStation } from '#/api/system/infoEntry/stationInfo/stationInfo';
 import { stationoperatorapi } from '#/api/system/tasksettings/tasktemplate';
 // import '#/assets/iconfonts/font/iconfont.css';
 import iconfont from '#/assets/iconfonts/font/iconfont.json';
 import TinymceEditor from '#/components/tinymce/src/editor.vue';
 import { getUploadAction } from '#/components/upload/config';
-
-import { drawerFormSchema } from './taskTemplate-data';
-
+import { drawerFormSchema, positionsOptions } from './taskTemplate-data';
+import knowledgemain from '#/components/knowledgemain/index.vue';
 const emit = defineEmits(['Confirm']);
 const iconlist = ref(iconfont?.glyphs || []);
 const accessStore = useAccessStore();
@@ -47,6 +43,13 @@ interface DrawerData {
   attachment?: any[];
   [key: string]: any;
 }
+const [QuoteModal, quoteModalApi] = useVbenModal({
+  title: '引用试题',
+  showCancelBtn: false,
+  class: 'quote-modal',
+  // onConfirm:()=>{
+  // }
+});
 const radio1 = ref('0');
 const dialogVisible = ref(false);
 const selectedIcon = ref('');
@@ -61,13 +64,30 @@ const formOptions = computed(() => {
     // @ts-ignore
     schema: drawerFormSchema({
       handleTaskFrequencyChange,
+      quoteModalApi,
     }),
     isDisabled: isViewRef.value,
     wrapperClass: 'grid-cols-2',
     handleValuesChange: (values: any) => {
-      if (values.executePosition === 3) {
-        radio1.value = '0';
-        isWebmaster.value = true;
+      if (values.executePositions) {
+        const posts = values.executePositions;
+        let isManagement = false;
+        for (const item of posts) {
+          const info = positionsOptions.find((i: any) => i.value === item);
+          if (
+            (info && info.type === 'management') ||
+            info.type === 'employee'
+          ) {
+            isManagement = true;
+            break;
+          }
+        }
+        if (isManagement) {
+          radio1.value = '0';
+          isWebmaster.value = true;
+        } else {
+          isWebmaster.value = false;
+        }
       }
     },
   };
@@ -218,6 +238,17 @@ const [Drawer, drawerApi] = useVbenDrawer({
         return;
       }
       const formData = await formApi.getValues();
+      if (formData.taskFrequency !== 'yearly') {
+        delete formData.startTimeMonth;
+        delete formData.startTimeYearDay;
+        delete formData.endTimeMonth;
+        delete formData.endTimeYearDay;
+      } else {
+        delete formData.startTimeDay;
+        delete formData.startTimeHour;
+        delete formData.endTimeDay;
+        delete formData.endTimeHour;
+      }
 
       // 添加附件数据
       if (attachments.value.length > 0) {
@@ -255,7 +286,17 @@ const [Drawer, drawerApi] = useVbenDrawer({
     isViewRef.value = false;
     isCopyRef.value = false;
     attachments.value = [];
-    radio1.value = '';
+    radio1.value = '0';
+    if (selectAllSysStationList.value.length > 0) {
+      selectAllSysStationList.value.forEach((item: any) => {
+        item.isExecutable = true; // 是否执行
+        item.isLicensable = false; // 是否授权
+        item.taskTemplateUsers = []; // 清空任务模板用户
+        item.taskTemplateUsersoption = undefined; // 清空用户选项
+        item.value1 = []; // 清空选中的用户值
+      });
+    }
+    selectedIcon.value = '';
   },
 });
 
@@ -332,7 +373,7 @@ const selectIcon = (val: any, item: any) => {
       </template>
       <!-- v-if="formApi.getValues().then(res)=>res.executePosition==='0'" -->
       <template #distributionMethod="scope">
-        <div style="display: flex; gap: 16px;align-items: center;">
+        <div style="display: flex; gap: 16px; align-items: center">
           <div>
             <el-radio-group v-model="radio1">
               <el-radio value="0" size="large">场站</el-radio>
@@ -524,9 +565,13 @@ const selectIcon = (val: any, item: any) => {
       </template>
     </Form>
   </Drawer>
+  <QuoteModal><knowledgemain /></QuoteModal>
 </template>
 
 <style scoped>
+:global(.quote-modal) {
+  min-width: 70% !important;
+}
 .icon-box {
   width: 100%;
   box-sizing: border-box;