修复bug

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

@@ -37,7 +37,7 @@ const chapterData = ref([]) as any;
 const chapterDataloading = ref(false);
 const centerloading = ref(false);
 const isEdit = ref(false);
-const ChapterId = ref(null);
+const ChapterId = ref(null) as any;
 const KnowledgeDetails = ref({}) as any;
 // 查询章节数据
 const chapterDatafn = async ({ initContentId }: any) => {

apps/web-ele/src/views/knowledge/type/create.vue

@@ -513,7 +513,7 @@ const closeForm = () => {
   .icon-list {
     display: flex;
     flex-wrap: wrap;
-    gap: 16px;
+    gap: 6px;
   }
 
   .icon-item {
@@ -521,8 +521,8 @@ const closeForm = () => {
     flex-direction: column;
     align-items: center;
     justify-content: center;
-    width: 80px;
-    height: 80px;
+    width: 50px;
+    height: 50px;
     cursor: pointer;
     border: 2px solid transparent;
     border-radius: 6px;

apps/web-ele/src/views/schedule/view/index.vue

@@ -205,6 +205,8 @@ const queryGasStationListfn = async () => {
   // mainloing.value = true;
   try {
     const res = await queryGasStationList({});
+    console.log('油站列表', res);
+
     gasstationlist.value = res || [];
   } catch (error) {
     console.log(error);
@@ -263,9 +265,16 @@ const handleCreateVisitorTask = async (formData: any) => {
   }
 };
 onMounted(() => {
+  console.log('个人信息', userStore.userInfo);
+
   queryGasStationListfn().then(() => {
-    if (userStore.userInfo?.stations?.length) {
+    if (userStore.userInfo?.stations?.length > 0) {
       searchParams.value.station = `${userStore.userInfo?.userId}-${userStore.userInfo?.stations[0]?.id}`;
+    } else {
+      searchParams.value.station =
+        gasstationlist.value[0]?.userId +
+        '-' +
+        gasstationlist.value[0]?.stationId;
     }
 
     queryCurrentViewData(
@@ -533,7 +542,7 @@ const createWorkOrderDrawerEvent = () => {
               <ElOption
                 v-for="item in gasstationlist"
                 :key="`${item.userId}-${item.stationId}`"
-                :label="`${item.nickName}-${item.postName}${item.stationName ? `-${item.stationName}` : ''}`"
+                :label="`${item.nickName}${item.postName ? `-${item.postName}` : ''}${userStore.userInfo?.stations?.length > 0 && item.stationName ? `-${item.stationName}` : ''}`"
                 :value="`${item.userId}-${item.stationId || 0}`"
               />
             </ElSelect>

apps/web-ele/src/views/schedule/work/class/component/addandedit.vue

@@ -334,6 +334,7 @@ const calculateDuration = (startTime: string, endTime: string): number => {
               <el-table-column
                 prop="firstStartTime"
                 label="上班时间"
+                width="150"
                 align="center"
               >
                 <template #default="scope">
@@ -350,6 +351,7 @@ const calculateDuration = (startTime: string, endTime: string): number => {
               <el-table-column
                 prop="firstEndTime"
                 label="下班时间"
+                width="150"
                 align="center"
               >
                 <template #default="scope">
@@ -376,6 +378,7 @@ const calculateDuration = (startTime: string, endTime: string): number => {
               <el-table-column
                 prop="firstWorkContent"
                 label="上班内容"
+                width="150"
                 align="center"
               >
                 <template #default="scope">
@@ -397,6 +400,7 @@ const calculateDuration = (startTime: string, endTime: string): number => {
             <el-table-column label="第二次" align="center">
               <el-table-column
                 prop="secondStartTime"
+                width="150"
                 label="上班时间"
                 align="center"
               >
@@ -413,6 +417,7 @@ const calculateDuration = (startTime: string, endTime: string): number => {
               </el-table-column>
               <el-table-column
                 prop="secondEndTime"
+                width="150"
                 label="下班时间"
                 align="center"
               >
@@ -439,6 +444,7 @@ const calculateDuration = (startTime: string, endTime: string): number => {
               </el-table-column>
               <el-table-column
                 prop="secondWorkContent"
+                width="150"
                 label="上班内容"
                 align="center"
               >

apps/web-ele/src/views/schedule/work/class/index.vue

@@ -146,10 +146,13 @@ const handleViewClick = (data: any) => {
 watch(
   () => router.currentRoute.value.path,
   (newPath, oldPath) => {
-    if (newPath === '/schedule/work/class' && oldPath === '/schedule/work/class/addandedit') {
+    if (
+      newPath === '/schedule/work/class' &&
+      oldPath === '/schedule/work/class/addandedit'
+    ) {
       BasicTableApi.reload();
     }
-  }
+  },
 );
 </script>
 <template>
@@ -157,7 +160,13 @@ watch(
     <BasicTable table-title="如每月8日后需调整上月数据，请联系系统管理员">
       <template #toolbar-tools>
         <el-space>
-          <el-button type="primary" @click="handleAddClick"> 开班 </el-button>
+          <el-button
+            type="primary"
+            @click="handleAddClick"
+            v-access:code="['work:class:openaclass']"
+          >
+            开班
+          </el-button>
         </el-space>
       </template>
       <template #action="{ row }">

apps/web-ele/src/views/schedule/work/classes/index.vue

@@ -166,7 +166,11 @@ const deletebtn = async (row: any) => {
           />
         </div>
         <div>
-          <el-button type="primary" @click="handleAddClick">添加</el-button
+          <el-button
+            type="primary"
+            @click="handleAddClick"
+            v-access:code="['work:classes:add']"
+            >添加</el-button
           ><el-button type="primary" @click="handleSearchClick">搜索</el-button
           ><el-button type="primary" @click="handleResetClick">重置</el-button>
         </div>
@@ -174,10 +178,21 @@ const deletebtn = async (row: any) => {
     </template>
     <BasicTable>
       <template #action="{ row }">
-        <el-button size="small" type="primary" plain @click="editbtn(row)"
+        <el-button
+          size="small"
+          type="primary"
+          plain
+          @click="editbtn(row)"
+          v-access:code="['work:classes:edit']"
           >编辑</el-button
         >
-        <el-button size="small" plain @click="deletebtn(row)">删除</el-button>
+        <el-button
+          size="small"
+          plain
+          @click="deletebtn(row)"
+          v-access:code="['work:classes:remove']"
+          >删除</el-button
+        >
       </template>
       <template #isCommon="{ row }">
         {{ row.isCommon == '0' ? '否' : '是' }}

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

@@ -114,6 +114,7 @@ async function handleView(row: any) {
         level: String(res.level),
         repel: Number(res.repel),
         isCycleEnd: res?.isCycleEnd === 1 ? [true] : [],
+        standardGuidelineName: `${res?.knowledgeCategoryDetails.name || ''}/${res?.knowledgeContentDetails.title || ''}`,
       })
       .open();
   } catch (error) {
@@ -142,6 +143,7 @@ async function handleEdit(row: any) {
         level: String(res.level),
         repel: Number(res.repel),
         isCycleEnd: res?.isCycleEnd === 1 ? [true] : [],
+        standardGuidelineName: `${res?.knowledgeCategoryDetails.name || ''}/${res?.knowledgeContentDetails.title || ''}`,
       })
       .open();
   } catch (error) {
@@ -185,7 +187,7 @@ const handleConfirm = async (data: any) => {
   console.log('提交数据', data);
   drawerApi.drawerLoading(true);
   try {
-    data.standardGuideline = '14,17';
+    // data.standardGuideline = '14,17';
     data.files = data?.attachment
       ?.map((item: any) => item.response.data.fileName)
       .join(',');
@@ -195,6 +197,9 @@ const handleConfirm = async (data: any) => {
     if (Array.isArray(data.isCycleEnd)) {
       data.isCycleEnd = data.isCycleEnd[0] === true ? 1 : 0;
     }
+    if (!data.taskLeader) {
+      data.taskLeader = null;
+    }
     // 根据是否包含 id 来决定调用新增接口还是编辑接口
     if (data.id) {
       // 编辑操作

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

@@ -3,7 +3,7 @@ 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 { useVbenModal } from '@vben/common-ui';
 import { ElMessage } from 'element-plus';
 
 // import type { SelectProps } from '#/adapter/form';
@@ -70,10 +70,13 @@ TaskExclusionOptionsfn();
 const getTaskTypeOptions = () => getDictOptions(DICT_KEYS.TASK_TYPE);
 // 获取表单类型字典选项
 const getFormTypeOptions = () => getDictOptions(DICT_KEYS.FORM_TYPE);
+// console.log('表单类型',getFormTypeOptions());
+// console.log('过滤表单类型',getFormTypeOptions()?.filter((item: any) => item?.value !== 'form'));
+
 // 获取任务频率字典选项
 export const getTaskFrequencyOptions = () =>
   getDictOptions(DICT_KEYS.TASK_FREQUENCY);
-console.log('任务频率', getTaskFrequencyOptions());
+// console.log('任务频率', getTaskFrequencyOptions());
 
 // 通用Select组件配置函数
 const createSearchSelectConfig = (options: any[], placeholder: string) => ({
@@ -192,11 +195,13 @@ export const queryFormSchema: FormSchemaGetter = () => [
     component: 'Select',
     fieldName: 'formType',
     label: '表单类型',
-    componentProps: {
-      allowClear: true,
-      placeholder: '请选择表单类型',
-      options: getFormTypeOptions(),
-      clearable: true,
+    componentProps: () => {
+      return {
+        allowClear: true,
+        placeholder: '请选择表单类型',
+        options: getFormTypeOptions()?.filter((item: any) => item?.value !== 'form'),
+        clearable: true,
+      };
     },
   },
 
@@ -447,7 +452,7 @@ export const drawerFormSchema: FormSchemaGetter = (props?: any) => [
     componentProps: (data: any) => {
       return {
         placeholder: '请选择表单类型',
-        options: getFormTypeOptions(),
+        options: getFormTypeOptions().filter((item: any) => item.value !== 'form'),
         clearable: true,
         disabled: data.isUpdate,
       };
@@ -1166,9 +1171,29 @@ export const drawerFormSchema: FormSchemaGetter = (props?: any) => [
     slot: 'description',
     formItemClass: 'col-span-2 items-baseline',
   },
+  //知识库
+    {
+    component: 'Input',
+    dependencies: {
+      show: () => false,
+      triggerFields: [''],
+    },
+    fieldName: 'knowledge',
+    formItemClass: 'col-span-2 items-baseline',
+  },
+  //知识库类别
+  {
+    component: 'Input',
+    dependencies: {
+      show: () => false,
+      triggerFields: [''],
+    },
+    fieldName: 'knowledgeCategory',
+    formItemClass: 'col-span-2 items-baseline',
+  },
   {
-    component: 'InputTag',
-    fieldName: 'standardGuideline',
+    component: 'Input',
+    fieldName: 'standardGuidelineName',
     label: '标准指引',
     componentProps: {
       placeholder: '请选择标准指引',
@@ -1178,14 +1203,14 @@ export const drawerFormSchema: FormSchemaGetter = (props?: any) => [
       return {
         suffix: () => {
           return (
-              <ElButton
-                onClick={() => {
-                  props?.quoteModalApi?.open();
-                }}
-                type="primary"
-              >
-                选择
-              </ElButton>
+            <ElButton
+              onClick={() => {
+                props?.quoteModalApi?.open();
+              }}
+              type="primary"
+            >
+              选择
+            </ElButton>
           );
         },
       };

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

@@ -19,6 +19,7 @@ const accessStore = useAccessStore();
 const isUpdateRef = ref<boolean>(false);
 const isViewRef = ref<boolean>(false);
 const isCopyRef = ref<boolean>(false);
+const knowledgeRef: any = ref(null);
 
 // 附件列表 - 添加类型定义
 const attachments = ref<any[]>([]);
@@ -43,18 +44,30 @@ 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('');
 const taskFrequency = ref('');
 const isWebmaster = ref(false);
+const selectedCategoryInfo = ref({});
+const [QuoteModal, quoteModalApi] = useVbenModal({
+  title: '引用试题',
+  showCancelBtn: false,
+  class: 'quote-modal',
+  onConfirm: () => {
+    const result = knowledgeRef.value.confirmSelection();
+    if (result) {
+      selectedCategoryInfo.value = result;
+      if (result) {
+        formApi.setFieldValue('knowledge', result.contentId);
+        formApi.setFieldValue('knowledgeCategory', result.categoryId);
+        formApi.setFieldValue('standardGuidelineName', result.contentNamePath);
+      }
+      quoteModalApi.close();
+      console.log(selectedCategoryInfo.value);
+    }
+  },
+});
 
 // // 处理taskFrequency变化的函数
 const formOptions = computed(() => {
@@ -249,7 +262,6 @@ const [Drawer, drawerApi] = useVbenDrawer({
         delete formData.endTimeDay;
         delete formData.endTimeHour;
       }
-
       // 添加附件数据
       if (attachments.value.length > 0) {
         formData.attachment = attachments.value;
@@ -297,6 +309,7 @@ const [Drawer, drawerApi] = useVbenDrawer({
       });
     }
     selectedIcon.value = '';
+    selectedCategoryInfo.value = {};
   },
 });
 
@@ -565,7 +578,7 @@ const selectIcon = (val: any, item: any) => {
       </template>
     </Form>
   </Drawer>
-  <QuoteModal><knowledgemain /></QuoteModal>
+  <QuoteModal><knowledgemain ref="knowledgeRef" /></QuoteModal>
 </template>
 
 <style scoped>