From 8bafad399c850943e780059c9adb533b39a31661 Mon Sep 17 00:00:00 2001
From: "DESKTOP-369JRHT\\12997" <9>
Date: Mon, 11 Nov 2024 11:27:25 +0800
Subject: [PATCH] =?UTF-8?q?11.11=E7=A1=AC=E4=BB=B6=E5=95=86=E5=9F=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fuintAdmin/src/views/power/page/mode.vue      |  2 +-
 fuintAdmin/src/views/power/page/record.vue    |  2 +-
 fuintAdmin_zt/src/views/setting/hardware.vue  | 15 ++-
 .../src/views/system/notify/index.vue         |  1 +
 .../src/views/system/notify/page/mode.vue     | 20 ++--
 .../src/views/system/notify/page/record.vue   | 17 ++--
 .../src/views/cashier/NewComponents/Vip.vue   | 29 +++---
 .../views/cashier/NewComponents/writeList.vue |  1 +
 .../cashier/orderComponents/order_Oil.vue     | 91 +------------------
 9 files changed, 41 insertions(+), 137 deletions(-)

diff --git a/fuintAdmin/src/views/power/page/mode.vue b/fuintAdmin/src/views/power/page/mode.vue
index a799169d5..a3085de34 100644
--- a/fuintAdmin/src/views/power/page/mode.vue
+++ b/fuintAdmin/src/views/power/page/mode.vue
@@ -484,7 +484,7 @@ export default {
     //height: 81vh;
 }
 .table_box{
-  height: 72vh;
+  height: 73vh;
   overflow: auto;
   scrollbar-width: none;
 }
diff --git a/fuintAdmin/src/views/power/page/record.vue b/fuintAdmin/src/views/power/page/record.vue
index 3008b7a86..829599dc3 100644
--- a/fuintAdmin/src/views/power/page/record.vue
+++ b/fuintAdmin/src/views/power/page/record.vue
@@ -561,7 +561,7 @@ export default {
   //height: 81vh;
 }
 .table_box{
-  height: 72vh;
+  height: 73vh;
   overflow: auto;
   scrollbar-width: none;
 }
diff --git a/fuintAdmin_zt/src/views/setting/hardware.vue b/fuintAdmin_zt/src/views/setting/hardware.vue
index 79067dc88..5e6eb9d00 100644
--- a/fuintAdmin_zt/src/views/setting/hardware.vue
+++ b/fuintAdmin_zt/src/views/setting/hardware.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="card-change"  style="min-height: 500px; margin-left: 20px; margin-top: 20px; margin-right: 20px;" shadow="never">
+  <div class="card-change"  style="height: 88vh; margin: 10px;box-sizing: border-box;padding-bottom: 0px" shadow="never">
     <div>
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="90px">
         <el-form-item label="" prop="name">
@@ -7,13 +7,13 @@
             v-model="queryParams.name"
             placeholder="请输入商品名称"
             clearable
-            style="width: 240px;"
+
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
 
-        <el-form-item label="请选择分类" prop="categoryName">
-          <el-select v-model="queryParams.categoryName" style="width: 150px" placeholder="全部">
+        <el-form-item label="" prop="categoryName">
+          <el-select v-model="queryParams.categoryName" placeholder="请选择分类" >
             <el-option
               v-for="dict in dict.type.hardware_type"
               :key="dict.label"
@@ -23,8 +23,8 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item label="请选择状态" prop="status">
-          <el-select v-model="queryParams.status" style="width: 150px" placeholder="全部">
+        <el-form-item label="" prop="status">
+          <el-select v-model="queryParams.status" placeholder="请选择状态" >
             <el-option
               v-for="dict in dict.type.hardware_status"
               :key="dict.value"
@@ -45,8 +45,7 @@
           >新增商品</el-button>
         </el-form-item>
       </el-form>
-
-      <div style="height: 70vh; overflow: auto;">
+      <div style="height: 70vh; overflow: auto; scrollbar-width: none ">
       <el-table :data="tableData" style="width: 100%" border>
         <el-table-column type="index" label="序号"></el-table-column>
         <el-table-column prop="name" label="商品名称"></el-table-column>
