diff --git a/common/vendor.js b/common/vendor.js
index 1120d37..4239b1e 100644
--- a/common/vendor.js
+++ b/common/vendor.js
@@ -9149,7 +9149,13 @@
return (0, o.myRequest)("customer/getFilesList", e)
}, t.netKehuFollow = function(e) {
return (0, o.myRequest)("record/getList", e)
- }, t.netKehuList = function(e) {
+ },t.getConsumeList = function(e) {
+ return (0, o.myRequest)("consume/getContractDetailConsume", e)
+ }, t.getBillList = function(e) {
+ return (0, o.myRequest)("bill/getBillList", e)
+ },t.getCollectionList = function(e) {
+ return (0, o.myRequest)("receivables/getList", e)
+ },t.netKehuList = function(e) {
return (0, o.myRequest)("customer/getList", e)
}, t.netKeyCollect = function(e) {
return (0, o.myRequest)("customer/collect", e)
diff --git a/pages/index/groupCompany/contract/contractDetail.js b/pages/index/groupCompany/contract/contractDetail.js
index 165abbe..86d6de3 100644
--- a/pages/index/groupCompany/contract/contractDetail.js
+++ b/pages/index/groupCompany/contract/contractDetail.js
@@ -72,12 +72,24 @@
lists: [{
name: "跟进记录",
status: 0
- }, {
+ }, {
+ name: "发票",
+ status: 1
+ }, {
+ name: "费用",
+ status: 2
+ }, {
+ name: "回款",
+ status:3
+ }, {
name: "基本信息",
- status: 1
+ status:4
}],
payment_approval: {},
- has_amount_view:false
+ has_amount_view:false,
+ consumeList:[],//费用记录列表
+ billList:[],//发票列表
+ collectionList:[]//回款列表
}
},
onLoad: function(t) {
@@ -89,7 +101,7 @@
this.show = !1
},
onShow: function() {
- this.info = null, this.getInfo(), this.getOperalist(), this.getPlanlist(), this.getPaymentlist(), this.getFile(), this.getApprovalList()
+ this.info = null, this.getInfo(), this.getOperalist(), this.getPlanlist(), this.getPaymentlist(), this.getFile(), this.getApprovalList(),this.getConsumeList(),this.getBillList(),this.getCollectionList()
},
components: {
customerDynamic: function() {
@@ -212,6 +224,45 @@
t.info = n.data
}))
},
+
+ //获取合同详情页面的费用记录
+ getConsumeList: function() {
+ var t = this;
+ (0, a.getConsumeList)({
+ contract_id: this.id,
+ page:1,
+ limit:9999,
+ }).then((function(n) {
+ console.log(n,'aaa')
+ t.consumeList = n.data
+ }))
+ },
+
+ //获取合同详情页面的发票记录
+ getBillList: function() {
+ var t = this;
+ (0, a.getBillList)({
+ contract_id: this.id,
+ page:1,
+ limit:9999,
+ }).then((function(n) {
+ console.log(n,'bbb')
+ t.billList = n.data.list
+ }))
+ },
+
+ //获取合同详情页面的回款记录
+ getCollectionList: function() {
+ var t = this;
+ (0, a.getCollectionList)({
+ contract_id: this.id,
+ page:1,
+ limit:9999,
+ }).then((function(n) {
+ console.log(n,'ccc')
+ t.collectionList = n.data.data
+ }))
+ },
toKehuInfo: function() {
t.navigateTo({
url: "/pages/index/groupCompany/groupCompany?id=" + this.info.customer.id
diff --git a/pages/index/groupCompany/contract/contractDetail.wxml b/pages/index/groupCompany/contract/contractDetail.wxml
index 6f3d69c..0e65bc3 100644
--- a/pages/index/groupCompany/contract/contractDetail.wxml
+++ b/pages/index/groupCompany/contract/contractDetail.wxml
@@ -110,7 +110,96 @@
+
+
+
+
+
+
+
+ {{"关联合同："+item.contract.name}}
+ {{"关联公司："+item.corporation.name}}
+ {{"发票金额："+item.money}}
+ {{"消费日期："+item.createtime}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.consume_type}}
+
+
+ {{"关联合同："+item.contract.name}}
+ {{"费用金额："+item.money}}
+ {{"报销主题："+item.theme}}
+ {{"备注："+item.remark}}
+
+
+
+
+ {{item.staff.name}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{"回款编号："+item.number}}
+ {{"关联合同："+item.contract.name}}
+ {{"回款方式："+item.return_type}}
+ {{"回款金额："+item.money}}
+ {{"回款日期："+item.return_time}}
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/index/groupCompany/contract/contractDetail.wxss b/pages/index/groupCompany/contract/contractDetail.wxss
index 4b222a7..21664dd 100644
--- a/pages/index/groupCompany/contract/contractDetail.wxss
+++ b/pages/index/groupCompany/contract/contractDetail.wxss
@@ -1 +1,64 @@
-.scrollView{height:140rpx;margin-bottom:70rpx;margin-top:70rpx}.scrollView .scrollbox{display:flex;justify-content:flex-start;align-items:center}.scrollView .scrollView_item{width:190rpx;height:140rpx;background:#fff;border-radius:20rpx;text-align:center;margin-right:28rpx}.scrollView .scrollView_item :first-child{height:80rpx;width:200rpx;color:#03aa96;font-size:54rpx;font-weight:600;line-height:80rpx}.scrollView .scrollView_item :last-child{height:60rpx;width:200rpx;font-size:30rpx;color:#333}.warnstatus{color:#ec7f51}.contractinfo{background:#03aa96;padding:20rpx 42rpx;position:relative}.contractinfo .constatus{position:absolute;right:24rpx;top:24rpx;background:#fff;padding:5rpx 12rpx;border-radius:5px;display:flex;justify-content:center;align-items:center;font-size:24rpx;color:#000}.contractinfo .constatus .con_status{color:#03aa96}.contractinfo .constatus .clockimg{width:32rpx;height:32rpx;margin-right:10rpx}.contractinfo .nameli{display:flex;justify-content:flex-start;align-items:center;margin-bottom:24rpx}.contractinfo .nameli .zhangimg{width:40rpx;height:40rpx;margin-right:15rpx}.contractinfo .nameli .name{font-size:32rpx;color:#fff;font-size:36rpx;font-weight:600}.contractinfo .li_text{display:flex;justify-content:flex-start;align-items:center}.contractinfo .li_text .biaoimg{width:40rpx;height:40rpx;margin-right:15rpx}.contractinfo .li_text .protext{margin:15rpx 0;font-size:30rpx;color:#fff;margin-right:24rpx}.contractinfo .li_text .pro_out{width:150rpx;height:30rpx;border-radius:15rpx;background:#ddd;margin-right:27rpx}.contractinfo .li_text .pro_out .pro_in{width:20%;height:30rpx;border-radius:15rpx;background:#fe9440}.contractinfo .li_text .money{font-size:30rpx;color:#fff}.contractinfo .content{font-size:30rpx;color:#fff;margin:15rpx 0}.tabinfo{display:flex;justify-content:space-between;align-items:center;padding:20rpx;background:#fff;border-top:1rpx solid silver}.tabinfo .tableft{display:flex;justify-content:flex-start;align-items:center}.tabinfo .tableft .headerimg{width:45rpx;height:45rpx;border-radius:50%}.tabinfo .tableft .name{font-size:26rpx;color:#03aa96;margin-left:24rpx}.tabinfo .rightimg{width:32rpx;height:32rpx}.btnlist{padding:20rpx 24rpx;display:flex;justify-content:space-around;align-items:center;border-top:1rpx solid #ddd;background:#fff}.btnlist .btn{width:300rpx;height:60rpx;border-radius:8rpx;font-size:24rpx;color:#fff;text-align:center;line-height:60rpx}.btnlist .pass{background:#03aa96}.btnlist .refuse{background:#f43f3b}.group_tab{margin:20rpx 0}.bottom_nav{position:fixed;bottom:0;left:0;right:0;padding:20rpx 0;background-color:#fff;text-align:center;color:#999;display:flex;justify-content:space-around;align-items:center;z-index:9}.pull_head{font-size:34rpx;color:#999;padding:30rpx 0}.pull_con{display:flex;justify-content:space-around;padding:20rpx 0 100rpx}
\ No newline at end of file
+.scrollView{height:140rpx;margin-bottom:70rpx;margin-top:70rpx}.scrollView .scrollbox{display:flex;justify-content:flex-start;align-items:center}.scrollView .scrollView_item{width:190rpx;height:140rpx;background:#fff;border-radius:20rpx;text-align:center;margin-right:28rpx}.scrollView .scrollView_item :first-child{height:80rpx;width:200rpx;color:#03aa96;font-size:54rpx;font-weight:600;line-height:80rpx}.scrollView .scrollView_item :last-child{height:60rpx;width:200rpx;font-size:30rpx;color:#333}.warnstatus{color:#ec7f51}.contractinfo{background:#03aa96;padding:20rpx 42rpx;position:relative}.contractinfo .constatus{position:absolute;right:24rpx;top:24rpx;background:#fff;padding:5rpx 12rpx;border-radius:5px;display:flex;justify-content:center;align-items:center;font-size:24rpx;color:#000}.contractinfo .constatus .con_status{color:#03aa96}.contractinfo .constatus .clockimg{width:32rpx;height:32rpx;margin-right:10rpx}.contractinfo .nameli{display:flex;justify-content:flex-start;align-items:center;margin-bottom:24rpx}.contractinfo .nameli .zhangimg{width:40rpx;height:40rpx;margin-right:15rpx}.contractinfo .nameli .name{font-size:32rpx;color:#fff;font-size:36rpx;font-weight:600}.contractinfo .li_text{display:flex;justify-content:flex-start;align-items:center}.contractinfo .li_text .biaoimg{width:40rpx;height:40rpx;margin-right:15rpx}.contractinfo .li_text .protext{margin:15rpx 0;font-size:30rpx;color:#fff;margin-right:24rpx}.contractinfo .li_text .pro_out{width:150rpx;height:30rpx;border-radius:15rpx;background:#ddd;margin-right:27rpx}.contractinfo .li_text .pro_out .pro_in{width:20%;height:30rpx;border-radius:15rpx;background:#fe9440}.contractinfo .li_text .money{font-size:30rpx;color:#fff}.contractinfo .content{font-size:30rpx;color:#fff;margin:15rpx 0}.tabinfo{display:flex;justify-content:space-between;align-items:center;padding:20rpx;background:#fff;border-top:1rpx solid silver}.tabinfo .tableft{display:flex;justify-content:flex-start;align-items:center}.tabinfo .tableft .headerimg{width:45rpx;height:45rpx;border-radius:50%}.tabinfo .tableft .name{font-size:26rpx;color:#03aa96;margin-left:24rpx}.tabinfo .rightimg{width:32rpx;height:32rpx}.btnlist{padding:20rpx 24rpx;display:flex;justify-content:space-around;align-items:center;border-top:1rpx solid #ddd;background:#fff}.btnlist .btn{width:300rpx;height:60rpx;border-radius:8rpx;font-size:24rpx;color:#fff;text-align:center;line-height:60rpx}.btnlist .pass{background:#03aa96}.btnlist .refuse{background:#f43f3b}.group_tab{margin:20rpx 0}.bottom_nav{position:fixed;bottom:0;left:0;right:0;padding:20rpx 0;background-color:#fff;text-align:center;color:#999;display:flex;justify-content:space-around;align-items:center;z-index:9}.pull_head{font-size:34rpx;color:#999;padding:30rpx 0}.pull_con{display:flex;justify-content:space-around;padding:20rpx 0 100rpx}
+.cost.data-v-2a5dec54 {
+ width:690rpx;
+ margin:0 auto 24rpx;
+ background:#fff;
+ border-radius:20rpx;
+ padding:30rpx;
+ position:relative
+}
+.cost .cost_type.data-v-2a5dec54 {
+ font-size:28rpx;
+ color:#333;
+ padding-bottom:15rpx;
+ border-bottom:1rpx solid #f5f5f5
+}
+.cost .cost_status.data-v-2a5dec54 {
+ position:absolute;
+ right:24rpx;
+ top:24rpx;
+ background:rgba(3,170,150,.1);
+ border-radius:5rpx;
+ font-size:26rpx;
+ color:#03aa96;
+ padding:5rpx 12rpx
+}
+.cost .cost_info.data-v-2a5dec54 {
+ display:flex;
+ justify-content:space-between;
+ align-items:center;
+ padding: 28rpx 10rpx 0 10rpx;
+ text-align: center;
+}
+.cost .cost_info .cost_left {
+ width: 75%;
+}
+.cost .cost_info .cost_left .cost_text.data-v-2a5dec54 {
+ font-size:24rpx;
+ color:#999;
+ margin-bottom:10rpx;
+ text-align: left;
+}
+.cost .cost_info .cost_right.data-v-2a5dec54 {
+ display:flex;
+ flex-direction:column;
+ align-items:center;
+ width: 19%;
+ justify-content: center;
+}
+.cost .cost_info .cost_right .staffimg.data-v-2a5dec54 {
+ width:80rpx;
+ height:80rpx;
+ border-radius:50%;
+ margin-bottom:8rpx
+}
+.cost .cost_info .cost_right .staffname.data-v-2a5dec54 {
+ font-size:24rpx;
+ color:#999;
+ word-break: break-all;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: -webkit-box;
+ -webkit-line-clamp:2;
+ -webkit-box-orient: vertical;
+}
diff --git a/pagesA/payment/item.wxml b/pagesA/payment/item.wxml
index 050b238..b5ab109 100644
--- a/pagesA/payment/item.wxml
+++ b/pagesA/payment/item.wxml
@@ -1 +1,29 @@
-{{"回款编号："+item.number}}{{"关联合同："+item.contract.name}}{{"回款方式："+item.return_type}}{{"回款金额："+item.money}}{{"回款日期："+item.return_time}}
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{"回款编号："+item.number}}
+ {{"关联合同："+item.contract.name}}
+ {{"回款方式："+item.return_type}}
+ {{"回款金额："+item.money}}
+ {{"回款日期："+item.return_time}}
+
+
+
+
+
+
\ No newline at end of file