diff --git a/pages/bankDraft/add/add.js b/pages/bankDraft/add/add.js
index fbefc24..e391d09 100644
--- a/pages/bankDraft/add/add.js
+++ b/pages/bankDraft/add/add.js
@@ -17,16 +17,18 @@ Page({
orderAmount: "",//汇票金额 必填
billPayUnit: "", //付票单位 必填
billReceiveUnit: "", // 收票单位 必填
- startTime: "", //开票日期 必填
- endTime: "", //到期日期 必填
+ startTime: "2020-01-01", //开票日期 必填
+ endTime: "2020-01-01", //到期日期 必填
orderStatus: "", //汇票状态 必填 1在库 2转付中 3转付 4承兑
remark: "",
},
- minDate: new Date(2008, 5, 1).getTime(),
- maxDate: new Date(2040, 0, 31).getTime(),
+ minDate: new Date(2020, 5, 1).getTime(),
+ maxDate: new Date(2030, 0, 31).getTime(),
orderStatusOptions:[],
orderTypeOptions:[],
- showBtn:true
+ showBtn:true,
+ showStartTime:false,
+ showEndTime:false,
},
/**
@@ -76,7 +78,29 @@ Page({
this.onShow()
}
},
-
+ onConfirmStartTime(e){
+ let data = this.getNewDate(new Date(e.detail.value));
+ this.setData({'form.startTime':data});
+ },
+ onConfirmEndTime(e){
+ let data = this.getNewDate(new Date(e.detail.value));
+ this.setData({'form.endTime':data});
+ },
+ 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
+ },
/**
* 生命周期函数--监听页面初次渲染完成
*/
diff --git a/pages/bankDraft/add/add.json b/pages/bankDraft/add/add.json
index 88dadef..7333fbd 100644
--- a/pages/bankDraft/add/add.json
+++ b/pages/bankDraft/add/add.json
@@ -14,6 +14,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-datetime-picker": "@vant/weapp/datetime-picker/index"
}
}
\ No newline at end of file
diff --git a/pages/bankDraft/add/add.wxml b/pages/bankDraft/add/add.wxml
index 11299ff..60fc3db 100644
--- a/pages/bankDraft/add/add.wxml
+++ b/pages/bankDraft/add/add.wxml
@@ -3,7 +3,7 @@
{{form.id?"":"新增"}}银行汇票
-
+
@@ -24,14 +24,22 @@
-
-
-
-
-
-
-
-
+
+ *开票日期
+
+
+ {{form.startTime?form.startTime:'开票日期'}}
+
+
+
+
+ *到期日期
+
+
+ {{form.endTime?form.endTime:'到期日期'}}
+
+
+
view{
+ display: flex;
+ justify-content: space-between;
+ line-height: 100rpx;
}
\ No newline at end of file
diff --git a/pages/contract/add/add.wxml b/pages/contract/add/add.wxml
index 4cac02a..3ce6668 100644
--- a/pages/contract/add/add.wxml
+++ b/pages/contract/add/add.wxml
@@ -292,7 +292,7 @@
审核时间
- {{form.reviewTime?form.reviewTime.substring(0,9):'审核时间'}}
+ {{form.reviewTime?form.reviewTime:'审核时间'}}
diff --git a/pages/contract/contract.js b/pages/contract/contract.js
index 5c4870b..f5228d4 100644
--- a/pages/contract/contract.js
+++ b/pages/contract/contract.js
@@ -147,7 +147,7 @@ Page({
success: (res) => {
if(res.code==200){
let new_list = this.data.list
- new_list.splice(this.data.index,1)
+ new_list.splice(this.data.itemIndex,1)
this.setData({'list':new_list})
UTIL.showToastNoneIcon('删除成功！');
}else{
diff --git a/pages/project/add/add.js b/pages/project/add/add.js
index da5430f..7c4d3bc 100644
--- a/pages/project/add/add.js
+++ b/pages/project/add/add.js
@@ -52,7 +52,29 @@ Page({
}
},
-
+ onConfirmStartTime(e){
+ let data = this.getNewDate(new Date(e.detail.value));
+ this.setData({'form.startTime':data});
+ },
+ onConfirmEndTime(e){
+ let data = this.getNewDate(new Date(e.detail.value));
+ this.setData({'form.endTime':data});
+ },
+ 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
+ },
back:function(){
wx.navigateBack({
delta: 1
diff --git a/pages/project/add/add.wxml b/pages/project/add/add.wxml
index 3af8b59..0f8b308 100644
--- a/pages/project/add/add.wxml
+++ b/pages/project/add/add.wxml
@@ -3,17 +3,26 @@
{{form.id?"":"新增"}}工程项目
-
+
-
-
-
-
-
-
-
+
+ *开工日期
+
+
+ {{form.startTime?form.startTime:'开工日期'}}
+
+
+
+
+ *竣工日期
+
+
+ {{form.endTime?form.endTime:'竣工日期'}}
+
+
+
diff --git a/pages/project/add/add.wxss b/pages/project/add/add.wxss
index 5d89b83..c080460 100644
--- a/pages/project/add/add.wxss
+++ b/pages/project/add/add.wxss
@@ -59,4 +59,9 @@
}
.van-field__label {
width: max-content;
+}
+.table-boxs>view{
+ display: flex;
+ justify-content: space-between;
+ line-height: 100rpx;
}
\ No newline at end of file