Merge branch 'master' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui

src/components/TableHead/src/TableHead.vue

@@ -4,7 +4,7 @@
       <div class="tableNavLeftBtns">
         <ButtonBase
           :Butttondata="buttonsLeft"
-          @buttonBaseClick="buttonBaseClick"
+          @button-base-click="buttonBaseClick"
         />
       </div>
       <div class="tableNavRightBtns">
@@ -18,7 +18,7 @@
           style="margin-right: 15px;"
         ></SearchNormal> -->
         <!-- 右侧按钮 -->
-        <ButtonBase :Butttondata="buttonsRight" @buttonBaseClick="buttonBaseClick" />
+        <ButtonBase :Butttondata="buttonsRight" @button-base-click="buttonBaseClick" />
       </div>
     </div>
     <slot></slot>
@@ -26,6 +26,7 @@
 </template>
 <script setup>
 import ButtonBase from '@/components/XButton/src/ButtonBase.vue'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
 // import SearchNormal from '@/components/SearchNormal/index.vue'
 // import * as highSearch from '@/utils/search/highSearch'
 // import * as primarySearch from '@/utils/search/primarySearch'
@@ -63,7 +64,12 @@ import ButtonBase from '@/components/XButton/src/ButtonBase.vue'
     //   buttonsRight.value.push(defaultButtons.defaultFilterBtn())
     // }
     // 父级传参处理左右
