From 9ed8be40d7e7701f1b89e8a5be882b6c38eddb39 Mon Sep 17 00:00:00 2001
From: yangchangfa <721441256@qq.com>
Date: Mon, 29 Jul 2024 19:04:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E4=BB=98=E8=AE=A2=E5=8D=95=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=8A=E8=AE=A2=E5=8D=95=E7=8E=AF=E5=A2=83=EF=BC=88=E7=94=9F?=
 =?UTF-8?q?=E4=BA=A7=E3=80=81=E6=B5=8B=E8=AF=95=EF=BC=89=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/pay/payOrder/payDaiFuWater.vue | 43 +++++++++++++++---------
 1 file changed, 28 insertions(+), 15 deletions(-)

diff --git a/src/views/pay/payOrder/payDaiFuWater.vue b/src/views/pay/payOrder/payDaiFuWater.vue
index bc18454..6e4b096 100644
--- a/src/views/pay/payOrder/payDaiFuWater.vue
+++ b/src/views/pay/payOrder/payDaiFuWater.vue
@@ -14,57 +14,64 @@
             <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="96px"
                 class="flex form" style="padding:0 20px">
                 <el-form-item label="商户订单号" prop="outTradeNo">
-                    <el-input size="small" v-model="queryParams.outTradeNo" placeholder="请输入商户订单号"
+                    <el-input size="small" v-model="queryParams.outTradeNo" placeholder="请输入商户订单号" clearable
                         @keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" />
                 </el-form-item>
                 <el-form-item label="平台订单号" prop="noOrder">
-                    <el-input size="small" v-model="queryParams.noOrder" placeholder="请输入平台订单号"
+                    <el-input size="small" v-model="queryParams.noOrder" placeholder="请输入平台订单号" clearable
                         @keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" />
                 </el-form-item>
                 <el-form-item label="商户名称" prop="storeName">
-                    <el-input size="small" v-model="queryParams.storeName" placeholder="请输入商户名称"
+                    <el-input size="small" v-model="queryParams.storeName" placeholder="请输入商户名称" clearable
                         @keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" />
                 </el-form-item>
                 <el-form-item label="银行卡号" prop="acctId">
-                    <el-input size="small" v-model="queryParams.acctId" placeholder="请输入银行卡号"
+                    <el-input size="small" v-model="queryParams.acctId" placeholder="请输入银行卡号" clearable
                         @keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" />
                 </el-form-item>
                 <el-form-item label="代付状态" prop="orderStatus">
-                    <el-select v-model="queryParams.orderStatus" placeholder="请选择代付状态" size="small">
+                    <el-select v-model="queryParams.orderStatus" placeholder="请选择代付状态" size="small" clearable>
                         <el-option v-for="dict in dict.type.payment_status" :key="dict.value" :label="dict.label"
                             :value="dict.value" />
                     </el-select>
                 </el-form-item>
 
                 <el-form-item label="出金渠道" prop="outChannel">
-                    <el-select v-model="queryParams.outChannel" placeholder="请选择出金渠道" clearable size="small">
+                    <el-select v-model="queryParams.outChannel" placeholder="请选择出金渠道" clearable size="small" clearable>
                         <el-option v-for="(item, i) in userLevType" :key="i" :label="item.channelName"
                             :value="item.payChannel"></el-option>
                     </el-select>
                 </el-form-item>
 
                 <el-form-item label="是否发起代付" prop="isPayment">
-                    <el-select v-model="queryParams.isPayment" placeholder="请选择是否发起代付" size="small">
+                    <el-select v-model="queryParams.isPayment" placeholder="请选择是否发起代付" size="small" clearable>
                         <el-option v-for="dict in dict.type.yes_no" :key="dict.value" :label="dict.label"
                             :value="dict.value" />
                     </el-select>
                 </el-form-item>
                 <el-form-item label="订单来源" prop="sourceType">
-                    <el-select v-model="queryParams.sourceType" placeholder="请选择订单来源" size="small">
+                    <el-select v-model="queryParams.sourceType" placeholder="请选择订单来源" size="small" clearable>
                         <el-option v-for="dict in dict.type.source_type" :key="dict.value" :label="dict.label"
                             :value="dict.value" />
                     </el-select>
                 </el-form-item>
 
+              <el-form-item label="订单环境" prop="belongEnv">
+                <el-select v-model="queryParams.belongEnv" placeholder="请选择订单环境" size="small" clearable>
+                  <el-option v-for="dict in dict.type.belongEnv" :key="dict.value" :label="dict.label"
+                             :value="dict.value" />
+                </el-select>
+              </el-form-item>
+
                 <el-form-item label="创建时间">
-                    <el-date-picker v-model="dateRange[0]" size="small" style="width: 340px; height: 32px;"
+                    <el-date-picker v-model="dateRange[0]" size="small" style="width: 340px; height: 32px;" clearable
                         value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="-" start-placeholder="开始日期"
                         end-placeholder="结束日期" :unlink-panels="true" :default-time="['00:00:00', '23:59:59']"
                         :picker-options="pickerOptions"></el-date-picker>
                 </el-form-item>
 
                 <el-form-item label="更新时间">
-                    <el-date-picker v-model="dateRange[1]" size="small" style="width: 340px; height: 32px"
+                    <el-date-picker v-model="dateRange[1]" size="small" style="width: 340px; height: 32px" clearable
                         value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="-" start-placeholder="开始日期"
                         end-placeholder="结束日期" :unlink-panels="true" :default-time="['00:00:00', '23:59:59']"
                         :picker-options="pickerOptions"></el-date-picker>
@@ -153,9 +160,15 @@
 
 
                 <el-table-column :label="'订单信息'" align="left" prop="orderMsg" min-width="100" show-overflow-tooltip/>
-
                 <el-table-column :label="'备注'" align="left" prop="memo" min-width="100" />
 
+                <el-table-column :label="'订单环境'" align="center" prop="belongEnv" min-width="80">
+                  <template slot-scope="scope">
+                    <el-tag
+                      :type="scope.row.belongEnv === 'pro' ? 'success' : 'info'"
+                      disable-transitions>  {{ scope.row.belongEnv == 'pro' ? '生产' : '测试' }}</el-tag>
+                  </template>
+                </el-table-column>
 
                 <el-table-column :label="'更新时间'" align="center" prop="storeNo" min-width="120">
                     <template slot-scope="scope">
@@ -368,7 +381,7 @@ import { common_api, platform_payment_list, payOrder } from "@/api/form";
 
 export default {
     name: "PkAdWeiList",
-    dicts: ['pay_status', 'source_type', 'yes_no', 'payment_status'],
+    dicts: ['pay_status', 'source_type', 'yes_no', 'payment_status', 'belongEnv'],
     data() {
         return {
             orderStatusType: [
@@ -498,6 +511,7 @@ export default {
             idskey: [],
             // 非单个禁用
             single: true,
+
             // 非多个禁用
             multiple: true,
             dateRange: [],
@@ -508,8 +522,7 @@ export default {
             // 导出遮罩层
             exportLoading: false,
             paymentIds: [],
-            // 非多个禁用
-            multiple: true,
+
             // 显示搜索条件
             showSearch: true,
             // 总条数
@@ -537,7 +550,7 @@ export default {
                 outTradeNo: null,
                 batchNo: null,
                 userType: null,
-
+                belongEnv: null
             },
 
             // 表单参数