From 0ee572eddbb85855cd07619b61479844128f9b41 Mon Sep 17 00:00:00 2001
From: guoxing <1369478551@qq.com>
Date: Mon, 5 Aug 2024 14:27:11 +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

---
 src/views/inStorage/deliveryNotice/index.vue  | 49 +++++++++++++------
 src/views/inStorage/receivingGoods/index.vue  |  3 ++
 src/views/system/menuManage/menuManage.vue    | 25 +---------
 .../system/userManage/userManageList.vue      |  2 +-
 4 files changed, 40 insertions(+), 39 deletions(-)

diff --git a/src/views/inStorage/deliveryNotice/index.vue b/src/views/inStorage/deliveryNotice/index.vue
index 2075d8c..418dc57 100644
--- a/src/views/inStorage/deliveryNotice/index.vue
+++ b/src/views/inStorage/deliveryNotice/index.vue
@@ -10,14 +10,14 @@
           <div v-show="isSearchShow" class="search">
             <el-form :inline="true" class="tab-header">
               <el-form-item label="入库类型">
-                <el-select v-model="queryParams.params.busTypeKey" placeholder="请选择">
+                <el-select v-model="queryParams.params.busTypeKey" placeholder="请选择" style="width: 200px;">
                   <el-option v-for="(item,i) in busTypeList" :key="item.sid" :label="item.name" :value="item.sid">
                   </el-option>
                 </el-select>
               </el-form-item>
               <el-form-item label="入库状态">
                 <el-select v-model="queryParams.params.billState" placeholder="请选择" style="width: 200px;">
-                  <el-option v-for="(item,i) in billStateList" :label="item.dictValue" :value="item.dictKey">
+                  <el-option v-for="(item,i) in billStateList" :label="item.name" :value="item.sid">
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -82,8 +82,8 @@
             </el-table-column> -->
             <el-table-column prop="applicationTime" label="申请时间" align="center" width="220" />
             <el-table-column prop="billNo" label="单据编码" align="center" width="220" />
-            <el-table-column prop="busTypeValue" label="单据类型" align="center" width="150" />
-            <el-table-column prop="handoverStatus" label="交接状态" align="center" width="150" />
+            <el-table-column prop="busTypeKeyValue" label="单据类型" align="center" width="150" />
+            <el-table-column prop="handoverStatusValue" label="交接状态" align="center" width="150" />
             <el-table-column prop="handoverTime" label="交接时间" align="center" width="180" />
             <el-table-column prop="billStateValue" label="状态" align="center" width="150" />
             <el-table-column prop="warehouseName" label="仓库" align="center" width="150" />
@@ -308,15 +308,31 @@
             sid: "0"
           },
           {
-            name: "验货入库",
+            name: "其他入库",
             sid: "1"
           },
           {
-            name: "销退入库",
+            name: "收货入库",
             sid: "2"
           }
         ],
-        billStateList: [],
+        billStateList: [{
+            name: "在途",
+            sid: "0"
+          },
+          {
+            name: "部分收货",
+            sid: "1"
+          },
+          {
+            name: "收货完成",
+            sid: "2"
+          },
+          {
+            name: "关闭",
+            sid: "3"
+          }
+        ],
         goodsList: [],
         warehouseRackList: [],
         goodsDetailList: [],
@@ -335,13 +351,13 @@
     methods: {
       init() {
 
-        typeValues({
-          type: 'receiveState'
-        }).then((res) => {
-          if (res.success) {
-            this.billStateList = res.data
-          }
-        })
+        // typeValues({
+        //   type: 'receiveState'
+        // }).then((res) => {
+        //   if (res.success) {
+        //     this.billStateList = res.data
+        //   }
+        // })
 
 
         var query = {
@@ -477,7 +493,10 @@
             const data = resp.data
             this.queryParams.total = data.total
             this.dataList = data.records
-            this.rowItemSid = data.records[0].sid
+            this.goodsDetailList = []
+            this.formobj = {}
+            this.operateList = []
+            this.rowItemClick(data.records[0])
             this.handleSelect('1')
           } else {
             // 根据resp.code进行异常情况处理
diff --git a/src/views/inStorage/receivingGoods/index.vue b/src/views/inStorage/receivingGoods/index.vue
index 1b80cfc..7548f13 100644
--- a/src/views/inStorage/receivingGoods/index.vue
+++ b/src/views/inStorage/receivingGoods/index.vue
@@ -594,6 +594,9 @@
       doClose() {
         this.$store.dispatch('tagsView/delView', this.$route)
         this.$router.go(-1)
+      },
+      toRelevancy() {
+
       },
       resetState() {
         this.viewState = 1
diff --git a/src/views/system/menuManage/menuManage.vue b/src/views/system/menuManage/menuManage.vue
index 49a9f9f..5dd6f7c 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" style="width:300px" />
             </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-48452053aa33'
@@ -427,18 +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) {
@@ -557,9 +536,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 fd87af0..730f393 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