From 6a76e1e6b05cb8cb8dd19299f23d1b825adf4abd Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 六月 2024 17:34:09 +0800
Subject: [PATCH] 提交一把

---
 company/src/views/system/permission.vue |   55 ++++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/company/src/views/system/permission.vue b/company/src/views/system/permission.vue
index 30d455c..c9eed29 100644
--- a/company/src/views/system/permission.vue
+++ b/company/src/views/system/permission.vue
@@ -3,19 +3,19 @@
     <!-- 鎼滅储琛ㄥ崟 -->
     <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
       <el-form-item label="鏉冮檺缂栫爜" prop="code">
-        <el-input v-model="searchForm.code" v-trim placeholder="璇疯緭鍏ユ潈闄愮紪鐮�" @keypress.enter.native="search"/>
+        <el-input v-model="searchForm.code" v-trim placeholder="璇疯緭鍏ユ潈闄愮紪鐮�" @keypress.enter.native="refresh"/>
       </el-form-item>
       <el-form-item label="鏉冮檺鍚嶇О" prop="name">
-        <el-input v-model="searchForm.name" v-trim placeholder="璇疯緭鍏ユ潈闄愬悕绉�" @keypress.enter.native="search"/>
+        <el-input v-model="searchForm.name" v-trim placeholder="璇疯緭鍏ユ潈闄愬悕绉�" @keypress.enter.native="refresh"/>
       </el-form-item>
       <el-form-item label="骞冲彴绫诲瀷" prop="type">
-        <el-select v-model="searchForm.type" placeholder="璇烽�夋嫨" @change="search">
-          <el-option label="閫氱敤" value="0"></el-option>
+        <el-select v-model="type" placeholder="璇烽�夋嫨" @change="refresh" clearable>
           <el-option label="骞冲彴绔�" value="1"></el-option>
-          <el-option label="浼佷笟绔�" value="2"></el-option>
-          <el-option label="鍟嗘埛绔�" value="3"></el-option>
+          <el-option label="鍟嗘埛绔�" value="2"></el-option>
+          <el-option label="浼佷笟绔�" value="3"></el-option>
         </el-select>
       </el-form-item>
+
       <section>
         <el-button type="primary" @click="search">鎼滅储</el-button>
         <el-button @click="reset">閲嶇疆</el-button>
@@ -26,7 +26,8 @@
       <ul class="toolbar" v-permissions="['system:permission:create', 'system:permission:delete']">
         <li><el-button type="primary" @click="$refs.operaPermissionWindow.open('鏂板缓绯荤粺鏉冮檺')" icon="el-icon-plus" v-permissions="['system:permission:create']">鏂板缓</el-button></li>
         <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['system:permission:delete']">鍒犻櫎</el-button></li>
-      </ul>
+
+     </ul>
       <el-table
         v-loading="isWorking.search"
         :data="tableData.list"
@@ -36,14 +37,13 @@
         @sort-change="handleSortChange"
       >
         <el-table-column type="selection" fixed="left" width="55"></el-table-column>
-        <el-table-column prop="code" label="鏉冮檺缂栫爜" fixed="left" min-width="200px"></el-table-column>
+        <el-table-column prop="code" label="鏉冮檺缂栫爜" fixed="left" min-width="250px"></el-table-column>
         <el-table-column prop="name" label="鏉冮檺鍚嶇О" fixed="left" min-width="120px"></el-table-column>
-        <el-table-column prop="name" label="骞冲彴绫诲瀷" fixed="left" min-width="120px">
+        <el-table-column prop="type" label="骞冲彴绫诲瀷" fixed="left" min-width="180px">
           <template slot-scope="{row}">
-            <span  v-if="row.type == null || row.type ===0">閫氱敤</span>
-            <span  v-if="row.type === 1">骞冲彴绔�</span>
-            <span   v-if="row.type === 2">浼佷笟绔�</span>
-            <span   v-if="row.type === 3">鍟嗘埛绔�</span>
+            <span  v-if="row.isadmin === 1">銆愬钩鍙般��</span>
+            <span  v-if="row.isshop === 1">銆愬晢鎴枫��</span>
+            <span  v-if="row.iscom === 1">銆愪紒涓氥��</span>
           </template>
         </el-table-column>
         <el-table-column prop="remark" label="鏉冮檺澶囨敞" min-width="120px"></el-table-column>
@@ -90,11 +90,14 @@
   data () {
     return {
       // 鎼滅储
+      type: '',
       searchForm: {
         code: '',
         name: '',
-        type: '',
-        remark: ''
+        remark: '',
+        iscom:null,
+        isshop:null,
+        isadmin:null
       }
     }
   },
@@ -108,6 +111,28 @@
       }]
     })
     this.search()
+  },
+  methods:{
+    refresh(){
+      this.searchForm.iscom = null
+      this.searchForm.isshop = null
+      this.searchForm.isadmin = null
+      if(this.type == 1){
+        this.searchForm.iscom = null
+        this.searchForm.isshop = null
+        this.searchForm.isadmin = 1
+      }else if(this.type == 2){
+        this.searchForm.iscom = null
+        this.searchForm.isshop = 1
+        this.searchForm.isadmin = null
+      }else if(this.type == 2){
+        this.searchForm.iscom = 1
+        this.searchForm.isshop = null
+        this.searchForm.isadmin = null
+      }
+      this.search()
+    }
   }
+
 }
 </script>

--
Gitblit v1.9.3