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/jsqd.vue |   99 ++++++++++++++++++++++++++++++++-----------------
 1 files changed, 65 insertions(+), 34 deletions(-)

diff --git a/src/views/jcsz/jsqd.vue b/src/views/jcsz/jsqd.vue
index 0288111..ea8b5c2 100644
--- a/src/views/jcsz/jsqd.vue
+++ b/src/views/jcsz/jsqd.vue
@@ -3,13 +3,13 @@
     <div class="body" :style="{height:mainHeight+'px'}">
 
       <div class="bodyTopButtonGroup" style="justify-content: space-between">
-        <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 style="display: flex">
           <el-tooltip class="item" effect="dark" content="瑙掕壊绫诲瀷鏁版嵁缁存姢" placement="top">
-            <el-button icon="el-icon-setting" @click="settingButton">璁剧疆</el-button>
+            <el-button v-waves icon="el-icon-setting" @click="settingButton">璁剧疆</el-button>
           </el-tooltip>
-          <el-button icon="el-icon-download" @click="upload">瀵煎叆</el-button>
+          <el-button v-waves icon="el-icon-download" @click="upload">瀵煎叆</el-button>
         </div>
       </div>
 
@@ -19,10 +19,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-input v-model="form.RoleCode" placeholder="璇疯緭鍏�" style="width: 200px" />
             </el-form-item>
             <el-form-item label="瑙掕壊鍚嶇О" style=" display: flex;">
@@ -49,9 +49,12 @@
               <el-input v-model="form.UserName" style="width: 200px" placeholder="璇疯緭鍏�" />
             </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
@@ -224,6 +227,7 @@
 
     <!--    鏂板淇敼瀵硅瘽妗�-->
     <el-dialog
+      v-el-drag-dialog
       :title="operation==='add'?'鏂板':'缂栬緫'"
       :visible.sync="dialogVisible"
       width="800px"
@@ -261,8 +265,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"
@@ -273,6 +278,7 @@
     </el-dialog>
     <!--    璁剧疆鎸夐挳瀵硅瘽妗�-->
     <el-dialog
+      v-el-drag-dialog
       title="璁剧疆"
       :visible.sync="settingDialogVisible"
       width="800px"
@@ -282,8 +288,8 @@
       @close="handleCloseSetting"
     >
       <div style="margin-bottom: 20px;display: flex">
-        <el-button type="primary" icon="el-icon-circle-plus-outline" @click="addSetting">鏂板</el-button>
-        <!--        <el-button type="primary" icon="el-icon-delete" @click="delSetting">鍒犻櫎</el-button>-->
+        <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="addSetting">鏂板</el-button>
+        <!--        <el-button v-waves type="primary" icon="el-icon-delete" @click="delSetting">鍒犻櫎</el-button>-->
       </div>
       <el-table
         ref="RoleTypeCodeArr"
@@ -337,9 +343,9 @@
         <el-table-column label="鎿嶄綔">
           <template slot-scope="{row}">
             <div class="operationClass">
-              <el-button v-if="row.isVisible===0" type="text" @click="delSetting(row)">鍒犻櫎</el-button>
-              <el-button v-if="row.isVisible===1" type="text" @click="formSettingSave(row)">淇濆瓨</el-button>
-              <el-button v-if="row.isVisible===1" type="text" @click="formSettingCancel(row)">鍙栨秷</el-button>
+              <el-button v-if="row.isVisible===0" v-waves type="text" @click="delSetting(row)">鍒犻櫎</el-button>
+              <el-button v-if="row.isVisible===1" v-waves type="text" @click="formSettingSave(row)">淇濆瓨</el-button>
+              <el-button v-if="row.isVisible===1" v-waves type="text" @click="formSettingCancel(row)">鍙栨秷</el-button>
             </div>
           </template>
         </el-table-column>
@@ -357,13 +363,14 @@
       />
       <span slot="footer" class="dialog-footer">
         <div class="footerButton">
-          <el-button @click="settingDialogVisibleCancel">杩斿洖</el-button>
-          <!--          <el-button type="primary" @click="settingDialogVisibleConfirm">纭� 瀹�</el-button>-->
+          <el-button v-waves @click="settingDialogVisibleCancel">杩斿洖</el-button>
+          <!--          <el-button v-waves type="primary" @click="settingDialogVisibleConfirm">纭� 瀹�</el-button>-->
         </div>
       </span>
     </el-dialog>
     <!--    鍏宠仈鐢ㄦ埛瀵硅瘽妗�-->
     <el-dialog
+      v-el-drag-dialog
       title="瑙掕壊鍏宠仈鐢ㄦ埛"
       :visible.sync="userDialogVisible"
       width="900px"
@@ -428,6 +435,7 @@
           </el-form-item>
         </el-form>
         <el-button
+          v-waves
           type="primary"
           icon="el-icon-search"
           style="margin-top: 5px;margin-left: 30px"
@@ -435,6 +443,7 @@
         >鏌ヨ
         </el-button>
         <el-button
+          v-waves
           type="info"
           icon="el-icon-refresh"
           style="margin-top: 5px;margin-left: 10px"
@@ -518,8 +527,9 @@
 
       <span slot="footer" class="dialog-footer">
         <div class="footerButton">