-    props.HeadButttondata.forEach(item=>{
+    const buttonData = ref([])
+    // 默认按钮 刷新 和 设置
+    buttonData.value.push(defaultButtons.defaultFreshBtn(null))
+    buttonData.value.push(defaultButtons.defaultSetBtn(null))
+    buttonData.value = [...buttonData.value,...props.HeadButttondata]
+    buttonData.value.forEach(item=>{
       if(item.float && item.float == 'right'){
         buttonsRight.value.push(item)
       }else{

src/utils/disposition/defaultButtons.ts

@@ -103,6 +103,20 @@ export function defaultResetBtn(option:any) {
   })
 }
 
+// 设置
+export function defaultSetBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '设置',
+    name: 'set',
+    hide: false,
+    type: 'primary',
+    icon: 'ep:refresh',
+    color: '',
+    float:'right',
+    hasPermi: ''
+  })
+}
+
 // 筛选按钮
 export function defaultFilterBtn(option:any) {
   return __defaultBtnOption(option,{

src/views/wms/bom/index.vue

@@ -98,8 +98,6 @@ const HeadButttondata = [
   defaultButtons.defaultAddBtn({hasPermi:'wms:bom:create'}), // 新增
   defaultButtons.defaultImportBtn({hasPermi:'wms:bom:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:bom:export'}), // 导出
-  // defaultButtons.defaultFilterBtn(), // 筛选
-  defaultButtons.defaultFreshBtn(null), // 刷新
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',

src/views/wms/itembasic/index.vue

@@ -66,8 +66,6 @@ const HeadButttondata = [
   defaultButtons.defaultAddBtn(null), // 新增
   defaultButtons.defaultImportBtn(null), // 导入
   defaultButtons.defaultExportBtn(null), // 导出
-  // defaultButtons.defaultFilterBtn(), // 筛选
-  defaultButtons.defaultFreshBtn(null), // 刷新
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',

src/views/wms/itempackaging/index.vue

@@ -88,7 +88,6 @@ const HeadButttondata = [
   defaultButtons.defaultImportBtn({hasPermi:'wms:itempackaging:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:itempackaging:export'}), // 导出
   // defaultButtons.defaultFilterBtn(), // 筛选
-  defaultButtons.defaultFreshBtn(null), // 刷新
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',
@@ -101,6 +100,7 @@ const HeadButttondata = [
 
 // 头部按钮事件 
 const buttonBaseClick = (val, item) => {
+  console.log(104, val)
   if (val == 'add') { // 新增
     openForm('create')
   } else if (val == 'import') { // 导入
@@ -109,6 +109,8 @@ const buttonBaseClick = (val, item) => {
     handleExport()
   } else if (val == 'refresh') { // 刷新
     getList()
+  } else if (val == 'set') { // 设置
+    getList()
   } else if (val == 'filtrate') { // 筛选
   } else { // 其他按钮 
     console.log('其他按钮', item)

src/views/wms/productionlineitem/index.vue

@@ -31,18 +31,6 @@
     </Table>
   </ContentWrap>
 
-  <!-- 表单弹窗：添加/修改 -->
-  <BasicForm 
-    ref="basicFormRef" 
-    @success="getList" 
-    :rules="ProductionlineitemRules" 
-    :formAllSchemas="Productionlineitem.allSchemas" 
-    searchTableTitle="物料基础信息"
-    :searchTableAllSchemas="ItemBasic.allSchemas"
-    :searchTablePage="ItembasicApi.getItembasicPage"
-    :apiUpdate="ProductionlineitemApi.updateProductionlineitem"
-    :apiCreate="ProductionlineitemApi.createProductionlineitem"
-  />
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm 
     ref="basicFormRef" 
@@ -111,8 +99,6 @@ const HeadButttondata = [
   defaultButtons.defaultAddBtn({hasPermi:'wms:productionlineitem:create'}), // 新增
   defaultButtons.defaultImportBtn({hasPermi:'wms:productionlineitem:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:productionlineitem:export'}), // 导出
-  // defaultButtons.defaultFilterBtn(), // 筛选
-  defaultButtons.defaultFreshBtn(null), // 刷新
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',

src/views/wms/stdcostprice/index.vue

@@ -93,8 +93,6 @@ const HeadButttondata = [
   defaultButtons.defaultAddBtn({hasPermi:'wms:stdcostprice:create'}), // 新增
   defaultButtons.defaultImportBtn({hasPermi:'wms:stdcostprice:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:stdcostprice:export'}), // 导出
-  // defaultButtons.defaultFilterBtn(), // 筛选
-  defaultButtons.defaultFreshBtn(null), // 刷新
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',

src/views/wms/strategy/batchStrategy/AddForm.vue

@@ -0,0 +1,359 @@
+<!-- 批次策略弹窗 -->
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible" width="900px">
+    <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-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" class="flex-top" prop="rulesConfig">
+                <div style="width: 100%;display:flex;align-items:center;margin-bottom:10px"
+                  v-for="(item, index) in formData.rulesConfigList" :key="index">
+                  <div style="width: 26px;display: flex;">
+                    <Icon icon="ep:remove" color="#757575" size="26" style="cursor: pointer;"
+                      @click="handleDeleteTable(item, index)" v-if="formData.rulesConfigList?.length > 1" />
+                  </div>
+                  <div class="flex w-[28%]">
+                    <div class="ml-10px mr-10px">批次类型</div>
+                    <el-select v-model="item.batchType" placeholder="请选择批次类型" style="flex:1" @change="inputBlur">
+                      <el-option v-for="cur in  options.batchTypeOptions" :key="cur.value" :label="cur.label" :value="cur.value" />
+                    </el-select>
+                  </div>
+                  <div class="flex w-[28%]">
+                    <div class="ml-10px mr-10px">批次格式</div>
+                    <el-input v-model="item.batchFormat" placeholder="yyyyMMDD" clearable style="flex:1" @blur="inputBlur"/>
+                  </div>
+                  <div class="flex" style="flex:1">
+                    <div class="ml-10px mr-10px">批次方向</div>
+                    <div class="checkbox">
+                      <el-radio-group v-model="item.batchDirection">
+                        <el-radio :label="cur.value" v-for="cur in options.directionOptions" :key="cur.value">{{ cur.label }}</el-radio>
+                      </el-radio-group>
+                    </div>
+                  </div>
+                </div>
+                <div class="button flex">
+                  <div @click="handleAddTable">
+                    <Icon icon="ep:circle-plus" color="#409eff" size="26" style="cursor: pointer;" />
+                    <div>添加条件</div>
+                  </div>
+                </div>
+              </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: 'BatchStrategyAddForm' })
+
+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: '',//选择的物品
+
+  // 规则配置
+  rulesConfigList: [{
+    batchType: 1,
+    batchFormat: '',
+    batchDirection:1,
+  }],//规则配置列表
+  rulesConfig:''//规则配置验证
+
+})
+// 验证规则
+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' }],
+  rulesConfig: [{ 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' }],
+
+  // 批次类型列表
+  batchTypeOptions: [{ value: 1, label: '生产时间' }, { value: 2, label: '到货时间' }, { value: 3, label: '失效时间' }, { value: 4, label: '供应商批次' }, { value: 5, label: '供应商优先级' }, { value: 6, label: '其他批次' }],
+  // 批次方向列表
+  directionOptions: [{ value: 1, label: '从小到大' }, { value: 2, label: '从大到小' }],
+
+})
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+//失去焦点的时候验证
+const inputBlur = () => {
+  console.log(formData.value.rulesConfigList);
+  
+  const isEmpty = formData.value.rulesConfigList.some((item, index) => {
+    return !item.batchType || !item.batchFormat
+  })
+  console.log(isEmpty);
+  if (isEmpty) {
+    formData.value.rulesConfig = ''
+  } else {
+    formData.value.rulesConfig = '1'
+  }
+  console.log(formData.value.rulesConfig);
+}
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验规则配置是否全部填写
+  const isEmpty = formData.value.rulesConfigList.some((item, index) => {
+    return !item.batchFormat
+  })
+  if (isEmpty) {
+    formData.value.rulesConfig = ''
+  } else {
+    formData.value.rulesConfig = '1'
+  }
+  // 校验表单
+  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: '',//选择的物品
+
+    // 规则配置
+    rulesConfigList: [{
+      batchType:1,
+      batchFormat: '',
+      batchDirection: 1,
+    }],//规则配置列表
+    rulesConfig: ''//规则配置验证
+  }
+}
+
+// 弹窗按钮
+const Butttondata = [
+  defaultButtons.formSaveBtn(null), // 保存
+  defaultButtons.formCloseBtn(null), // 关闭
+]
+// 按钮事件 
+const buttonBaseClick = (val, item) => {
+  // 保存
+  if (val == 'save') {
+    submitForm()
+  }
+  // 关闭
+  else if (val == 'close') {
+    dialogVisible.value = false
+  }
+}
+// 添加规则配置
+const handleAddTable = () => {
+  formData.value.rulesConfigList.push({
+    batchType: '',
+    batchFormat: '',
+    batchDirection: 1,
+  })
+}
+// 删除规则配置
+const handleDeleteTable = (item, index) => {
+  formData.value.rulesConfigList.splice(index, 1)
+}
+
+</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;
+}
+
+.button {
+  >div {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    cursor: pointer;
+
+    >div {
+      margin-left: 6px;
+      text-decoration: underline;
+      color: #409eff;
+    }
+  }
+}
+</style>

src/views/wms/strategy/upShelfStrategy/downShelfStrategy/index.vue → src/views/wms/strategy/batchStrategy/index.vue

@@ -1,3 +1,4 @@
+<!-- 批次策略 -->
 <template>
   <!-- 列表头部 -->
   <TableHead :HeadButttondata="HeadButttondata" @buttonBaseClick="buttonBaseClick" />
@@ -9,7 +10,7 @@
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import AddForm from './AddForm.vue'
 
-defineOptions({ name: 'DownShelfStrategy' })
+defineOptions({ name: 'BatchStrategy' })
 // 显示弹窗
 const formRef = ref()
 const openForm = (type: string) => {

src/views/wms/strategy/downShelfStrategy/AddForm.vue

@@ -1,3 +1,4 @@
+<!-- 下架策略弹窗 -->
 <template>
   <Dialog :title="dialogTitle" v-model="dialogVisible">
     <div class="p-20px m--10px" style="max-height: 500px;overflow-y: auto;">
@@ -154,9 +155,9 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <!-- 数量排列方向 -->
+            <!-- 数量排序方向 -->
             <el-col :span="24">
-              <el-form-item label="数量排列方向" class="flex-top" prop="quantitySort">
+              <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">{{
@@ -165,9 +166,9 @@
                 </div>
               </el-form-item>
             </el-col>
-            <!-- 巷道排列方向 -->
+            <!-- 巷道排序方向 -->
             <el-col :span="24">
-              <el-form-item label="巷道排列方向" class="flex-top" prop="roadwaySort">
+              <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
@@ -176,9 +177,9 @@
                 </div>
               </el-form-item>
             </el-col>
-            <!-- 货架排列方向 -->
+            <!-- 货架排序方向 -->
             <el-col :span="24">
-              <el-form-item label="货架排列方向" class="flex-top" prop="goodsDhelvesSort">
+              <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
@@ -187,9 +188,9 @@
                 </div>
               </el-form-item>
             </el-col>
-            <!-- 行排列方向 -->
+            <!-- 行排序方向 -->
             <el-col :span="24">
-              <el-form-item label="行排列方向" class="flex-top" prop="rowSort">
+              <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
@@ -198,9 +199,9 @@
                 </div>
               </el-form-item>
             </el-col>
-            <!-- 列排列方向 -->
+            <!-- 列排序方向 -->
             <el-col :span="24">
-              <el-form-item label="列排列方向" class="flex-top" prop="columnSort">
+              <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
@@ -236,15 +237,13 @@
             <!-- 拆分次数 -->
             <el-col :span="8">
               <el-form-item label="拆分次数" prop="splitsNumber" label-width="70px">
-                <el-input v-model="formData.splitsNumber" min="0" placeholder="请输入拆分次数" type="number" />
+                <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 v-model.number="formData.timeInterval" min="0" placeholder="请输入时间间隔" type="number"
-                  style="flex:1;margin-right:10px" />
-                小时
+                <el-input-number v-model="formData.timeInterval" :min="0" style="flex:1;margin-right:10px" controls-position="right" />小时
               </el-form-item>
             </el-col>
             <!-- 使用整理库位 -->
@@ -327,19 +326,19 @@ const formData = ref({
   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,
+  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({
@@ -450,20 +449,19 @@ const resetForm = () => {
     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,
+    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,//生成接收任务
   }
 }
 

src/views/wms/strategy/downShelfStrategy/index.vue

@@ -1,3 +1,4 @@
+<!-- 下架策略 -->
 <template>
   <!-- 列表头部 -->
   <TableHead :HeadButttondata="HeadButttondata" @buttonBaseClick="buttonBaseClick" />

src/views/wms/strategy/inspectStrategy/AddForm.vue

@@ -0,0 +1,381 @@
+<!-- 检验策略弹窗 -->
+<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>
+            <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>
+            <!-- 供应商类型 -->
+            <el-col :span="24">
+              <el-form-item label="供应商类型" class="flex-top err-120" prop="supplierType">
+                <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.supplierType" placeholder="请选择供应商类型" style="flex: 1;" clearable>
+                  <el-option v-for="item in options.supplierTypeOptions" :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="supplier" class="err-120">
+                <el-select v-model="formData.supplierRange" 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="物品" prop="items" class="err-120">
+                <el-select v-model="formData.itemsRange" 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.items" placeholder="请选择物品" style="flex: 1;" clearable>
+                  <el-option v-for="item in options.itemsList" :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>
+            <!-- 检验方式 -->
+            <el-col :span="24">
+              <el-form-item label="检验方式" class="flex-top" prop="inspectWay">
+                <div class="checkbox">
+                  <el-checkbox-group v-model="formData.inspectWay">
+                    <el-checkbox :label="item.label" v-for="item in options.inspectWayOptions" :key="item.value" />
+                  </el-checkbox-group>
+                </div>
+              </el-form-item>
+            </el-col>
+            <!-- 抽检方式 -->
+            <el-col :span="24">
+              <el-form-item label="抽检方式" class="flex-top" prop="spotceckWay">
+                <div class="checkbox">
+                  <el-radio-group v-model="formData.spotceckWay">
+                    <el-radio :label="item.value" v-for="item in options.spotceckWayOptions" :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="spotceckRules1">
+                <div style="flex:1;display:flex;align-items:center;margin-bottom:10px"
+                  v-for="(item, index) in formData.spotceckRules" :key="index">
+                  <div style="width: 26px;display: flex;">
+                    <Icon icon="ep:remove" color="#757575" size="26" style="cursor: pointer;"
+                      @click="handleDeleteTable(item, index)" v-if="formData.spotceckRules?.length>1" />
+                  </div>
+
+                  <el-input-number v-model="item.minNum" :min="0" :max="item.maxNum - 1" class='ml-20px mr-20px'
+                    style="width:100px" controls-position="right" @blur="inputNumberBlur" />
+                  <div>至</div>
+                  <el-input-number v-model="item.maxNum" :min="item.minNum + 1" class='ml-20px mr-20px'
+                    style="width:100px" controls-position="right"  @blur="inputNumberBlur"/>
+                  <div>抽样数</div>
+                  <el-input-number v-model="item.num"  :min="0" class='ml-20px mr-20px'
+                      style="width:100px" controls-position="right"  @blur="inputNumberBlur"/>
+                  <div>EA</div>
+                </div>
+                <div class="button flex">
+                  <div @click="handleAddTable">
+                    <Icon icon="ep:circle-plus" color="#409eff" size="26" style="cursor: pointer;" />
+                    <div>添加条件</div>
+                  </div>
+                </div>
+              </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'
+import {
+  validateInteger,
+} from "@/utils/validator";
+defineOptions({ name: 'InspectStrategyAddForm' })
+
+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,//状态
+
+  supplierTypeRange: 1,//供应商类型范围
+  supplierType: '',//选择的供应商类型
+
+  supplierRange: 1,//供应商范围
+  supplier: '',//选择的供应商
+
+  itemsRange: 1,//物品范围
+  items: '',//选择的物品
+
+  inspectWay: [],//选择的检验方式
+  spotceckWay: 1,//选择的抽检方式
+
+  spotceckRules: [{
+    minNum: 0,
+    maxNum: 1,
+    num: 0,
+  }],//抽检规则
+  spotceckRules1: ''
+})
+// 验证规则
+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' }],
+  supplierType: [{ required: true, message: '请选择供应商类型', trigger: 'change' }],
+  supplier: [{ required: true, message: '请选择供应商', trigger: 'change' }],
+  items: [{ required: true, message: '请选择物品', trigger: 'change' }],
+  inspectWay: [{ required: true, message: '请选择检验方式', trigger: 'change' }],
+  spotceckWay: [{ required: true, message: '请选择抽检方式', trigger: 'change' }],
+  spotceckRules1: [{ required: true, message: '抽检规则请填写完全', trigger: 'blur' },
+  { validator: validateInteger, message: '请输入整数', trigger: 'blur' }],
+})
+// 下拉框列表集合
+const options = reactive({
+  // 范围下拉框列表
+  rangeOptions: [{ value: 1, label: '包含' }, { value: 2, label: '大于', }],
+  // 供应商类型列表
+  supplierTypeOptions: [{ value: 1, label: '标准' }, { value: 2, label: '委外' }, { value: 3, label: '其他' }],
+  //供应商列表
+  supplierList: [{ value: 1, label: '供应商1' }, { value: 2, label: '供应商2' }, { value: 3, label: '供应商3' }],
+  //物品列表
+  itemsList: [{ value: 1, label: '物品1' }, { value: 2, label: '物品2' }],
+  //检验方式列表
+  inspectWayOptions: [{ value: 1, label: '免检' }, { value: 2, label: '全检' }, { value: 3, label: '抽检' }],
+  //抽检方式列表
+  spotceckWayOptions: [{ value: 1, label: '数量' }, { value: 2, label: '半分比' }],
+})
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+//失去焦点的时候验证
+const inputNumberBlur = ()=>{
+  const isEmpty = formData.value.spotceckRules.some((item, index) => {
+    return item.minNum < 0 || item.minNum == null || item.maxNum < 0 || item.maxNum == null || item.num < 0 || item.num == null
+  })
+  console.log(isEmpty);
+  
+  if (isEmpty) {
+    formData.value.spotceckRules1 = ''
+  } else {
+    formData.value.spotceckRules1 = '1'
+  }
+} 
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+
+  // 校验抽检规则是否全部填写
+  const isEmpty = formData.value.spotceckRules.some((item, index) => {
+    return item.minNum<0|| item.minNum==null || item.maxNum < 0 || item.maxNum == null || item.num < 0 || item.num == null
+  })
+  if (isEmpty) {
+    formData.value.spotceckRules1 = ''
+  } else {
+    formData.value.spotceckRules1 = '1'
+  }
+  // 校验表单
+  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,
+
+    supplierTypeRange: 1,//供应商类型范围
+    supplierType: '',//选择的供应商类型
+
+    supplierRange: 1,//供应商范围
+    supplier: '',//选择的供应商
+
+    itemsRange: 1,//物品范围
+    items: '',//选择的物品
+
+    inspectWay: [],//选择的检验方式
+    spotceckWay: 1,//选择的抽检方式
+
+    spotceckRules: [{
+      minNum: 0,
+      maxNum: 1,
+      num: 0,
+    }],//抽检规则
+  }
+}
+
+// 弹窗按钮
+const Butttondata = [
+  defaultButtons.formSaveBtn(null), // 保存
+  defaultButtons.formCloseBtn(null), // 关闭
+]
+// 按钮事件 
+const buttonBaseClick = (val, item) => {
+  // 保存
+  if (val == 'save') {
+    submitForm()
+  }
+  // 关闭
+  else if (val == 'close') {
+    dialogVisible.value = false
+  }
+}
+
+// 添加抽查规则
+const handleAddTable = () => {
+  console.log(formData.value.spotceckRules);
+  formData.value.spotceckRules.push({
+    minNum: 0,
+    maxNum: 1,
+    num: 0,
+  })
+}
+// 删除抽查规则
+const handleDeleteTable = (item, index) => {
+  formData.value.spotceckRules.splice(index, 1)
+}
+
+</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-120 .el-form-item__error {
+  padding-left: 120px !important;
+}
+
+.button {
+  >div {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    cursor: pointer;
+
+    >div {
+      margin-left: 6px;
+      text-decoration: underline;
+      color: #409eff;
+    }
+  }
+}
+</style>

src/views/wms/strategy/inspectStrategy/index.vue

@@ -0,0 +1,61 @@
+<!-- 检验策略 -->
+<template>
+  <!-- 列表头部 -->
+  <TableHead :HeadButttondata="HeadButttondata" @buttonBaseClick="buttonBaseClick" />
+   <!-- 表单弹窗：添加/修改 -->
+    <AddForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import AddForm from './AddForm.vue'
+
+defineOptions({ name: 'InspectStrategy' })
+// 显示弹窗
+const formRef = ref()
+const openForm = (type: string) => {
+  formRef.value.open(type)
+}
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn(null), // 新增
+  defaultButtons.defaultImportBtn(null), // 导入
+  defaultButtons.defaultExportBtn(null), // 导出
+  // defaultButtons.defaultFilterBtn(), // 筛选
+  defaultButtons.defaultFreshBtn(null), // 刷新
+]
+
+
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({ hasPermi: 'wms:itembasic:update' }), // 编辑
+  defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:itembasic:delete' }), // 删除
+]
+
+// 列表-操作按钮事件 
+const buttonTableClick = (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row.id)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+</script>

src/views/wms/strategy/manageAccuracyStrategy/AddForm.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="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="warehouse" class="err-240">
+                  <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.warehouseTypeRange" 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.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="忽略物品" prop="ignoreItems" class="err-120">
+                <el-select v-model="formData.ignoreItemsRange" 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.ignoreItems" placeholder="请选择物品" style="flex: 1;" clearable>
+                  <el-option v-for="item in options.ignoreItemsList" :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="ignoreWarehouse" class="err-120">
+                <el-select v-model="formData.ignoreWarehouseRange" 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.ignoreWarehouse" placeholder="请选择库位" style="flex: 1;" clearable>
+                  <el-option v-for="item in options.ignoreWarehouseList" :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="管理类型" class="flex-top" prop="manageType">
+                  <div class="checkbox">
+                    <el-radio-group v-model="formData.manageType">
+                      <el-radio :label="item.value" v-for="item in options.manageTypeOptions" :key="item.value">{{
+                        item.label
+                      }}</el-radio>
+                    </el-radio-group>
+                  </div>
+                </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: 'ManageAccuracyStrategyAddForm' })
+
+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: '',//选择的物品
+
+  // 仓库 库位
+  warehouseType: 1,//选择的是仓库/库区/库位组/库位类型
+  warehouseTypeRange: 1, //物品类型范围
+  warehouse: '',//选择的仓库/库区/库位组/库位
+
+  // 忽略物品
+  ignoreItemsRange: 1, // 选择的忽略物品范围
+  ignoreItems: '',//选择的忽略物品
+
+  // 存储状态
+  ignoreWarehouseRange: 1, // 选择的忽略库位范围
+  ignoreWarehouse: '',//选择的忽略库位
+
+  manageType:1,//管理类型
+
+})
+// 验证规则
+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' }],
+  warehouse: [{ required: true, message: '请选择仓库', trigger: 'blur' }],
+  ignoreItems: [{ required: true, message: '请选择物品', trigger: 'blur' }],
+  ignoreWarehouse: [{ 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' }],
+  // 仓库类型
+  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' }],
+   // 忽略物品列表
+  ignoreItemsList: [{ value: 1, label: '物品1' }, { value: 2, label: '物品2' }, { value: 3, label: '物品3' }],
+  //忽略库位列表
+  ignoreWarehouseList: [{ value: 1, label: '库位1' }, { value: 2, label: '库位2' }, { value: 3, label: '库位3' }],
+  // 管理类型
+  manageTypeOptions: [{ 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: '',//选择的物品
+
+    // 仓库 库位
+    warehouseType: 1,//选择的是仓库/库区/库位组/库位类型
+    warehouseTypeRange: 1, //物品类型范围
+    warehouse: '',//选择的仓库/库区/库位组/库位
+
+    // 忽略物品
+    ignoreItemsRange: 1, // 选择的忽略物品范围
+    ignoreItems: '',//选择的忽略物品
+
+    // 存储状态
+    ignoreWarehouseRange: 1, // 选择的忽略库位范围
+    ignoreWarehouse: '',//选择的忽略库位
+
+    manageType: 1,//管理类型
+  }
+}
+
+// 弹窗按钮
+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>

src/views/wms/strategy/manageAccuracyStrategy/index.vue

@@ -0,0 +1,61 @@
+<!-- 管理精度策略 -->
+<template>
+  <!-- 列表头部 -->
+  <TableHead :HeadButttondata="HeadButttondata" @buttonBaseClick="buttonBaseClick" />
+   <!-- 表单弹窗：添加/修改 -->
+    <AddForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import AddForm from './AddForm.vue'
+
+defineOptions({ name: 'ManageAccuracyStrategy' })
+// 显示弹窗
+const formRef = ref()
+const openForm = (type: string) => {
+  formRef.value.open(type)
+}
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn(null), // 新增
+  defaultButtons.defaultImportBtn(null), // 导入
+  defaultButtons.defaultExportBtn(null), // 导出
+  // defaultButtons.defaultFilterBtn(), // 筛选
+  defaultButtons.defaultFreshBtn(null), // 刷新
+]
+
+
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({ hasPermi: 'wms:itembasic:update' }), // 编辑
+  defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:itembasic:delete' }), // 删除
+]
+
+// 列表-操作按钮事件 
+const buttonTableClick = (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row.id)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+</script>

