From 1e8fc844038e3cb604390ebcb47d1228440f02e8 Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Sun, 31 Mar 2024 23:19:57 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E8=87=AA=E5=AE=9A=E4=B9=89=E8=AE=BE?=
=?UTF-8?q?=E7=BD=AE=E6=8C=89=E9=92=AE=E6=97=A0=E6=B3=95=E7=82=B9=E5=87=BB?=
=?UTF-8?q?=EF=BC=8C=E6=8E=A7=E5=88=B6=E5=8F=B0=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/task/content/Content.vue | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue
index e0c9fe3..7857120 100644
--- a/src/views/task/content/Content.vue
+++ b/src/views/task/content/Content.vue
@@ -619,6 +619,7 @@ function reloadList(param, text) {
@reject="rejectHandler"
@approval="approvalHandler"
/>
+
--
2.39.3
From cb4b00b1987a24981cfe3865aaef8015a1562801 Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Sun, 31 Mar 2024 23:29:31 +0800
Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=E5=90=8C=E4=B8=80=E6=89=8B?=
=?UTF-8?q?=E6=9C=BA=E5=8F=B7=E6=AF=8F=E5=A4=A9=E6=9C=80=E5=A4=9A=E8=8E=B7?=
=?UTF-8?q?=E5=8F=9610=E6=AC=A1=E9=AA=8C=E8=AF=81=E7=A0=81=EF=BC=8C?=
=?UTF-8?q?=E8=B6=85=E5=87=BA=E5=8D=81=E6=AC=A1=E5=90=8E=E5=BC=B9=E5=87=BA?=
=?UTF-8?q?=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA=EF=BC=9A=E8=8E=B7=E5=8F=96?=
=?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81=E6=AC=A1=E6=95=B0=E8=B6=85=E9=99=90?=
=?UTF-8?q?=EF=BC=8C=E8=AF=B7=E6=98=8E=E5=A4=A9=E5=86=8D=E8=AF=95!?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/login/components/Login.vue | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
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() {
--
2.39.3
From 93972ea9a5794252af627ba75f1a2a9e663f544c Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Sun, 31 Mar 2024 23:49:37 +0800
Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=E4=BB=BB=E5=8A=A1=E5=AE=A1?=
=?UTF-8?q?=E6=89=B9=E9=AB=98=E7=BA=A7=E7=AD=9B=E9=80=89=E8=A1=A5=E5=85=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components.d.ts | 1 +
src/config/final.ts | 41 +++++++++++++++++++++++++++--------------
2 files changed, 28 insertions(+), 14 deletions(-)
diff --git a/components.d.ts b/components.d.ts
index e07d992..d6fb45b 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -34,6 +34,7 @@ declare module 'vue' {
NModal: typeof import('naive-ui')['NModal']
NNotificationProvider: typeof import('naive-ui')['NNotificationProvider']
NotPassed: typeof import('./src/components/NotPassed.vue')['default']
+ NPopconfirm: typeof import('naive-ui')['NPopconfirm']
NPopover: typeof import('naive-ui')['NPopover']
NPopselect: typeof import('naive-ui')['NPopselect']
NProgress: typeof import('naive-ui')['NProgress']
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
--
2.39.3