From 6eeb0e5e63a1e262846f0f4f55ff91462f3ab7f2 Mon Sep 17 00:00:00 2001
From: guoxing <1369478551@qq.com>
Date: Mon, 5 Aug 2024 14:26:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchaseOrder/purchaseOrderAdd.vue        |  1 +
 src/views/system/menuManage/menuManage.vue    | 23 ++-----------------
 .../system/userManage/userManageList.vue      |  2 +-
 3 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/src/views/purchase/purchaseOrder/purchaseOrderAdd.vue b/src/views/purchase/purchaseOrder/purchaseOrderAdd.vue
index 78c45cc..edfd11f 100644
--- a/src/views/purchase/purchaseOrder/purchaseOrderAdd.vue
+++ b/src/views/purchase/purchaseOrder/purchaseOrderAdd.vue
@@ -799,6 +799,7 @@
 
           this.formobj.purchaseBillDetailList.push({
               "sid": value[i].sid != null ? value[i].sid : '',
+              "goodsSkuSid": value[i].sid != null ? value[i].sid : '',
               "goodsSkuCode": value[i].goodsSkuCode != null ? value[i].goodsSkuCode : '',
               "goodsSkuTitle": value[i].goodsName != null ? value[i].goodsName : '',
               "goodsSN": value[i].barCode != null ? value[i].barCode : '',
diff --git a/src/views/system/menuManage/menuManage.vue b/src/views/system/menuManage/menuManage.vue
index 2753ff3..f1b9226 100644
--- a/src/views/system/menuManage/menuManage.vue
+++ b/src/views/system/menuManage/menuManage.vue
@@ -142,12 +142,6 @@
               <el-input v-model="form.pageName" />
             </td>
           </tr>
-          <tr v-show="editMenuType=='2'">
-            <td>按钮Key</td>
-            <td>
-              <el-input v-model="form.btnKey" style="width:300px" />
-            </td>
-          </tr>
           <tr v-show="editMenuType=='2'">
             <td>权限标识</td>
             <td>
@@ -264,12 +258,6 @@
             <el-input v-model="form.pageName" style="width:300px" />
           </td>
         </tr>
-        <tr v-show="addMenuType=='2'">
-          <td>按钮Key</td>
-          <td>
-            <el-input v-model="form.btnKey" style="width:300px" />
-          </td>
-        </tr>
         <tr v-show="addMenuType=='2'">
           <td>权限标识</td>
           <td>
@@ -348,7 +336,6 @@
           remarks: '',
           sortNo: 0,
           cid: '',
-          btnKey: "",
           sourceName: 'wms',
           phoneFunction: "0",
           sourceSid: 'd936f1ba-03c3-11ec-bf08-48452053aa44'
@@ -427,16 +414,10 @@
 
       menuTypeChangeRadio(val) {
         console.log('menuTypeChangeRadio', val)
-        if (val != '2') {
-          this.form.btnKey = ""
-        }
         this.form.menuType = val
       },
       menuTypeChangeRadio2(val) {
         console.log('menuTypeChangeRadio2', val)
-        if (val != '2') {
-          this.form.btnKey = ""
-        }
         this.form.menuType = val
       },
       changeRadio(val) {
@@ -553,9 +534,9 @@
 
         if (this.form.menuType == '2') {
 
-          if (this.form.btnKey == '') {
+          if (this.form.cid == '') {
             this.$message({
-              message: '按钮Key不能为空',
+              message: '权限标识不能为空',
               type: 'warning'
             })
             return
diff --git a/src/views/system/userManage/userManageList.vue b/src/views/system/userManage/userManageList.vue
index e294edf..683002d 100644
--- a/src/views/system/userManage/userManageList.vue
+++ b/src/views/system/userManage/userManageList.vue
@@ -434,7 +434,7 @@
         this.roleForm.roleSid = []
         this.roleDialog = true
         this.roleForm.sid = row.sid
-        this.roleForm.userSid = row.sid
+        this.roleForm.userSid = window.sessionStorage.getItem('userSid')
         this.roleForm.orgsid = window.sessionStorage.getItem('orgSid')
         setRole(this.roleForm).then(res => {
           this.roleList = res.data