From 49b0cf5cdb58ef1b3a27922dbccb103d1cf19915 Mon Sep 17 00:00:00 2001
From: yuejiayang <146344614+YangLei105@users.noreply.github.com>
Date: Wed, 24 Jan 2024 11:00:29 +0800
Subject: [PATCH] =?UTF-8?q?2024.1.24=20=E7=B3=BB=E7=BB=9F=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=91=98=E4=B8=8D=E5=8F=AF=E4=BF=AE=E6=94=B9=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E8=87=AA=E5=B7=B1=20qcPartAttribute=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=97=B6=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=8A=A0=E5=85=A5?=
 =?UTF-8?q?=E6=89=80=E9=80=89bu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/qc/FQCResultEntry.vue  | 16 ++++++++--------
 src/views/modules/qc/qcPartAttribute.vue |  4 ++--
 src/views/modules/sys/role.vue           | 13 +++++++++++--
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/views/modules/qc/FQCResultEntry.vue b/src/views/modules/qc/FQCResultEntry.vue
index cedbc31..38667d8 100644
--- a/src/views/modules/qc/FQCResultEntry.vue
+++ b/src/views/modules/qc/FQCResultEntry.vue
@@ -1716,7 +1716,7 @@
             functionId: 301015,
             serialNumber: '301015Table3OrderNo',
             tableId: "301015Table3",
-            tableName: "派工单号表",
+            tableName: "任务新增-派工单",
             fixed: '',
             columnWidth: 80,
             columnProp: 'orderNo',
@@ -1734,7 +1734,7 @@
             functionId: 301015,
             serialNumber: '301015Table3SeqNo',
             tableId: "301015Table3",
-            tableName: "派工单号表",
+            tableName: "任务新增-派工单",
             fixed: '',
             columnWidth: 80,
             columnProp: 'seqNo',
@@ -1752,7 +1752,7 @@
             functionId: 301015,
             serialNumber: '301015Table3Sku',
             tableId: "301015Table3",
-            tableName: "派工单号表",
+            tableName: "任务新增-派工单",
             fixed: '',
             columnWidth: 80,
             columnProp: 'sku',
@@ -1770,7 +1770,7 @@
             functionId: 301015,
             serialNumber: '301015Table3PartNo',
             tableId: "301015Table3",
-            tableName: "派工单号表",
+            tableName: "任务新增-派工单",
             fixed: '',
             columnWidth: 80,
             columnProp: 'partNo',
@@ -1788,7 +1788,7 @@
             functionId: 301015,
             serialNumber: '301015Table3PartDesc',
             tableId: "301015Table3",
-            tableName: "派工单号表",
+            tableName: "任务新增-派工单",
             fixed: '',
             columnWidth: 80,
             columnProp: 'partDesc',
@@ -1806,7 +1806,7 @@
             functionId: 301015,
             serialNumber: '301015Table3Lotsize',
             tableId: "301015Table3",
-            tableName: "派工单号表",
+            tableName: "任务新增-派工单",
             fixed: '',
             columnWidth: 80,
             columnProp: 'lotsize',
@@ -1824,7 +1824,7 @@
             functionId: 301015,
             serialNumber: '301015Table3Qtyrequired',
             tableId: "301015Table3",
-            tableName: "派工单号表",
+            tableName: "任务新增-派工单",
             fixed: '',
             columnWidth: 80,
             columnProp: 'qtyrequired',
@@ -1842,7 +1842,7 @@
             functionId: 301015,
             serialNumber: '301015Table3OperationDesc',
             tableId: "301015Table3",
-            tableName: "派工单号表",
+            tableName: "任务新增-派工单",
             fixed: '',
             columnWidth: 80,
             columnProp: 'operationDesc',
diff --git a/src/views/modules/qc/qcPartAttribute.vue b/src/views/modules/qc/qcPartAttribute.vue
index fa0e767..c5c9133 100644
--- a/src/views/modules/qc/qcPartAttribute.vue
+++ b/src/views/modules/qc/qcPartAttribute.vue
@@ -1297,7 +1297,7 @@
         userBuList: [],
         partInfoList: [],
         partDetailData: {
-          buNo: '',
+          bu: '',
           partNo: '',
           partDesc: '',
           seqNo: '',
@@ -1341,7 +1341,7 @@
       },
 
       searchPartInfo () {
-        this.partDetailData.buNo = this.modalData.bu
+        this.partDetailData.bu = this.modalData.bu
         if (!this.partDetailData.partNo && !this.partDetailData.partDesc && !this.partDetailData.sku && !this.partDetailData.cinvSourceCode) {
           this.partInfoList = []
           this.partDisableFlag = true
diff --git a/src/views/modules/sys/role.vue b/src/views/modules/sys/role.vue
index fa2d63b..7e4b5d0 100644
--- a/src/views/modules/sys/role.vue
+++ b/src/views/modules/sys/role.vue
@@ -46,8 +46,12 @@
         width="150"
         :label="buttons.cz||'操作'">
         <template slot-scope="scope">
-          <a v-if="isAuth('sys:role:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.roleId)">{{buttons.edit||'修改'}}</a>
-          <a v-if="isAuth('sys:role:delete')" type="text" size="small" @click="deleteHandle(scope.row.roleId)">{{buttons.delete|| '删除'}}</a>
+          <a v-if="!adminUser && scope.row.roleName === '系统管理员'" type="text" size="small" style="pointer-events:none;color: #8a979e">{{ buttons.edit || '修改' }}</a>
+          <a v-if="!adminUser && scope.row.roleName !== '系统管理员'" type="text" size="small" @click="addOrUpdateHandle(scope.row.userId)">{{ buttons.edit || '修改' }}</a>
+          <a v-if="adminUser" type="text" size="small" @click="addOrUpdateHandle(scope.row.userId)">{{ buttons.edit || '修改' }}</a>
+          <a v-if="!adminUser && scope.row.roleName === '系统管理员'" type="text" size="small" style="pointer-events:none;color: #8a979e">{{ buttons.delete || '删除' }}</a>
+          <a v-if="!adminUser && scope.row.roleName !== '系统管理员'" type="text" size="small" @click="deleteHandle(scope.row.userId)">{{ buttons.delete || '删除' }}</a>
+          <a v-if="adminUser" type="text" size="small" @click="deleteHandle(scope.row.userId)">{{ buttons.delete || '删除' }}</a>
 <!--          <a type="text" size="small" @click="showAuthCustomerReportModal(scope.row)">{{buttons.reportRole || '报表赋权'}}</a>-->
         </template>
       </el-table-column>
@@ -120,6 +124,11 @@ import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/user
       this.favoriteIsOk()
       this.getDataList()
     },
+    computed: {
+      adminUser() {
+        return this.$store.state.user.id === 1
+      }
+    },
     methods: {
       // 校验用户是否收藏
       favoriteIsOk() {