diff --git a/pages/inCome/inCome.js b/pages/inCome/inCome.js
index 2bd4eab..34e5e8a 100644
--- a/pages/inCome/inCome.js
+++ b/pages/inCome/inCome.js
@@ -32,11 +32,16 @@ Page({
qtPics:[], //其他图片列表数据
//收入时间弹窗显隐
srShow:false,
- minDate: new Date(2018, 0, 1).getTime(),
- maxDate: new Date(2025, 0, 31).getTime(),
+ minDate: new Date(2021, 6, 1).getTime(),
+ maxDate: new Date(2023, 0, 31).getTime(),
crzhShow:false,
- accountListOptions:[] //存入账户类型选项
+ accountListOptions:[], //存入账户类型选项
+ crlxShow:false, //收入类型弹窗显隐
},
+ onCancelcrlx(){
+ this.setData({crlxShow:false,})
+ },
+ oncrlxShow(){ this.setData({crlxShow:true})},
onCancelcrzh(){
this.setData({crzhShow:false})
},
@@ -84,8 +89,10 @@ Page({
this.setData({showHt:true})
},
bindPickerChange (e) {
- let obj = this.data.incomeTypeOptions[e.detail.value];
+ let obj = e.detail.value;
+
this.setData({
+ crlxShow:false,
'formData.incomeType':obj.dictValue,
incomeTypeText:obj.dictLabel
})
@@ -111,13 +118,9 @@ Page({
/**
* 生命周期函数--监听页面显示
*/
- onReady: function () {
+ onReady: function () {
let that = this;
- //初始化收入时间
- this.setData({
- 'formData.accountDate':UTIL.formatDate(new Date())
- })
-
+
//获取收入单位
UTIL.httpRequest(API.URL_GET_GETINFO, {method:'GET'}, {
success: (res) => {
@@ -326,6 +329,11 @@ Page({
}
})
+ },
+ onChange(event){
+ this.setData({
+ [event.currentTarget.dataset.value]: event.detail,
+ })
},
imgPreviewImage(e){
diff --git a/pages/inCome/inCome.json b/pages/inCome/inCome.json
index fad0550..ba95bcb 100644
--- a/pages/inCome/inCome.json
+++ b/pages/inCome/inCome.json
@@ -1,22 +1,14 @@
{
- "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-dialog": "@vant/weapp/dialog/index",
- "van-collapse": "@vant/weapp/collapse/index",
- "van-collapse-item": "@vant/weapp/collapse-item/index"
+ "van-calendar": "@vant/weapp/calendar/index"
+
+
}
}
\ No newline at end of file
diff --git a/pages/inCome/inCome.wxml b/pages/inCome/inCome.wxml
index 9d24561..76e7f37 100644
--- a/pages/inCome/inCome.wxml
+++ b/pages/inCome/inCome.wxml
@@ -9,8 +9,16 @@
收入单位
{{bookName}}
-基础信息
+
+ 基础信息
+
+
+
+
收入时间
@@ -93,66 +101,11 @@
-
-
-
-
-
- 附件可拍照
-
-
- 总数 {{form.transfers[index].fileNum?form.transfers[index].fileNum:0}}张
-
-
-
-
-
- 收\n据
-
-
-
-
-
-
-
-
-
-
-
-
-
- 发\n票
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 其\n他
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 暂存
- 提交
+
-
-
\ No newline at end of file
+
\ No newline at end of file