From 584ae5476c319cd1551a97b64c01ee1e5e5ff5a6 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 25 十月 2023 15:46:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/views/system/PasswordManagement/passwords.vue |   23 ++++++++++++-----------
 1 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/Source/UBCS-WEB/src/views/system/PasswordManagement/passwords.vue b/Source/UBCS-WEB/src/views/system/PasswordManagement/passwords.vue
index aa9b662..4326828 100644
--- a/Source/UBCS-WEB/src/views/system/PasswordManagement/passwords.vue
+++ b/Source/UBCS-WEB/src/views/system/PasswordManagement/passwords.vue
@@ -1,5 +1,5 @@
 <template>
-  <basic-container>
+  <basic-container >
     <avue-crud v-model="form" :option="option" :data="data" ref="crud"  @on-load="onLoad" @row-save="rowSave" @row-update="rowUpdate" @row-del="rowDel" :page.sync="page">
       <template slot="menu" slot-scope="{ row, index }">
         <el-button
@@ -128,10 +128,12 @@
       option: {
         headerAlign: 'center',
         align: 'center',
+        columnBtn:false,
         border: true,
         index: true,
         rowKey:'id',
         editBtn:false,
+        height:700,
         delBtn:false,
         column: [
           {
@@ -176,7 +178,6 @@
 
           },
           {
-            //鍐欎袱涓粍鍚堟柟娉曟槸鍥犱负id鍜宯ame涓嶈兘鍚屾椂缁戝畾杩欎釜prop鏉ユ覆鏌擄紝涓�涓〃鏍煎仛闅愯棌鏉ユ暟鎹搷浣滐紙琛ㄥ崟闅愯棌锛夛紝鍙︿竴涓〃鏍煎仛鏄剧ず鍙樉绀哄湪椤甸潰锛堣〃鍗曢殣钘忥級銆�
             label: '缁勫悎鏂规硶',
             prop: 'combinationIds',
             type: "checkbox",
@@ -184,7 +185,7 @@
             labelWidth:"22%",
             id:5,
             hide:true,
-            change:this.handleCheckboxChange,
+            change: this.handleCheckboxChange,
             rules: [{
               required: true,
               message: "璇烽�夋嫨缁勫悎鏂规硶",
@@ -318,10 +319,8 @@
   created() {
     this.onLoad()
     combination().then(res=>{
-      console.log("111",res)
+      // console.log("111",res)
     })
-  },
-  mount() {
   },
   methods:{
     handleSelectChange(val){
@@ -331,8 +330,10 @@
       // }
     },
     handleCheckboxChange(val) {
+      console.log("val",val);
       const arr = this.option.column[5];
       this.checkboxlength = val.value;
+      console.log("this.checkboxlength",this.checkboxlength);
       this.checkboxedit = this.checkboxlength.toString().split(",");
 
       if (val.value != undefined && val.value != null) {
@@ -379,7 +380,7 @@
           });
           this.onLoad();
         }).catch(res=>{
-        console.log(res)
+        // console.log(res)
       })
     },
     rowSave(row,done){
@@ -399,7 +400,7 @@
       })
     },
     rowEdit(row){
-      console.log("鎵撳紑缂栬緫edit",row)
+      // console.log("鎵撳紑缂栬緫edit",row)
     },
     handleDel(row){
       this.$refs.crud.rowDel(row,row.$index);
@@ -410,7 +411,7 @@
       // const arr=this.option.column[5];
       this.checkboxNumber=row.combinationIds.split(",")
       this.selectNumber=row.requiredType
-      console.log(this.checkboxNumber, this.selectNumber)
+      // console.log(this.checkboxNumber, this.selectNumber)
     //  鎵撳紑缂栬緫棣栧厛鍒ゆ柇锛岀粍鍚堟柟娉曟槸鍚﹀皬浜庡繀濉绫伙紝濡傛灉灏忎簬缁欎簣鎻愰啋淇敼
         if(this.checkboxNumber.length<=this.selectNumber){
           this.$message({
@@ -428,7 +429,7 @@
         });
         done()
       }).catch(res=>{
-        console.log(res)
+        // console.log(res)
       })
     },
     onLoad(page, params = {}) {
@@ -439,7 +440,7 @@
         // this.data = data.records;
         // this.loading = false;
         // this.selectionClear();
-        console.log(res)
+        // console.log(res)
         this.page.total=res.data.data.total
         this.data=res.data.data.records
       });

--
Gitblit v1.9.3