diff --git a/src/views/wms/strategy/downShelfStrategy/AddForm copy.vue b/src/views/wms/strategy/downShelfStrategy/AddForm copy.vue
deleted file mode 100644
index 419a7ef11..000000000
--- a/src/views/wms/strategy/downShelfStrategy/AddForm copy.vue	
+++ /dev/null
@@ -1,523 +0,0 @@
-<!-- 下架策略弹窗 -->
-<template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible">
-    <div class="p-20px m--10px" style="max-height: 500px;overflow-y: auto;">
-      <!-- 规则 -->
-      <div class="item">
-        <div class="title">规则</div>
-        <el-form ref="formRef1" :model="formData" :rules="rules" label-width="120px" label-position="left">
-          <el-row gutter="10">
-            <el-col :span="24">
-              <el-form-item label="代码" prop="code">
-                <el-input v-model="formData.code" placeholder="请输入代码" clearable />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="名称" prop="name">
-                <el-input v-model="formData.name" placeholder="请输入名称" clearable />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="描述" prop="describe">
-                <el-input v-model="formData.describe" placeholder="请输入描述" clearable />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="优先级" prop="priority">
-                <el-input-number v-model="formData.priority" :min="1" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="状态" prop="status">
-                <el-switch v-model="formData.status" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-      </div>
-      <!-- 规则条件 -->
-      <div class="item mt-20px">
-        <div class="title">规则条件</div>
-        <el-form ref="formRef2" :model="formData" :rules="rules" label-width="120px" label-position="left">
-          <el-row gutter="10">
-            <!-- 选择供应商和客户 -->
-            <el-col :span="24">
-              <el-form-item label="" label-width="0" prop="supplier" class="err-240">
-                <el-select v-model="formData.type" placeholder="" style="width: 110px;margin-right: 10px;">
-                  <el-option :label="item.label" :value="item.value" v-for="item in options.typeOptions"
-                    :key="item.value" />
-                </el-select>
-                <el-select v-model="formData.supplierTypeRange" placeholder="请选择范围"
-                  style="width: 110px;;margin-right: 10px;">
-                  <el-option :label="item.label" :value="item.value" v-for="item in options.rangeOptions"
-                    :key="item.value" />
-                </el-select>
-                <el-select v-model="formData.supplier" placeholder="请选择供应商" style="flex: 1;" clearable>
-                  <el-option v-for="item in options.supplierList" :key="item.value" :label="item.label"
-                    :value="item.value" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <!-- 选择物品类型 -->
-            <el-col :span="24">
-              <el-form-item label="" label-width="0" prop="item" class="err-240">
-                <el-select v-model="formData.itemType" placeholder="" style="width: 110px;margin-right: 10px;">
-                  <el-option :label="item.label" :value="item.value" v-for="item in options.itemTypeOptions"
-                    :key="item.value" />
-                </el-select>
-                <el-select v-model="formData.itemTypeRange" placeholder="请选择范围" style="width: 110px;;margin-right: 10px;">
-                  <el-option :label="item.label" :value="item.value" v-for="item in options.rangeOptions"
-                    :key="item.value" />
-                </el-select>
-                <el-select v-model="formData.item" placeholder="请选择物品" style="flex: 1;" clearable>
-                  <el-option v-for="item in options.itemList" :key="item.value" :label="item.label" :value="item.value" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <!-- 选择重量体积还是面积 -->
-            <el-col :span="24">
-              <el-form-item label="" label-width="0" prop="calculation" class="err-240">
-                <el-select v-model="formData.calculationType" placeholder="" style="width: 110px;margin-right: 10px;">
-                  <el-option :label="item.label" :value="item.value" v-for="item in options.calculationTypeOptions"
-                    :key="item.value" />
-                </el-select>
-                <el-select v-model="formData.calculationTypeRange" placeholder="请选择范围"
-                  style="width: 110px;;margin-right: 10px;">
-                  <el-option :label="item.label" :value="item.value" v-for="item in options.rangeOptions"
-                    :key="item.value" />
-                </el-select>
-                <el-select v-model="formData.calculation" placeholder="请选择物品" style="flex: 1;" clearable>
-                  <el-option v-for="item in options.calculationList" :key="item.value" :label="item.label"
-                    :value="item.value" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <!-- 库存状态 -->
-            <el-col :span="24">
-              <el-form-item label="库存状态" prop="inventoryStatus" class="err-120">
-                <el-select v-model="formData.inventoryStatusRange" placeholder="请选择范围"
-                  style="width: 110px;;margin-right: 10px;">
-                  <el-option :label="item.label" :value="item.value" v-for="item in options.rangeOptions"
-                    :key="item.value" />
-                </el-select>
-                <el-select v-model="formData.inventoryStatus" placeholder="请选择库存状态" style="flex: 1;" clearable>
-                  <el-option v-for="item in options.inventoryStatusList" :key="item.value" :label="item.label"
-                    :value="item.value" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <!-- 存储类型 -->
-            <el-col :span="24">
-              <el-form-item label="存储状态" prop="storageType" class="err-120">
-                <el-select v-model="formData.storageTypeRange" placeholder="请选择范围"
-                  style="width: 110px;;margin-right: 10px;">
-                  <el-option :label="item.label" :value="item.value" v-for="item in options.rangeOptions"
-                    :key="item.value" />
-                </el-select>
-                <el-select v-model="formData.storageType" placeholder="请选择存储状态" style="flex: 1;" clearable>
-                  <el-option v-for="item in options.storageTypeList" :key="item.value" :label="item.label"
-                    :value="item.value" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <!-- 库存事务 -->
-            <el-col :span="24">
-              <el-form-item label="库存事务" prop="inventoryAffair" class="err-120">
-                <el-select v-model="formData.inventoryAffairRange" placeholder="请选择范围"
-                  style="width: 110px;;margin-right: 10px;">
-                  <el-option :label="item.label" :value="item.value" v-for="item in options.rangeOptions"
-                    :key="item.value" />
-                </el-select>
-                <el-select v-model="formData.inventoryAffair" placeholder="请选择库存事务" style="flex: 1;" clearable>
-                  <el-option v-for="item in options.inventoryAffairList" :key="item.value" :label="item.label"
-                    :value="item.value" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-      </div>
-      <!-- 规则配置 -->
-      <div class="item mt-20px">
-        <div class="title">规则配置</div>
-        <el-form ref="formRef3" :model="formData" :rules="rules" label-width="120px" label-position="left">
-          <el-row gutter="10">
-            <!-- 仓库 库区  库位组 库位 -->
-            <el-col :span="24">
-              <el-form-item label="" label-width="0" prop="warehouse" class="err-120">
-                <el-select v-model="formData.warehouseType" style="width: 110px;;margin-right: 10px;">
-                  <el-option :label="item.label" :value="item.value" v-for="item in options.warehouseTypeOptions"
-                    :key="item.value" />
-                </el-select>
-                <el-select v-model="formData.warehouse" placeholder="请选择库位" style="flex: 1;" clearable>
-                  <el-option v-for="item in options.warehouseTypeList" :key="item.value" :label="item.label"
-                    :value="item.value" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <!-- 数量排序方向 -->
-            <el-col :span="24">
-              <el-form-item label="数量排序方向" class="flex-top" prop="quantitySort">
-                <div class="checkbox">
-                  <el-radio-group v-model="formData.quantitySort">
-                    <el-radio :label="item.value" v-for="item in options.sortOptions" :key="item.value">{{
-                      item.label }}</el-radio>
-                  </el-radio-group>
-                </div>
-              </el-form-item>
-            </el-col>
-            <!-- 巷道排序方向 -->
-            <el-col :span="24">
-              <el-form-item label="巷道排序方向" class="flex-top" prop="roadwaySort">
-                <div class="checkbox">
-                  <el-radio-group v-model="formData.roadwaySort">
-                    <el-radio :label="item.value" v-for="item in options.sortOptions" :key="item.value">{{ item.label
-                    }}</el-radio>
-                  </el-radio-group>
-                </div>
-              </el-form-item>
-            </el-col>
-            <!-- 货架排序方向 -->
-            <el-col :span="24">
-              <el-form-item label="货架排序方向" class="flex-top" prop="goodsDhelvesSort">
-                <div class="checkbox">
-                  <el-radio-group v-model="formData.goodsDhelvesSort">
-                    <el-radio :label="item.value" v-for="item in options.sortOptions" :key="item.value">{{ item.label
-                    }}</el-radio>
-                  </el-radio-group>
-                </div>
-              </el-form-item>
-            </el-col>
-            <!-- 行排序方向 -->
-            <el-col :span="24">
-              <el-form-item label="行排序方向" class="flex-top" prop="rowSort">
-                <div class="checkbox">
-                  <el-radio-group v-model="formData.rowSort">
-                    <el-radio :label="item.value" v-for="item in options.sortOptions" :key="item.value">{{ item.label
-                    }}</el-radio>
-                  </el-radio-group>
-                </div>
-              </el-form-item>
-            </el-col>
-            <!-- 列排序方向 -->
-            <el-col :span="24">
-              <el-form-item label="列排序方向" class="flex-top" prop="columnSort">
-                <div class="checkbox">
-                  <el-radio-group v-model="formData.columnSort">
-                    <el-radio :label="item.value" v-for="item in options.sortOptions" :key="item.value">{{ item.label
-                    }}</el-radio>
-                  </el-radio-group>
-                </div>
-              </el-form-item>
-            </el-col>
-            <!-- 优先整包 -->
-            <el-col :span="24">
-              <el-form-item label="优先整包" prop="firstPackage">
-                <el-switch v-model="formData.firstPackage" />
-              </el-form-item>
-            </el-col>
-            <!-- 发料包装类型 -->
-            <el-col :span="24">
-              <el-form-item label="发料包装类型" class="flex-top" prop="packagingType">
-                <div class="checkbox">
-                  <el-radio-group v-model="formData.packagingType">
-                    <el-radio :label="item.value" v-for="item in options.packagingTypeOptions" :key="item.value">{{
-                      item.label
-                    }}</el-radio>
-                  </el-radio-group>
-                </div>
-              </el-form-item>
-            </el-col>
-            <!-- 多次发料 -->
-            <el-col :span="7">
-              <el-form-item label="多次发料" prop="manyTimesGoods">
-                <el-switch v-model="formData.manyTimesGoods" />
-              </el-form-item>
-            </el-col>
-            <!-- 拆分次数 -->
-            <el-col :span="8">
-              <el-form-item label="拆分次数" prop="splitsNumber" label-width="70px">
-                <el-input-number v-model="formData.splitsNumber" :min="0" controls-position="right" />
-              </el-form-item>
-            </el-col>
-            <!-- 时间间隔 -->
-            <el-col :span="9">
-              <el-form-item label="时间间隔" prop="timeInterval" label-width="70px">
-                <el-input-number v-model="formData.timeInterval" :min="0" style="flex:1;margin-right:10px" controls-position="right" />小时
-              </el-form-item>
-            </el-col>
-            <!-- 使用整理库位 -->
-            <el-col :span="24">
-              <el-form-item label="使用整理库位" prop="useArrangePlace">
-                <el-switch v-model="formData.useArrangePlace" />
-              </el-form-item>
-            </el-col>
-            <!-- 使用在途库位 -->
-            <el-col :span="24">
-              <el-form-item label="使用在途库位" prop="useWayPlace">
-                <el-switch v-model="formData.useWayPlace" />
-              </el-form-item>
-            </el-col>
-            <!-- 生成接收任务 -->
-            <el-col :span="24">
-              <el-form-item label="生成接收任务" prop="receiveTask">
-                <el-switch v-model="formData.receiveTask" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-      </div>
-    </div>
-    <template #footer>
-      <!-- 按钮-->
-      <TableHead :HeadButttondata="Butttondata" @buttonBaseClick="buttonBaseClick" />
-    </template>
-  </Dialog>
-</template>
-<script setup lang="ts">
-import * as defaultButtons from '@/utils/disposition/defaultButtons'
-defineOptions({ name: 'DownShelfStrategyAddForm' })
-
-const { t } = useI18n() // 国际化
-const message = useMessage() // 消息弹窗
-
-const dialogVisible = ref(false) // 弹窗的是否展示
-const dialogTitle = ref('') // 弹窗的标题
-const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-const formType = ref('') // 表单的类型：create - 新增；update - 修改
-const formRef1 = ref() // 表单 Ref
-const formRef2 = ref() // 表单 Ref
-const formRef3 = ref() // 表单 Ref
-// form表单数据
-const formData = ref({
-  code: '',//代码
-  name: '',//名称
-  describe: '',//描述
-  priority: '',//优先级
-  status: false,//状态
-  // 供应商类型
-  type: 1,//供应商类型范围
-  supplierTypeRange: 1,//选择的供应商类型范围
-  supplier: '',//选择的供应商
-
-  // 物品类型
-  itemType: 1,//选择的物品类型
-  itemTypeRange: 1, //物品类型范围
-  item: '',//选择的物品
-
-  //重量体积面积
-  calculationType: 1,//默认选择重量
-  calculationTypeRange: 1, // 选择重量范围
-  calculation: '',//选择重量之后选择的内容
-
-  // 库存状态
-  inventoryStatusRange: 1, // 选择的库存状态范围
-  inventoryStatus: '',//选择的库存状态
-
-  // 存储状态
-  storageTypeRange: 1, // 选择的存储状态范围
-  storageType: '',//选择的存储状态
-
-  // 库存事务
-  inventoryAffairRange: 1, // 选择的库存事务范围
-  inventoryAffair: '',//选择的库存事务
-
-  // 仓库 库位
-  warehouseType: 1,//选择的是仓库/库区/库位组/库位类型
-  warehouse: '',//选择的仓库/库区/库位组/库位
-
-  quantitySort: 1,//数量排序方向
-  roadwaySort: 1,//巷道排序方向
-  goodsDhelvesSort: 1,//货架排序方向
-  rowSort: 1,//行排序方向
-  columnSort: 1,//列排序方向
-  firstPackage: false,//优先整包
-  packagingType: 1,//发料包装类型
-  manyTimesGoods: false,//多次发料
-  splitsNumber: 1,//拆分次数
-  timeInterval: 1,//时间间隔
-  useArrangePlace: false,//使用整理库位
-  useWayPlace: false,//使用在途库位
-  receiveTask: false,//生成接收任务
-})
-// 验证规则
-const rules = ref({
-  code: [{ required: true, message: '请输入代码', trigger: 'blur' }],
-  name: [{ required: true, message: '请输入名字', trigger: 'blur' }],
-  describe: [{ required: true, message: '请输入描述', trigger: 'blur' }],
-  priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }],
-  supplier: [{ required: true, message: '请选择供应商', trigger: 'blur' }],
-  item: [{ required: true, message: '请选择物品', trigger: 'blur' }],
-  calculation: [{ required: true, message: '请选择', trigger: 'blur' }],
-  inventoryStatus: [{ required: true, message: '请选择库存状态', trigger: 'blur' }],
-  storageType: [{ required: true, message: '请选择存储类型', trigger: 'blur' }],
-  inventoryAffair: [{ required: true, message: '请选择库存事务', trigger: 'blur' }],
-  warehouse: [{ required: true, message: '请选择仓库', trigger: 'blur' }],
-})
-// 下拉框列表集合
-const options = reactive({
-  // 供应商客户下拉框列表
-  typeOptions: [{ value: 1, label: '供应商' }, { value: 2, label: '客户' }],
-  // 范围下拉框列表
-  rangeOptions: [{ value: 1, label: '包含' }, { value: 2, label: '大于', }],
-  //供应商列表
-  supplierList: [{ value: 1, label: '供应商1' }, { value: 2, label: '供应商2' }, { value: 3, label: '供应商3' }],
-
-  // 物品类型列表
-  itemTypeOptions: [{ value: 1, label: '物品分类' }, { value: 2, label: '物品分组' }, { value: 3, label: '物品' }, { value: 4, label: '项目' }, { value: 5, label: 'ABC类' }],
-  // 物品列表
-  itemList: [{ value: 1, label: '物品1' }, { value: 2, label: '物品2' }, { value: 3, label: '物品3' }],
-  // 重量体积面积类型列表
-  calculationTypeOptions: [{ value: 1, label: '重量' }, { value: 2, label: '体积' }, { value: 3, label: '面积' }],
-  // 重量体积面积列表
-  calculationList: [{ value: 1, label: '重量1' }, { value: 2, label: '重量2' }, { value: 3, label: '重量3' }],
-  // 库存状态列表
-  inventoryStatusList: [{ value: 1, label: '库存状态1' }, { value: 2, label: '库存状态2' }, { value: 3, label: '库存状态3' }],
-  // 存储状态列表
-  storageTypeList: [{ value: 1, label: '存储状态1' }, { value: 2, label: '存储状态2' }, { value: 3, label: '存储状态3' }],
-  // 库存事务列表
-  inventoryAffairList: [{ value: 1, label: '库存事务1' }, { value: 2, label: '库存事务2' }, { value: 3, label: '库存事务3' }],
-  // 仓库类型
-  warehouseTypeOptions: [{ value: 1, label: '仓库' }, { value: 2, label: '库区' }, { value: 3, label: '库位组' }, { value: 4, label: '库位' }],
-  // 仓库列表
-  warehouseTypeList: [{ value: 1, label: '仓库1' }, { value: 2, label: '仓库2' }, { value: 3, label: '仓库3' }],
-  // 排列方式
-  sortOptions: [{ value: 1, label: '从小到大' }, { value: 2, label: '从大到小' }],
-  // 发料包装类型
-  packagingTypeOptions: [{ value: 1, label: '包装' }, { value: 2, label: '容器' }, { value: 3, label: '单件' }],
-})
-
-/** 打开弹窗 */
-const open = async (type: string, id?: number) => {
-  dialogVisible.value = true
-  dialogTitle.value = t('action.' + type)
-  formType.value = type
-  resetForm()
-  // 修改时，设置数据
-
-}
-defineExpose({ open }) // 提供 open 方法，用于打开弹窗
-
-/** 提交表单 */
-const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
-const submitForm = async () => {
-  // 校验表单
-  if (!formRef1 || !formRef2 || !formRef3) return
-  const valid2 = formRef2.value.validate()
-  const valid1 = formRef1.value.validate()
-  const valid3 = await formRef3.value.validate()
-  if (!valid1 || !valid2 || !valid3) return
-  // 提交请求
-  formLoading.value = true
-
-}
-
-/** 重置表单 */
-const resetForm = () => {
-  formData.value = {
-    code: '',
-    name: '',
-    describe: '',
-    priority: '',
-    status: false,
-    // 供应商类型
-    type: 1,//供应商类型范围
-    supplierTypeRange: 1,//选择的供应商类型范围
-    supplier: '',//选择的供应商
-    // 物品类型
-    itemType: 1,//选择的物品类型
-    itemTypeRange: 1, //物品类型范围
-    item: '',//选择的物品
-    //重量体积面积
-    calculationType: 1,//默认选择重量
-    calculationTypeRange: 1, // 选择重量范围
-    calculation: '',//选择重量之后选择的内容
-
-    // 库存状态
-    inventoryStatusRange: 1, // 选择的库存状态范围
-    inventoryStatus: '',//选择的库存状态
-
-    // 存储状态
-    storageTypeRange: 1, // 选择的存储状态范围
-    storageType: '',//选择的存储状态
-
-    // 库存事务
-    inventoryAffairRange: 1, // 选择的库存事务范围
-    inventoryAffair: '',//选择的库存事务
-
-    // 仓库 库位
-    warehouseType: 1,//选择的是仓库/库区/库位组/库位类型
-    warehouse: '',//选择的仓库/库区/库位组/库位
-
-    quantitySort: 1,//数量排序方向
-    roadwaySort: 1,//巷道排序方向
-    goodsDhelvesSort: 1,//货架排序方向
-    rowSort: 1,//行排序方向
-    columnSort: 1,//列排序方向
-    firstPackage: false,//优先整包
-    packagingType: 1,//发料包装类型
-    manyTimesGoods: false,//多次发料
-    splitsNumber: 1,//拆分次数
-    timeInterval: 1,//时间间隔
-    useArrangePlace: false,//使用整理库位
-    useWayPlace: false,//使用在途库位
-    receiveTask: false,//生成接收任务
-  }
-}
-
-// 弹窗按钮
-const Butttondata = [
-  defaultButtons.formSaveBtn(null), // 保存
-  defaultButtons.formCloseBtn(null), // 关闭
-]
-// 按钮事件 
-const buttonBaseClick = (val, item) => {
-  // 保存
-  if (val == 'save') {
-    submitForm()
-  }
-  // 关闭
-  else if (val == 'close') {
-    dialogVisible.value = false
-  }
-}
-
-</script>
-<style scoped lang="scss">
-.item {
-  border: 1px solid #dedede;
-  border-radius: 4px;
-  padding: 30px 30px 5px;
-  position: relative;
-
-  .title {
-    position: absolute;
-    background: white;
-    padding: 0px 10px;
-    position: absolute;
-    top: 0px;
-    height: 30px;
-    line-height: 30px;
-    margin-top: -15px;
-  }
-}
-
-.checkbox {
-  background: #f5f5f5;
-  flex: 1;
-  padding: 0px 15px;
-  border-radius: 2px;
-}
-
-::v-deep .flex-top .el-form-item__content {
-  align-items: flex-start !important;
-}
-
-::v-deep .err-240 .el-form-item__error {
-  padding-left: 240px !important;
-}
-
-::v-deep .err-120 .el-form-item__error {
-  padding-left: 120px !important;
-}
-</style>
diff --git a/src/views/wms/strategy/downShelfStrategy/AddForm.vue b/src/views/wms/strategy/downShelfStrategy/AddForm.vue
index 8149ed38e..dfed5e798 100644
--- a/src/views/wms/strategy/downShelfStrategy/AddForm.vue
+++ b/src/views/wms/strategy/downShelfStrategy/AddForm.vue
@@ -1,4 +1,4 @@
-<!-- 上架策略弹窗 -->
+<!-- 下架策略弹窗 -->
 <template>
   <Dialog :title="dialogTitle" v-model="dialogVisible">
     <div class="p-20px m--10px" style="max-height: 500px;overflow-y: auto;">
