From 1ebc1241f22d9be456a91adb308bb04c83f8a402 Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Sat, 12 Aug 2023 15:48:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8E=E6=96=B0=E5=A2=9E8.?= =?UTF-8?q?11=E6=89=80=E6=8F=90=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/oaUser.js | 5 + components/company/company.vue | 19 +- manifest.json | 318 +++--- pages.json | 964 ++++++++++--------- pages/oaLogin/oaLogin.vue | 18 +- pages/updatePasswprd/updatePasswprd.vue | 96 ++ static/icons/setting.png | Bin 0 -> 5013 bytes static/server/server.js | 5 + subpkg/companySign/companySign.vue | 111 ++- subpkg/companyUnsign/companyUnsign.vue | 146 +-- subpkg/personnelDetails/personnelDetails.vue | 126 ++- 11 files changed, 1019 insertions(+), 789 deletions(-) create mode 100644 pages/updatePasswprd/updatePasswprd.vue create mode 100644 static/icons/setting.png diff --git a/api/oaUser.js b/api/oaUser.js index 68e6052..ac36c55 100644 --- a/api/oaUser.js +++ b/api/oaUser.js @@ -20,6 +20,11 @@ export const userCenter = (data) => oahttp.get('/user/center', data) */ export const userInfo = (data) => oahttp.get('/user/info', data) +/** + * 修改密码 + */ +export const changePassword = (data) => oahttp.post('/user/changePassword', data) + /** * 新增人员 */ diff --git a/components/company/company.vue b/components/company/company.vue index 00379d8..a92bb08 100644 --- a/components/company/company.vue +++ b/components/company/company.vue @@ -20,7 +20,7 @@ 区域： - {{company.address}} + {{c_address}} @@ -163,6 +163,23 @@ mounted() { this.initContract(this.$props.id, this.$props.type || null); }, + computed:{ + c_address(){ + let str = ''; + if(this.company.company_type==16){ + this.company?.province_name?str+=this.company?.province_name:null; + this.company?.city_name?str+=this.company?.city_name:null; + this.company?.area_name?str+=this.company?.area_name:null; + this.company?.street_name?str+=this.company?.street_name:null; + }else { + this.company?.street_name?str+=this.company?.street_name:null; + this.company?.village_name?str+=this.company?.village_name:null; + this.company?.brigade_name?str+=this.company?.brigade_name:null; + + } + return str; + } + }, methods: { navTo(contract_no) { download_file({ applyNo: contract_no }).then(res => { diff --git a/manifest.json b/manifest.json index 96c4c88..ef158e8 100644 --- a/manifest.json +++ b/manifest.json @@ -1,160 +1,160 @@ { - "name": "供销综合平台", - "appid": "__UNI__B5B1EDD", - "description": "", - "versionName": "1.0.0", - "versionCode": "100", - "transformPx": false, - /* 5+App特有相关 */ - "app-plus": { - "usingComponents": true, - "nvueStyleCompiler": "uni-app", - "compilerVersion": 3, - "splashscreen": { - "alwaysShowBeforeRender": true, - "waiting": true, - "autoclose": true, - "delay": 0 - }, - /* 模块配置 */ - "modules": { - "Payment": {}, - "Barcode": {}, - "Camera": {}, - "Maps": {} - }, - /* 应用发布信息 */ - "distribute": { - /* android打包配置 */ - "android": { - "permissions": [ - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "" - ] - }, - /* ios打包配置 */ - "ios": { - "dSYMs": false - }, - /* SDK配置 */ - "sdkConfigs": { - "payment": { - "weixin": { - "__platform__": ["ios", "android"], - "appid": "wx4789d9f1b50390ba", - "UniversalLinks": "" - } - }, - "ad": {}, - "maps": { - "amap": { - "appkey_ios": "0799f37420c0784f1e6cba230a68bdb1", - "appkey_android": "0799f37420c0784f1e6cba230a68bdb1" - } - } - }, - "splashscreen": { - "useOriginalMsgbox": true - }, - "icons": { - "android": { - "hdpi": "unpackage/res/icons/72x72.png", - "xhdpi": "unpackage/res/icons/96x96.png", - "xxhdpi": "unpackage/res/icons/144x144.png", - "xxxhdpi": "unpackage/res/icons/192x192.png" - }, - "ios": { - "appstore": "unpackage/res/icons/1024x1024.png", - "ipad": { - "app": "unpackage/res/icons/76x76.png", - "app@2x": "unpackage/res/icons/152x152.png", - "notification": "unpackage/res/icons/20x20.png", - "notification@2x": "unpackage/res/icons/40x40.png", - "proapp@2x": "unpackage/res/icons/167x167.png", - "settings": "unpackage/res/icons/29x29.png", - "settings@2x": "unpackage/res/icons/58x58.png", - "spotlight": "unpackage/res/icons/40x40.png", - "spotlight@2x": "unpackage/res/icons/80x80.png" - }, - "iphone": { - "app@2x": "unpackage/res/icons/120x120.png", - "app@3x": "unpackage/res/icons/180x180.png", - "notification@2x": "unpackage/res/icons/40x40.png", - "notification@3x": "unpackage/res/icons/60x60.png", - "settings@2x": "unpackage/res/icons/58x58.png", - "settings@3x": "unpackage/res/icons/87x87.png", - "spotlight@2x": "unpackage/res/icons/80x80.png", - "spotlight@3x": "unpackage/res/icons/120x120.png" - } - } - } - } - }, - /* 快应用特有相关 */ - "quickapp": {}, - "h5": { - "devServer": { - "proxy": { - "baseUrlTest/adminapi": { - "target": "https://worker-task.lihaink.cn", - "changeOrigin": true, - "pathRewrite": { - "^/baseUrlTest/adminapi": "/adminapi" - } - }, - "baseUrlTest/api": { - "target": "https://worker-task.lihaink.cn", - "changeOrigin": true, - "pathRewrite": { - "^/baseUrlTest/api": "/api" - } - } - } - }, - "sdkConfigs": { - "maps": { - "amap": { - "key": "275cd3601b1b2d6414f6c988e7911664", - "securityJsCode": "d2d7c56801819e8bdf71b8a71846f235", - "serviceHost": "" - } - } - } - }, - /* 小程序特有相关 */ - "mp-weixin": { - "appid": "wx6e14cb98394e36bc", - "setting": { - "urlCheck": false - }, - "usingComponents": true - }, - "mp-alipay": { - "usingComponents": true - }, - "mp-baidu": { - "usingComponents": true - }, - "mp-toutiao": { - "usingComponents": true - }, - "uniStatistics": { - "enable": false - }, - "vueVersion": "2" -} \ No newline at end of file + "name" : "供销综合平台", + "appid" : "__UNI__B5B1EDD", + "description" : "", + "versionName" : "1.0.0", + "versionCode" : "100", + "transformPx" : false, + /* 5+App特有相关 */ + "app-plus" : { + "usingComponents" : true, + "nvueStyleCompiler" : "uni-app", + "compilerVersion" : 3, + "splashscreen" : { + "alwaysShowBeforeRender" : true, + "waiting" : true, + "autoclose" : true, + "delay" : 0 + }, + /* 模块配置 */ + "modules" : { + "Payment" : {}, + "Barcode" : {}, + "Camera" : {}, + "Maps" : {} + }, + /* 应用发布信息 */ + "distribute" : { + /* android打包配置 */ + "android" : { + "permissions" : [ + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "" + ] + }, + /* ios打包配置 */ + "ios" : { + "dSYMs" : false + }, + /* SDK配置 */ + "sdkConfigs" : { + "payment" : { + "weixin" : { + "__platform__" : [ "ios", "android" ], + "appid" : "wx4789d9f1b50390ba", + "UniversalLinks" : "" + } + }, + "ad" : {}, + "maps" : { + "amap" : { + "appkey_ios" : "0799f37420c0784f1e6cba230a68bdb1", + "appkey_android" : "0799f37420c0784f1e6cba230a68bdb1" + } + } + }, + "splashscreen" : { + "useOriginalMsgbox" : true + }, + "icons" : { + "android" : { + "hdpi" : "unpackage/res/icons/72x72.png", + "xhdpi" : "unpackage/res/icons/96x96.png", + "xxhdpi" : "unpackage/res/icons/144x144.png", + "xxxhdpi" : "unpackage/res/icons/192x192.png" + }, + "ios" : { + "appstore" : "unpackage/res/icons/1024x1024.png", + "ipad" : { + "app" : "unpackage/res/icons/76x76.png", + "app@2x" : "unpackage/res/icons/152x152.png", + "notification" : "unpackage/res/icons/20x20.png", + "notification@2x" : "unpackage/res/icons/40x40.png", + "proapp@2x" : "unpackage/res/icons/167x167.png", + "settings" : "unpackage/res/icons/29x29.png", + "settings@2x" : "unpackage/res/icons/58x58.png", + "spotlight" : "unpackage/res/icons/40x40.png", + "spotlight@2x" : "unpackage/res/icons/80x80.png" + }, + "iphone" : { + "app@2x" : "unpackage/res/icons/120x120.png", + "app@3x" : "unpackage/res/icons/180x180.png", + "notification@2x" : "unpackage/res/icons/40x40.png", + "notification@3x" : "unpackage/res/icons/60x60.png", + "settings@2x" : "unpackage/res/icons/58x58.png", + "settings@3x" : "unpackage/res/icons/87x87.png", + "spotlight@2x" : "unpackage/res/icons/80x80.png", + "spotlight@3x" : "unpackage/res/icons/120x120.png" + } + } + } + } + }, + /* 快应用特有相关 */ + "quickapp" : {}, + "h5" : { + "devServer" : { + "proxy" : { + "baseUrlTest/adminapi" : { + "target" : "https://worker-task.lihaink.cn", + "changeOrigin" : true, + "pathRewrite" : { + "^/baseUrlTest/adminapi" : "/adminapi" + } + }, + "baseUrlTest/api" : { + "target" : "https://worker-task.lihaink.cn", + "changeOrigin" : true, + "pathRewrite" : { + "^/baseUrlTest/api" : "/api" + } + } + } + }, + "sdkConfigs" : { + "maps" : { + "amap" : { + "key" : "275cd3601b1b2d6414f6c988e7911664", + "securityJsCode" : "d2d7c56801819e8bdf71b8a71846f235", + "serviceHost" : "" + } + } + } + }, + /* 小程序特有相关 */ + "mp-weixin" : { + "appid" : "wx6e14cb98394e36bc", + "setting" : { + "urlCheck" : false + }, + "usingComponents" : true + }, + "mp-alipay" : { + "usingComponents" : true + }, + "mp-baidu" : { + "usingComponents" : true + }, + "mp-toutiao" : { + "usingComponents" : true + }, + "uniStatistics" : { + "enable" : false + }, + "vueVersion" : "2" +} diff --git a/pages.json b/pages.json index e1e3b02..f4ac82b 100644 --- a/pages.json +++ b/pages.json @@ -1,523 +1,531 @@ { - "pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages + "pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages - { - "path": "pages/oaHome/oaHome", - "style": { - "navigationBarTitleText": "首页", - "enablePullDownRefresh": true, - "app-plus": { - "titleNView": false - } - } - }, - { - "path": "pages/oaLogin/oaLogin", - "style": { - "navigationBarTitleText": "登录", - "app-plus": { - "titleNView": false - } - } - - }, - { - "path": "pages/business/business", - "style": { - "navigationBarTitleText": "商机信息", - "enablePullDownRefresh": true, - "navigationBarBackgroundColor": "#3175f9", - "navigationBarTextStyle": "white" - } - - }, - { - "path": "pages/index/index", - "style": { - "navigationBarTitleText": "uni-app", - "navigationBarBackgroundColor": "#3175f9", - "navigationBarTextStyle": "white" - } - }, - { - "path": "pages/oaExamine/oaExamine", - "style": { - "navigationBarTitleText": "审批", + { + "path": "pages/oaHome/oaHome", + "style": { + "navigationBarTitleText": "首页", "enablePullDownRefresh": true, - "navigationBarBackgroundColor": "#3175f9", - "navigationBarTextStyle": "white" - } - }, - { - "path": "pages/oaTask/oaTask", - "style": { - "navigationBarTitleText": "今日任务", + "app-plus": { + "titleNView": false + } + } + }, + { + "path": "pages/oaLogin/oaLogin", + "style": { + "navigationBarTitleText": "登录", + "app-plus": { + "titleNView": false + } + } + + }, + { + "path": "pages/business/business", + "style": { + "navigationBarTitleText": "商机信息", "enablePullDownRefresh": true, - "navigationBarBackgroundColor": "#3175f9", - "navigationBarTextStyle": "white" - } - }, - { - "path": "pages/oaMy/oaMy", - "style": { - "navigationBarTitleText": "我的", - "app-plus": { - "titleNView": false - } - } - }, { - "path": "pages/oaManager/oaManager", - "style": { - "navigationBarTitleText": "片区经理", - "navigationBarBackgroundColor": "#3175f9", - "navigationBarTextStyle": "white" - } + "navigationBarBackgroundColor": "#3175f9", + "navigationBarTextStyle": "white" + } - }, { - "path": "pages/oaNews/oaNews", - "style": { - "navigationBarTitleText": "公告详情", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#3175f9", - "navigationBarTextStyle": "white" - } + }, + { + "path": "pages/index/index", + "style": { + "navigationBarTitleText": "uni-app", + "navigationBarBackgroundColor": "#3175f9", + "navigationBarTextStyle": "white" + } + }, + { + "path": "pages/oaExamine/oaExamine", + "style": { + "navigationBarTitleText": "审批", + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#3175f9", + "navigationBarTextStyle": "white" + } + }, + { + "path": "pages/oaTask/oaTask", + "style": { + "navigationBarTitleText": "今日任务", + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#3175f9", + "navigationBarTextStyle": "white" + } + }, + { + "path": "pages/oaMy/oaMy", + "style": { + "navigationBarTitleText": "我的", + "app-plus": { + "titleNView": false + } + } + }, { + "path": "pages/oaManager/oaManager", + "style": { + "navigationBarTitleText": "片区经理", + "navigationBarBackgroundColor": "#3175f9", + "navigationBarTextStyle": "white" + } - }, { - "path": "pages/logistics/index", - "style": { - "navigationBarTitleText": "订单列表", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#3175f9", - "navigationBarTextStyle": "white" - } + }, { + "path": "pages/oaNews/oaNews", + "style": { + "navigationBarTitleText": "公告详情", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#3175f9", + "navigationBarTextStyle": "white" + } - }, { - "path": "pages/logistics/logisticDetil", - "style": { - "navigationBarTitleText": "订单详情", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#3175f9", - "navigationBarTextStyle": "white" - } + }, { + "path": "pages/logistics/index", + "style": { + "navigationBarTitleText": "订单列表", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#3175f9", + "navigationBarTextStyle": "white" + } - }, { - "path": "pages/logistics/t", - "style": { - "navigationBarTitleText": "订单详情", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#3175f9", - "navigationBarTextStyle": "white" - } + }, { + "path": "pages/logistics/logisticDetil", + "style": { + "navigationBarTitleText": "订单详情", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#3175f9", + "navigationBarTextStyle": "white" + } - }, { - "path": "pages/logistics/deliveryDetil", - "style": { - "navigationBarTitleText": "配送信息", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#3175f9", - "navigationBarTextStyle": "white" - } + }, { + "path": "pages/logistics/t", + "style": { + "navigationBarTitleText": "订单详情", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#3175f9", + "navigationBarTextStyle": "white" + } - } + }, { + "path": "pages/logistics/deliveryDetil", + "style": { + "navigationBarTitleText": "配送信息", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#3175f9", + "navigationBarTextStyle": "white" + } - ], - "subPackages": [{ - "root": "pages/views", - "name": "views", - "pages": [{ - "path": "application", - "style": { - "navigationBarTitleText": "地图首页", - "enablePullDownRefresh": false - } - }, - { - "path": "new_task", - "style": { - "navigationBarTitleText": "新建任务", - "enablePullDownRefresh": false - } - }, - { - "path": "com_approve", - "style": { - "navigationBarTitleText": "通用审批", - "enablePullDownRefresh": false - } - }, { - "path": "personal_center", - "style": { - "navigationBarTitleText": "个人中心1", - "enablePullDownRefresh": false - } + }, { + "path": "pages/updatePasswprd/updatePasswprd", + "style": { + "navigationBarTitleText": "修改密码", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#3175f9", + "navigationBarTextStyle": "white" + } - }, { - "path": "task_details", - "style": { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } + } + ], + "subPackages": [{ + "root": "pages/views", + "name": "views", + "pages": [{ + "path": "application", + "style": { + "navigationBarTitleText": "地图首页", + "enablePullDownRefresh": false + } + }, + { + "path": "new_task", + "style": { + "navigationBarTitleText": "新建任务", + "enablePullDownRefresh": false + } + }, + { + "path": "com_approve", + "style": { + "navigationBarTitleText": "通用审批", + "enablePullDownRefresh": false + } + }, { + "path": "personal_center", + "style": { + "navigationBarTitleText": "个人中心1", + "enablePullDownRefresh": false + } - }, { - "path": "personal_center_two", - "style": { - "navigationBarTitleText": "个人中心2", - "enablePullDownRefresh": false - } + }, { + "path": "task_details", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } - }, { - "path": "public_document", - "style": { - "navigationBarTitleText": "公司公示文档", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#3175f9", - "navigationBarTextStyle": "white" - } + }, { + "path": "personal_center_two", + "style": { + "navigationBarTitleText": "个人中心2", + "enablePullDownRefresh": false + } - }, { - "path": "leave_request", - "style": { - "navigationBarTitleText": "请假申请", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#3175f9", - "navigationBarTextStyle": "white" - } + }, { + "path": "public_document", + "style": { + "navigationBarTitleText": "公司公示文档", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#3175f9", + "navigationBarTextStyle": "white" + } - } - ] - }, { - "root": "subpkg", - "name": "subpkg", - "pages": [{ - "path": "personnel/personnel", - "style": { - "navigationBarTitleText": "人员管理", - "enablePullDownRefresh": true, - "navigationBarBackgroundColor": "#3175f9", - "navigationBarTextStyle": "white" - } + }, { + "path": "leave_request", + "style": { + "navigationBarTitleText": "请假申请", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#3175f9", + "navigationBarTextStyle": "white" + } - }, { - "path": "finance/finance", - "style": { - "navigationBarTitleText": "财务管理", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#3175f9", - "navigationBarTextStyle": "white" - } + } + ] + }, { + "root": "subpkg", + "name": "subpkg", + "pages": [{ + "path": "personnel/personnel", + "style": { + "navigationBarTitleText": "人员管理", + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#3175f9", + "navigationBarTextStyle": "white" + } - }, { - "path": "topUp/topUp", - "style": { - "navigationBarTitleText": "账户充值", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#3175f9", - "navigationBarTextStyle": "white", - "app-plus": { - "titleNView": { - "buttons": [{ - "color": "#fff", - "text": "充值记录", - "fontSize": "15", - "width": "90" - }] - } - } - } + }, { + "path": "finance/finance", + "style": { + "navigationBarTitleText": "财务管理", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#3175f9", + "navigationBarTextStyle": "white" + } - }, { - "path": "contract/contract", - "style": { - "navigationBarTitleText": "合同管理", - "enablePullDownRefresh": true, - "navigationBarBackgroundColor": "#3175f9", - "navigationBarTextStyle": "white" - } + }, { + "path": "topUp/topUp", + "style": { + "navigationBarTitleText": "账户充值", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#3175f9", + "navigationBarTextStyle": "white", + "app-plus": { + "titleNView": { + "buttons": [{ + "color": "#fff", + "text": "充值记录", + "fontSize": "15", + "width": "90" + }] + } + } + } - }, { - "path": "contractDetail/contractDetail", - "style": { - "navigationBarTitleText": "合同详情", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#3175f9", - "navigationBarTextStyle": "white" - } + }, { + "path": "contract/contract", + "style": { + "navigationBarTitleText": "合同管理", + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#3175f9", + "navigationBarTextStyle": "white" + } - }, { - "path": "pdfView/pdfView", - "style": { - "navigationBarTitleText": "合同内容", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#3175f9", - "navigationBarTextStyle": "white" - } + }, { + "path": "contractDetail/contractDetail", + "style": { + "navigationBarTitleText": "合同详情", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#3175f9", + "navigationBarTextStyle": "white" + } - }, { - "path": "companyInfo/companyInfo", - "style": { - "navigationBarTitleText": "公司信息", - "enablePullDownRefresh": true, - "navigationBarBackgroundColor": "#3175f9", - "navigationBarTextStyle": "white" - } + }, { + "path": "pdfView/pdfView", + "style": { + "navigationBarTitleText": "合同内容", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#3175f9", + "navigationBarTextStyle": "white" + } - }, { - "path": "companySign/companySign", - "style": { - "navigationBarTitleText": "签约公司详情", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#3175f9", - "navigationBarTextStyle": "white" - } + }, { + "path": "companyInfo/companyInfo", + "style": { + "navigationBarTitleText": "公司信息", + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#3175f9", + "navigationBarTextStyle": "white" + } - }, { - "path": "personnelDetails/personnelDetails", - "style": { - "navigationBarTitleText": "人员详细信息", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#3175f9", - "navigationBarTextStyle": "white" - } + }, { + "path": "companySign/companySign", + "style": { + "navigationBarTitleText": "签约公司详情", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#3175f9", + "navigationBarTextStyle": "white" + } - }, { - "path": "orderDetail/orderDetail", - "style": { - "navigationBarTitleText": "流水详情", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#3175f9", - "navigationBarTextStyle": "white" - } + }, { + "path": "personnelDetails/personnelDetails", + "style": { + "navigationBarTitleText": "人员详细信息", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#3175f9", + "navigationBarTextStyle": "white" + } - }, { - "path": "withdrawDeposit/withdrawDeposit", - "style": { - "navigationBarTitleText": "提现余额", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#3175f9", - "navigationBarTextStyle": "white", - "app-plus": { - "titleNView": { - "buttons": [{ - "color": "#fff", - "text": "提现记录", - "fontSize": "15", - "width": "90" - }] - } - } - } - }, { - "path": "withdrawList/withdrawList", - "style": { - "navigationBarTitleText": "提现记录", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#3175f9", - "navigationBarTextStyle": "white" - } + }, { + "path": "orderDetail/orderDetail", + "style": { + "navigationBarTitleText": "流水详情", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#3175f9", + "navigationBarTextStyle": "white" + } - }, { - "path": "noticeList/noticeList", - "style": { - "navigationBarTitleText": "公告列表", - "enablePullDownRefresh": true, - "navigationBarBackgroundColor": "#3175f9", - "navigationBarTextStyle": "white" - } + }, { + "path": "withdrawDeposit/withdrawDeposit", + "style": { + "navigationBarTitleText": "提现余额", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#3175f9", + "navigationBarTextStyle": "white", + "app-plus": { + "titleNView": { + "buttons": [{ + "color": "#fff", + "text": "提现记录", + "fontSize": "15", + "width": "90" + }] + } + } + } + }, { + "path": "withdrawList/withdrawList", + "style": { + "navigationBarTitleText": "提现记录", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#3175f9", + "navigationBarTextStyle": "white" + } - }, { - "path": "topUpList/topUpList", - "style": { - "navigationBarTitleText": "充值记录", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#3175f9", - "navigationBarTextStyle": "white" - } + }, { + "path": "noticeList/noticeList", + "style": { + "navigationBarTitleText": "公告列表", + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#3175f9", + "navigationBarTextStyle": "white" + } - }, { - "path": "companyAdmin/companyAdmin", - "style": { - "navigationBarTitleText": "公司管理", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#3175f9", - "navigationBarTextStyle": "white" - } + }, { + "path": "topUpList/topUpList", + "style": { + "navigationBarTitleText": "充值记录", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#3175f9", + "navigationBarTextStyle": "white" + } - }, { - "path": "newPersonnel/newPersonnel", - "style": { - "navigationBarTitleText": "新增人员", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#3175f9", - "navigationBarTextStyle": "white" - } + }, { + "path": "companyAdmin/companyAdmin", + "style": { + "navigationBarTitleText": "公司管理", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#3175f9", + "navigationBarTextStyle": "white" + } - }, { - "path": "archives/archives", - "style": { - "navigationBarTitleText": "档案管理", - "enablePullDownRefresh": true, - "navigationBarBackgroundColor": "#3175f9", - "navigationBarTextStyle": "white" - } + }, { + "path": "newPersonnel/newPersonnel", + "style": { + "navigationBarTitleText": "新增人员", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#3175f9", + "navigationBarTextStyle": "white" + } - }, { - "path": "newArchives/newArchives", - "style": { - "navigationBarTitleText": "信息登记", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#3175f9", - "navigationBarTextStyle": "white" - } + }, { + "path": "archives/archives", + "style": { + "navigationBarTitleText": "档案管理", + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#3175f9", + "navigationBarTextStyle": "white" + } - }, { - "path": "updateArchives/updateArchives", - "style": { - "navigationBarTitleText": "信息更新", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#3175f9", - "navigationBarTextStyle": "white" - } + }, { + "path": "newArchives/newArchives", + "style": { + "navigationBarTitleText": "信息登记", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#3175f9", + "navigationBarTextStyle": "white" + } - }, { - "path": "fixedAssets/fixedAssets", - "style": { - "navigationBarTitleText": "固定资产", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#3175f9", - "navigationBarTextStyle": "white" - } + }, { + "path": "updateArchives/updateArchives", + "style": { + "navigationBarTitleText": "信息更新", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#3175f9", + "navigationBarTextStyle": "white" + } - }, { - "path": "taskAdmin/taskAdmin", - "style": { - "navigationBarTitleText": "任务管理", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#3175f9", - "navigationBarTextStyle": "white" - } + }, { + "path": "fixedAssets/fixedAssets", + "style": { + "navigationBarTitleText": "固定资产", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#3175f9", + "navigationBarTextStyle": "white" + } - }, { - "path": "archivesDetail/archivesDetail", - "style": { - "navigationBarTitleText": "档案详情", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#3175f9", - "navigationBarTextStyle": "white" - } + }, { + "path": "taskAdmin/taskAdmin", + "style": { + "navigationBarTitleText": "任务管理", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#3175f9", + "navigationBarTextStyle": "white" + } - }, { - "path": "captain/captain", - "style": { - "navigationBarTitleText": "队长列表", - "enablePullDownRefresh": true, - "navigationBarBackgroundColor": "#3175f9", - "navigationBarTextStyle": "white" - } + }, { + "path": "archivesDetail/archivesDetail", + "style": { + "navigationBarTitleText": "档案详情", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#3175f9", + "navigationBarTextStyle": "white" + } - }, { - "path": "companyFinance/companyFinance", - "style": { - "navigationBarTitleText": "公司财务", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#3175f9", - "navigationBarTextStyle": "white" - } + }, { + "path": "captain/captain", + "style": { + "navigationBarTitleText": "队长列表", + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#3175f9", + "navigationBarTextStyle": "white" + } - }, { - "path": "companyUnsign/companyUnsign", - "style": { - "navigationBarTitleText": "未签约公司列表", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#3175f9", - "navigationBarTextStyle": "white" - } + }, { + "path": "companyFinance/companyFinance", + "style": { + "navigationBarTitleText": "公司财务", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#3175f9", + "navigationBarTextStyle": "white" + } - }, { - "path": "submit/submit", - "style": { - "navigationBarTitleText": "提交审核", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#3175f9", - "navigationBarTextStyle": "white" - } + }, { + "path": "companyUnsign/companyUnsign", + "style": { + "navigationBarTitleText": "未签约公司列表", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#3175f9", + "navigationBarTextStyle": "white" + } - }, { - "path": "dispatching/dispatching", - "style": { - "navigationBarTitleText": "任务:宣传配送", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#3175f9", - "navigationBarTextStyle": "white" - } + }, { + "path": "submit/submit", + "style": { + "navigationBarTitleText": "提交审核", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#3175f9", + "navigationBarTextStyle": "white" + } - }, { - "path": "blockTransaction/blockTransaction", - "style": { - "navigationBarTitleText": "任务:片区交易", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#3175f9", - "navigationBarTextStyle": "white" - } + }, { + "path": "dispatching/dispatching", + "style": { + "navigationBarTitleText": "任务:宣传配送", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#3175f9", + "navigationBarTextStyle": "white" + } - }, { - "path": "fileTask/fileTask", - "style": { - "navigationBarTitleText": "任务:档案更新", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#3175f9", - "navigationBarTextStyle": "white" - } + }, { + "path": "blockTransaction/blockTransaction", + "style": { + "navigationBarTitleText": "任务:片区交易", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#3175f9", + "navigationBarTextStyle": "white" + } - }] - }], - "globalStyle": { - "navigationBarTextStyle": "black", - "navigationBarTitleText": "uni-app", - "navigationBarBackgroundColor": "#F8F8F8", - "backgroundColor": "#F8F8F8" - }, - "tabBar": { - "color": "#282828", - "selectedColor": "#3175f9", - "borderStyle": "white", - "backgroundColor": "#ffffff", - "list": [{ - "pagePath": "pages/oaHome/oaHome", - "text": "首页", - "iconPath": "/static/tabs-icon/home.png", - "selectedIconPath": "/static/tabs-icon/home-a.png" - }, - { - "pagePath": "pages/oaExamine/oaExamine", - "text": "审批", - "iconPath": "/static/tabs-icon/Task.png", - "selectedIconPath": "/static/tabs-icon/Task-a.png" - }, - { - "pagePath": "pages/oaTask/oaTask", - "text": "任务", - "iconPath": "/static/tabs-icon/approval.png", - "selectedIconPath": "/static/tabs-icon/approval-a.png" - }, - // { - // "pagePath": "pages/oaManager/oaManager", - // "text": "片区经理", - // "iconPath": "/static/tabs-icon/manager.png", - // "selectedIconPath": "/static/tabs-icon/manager-a.png" - // }, - { - "pagePath": "pages/business/business", - "text": "商机", - "iconPath": "/static/tabs-icon/manager.png", - "selectedIconPath": "/static/tabs-icon/manager-a.png" - }, - { - "pagePath": "pages/oaMy/oaMy", - "text": "我的", - "iconPath": "/static/tabs-icon/my.png", - "selectedIconPath": "/static/tabs-icon/my-a.png" - } - ] - }, - "uniIdRouter": {} + }, { + "path": "fileTask/fileTask", + "style": { + "navigationBarTitleText": "任务:档案更新", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#3175f9", + "navigationBarTextStyle": "white" + } + + }] + }], + "globalStyle": { + "navigationBarTextStyle": "black", + "navigationBarTitleText": "uni-app", + "navigationBarBackgroundColor": "#F8F8F8", + "backgroundColor": "#F8F8F8" + }, + "tabBar": { + "color": "#282828", + "selectedColor": "#3175f9", + "borderStyle": "white", + "backgroundColor": "#ffffff", + "list": [{ + "pagePath": "pages/oaHome/oaHome", + "text": "首页", + "iconPath": "/static/tabs-icon/home.png", + "selectedIconPath": "/static/tabs-icon/home-a.png" + }, + { + "pagePath": "pages/oaExamine/oaExamine", + "text": "审批", + "iconPath": "/static/tabs-icon/Task.png", + "selectedIconPath": "/static/tabs-icon/Task-a.png" + }, + { + "pagePath": "pages/oaTask/oaTask", + "text": "任务", + "iconPath": "/static/tabs-icon/approval.png", + "selectedIconPath": "/static/tabs-icon/approval-a.png" + }, + // { + // "pagePath": "pages/oaManager/oaManager", + // "text": "片区经理", + // "iconPath": "/static/tabs-icon/manager.png", + // "selectedIconPath": "/static/tabs-icon/manager-a.png" + // }, + { + "pagePath": "pages/business/business", + "text": "商机", + "iconPath": "/static/tabs-icon/manager.png", + "selectedIconPath": "/static/tabs-icon/manager-a.png" + }, + { + "pagePath": "pages/oaMy/oaMy", + "text": "我的", + "iconPath": "/static/tabs-icon/my.png", + "selectedIconPath": "/static/tabs-icon/my-a.png" + } + ] + }, + "uniIdRouter": {} } \ No newline at end of file diff --git a/pages/oaLogin/oaLogin.vue b/pages/oaLogin/oaLogin.vue index 549a50b..e3fbea0 100644 --- a/pages/oaLogin/oaLogin.vue +++ b/pages/oaLogin/oaLogin.vue @@ -79,9 +79,21 @@ import { Toast } from "../../libs/uniApi"; let { data } = await userInfo(); this.$store.commit('setUserInfo', data); uni.hideLoading() - uni.switchTab({ - url: '/pages/oaHome/oaHome' - }) + if(data.is_new_user) { + uni.showLoading({ + mask:true, + title:'加载中' + }) + uni.switchTab({ + url:'/pages/oaHome/oaHome', + success: () => { + uni.hideLoading() + } + }) + } + else uni.navigateTo({ + url: '/pages/updatePasswprd/updatePasswprd' + }); }, initTerminal() { // #ifndef APP-PLUS diff --git a/pages/updatePasswprd/updatePasswprd.vue b/pages/updatePasswprd/updatePasswprd.vue new file mode 100644 index 0000000..9f9e58a --- /dev/null +++ b/pages/updatePasswprd/updatePasswprd.vue @@ -0,0 +1,96 @@ + + + + + \ No newline at end of file diff --git a/static/icons/setting.png b/static/icons/setting.png new file mode 100644 index 0000000000000000000000000000000000000000..719e7bfd12e2d3449227208c04832ae07fdc4126 GIT binary patch literal 5013 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合同已生成,请等待审核 - + @@ -22,6 +22,11 @@ + + + + 查看 + @@ -101,6 +106,12 @@ type: 1 //1-公司,2-个人 }) }, + // 查看合同 + naviToContract(file) { + uni.navigateTo({ + url: `/subpkg/pdfView/pdfView?url=${file}` + }) + }, // 初始化合同类型 async initContractTypeList() { let res = await dictDataLists({ @@ -110,50 +121,78 @@ }, // 生成合同 async createContract(data) { - uni.showLoading({ - title:'合同生成中', - mask: true + uni.showModal({ + content: '请检查信息无误后再生成合同', + confirmText: '确认无误', + cancelText: '我再看看', + confirmColor: '#3175f9', + success: async (e) => { + if (e.confirm) { + uni.showLoading({ + title:'合同生成中', + mask: true + }) + let res = await initiateContract({ + party_b: data.party_b, + contract_type: data.contract_type, + type: data.type + }) + this.initCompany(); + uni.hideLoading(); + Toast(res.msg || '合同已生成'); + this.navTo('/subpkg/submit/submit?type=' + 1); + } + } }) - let res = await initiateContract({ - party_b: data.party_b, - contract_type: data.contract_type, - type: data.type - }) - this.initCompany(); - uni.hideLoading(); - Toast(res.msg || '合同已生成') }, // 发送合同 async addContract(data) { - try{ - uni.showLoading({ - title:'合同发送中', - mask: true - }) - let res = await Draftingcontracts({ - id: this.id - }); - this.initCompany(); - if (this.userInfo.contract.check_status == 3) { - this.startTimer(); + uni.showModal({ + content: '请检查合同无误后再发送', + confirmText: '确认无误', + cancelText: '我再看看', + confirmColor: '#3175f9', + success: async (e) => { + if (e.confirm) { + try{ + uni.showLoading({ + title:'合同发送中', + mask: true + }) + let res = await Draftingcontracts({ + id: this.id + }); + this.initCompany(); + this.startTimer(); + uni.hideLoading(); + Toast('合同已发送'); + // this.navTo('/subpkg/submit/submit'); + }catch(e){ + uni.hideLoading(); + Toast(e.msg||'合同发送失败'); + } + } } - uni.hideLoading(); - Toast('合同已发送'); - this.navTo('/subpkg/submit/submit'); - }catch(e){ - uni.hideLoading(); - Toast(e.msg||'合同发送失败'); - } + }) }, // 发送短信 async getPostsms() { - if (this.timerCount == 0) { - this.startTimer(); - let res = await postsms({ - id: this.id + try { + uni.showLoading({ + title: '发送中', + mask: true }) - Toast('短信已发送'); - this.navTo('/subpkg/submit/submit'); + if (this.timerCount == 0) { + this.startTimer(); + let res = await postsms({ + id: this.id + }) + Toast('短信已发送'); + // this.navTo('/subpkg/submit/submit'); + } + } catch (e) { + uni.hideLoading(); + Toast(e.msg || '合同发送失败'); } }, // 定时器 diff --git a/subpkg/companyUnsign/companyUnsign.vue b/subpkg/companyUnsign/companyUnsign.vue index 2336d53..aaddeba 100644 --- a/subpkg/companyUnsign/companyUnsign.vue +++ b/subpkg/companyUnsign/companyUnsign.vue @@ -17,13 +17,14 @@ 联系方式：{{item.master_phone}} 区县乡镇： - {{item.city_name+'/'+item.area_name+'/'+item.street_name}} + {{c_address(item)}} - + @@ -33,76 +34,91 @@ + \ No newline at end of file diff --git a/subpkg/personnelDetails/personnelDetails.vue b/subpkg/personnelDetails/personnelDetails.vue index c940bd2..befcabf 100644 --- a/subpkg/personnelDetails/personnelDetails.vue +++ b/subpkg/personnelDetails/personnelDetails.vue @@ -106,14 +106,17 @@ - + - - @@ -165,12 +168,17 @@ - {{userInfo.contract.contract_type_name}} + {{userInfo.contract.contract_type_name||'合同'}} {{userInfo.contract&&userInfo.contract.create_time}} + + + + 查看 + @@ -256,12 +264,12 @@ this.initContractTypeList(); this.loadUserDetail(); let time = uni.getStorageSync('time' + this.id); - if(time>0&&(time - Date.now())/1000>0){ - this.startTimer((time - Date.now())/1000); + if (time > 0 && (time - Date.now()) / 1000 > 0) { + this.startTimer((time - Date.now()) / 1000); } }, onUnload() { - if(this.timerCount>0) uni.setStorageSync('time'+this.id, this.timerCount*1000+Date.now()); + if (this.timerCount > 0) uni.setStorageSync('time' + this.id, this.timerCount * 1000 + Date.now()); }, computed: { cTimerCount() { @@ -269,16 +277,21 @@ } }, methods: { + // 查看合同 naviToContract(contract_no) { - download_file({ - applyNo: contract_no - }).then(res => { - if (res.code != 1) { - Toast(res.msg) - } - uni.navigateTo({ - url: `/subpkg/pdfView/pdfView?url=${res.data.url}` + if (this.userInfo.is_contract) { + download_file({ + applyNo: contract_no + }).then(res => { + if (res.code != 1) { + Toast(res.msg) + } + uni.navigateTo({ + url: `/subpkg/pdfView/pdfView?url=${res.data.url}` + }) }) + } else uni.navigateTo({ + url: `/subpkg/pdfView/pdfView?url=${this.userInfo?.contract?.file}` }) }, navTo(url) { @@ -322,41 +335,60 @@ this.contractTypeList = res.data; }, // 生成合同 - async createContract(data) { - uni.showLoading({ - title: '合同生成中', - mask: true + createContract(data) { + uni.showModal({ + content: '请检查信息无误后再生成合同', + confirmText: '确认无误', + cancelText: '我再看看', + confirmColor: '#3175f9', + success: async (e) => { + if (e.confirm) { + uni.showLoading({ + title: '合同生成中', + mask: true + }) + let res = await userInitiateContract({ + party_b: data.party_b, + contract_type: data.contract_type, + type: data.type + }) + this.loadUserDetail(); + uni.hideLoading(); + Toast('合同已生成'); + this.navTo('/subpkg/submit/submit?type=' + 1); + } + } }) - let res = await userInitiateContract({ - party_b: data.party_b, - contract_type: data.contract_type, - type: data.type - }) - this.loadUserDetail(); - uni.hideLoading(); - Toast('合同已生成'); }, // 发送合同 async addContract(data) { - try { - uni.showLoading({ - title: '合同发送中', - mask: true - }) - let res = await userDraftingcontracts({ - id: this.userInfo.id - }); - this.loadUserDetail(); - if (this.userInfo.contract.check_status == 3) { - this.startTimer(); + uni.showModal({ + content: '请检查合同无误后再发送', + confirmText: '确认无误', + cancelText: '我再看看', + confirmColor: '#3175f9', + success: async (e) => { + if (e.confirm) { + try { + uni.showLoading({ + title: '合同发送中', + mask: true + }) + let res = await userDraftingcontracts({ + id: this.userInfo.id + }); + this.loadUserDetail(); + this.startTimer(); + uni.hideLoading(); + Toast('合同已发送'); + // this.navTo('/subpkg/submit/submit?type='+2); + } catch (e) { + uni.hideLoading(); + Toast(e.msg || '合同发送失败'); + } + } } - uni.hideLoading(); - Toast('合同已发送'); - this.navTo('/subpkg/submit/submit'); - } catch (e) { - uni.hideLoading(); - Toast(e.msg || '合同发送失败'); - } + }) }, // 发送短信 async getPostsms() { @@ -372,7 +404,7 @@ }) uni.hideLoading(); Toast('短信已发送'); - this.navTo('/subpkg/submit/submit'); + // this.navTo('/subpkg/submit/submit?type='+3); } } catch (e) { uni.hideLoading(); @@ -380,7 +412,7 @@ } }, // 定时器 - startTimer(time=60){ + startTimer(time = 60) { this.timerCount = time.toFixed(0); this.timer = setInterval(() => { this.timerCount--;