jsk 交易流水

src/api/reportCenter/index.js

@@ -3,19 +3,24 @@ import request from '@/utils/request'
 // 交易流水
 export function reportTradFlowListApi(data) {
   return request({
-      url: '/smart-canteen/report/trade/flow',
-      method: 'post',
+    url: '/smart-canteen/acc_trade/acct',
+    method: 'get',
     headers: {
         "merchant-id":"378915229716713472",
     },
-      data: data,
-      params:{
-      pageNum:data.pageNum,
-      pageSize:data.pageSize
-    }
+    params:data
+  })
+}
+export function getHealthInfoPageApi(data) {
+  return request({
+    url: '/smart-canteen/health_person_info/list',
+    method: 'get',
+    headers: {
+        "merchant-id":"378915229716713472",
+    },
+    params:data
   })
 }
-
 // 充值方式汇总
 export function reportAccRechargeListApi(data) {
   return request({

src/views/healthCenter/examinationReport/index.vue

@@ -70,7 +70,7 @@
         @pagination="getList"
         />
         <!-- 体检报告对话框 -->
-        <el-dialog :title="titleAddReport" :visible.sync="openAddReport" custom-class="dialog-right" class="addReportStyle" append-to-body>
+        <el-dialog :title="titleAddReport" :visible.sync="openAddReport"  style="right: 0px;" custom-class="dialog-right" class="addReportStyle" append-to-body>
           <el-form ref="form" :model="form" :rules="rules" label-width="90px">
             <el-row justify="center">
               <table  align="center" width="100%" cellspacing="0">
@@ -851,4 +851,7 @@ export default {
       font-weight: 700;
       color: #000;
     }
+    .addReportStyle .dialog-right{
+      margin-top: 0vh !important;
+    }
 </style>

src/views/reportCenter/tradedDetail/index.vue

@@ -66,9 +66,9 @@
                 <span>{{ (scope.row.outcome/100).toFixed(2) }}</span>
             </template>
         </el-table-column>
-        <el-table-column label="账户余额" align="center" prop="accAllBal" :show-overflow-tooltip="true" width="100">
+        <el-table-column label="账户余额" align="center" prop="accountAllBal" :show-overflow-tooltip="true" width="100">
             <template slot-scope="scope">
-                <span>{{ (scope.row.accAllBal/100).toFixed(2) }}</span>
+                <span>{{ (scope.row.accountAllBal/100).toFixed(2) }}</span>
             </template>
         </el-table-column>
         <el-table-column label="交易时间" align="center" prop="tradeTime" :show-overflow-tooltip="true" width="160"/>
@@ -95,16 +95,6 @@
         <el-table-column label="设备编号" align="center" prop="machineSn" :show-overflow-tooltip="true" width="180"/>
         <el-table-column label="设备名称" align="center" prop="deviceName" :show-overflow-tooltip="true" width="120"/>
         <el-table-column label="操作员" align="center" prop="createBy" :show-overflow-tooltip="true" width="100"/>
-        
-        <!-- <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width" fixed="right">
-          <template slot-scope="scope"> 
-            <el-button
-              size="mini"
-              type="text" 
-              @click="handleView(scope.row)" 
-            >详情</el-button> 
-          </template>
-        </el-table-column> -->
       </el-table>
 
       <pagination
@@ -119,7 +109,7 @@
 
   <script>
   import { deptTreeSelect } from '@/api/system/user'
-  import { reportTradFlowListApi } from "@/api/reportCenter/index";
+  import { reportTradFlowListApi,getHealthInfoPageApi } from "@/api/reportCenter/index";
   export default {//交易流水
     name: "",
     dicts: ['sys_user_type'],
@@ -228,14 +218,24 @@
                 ...this.queryParams,
                 "pageNum": this.queryParams.pageNum,
                 "pageSize": this.queryParams.pageSize,
+                "deptIdList":this.queryParams.deptIdList,
+                "searchValue":this.queryParams.searchValue,
                 "startDateTime":this.formatDate(this.dateRange[0]),
                 "endDateTime":this.formatDate(this.dateRange[1])
             }
+            console.log("param",param);
             reportTradFlowListApi(param).then(response => {
                 this.tableListData = response.rows;
+                console.log("this.tableListData",this.tableListData);
                 this.total = Number(response.total);
                 this.loading = false;
             });
+            // reportTradFlowListApi(param).then(response => {
+            //   console.log("response.rows",response.rows);
+            //     this.tableListData = response.rows;
+            //     this.total = Number(response.total);
+            //     this.loading = false;
+            // });
         },
         defaultDateRange() {
           const end = new Date(new Date().toLocaleDateString());
@@ -281,4 +281,3 @@
       justify-content: center;
     }
   </style>
-