@@ -146,7 +146,7 @@
                   <el-option :label="cur.label" :value="cur.value" v-for="(cur, index) in options.warehouseTypeOptions"
                     :key="index" />
                 </el-select>
-                <el-select v-model="item.Value" placeholder="请选择仓库" clearable style="flex: 1;">
+                <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-select>
               </el-form-item>
@@ -365,8 +365,8 @@ const options = reactive({
   itemTypeOptions: [{ value: 'ItemType', label: '物品类型' }, { value: 'ItemGroup', label: '物品分组' }, { value: 'ItemCode', label: '物品' }, { value: 'Project', label: '项目' }, { value: 'AbcClass', label: 'ABC类' }],
   // 重量体积面积类型列表
   calculationTypeOptions: [{ value: 'Weight', label: '重量' }, { value: 'Volume', label: '体积' }, { value: 'Area', label: '面积' }],
+    //仓库列表
   warehouseTypeOptions: [{ value: 'WarehouseCode', label: '仓库' }, { value: 'AreaCode', label: '库区' }, { value: 'LocationGroupCode', label: '库位组' }, { value: 'LocationCode', label: '库位' }],
-  //仓库列表
   warehouseList: [],
   // 排列方式
   sortOptions: [{ value: 'ASC', label: '从小到大' }, { value: 'DESC', label: '从大到小' }],
diff --git a/src/views/wms/strategy/downShelfStrategy/index.vue b/src/views/wms/strategy/downShelfStrategy/index.vue
index dd5f89a05..e57d742a8 100644
--- a/src/views/wms/strategy/downShelfStrategy/index.vue
+++ b/src/views/wms/strategy/downShelfStrategy/index.vue
@@ -1,5 +1,5 @@
 
-<!-- 供应商送货策略 -->
+<!-- 下架策略 -->
 <template>
   <!-- 列表头部 -->
   <TableHead :HeadButttondata="HeadButttondata" @buttonBaseClick="buttonBaseClick" />
diff --git a/src/views/wms/strategy/purchaseReceiptStrategy/AddForm.vue b/src/views/wms/strategy/purchaseReceiptStrategy/AddForm.vue
index a1d5626dc..190d546e1 100644
--- a/src/views/wms/strategy/purchaseReceiptStrategy/AddForm.vue
+++ b/src/views/wms/strategy/purchaseReceiptStrategy/AddForm.vue
@@ -1,5 +1,5 @@
 
-<!-- 供应商送货策略弹出层 -->
+<!-- 采购收货任务拆分策略弹出层 -->
 <template>
   <Dialog :title="dialogTitle" v-model="dialogVisible">
     <div class="p-20px m--10px" style="max-height: 500px;overflow-y: auto;">
diff --git a/src/views/wms/strategy/supplieDeliveryStrategy/AddForm.vue b/src/views/wms/strategy/supplieDeliveryStrategy/AddForm.vue
index 8300007cb..da1540a4b 100644
--- a/src/views/wms/strategy/supplieDeliveryStrategy/AddForm.vue
+++ b/src/views/wms/strategy/supplieDeliveryStrategy/AddForm.vue
@@ -107,10 +107,12 @@
               <el-form-item v-else-if="item.ParamCode == 'WarehouseCode'" label="仓库"
                 :prop="'configuration.' + index + '.Value'" :rules="{
                   required: true,
-                  message: '请选择仓库',
+                  message: `请选择${item.ParamCode == 'WarehouseCode' ? '仓库' : item.ParamCode == 'AreaCode' ? '库区' : item.ParamCode == 'LocationGroupCode' ? '库位组' : item.ParamCode == 'LocationCode' ? '库位' : ''}`,
                   trigger: 'change',
                 }">
-                <el-select v-model="item.Value" placeholder="请选择仓库" clearable>
+                <el-select v-model="item.Value"
+                  :placeholder="`请选择${item.ParamCode == 'WarehouseCode' ? '仓库' : item.ParamCode == 'AreaCode' ? '库区' : item.ParamCode == 'LocationGroupCode' ? '库位组' : item.ParamCode == 'LocationCode' ? '库位' : ''}`"
+                  clearable>
                   <el-option v-for="cur in options.warehouseList" :key="cur.id" :label="cur.name" :value="cur.id" />
                 </el-select>
               </el-form-item>
diff --git a/src/views/wms/strategy/upShelfStrategy/AddForm.vue b/src/views/wms/strategy/upShelfStrategy/AddForm.vue
index 74cbb3d89..a7497c506 100644
--- a/src/views/wms/strategy/upShelfStrategy/AddForm.vue
+++ b/src/views/wms/strategy/upShelfStrategy/AddForm.vue
@@ -147,7 +147,7 @@
                   <el-option :label="cur.label" :value="cur.value" v-for="(cur, index) in options.warehouseTypeOptions"
                     :key="index" />
                 </el-select>
-                <el-select v-model="item.Value" placeholder="请选择仓库" clearable style="flex: 1;">
+                <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-select>
               </el-form-item>
diff --git a/src/views/wms/strategy/upShelfStrategy/index.vue b/src/views/wms/strategy/upShelfStrategy/index.vue
index 30126820f..c22658c25 100644
--- a/src/views/wms/strategy/upShelfStrategy/index.vue
+++ b/src/views/wms/strategy/upShelfStrategy/index.vue
@@ -1,5 +1,5 @@
 
-<!-- 供应商送货策略 -->
+<!-- 上架策略 -->
 <template>
   <!-- 列表头部 -->
   <TableHead :HeadButttondata="HeadButttondata" @buttonBaseClick="buttonBaseClick" />
diff --git a/src/views/wms/strategy/warehouseStorageStrategy/AddForm copy.vue b/src/views/wms/strategy/warehouseStorageStrategy/AddForm copy.vue
new file mode 100644
index 000000000..e65d16b89
--- /dev/null
+++ b/src/views/wms/strategy/warehouseStorageStrategy/AddForm copy.vue	
@@ -0,0 +1,350 @@
+<!-- 库位存储策略弹窗 -->
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <div class="p-20px m--10px" style="max-height: 500px;overflow-y: auto;">
+      <!-- 规则 -->
+      <div class="item">
+        <div class="title">规则</div>
+        <el-form ref="formRef1" :model="formData" :rules="rules" label-width="130px" label-position="left">
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="代码" prop="code">
+                <el-input v-model="formData.code" placeholder="请输入代码" clearable />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="名称" prop="name">
+                <el-input v-model="formData.name" placeholder="请输入名称" clearable />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="描述" prop="describe">
+                <el-input v-model="formData.describe" placeholder="请输入描述" clearable />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="优先级" prop="priority">
+                <el-input-number v-model="formData.priority" :min="1" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="状态" prop="status">
+                <el-switch v-model="formData.status" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+      <!-- 规则条件 -->
+      <div class="item mt-20px">
+        <div class="title">规则条件</div>
+        <el-form ref="formRef2" :model="formData" :rules="rules" label-width="130px" label-position="left">
+          <el-row>
+            <!-- 仓库 库区  库位组 库位 -->
+            <el-col :span="24">
+              <el-form-item label="" label-width="0" prop="warehouse" class="err-260">
+                <el-select v-model="formData.warehouseType" style="width: 120px;;margin-right: 10px;">
+                  <el-option :label="item.label" :value="item.value" v-for="item in options.warehouseTypeOptions"
+                    :key="item.value" />
+                </el-select>
+
+                <el-select v-model="formData.warehouseTypeRange" placeholder="请选择范围"
+                  style="width: 120px;;margin-right: 10px;">
+                  <el-option :label="item.label" :value="item.value" v-for="item in options.rangeOptions"
+                    :key="item.value" />
+                </el-select>
+                <el-select v-model="formData.warehouse" placeholder="请选择库位" style="flex: 1;" clearable>
+                  <el-option v-for="item in options.warehouseTypeList" :key="item.value" :label="item.label"
+                    :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+      <!-- 规则配置 -->
+      <div class="item mt-20px">
+        <div class="title">规则配置</div>
+        <el-form ref="formRef3" :model="formData" :rules="rules" label-width="130px" label-position="left">
+          <el-row>
+            <!-- 默认库存状态 -->
+            <el-col :span="24">
+              <el-form-item label="默认库存状态" class="flex-top" prop="defaultInventoryStatus">
+                <div class="checkbox">
+                  <el-radio-group v-model="formData.defaultInventoryStatus">
+                    <el-radio :label="item.value" v-for="item in options.defaultInventoryStatusOptions"
+                      :key="item.value">{{
+                        item.label }}</el-radio>
+                  </el-radio-group>
+                </div>
+              </el-form-item>
+            </el-col>
+            <!-- 溢流库位 -->
+            <el-col :span="24">
+              <el-form-item label="溢流库位" prop="overflowWarehouse">
+                <el-select v-model="formData.overflowWarehouse" placeholder="请选择溢流库位" clearable>
+                  <el-option v-for="item in options.overflowWarehouseList" :key="item.value" :label="item.label"
+                    :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <!-- 允许负库存 -->
+            <el-col :span="12">
+              <el-form-item label="允许负库存" prop="allowNegativeInventory">
+                <el-switch v-model="formData.allowNegativeInventory" />
+              </el-form-item>
+            </el-col>
+            <!-- 保留零库存 -->
+            <el-col :span="12">
+              <el-form-item label="保留零库存" prop="reserveZeroInventory">
+                <el-switch v-model="formData.reserveZeroInventory" />
+              </el-form-item>
+            </el-col>
+            <!-- 允许领料 -->
+            <el-col :span="12">
+              <el-form-item label="允许领料" prop="allowPicking">
+                <el-switch v-model="formData.allowPicking" />
+              </el-form-item>
+            </el-col>
+            <!-- 允许过量领料 -->
+            <el-col :span="12">
+              <el-form-item label="允许过量领料" prop="allowExcessPicking">
+                <el-switch v-model="formData.allowExcessPicking" />
+              </el-form-item>
+            </el-col>
+            <!-- 允许整包存储 -->
+            <el-col :span="12">
+              <el-form-item label="允许整包存储" prop="allowPackageStorage">
+                <el-switch v-model="formData.allowPackageStorage" />
+              </el-form-item>
+            </el-col>
+            <!-- 允许散量存储 -->
+            <el-col :span="12">
+              <el-form-item label="允许散量存储" prop="allowDispersionStorage">
+                <el-switch v-model="formData.allowDispersionStorage" />
+              </el-form-item>
+            </el-col>
+            <!-- 允许出库 -->
+            <el-col :span="12">
+              <el-form-item label="允许出库" prop="allowOutbound">
+                <el-switch v-model="formData.allowOutbound" />
+              </el-form-item>
+            </el-col>
+            <!-- 允许入库 -->
+            <el-col :span="12">
+              <el-form-item label="允许入库" prop="allowInbound">
+                <el-switch v-model="formData.allowInbound" />
+              </el-form-item>
+            </el-col>
+            <!-- 允许退货到供应商 -->
+            <el-col :span="12">
+              <el-form-item label="允许退货到供应商" prop="allowReturn">
+                <el-switch v-model="formData.allowReturn" />
+              </el-form-item>
+            </el-col>
+            <!-- 允许接收客户退货 -->
+            <el-col :span="12">
+              <el-form-item label="允许接收客户退货" prop="allowReceiveReturn">
+                <el-switch v-model="formData.allowReceiveReturn" />
+              </el-form-item>
+            </el-col>
+            <!-- 允许拆箱 -->
+            <el-col :span="12">
+              <el-form-item label="允许拆箱" prop="allowOpenBox">
+                <el-switch v-model="formData.allowUnpacking" />
+              </el-form-item>
+            </el-col>
+            <!-- 允许拆托 -->
+            <el-col :span="12">
+              <el-form-item label="允许拆托" prop="allowOpenHolder">
+                <el-switch v-model="formData.allowOpenHolder" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </div>
+    <template #footer>
+      <!-- 按钮-->
+      <TableHead :HeadButttondata="Butttondata" @buttonBaseClick="buttonBaseClick" />
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+defineOptions({ name: 'WarehouseStorageStrategyAddForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formRef1 = ref() // 表单 Ref
+const formRef2 = ref() // 表单 Ref
+const formRef3 = ref() // 表单 Ref
+// form表单数据
+const formData = ref({
+  code: '',//代码
+  name: '',//名称
+  describe: '',//描述
+  priority: '',//优先级
+  status: false,//状态
+
+  // 仓库 库位
+  warehouseType: 1,//选择的是仓库/库区/库位组/库位类型
+  warehouseTypeRange: 1,//选择的仓库范围
+  warehouse: '',//选择的仓库/库区/库位组/库位
+
+  defaultInventoryStatus: 1,//默认库存状态
+  overflowWarehouse: '',//溢流库位
+  allowNegativeInventory: false,//允许负库存
+  reserveZeroInventory: false,//保留零库存
+  allowPicking: false,//允许领料
+  allowExcessPicking: false,//允许过量领料
+  allowPackageStorage: false,//允许整包存储
+  allowDispersionStorage: false,//允许散量存储
+  allowOutbound: false,//允许出库
+  allowInbound: false,//允许入库
+  allowReturn: false,//允许退货到供应商
+  allowReceiveReturn: false,//允许接收客户退货
+  allowOpenBox: false,//允许拆箱
+  allowOpenHolder: false,//允许拆托
+})
+// 验证规则
+const rules = ref({
+  code: [{ required: true, message: '请输入代码', trigger: 'blur' }],
+  name: [{ required: true, message: '请输入名字', trigger: 'blur' }],
+  describe: [{ required: true, message: '请输入描述', trigger: 'blur' }],
+  priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }],
+  warehouse: [{ required: true, message: '请选择仓库', trigger: 'blur' }],
+  overflowWarehouse: [{ required: true, message: '请选择溢流库位', trigger: 'blur' }],
+
+})
+// 下拉框列表集合
+const options = reactive({
+  // 范围下拉框列表
+  rangeOptions: [{ value: 1, label: '包含' }, { value: 2, label: '大于', }],
+  // 仓库类型
+  warehouseTypeOptions: [{ value: 1, label: '仓库' }, { value: 2, label: '库区' }, { value: 3, label: '库位组' }, { value: 4, label: '库位' }],
+  // 仓库列表
+  warehouseTypeList: [{ value: 1, label: '仓库1' }, { value: 2, label: '仓库2' }, { value: 3, label: '仓库3' }],
+  // 默认库存状态
+  defaultInventoryStatusOptions: [{ value: 1, label: '合格' }, { value: 2, label: '待检' }, { value: 3, label: '不合格' }, { value: 4, label: '隔离' }, { value: 5, label: '报废' }],
+  // 溢流库存列表
+  overflowWarehouseList: [{ value: 1, label: '溢流库存1' }, { value: 2, label: '溢流库存2' }],
+})
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef1 || !formRef2 || !formRef3) return
+  const valid2 = formRef2.value.validate()
+  const valid1 = formRef1.value.validate()
+  const valid3 = await formRef3.value.validate()
+  if (!valid1 || !valid2 || !valid3) return
+  // 提交请求
+  formLoading.value = true
+
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    code: '',
+    name: '',
+    describe: '',
+    priority: '',
+    status: false,
+
+    // 仓库 库位
+    warehouseType: 1,//选择的是仓库/库区/库位组/库位类型
+    warehouseTypeRange: 1,//选择的仓库范围
+    warehouse: '',//选择的仓库/库区/库位组/库位
+
+    defaultInventoryStatus: 1,//默认库存状态
+    overflowWarehouse: '',//溢流库位
+    allowNegativeInventory: false,//允许负库存
+    reserveZeroInventory: false,//保留零库存
+    allowPicking: false,//允许领料
+    allowExcessPicking: false,//允许过量领料
+    allowPackageStorage: false,//允许整包存储
+    allowDispersionStorage: false,//允许散量存储
+    allowOutbound: false,//允许出库
+    allowInbound: false,//允许入库
+    allowReturn: false,//允许退货到供应商
+    allowReceiveReturn: false,//允许接收客户退货
+    allowOpenBox: false,//允许拆箱
+    allowOpenHolder: false,//允许拆托
+  }
+}
+
+// 弹窗按钮
+const Butttondata = [
+  defaultButtons.formSaveBtn(null), // 保存
+  defaultButtons.formCloseBtn(null), // 关闭
+]
+// 按钮事件 
+const buttonBaseClick = (val, item) => {
+  // 保存
+  if (val == 'save') {
+    submitForm()
+  }
+  // 关闭
+  else if (val == 'close') {
+    dialogVisible.value = false
+  }
+}
+
+</script>
+<style scoped lang="scss">
+.item {
+  border: 1px solid #dedede;
+  border-radius: 4px;
+  padding: 30px 30px 5px;
+  position: relative;
+
+  .title {
+    position: absolute;
+    background: white;
+    padding: 0px 10px;
+    position: absolute;
+    top: 0px;
+    height: 30px;
+    line-height: 30px;
+    margin-top: -15px;
+  }
+}
+
+.checkbox {
+  background: #f5f5f5;
+  flex: 1;
+  padding: 0px 15px;
+  border-radius: 2px;
+}
+
+::v-deep .flex-top .el-form-item__content {
+  align-items: flex-start !important;
+}
+
+::v-deep .err-260 .el-form-item__error {
+  padding-left: 260px !important;
+}
+
+::v-deep .err-130 .el-form-item__error {
+  padding-left: 130px !important;
+}
+</style>
diff --git a/src/views/wms/strategy/warehouseStorageStrategy/AddForm.vue b/src/views/wms/strategy/warehouseStorageStrategy/AddForm.vue
index e65d16b89..d866edb66 100644
--- a/src/views/wms/strategy/warehouseStorageStrategy/AddForm.vue
+++ b/src/views/wms/strategy/warehouseStorageStrategy/AddForm.vue
@@ -1,15 +1,15 @@
-<!-- 库位存储策略弹窗 -->
+<!-- 库位存储策略弹窗弹窗 -->
 <template>
   <Dialog :title="dialogTitle" v-model="dialogVisible">
     <div class="p-20px m--10px" style="max-height: 500px;overflow-y: auto;">
