From dba6651c44548a3a617398a6afd14b455f5ea92f Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 31 八月 2023 17:06:40 +0800
Subject: [PATCH] 1.存货档案60%

---
 src/views/basicSettings/roleList.vue |   45 +++++++++++++++++++++++++++++++++++++++------
 1 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/src/views/basicSettings/roleList.vue b/src/views/basicSettings/roleList.vue
index 4548745..0d211da 100644
--- a/src/views/basicSettings/roleList.vue
+++ b/src/views/basicSettings/roleList.vue
@@ -29,7 +29,24 @@
             <el-button v-waves type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
           </div>
         </el-form>
-
+        <div
+          class="bodyTopFormExpand"
+          style="height:5px"
+        >
+          <!--          <svg-icon-->
+          <!--            v-show="mouseHoverType==='mouseout'"-->
+          <!--            style="cursor: pointer"-->
+          <!--            :icon-class="!isExpandForm?'doubleDown3':'doubleUp3'"-->
+          <!--            @mouseenter="mouseHoverType=$event.type"-->
+          <!--          />-->
+          <!--          <svg-icon-->
+          <!--            v-show="mouseHoverType==='mouseenter'"-->
+          <!--            style="cursor: pointer"-->
+          <!--            :icon-class="!isExpandForm?'doubleDown':'doubleUp'"-->
+          <!--            @click="isExpandForm=!isExpandForm"-->
+          <!--            @mouseout="mouseHoverType=$event.type"-->
+          <!--          />-->
+        </div>
       </div>
 
       <div class="elTableDiv">
@@ -81,9 +98,13 @@
             prop="description"
             label="澶囨敞"
             sortable="custom"
-          />
+          >
+            <template slot-scope="{row}">
+              {{ row.description?row.description:'/' }}
+            </template>
+          </el-table-column>
           <el-table-column
-            prop="lm_user"
+            prop="username"
             label="鍒涘缓浜哄憳"
             sortable="custom"
           />
@@ -131,7 +152,7 @@
                   <el-dropdown-menu slot="dropdown">
                     <el-dropdown-item icon="el-icon-circle-check" command="menuPower">鑿滃崟鏉冮檺</el-dropdown-item>
                     <el-dropdown-item icon="el-icon-user" command="divideUser">鍒嗛厤鐢ㄦ埛</el-dropdown-item>
-                    <el-dropdown-item icon="el-icon-download" command="downloadMenu">瀵煎嚭鑿滃崟</el-dropdown-item>
+                    <!--                    <el-dropdown-item icon="el-icon-download" command="downloadMenu">瀵煎嚭鑿滃崟</el-dropdown-item>-->
                   </el-dropdown-menu>
                 </el-dropdown>
               </div>
@@ -227,7 +248,13 @@
       <span slot="footer" class="dialog-footer">
         <div class="footerButton">
           <el-button v-waves @click="dialogVisibleCancel">鍙� 娑�</el-button>
-          <el-button v-waves type="primary" @click="dialogVisibleConfirm">纭� 瀹�</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>
@@ -412,6 +439,7 @@
     dialogVisibleConfirm() {
       this.$refs.dialogForm.validate(valid => {
         if (valid) {
+          this.$store.state.app.buttonIsDisabled = true
           if (this.$refs.tree) {
             this.dialogForm.datapermissions = this.$refs.tree.getCheckedKeys().join(',')
           }
@@ -419,8 +447,10 @@
             if (res.code === '200') {
               this.$notify.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
               this.dialogVisible = false
+              this.$store.state.app.buttonIsDisabled = false
               this.getRoleData()
             } else {
+              this.$store.state.app.buttonIsDisabled = false
               this.$notify.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
             }
           })
@@ -430,7 +460,10 @@
     handleCommand(command, row) {
       console.log(command, row)
       if (command === 'menuPower') {
-        this.$router.push('./roleList?powerId=' + row.id)// demo
+        this.$router.push('./powerDivider?rolecode=' + row.rolecode)
+      }
+      if (command === 'divideUser') {
+        this.$router.push('./roleDivider?rolecode=' + row.rolecode)
       }
     },
     // 鑾峰彇椤甸潰楂樺害

--
Gitblit v1.9.3