修改页面

src/views/otc/otcOrder/index.vue

@@ -11,49 +11,44 @@
         />
       </el-form-item>
 
-      <el-form-item label="交易类型" prop="tradeType">
-        <el-select v-model="queryParams.tradeType" placeholder="请选择交易类型" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-
 
 
+    <el-form-item label="交易类型" prop="appealStatus">
+        <el-select v-model="queryParams.tradeTypeStatus" placeholder="请选择交易类型" clearable size="small">
+          <el-option
+            v-for="dict in tradeTypeStatusOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
 
 
-      <el-form-item label="类型" prop="feeType">
+ <el-form-item label="类型" prop="feeType">
-        <el-select v-model="queryParams.feeType" placeholder="请选择类型：pen：按笔，percentage：百分比" clearable size="small">
+        <el-select v-model="queryParams.feeType" placeholder="请选择类型" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
+          <el-option
+            v-for="dict in feeTypeOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
         </el-select>
       </el-form-item>
 
       <el-form-item label="订单状态" prop="orderStatus">
-        <el-select v-model="queryParams.orderStatus" placeholder="请选择订单状态(挂单中 pending_order、已锁住is_lock、已完成 close、已取消 cancel、待放行released,申诉中in_appeal）" clearable size="small">
+        <el-select v-model="queryParams.feeTypeStatus" placeholder="请选择订单状态" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
+          <el-option
-        </el-select>
+            v-for="dict in orderStatusOptions"
-      </el-form-item>
+            :key="dict.dictValue"
-      <el-form-item label="支付方式" prop="paymentType">
+            :label="dict.dictLabel"
-        <el-select v-model="queryParams.paymentType" placeholder="请选择支付方式" clearable size="small">
+            :value="dict.dictValue"
-          <el-option label="请选择字典生成" value="" />
+          />
         </el-select>
       </el-form-item>
 
 
 
-
-      <el-form-item label="收款人" prop="payee">
-        <el-input
-          v-model="queryParams.payee"
-          placeholder="请输入收款人"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-
-
-
-
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -111,7 +106,7 @@
       <el-table-column label="流水编号" align="center" prop="id" />
       <el-table-column label="订单编号" align="center" prop="orderNo" />
       <el-table-column label="总订单编号" align="center" prop="storeOrder" />
-      <el-table-column label="交易类型" align="center" prop="tradeType" />
+      <el-table-column label="交易类型" align="center" prop="tradeType"   :formatter="tradeTypeFormat" />
       <el-table-column label="商家编号" align="center" prop="storeId" />
       <el-table-column label="用户编号" align="center" prop="userId" />
       <el-table-column label="币种" align="center" prop="coin" />
@@ -119,9 +114,9 @@
       <el-table-column label="实际买入或者卖出的法币金额" align="center" prop="realityLegalNums" />
       <el-table-column label="结算得到数量" align="center" prop="realitySettleCoinNums" />
       <el-table-column label="法币价格" align="center" prop="legalCurrency" />
-      <el-table-column label="类型：pen：按笔，percentage：百分比" align="center" prop="feeType" />
+      <el-table-column label="类型" align="center" prop="feeType"  :formatter="feeTypeFormat"/>
       <el-table-column label="手续费" align="center" prop="fee" />
-      <el-table-column label="订单状态(挂单中 pending_order、已锁住is_lock、已完成 close、已取消 cancel、待放行released,申诉中in_appeal）" align="center" prop="orderStatus" />
+      <el-table-column label="订单状态" align="center" prop="orderStatus" :formatter="orderStatusFormat" />
       <el-table-column label="支付方式" align="center" prop="paymentType" />
       <el-table-column label="付款时间倒计时" align="center" prop="paymentEndTime" width="180">
         <template slot-scope="scope">
@@ -146,11 +141,11 @@
       <el-table-column label="收款人" align="center" prop="payee" />
       <el-table-column label="收款银行" align="center" prop="collectionBank" />
       <el-table-column label="收款账号" align="center" prop="collectionAccount" />
-      <el-table-column label="支付参考账号" align="center" prop="paymentAccount" />
+     <!-- <el-table-column label="支付参考账号" align="center" prop="paymentAccount" />
       <el-table-column label="是否可以申诉" align="center" prop="isAppeal" />
       <el-table-column label="申诉订单编号" align="center" prop="appealOrderId" />
       <el-table-column label="申诉状态" align="center" prop="appealStatus" />
