更新

src/views/otc/OtcStoreBondConfig/index.vue

@@ -109,7 +109,7 @@
     <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="质押币种" prop="pledgeCoin">
-          <el-input v-model="form.pledgeCoin" placeholder="请输入质押币种" :disabled="form.id" />
+          <el-input v-model="form.pledgeCoin" placeholder="请输入质押币种" :disabled="form.id?true:false" />
         </el-form-item>
         <el-form-item label="质押币种最低数量" prop="pledgeMinNum">
           <el-input v-model="form.pledgeMinNum" placeholder="请输入质押币种最低数量" />
@@ -145,7 +145,7 @@
         <!--          </el-date-picker>-->
         <!--        </el-form-item>-->
         <el-form-item label="质押标识" prop="code">
-          <el-input v-model="form.code" placeholder="请输入质押标识" :disabled="form.id" />
+          <el-input v-model="form.code" placeholder="请输入质押标识" :disabled="form.id?true:false" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">

src/views/otc/otcAppealConfig/index.vue

@@ -79,7 +79,7 @@
             type="text"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['otc:otcAppealConfig:edit']"
-          >修改</el-button>
+          >编辑</el-button>
           <el-button
             size="medium"
             type="text"
@@ -117,7 +117,7 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="是否">
+        <el-form-item label="状态">
 <!--          <el-radio-group v-model="form.status">-->
 <!--            <el-radio label="1">请选择字典生成</el-radio>-->
 <!--          </el-radio-group>-->
@@ -245,11 +245,6 @@ export default {
     // 表单重置
     reset() {
       this.form = {
-        id: null,
-        remark: null,
-        terminalSource: null,
-        status: "Y",
-        createTime: null
       };
       this.resetForm("form");
     },

src/views/otc/otcAppealOrder/appealDetail.vue

@@ -2,8 +2,8 @@
     <div class="app-container">
         <div class="bg bg-white">
             <div class="detailTit flex m-b-16">
-                 <div class="circle"></div>
+                <div class="circle"></div>
-                 订单信息
+                订单信息
             </div>
             <el-table v-loading="loading" :data="UserCertificationList">
                 <el-table-column :label="'订单编号'" align="center" prop="balance">
@@ -183,16 +183,12 @@
                         <div class="text flex m-b-28">
                             申诉文件：
                             <div class="flex">
-                               <template v-if="UserCertificationList[0].listUrl.length" >
+                                <template v-if="UserCertificationList[0].listUrl.length">
-                                <el-image v-for="dict in UserCertificationList[0].listUrl" 
+                                    <el-image v-for="dict in UserCertificationList[0].listUrl" :key="dict"
-                                :key="dict" 
+                                        @click="previewImage(dict)" style="width: 150px;height:150px;margin-right:10px"
-                                @click="previewImage(dict)"
+                                        :src="dict" :preview-src-list="srcList" class="avatar">
-                                style="width: 150px;height:150px;margin-right:10px"
+                                    </el-image>
-                                :src="dict" 
+                                </template>
-                                :preview-src-list="srcList"
-                                class="avatar" >
-                                </el-image>
-                               </template>
                                 <span v-if="!UserCertificationList[0].listUrl.length">无</span>
                             </div>
                         </div>
@@ -328,6 +324,7 @@ export default {
         cancelApple() {
             this.openApple = false;
             this.open = false;
+            this.formApple.appealDesc=''
             this.reset();
         },
         handleSuccess() {
@@ -336,9 +333,14 @@ export default {
             this.formApple = this.UserCertificationList[0]
         },
         handleFail() {
-            this.reset()
+            getOtcAppealOrder(this.detailId).then(response => {
-            this.formApple = this.UserCertificationList[0]
+                this.reset()
-            this.openApple = true
+                this.formApple = this.UserCertificationList[0]
+                this.formApple.appealDesc=''
+                this.openApple = true
+            });
+
+
         },
         // 表单重置
         reset() {

src/views/otc/otcAppealOrder/index.vue

@@ -32,7 +32,7 @@
         </el-form-item>
 
         <el-form-item label="下单时间">
-                <el-date-picker v-model="dateRange" size="medium" style="width: 340px" value-format="yyyy-MM-dd HH:mm:ss"
+                <el-date-picker v-model="dateRange" size="medium" style="width: 360px" 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']"></el-date-picker>
             </el-form-item>
@@ -381,6 +381,12 @@ export default {
       });
     });
   },
