From c308b61f07c950869f04be2561e436bb054b0a3e Mon Sep 17 00:00:00 2001
From: zhangli <2235006734@qq.com>
Date: Thu, 19 Oct 2023 19:27:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=80=E6=9C=89=E7=AD=96=E7=95=A5=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/strategy/batchStrategy/AddForm.vue    |  1 +
 .../wms/strategy/batchStrategy/index.vue      |  1 +
 .../strategy/downShelfStrategy/AddForm.vue    | 74 +++++++++----------
 .../wms/strategy/downShelfStrategy/index.vue  |  1 +
 .../wms/strategy/inspectStrategy/AddForm.vue  |  1 +
 .../wms/strategy/inspectStrategy/index.vue    |  1 +
 .../manageAccuracyStrategy/AddForm.vue        |  1 +
 .../strategy/manageAccuracyStrategy/index.vue |  1 +
 .../repairMaterialStrategy/AddForm.vue        |  1 +
 .../strategy/repairMaterialStrategy/index.vue |  1 +
 .../storageCapacityStrategy/AddForm.vue       |  1 +
 .../storageCapacityStrategy/index.vue         |  1 +
 .../supplieDeliveryStrategy/AddForm.vue       |  6 +-
 .../supplieDeliveryStrategy/index.vue         |  2 +
 .../wms/strategy/upShelfStrategy/AddForm.vue  | 21 +++---
 .../wms/strategy/upShelfStrategy/index.vue    |  1 +
 .../utensilCapacityStrategy/AddForm.vue       |  1 +
 .../utensilCapacityStrategy/index.vue         |  1 +
 .../warehouseStorageStrategy/AddForm.vue      | 57 +++++++-------
 .../warehouseStorageStrategy/index.vue        |  1 +
 20 files changed, 99 insertions(+), 76 deletions(-)

diff --git a/src/views/wms/strategy/batchStrategy/AddForm.vue b/src/views/wms/strategy/batchStrategy/AddForm.vue
index 0a78aed7a..9d2a4596f 100644
--- a/src/views/wms/strategy/batchStrategy/AddForm.vue
+++ b/src/views/wms/strategy/batchStrategy/AddForm.vue
@@ -1,3 +1,4 @@
+<!-- 批次策略弹窗 -->
 <template>
   <Dialog :title="dialogTitle" v-model="dialogVisible" width="900px">
     <div class="p-20px m--10px" style="max-height: 500px;overflow-y: auto;">
diff --git a/src/views/wms/strategy/batchStrategy/index.vue b/src/views/wms/strategy/batchStrategy/index.vue
index 381f1bbce..29a72a847 100644
--- a/src/views/wms/strategy/batchStrategy/index.vue
+++ b/src/views/wms/strategy/batchStrategy/index.vue
@@ -1,3 +1,4 @@
+<!-- 批次策略 -->
 <template>
   <!-- 列表头部 -->
   <TableHead :HeadButttondata="HeadButttondata" @buttonBaseClick="buttonBaseClick" />
diff --git a/src/views/wms/strategy/downShelfStrategy/AddForm.vue b/src/views/wms/strategy/downShelfStrategy/AddForm.vue
index ce1ee8892..419a7ef11 100644
--- a/src/views/wms/strategy/downShelfStrategy/AddForm.vue
+++ b/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
@@ -325,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({
@@ -448,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,//生成接收任务
   }
 }
 
diff --git a/src/views/wms/strategy/downShelfStrategy/index.vue b/src/views/wms/strategy/downShelfStrategy/index.vue
index 08dd7efba..2abcfd89f 100644
--- a/src/views/wms/strategy/downShelfStrategy/index.vue
+++ b/src/views/wms/strategy/downShelfStrategy/index.vue
@@ -1,3 +1,4 @@
+<!-- 下架策略 -->
 <template>
   <!-- 列表头部 -->
   <TableHead :HeadButttondata="HeadButttondata" @buttonBaseClick="buttonBaseClick" />