-      <el-table-column label="取消类型" align="center" prop="cancelType" />
+      <el-table-column label="取消类型" align="center" prop="cancelType" /> -->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -324,6 +319,9 @@ export default {
       total: 0,
       // 用户otc订单表格数据
       otcOrderList: [],
+      feeTypeOptions: [],
+        orderStatusOptions: [],
+        tradeTypeStatusOptions: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -380,6 +378,18 @@ export default {
   },
   created() {
     this.getList();
+    this.getDicts("trade_type").then(response => {
+      this.tradeTypeStatusOptions = response.data;
+    });
+    this.getDicts("order_status").then(response => {
+      this.orderStatusOptions = response.data;
+    });
+
+    this.getDicts("fee_type").then(response => {
+      this.feeTypeOptions = response.data;
+    });
+
+
   },
   methods: {
     /** 查询用户otc订单列表 */
@@ -391,6 +401,19 @@ export default {
         this.loading = false;
       });
     },
+    tradeTypeFormat(row, column) {
+
+       return this.selectDictLabel(this.tradeTypeStatusOptions, row.tradeType);
+    },
+    orderStatusFormat(row, column) {
+
+       return this.selectDictLabel(this.orderStatusOptions, row.orderStatus);
+    },
+
+    feeTypeFormat(row, column) {
+
+       return this.selectDictLabel(this.feeTypeOptions, row.feeType);
+    },
     // 取消按钮
     cancel() {
       this.open = false;

src/views/otc/otcStoreOrder/index.vue

@@ -10,11 +10,17 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="交易类型" prop="tradeType">
+     <el-form-item label="交易类型" prop="appealStatus">
-        <el-select v-model="queryParams.tradeType" placeholder="请选择交易类型" clearable size="small">
+         <el-select v-model="queryParams.tradeTypeStatus" placeholder="请选择交易类型" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
+           <el-option
-        </el-select>
+             v-for="dict in tradeTypeStatusOptions"
-      </el-form-item>
+             :key="dict.dictValue"
+             :label="dict.dictLabel"
+             :value="dict.dictValue"
+           />
+         </el-select>
+       </el-form-item>
+
       <el-form-item label="商家编号" prop="storeId">
         <el-input
           v-model="queryParams.storeId"
@@ -33,111 +39,32 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="币种数量" prop="coinNum">
+
-        <el-input
+
-          v-model="queryParams.coinNum"
+
-          placeholder="请输入币种数量"
+     <el-form-item label="类型" prop="feeType">
-          clearable
+            <el-select v-model="queryParams.feeType" placeholder="请选择类型" clearable size="small">
-          size="small"
+              <el-option
-          @keyup.enter.native="handleQuery"
+                v-for="dict in feeTypeOptions"
-        />
+                :key="dict.dictValue"
-      </el-form-item>
+                :label="dict.dictLabel"
-      <el-form-item label="实际币种数量" prop="realityCoinNum">
+                :value="dict.dictValue"
-        <el-input
+              />
-          v-model="queryParams.realityCoinNum"
+            </el-select>
-          placeholder="请输入实际币种数量"
+          </el-form-item>
-          clearable
+
-          size="small"
+          <el-form-item label="订单状态" prop="orderStatus">
-          @keyup.enter.native="handleQuery"
+            <el-select v-model="queryParams.feeTypeStatus" placeholder="请选择订单状态" clearable size="small">
-        />
+              <el-option
-      </el-form-item>
+                v-for="dict in orderStatusOptions"
-      <el-form-item label="剩余数量" prop="remainNum">
+                :key="dict.dictValue"
-        <el-input
+                :label="dict.dictLabel"
-          v-model="queryParams.remainNum"
+                :value="dict.dictValue"
-          placeholder="请输入剩余数量"
+              />
-          clearable
+            </el-select>
-          size="small"
+          </el-form-item>
-          @keyup.enter.native="handleQuery"
+
-        />
+
-      </el-form-item>
-      <el-form-item label="法币价格" prop="legalCurrency">
-        <el-input
-          v-model="queryParams.legalCurrency"
-          placeholder="请输入法币价格"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="订单状态(挂单中 pending_order、已锁住is_lock、已完成 close、已取消 cancel、待放行released,申诉中in_appeal）" prop="orderStatus">
-        <el-select v-model="queryParams.orderStatus" placeholder="请选择订单状态(挂单中 pending_order、已锁住is_lock、已完成 close、已取消 cancel、待放行released,申诉中in_appeal）" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="最小限额" prop="minLimit">
-        <el-input
-          v-model="queryParams.minLimit"
-          placeholder="请输入最小限额"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="最大限额" prop="maxLimit">
-        <el-input
-          v-model="queryParams.maxLimit"
-          placeholder="请输入最大限额"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="限额币种" prop="limitCoin">
-        <el-input
-          v-model="queryParams.limitCoin"
-          placeholder="请输入限额币种"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="类型：pen：按笔，percentage：百分比" prop="feeType">
-        <el-select v-model="queryParams.feeType" placeholder="请选择类型：pen：按笔，percentage：百分比" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="手续费" prop="fee">
-        <el-input
-          v-model="queryParams.fee"
-          placeholder="请输入手续费"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="百分比的时" prop="feeRate">
-        <el-input
-          v-model="queryParams.feeRate"
-          placeholder="请输入百分比的时"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="已扣除手续费" prop="deductedFee">
-        <el-input
-          v-model="queryParams.deductedFee"
-          placeholder="请输入已扣除手续费"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="收款方式 多个逗号分割" prop="walletType">
-        <el-select v-model="queryParams.walletType" placeholder="请选择收款方式 多个逗号分割" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -194,18 +121,18 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="流水编号" align="center" prop="id" />
       <el-table-column label="订单编号" align="center" prop="orderNo" />
-      <el-table-column label="交易类型" align="center" prop="tradeType" />
+      <el-table-column label="交易类型" align="center" prop="tradeType"   :formatter="tradeTypeFormat" />
       <el-table-column label="商家编号" align="center" prop="storeId" />
       <el-table-column label="币种" align="center" prop="coin" />
       <el-table-column label="币种数量" align="center" prop="coinNum" />
       <el-table-column label="实际币种数量" align="center" prop="realityCoinNum" />
       <el-table-column label="剩余数量" align="center" prop="remainNum" />
       <el-table-column label="法币价格" align="center" prop="legalCurrency" />
-      <el-table-column label="订单状态(挂单中 pending_order、已锁住is_lock、已完成 close、已取消 cancel、待放行released,申诉中in_appeal）" align="center" prop="orderStatus" />
+      <el-table-column label="订单状态" align="center" prop="orderStatus" :formatter="orderStatusFormat" />
       <el-table-column label="最小限额" align="center" prop="minLimit" />
       <el-table-column label="最大限额" align="center" prop="maxLimit" />
       <el-table-column label="限额币种" align="center" prop="limitCoin" />
-      <el-table-column label="类型：pen：按笔，percentage：百分比" align="center" prop="feeType" />
+      <el-table-column label="类型" align="center" prop="feeType"  :formatter="feeTypeFormat"/>
       <el-table-column label="手续费" align="center" prop="fee" />
       <el-table-column label="百分比的时" align="center" prop="feeRate" />
       <el-table-column label="已扣除手续费" align="center" prop="deductedFee" />
@@ -230,7 +157,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -344,6 +271,9 @@ export default {
       total: 0,
       // otc订单信息表格数据
       otcStoreOrderList: [],
+      feeTypeOptions: [],
+        orderStatusOptions: [],
+           tradeTypeStatusOptions: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -401,6 +331,17 @@ export default {
   },
   created() {
     this.getList();
+    this.getDicts("order_status").then(response => {
+      this.orderStatusOptions = response.data;
+    });
+
+    this.getDicts("fee_type").then(response => {
+      this.feeTypeOptions = response.data;
+    });
+    this.getDicts("trade_type").then(response => {
+      this.tradeTypeStatusOptions = response.data;
+    });
+
   },
   methods: {
     /** 查询otc订单信息列表 */
@@ -412,6 +353,19 @@ export default {
         this.loading = false;
       });
     },
+  orderStatusFormat(row, column) {
+       return this.selectDictLabel(this.orderStatusOptions, row.orderStatus);
+    },
+
+    feeTypeFormat(row, column) {
+
+       return this.selectDictLabel(this.feeTypeOptions, row.feeType);
+    },
+    
+    tradeTypeFormat(row, column) {
+    
+       return this.selectDictLabel(this.tradeTypeStatusOptions, row.tradeType);
+    },
     // 取消按钮
     cancel() {
       this.open = false;