From 2fa578a18ed9055f8cb9863a8a0f02977cfa8350 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期二, 19 十二月 2023 17:33:53 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

---
 src/views/basic/location/index.vue |   30 ++++++++++++++++++------------
 1 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/views/basic/location/index.vue b/src/views/basic/location/index.vue
index f0474fe..fecfaa3 100644
--- a/src/views/basic/location/index.vue
+++ b/src/views/basic/location/index.vue
@@ -11,7 +11,10 @@
         :ajaxFun="ajaxFun"
         ref="locationTable"
       >
-        <template #toolbar></template>
+        <template #toolbar>
+          <el-button type="primary" @click="addOrUpdateHandle"
+          v-if="permissions.basic_location_add">鏂板</el-button>
+        </template>
       </ttable>
       <!-- 寮圭獥, 鏂板 / 淇敼 -->
       <table-form
@@ -44,7 +47,7 @@
       mulLocation: [],
       uploadInfo: {
         // 鏄惁灞曠ず涓婁紶EXCEL浠ュ強瀵瑰簲鐨剈rl
-        isShow: true,
+        isShow: false,
         url: '/mes/location/upload'
       },
       prelang: 'operation',
@@ -59,6 +62,7 @@
         seqNo: true,
         isShowHide: true, // 鏄惁鏄剧ず鏄惧奖鎸夐挳
         isSearch: true, // 楂樼骇鏌ヨ鎸夐挳
+        isRefresh: true, // 鏄惁鏄剧ず鍒锋柊鎸夐挳
         defaultOrderBy: { column: 'createTime', direction: 'desc' }
       },
       table: {
@@ -193,25 +197,19 @@
             optList: () => {
               return this.getWarehouseLocGroupList()
             }
-          },
+          }/* ,
           // ERP搴撲綅
           {
             minWidth: '200',
             prop: 'ifsLocation',
-            label: 'ERP搴撲綅',
+            label: 'IFS搴撲綅',
             sort: true,
             isTrue: false,
             isSearch: true,
             searchInfoType: 'text'
-          }
+          } */
         ],
-        toolbar: [
-          {
-            text: '鏂板',
-            type: 'primary',
-            fun: this.addOrUpdateHandle
-          }
-        ],
+        toolbar: [],
         operator: [
           {
             text: '鍒犻櫎',
@@ -350,6 +348,10 @@
     },
     // 鏂板 / 淇敼
     addOrUpdateHandle(row) {
+      if(!this.permissions.basic_location_edit && row.id!=null){
+        this.$message.error("璇ヨ鑹叉病鏈夋搷浣滄潈闄�")
+        return
+      }
       this.addOrUpdateVisible = true
       this.$nextTick(() => {
         this.$refs.addOrUpdate.init(row == null ? null : row.id)
@@ -357,6 +359,10 @@
     },
     // 鍒犻櫎
     deleteHandle(row) {
+      if(!this.permissions.basic_location_del){
+        this.$message.error("璇ヨ鑹叉病鏈夋搷浣滄潈闄�")
+        return
+      }
       this.$confirm('鏄惁纭鍒犻櫎搴撲綅鍙蜂负' + row.locNo, '鎻愮ず', {
         confirmButtonText: '纭畾',
         cancelButtonText: '鍙栨秷',

--
Gitblit v1.9.3