diff --git a/src/views/wms/strategy/inspectStrategy/AddForm.vue b/src/views/wms/strategy/inspectStrategy/AddForm.vue
index 9b5241aa9..57ed775dd 100644
--- a/src/views/wms/strategy/inspectStrategy/AddForm.vue
+++ b/src/views/wms/strategy/inspectStrategy/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;">
diff --git a/src/views/wms/strategy/inspectStrategy/index.vue b/src/views/wms/strategy/inspectStrategy/index.vue
index 30a95c3cd..93f40af64 100644
--- a/src/views/wms/strategy/inspectStrategy/index.vue
+++ b/src/views/wms/strategy/inspectStrategy/index.vue
@@ -1,3 +1,4 @@
+<!-- 检验策略 -->
 <template>
   <!-- 列表头部 -->
   <TableHead :HeadButttondata="HeadButttondata" @buttonBaseClick="buttonBaseClick" />
diff --git a/src/views/wms/strategy/manageAccuracyStrategy/AddForm.vue b/src/views/wms/strategy/manageAccuracyStrategy/AddForm.vue
index fef39e150..101e0a32f 100644
--- a/src/views/wms/strategy/manageAccuracyStrategy/AddForm.vue
+++ b/src/views/wms/strategy/manageAccuracyStrategy/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;">
diff --git a/src/views/wms/strategy/manageAccuracyStrategy/index.vue b/src/views/wms/strategy/manageAccuracyStrategy/index.vue
index 67a32628c..fca51b4cd 100644
--- a/src/views/wms/strategy/manageAccuracyStrategy/index.vue
+++ b/src/views/wms/strategy/manageAccuracyStrategy/index.vue
@@ -1,3 +1,4 @@
+<!-- 管理精度策略 -->
 <template>
   <!-- 列表头部 -->
   <TableHead :HeadButttondata="HeadButttondata" @buttonBaseClick="buttonBaseClick" />
diff --git a/src/views/wms/strategy/repairMaterialStrategy/AddForm.vue b/src/views/wms/strategy/repairMaterialStrategy/AddForm.vue
index 6154ceb86..300061e73 100644
--- a/src/views/wms/strategy/repairMaterialStrategy/AddForm.vue
+++ b/src/views/wms/strategy/repairMaterialStrategy/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;">
diff --git a/src/views/wms/strategy/repairMaterialStrategy/index.vue b/src/views/wms/strategy/repairMaterialStrategy/index.vue
index a6b486ceb..2c78db3f3 100644
--- a/src/views/wms/strategy/repairMaterialStrategy/index.vue
+++ b/src/views/wms/strategy/repairMaterialStrategy/index.vue
@@ -1,3 +1,4 @@
+<!-- 补料策略 -->
 <template>
   <!-- 列表头部 -->
   <TableHead :HeadButttondata="HeadButttondata" @buttonBaseClick="buttonBaseClick" />
diff --git a/src/views/wms/strategy/storageCapacityStrategy/AddForm.vue b/src/views/wms/strategy/storageCapacityStrategy/AddForm.vue
index 389443cac..5febe9435 100644
--- a/src/views/wms/strategy/storageCapacityStrategy/AddForm.vue
+++ b/src/views/wms/strategy/storageCapacityStrategy/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;">
diff --git a/src/views/wms/strategy/storageCapacityStrategy/index.vue b/src/views/wms/strategy/storageCapacityStrategy/index.vue
index 30201b24b..28ee7da5c 100644
--- a/src/views/wms/strategy/storageCapacityStrategy/index.vue
+++ b/src/views/wms/strategy/storageCapacityStrategy/index.vue
@@ -1,3 +1,4 @@
+<!-- 存储容量策略 -->
 <template>
   <!-- 列表头部 -->
   <TableHead :HeadButttondata="HeadButttondata" @buttonBaseClick="buttonBaseClick" />
