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/scgl/gd.vue |   92 ++++++++++++++++++++++++++++------------------
 1 files changed, 56 insertions(+), 36 deletions(-)

diff --git a/src/views/scgl/gd.vue b/src/views/scgl/gd.vue
index e87c583..5fb73da 100644
--- a/src/views/scgl/gd.vue
+++ b/src/views/scgl/gd.vue
@@ -4,11 +4,11 @@
 
       <div class="bodyTopButtonGroup" style="justify-content: space-between">
         <div style="display: flex">
-          <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
-          <el-button type="primary" icon="el-icon-connection" @click="send('send')">娲惧彂</el-button>
+          <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
+          <el-button v-waves type="primary" icon="el-icon-connection" @click="send('send')">娲惧彂</el-button>
         </div>
 
-        <el-button icon="el-icon-switch-button" @click="orderClose">鍏抽棴宸ュ崟</el-button>
+        <el-button v-waves icon="el-icon-switch-button" @click="orderClose">鍏抽棴宸ュ崟</el-button>
       </div>
 
       <div class="bodyTopFormGroup">
@@ -17,10 +17,10 @@
           :model="form"
           label-width="100px"
           inline
-          style="display: flex;justify-content: space-between"
+          style="display: flex;"
         >
           <div class="elForm">
-            <el-form-item label-width="70px" label="璁㈠崟鐘舵��" style=" display: flex;">
+            <el-form-item label="璁㈠崟鐘舵��" style=" display: flex;">
               <el-select
                 v-model="form.mesorderstus"
                 :popper-append-to-body="false"
@@ -59,7 +59,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-input v-model="form.partcode" style="width: 200px" placeholder="璇疯緭鍏�" />
             </el-form-item>
             <el-form-item v-show="isExpandForm" label="浜у搧鍚嶇О" style=" display: flex;">
@@ -71,7 +71,7 @@
             <el-form-item v-show="isExpandForm" label="鍒涘缓浜哄憳" style=" display: flex;">
               <el-input v-model="form.creatuser" style="width: 200px" placeholder="璇疯緭鍏�" />
             </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-date-picker-->
               <!--                v-model="form.createdate"-->
               <!--                type="daterange"-->
@@ -93,9 +93,9 @@
             </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>
@@ -339,13 +339,14 @@
                   <!--                    @click="check(row)"-->
                   <!--                  />-->
                   <i
-                    class="el-icon-tickets"
-                    style="cursor: pointer;color: #42b983;margin-right: 15px"
+                    :style="{color:$store.state.settings.theme}"
+                    class="el-icon-printer"
+                    style="cursor: pointer;margin-right: 15px"
                     @click="handlePrint(row.wo_code)"
                   />
                 </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>
@@ -441,8 +442,9 @@
               <div class="operationClass">
                 <el-tooltip class="item" effect="dark" content="鎵撳嵃宸ュ簭" placement="top">
                   <i
-                    class="el-icon-tickets"
-                    style="cursor: pointer;color: #42b983;margin-right: 15px"
+                    class="el-icon-printer"
+                    :style="{color:$store.state.settings.theme}"
+                    style="cursor: pointer;margin-right: 15px"
                     @click="supplementSmallClick(row)"
                   />
                 </el-tooltip>
@@ -454,6 +456,7 @@
     </div>
     <!--鏂板娲惧彂瀵硅瘽妗�-->
     <el-dialog
+      v-el-drag-dialog
       :title="operation==='add'?'鏂板':'娲惧彂'"
       :visible.sync="dialogVisible"
       width="840px"
@@ -521,6 +524,7 @@
               />
             </el-form-item>
             <el-button
+              v-waves
               type="primary"
               style="padding: 0 10px;margin-left: -8px;margin-top: 3px"
               class="el-icon-search"
@@ -589,6 +593,7 @@
               </el-select>
             </el-form-item>
             <el-button
+              v-waves
               type="primary"
               style="padding: 0 10px;margin-left: -8px;margin-top:3px"
               class="el-icon-search"
@@ -736,9 +741,10 @@
 
       <span slot="footer" class="dialog-footer">
         <div class="footerButton">
-          <el-button @click="dialogVisibleCancel">鍙� 娑�</el-button>
-          <!--          <el-button v-if="operation==='add'" type="primary" @click="dialogVisibleConfirmPreview('add')">棰勮</el-button>-->
+          <el-button v-waves @click="dialogVisibleCancel">鍙� 娑�</el-button>
+          <!--          <el-button v-waves v-if="operation==='add'" type="primary" @click="dialogVisibleConfirmPreview('add')">棰勮</el-button>-->
           <el-button