-      <!-- 规则 -->
-      <div class="item">
-        <div class="title">规则</div>
-        <el-form ref="formRef1" :model="formData" :rules="rules" label-width="130px" label-position="left">
-          <el-row>
+      <el-form ref="formRef" :model="formData" :rules="rules" label-width="130px" label-position="left">
+        <!-- 规则 -->
+        <div class="item">
+          <div class="title">规则</div>
+          <el-row gutter="10">
             <el-col :span="24">
-              <el-form-item label="代码" prop="code">
-                <el-input v-model="formData.code" placeholder="请输入代码" clearable />
+              <el-form-item label="代码" prop="strategyCode">
+                <el-input v-model="formData.strategyCode" placeholder="请输入代码" clearable disabled />
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -18,8 +18,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="描述" prop="describe">
-                <el-input v-model="formData.describe" placeholder="请输入描述" clearable />
+              <el-form-item label="描述" prop="description">
+                <el-input v-model="formData.description" placeholder="请输入描述" clearable />
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -33,136 +33,105 @@
               </el-form-item>
             </el-col>
           </el-row>
-        </el-form>
-      </div>
-      <!-- 规则条件 -->
-      <div class="item mt-20px">
-        <div class="title">规则条件</div>
-        <el-form ref="formRef2" :model="formData" :rules="rules" label-width="130px" label-position="left">
-          <el-row>
-            <!-- 仓库 库区  库位组 库位 -->
-            <el-col :span="24">
-              <el-form-item label="" label-width="0" prop="warehouse" class="err-260">
-                <el-select v-model="formData.warehouseType" style="width: 120px;;margin-right: 10px;">
-                  <el-option :label="item.label" :value="item.value" v-for="item in options.warehouseTypeOptions"
-                    :key="item.value" />
-                </el-select>
+        </div>
 
