diff --git a/pages/bank/bank.wxml b/pages/bank/bank.wxml
index 6fdb471..535c161 100644
--- a/pages/bank/bank.wxml
+++ b/pages/bank/bank.wxml
@@ -32,8 +32,13 @@
-
-
+
+
+
+
+
+ 删除
+
diff --git a/pages/bankDraft/bankDraft.js b/pages/bankDraft/bankDraft.js
index 597b8ba..6042a3d 100644
--- a/pages/bankDraft/bankDraft.js
+++ b/pages/bankDraft/bankDraft.js
@@ -89,7 +89,6 @@ Page({
this.onShow();
},
paging(){
- console.log(1);
this.setData({
pageNums:this.data.pageNums+1,
})
@@ -117,7 +116,8 @@ Page({
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);
+ response.rows[i].orderAmount = Number(response.rows[i].orderAmount).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => {
+ return $1 + ","; }).replace(/\.$/, "")
}
that.setData({
moneyorderList:response.rows
@@ -263,7 +263,6 @@ Page({
},
confirmTem:function(e){
let event = this.data.fileEvent
- console.log(event);
UTIL.httpRequest(API.URL_GET_GETFILEREMOVE+event.detail.file.id , {method:'GET'}, {
success: (res) => {
if(res.code==200){
diff --git a/pages/bankDraft/bankDraft.wxml b/pages/bankDraft/bankDraft.wxml
index 589e619..ce573d3 100644
--- a/pages/bankDraft/bankDraft.wxml
+++ b/pages/bankDraft/bankDraft.wxml
@@ -55,11 +55,21 @@
-
-
+
+
+
+
+
+ 删除
+
-
-
+
+
+
+
+
+ 附件
+
diff --git a/pages/contract/add/add.js b/pages/contract/add/add.js
index 26bbb8d..67a9e6a 100644
--- a/pages/contract/add/add.js
+++ b/pages/contract/add/add.js
@@ -56,7 +56,6 @@ Page({
this.setData({
[event.currentTarget.dataset.formname]: event.detail,
})
- console.log(this.data.form);
},
closeBox(even){
this.setData({
@@ -119,7 +118,6 @@ Page({
})
},
onConfirmAssetType (e) {
- console.log(e);
let obj = e.detail.value;
this.setData({
'form.assetType':this.data.assetTypeOptions[obj].dictValue,
@@ -328,7 +326,6 @@ Page({
UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'bidding_types', {method:'GET'}, {
success: (r) => {
if(r.data.length>0){
- console.log(res.data,r.data);
that.setData({
biddingTypeOptions:r.data,
})
diff --git a/pages/contract/contract.js b/pages/contract/contract.js
index e04b122..415a94f 100644
--- a/pages/contract/contract.js
+++ b/pages/contract/contract.js
@@ -23,6 +23,7 @@ Page({
uploadOptions:[],
fileList:[],
showPopup:false,
+ showPopupDel:false,
showRelevance:false,
relevanceList:[],
fileEvent:{},
@@ -71,6 +72,7 @@ Page({
})
},
getList:function(){
+ let _this = this
let params = {
pageNum:this.data.pageNums,
pageSize:10,
@@ -78,13 +80,24 @@ Page({
}
UTIL.httpRequest(API.URL_GET_CONTRACTLIST,params,{
success: (res) => {
- console.log(res);
if(res.code == 200){
if(this.data.pageNums!=1&&this.data.list.length {
+ rr.totalAmount = Number(rr.totalAmount ).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => {
+ return $1 + ","; }).replace(/\.$/, "")
+ if(index==(res.rows.length-1)){
+ let lists = this.data.list.concat(res.rows)
+ _this.setData({list:lists})
+ }
+ })
}else if(this.data.pageNums==1){
- this.setData({list:res.rows})
+ res.rows.map((rr,index) => {
+ rr.totalAmount = Number(rr.totalAmount ).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => {
+ return $1 + ","; }).replace(/\.$/, "")
+ if(index==(res.rows.length-1)){
+ _this.setData({list:res.rows})
+ }
+ })
}
}else{
UTIL.showToastNoneIcon(res.msg);
@@ -113,11 +126,25 @@ Page({
})
},
delete(e){
- UTIL.httpRequest(API.URL_GET_CONTRACTDELETE + e.currentTarget.dataset.id, {method:'GET'}, {
+ this.setData({
+ 'itemId':e.currentTarget.dataset.id,
+ "showPopupDel":true
+ });
+ },
+ cancelTemDel:function(e){
+ this.setData({
+ "itemId":"",
+ "showPopupDel":false
+ });
+ },
+ confirmTemDel:function(e){
+ this.setData({
+ "showPopupDel":false
+ });
+ UTIL.httpRequest(API.URL_GET_CONTRACTDELETE+this.data.itemId , {method:'GET'}, {
success: (res) => {
if(res.code==200){
let new_list = this.data.list
- console.log(e.currentTarget.dataset.index);
new_list.splice(e.currentTarget.dataset.index,1)
this.setData({'list':new_list})
UTIL.showToastNoneIcon('删除成功！');
@@ -141,7 +168,6 @@ Page({
})
},
relevanceDelete(e){
- console.log(e);
UTIL.httpRequest(API.URL_GET_ASSETREMOVE+ e.currentTarget.dataset.id, {method:'GET'}, {
success: (res) => {
if(res.code==200){
@@ -152,12 +178,6 @@ Page({
}else{
UTIL.showToastNoneIcon('删除失败！');
}
- },
- fail:(rr) =>{
- console.log(rr);
- },
- complete:(rr) => {
- console.log(rr);
}
})
},
@@ -172,12 +192,6 @@ Page({
'showRelevance':true,
'contractionId':e.currentTarget.dataset.id
})
- },
- fail:(rr) =>{
- console.log(rr);
- },
- complete:(rr) => {
- console.log(rr);
}
})
},
@@ -217,12 +231,6 @@ Page({
_this.setData({"fileList":newuploadList});
_this.setData({"showUpload":true})
}
- },
- fail:(rr) =>{
- console.log(rr);
- },
- complete:(rr) => {
- console.log(rr);
}
})
})
@@ -242,7 +250,6 @@ Page({
},
confirmTem:function(e){
let event = this.data.fileEvent
- console.log(event);
UTIL.httpRequest(API.URL_GET_GETFILEREMOVE+event.detail.file.id , {method:'GET'}, {
success: (res) => {
if(res.code==200){
@@ -340,7 +347,6 @@ Page({
* 生命周期函数--监听页面显示
*/
onShow() {
- console.log(this.data.contractionId)
if(this.data.contractionId!=""&&this.data.contractionId!=null){
this.relevanceBack()
}
diff --git a/pages/contract/contract.wxml b/pages/contract/contract.wxml
index e7e6d40..54bc33c 100644
--- a/pages/contract/contract.wxml
+++ b/pages/contract/contract.wxml
@@ -128,4 +128,7 @@
+
+
+
\ No newline at end of file
diff --git a/pages/contractAssets/fixedAssets.js b/pages/contractAssets/fixedAssets.js
index 5bd6b7f..f5617a6 100644
--- a/pages/contractAssets/fixedAssets.js
+++ b/pages/contractAssets/fixedAssets.js
@@ -90,7 +90,6 @@ Page({
}
UTIL.httpRequest(API.URL_GET_PERMANENTLIST,params,{
success: (res) => {
- console.log(res);
let _this = this
if(res.code == 200){
if(this.data.pageNums!=1&&this.data.list.length{
- console.log(rr);
- },
- complete:(rr) => {
- console.log(rr);
}
})
})
@@ -245,7 +238,6 @@ Page({
},
confirmTem:function(e){
let event = this.data.fileEvent
- console.log(event);
UTIL.httpRequest(API.URL_GET_GETFILEREMOVE+event.detail.file.id , {method:'GET'}, {
success: (res) => {
if(res.code==200){
diff --git a/pages/finance/finance.js b/pages/finance/finance.js
index f2cdfdc..3a47b4d 100644
--- a/pages/finance/finance.js
+++ b/pages/finance/finance.js
@@ -40,14 +40,32 @@ Page({
}
UTIL.httpRequest(API.URL_GET_FINANCIALLIST,params,{
success: (res) => {
- console.log(res);
-
if(res.code == 200){
+ res.summary.syjc=Number(res.summary.syjc ).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => {
+ return $1 + ","; }).replace(/\.$/, "")
+ res.summary.dai=Number(res.summary.dai ).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => {
+ return $1 + ","; }).replace(/\.$/, "")
+ res.summary.jie=Number(res.summary.jie ).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => {
+ return $1 + ","; }).replace(/\.$/, "")
+ res.summary.byjc=Number(res.summary.byjc ).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => {
+ return $1 + ","; }).replace(/\.$/, "")
this.setData({'data':res.summary})
if(this.data.pageNums!=1&&this.data.financeList.length {
+ rr.jieAmount = Number(rr.jieAmount ).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => {
+ return $1 + ","; }).replace(/\.$/, "")
+ rr.daiAmount = Number(rr.daiAmount ).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => {
+ return $1 + ","; }).replace(/\.$/, "")
+ })
let lists = this.data.financeList.concat(res.rows)
this.setData({financeList:lists})
}else if(this.data.pageNums==1){
+ res.rows.map(rr => {
+ rr.jieAmount = Number(rr.jieAmount ).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => {
+ return $1 + ","; }).replace(/\.$/, "")
+ rr.daiAmount = Number(rr.daiAmount ).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => {
+ return $1 + ","; }).replace(/\.$/, "")
+ })
this.setData({financeList:res.rows})
}
}else{
@@ -65,7 +83,6 @@ Page({
qu.select("#top_view1").boundingClientRect()
qu.select("#top_view2").boundingClientRect()
qu.exec(res => {
- console.log(res);
that.setData({
scrollHeight:wx.getSystemInfoSync().windowHeight-res[0].height-res[0].top-res[1].height-res[1].left*2
})
diff --git a/pages/finance/finance.wxml b/pages/finance/finance.wxml
index aef0837..15d0106 100644
--- a/pages/finance/finance.wxml
+++ b/pages/finance/finance.wxml
@@ -45,8 +45,8 @@
{{item.voucherSummary}}
- ￥+{{item.jieAmount?item.jieAmount:""}}
- ￥-{{item.daiAmount?item.daiAmount:""}}
+ ￥+{{item.jieAmount?item.jieAmount:""}}
+ ￥-{{item.daiAmount?item.daiAmount:""}}
diff --git a/pages/fixedAssets/add/add.js b/pages/fixedAssets/add/add.js
index c015692..62aab31 100644
--- a/pages/fixedAssets/add/add.js
+++ b/pages/fixedAssets/add/add.js
@@ -71,7 +71,6 @@ Page({
this.setData({
[event.currentTarget.dataset.formname]: event.detail,
})
- console.log(this.data.form);
},
closeBox(even){
this.setData({
@@ -226,7 +225,6 @@ Page({
this.setData({
[e.currentTarget.dataset.name]: e.detail.value
})
- console.log(e);
if(e.currentTarget.dataset.name == 'form.originalValue' ){
this.setData({
'form.netValue' : e.detail.value,
@@ -266,7 +264,6 @@ Page({
UTIL.httpRequest(API.URL_GET_PERMANENTDETAIL + this.data.id, {method:'GET'}, {
success: (res) => {
this.setData({'form':res.data});
- console.log(res.data);
let that = this;
//获取资产类别
UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'asset_type', {method:'GET'}, {
diff --git a/pages/fixedAssets/fixedAssets.js b/pages/fixedAssets/fixedAssets.js
index 544160f..5360787 100644
--- a/pages/fixedAssets/fixedAssets.js
+++ b/pages/fixedAssets/fixedAssets.js
@@ -85,11 +85,18 @@ Page({
}
UTIL.httpRequest(API.URL_GET_PERMANENTLIST,params,{
success: (res) => {
- console.log(res);
let _this = this
if(res.code == 200){
if(this.data.pageNums!=1&&this.data.list.length {
+ rr.originalValue = Number(rr.originalValue ).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) => {
@@ -114,6 +121,8 @@ Page({
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
@@ -151,20 +160,48 @@ Page({
})
},
delete(e){
- UTIL.httpRequest(API.URL_GET_PERMANENTDELETE + e.currentTarget.dataset.id, {method:'GET'}, {
- success: (res) => {
- if(res.code==200){
- let new_list = this.data.list
- console.log(e.currentTarget.dataset.index);
- new_list.splice(e.currentTarget.dataset.index,1)
- this.setData({'list':new_list})
- UTIL.showToastNoneIcon('删除成功！');
- }else{
- UTIL.showToastNoneIcon('删除失败！');
- }
- }
- })
+ this.setData({
+ 'itemId':e.currentTarget.dataset.id,
+ "showPopupDel":true
+ });
},
+ // cancelTemDel:function(e){
+ // this.setData({
+ // "itemId":"",
+ // "showPopupDel":false
+ // });
+ // },
+ // confirmTemDel:function(e){
+ // this.setData({
+ // "showPopupDel":false
+ // });
+ // UTIL.httpRequest(API.URL_GET_CONTRACTDELETE+this.data.itemId , {method:'GET'}, {
+ // success: (res) => {
+ // if(res.code==200){
+ // let new_list = this.data.list
+ // new_list.splice(e.currentTarget.dataset.index,1)
+ // this.setData({'list':new_list})
+ // UTIL.showToastNoneIcon('删除成功！');
+ // }else{
+ // UTIL.showToastNoneIcon('删除失败！');
+ // }
+ // }
+ // })
+ // },
+ // delete(e){
+ // UTIL.httpRequest(API.URL_GET_PERMANENTDELETE + e.currentTarget.dataset.id, {method:'GET'}, {
+ // success: (res) => {
+ // if(res.code==200){
+ // let new_list = this.data.list
+ // new_list.splice(e.currentTarget.dataset.index,1)
+ // this.setData({'list':new_list})
+ // UTIL.showToastNoneIcon('删除成功！');
+ // }else{
+ // UTIL.showToastNoneIcon('删除失败！');
+ // }
+ // }
+ // })
+ // },
upload(e){
this.setData({itemId:e.currentTarget.dataset.id});
this.asyncFun(e.currentTarget.dataset.id)
@@ -201,12 +238,6 @@ Page({
_this.setData({"fileList":newuploadList});
_this.setData({"showUpload":true})
}
- },
- fail:(rr) =>{
- console.log(rr);
- },
- complete:(rr) => {
- console.log(rr);
}
})
})
@@ -225,7 +256,6 @@ Page({
},
confirmTem:function(e){
let event = this.data.fileEvent
- console.log(event);
UTIL.httpRequest(API.URL_GET_GETFILEREMOVE+event.detail.file.id , {method:'GET'}, {
success: (res) => {
if(res.code==200){
diff --git a/pages/fixedAssets/fixedAssets.wxml b/pages/fixedAssets/fixedAssets.wxml
index 92476fa..5091985 100644
--- a/pages/fixedAssets/fixedAssets.wxml
+++ b/pages/fixedAssets/fixedAssets.wxml
@@ -47,11 +47,21 @@
-
-
+
+
+
+
+
+ 删除
+
-
-
+
+
+
+
+
+ 附件
+
@@ -75,5 +85,4 @@
-
\ No newline at end of file
diff --git a/pages/payee/list/list.wxml b/pages/payee/list/list.wxml
index 81bdbc2..71cde12 100644
--- a/pages/payee/list/list.wxml
+++ b/pages/payee/list/list.wxml
@@ -37,9 +37,14 @@
-
-
+
+
+
+
+ 删除
+
+
diff --git a/pages/project/add/add.js b/pages/project/add/add.js
index 6e52096..da5430f 100644
--- a/pages/project/add/add.js
+++ b/pages/project/add/add.js
@@ -20,7 +20,6 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad(options) {
- console.log(options)
if(options.id!=null&&options.id!=""){
let that = this
this.setData({id:options.id})
@@ -60,13 +59,11 @@ Page({
})
},
closeBox(even){
- console.log(even.currentTarget.dataset.name);
this.setData({
[even.currentTarget.dataset.name]:false
})
},
openBox(even){
- console.log(even.currentTarget.dataset.name);
this.setData({
[even.currentTarget.dataset.name]:true
})
@@ -78,7 +75,6 @@ Page({
});
},
onConfirmYn(event) {
- console.log(event);
this.setData({
[event.currentTarget.dataset.name]: false,
[event.currentTarget.dataset.value]: event.detail.value.dictValue,
@@ -144,7 +140,6 @@ Page({
},
onChange(event){
- console.log(event);
this.setData({
[event.currentTarget.dataset.value]: event.detail,
})
diff --git a/pages/project/project.js b/pages/project/project.js
index 3cfc1df..6fd3a11 100644
--- a/pages/project/project.js
+++ b/pages/project/project.js
@@ -95,7 +95,8 @@ this.onShow();
response.rows[i].ynProjcetStatusText = UTIL.getTransform(response.rows[i].ynProjcetStatus,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].projectAmount = parseFloat(response.rows[i].projectAmount).toFixed(2);
+ response.rows[i].projectAmount = Number(response.rows[i].projectAmount).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => {
+ return $1 + ","; }).replace(/\.$/, "")
}
that.setData({
@@ -237,7 +238,6 @@ this.onShow();
},
confirmTem:function(e){
let event = this.data.fileEvent
- console.log(event);
UTIL.httpRequest(API.URL_GET_GETFILEREMOVE+event.detail.file.id , {method:'GET'}, {
success: (res) => {
if(res.code==200){
diff --git a/utils/API.js b/utils/API.js
index c578729..7f93bda 100644
--- a/utils/API.js
+++ b/utils/API.js
@@ -400,7 +400,7 @@ export {
URL_POST_CONTRACTUPDATE,
URL_GET_CONTRACTDELETE,
URL_GET_ATTACHMENTLIST,
- URL_GET_MONEYORDERADD,
+ URL_POST_MONEYORDERADD,
URL_GET_PERMANENTLIST,
URL_GET_PERMANENTDELETE,
URL_GET_PERMANENTDETAIL,
@@ -412,7 +412,6 @@ export {
URL_GET_PROJECTADD,
URL_GET_PROJECTDELETE,
URL_GET_PASSWORDEDIT,
- URL_GET_PAYEEEDIT,
URL_GET_ASSETLIST,
URL_GET_MONEYORDERDETAIL,
URL_POST_MONEYORDERUPDATE,
@@ -421,7 +420,7 @@ export {
URL_GET_DEPOSITDETAIL,
URL_POST_DEPOSITUPDATE,
URL_GET_ASSETADD,
- URL_GET_ASSETREMOVE
+ URL_GET_ASSETREMOVE,
URL_GET_PAYEEEDIT,
URL_GET_PAYEEGET,
URL_GET_PAYEEREMOVE