+            v-waves
             type="primary"
             :loading="$store.state.app.buttonIsDisabled"
             :disabled="$store.state.app.buttonIsDisabled"
@@ -750,6 +756,7 @@
 
     <!-- 宸ュ簭浠诲姟瀵硅瘽妗�-->
     <el-dialog
+      v-el-drag-dialog
       title="宸ュ簭浠诲姟"
       :visible.sync="dialogVisibleTask"
       width="840px"
@@ -759,6 +766,7 @@
       @close="dialogVisibleTaskClose"
     >
       <el-button
+        v-waves
         style="margin-bottom: 15px"
         type="primary"
         @click="supplementClick"
@@ -829,21 +837,22 @@
           fixed="right"
         >
           <template slot-scope="{row}">
-            <el-button type="text" style="padding: 0;" @click="supplementSmallClick(row)">琛ユ墦</el-button>
+            <el-button v-waves type="text" style="padding: 0;" @click="supplementSmallClick(row)">琛ユ墦</el-button>
           </template>
         </el-table-column>
       </el-table>
 
       <span slot="footer" class="dialog-footer">
         <div class="footerButton">
-          <el-button @click="dialogVisibleBack">杩� 鍥�</el-button>
-          <!--          <el-button type="primary" @click="dialogVisibleConfirm">纭� 瀹�</el-button>-->
+          <el-button v-waves @click="dialogVisibleBack">杩� 鍥�</el-button>
+          <!--          <el-button v-waves type="primary" @click="dialogVisibleConfirm">纭� 瀹�</el-button>-->
         </div>
       </span>
     </el-dialog>
 
     <!-- 婧愬崟鍗曞彿瀵硅瘽妗�-->
     <el-dialog
+      v-el-drag-dialog
       title="婧愬崟鍗曞彿"
       :visible.sync="dialogVisibleSource"
       width="1200px"
@@ -933,8 +942,8 @@
           </div>
 
           <div style="display: flex;align-items: start;margin-top: 3px;z-index: 2;justify-content: end">
-            <el-button type="primary" icon="el-icon-search" @click="sourceSearch">鏌ヨ</el-button>
-            <el-button type="info" icon="el-icon-refresh" @click="sourceReset">閲嶇疆</el-button>
+            <el-button v-waves type="primary" icon="el-icon-search" @click="sourceSearch">鏌ヨ</el-button>
+            <el-button v-waves type="info" icon="el-icon-refresh" @click="sourceReset">閲嶇疆</el-button>
           </div>
 
         </el-form>
@@ -968,6 +977,7 @@
           :header-cell-style="this.$headerCellStyle"
           :cell-style="this.$cellStyle"
           @sort-change="sourceSortChange"
+          @row-click="getCurrentRowSource"
         >
           <!--          <el-table-column-->
           <!--            type="selection"-->
@@ -982,8 +992,8 @@
                 v-model="radioSelectedId"
                 :label="row.id"
                 style="color: transparent;padding-left: 10px;"
-                @change.native="getCurrentRowSource(row.id)"
               />
+              <!--              @change.native="getCurrentRowSource(row.id)"-->
             </template>
           </el-table-column>
           <el-table-column
@@ -1121,7 +1131,7 @@
           <!--            <template slot-scope="{row}">-->
           <!--              <div class="operationClass">-->
           <!--                <el-tooltip class="item" effect="dark" content="涓嬭揪" placement="top">-->
-          <!--                  &lt;!&ndash;                <el-button type="text" @click="edit('edit',row)">涓嬭揪</el-button>&ndash;&gt;-->
+          <!--                  &lt;!&ndash;                <el-button v-waves type="text" @click="edit('edit',row)">涓嬭揪</el-button>&ndash;&gt;-->
           <!--                  <i-->
           <!--                    class="el-icon-bottom"-->
           <!--                    style="color:#42b983;cursor: pointer;margin-left: 5px"-->
@@ -1145,14 +1155,15 @@
       />
       <span slot="footer" class="dialog-footer">
         <div class="footerButton">