-                <el-select v-model="formData.warehouseTypeRange" placeholder="请选择范围"
-                  style="width: 120px;;margin-right: 10px;">
-                  <el-option :label="item.label" :value="item.value" v-for="item in options.rangeOptions"
-                    :key="item.value" />
+        <!-- 规则条件 -->
+
+        <div class="item mt-20px">
+          <div class="title">规则条件</div>
+          <el-row gutter="10">
+            <el-col :span="24" v-for="(item, index) in formData.condition" :key="index">
+              <!-- 仓库 库区  库位组 库位 -->
+              <el-form-item label="" label-width="0" class="err-130" v-if="index == 0">
+                <el-select v-model="item.ParamCode" placeholder="" style="width: 120px;margin-right: 10px;"
+                  @change="changeWarehouse">
+                  <el-option :label="cur.label" :value="cur.value" v-for="(cur, index) in options.warehouseTypeOptions"
+                    :key="index" />
                 </el-select>
-                <el-select v-model="formData.warehouse" placeholder="请选择库位" style="flex: 1;" clearable>
-                  <el-option v-for="item in options.warehouseTypeList" :key="item.value" :label="item.label"
-                    :value="item.value" />
+                <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-select>
               </el-form-item>
             </el-col>
           </el-row>
-        </el-form>
-      </div>
-      <!-- 规则配置 -->
-      <div class="item mt-20px">
-        <div class="title">规则配置</div>
-        <el-form ref="formRef3" :model="formData" :rules="rules" label-width="130px" label-position="left">
-          <el-row>
-            <!-- 默认库存状态 -->
-            <el-col :span="24">
-              <el-form-item label="默认库存状态" class="flex-top" prop="defaultInventoryStatus">
+        </div>
+
+        <!-- 规则配置 -->
+        <div class="item mt-20px">
+          <div class="title">规则配置</div>
+          <el-row gutter="10">
+            <el-col :span="index == 0 || index == 1 ? 24 : 12" v-for="(item, index) in formData.configuration"
+              :key="index">
+              <!-- 默认库存状态 -->
+              <el-form-item label="默认库存状态" class="flex-top" v-if="index == 0">
                 <div class="checkbox">
