From d779143a62b841452226ac3fe6439f9b2552f41d Mon Sep 17 00:00:00 2001
From: "DESKTOP-369JRHT\\12997" <9>
Date: Tue, 29 Oct 2024 14:14:27 +0800
Subject: [PATCH] 10.29

---
 fuintAdmin/src/views/power/banner.vue        |  39 +--
 fuintAdmin/src/views/power/linkManage.vue    |   4 +-
 fuintAdmin/src/views/power/message.vue       |  44 +--
 fuintAdmin/src/views/power/notice.vue        |   2 +
 fuintAdmin/src/views/power/operateLog.vue    |   7 +-
 fuintAdmin/src/views/power/page/mode.vue     |  38 ++-
 fuintAdmin/src/views/power/page/record.vue   |  74 ++---
 fuintAdmin/src/views/power/payment/index.vue | 268 ++-----------------
 8 files changed, 89 insertions(+), 387 deletions(-)

diff --git a/fuintAdmin/src/views/power/banner.vue b/fuintAdmin/src/views/power/banner.vue
index 599630f2b..289c7632d 100644
--- a/fuintAdmin/src/views/power/banner.vue
+++ b/fuintAdmin/src/views/power/banner.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-conts">
     <div class="card-change" >
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
         <el-form-item label="" prop="name">
@@ -11,33 +11,13 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-
-        <!--        <el-form-item style="float: right">-->
-<!--        <el-form-item label="" prop="bannerName">-->
-<!--          <el-select v-model="queryParams.systemPosition" placeholder="请选择系统位置">-->
-<!--            <el-option-->
-<!--              v-for="item in systemPositionList"-->
-<!--              :key="item.value"-->
-<!--              :label="item.label"-->
-<!--              :value="item.value">-->
-<!--            </el-option>-->
-<!--          </el-select>-->
-<!--        </el-form-item>-->
-
         <el-form-item label="" prop="bannerName">
           <el-select v-model="queryParams.bannerStatus" placeholder="请选择banner图状态">
             <el-option label="停用" value="0" ></el-option>
             <el-option label="启用" value="1" ></el-option>
-            <!--                <el-option-->
-            <!--                  v-for="item in systemPositionList"-->
-            <!--                  :key="item.value"-->
-            <!--                  :label="item.label"-->
-            <!--                  :value="item.value">-->
-            <!--                </el-option>-->
           </el-select>
         </el-form-item>
-
-        <el-form-item style="float: right">
+        <el-form-item style="float: right;margin-right: 0px">
           <el-button type="primary" icon="el-icon-search"  @click="handleQuery">搜索</el-button>
           <el-button icon="el-icon-refresh"  @click="resetQuery">重置</el-button>
           <el-button
@@ -48,13 +28,7 @@
           >新增banner图</el-button>
         </el-form-item>
       </el-form>
-      <!--    </el-card>-->
-
-      <!--    &lt;!&ndash;    列表信息&ndash;&gt;-->
-      <!--    <el-card style="margin-top: 20px" >-->
-
-
-      <div style="height: 73.6vh;overflow: auto">
+      <div style="height: 76vh;overflow: auto">
         <el-table :data="tableData" style="width: 100%;" border>
           <el-table-column type="index" align="center" label="序号"></el-table-column>
           <el-table-column prop="bannerName" align="center" label="banner名称"></el-table-column>
