From b46bc2dba51a3885a68e4c58316b41a31ea16bb2 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 14 二月 2023 13:35:03 +0800
Subject: [PATCH] 1.存货档案修改

---
 src/views/bbgl/bzgz.vue |   38 ++++++++++++++++++++++++--------------
 1 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/src/views/bbgl/bzgz.vue b/src/views/bbgl/bzgz.vue
index 75d3358..3eabb24 100644
--- a/src/views/bbgl/bzgz.vue
+++ b/src/views/bbgl/bzgz.vue
@@ -2,7 +2,7 @@
   <div>
     <div class="body" :style="{height:mainHeight+'px'}">
       <div class="bodyTopButtonGroup">
-        <el-button type="primary" icon="el-icon-download" @click="download">瀵煎嚭</el-button>
+        <el-button v-waves type="primary" icon="el-icon-download" @click="download">瀵煎嚭</el-button>
       </div>
 
       <div class="bodyTopFormGroup">
@@ -11,10 +11,10 @@
           :model="form"
           label-width="100px"
           inline
-          style="display: flex;justify-content: space-between"
+          style="display: flex;"
         >
           <div class="elForm">
-            <el-form-item label="宸ュ崟缂栧彿" style=" display: flex;" label-width="70px">
+            <el-form-item label="宸ュ崟缂栧彿" style="display: flex;">
               <el-input v-model="form.wocode" placeholder="璇疯緭鍏�" style="width: 200px" />
             </el-form-item>
             <el-form-item label="浜у搧缂栫爜" style=" display: flex;">
@@ -26,7 +26,7 @@
             <el-form-item label="瑙勬牸鍨嬪彿" style=" display: flex;">
               <el-input v-model="form.partspec" style="width: 200px" placeholder="璇疯緭鍏�" />
             </el-form-item>
-            <el-form-item v-show="isExpandForm" label="宸ュ簭鍚嶇О" label-width="70px" style="display: flex;">
+            <el-form-item v-show="isExpandForm" label="宸ュ簭鍚嶇О" style="display: flex;">
               <el-input v-model="form.stepname" style="width: 200px" placeholder="璇疯緭鍏�" />
             </el-form-item>
             <el-form-item v-show="isExpandForm" label="鐢熶骇鐝粍" style=" display: flex;">
@@ -59,9 +59,12 @@
 
             </el-form-item>
           </div>
-          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
-            <el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
-            <el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
+          <div
+            class="bodySearchReset"
+            :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
+          >
+            <el-button v-waves type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
+            <el-button v-waves type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
           </div>
         </el-form>
 
@@ -197,12 +200,13 @@
           </el-table-column>
           <el-table-column
             prop="lm_user"
-            label="鎶ュ伐浜哄憳"
+            label="鎿嶄綔浜�"
             width="110"
             sortable="custom"
-          />          <el-table-column
+          />
+          <el-table-column
             prop="report_date"
-            label="鎶ュ伐鏃堕棿"
+            label="鎿嶄綔鏃堕棿"
             width="160"
             sortable="custom"
           />
@@ -218,7 +222,8 @@
                   <!--                  <i class="el-icon-edit-outline" @click="edit('edit',row)" />-->
                   <i
                     class="el-icon-tickets"
-                    style="cursor: pointer;color: #42b983;margin-right: 15px"
+                    :style="{color:$store.state.settings.theme}"
+                    style="cursor: pointer;margin-right: 15px"
                     @click="edit('edit',row)"
                   />
                 </el-tooltip>
@@ -243,6 +248,7 @@
     </div>
 
     <el-dialog
+      v-el-drag-dialog
       :title="operation==='add'?'鏂板':'浜哄憳鏄庣粏'"
       :visible.sync="dialogVisible"
       width="800px"
@@ -257,15 +263,16 @@
           :key="tag.name"
           type="success"
           style="margin-right: 15px;min-width: 80px;text-align: center"
+          :style="{color:$store.state.settings.theme}"
         >
           {{ tag }}
         </el-tag>
       </div>
       <span slot="footer" class="dialog-footer">
         <div class="footerButton">
-          <el-button @click="dialogVisible=false">杩� 鍥�</el-button>
-          <!--          <el-button @click="dialogVisibleCancel">鍙� 娑�</el-button>-->
-          <!--          <el-button type="primary" @click="dialogVisibleConfirm">纭� 瀹�</el-button>-->
+          <el-button v-waves @click="dialogVisible=false">杩� 鍥�</el-button>
+          <!--          <el-button v-waves @click="dialogVisibleCancel">鍙� 娑�</el-button>-->
+          <!--          <el-button v-waves type="primary" @click="dialogVisibleConfirm">纭� 瀹�</el-button>-->
         </div>
       </span>
     </el-dialog>
@@ -294,12 +301,15 @@
   GroupSalaryReportSearchUser
 } from '@/api/bbgl'
 import { MesOrderStepReportSelectUserGroup } from '@/api/scgl'
+import elDragDialog from '@/directive/el-drag-dialog'
+import waves from '@/directive/waves'
 
 export default {
   name: 'Zzjg',
   components: {
     Pagination, ImportPicker
   },
+  directives: { elDragDialog, waves },
   data() {
     return {
       mouseHoverType: 'mouseout',

--
Gitblit v1.9.3