diff --git a/fuintAdmin_zt/src/views/system/notify/index.vue b/fuintAdmin_zt/src/views/system/notify/index.vue
index 4fee41f03..030df0bb4 100644
--- a/fuintAdmin_zt/src/views/system/notify/index.vue
+++ b/fuintAdmin_zt/src/views/system/notify/index.vue
@@ -46,6 +46,7 @@ export default {
   margin-right: 50px;
   display: flex;
   align-items: center;
+  cursor: pointer;
 
 }
 .active{
diff --git a/fuintAdmin_zt/src/views/system/notify/page/mode.vue b/fuintAdmin_zt/src/views/system/notify/page/mode.vue
index b95490b2c..9db7f27d9 100644
--- a/fuintAdmin_zt/src/views/system/notify/page/mode.vue
+++ b/fuintAdmin_zt/src/views/system/notify/page/mode.vue
@@ -18,15 +18,7 @@
             <!-- 添加其他选项 -->
           </el-select>
         </el-form-item>
-<!--        <el-form-item label="" prop="recipientRoles">-->
-<!--          <el-input-->
-<!--            v-model="queryParams.recipientRoles"-->
-<!--            placeholder="请选择接收角色"-->
-<!--            clearable-->
-<!--            style="width: 240px;"-->
-<!--            @keyup.enter.native="handleQuery"-->
-<!--          />-->
-<!--        </el-form-item>-->
+
         <el-form-item label="" prop="templateStatus">
           <el-select v-model="queryParams.templateStatus" placeholder="请选择通知状态" clearable style="width: 240px;">
             <el-option label="启用" value="1"></el-option>
@@ -45,10 +37,8 @@
           >新增通知模板</el-button>
         </el-form-item>
       </el-form>
-<!--    </el-card>-->
-<!--    &lt;!&ndash;    列表信息&ndash;&gt;-->
-<!--    <el-card style="margin-top: 20px" >-->
-      <div  >
+
+      <div class="table_box">
 
       <el-table :data="tableData" style="width: 100%" border>
         <el-table-column align="center" type="index" label="序号"></el-table-column>
@@ -488,5 +478,9 @@ export default {
   height: 50px;
   line-height: 60px;
 }
+.table_box{
+  width: 100%;
+  height: 69vh;
+}
 </style>
 
diff --git a/fuintAdmin_zt/src/views/system/notify/page/record.vue b/fuintAdmin_zt/src/views/system/notify/page/record.vue
index a3936f7ab..b32c8e333 100644
--- a/fuintAdmin_zt/src/views/system/notify/page/record.vue
+++ b/fuintAdmin_zt/src/views/system/notify/page/record.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container" style="padding: 10px">
-    <div class="card-change" style="min-height: 80vh;">
+    <div class="card-change" >
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
         <el-form-item label="" prop="deptName">
           <el-input
@@ -20,15 +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="templateStatus">
           <el-select v-model="queryParams.templateStatus" placeholder="请选择通知状态" clearable style="width: 240px;">
             <el-option label="启用" value="1"></el-option>
@@ -51,7 +42,7 @@
       <!--    &lt;!&ndash;          &ndash;&gt;-->
       <!--    &lt;!&ndash;    列表信息&ndash;&gt;-->
       <!--    <el-card style="margin-top: 20px" >-->
-      <div >
+      <div class="table_box" >
         <el-table :data="tableData" style="width: 100%" border>
           <el-table-column align="center" type="index" label="序号"></el-table-column>
           <el-table-column align="center" prop="notificationName" label="通知名称"></el-table-column>
@@ -583,5 +574,9 @@ export default {
   height: 50px;
   line-height: 60px;
 }
+.table_box{
+  width: 100%;
+  height: 69vh;
+}
 </style>
 
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/Vip.vue b/fuintCashierWeb/src/views/cashier/NewComponents/Vip.vue
index 220dd6a65..1c3c6083e 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/Vip.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/Vip.vue
@@ -1,13 +1,8 @@
 <template>
-  <div class="app-container">
-<!--    <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 style="width: 100%;height: 15px"></div>
-    <div style=" width: 100%; display: flex;justify-content: space-between; height: 56px; border-radius: 8px; background: #fff;box-sizing: border-box;padding: 10px;width: 98%;margin: 0 auto;margin-bottom: 5px;">
+  <div class="box_conter">
+
+
+    <div style=" width: 100%; display: flex;justify-content: space-between; height: 56px; border-radius: 8px; background: #fff;box-sizing: border-box;padding: 10px;width: 100%;margin: 0 auto;margin-bottom: 5px;margin-bottom: 10px">
       <div style="  width: 100%;display: flex;justify-content: space-between;margin-left: 10px">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
 
@@ -1154,12 +1149,12 @@ export default {
 
 <style scoped lang="scss">
 
-.app-container {
-  width: 100%;
-  height: 100vh;
-  background: #f6f8f9;
-  margin: 0;
-  padding: 0;
+.box_conter{
+  box-sizing: border-box;
+  padding: 10px;
+  border-bottom: 0px;
+  background: #f2f2f2;
+  padding-bottom: 0px;
 }
 
 .sta {
@@ -1296,13 +1291,13 @@ export default {
 }
 
 .cot-box {
-  width: 98%;
+  width: 100%;
   border-radius: 8px;
   background: #fff;
   box-sizing: border-box;
   padding: 20px;
   margin: 0 auto;
-  height: 97vh;
+  height: 91vh;
 }
 
 .d-s {
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/writeList.vue b/fuintCashierWeb/src/views/cashier/NewComponents/writeList.vue
index f19baad62..41c42efc0 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/writeList.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/writeList.vue
@@ -126,6 +126,7 @@ export default {
   box-sizing: border-box;
   padding: 15px;
   border-radius: 8px;
+  margin-bottom: 10px;
 }
 .table-box {
   width: 100%;
diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue
index 22f3ae371..e49d49b1f 100644
--- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue
+++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue
@@ -910,24 +910,14 @@ export default {
 </script>
 
 <style scoped>
-.app-top {
-  width: 100%;
 
-  height: 60px;
+.box_conter{
   box-sizing: border-box;
   padding: 10px;
+  border-bottom: 0px;
+  background: #f2f2f2;
+  padding-bottom: 0px;
 }
-
-.clearfix {
-  width: 100%;
-
-}
-
-.box-card {
-  width: 100%;
-  margin-bottom: 15px;
-}
-
 .box-gang {
   width: 100%;
   display: flex;
@@ -937,21 +927,6 @@ export default {
 
 }
 
-.box {
-  //box-sizing: border-box;
-  padding: 5px;
-  //background: #f9f9f9;
-  margin-right: 20px;
-  margin-bottom: 20px;
-  padding-left: 20px;
-
-  width: 211px;
-  height: 60px;
-  background: rgba(64, 158, 255, 0.05);
-  border-radius: 6px 6px 6px 6px;
-  border: 1px solid #fe8c4a;
-}
-
 .el-form--inline .el-form-item {
 
 }
@@ -972,42 +947,6 @@ export default {
   }
 }
 
-.size-bole {
-  height: 31px;
-  font-family: YouSheBiaoTiHei;
-  font-weight: 400;
-  font-size: 24px;
-  color: #555555;
-  text-align: left;
-  font-style: normal;
-  text-transform: none;
-}
-
-.icon-img {
-  width: 20px;
-  height: 20px;
-  margin-right: 5px;
-
-  img {
-    float: right;
-    width: 20px;
-    height: 20px;
-  }
-}
-
-.wgang {
-  width: 100%;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  margin-bottom: 20px;
-
-}
-
-.table-box {
-  width: 100%;
-}
-
 .pagination-box {
   width: 100%;
   margin: 10px auto;
@@ -1016,9 +955,6 @@ export default {
   justify-content: flex-end;
 }
 
-.top-app-sou {
-  width: 20%;
-}
 
 .tk {
   text-align: center;
@@ -1026,19 +962,6 @@ export default {
   margin: 10px 0;
 }
 
-.box1 {
-  padding: 5px;
-  margin-right: 20px;
-  margin-bottom: 20px;
-  padding-left: 20px;
-
-  width: 211px;
-  height: 60px;
-  background: rgba(255, 150, 85, 0.05);
-  border-radius: 6px 6px 6px 6px;
-  border: 1px solid #FF9655;
-}
-
 .box2 {
   padding: 5px;
   margin-bottom: 20px;
@@ -1082,9 +1005,5 @@ export default {
   height: 59vh;
   overflow: auto;
 }
-.table-box {
-  width: 100%;
-  height: 66vh;
-  overflow: auto;
-}
+
 </style>