-          <el-button @click="userDialogVisibleCancel">鍙� 娑�</el-button>
+          <el-button v-waves @click="userDialogVisibleCancel">鍙� 娑�</el-button>
           <el-button
+            v-waves
             type="primary"
             :loading="$store.state.app.buttonIsDisabled"
             :disabled="$store.state.app.buttonIsDisabled"
@@ -530,6 +540,7 @@
     </el-dialog>
     <!--    鍒嗛厤鏉冮檺瀵硅瘽妗�-->
     <el-dialog
+      v-el-drag-dialog
       title="瑙掕壊鍏宠仈鏉冮檺"
       :visible.sync="dialogVisibleRight"
       width="800px"
@@ -557,29 +568,32 @@
           @click="myCheckboxClick(item)"
         >
 
-          <input
-            class="myCheckboxInput"
-            type="checkbox"
-            :disabled="rightFrom.usercode==='S001'"
-            :value="item.code"
-            :name="item.name"
-            :style="{color:item.isSelected2?'#42b983':'#fff'}"
-            @click="myCheckboxInputClick(item)"
-          >{{ item.name }}
+          <!--          <input-->
+          <!--            class="myCheckboxInput"-->
+          <!--            type="checkbox"-->
+          <!--            :disabled="rightFrom.usercode==='S001'"-->
+          <!--            :value="item.code"-->
+          <!--            :name="item.name"-->
+          <!--            :style="{color:item.isSelected2?'#42b983':'#fff'}"-->
+          <!--            @click="myCheckboxInputClick(item)"-->
+          <!--          >{{ item.name }}-->
 
-          <!--          :style="{color:item.isSelected2?'#42b983':'#fff'}"-->
           <!--            鐖跺瓙鐐瑰嚮浜嬩欢涓嶅奖鍝�-->
           <!--            onClick="event.cancelBubble = true"-->
           <!--鏄庡ぉ鍐嶇湅涓�涓媔nput鍜宔l-checkbox涔嬮棿鐨勫尯鍒�-->
+
           <el-checkbox
+            :key="item.code"
             v-model="item.isSelected2"
             class="myCheckboxInput"
             :value="item.code"
             :name="item.name"
             :disabled="rightFrom.usercode==='S001'"
-          >{{ item.name }}
-          </el-checkbox>
-
+            :checked="item.isSelected2"
+            :label="item.name"
+            @change="myCheckboxInputClick(item)"
+          />
+          <div class="myCheckboxInputLabel">{{ item.name }}</div>
         </div>
       </div>
       <el-divider />
@@ -614,8 +628,9 @@
       </div>
       <span slot="footer" class="dialog-footer">
         <div class="footerButton">
-          <el-button @click="rightDialogVisibleCancel">鍙� 娑�</el-button>
+          <el-button v-waves @click="rightDialogVisibleCancel">鍙� 娑�</el-button>
           <el-button
+            v-waves
             type="primary"
             :loading="$store.state.app.buttonIsDisabled"
             :disabled="$store.state.app.buttonIsDisabled"
@@ -651,12 +666,15 @@
 import { getCookie } from '@/utils/auth'
 import $ from 'jquery'
 import clearAllChildren, { validateCode } from '@/utils/global'
+import elDragDialog from '@/directive/el-drag-dialog'
+import waves from '@/directive/waves'
 
 export default {
   name: 'JSQD',
   components: {
     Pagination, ImportPicker
   },
+  directives: { elDragDialog, waves },
   data() {
     return {
       isIpad: false,
@@ -981,6 +999,10 @@
     },
     // 娣诲姞鎸夐挳
     addSetting() {
+      if (this.RoleTypeCodeArr.find(i => i.isVisible === 1)) {
+        return this.$message.info('璇峰厛淇濆瓨涓婁竴琛岃褰曪紒')
+      }
+
       let number = Math.random() * Math.random()// 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
       number = number === 0 ? (10 + Math.random()) : number
       const data = { roletype_code: '', roletype_name: '', isVisible: 1, number: number }
@@ -1551,8 +1573,8 @@
     },
     // 灏忕洅瀛愮偣鍑讳簨浠�
     myCheckboxInputClick(val) {
-      console.log(val, 777777)
-      val.isSelected2 = !val.isSelected2
+      val.isSelected2 = !!val.isSelected2
+
       this.dialogFormRight.rightCurrentCode = val.code
 
       // 1.绗竴绉嶆儏鍐�  灏忕洅瀛愪粠娌¢�変腑鍒伴�変腑
@@ -1708,17 +1730,26 @@
       //border: 1px solid $main_color;
       border: 1px solid #eee;
       display: flex;
-      min-width: 110px;
+      min-width: 100px;
       padding: 10px;
       margin: 10px 30px 0 0;
       border-radius: 5px;
       cursor: default;
+      position: relative;
 
       .myCheckboxInput {
         margin: 1px 5px 0 0;
         cursor: pointer;
       }
 
+      .myCheckboxInputLabel {
+        position: absolute;
+        left: 29px;
+        padding: 5px;
+        top: 6px;
+        color: transparent;
+      }
+
     }
 
     input[type=checkbox] {

--
Gitblit v1.9.3