From b51981f093c04ecb728b998362e846a34eb0402a Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Mon, 20 Nov 2023 18:23:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
api/oa.js | 13 +-
api/upload.js | 8 +-
components/UploadDemo.vue | 12 +-
components/return/index.vue | 4 +-
components/w-picker/date-picker.vue | 2 +-
components/w-picker/half-picker.vue | 2 +-
components/w-picker/range-picker.vue | 2 +-
components/w-picker/shortterm-picker.vue | 2 +-
components/w-picker/time-picker.vue | 2 +-
libs/login.js | 2 +-
libs/uniApi.js | 8 +-
pages.json | 24 +-
pages/addemployees/index.vue | 12 +-
pages/invoice/add.vue | 195 +++-
pages/invoice/bianji.vue | 171 ++-
pages/invoice/detail.vue | 383 +++++--
pages/invoice/handle.vue | 302 ++++-
pages/invoice/index.vue | 122 ++-
pages/jobtitle/index.vue | 4 +-
pages/leave_request/bianji.vue | 179 ++-
pages/leave_request/detail.vue | 340 +++++-
pages/leave_request/index.vue | 670 ++++++++----
pages/leave_request/index1.vue | 44 +-
pages/leave_request/index2.vue | 1188 ++++++++++++++++++++
pages/leaveapplication/index.vue | 284 +++--
pages/leaveapplication/index2.vue | 14 +-
pages/message/detail.vue | 16 +-
pages/message/index.vue | 2 +-
pages/oaLogin/editpwd.vue | 6 +-
pages/oaTask/detail.vue | 628 +++++++++++
pages/oaTask/oaTask.vue | 45 +-
pages/personneltransfer/index.vue | 4 +-
pages/project/detail.vue | 1217 +++++++++++++++++++++
pages/project/index.vue | 10 +-
pages/quest/index.vue | 2 +-
pages/reimbursement/index.vue | 69 +-
pages/reimbursementapplication/bianji.vue | 81 +-
pages/reimbursementapplication/handle.vue | 343 ++++--
pages/reimbursementapplication/index.vue | 144 ++-
pages/reimbursementrecord/index.vue | 4 +-
pages/resignationprofile/index.vue | 7 +-
pages/resources/index.vue | 37 +-
pages/structure/index.vue | 12 +-
pages/user/user.vue | 18 +-
pages/users/myInformation/index.vue | 22 +-
pages/waitlist/index.vue | 7 +-
pages/workrecord/index.vue | 4 +-
store/modules/app.js | 2 +-
store/modules/config.js | 4 +-
49 files changed, 5720 insertions(+), 953 deletions(-)
create mode 100644 pages/leave_request/index2.vue
create mode 100644 pages/oaTask/detail.vue
create mode 100644 pages/project/detail.vue
diff --git a/api/oa.js b/api/oa.js
index 2545cf8..02a964a 100644
--- a/api/oa.js
+++ b/api/oa.js
@@ -115,6 +115,7 @@ export const deletelink= (data) => oahttp.post('/project_index/delete_link',data
+
//获取项目任务列表
export const projecttasklist = (data) => oahttp.get('/project_task/index',data)
//新增项目任务
@@ -155,7 +156,7 @@ export const appmessageinbox = (data) => oahttp.get('/message_index/inbox',data)
//获取审批消息
export const appmessageread = (data) => oahttp.get('/message_index/read',data)
//流程审批
-export const appflow_check = (data) => oahttp.post('/oa_approve/flow_check',data)
+export const appflow_check = (data) => oahttp.post('/common/flow_check',data)
//获取审批消息
export const appapproveview= (data) => oahttp.get('/oa_approve/view',data)
@@ -193,6 +194,8 @@ export const topayview = (data) => oahttp.get('/finance_expense/topay',data)
//获取报销打款
export const checkedlist = (data) => oahttp.get('/finance_expense/checkedlist',data)
+//报销设置打款状态
+export const expenstopay = (data) => oahttp.post('/finance_expense/topay',data)
//发票
//我申请的发票
@@ -254,5 +257,13 @@ export const deleteincome = (data) => oahttp.post('/finance_income/delete',data)
// 获取未读消息数
export const msgcount = (data) => oahttp.get('/common/msg_count',data)
+//删除审批消息
export const deletemessage = (data) => oahttp.post('/message_index/delete',data)
+//获取审批审核人员所有审批】
+export const flowusers = (data) => oahttp.post('/common/get_flow_users',data)
+
+
+//获取审批审核人员所有审批】
+export const flownodes = (data) => oahttp.post('/common/get_flow_nodes',data)
+
diff --git a/api/upload.js b/api/upload.js
index dc41137..806bcb7 100644
--- a/api/upload.js
+++ b/api/upload.js
@@ -8,7 +8,7 @@ let header = HEADER;
}
function uploads(src, type) {
return new Promise((resolve, reject) => {
- // console.log('上传', type === 'img' ? '图片' : '视频', ':', src)
+ // //console.log('上传', type === 'img' ? '图片' : '视频', ':', src)
let a = uni.uploadFile({
// url: base.baseUrl + '/upload?token=',
url: HTTP_REQUEST_URL_TWO + '/api' + '/upload?token=',
@@ -25,7 +25,7 @@ function uploads(src, type) {
},
fail: (err) => {
reject(err)
- console.log('upload-上传失败', err)
+ //console.log('upload-上传失败', err)
}
});
})
@@ -33,7 +33,7 @@ function uploads(src, type) {
function oaUploads(src, type) {
return new Promise((resolve, reject) => {
- // console.log('上传', type === 'img' ? '图片' : '视频', ':', src)
+ // //console.log('上传', type === 'img' ? '图片' : '视频', ':', src)
let a = uni.uploadFile({
url: HTTP_REQUEST_URL_THREE + '/api/common/upload',
@@ -52,7 +52,7 @@ function oaUploads(src, type) {
},
fail: (err) => {
reject(err)
- console.log('upload-上传失败', err)
+ //console.log('upload-上传失败', err)
}
});
})
diff --git a/components/UploadDemo.vue b/components/UploadDemo.vue
index 15cde1a..ec0ee9d 100644
--- a/components/UploadDemo.vue
+++ b/components/UploadDemo.vue
@@ -98,7 +98,7 @@ export default {
// });
},
handleUploadCallback(e) {
- console.log('UploadCallback', e);
+ //console.log('UploadCallback', e);
if (['choose', 'success'].includes(e.type)) {
// 根据接口返回修改对应的response相关的逻辑
const tmpFiles = (e.data || []).map(({ response, tempFilePath, name, fileType }) => {
@@ -125,25 +125,25 @@ export default {
},
// 自定义上传
handleUploadFile({ url }) {
- console.log('UploadFile', url);
+ //console.log('UploadFile', url);
uni.uploadFile({
url: 'http://192.168.31.185:3000/api/upload',
filePath: url,
name: 'file',
success: (res) => {
- console.log('handleUpload success', res);
+ //console.log('handleUpload success', res);
const tmpData = JSON.parse(res.data);
uni.showToast({ title: tmpData.success ? '上传成功' : '上传失败', icon: 'none' });
},
fail: (err) => {
- console.log('handleUpload fail', err);
+ //console.log('handleUpload fail', err);
uni.showToast({ title: '出错啦', icon: 'none' });
},
});
},
// 预览
handlePreview({ url }) {
- console.log('PreviewFile', url);
+ //console.log('PreviewFile', url);
const fileType = this.getFileType(url);
if (fileType === 'image') {
return uni.previewImage({
@@ -156,7 +156,7 @@ export default {
return uni.openDocument({
filePath: url,
fail: (err) => {
- console.log(err);
+ //console.log(err);
uni.showToast({ icon: 'none', title: '文件预览失败' });
},
});
diff --git a/components/return/index.vue b/components/return/index.vue
index 50282f4..3baeba8 100644
--- a/components/return/index.vue
+++ b/components/return/index.vue
@@ -35,7 +35,7 @@
}
},
mounted() {
- console.log(this.isshow)
+ //console.log(this.isshow)
},
methods: {
close(){
@@ -46,7 +46,7 @@
returnbom() {
uni.sendHostEvent('closeApp', (ret) => {
//发送消息成功回调
- console.log('关闭应用' + JSON.stringify(ret));
+ //console.log('关闭应用' + JSON.stringify(ret));
});
}
}
diff --git a/components/w-picker/date-picker.vue b/components/w-picker/date-picker.vue
index c0154d5..81c15e2 100644
--- a/components/w-picker/date-picker.vue
+++ b/components/w-picker/date-picker.vue
@@ -168,7 +168,7 @@
break;
}
if(!strReg.test(value)){
- console.log(new Error("请传入与mode、fields匹配的value值,例value="+example+""))
+ //console.log(new Error("请传入与mode、fields匹配的value值,例value="+example+""))
}
return strReg.test(value);
},
diff --git a/components/w-picker/half-picker.vue b/components/w-picker/half-picker.vue
index 0fdfb33..2f0500e 100644
--- a/components/w-picker/half-picker.vue
+++ b/components/w-picker/half-picker.vue
@@ -67,7 +67,7 @@
checkValue(value){
let strReg=/^\d{4}-\d{2}-\d{2} [\u4e00-\u9fa5]{2}$/,example;
if(!strReg.test(value)){
- console.log(new Error("请传入与mode、fields匹配的value值,例value="+example+""))
+ //console.log(new Error("请传入与mode、fields匹配的value值,例value="+example+""))
}
return strReg.test(value);
},
diff --git a/components/w-picker/range-picker.vue b/components/w-picker/range-picker.vue
index 7dd8b5b..beff484 100644
--- a/components/w-picker/range-picker.vue
+++ b/components/w-picker/range-picker.vue
@@ -74,7 +74,7 @@
checkValue(value){
let strReg=/^\d{4}-\d{2}-\d{2}$/,example="2020-04-03";
if(!strReg.test(value[0])||!strReg.test(value[1])){
- console.log(new Error("请传入与mode匹配的value值,例["+example+","+example+"]"))
+ //console.log(new Error("请传入与mode匹配的value值,例["+example+","+example+"]"))
}
return strReg.test(value[0])&&strReg.test(value[1]);
},
diff --git a/components/w-picker/shortterm-picker.vue b/components/w-picker/shortterm-picker.vue
index d133cf4..53d164f 100644
--- a/components/w-picker/shortterm-picker.vue
+++ b/components/w-picker/shortterm-picker.vue
@@ -56,7 +56,7 @@
checkValue(value){
let strReg=/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}(:\d{2})?$/,example="2019-12-12 18:05:00或者2019-12-12 18:05";
if(!strReg.test(value)){
- console.log(new Error("请传入与mode、fields匹配的value值,例value="+example+""))
+ //console.log(new Error("请传入与mode、fields匹配的value值,例value="+example+""))
}
return strReg.test(value);
},
diff --git a/components/w-picker/time-picker.vue b/components/w-picker/time-picker.vue
index 2fc57e4..96909bb 100644
--- a/components/w-picker/time-picker.vue
+++ b/components/w-picker/time-picker.vue
@@ -56,7 +56,7 @@
checkValue(value){
let strReg=/^\d{2}:\d{2}:\d{2}$/,example="18:00:05";
if(!strReg.test(value)){
- console.log(new Error("请传入与mode、fields匹配的value值,例value="+example+""))
+ //console.log(new Error("请传入与mode、fields匹配的value值,例value="+example+""))
}
return strReg.test(value);
},
diff --git a/libs/login.js b/libs/login.js
index 9346b8f..f70b5d3 100644
--- a/libs/login.js
+++ b/libs/login.js
@@ -23,7 +23,7 @@ import {
function prePage() {
let pages = getCurrentPages();
- console.log(pages)
+ //console.log(pages)
let prePage = pages[pages.length - 2];
// #ifdef H5
return prePage;
diff --git a/libs/uniApi.js b/libs/uniApi.js
index ffd8def..ca99e9c 100644
--- a/libs/uniApi.js
+++ b/libs/uniApi.js
@@ -1,7 +1,7 @@
// import uniCopy from '@/js_sdk/xb-copy/uni-copy.js'; // 拷贝功能插件
// import compressImage from './compressImage.js'; // 解决图片旋转90°问题
// const device = uni.getSystemInfoSync();
-// console.log("device:======================== " + JSON.stringify(device));
+// //console.log("device:======================== " + JSON.stringify(device));
/*
参数说明
@url
@@ -180,7 +180,7 @@ export function GetUserInfo() {
return new Promise((reslove, reject) => {
uni.getUserInfo({
success(res) {
- console.log(res);
+ //console.log(res);
reslove(res);
},
fail(rej) {
@@ -258,9 +258,9 @@ export function chooseImage(count) {
}
// function compressImageHandler(src) {
-// // console.log('platform===' + device.platform)
+// // //console.log('platform===' + device.platform)
// const tempPath = compressImage(src, device.platform);
-// // console.log('tempPath-----' + tempPath);
+// // //console.log('tempPath-----' + tempPath);
// return tempPath
// }
//序列化对象和数组
diff --git a/pages.json b/pages.json
index 9fdb29f..2d0e2bf 100644
--- a/pages.json
+++ b/pages.json
@@ -5,7 +5,10 @@
"path": "pages/index/index",
"style": {
"navigationBarTitleText": "首页",
- "navigationStyle": "custom"
+
+ "navigationStyle": "custom",
+ "enablePullDownRefresh": true
+
}
},
{
@@ -37,6 +40,13 @@
"navigationBarBackgroundColor": "#3274F9",
"navigationBarTextStyle": "white"
}
+ },{
+ "path": "pages/oaTask/detail",
+ "style": {
+ "navigationBarTitleText": "任务详情",
+ "navigationBarBackgroundColor": "#3274F9",
+ "navigationBarTextStyle": "white"
+ }
},
{
"path": "pages/employees/index",
@@ -46,6 +56,7 @@
"navigationBarTextStyle": "white"
}
},
+
{
"path": "pages/structure/index",
"style": {
@@ -55,7 +66,7 @@
}
},
-
+
{
"path": "pages/examine/index",
"style": {
@@ -68,7 +79,7 @@
"path": "pages/appcenter/index",
"style": {
"navigationBarTitleText": "应用中心",
- "navigationBarBackgroundColor": "#3274F9",
+ "navigationBarBackgroundColor": "#3274F9",
"navigationBarTextStyle": "white"
}
},
@@ -174,6 +185,13 @@
"navigationBarBackgroundColor": "#3274F9",
"navigationBarTextStyle": "white"
}
+ }, {
+ "path": "pages/project/detail",
+ "style": {
+ "navigationBarTitleText": "项目详情",
+ "navigationBarBackgroundColor": "#3274F9",
+ "navigationBarTextStyle": "white"
+ }
},
{
"path": "pages/addproject/index",
diff --git a/pages/addemployees/index.vue b/pages/addemployees/index.vue
index bcb6696..7a02461 100644
--- a/pages/addemployees/index.vue
+++ b/pages/addemployees/index.vue
@@ -233,7 +233,7 @@
})
this.companydetail(option.data)
// this.buname=
- // console.log(this.columns3[0])
+ // //console.log(this.columns3[0])
}
this.getDocumentList()
@@ -328,7 +328,7 @@
this.flag1 = false
},
confirm1(e) {
- console.log(e)
+ //console.log(e)
this.merchantData.position_id = e.value[0].id
this.companygw = e.value[0].title
this.flag2 = false
@@ -337,7 +337,7 @@
validateForm: function() {
let that = this,
value = that.merchantData;
- console.log(that.merchantData)
+ //console.log(that.merchantData)
if (!value.thumb) return Toast(
'请选择头像'
);
@@ -386,7 +386,7 @@
},
async submit() {
let that = this
- console.log(that.validate)
+ //console.log(that.validate)
if (this.validateForm() && this.validate) {
const res = await addcomanyer(this.merchantData)
Toast(res.msg);
@@ -413,12 +413,12 @@
Toast('上传成功')
}).catch(err => {
- console.log('err', err);
+ //console.log('err', err);
Toast('上传失败')
})
},
fail: function(err) {
- console.log('choose失败');
+ //console.log('choose失败');
Toast('添加失败')
}
});
diff --git a/pages/invoice/add.vue b/pages/invoice/add.vue
index 486418d..0169ce1 100644
--- a/pages/invoice/add.vue
+++ b/pages/invoice/add.vue
@@ -9,13 +9,13 @@
-
+
开票类型:
-
+
开票主体:
@@ -62,12 +62,12 @@
-
+
银行营业网点 :
-
+
地址:
@@ -79,49 +79,67 @@
-
+
-
-
-
+ :instantly="true" @change="changeFile" @uploadEnd='onuploadEnd' @progress='onprogre'>
-
-
-
+
+
选择审批流程:
-
+
审核人:
+
+
+
+
+
+ 第{{i+1}}级 {{item.flow_type_txt}}
+
+
+
+
+
+
+
+ {{items.name}}
+
+
+
+
抄送人:
@@ -145,17 +163,17 @@
+ @close="flowPathShow=false" @cancel="flowPathShow=false" :closeOnClickOverlay="true" :closeOnClickAction="true">
@@ -176,12 +194,12 @@
Toast
} from '../../libs/uniApi'
import {
-
-
-
+
+
+ flowusers,
userdepartment,
getemployee,
- addinvoice,
+ addinvoice,
invoicecate,
appexpenseview,
invoiceview,
@@ -191,6 +209,9 @@
import {
FILE_URL
} from '@/api/file.js'
+ import {
+ HTTP_REQUEST_URL
+ } from '@/config/app.js'
export default {
components: {
lsjUpload
@@ -221,7 +242,7 @@
columns: [],
check_admin_name: '',
copy_names: '',
- isshow:true,
+ isshow: true,
columns1: [{
name: '增值税专用发票',
id: 1,
@@ -229,11 +250,11 @@
{
name: '普通发票',
id: 2,
- },{
+ }, {
name: '专用发票',
id: 3
}
-
+
],
list: [{
cate_title: "",
@@ -243,11 +264,17 @@
fileOption: {},
files: new Map(),
fileArray: [],
- dnum: 0
+ dnum: 0,
+ flowShow: true
}
},
onLoad() {
-
+
+ },
+ computed: {
+ httpRequestUrl() {
+ return HTTP_REQUEST_URL;
+ }
},
onShow() {
this.fileOption = {
@@ -269,7 +296,20 @@
methods: {
+ //选择流程id
+ async flowuser(id) {
+ let res = await flowusers({
+ id: id
+ })
+ if (res.data.flow_data.length > 0) {
+ this.flowShow = false
+ this.sprecord = res.data.flow_data
+ } else {
+ this.flowShow = true
+ }
+
+ },
reset() {
this.list = [{
name: "",
@@ -280,8 +320,8 @@
this.copy_names = ''
this.flowPath = ''
this.check_admin_name = ''
- this.project1=''
- this.project2=''
+ this.project1 = ''
+ this.project2 = ''
},
async getDocumentList1() {
let res = await invoicecate()
@@ -391,10 +431,10 @@
deliveryWayChangetwo(e) {
this.listobj.type = e.detail.value
- if(e.detail.value==2){
- this.isshow=false
- }else{
- this.isshow=true
+ if (e.detail.value == 2) {
+ this.isshow = false
+ } else {
+ this.isshow = true
}
},
//弹窗显示
@@ -415,7 +455,7 @@
branchConfirm1(e) {
console.log('confirm', e, e.value[2].name)
if (this.listobj.copy_uids) {
- this.listobj.copy_uids += e.value[2].id
+ this.listobj.copy_uids += e.value[2].id+ ','
} else {
this.listobj.copy_uids = e.value[2].id
}
@@ -425,15 +465,15 @@
},
async submiteBtn() {
- console.log(this.listobj)
- // let fileIds = [];
- // this.fileArray.map((item, i) => {
- // fileIds.push(item.id)
- // });
+ // console.log(this.listobj)
+ let fileIds = [];
+ this.fileArray.map((item, i) => {
+ fileIds.push(item.id)
+ });
- // if (this.fileArray.length > 0) {
- // this.listobj.file_ids = fileIds.join(',');
- // }
+ if (this.fileArray.length > 0) {
+ this.listobj.file_ids = fileIds.join(',');
+ }
this.listobj.flow_id = this.flow_id
if (this.listobj.invoice_phone) {
const pattern = /^1[3456789]\d{9}$/;
@@ -450,6 +490,11 @@
const res = await addinvoice(this.listobj)
+ if (res.code == 0) {
+ uni.navigateBack({
+ delta: 1
+ })
+ }
Toast('提交成功')
@@ -472,7 +517,7 @@
},
-
+
async getlist1() {
const res = await invoiceflow()
@@ -483,6 +528,8 @@
flowPathSelect(value) {
this.flowPath = value.name
this.flow_id = value.id
+
+ this.flowuser(value.id)
},
/** 类型 */
@@ -495,7 +542,7 @@
leavaType1(e) {
console.log(e)
this.project2 = e.name
- this.listobj.invoice_subject= e.id
+ this.listobj.invoice_subject = e.id
this.leavaTypeShow1 = false
},
leavaType2(e) {
@@ -574,10 +621,11 @@
position: relative;
padding-bottom: 100px;
}
-/deep/.u-action-sheet item-wrap{
- overflow: auto;
- max-height: 50vh;
-}
+
+ /deep/.u-action-sheet__item-wrap {
+ overflow: auto;
+ max-height: 50vh;
+ }
.leave_box,
.flow_path {
@@ -630,9 +678,52 @@
width: 100%;
min-height: 87.72rpx;
border-bottom: 1px solid #f7f7f7;
+ input {
+ width: 460rpx;
+
- .title {
- font-size: 31.58rpx;
+ }
+ font-size: 31.58rpx;
+ }
+
+ .record {
+ position: relative;
+ margin-bottom: 14.04rpx;
+
+ .circle {
+ width: 31.58rpx;
+ height: 31.58rpx;
+ background-color: #fff;
+ border: 2px solid #34A853;
+ border-radius: 50%;
+ margin: 5px;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+
+ &::before {
+ content: "";
+ display: block;
+ position: absolute;
+ clear: both;
+ width: 1px;
+ height: 100%;
+ background-color: rgba(204, 204, 204, 0.5);
+ margin: 31.58rpx;
+ }
+ }
+
+ .text {
+ flex: 1;
+ margin-left: 7.02rpx;
+ }
+ }
+
+ :last-child {
+ .circle {
+ &::before {
+ display: none;
+ }
}
}
diff --git a/pages/invoice/bianji.vue b/pages/invoice/bianji.vue
index 162c9b7..b814548 100644
--- a/pages/invoice/bianji.vue
+++ b/pages/invoice/bianji.vue
@@ -9,13 +9,13 @@
-
+
开票类型:
-
+
开票主体:
@@ -45,7 +45,7 @@
开票抬头:
-
+
电话号码:
@@ -79,49 +79,69 @@
-
+
-
-
+
{{ item.name }}
- {{ item.filesize | formatBytes }}
- 上传人:{{ item.admin_name }}
+ {{ item.filesize }}
+
-
+
- -->
-
-
-
-
+
-
-
+
+
选择审批流程:
-
+
+
审核人:
+
+
+
+
+ 第{{i+1}}级 {{item.flow_type_txt}}
+
+
+
+
+
+
+
+ {{items.name}}
+
+
+
+
抄送人:
@@ -178,7 +198,7 @@
import {
-
+ flowusers,
userdepartment,
getemployee,
addinvoice,
@@ -191,6 +211,9 @@
import {
FILE_URL
} from '@/api/file.js'
+ import {
+ HTTP_REQUEST_URL
+ } from '@/config/app.js'
export default {
components: {
lsjUpload
@@ -222,20 +245,22 @@
columns: [],
check_admin_name: '',
copy_names: '',
- isshow:true,
- columns1: [{
- name: '增值税专用发票',
- id: 1,
- },
- {
- name: '普通发票',
- id: 2,
- },{
- name: '专用发票',
- id: 3
- }
-
- ],
+ isshow: true,
+ flowShow: true,
+ sprecord: [],
+ columns1: [{
+ name: '增值税专用发票',
+ id: 1,
+ },
+ {
+ name: '普通发票',
+ id: 2,
+ }, {
+ name: '专用发票',
+ id: 3
+ }
+
+ ],
list: [{
cate_title: "",
amount: '',
@@ -268,8 +293,26 @@
},
-
+ computed: {
+ httpRequestUrl() {
+ return HTTP_REQUEST_URL;
+ }
+ },
methods: {
+ //选择流程id
+ async flowuser(id) {
+ let res = await flowusers({
+ id: id
+ })
+ if (res.data.flow_data.length > 0) {
+
+ this.flowShow = false
+ this.sprecord = res.data.flow_data
+ } else {
+ this.flowShow = true
+ }
+
+ },
async detail(id) {
let res = await invoiceview({
id: id
@@ -279,6 +322,7 @@
this.project1 = this.columns1.find(obj => obj.id === res.data.detail.type).name;
this.project2 = this.actions4.find(obj => obj.id === res.data.detail.invoice_subject).name;
// this.copy_names = res.data.detail.copy_user
+ this.listobj.id = res.data.detail.id
this.listobj.invoice_account = res.data.detail.invoice_account
this.listobj.invoice_address = res.data.detail.invoice_address
this.listobj.invoice_bank = res.data.detail.invoice_bank
@@ -288,14 +332,14 @@
this.listobj.invoice_tax = res.data.detail.invoice_tax
this.listobj.invoice_title = res.data.detail.invoice_title
this.listobj.invoice_type = res.data.detail.invoice_type
- this.listobj.amount= res.data.detail.amount
- this.listobj.type=res.data.detail.type
+ this.listobj.amount = res.data.detail.amount
+ this.listobj.type = res.data.detail.type
this.selected = res.data.detail.type.toString()
// console.log(res.data.detail.type)
- if( res.data.detail.type==2){
- this.isshow=false
- }else{
- this.isshow=true
+ if (res.data.detail.type == 2) {
+ this.isshow = false
+ } else {
+ this.isshow = true
}
},
reset() {
@@ -419,12 +463,12 @@
deliveryWayChangetwo(e) {
this.listobj.type = e.detail.value
-
- if(e.detail.value==2){
- this.isshow=false
- }else{
- this.isshow=true
+
+ if (e.detail.value == 2) {
+ this.isshow = false
+ } else {
+ this.isshow = true
}
},
//弹窗显示
@@ -445,7 +489,7 @@
branchConfirm1(e) {
console.log('confirm', e, e.value[2].name)
if (this.listobj.copy_uids) {
- this.listobj.copy_uids += e.value[2].id
+ this.listobj.copy_uids += e.value[2].id + ','
} else {
this.listobj.copy_uids = e.value[2].id
}
@@ -456,14 +500,14 @@
async submiteBtn() {
console.log(this.listobj)
- // let fileIds = [];
- // this.fileArray.map((item, i) => {
- // fileIds.push(item.id)
- // });
+ let fileIds = [];
+ this.fileArray.map((item, i) => {
+ fileIds.push(item.id)
+ });
- // if (this.fileArray.length > 0) {
- // this.listobj.file_ids = fileIds.join(',');
- // }
+ if (this.fileArray.length > 0) {
+ this.listobj.file_ids = fileIds.join(',');
+ }
this.listobj.flow_id = this.flow_id
if (this.listobj.invoice_phone) {
const pattern = /^1[3456789]\d{9}$/;
@@ -480,6 +524,11 @@
const res = await addinvoice(this.listobj)
+ if (res.code == 0) {
+ uni.navigateBack({
+ delta: 1
+ })
+ }
Toast('提交成功')
@@ -513,7 +562,7 @@
flowPathSelect(value) {
this.flowPath = value.name
this.flow_id = value.id
-
+ this.flowuser(value.id)
},
/** 类型 */
leavaType(e) {
@@ -604,10 +653,12 @@
position: relative;
padding-bottom: 100px;
}
-/deep/.u-action-sheet__item-wrap {
+
+ /deep/.u-action-sheet__item-wrap {
overflow: auto;
max-height: 50vh;
}
+
.leave_box,
.flow_path {
width: 100%;
@@ -659,7 +710,11 @@
width: 100%;
min-height: 87.72rpx;
border-bottom: 1px solid #f7f7f7;
+input {
+ width: 460rpx;
+
+ }
.title {
font-size: 31.58rpx;
}
diff --git a/pages/invoice/detail.vue b/pages/invoice/detail.vue
index 92cb919..e12c327 100644
--- a/pages/invoice/detail.vue
+++ b/pages/invoice/detail.vue
@@ -6,7 +6,7 @@
开票金额:
-
+
@@ -78,20 +78,20 @@
-
+
-
-
+
+
{{ item.name }}
- {{ item.filesize | formatBytes }}
- 上传人:{{ item.admin_name }}
+ {{ item.filesize }}
+
-
+
- -->
-
-
-
-
+
-
-
+
-
+
撤回意见
-
+
审批流程:
-
+
- {{item.check_time_str}} {{item.name}} {{item.status_str}}
- 了此申请。操作意见:{{item.content}}
+ {{nodelist.create_user}}创建
-
+
+
+
+
+ {{itemh.flow_type==1?'部门负责人':'上级部门负责人'}}
+
+ 当前审核
+
+
+
+ 通过
+ 拒绝
+
+
+ 待审核
+
+
+
+
+
+ {{itemh.flow_type==7?'部门分管领导':'上级部门分管领导'}}
+
+ 当前审核
+
+
+
+ 通过
+ 拒绝
+
+
+ 待审核
+
+
+
+
+
+
+
+ {{itemk.name}}
+
+
+ 当前审核
+
+
+
+ 待审核
+
+
+
+
+
+ 指定人或签
+
+ {{itemk.name}}
+
+
+ 当前审核
+
+
+
+
+
+ 待审核
+
+
+
+ 通过
+ 拒绝
+
+
+
+
+
+
+
+
+ 指定人员(会签)
+
+ {{itemk.name}}
+
+
+ 当前审核
+
+
+
+ 通过
+
+
+
+ 待审核
+ 拒绝
+
+
+
+
+
+
+
+ {{itemk.name}}
+
+
+ 当前审核
+
+
+
+
+ 通过
+
+
+ 待审核
+ 拒绝
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.check_time_str}} {{item.name}} {{item.status_str}}了此申请。操作意见:{{item.content}}
+
+
+
审核状态:
{{listobj.check_status=='0'?'待审核':listobj.check_status=='1'?'审核中':listobj.check_status=='2'?'审核通过':listobj.check_status=='3'?'审核不通过':'撤销审核'}}
-
-
+
+
审核人:
@@ -145,19 +279,20 @@
-
-
-
- 撤回
-
-
-
- 重新编辑
-
+
+
+
+
+ 撤回
+
+
+
+ 重新编辑
+
+
+
-
-
@@ -220,12 +355,16 @@
invoicecate,
appflow_check,
invoiceview,
- invoiceflow
+ invoiceflow,
+ flownodes
} from '@/api/oa.js'
import lsjUpload from '@/uni_modules/lsj-upload/components/lsj-upload/lsj-upload.vue'
import {
FILE_URL
} from '@/api/file.js'
+ import {
+ HTTP_REQUEST_URL
+ } from '@/config/app.js'
export default {
components: {
lsjUpload
@@ -258,7 +397,7 @@
columns: [],
check_admin_name: '',
copy_names: '',
- isshow:true,
+ isshow: true,
columns1: [{
name: '增值税专用发票',
id: 1,
@@ -266,11 +405,11 @@
{
name: '普通发票',
id: 2,
- },{
+ }, {
name: '专用发票',
id: 3
}
-
+
],
list: [{
cate_title: "",
@@ -282,12 +421,15 @@
fileArray: [],
check_record: [],
dnum: 0,
- ktype:1,
+ ktype: 1,
+ nodelist: {},
+ check_step_sort: '',
+ is_create_admin:0,
}
},
onLoad(option) {
this.detail(option.type)
- this.ktype=option.num
+ this.ktype = option.num
},
onShow() {
this.fileOption = {
@@ -309,30 +451,46 @@
methods: {
+ //获取审批节点
+ async flownodes(val) {
+ let res = await flownodes({
+ id: val,
+ type: 3
+ })
+ this.nodelist = res.data
+ // console.log(res)
+ },
async detail(id) {
let res = await invoiceview({
id: id
})
-
+ this.flownodes(id)
this.listobj = res.data.detail
+ this.check_step_sort = res.data.detail.check_step_sort
+ this.is_create_admin= res.data.detail.is_create_admin
this.project1 = this.columns1.find(obj => obj.id === res.data.detail.type).name;
this.project2 = this.actions4.find(obj => obj.id === res.data.detail.invoice_subject).name;
this.check_record = res.data.check_record
this.check_admin_name = res.data.detail.check_user
this.copy_names = res.data.detail.copy_user
-
-
- if( res.data.detail.type==2){
- this.isshow=false
- }else{
- this.isshow=true
+ if (res.data && res.data.detail && res.data.detail.fileArray) {
+ this.fileArray = res.data.detail.fileArray.map(function(obj) {
+ return {
+ name: obj.name,
+ filepath: obj.filepath,
+ fileext: obj.fileext,
+ filesize: obj.filesize
+ };
+ });
}
- if( res.data.detail.type==2){
- this.isshow=false
- }else{
- this.isshow=true
+
+ if (res.data.detail.type == 2) {
+ this.isshow = false
+ } else {
+ this.isshow = true
}
+
},
reset() {
this.list = [{
@@ -401,6 +559,36 @@
},
+
+ downloadFile(item) {
+ uni.downloadFile({
+ url: HTTP_REQUEST_URL + item.filepath,
+ success: function(res) {
+ if (res.statusCode === 200) {
+ const tempFilePath = res.tempFilePath;
+ if (item.fileext == 'png' || item.fileext == 'jpg') {
+ uni.previewImage({
+ urls: [tempFilePath]
+ });
+ } else {
+
+ uni.showModal({
+ title: '提示',
+ content: '暂时不支持查看,请登录后台查看',
+ success: function(res) {
+ if (res.confirm) {
+ // console.log('用户点击确定');
+ } else if (res.cancel) {
+ // console.log('用户点击取消');
+ }
+ }
+ });
+ }
+
+ }
+ }
+ });
+ },
//监听人员加载数据
async columnCode(e) {
if (e.columnIndex == 1) {
@@ -454,10 +642,10 @@
deliveryWayChangetwo(e) {
this.listobj.type = e.detail.value
- if(e.detail.value==2){
- this.isshow=false
- }else{
- this.isshow=true
+ if (e.detail.value == 2) {
+ this.isshow = false
+ } else {
+ this.isshow = true
}
},
//弹窗显示
@@ -499,7 +687,11 @@
let res = await appflow_check(data)
// console.log(res)
Toast(res.msg)
-
+ if (res.code == 0) {
+ uni.navigateBack({
+ delta: 1
+ })
+ }
// const res = await appexpense(this.listobj)
Toast('提交成功')
@@ -626,7 +818,7 @@
}
-
\ No newline at end of file
diff --git a/pages/leaveapplication/index.vue b/pages/leaveapplication/index.vue
index 999be8b..9f30357 100644
--- a/pages/leaveapplication/index.vue
+++ b/pages/leaveapplication/index.vue
@@ -15,9 +15,9 @@
{{fieldValue.title}}:
-
-
+
+
@@ -34,7 +34,7 @@
-
+
{{fieldValue.title}}:
@@ -43,7 +43,7 @@
-
+
{{fieldValue.title}}:
@@ -52,7 +52,7 @@
-
+
{{fieldValue.title}}:
@@ -62,13 +62,13 @@
-
+
{{fieldValue.title}}:
-
+
-
+
{{fieldValue.title}}:
@@ -77,12 +77,12 @@
-
+
{{ item.name }}
{{ item.filesize | formatBytes }}
- 上传人:{{ item.admin_name }}
+
@@ -123,10 +123,33 @@
选择审批流程:
-
+
+
审核人:
+
+
+
+
+ 第{{i+1}}级 {{item.flow_type_txt}}
+
+
+
+
+
+
+
+ {{items.name}}
+
+
+
+
+
抄送人:
@@ -173,11 +196,13 @@
-
+
+ @confirm="timeConfirm2($event)" :minDate="timestamp" @cancel="timeShow2 = false"
+ @close="timeShow2 = false">
@@ -198,11 +223,14 @@
getemployee,
userdepartment,
appapprove,
-
+ flowusers
} from '@/api/oa.js'
import {
FILE_URL
} from '@/api/file.js'
+ import {
+ HTTP_REQUEST_URL
+ } from '@/config/app.js'
import lsjUpload from '@/uni_modules/lsj-upload/components/lsj-upload/lsj-upload.vue'
export default {
components: {
@@ -275,6 +303,9 @@
datatype: '',
fileOption: {},
files: new Map(),
+ flowShow: true,
+ sprecord: []
+
}
},
onLoad(option) {
@@ -295,6 +326,11 @@
this.getDocumentList()
this.getDocumentList2()
},
+ computed: {
+ httpRequestUrl() {
+ return HTTP_REQUEST_URL;
+ }
+ },
onShow() {
// this.getFlow()
// 获取当前时间戳
@@ -302,21 +338,21 @@
},
watch: {
- timeData: {
- handler(newVal, oldVal) {
- if (newVal[0].time.length > 0 && newVal[1].time.length > 0) {
- const {
- leaveDays,
- leaveHours
- } = this.calculateLeaveDaysAndHours(this.timeData[0].time, this.timeData[1]
- .time)
- console.log(leaveHours, leaveDays)
- this.manHour = leaveHours + '小时'
- this.daysNum = leaveDays + '天'
- }
- },
- deep: true
- }
+ // timeData: {
+ // handler(newVal, oldVal) {
+ // if (newVal[0].time.length > 0 && newVal[1].time.length > 0) {
+ // const {
+ // leaveDays,
+ // leaveHours
+ // } = this.calculateLeaveDaysAndHours(this.timeData[0].time, this.timeData[1]
+ // .time)
+ // console.log(leaveHours, leaveDays)
+ // this.meatelist.duration = leaveHours
+ // this.daysNum = leaveDays + '天'
+ // }
+ // },
+ // deep: true
+ // }
},
methods: {
async getDocumentList2() {
@@ -329,6 +365,26 @@
},
+
+ async flowuser(id) {
+ let res = await flowusers({
+ id: id
+ })
+ // flowPathShow = true
+ // console.log(res.data.flow_data == false)
+ if (res.data.flow_data.length > 0) {
+
+ this.flowShow = false
+ this.sprecord = res.data.flow_data
+ } else {
+ this.flowShow = true
+ }
+
+ // this.flowShow = false
+ // this.sprecord = res.data.flow_data
+ // this.flowShow=!res.data.flow_data
+ // console.log(res.data.flow_data)
+ },
confirm(e) {
console.log(e)
@@ -357,11 +413,13 @@
},
//获取部门
async getDocumentList() {
- const res = await userdepartment()
+ const res = await userdepartment({
+ tree: 1
+ })
const deArr = res.data
let codelist = [
[], //顶级部门
- [], //次级部门
+
[] // 负责人
]
@@ -372,20 +430,14 @@
}
})
- codelist[1] = res.data[0].children.map((item) => { // 赋值
- return {
- id: item.id,
- name: item.title
- }
- })
let dat = await getemployee({
- did: codelist[1][0].id
+ did: codelist[0][0].id
})
- codelist[2] = dat.data.map((item) => {
+ codelist[1] = dat.data.map((item) => {
return {
id: item.id,
name: item.name
@@ -403,7 +455,7 @@
},
//监听人员加载数据
async columnCode(e) {
- if (e.columnIndex == 1) {
+ if (e.columnIndex == 0) {
let arr1 = []
let dat = await getemployee({
did: this.branchColumns[e.columnIndex][e.index].id
@@ -418,8 +470,10 @@
})
// 使用 Vue.set 或 this.$set 方法将新数组赋值给 columns3 数组对应位置
- this.$set(this.branchColumns, 2, newColumn);
+ this.$set(this.branchColumns, 1, newColumn);
+ } else {
+ this.$set(this.branchColumns, 1, []);
}
}
@@ -427,7 +481,7 @@
},
//监听人员加载数据
async columnCode1(e) {
- if (e.columnIndex == 1) {
+ if (e.columnIndex == 0) {
let arr1 = []
let dat = await getemployee({
did: this.branchColumns1[e.columnIndex][e.index].id
@@ -442,16 +496,19 @@
})
// 使用 Vue.set 或 this.$set 方法将新数组赋值给 columns3 数组对应位置
- this.$set(this.branchColumns1, 2, newColumn);
+ this.$set(this.branchColumns1, 1, newColumn);
+ } else {
+ this.$set(this.branchColumns1, 1, []);
}
+
}
},
async columnCode2(e) {
console.log(e)
- if (e.columnIndex == 1) {
+ if (e.columnIndex == 0) {
let arr1 = []
let dat = await getemployee({
did: this.branchColumns2[e.columnIndex][e.index].id
@@ -466,8 +523,10 @@
})
// 使用 Vue.set 或 this.$set 方法将新数组赋值给 columns3 数组对应位置
- this.$set(this.branchColumns2, 2, newColumn);
+ this.$set(this.branchColumns2, 1, newColumn);
+ } else {
+ this.$set(this.branchColumns2, 1, []);
}
}
@@ -572,22 +631,24 @@
},
// 回调参数为包含columnIndex、value、values
branchConfirm(e) {
- console.log('confirm', e, e.value[2].name)
- this.check_admin_name = e.value[2].name
- this.check_admin_ids = e.value[2].id
+ this.check_admin_name = e.value[1].name
+
+ this.check_admin_ids = e.value[1].id
this.branchShow = false
+ console.log('confirm', this.check_admin_ids, e, e.value[1].name)
},
branchConfirm1(e) {
- console.log('confirm', e, e.value[2].name)
- this.copy_uids += e.value[2].id
- this.copy_names += e.value[2].name + ','
+
+ this.copy_uids += e.value[1].id + ','
+ this.copy_names += e.value[1].name + ','
this.branchShow1 = false
+ console.log(this.copy_uids, e, e.value[1].name)
},
branchConfirm2(e) {
- console.log('confirm', e, e.value[2].name)
- this.meatelist.uid = e.value[2].id
- this.meatelist.name = e.value[2].name
+ console.log('confirm', e, e.value[1].name)
+ this.meatelist.uid = e.value[1].id
+ this.meatelist.name = e.value[1].name
this.branchShow2 = false
},
/** 请假类型 */
@@ -629,6 +690,7 @@
flowPathSelect(value) {
this.flowPath = value.name
this.flow_id = value.id
+ this.flowuser(value.id)
},
async getFlow() {
@@ -696,21 +758,21 @@
subData1.num = this.leavaTypeId4
}
if (this.meatelist.hasOwnProperty('num1') && this.typeId == 20) {
- subData1.num1 = this.leavaTypeId5
+ subData1.num1 = this.leavaTypeId5
}
subData = {
...this.meatelist,
...subData1
}
- console.log(subData)
+ // console.log(subData)
try {
const res = await appapprove(subData)
- if(res.code==0){
- uni.navigateBack({
- delta:1
- })
+ if (res.code == 0) {
+ uni.navigateBack({
+ delta: 1
+ })
}
Toast('提交成功')
} catch (e) {
@@ -808,25 +870,34 @@
/**
* 计算两个时间戳之间相差的小时数
* */
- calculateLeaveDaysAndHours(leaveStartTime, leaveEndTime) {
+ calculateLeaveDaysAndHours(leaveStartTime, leaveEndTime, hoursPerDay = 8) {
const startDate = new Date(leaveStartTime);
const endDate = new Date(leaveEndTime);
+
+ const timeDifference = endDate.getTime() - startDate.getTime();
// 计算请假天数
const leaveDays = Math.floor((endDate.getTime() - startDate.getTime()) / (24 * 60 * 60 * 1000)) + 1;
-
// 计算请假总小时数
- // const leaveHours = leaveDays * hoursPerDay;
- const timeDifference = endDate.getTime() - startDate.getTime();
-
+ const leaveHours = leaveDays * hoursPerDay;
// 将时间差转换为小时数
- const leaveHours = timeDifference / (1000 * 60 * 60); // 将毫秒数转换为小时数
- // console.log(leaveHours)
- // 返回结果
- return {
- leaveDays,
- leaveHours,
- };
+ // const leaveHours = timeDifference / (1000 * 60 * 60); // 将毫秒数转换为小时数
+ if (timeDifference <= 0) {
+ Toast('时间日期不合法,请重新输入')
+ this.meatelist.start_time = ''
+ this.meatelist.end_time = ''
+ this.timeData[0].time = ''
+ this.timeData[1].time = ''
+ this.meatelist.duration = ''
+ } else {
+ // 返回结果
+ return {
+ leaveDays,
+ leaveHours,
+ };
+ }
+
+
}
},
filters: {
@@ -851,6 +922,10 @@
padding-bottom: 100px;
}
+ .leave_box .title {
+ width: 180rpx;
+ }
+
.leave_box,
.flow_path {
width: 100%;
@@ -859,10 +934,12 @@
margin-bottom: 35.09rpx;
padding-bottom: 28.07rpx;
}
-/deep/.u-action-sheet__item-wrap {
+
+ /deep/.u-action-sheet__item-wrap {
overflow: auto;
max-height: 50vh;
}
+
.bot_btn {
position: fixed;
bottom: 0;
@@ -892,10 +969,63 @@
.leava_type {
height: 100rpx;
- border-bottom: 1px solid #999;
+ border-bottom: 1px solid #f7f7f7;
.title {
- font-size: 31.58rpx;
+ width: 180rpx;
+
+ }
+
+ input {
+ width: 480rpx;
+ }
+
+ }
+ .cont_cell{
+ input {
+ width: 480rpx;
+ }
+
+ }
+
+ .record {
+ position: relative;
+ margin-bottom: 14.04rpx;
+
+ .circle {
+ width: 31.58rpx;
+ height: 31.58rpx;
+ background-color: #fff;
+ border: 2px solid #34A853;
+ border-radius: 50%;
+ margin: 5px;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+
+ &::before {
+ content: "";
+ display: block;
+ position: absolute;
+ clear: both;
+ width: 1px;
+ height: 100%;
+ background-color: rgba(204, 204, 204, 0.5);
+ margin: 31.58rpx;
+ }
+ }
+
+ .text {
+
+ margin-left: 7.02rpx;
+ }
+ }
+
+ :last-child {
+ .circle {
+ &::before {
+ display: none;
+ }
}
}
diff --git a/pages/leaveapplication/index2.vue b/pages/leaveapplication/index2.vue
index 46b2129..fe2849d 100644
--- a/pages/leaveapplication/index2.vue
+++ b/pages/leaveapplication/index2.vue
@@ -29,8 +29,8 @@
{{ item.name }}
- {{ item.filesize | formatBytes }}
- 上传人:{{ item.admin_name }}
+ {{ item.filesize }}
+
@@ -339,14 +339,14 @@
},
// 回调参数为包含columnIndex、value、values
branchConfirm(e) {
- console.log('confirm', e, e.value[2].name)
+ //console.log('confirm', e, e.value[2].name)
this.check_admin_name = e.value[2].name
this.check_admin_ids = e.value[2].id
this.branchShow = false
},
branchConfirm1(e) {
- console.log('confirm', e, e.value[2].name)
+ //console.log('confirm', e, e.value[2].name)
this.copy_uids += e.value[2].id
this.copy_names+= e.value[2].name+','
this.branchShow1 = false
@@ -441,12 +441,12 @@
}).catch(err => {
Toast('上传失败')
that.loading = false
- console.log('上传失败', err)
+ //console.log('上传失败', err)
})
},
fail: function(err) {
Toast('添加失败')
- console.log('失败', err)
+ //console.log('失败', err)
}
});
},
@@ -459,7 +459,7 @@
if (res.confirm) {
that.fileArray.splice((i, 1))
} else if (res.cancel) {
- console.log('用户点击取消');
+ //console.log('用户点击取消');
}
}
})
diff --git a/pages/message/detail.vue b/pages/message/detail.vue
index 66c4ee4..fc9e280 100644
--- a/pages/message/detail.vue
+++ b/pages/message/detail.vue
@@ -9,14 +9,14 @@
-
-
+
-
+
@@ -298,17 +298,17 @@
}
.name {
- font-size: 35rpx;
+ font-size: 25rpx;
font-family: PingFang SC-Bold, PingFang SC;
- font-weight: bold;
+ // font-weight: bold;
color: #333333;
text {
- font-size: 25rpx;
+ font-size: 35rpx;
font-family: PingFang SC-Regular, PingFang SC;
font-weight: 400;
- color: #CCCCCC;
+ color: #333333;
}
}
diff --git a/pages/message/index.vue b/pages/message/index.vue
index 9caea76..98d44a6 100644
--- a/pages/message/index.vue
+++ b/pages/message/index.vue
@@ -173,7 +173,7 @@
uni.navigateTo({
url: '/pages/message/detail??type=' + id
})
- // console.log(res)
+ // //console.log(res)
},
taskDetail(item) {
diff --git a/pages/oaLogin/editpwd.vue b/pages/oaLogin/editpwd.vue
index 1161b9d..5e87dff 100644
--- a/pages/oaLogin/editpwd.vue
+++ b/pages/oaLogin/editpwd.vue
@@ -86,12 +86,12 @@
leftClick(e) {
uni.sendHostEvent('closeApp', e, (ret) => {
//发送消息成功回调
- console.log('关闭应用' + JSON.stringify(ret));
+ //console.log('关闭应用' + JSON.stringify(ret));
});
},
async login() {
- console.log(this.formData)
+ //console.log(this.formData)
if (this.formData.scene == 1 && !this.formData.old_pwd) return Toast('旧密码不能为空');
if (this.formData.scene == 1 && !this.formData.pwd) return Toast('新密码不能为空');
if (this.formData.scene == 1 && !this.formData.pwd_confirm) return Toast('确认密码不能为空');
@@ -106,7 +106,7 @@
})
let res = await changePassword(this.formData);
- // console.log(res, '11111111')
+ // //console.log(res, '11111111')
Toast(res.msg)
if(res.code==0){
uni.switchTab({
diff --git a/pages/oaTask/detail.vue b/pages/oaTask/detail.vue
new file mode 100644
index 0000000..5e21b4b
--- /dev/null
+++ b/pages/oaTask/detail.vue
@@ -0,0 +1,628 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{detail.title}}
+
+
+ {{detail.flow_status==1?"待办的":detail.flow_status==2?"进行中":detail.flow_status==3?"已完成":detail.flow_status==4?"已拒绝":"已关闭"}}
+
+
+
+
+
+
+
+ 负责人:{{detail.director_name}}
+ 协办人:{{detail.assist_admin_names}}
+
+ 工作性质:{{detail.cate_name}}
+ 计划完成日期:{{detail.end_time}}
+
+ 预估工时:{{detail.plan_hours}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 任务描述
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+ {{ item.filesize }}
+
+
+
+
+
+
+
+ 选择文件并上传
+
+ 上传前,请规范命名,最大只能上传100M的文件
+ 超过请压缩成多个文件上传。
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/oaTask/oaTask.vue b/pages/oaTask/oaTask.vue
index b1ac087..214e5fe 100644
--- a/pages/oaTask/oaTask.vue
+++ b/pages/oaTask/oaTask.vue
@@ -28,7 +28,7 @@
-
+
@@ -47,6 +47,10 @@
工作类型:{{items.cate_name}}
关联项目:{{items.project_name}}
预估工时:{{items.plan_hours}}
+
+ 状态:{{items.flow_status==1?"待办的":items.flow_status==2?"进行中":items.flow_status==3?"已完成":items.flow_status==4?"已拒绝":"已关闭"}}
+
+
+
+
+
+
+
+
+
+ {{item.name}}
+
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 项目链接:
+
+
+
+
+
+
+
+ 项目链接说明:
+
+
+
+
+
+
+
+ {{item.desc}}
+
+
+
+ 删除
+
+
+
+
+ 发布链接
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/project/index.vue b/pages/project/index.vue
index 9dd9f9b..fe293c5 100644
--- a/pages/project/index.vue
+++ b/pages/project/index.vue
@@ -13,7 +13,7 @@
-
+
@@ -178,7 +178,7 @@
},
//删除弹窗
clickItem(data) {
- // console.log(e)
+ // //console.log(e)
if (data.id == 2) {
uni.showModal({
@@ -217,6 +217,12 @@
url: '/pages/addproject/index??type=' + 1 + "&data=" + item.id
})
},
+ //详情
+ tian(item){
+ uni.navigateTo({
+ url: '/pages/project/detail??type=' + 1 + "&data=" + item.id
+ })
+ },
//查询
search() {
this.initList()
diff --git a/pages/quest/index.vue b/pages/quest/index.vue
index a7ad59d..7290438 100644
--- a/pages/quest/index.vue
+++ b/pages/quest/index.vue
@@ -163,7 +163,7 @@
},
//删除弹窗
clickItem(data) {
- // console.log(e)
+ // //console.log(e)
uni.showModal({
content: '确定要删除吗',
success: (e) => {
diff --git a/pages/reimbursement/index.vue b/pages/reimbursement/index.vue
index 32261f2..1643f3c 100644
--- a/pages/reimbursement/index.vue
+++ b/pages/reimbursement/index.vue
@@ -10,13 +10,13 @@
-
+
- {{item.check_user}}
+ {{item.admin_name}}
{{item.code}}
@@ -30,19 +30,40 @@
审核通过
审核不通过
撤销审核
- 已开具
+ 已打款
报销部门:{{item.department}}
入账月份:{{item.income_month}}
- 报销人审核人:{{item.admin_name}}
+ 报销人审核人:{{item.check_user}}
+
+
+
+
+
+
+
+ {{item.admin_name}}
+
+
+ {{item.code}}
+
+
+
+
+ 待审核
+ 审核中
+ 审核通过
+ 审核不通过
+ 撤销审核
+ 已打款
+
+
+ 报销部门:{{item.department}}
+ 入账月份:{{item.income_month}}
+ 报销人审核人:{{item.check_user}}
-
@@ -59,14 +80,18 @@
} from '@/libs/uniApi.js'
import {
-
+ expenstopay,
appexpenseindex,
apexpenselist,
appexpensecopy
} from '@/api/oa.js'
+ import liuswipeaction from '@/uni_modules/liu-swipe-action/components/liu-swipe-action/liu-swipe-action.vue'
export default {
+ components: {
+ 'liu-swipe-action': liuswipeaction
+ },
data() {
return {
@@ -87,6 +112,14 @@
list2: [],
num: 0,
btnList: [],
+ btnList1: [{
+ id: '2',
+ name: '开票',
+ width: '100rpx',
+ bgColor: '#ed656d',
+ color: '#FFFFFF',
+ fontSize: '28rpx'
+ }],
loadConfig: {
page: 1,
limit: 5,
@@ -168,7 +201,6 @@
}
this.list2 = [...this.list2, ...res.data?.data]
- console.log(this.list2)
},
async getlist1() {
@@ -215,14 +247,14 @@
},
//删除弹窗
clickItem(data) {
- // console.log(e)
+ // //console.log(e)
if (data.id == 2) {
uni.showModal({
- content: '确定要删除吗',
+ content: '是否设置为已打款状态',
success: (e) => {
if (e.confirm) {
- this.deleteDepartment(data.id)
+ this.deleteDepartment(this.list2[data.index].id)
}
}
})
@@ -235,13 +267,12 @@
//删除
async deleteDepartment(id) {
-
- const res = await deleteexpenseflow({
+ const res = await expenstopay({
id: id
})
-
+ //console.log(res,id)
if (res.code == 0) {
-
+
if (this.num == 0) {
this.initList()
} else if (this.num == 1) {
diff --git a/pages/reimbursementapplication/bianji.vue b/pages/reimbursementapplication/bianji.vue
index 085ea1a..a680c88 100644
--- a/pages/reimbursementapplication/bianji.vue
+++ b/pages/reimbursementapplication/bianji.vue
@@ -27,7 +27,7 @@
- 报销项目:
+ 关联项目:
@@ -67,8 +67,8 @@
{{ item.name }}
- {{ item.filesize | formatBytes }}
- 上传人:{{ item.admin_name }}
+ {{ item.filesize }}
+
@@ -99,10 +99,32 @@
选择审批流程:
-
+
审核人:
+
+
+
+
+ 第{{i+1}}级 {{item.flow_type_txt}}
+
+
+
+
+
+
+
+ {{items.name}}
+
+
+
+
+
抄送人:
@@ -161,8 +183,12 @@
getemployee,
appexpense,
projectlist,
- appexpenseview
+ appexpenseview,
+ flowusers
} from '@/api/oa.js'
+ import {
+ HTTP_REQUEST_URL
+ } from '@/config/app.js'
import lsjUpload from '@/uni_modules/lsj-upload/components/lsj-upload/lsj-upload.vue'
import {
FILE_URL
@@ -195,6 +221,9 @@
columns: [],
check_admin_name: '',
copy_names: '',
+ flowShow: true,
+ sprecord: [],
+
list: [{
cate_title: "",
amount: '',
@@ -219,35 +248,60 @@
},
// 获取当前时间戳
this.timestamp = Date.parse(new Date());
- this.getPersonInfo()
+ // this.getPersonInfo()
this.getlist()
this.getlist1()
this.getDocumentList()
this.getDocumentList1()
},
-
+ computed: {
+ httpRequestUrl() {
+ return HTTP_REQUEST_URL;
+ }
+ },
methods: {
+ //选择流程id
+ async flowuser(id) {
+ let res = await flowusers({
+ id: id,
+
+
+ })
+ if (res.data.flow_data.length > 0) {
+
+ this.flowShow = false
+ this.sprecord = res.data.flow_data
+ } else {
+ this.flowShow = true
+ }
+
+ },
async detail(id) {
let res = await appexpenseview({
id: id
})
// console.log(res,'111')
this.listobj.code = res.data.detail.code
- this.listobj.id = id
+ this.listobj.id = res.data.detail.id
this.list = res.data.detail.list
this.listobj.expense_time = res.data.detail.expense_time
this.listobj.income_month = res.data.detail.income_month
- this.project = res.data.detail.ptname
+ this.project = res.data.detail.ptname
this.listobj.flow_id = res.data.flows.id
this.listobj.ptid = res.data.detail.ptid
+ this.personInfo.name = res.data.detail.create_user
+
+ this.personInfo.department_name = res.data.detail.department
this.fileArray = res.data.detail.fileArray.map(function(obj) {
return {
name: obj.name,
+ filepath: obj.filepath,
+ fileext: obj.fileext,
filesize: obj.filesize
};
});
-// console.log(this.fileArray,'11111111111', res.data.detail)
+ // console.log(this.fileArray,'11111111111', res.data.detail)
},
reset() {
@@ -390,7 +444,7 @@
branchConfirm1(e) {
console.log('confirm', e, e.value[2].name)
if (this.listobj.copy_uids) {
- this.listobj.copy_uids += e.value[2].id
+ this.listobj.copy_uids += e.value[2].id + ','
} else {
this.listobj.copy_uids = e.value[2].id
}
@@ -426,9 +480,9 @@
const res = await appexpense(this.listobj)
- if(res.code==0){
+ if (res.code == 0) {
uni.navigateBack({
- delta:1
+ delta: 1
})
}
Toast('提交成功')
@@ -488,6 +542,7 @@
flowPathSelect(value) {
this.flowPath = value.name
this.flow_id = value.id
+ this.flowuser(value.id)
},
/** 类型 */
diff --git a/pages/reimbursementapplication/handle.vue b/pages/reimbursementapplication/handle.vue
index 71b98fc..39f759d 100644
--- a/pages/reimbursementapplication/handle.vue
+++ b/pages/reimbursementapplication/handle.vue
@@ -14,7 +14,7 @@
报销凭证编号:
-
+
@@ -26,9 +26,9 @@
-
- 报销项目:
-
+
+ 关联项目:
+
@@ -37,14 +37,14 @@
-
+
报销项目:
-
+
报销金额:
-
+
备注:
@@ -56,21 +56,21 @@
-
+
-
+
{{ item.name }}
{{ item.filesize }}
- 上传人:{{ item.admin_name }}
+
-
+
@@ -78,10 +78,147 @@
审批流程:
+
+
+
+
+ {{nodelist.create_user}}创建
+
+
+
+
+
+ {{itemh.flow_type==1?'部门负责人':'上级部门负责人'}}
+
+ 当前审核
+
+
+
+ 通过
+ 拒绝
+
+
+ 待审核
+
+
+
+
+
+ {{itemh.flow_type==7?'部门分管领导':'上级部门分管领导'}}
+
+ 当前审核
+
+
+
+ 通过
+ 拒绝
+
+
+ 待审核
+
+
+
+
+
+
+
+ {{itemk.name}}
+
+
+ 当前审核
+
+
+
+ 通过
+ 拒绝
+
+
+ 待审核
+
+
+
+
+
+ 指定人或签
+
+ {{itemk.name}}
+
+
+ 当前审核
+
+
+
+
+
+ 待审核
+
+
+
+ 通过
+ 拒绝
+
+
+
+
+
+
+
+
+ 指定人员(会签)
+
+ {{itemk.name}}
+
+
+ 当前审核
+
+
+
+ 通过
+
+
+
+ 待审核
+ 拒绝
+
+
+
+
+
+
+
+ {{itemk.name}}
+
+
+ 当前审核
+
+
+
+
+ 通过
+
+
+ 待审核
+ 拒绝
+
+
+
+
+
+
+
+
+
+
+
+
+
+
审核状态:
-
- {{listobj.check_status=='0'?'待审核':listobj.check_status=='1'?'审核中':listobj.check_status=='2'?'审核通过':listobj.check_status=='3'?'审核不通过':listobj.check_status=='4'?'审核不通过':'已打款'}}
+
+ {{listobj.check_status=='0'?'待审核':listobj.check_status=='1'?'审核中':listobj.check_status=='2'?'审核通过':listobj.check_status=='3'?'审核不通过':listobj.check_status=='4'?'撤销审核':'已打款'}}
审核人:
@@ -91,43 +228,52 @@
抄送人:
-
-
-
-
- {{item.check_time_str}} {{item.name}} {{item.status_str}}
- 了此申请。操作意见:{{item.content}}
-
-
-
- 审核节点:
-
-
-
-
-
-
+
+
+
+
+ 审核节点:
+
+
+
+
+
+
+
审核意见
-
+
-
-
- 拒绝
+
+
+ {{flow_type==5?'回退':'拒绝'}}
通过
+
+
-
- 报销项目:
+
+ 关联项目:
@@ -37,7 +37,7 @@
-
+
报销项目:
@@ -50,11 +50,11 @@
-
+
-
+
@@ -65,8 +65,8 @@
{{ item.name }}
- {{ item.filesize | formatBytes }}
- 上传人:{{ item.admin_name }}
+ {{ item.filesize }}
+
@@ -97,10 +97,30 @@
选择审批流程:
-
+
审核人:
+
+
+
+
+ 第{{i+1}}级 {{item.flow_type_txt}}
+
+
+
+
+
+
+
+ {{items.name}}
+
+
+
+
+
抄送人:
@@ -125,14 +145,14 @@
-
+
-
+
@@ -159,8 +179,12 @@
getemployee,
appexpense,
projectlist,
- appexpenseview
+ appexpenseview,
+ flowusers
} from '@/api/oa.js'
+ import {
+ HTTP_REQUEST_URL
+ } from '@/config/app.js'
import lsjUpload from '@/uni_modules/lsj-upload/components/lsj-upload/lsj-upload.vue'
import {
FILE_URL
@@ -201,7 +225,8 @@
fileOption: {},
files: new Map(),
fileArray: [],
- dnum: 0
+ dnum: 0,
+ flowShow: true
}
},
onLoad(option) {
@@ -223,10 +248,14 @@
this.getDocumentList()
this.getDocumentList1()
},
-
+ computed: {
+ httpRequestUrl() {
+ return HTTP_REQUEST_URL;
+ }
+ },
methods: {
-
+
reset() {
this.list = [{
name: "",
@@ -323,7 +352,19 @@
}
},
-
+ //选择流程id
+ async flowuser(id) {
+ let res = await flowusers({
+ id: id
+ })
+ if (res.data.flow_data.length > 0) {
+ this.flowShow = false
+ this.sprecord = res.data.flow_data
+ } else {
+ this.flowShow = true
+ }
+
+ },
//监听人员加载数据
async columnCode1(e) {
if (e.columnIndex == 1) {
@@ -367,7 +408,7 @@
branchConfirm1(e) {
console.log('confirm', e, e.value[2].name)
if (this.listobj.copy_uids) {
- this.listobj.copy_uids += e.value[2].id
+ this.listobj.copy_uids += e.value[2].id + ','
} else {
this.listobj.copy_uids = e.value[2].id
}
@@ -390,7 +431,7 @@
this.fileArray.map((item, i) => {
fileIds.push(item.id)
});
-
+
this.listobj.amount = this.list.map(item => item.amount);
this.listobj.cate_id = this.list.map(item => item.id);
this.listobj.remarks = this.list.map(item => item.remarks);
@@ -402,9 +443,9 @@
const res = await appexpense(this.listobj)
- if(res.code==0){
+ if (res.code == 0) {
uni.navigateBack({
- delta:1
+ delta: 1
})
}
Toast('提交成功')
@@ -420,7 +461,7 @@
num: ''
})
},
- deleteleava(item, index) {
+ deleteleava() {
if (this.list.length > 1) {
this.list.splice(0, 1)
} else {
@@ -464,12 +505,13 @@
flowPathSelect(value) {
this.flowPath = value.name
this.flow_id = value.id
+ this.flowuser(value.id)
},
/** 类型 */
leavaType(e) {
-
- this.list[this.dnum].cate_title= e.name
+
+ this.list[this.dnum].cate_title = e.name
this.list[this.dnum].id = e.id
this.leavaTypeShow = false
},
@@ -559,6 +601,47 @@
padding-bottom: 28.07rpx;
}
+ .record {
+ position: relative;
+ margin-bottom: 14.04rpx;
+
+ .circle {
+ width: 31.58rpx;
+ height: 31.58rpx;
+ background-color: #fff;
+ border: 2px solid #34A853;
+ border-radius: 50%;
+ margin: 5px;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+
+ &::before {
+ content: "";
+ display: block;
+ position: absolute;
+ clear: both;
+ width: 1px;
+ height: 100%;
+ background-color: rgba(204, 204, 204, 0.5);
+ margin: 31.58rpx;
+ }
+ }
+
+ .text {
+ flex: 1;
+ margin-left: 7.02rpx;
+ }
+ }
+
+ :last-child {
+ .circle {
+ &::before {
+ display: none;
+ }
+ }
+ }
+
.bot_btn {
position: fixed;
bottom: 0;
@@ -601,10 +684,13 @@
width: 100%;
min-height: 87.72rpx;
border-bottom: 1px solid #f7f7f7;
-
- .title {
- font-size: 31.58rpx;
+ input{
+ width: 480rpx;
}
+
+
+ font-size: 31.58rpx;
+
}
// 审批流程
diff --git a/pages/reimbursementrecord/index.vue b/pages/reimbursementrecord/index.vue
index 2603d25..cab12a2 100644
--- a/pages/reimbursementrecord/index.vue
+++ b/pages/reimbursementrecord/index.vue
@@ -137,7 +137,7 @@
limit: this.loadConfig.limit,
keyword: this.keyword
})
-console.log(res.msg.data)
+//console.log(res.msg.data)
this.loadConfig.status = "loadmore"
if (res.data.length < this.loadConfig.limit) {
this.loadConfig.status = "nomore"
@@ -156,7 +156,7 @@ console.log(res.msg.data)
},
//删除弹窗
clickItem(data) {
- // console.log(e)
+ // //console.log(e)
uni.showModal({
content: '确定要删除吗',
success: (e) => {
diff --git a/pages/resignationprofile/index.vue b/pages/resignationprofile/index.vue
index a0d2dd3..0fd7023 100644
--- a/pages/resignationprofile/index.vue
+++ b/pages/resignationprofile/index.vue
@@ -79,8 +79,11 @@
import {
Toast
} from '@/libs/uniApi.js'
+ import liuswipeaction from '@/uni_modules/liu-swipe-action/components/liu-swipe-action/liu-swipe-action.vue'
export default {
-
+ components: {
+ 'liu-swipe-action': liuswipeaction
+ },
data() {
return {
show: false,
@@ -164,7 +167,7 @@
},
//删除弹窗
clickItem(data) {
- // console.log(e)
+ // //console.log(e)
if (data.id == 2) {
uni.showModal({
content: '确定要删除吗',
diff --git a/pages/resources/index.vue b/pages/resources/index.vue
index ded0714..e91e7eb 100644
--- a/pages/resources/index.vue
+++ b/pages/resources/index.vue
@@ -31,15 +31,17 @@
+ 企业员工
- 企业员工
+
+
-
+
{{item.department}} ({{item.name}})
@@ -114,8 +116,11 @@
Toast
} from '@/libs/uniApi.js'
+ import liuswipeaction from '@/uni_modules/liu-swipe-action/components/liu-swipe-action/liu-swipe-action.vue'
export default {
-
+ components: {
+ 'liu-swipe-action': liuswipeaction
+ },
data() {
return {
@@ -198,7 +203,7 @@
},
methods: {
arryitem(item) {
- console.log(item.id)
+ //console.log(item.id)
switch (item.id) {
case 1:
@@ -245,7 +250,7 @@
status: this.status,
keyword: this.keyword,
})
- console.log(res.data.data)
+ // //console.log(res.data.data)
this.loadConfig.status = "loadmore"
if (res.data.data.length < this.loadConfig.limit) {
this.loadConfig.status = "nomore"
@@ -451,18 +456,22 @@
background-color: #FFFFFF;
padding: 28rpx 28rpx;
+ .middle-three-title {
+ font-size: 35rpx;
+ font-family: PingFang SC-Bold, PingFang SC;
+ font-weight: bold;
+ color: #3274F9;
+ margin-bottom: 30rpx;
+ }
+
.middle-three {
- .middle-threea {
- font-size: 35rpx;
- font-family: PingFang SC-Bold, PingFang SC;
- font-weight: bold;
- color: #3274F9;
- margin-bottom: 30rpx;
- }
+
.middle-threeb {
display: flex;
justify-content: space-between;
+ // margin-bottom: 20rpx;
+ padding: 20rpx 20rpx;
.middle-threeb-a {
@@ -509,7 +518,7 @@
.middle-threeb-b {
width: 80rpx;
height: 80rpx;
- margin-top: 45rpx;
+ margin-top: 25rpx;
image {
@@ -535,7 +544,7 @@
left: 50%;
margin-left: -252.5rpx;
position: absolute;
- bottom: 150rpx;
+ bottom: 50rpx;
z-index: 9999 !important;
position: fixed;
diff --git a/pages/structure/index.vue b/pages/structure/index.vue
index 8658284..aae122e 100644
--- a/pages/structure/index.vue
+++ b/pages/structure/index.vue
@@ -57,7 +57,11 @@
import {
Toast
} from '@/libs/uniApi.js'
+ import liuswipeaction from '@/uni_modules/liu-swipe-action/components/liu-swipe-action/liu-swipe-action.vue'
export default {
+ components: {
+ 'liu-swipe-action': liuswipeaction
+ },
data() {
return {
@@ -139,7 +143,7 @@
},
//删除弹窗
clickItem(data) {
- // console.log(e)
+ // //console.log(e)
uni.showModal({
content: '确定要删除吗',
success: (e) => {
@@ -157,7 +161,7 @@
const res = await deletedepartment({
id: id
})
- console.log(res, res.msg)
+ //console.log(res, res.msg)
if (res.code == 0) {
this.getDocumentList()
}
@@ -217,7 +221,7 @@
.middle-oneb {
display: flex;
justify-content: space-between;
- margin-bottom: 25rpx;
+ padding: 20rpx 20rpx;
.middle-oneb-a {
display: flex;
@@ -264,7 +268,7 @@
width: 80rpx;
height: 80rpx;
-
+ margin-top: 25rpx;
image {
width: 100%;
diff --git a/pages/user/user.vue b/pages/user/user.vue
index 30c9155..42d4e48 100644
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -119,7 +119,7 @@
// },
{
- name: '公示文档',
+ name: '公告',
icon: require('@/static/images/w2.png'),
paths: '/pages/users/user_document/index'
@@ -128,11 +128,11 @@
// name: '绑定公众号',
// icon: require('@/static/images/w3.png')
// },
- {
- name: '文章',
- icon: require('@/static/images/w4.png'),
- paths: '/pages/users/article/index'
- },
+ // {
+ // name: '文章',
+ // icon: require('@/static/images/w4.png'),
+ // paths: '/pages/users/article/index'
+ // },
{
name: '修改密码',
icon: require('@/static/images/w4.png'),
@@ -205,7 +205,7 @@
leftClick(e) {
uni.sendHostEvent('closeApp', e, (ret) => {
//发送消息成功回调
- console.log('关闭应用' + JSON.stringify(ret));
+ //console.log('关闭应用' + JSON.stringify(ret));
});
},
login() {
@@ -245,7 +245,7 @@
},
fail(e) {
uni.hideLoading()
- console.log(e);
+ //console.log(e);
},
})
} else Toast('暂未开放')
@@ -269,7 +269,7 @@
.head_box {
position: relative;
width: 100vw;
- height: 534rpx;
+ height: 400rpx;
margin-bottom: 30rpx;
background: #3274F9;
}
diff --git a/pages/users/myInformation/index.vue b/pages/users/myInformation/index.vue
index 8da7e07..e5a04e5 100644
--- a/pages/users/myInformation/index.vue
+++ b/pages/users/myInformation/index.vue
@@ -3,7 +3,7 @@