From 9b35b9f406c2185bfddb8203fb6e06ace3282377 Mon Sep 17 00:00:00 2001 From: yujk <990961482@qq.com> Date: Mon, 30 May 2022 17:34:46 +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 --- image/icon/relevance_icon.png | Bin 0 -> 1767 bytes image/icon/upload_icon.png | Bin 0 -> 2033 bytes pages/bank/add/add.js | 84 +++++++++++++++++++------ pages/bank/add/add.wxml | 2 +- pages/bank/bank.js | 23 ++++--- pages/bankDraft/add/add.js | 94 +++++++++++++++++++++++----- pages/bankDraft/add/add.wxml | 4 +- pages/bankDraft/bankDraft.js | 7 ++- pages/bankDraft/bankDraft.wxml | 12 ++-- pages/contract/contract.js | 51 ++++++++++++--- pages/contract/contract.wxml | 84 +++++++++++++++++++++++-- pages/contract/contract.wxss | 35 ++++++++++- pages/project/add/add.js | 111 ++++++++++++++++++++++++++------- pages/project/project.js | 12 ++-- pages/project/project.wxml | 10 +-- utils/API.js | 35 +++++++++-- 16 files changed, 456 insertions(+), 108 deletions(-) create mode 100644 image/icon/relevance_icon.png create mode 100644 image/icon/upload_icon.png diff --git a/image/icon/relevance_icon.png b/image/icon/relevance_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..59d1d579fc14cc81a490b4ee532c3fb917009300 GIT binary patch literal 1767 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 P00000NkvXXu0mjf4->qp literal 0 HcmV?d00001 diff --git a/pages/bank/add/add.js b/pages/bank/add/add.js index 59b2de0..d107405 100644 --- a/pages/bank/add/add.js +++ b/pages/bank/add/add.js @@ -16,7 +16,9 @@ Page({ bankType: "", //所属银行 必填 bankDeposit: "", //开户行 必填 payeePaymentLines: "", //联行号 //必填 - } + }, + id:"", + bankTypeOptions:[] }, back:function(){ wx.navigateBack({ @@ -27,6 +29,35 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad(options) { + if(options.id!=null&&options.id!=""){ + this.setData({id:options.id}) + UTIL.httpRequest(API.URL_GET_DEPOSITDETAIL + this.data.id, {method:'GET'}, { + success: (res) => { + 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}); + } + }) + } + }) + } + }) + }else{ + UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'bank_type', {method:'GET'}, { + success: (r) => { + this.setData({ + bankTypeOptions:r.data + }); + } + }) + } }, @@ -52,13 +83,11 @@ Page({ }) }, openBox(even){ - console.log(even.currentTarget.dataset.name); this.setData({ [even.currentTarget.dataset.name]:true }) }, closeBox(even){ - console.log(even.currentTarget.dataset.name); this.setData({ [even.currentTarget.dataset.name]:false }) @@ -66,7 +95,7 @@ Page({ onConfirm(even){ var that = this ; if(even.currentTarget.dataset.name == "showBankType"){ - // 付款方式类型字典查询 + // 付款方式类型字典查询 UTIL.httpRequest(API.URL_GET_DEPOSITLIST, {method:'GET',bankType:even.detail.value.dictValue,status:'0'}, { success: (res) => { that.setData({ @@ -96,7 +125,8 @@ Page({ }) }, goSubmit(){ - if(this.data.form.sheng===''||this.data.form.code==sheng){ //省 + console.log(this.data.form) + if(this.data.form.sheng===''||this.data.form.sheng==null){ //省 UTIL.showToastNoneIcon('请填写省！'); return false; }else if(this.data.form.shi===''||this.data.form.shi==null){ //市 @@ -114,20 +144,38 @@ Page({ }else{ var that = this; that.data.form.method = 'POST'; - UTIL.httpRequest(API.URL_GET_DEPOSITADD, that.data.form, { - success: (res) => { - wx.showToast({ - title: "提交成功！", - duration: 2000, - icon:"success" - }) - setTimeout(function(){ - wx.navigateBack({ - delta:1 + if(that.data.form.id==""||that.data.form.id==null){ + UTIL.httpRequest(API.URL_GET_DEPOSITADD, that.data.form, { + success: (res) => { + wx.showToast({ + title: "提交成功！", + duration: 2000, + icon:"success" }) - },2000) - } - }) + setTimeout(function(){ + wx.navigateBack({ + delta:1 + }) + },2000) + } + }) + }else{ + UTIL.httpRequest(API.URL_GET_DEPOSITUPDATE, that.data.form, { + success: (res) => { + wx.showToast({ + title: "修改成功！", + duration: 2000, + icon:"success" + }) + setTimeout(function(){ + wx.navigateBack({ + delta:1 + }) + },2000) + } + }) + } + } }, /** diff --git a/pages/bank/add/add.wxml b/pages/bank/add/add.wxml index 4cd9c13..b6910da 100644 --- a/pages/bank/add/add.wxml +++ b/pages/bank/add/add.wxml @@ -30,7 +30,7 @@ data-value="form.bankDeposit" /> - + diff --git a/pages/bank/bank.js b/pages/bank/bank.js index 9e5b7a5..03e9736 100644 --- a/pages/bank/bank.js +++ b/pages/bank/bank.js @@ -11,7 +11,8 @@ Page({ isIPX: app.globalData.isIPX, depositList:[], bankTypeOptions:[], - value:"" + value:"", + scrollHeight:'' }, goAdd(){ wx.navigateTo({ @@ -27,7 +28,14 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad(options) { - + var _this = this; + let qu = wx.createSelectorQuery() + qu.select("#top_view2").boundingClientRect() + qu.exec(res => { + _this.setData({ + scrollHeight:wx.getSystemInfoSync().windowHeight-res[0].top + }) + }) }, /** @@ -51,19 +59,16 @@ Page({ let param = { 'bankDeposit':this.data.value } - console.log(2); UTIL.httpRequest(API.URL_GET_DEPOSITLIST, param,{ success: (response) => { if (response.code == API.SUCCESS_CODE) { for (let i = 0; i < response.rows.length; i++) { response.rows[i].bankTypeText = UTIL.getTransform(response.rows[i].bankType,res.data); response.rows[i].payeePaymentLines = response.rows[i].payeePaymentLines.substr(0,4)+'****' - if(i == response.rows.length-1){ - that.setData({ - depositList:response.rows - }) - } } + that.setData({ + depositList:response.rows + }) } } }) @@ -79,7 +84,7 @@ Page({ UTIL.httpRequest(API.URL_GET_DEPOSITDELETE + e.currentTarget.dataset.id, {method:'GET'},{ success: (res) => { if (res.code == API.SUCCESS_CODE) { - that.data.depositList.splice(e.currentTarget.dataset.index, 1); + that.data.depositList.splice(e.currentTarget.dataset.index, 1); wx.showToast({ title: '删除成功！', icon: 'success', diff --git a/pages/bankDraft/add/add.js b/pages/bankDraft/add/add.js index e8936e0..3086b38 100644 --- a/pages/bankDraft/add/add.js +++ b/pages/bankDraft/add/add.js @@ -21,14 +21,58 @@ Page({ endTime: "", //到期日期 必填 orderStatus: "", //汇票状态 必填 1在库 2转付中 3转付 4承兑 remark: "", - } + }, + orderStatusOptions:[], + orderTypeOptions:[], + showBtn:true }, /** * 生命周期函数--监听页面加载 */ onLoad(options) { - + console.log(options) + if(options.id!=null&&options.id!=""){ + let that = this + this.setData({id:options.id}) + UTIL.httpRequest(API.URL_GET_MONEYORDERDETAIL + this.data.id, {method:'GET'}, { + success: (res) => { + if(res.data.orderStatus!='1'){ + this.setData({'showBtn':false}); + } + //汇票类型 + 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}); + } + }) + } + }) + //汇票状态 + 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}); + } + }) + } + }) + } + }) + }else{ + this.onShow() + } }, /** @@ -78,7 +122,6 @@ Page({ }) }, onConfirmOrderType(event) { - console.log(event); this.setData({ [event.currentTarget.dataset.name]: false, [event.currentTarget.dataset.value]: event.detail.value.dictValue, @@ -116,20 +159,37 @@ Page({ }else{ var that = this; that.data.form.method = 'POST'; - UTIL.httpRequest(API.URL_GET_MONEYORDERADD, that.data.form , { - success: (res) => { - wx.showToast({ - title: '保存成功', - icon: 'success', - duration: 2000, - complete(){ - setTimeout(function(){ - that.back(); - },2000) - } - }) - } - }) + if(that.data.form.id==""||that.data.form.id==null){ + UTIL.httpRequest(API.URL_GET_MONEYORDERADD, that.data.form , { + success: (res) => { + wx.showToast({ + title: '新增成功', + icon: 'success', + duration: 2000, + complete(){ + setTimeout(function(){ + that.back(); + },2000) + } + }) + } + }) + }else{ + UTIL.httpRequest(API.URL_POST_MONEYORDERUPDATE, that.data.form , { + success: (res) => { + wx.showToast({ + title: '修改成功', + icon: 'success', + duration: 2000, + complete(){ + setTimeout(function(){ + that.back(); + },2000) + } + }) + } + }) + } } }, onConfirmTime(event){ diff --git a/pages/bankDraft/add/add.wxml b/pages/bankDraft/add/add.wxml index 7c41969..42431df 100644 --- a/pages/bankDraft/add/add.wxml +++ b/pages/bankDraft/add/add.wxml @@ -1,7 +1,7 @@ - 新增银行汇票 + {{form.id?"查看":"新增"}}银行汇票 @@ -46,6 +46,6 @@ - + 确认 \ No newline at end of file diff --git a/pages/bankDraft/bankDraft.js b/pages/bankDraft/bankDraft.js index ebb22f4..597b8ba 100644 --- a/pages/bankDraft/bankDraft.js +++ b/pages/bankDraft/bankDraft.js @@ -78,6 +78,11 @@ Page({ */ onReady() { + }, + goUpdate(e){ + wx.navigateTo({ + url: 'add/add?id='+ e.currentTarget.dataset.id, + }) }, goSearch(e){ this.setData({'value':e.detail}) @@ -218,7 +223,7 @@ Page({ } UTIL.httpRequest(API.URL_GET_ATTACHMENTLIST, oData, { success: (rr) => { - if(rr.rows.length>0){ + if(rr.code==200&&rr.rows.length>0){ rr.rows.map((rrr,index) => { rrr.url = URL_PREFIX + rrr.fileUrl if(index==rr.rows.length-1){ diff --git a/pages/bankDraft/bankDraft.wxml b/pages/bankDraft/bankDraft.wxml index 4b2387b..589e619 100644 --- a/pages/bankDraft/bankDraft.wxml +++ b/pages/bankDraft/bankDraft.wxml @@ -21,8 +21,8 @@ - - + + 汇票号 @@ -55,11 +55,11 @@ - - + + - - + + diff --git a/pages/contract/contract.js b/pages/contract/contract.js index a592e0a..d67bea5 100644 --- a/pages/contract/contract.js +++ b/pages/contract/contract.js @@ -23,6 +23,8 @@ Page({ uploadOptions:[], fileList:[], showPopup:false, + showRelevance:false, + relevanceList:[], fileEvent:{}, itemId:"" }, @@ -120,6 +122,27 @@ Page({ } }) }, + relevance(e){ + console.log(e) + let params = { + contractionId:e.currentTarget.dataset.id + } + UTIL.httpRequest(API.URL_GET_ASSETLIST, params, { + success: (rr) => { + console.log(rr) + this.setData({ + 'revelanceList':rr.rows, + 'showRelevance':true + }) + }, + fail:(rr) =>{ + console.log(rr); + }, + complete:(rr) => { + console.log(rr); + } + }) + }, upload(e){ this.setData({itemId:e.currentTarget.dataset.id}); this.asyncFun(e.currentTarget.dataset.id) @@ -139,16 +162,23 @@ Page({ } UTIL.httpRequest(API.URL_GET_ATTACHMENTLIST, oData, { success: (rr) => { - console.log(rr.rows); - rr.rows.map((rrr,index) => { - rrr.url = URL_PREFIX + rrr.fileUrl - if(index==rr.rows.length-1){ - newList.push(Object.assign({},res,{"list":rr.rows})) - _this.setData({"fileList":_this.data.fileList.concat(newList)}); - _this.setData({"showUpload":true}) - } - }) - + if(rr.code==200&&rr.rows.length>0){ + rr.rows.map((rrr,index) => { + rrr.url = URL_PREFIX + rrr.fileUrl + if(index==rr.rows.length-1){ + newList.push(Object.assign({},res,{"list":rr.rows})) + _this.setData({"fileList":_this.data.fileList.concat(newList)}); + _this.setData({"showUpload":true}) + } + }) + }else{ + let newuploadList = uploadList + newuploadList.map(rd => { + rd.list = newList + }) + _this.setData({"fileList":newuploadList}); + _this.setData({"showUpload":true}) + } }, fail:(rr) =>{ console.log(rr); @@ -162,6 +192,7 @@ Page({ }, closeBox(){ this.setData({"showUpload":false}) + this.setData({"showRelevance":false}) }, deleteImg(event){ this.setData({"fileEvent":event}) diff --git a/pages/contract/contract.wxml b/pages/contract/contract.wxml index ba6eac3..07b669c 100644 --- a/pages/contract/contract.wxml +++ b/pages/contract/contract.wxml @@ -16,7 +16,7 @@ 新增 - + @@ -53,11 +53,29 @@ - - + + + + + + 删除 + - - + + + + + + 附件 + + + + + + + + 资产 + @@ -80,6 +98,62 @@ + + + + + 资产类型 + 资产名称 + 数量（单位） + + + + {{item.assetTable}} + {{item.name}} + {{item.num}}{{item.unit}} + + + + + 删除 + + + + + + + + + + + + + + + 资产类型 + 资产名称 + 数量（单位） + + + + {{item.assetTable}} + {{item.name}} + {{item.num}}{{item.unit}} + + + + + 删除 + + + + + + + + + + \ No newline at end of file diff --git a/pages/contract/contract.wxss b/pages/contract/contract.wxss index cd008b2..f63f242 100644 --- a/pages/contract/contract.wxss +++ b/pages/contract/contract.wxss @@ -64,7 +64,15 @@ text{display: block;} color: #31936c; } .deleteBox{ - width: 130px; + width: 150px; + text-align: center; + height: 100%; + background: #F6F6F6; + align-items: center; + display: flex; +} +.deleteBoxAsset{ + width: 50px; text-align: center; height: 100%; background: #F6F6F6; @@ -249,7 +257,10 @@ text{display: block;} text-align: center; border-radius: 5px; white-space:pre-wrap; - padding: 22px 8px; + padding: 5rpx 8rpx; + width: 50rpx; + margin: 0px 14px; + font-size: 24rpx; } .fj-li{ margin-top: 20px; @@ -266,4 +277,24 @@ text{display: block;} } .van-icon-description{ font-size: 60px; +} +.table{ + width:98%; + margin-left:1%; +} +.tr{ + width:100%; + display: flex; + align-items:center; + justify-content:center; + height:3rem; +} +.th,.td{ + flex: 1; + text-align: center; + align-items: center; + justify-content: center; +} +.th{ + display: flex; } \ No newline at end of file diff --git a/pages/project/add/add.js b/pages/project/add/add.js index 037f226..6e52096 100644 --- a/pages/project/add/add.js +++ b/pages/project/add/add.js @@ -11,20 +11,47 @@ Page({ isIPX: app.globalData.isIPX, showStartTime:false, showEndTime:false, + ynProjcetStatusOptions:[], + form:{}, + id:"" }, /** * 生命周期函数--监听页面加载 */ onLoad(options) { - var that = this; - UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'yn_projcet_status', {method:'GET'}, { - success: (res) => { - this.setData({ - ynProjcetStatusOptions:res.data - }); - } - }) + console.log(options) + if(options.id!=null&&options.id!=""){ + let that = this + this.setData({id:options.id}) + UTIL.httpRequest(API.URL_GET_PROJECTGET + this.data.id, {method:'GET'}, { + success: (res) => { + //汇票类型 + 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}); + } + }) + } + }) + } + }) + }else{ + UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'yn_projcet_status', {method:'GET'}, { + success: (res) => { + this.setData({ + ynProjcetStatusOptions:res.data + }); + } + }) + } + }, back:function(){ @@ -59,24 +86,62 @@ Page({ }); }, goSubmit(){ - var that = this ; + if(this.data.form.projectName===''||this.data.form.projectName==null){ //项目名称 + UTIL.showToastNoneIcon('请填写项目名称！'); + return false; + }else if(this.data.form.projectContractor===''||this.data.form.projectContractor==null){ //合同承建方 + UTIL.showToastNoneIcon('请输入合同承建方！'); + return false; + }else if(this.data.form.startTime===''||this.data.form.startTime==null){ //开工日期 + UTIL.showToastNoneIcon('请选择开工日期！'); + return false; + }else if(this.data.form.endTime===''||this.data.form.endTime==null){ //竣工日期 + UTIL.showToastNoneIcon('请输入竣工日期！'); + return false; + }else if(this.data.form.projectAmount === ''||this.data.form.projectAmount==null){//合共价款 + UTIL.showToastNoneIcon('请输入收票单位！'); + return false; + }else if(this.data.form.ynProjcetStatus === ''||this.data.form.ynProjcetStatus==null){//工程状态 + UTIL.showToastNoneIcon('工程状态不能为空！'); + return false; + }else{ + var that = this ; let data = that.data.form; data.method = 'POST'; - - UTIL.httpRequest(API.URL_GET_PROJECTADD, data, { - success: (res) => { - wx.showToast({ - title: "提交成功！", - duration: 2000, - icon:"success" - }) - setTimeout(function(){ - wx.navigateBack({ - delta:1 + if(that.data.form.id==""||that.data.form.id==null){ + UTIL.httpRequest(API.URL_GET_PROJECTADD, data, { + success: (res) => { + wx.showToast({ + title: "新增成功！", + duration: 2000, + icon:"success" }) - },2000) - } - }) + setTimeout(function(){ + wx.navigateBack({ + delta:1 + }) + },2000) + } + }) + }else{ + UTIL.httpRequest(API.URL_POST_PROJECTUPDATE, data, { + success: (res) => { + wx.showToast({ + title: "修改成功！", + duration: 2000, + icon:"success" + }) + setTimeout(function(){ + wx.navigateBack({ + delta:1 + }) + },2000) + } + }) + } + + } + }, onChange(event){ console.log(event); diff --git a/pages/project/project.js b/pages/project/project.js index b17837c..3cfc1df 100644 --- a/pages/project/project.js +++ b/pages/project/project.js @@ -68,6 +68,12 @@ this.onShow(); delta: 1 }) }, + + goUpdate(e){ + wx.navigateTo({ + url: 'add/add?id='+ e.currentTarget.dataset.id, + }) + }, /** * 生命周期函数--监听页面显示 */ @@ -145,8 +151,6 @@ this.onShow(); }) } }) - - }, changeTab2(e){ var that = this ; @@ -173,8 +177,6 @@ this.onShow(); }) } }) - - }, upload(e){ this.setData({itemId:e.currentTarget.dataset.id}); @@ -195,7 +197,7 @@ this.onShow(); } UTIL.httpRequest(API.URL_GET_ATTACHMENTLIST, oData, { success: (rr) => { - if(rr.rows.length>0){ + if(rr.code==200&&rr.rows.length>0){ rr.rows.map((rrr,index) => { rrr.url = URL_PREFIX + rrr.fileUrl if(index==rr.rows.length-1){ diff --git a/pages/project/project.wxml b/pages/project/project.wxml index be397ae..7bcb8ec 100644 --- a/pages/project/project.wxml +++ b/pages/project/project.wxml @@ -17,7 +17,7 @@ - + @@ -44,11 +44,11 @@ - - + + - - + + diff --git a/utils/API.js b/utils/API.js index a059007..79350e3 100644 --- a/utils/API.js +++ b/utils/API.js @@ -24,7 +24,7 @@ const MSG_ERROR_TO = '提交异常，请重试'; const MSG_INVALID_USER_TOKEN='登陆信息失效，请重新登陆'; /****************接口提示信息end**************** -/****************接口地址start****************/ + /****************接口地址start****************/ //获取openId const URL_GET_OPENID=`${URL_PREFIX}/wechat/codeLogin`; // 获取手机号解密接口 @@ -215,6 +215,12 @@ const URL_GET_FLOWREMOVE = `${URL_PREFIX}/cashier/flow/remove/`; //增加开户行 const URL_GET_DEPOSITADD = `${URL_PREFIX}/yinnong/deposit/add`; +//查询开户行详情 +const URL_GET_DEPOSITDETAIL = `${URL_PREFIX}/yinnong/deposit/get/`; + +//查询开户行详情 +const URL_POST_DEPOSITUPDATE = `${URL_PREFIX}/yinnong/deposit/edit`; + //添加合同 const URL_POST_CONTRACTADD = `${URL_PREFIX}/contraction/info/add/`; @@ -234,7 +240,13 @@ const URL_GET_CONTRACTDELETE = `${URL_PREFIX}/contraction/info/remove/`; const URL_GET_ATTACHMENTLIST = `${URL_PREFIX}/system/attachment/query/`; //新增银行汇票 -const URL_GET_MONEYORDERADD = `${URL_PREFIX}/yinnong/moneyorder/add`; +const URL_POST_MONEYORDERADD = `${URL_PREFIX}/yinnong/moneyorder/add`; + +//银行汇票详情 +const URL_GET_MONEYORDERDETAIL = `${URL_PREFIX}/yinnong/moneyorder/get/`; + +//修改银行汇票 +const URL_POST_MONEYORDERUPDATE = `${URL_PREFIX}/yinnong/moneyorder/edit`; //删除银行汇票 const URL_GET_MONEYORDERDELETE = `${URL_PREFIX}/yinnong/moneyorder/remove/`; @@ -242,6 +254,12 @@ const URL_GET_MONEYORDERDELETE = `${URL_PREFIX}/yinnong/moneyorder/remove/`; //新增工程项目 const URL_GET_PROJECTADD = `${URL_PREFIX}/yinnong/project/add`; +//工程项目详情 +const URL_GET_PROJECTGET = `${URL_PREFIX}/yinnong/project/get/`; + +//工程项目修改 +const URL_POST_PROJECTUPDATE = `${URL_PREFIX}/yinnong/project/edit`; + //查询对方科目 const URL_GET_SUBJECTLIST = `${URL_PREFIX}/finance/subject/list?is_last=Y`; @@ -274,6 +292,8 @@ const URL_GET_PASSWORDEDIT = `${URL_PREFIX}/cashier/account/editPassWord`; //收款人修改 const URL_GET_PAYEEEDIT = `${URL_PREFIX}/yinnong/payee/edit`; +//合同关联资产 +const URL_GET_ASSETLIST = `${URL_PREFIX}/contraction/asset/list`; /****************接口地址end****************/ @@ -368,7 +388,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, @@ -380,5 +400,12 @@ export { URL_GET_PROJECTADD, URL_GET_PROJECTDELETE, URL_GET_PASSWORDEDIT, - URL_GET_PAYEEEDIT + URL_GET_PAYEEEDIT, + URL_GET_ASSETLIST, + URL_GET_MONEYORDERDETAIL, + URL_POST_MONEYORDERUPDATE, + URL_GET_PROJECTGET, + URL_POST_PROJECTUPDATE, + URL_GET_DEPOSITDETAIL, + URL_POST_DEPOSITUPDATE } \ No newline at end of file