From 39f710eb0c44eb26f4f93f07ed90f1fe9ad1d18c Mon Sep 17 00:00:00 2001 From: yujk <990961482@qq.com> Date: Wed, 1 Jun 2022 11:41:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/bank/add/add.js | 73 ++++++++++++++---- pages/bank/add/add.wxml | 24 +++--- pages/bank/add/add.wxss | 5 ++ pages/bankDraft/add/add.js | 111 +++++++++++++++++++--------- pages/bankDraft/add/add.wxml | 35 +++++---- pages/contract/add/add.js | 37 ++++++++-- pages/contract/add/add.wxml | 6 +- pages/contractAssets/fixedAssets.js | 11 ++- pages/fixedAssets/add/add.js | 37 +++++++++- pages/fixedAssets/add/add.wxml | 10 +-- pages/project/add/add.js | 74 ++++++++++++++----- pages/project/add/add.wxml | 22 +++--- 12 files changed, 318 insertions(+), 127 deletions(-) diff --git a/pages/bank/add/add.js b/pages/bank/add/add.js index 15f82e7..07475f3 100644 --- a/pages/bank/add/add.js +++ b/pages/bank/add/add.js @@ -16,45 +16,61 @@ Page({ bankType: "", //所属银行 必填 bankDeposit: "", //开户行 必填 payeePaymentLines: "", //联行号 //必填 + }, + status:0, id:"", - bankTypeOptions:[] + bankTypeOptions:[], + bankTypeindex:'' }, back:function(){ wx.navigateBack({ delta: 1 }) }, + onConfirmbankType (e) { + let obj = e.detail.value; + this.setData({ + 'form.bankType':this.data.bankTypeOptions[obj].dictValue, + 'bankTypeindex':obj + }) + }, /** * 生命周期函数--监听页面加载 */ onLoad(options) { if(options.id!=null&&options.id!=""){ + let that = this this.setData({id:options.id}) UTIL.httpRequest(API.URL_GET_DEPOSITDETAIL + this.data.id, {method:'GET'}, { success: (res) => { + this.setData({'form':res.data}) UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'bank_type', {method:'GET'}, { success: (r) => { - this.setData({ - bankTypeOptions:r.data - }); - console.log(this.data.bankTypeOptions) - this.data.bankTypeOptions.map(rr => { - if(rr.dictValue == res.data.bankType){ - res.data.bankTypeText = rr.dictLabel - this.setData({'form':res.data}); - } - }) + if(r.data.length>0){ + that.setData({ + bankTypeOptions:r.data, + }) + r.data.map((rr,ind) => { + if(rr.dictValue == res.data.bankType){ + that.setData({'bankTypeindex':ind}) + } + }) + } } }) } }) }else{ + let that = this UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'bank_type', {method:'GET'}, { success: (r) => { - this.setData({ - bankTypeOptions:r.data - }); + if(r.data.length>0){ + that.setData({ + bankTypeOptions:r.data, + 'form.bankType':r.data[0].dictValue + }) + } } }) } @@ -125,7 +141,7 @@ Page({ }) }, goSubmit(){ - console.log(this.data.form) + if(this.data.form.sheng===''||this.data.form.sheng==null){ //省 UTIL.showToastNoneIcon('请填写省！'); return false; @@ -141,7 +157,8 @@ Page({ }else if(this.data.form.payeePaymentLines === ''||this.data.form.payeePaymentLines==null){//联行号 UTIL.showToastNoneIcon('请输入联行号！'); return false; - }else{ + }else if(this.data.status=='0'){ + this.setData({'status':1}) var that = this; that.data.form.method = 'POST'; if(that.data.form.id==""||that.data.form.id==null){ @@ -157,6 +174,18 @@ Page({ delta:1 }) },2000) + }, + fail: function (response) { + if (typeof fail === FUNCTION_TEXT) { + fail(handleFail(response)); + } else { + showToastNoneIcon(API.MSG_FAIL_HTTP); + } + this.setData({'status':0}) + }, + complete: function (response) { + this.setData({'status':0}) + wx.hideNavigationBarLoading(); } }) }else{ @@ -172,6 +201,18 @@ Page({ delta:1 }) },2000) + }, + fail: function (response) { + if (typeof fail === FUNCTION_TEXT) { + fail(handleFail(response)); + } else { + showToastNoneIcon(API.MSG_FAIL_HTTP); + } + this.setData({'status':0}) + }, + complete: function (response) { + this.setData({'status':0}) + wx.hideNavigationBarLoading(); } }) } diff --git a/pages/bank/add/add.wxml b/pages/bank/add/add.wxml index 414f5c7..be5f7a9 100644 --- a/pages/bank/add/add.wxml +++ b/pages/bank/add/add.wxml @@ -3,22 +3,20 @@ {{form.id?"":"新增"}}开户行 - + - - - - + + *所属银行 + + + {{bankTypeOptions[bankTypeindex].dictLabel?bankTypeOptions[bankTypeindex].dictLabel:"选择所属银行"}} + + + + + diff --git a/pages/bank/add/add.wxss b/pages/bank/add/add.wxss index af85688..2a70dc8 100644 --- a/pages/bank/add/add.wxss +++ b/pages/bank/add/add.wxss @@ -56,4 +56,9 @@ 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; } \ No newline at end of file diff --git a/pages/bankDraft/add/add.js b/pages/bankDraft/add/add.js index e391d09..c3a5930 100644 --- a/pages/bankDraft/add/add.js +++ b/pages/bankDraft/add/add.js @@ -29,13 +29,15 @@ Page({ showBtn:true, showStartTime:false, showEndTime:false, + orderTypeindex:0, + orderStatusindex:0, + status:0, }, /** * 生命周期函数--监听页面加载 */ onLoad(options) { - console.log(options) if(options.id!=null&&options.id!=""){ let that = this this.setData({id:options.id}) @@ -44,32 +46,35 @@ Page({ if(res.data.orderStatus!='1'){ this.setData({'showBtn':false}); } + this.setData({'form':res.data}) //汇票类型 UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'order_type', {method:'GET'}, { - success: (rr) => { - this.setData({ - orderTypeOptions:rr.data - }); - this.data.orderTypeOptions.map(r => { - if(r.dictValue == res.data.orderType){ - res.data.orderTypeText = r.dictLabel - that.setData({'form':res.data}); - } - }) + success: (r) => { + if(r.data.length>0){ + that.setData({ + orderTypeOptions:r.data, + }) + r.data.map((rr,ind) => { + if(rr.dictValue == res.data.orderType){ + that.setData({'orderTypeindex':ind}) + } + }) + } } }) //汇票状态 UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'order_status', {method:'GET'}, { - success: (rr) => { - this.setData({ - orderStatusOptions:rr.data - }); - this.data.orderStatusOptions.map(r => { - if(r.dictValue == res.data.orderStatus){ - res.data.orderStatusText = r.dictLabel - that.setData({'form':res.data}); - } - }) + success: (r) => { + if(r.data.length>0){ + that.setData({ + orderStatusOptions:r.data, + }) + r.data.map((rr,ind) => { + if(rr.dictValue == res.data.orderStatus){ + that.setData({'orderStatusindex':ind}) + } + }) + } } }) } @@ -112,20 +117,27 @@ Page({ * 生命周期函数--监听页面显示 */ onShow() { + let that = this //汇票类型 UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'order_type', {method:'GET'}, { success: (res) => { - this.setData({ - orderTypeOptions:res.data - }); + if(res.data.length>0){ + that.setData({ + orderTypeOptions:res.data, + 'form.orderType':res.data[0].dictValue + }) + } } }) //汇票状态 UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'order_status', {method:'GET'}, { success: (res) => { - this.setData({ - orderStatusOptions:res.data - }); + if(res.data.length>0){ + that.setData({ + orderStatusOptions:res.data, + 'form.orderStatus':res.data[0].dictValue + }) + } } }) }, @@ -142,17 +154,23 @@ Page({ }) }, closeBox(even){ - console.log(even.currentTarget.dataset.name); this.setData({ [even.currentTarget.dataset.name]:false }) }, - onConfirmOrderType(event) { + onConfirmorderType (e) { + let obj = e.detail.value; this.setData({ - [event.currentTarget.dataset.name]: false, - [event.currentTarget.dataset.value]: event.detail.value.dictValue, - [event.currentTarget.dataset.value+'Text']: event.detail.value.dictLabel, - }); + 'form.orderType':this.data.orderTypeOptions[obj].dictValue, + 'orderTypeindex':obj + }) + }, + onConfirmorderStatus (e) { + let obj = e.detail.value; + this.setData({ + 'form.orderStatus':this.data.orderStatusOptions[obj].dictValue, + 'orderStatusindex':obj + }) }, goSubmit(){ if(this.data.form.orderNum===''||this.data.form.orderNum==null){ //汇票号码 @@ -182,7 +200,8 @@ Page({ }else if(this.data.form.orderStatus === ''||this.data.form.orderStatus==null){//联行号 UTIL.showToastNoneIcon('汇票状态不能为空！'); return false; - }else{ + }else if(this.data.status=='0'){ + this.setData({'status':1}) var that = this; that.data.form.method = 'POST'; if(that.data.form.id==""||that.data.form.id==null){ @@ -198,6 +217,18 @@ Page({ },2000) } }) + }, + fail: function (response) { + if (typeof fail === FUNCTION_TEXT) { + fail(handleFail(response)); + } else { + showToastNoneIcon(API.MSG_FAIL_HTTP); + } + this.setData({'status':0}) + }, + complete: function (response) { + this.setData({'status':0}) + wx.hideNavigationBarLoading(); } }) }else{ @@ -213,6 +244,18 @@ Page({ },2000) } }) + }, + fail: function (response) { + if (typeof fail === FUNCTION_TEXT) { + fail(handleFail(response)); + } else { + showToastNoneIcon(API.MSG_FAIL_HTTP); + } + this.setData({'status':0}) + }, + complete: function (response) { + this.setData({'status':0}) + wx.hideNavigationBarLoading(); } }) } diff --git a/pages/bankDraft/add/add.wxml b/pages/bankDraft/add/add.wxml index 60fc3db..8beac01 100644 --- a/pages/bankDraft/add/add.wxml +++ b/pages/bankDraft/add/add.wxml @@ -6,8 +6,16 @@ - - + + *汇票类型 + + + {{orderTypeOptions[orderTypeindex].dictLabel?orderTypeOptions[orderTypeindex].dictLabel:"选择汇票类型"}} + + + + + @@ -40,18 +48,15 @@ - - - - + + *汇票状态 + + + {{orderStatusOptions[orderStatusindex].dictLabel?orderStatusOptions[orderStatusindex].dictLabel:"选择汇票状态"}} + + + + diff --git a/pages/contract/add/add.js b/pages/contract/add/add.js index 7d5df95..1e3c68e 100644 --- a/pages/contract/add/add.js +++ b/pages/contract/add/add.js @@ -41,6 +41,8 @@ Page({ biddingWayOptions: [], // 招标类型字典 biddingTypeOptions: [], + + status:0, }, back:function(){ wx.navigateBack({ @@ -193,7 +195,8 @@ Page({ }else if(this.data.form.contractionStatus === ''||this.data.form.contractionStatus==null){//合同状态 UTIL.showToastNoneIcon('单价不能为空！'); return false; - }else{ + }else if(this.data.status=='0'){ + this.setData({'status':1}) if(this.data.form.id!=null&&this.data.form.id!=""){ let data = this.data.form; data.method = "POST"; @@ -209,6 +212,18 @@ Page({ }else{ UTIL.showToastNoneIcon('修改失败'); } + }, + fail: function (response) { + if (typeof fail === FUNCTION_TEXT) { + fail(handleFail(response)); + } else { + showToastNoneIcon(API.MSG_FAIL_HTTP); + } + this.setData({'status':0}) + }, + complete: function (response) { + this.setData({'status':0}) + wx.hideNavigationBarLoading(); } }) }else{ @@ -226,6 +241,18 @@ Page({ }else{ UTIL.showToastNoneIcon('新增失败'); } + }, + fail: function (response) { + if (typeof fail === FUNCTION_TEXT) { + fail(handleFail(response)); + } else { + showToastNoneIcon(API.MSG_FAIL_HTTP); + } + this.setData({'status':0}) + }, + complete: function (response) { + this.setData({'status':0}) + wx.hideNavigationBarLoading(); } }) } @@ -345,10 +372,10 @@ Page({ biddingTypeOptions:r.data, }) r.data.map((rr,ind) => { - if(rr.dictValue == res.data.biddingType){ - that.setData({'biddingTypeindex':ind}) - } - }) + if(rr.dictValue == res.data.biddingType){ + that.setData({'biddingTypeindex':ind}) + } + }) } } }) diff --git a/pages/contract/add/add.wxml b/pages/contract/add/add.wxml index 7f78cb8..7753a56 100644 --- a/pages/contract/add/add.wxml +++ b/pages/contract/add/add.wxml @@ -122,7 +122,7 @@ 数量/面积 - + @@ -251,7 +251,7 @@ 招标日期 - {{form.biddingDate?form.biddingDate:'招标日期'}} + {{form.biddingDate?form.biddingDate:'未选择'}} @@ -292,7 +292,7 @@ 审核时间 - {{form.reviewTime?form.reviewTime:'审核时间'}} + {{form.reviewTime?form.reviewTime:'未选择'}} diff --git a/pages/contractAssets/fixedAssets.js b/pages/contractAssets/fixedAssets.js index 965a68e..64b77f3 100644 --- a/pages/contractAssets/fixedAssets.js +++ b/pages/contractAssets/fixedAssets.js @@ -25,7 +25,8 @@ Page({ showPopup:false, fileEvent:{}, itemId:"", - assetTypeOptions:[] + assetTypeOptions:[], + status:0, }, goAdd(){ wx.navigateTo({ @@ -150,7 +151,9 @@ Page({ this.getList(); }, goUpdate(e){ - let data = e.currentTarget.dataset.item; + if(this.data.status=='0'){ + this.setData({'status':1}) + let data = e.currentTarget.dataset.item; data.method = "POST"; data.assetTable = "t_asset_permanent" data.assetId = e.currentTarget.dataset.item.id @@ -163,15 +166,17 @@ Page({ 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'}, { diff --git a/pages/fixedAssets/add/add.js b/pages/fixedAssets/add/add.js index d5ad435..0fb62a6 100644 --- a/pages/fixedAssets/add/add.js +++ b/pages/fixedAssets/add/add.js @@ -28,6 +28,7 @@ Page({ expectedYears:1, depreciationYears:0, depreciationValue:0, + perYearDepreciationValue:0, }, assetTypeindex:'0', operationTypendex:'0', @@ -57,6 +58,8 @@ Page({ sysYesNoOptions: [], //单位字段 unitOptions:[], + + status:0, }, back:function(){ wx.navigateBack({ @@ -113,9 +116,10 @@ Page({ }) }, onConfirmIsMin (e) { + console.log(e); let obj = e.detail.value; this.setData({ - 'form.isMin':this.data.isMinOptions[obj].dictValue, + 'form.isMin':this.data.sysYesNoOptions[obj].dictValue, 'isMinindex':obj }) }, @@ -129,7 +133,7 @@ Page({ onConfirmIsFormAsset (e) { let obj = e.detail.value; this.setData({ - 'form.isFormAsset':this.data.isFormAssetOptions[obj].dictValue, + 'form.isFormAsset':this.data.sysYesNoOptions[obj].dictValue, 'isFormAssetindex':obj }) }, @@ -199,7 +203,8 @@ Page({ }else if(this.data.form.depreciationType == ''||this.data.form.depreciationType==null){//已结款 UTIL.showToastNoneIcon('折旧方式不能为空！'); return false; - }else{ + }else if(this.data.status == '0'){ + this.setData({'status':'1'}) if(this.data.form.id!=null&&this.data.form.id!=""){ let data = this.data.form; data.method = "POST"; @@ -214,7 +219,20 @@ Page({ },2000) }else{ UTIL.showToastNoneIcon('修改失败'); + this.setData({'status':'0'}) } + }, + fail: function (response) { + if (typeof fail === FUNCTION_TEXT) { + fail(handleFail(response)); + } else { + showToastNoneIcon(API.MSG_FAIL_HTTP); + } + this.setData({'status':0}) + }, + complete: function (response) { + this.setData({'status':0}) + wx.hideNavigationBarLoading(); } }) }else{ @@ -231,7 +249,20 @@ Page({ },2000) }else{ UTIL.showToastNoneIcon(res.msg); + this.setData({'status':'0'}) } + }, + fail: function (response) { + if (typeof fail === FUNCTION_TEXT) { + fail(handleFail(response)); + } else { + showToastNoneIcon(API.MSG_FAIL_HTTP); + } + this.setData({'status':0}) + }, + complete: function (response) { + this.setData({'status':0}) + wx.hideNavigationBarLoading(); } }) } diff --git a/pages/fixedAssets/add/add.wxml b/pages/fixedAssets/add/add.wxml index 5a75db7..4c76a45 100644 --- a/pages/fixedAssets/add/add.wxml +++ b/pages/fixedAssets/add/add.wxml @@ -14,7 +14,7 @@ *资产编码 - + @@ -22,7 +22,7 @@ *资产名称 - + @@ -65,7 +65,7 @@ 坐落位置 - + @@ -73,7 +73,7 @@ 规格型号 - + @@ -81,7 +81,7 @@ 供应商 - + diff --git a/pages/project/add/add.js b/pages/project/add/add.js index 7c4d3bc..27c9c1e 100644 --- a/pages/project/add/add.js +++ b/pages/project/add/add.js @@ -13,7 +13,9 @@ Page({ showEndTime:false, ynProjcetStatusOptions:[], form:{}, - id:"" + id:"", + ynProjcetStatusindex:0, + status:0, }, /** @@ -25,28 +27,34 @@ Page({ this.setData({id:options.id}) UTIL.httpRequest(API.URL_GET_PROJECTGET + this.data.id, {method:'GET'}, { success: (res) => { - //汇票类型 + this.setData({'form':res.data}) + UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'yn_projcet_status', {method:'GET'}, { - success: (rr) => { - this.setData({ - ynProjcetStatusOptions:rr.data - }); - this.data.ynProjcetStatusOptions.map(r => { - if(r.dictValue == res.data.ynProjcetStatus){ - res.data.ynProjcetStatusText = r.dictLabel - that.setData({'form':res.data}); - } - }) + success: (r) => { + if(r.data.length>0){ + that.setData({ + ynProjcetStatusOptions:r.data, + }) + r.data.map((rr,ind) => { + if(rr.dictValue == res.data.ynProjcetStatus){ + that.setData({'ynProjcetStatusindex':ind}) + } + }) + } } }) } }) }else{ + let that = this UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'yn_projcet_status', {method:'GET'}, { - success: (res) => { - this.setData({ - ynProjcetStatusOptions:res.data - }); + success: (r) => { + if(r.data.length>0){ + that.setData({ + ynProjcetStatusOptions:r.data, + 'form.ynProjcetStatus':r.data[0].dictValue + }) + } } }) } @@ -60,6 +68,13 @@ Page({ let data = this.getNewDate(new Date(e.detail.value)); this.setData({'form.endTime':data}); }, + onConfirmynProjcetStatus (e) { + let obj = e.detail.value; + this.setData({ + 'form.ynProjcetStatus':this.data.ynProjcetStatusOptions[obj].dictValue, + 'ynProjcetStatusindex':obj + }) + }, getNewDate(date){ //date是传过来的时间戳，注意需为13位，10位需*1000 //也可以不传,获取的就是当前时间 @@ -122,7 +137,8 @@ Page({ }else if(this.data.form.ynProjcetStatus === ''||this.data.form.ynProjcetStatus==null){//工程状态 UTIL.showToastNoneIcon('工程状态不能为空！'); return false; - }else{ + }else if(this.data.status=='0'){ + this.setData({'status':1}) var that = this ; let data = that.data.form; data.method = 'POST'; @@ -139,6 +155,18 @@ Page({ delta:1 }) },2000) + }, + fail: function (response) { + if (typeof fail === FUNCTION_TEXT) { + fail(handleFail(response)); + } else { + showToastNoneIcon(API.MSG_FAIL_HTTP); + } + this.setData({'status':0}) + }, + complete: function (response) { + this.setData({'status':0}) + wx.hideNavigationBarLoading(); } }) }else{ @@ -154,6 +182,18 @@ Page({ delta:1 }) },2000) + }, + fail: function (response) { + if (typeof fail === FUNCTION_TEXT) { + fail(handleFail(response)); + } else { + showToastNoneIcon(API.MSG_FAIL_HTTP); + } + this.setData({'status':0}) + }, + complete: function (response) { + this.setData({'status':0}) + wx.hideNavigationBarLoading(); } }) } diff --git a/pages/project/add/add.wxml b/pages/project/add/add.wxml index 0f8b308..61e7181 100644 --- a/pages/project/add/add.wxml +++ b/pages/project/add/add.wxml @@ -26,19 +26,15 @@ - - - - - + + *工程状态 + + + {{ynProjcetStatusOptions[ynProjcetStatusindex].dictLabel?ynProjcetStatusOptions[ynProjcetStatusindex].dictLabel:"选择所属银行"}} + + + +