-                  <el-radio-group v-model="formData.defaultInventoryStatus">
-                    <el-radio :label="item.value" v-for="item in options.defaultInventoryStatusOptions"
-                      :key="item.value">{{
-                        item.label }}</el-radio>
+                  <el-radio-group v-model="item.Value">
+                    <el-radio :label="cur.value" v-for="cur in getStrDictOptions(DICT_TYPE.INVENTORY_STATUS)"
+                      :key="cur.value">{{ cur.label }}</el-radio>
                   </el-radio-group>
                 </div>
               </el-form-item>
-            </el-col>
-            <!-- 溢流库位 -->
-            <el-col :span="24">
-              <el-form-item label="溢流库位" prop="overflowWarehouse">
-                <el-select v-model="formData.overflowWarehouse" placeholder="请选择溢流库位" clearable>
-                  <el-option v-for="item in options.overflowWarehouseList" :key="item.value" :label="item.label"
-                    :value="item.value" />
+              <!-- 溢流库位 -->
+              <el-form-item label="溢流库位" v-else-if="index == 1">
+                <el-select v-model="item.Value" placeholder="请选择溢流库位" clearable>
+                  <el-option v-for="cur in options.overflowWarehouseList" :key="cur.id" :label="cur.name"
+                    :value="cur.id" />
                 </el-select>
               </el-form-item>
