From b9aa9b7c268e5c4792a998c26bf4fd87f21097d6 Mon Sep 17 00:00:00 2001
From: zhaoyiran <yiran_zhao6@163.com>
Date: Wed, 13 Nov 2024 18:28:33 +0800
Subject: [PATCH] =?UTF-8?q?YT-927=E5=8F=91=E6=96=99=E7=AD=96=E7=95=A5?=
 =?UTF-8?q?=E5=92=8C=E5=8F=91=E8=B4=A7=E7=AD=96=E7=95=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../strategy/deliverStrategy/AddForm.vue      | 1208 +++++++++++++++++
 .../strategy/deliverStrategy/index.vue        |  170 +++
 .../strategy/downShelfStrategy/AddForm.vue    |  524 +++----
 3 files changed, 1644 insertions(+), 258 deletions(-)
 create mode 100644 src/views/wms/basicDataManage/strategySetting/strategy/deliverStrategy/AddForm.vue
 create mode 100644 src/views/wms/basicDataManage/strategySetting/strategy/deliverStrategy/index.vue

diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/deliverStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/deliverStrategy/AddForm.vue
new file mode 100644
index 000000000..2c3204eea
--- /dev/null
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/deliverStrategy/AddForm.vue
@@ -0,0 +1,1208 @@
+<!-- 下架策略弹窗 -->
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible"  width="700px">
+    <div class="p-20px m--10px" style="max-height: 80vh; overflow-y: auto">
+      <el-form
+        ref="formRef"
+        :model="formData"
+        :rules="rules"
+        label-width="120px"
+        label-position="left"
+      >
+
+        <!-- 规则 -->
+        <div class="item">
+          <div class="title">规则</div>
+          <el-row gutter="10">
+            <el-col :span="24">
+              <el-form-item label="代码" prop="strategyCode">
+                <el-input key="strategyCode"
+                  v-model="formData.strategyCode"
+                  placeholder="请输入代码"
+                  clearable
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="名称" prop="name">
+                <el-input key="name" v-model="formData.name" placeholder="请输入名称" clearable :disabled="formData.priority==0&&formType=='update'"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="描述" prop="description">
+                <el-input key="description" v-model="formData.description" placeholder="请输入描述" clearable :disabled="formData.priority==0&&formType=='update'"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="优先级" prop="priority">
+                <el-input-number key="priority" v-model="formData.priority" :min="formData.priority==0&&formType=='update'?0:1" :disabled="formData.priority==0&&formType=='update'"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="状态" prop="status">
+                <el-switch key="status" v-model="formData.status" :disabled="formData.priority==0&&formType=='update'"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+
+        <!-- 规则条件 -->
+
+        <div key="规则条件" class="item mt-20px">
+          <div key="规则条件title" class="title">规则条件</div>
+          <el-row key="规则条件row" :gutter="10">
+            <el-col key="供应商和客户col" :span="24" v-for="(item, index) in formData.condition" :key="index">
+              <!-- 选择物料类型 -->
+              <el-form-item key="物料类型formItem" label="" label-width="0" class="err-240" v-if="index == 1">
+                <el-select key="物料类型"
+                           v-model="item.ParamCode"
+                           placeholder=""
+                           @change="changeItemsType"
+                           style="width: 110px; margin-right: 10px"
+                           :disabled="formData.priority==0&&formType=='update'"
+                >
+                  <el-option
+                    :label="item.label"
+                    :value="item.value"
+                    v-for="item in options.itemTypeOptions"
+                    :key="'物料类型'+item.value"
+                  />
+                </el-select>
+                <el-select key="物料类型Operator"
+                           v-model="item.Operator"
+                           placeholder="请选择范围"
+                           style="width: 110px; margin-right: 10px"
+                           :disabled="formData.priority==0&&formType=='update'"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="cur in options.rangeOptions1"
+                    :key="'物料类型Operator'+cur.value"
+                  />
+                </el-select>
+                <el-select key="物料类型Value"
+                           v-model="item.Value"
+                           placeholder="请选择物料类型"
+                           style="flex: 1"
+                           clearable
+                           multiple
+                           collapse-tags
+                           v-if="item.ParamCode == 'ItemType'"
+                           :disabled="formData.priority==0&&formType=='update'"
+                >
+                  <el-option
+                    v-for="cur in getStrDictOptions(DICT_TYPE.ITEM_TYPE)"
+                    :key="'物料类型Value'+cur.value"
+                    :label="cur.label"
+                    :value="cur.value"
+                  />
+                </el-select>
+                <el-select key="ABC类"
+                           v-model="item.Value"
+                           placeholder="请选择ABC类"
+                           style="flex: 1"
+                           clearable
+                           multiple
+                           collapse-tags
+                           v-else-if="item.ParamCode == 'AbcClass'"
+                           :disabled="formData.priority==0&&formType=='update'"
+                >
+                  <el-option
+                    v-for="cur in getStrDictOptions(DICT_TYPE.ABC_CLASS)"
+                    :key="'ABC类'+cur.value"
+                    :label="cur.label"
+                    :value="cur.value"
+                  />
+                </el-select>
+
+                <el-select key="物料状态"
+                           v-model="item.Value"
+                           placeholder="请选择物料状态"
+                           style="flex: 1"
+                           clearable
+                           multiple
+                           collapse-tags
+                           v-else-if="item.ParamCode == 'ItemStatus'"
+                           :disabled="formData.priority==0&&formType=='update'"
+                >
+                  <el-option
+                    v-for="cur in getStrDictOptions(DICT_TYPE.ITEM_STATUS)"
+                    :key="'物料状态'+cur.value"
+                    :label="cur.label"
+                    :value="cur.value"
+                  />
+                </el-select>
+
+                <el-select key="物料分组"
+                           v-model="item.Value"
+                           placeholder="请输入物料分组，多个物料分组以逗号分隔"
+                           style="flex: 1"
+                           clearable
+                           multiple
+                           collapse-tags
+                           v-if="item.ParamCode == 'ItemGroup'"
+                           :disabled="formData.priority==0&&formType=='update'"
+                >
+                  <el-option
+                    v-for="cur in getStrDictOptions(DICT_TYPE.ITEM_GROUP)"
+                    :key="'物料分组Value'+cur.value"
+                    :label="cur.label"
+                    :value="cur.value"
+                  />
+                </el-select>
+                <!-- <el-input key="物料分组"
+                  v-model="item.Value"
+                  placeholder="请输入物料分组，多个物料分组以逗号分隔"
+                  clearable
+                  style="flex: 1"
+                  v-else-if="item.ParamCode == 'ItemGroup'"
+                /> -->
+                <el-input key="项目"
+                          v-model="item.Value"
+                          placeholder="请输入项目，多个项目以逗号分隔"
+                          clearable
+                          style="flex: 1"
+                          v-else-if="item.ParamCode == 'Project'"
+                          :disabled="formData.priority==0&&formType=='update'"
+                />
+                <el-input key="物料"
+                          v-model="item.Value"
+                          placeholder="请输入物料，多个物料以逗号分隔"
+                          clearable
+                          style="flex: 1"
+                          v-else-if="item.ParamCode == 'ItemCode'"
+                          :disabled="formData.priority==0&&formType=='update'"
+                />
+              </el-form-item>
+              <!-- 选择供应商和客户 -->
+              <el-form-item key="供应商和客户formItem" label="" label-width="0" class="err-240" v-if="index == 0">
+                <el-select key="供应商和客户"
+                  v-model="item.ParamCode"
+                  placeholder=""
+                  style="width: 110px; margin-right: 10px"
+                  @change="changeSupplierCustomer"
+                  :disabled="formData.priority==0&&formType=='update'"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="(cur, index) in options.typeOptions"
+                    :key="'供应商和客户'+cur.value"
+                  />
+                </el-select>
+                <el-select key="供应商和客户Operator"
+                  v-model="item.Operator"
+                  placeholder="请选择范围"
+                  style="width: 110px; margin-right: 10px"
+                  :disabled="formData.priority==0&&formType=='update'"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="cur in options.rangeOptions1"
+                    :key="'供应商和客户Operator'+cur.value"
+                  />
+                </el-select>
+                <el-select key="供应商和客户Value"
+                  v-model="item.Value"
+                  :placeholder="`请选择客户`"
+                  style="flex: 1"
+                  clearable
+                  multiple
+                  collapse-tags
+                  filterable
+                  :filter-method="filterMethod"
+                  :disabled="formData.priority==0&&formType=='update'"
+                >
+                  <el-option
+                    v-for="cur in options.supplierList"
+                    :key="'供应商和客户Value'+cur.code"
+                    :label="cur.name"
+                    :value="cur.code"
+                  />
+                </el-select>
+              </el-form-item>
+
+              <!-- 生产线 -->
+              <el-form-item key="生产线formItem" label="生产线" class="err-120" v-if="index == 5">
+                <el-select key="生产线Operator"
+                           v-model="item.Operator"
+                           placeholder="请选择范围"
+                           style="width: 110px; margin-right: 10px"
+                           :disabled="formData.priority==0&&formType=='update'"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="cur in options.rangeOptions1"
+                    :key="'生产线Operator'+cur.value"
+                  />
+                </el-select>
+                <el-input key="生产线Value" style="flex:1" placeholder="请选择生产线" disabled v-model="item.Value" @blur="blurTransactionType">
+                  <template #suffix>
+                    <el-button :disabled="formData.priority==0&&formType=='update'" type="text" plain style="color:var(--el-button-text-color)" @click="searchTransactionType">
+                      <Icon icon="ep:search" class="mr-5px" />
+                    </el-button>
+                  </template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+
+        <!-- 规则配置 -->
+        <div key="规则配置" class="item mt-20px">
+          <div key="规则配置title" class="title">规则配置</div>
+          <el-row key="规则配置row" :gutter="10">
+            <el-col key="仓库col" :span="24">
+              <el-form-item key="仓库formItem" label="" label-width="0" prop="warehouse" class="err-120">
+                <el-select key="仓库"
+                  v-model="warehouseType"
+                  placeholder=""
+                  style="width: 110px; margin-right: 10px"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="(cur, index) in options.warehouseTypeOptions"
+                    :key="'仓库'+cur.value"
+                  />
+                </el-select>
+
+
+                <!-- 仓库 -->
+                <el-input style="flex:1" v-show="warehouseType == 'WarehouseCode'" placeholder="请选择仓库" v-model="formData.configuration.WarehouseCode" @blur="blurWarehouse">
+                    <template #suffix>
+                      <el-button type="text" plain style="color:var(--el-button-text-color)" @click="searchWarehouse">
+                        <Icon icon="ep:search" class="mr-5px" /> 
+                      </el-button> 
+                    </template>
+                  </el-input>
+
+                  <!-- 库区 -->
+                  <el-input style="flex:1" v-show="warehouseType == 'AreaCode'" placeholder="请选择库区" v-model="formData.configuration.AreaCode" @blur="blurWarehouse">
+                    <template #suffix>
+                      <el-button type="text" plain style="color:var(--el-button-text-color)" @click="searchWarehouse">
+                        <Icon icon="ep:search" class="mr-5px" /> 
+                      </el-button> 
+                    </template>
+                  </el-input>
+
+                  
+                  <!-- 库位组 -->
+                  <el-input style="flex:1" v-show="warehouseType == 'LocationGroupCode'" placeholder="请选择库位组" v-model="formData.configuration.LocationGroupCode" @blur="blurWarehouse">
+                    <template #suffix>
+                      <el-button type="text" plain style="color:var(--el-button-text-color)" @click="searchWarehouse">
+                        <Icon icon="ep:search" class="mr-5px" /> 
+                      </el-button> 
+                    </template>
+                  </el-input>
+
+                  <!-- 库位 -->
+                  <el-input style="flex:1" v-show="warehouseType == 'LocationCode'" placeholder="请选择库位" v-model="formData.configuration.LocationCode" @blur="blurWarehouse">
+                    <template #suffix>
+                      <el-button type="text" plain style="color:var(--el-button-text-color)" @click="searchWarehouse">
+                        <Icon icon="ep:search" class="mr-5px" /> 
+                      </el-button> 
+                    </template>
+                  </el-input>
+                <!-- <el-select
+                  v-model="formData.configuration.WarehouseCode"
+                  v-if="warehouseType == 'WarehouseCode'"
+                  placeholder="请选择仓库"
+                  key="请选择仓库"
+                  clearable
+                  style="flex: 1"
+                  filterable
+                  :filter-method="filterMethodWarehouseList"
+                >
+                  <el-option
+                    v-for="cur in options.warehouseList"
+                    :key="'请选择仓库WarehouseCode'+index+cur.code"
+                    :label="cur.code"
+                    :value="cur.code"
+                  />
+                </el-select>
+                <el-select
+                  v-model="formData.configuration.AreaCode"
+                  v-if="warehouseType == 'AreaCode'"
+                  placeholder="请选择库区"
+                  key="请选择库区"
+                  clearable
+                  style="flex: 1"
+                  filterable
+                  :filter-method="filterMethodWarehouseList"
+                >
+                  <el-option
+                    v-for="cur in options.warehouseList"
+                    :key="'请选择库区AreaCode'+cur.code"
+                    :label="cur.code"
+                    :value="cur.code"
+                  />
+                </el-select>
+                <el-select
+                  v-model="formData.configuration.LocationGroupCode"
+                  v-if="warehouseType == 'LocationGroupCode'"
+                  placeholder="请选择库位组"
+                  key="请选择库位组"
+                  clearable
+                  style="flex: 1"
+                  filterable
+                  :filter-method="filterMethodWarehouseList"
+                >
+                  <el-option
+                    v-for="cur in options.warehouseList"
+                    :key="'请选择库位组LocationGroupCode'+cur.code"
+                    :label="cur.code"
+                    :value="cur.code"
+                  />
+                </el-select>
+
+                <el-select
+                  v-model="formData.configuration.LocationCode"
+                  v-if="warehouseType == 'LocationCode'"
+                  placeholder="请选择库位"
+                  key="请选择库位"
+                  clearable
+                  style="flex: 1"
+                  filterable
+                  :filter-method="filterMethodWarehouseList"
+                >
+                  <el-option
+                    v-for="cur in options.warehouseList"
+                    :key="'请选择库位LocationCode'+cur.code"
+                    :label="cur.code"
+                    :value="cur.code"
+                  />
+                </el-select> -->
+              </el-form-item>
+            </el-col>
+            <!-- 数量排序方向 -->
+            <el-col key="数量排序方向col" :span="24">
+              <el-form-item key="数量排序方向formItem" label="数量排序方向" class="flex-top">
+                <div class="checkbox">
+                  <el-radio-group key="数量排序方向" v-model="formData.configuration.QtyOrderDirection">
+                    <el-radio
+                      :label="cur.value"
+                      v-for="cur in options.sortOptions"
+                      :key="'数量排序方向'+cur.value"
+                      >{{ cur.label }}</el-radio
+                    >
+                  </el-radio-group>
+                </div>
+              </el-form-item>
+            </el-col>
+            <!-- 巷道排序方向 -->
+            <el-col key="巷道排序方向col" :span="24">
+              <el-form-item key="巷道排序方向formItem" label="巷道排序方向" class="flex-top">
+                <div class="checkbox">
+                  <el-radio-group key="巷道排序方向" v-model="formData.configuration.AisleOrder">
+                    <el-radio
+                      :label="cur.value"
+                      v-for="cur in options.sortOptions"
+                      :key="'巷道排序方向'+cur.value"
+                      >{{ cur.label }}</el-radio
+                    >
+                  </el-radio-group>
+                </div>
+              </el-form-item>
+            </el-col>
+            <!-- 货架排序方向 -->
+            <el-col key="货架排序方向col" :span="24">
+              <el-form-item key="货架排序方向formItem" label="货架排序方向" class="flex-top">
+                <div class="checkbox">
+                  <el-radio-group key="货架排序方向" v-model="formData.configuration.ShelfOrder">
+                    <el-radio
+                      :label="cur.value"
+                      v-for="cur in options.sortOptions"
+                      :key="'货架排序方向'+cur.value"
+                      >{{ cur.label }}</el-radio
+                    >
+                  </el-radio-group>
+                </div>
+              </el-form-item>
+            </el-col>
+            <!-- 行排序方向 -->
+            <el-col key="行排序方向col" :span="24">
+              <el-form-item key="行排序方向formItem" label="行排序方向" class="flex-top">
+                <div class="checkbox">
+                  <el-radio-group  key="行排序方向" v-model="formData.configuration.RowOrder">
+                    <el-radio
+                      :label="cur.value"
+                      v-for="cur in options.sortOptions"
+                      :key="'行排序方向'+cur.value"
+                      >{{ cur.label }}</el-radio
+                    >
+                  </el-radio-group>
+                </div>
+              </el-form-item>
+            </el-col>
+            <!-- 列排序方向 -->
+            <el-col key="列排序方向col" :span="24">
+              <el-form-item key="列排序方向formItem" label="列排序方向" class="flex-top">
+                <div class="checkbox">
+                  <el-radio-group key="列排序方向" v-model="formData.configuration.ColumOrder">
+                    <el-radio
+                      :label="cur.value"
+                      v-for="cur in options.sortOptions"
+                      :key="'列排序方向'+cur.value"
+                      >{{ cur.label }}</el-radio
+                    >
+                  </el-radio-group>
+                </div>
+              </el-form-item>
+            </el-col>
+
+          </el-row>
+        </div>
+      </el-form>
+    </div>
+    <template #footer>
+      <!-- 按钮-->
+      <TableHead :HeadButttondata="Butttondata" @buttonBaseClick="buttonBaseClick" />
+    </template>
+  </Dialog>
+  <SearchTable
+    ref="searchTableRef"
+    @searchTableSuccess="searchTableSuccess"
+  />
+</template>
+<script setup lang="ts">
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+defineOptions({ name: 'UpShelfStrategyAddForm' })
+import { getSupplierList } from '@/api/wms/supplier'
+import { getCustomerList } from '@/api/wms/customer'
+import { getWarehouseList } from '@/api/wms/warehouse'
+import { getAreaList } from '@/api/wms/areabasic'
+import { getLocationgroupList } from '@/api/wms/locationgroup'
+import { getLocationList } from '@/api/wms/location'
+import * as RuleApi from '@/api/wms/rule'
+import * as WarehouseApi from '@/api/wms/warehouse'
+import { Warehouse } from '@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data'
+import * as AreaApi from '@/api/wms/areabasic'
+import { Area } from '@/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data'
+import * as LocationgroupApi from '@/api/wms/locationgroup'
+import { Locationgroup } from '@/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data'
+
+import * as LocationApi from '@/api/wms/location'
+import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
+import { isString } from '@/utils/is'
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+import * as TransactiontypeApi from '@/api/wms/transactiontype'
+import { Transactiontype } from '@/views/wms/basicDataManage/documentSetting/transactiontype/transactiontype.data'
+import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data'
+import * as ProductionlineApi from '@/api/wms/productionline'
+
+
+
+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 formRef = ref() // 表单 Ref
+
+const formStrategyCode = ref('')
+// 仓库类型
+const warehouseType = ref('WarehouseCode')
+
+// form表单数据
+const formData = ref({
+  id: '',
+  strategyCode: formStrategyCode.value, //策略代码id
+  name: '', //名称
+  description: '', //描述
+  priority: '', //优先级
+  status: true, //状态
+  //规则条件集合
+  condition: [
+    // 物料类型/物料分组/物料/abc类/项目/
+    { ParamCode: 'ItemType', Operator: 'IN', Value: '' },
+    // 供应商
+    { ParamCode: 'SupplierCode', Operator: 'IN', Value: '' },
+    // 重量/体积/面积
+    { ParamCode: 'Weight', Operator: '>', Value: [] },
+    // 库存状态
+    { ParamCode: 'InventoryStatus', Operator: 'IN', Value: [] },
+    // 存储类型
+    { ParamCode: 'StorageType', Operator: 'IN', Value: [] },
+    // 库存事务
+    { ParamCode: 'TransactionType', Operator: 'IN', Value: '' }
+  ],
+  configuration: {
+    // 仓库代码
+    WarehouseCode: '',
+    // 库区代码
+    AreaCode: '',
+    // 库位组代码
+    LocationGroupCode: '',
+    // 库位代码
+    LocationCode: '',
+    // 数量排序方向
+    QtyOrderDirection: 'ASC',
+    // 巷道排序方向
+    AisleOrder: 'ASC',
+    // 货架排序方向
+    ShelfOrder: 'ASC',
+    // 行排序方向
+    RowOrder: 'ASC',
+    // 列排序方向
+    ColumOrder: 'ASC',
+    // 优先整包
+    EntirePackageFirst: 'FALSE',
+    // 发料包装类型
+    IssueStorageType: 'SINGLE',
+    // 是否拆分发料
+    IsSplit: '',
+    // 拆分数量
+    EachTimeQty: '',
+    // 时间间隔
+    TimeInterval: '',
+    // 是否使用整理库位
+    UseOrganizeLocation: 'FALSE',
+    // 是否使用在途库位
+    UseTransportLocation: 'FALSE',
+    // 是否生成发料接收任务
+    CreateReceiptJob: 'FALSE'
+  }
+})
+// 验证规则
+const rules = ref({
+  strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
+  name: [{ required: true, message: '请输入名字', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
+  description: [{ required: true, message: '请输入描述', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
+  priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }]
+})
+
+// 所有的范围类型
+const rangeOptions = [
+  { value: '==', label: '等于' },
+  { value: '!=', label: '不等于' },
+  { value: '>', label: '大于' },
+  { value: '<', label: '小于' },
+  { value: '>=', label: '大于等于' },
+  { value: '<=', label: '小于等于' },
+  { value: 'IN', label: '包含' },
+  { value: 'NOT IN', label: '不包含' },
+  { value: 'NULL', label: '为空' },
+  { value: 'NOT NULL', label: '不为空' }
+]
+const formatRangeOptions = (...rest) => {
+  // 交集
+  let result = rangeOptions.filter((aItem) => rest.some((bItem) => aItem.value === bItem))
+  return result
+}
+
+// 下拉框列表集合
+const options = reactive({
+  //范围下拉框列表
+  rangeOptions1: formatRangeOptions('IN', 'NOT IN'),
+  rangeOptions2: formatRangeOptions('>', '<', '>=', '<='),
+  // 供应商客户下拉框列表
+  typeOptions: [
+    { value: 'CustomerCode', label: '客户' }
+  ],
+  //供应商列表
+  supplierList: [],
+  originSupplierList: [],
+  // 物料类型列表
+  itemTypeOptions: [
+    { value: 'ItemType', label: '物料类型' },
+    { value: 'ItemGroup', label: '物料分组' },
+    { value: 'ItemCode', label: '物料' },
+    { value: 'Project', label: '项目' },
+    { value: 'AbcClass', label: 'ABC类' },
+    { value: 'ItemStatus', label: '物料状态' }
+  ],
+  // 重量体积面积类型列表
+  calculationTypeOptions: [
+    { value: 'Weight', label: '重量' },
+    { value: 'Volume', label: '体积' },
+    { value: 'Area', label: '面积' }
+  ],
+  //仓库列表
+  warehouseTypeOptions: [
+    { value: 'WarehouseCode', label: '仓库' },
+    { value: 'AreaCode', label: '库区' },
+    { value: 'LocationGroupCode', label: '库位组' },
+    { value: 'LocationCode', label: '库位' }
+  ],
+  warehouseList: [],
+  originWarehouseList: [],
+  // 排列方式
+  sortOptions: [
+    { value: 'ASC', label: '从小到大' },
+    { value: 'DESC', label: '从大到小' }
+  ]
+})
+// 弹窗按钮
+const Butttondata = ref([
+  defaultButtons.formSaveBtn(null), // 保存
+  defaultButtons.formCloseBtn(null) // 关闭
+])
+// 按钮事件
+const buttonBaseClick = (val, item) => {
+  // 保存
+  if (val == 'save') {
+    submitForm()
+  }
+  // 关闭
+  else if (val == 'close') {
+    dialogVisible.value = false
+  }
+}
+
+// 获取供应商列表
+const getFormSupplierList = async () => {
+  options.originSupplierList = await getSupplierList(null)
+  options.supplierList = [...options.originSupplierList]
+}
+// 获取客户列表
+const getFormCustomerList = async () => {
+  options.originSupplierList = await getCustomerList(null)
+  options.supplierList = [...options.originSupplierList]
+}
+const filterMethod = (query: string) => {
+  if (query) {
+    options.supplierList = options.originSupplierList.filter((item) => {
+      if(!item.name||item.name==''){
+        return item.code.includes(query)
+      }else{
+        return item.name.includes(query)
+      }
+    })
+  } else {
+    options.supplierList = [...options.originSupplierList]
+  }
+}
+// 选择客户还是承运商
+const changeSupplierCustomer = (e) => {
+  formData.value.condition[0].Value = ''
+  if (e == 'CustomerCode') {
+    getFormCustomerList()
+  } else if (e == 'SupplierCode') {
+    getFormSupplierList()
+  }
+}
+getFormSupplierList()
+// 选择物料类型/物料分组/abc类/物料/项目
+const changeItemsType = () => {
+  formData.value.condition[1].Value = ''
+}
+// 选择重量/体积/面积
+const changeCalculation = () => {
+  formData.value.condition[2].Value = ''
+}
+// 获取仓库列表
+const getFormWarehouseList = async () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: t('ts.加载中'),
+    background: 'rgba(0, 0, 0, 0.7)',
+  })
+  options.originWarehouseList = await getWarehouseList()
+  options.warehouseList = [...options.originWarehouseList]
+  nextTick(()=>{
+    loading.close()
+  })
+}
+// 获取库区列表
+const getFormAreaList = async () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: t('ts.加载中'),
+    background: 'rgba(0, 0, 0, 0.7)',
+  })
+  options.originWarehouseList = await getAreaList()
+  options.warehouseList = [...options.originWarehouseList]
+  nextTick(()=>{
+    loading.close()
+  })
+}
+// 获取库位组列表
+const getFormLocationgrouList = async () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: t('ts.加载中'),
+    background: 'rgba(0, 0, 0, 0.7)',
+  })
+  options.originWarehouseList = await getLocationgroupList()
+  options.warehouseList = [...options.originWarehouseList]
+  nextTick(()=>{
+    loading.close()
+  })
+}
+// 获取库位列表
+const getFormLocationList = async () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: t('ts.加载中'),
+    background: 'rgba(0, 0, 0, 0.7)',
+  })
+  options.originWarehouseList =  await getLocationList()
+  options.warehouseList = [...options.originWarehouseList]
+  nextTick(()=>{
+    loading.close()
+  })
+}
+const filterMethodWarehouseList = (query: string) => {
+  if (query) {
+    options.warehouseList = options.originWarehouseList.filter((item) => {
+      return item.code.includes(query)
+    })
+  } else {
+    options.warehouseList = options.originWarehouseList
+  }
+}
+
+
+const searchTableRef = ref()
+
+const blurWarehouse = async ()=>{
+  // 校验的值
+  let warehouseValue = formData.value.configuration[warehouseType.value]
+  if(!warehouseValue){
+    return
+  }
+  if(warehouseType.value == 'WarehouseCode'){
+    // 仓库
+    let verifyRes = await WarehouseApi.verifyWarehouse({
+      code:warehouseValue
+    })
+    console.log('仓库verifyRes',verifyRes)
+    if(verifyRes&&verifyRes.length>0){
+      let verifyList = verifyRes.map(item=>(item['code']))
+      let codeList = formData.value.configuration[warehouseType.value].split(',')
+      formData.value.configuration[warehouseType.value] = codeList.filter(item=>verifyList.indexOf(item)>-1).join(',')
+    }else{
+      formData.value.configuration[warehouseType.value] = ''
+    }
+  }else if(warehouseType.value == 'AreaCode'){
+    // 库区
+    let verifyRes = await AreaApi.verifyAreaList({
+      code:warehouseValue
+    })
+    console.log('库区verifyRes',verifyRes)
+    if(verifyRes&&verifyRes.length>0){
+      let verifyList = verifyRes.map(item=>(item['code']))
+      let codeList = formData.value.configuration[warehouseType.value].split(',')
+      formData.value.configuration[warehouseType.value] = codeList.filter(item=>verifyList.indexOf(item)>-1).join(',')
+    }else{
+      formData.value.configuration[warehouseType.value] = ''
+    }
+  }else if(warehouseType.value == 'LocationGroupCode'){
+    // 库位组
+    let verifyRes = await LocationgroupApi.verifyLocationgroup({
+      code:warehouseValue
+    })
+    console.log('库位组verifyRes',verifyRes)
+    if(verifyRes&&verifyRes.length>0){
+      let verifyList = verifyRes.map(item=>(item['code']))
+      let codeList = formData.value.configuration[warehouseType.value].split(',')
+      formData.value.configuration[warehouseType.value] = codeList.filter(item=>verifyList.indexOf(item)>-1).join(',')
+    }else{
+      formData.value.configuration[warehouseType.value] = ''
+    }
+
+  }else if(warehouseType.value == 'LocationCode'){
+    // 库位
+    let verifyRes = await LocationApi.verifyLocation({
+      code:warehouseValue
+    })
+    console.log('库位组verifyRes',verifyRes)
+    if(verifyRes&&verifyRes.length>0){
+      let verifyList = verifyRes.map(item=>(item['code']))
+      let codeList = formData.value.configuration[warehouseType.value].split(',')
+      formData.value.configuration[warehouseType.value] = codeList.filter(item=>verifyList.indexOf(item)>-1).join(',')
+    }else{
+      formData.value.configuration[warehouseType.value] = ''
+    }
+  }
+
+  let fields = ['WarehouseCode','AreaCode','LocationGroupCode','LocationCode']
+  fields.forEach(item=>{
+    if(item!=warehouseType.value){
+      formData.value.configuration[item] = ''
+    }
+  })
+
+}
+// 生产线
+const searchTransactionType = ()=>{
+  searchTableRef.value.open(
+    '请选择生产线',
+    Productionline.allSchemas,
+    ProductionlineApi.getProductionlinePage,
+    'TransactionType',
+    'code',
+    true,
+    undefined,
+    undefined,
+    undefined
+  )
+}
+// 失去焦点校验
+const blurTransactionType = async ()=>{
+  let transactionType = formData.value.condition.find(item=>item['ParamCode']=='TransactionType')
+  if(transactionType&&transactionType.Value){
+    let verifyRes = await TransactiontypeApi.verifyTransactiontype({
+      code:transactionType.Value
+    })
+    console.log('事务类型verifyRes',verifyRes)
+    if(verifyRes&&verifyRes.length>0){
+      let verifyList = verifyRes.map(item=>(item['code']))
+      let codeList = transactionType.Value.split(',')
+      transactionType.Value = codeList.filter(item=>verifyList.indexOf(item)>-1).join(',')
+    }else{
+      transactionType.Value = ''
+    }
+  }
+}
+
+
+const searchWarehouse = ()=>{
+
+  if(warehouseType.value == 'WarehouseCode'){
+    // 仓库
+    searchTableRef.value.open(
+      '请选择仓库',
+      Warehouse.allSchemas,
+      WarehouseApi.getWarehousePage,
+      'WarehouseCode',
+      'code',
+      true,
+      undefined,
+      undefined,
+      undefined
+    )
+  }else if(warehouseType.value == 'AreaCode'){
+    searchTableRef.value.open(
+      '请选择库区',
+      Area.allSchemas,
+      AreaApi.getAreaPage,
+      'WarehouseCode',
+      'code',
+      true,
+      undefined,
+      undefined,
+      undefined
+    )
+
+  }else if(warehouseType.value == 'LocationGroupCode'){
+    
+    searchTableRef.value.open(
+      '请选择库位组',
+      Locationgroup.allSchemas,
+      LocationgroupApi.getLocationgroupPage,
+      'WarehouseCode',
+      'code',
+      true,
+      undefined,
+      undefined,
+      undefined
+    )
+
+  }else if(warehouseType.value == 'LocationCode'){
+    searchTableRef.value.open(
+      '请选择库位',
+      Location.allSchemas,
+      LocationApi.getLocationPage,
+      'WarehouseCode',
+      'code',
+      true,
+      undefined,
+      undefined,
+      undefined
+    )
+
+  }
+  
+}
+const searchTableSuccess = (formField, searchField, val, type, row) => {
+  if(formField=='TransactionType'){
+    let transactionType = formData.value.condition.find(item=>item['ParamCode']=='TransactionType')
+    if(transactionType){
+      transactionType.Value = val.map(item=>(item['code'])).join(',')
+    }
+    return
+  }
+  // let searchTableTitle  =  warehouseType.value == 'WarehouseCode'?'请选择仓库':warehouseType.value == 'AreaCode'?'请选择库区':warehouseType.value == 'LocationGroupCode'?'请选择库位组':warehouseType.value == 'LocationCode'?'请选择库位':''
+  console.log('searchTableSuccess',formField, searchField, val, type, row)
+  console.log(val.map(item=>(item['code'])).join(','))
+  formData.value.configuration[warehouseType.value] = val.map(item=>(item['code'])).join(',')
+  let fields = ['WarehouseCode','AreaCode','LocationGroupCode','LocationCode']
+  fields.forEach(item=>{
+    if(item!=warehouseType.value){
+      formData.value.configuration[item] = ''
+    }
+  })
+}
+// getFormWarehouseList()
+// 选择仓库/库位/库位组/库区
+const changeWarehouse = (e) => {
+  formData.value.configuration.WarehouseCode = ''
+  formData.value.configuration.AreaCode = ''
+  formData.value.configuration.LocationGroupCode = ''
+  formData.value.configuration.LocationCode = ''
+  if (e == 'WarehouseCode') {
+    getFormWarehouseList()
+  } else if (e == 'AreaCode') {
+    getFormAreaList()
+  } else if (e == 'LocationGroupCode') {
+    getFormLocationgrouList()
+  } else if (e == 'LocationCode') {
+    getFormLocationList()
+  }
+}
+/** 打开弹窗 */
+const open = async (type: string, strategyCode: string, id?: number) => {
+  formStrategyCode.value = strategyCode
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  warehouseType.value = 'WarehouseCode'
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      let data = await RuleApi.getRule(id)
+      formData.value.id = data.id
+      formData.value.strategyCode = data.strategyCode
+      formData.value.name = data.name
+      formData.value.description = data.description
+      formData.value.priority = data.priority
+      formData.value.status = data.status == 0 ? true : false
+      // if (formData.value.priority == 0) {
+      //   Butttondata.value = [
+      //     defaultButtons.formSaveBtn({ disabled: true }), // 保存
+      //     defaultButtons.formCloseBtn(null) // 关闭
+      //   ]
+      // } else {
+        Butttondata.value = [
+          defaultButtons.formSaveBtn(null), // 保存
+          defaultButtons.formCloseBtn(null) // 关闭
+        ]
+      // }
+      if (data.condition) {
+        formData.value.condition = JSON.parse(data.condition)
+        formData.value.condition.forEach((item, index) => {
+          if ((item.Operator == 'IN' || item.Operator == 'NOT IN')&& Array.isArray(item.Value)) {
+            item.Value = item.Value.split(',')
+          }
+        })
+      }
+      if (data.configuration) {
+        formData.value.configuration = JSON.parse(data.configuration)
+      }
+      // 判断是获取客户列表还是供应上列表
+      if (formData.value.condition[0].ParamCode == 'SupplierCode') {
+        getFormSupplierList()
+      } else {
+        getFormCustomerList()
+      }
+      // 判断是获取仓库/库位/库位组/库区列表
+      if (
+        'WarehouseCode' in formData.value.configuration &&
+        formData.value.configuration.WarehouseCode
+      ) {
+        warehouseType.value = 'WarehouseCode'
+        // getFormWarehouseList()
+      } else if (
+        'AreaCode' in formData.value.configuration &&
+        formData.value.configuration.AreaCode
+      ) {
+        warehouseType.value = 'AreaCode'
+        // getFormAreaList()
+      } else if (
+        'LocationGroupCode' in formData.value.configuration &&
+        formData.value.configuration.LocationGroupCode
+      ) {
+        warehouseType.value = 'LocationGroupCode'
+        // getFormLocationgrouList()
+      } else if (
+        'LocationCode' in formData.value.configuration &&
+        formData.value.configuration.LocationCode
+      ) {
+        warehouseType.value = 'LocationCode'
+        // getFormLocationList()
+      }
+    } finally {
+      formLoading.value = false
+    }
+  } else {
+    Butttondata.value = [
+      defaultButtons.formSaveBtn(null), // 保存
+      defaultButtons.formCloseBtn(null) // 关闭
+    ]
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  await blurWarehouse()
+  await blurTransactionType()
+  console.log('规则条件',formData.value.condition)
+  
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // if (formData.value.priority == 0) {
+  //   message.error('优先级不可以为0')
+  //   return
+  // }
+  // 提交请求
+  formLoading.value = true
+  try {
+    const arr = formData.value.condition.map(item=> {
+       let str = item.Value
+       if(isString(item.Value)){
+        if(item.Value.indexOf('，'>-1)){
+        str = item.Value.split('，').join(',')
+        }
+      }
+      if ((item.Operator == 'IN' || item.Operator == 'NOT IN')&& Array.isArray(item.Value)) {
+        str = item.Value.join(',')
+      }
+     
+      return {
+        ParamCode:item.ParamCode,
+        Operator:item.Operator,
+        Value:str
+      }
+    })
+    let data = {
+      id: formData.value.id,
+      strategyCode: formData.value.strategyCode, //策略代码
+      name: formData.value.name, //名称
+      description: formData.value.description, //描述
+      priority: formData.value.priority, //优先级
+      status: formData.value.status ? 0 : 1, //状态
+      //规则条件集合
+      condition: JSON.stringify(arr),
+      configuration: JSON.stringify(formData.value.configuration)
+    }
+    if (formType.value === 'create') {
+      await RuleApi.createRule(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await RuleApi.updateRule(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: '',
+    strategyCode: formStrategyCode.value, //策略代码id
+    name: '', //名称
+    description: '', //描述
+    priority: '', //优先级
+    status: true, //状态
+    //规则条件集合
+    condition: [
+      // 供应商
+      { ParamCode: 'SupplierCode', Operator: 'IN', Value: '' },
+      // 物料类型/物料分组/物料/abc类/项目/
+      { ParamCode: 'ItemType', Operator: 'IN', Value: '' },
+      // /重量/体积/面积
+      { ParamCode: 'Weight', Operator: '>', Value: [] },
+      // 库存状态
+      { ParamCode: 'InventoryStatus', Operator: 'IN', Value: [] },
+      // 存储类型
+      { ParamCode: 'StorageType', Operator: 'IN', Value: [] },
+      // 库存事务
+      { ParamCode: 'TransactionType', Operator: 'IN', Value: '' }
+    ],
+
+    configuration: {
+      // 仓库代码
+      WarehouseCode: '',
+      // 库区代码
+      AreaCode: '',
+      // 库位组代码
+      LocationGroupCode: '',
+      // 库位代码
+      LocationCode: '',
+      // 数量排序方向
+      QtyOrderDirection: 'ASC',
+      // 巷道排序方向
+      AisleOrder: 'ASC',
+      // 货架排序方向
+      ShelfOrder: 'ASC',
+      // 行排序方向
+      RowOrder: 'ASC',
+      // 列排序方向
+      ColumOrder: 'ASC',
+      // 优先整包
+      EntirePackageFirst: 'FALSE',
+      // 发料包装类型
+      IssueStorageType: 'SINGLE',
+      // 是否拆分发料
+      IsSplit: '',
+      // 拆分数量
+      EachTimeQty: '',
+      // 时间间隔
+      TimeInterval: '',
+      // 是否使用整理库位
+      UseOrganizeLocation: 'FALSE',
+      // 是否使用在途库位
+      UseTransportLocation: 'FALSE',
+      // 是否生成发料接收任务
+      CreateReceiptJob: 'FALSE'
+    }
+  }
+}
+</script>
+<style scoped lang="scss">
+.item {
+  border: 1px solid #dedede;
+  border-radius: 4px;
+  padding: 30px 30px 5px;
+  position: relative;
+
+  .title {
+    position: absolute;
+    background: white;
+    padding: 0px 10px;
+    position: absolute;
+    top: 0px;
+    height: 30px;
+    line-height: 30px;
+    margin-top: -15px;
+  }
+}
+
+.checkbox {
+  background: #f5f5f5;
+  flex: 1;
+  padding: 0px 15px;
+  border-radius: 2px;
+}
+
+::v-deep .flex-top .el-form-item__content {
+  align-items: flex-start !important;
+}
+
+::v-deep .err-240 .el-form-item__error {
+  padding-left: 240px !important;
+}
+
+::v-deep .err-120 .el-form-item__error {
+  padding-left: 120px !important;
+}
+</style>
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/deliverStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/deliverStrategy/index.vue
new file mode 100644
index 000000000..96e297849
--- /dev/null
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/deliverStrategy/index.vue
@@ -0,0 +1,170 @@
+<!-- 下架策略 -->
+<template>
+  <!-- 搜索工作栏 -->
+  <ContentWrap>
+    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+      <el-form-item label="策略名称" prop="name">
+        <el-input v-model="queryParams.name" placeholder="请输入策略名称" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
+      </el-form-item>
+      <el-form-item label="优先级" prop="priority">
+        <el-input v-model.number="queryParams.priority" type="number" oninput ="value=value.replace(/[^\d]/g,'')" placeholder="请输入优先级" clearable @keyup.enter="handleQuery" class="!w-240px" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="info" plain @click="handleQuery">
+          <Icon icon="ep:search" class="mr-5px" /> 搜索
+        </el-button>
+        <el-button type="info" plain @click="resetQuery">
+          <Icon icon="ep:refresh" class="mr-5px" /> 重置
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+  <!-- 列表头部 -->
+  <TableHead :HeadButttondata="HeadButttondata" @buttonBaseClick="buttonBaseClick" />
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-clientTable v-loading="loading" :data="list" :default-sort="{ prop: 'priority', order: 'null' }">
+      <el-table-column align="center" label="策略代码" prop="strategyCode" />
+      <el-table-column align="center" label="策略名称" prop="name" show-overflow-tooltip />
+      <el-table-column align="center" label="策略描述" prop="description" />
+      <el-table-column align="center" label="优先级" prop="priority" sortable/>
+      <el-table-column align="center" label="状态" prop="status">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="操作" fixed="right" width="240">
+        <template #default="scope">
+          <ButtonBase :Butttondata="butttondata(scope.row)" @button-base-click="buttonTableClick($event, scope.row)" />
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination v-model:limit="queryParams.pageSize" v-model:page="queryParams.pageNo" :total="total"
+      @pagination="getList" />
+  </ContentWrap>
+  <!-- 表单弹窗：添加/修改 -->
+  <AddForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { DICT_TYPE } from '@/utils/dict'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as RuleApi from '@/api/wms/rule'
+import AddForm from './AddForm.vue'
+
+defineOptions({ name: 'SupplieDeliveryStrategy' })
+
+const queryFormRef = ref() // 搜索的表单
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 字典表格数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  strategyCode: 'S012',
+})
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await RuleApi.getRulePage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+// 显示弹窗
+const formRef = ref()
+const openForm = (type: string, strategyCode: string, id: number) => {
+  formRef.value.open(type, strategyCode, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await RuleApi.deleteRule(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    buttonBaseClick('refresh',null)
+  } catch { }
+}
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn(null), // 新增
+]
+
+
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  console.log('buttonBaseClick',val)
+  
+  if (val == 'add') { // 新增
+    openForm('create', queryParams.strategyCode)
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val == row.priority) {
+    return true
+  } else {
+    return false
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    defaultButtons.mainListEditBtn(null), // 编辑
+    defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0)}), // 删除
+  ]
+}
+
+// 列表-操作按钮事件 
+const buttonTableClick = (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', queryParams.strategyCode, row.id)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+
+</script>
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
index 35f193ba3..c1d18040e 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
@@ -54,53 +54,53 @@
           <el-row key="规则条件row" :gutter="10">
             <el-col key="供应商和客户col" :span="24" v-for="(item, index) in formData.condition" :key="index">
               <!-- 选择供应商和客户 -->
-              <el-form-item key="供应商和客户formItem" label="" label-width="0" class="err-240" v-if="index == 0">
-                <el-select key="供应商和客户"
-                  v-model="item.ParamCode"
-                  placeholder=""
-                  style="width: 110px; margin-right: 10px"
-                  @change="changeSupplierCustomer"
-                  :disabled="formData.priority==0&&formType=='update'"
-                >
-                  <el-option
-                    :label="cur.label"
-                    :value="cur.value"
-                    v-for="(cur, index) in options.typeOptions"
-                    :key="'供应商和客户'+cur.value"
-                  />
-                </el-select>
-                <el-select key="供应商和客户Operator"
-                  v-model="item.Operator"
-                  placeholder="请选择范围"
-                  style="width: 110px; margin-right: 10px"
-                  :disabled="formData.priority==0&&formType=='update'"
-                >
-                  <el-option
-                    :label="cur.label"
-                    :value="cur.value"
-                    v-for="cur in options.rangeOptions1"
-                    :key="'供应商和客户Operator'+cur.value"
-                  />
-                </el-select>
-                <el-select key="供应商和客户Value"
-                  v-model="item.Value"
-                  :placeholder="`请选择${item.ParamCode == 'SupplierCode' ? '供应商' : '客户'}`"
-                  style="flex: 1"
-                  clearable
-                  multiple
-                  collapse-tags
-                  filterable
-                  :filter-method="filterMethod"
-                  :disabled="formData.priority==0&&formType=='update'"
-                >
-                  <el-option
-                    v-for="cur in options.supplierList"
-                    :key="'供应商和客户Value'+cur.code"
-                    :label="cur.name"
-                    :value="cur.code"
-                  />
-                </el-select>
-              </el-form-item>
+<!--              <el-form-item key="供应商和客户formItem" label="" label-width="0" class="err-240" v-if="index == 0">-->
+<!--                <el-select key="供应商和客户"-->
+<!--                  v-model="item.ParamCode"-->
+<!--                  placeholder=""-->
+<!--                  style="width: 110px; margin-right: 10px"-->
+<!--                  @change="changeSupplierCustomer"-->
+<!--                  :disabled="formData.priority==0&&formType=='update'"-->
+<!--                >-->
+<!--                  <el-option-->
+<!--                    :label="cur.label"-->
+<!--                    :value="cur.value"-->
+<!--                    v-for="(cur, index) in options.typeOptions"-->
+<!--                    :key="'供应商和客户'+cur.value"-->
+<!--                  />-->
+<!--                </el-select>-->
+<!--                <el-select key="供应商和客户Operator"-->
+<!--                  v-model="item.Operator"-->
+<!--                  placeholder="请选择范围"-->
+<!--                  style="width: 110px; margin-right: 10px"-->
+<!--                  :disabled="formData.priority==0&&formType=='update'"-->
+<!--                >-->
+<!--                  <el-option-->
+<!--                    :label="cur.label"-->
+<!--                    :value="cur.value"-->
+<!--                    v-for="cur in options.rangeOptions1"-->
+<!--                    :key="'供应商和客户Operator'+cur.value"-->
+<!--                  />-->
+<!--                </el-select>-->
+<!--                <el-select key="供应商和客户Value"-->
+<!--                  v-model="item.Value"-->
+<!--                  :placeholder="`请选择${item.ParamCode == 'SupplierCode' ? '供应商' : '客户'}`"-->
+<!--                  style="flex: 1"-->
+<!--                  clearable-->
+<!--                  multiple-->
+<!--                  collapse-tags-->
+<!--                  filterable-->
+<!--                  :filter-method="filterMethod"-->
+<!--                  :disabled="formData.priority==0&&formType=='update'"-->
+<!--                >-->
+<!--                  <el-option-->
+<!--                    v-for="cur in options.supplierList"-->
+<!--                    :key="'供应商和客户Value'+cur.code"-->
+<!--                    :label="cur.name"-->
+<!--                    :value="cur.code"-->
+<!--                  />-->
+<!--                </el-select>-->
+<!--              </el-form-item>-->
               <!-- 选择物料类型 -->
               <el-form-item key="物料类型formItem" label="" label-width="0" class="err-240" v-if="index == 1">
                 <el-select key="物料类型"
@@ -164,6 +164,25 @@
                     :value="cur.value"
                   />
                 </el-select>
+
+                <el-select key="物料状态"
+                           v-model="item.Value"
+                           placeholder="请选择物料状态"
+                           style="flex: 1"
+                           clearable
+                           multiple
+                           collapse-tags
+                           v-else-if="item.ParamCode == 'ItemStatus'"
+                           :disabled="formData.priority==0&&formType=='update'"
+                >
+                  <el-option
+                    v-for="cur in getStrDictOptions(DICT_TYPE.ITEM_STATUS)"
+                    :key="'物料状态'+cur.value"
+                    :label="cur.label"
+                    :value="cur.value"
+                  />
+                </el-select>
+
                 <el-select key="物料分组"
                   v-model="item.Value"
                   placeholder="请输入物料分组，多个物料分组以逗号分隔"
@@ -206,111 +225,111 @@
                 />
               </el-form-item>
               <!-- 选择重量体积还是面积 -->
-              <el-form-item key="重量体积或面积formItem" label="" label-width="0" class="err-240" v-if="index == 2">
-                <el-select key="重量体积或面积"
-                  v-model="item.ParamCode"
-                  placeholder=""
-                  @change="changeCalculation"
-                  style="width: 110px; margin-right: 10px"
-                  :disabled="formData.priority==0&&formType=='update'"
-                >
-                  <el-option
-                    :label="cur.label"
-                    :value="cur.value"
-                    v-for="cur in options.calculationTypeOptions"
-                    :key="'重量体积或面积'+cur.value"
-                  />
-                </el-select>
-                <el-select key="重量体积或面积Operator"
-                  v-model="item.Operator"
-                  placeholder="请选择范围"
-                  style="width: 110px; margin-right: 10px"
-                  :disabled="formData.priority==0&&formType=='update'"
-                >
-                  <el-option
-                    :label="cur.label"
-                    :value="cur.value"
-                    v-for="cur in options.rangeOptions2"
-                    :key="'重量体积或面积Operator'+cur.value"
-                  />
-                </el-select>
-                <el-input key="重量体积或面积Value"
-                  v-model="item.Value"
-                  :placeholder="`请输入${
-                    item.ParamCode == 'Weight' ? '重量' : item.ParamCode == 'Area' ? '面积' : '体积'
-                  }`"
-                  clearable
-                  style="flex: 1"
-                  :disabled="formData.priority==0&&formType=='update'"
-                />
-              </el-form-item>
+<!--              <el-form-item key="重量体积或面积formItem" label="" label-width="0" class="err-240" v-if="index == 2">-->
+<!--                <el-select key="重量体积或面积"-->
+<!--                  v-model="item.ParamCode"-->
+<!--                  placeholder=""-->
+<!--                  @change="changeCalculation"-->
+<!--                  style="width: 110px; margin-right: 10px"-->
+<!--                  :disabled="formData.priority==0&&formType=='update'"-->
+<!--                >-->
+<!--                  <el-option-->
+<!--                    :label="cur.label"-->
+<!--                    :value="cur.value"-->
+<!--                    v-for="cur in options.calculationTypeOptions"-->
+<!--                    :key="'重量体积或面积'+cur.value"-->
+<!--                  />-->
+<!--                </el-select>-->
+<!--                <el-select key="重量体积或面积Operator"-->
+<!--                  v-model="item.Operator"-->
+<!--                  placeholder="请选择范围"-->
+<!--                  style="width: 110px; margin-right: 10px"-->
+<!--                  :disabled="formData.priority==0&&formType=='update'"-->
+<!--                >-->
+<!--                  <el-option-->
+<!--                    :label="cur.label"-->
+<!--                    :value="cur.value"-->
+<!--                    v-for="cur in options.rangeOptions2"-->
+<!--                    :key="'重量体积或面积Operator'+cur.value"-->
+<!--                  />-->
+<!--                </el-select>-->
+<!--                <el-input key="重量体积或面积Value"-->
+<!--                  v-model="item.Value"-->
+<!--                  :placeholder="`请输入${-->
+<!--                    item.ParamCode == 'Weight' ? '重量' : item.ParamCode == 'Area' ? '面积' : '体积'-->
+<!--                  }`"-->
+<!--                  clearable-->
+<!--                  style="flex: 1"-->
+<!--                  :disabled="formData.priority==0&&formType=='update'"-->
+<!--                />-->
+<!--              </el-form-item>-->
               <!-- 库存状态 -->
-              <el-form-item key="库存状态formItem" label="库存状态" class="err-120" v-if="index == 3">
-                <el-select key="库存状态Operator"
-                  v-model="item.Operator"
-                  placeholder="请选择范围"
-                  style="width: 110px; margin-right: 10px"
-                  :disabled="formData.priority==0&&formType=='update'"
-                >
-                  <el-option
-                    :label="cur.label"
-                    :value="cur.value"
-                    v-for="cur in options.rangeOptions1"
-                    :key="'库存状态Operator'+cur.value"
-                  />
-                </el-select>
-                <el-select key="库存状态Value"
-                  v-model="item.Value"
-                  placeholder="请选择库存状态"
-                  style="flex: 1"
-                  clearable
-                  multiple
-                  collapse-tags
-                  :disabled="formData.priority==0&&formType=='update'"
-                >
-                  <el-option
-                    v-for="cur in getStrDictOptions(DICT_TYPE.INVENTORY_STATUS)"
-                    :key="'库存状态Value'+cur.value"
-                    :label="cur.label"
-                    :value="cur.value"
-                  />
-                </el-select>
-              </el-form-item>
+<!--              <el-form-item key="库存状态formItem" label="库存状态" class="err-120" v-if="index == 3">-->
+<!--                <el-select key="库存状态Operator"-->
+<!--                  v-model="item.Operator"-->
+<!--                  placeholder="请选择范围"-->
+<!--                  style="width: 110px; margin-right: 10px"-->
+<!--                  :disabled="formData.priority==0&&formType=='update'"-->
+<!--                >-->
+<!--                  <el-option-->
+<!--                    :label="cur.label"-->
+<!--                    :value="cur.value"-->
+<!--                    v-for="cur in options.rangeOptions1"-->
+<!--                    :key="'库存状态Operator'+cur.value"-->
+<!--                  />-->
+<!--                </el-select>-->
+<!--                <el-select key="库存状态Value"-->
+<!--                  v-model="item.Value"-->
+<!--                  placeholder="请选择库存状态"-->
+<!--                  style="flex: 1"-->
+<!--                  clearable-->
+<!--                  multiple-->
+<!--                  collapse-tags-->
+<!--                  :disabled="formData.priority==0&&formType=='update'"-->
+<!--                >-->
+<!--                  <el-option-->
+<!--                    v-for="cur in getStrDictOptions(DICT_TYPE.INVENTORY_STATUS)"-->
+<!--                    :key="'库存状态Value'+cur.value"-->
+<!--                    :label="cur.label"-->
+<!--                    :value="cur.value"-->
+<!--                  />-->
+<!--                </el-select>-->
+<!--              </el-form-item>-->
               <!-- 存储类型 -->
-              <el-form-item key="存储类型formItem" label="存储类型" class="err-120" v-if="index == 4">
-                <el-select key="存储类型Operator"
-                  v-model="item.Operator"
-                  placeholder="请选择范围"
-                  style="width: 110px; margin-right: 10px"
-                  :disabled="formData.priority==0&&formType=='update'"
-                >
-                  <el-option
-                    :label="cur.label"
-                    :value="cur.value"
-                    v-for="cur in options.rangeOptions1"
-                    :key="'存储类型Operator'+cur.value"
-                  />
-                </el-select>
-                <el-select key="存储类型Value"
-                  v-model="item.Value"
-                  placeholder="请选择存储类型"
-                  style="flex: 1"
-                  clearable
-                  multiple
-                  collapse-tags
-                  :disabled="formData.priority==0&&formType=='update'"
-                >
-                  <el-option
-                    v-for="cur in getStrDictOptions(DICT_TYPE.STORAGE_TYPE)"
-                    :key="'存储类型Value'+cur.value"
-                    :label="cur.label"
-                    :value="cur.value"
-                  />
-                </el-select>
-              </el-form-item>
-              <!-- 库存事务 -->
-              <el-form-item key="库存事务formItem" label="库存事务" class="err-120" v-if="index == 5">
-                <el-select key="库存事务Operator"
+<!--              <el-form-item key="存储类型formItem" label="存储类型" class="err-120" v-if="index == 4">-->
+<!--                <el-select key="存储类型Operator"-->
+<!--                  v-model="item.Operator"-->
+<!--                  placeholder="请选择范围"-->
+<!--                  style="width: 110px; margin-right: 10px"-->
+<!--                  :disabled="formData.priority==0&&formType=='update'"-->
+<!--                >-->
+<!--                  <el-option-->
+<!--                    :label="cur.label"-->
+<!--                    :value="cur.value"-->
+<!--                    v-for="cur in options.rangeOptions1"-->
+<!--                    :key="'存储类型Operator'+cur.value"-->
+<!--                  />-->
+<!--                </el-select>-->
+<!--                <el-select key="存储类型Value"-->
+<!--                  v-model="item.Value"-->
+<!--                  placeholder="请选择存储类型"-->
+<!--                  style="flex: 1"-->
+<!--                  clearable-->
+<!--                  multiple-->
+<!--                  collapse-tags-->
+<!--                  :disabled="formData.priority==0&&formType=='update'"-->
+<!--                >-->
+<!--                  <el-option-->
+<!--                    v-for="cur in getStrDictOptions(DICT_TYPE.STORAGE_TYPE)"-->
+<!--                    :key="'存储类型Value'+cur.value"-->
+<!--                    :label="cur.label"-->
+<!--                    :value="cur.value"-->
+<!--                  />-->
+<!--                </el-select>-->
+<!--              </el-form-item>-->
+              <!-- 生产线 -->
+              <el-form-item key="生产线formItem" label="生产线" class="err-120" v-if="index == 5">
+                <el-select key="生产线Operator"
                   v-model="item.Operator"
                   placeholder="请选择范围"
                   style="width: 110px; margin-right: 10px"
@@ -320,16 +339,10 @@
                     :label="cur.label"
                     :value="cur.value"
                     v-for="cur in options.rangeOptions1"
-                    :key="'库存事务Operator'+cur.value"
+                    :key="'生产线Operator'+cur.value"
                   />
                 </el-select>
-                <!-- <el-input key="库存事务Value"
-                  v-model="item.Value"
-                  placeholder="请输入库存事务，多个库存事务以逗号分隔"
-                  clearable
-                  style="flex: 1"
-                /> -->
-                <el-input key="库存事务Value" style="flex:1" placeholder="请选择库存事务" disabled v-model="item.Value" @blur="blurTransactionType">
+                <el-input key="生产线Value" style="flex:1" placeholder="请选择生产线" disabled v-model="item.Value" @blur="blurTransactionType">
                     <template #suffix>
                       <el-button :disabled="formData.priority==0&&formType=='update'" type="text" plain style="color:var(--el-button-text-color)" @click="searchTransactionType">
                         <Icon icon="ep:search" class="mr-5px" /> 
@@ -544,91 +557,91 @@
               </el-form-item>
             </el-col>
             <!-- 优先整包 -->
-            <el-col :span="24">
-              <el-form-item key="优先整包formItem" label="优先整包">
-                <el-switch key="优先整包"
-                  v-model="formData.configuration.EntirePackageFirst"
-                  active-value="TRUE"
-                  inactive-value="FALSE"
-                />
-              </el-form-item>
-            </el-col>
+<!--            <el-col :span="24">-->
+<!--              <el-form-item key="优先整包formItem" label="优先整包">-->
+<!--                <el-switch key="优先整包"-->
+<!--                  v-model="formData.configuration.EntirePackageFirst"-->
+<!--                  active-value="TRUE"-->
+<!--                  inactive-value="FALSE"-->
+<!--                />-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
             <!-- 发料包装类型 -->
-            <el-col key="发料包装类型col" :span="24">
-              <el-form-item key="发料包装类型formItem" label="发料包装类型">
-                <div class="checkbox">
-                  <el-radio-group key="发料包装类型" v-model="formData.configuration.IssueStorageType">
-                    <el-radio
-                      :label="cur.value"
-                      v-for="cur in getStrDictOptions(DICT_TYPE.STORAGE_TYPE)"
-                      :key="'发料包装类型'+cur.value"
-                      >{{ cur.label }}</el-radio
-                    >
-                  </el-radio-group>
-                </div>
-              </el-form-item>
-            </el-col>
+<!--            <el-col key="发料包装类型col" :span="24">-->
+<!--              <el-form-item key="发料包装类型formItem" label="发料包装类型">-->
+<!--                <div class="checkbox">-->
+<!--                  <el-radio-group key="发料包装类型" v-model="formData.configuration.IssueStorageType">-->
+<!--                    <el-radio-->
+<!--                      :label="cur.value"-->
+<!--                      v-for="cur in getStrDictOptions(DICT_TYPE.STORAGE_TYPE)"-->
+<!--                      :key="'发料包装类型'+cur.value"-->
+<!--                      >{{ cur.label }}</el-radio-->
+<!--                    >-->
+<!--                  </el-radio-group>-->
+<!--                </div>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
             <!-- 多次发料 -->
-            <el-col key="多次发料col" :span="7">
-              <el-form-item key="多次发料formItem" label="多次发料">
-                <el-switch  key="多次发料"
-                  v-model="formData.configuration.IsSplit"
-                  active-value="TRUE"
-                  inactive-value="FALSE"
-                />
-              </el-form-item>
-            </el-col>
+<!--            <el-col key="多次发料col" :span="7">-->
+<!--              <el-form-item key="多次发料formItem" label="多次发料">-->
+<!--                <el-switch  key="多次发料"-->
+<!--                  v-model="formData.configuration.IsSplit"-->
+<!--                  active-value="TRUE"-->
+<!--                  inactive-value="FALSE"-->
+<!--                />-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
             <!-- 拆分次数 -->
-            <el-col key="拆分次数col" :span="8">
-              <el-form-item key="拆分次数formItem" label="拆分次数" label-width="70px">
-                <el-input-number key="拆分次数"
-                  v-model="formData.configuration.EachTimeQty"
-                  :min="0"
-                  controls-position="right"
-                />
-              </el-form-item>
-            </el-col>
+<!--            <el-col key="拆分次数col" :span="8">-->
+<!--              <el-form-item key="拆分次数formItem" label="拆分次数" label-width="70px">-->
+<!--                <el-input-number key="拆分次数"-->
+<!--                  v-model="formData.configuration.EachTimeQty"-->
+<!--                  :min="0"-->
+<!--                  controls-position="right"-->
+<!--                />-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
             <!-- 时间间隔 -->
-            <el-col key="时间间隔col" :span="9">
-              <el-form-item key="时间间隔formItem" label="时间间隔" label-width="70px">
-                <el-input-number key="时间间隔"
-                  v-model="formData.configuration.TimeInterval"
-                  :min="0"
-                  style="flex: 1; margin-right: 10px"
-                  controls-position="right"
-                />小时
-              </el-form-item>
-            </el-col>
+<!--            <el-col key="时间间隔col" :span="9">-->
+<!--              <el-form-item key="时间间隔formItem" label="时间间隔" label-width="70px">-->
+<!--                <el-input-number key="时间间隔"-->
+<!--                  v-model="formData.configuration.TimeInterval"-->
+<!--                  :min="0"-->
+<!--                  style="flex: 1; margin-right: 10px"-->
+<!--                  controls-position="right"-->
+<!--                />小时-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
             <!-- 使用整理库位-->
-            <el-col key="使用整理库位col" :span="24">
-              <el-form-item key="使用整理库位formItem" label="使用整理库位">
-                <el-switch key="使用整理库位"
-                  v-model="formData.configuration.UseOrganizeLocation"
-                  active-value="TRUE"
-                  inactive-value="FALSE"
-                />
-              </el-form-item>
-            </el-col>
+<!--            <el-col key="使用整理库位col" :span="24">-->
+<!--              <el-form-item key="使用整理库位formItem" label="使用整理库位">-->
+<!--                <el-switch key="使用整理库位"-->
+<!--                  v-model="formData.configuration.UseOrganizeLocation"-->
+<!--                  active-value="TRUE"-->
+<!--                  inactive-value="FALSE"-->
+<!--                />-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
             <!-- 使用在途库位 -->
-            <el-col key="使用在途库位col" :span="24">
-              <el-form-item key="使用在途库位formItem"  label="使用在途库位">
-                <el-switch key="使用在途库位"
-                  v-model="formData.configuration.UseTransportLocation"
-                  active-value="TRUE"
-                  inactive-value="FALSE"
-                />
-              </el-form-item>
-            </el-col>
+<!--            <el-col key="使用在途库位col" :span="24">-->
+<!--              <el-form-item key="使用在途库位formItem"  label="使用在途库位">-->
+<!--                <el-switch key="使用在途库位"-->
+<!--                  v-model="formData.configuration.UseTransportLocation"-->
+<!--                  active-value="TRUE"-->
+<!--                  inactive-value="FALSE"-->
+<!--                />-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
             <!-- 生成接收任务 -->
-            <el-col key="生成接收任务col" :span="24">
-              <el-form-item key="生成接收任务formItem" label="生成接收任务">
-                <el-switch key="生成接收任务"
-                  v-model="formData.configuration.CreateReceiptJob"
-                  active-value="TRUE"
-                  inactive-value="FALSE"
-                />
-              </el-form-item>
-            </el-col>
+<!--            <el-col key="生成接收任务col" :span="24">-->
+<!--              <el-form-item key="生成接收任务formItem" label="生成接收任务">-->
+<!--                <el-switch key="生成接收任务"-->
+<!--                  v-model="formData.configuration.CreateReceiptJob"-->
+<!--                  active-value="TRUE"-->
+<!--                  inactive-value="FALSE"-->
+<!--                />-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
           </el-row>
         </div>
       </el-form>
@@ -665,9 +678,8 @@ import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/l
 import { isString } from '@/utils/is'
 import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
 import * as TransactiontypeApi from '@/api/wms/transactiontype'
-import { Transactiontype } from '@/views/wms/basicDataManage/documentSetting/transactiontype/transactiontype.data'
-
-
+import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data'
+import * as ProductionlineApi from '@/api/wms/productionline'
 
 
 const { t } = useI18n() // 国际化
@@ -693,18 +705,10 @@ const formData = ref({
   status: true, //状态
   //规则条件集合
   condition: [
-    // 供应商
-    { ParamCode: 'SupplierCode', Operator: 'IN', Value: '' },
     // 物料类型/物料分组/物料/abc类/项目/
     { ParamCode: 'ItemType', Operator: 'IN', Value: '' },
-    // 重量/体积/面积
-    { ParamCode: 'Weight', Operator: '>', Value: [] },
-    // 库存状态
-    { ParamCode: 'InventoryStatus', Operator: 'IN', Value: [] },
-    // 存储类型
-    { ParamCode: 'StorageType', Operator: 'IN', Value: [] },
-    // 库存事务
-    { ParamCode: 'TransactionType', Operator: 'IN', Value: '' }
+    // 生产线
+    { ParamCode: 'Productionline', Operator: 'IN', Value: '' }
   ],
   configuration: {
     // 仓库代码
@@ -789,7 +793,8 @@ const options = reactive({
     { value: 'ItemGroup', label: '物料分组' },
     { value: 'ItemCode', label: '物料' },
     { value: 'Project', label: '项目' },
-    { value: 'AbcClass', label: 'ABC类' }
+    { value: 'AbcClass', label: 'ABC类' },
+    { value: 'ItemStatus', label: '物料状态' }
   ],
   // 重量体积面积类型列表
   calculationTypeOptions: [
@@ -1007,10 +1012,10 @@ const blurWarehouse = async ()=>{
 //事务类型
 const searchTransactionType = ()=>{
   searchTableRef.value.open(
-    '请选择事务类型',
-    Transactiontype.allSchemas,
-    TransactiontypeApi.getTransactiontypePage,
-    'TransactionType',
+    '请选择生产线',
+    Productionline.allSchemas,
+    ProductionlineApi.getProductionlinePage,
+    'Productionline',
     'code',
     true,
     undefined,
@@ -1096,8 +1101,8 @@ const searchWarehouse = ()=>{
   
 }
 const searchTableSuccess = (formField, searchField, val, type, row) => {
-  if(formField=='TransactionType'){
-    let transactionType = formData.value.condition.find(item=>item['ParamCode']=='TransactionType')
+  if(formField=='Productionline'){
+    let transactionType = formData.value.condition.find(item=>item['ParamCode']=='Productionline')
     if(transactionType){
       transactionType.Value = val.map(item=>(item['code'])).join(',')
     }
@@ -1164,11 +1169,14 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       if (data.condition) {
         formData.value.condition = JSON.parse(data.condition)
         formData.value.condition.forEach((item, index) => {
+          console.log(item)
           if ((item.Operator == 'IN' || item.Operator == 'NOT IN')&& Array.isArray(item.Value)) {
+            console.log(item.Value)
             item.Value = item.Value.split(',')
           }
         })
       }
+      console.log(formData.value.condition)
       if (data.configuration) {
         formData.value.configuration = JSON.parse(data.configuration)
       }
@@ -1298,8 +1306,8 @@ const resetForm = () => {
       { ParamCode: 'InventoryStatus', Operator: 'IN', Value: [] },
       // 存储类型
       { ParamCode: 'StorageType', Operator: 'IN', Value: [] },
-      // 库存事务
-      { ParamCode: 'TransactionType', Operator: 'IN', Value: '' }
+      // 生产线
+      { ParamCode: 'Productionline', Operator: 'IN', Value: '' }
     ],
 
     configuration: {