src/views/wms/strategy/repairMaterialStrategy/AddForm.vue

@@ -0,0 +1,322 @@
+<!-- 补料策略弹窗 -->
+<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>
+            <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>
+            <!-- 选择物品类型 -->
+            <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="warehouse" class="err-240">
+                <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.warehouseTypeRange" 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.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="120px" label-position="left">
+          <el-row>
+            <!-- 最大库存 -->
+            <el-col :span="24">
+              <el-form-item label="最大库存" prop="maxInventory">
+                <el-input-number v-model="formData.maxInventory"  :min="0" controls-position="right" />
+              </el-form-item>
+            </el-col>
+             <!-- 最小库存 -->
+              <el-col :span="24">
+                <el-form-item label="最小库存" prop="minInventory">
+                  <el-input-number v-model="formData.minInventory" :min="0" controls-position="right" />
+                </el-form-item>
+              </el-col>
+               <!-- 安全库存 -->
+              <el-col :span="24">
+                <el-form-item label="安全库存" prop="safeInventory">
+                  <el-input-number v-model="formData.safeInventory" :min="0" controls-position="right" />
+                </el-form-item>
+              </el-col>
+               <!-- 补料数量 -->
+              <el-col :span="24">
+                <el-form-item label="补料数量" prop="number">
+                  <el-input-number v-model="formData.number" :min="0" controls-position="right" />
+                </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: 'RepairMaterialStrategyAddForm' })
+
+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,//状态
+
+  // 物品类型
+  itemType: 1,//选择的物品类型
+  itemTypeRange: 1, //物品类型范围
+  item: '',//选择的物品
+
+  // 仓库 库位
+  warehouseType: 1,//选择的是仓库/库区/库位组/库位类型
+  warehouseTypeRange: 1, //物品类型范围
+  warehouse: '',//选择的仓库/库区/库位组/库位
+
+  maxInventory: 0,//最大库存
+  minInventory: 0,//最小库存
+  safeInventory: 0,//安全库存
+  number: 0,//补料数量
+
+})
+// 验证规则
+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' }],
+  item: [{ required: true, message: '请选择物品', trigger: 'change' }],
+  warehouse: [{ required: true, message: '请选择仓库', trigger: 'change' }],
+  maxInventory: [{ required: true, message: '请输入最大库存', trigger: 'change' }],
+  minInventory: [{ required: true, message: '请输入最小库存', trigger: 'change' }],
+  safeInventory: [{ required: true, message: '请输入安全库存', trigger: 'change' }],
+  number: [{ required: true, message: '请输入补料数量', trigger: ['change', 'blur'] }],
+})
+// 下拉框列表集合
+const options = reactive({
+  // 范围下拉框列表
+  rangeOptions: [{ value: 1, label: '包含' }, { value: 2, label: '大于', }],
+
+  // 物品类型列表
+  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' }],
+  // 仓库类型
+  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' }],
+
+})
+
+/** 打开弹窗 */
+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,
+    // 物品类型
+    itemType: 1,//选择的物品类型
+    itemTypeRange: 1, //物品类型范围
+    item: '',//选择的物品
+
+    // 仓库 库位
+    warehouseType: 1,//选择的是仓库/库区/库位组/库位类型
+    warehouseTypeRange: 1, //物品类型范围
+    warehouse: '',//选择的仓库/库区/库位组/库位
+    
+    maxInventory: 0,//最大库存
+    minInventory: 0,//最小库存
+    safeInventory: 0,//安全库存
+    number: 0,//补料数量
+  }
+}
+
+// 弹窗按钮
+const Butttondata = [
+  defaultButtons.formSaveBtn(null), // 保存
+  defaultButtons.formCloseBtn(null), // 关闭
+]
+// 按钮事件 
+const buttonBaseClick = (val, item) => {
+  // 保存
+  if (val == 'save') {
+    submitForm()
+  }
+  // 关闭
+  else if (val == 'close') {
+    dialogVisible.value = false
+  }
+}
+// 存储类型全选
+const checkAll = ref(false)
+const isIndeterminate = ref(false)
+const handleCheckAllChange = (val: boolean) => {
+  console.log(formData.value.storageType);
+  formData.value.storageType = val ? options.storageTypeOptions : []
+  console.log(formData.value.storageType);
+
+  isIndeterminate.value = false
+}
+const handleCheckedCitiesChange = (value: string[]) => {
+  const checkedCount = value.length
+  checkAll.value = checkedCount === options.storageTypeOptions.length
+  isIndeterminate.value = checkedCount > 0 && checkedCount < options.storageTypeOptions.length
+}
+
+// 替代存储类型全选
+const replaceCheckAll = ref(false)
+const replaceIsIndeterminate = ref(false)
+const replaceHandleCheckAllChange = (val: boolean) => {
+  console.log(formData.value.storageType);
+  formData.value.replaceStorageType = val ? options.storageTypeOptions : []
+  console.log(formData.value.storageType);
+
+  replaceIsIndeterminate.value = false
+}
+const replaceHandleCheckedCitiesChange = (value: string[]) => {
+  const checkedCount = value.length
+  replaceCheckAll.value = checkedCount === options.storageTypeOptions.length
+  replaceIsIndeterminate.value = checkedCount > 0 && checkedCount < options.storageTypeOptions.length
+}
+</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>

