Merge branch 'dev' of 47.94.45.65:angelo/web-retail-admin into test

src/views/financial/cashDetails/index.vue

@@ -340,13 +340,6 @@
               </template>
             </el-table-column>
 
-            <el-table-column
-              v-if="showData.exchangeRate"
-              align="center"
-              prop="exchangeRate"
-              :label="'汇率'"
-            />
-
             <!-- lll -->
             <el-table-column
               v-if="showData.creationTime"
@@ -381,18 +374,7 @@
               prop="accountName"
               :label="'开户姓名'"
             />
-            <el-table-column
+
-              align="center"
-              prop="accountProvince"
-              :label="$t('开户支行省')"
-              width="130"
-            />
-            <el-table-column
-              align="center"
-              prop="accountCity"
-              :label="$t('开户支行市')"
-              width="130"
-            />
             <el-table-column
               v-if="showData.phone"
               align="center"
@@ -407,18 +389,7 @@
               :label="'身份证号码'"
               width="180"
             />
-            <el-table-column
+
-              align="center"
-              prop="validStartDate"
-              :label="$t('有效期起始日期')"
-              width="130"
-            />
-            <el-table-column
-              align="center"
-              prop="validEndDate"
-              :label="$t('有效期截止日期')"
-              width="130"
-            />
             <el-table-column
               v-if="showData.remarks"
               align="center"
@@ -467,7 +438,12 @@
               prop="payerRemarks"
               :label="'打款备注'"
             />
-
+            <el-table-column
+              v-if="showData.approveStateVal"
+              align="center"
+              prop="approveStateVal"
+              :label="'审核状态'"
+            />
             <el-table-column
               v-if="showData.withdrawCode"
               align="center"
@@ -475,13 +451,6 @@
               width="200"
               :label="'单据编号'"
             />
-            <el-table-column
-              v-if="showData.approveStateVal"
-              align="center"
-              prop="approveStateVal"
-              :label="'审核状态'"
-              fixed="right"
-            />
             <el-table-column
               align="center"
               prop="time"
@@ -618,10 +587,6 @@ export default {
       // 折叠搜索框
       isActive: false,
       moren: 'cashDetails',
-      rejectDialogVisible: false,
-      rejectForm: {
-        rejectRemark: ''
-      },
       topList: [
         {
           name: '提现明细',
@@ -790,7 +755,11 @@ export default {
           key: ''
         }
       ],
-      showData: {}
+      showData: {},
+      rejectDialogVisible: false,
+      rejectForm: {
+        rejectRemark: ''
+      }
     }
   },
   computed: {