From f1ed72008c8823ed6085b6c016cc89e50c8afad8 Mon Sep 17 00:00:00 2001 From: wpf <2187978347@qq.com> Date: Sun, 6 Aug 2023 16:27:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=EF=BC=8C=E4=BF=AE=E5=A4=8Dbu?= =?UTF-8?q?g?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/task/taskItem.vue | 4 +- package-lock.json | 11 +- pages.json | 6 +- pages/oaHome/oaHome.vue | 5 +- pages/oaMy/oaMy.vue | 4 +- static/server/server.js | 12 +- subpkg/archives/archives.vue | 413 +++---- subpkg/archivesDetail/archivesDetail.vue | 2 +- subpkg/companyInfo/companyInfo.vue | 7 +- subpkg/companySign/companySign.vue | 16 +- subpkg/companyUnsign/companyUnsign.vue | 11 + subpkg/newArchives/newArchives.vue | 21 +- subpkg/personnel/personnel.vue | 16 +- subpkg/personnelDetails/personnelDetails.vue | 1118 +++++++++--------- subpkg/updateArchives/updateArchives.vue | 2 +- 15 files changed, 868 insertions(+), 780 deletions(-) diff --git a/components/task/taskItem.vue b/components/task/taskItem.vue index 2417577..1f2f40d 100644 --- a/components/task/taskItem.vue +++ b/components/task/taskItem.vue @@ -40,7 +40,9 @@ props: { datas: { type: Object, - default: {} + default: function(){ + return {} + } } }, data() { diff --git a/package-lock.json b/package-lock.json index 5ee8b9d..51a135c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,6 @@ { + "name": "OfficeApp", + "lockfileVersion": 3, "requires": true, - "lockfileVersion": 1, - "dependencies": { - "lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" - } - } + "packages": {} } diff --git a/pages.json b/pages.json index c6f8a3a..430f7be 100644 --- a/pages.json +++ b/pages.json @@ -152,7 +152,7 @@ "path": "personnel/personnel", "style": { "navigationBarTitleText": "人员管理", - "enablePullDownRefresh": false, + "enablePullDownRefresh": true, "navigationBarBackgroundColor": "#3175f9", "navigationBarTextStyle": "white" } @@ -216,7 +216,7 @@ "path": "companyInfo/companyInfo", "style": { "navigationBarTitleText": "公司信息", - "enablePullDownRefresh": false, + "enablePullDownRefresh": true, "navigationBarBackgroundColor": "#3175f9", "navigationBarTextStyle": "white" } @@ -315,7 +315,7 @@ "path": "archives/archives", "style": { "navigationBarTitleText": "档案管理", - "enablePullDownRefresh": false, + "enablePullDownRefresh": true, "navigationBarBackgroundColor": "#3175f9", "navigationBarTextStyle": "white" } diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue index 4f77b35..021e59b 100644 --- a/pages/oaHome/oaHome.vue +++ b/pages/oaHome/oaHome.vue @@ -23,12 +23,13 @@ 姓名:{{ myOaInfo.nickname }} - + （{{ myOaInfo.admin_id?'超级管理员':'普通用户'}}） 电话:{{myOaInfo.account}}
- 公司:{{ myOaInfo.company.company_name }} + 公司:{{ myOaInfo.company.company_name }}
+ 公司类型:{{ myOaInfo.company.company_type_name }}
 diff --git a/pages/oaMy/oaMy.vue b/pages/oaMy/oaMy.vue index 4c7e049..34175e5 100644 --- a/pages/oaMy/oaMy.vue +++ b/pages/oaMy/oaMy.vue @@ -23,11 +23,13 @@ 姓名:{{ oaUserInfo.nickname }} + （{{ oaUserInfo.admin_id?'超级管理员':'普通用户'}}） 电话:{{oaUserInfo.account}}