src/views/wms/strategy/repairMaterialStrategy/index.vue

@@ -0,0 +1,61 @@
+<!-- 补料策略 -->
+<template>
+  <!-- 列表头部 -->
+  <TableHead :HeadButttondata="HeadButttondata" @buttonBaseClick="buttonBaseClick" />
+   <!-- 表单弹窗：添加/修改 -->
+    <AddForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import AddForm from './AddForm.vue'
+
+defineOptions({ name: 'RepairMaterialStrategy' })
+// 显示弹窗
+const formRef = ref()
+const openForm = (type: string) => {
+  formRef.value.open(type)
+}
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn(null), // 新增
+  defaultButtons.defaultImportBtn(null), // 导入
+  defaultButtons.defaultExportBtn(null), // 导出
+  // defaultButtons.defaultFilterBtn(), // 筛选
+  defaultButtons.defaultFreshBtn(null), // 刷新
+]
+
+
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({ hasPermi: 'wms:itembasic:update' }), // 编辑
+  defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:itembasic:delete' }), // 删除
+]
+
+// 列表-操作按钮事件 
+const buttonTableClick = (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row.id)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+</script>

src/views/wms/strategy/storageCapacityStrategy/AddForm.vue

@@ -0,0 +1,355 @@
+<!-- 存储容量策略弹窗 -->
+<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>
+            <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>
+            <!-- 选择物品类型 -->
+            <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="warehouse" class="err-240">
+                <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.warehouseTypeRange" 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.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="120px" label-position="left">
+          <el-row>
+            <!-- 存储类型 -->
+            <el-col :span="24">
+              <el-form-item label="存储类型" class="flex-top" prop="storageType">
+                <div class="checkbox flex">
+                  <el-checkbox v-model="checkAll" :indeterminate="isIndeterminate"
+                    @change="handleCheckAllChange">全部</el-checkbox>
+                  <el-checkbox-group v-model="formData.storageType" @change="handleCheckedCitiesChange"
+                    style="margin-left: 30px;flex:1">
+                    <el-checkbox :label="item" v-for="(item, index) in options.storageTypeOptions" :key="index" />
+                  </el-checkbox-group>
+                </div>
+              </el-form-item>
+            </el-col>
+            <!-- 存储容量 -->
+            <el-col :span="24">
+              <el-form-item label="存储容量" prop="storageCapacity">
+                <el-input v-model="formData.storageCapacity" placeholder="请输入存储容量" clearable />
+              </el-form-item>
+            </el-col>
+            <!-- 替代存储类型 -->
+            <el-col :span="24">
+              <el-form-item label="替代存储类型" class="flex-top" prop="replaceStorageType">
+                <div class="checkbox flex">
+                  <el-checkbox v-model="replaceCheckAll" :indeterminate="replaceIsIndeterminate"
+                    @change="replaceHandleCheckAllChange">全部</el-checkbox>
+                  <el-checkbox-group v-model="formData.replaceStorageType" @change="replaceHandleCheckedCitiesChange"
+                    style="margin-left: 30px;flex:1">
+                    <el-checkbox :label="item" v-for="(item, index) in options.storageTypeOptions" :key="index" />
+                  </el-checkbox-group>
+                </div>
+              </el-form-item>
+            </el-col>
+            <!-- 替代存储容量 -->
+            <el-col :span="24">
+              <el-form-item label="替代存储容量" prop="replaceStorageCapacity">
+                <el-input v-model="formData.replaceStorageCapacity" placeholder="请输入存储容量" clearable />
+              </el-form-item>
+            </el-col>
+            <!-- 固定位置 -->
+            <el-col :span="24">
+              <el-form-item label="固定位置" prop="fixedPosition">
+                <el-switch v-model="formData.fixedPosition" />
+              </el-form-item>
+            </el-col>
+            <!-- 占用相邻库位 -->
+            <el-col :span="24">
+              <el-form-item label="占用相邻库位" prop="occupyWarehouse">
+                <el-switch v-model="formData.occupyWarehouse" />
+              </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: 'StorageCapacityStrategyAddForm' })
+
+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,//状态
+
+  // 物品类型
+  itemType: 1,//选择的物品类型
+  itemTypeRange: 1, //物品类型范围
+  item: '',//选择的物品
+
+  // 仓库 库位
+  warehouseType: 1,//选择的是仓库/库区/库位组/库位类型
+  warehouseTypeRange: 1, //物品类型范围
+  warehouse: '',//选择的仓库/库区/库位组/库位
+
+  storageType: [],//存储类型
+  storageCapacity:'',//存储容量
+  replaceStorageType:[],//替代存储类型
+  replaceStorageCapacity: '',//替代存储容量
+  fixedPosition:false,//固定位置
+  occupyWarehouse: 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' }],
+  item: [{ required: true, message: '请选择物品', trigger: 'change' }],
+  warehouse: [{ required: true, message: '请选择仓库', trigger: 'change' }],
+  storageType: [{ required: true, message: '请选择存储类型', trigger: 'change' }],
+  storageCapacity: [{ required: true, message: '请输入存储容量', trigger: 'blur' }],
+  replaceStorageType: [{ required: true, message: '请选择替代存储类型', trigger: 'change' }],
+  replaceStorageCapacity: [{ required: true, message: '请输入替代存储容量', trigger: 'blur' }],
+  fixedPosition: [{ required: true, message: '请选择固定位置', trigger: 'change' }],
+  occupyWarehouse: [{ required: true, message: '请选择占用相邻库位', trigger: 'change' }],
+})
+// 下拉框列表集合
+const options = reactive({
+  // 范围下拉框列表
+  rangeOptions: [{ value: 1, label: '包含' }, { value: 2, label: '大于', }],
+
+  // 物品类型列表
+  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' }],
+  // 仓库类型
+  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' }],
+  // 存储类型列表
+  storageTypeOptions: ['包装', '容器', '单件'],
+})
+
+/** 打开弹窗 */
+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,
+    // 物品类型
+    itemType: 1,//选择的物品类型
+    itemTypeRange: 1, //物品类型范围
+    item: '',//选择的物品
+
+    // 仓库 库位
+    warehouseType: 1,//选择的是仓库/库区/库位组/库位类型
+    warehouseTypeRange: 1, //物品类型范围
+    warehouse: '',//选择的仓库/库区/库位组/库位
+
+
+    storageType: [],//存储类型
+    storageCapacity: '',//存储容量
+    replaceStorageType: [],//替代存储类型
+    replaceStorageCapacity: '',//替代容量
+    fixedPosition: false,//固定位置
+    occupyWarehouse: false,//占用相邻库位
+  }
+}
+
+// 弹窗按钮
+const Butttondata = [
+  defaultButtons.formSaveBtn(null), // 保存
+  defaultButtons.formCloseBtn(null), // 关闭
+]
+// 按钮事件 
+const buttonBaseClick = (val, item) => {
+  // 保存
+  if (val == 'save') {
+    submitForm()
+  }
+  // 关闭
+  else if (val == 'close') {
+    dialogVisible.value = false
+  }
+}
+// 存储类型全选
+const checkAll = ref(false)
+const isIndeterminate = ref(false)
+const handleCheckAllChange = (val: boolean) => {
+  console.log(formData.value.storageType);
+  formData.value.storageType = val ? options.storageTypeOptions : []
+  console.log(formData.value.storageType);
+
+  isIndeterminate.value = false
+}
+const handleCheckedCitiesChange = (value: string[]) => {
+  const checkedCount = value.length
+  checkAll.value = checkedCount === options.storageTypeOptions.length
+  isIndeterminate.value = checkedCount > 0 && checkedCount < options.storageTypeOptions.length
+}
+
+// 替代存储类型全选
+const replaceCheckAll = ref(false)
+const replaceIsIndeterminate = ref(false)
+const replaceHandleCheckAllChange = (val: boolean) => {
+  console.log(formData.value.storageType);
+  formData.value.replaceStorageType = val ? options.storageTypeOptions : []
+  console.log(formData.value.storageType);
+
+  replaceIsIndeterminate.value = false
+}
+const replaceHandleCheckedCitiesChange = (value: string[]) => {
+  const checkedCount = value.length
+  replaceCheckAll.value = checkedCount === options.storageTypeOptions.length
+  replaceIsIndeterminate.value = checkedCount > 0 && checkedCount < options.storageTypeOptions.length
+}
+</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>

