diff --git a/fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue b/fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue
index 073c00e67..21b690b6f 100644
--- a/fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue
+++ b/fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue
@@ -8,7 +8,7 @@
         </el-form-item>
         <el-form-item label="" prop="payChannel">
           <el-select
-            v-model="queryParams.payChannel"
+            v-model="queryParams.type"
             clearable
             placeholder="请选择订单类型啊"
           >
@@ -23,23 +23,37 @@
             clearable
             placeholder="请选择订单分类"
           >
-            <el-option label="小程序" value="applet"/>
-            <el-option label="收银台" value="cashier"/>
-            <el-option label="POS端" value="POS"/>
+            <el-option label="油品" value="1"/>
+            <el-option label="商品" value="2"/>
+            <el-option label="储值卡" value="3"/>
+            <el-option label="积分" value="4"/>
+            <el-option label="囤油卡" value="5"/>
+            <el-option label="收银台订单" value="6"/>
+            <el-option label="挂账订单" value="7"/>
+            <el-option label="pos" value="8"/>
           </el-select>
         </el-form-item>
 
-
+<!--        <el-form-item label="" prop="payType">-->
+<!--          <el-select-->
+<!--            v-model="queryParams.payType"-->
+<!--            clearable-->
+<!--            placeholder="请选择支付方式"-->
+<!--          >-->
+<!--            <el-option label="现金" value="CASH"/>-->
+<!--            <el-option label="微信" value="WECHAT"/>-->
+<!--            <el-option label="支付宝" value="ALIPAY"/>-->
+<!--            <el-option label="余额" value="balance"/>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
         <el-form-item label="" prop="payType">
-          <el-select
-            v-model="queryParams.payType"
-            clearable
-            placeholder="请选择支付方式"
-          >
-            <el-option label="现金" value="CASH"/>
-            <el-option label="微信" value="WECHAT"/>
-            <el-option label="支付宝" value="ALIPAY"/>
-            <el-option label="余额" value="balance"/>
+          <el-select v-model="queryParams.payType" placeholder="请选择支付方式" clearable>
+            <el-option
+              v-for="dicts in this.dictPayType"
+              :key="dicts.dictValue"
+              :label="dicts.dictLabel"
+              :value="dicts.dictValue"
+            />
           </el-select>
         </el-form-item>
         <el-form-item label="" prop="status">
@@ -53,16 +67,25 @@
             <el-option label="已退款" value="refund"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="" prop="payType">
-          <el-select
-            v-model="queryParams.payType"
-            clearable
-            placeholder="请选择支付渠道"
-          >
-            <el-option label="现金" value="CASH"/>
-            <el-option label="微信" value="WECHAT"/>
-            <el-option label="支付宝" value="ALIPAY"/>
-            <el-option label="余额" value="balance"/>
+<!--        <el-form-item label="" prop="payType">-->
+<!--          <el-select-->
+<!--            v-model="queryParams.payChannel"-->
+<!--            clearable-->
+<!--            placeholder="请选择支付渠道"-->
+<!--          >-->
+<!--            <el-option label="小程序" value="applet"/>-->
+<!--            <el-option label="收银台" value="cashier"/>-->
+<!--            <el-option label="POS端" value="POS"/>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
+        <el-form-item label="" prop="paymentChannel">
+          <el-select v-model="queryParams.paymentChannel" placeholder="请选择支付通道" clearable>
+            <el-option
+              v-for="dicts in this.dict"
+              :key="dicts.dictValue"
+              :label="dicts.dictLabel"
+              :value="dicts.dictValue"
+            />
           </el-select>
         </el-form-item>
         <el-form-item label="" style="margin-right: 0px" prop="status">
@@ -77,15 +100,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="" prop="status">
-          <el-select
-            v-model="queryParams.status"
-            clearable
-            placeholder="请输入付款用户"
-          >
-            <el-option label="已支付" value="paid"/>
-            <el-option label="未支付" value="unpaid"/>
-            <el-option label="已退款" value="refund"/>
-          </el-select>
+          <el-input v-model="queryParams.userId" placeholder="请输入付款用户"></el-input>
         </el-form-item>
         <el-form-item label="">
           <el-date-picker
@@ -231,7 +246,7 @@
               <div v-else style="color: #F44522">支付失败</div>
             </template>
           </el-table-column>
-          <el-table-column prop="merchantName" align="center" label="支付渠道"></el-table-column>
+          <el-table-column prop="paymentChannel" align="center" label="支付渠道"></el-table-column>
           <el-table-column prop="mchntCd" align="center" label="商户号"></el-table-column>
           <el-table-column prop="createBy" align="center" label="关联员工"></el-table-column>
 
@@ -300,13 +315,17 @@
 import {
   exportExcelTradingApi,
   orderStatistics,
-  transactionList
+  transactionList,
+  getDicts
 } from "@/api/allOrder";
+import {getStaffByStorId} from "../../../../api/allOrder";
 
 export default {
   name: "reconciliation-trading",
   data() {
     return {
+      dict:{},
+      dictPayType:{},
       map:{},
       radio1: "油号选错",
       loading: false,
@@ -369,8 +388,11 @@ export default {
 
   },
   methods: {
+
     async getDeptList() {
       this.getList()
+      this.getDicts()
+      this.getStaffByStorId()
     },
     exportExcelCashier() {
       let dateRange = []
@@ -411,6 +433,24 @@ export default {
 
       })
     },
+
+
+    // 获取字典
+    async getDicts() {
+      getDicts("payment_channel").then(response => {
+        this.dict = response.data;
+      })
+      getDicts("payment_type").then(response => {
+        this.dictPayType = response.data;
+      })
+    },
+
+    // 获取字典
+    async getStaffByStorId() {
+      getStaffByStorId().then(response => {
+        this.staffList = response.data;
+      })
+    },
     getOrdersInfo(data) {
       this.dialogVisible = true;
       this.ordersInfo = data