+
+  watch:{
+  $route(to,from){
+    this.getList()
+  }
+},
   methods: {
     handleView(row) {
       this.$router.push(

src/views/otc/otcCurrencyCoin/index.vue

@@ -89,7 +89,6 @@
     </el-row>
 
     <el-table v-loading="loading" :data="otcCurrencyCoinList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="法币简称" align="center" prop="currencyCoin" />
       <el-table-column label="法币全称" align="center" prop="fullName" />
       <el-table-column label="状态" align="center" prop="isDefault" width="140px">

src/views/otc/otcFinance/index.vue

@@ -29,7 +29,7 @@
                 </el-form-item>
 
                 <el-form-item label="创建时间">
-                    <el-date-picker v-model="dateRange" size="medium" style="width: 340px"
+                    <el-date-picker v-model="dateRange" size="medium" style="width: 360px"
                         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']"></el-date-picker>

src/views/otc/otcOrder/index.vue

@@ -70,7 +70,7 @@
       </el-form-item>
 
       <el-form-item label="下单时间">
-                <el-date-picker v-model="dateRange" size="medium" style="width: 340px" value-format="yyyy-MM-dd HH:mm:ss"
+                <el-date-picker v-model="dateRange" size="medium" style="width: 360px" 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']"></el-date-picker>
             </el-form-item>

src/views/otc/otcStore/index.vue

@@ -16,7 +16,7 @@
             </el-form-item>
 
             <el-form-item label="创建时间">
-                <el-date-picker v-model="dateRange" size="medium" style="width: 340px" value-format="yyyy-MM-dd HH:mm:ss"
+                <el-date-picker v-model="dateRange" size="medium" style="width: 360px" 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']"></el-date-picker>
             </el-form-item>

src/views/otc/otcStoreDaiFuOrder/index.vue

@@ -40,7 +40,7 @@
                 </el-form-item>
 
                 <el-form-item label="创建时间">
-                    <el-date-picker v-model="dateRange" size="medium" style="width: 340px"
+                    <el-date-picker v-model="dateRange" size="medium" style="width: 360px"
                         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']"></el-date-picker>
@@ -60,7 +60,7 @@
                 <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
             </el-row>
 
-            <el-table :data="infoList" v-loading="loading">
+            <el-table :data="otcCoinList" v-loading="loading">
 
                 <el-table-column label="平台订单号" align="center" prop="noOrder" />
 

src/views/otc/otcStoreOrder/index.vue

@@ -30,7 +30,7 @@
         </el-form-item>
 
         <el-form-item label="下单时间">
-                <el-date-picker v-model="dateRange" size="medium" style="width: 340px" value-format="yyyy-MM-dd HH:mm:ss"
+                <el-date-picker v-model="dateRange" size="medium" style="width: 360px" 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']"></el-date-picker>
             </el-form-item>
@@ -146,71 +146,67 @@
 
     <!-- 添加或修改otc订单信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px" class="flex" style="justify-content: space-around;">
-        <el-form-item label="订单编号" prop="orderNo">
+        <div>
-          <el-input v-model="form.orderNo" placeholder="请输入订单编号" />
+
+        <el-form-item label="订单编号">
+          {{form.orderNo}}
         </el-form-item>
-        <el-form-item label="交易类型" prop="tradeType">
+        <el-form-item label="交易类型">
-          <el-select v-model="form.tradeType" placeholder="请选择交易类型">
+          {{ tradeTypeFormat(form) }}
-            <!--            <el-option label="请选择字典生成" value="" />-->
-            <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="storeId">-->
         <!--          <el-input v-model="form.storeId" placeholder="请输入商家编号" />-->
         <!--        </el-form-item>-->
-        <el-form-item label="商家昵称" prop="storeId">
+        <el-form-item label="商家昵称">
-          <el-input v-model="form.storeName" placeholder="请输入商家编号" />
+          {{form.storeName}}
         </el-form-item>
-        <el-form-item label="币种" prop="coin">
+        <el-form-item label="币种">
-          <el-input v-model="form.coin" placeholder="请输入币种" />
+          {{form.coin}}
         </el-form-item>
-        <el-form-item label="币种数量" prop="coinNum">
+        <el-form-item label="币种数量">
-          <el-input v-model="form.coinNum" placeholder="请输入币种数量" />
+          {{form.coinNum}}
         </el-form-item>
-        <el-form-item label="订单数量" prop="realityCoinNum">
+        <el-form-item label="订单数量">
-          <el-input v-model="form.realityCoinNum" placeholder="请输入订单数量" />
+          {{form.realityCoinNum}}
         </el-form-item>
-        <el-form-item label="剩余数量" prop="remainNum">
+        <el-form-item label="剩余数量">
-          <el-input v-model="form.remainNum" placeholder="请输入剩余数量" />
+          {{form.remainNum}}
         </el-form-item>
-        <el-form-item label="法币价格" prop="legalCurrency">
+        <el-form-item label="法币价格">
-          <el-input v-model="form.legalCurrency" placeholder="请输入法币价格" />
+          {{form.legalCurrency}}
         </el-form-item>
+
+
         <el-form-item label="订单状态">
           <!--          <el-radio-group v-model="form.orderStatus">-->
           <!--            <el-radio label="1">请选择字典生成</el-radio>-->
           <!--          </el-radio-group>-->
-          <el-select v-model="form.orderStatus" placeholder="订单状态">
+          {{ orderStatusFormat(form)}}
-            <el-option v-for="dict in orderStatusOptions" :key="dict.dictValue" :label="dict.dictLabel"
-              :value="dict.dictValue" />
-          </el-select>
         </el-form-item>
-        <el-form-item label="最小限额" prop="minLimit">
+        <el-form-item label="最小限额">
-          <el-input v-model="form.minLimit" placeholder="请输入最小限额" />
+          {{form.minLimit}}
         </el-form-item>
-        <el-form-item label="最大限额" prop="maxLimit">
+      </div>
-          <el-input v-model="form.maxLimit" placeholder="请输入最大限额" />
+<div>
+        <el-form-item label="最大限额">
+          {{form.maxLimit}}
         </el-form-item>
-        <el-form-item label="限额币种" prop="limitCoin">
+        
-          <el-input v-model="form.limitCoin" placeholder="请输入限额币种" />
+        <el-form-item label="限额币种">
+          {{form.limitCoin}}
         </el-form-item>
-        <el-form-item label="手续费类型：" prop="feeType">
+        <el-form-item label="手续费类型">
-          <el-select v-model="form.feeType" placeholder="手续费类型">
+          {{ feeTypeFormat(form)}}
-            <!--            <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="fee">
+        <el-form-item label="手续费">
-          <el-input v-model="form.fee" placeholder="请输入手续费" />
+          {{form.fee}}
         </el-form-item>
-        <el-form-item label="手续费率" prop="feeRate">
+        <el-form-item label="手续费率">
-          <el-input v-model="form.feeRate" placeholder="手续费率" />
+          {{form.feeRate}}
         </el-form-item>
-        <el-form-item label="已扣除手续费" prop="deductedFee">
+        <el-form-item label="已扣除手续费">
-          <el-input v-model="form.deductedFee" placeholder="请输入已扣除手续费" />
+          {{form.deductedFee}}
         </el-form-item>
         <!--        <el-form-item label="添加时间" prop="createTime">-->
         <!--          <el-date-picker clearable size="medium"-->
@@ -223,16 +219,18 @@
         <!--        <el-form-item label="收款方式" prop="walletType">-->
         <!--            <el-input v-model="form.walletType" placeholder="收款方式" />-->
         <!--        </el-form-item>-->
-        <el-form-item label="收款方式" prop="walletType">
+        <el-form-item label="收款方式">
-          <el-input v-model="form.walletTypeName" placeholder="收款方式" />
+          {{form.walletTypeName}}
         </el-form-item>
-        <el-form-item label="交易说明" prop="transactionDesc">
+        <el-form-item label="交易说明">
-          <el-input v-model="form.transactionDesc" type="textarea" placeholder="请输入内容" />
+          {{form.transactionDesc}}
         </el-form-item>
+      </div>
+
       </el-form>
       <div slot="footer" class="dialog-footer">
         <!--        <el-button type="primary" @click="submitForm">确 定</el-button>-->
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel">确 定</el-button>
       </div>
     </el-dialog>
 

src/views/otc/otcStorePledge/index.vue

@@ -146,10 +146,19 @@
         <el-form-item label="可用数量" prop="availableBalance">
           <el-input v-model="form.availableBalance" placeholder="请输入可用数量" />
         </el-form-item>
-        <el-form-item label="状态YN">
+        <el-form-item label="状态">
-          <el-radio-group v-model="form.status">
+          <!-- <el-radio-group v-model="form.status">
             <el-radio label="1">请选择字典生成</el-radio>
-          </el-radio-group>
+          </el-radio-group> -->
+          <el-select v-model="form.status" placeholder="请选择状态" clearable size="medium">
+            <el-option
+              v-for="dict in statusOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            />
+          </el-select>
+
         </el-form-item>
         <el-form-item label="添加时间" prop="createTime">
           <el-date-picker clearable size="small"
@@ -177,6 +186,8 @@ export default {
   },
   data() {
     return {
+      statusOptions: [],
+
       // 遮罩层
       loading: true,
       // 选中数组
@@ -240,7 +251,6 @@ export default {
     },
 
     statusFormat(row, column) {
-
        return this.selectDictLabel(this.statusOptions, row.status);
     },
     // 取消按钮

src/views/otc/otcStoreRechargeOrder/index.vue

@@ -40,7 +40,7 @@
             </el-form-item> -->
 
                 <el-form-item label="创建时间">
-                    <el-date-picker v-model="dateRange" size="medium" style="width: 340px"
+                    <el-date-picker v-model="dateRange" size="medium" style="width: 360px"
                         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']"></el-date-picker>
@@ -103,7 +103,7 @@
 
                 <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
                     <template slot-scope="scope">
-                        <el-button size="medium" type="text" style="  ;" v-if="scope.row.orderStatus == 1"
+                        <el-button size="medium" type="text" v-if="scope.row.orderStatus == 1"
                             @click="handleOrder(scope.row)">手工处理</el-button>
                     </template>
                 </el-table-column>

src/views/user/UserCertification/index.vue

@@ -212,6 +212,11 @@ export default {
       srcList: ["http://118.25.187.239:9099/img/adImg/557097620301025280.jpg"],
     };
   },
+  watch:{
+  $route(to,from){
+    this.getList()
+  }
+},
   created() {
     this.getList();
     this.getDicts("audit_status").then(response => {

src/views/user/ad/index.vue

@@ -140,7 +140,7 @@
             type="text"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['ad:ad:edit']"
-          >修改</el-button>
+          >编辑</el-button>
           <el-button
             size="medium"
             type="text"

src/views/user/coin/index.vue

@@ -82,7 +82,6 @@
     </el-row>
 
     <el-table v-loading="loading" :data="coinList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="ID" align="center" prop="id" />
       <el-table-column label="币种名称" align="center" prop="name" />
       <el-table-column label="中文名称" align="center" prop="nameCn" />
@@ -108,14 +107,12 @@
           <el-button
             size="medium"
             type="text"
-            icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['user:coin:edit']"
-          >修改</el-button>
+          >编辑</el-button>
           <el-button
             size="medium"
             type="text"
-            icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['user:coin:remove']"
           >删除</el-button>
@@ -135,7 +132,7 @@
 
     <!-- 添加或修改币种配置对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
       <!--  <el-form-item label="类型" prop="feeType">
         <el-select v-model="form.feeType" placeholder="请选择类型">
           <el-option label="按笔" value="pen"></el-option>

src/views/user/mail/index.vue

@@ -136,14 +136,12 @@
           <el-button
             size="medium"
             type="text"
-            icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['user:mail:edit']"
-          >修改</el-button>
+          >编辑</el-button>
           <el-button
             size="medium"
             type="text"
-            icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['user:mail:remove']"
           >删除</el-button>
@@ -162,7 +160,7 @@
 
     <!-- 添加或修改站内信对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="82px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="122px">
        <!-- <el-form-item label="发送者" prop="sender">
           <el-input v-model="form.sender" placeholder="请输入发送者" />
         </el-form-item>
@@ -378,22 +376,7 @@ export default {
     // 表单重置
     reset() {
       this.form = {
-        mailId: null,
+       
-        sender: null,
-        recipient: null,
-        mailImg: null,
-        orderNo: null,
-        mailTitleZh: null,
-        mailTitleEn: null,
-        mailTitleFt: null,
-        mailDetailsZh: null,
-        mailDetailsEn: null,
-        mailDetailsFt: null,
-        mailState: null,
-        dataStatus: "0",
-        mailType: null,
-        createTime: null,
-        updateTime: null
       };
       this.resetForm("form");
     },

src/views/user/position/index.vue

@@ -76,7 +76,7 @@
             type="text"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['ad:position:edit']"
-          >修改</el-button>
+          >编辑</el-button>
           <el-button
             size="medium"
             type="text"

src/views/user/userCustomer/index.vue

@@ -49,7 +49,7 @@
       </el-form-item>
 
       <el-form-item label="注册时间">
-                <el-date-picker v-model="dateRange" size="medium" style="width: 340px" value-format="yyyy-MM-dd HH:mm:ss"
+                <el-date-picker v-model="dateRange" size="medium" style="width: 360px" 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']"></el-date-picker>
             </el-form-item>

src/views/user/userCustomer/pkCouponScopeRangeStoreList.vue

@@ -14,7 +14,7 @@
      
       <el-form-item label="转账类型" prop="type">
         <el-select v-model="queryParams.type" placeholder="请选择转账类型" clearable size="medium">
-          <el-option v-for="dict in typeOptions" :key="dict.dictValue" :label="dict.dictLabel"
+          <el-option v-for="dict in typeOptions" :key="dict.dictCode" :label="dict.dictLabel"
             :value="dict.dictValue" />
         </el-select>
       </el-form-item>
@@ -48,7 +48,7 @@
 
     <div class="bg bg-white">
             <el-row :gutter="10" class="m-b-16">
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="primary"
           size="medium"
@@ -73,7 +73,7 @@
           @click="handleDelete"
           v-hasPermi="['user:walletAssetsRecord:remove']"
         >删除</el-button>
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -86,37 +86,31 @@
     </el-row>
 
     <el-table v-loading="loading" :data="walletAssetsRecordList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="用户名称" align="center" prop="userName" />
-      <el-table-column label="流水编号" align="center" prop="id" />
+        <el-table-column label="操作类型" align="center" prop="type" :formatter="typeFormat" />
-    <!--  <el-table-column label="用户编号" align="center" prop="userId" /> -->
+        <el-table-column label="币种" align="center" prop="coinId" />
-      <el-table-column label="用户姓名" align="center" prop="userName" />
+        <el-table-column label="数量" align="center" prop="num" />
-      <el-table-column label="转账类型" align="center" prop="type" :formatter="typeFormat"/>
+        <!-- <el-table-column label="手续费" align="center" prop="fee" /> -->
-      <el-table-column label="币种" align="center" prop="coinId" />
+        <!-- <el-table-column label="类型 完成complete" align="center" prop="status" /> -->
-      <el-table-column label="数量" align="center" prop="num" />
+
-      <el-table-column label="手续费" align="center" prop="fee" />
+        <el-table-column label="变动前余额" align="center">
-     <!-- <el-table-column label="类型 完成complete" align="center" prop="status" /> -->
+          <template slot-scope="scope">
-      <el-table-column label="剩下金额" align="center" prop="remainBalance" />
+            {{ scope.row.num + scope.row.remainBalance }}
-      <el-table-column label="业务编号" align="center" prop="serviceId" />
+          </template>
-     <!-- <el-table-column label="是否显示" align="center" prop="isShow" /> -->
+        </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <el-table-column label="变动后余额" align="center" prop="remainBalance" />
-        <template slot-scope="scope">
+        <el-table-column label="操作时间" align="center" prop="createTime" />
-          <el-button
+
-            size="medium"
+        <!-- <el-table-column label="是否显示" align="center" prop="isShow" /> -->
-            type="text"
+        <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-            icon="el-icon-edit"
+          <template slot-scope="scope">
-            @click="handleUpdate(scope.row)"
+            <el-button size="medium" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-            v-hasPermi="['user:walletAssetsRecord:edit']"
+              v-hasPermi="['user:walletAssetsRecord:edit']">修改</el-button>
-          >修改</el-button>
+            <el-button size="medium" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-          <el-button
+              v-hasPermi="['user:walletAssetsRecord:remove']">删除</el-button>
-            size="medium"
+          </template>
-            type="text"
+        </el-table-column> -->
-            icon="el-icon-delete"
+      </el-table>
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['user:walletAssetsRecord:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
 
     <pagination
       v-show="total>0"
@@ -135,7 +129,7 @@
         </el-form-item>
         <el-form-item label="转账类型" prop="type">
           <el-select v-model="form.type" placeholder="请选择转账类型" clearable size="medium">
-          <el-option v-for="dict in typeOptions" :key="dict.dictValue" :label="dict.dictLabel"
+          <el-option v-for="dict in typeOptions" :key="dict.dictCode" :label="dict.dictLabel"
             :value="dict.dictValue" />
         </el-select>
 
@@ -192,7 +186,7 @@ export default {
   },
   props: {
     pkCouponId: {
-      type: Number,
+      type: String,
       default() {
         return null;
       },

src/views/user/walletAssetsRecord/index.vue

@@ -30,7 +30,7 @@
         </el-form-item>
 
         <el-form-item label="操作时间">
-                <el-date-picker v-model="dateRange" size="medium" style="width: 340px" value-format="yyyy-MM-dd HH:mm:ss"
+                <el-date-picker v-model="dateRange" size="medium" style="width: 360px" 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']"></el-date-picker>
             </el-form-item>