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/jcsz/zzjg.vue |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/views/jcsz/zzjg.vue b/src/views/jcsz/zzjg.vue
index c5f2b1c..30b74ed 100644
--- a/src/views/jcsz/zzjg.vue
+++ b/src/views/jcsz/zzjg.vue
@@ -3,7 +3,7 @@
     <div class="body" :style="{height:mainHeight+'px'}">
 
       <div class="bodyTopButtonGroup">
-        <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
+        <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
       </div>
       <div class="bodyTopFormGroup">
         <el-form
@@ -44,8 +44,8 @@
             class="bodySearchReset"
             :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'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>
+            <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>
         <div
@@ -85,9 +85,9 @@
             :fixed="item.fixed?(item.fixed==='left'?'left':'right'):false"
           >
             <template slot-scope="{row}">
-              <div v-if="row[item.prop]==='D'&&row.description">閮ㄩ棬</div>
-              <div v-else-if="row[item.prop]==='W'&&row.description">杞﹂棿</div>
-              <div v-else-if="row[item.prop]===null">/</div>
+              <div v-if="row[item.prop]==='D'&&item.prop==='description'">閮ㄩ棬</div>
+              <div v-else-if="row[item.prop]==='W'&&item.prop==='description'">杞﹂棿</div>
+              <div v-else-if="!row[item.prop]">/</div>
               <div v-else>{{ row[item.prop] }}</div>
             </template>
           </el-table-column>
@@ -240,8 +240,9 @@
       </el-form>
       <span slot="footer" class="dialog-footer">
         <div class="footerButton">
-          <el-button @click="dialogVisibleCancel">鍙� 娑�</el-button>
+          <el-button v-waves @click="dialogVisibleCancel">鍙� 娑�</el-button>
           <el-button
+            v-waves
             type="primary"
             :loading="$store.state.app.buttonIsDisabled"
             :disabled="$store.state.app.buttonIsDisabled"
@@ -260,6 +261,7 @@
 import { validateCode } from '@/utils/global'
 import TableColumnSettings from '@/components/TableColumnSettings'
 import elDragDialog from '@/directive/el-drag-dialog' // base on element-ui
+import waves from '@/directive/waves/index.js' // 姘存尝绾规寚浠�
 
 // const SER_HZ = /^[\u4e00-\u9fa5]+$/
 // const SER_HZ = /^[a-zA-Z0-9_;,.<>() ]{0,}$/
@@ -268,7 +270,7 @@
   components: {
     Pagination, TableColumnSettings
   },
-  directives: { elDragDialog },
+  directives: { elDragDialog, waves },
   data() {
     // const validateName = (rule, value, callback) => {
     //   if (!value) {

--
Gitblit v1.9.3