diff --git a/src/api/dictionary/index.ts b/src/api/dictionary/index.ts index 23ca588..6968f53 100644 --- a/src/api/dictionary/index.ts +++ b/src/api/dictionary/index.ts @@ -377,6 +377,17 @@ export async function getizstatusList() { url: `/static/admin/web/distionary/bytypecode/izstatus`, method: 'get', }) + return res.data[0].distionaryList +} +/** + * 获取审核状态字典(任务审核) + * @returns + */ +export async function getizApprovalStatusList() { + const res = await http.request({ + url: `/static/admin/web/distionary/bytypecode/izApprovalStatus`, + method: 'get', + }) return res.data[0].distionaryList } diff --git a/src/config/final.ts b/src/config/final.ts index fcc931d..2b6a2e5 100644 --- a/src/config/final.ts +++ b/src/config/final.ts @@ -1,5 +1,5 @@ import type { AsideEntity } from './aside' -import { IzProjectVue, IzStatus, IztaskrromVue, PictureDownloadVue, PlanVue, ReportUserVue, TimeVue, IzCustomname, IzCustomtype, IzVisitcity, IzCustomlevel, IzProjecttype, IzProductVue, IzvisitproVue, IzfirmVue } from '@/views/home/aside/comp/items' +import { IzApprovalStatus, IzProjectVue, IzStatus, IztaskrromVue, PictureDownloadVue, PlanVue, ReportUserVue, TimeVue, IzCustomname, IzCustomtype, IzVisitcity, IzCustomlevel, IzProjecttype, IzProductVue, IzvisitproVue, IzfirmVue } from '@/views/home/aside/comp/items' export interface RowData { id: string @@ -137,8 +137,8 @@ export const asideTaskMap: Recordable = { label: '审批状态', defaultValue: null, isDefaultFilter: true, - key: 'izstatus', - component: IzStatus, // todo + key: 'izApprovalStatus', + component: IzApprovalStatus, // todo }, izuptime: { label: '提报时间', diff --git a/src/store/modules/dictonary.ts b/src/store/modules/dictonary.ts index e54fb1b..c43121e 100644 --- a/src/store/modules/dictonary.ts +++ b/src/store/modules/dictonary.ts @@ -1,6 +1,6 @@ import { defineStore } from 'pinia' import { store } from '@/store' -import { getBackList, getBusinessList, getIzShowList, getIztaskstatusList, getPictureTypeList, getRegionList, getRejectList, getRelationTypeList, getTFList, getizstatusList } from '@/api/dictionary' +import { getBackList, getBusinessList, getIzShowList, getIztaskstatusList, getPictureTypeList, getRegionList, getRejectList, getRelationTypeList, getTFList, getizstatusList, getizApprovalStatusList } from '@/api/dictionary' export interface DictionaryState { regionList: any @@ -24,6 +24,7 @@ export interface DictionaryState { backList: any relationTypeList: any izstatusList: any + izApprovalStatusList: any } export const useDictionaryStore = defineStore({ @@ -50,6 +51,7 @@ export const useDictionaryStore = defineStore({ backList: null, relationTypeList: null, izstatusList: null, + izApprovalStatusList: null, }), getters: { getRegionList: (state) => { @@ -100,8 +102,35 @@ export const useDictionaryStore = defineStore({ getizstatus: (state) => { return state.izstatusList }, + getizApprovalStatus: (state) => { + return state.izApprovalStatusList + } }, actions: { + initData(){ + this.fetchRegionList(); + this.fetchPictureTypeList(); + this.fetchPersionList(); + this.fetchPlanList(); + this.fetchTFList(); + this.fetchIzShowList(); + this.fetchIzProjectList(); + this.fetchIztaskrromList(); + this.fetchIztaskstatusList(); + this.fetchIzvisitproList(); + this.fetchIzfirmList(); + this.fetchIzproductnameList(); + this.fetchizcustomnameList(); + this.fetchIzCustomtypeList(); + this.fetchIzcustomlevelList(); + this.fetchizizprojecttypeList(); + this.fetchizvisitcityList(); + this.fetchRejectList(); + this.fetchBackList(); + this.fetchRelationTypeList(); + this.fetchizstatusListt(); + this.fetchizApprovalStatusList(); + }, settfList(config) { this.tfList = config }, @@ -231,6 +260,12 @@ export const useDictionaryStore = defineStore({ this.izstatusList = generateOptions2(list, 'codeno', 'name') return this.izstatusList }, + // 审核状态(任务审核模块) + async fetchizApprovalStatusList() { + const list = await getizApprovalStatusList() + this.izApprovalStatusList = generateOptions2(list, 'codeno', 'name') + return this.izApprovalStatusList + }, }, }) diff --git a/src/views/home/aside/Aside.vue b/src/views/home/aside/Aside.vue index b395d41..53ba0a7 100644 --- a/src/views/home/aside/Aside.vue +++ b/src/views/home/aside/Aside.vue @@ -18,7 +18,7 @@ import { cloneDeep } from 'lodash-es' const configStore = useConfig() // 所有左侧模块的值 -const asideValue: Record = reactive({}) +let asideValue: Record = reactive({}) // 左侧某个模块是否显示: 显示需同时满足系统配置和个人配置 const asideVisible: Partial> = reactive({}) // 当前显示的模块,按照数组顺序显示 @@ -165,7 +165,6 @@ function setShowSearch(value: boolean) { showSearch.value = value } const newFilterOk = () => { - console.log('home', 'newFilterOk',filterModalRef.value); filterModalRef.value.query( filterModalRef.value.pagination.page, filterModalRef.value.pagination.pageSize @@ -206,13 +205,16 @@ function editFilter(filter: any) { function updateComponent(key, e) { console.log("跟新值", key, e); let tempobj = cloneDeep(asideValue); - tempobj[key] = e; - customObjRef.value = tempobj; - Object.assign(asideValue, tempobj); + // tempobj[key] = e; + // customObjRef.value = tempobj; + // Object.assign(asideValue, tempobj); + asideValue[key] = e; + customObjRef.value = cloneDeep(asideValue) } watch(asideValue, (newVal) => { console.log("asideValue处理后", newVal); + console.log('asideValue--->',asideValue) configStore.setAsideValue(newVal) }, { deep: true }) diff --git a/src/views/home/aside/comp/items/IzApprovalStatus.vue b/src/views/home/aside/comp/items/IzApprovalStatus.vue new file mode 100644 index 0000000..287bc64 --- /dev/null +++ b/src/views/home/aside/comp/items/IzApprovalStatus.vue @@ -0,0 +1,77 @@ + + + + + diff --git a/src/views/home/aside/comp/items/Similarity.vue b/src/views/home/aside/comp/items/Similarity.vue index 874311e..6b0458f 100644 --- a/src/views/home/aside/comp/items/Similarity.vue +++ b/src/views/home/aside/comp/items/Similarity.vue @@ -1,42 +1,46 @@ @@ -45,7 +49,13 @@ function onChange(value: number & number[]) { - + @@ -56,7 +66,7 @@ function onChange(value: number & number[]) { .wrapper { padding: 10px; } -::v-deep(.n-collapse-item-arrow){ - color: #999999 !important;; +::v-deep(.n-collapse-item-arrow) { + color: #999999 !important; } diff --git a/src/views/home/aside/comp/items/index.ts b/src/views/home/aside/comp/items/index.ts index 7843f5b..22655ea 100644 --- a/src/views/home/aside/comp/items/index.ts +++ b/src/views/home/aside/comp/items/index.ts @@ -19,6 +19,7 @@ import RegionVue from './Region.vue' import ReportUserVue from './ReportUser.vue' import SimilarityVue from './Similarity.vue' import TimeVue from './Time.vue' +import IzApprovalStatus from './IzApprovalStatus.vue' -export { IzProjecttype, IzStatus, IzVisitcity, IzCustomlevel, IzCustomtype, IzCustomname, IzfirmVue, IzProductVue, IzvisitproVue, IztaskstatusVue, IztaskrromVue, IzProjectVue, PictureDownloadVue, PictureUploadVue, PlaceHolderVue, RegionVue, SimilarityVue, ReportUserVue, PlanVue, PictureTypeVue, TimeVue } +export { IzProjecttype, IzStatus, IzVisitcity, IzCustomlevel, IzCustomtype, IzCustomname, IzfirmVue, IzProductVue, IzvisitproVue, IztaskstatusVue, IztaskrromVue, IzProjectVue, PictureDownloadVue, PictureUploadVue, PlaceHolderVue, RegionVue, SimilarityVue, ReportUserVue, PlanVue, PictureTypeVue, TimeVue, IzApprovalStatus } diff --git a/src/views/task/modal/CustomFieldModal.vue b/src/views/task/modal/CustomFieldModal.vue index 3bb4fd0..db84160 100644 --- a/src/views/task/modal/CustomFieldModal.vue +++ b/src/views/task/modal/CustomFieldModal.vue @@ -260,7 +260,17 @@ function removeHandler(id: string) { offList.value[index].checked = false; offShowList.value = cloneDeep(offList.value); } +const initData = ()=>{ + offList.value = []; + onList.value = []; + fixList.value = []; + offShowList.value = []; + onShowList.value = []; + fixShowList.value = []; + selectIds.value = []; +} const getData = async (type = "") => { + initData(); const userStore = useUser(); const userInfo = userStore.getUserInfo; let res; @@ -478,7 +488,7 @@ const queryData = (value, type) => {
-
+
@@ -377,7 +411,7 @@ onMounted(async () => { :class="{ fix: item.fix }" class="cursor-move draggable-item" > - + {{ item.name }} {