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/xtsz/cjgg.vue |   46 ++++++++++++++++++++++++++++++----------------
 1 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/src/views/xtsz/cjgg.vue b/src/views/xtsz/cjgg.vue
index 23fa776..3e9a588 100644
--- a/src/views/xtsz/cjgg.vue
+++ b/src/views/xtsz/cjgg.vue
@@ -2,8 +2,8 @@
   <div>
     <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 icon="el-icon-download" @click="upload">瀵煎叆</el-button>-->
+        <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
+        <!--        <el-button v-waves icon="el-icon-download" @click="upload">瀵煎叆</el-button>-->
       </div>
 
       <div class="bodyTopFormGroup">
@@ -12,10 +12,10 @@
           :model="form"
           label-width="100px"
           inline
-          style="display: flex;justify-content: space-between"
+          style="display: flex;"
         >
           <div class="elForm">
-            <el-form-item label="鎵ц杞﹂棿" label-width="70px" style=" display: flex;">
+            <el-form-item label="鎵ц杞﹂棿" style=" display: flex;">
               <el-select v-model="form.wkspcode" style="width: 200px" placeholder="璇烽�夋嫨">
                 <el-option
                   v-for="item in wkspSelectArr"
@@ -41,7 +41,7 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item v-show="isExpandForm" label-width="70px" label="鍏憡绛夌骇" style=" display: flex;">
+            <el-form-item v-show="isExpandForm" label="鍏憡绛夌骇" style=" display: flex;">
               <el-select v-model="form.level" style="width: 200px" placeholder="璇烽�夋嫨">
                 <el-option
                   v-for="item in levelSelectArr"
@@ -52,9 +52,9 @@
               </el-select>
             </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>
         <div
@@ -100,6 +100,7 @@
             prop="wksp_name"
             label="鎵ц杞﹂棿"
             sortable="custom"
+            show-tooltip-when-overflow
           />
           <el-table-column
             prop="title"
@@ -116,17 +117,19 @@
           />
           <el-table-column
             prop="lm_user"
+            show-tooltip-when-overflow
             label="鍒涘缓浜哄憳"
             sortable="custom"
           />
           <el-table-column
             prop="lm_date"
             label="鍒涘缓鏃堕棿"
-
+            show-tooltip-when-overflow
             sortable="custom"
           />
           <el-table-column
             prop="if_cancel"
+            show-tooltip-when-overflow
             label="鏄惁鎾ら攢"
             sortable="custom"
           >
@@ -139,6 +142,7 @@
             prop="priority"
             label="鍏憡绛夌骇"
             sortable="custom"
+            show-tooltip-when-overflow
           >
             <template slot-scope="{row}">
               <div v-if="row.priority===3">涓�鑸�</div>
@@ -154,10 +158,10 @@
             <template slot-scope="{row}">
               <div class="operationClass">
                 <el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">
-                  <i class="el-icon-edit-outline" @click="edit('edit',row)" />
+                  <i class="el-icon-edit-outline" :style="{color:$store.state.settings.theme}" @click="edit('edit',row)" />
                 </el-tooltip>
                 <el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
-                  <i class="el-icon-delete" @click="del(row)" />
+                  <i class="el-icon-delete" :style="{color:$store.state.settings.theme}" @click="del(row)" />
                 </el-tooltip>
               </div>
             </template>
@@ -177,6 +181,7 @@
     </div>
 
     <el-dialog
+      v-el-drag-dialog
       :title="operation==='add'?'鏂板':'缂栬緫'"
       :visible.sync="dialogVisible"
       width="800px"
@@ -241,8 +246,14 @@
       </el-form>
       <span slot="footer" class="dialog-footer">
         <div class="footerButton">
-          <el-button @click="dialogVisibleCancel">鍙� 娑�</el-button>
-          <el-button type="primary" @click="dialogVisibleConfirm">纭� 瀹�</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"
+            @click="dialogVisibleConfirm"
+          >纭� 瀹�</el-button>
         </div>
       </span>
     </el-dialog>
@@ -258,12 +269,15 @@
 import ImportPicker from '@/components/ImportPicker'
 import { SystemAnnouncementAddUpdate, SystemAnnouncementDelete, SystemAnnouncementSearch } from '@/api/xtsz'
 import { ShopSearch } from '@/api/dzkb'
+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',
@@ -454,19 +468,19 @@
     },
     // 瀵硅瘽妗嗙‘璁�
     dialogVisibleConfirm() {
-      console.log(this.dialogForm.dtString, 111)
-      console.log(this.dialogForm.id, this.dialogForm.ancetitle, this.dialogForm.ancecont, this.dialogForm.level, this.dialogForm.cancel, this.dialogForm.opertype, 111)
       this.$refs.dialogForm.validate(valid => {
         if (valid) {
+          this.$store.state.app.buttonIsDisabled = true
           const data = []
           this.dialogForm.dtString.forEach(item => {
             data.push({ wksp_code: item })
           })
           SystemAnnouncementAddUpdate(data, this.dialogForm.id, this.dialogForm.ancetitle, this.dialogForm.ancecont, this.dialogForm.level, this.dialogForm.cancel, this.operation === 'add' ? 'Add' : 'Update').then(res => {
             if (res.code === '200') {
-              this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
               this.dialogVisible = false
+              this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
               this.getSystemAnnouncementSearch()
+              this.$store.state.app.buttonIsDisabled = false
             } else {
               this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
             }

--
Gitblit v1.9.3