Merge branch 'develop' into glf

src/views/business/salaryAccount/index.vue

@@ -154,8 +154,8 @@
                 </div>
                 <div style="width: 90%;">
                   <el-row>
-                                        <!-- <el-col :span="12"><el-button style="width:120px;" type="primary"
-                                                plain>账单查询</el-button></el-col> -->
+                    <el-col :span="12"><el-button style="width:120px;" type="primary" plain
+                                                  @click="showBill(ele.payAccNo)">充值记录</el-button></el-col>
                     <el-col :span="12"><el-button @click="salarySelection(ele.payAccNo)"
                                                   style="width:120px;" type="primary" plain>去发薪</el-button></el-col>
                   </el-row>
@@ -368,12 +368,12 @@
         </el-table-column>
         <el-table-column label="收支类型" align="center" prop="tranType">
           <template slot-scope="scope">
-                        <el-button type="success" size="mini" v-if="scope.row.tranType == 2">收入</el-button>
+            <el-button type="success" size="mini">收入</el-button>
           </template>
         </el-table-column>
         <el-table-column label="金额" align="center" prop="tranAmount">
           <template slot-scope="scope">
-                        <span v-if="scope.row.tranType == 2" style="color: rgb(255, 208, 75)">
+                        <span style="color: rgb(255, 208, 75)">
                             + {{ scope.row.tranAmount }}
                         </span>
           </template>
@@ -461,9 +461,7 @@ export default {
       // 充值参数-自有
       ownAliQRCodeRechargeOpen: false,
       ownRechargeTitle: null,
-            ownAliQRCodeRechargeForm: {
-
-            },
+      ownAliQRCodeRechargeForm: {},
       // 线下充值
       rechargeCoursePanel: false,
       offlineRechargeData: {},
@@ -484,7 +482,8 @@ export default {
       loading: false
     }
   },
-    created() { },
+  created() {
+  },
   mounted() {
     if (this.payType == 'first') {
       this.params.bindType = 1