From ef50840e2a90147fb86841701a7b075993aad917 Mon Sep 17 00:00:00 2001
From: "DESKTOP-369JRHT\\12997" <9>
Date: Mon, 4 Nov 2024 18:16:16 +0800
Subject: [PATCH] 11.4

---
 .../views/oilConfig/oilInventory/order.vue    | 19 +++++++++++++++++--
 fuintAdmin/src/views/shopowner.vue            |  3 ++-
 fuintAdmin_zt/src/views/Site/index.vue        |  5 ++++-
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/fuintAdmin/src/views/oilConfig/oilInventory/order.vue b/fuintAdmin/src/views/oilConfig/oilInventory/order.vue
index 3641ecbcd..4e7d1c61c 100644
--- a/fuintAdmin/src/views/oilConfig/oilInventory/order.vue
+++ b/fuintAdmin/src/views/oilConfig/oilInventory/order.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container" style="padding-top: 1px">
 
-    <div class="card-change-1-search" style="margin: 10px;">
+    <div class="top_tap" >
       <div style="height: 90px; display: flex; justify-content: space-between;">
         <div style="height: 100%;  display: flex; justify-content: space-between;">
           <div style="height: 100%; width: 70%;  display: flex; justify-content: space-between;">
@@ -71,7 +71,7 @@
       </div>
     </div>
 
-    <div class="card-change-1-1" style="margin: 10px; height: 76vh; ">
+    <div class="center_tap" >
       <el-row :gutter="10" class="mb8">
         <el-col :span="1.5">
 <!--          <span style="font-size: 20px;font-weight: bold">盘点详情</span>-->
@@ -905,4 +905,19 @@ export default {
     padding-left: 20px;
 
   }
+  .top_tap{
+    border-radius: 8px;
+    background: #fff;
+    box-sizing: border-box;
+    padding: 15px;
+    margin: 10px;
+  }
+  .center_tap{
+    border-radius: 8px;
+    background: #fff;
+    box-sizing: border-box;
+    padding: 15px;
+    margin: 10px;
+    height: 80vh;
+  }
 </style>
diff --git a/fuintAdmin/src/views/shopowner.vue b/fuintAdmin/src/views/shopowner.vue
index d30c0504e..4fbc262e9 100644
--- a/fuintAdmin/src/views/shopowner.vue
+++ b/fuintAdmin/src/views/shopowner.vue
@@ -272,7 +272,8 @@ import {
   getOilAndGoodsAndVipAndPoints
 } from "@/api/allOrder";
 
-export default {
+export default
+{
 
   props: ["accountId"],
   data() {
diff --git a/fuintAdmin_zt/src/views/Site/index.vue b/fuintAdmin_zt/src/views/Site/index.vue
index 35dcfccd4..7c6076463 100644
--- a/fuintAdmin_zt/src/views/Site/index.vue
+++ b/fuintAdmin_zt/src/views/Site/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container" >
+  <div class="app-container" style="padding: 0px">
     <div class="tab-box">
       <div class="f-box" v-for="(item,index) in tablist" :key="index" @click="handleClick1(index)" :class="{ 'active' :activeindex==index}">{{item.name}}</div>
     </div>
@@ -623,7 +623,9 @@
 
     <!-- 添加或修改用户配置对话框 class="common-dialog" -->
     <el-dialog :title="title" :visible.sync="open"  width="600px" append-to-body :close-on-click-modal="false" >
+
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+
         <el-row>
           <el-col :span="24">
             <el-form-item label="所属机构" prop="deptId">
@@ -638,6 +640,7 @@
             </el-form-item>
           </el-col>
         </el-row>
+
         <el-row>
           <el-col :span="24">
             <el-form-item label="用户姓名" prop="realName">