修改合同详情

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)

pages/index/groupCompany/contract/contractDetail.js

@@ -73,11 +73,23 @@
                                   name: "跟进记录",
                                   status: 0
                                     }, {
-                                  name: "基本信息",
+                                        name: "发票",
                                         status: 1
+                                    }, {
+                                      name: "费用",
+                                      status: 2
+                                  }, {
+                                    name: "回款",
+                                    status:3
+                                }, {
+                                  name: "基本信息",
+                                  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

pages/index/groupCompany/contract/contractDetail.wxml

@@ -110,7 +110,96 @@
                 </block>
             </view>
         </block>
+
+
+        <!-- 发票 -->
         <block wx:if="{{current==1}}">
+          <block wx:for="{{billList}}" wx:for-item="item" wx:for-index="index" wx:key="index">
+              <view class="cost data-v-2a5dec54">
+                  <view class="cost_info data-v-2a5dec54">
+                      <view class="cost_left data-v-2a5dec54">
+                          <view class="cost_text data-v-2a5dec54">{{"关联合同："+item.contract.name}}</view>
+                          <view class="cost_text data-v-2a5dec54">{{"关联公司："+item.corporation.name}}</view>
+                          <view class="cost_text data-v-2a5dec54">{{"发票金额："+item.money}}</view>
+                          <view class="cost_text data-v-2a5dec54">{{"消费日期："+item.createtime}}</view>
+                      </view>
+                  </view>
+              </view>
+          </block>
+        </block>
+
+        <!-- 费用 -->
+        <block wx:if="{{current==2}}">
+          <view  class="cost data-v-2a5dec54" wx:for="{{consumeList}}"  wx:for-item="item" wx:for-index="index" wx:key="index">
+              <block wx:if="{{item.check_status==0}}">
+                  <view class="cost_status data-v-2a5dec54"><label class="_span data-v-2a5dec54">待审核</label></view>
+              </block>
+              <block wx:if="{{item.check_status==1}}">
+                  <view class="cost_status data-v-2a5dec54"><label class="_span data-v-2a5dec54">审核中</label></view>
+              </block>
+              <block wx:if="{{item.check_status==2}}">
+                  <view class="cost_status data-v-2a5dec54"><label class="_span data-v-2a5dec54">审核通过</label></view>
+              </block>
+              <block wx:if="{{item.check_status==3}}">
+                  <view class="cost_status data-v-2a5dec54"><label class="_span data-v-2a5dec54">审核未通过</label></view>
+              </block>
+              <block wx:if="{{item.check_status==4}}">
+                  <view class="cost_status data-v-2a5dec54"><label class="_span data-v-2a5dec54">撤销</label></view>
+              </block>
+              <view class="cost_type data-v-2a5dec54">{{item.consume_type}}</view>
+              <view class="cost_info data-v-2a5dec54">
+                  <view class="cost_left data-v-2a5dec54">
+                      <view class="cost_text data-v-2a5dec54">{{"关联合同："+item.contract.name}}</view>
+                      <view class="cost_text data-v-2a5dec54">{{"费用金额："+item.money}}</view>
+                      <view class="cost_text data-v-2a5dec54">{{"报销主题："+item.theme}}</view>
+                      <view class="cost_text data-v-2a5dec54">{{"备注："+item.remark}}</view>
+                      <!-- <view class="cost_text data-v-2a5dec54">{{"消费日期："+item.consume_time}}</view> -->
+                  </view>
+                  <view class="cost_right data-v-2a5dec54">
+                      <image class="staffimg data-v-2a5dec54" src="{{item.staff.img}}" mode></image>
+                      <view class="staffname data-v-2a5dec54">{{item.staff.name}}</view>
+                  </view>
+              </view>
+          </view>
+        </block>
+
+        <!-- 回款记录 -->
+        <block wx:if="{{current==3}}">
+          <block wx:for="{{collectionList}}" wx:for-item="item" wx:for-index="index" wx:key="index">
+              <view  class="cost data-v-2a5dec54" bindtap="__e">
+                  <block wx:if="{{item.check_status==0}}">
+                      <view class="cost_status data-v-2a5dec54"><label class="_span data-v-23dddfa8">待审核</label></view>
+                  </block>
+                  <block wx:if="{{item.check_status==1}}">
+                      <view class="cost_status data-v-2a5dec54"><label class="_span data-v-23dddfa8">审核中</label></view>
+                  </block>
+                  <block wx:if="{{item.check_status==2}}">
+                      <view class="cost_status data-v-2a5dec54"><label class="_span data-v-23dddfa8">审核通过</label></view>
+                  </block>
+                  <block wx:if="{{item.check_status==3}}">
+                      <view class="cost_status data-v-2a5dec54"><label class="_span data-v-23dddfa8">审核未通过</label></view>
+                  </block>
+                  <block wx:if="{{item.check_status==4}}">
+                      <view class="cost_status data-v-2a5dec54"><label class="_span data-v-23dddfa8">已撤回</label></view>
+                  </block>
+
+                  <view class="cost_info data-v-2a5dec54">
+                      <view class="cost_left data-v-2a5dec54">
+                        <view class="cost_text data-v-2a5dec54">{{"回款编号："+item.number}}</view>
+                        <view class="cost_text data-v-2a5dec54">{{"关联合同："+item.contract.name}}</view>
+                        <view class="cost_text data-v-2a5dec54">{{"回款方式："+item.return_type}}</view>
+                        <view class="cost_text data-v-2a5dec54">{{"回款金额："+item.money}}</view>
+                        <view class="cost_text data-v-2a5dec54">{{"回款日期："+item.return_time}}</view>
+                      </view>
+                      <view class="cost_right data-v-2a5dec54">
+                      </view>
+                  </view>
+              </view>
+          </block>
+        </block>
+
+
+        <block wx:if="{{current==4}}">
             <view class="processing_title">
                 <block wx:if="{{info}}">
                     <base-info vue-id="a970ea7e-3" info="{{info}}" payment_approval="{{payment_approval}}" bind:__l="__l"></base-info>

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}
+.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;
+}