@@ -383,6 +357,13 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.app-conts{
+  width: 100%;
+  box-sizing: border-box;
+  padding: 10px;
+  min-height: 90vh;
+  background: #f6f8f9;
+}
 .common-dialog >>> .el-upload--picture-card {
   width: 60px;
   height: 50px;
diff --git a/fuintAdmin/src/views/power/linkManage.vue b/fuintAdmin/src/views/power/linkManage.vue
index 3c7a6a6da..692eba3bd 100644
--- a/fuintAdmin/src/views/power/linkManage.vue
+++ b/fuintAdmin/src/views/power/linkManage.vue
@@ -28,7 +28,7 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item style="float: right">
+        <el-form-item style="float: right;margin-right: 0px">
           <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
           <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
           <el-button type="primary" @click="handleAdd">新增链接</el-button>
@@ -44,7 +44,7 @@
           <el-table-column prop="hlink" align="center" label="H5链接"></el-table-column>
           <el-table-column prop="accountName" align="center" label="创建人"></el-table-column>
           <el-table-column prop="createTime" align="center" label="创建时间"></el-table-column>
-          <el-table-column align="center" label="操作">
+          <el-table-column align="center" width="180px" label="操作">
             <template slot-scope="scope">
               <el-button
                 size="mini"
diff --git a/fuintAdmin/src/views/power/message.vue b/fuintAdmin/src/views/power/message.vue
index d5d16c9dd..ff3fec8f8 100644
--- a/fuintAdmin/src/views/power/message.vue
+++ b/fuintAdmin/src/views/power/message.vue
@@ -1,14 +1,12 @@
 <template>
-  <div class="app-container">
-
+  <div class="container_hui">
     <div class="tab-box">
       <div class="tab_" :class="{active:index== tabindex }" @click="getindex(index)" v-for="(item,index) in  tabs"
            :key="index">
         {{ item.name }}
       </div>
     </div>
-
-    <div class="card-change" style="margin: 20px" v-if="tabindex == 0">
+    <div class="card-changes"  v-if="tabindex == 0">
       <!--   短信模板查询   -->
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="180px">
         <el-form-item label="" prop="name">
@@ -28,7 +26,7 @@
         </el-form-item>
 
         <el-form-item label="" prop="status">
-          <el-select v-model="queryParams.status" style="width: 150px" placeholder="请选择短信模版状态">
+          <el-select v-model="queryParams.status" style="width: 240px" placeholder="请选择短信模版状态">
             <el-option
               v-for="dict in dict.type.message_status"
               :key="dict.value"
@@ -38,20 +36,19 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item style="float: right">
+        <el-form-item style="float: right;margin-right: 0px">
           <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
           <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
           <el-button
             type="primary"
             icon="el-icon-plus"
             @click="handleAdd"
-            v-hasPermi="['setting:message:add']"
           >新增短信模板
           </el-button>
         </el-form-item>
       </el-form>
       <!-- 短信模板列表 -->
-      <div style="height: 72vh;overflow: auto;width: 100%">
+      <div style="height: 68vh;overflow: auto;width: 100%">
         <el-table :data="tableData" border width="500%" :header-cell-style="{'text-align':'center'}">
           <el-table-column type="index" label="序号"></el-table-column>
           <el-table-column prop="messageId" label="短信模板ID" width="100">
@@ -137,9 +134,8 @@
 
     </div>
     <!--  发送短信  -->
-    <div class="card-change" style="margin: 20px" v-if="tabindex == 1">
+    <div class="card-changes"  v-if="tabindex == 1">
       <el-form :model="sendqueryParams" ref="queryForm" size="small" :inline="true" label-width="180px">
-
         <el-form-item label="" prop="name">
           <el-input
             v-model="sendqueryParams.name"
@@ -156,7 +152,7 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item style="float: right">
+        <el-form-item style="float: right;margin-right: 0px">
           <el-button type="primary" icon="el-icon-search" @click="sendhandleQuery">搜索</el-button>
           <el-button icon="el-icon-refresh" @click="sendresetQuery">重置</el-button>
         </el-form-item>
@@ -243,7 +239,7 @@
 
     </div>
     <!-- 短信费用 -->
-    <div class="card-change" style="margin: 20px" v-if="tabindex == 2">
+    <div class="card-changes"  v-if="tabindex == 2">
       <el-form :model="costqueryParams" ref="queryParams2" size="small" :inline="true" label-width="180px">
 
         <el-form-item label="" prop="createName">
@@ -255,8 +251,7 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-
-        <el-form-item style="float: right">
+        <el-form-item style="float: right;margin-right: 0px">
           <el-button type="primary" icon="el-icon-search" @click="costhandleQuery">搜索</el-button>
           <el-button icon="el-icon-refresh" @click="costresetQuery">重置</el-button>
           <el-button
@@ -462,7 +457,6 @@
       </el-form>
 
     </el-dialog>
-
     <!-- 新增费用设置 -->
     <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open2" width="30%" append-to-body>
       <el-form ref="form2" :rules="rules" :model="form2" label-width="80px">
@@ -490,7 +484,6 @@
         <el-button type="primary" @click="submitForm2">确 定</el-button>
       </div>
     </el-dialog>
-
     <!--  充值  -->
     <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open3" width="30%" append-to-body>
       <el-form ref="form3" :rules="rules" :model="form3" label-width="80px">
@@ -553,7 +546,6 @@
         </div>
       </el-form>
     </el-dialog>
-
   </div>
 </template>
 
@@ -1149,7 +1141,21 @@ export default {
 </script>
 <style lang="scss" scoped>
 .app-container {
-  padding: 0;
+  padding: 0px !important;
+}
+.container_hui{
+  background: #f6f8f9;
+  box-sizing: border-box;
+  padding-bottom: 10px;
+}
+
+.card-changes{
+  background: #fff;
+  border-radius: 8px;
+  box-sizing: border-box;
+  padding: 15px;
+  margin: 10px;
+  height: 86vh;
 }
 
 .common-dialog > > > .el-upload--picture-card {
@@ -1185,7 +1191,7 @@ export default {
   background: #fff;
   display: flex;
   box-sizing: border-box;
-  margin-bottom: 25px;
+  margin-bottom: 10px;
   text-align: center; /* 水平居中 */
 
 }
diff --git a/fuintAdmin/src/views/power/notice.vue b/fuintAdmin/src/views/power/notice.vue
index 0c67a9dbd..d94513a2b 100644
--- a/fuintAdmin/src/views/power/notice.vue
+++ b/fuintAdmin/src/views/power/notice.vue
@@ -46,6 +46,7 @@ export default {
   margin-right: 50px;
   display: flex;
   align-items: center;
+  cursor: pointer;
 
 }
 .active{
@@ -55,6 +56,7 @@ export default {
 .container{
   background: #F4F5F9;
   box-sizing: border-box;
+  padding-bottom: 10px;
   //padding: 20px;
 }
 .tabder-box{
diff --git a/fuintAdmin/src/views/power/operateLog.vue b/fuintAdmin/src/views/power/operateLog.vue
index 3806ce82c..a5b2c032f 100644
--- a/fuintAdmin/src/views/power/operateLog.vue
+++ b/fuintAdmin/src/views/power/operateLog.vue
@@ -1,6 +1,5 @@
 <template>
-  <div class="app-container" style="padding: 20px">
-
+  <div class="app-container" style="padding: 10px">
     <div class="card-change">
       <div>
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="40px">
@@ -72,7 +71,7 @@
             </el-date-picker>
           </el-form-item>
 
-          <el-form-item style="float: right">
+          <el-form-item style="float: right;margin-right: 0px">
 
             <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
             <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
@@ -81,7 +80,7 @@
         </el-form>
       </div>
 
-      <div style="height: 68vh;overflow: auto;width: 100%">
+      <div style="height: 71vh;overflow: auto;width: 100%;scrollbar-width: none">
         <el-table :data="tableData" style="width: 100%" border>
           <el-table-column type="index" label="序号"></el-table-column>
           <el-table-column prop="createAccount" label="登录账号"></el-table-column>
diff --git a/fuintAdmin/src/views/power/page/mode.vue b/fuintAdmin/src/views/power/page/mode.vue
index 85be5168c..8e77d7970 100644
--- a/fuintAdmin/src/views/power/page/mode.vue
+++ b/fuintAdmin/src/views/power/page/mode.vue
@@ -1,6 +1,6 @@
 <template>
-  <div class="app-container">
-    <div class="card-change">
+  <div class="container_hui">
+    <div class="cards-change">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
         <el-form-item label="" prop="notificationName">
           <el-input
@@ -22,12 +22,6 @@
         </el-form-item>
         <el-form-item label="" prop="recipientRoles">
           <el-select v-model="queryParams.recipientRoles" placeholder="请选择接收角色" clearable style="width: 240px;">
-<!--            <el-option-->
-<!--              v-for="item in roleList"-->
-<!--              :key="item.dutyId+''"-->
-<!--              :label="item.dutyName"-->
-<!--              :value="item.dutyId+''"-->
-<!--            ></el-option>-->
             <el-option v-for="item in dutyList1" :label="item.dutyName" :value="item.dutyId"></el-option>
           </el-select>
         </el-form-item>
@@ -35,25 +29,18 @@
           <el-select v-model="queryParams.templateStatus" placeholder="请选择通知状态" clearable style="width: 240px;">
             <el-option label="启用" value="1"></el-option>
             <el-option label="禁用" value="0"></el-option>
-            <!-- 添加其他选项 -->
           </el-select>
         </el-form-item>
-
-        <el-form-item style="float: right">
+        <el-form-item style="float: right;margin-right: 0px">
           <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
           <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
           <el-button
             type="primary"
-            @click="handleAdd"
-            v-hasPermi="['system:notify:addTemplate']"
-          >新增通知模板
+            @click="handleAdd">新增通知模板
           </el-button>
         </el-form-item>
       </el-form>
-      <!--    </el-card>-->
-      <!--    &lt;!&ndash;    列表信息&ndash;&gt;-->
-      <!--    <el-card style="margin-top: 20px" >-->
-      <div style="height: 65vh;overflow: auto">
+      <div style="height: 70vh;overflow: auto">
 
         <el-table :data="tableData" style="width: 100%" border>
           <el-table-column align="center" type="index" label="序号"></el-table-column>
@@ -75,15 +62,13 @@
               <el-button
                 size="mini"
                 type="text"
-                icon="el-icon-view"
                 @click="edit(scope.row)"
                 v-hasPermi="['system:notify:editTemplate']"
-              >编辑
+              >修改
               </el-button>
               <el-button
                 size="mini"
                 type="text"
-                icon="el-icon-edit"
                 @click="del(scope.row)"
                 v-hasPermi="['system:notify:deleteTemplate']"
               >删除
@@ -484,6 +469,17 @@ export default {
   height: 50px;
   line-height: 60px;
 }
+.container_hui{
+  background: #fff;
+  margin: 10px;
+  border-radius: 8px;
+  box-sizing: border-box;
+  padding: 15px;
+
+}
+.cards-change{
+    height: 83vh;
+}
 
 </style>
 
diff --git a/fuintAdmin/src/views/power/page/record.vue b/fuintAdmin/src/views/power/page/record.vue
index 9c88e71e3..490bcb7a4 100644
--- a/fuintAdmin/src/views/power/page/record.vue
+++ b/fuintAdmin/src/views/power/page/record.vue
@@ -1,6 +1,6 @@
 <template>
-  <div class="app-container">
-    <div class="card-change">
+  <div class="container_hui">
+    <div class="cards-change">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
         <el-form-item label="" prop="deptName">
           <el-input
@@ -20,16 +20,6 @@
           </el-select>
         </el-form-item>
 
-        <!--        <el-form-item label="" prop="appStatus">-->
-        <!--          <el-input-->
-        <!--            v-model="queryParams.appStatus"-->
-        <!--            placeholder="请选择接受角色"-->
-        <!--            clearable-->
-        <!--            style="width: 240px;"-->
-        <!--            @keyup.enter.native="handleQuery"-->
-        <!--          />-->
-        <!--        </el-form-item>-->
-
         <el-form-item label="" prop="recipientRoles">
           <el-select v-model="queryParams.recipientRoles" placeholder="请选择接收角色" clearable style="width: 240px;">
             <el-option v-for="item in dutyList1" :label="item.dutyName" :value="item.dutyId"></el-option>
@@ -42,7 +32,7 @@
             <!-- 添加其他选项 -->
           </el-select>
         </el-form-item>
-        <el-form-item style="float: right">
+        <el-form-item style="float: right;margin-right: 0px">
           <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
           <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
           <el-button
@@ -53,10 +43,6 @@
           </el-button>
         </el-form-item>
       </el-form>
-      <!--    </el-card>-->
-      <!--    &lt;!&ndash;          &ndash;&gt;-->
-      <!--    &lt;!&ndash;    列表信息&ndash;&gt;-->
-      <!--    <el-card style="margin-top: 20px" >-->
       <div style="height: 69vh;overflow: auto">
         <el-table :data="tableData" style="width: 100%" border>
           <el-table-column align="center" type="index" label="序号"></el-table-column>
@@ -150,22 +136,6 @@
           </el-select>
         </el-form-item>
         <el-form-item label="接收用户" :required="true">
-          <!--          原样式-->
-          <!--          <div style="border: 1px solid #DCDFE6;width: 100%;height: 100px;  border-radius: 4px; flex-wrap: wrap;overflow-y: scroll;">-->
-          <!--            <div style="display: flex;margin: 10px;">-->
-          <!--              <div @click="clickAdd" style="height: 32px;display: flex;-->
-          <!--                justify-content: center; /* 水平居中 */-->
-          <!--                align-items: center; /* 垂直居中 */ ">-->
-          <!--                <img src="../page/img/icon-adduser@3x.png">-->
-          <!--              </div>-->
-          <!--              <div v-for="item in form.recipientUser" :key="item.id">-->
-          <!--                <el-badge value="x" class="item" style="margin-left: 10px">-->
-          <!--                  <el-button @click="clickUser(item.id)" size="mini">{{ item.userName }}</el-button>-->
-          <!--                </el-badge>-->
-          <!--              </div>-->
-          <!--            </div>-->
-          <!--          </div>-->
-          <!--          新样式-->
           <el-select v-model="form.recipientUser" multiple placeholder="请选择接收用户"
                      style="width: 100%;">
             <el-option v-for="item in linshicunshu" :label="item.userName" :value="item.id"></el-option>
@@ -478,31 +448,11 @@ export default {
             userName: item.realName ? item.realName : '--'
           })
         })
-      // console.log("valval", val)
-
-      // val.forEach(item => {
-      //   let a = {
-      //     staffId: item.staffId,
-      //     userName: item.realName ? item.realName : '--'
-      //   }
-      //   // 检查 item 是否已存在于 newArray 中
-      //   let index = this.linshicunshu.indexOf(item.staffId);
-      //   if (index === -1) { // 未找到则添加
-      //     this.linshicunshu.push(a);
-      //   } else { // 已存在则不需要操作
-      //     // 可以选择移除，但根据题目要求，这里不需要显式移除
-      //   }
-      // });
-      //
-
 
       console.log("val2", this.linshicunshu)
 
     },
     onlyGetUser() {
-      // this.loading = true;
-      // console.log(this.queryParams,222)
-      // this.addDateRange(this.queryParams, this.dateRange)
       this.linshicunshu = []
       listUser1(this.queryParamsUser).then(response => {
           this.userList = response.data.records
@@ -514,18 +464,12 @@ export default {
               userName: item.realName ? item.realName : '--'
             })
           })
-
-          // this.total = response.data.total;
-          // this.total = response.data.total;
-          // this.loading = false;
         }
       );
     },
     clickUser(id) {
       this.form.recipientUser = this.form.recipientUser.filter(item => item.id !== id);
     },