-            </el-col>
-            <!-- 允许负库存 -->
-            <el-col :span="12">
-              <el-form-item label="允许负库存" prop="allowNegativeInventory">
-                <el-switch v-model="formData.allowNegativeInventory" />
+              <!-- 允许负库存 -->
+              <el-form-item label="允许负库存" v-else-if="index == 2">
+                <el-switch v-model="item.Value" />
               </el-form-item>
-            </el-col>
-            <!-- 保留零库存 -->
-            <el-col :span="12">
-              <el-form-item label="保留零库存" prop="reserveZeroInventory">
-                <el-switch v-model="formData.reserveZeroInventory" />
+              <!-- 保留零库存 -->
+              <el-form-item label="保留零库存" v-else-if="index == 3">
+                <el-switch v-model="item.Value" />
               </el-form-item>
-            </el-col>
-            <!-- 允许领料 -->
-            <el-col :span="12">
-              <el-form-item label="允许领料" prop="allowPicking">
-                <el-switch v-model="formData.allowPicking" />
+              <!-- 允许领料 -->
+              <el-form-item label="允许领料" v-else-if="index == 4">
+                <el-switch v-model="item.Value" />
               </el-form-item>
-            </el-col>
-            <!-- 允许过量领料 -->
-            <el-col :span="12">
-              <el-form-item label="允许过量领料" prop="allowExcessPicking">
-                <el-switch v-model="formData.allowExcessPicking" />
+              <!-- 允许过量领料 -->
+              <el-form-item label="允许过量领料" v-else-if="index == 5">
+                <el-switch v-model="item.Value" />
               </el-form-item>
-            </el-col>
-            <!-- 允许整包存储 -->
-            <el-col :span="12">
-              <el-form-item label="允许整包存储" prop="allowPackageStorage">
-                <el-switch v-model="formData.allowPackageStorage" />
+              <!-- 允许整包存储 -->
+              <el-form-item label="允许整包存储" v-else-if="index == 6">
+                <el-switch v-model="item.Value" />
               </el-form-item>
-            </el-col>
-            <!-- 允许散量存储 -->
-            <el-col :span="12">
-              <el-form-item label="允许散量存储" prop="allowDispersionStorage">
-                <el-switch v-model="formData.allowDispersionStorage" />
+              <!-- 允许散量存储 -->
+              <el-form-item label="允许散量存储" v-else-if="index == 7">
+                <el-switch v-model="item.Value" />
               </el-form-item>
-            </el-col>
-            <!-- 允许出库 -->
-            <el-col :span="12">
-              <el-form-item label="允许出库" prop="allowOutbound">
-                <el-switch v-model="formData.allowOutbound" />
+              <!-- 允许出库 -->
+              <el-form-item label="允许出库" v-else-if="index == 8">
+                <el-switch v-model="item.Value" />
               </el-form-item>
-            </el-col>
-            <!-- 允许入库 -->
-            <el-col :span="12">
-              <el-form-item label="允许入库" prop="allowInbound">
-                <el-switch v-model="formData.allowInbound" />
+              <!-- 允许入库 -->
+              <el-form-item label="允许入库" v-else-if="index == 9">
+                <el-switch v-model="item.Value" />
               </el-form-item>
-            </el-col>
-            <!-- 允许退货到供应商 -->
-            <el-col :span="12">
-              <el-form-item label="允许退货到供应商" prop="allowReturn">
-                <el-switch v-model="formData.allowReturn" />
+              <!-- 允许退货到供应商 -->
+              <el-form-item label="允许退货到供应商" v-else-if="index == 10">
+                <el-switch v-model="item.Value" />
               </el-form-item>
-            </el-col>
-            <!-- 允许接收客户退货 -->
-            <el-col :span="12">
-              <el-form-item label="允许接收客户退货" prop="allowReceiveReturn">
-                <el-switch v-model="formData.allowReceiveReturn" />
+              <!-- 允许接收客户退货 -->
+              <el-form-item label="允许接收客户退货" v-else-if="index == 11">
+                <el-switch v-model="item.Value" />
               </el-form-item>
-            </el-col>
-            <!-- 允许拆箱 -->
-            <el-col :span="12">
-              <el-form-item label="允许拆箱" prop="allowOpenBox">
-                <el-switch v-model="formData.allowUnpacking" />
+
+              <!-- 允许拆箱 -->
+              <el-form-item label="允许拆箱" v-else-if="index == 12">
+                <el-switch v-model="item.Value" />
               </el-form-item>
-            </el-col>
-            <!-- 允许拆托 -->
-            <el-col :span="12">
-              <el-form-item label="允许拆托" prop="allowOpenHolder">
-                <el-switch v-model="formData.allowOpenHolder" />
+
+              <!-- 允许拆托 -->
+              <el-form-item label="允许拆托" v-else-if="index == 13">
+                <el-switch v-model="item.Value" />
               </el-form-item>
             </el-col>
           </el-row>