diff --git a/src/views/wms/strategy/supplieDeliveryStrategy/AddForm.vue b/src/views/wms/strategy/supplieDeliveryStrategy/AddForm.vue
index 9954e7f9e..0002fedc2 100644
--- a/src/views/wms/strategy/supplieDeliveryStrategy/AddForm.vue
+++ b/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,8 +232,10 @@ const resetForm = () => {
     weekRange: 1,//星期几范围
     week: [],//选择的星期几
 
+    startTime: '',//开始时间
+    endTime: '',//开始时间
     warehouse: '',//选择的仓库
-    moon:'',//选择的月台
+    moon: '',//选择的月台
   }
 }
 
diff --git a/src/views/wms/strategy/supplieDeliveryStrategy/index.vue b/src/views/wms/strategy/supplieDeliveryStrategy/index.vue
index 78590ea1b..35df87f75 100644
--- a/src/views/wms/strategy/supplieDeliveryStrategy/index.vue
+++ b/src/views/wms/strategy/supplieDeliveryStrategy/index.vue
@@ -1,3 +1,5 @@
+
+<!-- 供应商送货策略 -->
 <template>
   <!-- 列表头部 -->
   <TableHead :HeadButttondata="HeadButttondata" @buttonBaseClick="buttonBaseClick" />
diff --git a/src/views/wms/strategy/upShelfStrategy/AddForm.vue b/src/views/wms/strategy/upShelfStrategy/AddForm.vue
index 96cdbb020..1d4de2e30 100644
--- a/src/views/wms/strategy/upShelfStrategy/AddForm.vue
+++ b/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,//允许混状态
   }
 }
 
diff --git a/src/views/wms/strategy/upShelfStrategy/index.vue b/src/views/wms/strategy/upShelfStrategy/index.vue
index f6f1fc56f..dcbd00453 100644
--- a/src/views/wms/strategy/upShelfStrategy/index.vue
+++ b/src/views/wms/strategy/upShelfStrategy/index.vue
@@ -1,3 +1,4 @@
+<!-- 上架策略 -->
 <template>
   <!-- 列表头部 -->
   <TableHead :HeadButttondata="HeadButttondata" @buttonBaseClick="buttonBaseClick" />
diff --git a/src/views/wms/strategy/utensilCapacityStrategy/AddForm.vue b/src/views/wms/strategy/utensilCapacityStrategy/AddForm.vue
index d4e19c347..884b36efd 100644
--- a/src/views/wms/strategy/utensilCapacityStrategy/AddForm.vue
+++ b/src/views/wms/strategy/utensilCapacityStrategy/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;">
diff --git a/src/views/wms/strategy/utensilCapacityStrategy/index.vue b/src/views/wms/strategy/utensilCapacityStrategy/index.vue
index 381f1bbce..3b2f061ca 100644
--- a/src/views/wms/strategy/utensilCapacityStrategy/index.vue
+++ b/src/views/wms/strategy/utensilCapacityStrategy/index.vue
@@ -1,3 +1,4 @@
+<!-- 器具容量策略 -->
 <template>
   <!-- 列表头部 -->
   <TableHead :HeadButttondata="HeadButttondata" @buttonBaseClick="buttonBaseClick" />
diff --git a/src/views/wms/strategy/warehouseStorageStrategy/AddForm.vue b/src/views/wms/strategy/warehouseStorageStrategy/AddForm.vue
index e54a90f96..e65d16b89 100644
--- a/src/views/wms/strategy/warehouseStorageStrategy/AddForm.vue
+++ b/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,//允许拆托
   }
 }
 
diff --git a/src/views/wms/strategy/warehouseStorageStrategy/index.vue b/src/views/wms/strategy/warehouseStorageStrategy/index.vue
index 56577b27b..2bfc1fc2e 100644
--- a/src/views/wms/strategy/warehouseStorageStrategy/index.vue
+++ b/src/views/wms/strategy/warehouseStorageStrategy/index.vue
@@ -1,3 +1,4 @@
+<!-- 库位存储策略 -->
 <template>
   <!-- 列表头部 -->
   <TableHead :HeadButttondata="HeadButttondata" @buttonBaseClick="buttonBaseClick" />