-
-
     clickAdd() {
       this.linshicunshu = []
       this.open1 = true;
@@ -604,5 +548,17 @@ export default {
   height: 50px;
   line-height: 60px;
 }
+.container_hui{
+  background: #fff;
+  margin: 10px;
+  border-radius: 8px;
+  box-sizing: border-box;
+  padding: 15px;
+
+}
+.cards-change{
+  height: 83vh;
+}
+
 </style>
 
diff --git a/fuintAdmin/src/views/power/payment/index.vue b/fuintAdmin/src/views/power/payment/index.vue
index 653282679..c7c29934e 100644
--- a/fuintAdmin/src/views/power/payment/index.vue
+++ b/fuintAdmin/src/views/power/payment/index.vue
@@ -1,210 +1,5 @@
 <template>
   <div class="box-centenr">
-<!--    <div style="width: 100%;display: flex">-->
-<!--      <el-alert-->
-<!--        title="说明"-->
-<!--        type="error"-->
-<!--        description="为了保证加油站商户日常在线支付业务的稳定性，来个油惠目前支持多通道支付-->
-<!--                      可以有效的避免单支付通道带来不稳定性，从而造成油站不能正常支付问题-->
-<!--                      加油站一旦出现不能正常支付的情况，可以随时手工切换支付通道，来保证加油站支付收款业务"-->
-<!--        :closable="false"-->
-<!--      >-->
-<!--      </el-alert>-->
-
-<!--      <div style="width: 150%;display: flex;justify-content: right">-->
-<!--        <div class="mingc">功能状态</div>-->
-<!--        <el-switch-->
-<!--          v-model="value1"-->
-<!--          @change="changeStatus1"-->
-<!--        >-->
-<!--        </el-switch>-->
-<!--      </div>-->
-<!--    </div>-->
-<!--    <div class="content-box">-->
-<!--      <el-card class="box-card" shadow="hover" v-for="item in merchantList" :key="item.id">-->
-<!--        <div slot="header" class="clearfix">-->
-<!--          <span><dict-tag :options="dict.type.payment_channel" :value="item.merchantName"/></span>-->
-<!--          <el-button v-if="item.isUse=='0'"-->
-<!--                     @click="editStatus(item,1)"-->
-<!--                     style="float: right; padding: 3px 0" type="text">切换为当前通道-->
-<!--          </el-button>-->
-<!--          <el-tag v-else effect="dark" type="success" style="float: right">当前使用中</el-tag>-->
-<!--        </div>-->
-<!--        <div>商户编号: {{ item.mchntCd }}</div>-->
-<!--        <div>备注: <span style="color: #00afff;margin-left: 3px"-->
-<!--                         @click="editRemark(item.id)">{{ item.remark ? item.remark : "&#45;&#45;" }}</span></div>-->
-<!--      </el-card>-->
-<!--    </div>-->
-<!--    <el-divider></el-divider>-->
-<!--    <div class="cont-box">-->
-<!--      <div style="width: 40%">-->
-<!--        <el-alert-->
-<!--          title="使用说明"-->
-<!--          type="error"-->
-<!--          description="添加/编辑对应的规则->规则配置正常->发布规则->规则生效-->
-<!--注意:功能状态启用且通道规则发布生效后当前功能才有效,否则使用系统单商户号模式"-->
-<!--          :closable="false"-->
-<!--        >-->
-<!--        </el-alert>-->
-<!--      </div>-->
-
-<!--      <div style="display: flex;align-items: center">-->
-<!--        <div class="mingc">规则周期</div>-->
-<!--        <el-radio-group v-model="labelPosition" @input="ruleCycle == labelPosition" size="small">-->
-<!--          <el-radio-button label="permanent">永久</el-radio-button>-->
-<!--          <el-radio-button label="singleDay">单日</el-radio-button>-->
-<!--        </el-radio-group>-->
-<!--        <div class="mingc">功能状态</div>-->
-<!--        <el-switch-->
-<!--          v-model="value"-->
-<!--          @change="changeStatus"-->
-<!--        >-->
-<!--        </el-switch>-->
-<!--      </div>-->
-<!--    </div>-->
-
-<!--    <div class="cont-box">-->
-<!--      <div>-->
-<!--        <el-button type="primary" icon="el-icon-plus" @click="addOil">添加规则</el-button>-->
-<!--      </div>-->
-<!--      <div>-->
-<!--        <el-button type="success" icon="el-icon-s-promotion" @click="open">发布规则</el-button>-->
-<!--      </div>-->
-<!--    </div>-->
-<!--    <div class="hangbox" v-for="(item,index) in oilConfigList" :key="item.id">-->
-<!--      <div>{{ index + 1 }}.通道</div>-->
-<!--      <div class="jiaong">{{ item.merchantName }}({{ item.remark }})</div>-->
-<!--      <div> 商户号</div>-->
-<!--      <div class="jiaong">{{ item.mchntCd }}</div>-->
-<!--      <div> 交易占比</div>-->
-<!--      <div class="jiaong"> {{ item.proportion }}</div>-->
-<!--      <div style="margin-right: 20px"> %更换支付通道</div>-->
-
-<!--      <el-button type="primary" icon="el-icon-edit" @click="editOilConfig(item.id)">编辑</el-button>-->
-<!--      <el-button type="danger" icon="el-icon-close" @click="deleteOilConfig(item.id)">删除</el-button>-->
-<!--    </div>-->
-<!--    <div class="hsize">-->
-<!--      注:规则按照顺序进行处理并自动更换支付通道，新增或变更规则后需要发布当前规则才生效,发布生效后的规则将从序号1的配置生效-->
-<!--    </div>-->
-
-<!--    <el-dialog :title="title" :visible.sync="dialogVisible" width="30%">-->
-<!--      <el-form :model="form1" ref="form1" :rules="rules">-->
-<!--        <el-form-item label="支付通道" :label-width="formLabelWidth" prop="merchantName" width="300px">-->
-<!--          <el-select-->
-<!--            v-model="form1.merchantName"-->
-<!--            placeholder="全部"-->
-<!--            clearable-->
-<!--            style="width: 240px"-->
-<!--          >-->
-<!--            <el-option-->
-<!--              v-for="dict in dict.type.payment_channel"-->
-<!--              :key="dict.value"-->
-<!--              :label="dict.label"-->
-<!--              :value="dict.value"-->
-<!--            />-->
-<!--          </el-select>-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="商户号" :label-width="formLabelWidth" prop="mchntCd">-->
-<!--          <el-input v-model="form1.mchntCd" autocomplete="off"></el-input>-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="备注" :label-width="formLabelWidth" prop="remark">-->
-<!--          <el-input v-model="form1.remark" autocomplete="off"></el-input>-->
-<!--        </el-form-item>-->
-<!--      </el-form>-->
-<!--      <span slot="footer" class="dialog-footer">-->
-<!--        <el-button @click="dialogVisible = false">取 消</el-button>-->
-<!--        <el-button type="primary" @click="submitMerchant">确 定</el-button>-->
-<!--      </span>-->
-<!--    </el-dialog>-->
-
-<!--    <el-dialog :title="title" :visible.sync="show" width="25%" style="margin-top: 200px">-->
-<!--      <span>请输入备注信息</span>-->
-<!--      <el-input placeholder="请输入备注信息" style="margin-top: 20px"-->
-<!--                v-model="merchantConfig.remark"-->
-<!--                clearable>-->
-<!--      </el-input>-->
-<!--      <span slot="footer" class="dialog-footer">-->
-<!--        <el-button @click="show = false">取 消</el-button>-->
-<!--        <el-button type="primary" @click="submitRemark">确 定</el-button>-->
-<!--      </span>-->
-<!--    </el-dialog>-->
-
-<!--    &lt;!&ndash;    编辑通道规则&ndash;&gt;-->
-<!--    <el-dialog :title="title" :visible.sync="dialogFormVisible"-->
-<!--               width="30%">-->
-<!--      <el-form :model="form" ref="form">-->
-
-<!--        <el-form-item label="支付通道" :label-width="formLabelWidth" width="300px">-->
-<!--          <el-select v-model="form.merchConfigId"-->
-<!--                     @change="changeMerch"-->
-<!--                     :disabled="isDis" placeholder="请选择商户信息" style="width: 100%">-->
-<!--            <el-option-->
-<!--              v-for="item in merchantList" :key="item.id"-->
-<!--              :label="item.merchantName"-->
-<!--              :value="item.id">-->
-<!--              <span style="float: left">-->
-<!--                <dict-tag :options="dict.type.payment_channel" :value="item.merchantName"/>-->
-<!--              </span>-->
-<!--              <span style="color: #30a1ff">({{ item.remark ? item.remark : "&#45;&#45;" }})</span>-->
-<!--              <span style="float: right; color: #8492a6; font-size: 13px">{{ item.mchntCd }}</span>-->
-<!--            </el-option>-->
-<!--          </el-select>-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="商户号" :label-width="formLabelWidth">-->
-<!--          <el-input v-model="form.mchntCd" disabled autocomplete="off"></el-input>-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="交易占比" :label-width="formLabelWidth">-->
-<!--          <el-input v-model="form.proportion" autocomplete="off">-->
-<!--            <template slot="append">%</template>-->
-<!--          </el-input>-->
-<!--          <div>交易占比满足规则后切换到下一个支付通道</div>-->
-<!--        </el-form-item>-->
-
-
-<!--      </el-form>-->
-<!--      <div slot="footer" class="dialog-footer">-->
-<!--        <el-button @click="clearOil">取 消</el-button>-->
-<!--        <el-button type="primary" @click="submitOilConfig">确 定</el-button>-->
-<!--      </div>-->
-<!--    </el-dialog>-->
-
-<!--    <el-dialog-->
-<!--      title="配置消费记录信息"-->
-<!--      :visible.sync="dialogVisibleList">-->
-<!--      <div class="wrap-wrap">-->
-<!--        <el-table ref="tables" v-loading="loading" :data="merchantRecordList">-->
-<!--          <el-table-column label="ID" align="center" prop="id" width="80"/>-->
-<!--          <el-table-column label="入账类型" align="center" prop="type">-->
-<!--            <template slot-scope="scope">-->
-<!--              <el-tag type="success" v-if="scope.row.type=='0'">增加</el-tag>-->
-<!--              <el-tag type="danger" v-if="scope.row.type=='1'">减少</el-tag>-->
-<!--            </template>-->
-<!--          </el-table-column>-->
-<!--          <el-table-column label="入账金额" align="center" prop="amount"/>-->
-<!--          <el-table-column label="入账状态" align="center" prop="isSuccess">-->
-<!--            <template slot-scope="scope">-->
-<!--              <span v-if="scope.row.isSuccess=='yes'">成功</span>-->
-<!--              <span v-if="scope.row.isSuccess=='no'">失败</span>-->
-<!--            </template>-->
-<!--          </el-table-column>-->
-<!--          <el-table-column label="关联订单号" align="center" width="300" prop="orderNo"/>-->
-<!--          <el-table-column label="注册时间" align="center" width="200" prop="createTime">-->
-<!--            <template slot-scope="scope">-->
-<!--              <span>{{ parseTime(scope.row.createTime) }}</span>-->
-<!--            </template>-->
-<!--          </el-table-column>-->
-<!--        </el-table>-->
-
-<!--        <pagination-->
-<!--          v-show="total>0"-->
-<!--          :total="total"-->
-<!--          :page.sync="queryParams.page"-->
-<!--          :limit.sync="queryParams.pageSize"-->
-<!--          @pagination="getMerchantList(merchantId)"-->
-<!--        />-->
-<!--      </div>-->
-<!--    </el-dialog>-->
-
     <div class="new-box">
       <div class="n-top-box">
         <div class="d-s">
@@ -335,10 +130,6 @@
           label="规则名称"
           align="center"
           width="120">
-          <!--          <template slot-scope="scope">-->
-          <!--            <div style="color: #fe8c4a;cursor: pointer">{{ scope.row.ruleName }}</div>-->
-          <!--          </template>-->
-
         </el-table-column>
         <el-table-column
           prop="ruleType"
@@ -402,14 +193,13 @@
               <div style="color: #fe8c4a;cursor: pointer;margin: 0 10px" v-if="scope.row.status!= 'qy'" @click="EnableRule(scope.row)">启用</div>
               <div style="color: #fe8c4a;cursor: pointer;margin: 0 10px" v-if="scope.row.status!= 'jy'" @click="editRule(scope.row,2)">查看</div>
             </div>
-
           </template>
         </el-table-column>
       </el-table>
     </div>
-    <el-dialog :close-on-click-modal="false" :title="addMerchantTitile" :visible.sync="addMerchants" width="550px">
+    <el-dialog :close-on-click-modal="false" :title="addMerchantTitile" :visible.sync="addMerchants" width="26%">
       <el-form :model="form" ref="formAdd" :rules="rules"  :inline="true">
-        <el-form-item label="所属机构" :label-width="formLabelWidth" prop="deptId">
+        <el-form-item label="所属机构" style="margin-right: 0px" :label-width="formLabelWidth" prop="deptId">
           <el-select v-model="form.deptId+''" disabled placeholder="请选择所属机构" style="width: 350px">
             <el-option
               v-for="item in deptListSelect"
@@ -419,19 +209,13 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="支付通道" :label-width="formLabelWidth" prop="merchantName">
+        <el-form-item label="支付通道" style="margin-right: 0px" :label-width="formLabelWidth" prop="merchantName">
           <el-select
             v-model="form.merchantName"
             placeholder="全部"
             clearable
             style="width: 350px"
           >
-            <!--            <el-option-->
-            <!--              v-for="dict in dict.type.payment_channel"-->
-            <!--              :key="dict.value"-->
-            <!--              :label="dict.label"-->
-            <!--              :value="dict.value"-->
-            <!--            />-->
             <el-option
               v-for="(item,index) in payChannel"
               :key="index"
@@ -440,11 +224,11 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="商户号编号" :label-width="formLabelWidth" prop="mchntCd">
+        <el-form-item label="商户号编号" style="margin-right: 0px" :label-width="formLabelWidth" prop="mchntCd">
           <el-input v-model="form.mchntCd" placeholder="请输入商户号编号" autocomplete="off"
                     style="width: 350px"></el-input>
         </el-form-item>
-        <el-form-item label="备注" :label-width="formLabelWidth">
+        <el-form-item label="备注" style="margin-right: 0px" :label-width="formLabelWidth">
           <el-input type="textarea" v-model="form.remark" placeholder="请输入备注" autocomplete="off"
                     style="width: 350px"></el-input>
         </el-form-item>
@@ -456,13 +240,16 @@
     </el-dialog>
     <el-dialog :close-on-click-modal="false" :title="Ruletitle" :visible.sync="addRule">
       <el-form :model="formRule" ref="formRule" :rules="rules">
-        <el-form-item label="规则名称" :label-width="formLabelWidth" prop="ruleName">
-          <el-input v-model="formRule.ruleName" placeholder="请输入规则名称" autocomplete="off" style="width: 350px"></el-input>
-        </el-form-item>
-        <el-form-item label="规则描述" :label-width="formLabelWidth">
-          <el-input type="textarea" v-model="formRule.description" placeholder="请输入规则描述" autocomplete="off"
-                    style="width: 350px"></el-input>
-        </el-form-item>
+        <div style="display: flex;align-items: center">
+          <el-form-item label="规则名称" :label-width="formLabelWidth" prop="ruleName">
+            <el-input v-model="formRule.ruleName" placeholder="请输入规则名称" autocomplete="off" style="width: 350px"></el-input>
+          </el-form-item>
+          <el-form-item label="规则描述" :label-width="formLabelWidth">
+            <el-input type="textarea" v-model="formRule.description" placeholder="请输入规则描述" autocomplete="off"
+                      style="width: 350px"></el-input>
+          </el-form-item>
+        </div>
+
         <el-form-item label="规则类型" :label-width="formLabelWidth" prop="ruleType">
           <div style="display: flex">
             <div class="xz_box" :class=" {'active' : formRule.ruleType == 1 } " @click="formRule.ruleType = 1"><i
@@ -557,10 +344,7 @@
             <div style="width: 15px"></div>
           </div>
           <div style="margin-left: 80px">启用成功后其他规则的规则状态变为停用！</div>
-
-
         </el-form-item>
-
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="Enable = false">取 消</el-button>
@@ -577,12 +361,6 @@
             clearable
             style="width: 240px"
           >
-            <!--            <el-option-->
-            <!--              v-for="dict in dict.type.payment_channel"-->
-            <!--              :key="dict.value"-->
-            <!--              :label="dict.label"-->
-            <!--              :value="dict.value"-->
-            <!--            />-->
             <el-option
               v-for="(item,index) in payChannel"
               :key="index"
@@ -645,28 +423,12 @@
           </el-input>
           <div>交易占比满足规则后切换到下一个支付通道</div>
         </el-form-item>
-        <!--        <el-form-item label="参与次数" :label-width="formLabelWidth">-->
-        <!--          <el-radio-group v-model="form.resource" >-->
-        <!--            <el-radio label="不固定次数"></el-radio>-->
-        <!--            <el-radio label="固定次数"></el-radio>-->
-        <!--          </el-radio-group>-->
-        <!--          <div>是否限制当前配置在生效期间内的参与次数</div>-->
-        <!--        </el-form-item>-->
-
-        <!--        <el-form-item label="排序" :label-width="formLabelWidth">-->
-        <!--          <el-input-number v-model="form.num" controls-position="right"  :min="1" :max="100"></el-input-number>-->
-        <!--          <div>数值越大顺序越在前</div>-->
-        <!--        </el-form-item>-->
-
-
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="clearOil">取 消</el-button>
         <el-button type="primary" @click="submitOilConfig">确 定</el-button>
       </div>
     </el-dialog>
-
-
   </div>
 </template>