guoxiangbin
/
ocr-web
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

feat: 修改文件冲突

Browse Source
pull/265/head
raoyongjun 2 years ago
parent 9f3021438e b032f5fcc0
commit d0ad81ee68
20 changed files with 2319 additions and 1528 deletions
Show Stats Download Patch File Download Diff File

3405
pnpm-lock.yaml
View File

File diff suppressed because it is too large Load Diff

BIN
src/assets/images/reset.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

46
src/layout/components/Header/ShortcutModal.vue
Unescape View File

@ -1,28 +1,28 @@
<script lang="ts" setup> <script lang="ts" setup>
import { defineOptions, ref } from "vue"; import { defineOptions, ref } from 'vue'
defineOptions({ name: "ShortcutModal" }); defineOptions({ name: 'ShortcutModal' })
const show = ref(false); const show = ref(false)
const cardStyle = { const cardStyle = {
"width": "800px", 'width': '800px',
"--n-padding-bottom": "10px", '--n-padding-bottom': '10px',
"--n-padding-left": "10px", '--n-padding-left': '10px',
"padding-bottom": "100px", 'padding-bottom': '100px',
}; }
function showModal() { function showModal() {
show.value = true; show.value = true
} }
function closeModal() { function closeModal() {
show.value = false; show.value = false
} }
defineExpose({ defineExpose({
showModal, showModal,
}); })
</script> </script>
<template> <template>
@ -125,11 +125,20 @@ defineExpose({
<div class="wrapper-request"> <div class="wrapper-request">
<table style="margin-left: 120px; width: 290px"> <table style="margin-left: 120px; width: 290px">
<tr> <tr>
<td>
<td ><div class="key" style="float: left; <div
margin-left: 5px;" data-key="c" /></td> class="key" style="float: left;
<td><div style="float: left; margin-left: 5px;" data-key="c"
margin-left: -60px;">关闭（关闭当前场景弹窗）</div></td> />
</td>
<td>
<div
style="float: left;
margin-left: -60px;"
>
关闭（关闭当前场景弹窗）
</div>
</td>
</tr> </tr>
<tr> <tr>
<td> <td>
@ -142,7 +151,7 @@ defineExpose({
</table> </table>
<table style="margin-left: 50px"> <table style="margin-left: 50px">
<tr> <tr>
<td style="text-align: left; width: 53px"> <td style="text-align: left; width: 55px">
<div class="key" data-key="p p" /> <div class="key" data-key="p p" />
</td> </td>
<td>通过</td> <td>通过</td>
@ -154,12 +163,11 @@ defineExpose({
<td>不通过</td> <td>不通过</td>
</tr> </tr>
</table> </table>
</div> </div>
<div class="wrapper-request"> <div class="wrapper-request">
<table style="margin-left: 120px; width: 180px"> <table style="margin-left: 120px; width: 180px">
<tr> <tr>
<td style="text-align: left; width: 53px"> <td style="text-align: left; width: 55px">
<div class="key" data-key="k k" /> <div class="key" data-key="k k" />
</td> </td>
<td>开启沉浸模式</td> <td>开启沉浸模式</td>

49
src/store/modules/dictonary.ts
Unescape View File

@ -1,6 +1,6 @@
import { defineStore } from 'pinia' import { defineStore } from 'pinia'
import { getBackList, getBusinessList, getIzShowList, getPictureTypeList, getRegionList, getRejectList, getRelationTypeList, getTFList, getizApprovalStatusList, getizstatusList } from '@/api/dictionary'
import { store } from '@/store' import { store } from '@/store'
import { getBackList, getBusinessList, getIzShowList, getIztaskstatusList, getPictureTypeList, getRegionList, getRejectList, getRelationTypeList, getTFList, getizstatusList, getizApprovalStatusList } from '@/api/dictionary'
export interface DictionaryState { export interface DictionaryState {
regionList: any regionList: any
@ -76,7 +76,8 @@ export const useDictionaryStore = defineStore({
return state.iztaskrromList return state.iztaskrromList
}, },
getiztaskstatus: (state) => { getiztaskstatus: (state) => {
return state.iztaskstatusList // return state.iztaskstatusList
return state.izstatusList
}, },
getizvisitpro: (state) => { getizvisitpro: (state) => {
return state.izvisitproList return state.izvisitproList
@ -104,32 +105,32 @@ export const useDictionaryStore = defineStore({
}, },
getizApprovalStatus: (state) => { getizApprovalStatus: (state) => {
return state.izApprovalStatusList return state.izApprovalStatusList
} },
}, },
actions: { actions: {
initData(){ initData() {
// this.fetchRegionList(); //废弃 // this.fetchRegionList(); //废弃
this.fetchPictureTypeList(); this.fetchPictureTypeList()
this.fetchPersionList(); this.fetchPersionList()
this.fetchPlanList(); this.fetchPlanList()
this.fetchTFList(); this.fetchTFList()
// this.fetchIzShowList(); //废弃 // this.fetchIzShowList(); //废弃
this.fetchIzProjectList(); this.fetchIzProjectList()
this.fetchIztaskrromList(); this.fetchIztaskrromList()
this.fetchIztaskstatusList(); this.fetchIztaskstatusList()
this.fetchIzvisitproList(); this.fetchIzvisitproList()
this.fetchIzfirmList(); this.fetchIzfirmList()
this.fetchIzproductnameList(); this.fetchIzproductnameList()
this.fetchizcustomnameList(); this.fetchizcustomnameList()
this.fetchIzCustomtypeList(); this.fetchIzCustomtypeList()
this.fetchIzcustomlevelList(); this.fetchIzcustomlevelList()
this.fetchizizprojecttypeList(); this.fetchizizprojecttypeList()
this.fetchizvisitcityList(); this.fetchizvisitcityList()
this.fetchRejectList(); this.fetchRejectList()
this.fetchBackList(); this.fetchBackList()
this.fetchRelationTypeList(); this.fetchRelationTypeList()
this.fetchizstatusListt(); this.fetchizstatusListt()
this.fetchizApprovalStatusList(); this.fetchizApprovalStatusList()
}, },
settfList(config) { settfList(config) {
this.tfList = config this.tfList = config

8
src/views/final/aside/Aside.vue
Unescape View File

@ -26,7 +26,7 @@ import emitter from '@/utils/mitt'
import { getFilterList } from '@/api/home/main' import { getFilterList } from '@/api/home/main'
import { useKeydown } from '@/hooks/event/useKeydown' import { useKeydown } from '@/hooks/event/useKeydown'
const emit = defineEmits(['inputChange',]) const emit = defineEmits(['inputChange'])
const finalStore = useFinal() const finalStore = useFinal()
// 所有左侧模块的值 // 所有左侧模块的值
const asideValue: Record<keyof typeof asideMap, any> = reactive({}) const asideValue: Record<keyof typeof asideMap, any> = reactive({})
@ -67,7 +67,7 @@ function newFilterOk() {
filterModalRef.value.pagination.page, filterModalRef.value.pagination.page,
filterModalRef.value.pagination.pageSize, filterModalRef.value.pagination.pageSize,
) )
filterModalRef.value.showModal() filterModalRef.value.closeModal()
} }
const mousetrap = inject('mousetrap') as any const mousetrap = inject('mousetrap') as any
@ -336,7 +336,7 @@ function updateComponent(key, e) {
} }
defineExpose({ defineExpose({
showSearch, showSearch,
}); })
useKeydown('s', () => setShowSearch(true)) useKeydown('s', () => setShowSearch(true))
</script> </script>
@ -409,6 +409,8 @@ useKeydown('s', () => setShowSearch(true))
border-radius: 3px; border-radius: 3px;
box-sizing: border-box; box-sizing: border-box;
height: 100% !important; height: 100% !important;
margin-left: 16px;
&-header { &-header {
padding: 10px; padding: 10px;
width: 100%; width: 100%;

1
src/views/final/comp/FilterModal.vue
Unescape View File

@ -311,6 +311,7 @@ function closeModal() {
defineExpose({ defineExpose({
showModal, showModal,
closeModal,
query, query,
pagination, pagination,
}) })

11
src/views/final/comp/NewFilterModal.vue
Unescape View File

@ -194,8 +194,8 @@ watch(
function showModal() { function showModal() {
show.value = true show.value = true
setTimeout(() => { setTimeout(() => {
formValue.name = '' // formValue.name = ''
}, 300); }, 300)
} }
function closeModal() { function closeModal() {
@ -249,8 +249,9 @@ function edit(editFilter: any) {
currentStatus.value = 'edit' currentStatus.value = 'edit'
const { searchname, ocrUsersearchchildList, id } = editFilter const { searchname, ocrUsersearchchildList, id } = editFilter
currentEditId = id currentEditId = id
formValue.name = searchname
formValue.conditions = ocrUsersearchchildList.map((item) => { formValue.conditions = ocrUsersearchchildList.map((item) => {
return { return {
type: item.searchfield, type: item.searchfield,
@ -258,6 +259,10 @@ function edit(editFilter: any) {
result: unformatValue(item.searchfield, item.searchvalue), result: unformatValue(item.searchfield, item.searchvalue),
} }
}) })
formValue.name = editFilter.searchname
// formValue.searchname = searchname
formValue.name = searchname
console.log(formValue)
} }
defineExpose({ defineExpose({

42
src/views/final/content/Content.vue
Unescape View File

@ -8,6 +8,7 @@ import { NButton, NDataTable, useDialog, useMessage } from 'naive-ui'
import { import {
computed, computed,
defineEmits, defineEmits,
defineProps,
h, h,
nextTick, nextTick,
onBeforeMount, onBeforeMount,
@ -16,7 +17,7 @@ import {
reactive, reactive,
ref, ref,
unref, unref,
watch,defineProps watch,
} from 'vue' } from 'vue'
import { rowPropKeys } from 'naive-ui/es/legacy-grid/src/Row' import { rowPropKeys } from 'naive-ui/es/legacy-grid/src/Row'
import { useRoute, useRouter } from 'vue-router' import { useRoute, useRouter } from 'vue-router'
@ -47,13 +48,14 @@ import emitter from '@/utils/mitt'
import { formatToDateHMS } from '@/utils/dateUtil' import { formatToDateHMS } from '@/utils/dateUtil'
import { getAllfieldList, getfieldList, savefield } from '@/api/home/filter' import { getAllfieldList, getfieldList, savefield } from '@/api/home/filter'
import DataHeader from '@/components/DataHeader/index.vue' import DataHeader from '@/components/DataHeader/index.vue'
const props = defineProps({ const props = defineProps({
taskvalue: { taskvalue: {
type: String, type: String,
default: "" default: '',
} },
}); })
const emit = defineEmits(['changeShow']) const emit = defineEmits(['changeShow'])
function changeContent() { function changeContent() {
emit('changeShow') emit('changeShow')
@ -506,7 +508,7 @@ async function query(
) { ) {
console.log('query', taskName) console.log('query', taskName)
const asideParmas = cloneDeep(unref(finalStore.getAsideValue)) const asideParmas = cloneDeep(unref(finalStore.getAsideValue))
console.log(asideParmas); console.log(asideParmas)
if (asideParmas.izyear) { if (asideParmas.izyear) {
asideParmas.izuptime = cloneDeep(asideParmas.izyear) asideParmas.izuptime = cloneDeep(asideParmas.izyear)
@ -524,13 +526,12 @@ async function query(
// 有过滤配置的时候优先使用过滤配置，不要使用左侧参数 // 有过滤配置的时候优先使用过滤配置，不要使用左侧参数
// let params = filterId ? { userSearchId: filterId } : asideParmas // let params = filterId ? { userSearchId: filterId } : asideParmas
let params = asideParmas const params = asideParmas
if (params?.izshowall == true) if (params?.izshowall == true) {
{
params.isFail = true params.isFail = true
delete params.izshowall; delete params.izshowall
} }
// params = params?.izshowall ? { isFail: true } : params // params = params?.izshowall ? { isFail: true } : params
const result = await getFinalList({ const result = await getFinalList({
sortorder: sortorder.value, sortorder: sortorder.value,
@ -567,7 +568,7 @@ async function handlePageChange(currentPage) {
return return
const { pageSize } = pagination const { pageSize } = pagination
pagination.page = currentPage pagination.page = currentPage
await query(currentPage, pageSize,{},props.taskvalue) await query(currentPage, pageSize, {}, props.taskvalue)
} }
async function handlePageSizeChange(currentPageSize) { async function handlePageSizeChange(currentPageSize) {
if (loading.value) if (loading.value)
@ -576,7 +577,7 @@ async function handlePageSizeChange(currentPageSize) {
const { page } = pagination const { page } = pagination
pagination.pageSize = currentPageSize pagination.pageSize = currentPageSize
await query(page, currentPageSize,{},props.taskvalue) await query(page, currentPageSize, {}, props.taskvalue)
} }
function handleCheck(rowKeys: DataTableRowKey[]) { function handleCheck(rowKeys: DataTableRowKey[]) {
@ -739,7 +740,7 @@ function validate(items: any[]) {
function goDetail(row) { function goDetail(row) {
router.push({ router.push({
name: 'final-detail', name: 'final-detail',
query: { id: row.id, packageid: row.packageid, taskindex: row.taskIndex,type:'table' }, query: { id: row.id, packageid: row.packageid, taskindex: row.taskIndex, type: 'table' },
}) })
} }
@ -876,7 +877,7 @@ function reload() {
const { page, pageSize } = unref( const { page, pageSize } = unref(
tableRef.value?.pagination, tableRef.value?.pagination,
) as PaginationProps ) as PaginationProps
query(page!, pageSize!,{},props.taskvalue) query(page!, pageSize!, {}, props.taskvalue)
} }
watch( watch(
@ -918,8 +919,7 @@ function filterTableData(keyword) {
query(pagination.page, pagination.pageSize, '', keyword) query(pagination.page, pagination.pageSize, '', keyword)
else query(pagination.page, pagination.pageSize) else query(pagination.page, pagination.pageSize)
} }
async function initData(pageSize, page, filterId?: any, async function initData(pageSize, page, filterId?: any, taskName?: string) {
taskName?: string) {
const asideParmas = unref(finalStore.getAsideValue) const asideParmas = unref(finalStore.getAsideValue)
if (asideParmas.izyear) { if (asideParmas.izyear) {
asideParmas.izuptime = cloneDeep(asideParmas.izyear) asideParmas.izuptime = cloneDeep(asideParmas.izyear)
@ -936,11 +936,10 @@ async function initData(pageSize, page, filterId?: any,
} }
// 有过滤配置的时候优先使用过滤配置，不要使用左侧参数 // 有过滤配置的时候优先使用过滤配置，不要使用左侧参数
// let params = filterId ? { userSearchId: filterId } : asideParmas // let params = filterId ? { userSearchId: filterId } : asideParmas
let params = asideParmas const params = asideParmas
if (params?.izshowall == true) if (params?.izshowall == true) {
{
params.isFail = true params.isFail = true
delete params.izshowall; delete params.izshowall
} }
const result = await getFinalList({ const result = await getFinalList({
sortorder: sortorder.value, sortorder: sortorder.value,
@ -965,7 +964,7 @@ onMounted(() => {
emitter.on('filter-final', refreshHandler) emitter.on('filter-final', refreshHandler)
getColumns() getColumns()
if (asideParmas == null) { if (asideParmas == null) {
initData(1, 20,{},props.taskvalue) initData(1, 20, {}, props.taskvalue)
} }
else { else {
reset() reset()
@ -1167,6 +1166,7 @@ defineExpose({
flex-direction: column; flex-direction: column;
box-sizing: border-box; box-sizing: border-box;
margin-left: 16px; margin-left: 16px;
width: 100%; width: 100%;
background: #fff; background: #fff;
padding: 0px 24px 24px 24px; padding: 0px 24px 24px 24px;

86
src/views/final/content/ListContent.vue
Unescape View File

@ -1,8 +1,9 @@
<script lang="ts" setup> <script lang="ts" setup>
import { computed, onMounted, reactive, ref, unref, watch,defineProps } from 'vue' import { computed, defineProps, onMounted, reactive, ref, unref, watch } from 'vue'
import { useRoute, useRouter } from 'vue-router' import { useRoute, useRouter } from 'vue-router'
import { chunk } from 'lodash-es' import { chunk, cloneDeep } from 'lodash-es'
import { useDialog, useMessage } from 'naive-ui' import { useDialog, useMessage } from 'naive-ui'
import dayjs from 'dayjs'
import { RepeatModal, RepeatTaskTableModal } from '../comp' import { RepeatModal, RepeatTaskTableModal } from '../comp'
import testImg from '@/assets/images/test.png' import testImg from '@/assets/images/test.png'
import type { RowData } from '@/config/final' import type { RowData } from '@/config/final'
@ -10,10 +11,16 @@ import { getFinalList } from '@/api/final'
import { useFinal } from '@/store/modules/final' import { useFinal } from '@/store/modules/final'
import { formatToDateHMS } from '@/utils/dateUtil' import { formatToDateHMS } from '@/utils/dateUtil'
import { audit } from '@/api/task/task' import { audit } from '@/api/task/task'
import dayjs from 'dayjs'
import { cloneDeep } from 'lodash-es'
import NotPassed from '@/components/Approval/NotPassed.vue' import NotPassed from '@/components/Approval/NotPassed.vue'
const props = defineProps({
taskvalue: {
type: String,
default: '',
},
})
const emit = defineEmits(['changeShow']) const emit = defineEmits(['changeShow'])
const dialog = useDialog() const dialog = useDialog()
const message = useMessage() const message = useMessage()
@ -26,13 +33,6 @@ const total = ref(0)
const scrollContainer = ref(null) const scrollContainer = ref(null)
const tableData = ref<any>([]) const tableData = ref<any>([])
const finalStore = useFinal() const finalStore = useFinal()
const props = defineProps({
taskvalue: {
type: String,
default: ""
}
});
let num = 1 let num = 1
const pagination = reactive({ const pagination = reactive({
page: 1, page: 1,
@ -99,27 +99,25 @@ async function initData(
taskName?: string, taskName?: string,
) { ) {
const asideParmas = unref(finalStore.getAsideValue) const asideParmas = unref(finalStore.getAsideValue)
if(asideParmas.izyear){ if (asideParmas.izyear) {
// console.log(asideParmas.izyear) // console.log(asideParmas.izyear)
// asideParmas.izuptime = cloneDeep(asideParmas.izyear) // asideParmas.izuptime = cloneDeep(asideParmas.izyear)
// asideParmas.izuptime = asideParmas.izyear.split(","); // asideParmas.izuptime = asideParmas.izyear.split(",");
let ontime = dayjs(asideParmas.izyear[0]).format( const ontime = dayjs(asideParmas.izyear[0]).format(
'YYYY/MM/DD', 'YYYY/MM/DD',
) )
let twotime = dayjs(asideParmas.izyear[1]).format( const twotime = dayjs(asideParmas.izyear[1]).format(
'YYYY/MM/DD', 'YYYY/MM/DD',
) )
asideParmas.izuptime =ontime+"-"+twotime asideParmas.izuptime = `${ontime}-${twotime}`
// delete asideParmas.izyear // delete asideParmas.izyear
} }
// 有过滤配置的时候优先使用过滤配置，不要使用左侧参数 // 有过滤配置的时候优先使用过滤配置，不要使用左侧参数
// let params = filterId ? { userSearchId: filterId } : asideParmas // let params = filterId ? { userSearchId: filterId } : asideParmas
let params = asideParmas const params = asideParmas
if (params?.izshowall == true) if (params?.izshowall == true) {
{
params.isFail = true params.isFail = true
delete params.izshowall; delete params.izshowall
} }
const result = await getFinalList({ const result = await getFinalList({
sortorder: sortorder.value, sortorder: sortorder.value,
@ -131,7 +129,7 @@ async function initData(
...params, ...params,
}) })
const { data, pageCount, totalCount } = result const { data, pageCount, totalCount } = result
//console.log(data, pageCount, totalCount) // console.log(data, pageCount, totalCount)
// tableData.value = tableData.value.concat(data); // tableData.value = tableData.value.concat(data);
tableData.value = data tableData.value = data
// console.log(tableData.value) // console.log(tableData.value)
@ -158,27 +156,25 @@ async function query(
const asideParmas = unref(finalStore.getAsideValue) const asideParmas = unref(finalStore.getAsideValue)
// 有过滤配置的时候优先使用过滤配置，不要使用左侧参数 // 有过滤配置的时候优先使用过滤配置，不要使用左侧参数
// let params = filterId ? { userSearchId: filterId } : asideParmas // let params = filterId ? { userSearchId: filterId } : asideParmas
if(asideParmas.izyear){ if (asideParmas.izyear) {
// console.log(asideParmas.izyear) // console.log(asideParmas.izyear)
// asideParmas.izuptime = cloneDeep(asideParmas.izyear) // asideParmas.izuptime = cloneDeep(asideParmas.izyear)
// asideParmas.izuptime = asideParmas.izyear.split(","); // asideParmas.izuptime = asideParmas.izyear.split(",");
let ontime = dayjs(asideParmas.izyear[0]).format( const ontime = dayjs(asideParmas.izyear[0]).format(
'YYYY/MM/DD', 'YYYY/MM/DD',
) )
let twotime = dayjs(asideParmas.izyear[1]).format( const twotime = dayjs(asideParmas.izyear[1]).format(
'YYYY/MM/DD', 'YYYY/MM/DD',
) )
asideParmas.izuptime =ontime+"-"+twotime asideParmas.izuptime = `${ontime}-${twotime}`
// delete asideParmas.izyear // delete asideParmas.izyear
} }
let params = asideParmas let params = asideParmas
if (params?.izshowall == true) if (params?.izshowall == true) {
{
params.isFail = true params.isFail = true
delete params.izshowall; delete params.izshowall
} }
params = params?.izshowall ? {isFail:true} : params; params = params?.izshowall ? { isFail: true } : params
const result = await getFinalList({ const result = await getFinalList({
sortorder: sortorder.value, sortorder: sortorder.value,
pageSize, pageSize,
@ -189,7 +185,7 @@ async function query(
...params, ...params,
}) })
const { data, pageCount, totalCount } = result const { data, pageCount, totalCount } = result
console.log(data, pageCount, totalCount); console.log(data, pageCount, totalCount)
const newlist = [] const newlist = []
const oldlist = tableData.value const oldlist = tableData.value
if (oldlist.length > 0) { if (oldlist.length > 0) {
@ -239,7 +235,7 @@ function isValidTimestamp(value) {
function goDetail(row) { function goDetail(row) {
router.push({ router.push({
name: 'final-detail', name: 'final-detail',
query: { id: row.id, packageid: row.packageid, taskindex: row.taskNode, type:'card' }, query: { id: row.id, packageid: row.packageid, taskindex: row.taskNode, type: 'card' },
}) })
} }
// 小结批量不通过 // 小结批量不通过
@ -272,7 +268,7 @@ function showModal(modalRef: any) {
onMounted(() => { onMounted(() => {
initRem() initRem()
initData(1, 20,{},props.taskvalue) initData(1, 20, {}, props.taskvalue)
}) })
const item = { const item = {
img: testImg, img: testImg,
@ -313,7 +309,7 @@ function doAudit(param: any, row: any) {
if (code === 'OK') { if (code === 'OK') {
message.success(res.message) message.success(res.message)
// changecardstatus(3, row); // changecardstatus(3, row);
initData(1, 20,{},props.taskvalue) initData(1, 20, {}, props.taskvalue)
num = 1 num = 1
reload() reload()
selectionIds.value = [] selectionIds.value = []
@ -423,7 +419,6 @@ function checkBottom() {
if (!container) if (!container)
return return
// const { scrollTop, clientHeight, scrollHeight } = container; // const { scrollTop, clientHeight, scrollHeight } = container;
const scrollTop = window.pageYOffset || document.documentElement.scrollTop const scrollTop = window.pageYOffset || document.documentElement.scrollTop
@ -437,11 +432,11 @@ function checkBottom() {
clearTimeout(debounceTimer) clearTimeout(debounceTimer)
// console.log(pagination) // console.log(pagination)
debounceTimer = setTimeout(() => { debounceTimer = setTimeout(() => {
if (scrollTop + clientHeight >= scrollHeight -500&&!(pagination.pageCount<num)) { if (scrollTop + clientHeight >= scrollHeight - 500 && !(pagination.pageCount < num)) {
num = num + 1 num = num + 1
console.log(num) console.log(num)
console.log( pagination.pageCount) console.log(pagination.pageCount)
query(num, 20,{},props.taskvalue) query(num, 20, {}, props.taskvalue)
// fetchData(); // 接近底部时加载更多数据 // fetchData(); // 接近底部时加载更多数据
} }
}, 500) }, 500)
@ -471,18 +466,18 @@ function changesort(sortnamex) {
sortorder.value = 'asc' sortorder.value = 'asc'
sortname.value = 'field1' sortname.value = 'field1'
} }
initData(1, 20,{},props.taskvalue) initData(1, 20, {}, props.taskvalue)
num = 1 num = 1
} }
function notpass (){ function notpass() {
initData(1, 20,{},props.taskvalue) initData(1, 20, {}, props.taskvalue)
selectionIds.value = [] selectionIds.value = []
} }
watch( watch(
() => finalStore.asideValue, () => finalStore.asideValue,
(newVal, oldVal) => { (newVal, oldVal) => {
initData(1, 20,{},props.taskvalue) initData(1, 20, {}, props.taskvalue)
num=1 num = 1
}, },
{ deep: true }, { deep: true },
) )
@ -594,13 +589,13 @@ defineExpose({
</div> </div>
</div> </div>
<div style="width: 3vw"> <div style="width: 3vw">
<!--<SvgIcon name="magnifying-1" size="18" style="margin-right: 8px" /> <!-- <SvgIcon name="magnifying-1" size="18" style="margin-right: 8px" />
<SvgIcon <SvgIcon
style="cursor: pointer" style="cursor: pointer"
size="18" size="18"
name="column" name="column"
@click="showModal(customTabelRef)" @click="showModal(customTabelRef)"
/>--> /> -->
</div> </div>
</div> </div>
<div ref="scrollContainer" :class="tableData.length > 4 ? 'cotnet_wrapeer' : 'cotnet_wrapeertwo'" @scroll="checkBottom"> <div ref="scrollContainer" :class="tableData.length > 4 ? 'cotnet_wrapeer' : 'cotnet_wrapeertwo'" @scroll="checkBottom">
@ -753,6 +748,7 @@ defineExpose({
flex-direction: column; flex-direction: column;
box-sizing: border-box; box-sizing: border-box;
margin-left: 16px; margin-left: 16px;
margin-right: 16px;
width: 100%; width: 100%;
background: #fff; background: #fff;
padding: 0px 24px 24px 24px; padding: 0px 24px 24px 24px;

3
src/views/home/aside/Aside.vue
Unescape View File

@ -224,7 +224,7 @@ function newFilterOk() {
filterModalRef.value.pagination.page, filterModalRef.value.pagination.page,
filterModalRef.value.pagination.pageSize, filterModalRef.value.pagination.pageSize,
) )
filterModalRef.value.showModal() filterModalRef.value.closeModal()
} }
// 滚动容器，让key对应模块处于可视区域 // 滚动容器，让key对应模块处于可视区域
@ -359,6 +359,7 @@ useKeydown('s', () => setShowSearch(true))
border: 1px solid #efeff5; border: 1px solid #efeff5;
border-radius: 3px; border-radius: 3px;
box-sizing: border-box; box-sizing: border-box;
margin-left: 16px;
&-header { &-header {
padding: 10px; padding: 10px;

104
src/views/home/aside/comp/items/Time.vue
Unescape View File

@ -1,71 +1,75 @@
<script lang="ts" setup> <script lang="ts" setup>
import dayjs from "dayjs"; import dayjs from 'dayjs'
import { onUpdated, watch } from "vue"; import { onMounted, onUpdated, ref, watch } from 'vue'
import { onMounted, ref } from "vue";
import { useConfig } from "@/store/modules/asideConfig";
import { useFinal } from '@/store/modules/final'
const configUseStore = useConfig(); import { useConfig } from '@/store/modules/asideConfig'
import { useFinal } from '@/store/modules/final'
const props = defineProps<{
value: [number, number] | null
label: string
}>()
const emit = defineEmits<{
(e: 'update:value', value: number[]): void
}>()
const configUseStore = useConfig()
const time = ref<[number, number] | null>(props.value)
const timeold = ref<[number, number] | null>(props.value)
const isLoadValue = ref(false)
configUseStore.$subscribe(() => { configUseStore.$subscribe(() => {
if (isLoadValue.value) { if (isLoadValue.value) {
isLoadValue.value = false; isLoadValue.value = false
return; return
} }
let asideValue = configUseStore.getAsideValue; const asideValue = configUseStore.getAsideValue
if (asideValue["izyear"]) { if (asideValue.izyear)
time.value = asideValue["izyear"]; time.value = asideValue.izyear
} else { else
time.value = null; time.value = null
} })
});
const finalStore = useFinal() const finalStore = useFinal()
finalStore.$subscribe(() => { finalStore.$subscribe(() => {
if (isLoadValue.value) { if (isLoadValue.value) {
isLoadValue.value = false; isLoadValue.value = false
return; return
}
let asideValue = finalStore.getAsideValue;
console.log("asideValue izyear", asideValue);
if (asideValue && asideValue["izyear"]) {
time.value = asideValue["izyear"];
} else {
time.value = null;
} }
}); const asideValue = finalStore.getAsideValue
console.log('asideValue izyear', asideValue)
if (asideValue && asideValue.izyear)
time.value = asideValue.izyear
else
time.value = null
})
const props = defineProps<{
value: [number, number] | null;
label: string;
}>();
const emit = defineEmits<{
(e: "update:value", value: number[]): void;
}>();
const time = ref<[number, number] | null>(props.value);
const isLoadValue = ref(false);
function onChange(value: [number, number]) { function onChange(value: [number, number]) {
isLoadValue.value = true; isLoadValue.value = true
emit("update:value", value); emit('update:value', value)
} }
onMounted(() => { onMounted(() => {
if (!props.value) { if (!props.value) {
// 获取当前日期 // 获取当前日期
const currentDate = dayjs(); const currentDate = dayjs()
// 计算前三个月的起始日期和结束日期 // 计算前三个月的起始日期和结束日期
const endDate = currentDate.toDate(); const endDate = currentDate.toDate()
const startDate = currentDate.subtract(3, "month").toDate(); const startDate = currentDate.subtract(3, 'month').toDate()
// 设置默认日期范围为前三个月的起始日期到三个月前的今天 // 设置默认日期范围为前三个月的起始日期到三个月前的今天
time.value = [startDate.getTime(), endDate.getTime()]; timeold.value = [startDate.getTime(), endDate.getTime()]
console.log("time init", startDate.getTime(), endDate.getTime()); time.value = [startDate.getTime(), endDate.getTime()]
console.log('time init', startDate.getTime(), endDate.getTime())
setTimeout(() => { setTimeout(() => {
emit("update:value", [startDate.getTime(), endDate.getTime()]); emit('update:value', [startDate.getTime(), endDate.getTime()])
}, 300); }, 300)
} }
}); })
watch(
() => time.value,
() => {
// console.log(time.value)
if (time.value == null)
time.value = timeold.value
},
)
</script> </script>
<template> <template>
@ -77,10 +81,12 @@ onMounted(() => {
v-model:value="time" v-model:value="time"
type="daterange" type="daterange"
:clearable="false" :clearable="false"
@update:value="onChange"
placeholder="请选择" placeholder="请选择"
@update:value="onChange"
> >
<template #separator> 至 </template> <template #separator>
至
</template>
</n-date-picker> </n-date-picker>
</n-space> </n-space>
</n-collapse-item> </n-collapse-item>

1
src/views/home/aside/comp/modals/FilterModal.vue
Unescape View File

@ -358,6 +358,7 @@ function closeModal() {
defineExpose({ defineExpose({
showModal, showModal,
closeModal,
query, query,
pagination, pagination,
}) })

4
src/views/home/aside/comp/modals/NewFilterModal.vue
Unescape View File

@ -217,8 +217,8 @@ function showModal() {
typeOptions.value = list typeOptions.value = list
show.value = true show.value = true
setTimeout(() => { setTimeout(() => {
formValue.name = '' // formValue.name = ''
}, 300); }, 300)
} }
function closeModal() { function closeModal() {

6
src/views/task/aside/Aside.vue
Unescape View File

@ -143,7 +143,7 @@ onMounted(() => {
window.addEventListener('keydown', handleKeydown) window.addEventListener('keydown', handleKeydown)
init() init()
}) })
onUnmounted(()=>{ onUnmounted(() => {
window.removeEventListener('keydown', handleKeydown) window.removeEventListener('keydown', handleKeydown)
}) })
async function init() { async function init() {
@ -200,7 +200,7 @@ function newFilterOk() {
filterModalRef.value.pagination.page, filterModalRef.value.pagination.page,
filterModalRef.value.pagination.pageSize, filterModalRef.value.pagination.pageSize,
) )
filterModalRef.value.showModal() filterModalRef.value.closeModal()
} }
onBeforeMount(async () => { onBeforeMount(async () => {
configStore.fetchConfig() configStore.fetchConfig()
@ -336,6 +336,8 @@ function handleOk(item: any) {
border: 1px solid rgb(239, 239, 245); border: 1px solid rgb(239, 239, 245);
border-radius: 3px; border-radius: 3px;
box-sizing: border-box; box-sizing: border-box;
margin-left: 16px;
margin-right: 16px;
&-header { &-header {
padding: 12px 16px; padding: 12px 16px;

7
src/views/task/content/Content.vue
Unescape View File

@ -126,6 +126,10 @@ function changeimgbigshow() {
// 键盘左右箭头快捷切换 // 键盘左右箭头快捷切换
useKeydown('right', forwardHandler) useKeydown('right', forwardHandler)
useKeydown('left', backHandler) useKeydown('left', backHandler)
useKeydown('c', () => {
isFullScreen.value = false
imgbigshow.value = false
})
useKeydown('p p', () => { useKeydown('p p', () => {
const item = taskDetailInfo.value const item = taskDetailInfo.value
if (item?.userapprove?.statshis === 2 || item?.userapprove?.statshis == 3) { if (item?.userapprove?.statshis === 2 || item?.userapprove?.statshis == 3) {
@ -706,7 +710,7 @@ function nodrage() {
<template #icon> <template #icon>
<SvgIcon name="revoke" /> <SvgIcon name="revoke" />
</template> </template>
返回 返回1
</n-button> </n-button>
<img <img
class="btn-approval btn-left" class="btn-approval btn-left"
@ -1429,6 +1433,7 @@ function nodrage() {
flex-direction: column; flex-direction: column;
box-sizing: border-box; box-sizing: border-box;
margin-left: 16px; margin-left: 16px;
margin-right: 16px !important;
padding: 16px 16px 0px 16px; padding: 16px 16px 0px 16px;
background: #fff; background: #fff;
border-radius: 3px; border-radius: 3px;

14
src/views/task/index.vue
Unescape View File

@ -1,14 +1,14 @@
<script lang="ts" setup> <script lang="ts" setup>
import { ref } from "vue"; import { ref } from 'vue'
import Aside from "./aside/Aside.vue"; import Aside from './aside/Aside.vue'
import Content from "./content/Content.vue"; import Content from './content/Content.vue'
import DataHeader from "@/components/DataHeader/index.vue"; import DataHeader from '@/components/DataHeader/index.vue'
import Robot from '@/components/Robot/index.vue' import Robot from '@/components/Robot/index.vue'
const asideRef: any = ref(null); const asideRef: any = ref(null)
function setAsideItemName(text) { function setAsideItemName(text) {
asideRef.value.setAsideItemName(text); asideRef.value.setAsideItemName(text)
} }
</script> </script>
@ -37,6 +37,8 @@ function setAsideItemName(text) {
} }
:deep(.header_wrap){ :deep(.header_wrap){
margin-top: 3px !important; margin-top: 3px !important;
margin-left: 16px;
margin-right: 16px;
background: #FFFFFF; background: #FFFFFF;
} }
.main { .main {

4
src/views/task/modal/NewFilterModal.vue
Unescape View File

@ -194,8 +194,8 @@ watch(
function showModal() { function showModal() {
show.value = true show.value = true
setTimeout(() => { setTimeout(() => {
formValue.name = '' // formValue.name = ''
}, 300); }, 300)
} }
function closeModal() { function closeModal() {

1
src/views/worksheet/aside/Aside.vue
Unescape View File

@ -265,6 +265,7 @@ if (searchContent) {
border: 1px solid rgb(239, 239, 245); border: 1px solid rgb(239, 239, 245);
border-radius: 3px; border-radius: 3px;
box-sizing: border-box; box-sizing: border-box;
margin-left: 16px;
&-header { &-header {
padding: 12px 16px; padding: 12px 16px;

3
src/views/worksheet/content/Content.vue
Unescape View File

@ -988,7 +988,8 @@ defineExpose({
flex: 1; flex: 1;
flex-direction: column; flex-direction: column;
box-sizing: border-box; box-sizing: border-box;
margin-left: 16px; margin-left: 16px !important;
margin-right: 16px !important;
padding: 16px 16px 0px 16px; padding: 16px 16px 0px 16px;
background: #fff; background: #fff;
border-radius: 3px; border-radius: 3px;

2
src/views/worksheet/index.vue
Unescape View File

@ -33,6 +33,8 @@ function ApprovalOver(packageId) {
<style lang="less" scoped> <style lang="less" scoped>
:deep(.header_wrap){ :deep(.header_wrap){
margin-top: 3px !important; margin-top: 3px !important;
margin-left: 16px;
margin-right: 16px;
background: #FFFFFF; background: #FFFFFF;
} }
.main { .main {

Write Preview
Loading…
Cancel
Save