From 253fa0a543bfde2dcb86d8e885d85ed9bf42d10e Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Thu, 3 Aug 2023 14:05:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/company.js | 18 +- api/oaPbulic.js | 7 +- components/company/company.vue | 1 + components/companyFinance/companyFinance.vue | 249 ++++++++++ components/newArchives/store.vue | 457 ++++++++++--------- pages.json | 9 + static/server/server.js | 6 + subpkg/archives/archives.vue | 1 + subpkg/captain/captain.vue | 181 ++++++++ subpkg/companyInfo/companyInfo.vue | 143 ++++-- subpkg/personnel/personnel.vue | 4 +- subpkg/personnelDetails/personnelDetails.vue | 100 +++- subpkg/updateArchives/updateArchives.vue | 6 +- 13 files changed, 899 insertions(+), 283 deletions(-) create mode 100644 components/companyFinance/companyFinance.vue create mode 100644 subpkg/captain/captain.vue diff --git a/api/company.js b/api/company.js index 503f529..8791c34 100644 --- a/api/company.js +++ b/api/company.js @@ -10,6 +10,11 @@ export const companyMine = (data) => oahttp.get('/company/mine', data) */ export const companyIndex = (data) => oahttp.get('/company/index', data) +/** + * 未签约公司列表 + */ +export const companyUnsigned = (data) => oahttp.get('/company/unsigned', data) + /** * 公司详情 */ @@ -28,4 +33,15 @@ export const companyUser = (data) => oahttp.get('/company/users', data) /** * 人员详情 */ -export const companyUserDetail = (data) => oahttp.get('/company/user', data) \ No newline at end of file +export const companyUserDetail = (data) => oahttp.get('/company/user', data) + + +/** + * 人员详情 + */ +export const accountMonthList = (data) => oahttp.get('/account_log/company_year_count', data) + +/** + * 人员详情 + */ +export const accountDateList = (data) => oahttp.get('/account_log/company_lists', data) \ No newline at end of file diff --git a/api/oaPbulic.js b/api/oaPbulic.js index 6e5daf7..7410bfc 100644 --- a/api/oaPbulic.js +++ b/api/oaPbulic.js @@ -34,4 +34,9 @@ export const commonBrigade = (data) => oahttp.get('/common/brigade', data) /** * 获取商机分类 */ -export const categoryBusinessList = (data) => oahttp.get('/CategoryBusiness/list', data) \ No newline at end of file +export const categoryBusinessList = (data) => oahttp.get('/CategoryBusiness/list', data) + +/** + * 字典列表 + */ +export const dictDataLists = (data) => oahttp.get('/common/dict_data_lists', data) \ No newline at end of file diff --git a/components/company/company.vue b/components/company/company.vue index 3abf8cd..c4594e0 100644 --- a/components/company/company.vue +++ b/components/company/company.vue @@ -189,6 +189,7 @@ } this.company = res.data.company; + uni.$emit('companyInfo', this.company); //发送全局事件 this.user = res.data.user; this.contract = res.data.contract; this.skeleton = false; diff --git a/components/companyFinance/companyFinance.vue b/components/companyFinance/companyFinance.vue new file mode 100644 index 0000000..de22fb2 --- /dev/null +++ b/components/companyFinance/companyFinance.vue @@ -0,0 +1,249 @@ + + + + + \ No newline at end of file diff --git a/components/newArchives/store.vue b/components/newArchives/store.vue index c0ad487..fa3ff0d 100644 --- a/components/newArchives/store.vue +++ b/components/newArchives/store.vue @@ -1,224 +1,235 @@ - - - - - \ No newline at end of file diff --git a/pages.json b/pages.json index 7dcb44e..fcedf3c 100644 --- a/pages.json +++ b/pages.json @@ -355,6 +355,15 @@ "navigationBarTextStyle": "white" } + }, { + "path": "captain/captain", + "style": { + "navigationBarTitleText": "队长列表", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#3175f9", + "navigationBarTextStyle": "white" + } + }] }], "globalStyle": { diff --git a/static/server/server.js b/static/server/server.js index cadc5d7..ab0d8a8 100644 --- a/static/server/server.js +++ b/static/server/server.js @@ -226,6 +226,12 @@ export const oaHomeData = [ icon: prefix + 'oa/bxsq@2x.png', // url: '/subpkg/taskAdmin/taskAdmin', }, + { + text: '档案管理', + icon: prefix + 'oa/bxsq@2x.png', + url: '/subpkg/captain/captain', + admin: true + }, { text: '档案管理', icon: prefix + 'oa/bxsq@2x.png', diff --git a/subpkg/archives/archives.vue b/subpkg/archives/archives.vue index 78de1b3..2d70084 100644 --- a/subpkg/archives/archives.vue +++ b/subpkg/archives/archives.vue @@ -213,6 +213,7 @@ justify-content: left; align-items: center; margin-top: 20rpx; + font-size: 25rpx; .circle { width: 11rpx; diff --git a/subpkg/captain/captain.vue b/subpkg/captain/captain.vue new file mode 100644 index 0000000..b3c92ce --- /dev/null +++ b/subpkg/captain/captain.vue @@ -0,0 +1,181 @@ + + + + + \ No newline at end of file diff --git a/subpkg/companyInfo/companyInfo.vue b/subpkg/companyInfo/companyInfo.vue index d44cbd7..5957376 100644 --- a/subpkg/companyInfo/companyInfo.vue +++ b/subpkg/companyInfo/companyInfo.vue @@ -1,47 +1,63 @@ \ No newline at end of file diff --git a/subpkg/updateArchives/updateArchives.vue b/subpkg/updateArchives/updateArchives.vue index 4df62f1..0da6d5b 100644 --- a/subpkg/updateArchives/updateArchives.vue +++ b/subpkg/updateArchives/updateArchives.vue @@ -176,7 +176,11 @@ // 初始化商机分类 async initCategoryBusinessList() { let res = await categoryBusinessList(); - this.demandList = res.data; + // this.demandList = res.data; + this.demandList = res.data.filter(item=>item.id==6); + this.demandList[0].children = this.demandList[0].children.filter(item=>item.id==7||item.id==8); + this.demandListChild = this.demandList[0].children; + // console.log(this.demandList); }, // 选择更多需求 changeHandler(e) {