1、新增账单明细详情

2、调整状态样式

src/views/billrecord/chongzhi.vue

@@ -24,15 +24,32 @@
                    @click="handleStat">
           采购统计</el-button><span span style="color: red; font-weight:bold">{{chongZhiStat}}</span>
       </template>
+      <template slot="menu" slot-scope="{row}">
+        <el-button type="text" size="small" icon="el-icon-zoom-in" @click="purchaseDetail(row)">采购明细
+        </el-button>
+      </template>
+      <template slot="payStatus" slot-scope="{row}">
+        <el-tag plain size="small" type="info" v-if="row.payStatus === 0">待付款</el-tag>
+        <el-tag plain size="small" type="success" v-if="row.payStatus === 1">付款成功</el-tag>
+        <el-tag plain size="small" type="danger" v-if="row.payStatus === 3">付款失败</el-tag>
+        <el-tag plain size="small" type="danger" v-if="row.payStatus === 4">系统异常</el-tag>
+      </template>
     </avue-crud>
+    <el-dialog :modal-append-to-body="false" :visible.sync="purchaseDetailVisible" title="采购明细页面" width="70%" center top="2vh" modal="true">
+        <bussinesspurchaserecord :bill-record-id="billRecordId" :bussiness-id="bussinessId" v-if="purchaseDetailVisible"></bussinesspurchaserecord>
+    </el-dialog>
   </basic-container>
 </template>
 
 <script>
   import {getBussinessList as getList, billStat} from "@/api/billrecord/billrecord";
   import {mapGetters} from "vuex";
+  import bussinesspurchaserecord from "../bussiness/bussinesspurchaserecord.vue"
 
   export default {
+    components: {
+      bussinesspurchaserecord
+    },
     data() {
       return {
         form: {},
@@ -44,11 +61,14 @@
           currentPage: 1,
           total: 0
         },
+        billRecordId: null,
+        bussinessId: null,
+        purchaseDetailVisible: false,
         selectionList: [],
         option: {
           // showHeader:false,
           addBtn: false,
-          menu: false,
+          menu: true,
           height: 'auto',
           calcHeight: 30,
           dialogWidth: 950,
@@ -57,7 +77,10 @@
           searchMenuSpan: 6,
           border: true,
           index: true,
-          viewBtn: true,
+          viewBtn: false,
+          editBtn: false,
+          delBtn: false,
+          addBtn: false,
           selection: true,
           dialogClickModal: false,
           column: [
@@ -85,6 +108,7 @@
               label: "采购状态",
               prop: "payStatus",
               type: "select",
+              slot: true,
               search: true,
               dicData:[
                 {
@@ -105,10 +129,6 @@
                 },
               ]
             },
-            {
-              label: "汇款备注码",
-              prop: "remitComment",
-            },
             {
               label: "描述",
               prop: "failReason",
@@ -141,6 +161,11 @@
       }
     },
     methods: {
+      purchaseDetail(row){
+        this.purchaseDetailVisible = true;
+        this.billRecordId = row.id;
+        this.bussinessId = row.userId;
+      },
       handleStat(){
         billStat(this.query).then(res =>{
           this.chongZhiStat = "¥" + res.data.data;

src/views/bussiness/bussinesspurchaserecord.vue

@@ -36,6 +36,10 @@
   import {mapGetters} from "vuex";
 
   export default {
+    props:{
+      billRecordId: null,
+      bussinessId: null
+    },
     data() {
       return {
         form: {},
@@ -56,6 +60,7 @@
           border: true,
           index: true,
           viewBtn: true,
+          menu: false,
           selection: true,
           dialogClickModal: false,
           display: false,
@@ -204,6 +209,8 @@
         this.onLoad(this.page, this.query);
       },
       onLoad(page, params = {}) {
+        params["billRecordId"] = this.billRecordId;
+        params["bussinessId"] = this.bussinessId;
         this.loading = true;
         getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
           const data = res.data.data;

src/views/guosen/debit.vue

@@ -89,10 +89,12 @@
                    @click="handleStat">
           分润统计</el-button><span style="color: red; font-weight:bold">{{debtStat}}</span>
       </template>
+      <template slot="status" slot-scope="{row}">
+        <el-tag plain size="small" type="info" v-if="row.status === 1">待确认</el-tag>
+        <el-tag plain size="small" type="success" v-if="row.status === 2">确认成功</el-tag>
+        <el-tag plain size="small" type="danger" v-if="row.status === 3">确认失败</el-tag>
+      </template>
     </avue-crud>
-
-
-
   </basic-container>
 </template>
 
@@ -218,6 +220,7 @@
               type: "select",
               search: true,
               searchSpan: 4,
+              slot:true,
               dicData: [{
                   label: "待确认",
                   value: 1

src/views/wel/index.vue

@@ -60,6 +60,17 @@
                     {{bussiness.remain}}
                   </span>
                 </div>
+                <div style="margin-left: 20px;margin-top:30px;">
+                  <span style="color: white;">在途金额</span>
+                </div>
+                <div style="margin-left: 20px;margin-top:10px;padding-bottom: 20px;">
+                  <span>
+                    <avue-avatar style="margin-bottom: 30px;" src="/img/bg/rmb.png"></avue-avatar>
+                  </span>
+                  <span style="font-size:60px;margin-left:20px;margin-bottom: 20px;color:white;">
+                    {{bussiness.freeze}}
+                  </span>
+                </div>
               </div>
             </el-col>
             <el-col span="12" height="400px">