diff --git a/app.json b/app.json index fb2c0aa..f9d9bcf 100644 --- a/app.json +++ b/app.json @@ -9,6 +9,8 @@ "pages/bankDraft/add/add", "pages/project/project", "pages/project/add/add", + "pages/finance/finance", + "pages/finance/voucher/voucher", "pages/pay/detail", "pages/pay/payee/payee", "pages/contractAssets/fixedAssets", @@ -21,6 +23,10 @@ "pages/bill/bill", "pages/statistics/statistics", "pages/user/region/region", + "pages/finance/index", + "pages/resources/resources", + "pages/resources/detail/detail", + "pages/resources/edit/edit", "pages/phoneLogin" ], "subPackages": [ @@ -138,40 +144,6 @@ "list/edit", "list/detail" ] - }, - { - "root": "pages/finance/", - "pages": [ - "index", - "finance", - "voucher/voucher", - "list_balance_ranking/list_balance_ranking", - "detailed_liabilities/detailed_liabilities", - "detailed_incomeAndExpenditurePublic/detailed_incomeAndExpenditurePublic" - ] - }, - { - "root": "pages/mainBody/", - "pages": [ - "list/list", - "detail/detail" - ] - }, - { - "root": "pages/resources/", - "pages": [ - "resources", - "edit/edit", - "detail/detail" - ] - }, - { - "root": "pages/discussions/", - "pages": [ - "list", - "form/form", - "detail/detail" - ] } ], "window": { @@ -179,7 +151,7 @@ "navigationStyle": "custom", "enablePullDownRefresh": false, "navigationBarBackgroundColor": "#fff", - "navigationBarTitleText": "中农融信", + "navigationBarTitleText": "农燊高科", "navigationBarTextStyle": "black" }, "sitemapLocation": "sitemap.json", diff --git a/component/SubjectTreeChooserNodeItem/SubjectTreeChooserNodeItem.js b/component/SubjectTreeChooserNodeItem/SubjectTreeChooserNodeItem.js deleted file mode 100644 index eaec388..0000000 --- a/component/SubjectTreeChooserNodeItem/SubjectTreeChooserNodeItem.js +++ /dev/null @@ -1,32 +0,0 @@ -// component/SubjectTreeChooserNodeItem/SubjectTreeChooserNodeItem.js -import * as UTIL from '../../utils/util.js'; -import * as API from '../../utils/API.js'; -const app = getApp() -Component({ - properties: { - type: Object, - popupVisible:false, - subjects: {}, - observer: function (newVal, oldVal) {} - }, - observers: { - 'subjects': function(val) { - // this.selectComponent('#tabs').resize(); - }, - 'popupVisible': function(val) { - } - }, - /** - * 页面的初始数据 - */ - data: { - }, - /** - * 组件的方法列表 - */ - methods: { - open(e){ - console.log(e); - }, - } -}) \ No newline at end of file diff --git a/component/SubjectTreeChooserNodeItem/SubjectTreeChooserNodeItem.json b/component/SubjectTreeChooserNodeItem/SubjectTreeChooserNodeItem.json deleted file mode 100644 index acc5399..0000000 --- a/component/SubjectTreeChooserNodeItem/SubjectTreeChooserNodeItem.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "component": true, - "usingComponents": { - "childrenPage":"/component/SubjectTreeChooserNodeItem/childrenPage", - "van-popup": "@vant/weapp/popup/index", - "van-datetime-picker": "@vant/weapp/datetime-picker/index", - "van-checkbox": "@vant/weapp/checkbox/index", - "van-tab": "@vant/weapp/tab/index", - "van-tabs": "@vant/weapp/tabs/index", - "van-collapse": "@vant/weapp/collapse/index", - "van-collapse-item": "@vant/weapp/collapse-item/index", - "van-checkbox-group": "@vant/weapp/checkbox-group/index" - } -} \ No newline at end of file diff --git a/component/SubjectTreeChooserNodeItem/SubjectTreeChooserNodeItem.wxml b/component/SubjectTreeChooserNodeItem/SubjectTreeChooserNodeItem.wxml deleted file mode 100644 index 846bc25..0000000 --- a/component/SubjectTreeChooserNodeItem/SubjectTreeChooserNodeItem.wxml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/component/SubjectTreeChooserNodeItem/SubjectTreeChooserNodeItem.wxss b/component/SubjectTreeChooserNodeItem/SubjectTreeChooserNodeItem.wxss deleted file mode 100644 index cda0f15..0000000 --- a/component/SubjectTreeChooserNodeItem/SubjectTreeChooserNodeItem.wxss +++ /dev/null @@ -1 +0,0 @@ -/* component/SubjectTreeChooserNodeItem/SubjectTreeChooserNodeItem.wxss */ \ No newline at end of file diff --git a/component/SubjectTreeChooserNodeItem/childrenPage.js b/component/SubjectTreeChooserNodeItem/childrenPage.js deleted file mode 100644 index 2fa77e7..0000000 --- a/component/SubjectTreeChooserNodeItem/childrenPage.js +++ /dev/null @@ -1,43 +0,0 @@ -// component/SubjectTreeChooserNodeItem/childrenPage.js -Component({ - - /** - * 组件的属性列表 - */ - properties: { - type: Object, - subjects: {}, - }, - observers: { - 'subjects': function(val) { - // console.log(val); // 打印innerText的当前值 - // this.selectComponent('#tabs').resize(); - } - }, - - /** - * 组件的初始数据 - */ - data: { - activeNames:'' - }, - - /** - * 组件的方法列表 - */ - methods: { - open(e){ - console.log(e); - }, - onChange(event) { - this.setData({ - activeNames: event.detail, - }); - }, - onItemClicked(e){ - console.log(e); - // this.triggerEvent('cancel',e) - this.triggerEvent('cancel', e, { bubbles: true, composed: true }) - } - } -}) \ No newline at end of file diff --git a/component/SubjectTreeChooserNodeItem/childrenPage.json b/component/SubjectTreeChooserNodeItem/childrenPage.json deleted file mode 100644 index 657e01c..0000000 --- a/component/SubjectTreeChooserNodeItem/childrenPage.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "component": true, - "usingComponents": { - "childrenPage":"/component/SubjectTreeChooserNodeItem/childrenPage", - "van-collapse": "@vant/weapp/collapse/index", - "van-collapse-item": "@vant/weapp/collapse-item/index" - } -} \ No newline at end of file diff --git a/component/SubjectTreeChooserNodeItem/childrenPage.wxml b/component/SubjectTreeChooserNodeItem/childrenPage.wxml deleted file mode 100644 index 6e07229..0000000 --- a/component/SubjectTreeChooserNodeItem/childrenPage.wxml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - {{ item.subjectId }} {{ item.subjectName }} - - - - - - - - \ No newline at end of file diff --git a/component/SubjectTreeChooserNodeItem/childrenPage.wxss b/component/SubjectTreeChooserNodeItem/childrenPage.wxss deleted file mode 100644 index accc09e..0000000 --- a/component/SubjectTreeChooserNodeItem/childrenPage.wxss +++ /dev/null @@ -1 +0,0 @@ -/* component/SubjectTreeChooserNodeItem/childrenPage.wxss */ \ No newline at end of file diff --git a/component/editor/editor.js b/component/editor/editor.js index 1cf3543..c3db795 100644 --- a/component/editor/editor.js +++ b/component/editor/editor.js @@ -24,7 +24,6 @@ Component({ }, ready() { const platform = wx.getSystemInfoSync().platform - console.log(platform); const isIOS = platform === 'ios' this.setData({ isIOS diff --git a/component/editor/editor.wxml b/component/editor/editor.wxml index 53d9c35..64395ba 100644 --- a/component/editor/editor.wxml +++ b/component/editor/editor.wxml @@ -1,4 +1,7 @@ - \ No newline at end of file diff --git a/component/editor/editor.wxss b/component/editor/editor.wxss index 86b26cc..0dff491 100644 --- a/component/editor/editor.wxss +++ b/component/editor/editor.wxss @@ -20,7 +20,9 @@ .toolbar { padding: 0 16rpx; + height: 200rpx; width: 100%; + position: fixed; left: 0; right: 100%; bottom: 0; diff --git a/image/icon/cancel_icon.png b/image/icon/cancel_icon.png new file mode 100644 index 0000000..2020549 Binary files /dev/null and b/image/icon/cancel_icon.png differ diff --git a/image/index/index_block_04.png b/image/index/index_block_04.png deleted file mode 100644 index 45b8a4e..0000000 Binary files a/image/index/index_block_04.png and /dev/null differ diff --git a/image/index/index_block_23.png b/image/index/index_block_23.png deleted file mode 100644 index 611f4e3..0000000 Binary files a/image/index/index_block_23.png and /dev/null differ diff --git a/image/index/index_block_26.png b/image/index/index_block_26.png deleted file mode 100644 index d8bd41b..0000000 Binary files a/image/index/index_block_26.png and /dev/null differ diff --git a/pages/index/index.js b/pages/index/index.js index 37b6806..2beed4d 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -91,17 +91,12 @@ Page({ // }) // }, onShow(){ - //获取滚动条高度 - // this.computeBarLocation(); - UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'payment_state', {method:'GET'}, { - success: (res) => { - this.setData({ - paymentStateOption:res.data - }) - } - }) //获取用户信息 this.getUserInfo() + //查询待办 + this.getTaskList(); + //查询已办 + this.getTaskDoneList(); //查询dept this.getTreeDept(); }, @@ -137,28 +132,36 @@ Page({ let data = { pageNum:1, pageSize:999, - // orderByColumn:"A.ID_", - // isAsc:"desc", + orderByColumn:"A.ID_", + isAsc:"desc", systemType:4, method:"GET", - deptId:JSON.parse(wx.getStorageSync('user')).deptId, // taskName:'相关人员审批' } UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'activity_business_type', {method:'GET'}, { success: (res) => { } }) - UTIL.httpRequest(API.A_myTodoList,data, { + UTIL.httpRequest(API.URL_GET_TASKLIST,data, { success: (res) => { if (res.code == API.SUCCESS_CODE) { let list = []; - for(let i = 0;i < res.total;i++){ - res.rows[i].createTime = res.rows[i].createTime.substr(0,10) - console.log(res.rows[i].createTime); - list.push(res.rows[i]) - } - this.setData({todoList:list,todoNum:res.rows.length}) + for(let i = 0;i < res.total;i++){ + if(res.rows[i].formData){ + if (res.rows[i].formData.activityBusinessType == '16' || res.rows[i].formData.activityBusinessType=='36') { + res.rows[i].formData.expenditureAmount = Number(res.rows[i].formData.expenditureAmount).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => { + return $1 + ","; }).replace(/\.$/, "") + list.push(res.rows[i]) + } + } + } + this.setData({todoList:list,todoNum:list.length}) + } + }, fail: (res) => { + console.log(res); + }, + complete: (res) => { } }) }, @@ -166,36 +169,27 @@ Page({ let data = { pageNum:1, pageSize:999, - // orderByColumn:"A.ID_", - // isAsc:"desc", + orderByColumn:"A.ID_", + isAsc:"desc", systemType:4, method:"GET", - deptId:JSON.parse(wx.getStorageSync('user')).deptId, // taskName:'相关人员审批' } - UTIL.httpRequest(API.A_myDoneList,data, { + UTIL.httpRequest(API.URL_GET_TASKDONELIST,data, { success: (res) => { if (res.code == API.SUCCESS_CODE) { let list = []; - // for(let i = 0;i { - // return $1 + ","; }).replace(/\.$/, "") - // list.push(res.rows[i]) - // } - // } - // } - - for(let i = 0;i < res.total;i++){ - res.rows[i].data.expenditureAmount = Number(res.rows[i].data.expenditureAmount).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => { - return $1 + ","; }).replace(/\.$/, "") - res.rows[i].auditTime = res.rows[i].auditTime.substr(0,10) - console.log(res.rows[i].createTime); - list.push(res.rows[i]) - } + for(let i = 0;i { + return $1 + ","; }).replace(/\.$/, "") + list.push(res.rows[i]) + } + } + } this.setData({doneList:list,doneNum:list.length}) } }, fail: (res) => { @@ -205,7 +199,7 @@ Page({ } }) }, - getTransferList:function(e){//已废弃 + getTransferList:function(e){ let data = { // pageNum:1, // pageSize:10, @@ -222,8 +216,7 @@ Page({ this.setData({yfqNum:a}) for(let i = 0;i { - return $1 + ","; }).replace(/\.$/, ""); - + return $1 + ","; }).replace(/\.$/, "") } this.setData({yfqList:res.rows}) } @@ -252,7 +245,6 @@ Page({ for(let i = 0;i< c.length;i++){ c[i].totalAmount = Number(c[i].totalAmount).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => { return $1 + ","; }).replace(/\.$/, "") - c[i].paymentStateText = UTIL.getTransform(res.rows[i].paymentState,this.data.paymentStateOption); } this.setData({yfqList:c}) } @@ -323,7 +315,6 @@ Page({ }, /* 计算bar 高度*/ computeBarLocation() { - console.log('aaaaaaaaaaaaa'); var that = this; let CustomMenuButton = wx.getMenuButtonBoundingClientRect(); let CustomWidows = wx.getSystemInfoSync(); @@ -334,12 +325,11 @@ Page({ query.select('.navList_main').boundingClientRect(); query.select('.child_function').boundingClientRect(); query.select('.work_plan').boundingClientRect(); - + query.exec((res) => { let wrokScrollHeight = CustomWidows.windowHeight; res.forEach((v)=>{ wrokScrollHeight = wrokScrollHeight - v.height; - console.log(v.height); }) wrokScrollHeight = wrokScrollHeight-CustomMenuButton.top-CustomMenuButton.bottom -15; that.setData({ @@ -358,16 +348,13 @@ Page({ this.setData({userInfoObj:res.user}) this.setData({region:res.user.deptName}) this.setData({item:JSON.stringify(res.user)}) - wx.setStorageSync('user', JSON.stringify(res.user)) this.getBookList() //查询已制单 this.getTransferList2(); + //查询已发起 + // this.getTransferList(); this.getTransferList1(); - //查询待办 - this.getTaskList(); - //查询已办 - this.getTaskDoneList(); } } }) @@ -380,9 +367,7 @@ Page({ this.setData({provinces:res.data}) if(res.data[0].children){ this.setData({citys:res.data[0].children}) - if(res.data[0].children[this.data.value[1]].children){ - this.setData({areas:res.data[0].children[this.data.value[1]].children}) - } + if(res.data[0].children[this.data.value[1]].children){this.setData({areas:res.data[0].children[this.data.value[1]].children})} } } @@ -486,9 +471,9 @@ Page({ cityCancel(e) { var id = this.data.provinces[0].id this.setData({ - // citys: this.data.lastCitys || this.data.userInfoObj.parentDeptName, //默认北京市辖区, - // areas: this.data.lastAreas || this.data.userInfoObj.deptName, - // value: [...this.data.regionValue], + citys: this.data.lastCitys || this.data.userInfoObj.parentDeptName, //默认北京市辖区, + areas: this.data.lastAreas || this.data.userInfoObj.deptName, + value: [...this.data.regionValue], visible: false }) }, diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 46a0501..9b0a065 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -96,14 +96,9 @@ - - - - - 四议表决 @@ -156,10 +151,6 @@ 票据使用 --> - - - 主体名录 - @@ -177,41 +168,41 @@ - + - {{item.auditName}} + {{item.formData.remark}} - {{item.createTime}} + {{item.formData.applyTime}} - {{item.data.transferType=='2'?'信用卡转账':item.data.transferType=='1'?'银行转账':'其他'}} + {{item.formData.transferType=='2'?'信用卡转账':item.formData.transferType=='1'?'银行转账':'其他'}} - ￥{{item.data.expenditureAmount}} + ￥{{item.formData.expenditureAmount}} - + - {{item.auditName}} + {{item.formData.remark}} - {{item.auditTime}} + {{item.formData.applyTime}} - {{item.data.transferType=='2'?'信用卡转账':item.data.transferType=='1'?'银行转账':'其他'}} + {{item.formData.transferType=='2'?'信用卡转账':item.formData.transferType=='1'?'银行转账':'其他'}} - ￥{{item.data.expenditureAmount}} + ￥{{item.formData.expenditureAmount}} @@ -233,7 +224,6 @@ --> - @@ -251,7 +241,6 @@ {{item.transferType=='2'?'信用卡转账':item.transferType=='1'?'银行转账':'其他'}} - {{item.paymentStateText}} ￥{{item.expenditureAmount}} diff --git a/pages/index/index.wxss b/pages/index/index.wxss index ced75e4..8fe4ee3 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -288,7 +288,7 @@ .workflow .workflow_list .process_pay .describe{ font-size: 30rpx; - width: 320rpx; + width: 330rpx; color: #3c9370; display: flex; align-items: center; diff --git a/pages/noLoginIndex.wxml b/pages/noLoginIndex.wxml index e3d3ddf..e0446a6 100644 --- a/pages/noLoginIndex.wxml +++ b/pages/noLoginIndex.wxml @@ -1,2 +1,2 @@ - + diff --git a/pages/noLoginIndex.wxss b/pages/noLoginIndex.wxss index cd154ab..bfe7486 100644 --- a/pages/noLoginIndex.wxss +++ b/pages/noLoginIndex.wxss @@ -1,6 +1,6 @@ /* pages/noLoginIndex.wxss */ page{ - background-color: #F6F6F6!important; + background-color: #ffffff!important; height: 100vh; } .navList_main{ diff --git a/pages/paymentManager/toPay/toPay.js b/pages/paymentManager/toPay/toPay.js index 068a8c1..15f8053 100644 --- a/pages/paymentManager/toPay/toPay.js +++ b/pages/paymentManager/toPay/toPay.js @@ -111,13 +111,8 @@ Page({ confirmText: '确定', success: function (e) { //非建行 - // if(_this.data.data.alternateField1==null||_this.data.data.alternateField1.length<1){ - // UTIL.showToastNoneIcon("请输入验证码！"); - // }else{ - // _this.setData({'showPopup':true}) - // } - if(_this.data.data.accountPassword==null||_this.data.data.accountPassword.length<1){ - UTIL.showToastNoneIcon("请输入支付口令！"); + if(_this.data.data.alternateField1==null||_this.data.data.alternateField1.length<1){ + UTIL.showToastNoneIcon("请输入验证码！"); }else{ _this.setData({'showPopup':true}) } diff --git a/pages/paymentManager/toPay/toPay.wxml b/pages/paymentManager/toPay/toPay.wxml index 2cf65cd..f71fb1b 100644 --- a/pages/paymentManager/toPay/toPay.wxml +++ b/pages/paymentManager/toPay/toPay.wxml @@ -57,7 +57,7 @@ - + diff --git a/pages/phoneLogin.wxml b/pages/phoneLogin.wxml index da113c7..c93b4fd 100644 --- a/pages/phoneLogin.wxml +++ b/pages/phoneLogin.wxml @@ -1,44 +1,35 @@ - - - + - + - 账户密码登录 - + + -