-        </el-form>
-      </div>
+        </div>
+      </el-form>
     </div>
     <template #footer>
       <!-- 按钮-->
@@ -172,7 +141,15 @@
 </template>
 <script setup lang="ts">
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-defineOptions({ name: 'WarehouseStorageStrategyAddForm' })
+defineOptions({ name: 'UpShelfStrategyAddForm' })
+import { getWarehouseList } from '@/api/wms/warehouse'
+import { getAreaList } from '@/api/wms/areabasic'
+import { getLocationgroupList } from '@/api/wms/locationgroup'
+import { getLocationList } from '@/api/wms/location'
+import * as RuleApi from '@/api/wms/rule'
+
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -181,69 +158,175 @@ const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
-const formRef1 = ref() // 表单 Ref
-const formRef2 = ref() // 表单 Ref
-const formRef3 = ref() // 表单 Ref
+const formRef = ref() // 表单 Ref
+
+
+const formStrategyCode = ref('')
 // form表单数据
 const formData = ref({
-  code: '',//代码
+  id: '',
+  strategyCode: formStrategyCode.value,//策略代码id
   name: '',//名称
-  describe: '',//描述
+  description: '',//描述
   priority: '',//优先级
-  status: false,//状态
+  status: true,//状态
+  //规则条件集合
+  condition: [
+    // 仓库
+    { ParamCode: 'LocationCode', Value: "" },
+  ],
+  configuration: [
+    // 默认库存状态
+    { ParamCode: 'DefaultInventoryStatus', Value: 'OK' },
+    // 溢流库位
+    { ParamCode: 'OverflowLocationCode', Value: '' },
+    // 可以负库存
+    { ParamCode: 'EnableNegative', Value: true },
+    // 可以保留零库存
+    { ParamCode: 'EnableKeepZero', Value: true },
+    // 可以领料
+    { ParamCode: 'EnablePick', Value: true },
+    // 可以过量领料
+    { ParamCode: 'EnableOverPick', Value: true },
+    // 可以整包存储 
+    { ParamCode: 'EnableWholeStore', Value: true },
+    // 可以散件存储 
+    { ParamCode: 'EnableBreakStore', Value: true },
+    // 可以发出
+    { ParamCode: 'EnableShip', Value: true },
+    // 可以接收
+    { ParamCode: 'EnableReceive', Value: true },
+    // 可以退货给供应商
+    { ParamCode: 'EnableReturnToSupplier', Value: true },
+    // 可以接收客户退货
+    { ParamCode: 'EnableReturnFromCustomer', Value: true },
+    // 是否可以拆箱
+    { ParamCode: 'EnableSplitBox', Value: true },
+    // 是否可以拆托
+    { ParamCode: 'EnableSplitPallet', Value: true },
+  ]
 
-  // 仓库 库位
-  warehouseType: 1,//选择的是仓库/库区/库位组/库位类型
-  warehouseTypeRange: 1,//选择的仓库范围
-  warehouse: '',//选择的仓库/库区/库位组/库位
-
-  defaultInventoryStatus: 1,//默认库存状态
-  overflowWarehouse: '',//溢流库位
-  allowNegativeInventory: false,//允许负库存
-  reserveZeroInventory: false,//保留零库存
-  allowPicking: false,//允许领料
-  allowExcessPicking: false,//允许过量领料
-  allowPackageStorage: false,//允许整包存储
-  allowDispersionStorage: false,//允许散量存储
-  allowOutbound: false,//允许出库
-  allowInbound: false,//允许入库
-  allowReturn: false,//允许退货到供应商
-  allowReceiveReturn: false,//允许接收客户退货
-  allowOpenBox: false,//允许拆箱
-  allowOpenHolder: false,//允许拆托
 })
 // 验证规则
 const rules = ref({
-  code: [{ required: true, message: '请输入代码', trigger: 'blur' }],
+  strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' }],
   name: [{ required: true, message: '请输入名字', trigger: 'blur' }],
-  describe: [{ required: true, message: '请输入描述', trigger: 'blur' }],
+  description: [{ required: true, message: '请输入描述', trigger: 'blur' }],
   priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }],
-  warehouse: [{ required: true, message: '请选择仓库', trigger: 'blur' }],
-  overflowWarehouse: [{ required: true, message: '请选择溢流库位', trigger: 'blur' }],
-
 })
+
+// 所有的范围类型
+const rangeOptions = [
+  { value: '==', label: '等于' },
+  { value: '!=', label: '不等于' },
+  { value: '>', label: '大于' },
+  { value: '<', label: '小于' },
+  { value: '>=', label: '大于等于' },
+  { value: '<=', label: '小于等于' },
+  { value: 'IN', label: '包含' },
+  { value: 'NOT IN', label: '不包含' },
+  { value: 'NULL', label: '为空' },
+  { value: 'NOT NULL', label: '不为空' },
+]
+const formatRangeOptions = (...rest) => {
+  // 交集
+  let result = rangeOptions.filter(aItem => rest.some(bItem => aItem.value === bItem));
+  return result
+}
+
 // 下拉框列表集合
 const options = reactive({
-  // 范围下拉框列表
-  rangeOptions: [{ value: 1, label: '包含' }, { value: 2, label: '大于', }],
-  // 仓库类型
-  warehouseTypeOptions: [{ value: 1, label: '仓库' }, { value: 2, label: '库区' }, { value: 3, label: '库位组' }, { value: 4, label: '库位' }],
-  // 仓库列表
-  warehouseTypeList: [{ value: 1, label: '仓库1' }, { value: 2, label: '仓库2' }, { value: 3, label: '仓库3' }],
-  // 默认库存状态
-  defaultInventoryStatusOptions: [{ value: 1, label: '合格' }, { value: 2, label: '待检' }, { value: 3, label: '不合格' }, { value: 4, label: '隔离' }, { value: 5, label: '报废' }],
-  // 溢流库存列表
-  overflowWarehouseList: [{ value: 1, label: '溢流库存1' }, { value: 2, label: '溢流库存2' }],
+  //范围下拉框列表
+  rangeOptions1: formatRangeOptions('IN', 'NOT IN'),
+  rangeOptions2: formatRangeOptions('>', '<', '>=', '<='),
+
+  //仓库列表
+  warehouseTypeOptions: [{ value: 'WarehouseCode', label: '仓库' }, { value: 'AreaCode', label: '库区' }, { value: 'LocationGroupCode', label: '库位组' }, { value: 'LocationCode', label: '库位' }],
+  warehouseList: [],
+  // 溢流库位列表
+  overflowWarehouseList: []
 })
 
+
+
+// 获取仓库列表
+const getFormWarehouseList = async () => {
+  options.warehouseList = await getWarehouseList();
+}
+// 获取库区列表
+const getFormAreaList = async () => {
+  options.warehouseList = await getAreaList();
+}
+// 获取库位组列表
+const getFormLocationgrouList = async () => {
+  options.warehouseList = await getLocationgroupList();
+}
+// 获取库位列表
+const getFormLocationList = async (queryParms) => {
+  if (queryParms) {
+    options.overflowWarehouseList = await getLocationList(queryParms);
+  } else {
+    options.warehouseList = await getLocationList();
+  }
+}
+getFormLocationList()
+// 获取溢流库位
+const queryParms = {
+  type: 'OVERFLOW'
+}
+getFormLocationList(queryParms)
+// 选择仓库/库位/库位组/库区
+const changeWarehouse = (e) => {
+  formData.value.condition[0].Value = ''
+  if (e == 'WarehouseCode') {
+    getFormWarehouseList()
+  } else if (e == 'AreaCode') {
+    getFormAreaList()
+  } else if (e == 'LocationGroupCode') {
+    getFormLocationgrouList()
+  } else if (e == 'LocationCode') {
+    getFormLocationList()
+  }
+}
 /** 打开弹窗 */