- 公司:{{ oaUserInfo.company.company_name }} + 公司:{{ oaUserInfo.company.company_name }}
+ 公司类型:{{ oaUserInfo.company.company_type_name }}
 diff --git a/static/server/server.js b/static/server/server.js index ace0a5d..c27b7cd 100644 --- a/static/server/server.js +++ b/static/server/server.js @@ -204,12 +204,12 @@ export const oaHomeData = [ url: '/subpkg/personnel/personnel', admin: true }, - { - text: '固定资产', - icon: prefix + 'oa/wcsq@2x.png', - // url: '/subpkg/fixedAssets/fixedAssets', - admin: true - }, + // { + // text: '固定资产', + // icon: prefix + 'oa/wcsq@2x.png', + // url: '/subpkg/fixedAssets/fixedAssets', + // admin: true + // }, { text: '合同管理', icon: prefix + 'oa/cgsq@2x.png', diff --git a/subpkg/archives/archives.vue b/subpkg/archives/archives.vue index 59c1772..df159ce 100644 --- a/subpkg/archives/archives.vue +++ b/subpkg/archives/archives.vue @@ -1,217 +1,230 @@ \ No newline at end of file + } + diff --git a/subpkg/archivesDetail/archivesDetail.vue b/subpkg/archivesDetail/archivesDetail.vue index 6fb0cb1..dd3e01e 100644 --- a/subpkg/archivesDetail/archivesDetail.vue +++ b/subpkg/archivesDetail/archivesDetail.vue @@ -14,7 +14,7 @@ 基本信息 - + diff --git a/subpkg/companyInfo/companyInfo.vue b/subpkg/companyInfo/companyInfo.vue index 70c70d9..96f725a 100644 --- a/subpkg/companyInfo/companyInfo.vue +++ b/subpkg/companyInfo/companyInfo.vue @@ -91,11 +91,12 @@ this.loadCompanyList(); }, methods: { - initLoad() { + async initLoad() { this.loadConfig.page = 1; this.loadConfig.status = "loadmore"; this.companyList = []; - this.loadCompanyList(); + await this.loadCompanyList(); + uni.stopPullDownRefresh() }, // 加载公司列表 async loadCompanyList() { @@ -138,7 +139,7 @@ } }, onPullDownRefresh() { - uni.stopPullDownRefresh() + this.initLoad() } } diff --git a/subpkg/companySign/companySign.vue b/subpkg/companySign/companySign.vue index b9af296..5abfe82 100644 --- a/subpkg/companySign/companySign.vue +++ b/subpkg/companySign/companySign.vue @@ -3,12 +3,12 @@ - - + + - - + + @@ -101,22 +101,22 @@ }) this.contractTypeList = res.data; }, - // 发起合同 + // 生成合同 async createContract(data) { let res = await initiateContract({ party_b: data.party_b, contract_type: data.contract_type, type: data.type }) - Toast(res.msg || '合同已发起') + Toast(res.msg || '合同已生成') this.initCompany(); }, - // 生成合同 + // 发送合同 async addContract(data) { let res = await Draftingcontracts({ id: this.id }); - Toast('合同已生成'); + Toast('合同已发送'); this.initCompany(); if (this.userInfo.contract.check_status == 3) { this.timerCount = 60; diff --git a/subpkg/companyUnsign/companyUnsign.vue b/subpkg/companyUnsign/companyUnsign.vue index c2531e6..9a8f90f 100644 --- a/subpkg/companyUnsign/companyUnsign.vue +++ b/subpkg/companyUnsign/companyUnsign.vue @@ -83,6 +83,17 @@ export default { url: url }) : Toast('暂未开放') }, + copyPhone(str = "", type = "号码") { + if (str) uni.setClipboardData({ + data: str + "", + success: (e) => { + Toast(type + '已复制') + }, + fail: (e) => { + Toast('复制失败') + } + }) + }, }, onPullDownRefresh() { uni.stopPullDownRefresh() diff --git a/subpkg/newArchives/newArchives.vue b/subpkg/newArchives/newArchives.vue index 0d997d8..b71144e 100644 --- a/subpkg/newArchives/newArchives.vue +++ b/subpkg/newArchives/newArchives.vue @@ -4,7 +4,7 @@ 基本信息 - + @@ -28,6 +28,9 @@ 地区信息 + + + @@ -56,8 +59,8 @@ - - + - - - 身份证号:{{userInfo.id_card}} - - - 联系电话:{{userInfo.phone}} - - - - - 是否为小队长: - - - - - - - - 负责区域: - {{userInfo.city_name+userInfo.area_name+userInfo.street_name}}{{userInfo.city_name+userInfo.area_name+userInfo.street_name}} - - - - 修改信息 - - 是否为小队长: - - - - - - - 取消 - 确认 - - - - - - - - - - 资质信息 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 电子合同 - - - 性别：{{userInfo.sex==1?'男':'女'}} - 身份证号码：{{userInfo.id_card}} - 联系电话：{{userInfo.phone}} - 合同类型：{{userInfo.contract&&userInfo.contract.contract_type_name}} - 合同编号：{{userInfo.contract&&userInfo.contract.contract_no}} - - - - - - 合同 - - {{userInfo.contract&&userInfo.contract.create_time}} - - - - - - - - - - - - - - - - {{userInfo.contract.contract_type_name}} - - {{userInfo.contract&&userInfo.contract.create_time}} - - - - - - - - - - - - - - - - {{userInfo.contract.contract_type_name}} - - {{userInfo.contract&&userInfo.contract.create_time}} - - - - - - - - - - - - - - + + + + + + 人员基本信息 + + + + + + {{userInfo.name}} + + + + + + 身份证号:{{userInfo.id_card}} + + + 联系电话:{{userInfo.phone}} + + + + + 是否为小队长: + + + + + + + + + + 负责区域:{{userInfo.street_name+(userInfo.village_name||'')+(userInfo.brigade_name||'')}} + + + + 修改信息 + + 是否为小队长: + + + + + + + 取消 + 确认 + + + + + + + + + + + 资质信息 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 电子合同 + + + 性别：{{userInfo.sex==1?'男':'女'}} + 身份证号码：{{userInfo.id_card}} + 联系电话：{{userInfo.phone}} + 合同类型：{{userInfo.contract&&userInfo.contract.contract_type_name}} + 合同编号：{{userInfo.contract&&userInfo.contract.contract_no}} + + + + + + + {{userInfo.contract.contract_type_name||'合同'}} + + {{userInfo.contract&&userInfo.contract.create_time}} + + + + + + + 查看 + + + + + + + + + + + + + + + {{userInfo.contract.contract_type_name}} + + {{userInfo.contract&&userInfo.contract.create_time}} + + + + + + + + + + + + + + + + {{userInfo.contract.contract_type_name}} + + {{userInfo.contract&&userInfo.contract.create_time}} + + + + + + + + + + + + + + \ No newline at end of file + .contract_img { + width: 102rpx; + height: 102rpx; + background: #F5F5F5; + border-radius: 14rpx 14rpx 14rpx 14rpx; + margin-right: 21rpx; + } + + .text { + display: flex; + flex-direction: column; + justify-content: space-between; + + .name { + font-size: 32rpx; + ; + font-weight: 500; + color: rgba(0, 0, 0, 0.8); + line-height: 35rpx; + } + + .nickname { + margin-right: 35rpx; + } + + text { + height: 39rpx; + font-size: 28rpx; + font-weight: 400; + color: #666666; + line-height: 35rpx; + } + } + } + + .right { + font-size: 28rpx; + font-weight: 500; + color: #3274F9; + line-height: 35rpx; + display: flex; + justify-content: center; + align-items: center; + + .icon { + width: 35rpx; + height: 39rpx; + background-color: #3274F9; + opacity: 1; + margin-right: 10rpx + } + } + + } + + .send { + padding-top: 28rpx; + } + + .send_btn { + width: 100%; + height: 84rpx; + background: $theme-oa-color; + border-radius: 42rpx 42rpx 42rpx 42rpx; + color: #fff; + line-height: 80rpx; + text-align: center; + } + + .tips_center { + background-color: #666; + color: #eee; + } + } + + .btn { + margin-top: 32rpx; + // margin-bottom: 40rpx; + width: 694rpx; + height: 84rpx; + background: $theme-oa-color; + border-radius: 42rpx 42rpx 42rpx 42rpx; + color: #fff; + line-height: 80rpx; + text-align: center; + } + + .tips_center { + background-color: #666; + color: #eee; + } + } + diff --git a/subpkg/updateArchives/updateArchives.vue b/subpkg/updateArchives/updateArchives.vue index 0758abb..cddc99f 100644 --- a/subpkg/updateArchives/updateArchives.vue +++ b/subpkg/updateArchives/updateArchives.vue @@ -4,7 +4,7 @@