From db03934ace47f228af6763252157e880d129ccfd Mon Sep 17 00:00:00 2001
From: "DESKTOP-369JRHT\\12997" <9>
Date: Thu, 14 Nov 2024 14:59:48 +0800
Subject: [PATCH] 11.14

---
 fuintAdmin_zt/src/views/Site/index.vue        | 41 +------------------
 .../src/views/components/Service/allOrder.vue |  1 -
 .../src/views/components/Service/payment.vue  |  8 +---
 3 files changed, 4 insertions(+), 46 deletions(-)

diff --git a/fuintAdmin_zt/src/views/Site/index.vue b/fuintAdmin_zt/src/views/Site/index.vue
index 77ae73cda..f78608a0f 100644
--- a/fuintAdmin_zt/src/views/Site/index.vue
+++ b/fuintAdmin_zt/src/views/Site/index.vue
@@ -34,7 +34,7 @@
       </el-col>
 
       <el-col :span="18">
-        <el-card style="margin-bottom: 20px;border: none;box-shadow: none;height: 81.5vh;overflow: auto" shadow="never">
+        <el-card style="border: none;box-shadow: none;height: 84.2vh;overflow: auto" shadow="never">
 <!--          <el-tabs v-model="activeName" @tab-click="handleClick">-->
 <!--        用户信息    -->
 <!--            <el-tab-pane label="用户信息" name="list">-->
@@ -161,15 +161,6 @@
                           @click="handleResetPwd(scope.row)"
                           v-hasPermi="['user:delete']"
                         >重置密码</el-button>
-  <!--                      <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" >-->
-  <!--                      <span class="el-dropdown-link" v-hasPermi="['user:password']">-->
-  <!--                        <i class="el-icon-d-arrow-right el-icon&#45;&#45;right"></i>更多-->
-  <!--                      </span>-->
-  <!--                        <el-dropdown-menu slot="dropdown">-->
-  <!--                          <el-dropdown-item command="handleResetPwd" icon="el-icon-key" v-hasPermi="['user:password']"-->
-  <!--                                            >重置密码</el-dropdown-item>-->
-  <!--                        </el-dropdown-menu>-->
-  <!--                      </el-dropdown>-->
                       </template>
                     </el-table-column>
                   </el-table>
@@ -194,9 +185,6 @@
                                  v-model="cascader" :props="defaultProps" @change="handleChanges"  :placeholder="parentName"  ></el-cascader>
                   </el-form-item>
 
-<!--                  <el-form-item label="上级部门" prop="parentId">-->
-<!--                    <treeselect v-model="cascader" :options="Thetree" :normalizer="normalizer" @change="handleChanges"  placeholder="啊" />-->
-<!--                  </el-form-item>-->
                   <el-form-item v-if="deptType == 2" label="油站名称" prop="deptName">
                     <el-input :disabled="isTopDept" v-model="ruleForm.deptName" style="width: 670px"></el-input>
                   </el-form-item>
@@ -563,14 +551,6 @@
                  {{scope.row.dutyName}}
                 </template>
                 </el-table-column>
-<!--                <el-table-column label="角色类型" align="center" prop="dutyType" >-->
-<!--                  <template slot-scope="scope">-->
-<!--                    <span v-if="scope.row.dutyType=='1'">超级管理员</span>-->
-<!--                    <span v-if="scope.row.dutyType=='2'">普通管理员</span>-->
-<!--                    <span v-if="scope.row.dutyType=='3'">油站角色</span>-->
-<!--                    <span v-if="scope.row.dutyType=='4'">公司角色</span>-->
-<!--                  </template>-->
-<!--                </el-table-column>-->
                 <el-table-column label="所属机构" align="center" prop="deptName" />
                 <el-table-column label="角色状态" align="center" prop="status" >
                   <template slot-scope="scope">
@@ -729,19 +709,6 @@
         <el-form-item label="角色名称" prop="roleName">
           <el-input v-model="form1.roleName" @input="$forceUpdate()" style="width: 300px" placeholder="请输入角色名称" />
         </el-form-item>
-<!--        <el-form-item label="角色类型" prop="roleType">-->
-<!--          <el-select-->
-<!--            v-model="form1.roleType"-->
-<!--            placeholder="角色类型"-->
-<!--            @change="changeMenu"-->
-<!--            style="width: 300px"-->
-<!--          >-->
-<!--&lt;!&ndash;            <el-option key="1" label="超级管理员" value="1"/>&ndash;&gt;-->
-<!--&lt;!&ndash;            <el-option key="2" label="普通管理员" value="2"/>&ndash;&gt;-->
-<!--            <el-option key="3" label="油站角色" value="3"/>-->
-<!--            <el-option key="4" label="公司角色" value="4"/>-->
-<!--          </el-select>-->
-<!--        </el-form-item>-->
         <el-form-item label="状态">
           <el-radio-group v-model="form1.status">
             <el-radio key="A" label="A" value="A">启用</el-radio>
@@ -837,10 +804,6 @@ import {getButtonPermi, treeselect as menuTreeselect} from "@/api/system/menu";
 import Yearff from "@/views/Site/components/yearff.vue";
 import Beforeff from "@/views/Site/components/before.vue";
 import Afterff from "@/views/Site/components/afterff.vue";
-
-
-
-
 export default {
     name: "User",
   computed: {
@@ -2216,7 +2179,7 @@ export default {
   }
   .left-box{
     box-sizing: border-box;
-    height: 77vh;
+    height: 80vh;
     padding: 15px;
     overflow-y: auto; /* 只显示垂直滚动条 */
   }
diff --git a/fuintAdmin_zt/src/views/components/Service/allOrder.vue b/fuintAdmin_zt/src/views/components/Service/allOrder.vue
index 5e77920e8..793eeb64f 100644
--- a/fuintAdmin_zt/src/views/components/Service/allOrder.vue
+++ b/fuintAdmin_zt/src/views/components/Service/allOrder.vue
@@ -1,6 +1,5 @@
 <template>
   <div class="app-containers">
-
     <div class="bai-box" >
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
 
diff --git a/fuintAdmin_zt/src/views/components/Service/payment.vue b/fuintAdmin_zt/src/views/components/Service/payment.vue
index a5e3eae1f..15750541c 100644
--- a/fuintAdmin_zt/src/views/components/Service/payment.vue
+++ b/fuintAdmin_zt/src/views/components/Service/payment.vue
@@ -130,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"
@@ -243,10 +239,10 @@
         <el-button type="primary" @click="submitMerchant">保 存</el-button>
       </div>
     </el-dialog>
-    <el-dialog :title="Ruletitle" :visible.sync="addRule" width="60%">
+    <el-dialog :title="Ruletitle" :visible.sync="addRule" width="55%">
       <el-form :model="formRule" ref="formRule" :rules="rules">
         <el-row :gutter="20">
-          <el-col :span="10">
+          <el-col :span="11">
             <el-form-item label="规则名称" :label-width="formLabelWidth" prop="ruleName">
               <el-input v-model="formRule.ruleName" placeholder="请输入规则名称" autocomplete="off" style="width: 100%"></el-input>
             </el-form-item>