diff --git a/app.json b/app.json
index a026a8c..da5321e 100644
--- a/app.json
+++ b/app.json
@@ -33,7 +33,8 @@
"pages/contract/add/add",
"pages/fixedAssets/fixedAssets",
"pages/fixedAssets/add/add",
- "pages/finance/finance"
+ "pages/finance/finance",
+ "pages/contractAssets/fixedAssets"
],
"window": {
"backgroundTextStyle": "light",
diff --git a/pages/bank/bank.wxml b/pages/bank/bank.wxml
index 9ede2b4..6fdb471 100644
--- a/pages/bank/bank.wxml
+++ b/pages/bank/bank.wxml
@@ -4,7 +4,7 @@
开户行
-
+
新增
-
-
+
+
@@ -32,12 +32,12 @@
-
-
+
+
-
+
var indexOf = function(name,value){
return name.indexOf(value);
diff --git a/pages/contract/contract.js b/pages/contract/contract.js
index d67bea5..e04b122 100644
--- a/pages/contract/contract.js
+++ b/pages/contract/contract.js
@@ -26,7 +26,8 @@ Page({
showRelevance:false,
relevanceList:[],
fileEvent:{},
- itemId:""
+ itemId:"",
+ contractionId:""
},
goAdd(){
wx.navigateTo({
@@ -43,7 +44,6 @@ Page({
*/
onLoad(options) {
var that = this;
-
let qu = wx.createSelectorQuery()
qu.select("#top_view").boundingClientRect()
qu.select("#top_ban").boundingClientRect()
@@ -107,6 +107,11 @@ Page({
url: '/pages/contract/add/add?id='+e.currentTarget.dataset.id,
})
},
+ addAssets(e){
+ wx.navigateTo({
+ url: '/pages/contractAssets/fixedAssets?id='+this.data.contractionId,
+ })
+ },
delete(e){
UTIL.httpRequest(API.URL_GET_CONTRACTDELETE + e.currentTarget.dataset.id, {method:'GET'}, {
success: (res) => {
@@ -122,17 +127,50 @@ Page({
}
})
},
+ relevanceBack(){
+ let params = {
+ contractionId:this.data.contractionId
+ }
+ UTIL.httpRequest(API.URL_GET_ASSETLIST, params, {
+ success: (rr) => {
+ this.setData({
+ 'revelanceList':rr.rows,
+ 'showRelevance':true
+ })
+ },
+ })
+ },
+ relevanceDelete(e){
+ console.log(e);
+ UTIL.httpRequest(API.URL_GET_ASSETREMOVE+ e.currentTarget.dataset.id, {method:'GET'}, {
+ success: (res) => {
+ if(res.code==200){
+ let new_list = this.data.revelanceList
+ new_list.splice(e.currentTarget.dataset.index,1)
+ this.setData({'revelanceList':new_list})
+ UTIL.showToastNoneIcon('删除成功！');
+ }else{
+ UTIL.showToastNoneIcon('删除失败！');
+ }
+ },
+ fail:(rr) =>{
+ console.log(rr);
+ },
+ complete:(rr) => {
+ console.log(rr);
+ }
+ })
+ },
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
+ 'showRelevance':true,
+ 'contractionId':e.currentTarget.dataset.id
})
},
fail:(rr) =>{
@@ -302,7 +340,10 @@ Page({
* 生命周期函数--监听页面显示
*/
onShow() {
-
+ console.log(this.data.contractionId)
+ if(this.data.contractionId!=""&&this.data.contractionId!=null){
+ this.relevanceBack()
+ }
},
/**
diff --git a/pages/contract/contract.wxml b/pages/contract/contract.wxml
index 07b669c..e7e6d40 100644
--- a/pages/contract/contract.wxml
+++ b/pages/contract/contract.wxml
@@ -108,12 +108,12 @@
- {{item.assetTable}}
+ 固定资产
{{item.name}}
{{item.num}}{{item.unit}}
-
+
删除
@@ -121,35 +121,7 @@
-
-
-
-
-
-
-
-
-
- 资产类型
- 资产名称
- 数量（单位）
-
-
-
- {{item.assetTable}}
- {{item.name}}
- {{item.num}}{{item.unit}}
-
-
-
-
- 删除
-
-
-
-
-
-
+
diff --git a/utils/API.js b/utils/API.js
index 79350e3..4266243 100644
--- a/utils/API.js
+++ b/utils/API.js
@@ -295,6 +295,12 @@ const URL_GET_PAYEEEDIT = `${URL_PREFIX}/yinnong/payee/edit`;
//合同关联资产
const URL_GET_ASSETLIST = `${URL_PREFIX}/contraction/asset/list`;
+//新增合同关联资产
+const URL_GET_ASSETADD = `${URL_PREFIX}/contraction/asset/add`;
+
+//删除合同关联资产
+const URL_GET_ASSETREMOVE = `${URL_PREFIX}/contraction/asset/remove/`;
+
/****************接口地址end****************/
@@ -407,5 +413,7 @@ export {
URL_GET_PROJECTGET,
URL_POST_PROJECTUPDATE,
URL_GET_DEPOSITDETAIL,
- URL_POST_DEPOSITUPDATE
+ URL_POST_DEPOSITUPDATE,
+ URL_GET_ASSETADD,
+ URL_GET_ASSETREMOVE
}
\ No newline at end of file