对于财务管理进行y优化

src/views/finance/application/components/DetailModal.vue

@@ -30,12 +30,12 @@
           {{ withdrawalInfo.rejectReason || '--' }}
         </el-descriptions-item>
 
-        <el-descriptions-item label="账户可提现金额：">
+        <!-- <el-descriptions-item label="账户可提现金额：">
           {{ watherInfo.price }}
         </el-descriptions-item>
         <el-descriptions-item label="账户总金额：">
           {{ watherInfo.totalPrice }}
-        </el-descriptions-item>
+        </el-descriptions-item> -->
         <el-descriptions-item label="提现中：">
           {{ watherInfo.pendingWithdrawal }}
         </el-descriptions-item>
@@ -45,34 +45,7 @@
       </el-descriptions>
     </div>
 
-    <el-tabs value="outgoingRecord">
-      <el-tab-pane label="出账记录列表" name="outgoingRecord">
-        <div v-if="outgoingRecordList && outgoingRecordList.length" style="margin-top: 32px;">
-          <el-table
-            v-loading="!outgoingRecordList.length" height="60vh" element-loading-text="暂无出账记录数据" :data="outgoingRecordList"
-            v-bind="{ stripe: true, size: 'small', border: true, fit: true, highlightCurrentRow: true }"
-          >
-            <el-table-column align="center" min-width="80" prop="id" label="ID" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" min-width="80" prop="buyerUserId" label="出账用户Id" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" width="150" prop="orderFormid" label="购买订单编号" show-overflow-tooltip />
-            <el-table-column align="center" width="150" prop="commissionNumber" label="出账数量" show-overflow-tooltip />
-            <el-table-column align="center" label="出账类型" prop="waterType">
-              <template slot-scope="{ row }">
-                <el-tag v-if="row.waterType === 1" effect="plain" type="info">商城购买</el-tag>
-                <el-tag v-else-if="row.waterType === 2" effect="plain" type="success">商圈购买</el-tag>
-                <el-tag v-else-if="row.waterType === 3" effect="plain" type="success">社区购买</el-tag>
-                <el-tag v-else-if="row.waterType === 4" effect="plain" type="success">提现</el-tag>
-                <el-tag v-else-if="row.waterType === 5" effect="plain" type="success">退款扣除</el-tag>
-                <el-tag v-else-if="row.waterType === 6" effect="plain" type="success">代金券购买</el-tag>
-                <span v-else>--</span>
-              </template>
-            </el-table-column>
-            <el-table-column align="center" min-width="80" prop="destinationId" label="去向Id" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" width="150" prop="createTime" label="创建时间" show-overflow-tooltip />
-          </el-table>
-        </div>
-        <div v-else style="font-size: 16px;font-weight: bold;">无出账记录数据</div>
-      </el-tab-pane>
+    <el-tabs value="entryRecord">
       <el-tab-pane label="入账记录列表" name="entryRecord">
         <div v-if="entryRecordList && entryRecordList.length" style="margin-top: 32px;">
           <el-table
@@ -131,6 +104,33 @@
         </div>
         <div v-else style="font-size: 16px;font-weight: bold;">无入账记录数据</div>
       </el-tab-pane>
+      <el-tab-pane label="出账记录列表" name="outgoingRecord">
+        <div v-if="outgoingRecordList && outgoingRecordList.length" style="margin-top: 32px;">
+          <el-table
+            v-loading="!outgoingRecordList.length" height="60vh" element-loading-text="暂无出账记录数据" :data="outgoingRecordList"
+            v-bind="{ stripe: true, size: 'small', border: true, fit: true, highlightCurrentRow: true }"
+          >
+            <el-table-column align="center" min-width="80" prop="id" label="ID" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" min-width="80" prop="buyerUserId" label="出账用户Id" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" width="150" prop="orderFormid" label="购买订单编号" show-overflow-tooltip />
+            <el-table-column align="center" width="150" prop="commissionNumber" label="出账数量" show-overflow-tooltip />
+            <el-table-column align="center" label="出账类型" prop="waterType">
+              <template slot-scope="{ row }">
+                <el-tag v-if="row.waterType === 1" effect="plain" type="info">商城购买</el-tag>
+                <el-tag v-else-if="row.waterType === 2" effect="plain" type="success">商圈购买</el-tag>
+                <el-tag v-else-if="row.waterType === 3" effect="plain" type="success">社区购买</el-tag>
+                <el-tag v-else-if="row.waterType === 4" effect="plain" type="success">提现</el-tag>
+                <el-tag v-else-if="row.waterType === 5" effect="plain" type="success">退款扣除</el-tag>
+                <el-tag v-else-if="row.waterType === 6" effect="plain" type="success">代金券购买</el-tag>
+                <span v-else>--</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" min-width="80" prop="destinationId" label="去向Id" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" width="150" prop="createTime" label="创建时间" show-overflow-tooltip />
+          </el-table>
+        </div>
+        <div v-else style="font-size: 16px;font-weight: bold;">无出账记录数据</div>
+      </el-tab-pane>
     </el-tabs>
   </el-dialog>
 </template>

src/views/order/pending/index.vue

@@ -42,6 +42,7 @@
             <!-- <el-option label="商品ID" value="5" /> -->
             <el-option label="下单号码" value="6" />
             <el-option label="订单编号" value="7" />
+            <el-option label="支付单号" value="8" />
           </el-select>
         </template>
       </el-input>