@@ -347,31 +289,20 @@ function updateComponent(key, e) {
updateComponent(item.key, e)"
/>
@@ -379,9 +310,7 @@ function updateComponent(key, e) {
@@ -433,17 +362,11 @@ function updateComponent(key, e) {
right: -20px;
}
- ::v-deep(.n-collapse
- .n-collapse-item.n-collapse-item--right-arrow-placement
- .n-collapse-item__header
- .n-collapse-item-arrow) {
+ ::v-deep(.n-collapse .n-collapse-item.n-collapse-item--right-arrow-placement .n-collapse-item__header .n-collapse-item-arrow) {
margin-left: 8px;
}
- ::v-deep(.n-collapse
- .n-collapse-item
- .n-collapse-item__header
- .n-collapse-item__header-main) {
+ ::v-deep(.n-collapse .n-collapse-item .n-collapse-item__header .n-collapse-item__header-main) {
font-weight: bold;
justify-content: space-between;
}
@@ -456,18 +379,11 @@ function updateComponent(key, e) {
border-top: 0px;
}
- ::v-deep(.n-collapse
- .n-collapse-item
- .n-collapse-item__content-wrapper
- .n-collapse-item__content-inner) {
+ ::v-deep(.n-collapse .n-collapse-item .n-collapse-item__content-wrapper .n-collapse-item__content-inner) {
padding-top: 10px;
}
- ::v-deep(.n-scrollbar
- > .n-scrollbar-rail.n-scrollbar-rail--vertical
- > .n-scrollbar-rail__scrollbar, .n-scrollbar
- + .n-scrollbar-rail.n-scrollbar-rail--vertical
- > .n-scrollbar-rail__scrollbar) {
+ ::v-deep(.n-scrollbar > .n-scrollbar-rail.n-scrollbar-rail--vertical > .n-scrollbar-rail__scrollbar, .n-scrollbar + .n-scrollbar-rail.n-scrollbar-rail--vertical > .n-scrollbar-rail__scrollbar) {
width: 0px;
}
}
diff --git a/src/views/final/comp/CustomFilterModalVue.vue b/src/views/final/comp/CustomFilterModalVue.vue
index ffe1e56..0ae9978 100644
--- a/src/views/final/comp/CustomFilterModalVue.vue
+++ b/src/views/final/comp/CustomFilterModalVue.vue
@@ -13,6 +13,13 @@ const selectIds = ref([])
const tempList = ref([])
const extraCustomConfig: any = []
+// 左侧隐藏列表
+const offList = ref([])
+// 右侧显示列表
+const onList = ref([])
+
+const offKeyword = ref('')
+const onKeyword = ref('')
Object.keys(asideMap).forEach((key) => {
const { isDefaultFilter } = asideMap[key]
if (isDefaultFilter)
@@ -26,8 +33,6 @@ function showModal() {
const config = finalStore.getSystemConfig
const customConfig = finalStore.getCustomConfig
- console.log('开启了啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦筛选条件----------------', config, customConfig)
- console.log('开启了啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦筛选条件----------------', tempList.value, finalStore.getFilterConfig)
if (config == null || customConfig == null)
return
if (tempList.value.length > 0 && isEqual(tempList.value, finalStore.getFilterConfig))
@@ -35,7 +40,6 @@ function showModal() {
const { showList, hideList } = generatList(config, customConfig)
tempList.value = cloneDeep(showList)
- console.log('tempList.value开启了lllllllllllllllllll', showList, hideList)
if (tempList.value.length > 0)
finalStore.setFilterConfig(tempList.value)
@@ -52,11 +56,6 @@ function closeModal() {
show.value = false
}
-// 左侧隐藏列表
-const offList = ref([])
-// 右侧显示列表
-const onList = ref([])
-
const allCount = computed(() => {
return `全部筛选(共${offList.value.length}个)`
})
@@ -90,39 +89,16 @@ function generateDefaultList(config) {
}
function generatList(config, customConfig) {
- const keys = Object.keys(config)
let onList: object[] = []
const offList: any = []
- const showKeys = []
+ const showKeys: any[] = []
const tempShowKeys = [...customConfig, ...extraCustomConfig]
- tempShowKeys.map((item) => {
+ tempShowKeys.forEach((item) => {
if (!showKeys.includes(item))
showKeys.push(item)
})
- console.log('原始筛选条件showKeys', showKeys)
- console.log('原始筛选条件config customConfig', config, customConfig)
- // for (const key of keys) {
- // if (!key.startsWith('iz') || config[key] === 'N' || asideMap[key] === undefined)
- // continue
-
- // const name = asideMap[key]?.label
- // const isDefaultFilter = asideMap[key]?.isDefaultFilter
-
- // // 系统配置为Y,且不是默认配置
- // if (!isDefaultFilter) {
- // const isChecked = asideMap[key].isDefaultFilter || showKeys.includes(key)
-
- // offList.push({
- // id: key,
- // name: name || '未配置',
- // fix: isDefaultFilter,
- // checked: isChecked,
- // })
- // if (isChecked && !selectIds.value.includes(key))
- // isChecked && selectIds.value.push(key)
- // }
- // }
- Object.keys(asideMap).map((key) => {
+
+ Object.keys(asideMap).forEach((key) => {
const name = asideMap[key]?.label
const isDefaultFilter = asideMap[key]?.isDefaultFilter
@@ -158,41 +134,30 @@ function generatList(config, customConfig) {
return acc
}
}, [])
- console.log('原始筛选条件onList', onList)
const fixedList = generateDefaultList(config)
- // offList.unshift(...fixedList)
- console.log('原始筛选条件fixedList', fixedList)
onList.unshift(...fixedList)
- console.log('原始筛选条件customConfig', customConfig)
// onList按照customConfig排序
const tempOnList = cloneDeep(onList)
- console.log('原始筛选条件tempOnList', tempOnList)
const sortKeyList: any = []
- finalStore.getFilterConfig.map((item: any) => {
- console.log('tFilterConfig item000000000000000', item)
+ finalStore.getFilterConfig.forEach((item: any) => {
sortKeyList.push(item.id)
})
- console.log('原始筛选条件sortKeyList', sortKeyList)
- console.log('原始筛选条件showKeys', showKeys)
const sortList: any = []
if (sortKeyList.length > 0) {
- sortKeyList.map((key) => {
+ sortKeyList.forEach((key) => {
const tempItem = tempOnList.find(item => item.id == key)
if (tempItem)
sortList.push(tempItem)
})
}
else {
- showKeys.map((key) => {
+ showKeys.forEach((key) => {
const tempItem = tempOnList.find(item => item.id == key)
if (tempItem)
sortList.push(tempItem)
})
}
- console.log('原始筛选条件showList', sortList)
- console.log('原始筛选条件hideList', offList)
- console.log('原始筛选条件configStore.getFilterConfig', finalStore.getFilterConfig)
// return { showList: onList, hideList: offList }
return { showList: sortList, hideList: offList }
}
@@ -203,20 +168,16 @@ finalStore.$subscribe(() => {
if (config == null || customConfig == null)
return
- console.log('订阅tempList.value-----------', tempList.value)
- console.log('订阅finalStore.getFilterConfig-----------', finalStore.getFilterConfig)
if (tempList.value.length > 0 && isEqual(tempList.value, finalStore.getFilterConfig))
return
const { showList, hideList } = generatList(config, customConfig)
tempList.value = cloneDeep(showList)
- console.log('订阅克隆条件', tempList.value)
if (tempList.value.length > 0)
finalStore.setFilterConfig(tempList.value)
// setTimeout(() => {
// }, 500);
- console.log('订阅showList, hideList-----------', showList, hideList)
onList.value = showList
offList.value = hideList
})
@@ -229,16 +190,13 @@ async function handleSumbit(e: MouseEvent) {
await setFilter({ searchcount: param, type: 1 })
const obj = await finalStore.fetchCustomConfig()
- console.log('obj-------------------------------', obj)
const tempOnList = cloneDeep(onList.value)
- console.log('提交筛选条件tempOnList', tempOnList)
const sortList: any = []
- obj.map((key) => {
+ obj.forEach((key) => {
const tempItem = tempOnList.find(item => item.id == key)
if (tempItem)
sortList.push(tempItem)
})
- console.log('finalStore.sortList提交---------------', sortList)
// setTimeout(() => {
if (sortList.length > 0)
finalStore.setFilterConfig(sortList)
@@ -353,9 +311,6 @@ function removeHandler(id: string) {
onList.value.splice(index, 1)
}
-const offKeyword = ref('')
-const onKeyword = ref('')
-
const leftInputHandler = debounce((keyword) => {
offKeyword.value = keyword
}, 300)
@@ -364,19 +319,6 @@ const rightInputHandler = debounce((keyword) => {
onKeyword.value = keyword
}, 300)
-// async function getfield() {
-// let res
-// res = await getAllfieldList(3)
-// const userStore = useUser()
-// const userInfo = userStore.getUserInfo
-// res = await getfieldList(3, userInfo.id)
-// }
-function onMove(e) {
- // 这里的e表示即将停靠的元素。
- if (e?.related?.className?.indexOf('fix') !== -1)
- return false
-}
-
onMounted(() => {
// getfield()
})
diff --git a/src/views/final/comp/FilterModal.vue b/src/views/final/comp/FilterModal.vue
index 2ea68c8..f7318a6 100644
--- a/src/views/final/comp/FilterModal.vue
+++ b/src/views/final/comp/FilterModal.vue
@@ -251,7 +251,6 @@ const tableRef = ref>()
onMounted(() => {
nextTick(() => {
- console.log(tableRef.value, 'tableRef')
})
})
@@ -288,14 +287,12 @@ function onEnd(event: SortableEvent) {
// 插入到元素后,索引-1;插入到元素前,索引+1
const order = insertafter ? index - 1 : index + 1
- // console.log('dragid:', dragId, 'order:', order)
sort(dragId, order)
}
function onMove(evt: any) {
relatedId = evt.related?.dataset?.id
insertafter = evt.willInsertAfter
- // console.log(`你正在拖动:${evt.dragged.dataset.id},替换了:${evt.related}`, 'insertafter', evt.willInsertAfter)
}
function destory() {
diff --git a/src/views/final/comp/RepeatModal.vue b/src/views/final/comp/RepeatModal.vue
index ecb9fd4..aaadf2e 100644
--- a/src/views/final/comp/RepeatModal.vue
+++ b/src/views/final/comp/RepeatModal.vue
@@ -54,14 +54,6 @@ async function query() {
sortname: '',
})
const { data } = result
- // console.log(data)
- // // const list = []
- // // data.forEach((items) => {
- // // items.repeatedTaskList.forEach((item) => {
- // // list.push(item)
- // // })
- // // })
- // console.log(data)
emit('reject', data)
closeModal()
}
diff --git a/src/views/final/comp/RepeatTaskTableModal.vue b/src/views/final/comp/RepeatTaskTableModal.vue
index 496cb3d..1d67e9a 100644
--- a/src/views/final/comp/RepeatTaskTableModal.vue
+++ b/src/views/final/comp/RepeatTaskTableModal.vue
@@ -190,8 +190,6 @@ async function query(page: number, pageSize: number) {
pageNo: pagination.page,
sortname: '',
})
- console.log(666666)
- console.log(result)
const { data, pageCount, totalCount } = result
total.value = totalCount
@@ -288,7 +286,6 @@ function batchApproval() {
message.error(msg)
return
}
- console.log(items)
const list: any = []
items.forEach((item) => {
list.push({
diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue
index b73f806..6d9bd64 100644
--- a/src/views/final/content/Content.vue
+++ b/src/views/final/content/Content.vue
@@ -483,7 +483,6 @@ const message = useMessage()
const finalStore = useFinal()
async function query(page: number, pageSize: number, filterId?: any, taskName?: string) {
- console.log('query', taskName)
const asideParmas = unref(finalStore.getAsideValue)
// 有过滤配置的时候优先使用过滤配置,不要使用左侧参数
// let params = filterId ? { userSearchId: filterId } : asideParmas
@@ -498,7 +497,7 @@ async function query(page: number, pageSize: number, filterId?: any, taskName?:
taskName,
...params,
})
- const { data, pageCount, totalCount } = result
+ const { data, totalCount } = result
tableData.value = data
total.value = totalCount
pagination.page = page
@@ -708,7 +707,7 @@ function resetHandler() {
// TODO:需要支持重置
// const result = await resetApproval()
},
- onNegativeClick: () => {},
+ onNegativeClick: () => { },
})
}
@@ -749,7 +748,6 @@ function batchApproval() {
message.error(msg)
return
}
- console.log(items)
const list: any = []
items.forEach((item) => {
list.push({
@@ -774,7 +772,6 @@ function batchApproval() {
// 小结批量不通过
function repeatBatchReject(items) {
- console.log(items)
rejectHandler(items)
}
@@ -815,7 +812,7 @@ function doAudit(param: any) {
}
})
},
- onNegativeClick: () => {},
+ onNegativeClick: () => { },
})
}
@@ -860,7 +857,6 @@ async function refreshHandler(searchId?: any) {
if (id_param)
searchKeyword = id_param[0].slice(1, -1)
}
- console.log('refreshHandler', searchKeyword)
query(pagination.page, pagination.pageSize, searchId, searchKeyword)
}
@@ -869,8 +865,10 @@ function filterTableData(keyword) {
pagination.pageSize = 10
if (keyword) {
query(pagination.page, pagination.pageSize, '', keyword)
- else
+ }
+ else {
query(pagination.page, pagination.pageSize)
+ }
}
defineExpose({
@@ -883,20 +881,10 @@ defineExpose({
-->
-
+
-
+
-
+
diff --git a/src/views/home/aside/Aside.vue b/src/views/home/aside/Aside.vue
index 94c9755..19b9b9e 100644
--- a/src/views/home/aside/Aside.vue
+++ b/src/views/home/aside/Aside.vue
@@ -9,9 +9,7 @@ import {
ref,
shallowRef,
unref,
- watch,
} from 'vue'
-import dayjs from 'dayjs'
import { cloneDeep, isEqual } from 'lodash-es'
import { CustomFilterModalVue, FilterModalVue, NewFilterModalVue } from './comp/modals'
import Search from './comp/Search.vue'
@@ -19,11 +17,9 @@ import AdvanceFilter from './comp/AdvanceFilter.vue'
import { getViewportOffset } from '@/utils/domUtils'
import { useWindowSizeFn } from '@/hooks/event/useWindowSizeFn'
import { useConfig } from '@/store/modules/asideConfig'
-import type { Filter } from '/#/home'
import type { AsideEntity } from '@/config/aside'
import { asideMap } from '@/config/aside'
import type { AsideConfig } from '/#/api'
-import emitter from '@/utils/mitt'
import { getFilterList } from '@/api/home/main'
const configStore = useConfig()
@@ -57,9 +53,7 @@ function showModal(modalRef: any) {
onMounted(() => {
nextTick(() => {
computeSlideHeight()
- const tempAsideValue = cloneDeep(asideValue)
// configStore.setAsideValue(tempAsideValue);
- console.log('asideMap和asideValue', tempAsideValue)
})
})
@@ -115,7 +109,6 @@ nextTick(() => {
if (config == null || customConfig == null)
return
- // console.log("config", config, "customConfig", customConfig);
/* rao
const showKeys = [...customConfig].filter(key => !asideMap[key].isDefaultFilter)// 获取customConfig 非isDefaultFilter的选项
const defaultKeys = Object.keys(asideMap).filter(key => asideMap[key].isDefaultFilter)// 获取asideMap isDefaultFilter的选项
@@ -143,13 +136,11 @@ nextTick(() => {
// if (asideMap.hasOwnProperty(key)) {
if (Object.prototype.hasOwnProperty.call(customObjRef.value, key)) {
const str = key.toLowerCase()
- // console.log("customObjRef.value[str]1111111111111", customObjRef.value[str]);
if (str == 'izsimilarity') {
if (typeof customObjRef.value[str] == 'string')
customObjRef.value[str] = customObjRef.value[str].split(',')
asideValue[key] = customObjRef.value[str] // 赋值
- console.log('相似度2222222222', asideValue[key])
}
else if (str == 'izyear') {
if (typeof customObjRef.value[str] == 'string') {
@@ -159,16 +150,13 @@ nextTick(() => {
customObjRef.value[str] = time
}
asideValue[key] = customObjRef.value[str] // 赋值
- console.log('时间2222222222', asideValue[key])
}
else if (
str != 'izsimilarity'
&& str != 'izyear'
&& customObjRef.value[str]
) {
- console.log('customObjRef.value[str]222222', customObjRef.value[str])
// let list = customObjRef.value[str].split(',');
- // console.log("list222222", list);
asideValue[key] = customObjRef.value[str] // 赋值
}
else {
@@ -179,33 +167,28 @@ nextTick(() => {
return key
})
customTempObjRef.value = customObjRef.value
- console.log('asideValue直接处理后的结果', asideValue)
- console.log('customTempObjRef.value', customTempObjRef.value)
const tempobj = cloneDeep(asideValue)
- console.log('tempObj', tempobj)
configStore.setAsideValue(tempobj)
}
- // console.log("showKeys", showKeys);
const items = showKeys.reduce((acc, key) => {
const currentData = asideMap[key]
const render = currentData?.render
if (render !== false) {
const str = key?.toLowerCase()
- const o = {
- key: str,
- config: asideMap[str],
- };
- return [...acc, o];
- } else {
- return acc;
- }
- }, []);
- console.log("showItems=================================", items);
- showItems.value = items;
- configFilterRef.value = configStore.getFilterConfig;
-});
-
+ const o = {
+ key: str,
+ config: asideMap[str],
+ }
+ return [...acc, o]
+ }
+ else {
+ return acc
+ }
+ }, [])
+ showItems.value = items
+ configFilterRef.value = configStore.getFilterConfig
+ })
})
const asideEnter = ref(false)
@@ -236,7 +219,6 @@ function scrollHandler(key: string) {
async function filterHandler(searchId: string) {
// emitter.emit('filter', searchId)
const res = await getFilterList({ userSearchId: searchId })
- // console.log("顾虑结果", res);
if (res.code == 'OK') {
const obj = res.data
customObjRef.value = res.data
@@ -249,7 +231,6 @@ async function filterHandler(searchId: string) {
return key
})
- // console.log(showKeys);
configStore.setCustomConfig(showKeys)
}
}
@@ -261,21 +242,14 @@ function editFilter(filter: any) {
}
function updateComponent(key, e) {
- console.log('跟新值', key, e)
- console.log('tempAsideValue跟新值', configStore.getAsideValue, asideValue)
- // let tempAsideValue = configStore.getAsideValue || asideValue;
const tempobj = cloneDeep(asideValue)
- console.log(tempobj, 'tempobj')
tempobj[key] = e
- console.log(tempobj, 'tempobj After')
customObjRef.value = tempobj
// asideValue = Object.assign({}, asideValue, tempobj);
- console.log('asideValue跟新值', tempobj)
configStore.setAsideValue(tempobj)
}
function handleOk(item: any) {
- console.log('handleOk', item)
if (item) {
AdvanceFilterRef.value.setCurrentlySelectedAdvanced(item.searchname)
filterHandler(item.id)
@@ -285,20 +259,10 @@ function handleOk(item: any) {
filterHandler('')
}
}
-
-// watch(asideValue, (newVal) => {
-// console.log("asideValue处理后", newVal);
-// configStore.setAsideValue(newVal)
-// }, { deep: true })
-
+
@@ -307,38 +271,24 @@ function handleOk(item: any) {
updateComponent(item.key, e)"
/>
@@ -392,17 +342,11 @@ function handleOk(item: any) {
right: -20px;
}
- ::v-deep(.n-collapse
- .n-collapse-item.n-collapse-item--right-arrow-placement
- .n-collapse-item__header
- .n-collapse-item-arrow) {
+ ::v-deep(.n-collapse .n-collapse-item.n-collapse-item--right-arrow-placement .n-collapse-item__header .n-collapse-item-arrow) {
margin-left: 8px;
}
- ::v-deep(.n-collapse
- .n-collapse-item
- .n-collapse-item__header
- .n-collapse-item__header-main) {
+ ::v-deep(.n-collapse .n-collapse-item .n-collapse-item__header .n-collapse-item__header-main) {
font-weight: bold;
justify-content: space-between;
}
@@ -415,18 +359,11 @@ function handleOk(item: any) {
border-top: 0px;
}
- ::v-deep(.n-collapse
- .n-collapse-item
- .n-collapse-item__content-wrapper
- .n-collapse-item__content-inner) {
+ ::v-deep(.n-collapse .n-collapse-item .n-collapse-item__content-wrapper .n-collapse-item__content-inner) {
padding-top: 10px;
}
- ::v-deep(.n-scrollbar
- > .n-scrollbar-rail.n-scrollbar-rail--vertical
- > .n-scrollbar-rail__scrollbar, .n-scrollbar
- + .n-scrollbar-rail.n-scrollbar-rail--vertical
- > .n-scrollbar-rail__scrollbar) {
+ ::v-deep(.n-scrollbar > .n-scrollbar-rail.n-scrollbar-rail--vertical > .n-scrollbar-rail__scrollbar, .n-scrollbar + .n-scrollbar-rail.n-scrollbar-rail--vertical > .n-scrollbar-rail__scrollbar) {
width: 0px;
}
}
diff --git a/src/views/home/aside/comp/items/IzApprovalStatus.vue b/src/views/home/aside/comp/items/IzApprovalStatus.vue
index 8a0776d..55f4db3 100644
--- a/src/views/home/aside/comp/items/IzApprovalStatus.vue
+++ b/src/views/home/aside/comp/items/IzApprovalStatus.vue
@@ -13,8 +13,12 @@ const emit = defineEmits<{
(e: 'update:value', value: string[]): void
}>()
+const isLoadValue = ref(false)
const configUseStore = useConfig()
+const formValue = ref({
+ plans: props.value,
+})
configUseStore.$subscribe(() => {
if (isLoadValue.value) {
isLoadValue.value = false
@@ -24,17 +28,13 @@ configUseStore.$subscribe(() => {
if (asideValue.izApprovalStatus && typeof asideValue.izApprovalStatus == 'string') {
const list = asideValue.izApprovalStatus.split(',')
formValue.value.plans = list
- console.log('formValue.value.izApprovalStatus', formValue.value.plans)
}
else {
formValue.value.plans = []
}
})
-const formValue = ref({
- plans: props.value,
-})
if (typeof formValue.value.plans == 'string') {
- const list = formValue.value.plans.split(',')
+ const list = (formValue.value.plans as string).split(',')
formValue.value.plans = list
}
const rules: FormRules = {
@@ -57,7 +57,6 @@ onBeforeMount(async () => {
const list = await configStore.fetchizApprovalStatusList()
options.value = list
})
-const isLoadValue = ref(false)
function onChange(value: Array) {
isLoadValue.value = true
emit('update:value', value)
diff --git a/src/views/home/aside/comp/items/IzCustomlevel.vue b/src/views/home/aside/comp/items/IzCustomlevel.vue
index 345e48e..eab844a 100644
--- a/src/views/home/aside/comp/items/IzCustomlevel.vue
+++ b/src/views/home/aside/comp/items/IzCustomlevel.vue
@@ -1,6 +1,6 @@
diff --git a/src/views/task/aside/ListItem.vue b/src/views/task/aside/ListItem.vue
index ec087b6..a889edf 100644
--- a/src/views/task/aside/ListItem.vue
+++ b/src/views/task/aside/ListItem.vue
@@ -27,7 +27,6 @@ const svgName = computed(() => {
watch(
() => props.listItem,
(newVal) => {
- console.log(props.listItem)
listItem.value = newVal
},
)
diff --git a/src/views/task/aside/TaskList.vue b/src/views/task/aside/TaskList.vue
index 024f8d4..13eae94 100644
--- a/src/views/task/aside/TaskList.vue
+++ b/src/views/task/aside/TaskList.vue
@@ -27,8 +27,6 @@ const pagination = reactive({
function selectHandler(item, index: number) {
activeId.value = item.id
- console.log(activeId.value, item.id)
- console.log(index)
taskStore.setActive(index, item.id)
}
@@ -81,10 +79,9 @@ watch(
watch(
() => taskStore.inFileId,
- async (newVal) => {
- const newlist = []
+ async (newVal: any) => {
+ const newlist: any[] = []
const filterid = newVal.taskname
- console.log(filterid)
const index = data.value.findIndex(person => person.fromtaskname === filterid)
const ovelist = data.value.filter(item => item.fromtaskname !== filterid)
@@ -136,7 +133,6 @@ onMounted(() => {
searchId.value = id
data.value = await fetchList()
activeId.value = data.value[0].id
- console.log(data.value)
})
})
diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue
index e39d746..6dcaf58 100644
--- a/src/views/task/content/Content.vue
+++ b/src/views/task/content/Content.vue
@@ -1,7 +1,6 @@
diff --git a/src/views/task/modal/CustomFieldModal.vue b/src/views/task/modal/CustomFieldModal.vue
index 107c241..c354969 100644
--- a/src/views/task/modal/CustomFieldModal.vue
+++ b/src/views/task/modal/CustomFieldModal.vue
@@ -2,9 +2,7 @@
import { cloneDeep, difference } from 'lodash-es'
import { computed, defineEmits, defineProps, onMounted, ref, watch } from 'vue'
import { VueDraggable } from 'vue-draggable-plus'
-import { useMessage } from 'naive-ui'
import { getAllfieldList, getfieldList, savefield } from '@/api/home/filter'
-import { workPackageMap } from '@/config/workorder'
import { useUser } from '@/store/modules/user'
const props = defineProps({
@@ -17,8 +15,6 @@ const props = defineProps({
const emit = defineEmits(['onOk'])
-const message = useMessage()
-
// 左侧隐藏列表
const offList = ref([])
// 右侧显示列表
@@ -38,70 +34,10 @@ const selectCount = computed(() => {
return `显示字段(共${onList.value.length}个)`
})
-function generatList() {
- const keys = Object.keys(workPackageMap)
- let showList: object[] = []
- const hideList: object[] = []
- const showStr = 'status'
- const showKeys = showStr.split(',').map((key: string) => key.toLowerCase())
-
- for (const key of keys) {
- const name = workPackageMap[key]?.label
- const isDefault = workPackageMap[key]?.isDefault
-
- // 系统配置为Y且不是默认配置
- if (!isDefault) {
- hideList.push({
- id: key,
- name: name || '未配置',
- fix: isDefault,
- checked: workPackageMap[key].isDefault,
- })
- }
- }
-
- showList = showKeys.reduce((acc, key) => {
- const config = {
- id: key,
- name: workPackageMap[key].label || '未配置',
- fix: workPackageMap[key].isDefault,
- }
- return [...acc, config]
- }, [])
-
- const fixedList = generateDefaultList()
-
- hideList.unshift(...fixedList)
- showList.unshift(...fixedList)
-
- onList.value = showList
- offList.value = hideList
- return { showList, hideList }
-}
-
-function generateDefaultList() {
- return Object.keys(workPackageMap).reduce((acc, key) => {
- const { label, isDefault } = workPackageMap[key]
-
- if (isDefault) {
- const config = {
- id: key,
- name: label || '未配置',
- fix: true,
- checked: true,
- }
- return [...acc, config]
- }
- else {
- return acc
- }
- }, [])
-}
-
const show = ref(false)
const checkAll = computed(() => {
let baseNum = 0
- offList.value.map((v) => {
+ offList.value.forEach((v) => {
if (v.fix)
baseNum += 1
})
@@ -120,10 +56,10 @@ async function handleSumbit(e: MouseEvent) {
const userStore = useUser()
const userInfo = userStore.getUserInfo
let userFieldFixed = ''
- fixList.value.map((v) => {
+ fixList.value.forEach((v) => {
userFieldFixed += `${v.id},`
})
- onList.value.map((v) => {
+ onList.value.forEach((v) => {
userFieldFixed += `${v.id},`
})
userFieldFixed = userFieldFixed.slice(0, userFieldFixed.length - 1)
@@ -156,7 +92,7 @@ function onCheckAllChange(value) {
selectIds.value = value ? ids : []
if (value) {
- offList.value.map((v) => {
+ offList.value.forEach((v) => {
if (!v.checked)
onList.value.push(v)
})
@@ -228,7 +164,6 @@ watch(
index--
}
}
- console.log(onShowList.value, list, 'onShowList')
}
},
)
@@ -302,7 +237,7 @@ async function getData(type = '') {
const userFieldUnFixed = useList?.userFieldUnFixed?.split(',')
if (!type || type == 'off') {
offList.value = []
- allList?.map((v) => {
+ allList?.forEach((v) => {
const item = {
name: v.fieldDesc,
id: v.name,
@@ -319,7 +254,7 @@ async function getData(type = '') {
offList.value.unshift(...fixList.value)
}
if (!type || type == 'on') {
- useList?.userFieldFixed?.split(',').map((v) => {
+ useList?.userFieldFixed?.split(',').forEach((v) => {
let item = allList.find(v2 => v2.name == v)
if (item) {
item = {
@@ -343,7 +278,7 @@ onMounted(() => getData())
const indeterminate = computed(() => {
let baseNum = 0
- offList.value.map((v) => {
+ offList.value.forEach((v) => {
if (v.fix)
baseNum += 1
})
diff --git a/src/views/task/modal/CustomSettingModal.vue b/src/views/task/modal/CustomSettingModal.vue
index 469dea5..c5a13ac 100644
--- a/src/views/task/modal/CustomSettingModal.vue
+++ b/src/views/task/modal/CustomSettingModal.vue
@@ -1,7 +1,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-

-

-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{
- TASK_STATUS_OBJ[taskDetailInfo?.userapprove?.statshis]
- }}
- 审批状态
-
-
-
-
-
-
-
- {{ totalCount }}张
-
- 相似匹配
-
-
-
-
-
-
-
- {{ taskDetailInfo?.ocrPicture?.photoDateTimestamp ?? "-" }}
-
-
-
-
- {{
- taskDetailInfo?.ocrPicture?.submitDateTimestamp
- ? formatToDateHMS(
- Number(taskDetailInfo.ocrPicture.submitDateTimestamp),
- )
- : "-"
- }}
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index 4b735be..e7640ed 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -11,7 +11,7 @@ import emitter from '@/utils/mitt'
import { useInfiniteScroll } from '@vueuse/core'
import { format } from 'date-fns'
import imagesloaded from 'imagesloaded'
-import { clone, cloneDeep, debounce, pickBy } from 'lodash-es'
+import { clone, cloneDeep, debounce } from 'lodash-es'
import { useDialog, useMessage } from 'naive-ui'
import {
computed,
@@ -248,21 +248,7 @@ async function sortHandler(orderby: 'similarityScore' | 'createdate') {
sortBy.orderType = sortBy.orderType === 'asc' ? 'desc' : 'asc'
refreshHandler()
}
-
-const propertys = computed(() => {
- const { ocrPicture } = taskDetailInfo.value
- const v = pickBy(ocrPicture, (value, key: string) => {
- return key.startsWith('field') && value !== null
- })
- return v
-})
function overTaskHandelr(item: any) {
- // console.log(item, 'item')
- // if (item?.historyStates === 2 || item?.historyStates == 3) {
- // overTask.value = null
- // return
- // }
-
if (validate([item]) == null && batch.value === false)
overTask.value = item
}
@@ -275,11 +261,11 @@ function onEsc() {
isFullScreen.value = false
}
-function resizeImage() {
- const container = document.querySelector('.image-container')!
- const containerWidth = container.offsetWidth
- const containerHeight = container.offsetHeight
-}
+// function resizeImage() {
+// const container = document.querySelector('.image-container')!
+// // const containerWidth = container.offsetWidth
+// // const containerHeight = container.offsetHeight
+// }
onUnmounted(() => {
workStore.reset()
@@ -287,7 +273,7 @@ onUnmounted(() => {
})
onMounted(() => {
document.addEventListener('keydown', onEsc)
- window.addEventListener('resize', resizeImage)
+ // window.addEventListener('resize', resizeImage)
})
function immersionHandler() {
// class="wrapper"
@@ -480,9 +466,13 @@ function handleRejectdubiousfileyd() {
positiveText: '确定',
negativeText: '取消',
onPositiveClick: () => {
+ // eslint-disable-next-line ts/ban-ts-comment
+ // @ts-expect-error
audit(param).then(async (res) => {
const { code } = res
if (code === 'OK') {
+ // eslint-disable-next-line ts/ban-ts-comment
+ // @ts-expect-error
dubiousfileyd(taskDetailInfo.value.pictureId).then(() => {
refreshHandler()
})
diff --git a/types/api.d.ts b/types/api.d.ts
index 27b408e..4d8ad3b 100644
--- a/types/api.d.ts
+++ b/types/api.d.ts
@@ -129,6 +129,7 @@ export interface FinalParam {
sortname: string
pageSize: number
currPage: number
+ pageNo: number
}
export interface ResetParam {