From 7d3d481ef5adb19dd54b9b39154f0d7c57798e5e Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 28 Nov 2023 09:18:42 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AD=96=E7=95=A5=EF=BC=8C=E7=9B=98=E7=82=B9?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/directives/permission/hasRole.ts                      | 5 ++++-
 .../strategy/downShelfStrategy/AddForm.vue                | 8 ++++----
 .../strategy/manageAccuracyStrategy/AddForm.vue           | 2 +-
 .../strategy/repairMaterialStrategy/AddForm.vue           | 2 +-
 .../strategy/storageCapacityStrategy/AddForm.vue          | 4 ++--
 .../strategy/supplieDeliveryStrategy/AddForm.vue          | 6 +++---
 .../strategySetting/strategy/upShelfStrategy/AddForm.vue  | 8 ++++----
 .../strategy/warehouseStorageStrategy/AddForm.vue         | 8 ++++----
 src/views/wms/countManage/count/countPlanMain/index.vue   | 3 +--
 9 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/src/directives/permission/hasRole.ts b/src/directives/permission/hasRole.ts
index 31a352a72..ae253cbae 100644
--- a/src/directives/permission/hasRole.ts
+++ b/src/directives/permission/hasRole.ts
@@ -8,7 +8,10 @@ export function hasRole(app: App<Element>) {
     const { wsCache } = useCache()
     const { value } = binding
     const super_admin = 'admin'
-    const roles = wsCache.get(CACHE_KEY.USER).roles
+    let roles = []
+    if(wsCache.get(CACHE_KEY.USER)?.roles){
+      roles = wsCache.get(CACHE_KEY.USER).roles
+    }
 
     if (value && value instanceof Array && value.length > 0) {
       const roleFlag = value
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
index 3d75488ad..a5f66f647 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
@@ -146,17 +146,17 @@
                     :key="index" />
                 </el-select>
                 <el-select v-model="formData.configuration.WarehouseCode" v-if="warehouseType == 'WarehouseCode'" placeholder="请选择仓库"  clearable style="flex: 1;">
-                  <el-option v-for="cur in options.warehouseList" :key="cur.id" :label="cur.name" :value="cur.id" />
+                  <el-option v-for="cur in options.warehouseList" :key="cur.code" :label="cur.name" :value="cur.code" />
                 </el-select>
                 <el-select v-model="formData.configuration.AreaCode" v-if="warehouseType == 'AreaCode'" placeholder="请选择库区"  clearable style="flex: 1;">
-                  <el-option v-for="cur in options.warehouseList" :key="cur.id" :label="cur.name" :value="cur.id" />
+                  <el-option v-for="cur in options.warehouseList" :key="cur.code" :label="cur.name" :value="cur.code" />
                 </el-select>
                 <el-select v-model="formData.configuration.LocationGroupCode" v-if="warehouseType == 'LocationGroupCode'" placeholder="请选择库位组"  clearable style="flex: 1;">
-                  <el-option v-for="cur in options.warehouseList" :key="cur.id" :label="cur.name" :value="cur.id" />
+                  <el-option v-for="cur in options.warehouseList" :key="cur.code" :label="cur.name" :value="cur.code" />
                 </el-select>
 
                 <el-select v-model="formData.configuration.LocationCode" v-if="warehouseType == 'LocationCode'" placeholder="请选择库位"  clearable style="flex: 1;">
-                  <el-option v-for="cur in options.warehouseList" :key="cur.id" :label="cur.name" :value="cur.id" />
+                  <el-option v-for="cur in options.warehouseList" :key="cur.code" :label="cur.name" :value="cur.code" />
                 </el-select>
               </el-form-item>
             </el-col>
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue
index 11c90ff93..1e3e63b16 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue
@@ -98,7 +98,7 @@
                 <el-select v-model="item.Value"
                   :placeholder="`请选择${item.ParamCode == 'WarehouseCode' ? '仓库' : item.ParamCode == 'AreaCode' ? '库区' : item.ParamCode == 'LocationGroupCode' ? '库位组' : item.ParamCode == 'LocationCode' ? '库位' : ''}`"
                   clearable style="flex: 1;">
-                  <el-option v-for="cur in options.warehouseList" :key="cur.id" :label="cur.name" :value="cur.id" />
+                  <el-option v-for="cur in options.warehouseList" :key="cur.code" :label="cur.name" :value="cur.code" />
                 </el-select>
               </el-form-item>
               <!-- 忽略物品 -->
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue
index c20e75fd3..d23465971 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue
@@ -82,7 +82,7 @@
                 <el-select v-model="item.Value"
                   :placeholder="`请选择${item.ParamCode == 'WarehouseCode' ? '仓库' : item.ParamCode == 'AreaCode' ? '库区' : item.ParamCode == 'LocationGroupCode' ? '库位组' : item.ParamCode == 'LocationCode' ? '库位' : ''}`"
                   clearable style="flex: 1;">
-                  <el-option v-for="cur in options.warehouseList" :key="cur.id" :label="cur.name" :value="cur.id" />
+                  <el-option v-for="cur in options.warehouseList" :key="cur.code" :label="cur.name" :value="cur.code" />
                 </el-select>
               </el-form-item>
             </el-col>
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue
index 6b627ebf4..c8a5091ba 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue
@@ -173,9 +173,9 @@
                 >
                   <el-option
                     v-for="cur in options.warehouseList"
-                    :key="cur.id"
+                    :key="cur.code"
                     :label="cur.name"
-                    :value="cur.id"
+                    :value="cur.code"
                   />
                 </el-select>
               </el-form-item>
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue
index 38d77544f..13f4101c4 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue
@@ -98,19 +98,19 @@
                 <el-select v-model="formData.configuration.WarehouseCode"
                   :placeholder="`请选择${formData.configuration.WarehouseCode == 'WarehouseCode' ? '仓库' : formData.configuration.WarehouseCode== 'AreaCode' ? '库区' : formData.configuration.WarehouseCode == 'LocationGroupCode' ? '库位组' : formData.configuration.WarehouseCode == 'LocationCode' ? '库位' : ''}`"
                   clearable>
-                  <el-option v-for="cur in options.warehouseList" :key="cur.id" :label="cur.name" :value="cur.id" />
+                  <el-option v-for="cur in options.warehouseList" :key="cur.code" :label="cur.name" :value="cur.code" />
                 </el-select>
               </el-form-item>
               <!-- 月台 -->
               <el-form-item  label="月台" prop="DockCode" >
                 <el-select v-model="formData.configuration.DockCode" placeholder="请选择月台" clearable>
-                  <el-option v-for="cur in options.dockList" :key="cur.id" :label="cur.name" :value="cur.id" />
+                  <el-option v-for="cur in options.dockList" :key="cur.code" :label="cur.name" :value="cur.code" />
                 </el-select>
               </el-form-item>
               <!-- 在途库位 -->
               <el-form-item label="在途库位" prop="OnTheWayLocationCode" >
                 <el-select v-model="formData.configuration.OnTheWayLocationCode" placeholder="请选择在途库位" clearable>
-                  <el-option v-for="cur in options.locationList" :key="cur.id" :label="cur.name" :value="cur.id" />
+                  <el-option v-for="cur in options.locationList" :key="cur.code" :label="cur.name" :value="cur.code" />
                 </el-select>
               </el-form-item>
             </el-col>
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
index 18bef7713..6c51d21ef 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
@@ -148,17 +148,17 @@
                     :key="index" />
                 </el-select>
                 <el-select v-model="formData.configuration.WarehouseCode" v-if="warehouseType == 'WarehouseCode'" placeholder="请选择仓库"  clearable style="flex: 1;">
-                  <el-option v-for="cur in options.warehouseList" :key="cur.id" :label="cur.name" :value="cur.id" />
+                  <el-option v-for="cur in options.warehouseList" :key="cur.code" :label="cur.name" :value="cur.code" />
                 </el-select>
                 <el-select v-model="formData.configuration.AreaCode" v-if="warehouseType == 'AreaCode'" placeholder="请选择库区"  clearable style="flex: 1;">
-                  <el-option v-for="cur in options.warehouseList" :key="cur.id" :label="cur.name" :value="cur.id" />
+                  <el-option v-for="cur in options.warehouseList" :key="cur.code" :label="cur.name" :value="cur.code" />
                 </el-select>
                 <el-select v-model="formData.configuration.LocationGroupCode" v-if="warehouseType == 'LocationGroupCode'" placeholder="请选择库位组"  clearable style="flex: 1;">
-                  <el-option v-for="cur in options.warehouseList" :key="cur.id" :label="cur.name" :value="cur.id" />
+                  <el-option v-for="cur in options.warehouseList" :key="cur.code" :label="cur.name" :value="cur.code" />
                 </el-select>
 
                 <el-select v-model="formData.configuration.LocationCode" v-if="warehouseType == 'LocationCode'" placeholder="请选择库位"  clearable style="flex: 1;">
-                  <el-option v-for="cur in options.warehouseList" :key="cur.id" :label="cur.name" :value="cur.id" />
+                  <el-option v-for="cur in options.warehouseList" :key="cur.code" :label="cur.name" :value="cur.code" />
                 </el-select>
               </el-form-item>
             </el-col>
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue
index b5a7b1f94..2b3ecd7ae 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue
@@ -85,9 +85,9 @@
                 >
                   <el-option
                     v-for="cur in options.warehouseList"
-                    :key="cur.id"
+                    :key="cur.code"
                     :label="cur.name"
-                    :value="cur.id"
+                    :value="cur.code"
                   />
                 </el-select>
               </el-form-item>
@@ -124,9 +124,9 @@
                 >
                   <el-option
                     v-for="cur in options.overflowWarehouseList"
-                    :key="cur.id"
+                    :key="cur.code"
                     :label="cur.name"
-                    :value="cur.id"
+                    :value="cur.code"
                   />
                 </el-select>
               </el-form-item>
diff --git a/src/views/wms/countManage/count/countPlanMain/index.vue b/src/views/wms/countManage/count/countPlanMain/index.vue
index cce9590e7..a22070789 100644
--- a/src/views/wms/countManage/count/countPlanMain/index.vue
+++ b/src/views/wms/countManage/count/countPlanMain/index.vue
@@ -161,7 +161,7 @@ const { getList, setSearchParams } = tableMethods
 // 列表头部按钮
 const HeadButttondata = [
   defaultButtons.defaultAddBtn({hasPermi:'wms:count-plan-main:create'}), // 新增——需要手动修改下权限
-  defaultButtons.defaultImportBtn({hasPermi:'wms:count-plan-main:import'}), // 导入
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:count-plan-main:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:count-plan-main:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
@@ -362,6 +362,5 @@ const selectChange = (field,val)=>{
 /** 初始化 **/
 onMounted(async () => {
   getList()
-  importTemplateData.templateUrl = await CountPlanMainApi.importTemplate()
 })
 </script>