src/views/wms/strategy/storageCapacityStrategy/index.vue

@@ -0,0 +1,61 @@
+<!-- 存储容量策略 -->
+<template>
+  <!-- 列表头部 -->
+  <TableHead :HeadButttondata="HeadButttondata" @buttonBaseClick="buttonBaseClick" />
+   <!-- 表单弹窗：添加/修改 -->
+    <AddForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import AddForm from './AddForm.vue'
+
+defineOptions({ name: 'StorageCapacityStrategy' })
+// 显示弹窗
+const formRef = ref()
+const openForm = (type: string) => {
+  formRef.value.open(type)
+}
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn(null), // 新增
+  defaultButtons.defaultImportBtn(null), // 导入
+  defaultButtons.defaultExportBtn(null), // 导出
+  // defaultButtons.defaultFilterBtn(), // 筛选
+  defaultButtons.defaultFreshBtn(null), // 刷新
+]
+
+
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({ hasPermi: 'wms:itembasic:update' }), // 编辑
+  defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:itembasic:delete' }), // 删除
+]
+
+// 列表-操作按钮事件 
+const buttonTableClick = (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row.id)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+</script>

src/views/wms/strategy/supplieDeliveryStrategy/AddForm.vue

@@ -1,3 +1,5 @@
+
+<!-- 供应商送货策略弹出层 -->
 <template>
   <Dialog :title="dialogTitle" v-model="dialogVisible">
     <div class="p-20px m--10px" style="max-height: 500px;overflow-y: auto;">
