From d86ccb2b95f03aaa4e3ef3fdab8f3bda5d965473 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期二, 17 十月 2023 20:38:06 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/adjust-style

---
 src/components/makepager/FormBtnsView.vue |   37 ++++++++++++++++---------------------
 1 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/src/components/makepager/FormBtnsView.vue b/src/components/makepager/FormBtnsView.vue
index a1c98fd..201eb77 100644
--- a/src/components/makepager/FormBtnsView.vue
+++ b/src/components/makepager/FormBtnsView.vue
@@ -7,14 +7,14 @@
         <div class="right-label">棰濆鐨勪环鏍�</div>
       </div>
     </div> -->
-    <div v-if="!showProduct && !showWarehouse && !showPosition && !addProduct" class="sub-number left_border">
+    <div v-if="!showProduct && !showWarehouse && !showPosition && !addProduct" class="sub-number left_border no-cursor">
       <div class="left"><i class="el-icon-present"></i></div>
       <div class="right">
         <div class="right-label">{{ "0.00" + "浠�" }}</div>
         <div class="right-label">鍦ㄥ簱</div>
       </div>
     </div>
-    <div v-if="!showProduct && !showWarehouse && !showPosition && !addProduct" class="sub-number">
+    <div v-if="!showProduct && !showWarehouse && !showPosition && !addProduct" class="sub-number no-cursor">
       <div class="left"><i class="el-icon-present"></i></div>
       <div class="right">
         <div class="right-label">{{ "0.00" + "浠�" }}</div>
@@ -23,9 +23,8 @@
     </div>
     <div
       v-if="!showProduct && !showWarehouse && !showPosition"
-      class="sub-number"
+      class="sub-number yes-cursor"
       @click="inOutBoundClick"
-      style="cursor: pointer"
       :class="{ left_border: addProduct }"
     >
       <div class="left icon-view"><i class="el-icon-sort"></i></div>
@@ -34,7 +33,7 @@
         <div class="right-label">{{ "鍑�: " + 0 }}</div>
       </div>
     </div>
-    <div
+    <!-- <div
       v-if="!showProduct && !showWarehouse && !showPosition"
       class="sub-number"
       @click="inOutBoundClick"
@@ -45,35 +44,28 @@
         <div class="right-label">{{ 0 }}</div>
         <div class="right-label">BOM</div>
       </div>
-    </div>
-    <div v-if="!showProduct && !showWarehouse && !showPosition" class="sub-number">
+    </div> -->
+    <div v-if="!showProduct && !showWarehouse && !showPosition" class="sub-number no-cursor">
       <div class="left"><i class="el-icon-refresh"></i></div>
       <div class="right">
         <div class="right-label">{{ 0 }}</div>
         <div class="right-label">閲嶈璐ц鍒�</div>
       </div>
     </div>
-    <div v-if="showProduct" class="sub-number left_border" @click="productClick" style="cursor: pointer">
+    <div v-if="showProduct" class="sub-number left_border yes-cursor" @click="productClick">
       <div class="left"><i class="el-icon-s-fold"></i></div>
       <div class="right">
         <div class="right-label">{{ 0 }}</div>
         <div class="right-label">浜у搧</div>
       </div>
     </div>
-    <div v-if="!showWarehouse" class="sub-number">
+    <div v-if="!showWarehouse" class="sub-number left_border no-cursor">
       <div class="left"><i class="el-icon-refresh"></i></div>
       <div class="right">
         <div class="right-one">涓婃灦瑙勫垯</div>
       </div>
     </div>
-    <!-- <div v-if="!showProduct && !showWarehouse && !showPosition" class="sub-number">
-      <div class="left"><i class="el-icon-s-data"></i></div>
-      <div class="right">
-        <div class="right-label">{{ "0.00" + "浠�" }}</div>
-        <div class="right-label">宸插敭</div>
-      </div>
-    </div> -->
-    <div v-if="!showProduct && !showWarehouse && !showPosition && showProcure" class="sub-number">
+    <!-- <div v-if="!showProduct && !showWarehouse && !showPosition && showProcure" class="sub-number">
       <div class="left"><i class="el-icon-bank-card"></i></div>
       <div class="right">
         <div class="right-label">{{ "0.00" + "浠�" }}</div>
@@ -86,14 +78,14 @@
         <div class="right-label">{{ "0.00" + "浠�" }}</div>
         <div class="right-label">宸插敭</div>
       </div>
-    </div>
-    <div v-if="showPosition" class="sub-number">
+    </div> -->
+    <div v-if="showPosition" class="sub-number no-cursor">
       <div class="left"><i class="el-icon-help"></i></div>
       <div class="right">
         <div class="right-one">褰撳墠搴撳瓨</div>
       </div>
     </div>
-    <div v-if="showWarehouse" class="sub-number">
+    <div v-if="showWarehouse" class="sub-number left_border no-cursor">
       <div class="left"><i class="el-icon-refresh"></i></div>
       <div class="right">
         <div class="right-one">璺嚎</div>
@@ -152,11 +144,14 @@
   display: flex;
   justify-content: right;
   height: 44px;
-  border-bottom: 1px solid #e9e9e9;
+  // border-bottom: 1px solid #e9e9e9;
+  padding: 0px 10px;
   font-size: 13px;
   .sub-number {
     width: 12.5%;
     border-right: 1px solid #e9e9e9;
+    border-top: 1px solid #e9e9e9;
+    border-bottom: 1px solid #e9e9e9;
     display: flex;
     padding: 3px 9px;
     .left {

--
Gitblit v1.8.0