diff --git a/pages/bank/add/add.js b/pages/bank/add/add.js
index d107405..15f82e7 100644
--- a/pages/bank/add/add.js
+++ b/pages/bank/add/add.js
@@ -115,7 +115,7 @@ Page({
[even.currentTarget.dataset.value]:even.detail.value.bankDeposit,
[even.currentTarget.dataset.value+"Text"]:even.detail.value.bankDeposit,
[even.currentTarget.dataset.name]:false,
- ["form.payeePaymentLines"]:even.detail.value.payeePaymentLines
+ ["form.bankDeposit"]:even.detail.value.bankDeposit
})
},
onChange(even){
@@ -160,7 +160,7 @@ Page({
}
})
}else{
- UTIL.httpRequest(API.URL_GET_DEPOSITUPDATE, that.data.form, {
+ UTIL.httpRequest(API.URL_POST_DEPOSITUPDATE, that.data.form, {
success: (res) => {
wx.showToast({
title: "修改成功!",
@@ -175,7 +175,6 @@ Page({
}
})
}
-
}
},
/**
diff --git a/pages/bank/add/add.wxml b/pages/bank/add/add.wxml
index b6910da..414f5c7 100644
--- a/pages/bank/add/add.wxml
+++ b/pages/bank/add/add.wxml
@@ -1,7 +1,7 @@
- {{form.id?"查看":"新增"}}开户行
+ {{form.id?"":"新增"}}开户行
@@ -18,21 +18,10 @@
data-value="form.bankType"
/>
-
-
-
-
-
-
+
+
+
- 确认
+ 保存
\ No newline at end of file
diff --git a/pages/bank/bank.js b/pages/bank/bank.js
index 03e9736..1a94f1a 100644
--- a/pages/bank/bank.js
+++ b/pages/bank/bank.js
@@ -12,7 +12,9 @@ Page({
depositList:[],
bankTypeOptions:[],
value:"",
- scrollHeight:''
+ scrollHeight:'',
+ itemId:'',
+ itemIndex:''
},
goAdd(){
wx.navigateTo({
@@ -80,19 +82,32 @@ Page({
this.onShow()
},
delete(e){
- var that = this;
- UTIL.httpRequest(API.URL_GET_DEPOSITDELETE + e.currentTarget.dataset.id, {method:'GET'},{
+ 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_DEPOSITDELETE+this.data.itemId , {method:'GET'}, {
success: (res) => {
- if (res.code == API.SUCCESS_CODE) {
- that.data.depositList.splice(e.currentTarget.dataset.index, 1);
- wx.showToast({
- title: '删除成功!',
- icon: 'success',
- duration: 2000
- })
- that.setData({
- depositList : that.data.depositList,
- })
+ if(res.code==200){
+ let new_list = this.data.depositList
+ new_list.splice(this.data.itemIndex,1)
+ this.setData({'depositList':new_list})
+ UTIL.showToastNoneIcon('删除成功!');
+ }else{
+ UTIL.showToastNoneIcon('删除失败!');
}
}
})
diff --git a/pages/bank/bank.wxml b/pages/bank/bank.wxml
index 535c161..35e1862 100644
--- a/pages/bank/bank.wxml
+++ b/pages/bank/bank.wxml
@@ -9,7 +9,7 @@
value="{{ value }}"
shape="round"
background="transparent"
- placeholder="请输入搜索关键词"
+ placeholder="请输入开户行名称"
clearable
bind:change="goSearch"
/>
@@ -43,6 +43,8 @@
+
+
var indexOf = function(name,value){
return name.indexOf(value);
diff --git a/pages/bankDraft/add/add.js b/pages/bankDraft/add/add.js
index 3086b38..a44e6e3 100644
--- a/pages/bankDraft/add/add.js
+++ b/pages/bankDraft/add/add.js
@@ -160,7 +160,7 @@ Page({
var that = this;
that.data.form.method = 'POST';
if(that.data.form.id==""||that.data.form.id==null){
- UTIL.httpRequest(API.URL_GET_MONEYORDERADD, that.data.form , {
+ UTIL.httpRequest(API.URL_POST_MONEYORDERADD, that.data.form , {
success: (res) => {
wx.showToast({
title: '新增成功',
diff --git a/pages/bankDraft/add/add.wxml b/pages/bankDraft/add/add.wxml
index 42431df..382f5ed 100644
--- a/pages/bankDraft/add/add.wxml
+++ b/pages/bankDraft/add/add.wxml
@@ -1,7 +1,7 @@
- {{form.id?"查看":"新增"}}银行汇票
+ {{form.id?"":"新增"}}银行汇票
@@ -20,7 +20,7 @@
-
+
@@ -43,9 +43,9 @@
data-value="form.orderStatus"
/>
-
+
- 确认
+ 保存
\ No newline at end of file
diff --git a/pages/bankDraft/bankDraft.js b/pages/bankDraft/bankDraft.js
index 6042a3d..641039b 100644
--- a/pages/bankDraft/bankDraft.js
+++ b/pages/bankDraft/bankDraft.js
@@ -32,9 +32,11 @@ Page({
value:'',
pageNums:1,
showUpload:false,
+ showPopupDel:false,
uploadOptions:[],
fileList:[],
itemId:"",
+ itemIndex:"",
list:[],
fileEvent:{},
},
@@ -105,6 +107,8 @@ Page({
orderTypeOptions:res.data
});
let param = {
+ 'orderType':that.data.value1,
+ 'orderStatus':that.data.value2,
'billPayUnit' : this.data.value,
pageNum:this.data.pageNums,
pageSize:10,
@@ -129,20 +133,32 @@ Page({
})
},
delete(e){
- var that = this;
- UTIL.httpRequest(API.URL_GET_MONEYORDERDELETE + e.currentTarget.dataset.id, {method:'GET'},{
+ 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_MONEYORDERDELETE + this.data.itemId , {method:'GET'}, {
success: (res) => {
- if (res.code == API.SUCCESS_CODE) {
- let list = that.data.moneyorderList
- list.splice(e.currentTarget.dataset.index, 1);
- wx.showToast({
- title: '删除成功!',
- icon: 'success',
- duration: 2000
- })
- that.setData({
- moneyorderList : list,
- })
+ if(res.code==200){
+ let new_list = this.data.moneyorderList
+ new_list.splice(this.data.index,1)
+ this.setData({'moneyorderList':new_list})
+ UTIL.showToastNoneIcon('删除成功!');
+ }else{
+ UTIL.showToastNoneIcon('删除失败!');
}
}
})
@@ -286,7 +302,7 @@ Page({
return new Promise((resolve, reject) => {
wx.uploadFile({
url: API.URL_GET_UPLOAD,
- filePath: uploadFile.file.file[0].url,
+ filePath: uploadFile.file.file.url,
name: 'file',
header: {
"Content-Type": "multipart/form-data",//记得设置
diff --git a/pages/bankDraft/bankDraft.wxml b/pages/bankDraft/bankDraft.wxml
index ce573d3..d726c23 100644
--- a/pages/bankDraft/bankDraft.wxml
+++ b/pages/bankDraft/bankDraft.wxml
@@ -9,7 +9,7 @@
value="{{ value }}"
shape="round"
background="transparent"
- placeholder="请输入搜索关键词"
+ placeholder="请输入付票单位名称"
clearable
bind:change="goSearch"
/>
@@ -83,7 +83,7 @@
-
+
@@ -93,4 +93,6 @@
+
+
\ No newline at end of file
diff --git a/pages/contract/add/add.js b/pages/contract/add/add.js
index 67a9e6a..b530860 100644
--- a/pages/contract/add/add.js
+++ b/pages/contract/add/add.js
@@ -141,7 +141,12 @@ Page({
getNewDate(date){
//date是传过来的时间戳,注意需为13位,10位需*1000
//也可以不传,获取的就是当前时间
- var time = new Date(date);
+ 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); //日
@@ -196,6 +201,11 @@ Page({
success: (res) => {
if(res.code == 200){
UTIL.showToastNoneIcon('修改成功');
+ setTimeout(function(){
+ wx.navigateBack({
+ delta:1
+ })
+ },2000)
}else{
UTIL.showToastNoneIcon('修改失败');
}
@@ -207,9 +217,14 @@ Page({
UTIL.httpRequest(API.URL_POST_CONTRACTADD,data,{
success: (res) => {
if(res.code == 200){
- UTIL.showToastNoneIcon(res.msg);
+ UTIL.showToastNoneIcon('新增成功');
+ setTimeout(function(){
+ wx.navigateBack({
+ delta:1
+ })
+ },2000)
}else{
- UTIL.showToastNoneIcon(res.msg);
+ UTIL.showToastNoneIcon('新增失败');
}
}
})
@@ -341,6 +356,13 @@ Page({
})
}else{
let that = this;
+ this.setData({
+ 'form.reviewTime':this.getNewDate(),
+ 'form.buildingTime':this.getNewDate(),
+ 'form.startTime':this.getNewDate(),
+ 'form.endTime':this.getNewDate(),
+ 'form.biddingDate':this.getNewDate(),
+ })
//获取收入合同状态
UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'type_of_contract', {method:'GET'}, {
success: (res) => {
@@ -391,7 +413,7 @@ Page({
if(res.data.length>0){
that.setData({
contractionStatusOptions:res.data,
- 'form.contractionStatus':res.data[1].dictValue
+ 'form.contractionStatus':res.data[0].dictValue
})
}
}
diff --git a/pages/contract/add/add.json b/pages/contract/add/add.json
index a8daf78..b8811c7 100644
--- a/pages/contract/add/add.json
+++ b/pages/contract/add/add.json
@@ -4,6 +4,7 @@
"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-calendar": "@vant/weapp/calendar/index",
+ "van-icon":"@vant/weapp/icon/index"
}
}
\ No newline at end of file
diff --git a/pages/contract/add/add.wxml b/pages/contract/add/add.wxml
index 91ec152..94aafe4 100644
--- a/pages/contract/add/add.wxml
+++ b/pages/contract/add/add.wxml
@@ -14,7 +14,7 @@
*合同编码
-
+
@@ -22,7 +22,7 @@
*合同名称
-
+
@@ -30,6 +30,7 @@
{{assetTypeOptions[assetTypeindex].dictLabel?assetTypeOptions[assetTypeindex].dictLabel:"选择合同类型"}}
+
@@ -38,6 +39,7 @@
{{contractionSourceOptions[contractionSourceindex].dictLabel?contractionSourceOptions[contractionSourceindex].dictLabel:"选择合同来源"}}
+
@@ -46,7 +48,7 @@
*甲方名称
-
+
@@ -54,7 +56,7 @@
甲方代表
-
+
@@ -62,7 +64,7 @@
甲方电话
-
+
@@ -70,7 +72,7 @@
*乙方名称
-
+
@@ -78,7 +80,7 @@
乙方代表
-
+
@@ -86,7 +88,7 @@
乙方电话
-
+
@@ -94,6 +96,7 @@
{{collectionPayOptions[collectionPayindex].dictLabel?collectionPayOptions[collectionPayindex].dictLabel:"选择首付款类型"}}
+
@@ -102,6 +105,7 @@
{{settleTypeOptions[settleTypeindex].dictLabel?settleTypeOptions[settleTypeindex].dictLabel:"选择结款方式"}}
+
@@ -110,7 +114,7 @@
*合同金额
-
+
@@ -118,7 +122,7 @@
数量/面积
-
+
@@ -134,7 +138,7 @@
*单价(元)
-
+
@@ -142,7 +146,7 @@
*已结款(元)
-
+
@@ -150,7 +154,7 @@
下次结款(元)
-
+
@@ -182,6 +186,7 @@
{{contractionStatusOptions[contractionStatusindex].dictLabel?contractionStatusOptions[contractionStatusindex].dictLabel:"选择合同状态"}}
+
@@ -206,6 +211,7 @@
{{biddingWayOptions[biddingWayindex].dictLabel?biddingWayOptions[biddingWayindex].dictLabel:"选择招标方式"}}
+
@@ -214,7 +220,7 @@
项目编号
-
+
@@ -222,7 +228,7 @@
项目名称
-
+
@@ -230,7 +236,7 @@
经办人
-
+
@@ -238,14 +244,14 @@
预算金额(元)
-
+
招标日期
- {{form.biddingDate}}
+ {{form.biddingDate?form.biddingDate:'招标日期'}}
@@ -254,6 +260,7 @@
{{biddingTypeOptions[biddingTypeindex].dictLabel?biddingTypeOptions[biddingTypeindex].dictLabel:"选择招标方式"}}
+
@@ -262,7 +269,7 @@
中标单位
-
+
@@ -270,7 +277,7 @@
中标金额(元)
-
+
@@ -278,19 +285,19 @@
审核人
-
+
审核时间
- {{form.reviewTime}}
+ {{form.reviewTime?form.reviewTime:'审核时间'}}
- 确认
+ 保存
\ No newline at end of file
diff --git a/pages/contract/contract.js b/pages/contract/contract.js
index 415a94f..5c4870b 100644
--- a/pages/contract/contract.js
+++ b/pages/contract/contract.js
@@ -128,12 +128,14 @@ Page({
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
});
},
@@ -145,7 +147,7 @@ Page({
success: (res) => {
if(res.code==200){
let new_list = this.data.list
- new_list.splice(e.currentTarget.dataset.index,1)
+ new_list.splice(this.data.index,1)
this.setData({'list':new_list})
UTIL.showToastNoneIcon('删除成功!');
}else{
@@ -273,7 +275,7 @@ Page({
return new Promise((resolve, reject) => {
wx.uploadFile({
url: API.URL_GET_UPLOAD,
- filePath: uploadFile.file.file[0].url,
+ filePath: uploadFile.file.file.url,
name: 'file',
header: {
"Content-Type": "multipart/form-data",//记得设置
@@ -347,8 +349,31 @@ Page({
* 生命周期函数--监听页面显示
*/
onShow() {
+ console.log(this.data.contractionId);
if(this.data.contractionId!=""&&this.data.contractionId!=null){
this.relevanceBack()
+ }else{
+ let _this = this
+ let params = {
+ pageNum:1,
+ pageSize:10,
+ name:this.data.name
+ }
+ UTIL.httpRequest(API.URL_GET_CONTRACTLIST,params,{
+ success: (res) => {
+ if(res.code == 200){
+ 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);
+ }
+ }
+ })
}
},
diff --git a/pages/contract/contract.json b/pages/contract/contract.json
index 39a4ff2..6d17c25 100644
--- a/pages/contract/contract.json
+++ b/pages/contract/contract.json
@@ -9,6 +9,7 @@
"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-upload": "@vant/weapp/uploader/index",
+ "van-icon":"@vant/weapp/icon/index"
}
}
\ No newline at end of file
diff --git a/pages/contract/contract.wxml b/pages/contract/contract.wxml
index 54bc33c..4821006 100644
--- a/pages/contract/contract.wxml
+++ b/pages/contract/contract.wxml
@@ -9,7 +9,7 @@
value="{{ name }}"
shape="round"
background="transparent"
- placeholder="请输入搜索关键词"
+ placeholder="请输入合同名称"
clearable
bind:change="goSearch"
/>
@@ -24,6 +24,7 @@
正常
撤销
+ 终止
@@ -53,7 +54,7 @@
-
+
@@ -90,7 +91,7 @@
-
+
diff --git a/pages/fixedAssets/add/add.js b/pages/fixedAssets/add/add.js
index 62aab31..d5ad435 100644
--- a/pages/fixedAssets/add/add.js
+++ b/pages/fixedAssets/add/add.js
@@ -12,13 +12,14 @@ Page({
id:null,
form:{
reviewTime:'2022-01-01',
- buildingTime:'2022-01-01',
+ buildTime:'2022-01-01',
startTime:'2022-01-01',
endTime:'2022-01-01',
biddingDate:'2022-01-01',
- fixedValue:'153:固定资产清理',
- fixedSubject:'152:累计折旧',
- depreciationSubject:'541005:管理费用-折旧及修理费',
+ fixedValue:'',
+ fixedSubject:'153:固定资产清理',
+ depreciationSubject:'152:累计折旧',
+ depreciationFeeSubject:'541005:管理费用-折旧及修理费',
originalValue:0.00,
quantity:0.00,
netValue:0.00,
@@ -93,8 +94,8 @@ Page({
onConfirmAddType (e) {
let obj = e.detail.value;
this.setData({
- 'form.addWay':this.data.addWayOptions[obj].dictValue,
- 'addWayindex':obj
+ 'form.addType':this.data.addTypeOptions[obj].dictValue,
+ 'addTypeindex':obj
})
},
onConfirmUseType (e) {
@@ -149,7 +150,12 @@ Page({
getNewDate(date){
//date是传过来的时间戳,注意需为13位,10位需*1000
//也可以不传,获取的就是当前时间
- var time = new Date(date);
+ 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); //日
@@ -201,6 +207,11 @@ Page({
success: (res) => {
if(res.code == 200){
UTIL.showToastNoneIcon('修改成功');
+ setTimeout(function(){
+ wx.navigateBack({
+ delta:1
+ })
+ },2000)
}else{
UTIL.showToastNoneIcon('修改失败');
}
@@ -213,6 +224,11 @@ Page({
success: (res) => {
if(res.code == 200){
UTIL.showToastNoneIcon(res.msg);
+ setTimeout(function(){
+ wx.navigateBack({
+ delta:1
+ })
+ },2000)
}else{
UTIL.showToastNoneIcon(res.msg);
}
@@ -392,6 +408,13 @@ Page({
})
}else{
let that = this;
+ this.setData({
+ 'form.reviewTime':this.getNewDate(),
+ 'form.buildTime':this.getNewDate(),
+ 'form.startTime':this.getNewDate(),
+ 'form.endTime':this.getNewDate(),
+ 'form.biddingDate':this.getNewDate(),
+ })
//获取资产类别
UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'asset_type', {method:'GET'}, {
success: (res) => {
diff --git a/pages/fixedAssets/add/add.json b/pages/fixedAssets/add/add.json
index a8daf78..b8811c7 100644
--- a/pages/fixedAssets/add/add.json
+++ b/pages/fixedAssets/add/add.json
@@ -4,6 +4,7 @@
"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-calendar": "@vant/weapp/calendar/index",
+ "van-icon":"@vant/weapp/icon/index"
}
}
\ No newline at end of file
diff --git a/pages/fixedAssets/add/add.wxml b/pages/fixedAssets/add/add.wxml
index b9269b5..5a75db7 100644
--- a/pages/fixedAssets/add/add.wxml
+++ b/pages/fixedAssets/add/add.wxml
@@ -30,6 +30,7 @@
{{assetTypeOptions[assetTypeindex].dictLabel?assetTypeOptions[assetTypeindex].dictLabel:"选择资产类别"}}
+
@@ -38,14 +39,16 @@
{{operationTypeOptions[operationTypeindex].dictLabel?operationTypeOptions[operationTypeindex].dictLabel:"选择经营属性"}}
+
*增加方式
-
+
{{addTypeOptions[addTypeindex].dictLabel?addTypeOptions[addTypeindex].dictLabel:"选择增加方式"}}
+
@@ -86,6 +89,7 @@
{{useTypeOptions[useTypeindex].dictLabel?useTypeOptions[useTypeindex].dictLabel:"选择使用情况"}}
+
@@ -94,6 +98,7 @@
{{assetStatusOptions[assetStatusindex].dictLabel?assetStatusOptions[assetStatusindex].dictLabel:"选择资产状态"}}
+
@@ -102,6 +107,7 @@
{{sysYesNoOptions[isMinindex].dictLabel?sysYesNoOptions[isMinindex].dictLabel:"选择单元资产"}}
+
@@ -110,6 +116,7 @@
{{sysYesNoOptions[isFormAssetindex].dictLabel?sysYesNoOptions[isFormAssetindex].dictLabel:"选择扶贫资产"}}
+
@@ -126,7 +133,7 @@
数量/面积
-
+
@@ -134,6 +141,7 @@
{{unitOptions[unitindex].dictLabel?unitOptions[unitindex].dictLabel:"选择计量单位"}}
+
@@ -142,7 +150,7 @@
原值(元)
-
+
@@ -150,7 +158,7 @@
净值(元)
-
+
@@ -158,7 +166,7 @@
残值率 N%
-
+
@@ -166,7 +174,7 @@
净残值(元)
-
+
@@ -174,7 +182,7 @@
资产清理(元)
-
+
@@ -222,6 +230,7 @@
{{depreciationTypeOptions[depreciationTypeindex].dictLabel?depreciationTypeOptions[depreciationTypeindex].dictLabel:"选择折旧方式"}}
+
@@ -230,7 +239,7 @@
预计使用年数
-
+
@@ -246,7 +255,7 @@
已折旧年数
-
+
@@ -261,5 +270,5 @@
- 确认
+ 保存
\ No newline at end of file
diff --git a/pages/fixedAssets/fixedAssets.js b/pages/fixedAssets/fixedAssets.js
index 5360787..05b92ec 100644
--- a/pages/fixedAssets/fixedAssets.js
+++ b/pages/fixedAssets/fixedAssets.js
@@ -159,49 +159,38 @@ Page({
url: '/pages/fixedAssets/add/add?id='+e.currentTarget.dataset.id,
})
},
+
delete(e){
this.setData({
'itemId':e.currentTarget.dataset.id,
+ 'itemIndex':e.currentTarget.dataset.index,
"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('删除失败!');
- // }
- // }
- // })
- // },
+ cancelTemDel:function(e){
+ this.setData({
+ "itemId":"",
+ "itemIndex":"",
+ "showPopupDel":false
+ });
+ },
+ confirmTemDel:function(e){
+ this.setData({
+ "showPopupDel":false
+ });
+ UTIL.httpRequest(API.URL_GET_PERMANENTDELETE + 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('删除失败!');
+ }
+ }
+ })
+ },
upload(e){
this.setData({itemId:e.currentTarget.dataset.id});
this.asyncFun(e.currentTarget.dataset.id)
@@ -279,7 +268,7 @@ Page({
return new Promise((resolve, reject) => {
wx.uploadFile({
url: API.URL_GET_UPLOAD,
- filePath: uploadFile.file.file[0].url,
+ filePath: uploadFile.file.file.url,
name: 'file',
header: {
"Content-Type": "multipart/form-data",//记得设置
diff --git a/pages/fixedAssets/fixedAssets.wxml b/pages/fixedAssets/fixedAssets.wxml
index 5091985..d3b1c95 100644
--- a/pages/fixedAssets/fixedAssets.wxml
+++ b/pages/fixedAssets/fixedAssets.wxml
@@ -9,7 +9,7 @@
value="{{ name }}"
shape="round"
background="transparent"
- placeholder="请输入搜索关键词"
+ placeholder="请输入固定资产名称"
clearable
bind:change="goSearch"
/>
@@ -76,7 +76,7 @@
-
+
@@ -85,4 +85,6 @@
+
+
\ No newline at end of file
diff --git a/pages/project/add/add.wxml b/pages/project/add/add.wxml
index 39c43df..3af8b59 100644
--- a/pages/project/add/add.wxml
+++ b/pages/project/add/add.wxml
@@ -1,7 +1,7 @@
- 新增工程项目
+ {{form.id?"":"新增"}}工程项目
@@ -14,7 +14,7 @@
-
+
@@ -30,8 +30,8 @@
-
+
- 确认
+ 保存
\ No newline at end of file
diff --git a/pages/project/project.js b/pages/project/project.js
index 6fd3a11..d86fd0e 100644
--- a/pages/project/project.js
+++ b/pages/project/project.js
@@ -21,6 +21,7 @@ Page({
uploadOptions:[],
fileList:[],
itemId:"",
+ itemIndex:"",
list:[],
fileEvent:{},
projectList:[]
@@ -52,7 +53,7 @@ Page({
* 生命周期函数--监听页面初次渲染完成
*/
onReady() {
-this.onShow();
+ this.onShow();
},
goSearch(e){
this.setData({name:e.detail})
@@ -109,20 +110,32 @@ this.onShow();
})
},
delete(e){
- var that = this;
- UTIL.httpRequest(API.URL_GET_PROJECTDELETE + e.currentTarget.dataset.id, {method:'GET'},{
+ 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_PROJECTDELETE + this.data.itemId , {method:'GET'}, {
success: (res) => {
- if (res.code == API.SUCCESS_CODE) {
- let list = that.data.projectList
- list.splice(e.currentTarget.dataset.index, 1);
- wx.showToast({
- title: '删除成功!',
- icon: 'success',
- duration: 2000
- })
- that.setData({
- projectList : list,
- })
+ if(res.code==200){
+ let new_list = this.data.projectList
+ new_list.splice(this.data.index,1)
+ this.setData({'projectList':new_list})
+ UTIL.showToastNoneIcon('删除成功!');
+ }else{
+ UTIL.showToastNoneIcon('删除失败!');
}
}
})
@@ -261,7 +274,7 @@ this.onShow();
return new Promise((resolve, reject) => {
wx.uploadFile({
url: API.URL_GET_UPLOAD,
- filePath: uploadFile.file.file[0].url,
+ filePath: uploadFile.file.file.url,
name: 'file',
header: {
"Content-Type": "multipart/form-data",//记得设置
diff --git a/pages/project/project.wxml b/pages/project/project.wxml
index 7bcb8ec..f0b875b 100644
--- a/pages/project/project.wxml
+++ b/pages/project/project.wxml
@@ -9,7 +9,7 @@
value="{{ name }}"
shape="round"
background="transparent"
- placeholder="请输入搜索关键词"
+ placeholder="请输入工程项目名称"
clearable
bind:change="goSearch"
/>
@@ -44,11 +44,21 @@
-
-
+
+
+
+
+
+ 删除
+
-
-
+
+
+
+
+
+ 附件
+
@@ -62,7 +72,7 @@
-
+
@@ -72,4 +82,6 @@
+
+
\ No newline at end of file