@@ -230,6 +232,8 @@ const resetForm = () => {
     weekRange: 1,//星期几范围
     week: [],//选择的星期几
 
+    startTime: '',//开始时间
+    endTime: '',//开始时间
     warehouse: '',//选择的仓库
     moon: '',//选择的月台
   }

src/views/wms/strategy/supplieDeliveryStrategy/index.vue

@@ -1,3 +1,5 @@
+
+<!-- 供应商送货策略 -->
 <template>
   <!-- 列表头部 -->
   <TableHead :HeadButttondata="HeadButttondata" @buttonBaseClick="buttonBaseClick" />

src/views/wms/strategy/upShelfStrategy/AddForm.vue

@@ -1,3 +1,4 @@
+<!-- 上架策略弹窗 -->
 <template>
   <Dialog :title="dialogTitle" v-model="dialogVisible">
     <div class="p-20px m--10px" style="max-height: 500px;overflow-y: auto;">
@@ -246,11 +247,11 @@ const formData = ref({
   warehouseType: 1,//选择的是仓库/库区/库位组/库位类型
   warehouse: '',//选择的仓库/库区/库位组/库位
 
-  firstWarehouse: false,
-  firstNoWarehouse: false,
-  allowMixedItems: false,
-  allowMixedBatch: false,
-  allowMixedStatus: false,
+  firstWarehouse: false,//优先空库位
+  firstNoWarehouse: false,//优先非空库位
+  allowMixedItems: false,//允许混物品
+  allowMixedBatch: false,//允许混批次
+  allowMixedStatus: false,//允许混状态
 })
 // 验证规则
 const rules = ref({
@@ -358,11 +359,11 @@ const resetForm = () => {
     warehouseType: 1,//选择的是仓库/库区/库位组/库位类型
     warehouse: '',//选择的仓库/库区/库位组/库位
 
-    firstWarehouse: false,
-    firstNoWarehouse: false,
-    allowMixedItems: false,
-    allowMixedBatch: false,
-    allowMixedStatus: false,
+    firstWarehouse: false,//优先空库位
+    firstNoWarehouse: false,//优先非空库位
+    allowMixedItems: false,//允许混物品
+    allowMixedBatch: false,//允许混批次
+    allowMixedStatus: false,//允许混状态
   }
 }
 

src/views/wms/strategy/upShelfStrategy/downShelfStrategy/AddForm.vue

@@ -1,525 +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 v-model="formData.splitsNumber" min="0" placeholder="请输入拆分次数" type="number" />
-              </el-form-item>
-            </el-col>
-            <!-- 时间间隔 -->
-            <el-col :span="9">
-              <el-form-item label="时间间隔" prop="timeInterval" label-width="70px">
-                <el-input v-model.number="formData.timeInterval" min="0"  placeholder="请输入时间间隔" type="number"
-                  style="flex:1;margin-right:10px" />
-                  小时
-              </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>

src/views/wms/strategy/upShelfStrategy/index.vue

@@ -1,3 +1,4 @@
+<!-- 上架策略 -->
 <template>
   <!-- 列表头部 -->
   <TableHead :HeadButttondata="HeadButttondata" @buttonBaseClick="buttonBaseClick" />

src/views/wms/strategy/utensilCapacityStrategy/AddForm.vue

@@ -0,0 +1,253 @@
+<!-- 器具容量策略弹窗 -->
+<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="器具类型" prop="utensilType" class="err-120">
+                <el-select v-model="formData.utensilTypeRange" 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.utensilType" placeholder="请选择器具" style="flex: 1;" clearable>
+                  <el-option v-for="item in options.utensilTypeList" :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-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="容纳数量" prop="number">
+                <el-input-number v-model="formData.number"  :min="0" controls-position="right" />
+              </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: 'BatchStrategyAddForm' })
+
+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,//状态
+  // 器具类型
+  utensilTypeRange: 1,//选择的器具类型范围
+  utensilType: '',//选择的器具类型
+
+  // 物品类型
+  itemType: 1,//选择的物品类型
+  itemTypeRange: 1, //物品类型范围
+  item: '',//选择的物品
+
+  number: 0,//容纳数量
+})
+// 验证规则
+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' }],
+  utensilType: [{ required: true, message: '请选择器具类型', trigger: 'blur' }],
+  item: [{ required: true, message: '请选择物品', trigger: 'blur' }],
+  number: [{ required: true, message: '请输入容纳数量', trigger: ['change', 'blur']}],
+})
+// 下拉框列表集合
+const options = reactive({
+  // 范围下拉框列表
+  rangeOptions: [{ value: 1, label: '包含' }, { value: 2, label: '大于', }],
+  //器具类型列表
+  utensilTypeList: [{ value: 1, label: '器具类型1' }, { value: 2, label: '器具类型2' }, { value: 3, label: '器具类型3' }],
+
+  // 物品类型列表
+  itemTypeOptions: [{ value: 2, label: '物品分组' }, { value: 3, label: '物品' }, { value: 4, label: '项目' }],
+  // 物品列表
+  itemList: [{ value: 1, label: '物品1' }, { value: 2, label: '物品2' }, { value: 3, label: '物品3' }],
+ 
+})
+
+/** 打开弹窗 */
+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,
+    
+    // 器具类型
+    utensilTypeRange: 1,//选择的器具类型范围
+    utensilType: '',//选择的器具类型
+
+    // 物品类型
+    itemType: 2,//选择的物品类型
+    itemTypeRange: 1, //物品类型范围
+    item: '',//选择的物品
+    
+    number: 0,//容纳数量
+  }
+}
+
+// 弹窗按钮
+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>

