diff --git a/app.json b/app.json
index 78714bd..554e6e1 100644
--- a/app.json
+++ b/app.json
@@ -42,6 +42,12 @@
"pages/apply/paymentTemplate/add/upLoad/upLoad",
"pages/apply/paymentTemplate/add/upError/upError",
"pages/apply/paymentTemplate/add/payeeList/payee"
+ "pages/contractAssets/fixedAssets",
+ "pages/fixedAssets/change/change",
+ "pages/paymentManager/paymentManager",
+ "pages/paymentManager/toPay/toPay",
+ "pages/majorEvent/majorEvent",
+ "pages/majorEvent/add/add"
],
"window": {
"backgroundTextStyle": "light",
diff --git a/component/editor/assets/iconfont.wxss b/component/editor/assets/iconfont.wxss
new file mode 100644
index 0000000..9ff2f5c
--- /dev/null
+++ b/component/editor/assets/iconfont.wxss
@@ -0,0 +1,240 @@
+@font-face {font-family: "iconfont";
+ src: url('//at.alicdn.com/t/font_945958_zfsfjju1dim.eot?t=1547618146468'); /* IE9 */
+ src: url('//at.alicdn.com/t/font_945958_zfsfjju1dim.eot?t=1547618146468#iefix') format('embedded-opentype'), /* IE6-IE8 */
+ url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2'),
+ url('//at.alicdn.com/t/font_945958_zfsfjju1dim.woff?t=1547618146468') format('woff'),
+ url('//at.alicdn.com/t/font_945958_zfsfjju1dim.ttf?t=1547618146468') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
+ url('//at.alicdn.com/t/font_945958_zfsfjju1dim.svg?t=1547618146468#iconfont') format('svg'); /* iOS 4.1- */
+}
+
+.iconfont {
+ font-family: "iconfont" !important;
+ font-size: 16px;
+ font-style: normal;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-redo:before {
+ content: "\e627";
+}
+
+.icon-undo:before {
+ content: "\e633";
+}
+
+.icon-indent:before {
+ content: "\eb28";
+}
+
+.icon-outdent:before {
+ content: "\e6e8";
+}
+
+.icon-fontsize:before {
+ content: "\e6fd";
+}
+
+.icon-format-header-1:before {
+ content: "\e860";
+}
+
+.icon-format-header-4:before {
+ content: "\e863";
+}
+
+.icon-format-header-5:before {
+ content: "\e864";
+}
+
+.icon-format-header-6:before {
+ content: "\e865";
+}
+
+.icon-clearup:before {
+ content: "\e64d";
+}
+
+.icon-preview:before {
+ content: "\e631";
+}
+
+.icon-date:before {
+ content: "\e63e";
+}
+
+.icon-fontbgcolor:before {
+ content: "\e678";
+}
+
+.icon-clearedformat:before {
+ content: "\e67e";
+}
+
+.icon-font:before {
+ content: "\e684";
+}
+
+.icon-723bianjiqi_duanhouju:before {
+ content: "\e65f";
+}
+
+.icon-722bianjiqi_duanqianju:before {
+ content: "\e660";
+}
+
+.icon-text_color:before {
+ content: "\e72c";
+}
+
+.icon-format-header-2:before {
+ content: "\e75c";
+}
+
+.icon-format-header-3:before {
+ content: "\e75d";
+}
+
+.icon--checklist:before {
+ content: "\e664";
+}
+
+.icon-baocun:before {
+ content: "\ec09";
+}
+
+.icon-line-height:before {
+ content: "\e7f8";
+}
+
+.icon-quanping:before {
+ content: "\ec13";
+}
+
+.icon-direction-rtl:before {
+ content: "\e66e";
+}
+
+.icon-direction-ltr:before {
+ content: "\e66d";
+}
+
+.icon-selectall:before {
+ content: "\e62b";
+}
+
+.icon-fuzhi:before {
+ content: "\ec7a";
+}
+
+.icon-shanchu:before {
+ content: "\ec7b";
+}
+
+.icon-bianjisekuai:before {
+ content: "\ec7c";
+}
+
+.icon-fengexian:before {
+ content: "\ec7f";
+}
+
+.icon-dianzan:before {
+ content: "\ec80";
+}
+
+.icon-charulianjie:before {
+ content: "\ec81";
+}
+
+.icon-charutupian:before {
+ content: "\ec82";
+}
+
+.icon-wuxupailie:before {
+ content: "\ec83";
+}
+
+.icon-juzhongduiqi:before {
+ content: "\ec84";
+}
+
+.icon-yinyong:before {
+ content: "\ec85";
+}
+
+.icon-youxupailie:before {
+ content: "\ec86";
+}
+
+.icon-youduiqi:before {
+ content: "\ec87";
+}
+
+.icon-zitidaima:before {
+ content: "\ec88";
+}
+
+.icon-xiaolian:before {
+ content: "\ec89";
+}
+
+.icon-zitijiacu:before {
+ content: "\ec8a";
+}
+
+.icon-zitishanchuxian:before {
+ content: "\ec8b";
+}
+
+.icon-zitishangbiao:before {
+ content: "\ec8c";
+}
+
+.icon-zitibiaoti:before {
+ content: "\ec8d";
+}
+
+.icon-zitixiahuaxian:before {
+ content: "\ec8e";
+}
+
+.icon-zitixieti:before {
+ content: "\ec8f";
+}
+
+.icon-zitiyanse:before {
+ content: "\ec90";
+}
+
+.icon-zuoduiqi:before {
+ content: "\ec91";
+}
+
+.icon-zitiyulan:before {
+ content: "\ec92";
+}
+
+.icon-zitixiabiao:before {
+ content: "\ec93";
+}
+
+.icon-zuoyouduiqi:before {
+ content: "\ec94";
+}
+
+.icon-duigoux:before {
+ content: "\ec9e";
+}
+
+.icon-guanbi:before {
+ content: "\eca0";
+}
+
+.icon-shengyin_shiti:before {
+ content: "\eca5";
+}
+
+.icon-Character-Spacing:before {
+ content: "\e964";
+}
diff --git a/component/editor/editor.js b/component/editor/editor.js
new file mode 100644
index 0000000..c3db795
--- /dev/null
+++ b/component/editor/editor.js
@@ -0,0 +1,178 @@
+Component({
+ properties: {
+ width: {
+ type: String
+ },
+ height: {
+ type: String
+ },
+ insertPicture: {
+ type: Boolean,
+ value: true
+ },
+ placeholder: {
+ type: String,
+ value: '输入文字...'
+ }
+ },
+ data: {
+ formats: {},
+ readOnly: false,
+ // editorHeight: 300,
+ keyboardHeight: 0,
+ isIOS: false
+ },
+ ready() {
+ const platform = wx.getSystemInfoSync().platform
+ const isIOS = platform === 'ios'
+ this.setData({
+ isIOS
+ })
+ const that = this
+ this.updatePosition(0)
+ let keyboardHeight = 0
+ wx.onKeyboardHeightChange(res => {
+ if (res.height === keyboardHeight) return
+ const duration = res.height > 0 ? res.duration * 1000 : 0
+ keyboardHeight = res.height
+ setTimeout(() => {
+ wx.pageScrollTo({
+ scrollTop: 0,
+ success() {
+ that.updatePosition(keyboardHeight)
+ that.editorCtx.scrollIntoView()
+ }
+ })
+ }, duration)
+
+ })
+ },
+ methods: {
+ readOnlyChange() {
+ this.setData({
+ readOnly: !this.data.readOnly
+ })
+ },
+ updatePosition(keyboardHeight) {
+ const toolbarHeight = 100
+ const {
+ windowHeight,
+ platform
+ } = wx.getSystemInfoSync()
+ // let editorHeight = keyboardHeight > 0 ? (windowHeight - keyboardHeight - toolbarHeight) : windowHeight
+ this.setData({
+ // editorHeight,
+ keyboardHeight
+ })
+ },
+ calNavigationBarAndStatusBar() {
+ const systemInfo = wx.getSystemInfoSync()
+ const {
+ statusBarHeight,
+ platform
+ } = systemInfo
+ const isIOS = platform === 'ios'
+ const navigationBarHeight = isIOS ? 44 : 48
+ return statusBarHeight + navigationBarHeight
+ },
+ onEditorReady() {
+ const that = this
+ //组件使用createSelectorQuery加上in(this)
+ wx.createSelectorQuery().in(that).select('#editor').context(function (res) {
+ that.editorCtx = res.context
+ }).exec()
+ },
+ undo() {
+ this.editorCtx.undo()
+ },
+ redo() {
+ this.editorCtx.redo()
+ },
+ blur() {
+ this.editorCtx.blur()
+ },
+ format(e) {
+ let {
+ name,
+ value
+ } = e.target.dataset
+ if (!name) return
+ // console.log('format', name, value)
+ if (name === "backgroundColor" && value === "#ff0000") { //设置字体颜色为白色
+ this.editorCtx.format("color", "#ffffff")
+ }
+ if (name === "backgroundColor" && value === "#ffffff") {
+ this.editorCtx.format("color", "#000000")
+ }
+ if (name === "color") { //清除字体样式
+ this.editorCtx.removeFormat()
+ }
+ this.editorCtx.format(name, value)
+
+ },
+ onStatusChange(e) {
+ const formats = e.detail
+ this.setData({
+ formats
+ })
+ },
+ insertDivider() {
+ this.editorCtx.insertDivider({
+ success: function () {
+ console.log('insert divider success')
+ }
+ })
+ },
+ clear() {
+ this.editorCtx.clear({
+ success: function (res) {
+ console.log("clear success")
+ }
+ })
+ },
+ removeFormat() {
+ this.editorCtx.removeFormat()
+ },
+ insertDate() {
+ const date = new Date()
+ const formatDate = `${date.getFullYear()}/${date.getMonth() + 1}/${date.getDate()}`
+ this.editorCtx.insertText({
+ text: formatDate
+ })
+ },
+ insertImage() {
+ this.triggerEvent('insertImage'); //触发父组件方法
+ },
+ insertSrc(src) { //接受图片返回地址
+ this.editorCtx.insertImage({
+ src,
+ data: {
+ id: 'abcd',
+ role: 'god'
+ },
+ width: '80%',
+ fail: (err) => {
+ console.log(`图片插入失败:${err}`);
+ }
+ })
+ },
+ getContent(e) { //获得文本内容
+ this.triggerEvent('Content', {
+ content: e.detail
+ })
+ },
+ setHtml(html) { //回显
+ if (html) {
+ this.createSelectorQuery().select('#editor').context((res) => {
+ this.editorCtx = res.context
+ this.editorCtx.setContents({
+ html,
+ fail: (err) => {
+ console.log(`内容回显失败:${err}`);
+ }
+ })
+ }).exec()
+ }
+ },
+ }
+})
\ No newline at end of file
diff --git a/component/editor/editor.json b/component/editor/editor.json
new file mode 100644
index 0000000..32640e0
--- /dev/null
+++ b/component/editor/editor.json
@@ -0,0 +1,3 @@
+{
+ "component": true
+}
\ No newline at end of file
diff --git a/component/editor/editor.wxml b/component/editor/editor.wxml
new file mode 100644
index 0000000..64395ba
--- /dev/null
+++ b/component/editor/editor.wxml
@@ -0,0 +1,50 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/component/editor/editor.wxss b/component/editor/editor.wxss
new file mode 100644
index 0000000..0dff491
--- /dev/null
+++ b/component/editor/editor.wxss
@@ -0,0 +1,34 @@
+@import "./assets/iconfont.wxss";
+.ql-container {
+ font-size: 16px;
+ line-height: 1.5;
+ padding: 10px 10px 20px 10px;
+}
+
+.ql-active {
+ color: #22C704;
+}
+
+.iconfont {
+ display: flex;
+ width: 60rpx;
+ height: 60rpx;
+ align-items: center;
+ justify-content: center;
+ font-size: 40rpx;
+}
+
+.toolbar {
+ padding: 0 16rpx;
+ height: 200rpx;
+ width: 100%;
+ position: fixed;
+ left: 0;
+ right: 100%;
+ bottom: 0;
+ display: flex;
+ flex-wrap: wrap;
+ align-items: center;
+ border-top: 1px solid #ECECEC;
+ background-color: white;
+}
\ No newline at end of file
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/icon/clock_red_icon.png b/image/icon/clock_red_icon.png
new file mode 100644
index 0000000..b162b71
Binary files /dev/null and b/image/icon/clock_red_icon.png differ
diff --git a/image/icon/detailNum_icon.png b/image/icon/detailNum_icon.png
new file mode 100644
index 0000000..55ae3d9
Binary files /dev/null and b/image/icon/detailNum_icon.png differ
diff --git a/image/icon/payBg.png b/image/icon/payBg.png
new file mode 100644
index 0000000..fe0774b
Binary files /dev/null and b/image/icon/payBg.png differ
diff --git a/image/icon/paymentManager_icon.png b/image/icon/paymentManager_icon.png
new file mode 100644
index 0000000..ac4b27d
Binary files /dev/null and b/image/icon/paymentManager_icon.png differ
diff --git a/image/icon/scrap_icon.png b/image/icon/scrap_icon.png
new file mode 100644
index 0000000..bf2e57f
Binary files /dev/null and b/image/icon/scrap_icon.png differ
diff --git a/image/icon/sell_icon.png b/image/icon/sell_icon.png
new file mode 100644
index 0000000..65fd45b
Binary files /dev/null and b/image/icon/sell_icon.png differ
diff --git a/image/icon/terminate_icon.png b/image/icon/terminate_icon.png
new file mode 100644
index 0000000..d880240
Binary files /dev/null and b/image/icon/terminate_icon.png differ
diff --git a/image/index/majorEvent_icon.png b/image/index/majorEvent_icon.png
new file mode 100644
index 0000000..fc073e4
Binary files /dev/null and b/image/index/majorEvent_icon.png differ
diff --git a/image/index/paymentManager_icon.png b/image/index/paymentManager_icon.png
new file mode 100644
index 0000000..1be98d6
Binary files /dev/null and b/image/index/paymentManager_icon.png differ
diff --git a/pages/bankDraft/bankDraft.js b/pages/bankDraft/bankDraft.js
index 641039b..cf555ee 100644
--- a/pages/bankDraft/bankDraft.js
+++ b/pages/bankDraft/bankDraft.js
@@ -118,8 +118,6 @@ Page({
if (response.code == API.SUCCESS_CODE) {
for (let i = 0; i < response.rows.length; i++) {
response.rows[i].orderTypeText = UTIL.getTransform(response.rows[i].orderType,res.data);
- response.rows[i].startTime = response.rows[i].startTime.replace(/-/g,".");
- response.rows[i].endTime = response.rows[i].endTime.replace(/-/g,".");
response.rows[i].orderAmount = Number(response.rows[i].orderAmount).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => {
return $1 + ","; }).replace(/\.$/, "")
}
diff --git a/pages/bankDraft/bankDraft.wxss b/pages/bankDraft/bankDraft.wxss
index 8c48f92..42be150 100644
--- a/pages/bankDraft/bankDraft.wxss
+++ b/pages/bankDraft/bankDraft.wxss
@@ -142,7 +142,7 @@ text{display: block;}
margin-top: 10px;
}
.detail_time text{
- font-size: 14px;
+ font-size: 12px;
margin-left: 5px;
color: #878787;
}
@@ -154,7 +154,7 @@ text{display: block;}
}
.li .detail_box_left .fkdw{
color: #B5B5B5;
- font-size: 14px;
+ font-size: 12px;
margin-top: 5px;
}
.li .detail_box_center{
@@ -171,7 +171,7 @@ text{display: block;}
}
.li .detail_box_right .skdw{
color: #B5B5B5;
- font-size: 14px;
+ font-size: 12px;
margin-top: 5px;
}
diff --git a/pages/contract/add/add.js b/pages/contract/add/add.js
index 1756254..63a793c 100644
--- a/pages/contract/add/add.js
+++ b/pages/contract/add/add.js
@@ -272,8 +272,6 @@ Page({
UTIL.httpRequest(API.URL_GET_CONTRACTDETAIL + this.data.id, {method:'GET'}, {
success: (res) => {
this.setData({'form':res.data});
- res.data.biddingDate = res.data.biddingDate.slice(0,9)
- res.data.reviewTime = res.data.reviewTime.slice(0,9)
let that = this;
//获取收入合同状态
UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'type_of_contract', {method:'GET'}, {
diff --git a/pages/contract/contract.js b/pages/contract/contract.js
index c8c697f..2cc2b96 100644
--- a/pages/contract/contract.js
+++ b/pages/contract/contract.js
@@ -174,6 +174,34 @@ Page({
},
})
},
+ terminate(e){
+ UTIL.httpRequest(API.URL_GET_TERMINATEINFO+ e.currentTarget.dataset.id, {method:'GET'}, {
+ success: (res) => {
+ if(res.code==200){
+ let list = this.data.list
+ list[e.currentTarget.dataset.index].contractionStatus = '3'
+ this.setData({'list':list})
+ UTIL.showToastNoneIcon('终止成功!');
+ }else{
+ UTIL.showToastNoneIcon('终止失败!: '+res.msg);
+ }
+ }
+ })
+},
+ cancel(e){
+ UTIL.httpRequest(API.URL_GET_CANCELINFO+ e.currentTarget.dataset.id, {method:'GET'}, {
+ success: (res) => {
+ if(res.code==200){
+ let list = this.data.list
+ list[e.currentTarget.dataset.index].contractionStatus = '2'
+ this.setData({'list':list})
+ UTIL.showToastNoneIcon('撤销成功!');
+ }else{
+ UTIL.showToastNoneIcon('撤销失败!: '+res.msg);
+ }
+ }
+ })
+},
relevanceDelete(e){
UTIL.httpRequest(API.URL_GET_ASSETREMOVE+ e.currentTarget.dataset.id, {method:'GET'}, {
success: (res) => {
diff --git a/pages/contract/contract.wxml b/pages/contract/contract.wxml
index ce1d460..87ba6bb 100644
--- a/pages/contract/contract.wxml
+++ b/pages/contract/contract.wxml
@@ -16,7 +16,7 @@
新增
-
+
@@ -79,6 +79,24 @@
+
+
+
+
+
+
+ 终止
+
+
+
+
+
+
+
+ 撤销
+
+
+
@@ -109,7 +127,7 @@
- 固定资产
+ {{item.assetTable=='t_asset_permanent'?"固定资产":"资源资产"}}
{{item.name}}
{{item.num}}{{item.unit}}
diff --git a/pages/contract/contract.wxss b/pages/contract/contract.wxss
index 880ca12..38e5bc5 100644
--- a/pages/contract/contract.wxss
+++ b/pages/contract/contract.wxss
@@ -71,6 +71,14 @@ text{display: block;}
align-items: center;
display: flex;
}
+.moreBox{
+ width: 100px;
+ text-align: center;
+ height: 100%;
+ background: #F6F6F6;
+ align-items: center;
+ display: flex;
+}
.deleteBoxAsset{
width: 50px;
text-align: center;
diff --git a/pages/contractAssets/fixedAssets.js b/pages/contractAssets/fixedAssets.js
index 64b77f3..fea752f 100644
--- a/pages/contractAssets/fixedAssets.js
+++ b/pages/contractAssets/fixedAssets.js
@@ -15,6 +15,7 @@ Page({
data: {
isIPX: app.globalData.isIPX,
list:[],
+ list1:[],
isLoading:false,
pageNums:1,
scrollHeight:"",
@@ -27,6 +28,11 @@ Page({
itemId:"",
assetTypeOptions:[],
status:0,
+ index:0,
+ array:[
+ {assetTable:'t_asset_permanent',assetTableName:'固定资产'},
+ {assetTable:'t_asset_resource',assetTableName:'资源性资产'}
+ ],
},
goAdd(){
wx.navigateTo({
@@ -45,6 +51,10 @@ Page({
}
})
},
+ bindPickerChange:function(e){
+ this.setData({index:e.detail.value});
+ this.getList()
+ },
/**
* 生命周期函数--监听页面加载
*/
@@ -80,64 +90,77 @@ Page({
this.getList();
},
getList:function(){
- let params = {
- pageNum:this.data.pageNums,
- pageSize:10,
+
+ if(this.data.index == 0){
+ let params = {
name:this.data.name,
- isMin:"Y",
useType:'2',
- operationType:'1',
- assetStatus:'1'
+ OperationType:'1',
+ assetStatus:'1',
+ isMin:'Y'
}
- UTIL.httpRequest(API.URL_GET_PERMANENTLIST,params,{
- success: (res) => {
- let _this = this
- if(res.code == 200){
- if(this.data.pageNums!=1&&this.data.list.length {
- if(r.data.length>0){
- let li = lists.map( res => {
- r.data.map(rr => {
- if(res.assetType == rr.dictValue){
- res.assetType = rr.dictLabel
- }
- })
- return res
+ UTIL.httpRequest(API.URL_GET_PERMANENTLIST,params,{
+ success: (res) => {
+ let _this = this
+ if(res.code == 200){
+ //获取资产类别
+ UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'asset_type', {method:'GET'}, {
+ success: (r) => {
+ if(r.data.length>0){
+ let li = res.rows.map( ress => {
+ r.data.map(rr => {
+ if(ress.assetType == rr.dictValue){
+ ress.assetType = rr.dictLabel
+ }
})
- _this.setData({list:li})
- }else{
- _this.setData({list:lists})
- }
+ return ress
+ })
+ _this.setData({list:li})
+ }else{
+ _this.setData({list:res.rows})
}
- })
- }else if(this.data.pageNums==1){
- //获取资产类别
- UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'asset_type', {method:'GET'}, {
- success: (r) => {
- if(r.data.length>0){
- let li = res.rows.map( ress => {
- r.data.map(rr => {
- if(ress.assetType == rr.dictValue){
- ress.assetType = rr.dictLabel
- }
- })
- return ress
+ }
+ })
+ }else{
+ UTIL.showToastNoneIcon(res.msg);
+ }
+ }
+ })
+ }else{
+ let params = {
+ name:this.data.name,
+ useType : '2',
+ status : '0'
+ }
+ UTIL.httpRequest(API.URL_GET_RESOURCELIST,params,{
+ success: (res) => {
+ let _this = this
+ if(res.code == 200){
+ //获取资产类别
+ UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'resource_type', {method:'GET'}, {
+ success: (r) => {
+ if(r.data.length>0){
+ let li = res.rows.map( ress => {
+ r.data.map(rr => {
+ if(ress.resourceType == rr.dictValue){
+ ress.resourceType = rr.dictLabel
+ }
})
- _this.setData({list:li})
- }else{
- _this.setData({list:res.rows})
- }
+ return ress
+ })
+ _this.setData({list1:li})
+ }else{
+ _this.setData({list1:res.rows})
}
- })
+ }
+ })
+ }else{
+ UTIL.showToastNoneIcon(res.msg);
}
- }else{
- UTIL.showToastNoneIcon(res.msg);
}
- }
- })
+ })
+ }
+
},
paging(){
this.setData({
@@ -155,12 +178,12 @@ Page({
this.setData({'status':1})
let data = e.currentTarget.dataset.item;
data.method = "POST";
- data.assetTable = "t_asset_permanent"
+ data.assetTable = 't_asset_permanent'
data.assetId = e.currentTarget.dataset.item.id
data.contractionId = this.data.itemId
data.num = e.currentTarget.dataset.item.quantity
if(data.unit==""||data.unit==null){
- data.unit = '1'
+ data.unit = '台'
}
UTIL.httpRequest(API.URL_GET_ASSETADD,data,{
success: (res) => {
@@ -178,6 +201,34 @@ Page({
})
}
},
+ goUpdate1(e){
+ if(this.data.status=='0'){
+ this.setData({'status':1})
+ let data = e.currentTarget.dataset.item;
+ data.method = "POST";
+ data.assetTable = 't_asset_resource'
+ data.assetId = e.currentTarget.dataset.item.id
+ data.contractionId = this.data.itemId
+ data.num = e.currentTarget.dataset.item.totalArea
+ if(data.unit==""||data.unit==null){
+ data.unit = '亩'
+ }
+ UTIL.httpRequest(API.URL_GET_ASSETADD,data,{
+ success: (res) => {
+ if(res.code == 200){
+ UTIL.showToastNoneIcon(res.msg);
+ this.setData({'status':0})
+ wx.navigateBack({
+ delta: 1
+ })
+ }else{
+ UTIL.showToastNoneIcon(res.msg);
+ this.setData({'status':0})
+ }
+ }
+ })
+ }
+},
delete(e){
UTIL.httpRequest(API.URL_GET_PERMANENTDELETE + e.currentTarget.dataset.id, {method:'GET'}, {
success: (res) => {
diff --git a/pages/contractAssets/fixedAssets.wxml b/pages/contractAssets/fixedAssets.wxml
index 99ff37e..c0acd32 100644
--- a/pages/contractAssets/fixedAssets.wxml
+++ b/pages/contractAssets/fixedAssets.wxml
@@ -1,11 +1,12 @@
- 可关联固定资产
+ 可关联资产
-
+
+
+
+
+
+ {{array[index].assetTableName}}
+
+
+
+
-
-
+
+
@@ -47,6 +57,36 @@
-
-
-
\ No newline at end of file
+
+
+
+
+
+ {{item.name}}
+
+ 自用
+ 闲置
+ 出租或出借
+ 其他
+
+
+
+ {{item.code}}
+
+ {{item.resourceType}}
+
+
+
+
+
+
+ {{item.createTime}}
+
+
+ 数量/面积:
+ {{item.totalArea}}
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/finance/finance.wxml b/pages/finance/finance.wxml
index 15d0106..96d73d2 100644
--- a/pages/finance/finance.wxml
+++ b/pages/finance/finance.wxml
@@ -24,19 +24,19 @@
上月结余
- ¥{{data.syjc}}
+ ¥{{data.syjc}}
支出
- ¥{{data.dai}}
+ ¥{{data.dai}}
收入
- ¥{{data.jie}}
+ ¥{{data.jie}}
本月结存
- ¥{{data.byjc}}
+ ¥{{data.byjc}}
diff --git a/pages/finance/finance.wxss b/pages/finance/finance.wxss
index b52c70e..8c8ac9e 100644
--- a/pages/finance/finance.wxss
+++ b/pages/finance/finance.wxss
@@ -45,24 +45,21 @@
padding: 10rpx 32.5rpx;
}
.workflow .workflow_list{
- height: 150rpx;
background-color: #fff;
border-radius: 24rpx;
box-shadow:0rpx 0rpx 10rpx rgba(0,0,0,.1);
- margin-bottom: 20rpx;
- padding:15rpx 25rpx 10rpx 35rpx;
+ padding:25rpx 25rpx 10rpx 35rpx;
}
.workflow .workflow_list .process_intro{
display: flex;
- height: 62rpx;
align-items: center;
}
.workflow .process_intro .name{
- width: 390rpx;
- font-size: 34rpx;
+ max-width: 390rpx;
+ font-size: 16px;
margin-right: 30rpx;
- display: flex;
+ flex:1;
justify-content: space-between;
align-items: center;
}
@@ -112,7 +109,7 @@
.workflow .time{
flex: 1;
text-align: right;
- font-size: 32rpx;
+ font-size: 12px;
color: #9ea1aa;
}
@@ -135,16 +132,18 @@
width: 32rpx;
height: 32rpx;
margin-right: 12rpx;
+ text-align: right;
+ font-size: 14px;
}
.workflow .workflow_list .amount{
- font-size: 38rpx;
+ font-size: 14px;
flex: 1;
text-align: right;
color: #f31e1f;
}
.workflow .workflow_list .amounts{
- font-size: 38rpx;
+ font-size: 14px;
flex: 1;
text-align: right;
color:#4caf50;
@@ -192,6 +191,7 @@
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
+ font-size: 12px;
}
.banner {
display: flex;background:#4caf50;color:#fff;text-align: center;margin:3%;border-radius: 20rpx;line-height: 50rpx;
diff --git a/pages/fixedAssets/change/change.js b/pages/fixedAssets/change/change.js
new file mode 100644
index 0000000..1444ad2
--- /dev/null
+++ b/pages/fixedAssets/change/change.js
@@ -0,0 +1,629 @@
+// pages/contract/add/add.js
+import * as UTIL from '../../../utils/util.js';
+import * as API from '../../../utils/API.js';
+const app = getApp();
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ isIPX: app.globalData.isIPX,
+ id:null,
+ form:{},
+ assetTypeindex:'0',
+ changeTypeindex:'0',
+ depreciationTypeindex:'0',
+ changeValueindex:'0',
+ // 折旧方式字典
+ depreciationTypeOptions:[],
+ // 资产类别字典
+ assetTypeOptions: [],
+ // 变更类型字典
+ changeTypeOptions: [
+ { 'dictLabel':'数量/面积变更','dictValue':'1'},
+ { 'dictLabel':'原值变更','dictValue':'2'},
+ { 'dictLabel':'预计使用年数变更','dictValue':'3'},
+ { 'dictLabel':'累计折旧变更','dictValue':'4'},
+ { 'dictLabel':'已折旧年数变更','dictValue':'5'},
+ { 'dictLabel':'残值率变更','dictValue':'6'},
+ { 'dictLabel':'折旧方式变更','dictValue':'7'},
+ ],
+ status:0,
+ },
+ back:function(){
+ wx.navigateBack({
+ delta: 1
+ })
+ },
+ openBox(even){
+ this.setData({
+ [even.currentTarget.dataset.name]:true
+ })
+ },
+ onChange(event){
+ this.setData({
+ [event.currentTarget.dataset.formname]: event.detail,
+ })
+ },
+ closeBox(even){
+ this.setData({
+ [even.currentTarget.dataset.name]:false
+ })
+ },
+ onConfirmChangeType (e) {
+ let obj = e.detail.value;
+ this.setData({
+ 'form.changeType':this.data.changeTypeOptions[obj].dictValue,
+ 'changeTypeindex':obj
+ })
+ },
+ onConfirmChangeValue(e){
+ let obj = e.detail.value;
+ this.setData({
+ 'form.changeValue':this.data.depreciationTypeOptions[obj].dictValue,
+ 'changeValueindex':obj
+ })
+ },
+ onConfirmDepreciationType(e){
+ let obj = e.detail.value;
+ this.setData({
+ 'form.depreciationType':this.data.depreciationTypeOptions[obj].dictValue,
+ 'depreciationTypeindex':obj
+ })
+ },
+ onConfirmAssetType (e) {
+ let obj = e.detail.value;
+ this.setData({
+ 'form.assetType':this.data.assetTypeOptions[obj].dictValue,
+ 'assetTypeindex':obj
+ })
+ },
+ getNewDate(date){
+ //date是传过来的时间戳,注意需为13位,10位需*1000
+ //也可以不传,获取的就是当前时间
+ var time
+ if(date){
+ time = new Date(date);
+ }else{
+ time = new Date();
+ }
+ var year= time.getFullYear() //年
+ var month = ("0" + (time.getMonth() + 1)).slice(-2); //月
+ var day = ("0" + time.getDate()).slice(-2); //日
+ var mydate = year + "-" + month + "-" + day;
+ return mydate
+ },
+ goSubmit:function(){
+ if(this.data.changeTypeindex != 6&&(this.data.form.changeValue===''||this.data.form.changeValue==null)){ //变更后值
+ UTIL.showToastNoneIcon('变更后值不能给你为空!');
+ return false;
+ }else if(this.data.status == '0'){
+ let that = this
+ this.setData({'status':'1'})
+ let data = this.data.form;
+ data.method = "POST";
+ if(this.data.changeTypeindex == 0){
+ data.quantity = data.changeValue
+ UTIL.httpRequest(API.URL_POST_UPDATEQUANTITY,data,{
+ success: (res) => {
+ that.setData({'status':'0'})
+ if(res.code == 200){
+ UTIL.showToastNoneIcon("变更成功");
+ setTimeout(function(){
+ wx.navigateBack({
+ delta:1
+ })
+ },2000)
+ }else{
+ UTIL.showToastNoneIcon("变更失败:"+res.msg);
+ }
+ },
+ fail: function (response) {
+ if (typeof fail === FUNCTION_TEXT) {
+ fail(handleFail(response));
+ } else {
+ showToastNoneIcon(API.MSG_FAIL_HTTP);
+ }
+ that.setData({'status':0})
+ },
+ complete: function (response) {
+ wx.hideNavigationBarLoading();
+ }
+ })
+ }else if(this.data.changeTypeindex == 1){
+ data.originalValue = data.changeValue
+ UTIL.httpRequest(API.URL_POST_UPDATEORIGINALVALUE,data,{
+ success: (res) => {
+ that.setData({'status':'0'})
+ if(res.code == 200){
+ UTIL.showToastNoneIcon("变更成功");
+ setTimeout(function(){
+ wx.navigateBack({
+ delta:1
+ })
+ },2000)
+ }else{
+ UTIL.showToastNoneIcon("变更失败:"+res.msg);
+ }
+ },
+ fail: function (response) {
+ if (typeof fail === FUNCTION_TEXT) {
+ fail(handleFail(response));
+ } else {
+ showToastNoneIcon(API.MSG_FAIL_HTTP);
+ }
+ that.setData({'status':0})
+ },
+ complete: function (response) {
+ wx.hideNavigationBarLoading();
+ }
+ })
+ }else if(this.data.changeTypeindex == 2){
+ data.expectedYears = data.changeValue
+ UTIL.httpRequest(API.URL_POST_UPDATEEXPECTEDYEARS,data,{
+ success: (res) => {
+ that.setData({'status':'0'})
+ if(res.code == 200){
+ UTIL.showToastNoneIcon("变更成功");
+ setTimeout(function(){
+ wx.navigateBack({
+ delta:1
+ })
+ },2000)
+ }else{
+ UTIL.showToastNoneIcon("变更失败:"+res.msg);
+ }
+ },
+ fail: function (response) {
+ if (typeof fail === FUNCTION_TEXT) {
+ fail(handleFail(response));
+ } else {
+ showToastNoneIcon(API.MSG_FAIL_HTTP);
+ }
+ that.setData({'status':0})
+ },
+ complete: function (response) {
+ wx.hideNavigationBarLoading();
+ }
+ })
+ }else if(this.data.changeTypeindex == 3){
+ data.depreciationValue = data.changeValue
+ UTIL.httpRequest(API.URL_POST_UPDATEDEPRECIATIONVALUE,data,{
+ success: (res) => {
+ that.setData({'status':'0'})
+ if(res.code == 200){
+ UTIL.showToastNoneIcon("变更成功");
+ setTimeout(function(){
+ wx.navigateBack({
+ delta:1
+ })
+ },2000)
+ }else{
+ UTIL.showToastNoneIcon("变更失败:"+res.msg);
+ }
+ },
+ fail: function (response) {
+ if (typeof fail === FUNCTION_TEXT) {
+ fail(handleFail(response));
+ } else {
+ showToastNoneIcon(API.MSG_FAIL_HTTP);
+ }
+ that.setData({'status':0})
+ },
+ complete: function (response) {
+ wx.hideNavigationBarLoading();
+ }
+ })
+ }else if(this.data.changeTypeindex == 4){
+ data.depreciationYears = data.changeValue
+ UTIL.httpRequest(API.URL_POST_UPDATEDEPRECIATIONYEARS,data,{
+ success: (res) => {
+ that.setData({'status':'0'})
+ if(res.code == 200){
+ UTIL.showToastNoneIcon("变更成功");
+ setTimeout(function(){
+ wx.navigateBack({
+ delta:1
+ })
+ },2000)
+ }else{
+ UTIL.showToastNoneIcon("变更失败:"+res.msg);
+ }
+ },
+ fail: function (response) {
+ if (typeof fail === FUNCTION_TEXT) {
+ fail(handleFail(response));
+ } else {
+ showToastNoneIcon(API.MSG_FAIL_HTTP);
+ }
+ that.setData({'status':0})
+ },
+ complete: function (response) {
+ wx.hideNavigationBarLoading();
+ }
+ })
+ }else if(this.data.changeTypeindex == 5){
+ data.residualsRate = data.changeValue
+ UTIL.httpRequest(API.URL_POST_UPDATERESIDUALSRATE,data,{
+ success: (res) => {
+ that.setData({'status':'0'})
+ if(res.code == 200){
+ UTIL.showToastNoneIcon("变更成功");
+ setTimeout(function(){
+ wx.navigateBack({
+ delta:1
+ })
+ },2000)
+ }else{
+ UTIL.showToastNoneIcon("变更失败:"+res.msg);
+ }
+ },
+ fail: function (response) {
+ if (typeof fail === FUNCTION_TEXT) {
+ fail(handleFail(response));
+ } else {
+ showToastNoneIcon(API.MSG_FAIL_HTTP);
+ }
+ that.setData({'status':0})
+ },
+ complete: function (response) {
+ wx.hideNavigationBarLoading();
+ }
+ })
+ }else if(this.data.changeTypeindex == 6){
+ data.depreciationType = this.data.depreciationTypeOptions[this.data.changeValueindex].dictValue
+ UTIL.httpRequest(API.URL_POST_UPDATEDEPRECIATIONMETHOD,data,{
+ success: (res) => {
+ that.setData({'status':'0'})
+ if(res.code == 200){
+ UTIL.showToastNoneIcon("变更成功");
+ setTimeout(function(){
+ wx.navigateBack({
+ delta:1
+ })
+ },2000)
+ }else{
+ UTIL.showToastNoneIcon("变更失败:"+res.msg);
+ }
+ },
+ fail: function (response) {
+ if (typeof fail === FUNCTION_TEXT) {
+ fail(handleFail(response));
+ } else {
+ showToastNoneIcon(API.MSG_FAIL_HTTP);
+ }
+ that.setData({'status':0})
+ },
+ complete: function (response) {
+ wx.hideNavigationBarLoading();
+ }
+ })
+ }
+
+
+ }
+ },
+ bindNewInput: function (e) {
+ this.setData({
+ [e.currentTarget.dataset.name]: e.detail.value
+ })
+ if(e.currentTarget.dataset.name == 'form.originalValue' ){
+ this.setData({
+ 'form.netSalvage' : (this.data.form.residualsRate*e.detail.value/100).toFixed(2),
+ 'form.perYearDepreciationValue' : ((e.detail.value-(this.data.form.residualsRate*e.detail.value/100))/this.data.form.expectedYears).toFixed(2),
+ 'form.netValue':this.data.form.originalValue-this.data.form.depreciationValue
+ })
+ }
+ if(e.currentTarget.dataset.name == 'form.residualsRate' &&e.detail.value<=100){
+ this.setData({
+ 'form.netSalvage' : (this.data.form.originalValue*e.detail.value/100)100){
+ this.setData({
+ 'form.residualsRate' : 5,
+ })
+ }
+ if(e.currentTarget.dataset.name == 'form.netSalvage' ){
+ this.setData({
+ 'form.perYearDepreciationValue' : ((this.data.form.originalValue-e.detail.value)/this.data.form.expectedYears).toFixed(2)
+ })
+ }
+ if(e.currentTarget.dataset.name == 'form.expectedYears' ){
+ this.setData({
+ 'form.perYearDepreciationValue' : ((this.data.form.originalValue-this.data.form.netSalvage)/e.detail.value).toFixed(2)
+ })
+ }
+ if(e.currentTarget.dataset.name == 'form.depreciationYears' ){
+ this.setData({
+ 'form.depreciationValue' : (this.data.form.perYearDepreciationValue*e.detail.value)>this.data.form.originalValue?this.data.form.originalValue:(this.data.form.perYearDepreciationValue*e.detail.value).toFixed(2),
+ 'form.netValue' : (this.data.form.originalValue-(this.data.form.perYearDepreciationValue*e.detail.value))>=0?(this.data.form.originalValue-(this.data.form.perYearDepreciationValue*e.detail.value).toFixed(2)):0
+ })
+ }
+
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad(options) {
+ if(options.id!=null&&options.id!=""){
+ this.setData({id:options.id})
+ //获取收入合同状态
+ UTIL.httpRequest(API.URL_GET_PERMANENTDETAIL + this.data.id, {method:'GET'}, {
+ success: (res) => {
+ this.setData({'form':res.data});
+ let that = this;
+ //获取资产类别
+ UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'asset_type', {method:'GET'}, {
+ success: (r) => {
+ if(r.data.length>0){
+ that.setData({
+ assetTypeOptions:r.data,
+ })
+ r.data.map((rr,ind) => {
+ if(rr.dictValue == res.data.assetType){
+ that.setData({'assetTypeindex':ind})
+ }
+ })
+ }
+ }
+ })
+ //获取经营属性
+ UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'operation_type', {method:'GET'}, {
+ success: (r) => {
+ if(r.data.length>0){
+ that.setData({
+ operationTypeOptions:r.data,
+ })
+ r.data.map((rr,ind) => {
+ if(rr.dictValue == res.data.operationType){
+ that.setData({'operationTypeindex':ind})
+ }
+ })
+ }
+ }
+ })
+ //获取增加方式
+ UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'add_type', {method:'GET'}, {
+ success: (r) => {
+ if(r.data.length>0){
+ that.setData({
+ addTypeOptions:r.data,
+ })
+ r.data.map((rr,ind) => {
+ if(rr.dictValue == res.data.addType){
+ that.setData({'addTypeindex':ind})
+ }
+ })
+ }
+ }
+ })
+ //获取使用情况
+ UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'use_type', {method:'GET'}, {
+ success: (r) => {
+ if(r.data.length>0){
+ that.setData({
+ useTypeOptions:r.data,
+ })
+ r.data.map((rr,ind) => {
+ if(rr.dictValue == res.data.useType){
+ that.setData({'useTypeindex':ind})
+ }
+ })
+ }
+ }
+ })
+ //获取折旧方式
+ UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'depreciation_type', {method:'GET'}, {
+ success: (r) => {
+ if(r.data.length>0){
+ that.setData({
+ depreciationTypeOptions:r.data,
+ })
+ r.data.map((rr,ind) => {
+ if(rr.dictValue == res.data.depreciationType){
+ that.setData({'depreciationTypeindex':ind})
+ }
+ })
+ }
+ }
+ })
+ //获取资产状态
+ UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'asset_status', {method:'GET'}, {
+ success: (r) => {
+ if(r.data.length>0){
+ that.setData({
+ assetStatusOptions:r.data,
+ })
+ r.data.map((rr,ind) => {
+ if(rr.dictValue == res.data.assetStatus){
+ that.setData({'assetStatusindex':ind})
+ }
+ })
+ }
+ }
+ })
+ //获取单位
+ UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'fixed_assets_unit', {method:'GET'}, {
+ success: (r) => {
+ if(r.data.length>0){
+ that.setData({
+ unitOptions:r.data,
+ })
+ r.data.map((rr,ind) => {
+ if(rr.dictValue == res.data.unit){
+ that.setData({'unitindex':ind})
+ }
+ })
+ }
+ }
+ })
+ //获取系统是否
+ UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'sys_yes_no', {method:'GET'}, {
+ success: (r) => {
+ if(r.data.length>0){
+ that.setData({
+ sysYesNoOptions:r.data,
+ })
+ r.data.map((rr,ind) => {
+ if(rr.dictValue == res.data.isMin){
+ that.setData({'isMinindex':ind})
+ }
+ if(rr.dictValue == res.data.isFormAsset){
+ that.setData({'isFormAssetindex':ind})
+ }
+ })
+ }
+ }
+ })
+ }
+ })
+ }else{
+ let that = this;
+ //获取资产类别
+ UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'asset_type', {method:'GET'}, {
+ success: (res) => {
+ if(res.data.length>0){
+ that.setData({
+ assetTypeOptions:res.data,
+ 'form.assetType':res.data[0].dictValue
+ })
+ }
+ }
+ })
+ //获取经营属性
+ UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'operation_type', {method:'GET'}, {
+ success: (res) => {
+ if(res.data.length>0){
+ that.setData({
+ operationTypeOptions:res.data,
+ 'form.operationType':res.data[0].dictValue
+ })
+ }
+ }
+ })
+ //获取增加方式
+ UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'add_type', {method:'GET'}, {
+ success: (res) => {
+ if(res.data.length>0){
+ that.setData({
+ addTypeOptions:res.data,
+ 'form.addType':res.data[0].dictValue
+ })
+ }
+ }
+ })
+ //获取使用情况
+ UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'use_type', {method:'GET'}, {
+ success: (res) => {
+ if(res.data.length>0){
+ that.setData({
+ useTypeOptions:res.data,
+ 'form.useType':res.data[0].dictValue
+ })
+ }
+ }
+ })
+ //获取折旧方式
+ UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'depreciation_type', {method:'GET'}, {
+ success: (res) => {
+ if(res.data.length>0){
+ that.setData({
+ depreciationTypeOptions:res.data,
+ 'form.depreciationType':res.data[1].dictValue
+ })
+ }
+ }
+ })
+ //获取资产状态
+ UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'asset_status', {method:'GET'}, {
+ success: (res) => {
+ if(res.data.length>0){
+ that.setData({
+ assetStatusOptions:res.data,
+ 'form.assetStatus':res.data[0].dictValue
+ })
+ }
+ }
+ })
+ //获取单位
+ UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'fixed_assets_unit', {method:'GET'}, {
+ success: (res) => {
+ if(res.data.length>0){
+ that.setData({
+ unitOptions:res.data,
+ 'form.unit':res.data[0].dictValue
+ })
+ }
+ }
+ })
+ //获取是否
+ UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'sys_yes_no', {method:'GET'}, {
+ success: (res) => {
+ if(res.data.length>0){
+ that.setData({
+ sysYesNoOptions:res.data,
+ 'form.isMin':res.data[0].dictValue,
+ 'form.isFormAsset':res.data[0].dictValue
+ })
+ }
+ }
+ })
+ }
+
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage() {
+
+ }
+})
\ No newline at end of file
diff --git a/pages/fixedAssets/change/change.json b/pages/fixedAssets/change/change.json
new file mode 100644
index 0000000..b8811c7
--- /dev/null
+++ b/pages/fixedAssets/change/change.json
@@ -0,0 +1,10 @@
+{
+ "navigationStyle": "custom",
+ "usingComponents": {
+ "van-field": "@vant/weapp/field/index",
+ "van-popup": "@vant/weapp/popup/index",
+ "van-picker": "@vant/weapp/picker/index",
+ "van-calendar": "@vant/weapp/calendar/index",
+ "van-icon":"@vant/weapp/icon/index"
+ }
+}
\ No newline at end of file
diff --git a/pages/fixedAssets/change/change.wxml b/pages/fixedAssets/change/change.wxml
new file mode 100644
index 0000000..8406c22
--- /dev/null
+++ b/pages/fixedAssets/change/change.wxml
@@ -0,0 +1,280 @@
+
+
+
+ {{form.id?"":"新增"}}资产信息
+
+
+
+
+ 基本信息
+
+
+
+
+ *资产编码
+
+
+
+
+
+
+
+ *资产名称
+
+
+
+
+
+
+ *资产类别
+
+
+ {{assetTypeOptions[assetTypeindex].dictLabel?assetTypeOptions[assetTypeindex].dictLabel:"选择资产类别"}}
+
+
+
+
+
+ *变更类型
+
+
+ {{changeTypeOptions[changeTypeindex].dictLabel?changeTypeOptions[changeTypeindex].dictLabel:"选择变更类型"}}
+
+
+
+
+
+
+
+
+
+ 变更信息
+
+
+
+
+ 数量/面积
+
+
+
+
+
+
+
+ 变更后
+
+
+
+
+
+
+
+ 备注
+
+
+
+
+
+
+
+
+
+
+ 变更信息
+
+
+
+
+ 资产原值
+
+
+
+
+
+
+
+ 变更后
+
+
+
+
+
+
+
+ 备注
+
+
+
+
+
+
+
+
+
+
+ 变更信息
+
+
+
+
+ 预计使用年数
+
+
+
+
+
+
+
+ 变更后
+
+
+
+
+
+
+
+ 备注
+
+
+
+
+
+
+
+
+
+
+ 变更信息
+
+
+
+
+ 累计折旧
+
+
+
+
+
+
+
+ 变更后
+
+
+
+
+
+
+
+ 备注
+
+
+
+
+
+
+
+
+
+
+ 变更信息
+
+
+
+
+ 已折旧年数
+
+
+
+
+
+
+
+ 变更后
+
+
+
+
+
+
+
+ 备注
+
+
+
+
+
+
+
+
+
+
+ 变更信息
+
+
+
+
+ 残值率
+
+
+
+
+
+
+
+ 变更后
+
+
+
+
+
+
+
+ 备注
+
+
+
+
+
+
+
+
+
+
+ 变更信息
+
+
+
+
+ 折旧方式
+
+
+
+ {{depreciationTypeOptions[depreciationTypeindex].dictLabel?depreciationTypeOptions[depreciationTypeindex].dictLabel:"选择折旧方式"}}
+
+
+
+
+
+
+ 变更后
+
+
+
+ {{depreciationTypeOptions[changeValueindex].dictLabel?depreciationTypeOptions[changeValueindex].dictLabel:"选择折旧方式"}}
+
+
+
+
+
+
+ 备注
+
+
+
+
+
+
+
+
+ 保存
+
\ No newline at end of file
diff --git a/pages/fixedAssets/change/change.wxss b/pages/fixedAssets/change/change.wxss
new file mode 100644
index 0000000..19cc453
--- /dev/null
+++ b/pages/fixedAssets/change/change.wxss
@@ -0,0 +1,69 @@
+/* pages/payee/add/add.wxss */
+.main-box{
+ background: #ffffff;
+ padding: 20px;
+ width: 94%;
+ margin: 0 auto;
+ border-radius: 10px;
+ box-shadow: 0px 5px 5px rgba(0, 0, 0, 0.16);
+}
+.table-box van-field van-cell .van-cell{
+ margin-bottom: 15px;
+}
+.table-box van-field:last-child van-cell .van-cell{
+ margin-bottom: 0px;
+}
+.van-cell{
+ padding: 0!important;
+ margin-bottom: 15px;
+}
+.van-cell__value {
+ display: flex;
+ justify-content: flex-end;
+}
+.van-radio--horizontal {
+ margin-right: 0!important;
+ margin-left: var(--padding-sm,12px)
+}
+.van-cell--required:before {
+ left: 0!important;
+}
+
+.van-field__label {
+ padding-left: 10px;
+}
+.tit{
+ line-height: 20px;
+ font-size: 16px;
+ font-weight: bold;
+}
+.bottom{
+ width: 100%;
+ margin: 0 auto;
+ text-align: center;
+ margin-top: 30px;
+ margin-bottom: 30px;
+ display: flex;
+}
+
+.bottom view {
+ width: 47%;
+ margin: 0 auto;
+ border-radius: 30px;
+ display: inline-block;
+}
+
+.bottom .btn2{
+ border: 1px solid transparent;
+ padding: 8px 0px;
+ background-image: linear-gradient(to right, #2C8E68, #5CAE77);
+ color: #fff;
+}
+.table-boxs>view{
+ display: flex;
+ justify-content: space-between;
+ line-height: 80rpx;
+}
+.table-box text{
+ line-height: 80rpx;
+}
\ No newline at end of file
diff --git a/pages/fixedAssets/fixedAssets.js b/pages/fixedAssets/fixedAssets.js
index 1f70e48..555f75b 100644
--- a/pages/fixedAssets/fixedAssets.js
+++ b/pages/fixedAssets/fixedAssets.js
@@ -1,4 +1,4 @@
-// pages/bank/bank.js
+// pages/fixedAssets/fixedAssets.js
import * as UTIL from '../../utils/util.js';
import * as API from '../../utils/API.js';
let EVN_CONFIG = require('../../env/env');
@@ -159,6 +159,57 @@ Page({
url: '/pages/fixedAssets/add/add?id='+e.currentTarget.dataset.id,
})
},
+ scrap(e){
+ console.log(e.currentTarget.dataset.data.id,e.currentTarget.dataset.data.index);
+ if(e.currentTarget.dataset.data.assetStatus != 1){
+ UTIL.showToastNoneIcon('只允许修改资产状态为正常的资产!');
+ return false;
+ }else if(e.currentTarget.dataset.data.useType == 3){
+ UTIL.showToastNoneIcon('使用状态为出租或出借不允许操作!');
+ return false;
+ }else{
+ UTIL.httpRequest(API.URL_GET_UPDATERSCRAP + e.currentTarget.dataset.data.id , {method:'GET'}, {
+ success: (res) => {
+ if(res.code==200){
+ let new_list = this.data.list
+ new_list.splice(e.currentTarget.dataset.data.index,1)
+ this.setData({'list':new_list})
+ UTIL.showToastNoneIcon('报废成功!');
+ }else{
+ UTIL.showToastNoneIcon('报废失败!:'+res.msg);
+ }
+ }
+ })
+ }
+ },
+ sell(e){
+ console.log(e.currentTarget.dataset.data.id,e.currentTarget.dataset.data.index);
+ if(e.currentTarget.dataset.data.assetStatus != 1){
+ UTIL.showToastNoneIcon('只允许修改资产状态为正常的资产!');
+ return false;
+ }else if(e.currentTarget.dataset.data.useType == 3){
+ UTIL.showToastNoneIcon('使用状态为出租或出借不允许操作!');
+ return false;
+ }else{
+ UTIL.httpRequest(API.URL_GET_UPDATERSALE + e.currentTarget.dataset.data.id , {method:'GET'}, {
+ success: (res) => {
+ if(res.code==200){
+ let new_list = this.data.list
+ new_list.splice(e.currentTarget.dataset.data.index,1)
+ this.setData({'list':new_list})
+ UTIL.showToastNoneIcon('出售成功!');
+ }else{
+ UTIL.showToastNoneIcon('出售失败!:'+res.msg);
+ }
+ }
+ })
+ }
+ },
+ change(e){
+ wx.navigateTo({
+ url: '/pages/fixedAssets/change/change?id='+e.currentTarget.dataset.id,
+ })
+ },
delete(e){
this.setData({
'itemId':e.currentTarget.dataset.id,
diff --git a/pages/fixedAssets/fixedAssets.wxml b/pages/fixedAssets/fixedAssets.wxml
index e5ad757..8dae8c5 100644
--- a/pages/fixedAssets/fixedAssets.wxml
+++ b/pages/fixedAssets/fixedAssets.wxml
@@ -16,7 +16,7 @@
新增
-
+
@@ -46,6 +46,24 @@
+
+
+
+
+
+
+ 报废
+
+
+
+
+
+
+
+ 出售
+
+
+
@@ -63,6 +81,14 @@
附件
+
+
+
+
+
+ 变更
+
+
diff --git a/pages/fixedAssets/fixedAssets.wxss b/pages/fixedAssets/fixedAssets.wxss
index 9e63322..75d3fef 100644
--- a/pages/fixedAssets/fixedAssets.wxss
+++ b/pages/fixedAssets/fixedAssets.wxss
@@ -71,6 +71,14 @@ text{display: block;}
align-items: center;
display: flex;
}
+.moreBox{
+ width: 90px;
+ text-align: center;
+ height: 100%;
+ background: #F6F6F6;
+ align-items: center;
+ display: flex;
+}
.workflow .workflow_list{
height: 150rpx;
background-color: #fff;
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 21b4a2e..00a088a 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -101,6 +101,14 @@
固定资产
+
+
+ 支付管理
+
+
+
+ 重大事项
+
diff --git a/pages/majorEvent/add/add.js b/pages/majorEvent/add/add.js
new file mode 100644
index 0000000..36818c7
--- /dev/null
+++ b/pages/majorEvent/add/add.js
@@ -0,0 +1,228 @@
+// pages/bankDraft/add/add.js
+import * as UTIL from '../../../utils/util.js';
+import * as API from '../../../utils/API.js';
+let EVN_CONFIG = require('../../../env/env');
+const DISTRIBUTE_ENVIROMENT = 'IMGURL';
+let {
+ URL_PREFIX,
+} = EVN_CONFIG[DISTRIBUTE_ENVIROMENT];
+const app = getApp();
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ isIPX: app.globalData.isIPX,
+ form:{
+ eventTime: "2020-01-01", //开票日期 必填
+ remark: "",
+ },
+ showBtn:true,
+ showEventTime:false,
+ status:0,
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad(options) {
+ let that = this
+ if(options.id!=null&&options.id!=""){
+ this.setData({id:options.id})
+ UTIL.httpRequest(API.URL_GET_MAJOREVENTGET + this.data.id, {method:'GET'}, {
+ success: (res) => {
+ console.log(res);
+ if(res.data.auditStatus!='0'&&res.data.auditStatus!='2'){
+ this.setData({'showBtn':false});
+ }
+ this.setData({'form':res.data})
+ this.selectComponent('#hf_editor').setHtml(res.data.eventContent);
+ }
+ })
+ }else{
+ this.onShow()
+ }
+ },
+ onConfirmEventTime(e){
+ let data = this.getNewDate(new Date(e.detail.value));
+ this.setData({'form.eventTime':data});
+ },
+ getHtml(e) {//从组件获取值
+ this.data.form.eventContent = e.detail.content.html
+ },
+ insertImage(){ //图片上传插入示例
+ wx.chooseImage({
+ count: 1,
+ success: r => {
+ // 本地测试图片插入
+ // this.selectComponent('#hf_editor').insertSrc(res.tempFilePaths[0]);
+
+ wx.uploadFile({ //调用图片上传接口
+ url: URL_PREFIX+'/common/upload',
+ filePath: r.tempFilePaths[0],
+ name: 'imgFile',
+ success: res => {
+ console.log();
+ let imgUrl = JSON.parse(res.data).url
+ this.selectComponent('#hf_editor').insertSrc(URL_PREFIX+'/common/upload' + imgUrl);//调用组件insertSrc方法
+ }
+ })
+ }
+ })
+ },
+ getNewDate(date){
+ //date是传过来的时间戳,注意需为13位,10位需*1000
+ //也可以不传,获取的就是当前时间
+ var time
+ if(date){
+ time = new Date(date);
+ }else{
+ time = new Date();
+ }
+ var year= time.getFullYear() //年
+ var month = ("0" + (time.getMonth() + 1)).slice(-2); //月
+ var day = ("0" + time.getDate()).slice(-2); //日
+ var mydate = year + "-" + month + "-" + day;
+ return mydate
+ },
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow() {
+
+ },
+ openBox(even){
+ console.log(even.currentTarget.dataset.name);
+ this.setData({
+ [even.currentTarget.dataset.name]:true
+ })
+ },
+ onChange(event){
+ console.log(event);
+ this.setData({
+ [event.currentTarget.dataset.value]: event.detail,
+ })
+ },
+ closeBox(even){
+ console.log(even.currentTarget.dataset.name);
+ this.setData({
+ [even.currentTarget.dataset.name]:false
+ })
+ },
+ goSubmit(){
+ if(this.data.form.eventName===''||this.data.form.eventName==null){ //事项名称
+ UTIL.showToastNoneIcon('请填写事项名称!');
+ return false;
+ }else if(this.data.form.eventTime===''||this.data.form.eventTime==null){ //事项时间
+ UTIL.showToastNoneIcon('事项时间不能为空!');
+ return false;
+ }else if(this.data.form.eventContent===''||this.data.form.eventContent==null){ //事项内容
+ UTIL.showToastNoneIcon('事项内容不能为空!');
+ return false;
+ }else if(this.data.status=='0'){
+ this.setData({'status':'1'})
+ var that = this;
+ that.data.form.method = 'POST';
+ that.data.form.eventContent = that.data.form.eventContent.replace(/\\/g,"/")
+ console.log(that.data.form);
+ if(that.data.form.id==""||that.data.form.id==null){
+ UTIL.httpRequest(API.URL_POST_MAJOREVENTADD, that.data.form , {
+ success: (res) => {
+ this.setData({'status':0})
+ if(res.code == 200){
+ UTIL.showToastNoneIcon('新增成功');
+ setTimeout(function(){
+ wx.navigateBack({
+ delta:1
+ })
+ },2000)
+ }else{
+ UTIL.showToastNoneIcon('新增失败:'+res.msg);
+ }
+ }
+ })
+ }else{
+ UTIL.httpRequest(API.URL_POST_MAJOREVENTUPDATE, that.data.form , {
+ success: (res) => {
+ this.setData({'status':0})
+ if(res.code == 200){
+ UTIL.showToastNoneIcon('修改成功');
+ setTimeout(function(){
+ wx.navigateBack({
+ delta:1
+ })
+ },2000)
+ }else{
+ UTIL.showToastNoneIcon('修改失败:'+res.msg);
+ }
+ }
+ })
+ }
+ }
+ },
+ onConfirmTime(event){
+ this.setData({
+ [event.currentTarget.dataset.name]: false,
+ [event.currentTarget.dataset.value]: UTIL.formatDate(event.detail),
+ });
+ },
+ openBox(even){
+ console.log(even.currentTarget.dataset.name);
+ this.setData({
+ [even.currentTarget.dataset.name]:true
+ })
+ },
+ closeBox(even){
+ console.log(even.currentTarget.dataset.name);
+ this.setData({
+ [even.currentTarget.dataset.name]:false
+ })
+ },
+ back:function(){
+ wx.navigateBack({
+ delta: 1
+ })
+ },
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage() {
+
+ }
+})
\ No newline at end of file
diff --git a/pages/majorEvent/add/add.json b/pages/majorEvent/add/add.json
new file mode 100644
index 0000000..5cd5fa7
--- /dev/null
+++ b/pages/majorEvent/add/add.json
@@ -0,0 +1,21 @@
+{
+ "navigationStyle": "custom",
+ "usingComponents": {
+ "van-row": "@vant/weapp/row/index",
+ "van-col": "@vant/weapp/col/index",
+ "van-cell": "@vant/weapp/cell/index",
+ "van-cell-group": "@vant/weapp/cell-group/index",
+ "van-tag": "@vant/weapp/tag/index",
+ "van-icon": "@vant/weapp/icon/index",
+ "van-steps": "@vant/weapp/steps/index",
+ "van-button": "@vant/weapp/button/index",
+ "van-radio": "@vant/weapp/radio/index",
+ "van-radio-group": "@vant/weapp/radio-group/index",
+ "van-field": "@vant/weapp/field/index",
+ "van-popup": "@vant/weapp/popup/index",
+ "van-picker": "@vant/weapp/picker/index",
+ "van-calendar": "@vant/weapp/calendar/index",
+ "van-datetime-picker": "@vant/weapp/datetime-picker/index",
+ "hf_editor": "/component/editor/editor"
+ }
+}
\ No newline at end of file
diff --git a/pages/majorEvent/add/add.wxml b/pages/majorEvent/add/add.wxml
new file mode 100644
index 0000000..47ef547
--- /dev/null
+++ b/pages/majorEvent/add/add.wxml
@@ -0,0 +1,24 @@
+
+
+
+ {{form.id?"":"新增"}}重大项目
+
+
+
+
+
+ *发生日期
+
+
+ {{form.eventTime?form.eventTime:'发生日期'}}
+
+
+
+
+
+
+
+
+
+ 保存
+
\ No newline at end of file
diff --git a/pages/majorEvent/add/add.wxss b/pages/majorEvent/add/add.wxss
new file mode 100644
index 0000000..61f66a2
--- /dev/null
+++ b/pages/majorEvent/add/add.wxss
@@ -0,0 +1,103 @@
+/* pages/payee/add/add.wxss */
+.main-box{
+ background: #ffffff;
+ padding: 20px;
+ width: 94%;
+ margin: 0 auto;
+ border-radius: 10px;
+ box-shadow: 0px 5px 5px rgba(0, 0, 0, 0.16);
+}
+.table-box van-field van-cell .van-cell{
+ margin-bottom: 15px;
+}
+.table-box van-field:last-child van-cell .van-cell{
+ margin-bottom: 0px;
+}
+.van-cell{
+ padding: 0!important;
+ margin-bottom: 15px;
+}
+.van-cell__value {
+ display: flex;
+ justify-content: flex-end;
+}
+.van-radio--horizontal {
+ margin-right: 0!important;
+ margin-left: var(--padding-sm,12px)
+}
+.van-cell--required:before {
+ left: 0!important;
+}
+
+.van-field__label {
+ padding-left: 10px;
+}
+
+.bottom{
+ width: 100%;
+ margin: 0 auto;
+ text-align: center;
+ margin-top: 30px;
+ margin-bottom: 30px;
+ display: flex;
+ position: absolute;
+ bottom: 10%;
+}
+
+.bottom view {
+ width: 47%;
+ margin: 0 auto;
+ border-radius: 30px;
+ display: inline-block;
+}
+
+.bottom .btn2{
+ border: 1px solid transparent;
+ padding: 8px 0px;
+ background-image: linear-gradient(to right, #2C8E68, #5CAE77);
+ color: #fff;
+}
+.table-boxs>view{
+ display: flex;
+ justify-content: space-between;
+ line-height: 100rpx;
+}
+.ql-container {
+ box-sizing: border-box;
+ width: 100%;
+ height: 400px;
+ font-size: 16px;
+ line-height: 1.5;
+ overflow: auto;
+ padding: 10px 10px 20px 10px;
+ border: 1px solid #ECECEC;
+}
+
+.ql-active {
+ color: #22C704;
+}
+
+.iconfont {
+ display: inline-block;
+ width: 30px;
+ height: 30px;
+ cursor: pointer;
+ font-size: 20px;
+}
+
+.toolbar {
+ box-sizing: border-box;
+ padding: 0 10px;
+ height: 50px;
+ width: 100%;
+ position: absolute;
+ left: 0;
+ right: 100%;
+ top: 0;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ border: 1px solid #ECECEC;
+ border-left: none;
+ border-right: none;
+}
diff --git a/pages/majorEvent/majorEvent.js b/pages/majorEvent/majorEvent.js
new file mode 100644
index 0000000..d66132f
--- /dev/null
+++ b/pages/majorEvent/majorEvent.js
@@ -0,0 +1,398 @@
+// pages/project/project.js
+import * as UTIL from '../../utils/util.js';
+import * as API from '../../utils/API.js';
+let EVN_CONFIG = require('../../env/env');
+const DISTRIBUTE_ENVIROMENT = 'IMGURL';
+let {
+ URL_PREFIX,
+} = EVN_CONFIG[DISTRIBUTE_ENVIROMENT];
+const app = getApp();
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ isIPX: app.globalData.isIPX,
+ eventName:"",
+ value:'',
+ pageNums:1,
+ showUpload:false,
+ uploadOptions:[],
+ fileList:[],
+ itemId:"",
+ itemIndex:"",
+ list:[],
+ fileEvent:{},
+ showPopupDel:false,
+ showPopupSubmit:false,
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad(options) {
+ var _this = this;
+ let qu = wx.createSelectorQuery()
+ qu.select("#top_view").boundingClientRect()
+ qu.exec(res => {
+ _this.setData({
+ scrollHeight:wx.getSystemInfoSync().windowHeight-res[0].height-res[0].top
+ })
+ })
+ //获取附件字典
+ UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'common_attach', {method:'GET'}, {
+ success: (res) => {
+ this.setData({
+ uploadOptions:res.data,
+ })
+ }
+ })
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady() {
+ this.onShow();
+ },
+ goSearch(e){
+ this.setData({eventName:e.detail})
+ this.onShow();
+ },
+ goAdd(){
+ wx.navigateTo({
+ url: 'add/add',
+ })
+ },
+ back:function(){
+ wx.navigateBack({
+ delta: 1
+ })
+ },
+
+ goUpdate(e){
+ wx.navigateTo({
+ url: 'add/add?id='+ e.currentTarget.dataset.id,
+ })
+ },
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow() {
+ var that = this;
+ let params = {
+ pageNum : this.data.pageNum,
+ pageSize: 10,
+ eventName: this.data.eventName,
+ method:'GET'
+ }
+ UTIL.httpRequest(API.URL_GET_MAJOREVENTLIST, params, {
+ success: (res) => {
+ this.setData({
+ list:res.rows
+ });
+ }
+ })
+ },
+ submit(e){
+ this.setData({
+ 'itemId':e.currentTarget.dataset.id,
+ 'itemIndex':e.currentTarget.dataset.index,
+ "showPopupSubmit":true
+ });
+ },
+ confirmTemSub(){
+ this.setData({
+ "showPopupSubmit":false
+ });
+ UTIL.httpRequest(API.URL_GET_MAJOREVENTSUBMIT + this.data.itemId , {method:'GET'}, {
+ success: (res) => {
+ if(res.code==200){
+ let new_list = this.data.list
+ new_list[this.data.itemIndex].auditStatus = '1'
+ this.setData({'list':new_list})
+ UTIL.showToastNoneIcon('提交成功');
+ }else{
+ UTIL.showToastNoneIcon('提交失败!');
+ }
+ }
+ })
+ },
+ cancelTemSub(){
+ this.setData({
+ "itemId":"",
+ "itemIndex":"",
+ "showPopupSubmit":false
+ });
+ },
+ delete(e){
+ this.setData({
+ 'itemId':e.currentTarget.dataset.id,
+ 'itemIndex':e.currentTarget.dataset.index,
+ "showPopupDel":true
+ });
+ },
+ cancelTemDel:function(e){
+ this.setData({
+ "itemId":"",
+ "itemIndex":"",
+ "showPopupDel":false
+ });
+ },
+ confirmTemDel:function(e){
+ this.setData({
+ "showPopupDel":false
+ });
+ UTIL.httpRequest(API.URL_GET_MAJOREVENTDELETE + this.data.itemId , {method:'GET'}, {
+ success: (res) => {
+ if(res.code==200){
+ let new_list = this.data.list
+ new_list.splice(this.data.index,1)
+ this.setData({'list':new_list})
+ UTIL.showToastNoneIcon('删除成功!');
+ }else{
+ UTIL.showToastNoneIcon('删除失败!');
+ }
+ }
+ })
+ },
+ changeTab(e){
+ var that = this ;
+ that.setData({value1:e.detail})
+
+ UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'order_type', {method:'GET'}, {
+ success: (res) => {
+ UTIL.httpRequest(API.URL_GET_GETMONEYORDERLIST, {method:'GET',orderType:that.data.value1,orderStatus:that.data.value2},{
+ success: (response) => {
+ if (response.code == API.SUCCESS_CODE) {
+
+ for (let i = 0; i < response.rows.length; i++) {
+ response.rows[i].orderTypeText = UTIL.getTransform(response.rows[i].orderType,res.data);
+ response.rows[i].startTime = response.rows[i].startTime.replace(/-/g,".");
+ response.rows[i].endTime = response.rows[i].endTime.replace(/-/g,".");
+ response.rows[i].orderAmount = parseFloat(response.rows[i].orderAmount).toFixed(2);
+ }
+
+ that.setData({
+ moneyorderList:response.rows
+ })
+ }
+ }
+ })
+ }
+ })
+ },
+ changeTab2(e){
+ var that = this ;
+ that.setData({value2:e.detail})
+
+ UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'order_type', {method:'GET'}, {
+ success: (res) => {
+ UTIL.httpRequest(API.URL_GET_GETMONEYORDERLIST, {method:'GET',orderType:that.data.value1,orderStatus:that.data.value2},{
+ success: (response) => {
+ if (response.code == API.SUCCESS_CODE) {
+
+ for (let i = 0; i < response.rows.length; i++) {
+ response.rows[i].orderTypeText = UTIL.getTransform(response.rows[i].orderType,res.data);
+ response.rows[i].startTime = response.rows[i].startTime.replace(/-/g,".");
+ response.rows[i].endTime = response.rows[i].endTime.replace(/-/g,".");
+ response.rows[i].orderAmount = parseFloat(response.rows[i].orderAmount).toFixed(2);
+ }
+
+ that.setData({
+ moneyorderList:response.rows
+ })
+ }
+ }
+ })
+ }
+ })
+ },
+ upload(e){
+ this.setData({itemId:e.currentTarget.dataset.id});
+ this.asyncFun(e.currentTarget.dataset.id)
+ },
+ asyncFun(id){
+ this.setData({"fileList":[]})
+ let uploadList = this.data.uploadOptions
+ let newList = []
+ let _this = this
+ uploadList.map( res => {
+ let oData = {
+ tableId: id,
+ tableName: "t_yinnong_majorevent", //上传表
+ bizPath: "yinnong",
+ fileType: res.dictValue, //附件类型 1原始发票 2会议纪要 3会议照片 4 参会人员签字
+ method:'GET'
+ }
+ UTIL.httpRequest(API.URL_GET_ATTACHMENTLIST, oData, {
+ success: (rr) => {
+ if(rr.code==200&&rr.rows.length>0){
+ rr.rows.map((rrr,index) => {
+ rrr.url = URL_PREFIX + rrr.fileUrl
+ if(index==rr.rows.length-1){
+ newList.push(Object.assign({},res,{"list":rr.rows}))
+ _this.setData({"fileList":_this.data.fileList.concat(newList)});
+ _this.setData({"showUpload":true})
+ }
+ })
+ }else{
+ let newuploadList = uploadList
+ newuploadList.map(rd => {
+ rd.list = newList
+ })
+ _this.setData({"fileList":newuploadList});
+ _this.setData({"showUpload":true})
+ }
+ },
+ fail:(rr) =>{
+
+ },
+ complete:(rr) => {
+
+ }
+ })
+ })
+ },
+ closeBox(){
+ this.setData({"showUpload":false})
+ },
+ deleteImg(event){
+ this.setData({"fileEvent":event})
+ this.setData({"showPopup":true});
+ },
+ cancelTem:function(e){
+ this.setData({"fileEvent":"{}"});
+ this.setData({"showPopup":false});
+ },
+ confirmTem:function(e){
+ let event = this.data.fileEvent
+ UTIL.httpRequest(API.URL_GET_GETFILEREMOVE+event.detail.file.id , {method:'GET'}, {
+ success: (res) => {
+ if(res.code==200){
+ let ll = this.data.fileList
+ var jsonlist = ll[event.target.dataset.idx].list;
+ jsonlist.splice(event.detail.index, 1)
+ ll[event.target.dataset.idx].list = jsonlist
+ this.setData({"fileList":ll})
+ this.setData({showPopup:false});
+ wx.showToast({
+ title: '删除成功!',
+ icon: 'success',
+ duration: 2000,
+ })
+ }
+ }
+ })
+ },
+ uploadFile(uploadFile,event) {
+ let _this = this
+ return new Promise((resolve, reject) => {
+ wx.uploadFile({
+ url: API.URL_GET_UPLOAD,
+ filePath: uploadFile.file.file.url,
+ name: 'file',
+ header: {
+ "Content-Type": "multipart/form-data",//记得设置
+ "chartset":"utf-8",
+ 'Authorization':'Bearer '+getApp().globalData.userInfo.token
+ },
+ formData:uploadFile,
+ success: (res) => {
+ res.data = JSON.parse(res.data);
+ if(res.statusCode == 200){
+ let files = _this.data.fileList
+ let fName = res.data.fileUrl.split('/')
+ let fLength = fName.length
+ files[event.currentTarget.dataset.idx].list.push({
+ "fileName": fName[fLength-1],
+ "fileType": "0",
+ "fileUrl":res.data.fileUrl ,
+ "id": res.data.id,
+ "tableId": 6,
+ "url":URL_PREFIX+res.data.fileUrl
+ })
+ _this.setData({"fileList":files})
+ wx.hideLoading()
+ }
+ },
+ fail: (err) => {
+ //上传失败:修改pedding为reject
+ reject(err)
+ }
+ });
+ })
+ },
+ afterRead(event) {
+ let _this = this
+ wx.showLoading({
+ title: '上传中...'
+ })
+ let fileForm={
+ file: event.detail,
+ fileType:event.currentTarget.dataset.idx,
+ tableName: "t_yinnong_majorevent", //上传表
+ bizPath: "yinnong",
+ tableId:_this.data.itemId
+ }
+ this.uploadFile(fileForm,event)
+ },
+ lookDown(file,detail){
+ // 获取指定字符串最后一次出现的位置,返回index
+ var index1 = file.detail.url.lastIndexOf('.');
+ // substr(start, length) 抽取从start下标开始的length个字符,返回新的字符串;
+ var style = file.detail.url.substr(index1 + 1)
+ //判断图片类型,不需要下载,不做处理
+ if(style=='png'||style=='jpg'||style=='jpeg'||style=='bmp'||style=='gif'||style=='webp'||style=='psd'||style== 'svg'||style=='tiff'){
+ //判断非图片类型
+ }else{
+ wx.downloadFile({
+ url: file.detail.url,
+ success(data){
+ wx.openDocument({
+ filePath: data.tempFilePath,
+ fileType: style,
+ showMenu:true,
+ success(res){
+ }
+ })
+ }
+ })
+ }
+ },
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage() {
+
+ }
+})
\ No newline at end of file
diff --git a/pages/majorEvent/majorEvent.json b/pages/majorEvent/majorEvent.json
new file mode 100644
index 0000000..6e4aadf
--- /dev/null
+++ b/pages/majorEvent/majorEvent.json
@@ -0,0 +1,17 @@
+{
+ "usingComponents": {
+ "van-checkbox": "@vant/weapp/checkbox/index",
+ "van-checkbox-group": "@vant/weapp/checkbox-group/index",
+ "van-cell": "@vant/weapp/cell/index",
+ "van-cell-group": "@vant/weapp/cell-group/index",
+ "van-search": "@vant/weapp/search/index",
+ "van-radio": "@vant/weapp/radio/index",
+ "van-radio-group": "@vant/weapp/radio-group/index",
+ "van-swipe-cell": "@vant/weapp/swipe-cell/index",
+ "van-dropdown-menu": "@vant/weapp/dropdown-menu/index",
+ "van-dropdown-item": "@vant/weapp/dropdown-item/index",
+ "van-tag": "@vant/weapp/tag/index",
+ "van-action-sheet": "@vant/weapp/action-sheet/index",
+ "van-upload": "@vant/weapp/uploader/index"
+ }
+}
\ No newline at end of file
diff --git a/pages/majorEvent/majorEvent.wxml b/pages/majorEvent/majorEvent.wxml
new file mode 100644
index 0000000..4dcbde1
--- /dev/null
+++ b/pages/majorEvent/majorEvent.wxml
@@ -0,0 +1,91 @@
+
+
+
+ 重大事项
+
+
+
+
+ 新增
+
+
+
+
+
+
+
+ {{item.eventName}}
+
+
+
+
+
+ {{item.eventTime}}
+
+
+ 草稿
+ 待审
+ 驳回
+ 通过
+
+
+
+
+
+
+
+
+
+ 删除
+
+
+
+
+
+
+
+ 附件
+
+
+
+
+
+
+
+ 提交
+
+
+
+
+
+
+
+
+
+
+ {{item.dictLabel}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/majorEvent/majorEvent.wxss b/pages/majorEvent/majorEvent.wxss
new file mode 100644
index 0000000..183fd24
--- /dev/null
+++ b/pages/majorEvent/majorEvent.wxss
@@ -0,0 +1,347 @@
+/* pages/bank/bank.wxss */
+.van-search__content {
+ border: 1px solid #5CAE77!important;
+ background: #fff!important;
+}
+van-search {
+ flex: 0.8;
+}
+.search_box{
+ display: flex;
+}
+.add_btn{
+ flex: 0.2;
+ padding: var(--search-padding,10px 12px);
+ padding-left: 0;
+}
+.add_btn text{
+ background-color: #62AD66;
+ display: block;
+ height: 100%;
+ text-align: center;
+ line-height: 36px;
+ color: #fff;
+ border-radius: 36px;
+ box-shadow: 0px 5px 5px #ddd;
+}
+text{display: block;}
+.work_plan{
+ padding: 40rpx 32.5rpx 30rpx;
+ display: flex;
+}
+
+.work_plan .menu_item{
+ background-color: #fff;
+ box-shadow: 2px 5px 5px #ddd;
+ border-radius: 60rpx;
+ text-align: center;
+ position: relative;
+ margin-right: 20px;
+ padding: 8px 10px;
+}
+.work_plan .menu_item.active{
+ background-color: #2C8E68;
+ color: #fff;
+}
+.work_plan .menu_item .remind{
+ height: 30rpx;
+ background: #e90101;
+ color: #fff;
+ font-size: 26rpx;
+ position: absolute;
+ line-height: 30rpx;
+ padding:0 10rpx;
+ border-radius: 25px;
+ top: -10rpx;
+ right: -10rpx;
+}
+
+.work_plan .more{
+ flex: 1;
+ text-align: center;
+ line-height: 60rpx;
+ font-size: 36rpx;
+ color: #31936c;
+}
+.deleteBox{
+ width: 130px;
+ text-align: center;
+ height: 100%;
+ background: #F6F6F6;
+ align-items: center;
+ display: flex;
+}
+.workflow .workflow_list{
+ height: 150rpx;
+ background-color: #fff;
+ border-radius: 24rpx;
+ box-shadow:0rpx 0rpx 10rpx rgba(0,0,0,.1);
+ margin-bottom: 20rpx;
+ padding:15rpx 25rpx 10rpx 35rpx;
+}
+.workflow .workflow_list .process_intro{
+ display: flex;
+ height: 62rpx;
+ align-items: center;
+}
+
+.workflow .process_intro .name{
+ width: 390rpx;
+ font-size: 34rpx;
+ margin-right: 30rpx;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+}
+.workflow .process_intro .name .name_tit{
+ width: 290rpx;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+}
+.van-swipe-cell {
+ width: 94%;
+ background: #fff;
+ border-radius: 10px;
+ box-shadow: 2px 5px 5px #ddd;
+ margin: 0 auto;
+ margin-bottom: 15px;
+}
+.li{
+ width: 100%;
+ padding: 14px;
+}
+.tit_box{
+ display: flex;
+ justify-content: space-between;
+}
+.tit_box_left{
+ display: flex;
+ align-items: center;
+}
+.detail_box{
+ margin-top: 10px;
+ display: flex;
+ justify-content: space-between;
+}
+.detail_box text{
+ color:#878787;
+}
+.fkmc {
+ line-height: 20px;
+ font-size: 16px;
+}
+.detail_time .detail_box_money{
+ font-size: 14px;
+}
+.detail_time_box{
+ display: flex;
+ justify-content: space-between;
+ margin-top: 10px;
+}
+.detail_time{
+ display: flex;
+ align-items: center;
+ padding-left: 3px;
+}
+.detail_time text{
+ font-size: 12px;
+ margin-left: 5px;
+ color: #878787;
+}
+.li .detail_box_left text{
+ text-align: center;
+}
+.li .detail_box_left .fkdw{
+ color: #B5B5B5;
+ font-size: 14px;
+ margin-top: 5px;
+}
+.li .detail_box_center{
+ color: #666666;
+ font-size: 12px;
+ text-align: center;
+}
+.li .detail_box_right text{
+ text-align: center;
+}
+.li .detail_box_right .skdw{
+ color: #B5B5B5;
+ font-size: 14px;
+ margin-top: 5px;
+}
+
+.li .fksr{
+ display: flex;
+ align-items: center;
+ margin-top: 15px;
+ color: #2C8E68;
+ font-size: 16px;
+}
+.li .wtj{
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ padding: 3px 8px;
+ border-radius: 5px;
+ font-size: 14px;
+}
+.no{
+ background-color:#fbe3e3;
+ color: #e90000;
+}
+.white{
+ background-color:#feeadc;
+ color: #fc9a55;
+}
+.yes{
+ background-color:#ddeee3;
+ color: #5cae77;
+}
+.other{
+ background-color:#f0f1f6;
+ color: #878787;
+}
+.li .tit{
+ font-size: 16px;
+ color: #333333;
+ line-height: 25px;
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 1;
+ word-break: break-all;
+ overflow: hidden;
+ margin-left: 5px;
+}
+.li .fj_name{
+ font-size: 14px;
+ color: #B3DB62;
+ line-height: 25px;
+}
+.li .time{
+ font-size: 14px;
+ color: #9B9CAA;
+}
+.li .money{
+ font-size: 18px;
+ color: #5CAE77;
+}
+.tit_type{
+ display: flex;
+ align-items: center;
+}
+.tit_type text{
+ background: rgba(92, 174, 119, 0.2);
+ color: #5CAE77;
+ padding: 2px 10px;
+}
+.van-checkbox__label {
+ display: flex;
+ justify-content: space-between;
+ width: 100%;
+}
+
+.van-checkbox__icon-wrap {
+ border-radius: 5px;
+}
+.van-checkbox__icon {
+ border-radius: 5px;
+ border: 2px solid #2C8E68!important;
+ background-color: rgba(44, 142, 104, 0.2);
+}
+.bottom{
+ width: 100%;
+ margin: 0 auto;
+ text-align: center;
+ padding: 15px 0;
+ display: flex;
+ position: fixed;
+ bottom: 0%;
+ background: #fff;
+ box-shadow: 0 0 5px #ddd;
+}
+
+.bottom view {
+ width: 47%;
+ margin: 0 auto;
+ border-radius: 30px;
+ display: inline-block;
+}
+
+.bottom .btn2{
+ border: 1px solid transparent;
+ padding: 10px 0px;
+ background-image: linear-gradient(to right, #2C8E68, #5CAE77);
+ color: #fff;
+}
+
+.downView{
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ padding: 0 20px;
+ border: 1px solid #5CAE77;
+ border-radius: 50px;
+ background: #fff;
+ margin-left: auto;
+}
+.downView image{
+ width: 10px;
+ height: 8px;
+ margin-left: 10px;
+}
+.hp_type{
+ padding: 4vw 3%;
+ display: flex;
+ border-bottom: 1px solid #eee;
+}
+.hp_type view{
+ padding: 2vw 6%;
+ background: #EEEEEE;
+ border-radius: 60px;
+ margin-right: 3%;
+ width: 30vw;
+ text-align: center;
+}
+.hp_button{
+ display: flex;
+ justify-content: space-around;
+ padding:4vw 0 6vw;
+}
+.hp_button view{
+ padding: 3vw 6%;
+ background: #EEEEEE;
+ border-radius: 60px;
+ width: 30vw;
+ text-align: center;
+}
+.van-dropdown-menu {
+ margin-bottom: 15px;
+}
+.fj-box text{
+ background-color: #5CAE77;
+ color: #ffffff;
+ text-align: center;
+ border-radius: 5px;
+ white-space:pre-wrap;
+ padding: 5rpx 8rpx;
+ width: 50rpx;
+ margin: 0px 14px;
+ font-size: 24rpx;
+}
+.fj-li{
+ margin-top: 20px;
+ display: flex;
+ /* flex-wrap: wrap; */
+}
+.fj-li .img_li{
+ width: 100%;
+ height: 18.5vw;
+}
+
+.fj-li .img_add{
+ overflow: hidden;
+}
+.van-icon-description{
+ font-size: 60px;
+}
diff --git a/pages/paymentManager/paymentManager.js b/pages/paymentManager/paymentManager.js
new file mode 100644
index 0000000..c3244b5
--- /dev/null
+++ b/pages/paymentManager/paymentManager.js
@@ -0,0 +1,410 @@
+// pages/paymentManager/paymentManager.js
+import * as UTIL from '../../utils/util.js';
+import * as API from '../../utils/API.js';
+let EVN_CONFIG = require('../../env/env');
+const DISTRIBUTE_ENVIROMENT = 'IMGURL';
+let {
+ URL_PREFIX,
+} = EVN_CONFIG[DISTRIBUTE_ENVIROMENT];
+const app = getApp();
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ isIPX: app.globalData.isIPX,
+ list:[],
+ isLoading:false,
+ pageNums:1,
+ scrollHeight:"",
+ name:"",
+ showUpload:false,
+ uploadOptions:[],
+ fileList:[],
+ showPopup:false,
+ fileEvent:{},
+ itemId:"",
+ assetTypeOptions:[],
+ option1: [
+ { text: '支付状态', value: '' },
+ { text: '待支付', value: '1' },
+ { text: '银行受理', value: '3' },
+ { text: '支付失败', value: '4' },
+ { text: '部分失败', value: '5' },
+ ],
+ option2: [
+ { text: '支出类别', value: '' },
+ { text: '结算类', value: '1' },
+ { text: '工程项目类', value: '2' },
+ { text: '合同类', value: '4' },
+ { text: '其他', value: '5' },
+ ],
+ option3: [
+ { text: '申请类别', value: '' },
+ { text: '银行卡转账', value: '1' },
+ { text: '信用卡还款', value: '2' },
+ ],
+ value1: '',
+ value2: '',
+ value3: '',
+ },
+ goAdd(){
+ wx.navigateTo({
+ url: 'add/add',
+ })
+ },
+ back:function(){
+ wx.navigateBack({
+ delta: 1
+ })
+ },
+ assetTypeDict(val){
+ this.data.assetTypeOptions.map(res => {
+ if(res.dictValue == val){
+ return res.dictLabel
+ }
+ })
+ },
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad(options) {
+ var that = this;
+ let qu = wx.createSelectorQuery()
+ qu.select("#top_view1").boundingClientRect()
+ qu.select("#top_ban").boundingClientRect()
+ qu.exec(res => {
+ that.setData({
+ scrollHeight:wx.getSystemInfoSync().windowHeight-res[0].height-res[0].top
+ })
+ })
+
+ this.getList();
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady() {
+ //获取附件字典
+ UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'bookkeeping_type', {method:'GET'}, {
+ success: (res) => {
+ if(res.data.length>0){
+ this.setData({
+ uploadOptions:res.data,
+ })
+ }
+ }
+ })
+
+ },
+ getList:function(){
+ let params = {
+ pageNum:this.data.pageNums,
+ pageSize:10,
+ name:this.data.name,
+ paymentState:this.data.value1,
+ capitalExpenditureType:this.data.value2,
+ transferType:this.data.value3
+ }
+ UTIL.httpRequest(API.URL_GET_TRANSFERPAYLIST,params,{
+ success: (res) => {
+ let _this = this
+ if(res.code == 200){
+ if(this.data.pageNums!=1&&this.data.list.length {
+ rr.expenditureAmount = Number(rr.expenditureAmount ).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => {
+ return $1 + ","; }).replace(/\.$/, "")
+ if(index==(res.rows.length-1)){
+ lists = _this.data.list.concat(res.rows)
+ }
+ })
+
+ //获取资产类别
+ UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'asset_type', {method:'GET'}, {
+ success: (r) => {
+ if(r.data.length>0){
+ let li = lists.map( res => {
+ r.data.map(rr => {
+ if(res.assetType == rr.dictValue){
+ res.assetType = rr.dictLabel
+ }
+ })
+ return res
+ })
+ _this.setData({list:li})
+ }else{
+ _this.setData({list:lists})
+ }
+ }
+ })
+ }else if(this.data.pageNums==1){
+ //获取资产类别
+ UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'asset_type', {method:'GET'}, {
+ success: (r) => {
+ if(r.data.length>0){
+ let li = res.rows.map( ress => {
+ ress.originalValue = Number(ress.originalValue ).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => {
+ return $1 + ","; }).replace(/\.$/, "")
+ r.data.map(rr => {
+ if(ress.assetType == rr.dictValue){
+ ress.assetType = rr.dictLabel
+ }
+ })
+ return ress
+ })
+ _this.setData({list:li})
+ }else{
+ _this.setData({list:res.rows})
+ }
+ }
+ })
+ }
+ }else{
+ UTIL.showToastNoneIcon(res.msg);
+ }
+ }
+ })
+ },
+ paging(){
+ this.setData({
+ pageNums:this.data.pageNums+1,
+ })
+ this.getList();
+ },
+ goSearch(e){
+ this.setData({name:e.detail});
+ this.setData({pageNums:1});
+ this.getList();
+ },
+ toPay(e){
+ wx.navigateTo({
+ url: '/pages/paymentManager/toPay/toPay?id='+e.currentTarget.dataset.id,
+ })
+ },
+ scrap(e){
+ console.log(e.currentTarget.dataset.data.id,e.currentTarget.dataset.data.index);
+ if(e.currentTarget.dataset.data.assetStatus != 1){
+ UTIL.showToastNoneIcon('只允许修改资产状态为正常的资产!');
+ return false;
+ }else if(e.currentTarget.dataset.data.useType == 3){
+ UTIL.showToastNoneIcon('使用状态为出租或出借不允许操作!');
+ return false;
+ }else{
+ UTIL.httpRequest(API.URL_GET_UPDATERSCRAP + e.currentTarget.dataset.data.id , {method:'GET'}, {
+ success: (res) => {
+ if(res.code==200){
+ let new_list = this.data.list
+ new_list.splice(e.currentTarget.dataset.data.index,1)
+ this.setData({'list':new_list})
+ UTIL.showToastNoneIcon('报废成功!');
+ }else{
+ UTIL.showToastNoneIcon('报废失败!:'+res.msg);
+ }
+ }
+ })
+ }
+ },
+ sell(e){
+ console.log(e.currentTarget.dataset.data.id,e.currentTarget.dataset.data.index);
+ if(e.currentTarget.dataset.data.assetStatus != 1){
+ UTIL.showToastNoneIcon('只允许修改资产状态为正常的资产!');
+ return false;
+ }else if(e.currentTarget.dataset.data.useType == 3){
+ UTIL.showToastNoneIcon('使用状态为出租或出借不允许操作!');
+ return false;
+ }else{
+ UTIL.httpRequest(API.URL_GET_UPDATERSALE + e.currentTarget.dataset.data.id , {method:'GET'}, {
+ success: (res) => {
+ if(res.code==200){
+ let new_list = this.data.list
+ new_list.splice(e.currentTarget.dataset.data.index,1)
+ this.setData({'list':new_list})
+ UTIL.showToastNoneIcon('出售成功!');
+ }else{
+ UTIL.showToastNoneIcon('出售失败!:'+res.msg);
+ }
+ }
+ })
+ }
+ },
+ change(e){
+ var that = this ;
+ that.setData({value:e.detail,pageNum:1})
+ this.getList()
+ },
+ changeTab(e){
+ var that = this ;
+ that.setData({value1:e.detail,pageNum:1})
+ this.getList()
+ },
+ changeTab2(e){
+ var that = this ;
+ that.setData({value2:e.detail,pageNum:1})
+ this.getList()
+ },
+
+ upload(e){
+ this.setData({itemId:e.currentTarget.dataset.id});
+ this.asyncFun(e.currentTarget.dataset.id)
+ },
+ asyncFun(id){
+ this.setData({"fileList":[]})
+ let uploadList = this.data.uploadOptions
+ let _this = this
+ uploadList.map( (res,idx) => {
+ res.list=[]
+ console.log(res);
+ let oData = {
+ tableId: id,
+ tableName: "t_yinnong_transfer", //上传表
+ bizPath: "transfer",
+ fileType: res.dictValue, //附件类型 1原始发票 2会议纪要 3会议照片 4 参会人员签字
+ method:'GET'
+ }
+ UTIL.httpRequest(API.URL_GET_ATTACHMENTLIST, oData, {
+ success: (rr) => {
+ if(rr.rows.length>0){
+ rr.rows.map((rrr,index) => {
+ rrr.url = URL_PREFIX + rrr.fileUrl
+ rrr.name = rrr.fileName
+ if(index==rr.rows.length-1){
+ res.list = rr.rows
+ let lis = uploadList
+ lis[idx] = res
+ _this.setData({"fileList":lis});
+ _this.setData({"showUpload":true})
+ }
+ })
+ }
+ else{
+ _this.setData({"showUpload":true})
+ }
+ }
+ })
+ })
+
+ },
+ closeBox(){
+ this.setData({"showUpload":false})
+ },
+ uploadFile(uploadFile,event) {
+ let _this = this
+ return new Promise((resolve, reject) => {
+ wx.uploadFile({
+ url: API.URL_GET_UPLOAD,
+ filePath: uploadFile.file.file.url,
+ name: 'file',
+ header: {
+ "Content-Type": "multipart/form-data",//记得设置
+ "chartset":"utf-8",
+ 'Authorization':'Bearer '+getApp().globalData.userInfo.token
+ },
+ formData:uploadFile,
+ success: (res) => {
+ res.data = JSON.parse(res.data);
+ if(res.statusCode == 200){
+ let files = _this.data.fileList
+ let fName = res.data.fileUrl.split('/')
+ let fLength = fName.length
+ files[event.currentTarget.dataset.idx].list.push({
+ "fileName": fName[fLength-1],
+ "name":fName[fLength-1],
+ "fileType": "0",
+ "fileUrl":res.data.fileUrl ,
+ "id": res.data.id,
+ "tableId": 6,
+ "url":URL_PREFIX+res.data.fileUrl
+ })
+ _this.setData({"fileList":files})
+ wx.hideLoading()
+ }
+ },
+ fail: (err) => {
+ //上传失败:修改pedding为reject
+ reject(err)
+ }
+ });
+ })
+ },
+ afterRead(event) {
+ let _this = this
+ wx.showLoading({
+ title: '上传中...'
+ })
+ let fileForm={
+ file: event.detail,
+ fileType:event.currentTarget.dataset.idx,
+ tableName: "t_yinnong_transfer", //上传表
+ bizPath: "transfer",
+ tableId:_this.data.itemId
+ }
+ this.uploadFile(fileForm,event)
+ },
+ lookDown(e){
+ let file =e
+ // 获取指定字符串最后一次出现的位置,返回index
+ var index1 = file.detail.url.lastIndexOf('.');
+ // substr(start, length) 抽取从start下标开始的length个字符,返回新的字符串;
+ var style = file.detail.url.substr(index1 + 1)
+ //判断图片类型,不需要下载,不做处理
+ if(style=='png'||style=='jpg'||style=='jpeg'||style=='bmp'||style=='gif'||style=='webp'||style=='psd'||style== 'svg'||style=='tiff'){
+ //判断非图片类型
+ }else{
+ wx.downloadFile({
+ url: file.detail.url,
+ success(data){
+ wx.openDocument({
+ filePath: data.tempFilePath,
+ fileType: style,
+ showMenu:true,
+ success(res){
+ }
+ })
+ }
+ })
+ }
+ },
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow() {
+ this.setData({'pageNums':1})
+ this.getList();
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh() {
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom() {
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage() {
+
+ }
+})
\ No newline at end of file
diff --git a/pages/paymentManager/paymentManager.json b/pages/paymentManager/paymentManager.json
new file mode 100644
index 0000000..669beb2
--- /dev/null
+++ b/pages/paymentManager/paymentManager.json
@@ -0,0 +1,16 @@
+{
+ "usingComponents": {
+ "van-checkbox": "@vant/weapp/checkbox/index",
+ "van-checkbox-group": "@vant/weapp/checkbox-group/index",
+ "van-cell": "@vant/weapp/cell/index",
+ "van-cell-group": "@vant/weapp/cell-group/index",
+ "van-search": "@vant/weapp/search/index",
+ "van-radio": "@vant/weapp/radio/index",
+ "van-radio-group": "@vant/weapp/radio-group/index",
+ "van-swipe-cell": "@vant/weapp/swipe-cell/index",
+ "van-action-sheet": "@vant/weapp/action-sheet/index",
+ "van-upload": "@vant/weapp/uploader/index",
+ "van-dropdown-menu": "@vant/weapp/dropdown-menu/index",
+ "van-dropdown-item": "@vant/weapp/dropdown-item/index"
+ }
+}
\ No newline at end of file
diff --git a/pages/paymentManager/paymentManager.wxml b/pages/paymentManager/paymentManager.wxml
new file mode 100644
index 0000000..91f86f4
--- /dev/null
+++ b/pages/paymentManager/paymentManager.wxml
@@ -0,0 +1,79 @@
+
+
+
+ 支出管理
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.payer}}
+
+
+
+ {{item.payerAccount}}
+ {{item.transferType==1?"银行还款":"信用卡还款"}}
+
+
+
+
+
+ {{item.applyDate}}
+
+
+
+ {{item.applyDate}}
+
+
+
+
+
+
+ ¥{{item.expenditureAmount}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 附件
+
+
+
+
+
+
+
+
+
+
+
+ {{item.dictLabel}}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/paymentManager/paymentManager.wxss b/pages/paymentManager/paymentManager.wxss
new file mode 100644
index 0000000..116395b
--- /dev/null
+++ b/pages/paymentManager/paymentManager.wxss
@@ -0,0 +1,285 @@
+/* pages/paymentManager/paymentManager.wxss */
+.van-search__content {
+ border: 1px solid #5CAE77!important;
+ background: #fff!important;
+}
+van-search {
+ flex: 0.8;
+}
+.search_box{
+ display: flex;
+}
+.add_btn{
+ flex: 0.2;
+ padding: var(--search-padding,10px 12px);
+ padding-left: 0;
+}
+.add_btn text{
+ background-color: #62AD66;
+ display: block;
+ height: 100%;
+ text-align: center;
+ line-height: 36px;
+ color: #fff;
+ border-radius: 36px;
+ box-shadow: 0px 5px 5px #ddd;
+}
+text{display: block;}
+.work_plan{
+ padding: 40rpx 32.5rpx 30rpx;
+ display: flex;
+}
+
+.work_plan .menu_item{
+ background-color: #fff;
+ box-shadow: 2px 5px 5px #ddd;
+ border-radius: 60rpx;
+ text-align: center;
+ position: relative;
+ margin-right: 20px;
+ padding: 8px 10px;
+}
+.work_plan .menu_item.active{
+ background-color: #2C8E68;
+ color: #fff;
+}
+.work_plan .menu_item .remind{
+ height: 30rpx;
+ background: #e90101;
+ color: #fff;
+ font-size: 26rpx;
+ position: absolute;
+ line-height: 30rpx;
+ padding:0 10rpx;
+ border-radius: 25px;
+ top: -10rpx;
+ right: -10rpx;
+}
+
+.work_plan .more{
+ flex: 1;
+ text-align: center;
+ line-height: 60rpx;
+ font-size: 36rpx;
+ color: #31936c;
+}
+.deleteBox{
+ width: 50px;
+ text-align: center;
+ height: 100%;
+ background: #F6F6F6;
+ align-items: center;
+ display: flex;
+}
+.moreBox{
+ width: 90px;
+ text-align: center;
+ height: 100%;
+ background: #F6F6F6;
+ align-items: center;
+ display: flex;
+}
+.workflow .workflow_list{
+ height: 150rpx;
+ background-color: #fff;
+ border-radius: 24rpx;
+ box-shadow:0rpx 0rpx 10rpx rgba(0,0,0,.1);
+ margin-bottom: 20rpx;
+ padding:15rpx 25rpx 10rpx 35rpx;
+}
+.workflow .workflow_list .process_intro{
+ display: flex;
+ height: 62rpx;
+ align-items: center;
+}
+
+.workflow .process_intro .name{
+ width: 390rpx;
+ font-size: 34rpx;
+ margin-right: 30rpx;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+}
+.workflow .process_intro .name .name_tit{
+ width: 290rpx;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+}
+.van-swipe-cell {
+ width: 94%;
+ background: #fff;
+ border-radius: 10px;
+ box-shadow: 2px 5px 5px #ddd;
+ margin: 0 auto;
+ margin-bottom: 15px;
+}
+.li{
+ width: 100%;
+ padding: 14px;
+ display: flex;
+}
+.tit_box{
+ display: flex;
+}
+.detail_box{
+ margin-top: 10px;
+ display: flex;
+ justify-content: space-between;
+}
+.li view text{
+ /* margin-top: 15px; */
+}
+.li .detail_box view{
+ display: flex;
+ align-items: center;
+}
+.li .detail_box view text{
+ color: #666666;
+ font-size: 12px;
+}
+
+.li view text:nth-child(1){
+ margin-top: 0px;
+}
+.li .fksr{
+ display: flex;
+ align-items: center;
+ margin-top: 15px;
+ color: #2C8E68;
+ font-size: 16px;
+}
+.li .wtj{
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ padding: 3px 8px;
+ border-radius: 5px;
+ font-size: 14px;
+}
+.no{
+ background-color:#fbe3e3;
+ color: #e90000;
+}
+.white{
+ background-color:#feeadc;
+ color: #fc9a55;
+}
+.yes{
+ background-color:#ddeee3;
+ color: #5cae77;
+}
+.other{
+ background-color:#f0f1f6;
+ color: #878787;
+}
+.li .tit{
+ font-size: 16px;
+ color: #444444;
+ line-height: 14px;
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 1;
+ word-break: break-all;
+ overflow: hidden;
+}
+.li .fj_name{
+ font-size: 14px;
+ color: #B3DB62;
+ line-height: 25px;
+}
+.li .time{
+ font-size: 14px;
+ color: #9B9CAA;
+}
+.li .money{
+ font-size: 18px;
+ color: #5CAE77;
+}
+.van-checkbox__label {
+ display: flex;
+ justify-content: space-between;
+ width: 100%;
+}
+
+.van-checkbox__icon-wrap {
+ border-radius: 5px;
+}
+.van-checkbox__icon {
+ border-radius: 5px;
+ border: 2px solid #2C8E68!important;
+ background-color: rgba(44, 142, 104, 0.2);
+}
+.bottom{
+ width: 100%;
+ margin: 0 auto;
+ text-align: center;
+ padding: 15px 0;
+ display: flex;
+ position: fixed;
+ bottom: 0%;
+ background: #fff;
+ box-shadow: 0 0 5px #ddd;
+}
+
+.bottom view {
+ width: 47%;
+ margin: 0 auto;
+ border-radius: 30px;
+ display: inline-block;
+}
+
+.bottom .btn2{
+ border: 1px solid transparent;
+ padding: 10px 0px;
+ background-image: linear-gradient(to right, #2C8E68, #5CAE77);
+ color: #fff;
+}
+
+.downView{
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ padding: 0 20px;
+ border: 1px solid #5CAE77;
+ border-radius: 50px;
+ background: #fff;
+ margin-left: auto;
+}
+.downView image{
+ width: 10px;
+ height: 8px;
+ margin-left: 10px;
+}
+.fj-box text{
+ background-color: #5CAE77;
+ color: #ffffff;
+ text-align: center;
+ border-radius: 5px;
+ white-space:pre-wrap;
+ padding: 5rpx 8rpx;
+ width: 50rpx;
+ margin: 0px 14px;
+ font-size: 24rpx;
+}
+.fj-li{
+ margin-top: 20px;
+ display: flex;
+ /* flex-wrap: wrap; */
+}
+.fj-li .img_li{
+ width: 100%;
+ height: 18.5vw;
+}
+
+.fj-li .img_add{
+ overflow: hidden;
+}
+.van-icon-description{
+ font-size: 60px;
+}
+.van-dropdown-menu {
+ width:100%;
+ margin-bottom: 15px;
+}
\ No newline at end of file
diff --git a/pages/project/add/add.wxml b/pages/project/add/add.wxml
index 8bd644d..61255e1 100644
--- a/pages/project/add/add.wxml
+++ b/pages/project/add/add.wxml
@@ -1,42 +1,37 @@
-
- {{form.id?"":"新增"}}工程项目
+
+ 新增工程项目
-
+
-
- *开工日期
-
-
- {{form.startTime?form.startTime:'开工日期'}}
-
-
-
-
- *竣工日期
-
-
- {{form.endTime?form.endTime:'竣工日期'}}
-
-
-
-
+
+
-
- *工程状态
-
-
- {{ynProjcetStatusOptions[ynProjcetStatusindex].dictLabel?ynProjcetStatusOptions[ynProjcetStatusindex].dictLabel:"选择所属银行"}}
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
- 保存
+ 确认
\ No newline at end of file
diff --git a/pages/project/add/add.wxss b/pages/project/add/add.wxss
index c080460..ba73b72 100644
--- a/pages/project/add/add.wxss
+++ b/pages/project/add/add.wxss
@@ -1,4 +1,6 @@
/* pages/payee/add/add.wxss */
+
+@import "../../../style/iconfont.wxss";
.main-box{
background: #ffffff;
padding: 20px;
diff --git a/style/iconfont.wxss b/style/iconfont.wxss
index e186a3c..9f598cc 100644
--- a/style/iconfont.wxss
+++ b/style/iconfont.wxss
@@ -1,8 +1,10 @@
-@font-face {
- font-family: "iconfont"; /* Project id 3051601 */
- src: url('//at.alicdn.com/t/font_3051601_80e3j4e5om7.woff2?t=1640658441847') format('woff2'),
- url('//at.alicdn.com/t/font_3051601_80e3j4e5om7.woff?t=1640658441847') format('woff'),
- url('//at.alicdn.com/t/font_3051601_80e3j4e5om7.ttf?t=1640658441847') format('truetype');
+@font-face {font-family: "iconfont";
+ src: url('//at.alicdn.com/t/font_945958_zfsfjju1dim.eot?t=1547618146468'); /* IE9 */
+ src: url('//at.alicdn.com/t/font_945958_zfsfjju1dim.eot?t=1547618146468#iefix') format('embedded-opentype'), /* IE6-IE8 */
+ url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2'),
+ url('//at.alicdn.com/t/font_945958_zfsfjju1dim.woff?t=1547618146468') format('woff'),
+ url('//at.alicdn.com/t/font_945958_zfsfjju1dim.ttf?t=1547618146468') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
+ url('//at.alicdn.com/t/font_945958_zfsfjju1dim.svg?t=1547618146468#iconfont') format('svg'); /* iOS 4.1- */
}
.iconfont {
@@ -40,3 +42,32 @@
.icon-guanbi:before {
content: "\e62a";
}
+
+.icon-format-header-2:before {
+ content: "\e75c";
+}
+
+.icon-format-header-3:before {
+ content: "\e75d";
+}
+.icon-zitijiacu:before {
+ content: "\ec8a";
+}
+.icon-zitixieti:before {
+ content: "\ec8f";
+}
+.icon-zitixiahuaxian:before {
+ content: "\ec8e";
+}
+.icon--checklist:before {
+ content: "\e664";
+}
+.icon-youxupailie:before {
+ content: "\ec86";
+}
+.icon-wuxupailie:before {
+ content: "\ec83";
+}
+.icon-charutupian:before {
+ content: "\ec82";
+}
\ No newline at end of file
diff --git a/utils/API.js b/utils/API.js
index 791d191..dc7533e 100644
--- a/utils/API.js
+++ b/utils/API.js
@@ -266,6 +266,12 @@ const URL_GET_SUBJECTLIST = `${URL_PREFIX}/finance/subject/list?is_last=Y`;
//固定资产列表
const URL_GET_PERMANENTLIST = `${URL_PREFIX}/asset/permanent/list/`;
+//可关联固定资产列表
+const URL_GET_PERMANENTLISTS = `${URL_PREFIX}/asset/permanent/listContractPermanentList/`;
+
+//可关联资源性资产列表
+const URL_GET_RESOURCELIST = `${URL_PREFIX}/asset/resource/listContractResourceList/`;
+
//固定资产删除
const URL_GET_PERMANENTDELETE = `${URL_PREFIX}/asset/permanent/remove/`;
@@ -312,6 +318,74 @@ const URL_GET_UPLOADFILE = `${URL_PREFIX}/yinnong/transfer/importData`;
//下载收款人模板
const URL_GET_DOWNFILE = `${URL_PREFIX}/yinnong/transfer/importTemplate`;
+//合同终止
+const URL_GET_TERMINATEINFO = `${URL_PREFIX}/contraction/info/terminateInfo/`;
+
+//合同撤销
+const URL_GET_CANCELINFO = `${URL_PREFIX}/contraction/info/cancelnfo/`;
+
+//可关联合同列表
+const URL_GET_ASSETLISTALL = `${URL_PREFIX}/contraction/asset/list/`;
+
+//固定资产变更(数量)
+const URL_POST_UPDATEQUANTITY = `${URL_PREFIX}/asset/permanent/updateQuantity`;
+
+//固定资产变更(原值)
+const URL_POST_UPDATEORIGINALVALUE = `${URL_PREFIX}/asset/permanent/updateOriginalValuePermanent`;
+
+//固定资产变更(折旧方式)
+const URL_POST_UPDATEDEPRECIATIONMETHOD = `${URL_PREFIX}/asset/permanent/updateDepreciationMethod`;
+
+//固定资产变更(预计使用年数)
+const URL_POST_UPDATEEXPECTEDYEARS = `${URL_PREFIX}/asset/permanent/updateExpectedYears`;
+
+//固定资产变更(已折旧年数)
+const URL_POST_UPDATEDEPRECIATIONYEARS = `${URL_PREFIX}/asset/permanent/updateDepreciationYears`;
+
+//固定资产变更(累计折旧)
+const URL_POST_UPDATEDEPRECIATIONVALUE = `${URL_PREFIX}/asset/permanent/updateDepreciationValue`;
+
+//固定资产变更(残值率)
+const URL_POST_UPDATERESIDUALSRATE = `${URL_PREFIX}/asset/permanent/updateResidualsRate`;
+
+//出售固定资产
+const URL_GET_UPDATERSALE = `${URL_PREFIX}/asset/permanent/updateSale/`;
+
+//作废固定资产
+const URL_GET_UPDATESCRAP = `${URL_PREFIX}/asset/permanent/updateScrap/`;
+
+//查询支付管理列表
+const URL_GET_TRANSFERPAYLIST = `${URL_PREFIX}/yinnong/transfer/payList/`;
+
+//查询转账详情
+const URL_GET_TRANSFERINFO= `${URL_PREFIX}/yinnong/transfer/get/`;
+
+//查询转账列表
+const URL_GET_TRANSFERINFOS= `${URL_PREFIX}/yinnong/transferDetail/getDetails/`;
+
+//支付验证码
+const URL_GET_SENDMSG= `${URL_PREFIX}/yinnong/transfer/sendSms/`;
+
+//支付
+const URL_GET_PAY= `${URL_PREFIX}/yinnong/transfer/pay/`;
+
+//重大事项列表
+const URL_GET_MAJOREVENTLIST= `${URL_PREFIX}/yinnong/majorevent/list/`;
+
+//重大事项查询
+const URL_GET_MAJOREVENTGET= `${URL_PREFIX}/yinnong/majorevent/get/`;
+
+//重大事项新增
+const URL_POST_MAJOREVENTADD= `${URL_PREFIX}/yinnong/majorevent/add/`;
+
+//重大事项修改
+const URL_POST_MAJOREVENTUPDATE= `${URL_PREFIX}/yinnong/majorevent/edit/`;
+
+//重大事项删除
+const URL_GET_MAJOREVENTDELETE= `${URL_PREFIX}/yinnong/majorevent/remove/`;
+
+//重大事项提交
+const URL_GET_MAJOREVENTSUBMIT= `${URL_PREFIX}/yinnong/majorevent/customSubmit/`;
/****************接口地址end****************/
@@ -431,5 +505,30 @@ export {
URL_GET_PAYEEGET,
URL_GET_PAYEEREMOVE,
URL_GET_UPLOADFILE,
- URL_GET_DOWNFILE
+ URL_GET_DOWNFILE,
+ URL_GET_TERMINATEINFO,
+ URL_GET_CANCELINFO,
+ URL_GET_ASSETLISTALL,
+ URL_GET_RESOURCELIST,
+ URL_GET_PERMANENTLISTS,
+ URL_POST_UPDATEQUANTITY,
+ URL_POST_UPDATEORIGINALVALUE,
+ URL_POST_UPDATEDEPRECIATIONMETHOD,
+ URL_POST_UPDATEEXPECTEDYEARS,
+ URL_POST_UPDATEDEPRECIATIONYEARS,
+ URL_POST_UPDATEDEPRECIATIONVALUE,
+ URL_POST_UPDATERESIDUALSRATE,
+ URL_GET_UPDATERSALE,
+ URL_GET_UPDATESCRAP,
+ URL_GET_TRANSFERPAYLIST,
+ URL_GET_TRANSFERINFO,
+ URL_GET_TRANSFERINFOS,
+ URL_GET_SENDMSG,
+ URL_GET_PAY,
+ URL_GET_MAJOREVENTLIST,
+ URL_GET_MAJOREVENTGET,
+ URL_POST_MAJOREVENTADD,
+ URL_POST_MAJOREVENTUPDATE,
+ URL_GET_MAJOREVENTDELETE,
+ URL_GET_MAJOREVENTSUBMIT
}
\ No newline at end of file