-const open = async (type: string, id?: number) => {
+const open = async (type: string, strategyCode: string, id?: number) => {
+  formStrategyCode.value = strategyCode
   dialogVisible.value = true
   dialogTitle.value = t('action.' + type)
   formType.value = type
   resetForm()
   // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      let data = await RuleApi.getRule(id)
+      formData.value.id = data.id
+      formData.value.strategyCode = data.strategyCode
+      formData.value.name = data.name
+      formData.value.description = data.description
+      formData.value.priority = data.priority
+      formData.value.status = data.status == 0 ? true : false
+      if (data.condition) {
+        formData.value.condition = JSON.parse(data.condition)
+      }
+      if (data.configuration) {
+        formData.value.configuration = JSON.parse(data.configuration)
+      }
 
+      // 判断是获取仓库/库位/库位组/库区列表
+      if (formData.value.configuration[0].ParamCode == 'WarehouseCode') {
+        getFormWarehouseList()
+      } else if (formData.value.configuration[0].ParamCode == 'AreaCode') {
+        getFormAreaList()
+      } else if (formData.value.configuration[0].ParamCode == 'LocationGroupCode') {
+        getFormLocationgrouList()
+      } else if (formData.value.configuration[0].ParamCode == 'LocationCode') {
+        getFormLocationList()
+      }
+    } finally {
+      formLoading.value = false
+    }
+  }
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
@@ -251,44 +334,83 @@ defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
 const submitForm = async () => {
   // 校验表单
-  if (!formRef1 || !formRef2 || !formRef3) return
-  const valid2 = formRef2.value.validate()
-  const valid1 = formRef1.value.validate()
-  const valid3 = await formRef3.value.validate()
-  if (!valid1 || !valid2 || !valid3) return
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
   // 提交请求
   formLoading.value = true
-
+  try {
+    let data = {
+      id: formData.value.id,
+      strategyCode: formData.value.strategyCode,//策略代码
+      name: formData.value.name,//名称
+      description: formData.value.description,//描述
+      priority: formData.value.priority,//优先级
+      status: formData.value.status ? 0 : 1,//状态
+      //规则条件集合
+      condition: JSON.stringify(formData.value.condition),
+      configuration: JSON.stringify(formData.value.configuration)
+    }
+    if (formType.value === 'create') {
+      await RuleApi.createRule(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await RuleApi.updateRule(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
 }
 
 /** 重置表单 */
 const resetForm = () => {
   formData.value = {
-    code: '',
-    name: '',
-    describe: '',
-    priority: '',
-    status: false,
-
-    // 仓库 库位
-    warehouseType: 1,//选择的是仓库/库区/库位组/库位类型
-    warehouseTypeRange: 1,//选择的仓库范围
-    warehouse: '',//选择的仓库/库区/库位组/库位
+    id: '',
+    strategyCode: formStrategyCode.value,//策略代码id
+    name: '',//名称
+    description: '',//描述
+    priority: '',//优先级
+    status: true,//状态
+    //规则条件集合
+    condition: [
+      // 仓库
+      { ParamCode: 'LocationCode', Value: "" },
+    ],
 
-    defaultInventoryStatus: 1,//默认库存状态
-    overflowWarehouse: '',//溢流库位
-    allowNegativeInventory: false,//允许负库存
-    reserveZeroInventory: false,//保留零库存
-    allowPicking: false,//允许领料
-    allowExcessPicking: false,//允许过量领料
-    allowPackageStorage: false,//允许整包存储
-    allowDispersionStorage: false,//允许散量存储
-    allowOutbound: false,//允许出库
-    allowInbound: false,//允许入库
-    allowReturn: false,//允许退货到供应商
-    allowReceiveReturn: false,//允许接收客户退货
-    allowOpenBox: false,//允许拆箱
-    allowOpenHolder: false,//允许拆托
+    configuration: [
+      // 默认库存状态
+      { ParamCode: 'DefaultInventoryStatus', Value: 'OK' },
+      // 溢流库位
+      { ParamCode: 'OverflowLocationCode', Value: '' },
+      // 可以负库存
+      { ParamCode: 'EnableNegative', Value: true },
+      // 可以保留零库存
+      { ParamCode: 'EnableKeepZero', Value: true },
+      // 可以领料
+      { ParamCode: 'EnablePick', Value: true },
+      // 可以过量领料
+      { ParamCode: 'EnableOverPick', Value: true },
+      // 可以整包存储 
+      { ParamCode: 'EnableWholeStore', Value: true },
+      // 可以散件存储 
+      { ParamCode: 'EnableBreakStore', Value: true },
+      // 可以发出
+      { ParamCode: 'EnableShip', Value: true },
+      // 可以接收
+      { ParamCode: 'EnableReceive', Value: true },
+      // 可以退货给供应商
+      { ParamCode: 'EnableReturnToSupplier', Value: true },
+      // 可以接收客户退货
+      { ParamCode: 'EnableReturnFromCustomer', Value: true },
+      // 是否可以拆箱
+      { ParamCode: 'EnableSplitBox', Value: true },
+      // 是否可以拆托
+      { ParamCode: 'EnableSplitPallet', Value: true },
+    ]
   }
 }
 
@@ -340,11 +462,16 @@ const buttonBaseClick = (val, item) => {
   align-items: flex-start !important;
 }
 
-::v-deep .err-260 .el-form-item__error {
-  padding-left: 260px !important;
+::v-deep .err-240 .el-form-item__error {
+  padding-left: 240px !important;
+}
+
+::v-deep .err-120 .el-form-item__error {
+  padding-left: 120px !important;
 }
 
 ::v-deep .err-130 .el-form-item__error {
   padding-left: 130px !important;
 }
+
 </style>
diff --git a/src/views/wms/strategy/warehouseStorageStrategy/index.vue b/src/views/wms/strategy/warehouseStorageStrategy/index.vue
index 2bfc1fc2e..b893f379f 100644
--- a/src/views/wms/strategy/warehouseStorageStrategy/index.vue
+++ b/src/views/wms/strategy/warehouseStorageStrategy/index.vue
@@ -1,28 +1,88 @@
-<!-- 库位存储策略 -->
+
+<!-- 上架策略 -->
 <template>
   <!-- 列表头部 -->
   <TableHead :HeadButttondata="HeadButttondata" @buttonBaseClick="buttonBaseClick" />
-   <!-- 表单弹窗：添加/修改 -->
-    <AddForm ref="formRef" @success="getList" />
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list">
+      <el-table-column align="center" label="策略代码" prop="strategyCode" />
+      <el-table-column align="center" label="策略名称" prop="name" show-overflow-tooltip />
+      <el-table-column align="center" label="策略描述" prop="description" />
+      <el-table-column align="center" label="优先级" prop="priority" />
+      <el-table-column align="center" label="状态" prop="status">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="操作" fixed="right" width="240">
+        <template #default="scope">
+          <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event, scope.row)" />
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination v-model:limit="queryParams.pageSize" v-model:page="queryParams.pageNo" :total="total"
+      @pagination="getList" />
+  </ContentWrap>
+  <!-- 表单弹窗：添加/修改 -->
+  <AddForm ref="formRef" @success="getList" />
 </template>
 
 <script setup lang="ts">
+import { DICT_TYPE } from '@/utils/dict'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as RuleApi from '@/api/wms/rule'
 import AddForm from './AddForm.vue'
+// import { dateFormatter } from '@/utils/formatTime'
+
+defineOptions({ name: 'SupplieDeliveryStrategy' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 字典表格数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  strategyCode: 'S011',
+})
+
+/** 查询字典类型列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await RuleApi.getRulePage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
 
-defineOptions({ name: 'WarehouseStorageStrategy' })
 // 显示弹窗
 const formRef = ref()
-const openForm = (type: string) => {
-  formRef.value.open(type)
+const openForm = (type: string, strategyCode: string, id: number) => {
+  formRef.value.open(type, strategyCode, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await RuleApi.deleteRule(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch { }
 }
 // 列表头部按钮
 const HeadButttondata = [
   defaultButtons.defaultAddBtn(null), // 新增
-  defaultButtons.defaultImportBtn(null), // 导入
-  defaultButtons.defaultExportBtn(null), // 导出
-  // defaultButtons.defaultFilterBtn(), // 筛选
-  defaultButtons.defaultFreshBtn(null), // 刷新
 ]
 
 
@@ -30,7 +90,7 @@ const HeadButttondata = [
 // 头部按钮事件 
 const buttonBaseClick = (val, item) => {
   if (val == 'add') { // 新增
-    openForm('create')
+    openForm('create', queryParams.strategyCode)
   } else if (val == 'import') { // 导入
     handleImport()
   } else if (val == 'export') { // 导出
@@ -52,10 +112,15 @@ const butttondata = [
 // 列表-操作按钮事件 
 const buttonTableClick = (val, row) => {
   if (val == 'edit') { // 编辑
-    openForm('update', row.id)
+    openForm('update', queryParams.strategyCode, row.id)
   } else if (val == 'delete') { // 删除
     handleDelete(row.id)
   }
 }
 
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+
 </script>