src/views/wms/strategy/utensilCapacityStrategy/index.vue

@@ -0,0 +1,61 @@
+<!-- 器具容量策略 -->
+<template>
+  <!-- 列表头部 -->
+  <TableHead :HeadButttondata="HeadButttondata" @buttonBaseClick="buttonBaseClick" />
+   <!-- 表单弹窗：添加/修改 -->
+    <AddForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import AddForm from './AddForm.vue'
+
+defineOptions({ name: 'BatchStrategy' })
+// 显示弹窗
+const formRef = ref()
+const openForm = (type: string) => {
+  formRef.value.open(type)
+}
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn(null), // 新增
+  defaultButtons.defaultImportBtn(null), // 导入
+  defaultButtons.defaultExportBtn(null), // 导出
+  // defaultButtons.defaultFilterBtn(), // 筛选
+  defaultButtons.defaultFreshBtn(null), // 刷新
+]
+
+
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({ hasPermi: 'wms:itembasic:update' }), // 编辑
+  defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:itembasic:delete' }), // 删除
+]
+
+// 列表-操作按钮事件 
+const buttonTableClick = (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row.id)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+</script>

src/views/wms/strategy/warehouseStorageStrategy/AddForm.vue

@@ -1,3 +1,4 @@
+<!-- 库位存储策略弹窗 -->
 <template>
   <Dialog :title="dialogTitle" v-model="dialogVisible">
     <div class="p-20px m--10px" style="max-height: 500px;overflow-y: auto;">
@@ -196,20 +197,20 @@ const formData = ref({
   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,
+  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({
@@ -274,20 +275,20 @@ const resetForm = () => {
     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,
+    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,//允许拆托
   }
 }
 

src/views/wms/strategy/warehouseStorageStrategy/index.vue

@@ -1,3 +1,4 @@
+<!-- 库位存储策略 -->
 <template>
   <!-- 列表头部 -->
   <TableHead :HeadButttondata="HeadButttondata" @buttonBaseClick="buttonBaseClick" />