From 75efe3f5fa2be1905d115ff958ed032d64623b68 Mon Sep 17 00:00:00 2001
From: "DESKTOP-369JRHT\\12997" <9>
Date: Fri, 15 Nov 2024 08:49:37 +0800
Subject: [PATCH] 11.15

---
 .../src/views/handover/HandoverRecord.vue     |  2 +-
 .../src/layout/components/Navbar.vue          | 30 ++----------------
 fuintAdmin_zt/src/views/Site/index.vue        |  8 ++---
 .../jiaoyiduizhang/tab/vip.vue                |  4 +--
 .../src/views/homeComponents/agent.vue        | 12 ++++---
 .../src/views/notificationList/index.vue      | 31 ++++++++++---------
 .../views/cashier/NewComponents/Handover.vue  |  6 ++--
 .../cashier/NewComponents/HandoverRecord.vue  |  7 +++--
 .../views/cashier/NewComponents/Integral.vue  | 11 +++++--
 fuintCashierWeb/src/views/cashier/index.vue   | 13 --------
 10 files changed, 47 insertions(+), 77 deletions(-)

diff --git a/fuintAdmin/src/views/handover/HandoverRecord.vue b/fuintAdmin/src/views/handover/HandoverRecord.vue
index 27f0e70ad..5b26ac90f 100644
--- a/fuintAdmin/src/views/handover/HandoverRecord.vue
+++ b/fuintAdmin/src/views/handover/HandoverRecord.vue
@@ -154,7 +154,7 @@ export default {
   <div class="table-s">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px">
       <el-form-item label="" prop="status">
-        <el-select v-model="queryParams.status" style="width: 150px" placeholder="交班方式" clearable>
+        <el-select v-model="queryParams.status" style="width: 150px" placeholder="交班方式1" clearable>
           <el-option  label="统一交班" value="统一交班">统一交班</el-option>
           <el-option  label="个人交班" value="个人交班">个人交班</el-option>
         </el-select>
diff --git a/fuintAdmin_zt/src/layout/components/Navbar.vue b/fuintAdmin_zt/src/layout/components/Navbar.vue
index 2a25e3e15..730092a45 100644
--- a/fuintAdmin_zt/src/layout/components/Navbar.vue
+++ b/fuintAdmin_zt/src/layout/components/Navbar.vue
@@ -10,17 +10,7 @@
 
       </div>
     </div>
-
-<!--    <breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav"/>-->
-
-<!--    <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav"/>-->
-
     <div class="right-menu">
-<!--      <template v-if="device!=='mobile'">-->
-<!--        <search id="header-search" class="right-menu-item" />-->
-<!--        <screenfull id="screenfull" class="right-menu-item hover-effect" />-->
-<!--        <FuintDoc id="fuint-doc" class="right-menu-item hover-effect" />-->
-<!--      </template>-->
       <div class="d-s"style="margin-right: 20px">
           <img src="../../assets/images/qp.png" style="width: 28px;height: 28px;margin-right: 5px">
         <div>全屏</div>
@@ -112,14 +102,7 @@ export default {
       },
       deptName:'',
       rules:{
-        // password: [
-        //   { required: true, message: '请输入密码', trigger: 'blur' },
-        //   { min: 3, max: 15, message: '长度在 3 到 15 个字符', trigger: 'blur' }
-        // ],
-        // passwords: [
-        //   { required: true, message: '请输入新密码', trigger: 'blur' },
-        //   { min: 3, max: 15, message: '长度在 3 到 15 个字符', trigger: 'blur' }
-        // ],
+
         password: [
           { required: true, message: '请输入新密码', trigger: 'blur' },
           { min: 3, max: 15, message: '长度在 3 到 15 个字符', trigger: 'blur' },
@@ -257,16 +240,12 @@ export default {
 .navbar {
   height: 90px;
   overflow: hidden;
-  //position: relative;
   background: white;
-  //background-image: url("../../assets/images/kkx.png") ;
   background-size: 100% 100%;
   background-size: cover;
   background-repeat: no-repeat;
-
-  box-shadow: 0 1px 4px rgba(0,21,41,.08);
   box-sizing: border-box;
- display: flex;
+  display: flex;
   align-items: center;
   justify-content: space-between;
   .hamburger-container {
@@ -283,11 +262,6 @@ export default {
     }
   }
   .title-logo{
-    //position: absolute;
-    //top: 50%; /* 将元素垂直向上移动容器高度的50% */
-    //left: 5%; /* 将元素水平向左移动容器宽度的50% */
-    //transform: translate(-50%, -50%); /* 通过移动元素的左上角使其居中 */
-    //color: #ffffff;
     font-size: 24px;
     font-weight: bold;
     display: flex;
diff --git a/fuintAdmin_zt/src/views/Site/index.vue b/fuintAdmin_zt/src/views/Site/index.vue
index f78608a0f..fddd49fc5 100644
--- a/fuintAdmin_zt/src/views/Site/index.vue
+++ b/fuintAdmin_zt/src/views/Site/index.vue
@@ -4,7 +4,7 @@
       <div class="f-box" v-for="(item,index) in tablist" :key="index" @click="handleClick1(index)" :class="{ 'active' :activeindex==index}">{{item.name}}</div>
     </div>
     <el-row style="padding: 10px">
-      <el-col :span="6">
+      <el-col :span="5">
         <el-card  style="margin-right: 5px; border: none;box-shadow: none;" shadow="never">
           <div class="left-box">
             <div class="title-h">组织架构</div>
@@ -32,12 +32,8 @@
           </div>
         </el-card>
       </el-col>
-
-      <el-col :span="18">
+      <el-col :span="19">
         <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">-->
               <template v-if="activeindex == 1">
               <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
                        label-width="68px">
diff --git a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/vip.vue b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/vip.vue
index 901bd36ec..5872344a1 100644
--- a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/vip.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/vip.vue
@@ -1,6 +1,6 @@
 <!-- 收银台订单-->
 <template>
-  <div style="background: #f6f8f9;width: 100%;padding: 20px;" >
+  <div style="background: #f6f8f9;width: 100%;padding: 10px;" >
     <div class="card-change">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
         <el-form-item label="" prop="deptId" style="width: 180px">
@@ -277,7 +277,7 @@ import {getRunningWaterByTissueApi} from "@/api/allOrder";
 
 .table-box{
   width: 100%;
-  height: 66vh;
+  height: 74vh;
   min-height: 650px;
   overflow: auto;
 }
diff --git a/fuintAdmin_zt/src/views/homeComponents/agent.vue b/fuintAdmin_zt/src/views/homeComponents/agent.vue
index 1d4bae9c6..6d9d24b18 100644
--- a/fuintAdmin_zt/src/views/homeComponents/agent.vue
+++ b/fuintAdmin_zt/src/views/homeComponents/agent.vue
@@ -137,7 +137,7 @@
             </el-popover>
           </div>
         </div>
-        <div style="height: 90%;overflow:auto;">
+        <div style="height: 90%;overflow:auto; scrollbar-width: none">
           <div class="d-s" style="margin: 30px 0px" v-for="(item,index) in hardwareList" :key="index" >
             <!--          <div class="r-img">-->
             <!--            <img src="../../assets/images/pcin.png" style="width: 84px;height: 70px">-->
@@ -696,6 +696,7 @@ export default {
   height: 100%;
   /* height: 100vh; */
   background: #f4f5f9;
+  padding: 10px;
 }
 .d-s{
   display: flex;
@@ -717,10 +718,10 @@ export default {
   display: flex;
 
   justify-content: space-between;
-  margin-top: 20px;
+  margin-top: 10px;
 }
 .left-box{
-  width: 73%;
+  width: 73.5%;
   background: #FFFFFF;
   border-radius: 10px 10px 10px 10px;
   border: 1px solid #FFFFFF;
@@ -730,9 +731,10 @@ export default {
   justify-content: space-between;
   box-sizing: border-box;
   padding: 15px;
+  scrollbar-width: none;
 }
 .left-box-t{
-  width: 73%;
+  width: 73.5%;
   box-sizing: border-box;
   padding: 15px;
   border-radius: 8px;
@@ -867,7 +869,7 @@ export default {
   background:  #fff;
   box-sizing: border-box;
   padding: 20px;
-  margin-top: 20px;
+  margin-top: 10px;
 }
 .anniu-h{
   width: 80px;
diff --git a/fuintAdmin_zt/src/views/notificationList/index.vue b/fuintAdmin_zt/src/views/notificationList/index.vue
index 32727a1e9..2f0da193f 100644
--- a/fuintAdmin_zt/src/views/notificationList/index.vue
+++ b/fuintAdmin_zt/src/views/notificationList/index.vue
@@ -29,20 +29,18 @@
                     <el-button icon="el-icon-refresh"  @click="resetQuery">重置</el-button>
         </el-form-item>
       </el-form>
-<!--    </el-card>-->
-<!--    &lt;!&ndash;          &ndash;&gt;-->
-<!--    &lt;!&ndash;    列表信息&ndash;&gt;-->
-<!--    <el-card style="margin-top: 20px" >-->
-      <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>
-        <el-table-column align="center" prop="notificationType" label="通知类型"></el-table-column>
-        <el-table-column align="center" prop="templateContent" label="通知内容"></el-table-column>
-<!--        <el-table-column align="center" prop="sendStatus" label="通知状态"></el-table-column>-->
-        <el-table-column align="center" prop="createName" label="创建人"></el-table-column>
-        <el-table-column align="center" prop="createTime" label="创建时间"></el-table-column>
-        <el-table-column align="center" prop="createTime" label="发送时间"></el-table-column>
-      </el-table>
+      <div style="height: 69vh;">
+        <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>
+          <el-table-column align="center" prop="notificationType" label="通知类型"></el-table-column>
+          <el-table-column align="center" prop="templateContent" label="通知内容"></el-table-column>
+          <el-table-column align="center" prop="createName" label="创建人"></el-table-column>
+          <el-table-column align="center" prop="createTime" label="创建时间"></el-table-column>
+          <el-table-column align="center" prop="createTime" label="发送时间"></el-table-column>
+        </el-table>
+      </div>
+
       <pagination
         v-show="total>0"
         :total="total"
@@ -315,6 +313,11 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.app-container{
+  box-sizing: border-box;
+  padding: 10px;
+  padding-bottom: 0px;
+}
 .common-dialog >>> .el-upload--picture-card {
   width: 60px;
   height: 50px;
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/Handover.vue b/fuintCashierWeb/src/views/cashier/NewComponents/Handover.vue
index 289127bd3..6bb5d4bf3 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/Handover.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/Handover.vue
@@ -10,7 +10,7 @@
     </div>
     <div v-if="tabindex == 0">
       <div class="card-box"
-           style="width: 98%;margin: 10px auto;background: #fff;box-sizing: border-box;padding-top: 15px"
+           style="width: 99%;margin: 10px auto;background: #fff;box-sizing: border-box;padding-top: 15px"
       >
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px">
           <el-form-item label="" prop="status">
@@ -109,7 +109,7 @@
           <div>{{ orderSummary.memberPoints }}</div>
         </div>
         <div class="xxing"></div>
-        <div style="overflow: auto; height: 32vh;scrollbar-width: none; ">
+        <div style="overflow: auto; height: 35vh;scrollbar-width: none; ">
           <div class="for-box">
             <div class="for-title">
               <div class="x-"></div>
@@ -358,7 +358,7 @@
         </div>
       </div>
       <div
-        style="width: 98%; margin: 10px auto;display: flex;align-items: center;justify-content: center; background: #fff;box-sizing: border-box;padding: 15px "
+        style="width: 99%; margin: 10px auto;display: flex;align-items: center;justify-content: center; background: #fff;box-sizing: border-box;padding: 15px "
       >
         <el-button type="primary" @click="shift()">交班</el-button>
       </div>
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/HandoverRecord.vue b/fuintCashierWeb/src/views/cashier/NewComponents/HandoverRecord.vue
index f1be7b475..fc40e3520 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/HandoverRecord.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/HandoverRecord.vue
@@ -281,12 +281,13 @@ export default {
 
 }
 .wit-box{
-  height: 92vh;
-  width: 98%;
-  margin: 15px auto;
+  height: 93vh;
+  width: 99%;
+  margin: 10px auto;
   background: #fff;
   border-radius: 8px;
   padding: 10px;
+  margin-bottom: 0px;
   box-sizing: border-box;
 }
 </style>
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue b/fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue
index dcd752493..e4b9892ff 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue
@@ -129,7 +129,7 @@
     <div class="center-right">
       <div class="center-right-top" style="margin-left: 25px;">
         <el-tabs v-model="queryParams.categoryId" style="width: 100%" @tab-click="handleClick">
-          <el-tab-pane label="全部" name="first"></el-tab-pane>
+
           <el-tab-pane v-for="(item,index) in giftCategoryList" :label="item.categoryName" :name="item.id.toString()"
           ></el-tab-pane>
         </el-tabs>
@@ -527,6 +527,13 @@ export default {
     getGiftCategory() {
       getGiftCategoryApi().then(res => {
         this.giftCategoryList = res.data.records
+
+        let data = {
+          categoryName:'全部',
+          id:0
+        }
+        this.giftCategoryList.splice(0,0,data)
+        console.log(this.giftCategoryList,'12321')
       })
     },
     // 获取支付方式
@@ -1273,7 +1280,7 @@ export default {
   display: flex;
   box-sizing: border-box;
   padding: 10px;
-  padding-top: 20px;
+
   height: 100vh;
   justify-content: space-between;
 }
diff --git a/fuintCashierWeb/src/views/cashier/index.vue b/fuintCashierWeb/src/views/cashier/index.vue
index d703e328e..2ee37e443 100644
--- a/fuintCashierWeb/src/views/cashier/index.vue
+++ b/fuintCashierWeb/src/views/cashier/index.vue
@@ -5,9 +5,6 @@
     <div class="app-left">
       <div class="app-left-top">
         <img src="../../assets/logo/logo_syt.png" style="width: 167px;height: 16px;">
-<!--        <div class="app-left-title">-->
-<!--        -->
-<!--        </div>-->
       </div>
       <div class="app-left-box" v-for="(item,index) in tabarr" v-if="item.name !== '积分'" :class="{'bule': leftindex == item.index1}" :key="index" @click="gocomponents(index,item.path)">
           <i :class="item.icon" style="font-size: 18px" ></i> <div style="cursor: pointer;margin-left: 10px">{{item.name}}</div>
@@ -16,17 +13,7 @@
         <div class="app-left-box"  @click="isClickMethod()" :class="{'bule':  leftindex == item.index1 }">
           <i :class="item.icon" style="font-size: 18px" ></i> <div style="cursor: pointer;margin-left: 10px">{{item.name}}</div>
         </div>
-<!--        <transition name="el-zoom-in-top">-->
         <el-collapse-transition>
-
-<!--        <div v-if="isClick">-->
-<!--            <div class="app-left-box"  @click="gocomponents(5,'/Integral')">-->
-<!--              <div style="cursor: pointer;margin-left: 10px">积分商城</div>-->
-<!--            </div>-->
-<!--            <div class="app-left-box"  @click="gocomponents(5,'/IntegralOrder')">-->
-<!--              <div style="cursor: pointer;margin-left: 10px">积分订单</div>-->
-<!--            </div>-->
-<!--          </div>-->
         </el-collapse-transition>
       </div>
       <div class="app-left-box" @click="logout">