pagesA/payment/item.wxml

@@ -1 +1,29 @@
-<view class="data-v-23dddfa8"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['toPayDetail',['$0'],[[['list','',index]]]]]]]}}" class="pay_li data-v-23dddfa8" bindtap="__e"><block wx:if="{{item.check_status==0}}"><view class="recostatus data-v-23dddfa8"><label class="_span data-v-23dddfa8">待审核</label></view></block><block wx:if="{{item.check_status==1}}"><view class="recostatus data-v-23dddfa8"><label class="_span data-v-23dddfa8">审核中</label></view></block><block wx:if="{{item.check_status==2}}"><view class="recostatus data-v-23dddfa8"><label class="_span data-v-23dddfa8">审核通过</label></view></block><block wx:if="{{item.check_status==3}}"><view class="recostatus data-v-23dddfa8"><label class="_span data-v-23dddfa8">审核未通过</label></view></block><block wx:if="{{item.check_status==4}}"><view class="recostatus data-v-23dddfa8"><label class="_span data-v-23dddfa8">已撤回</label></view></block><view class="pay_num data-v-23dddfa8">{{"回款编号："+item.number}}</view><view class="litext data-v-23dddfa8">{{"关联合同："+item.contract.name}}</view><view class="litext data-v-23dddfa8">{{"回款方式："+item.return_type}}</view><view class="litext data-v-23dddfa8">{{"回款金额："+item.money}}</view><view class="litext data-v-23dddfa8">{{"回款日期："+item.return_time}}</view></view></block><block wx:if="{{$root.g0==0}}"><u-empty vue-id="59cbf2d6-1" text="暂无更多" class="data-v-23dddfa8" bind:__l="__l"></u-empty></block></view>
+<view class="data-v-23dddfa8">
+    <block wx:for="{{list}}" wx:for-item="item" wx:for-index="index" wx:key="index">
+        <view data-event-opts="{{[['tap',[['toPayDetail',['$0'],[[['list','',index]]]]]]]}}" class="pay_li data-v-23dddfa8" bindtap="__e">
+            <block wx:if="{{item.check_status==0}}">
+                <view class="recostatus data-v-23dddfa8"><label class="_span data-v-23dddfa8">待审核</label></view>
+            </block>
+            <block wx:if="{{item.check_status==1}}">
+                <view class="recostatus data-v-23dddfa8"><label class="_span data-v-23dddfa8">审核中</label></view>
+            </block>
+            <block wx:if="{{item.check_status==2}}">
+                <view class="recostatus data-v-23dddfa8"><label class="_span data-v-23dddfa8">审核通过</label></view>
+            </block>
+            <block wx:if="{{item.check_status==3}}">
+                <view class="recostatus data-v-23dddfa8"><label class="_span data-v-23dddfa8">审核未通过</label></view>
+            </block>
+            <block wx:if="{{item.check_status==4}}">
+                <view class="recostatus data-v-23dddfa8"><label class="_span data-v-23dddfa8">已撤回</label></view>
+            </block>
+            <view class="pay_num data-v-23dddfa8">{{"回款编号："+item.number}}</view>
+            <view class="litext data-v-23dddfa8">{{"关联合同："+item.contract.name}}</view>
+            <view class="litext data-v-23dddfa8">{{"回款方式："+item.return_type}}</view>
+            <view class="litext data-v-23dddfa8">{{"回款金额："+item.money}}</view>
+            <view class="litext data-v-23dddfa8">{{"回款日期："+item.return_time}}</view>
+        </view>
+    </block>
+    <block wx:if="{{$root.g0==0}}">
+        <u-empty vue-id="59cbf2d6-1" text="暂无更多" class="data-v-23dddfa8" bind:__l="__l"></u-empty>
+    </block>
+</view>