Browse Source

打包类型报错修复

刘洋 1 năm trước cách đây
mục cha
commit
d48aba37a2

+ 2 - 2
src/hooks/useUploadFile.ts

@@ -2,8 +2,8 @@ import { ref } from 'vue'
 import { genFileId } from 'element-plus'
 import type { UploadFile, UploadProps, UploadRawFile, UploadInstance } from 'element-plus'
 
-const useUploadFile = (upload: any) => {
-  // const upload = ref<UploadInstance>()
+const useUploadFile = (uploadRef?: any) => {
+  const upload = uploadRef || ref<UploadInstance>()
   const fileList = ref<UploadFile[]>([])
   const percentage = ref<number>(0)
 

+ 4 - 15
src/modules/marking/inquiry-result/index.vue

@@ -179,7 +179,7 @@ import { Splitpanes, Pane } from 'splitpanes'
 import { setPaneSize } from '@/utils/common'
 import useMainStore from '@/store/main'
 import BtnPagination from '@/components/common/BtnPagination.vue'
-const isMult = ref(false)
+// const isMult = ref(false)
 const multipleSelection = ref<any>([])
 const handleSelectionChange = (val: any) => {
   multipleSelection.value = val
@@ -352,7 +352,9 @@ const {
   onCurrentChange,
   nextRow,
   elTableRef,
-} = useTableCheck(data, true, null, false, isMult)
+  isMult,
+  multToggle,
+} = useTableCheck(data, true, null, false)
 
 watch(current, () => {
   if (current.value) {
@@ -511,19 +513,6 @@ const { drawing, dataUrl } = useSetImgBg(imgOption, frontColor, setFrontColor)
 
 onRefresh()
 
-const multToggle = () => {
-  isMult.value = !isMult.value
-  editScoreVisible.value = !isMult.value
-  if (!isMult.value && tableData.value?.length && current.value) {
-    nextTick(() => {
-      let index = tableData.value.findIndex((task: any) => task.taskId == current.value?.taskId)
-      elTableRef?.value?.setCurrentRow(tableData.value[index == -1 ? 0 : index])
-    })
-  }
-  if (isMult.value) {
-    elTableRef?.value?.clearSelection()
-  }
-}
 const rejectIds = computed(() => {
   return isMult.value ? multipleSelection.value.map((item: any) => item.taskId) : [current.value?.taskId]
 })

+ 3 - 3
src/store/layout.ts

@@ -74,7 +74,7 @@ function filterPrivilege(
   item: MainLayoutStore.MenuItem,
   privilege: ExtractApiResponse<'getUserPrivilege'>
 ): MainLayoutStore.MenuItem | undefined {
-  if (privilege.some((d) => item.index === d.code)) {
+  if (privilege.some((d: any) => item.index === d.code)) {
     return {
       ...item,
       children: item.children?.filter((child) => !!filterPrivilege(child, privilege)),
@@ -135,10 +135,10 @@ const useMainLayoutStore = defineStore<
           })
         }
         this.permBtnCodes = privilege
-          .filter((node) => {
+          .filter((node: any) => {
             return node.privilegeType === 'BUTTON'
           })
-          .map((item) => item.code)
+          .map((item: any) => item.code)
 
         this.renderMenus = this.menuList.reduce((menus, menu) => {
           return menus.concat(filterPrivilege(menu, privilege) || [])