-          <el-button @click="dialogVisibleSourceBack">杩� 鍥�</el-button>
-          <el-button type="primary" @click="dialogVisibleSourceConfirm">纭� 瀹�</el-button>
+          <el-button v-waves @click="dialogVisibleSourceBack">杩� 鍥�</el-button>
+          <el-button v-waves type="primary" @click="dialogVisibleSourceConfirm">纭� 瀹�</el-button>
         </div>
       </span>
     </el-dialog>
 
     <!--鎵撳嵃棰勮瀵硅瘽妗�  澶ф爣绛�-->
     <el-dialog
+      v-el-drag-dialog
       title=""
       :visible.sync="dialogVisibleApprove"
       width="812px"
@@ -1288,16 +1299,17 @@
       </div>
       <span slot="footer" class="dialog-footer">
         <div class="footerButton">
-          <el-button @click="dialogVisibleBackPreview">杩� 鍥�</el-button>
-          <!--            <el-button v-if="operation==='add'" type="primary" @click="dialogVisibleConfirm">纭� 瀹�</el-button>-->
-          <!--            <el-button type="primary" @click="dialogVisibleConfirm">纭� 瀹�/鎵� 鍗�</el-button>-->
-          <el-button v-print="printObj" type="primary">鎵� 鍗�</el-button>
+          <el-button v-waves @click="dialogVisibleBackPreview">杩� 鍥�</el-button>
+          <!--            <el-button v-waves v-if="operation==='add'" type="primary" @click="dialogVisibleConfirm">纭� 瀹�</el-button>-->
+          <!--            <el-button v-waves type="primary" @click="dialogVisibleConfirm">纭� 瀹�/鎵� 鍗�</el-button>-->
+          <el-button v-waves v-print="printObj" type="primary">鎵� 鍗�</el-button>
         </div>
       </span>
     </el-dialog>
 
     <!--鎵撳嵃棰勮椤甸潰  灏忔爣绛�-->
     <el-dialog
+      v-el-drag-dialog
       title="棰勮"
       :visible.sync="dialogVisible2"
       width="1140"
@@ -1515,14 +1527,15 @@
       </div>
       <span slot="footer" class="dialog-footer">
         <div class="footerButton">
-          <el-button @click="dialogVisible2 = false">鍙� 娑�</el-button>
-          <el-button v-print="printObj2" type="primary">鎵� 鍗�</el-button>
+          <el-button v-waves @click="dialogVisible2 = false">鍙� 娑�</el-button>
+          <el-button v-waves v-print="printObj2" type="primary">鎵� 鍗�</el-button>
         </div>
       </span>
     </el-dialog>
 
     <!--    宸ヨ壓璺嚎瀵硅瘽妗�-->
     <el-dialog
+      v-el-drag-dialog
       :close-on-click-modal="false"
       title="鍏宠仈宸ヨ壓璺嚎"
       :visible.sync="dialogVisibleRoute"
@@ -1633,8 +1646,8 @@
       </div>
       <span slot="footer" class="dialog-footer">
         <div class="footerButton">
-          <el-button @click="routeDialogVisibleCancel">鍙� 娑�</el-button>
-          <el-button type="primary" @click="routeDialogVisibleConfirm">纭� 瀹�</el-button>
+          <el-button v-waves @click="routeDialogVisibleCancel">鍙� 娑�</el-button>
+          <el-button v-waves type="primary" @click="routeDialogVisibleConfirm">纭� 瀹�</el-button>
         </div>
       </span>
     </el-dialog>
@@ -1658,12 +1671,15 @@
 import { urlAddRandomNo, webapp_ws_ajax_run, webapp_ws_autoupdate } from '@/utils/grwebapp'
 import QRCode from 'qrcodejs2'
 import $ from 'jquery'
+import elDragDialog from '@/directive/el-drag-dialog'
+import waves from '@/directive/waves'
 
 export default {
   name: 'GD',
   components: {
     Pagination
   },
+  directives: { elDragDialog, waves },
   data() {
     return {
       mouseHoverType: 'mouseout',
@@ -2504,8 +2520,12 @@
       this.sourceFormTotal = res.count
     },
     // 鍗曢�夋閫変腑鑾峰彇褰撳墠琛屼俊鎭�
-    getCurrentRowSource(id) {
-      this.radioSelectedId = id
+    // getCurrentRowSource2(id) {
+    //   this.radioSelectedId = id
+    // },
+    // 鍗曢�夋閫変腑鑾峰彇褰撳墠琛屼俊鎭�
+    getCurrentRowSource(row, event, column) {
+      this.radioSelectedId = row.id
     },
     sourceSearch() {
       this.getErpOrderSearch()

--
Gitblit v1.9.3