From 4952d0660a3a6de4d918822a3c6bacd358c21df0 Mon Sep 17 00:00:00 2001
From: zhangli <2235006734@qq.com>
Date: Wed, 18 Oct 2023 17:29:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E7=AD=96=E7=95=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/strategy/supplieDeliveryStrategy/AddForm.vue      | 8 ++++----
 .../{groundingStrategy => upShelfStrategy}/AddForm.vue    | 4 ++--
 .../{groundingStrategy => upShelfStrategy}/index.vue      | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)
 rename src/views/wms/strategy/{groundingStrategy => upShelfStrategy}/AddForm.vue (99%)
 rename src/views/wms/strategy/{groundingStrategy => upShelfStrategy}/index.vue (97%)

diff --git a/src/views/wms/strategy/supplieDeliveryStrategy/AddForm.vue b/src/views/wms/strategy/supplieDeliveryStrategy/AddForm.vue
index ff4879ae1..9954e7f9e 100644
--- a/src/views/wms/strategy/supplieDeliveryStrategy/AddForm.vue
+++ b/src/views/wms/strategy/supplieDeliveryStrategy/AddForm.vue
@@ -48,7 +48,7 @@
                 </el-select>
                 <div class="checkbox">
                   <el-checkbox-group v-model="formData.supplierType">
-                    <el-checkbox :label="item.label" v-for="item in options.supplierTypeCheckbox" :key="item.value" />
+                    <el-checkbox :label="item.label" v-for="item in options.supplierTypeOptions" :key="item.value" />
                   </el-checkbox-group>
                 </div>
               </el-form-item>
@@ -73,7 +73,7 @@
                 </el-select>
                 <div class="checkbox">
                   <el-checkbox-group v-model="formData.week">
-                    <el-checkbox :label="item.label" v-for="item in options.weekCheckbox" :key="item.value" />
+                    <el-checkbox :label="item.label" v-for="item in options.weekOptions" :key="item.value" />
                   </el-checkbox-group>
                 </div>
               </el-form-item>
@@ -177,11 +177,11 @@ const options = reactive({
   // 范围下拉框列表
   rangeOptions: [{ value: 1, label: '包含' }, { value: 2, label: '大于', }],
   // 供应商类型列表
-  supplierTypeCheckbox: [{ value: 1, label: '标准' }, { value: 2, label: '委外' }, { value: 3, label: '其他' }],
+  supplierTypeOptions: [{ value: 1, label: '标准' }, { value: 2, label: '委外' }, { value: 3, label: '其他' }],
   //供应商列表
   supplierList: [{ value: 1, label: '供应商1' }, { value: 2, label: '供应商2' }, { value: 3, label: '供应商3' }],
   //星期几列表
-  weekCheckbox: [{ value: 1, label: '星期一' }, { value: 2, label: '星期二' }, { value: 3, label: '星期三' }, { value: 4, label: '星期四' }, { value: 5, label: '星期五' }, { value: 6, label: '星期六' }, { value: 7, label: '星期日' }],
+  weekOptions: [{ value: 1, label: '星期一' }, { value: 2, label: '星期二' }, { value: 3, label: '星期三' }, { value: 4, label: '星期四' }, { value: 5, label: '星期五' }, { value: 6, label: '星期六' }, { value: 7, label: '星期日' }],
   //仓库列表
   warehouseList: [{ value: 1, label: '仓库1' }, { value: 2, label: '仓库2' }, { value: 3, label: '仓库3' }],
   //月台列表
diff --git a/src/views/wms/strategy/groundingStrategy/AddForm.vue b/src/views/wms/strategy/upShelfStrategy/AddForm.vue
similarity index 99%
rename from src/views/wms/strategy/groundingStrategy/AddForm.vue
rename to src/views/wms/strategy/upShelfStrategy/AddForm.vue
index 1f06ed14b..96cdbb020 100644
--- a/src/views/wms/strategy/groundingStrategy/AddForm.vue
+++ b/src/views/wms/strategy/upShelfStrategy/AddForm.vue
@@ -196,7 +196,7 @@
 </template>
 <script setup lang="ts">
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-defineOptions({ name: 'GroundingStrategyAddForm' })
+defineOptions({ name: 'UpShelfStrategyAddForm' })
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -264,7 +264,7 @@ const rules = ref({
   inventoryStatus: [{ required: true, message: '请选择库存状态', trigger: 'blur' }],
   storageType: [{ required: true, message: '请选择存储类型', trigger: 'blur' }],
   inventoryAffair: [{ required: true, message: '请选择库存事务', trigger: 'blur' }],
-  warehouse: [{ required: true, message: '请选择库位', trigger: 'blur' }],
+  warehouse: [{ required: true, message: '请选择仓库', trigger: 'blur' }],
 
 })
 // 下拉框列表集合
diff --git a/src/views/wms/strategy/groundingStrategy/index.vue b/src/views/wms/strategy/upShelfStrategy/index.vue
similarity index 97%
rename from src/views/wms/strategy/groundingStrategy/index.vue
rename to src/views/wms/strategy/upShelfStrategy/index.vue
index 5e5089985..f6f1fc56f 100644
--- a/src/views/wms/strategy/groundingStrategy/index.vue
+++ b/src/views/wms/strategy/upShelfStrategy/index.vue
@@ -9,7 +9,7 @@
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import AddForm from './AddForm.vue'
 
-defineOptions({ name: 'GroundingStrategy' })
+defineOptions({ name: 'UpShelfStrategy' })
 // 显示弹窗
 const formRef = ref()
 const openForm = (type: string) => {