diff --git a/src/config/final.ts b/src/config/final.ts index a0d4947..fcc931d 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 } from '@/views/home/aside/comp/items' +import { 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,78 +137,91 @@ export const asideTaskMap: Recordable = { label: '审批状态', defaultValue: null, isDefaultFilter: true, - key: 'izstatus' + key: 'izstatus', + component: IzStatus, // todo }, izuptime: { label: '提报时间', defaultValue: null, isDefaultFilter: true, - key: 'izuptime' + key: 'izuptime', + component: TimeVue, }, izupuser: { label: '提报人', defaultValue: null, isDefaultFilter: true, - key: 'izupuser' + key: 'izupuser', + component: ReportUserVue, }, iztaskrrom: { label: '任务来源', defaultValue: null, isDefaultFilter: true, - key: 'iztaskrrom' + key: 'iztaskrrom', + component: IztaskrromVue, }, izcustomname: { label: '拜访客户', defaultValue: null, isDefaultFilter: true, - key: 'izcustomname' + key: 'izcustomname', + component: IzCustomname, }, izcustomtype: { label: '客户类型', defaultValue: null, isDefaultFilter: true, - key: 'izcustomtype' + key: 'izcustomtype', + component: IzCustomtype, }, izproject: { label: '所属项目', defaultValue: null, isDefaultFilter: true, - key: 'izproject' + key: 'izproject', + component: IzProjectVue, }, izvisitpro: { label: '拜访省份/直辖市', defaultValue: null, isDefaultFilter: true, - key: 'izvisitpro' + key: 'izvisitpro', + component: IzVisitcity, }, izcustomlevel: { label: '客户级别', defaultValue: null, isDefaultFilter: true, - key: 'izcustomlevel' + key: 'izcustomlevel', + component: IzCustomlevel }, izprojecttype: { label: '项目类别', defaultValue: null, isDefaultFilter: true, - key: 'izprojecttype' + key: 'izprojecttype', + component: IzProjecttype, }, izproductname: { label: '产品名称', defaultValue: null, isDefaultFilter: true, - key: 'izproductname' + key: 'izproductname', + component: IzProductVue, }, izvisitcity: { label: '拜访城市', defaultValue: null, isDefaultFilter: true, - key: 'izvisitcity' + key: 'izvisitcity', + component: IzvisitproVue, }, izfirm: { label: '厂商', defaultValue: null, isDefaultFilter: true, - key: 'izfirm' + key: 'izfirm', + component: IzfirmVue, } } \ No newline at end of file diff --git a/src/views/login/components/Login.vue b/src/views/login/components/Login.vue index 2e4d5a9..4b50660 100644 --- a/src/views/login/components/Login.vue +++ b/src/views/login/components/Login.vue @@ -300,7 +300,11 @@ async function sendCode(value) { phone: formSms.phone, agentcode: formSms.agentcode, }); - startCount(); + if(res.code == 'OK'){ + startCount(); + }else{ + message.error(res.message) + } } function startCount() { diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue index 488edf8..b7a2d19 100644 --- a/src/views/task/content/Content.vue +++ b/src/views/task/content/Content.vue @@ -645,6 +645,7 @@ function switchBatch() { @reject="rejectHandler" @approval="approvalHandler" /> +