sfms3.0
/
sfms3.0-ui
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

策略单选变成多选

master
zhang_li 12 months ago
parent
6ce4a3a574
commit
36502beb51
12 changed files with 1423 additions and 568 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue
  2. 268
      src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue
  3. 604
      src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
  4. 2
      src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue
  5. 344
      src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue
  6. 2
      src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue
  7. 245
      src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue
  8. 14
      src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue
  9. 8
      src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue
  10. 26
      src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
  11. 198
      src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/AddForm.vue
  12. 4
      src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue

2
src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue
View File

@ -106,6 +106,8 @@
placeholder="请选择供应商"
style="flex: 1"
clearable
multiple
collapse-tags
>
<el-option
v-for="cur in options.supplierList"

268
src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue
View File

@ -1,15 +1,26 @@
<!-- 批次策略弹窗 -->
<template>
<Dialog :title="dialogTitle" v-model="dialogVisible" style="width:800px;">
<div class="p-20px m--10px" style="max-height: 50vh;overflow-y: auto;">
<el-form ref="formRef" :model="formData" :rules="rules" label-width="120px" label-position="left">
<Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 800px">
<div class="p-20px m--10px" style="max-height: 50vh; 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>
<el-col :span="24">
<el-form-item label="代码" prop="strategyCode">
<el-input v-model="formData.strategyCode" placeholder="请输入代码" clearable disabled />
<el-input
v-model="formData.strategyCode"
placeholder="请输入代码"
clearable
disabled
/>
</el-form-item>
</el-col>
<el-col :span="24">
@ -42,47 +53,127 @@
<el-col :span="24" v-for="(item, index) in formData.condition" :key="index">
<!-- 选择供应商和客户 -->
<el-form-item label="" label-width="0" class="err-240" v-if="index == 0">
<el-select v-model="item.ParamCode" placeholder="" style="width: 110px;margin-right: 10px;"
@change="changeSupplierCustomer">
<el-option :label="cur.label" :value="cur.value" v-for="(cur, index) in options.typeOptions"
:key="index" />
<el-select
v-model="item.ParamCode"
placeholder=""
style="width: 110px; margin-right: 10px"
@change="changeSupplierCustomer"
>
<el-option
:label="cur.label"
:value="cur.value"
v-for="(cur, index) in options.typeOptions"
:key="index"
/>
</el-select>
<el-select v-model="item.Operator" placeholder="请选择范围" style="width: 110px;;margin-right: 10px;">
<el-option :label="cur.label" :value="cur.value" v-for="cur in options.rangeOptions1"
:key="cur.value" />
<el-select
v-model="item.Operator"
placeholder="请选择范围"
style="width: 110px; margin-right: 10px"
>
<el-option
:label="cur.label"
:value="cur.value"
v-for="cur in options.rangeOptions1"
:key="cur.value"
/>
</el-select>
<el-select v-model="item.Value" :placeholder="`请选择${item.ParamCode == 'SupplierCode' ? '供应商' : '客户'}`"
style="flex: 1;" clearable>
<el-option v-for="cur in options.supplierList" :key="cur.id" :label="cur.name" :value="cur.id" />
<el-select
v-model="item.Value"
:placeholder="`请选择${item.ParamCode == 'SupplierCode' ? '供应商' : '客户'}`"
style="flex: 1"
clearable
multiple
collapse-tags
>
<el-option
v-for="cur in options.supplierList"
:key="cur.id"
:label="cur.name"
:value="cur.id"
/>
</el-select>
</el-form-item>
<!-- 选择物品类型 -->
<el-form-item label="" label-width="0" class="err-240" v-if="index == 1">
<el-select v-model="item.ParamCode" placeholder="" @change="changeItemsType"
style="width: 110px;margin-right: 10px;">
<el-option :label="item.label" :value="item.value" v-for="item in options.itemTypeOptions"
:key="item.value" />
<el-select
v-model="item.ParamCode"
placeholder=""
@change="changeItemsType"
style="width: 110px; margin-right: 10px"
>
<el-option
:label="item.label"
:value="item.value"
v-for="item in options.itemTypeOptions"
:key="item.value"
/>
</el-select>
<el-select v-model="item.Operator" placeholder="请选择范围" style="width: 110px;;margin-right: 10px;">
<el-option :label="cur.label" :value="cur.value" v-for="cur in options.rangeOptions1"
:key="cur.value" />
<el-select
v-model="item.Operator"
placeholder="请选择范围"
style="width: 110px; margin-right: 10px"
>
<el-option
:label="cur.label"
:value="cur.value"
v-for="cur in options.rangeOptions1"
:key="cur.value"
/>
</el-select>
<el-select v-model="item.Value" placeholder="请选择物品类型" style="flex: 1;" clearable
v-if="item.ParamCode == 'ItemType'">
<el-option v-for="cur in getStrDictOptions(DICT_TYPE.ITEM_TYPE)" :key="cur.value" :label="cur.label"
:value="cur.value" />
<el-select
v-model="item.Value"
placeholder="请选择物品类型"
style="flex: 1"
clearable
multiple
collapse-tags
v-if="item.ParamCode == 'ItemType'"
>
<el-option
v-for="cur in getStrDictOptions(DICT_TYPE.ITEM_TYPE)"
:key="cur.value"
:label="cur.label"
:value="cur.value"
/>
</el-select>
<el-select v-model="item.Value" placeholder="请选择ABC类" style="flex: 1;" clearable
v-else-if="item.ParamCode == 'AbcClass'">
<el-option v-for="cur in getStrDictOptions(DICT_TYPE.ABC_CLASS)" :key="cur.value" :label="cur.label"
:value="cur.value" />
<el-select
v-model="item.Value"
placeholder="请选择ABC类"
style="flex: 1"
clearable
multiple
collapse-tags
v-else-if="item.ParamCode == 'AbcClass'"
>
<el-option
v-for="cur in getStrDictOptions(DICT_TYPE.ABC_CLASS)"
:key="cur.value"
:label="cur.label"
:value="cur.value"
/>
</el-select>
<el-input v-model="item.Value" placeholder="请输入物品分组" clearable style="flex: 1;"
v-else-if="item.ParamCode == 'ItemGroup'" />
<el-input v-model="item.Value" placeholder="请输入项目" clearable style="flex: 1;"
v-else-if="item.ParamCode == 'Project'" />
<el-input v-model="item.Value" placeholder="请输入物品" clearable style="flex: 1;"
v-else-if="item.ParamCode == 'ItemCode'" />
<el-input
v-model="item.Value"
placeholder="请输入物品分组，多个物品分组以逗号分隔"
clearable
style="flex: 1"
v-else-if="item.ParamCode == 'ItemGroup'"
/>
<el-input
v-model="item.Value"
placeholder="请输入项目，多个项目以逗号分隔"
clearable
style="flex: 1"
v-else-if="item.ParamCode == 'Project'"
/>
<el-input
v-model="item.Value"
placeholder="请输入物品，多个物品以逗号分隔"
clearable
style="flex: 1"
v-else-if="item.ParamCode == 'ItemCode'"
/>
</el-form-item>
</el-col>
</el-row>
@ -94,37 +185,61 @@
<el-col :span="24">
<!-- 存储类型 -->
<el-form-item label="" label-width="0" class="flex-top" prop="configurationRules">
<div style="width: 100%;display:flex;align-items:center;margin-bottom:10px"
v-for="(cur, key) in formData.configuration.ManagementPrecision" :key="key">
<div style="width: 26px;display: flex;">
<Icon icon="ep:remove" color="#757575" size="26" style="cursor: pointer;"
@click="handleDeleteTable(formData.configuration.ManagementPrecision, cur, key)" v-if="formData?.configuration?.ManagementPrecision?.length > 1" />
<div
style="width: 100%; display: flex; align-items: center; margin-bottom: 10px"
v-for="(cur, key) in formData.configuration.ManagementPrecision"
:key="key"
>
<div style="width: 26px; display: flex">
<Icon
icon="ep:remove"
color="#757575"
size="26"
style="cursor: pointer"
@click="
handleDeleteTable(formData.configuration.ManagementPrecision, cur, key)
"
v-if="formData?.configuration?.ManagementPrecision?.length > 1"
/>
</div>
<div class="flex w-[28%]">
<div class="ml-10px mr-10px">批次类型</div>
<el-select v-model="cur.BatchType" placeholder="请选择批次类型" style="flex: 1">
<el-option v-for="it in getStrDictOptions(DICT_TYPE.BATCH_TYPE)" :key="it.value" :label="it.label"
:value="it.value" />
<el-option
v-for="it in getStrDictOptions(DICT_TYPE.BATCH_TYPE)"
:key="it.value"
:label="it.label"
:value="it.value"
/>
</el-select>
</div>
<div class="flex w-[28%]">
<div class="ml-10px mr-10px">批次格式</div>
<el-input v-model="cur.BatchFormat" placeholder="yyyyMMDD" clearable style="flex:1"
@blur="inputBlur" />
<el-input
v-model="cur.BatchFormat"
placeholder="yyyyMMDD"
clearable
style="flex: 1"
@blur="inputBlur"
/>
</div>
<div class="flex" style="flex: 1">
<div class="ml-10px mr-10px">批次方向</div>
<div class="checkbox">
<el-radio-group v-model="cur.BatchDirection">
<el-radio :label="cur.value" v-for="cur in getStrDictOptions(DICT_TYPE.BATCH_DIRECTION)"
:key="cur.value">{{ cur.label }}</el-radio>
<el-radio
:label="cur.value"
v-for="cur in getStrDictOptions(DICT_TYPE.BATCH_DIRECTION)"
:key="cur.value"
>{{ cur.label }}</el-radio
>
</el-radio-group>
</div>
</div>
</div>
<div class="button flex">
<div @click="handleAddTable(formData.configuration.ManagementPrecision)">
<Icon icon="ep:circle-plus" color="#409eff" size="26" style="cursor: pointer;" />
<Icon icon="ep:circle-plus" color="#409eff" size="26" style="cursor: pointer" />
<div>添加条件</div>
</div>
</div>
@ -158,7 +273,6 @@ const formLoading = ref(false) // 表单的加载中：1）修改时的数据加
const formType = ref('') // 表单的类型：create - 新增；update - 修改
const formRef = ref() // 表单 Ref
const formStrategyCode = ref('')
// form表单数据
const formData = ref({
@ -171,20 +285,21 @@ const formData = ref({
//规则条件集合
condition: [
// 供应商
{ ParamCode: 'SupplierCode', Operator: "IN", Value: "" },
{ ParamCode: 'SupplierCode', Operator: 'IN', Value: '' },
// 物品类型/物品分组/物品/abc类/项目/
{ ParamCode: 'ItemType', Operator: "IN", Value: "" },
{ ParamCode: 'ItemType', Operator: 'IN', Value: '' }
],
configuration: {
// 管理精度
ManagementPrecision:[{
ManagementPrecision: [
{
BatchType: 'ARRIVE_TIME',
BatchFormat: '',
BatchDirection: 'ASC',
}]
BatchDirection: 'ASC'
}
]
},
configurationRules: '1' //规则配置验证
})
// 验证规则
const rules = ref({
@ -192,8 +307,7 @@ const rules = ref({
name: [{ required: true, message: '请输入名字', trigger: 'blur' }],
description: [{ required: true, message: '请输入描述', trigger: 'blur' }],
priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }],
configurationRules: [{ required: true, message: '规则配置请填写完全', trigger: 'blur' }],
configurationRules: [{ required: true, message: '规则配置请填写完全', trigger: 'blur' }]
})
// 所有的范围类型
@ -207,11 +321,11 @@ const rangeOptions = [
{ value: 'IN', label: '包含' },
{ value: 'NOT IN', label: '不包含' },
{ value: 'NULL', label: '为空' },
{ value: 'NOT NULL', label: '不为空' },
{ value: 'NOT NULL', label: '不为空' }
]
const formatRangeOptions = (...rest) => {
// 交集
let result = rangeOptions.filter(aItem => rest.some(bItem => aItem.value === bItem));
let result = rangeOptions.filter((aItem) => rest.some((bItem) => aItem.value === bItem))
return result
}
@ -221,12 +335,20 @@ const options = reactive({
rangeOptions1: formatRangeOptions('IN', 'NOT IN'),
rangeOptions2: formatRangeOptions('IN'),
// 供应商客户下拉框列表
typeOptions: [{ value: 'SupplierCode', label: '供应商' }, { value: 'CustomerCode', label: '客户' }],
typeOptions: [
{ value: 'SupplierCode', label: '供应商' },
{ value: 'CustomerCode', label: '客户' }
],
//供应商列表
supplierList: [],
// 物品类型列表
itemTypeOptions: [{ value: 'ItemType', label: '物品类型' }, { value: 'ItemGroup', label: '物品分组' }, { value: 'ItemCode', label: '物品' }, { value: 'Project', label: '项目' }, { value: 'AbcClass', label: 'ABC类' }],
itemTypeOptions: [
{ value: 'ItemType', label: '物品类型' },
{ value: 'ItemGroup', label: '物品分组' },
{ value: 'ItemCode', label: '物品' },
{ value: 'Project', label: '项目' },
{ value: 'AbcClass', label: 'ABC类' }
]
})
// 弹窗按钮
const Butttondata = ref([
@ -246,11 +368,11 @@ const buttonBaseClick = (val, item) => {
}
// 获取供应商列表
const getFormSupplierList = async () => {
options.supplierList = await getSupplierList();
options.supplierList = await getSupplierList()
}
// 获取客户列表
const getFormCustomerList = async () => {
options.supplierList = await getCustomerList();
options.supplierList = await getCustomerList()
}
// 选择客户还是承运商
const changeSupplierCustomer = (e) => {
@ -373,17 +495,19 @@ const resetForm = () => {
//规则条件集合
condition: [
// 供应商
{ ParamCode: 'SupplierCode', Operator: "IN", Value: "" },
{ ParamCode: 'SupplierCode', Operator: 'IN', Value: '' },
// 物品类型/物品分组/物品/abc类/项目/
{ ParamCode: 'ItemType', Operator: "IN", Value: "" },
{ ParamCode: 'ItemType', Operator: 'IN', Value: '' }
],
configuration: {
// 管理精度
ManagementPrecision:[{
ManagementPrecision: [
{
BatchType: 'ARRIVE_TIME',
BatchFormat: '',
BatchDirection: 'ASC',
}]
BatchDirection: 'ASC'
}
]
},
configurationRules: '1' //规则配置验证
}
@ -394,7 +518,7 @@ const handleAddTable = (item) => {
item.push({
BatchType: 'ARRIVE_TIME',
BatchFormat: '',
BatchDirection: 'ASC',
BatchDirection: 'ASC'
})
}
// 删除规则配置
@ -404,7 +528,7 @@ const handleDeleteTable = (item, cur, key) => {
//失去焦点的时候验证
const inputBlur = () => {
let arr = []
formData.value.configuration.ManagementPrecision.forEach(item => {
formData.value.configuration.ManagementPrecision.forEach((item) => {
let bol = false
if (!item.BatchFormat) {
bol = false
@ -413,12 +537,12 @@ const inputBlur = () => {
}
arr.push(bol)
})
const isEmpty = arr.some(cur => {
const isEmpty = arr.some((cur) => {
return !cur
})
if (isEmpty) {
formData.value.configurationRules = ''
return;
return
} else {
formData.value.configurationRules = '1'
}

604
src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
View File

@ -1,15 +1,26 @@
<!-- 下架策略弹窗 -->
<template>
<Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px;">
<div class="p-20px m--10px" style="max-height: 50vh;overflow-y: auto;">
<el-form ref="formRef" :model="formData" :rules="rules" label-width="120px" label-position="left">
<Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px">
<div class="p-20px m--10px" style="max-height: 50vh; 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 v-model="formData.strategyCode" placeholder="请输入代码" clearable disabled />
<el-input
v-model="formData.strategyCode"
placeholder="请输入代码"
clearable
disabled
/>
</el-form-item>
</el-col>
<el-col :span="24">
@ -43,92 +54,244 @@
<el-col :span="24" v-for="(item, index) in formData.condition" :key="index">
<!-- 选择供应商和客户 -->
<el-form-item label="" label-width="0" class="err-240" v-if="index == 0">
<el-select v-model="item.ParamCode" placeholder="" style="width: 110px;margin-right: 10px;"
@change="changeSupplierCustomer">
<el-option :label="cur.label" :value="cur.value" v-for="(cur, index) in options.typeOptions"
:key="index" />
<el-select
v-model="item.ParamCode"
placeholder=""
style="width: 110px; margin-right: 10px"
@change="changeSupplierCustomer"
>
<el-option
:label="cur.label"
:value="cur.value"
v-for="(cur, index) in options.typeOptions"
:key="index"
/>
</el-select>
<el-select v-model="item.Operator" placeholder="请选择范围" style="width: 110px;;margin-right: 10px;">
<el-option :label="cur.label" :value="cur.value" v-for="cur in options.rangeOptions1"
:key="cur.value" />
<el-select
v-model="item.Operator"
placeholder="请选择范围"
style="width: 110px; margin-right: 10px"
>
<el-option
:label="cur.label"
:value="cur.value"
v-for="cur in options.rangeOptions1"
:key="cur.value"
/>
</el-select>
<el-select v-model="item.Value" :placeholder="`请选择${item.ParamCode == 'SupplierCode' ? '供应商' : '客户'}`"
style="flex: 1;" clearable>
<el-option v-for="cur in options.supplierList" :key="cur.id" :label="cur.name" :value="cur.id" />
<el-select
v-model="item.Value"
:placeholder="`请选择${item.ParamCode == 'SupplierCode' ? '供应商' : '客户'}`"
style="flex: 1"
clearable
multiple
collapse-tags
>
<el-option
v-for="cur in options.supplierList"
:key="cur.id"
:label="cur.name"
:value="cur.id"
/>
</el-select>
</el-form-item>
<!-- 选择物品类型 -->
<el-form-item label="" label-width="0" class="err-240" v-if="index == 1">
<el-select v-model="item.ParamCode" placeholder="" @change="changeItemsType"
style="width: 110px;margin-right: 10px;">
<el-option :label="item.label" :value="item.value" v-for="item in options.itemTypeOptions"
:key="item.value" />
<el-select
v-model="item.ParamCode"
placeholder=""
@change="changeItemsType"
style="width: 110px; margin-right: 10px"
>
<el-option
:label="item.label"
:value="item.value"
v-for="item in options.itemTypeOptions"
:key="item.value"
/>
</el-select>
<el-select v-model="item.Operator" placeholder="请选择范围" style="width: 110px;;margin-right: 10px;">
<el-option :label="cur.label" :value="cur.value" v-for="cur in options.rangeOptions1"
:key="cur.value" />
<el-select
v-model="item.Operator"
placeholder="请选择范围"
style="width: 110px; margin-right: 10px"
>
<el-option
:label="cur.label"
:value="cur.value"
v-for="cur in options.rangeOptions1"
:key="cur.value"
/>
</el-select>
<el-select v-model="item.Value" placeholder="请选择物品类型" style="flex: 1;" clearable
v-if="item.ParamCode == 'ItemType'">
<el-option v-for="cur in getStrDictOptions(DICT_TYPE.ITEM_TYPE)" :key="cur.value" :label="cur.label"
:value="cur.value" />
<el-select
v-model="item.Value"
placeholder="请选择物品类型"
style="flex: 1"
clearable
multiple
collapse-tags
v-if="item.ParamCode == 'ItemType'"
>
<el-option
v-for="cur in getStrDictOptions(DICT_TYPE.ITEM_TYPE)"
:key="cur.value"
:label="cur.label"
:value="cur.value"
/>
</el-select>
<el-select v-model="item.Value" placeholder="请选择ABC类" style="flex: 1;" clearable
v-else-if="item.ParamCode == 'AbcClass'">
<el-option v-for="cur in getStrDictOptions(DICT_TYPE.ABC_CLASS)" :key="cur.value" :label="cur.label"
:value="cur.value" />
<el-select
v-model="item.Value"
placeholder="请选择ABC类"
style="flex: 1"
clearable
multiple
collapse-tags
v-else-if="item.ParamCode == 'AbcClass'"
>
<el-option
v-for="cur in getStrDictOptions(DICT_TYPE.ABC_CLASS)"
:key="cur.value"
:label="cur.label"
:value="cur.value"
/>
</el-select>
<el-input v-model="item.Value" placeholder="请输入物品分组" clearable style="flex: 1;"
v-else-if="item.ParamCode == 'ItemGroup'" />
<el-input v-model="item.Value" placeholder="请输入项目" clearable style="flex: 1;"
v-else-if="item.ParamCode == 'Project'" />
<el-input v-model="item.Value" placeholder="请输入物品" clearable style="flex: 1;"
v-else-if="item.ParamCode == 'ItemCode'" />
<el-input
v-model="item.Value"
placeholder="请输入物品分组，多个物品分组以逗号分隔"
clearable
style="flex: 1"
v-else-if="item.ParamCode == 'ItemGroup'"
/>
<el-input
v-model="item.Value"
placeholder="请输入项目，多个项目以逗号分隔"
clearable
style="flex: 1"
v-else-if="item.ParamCode == 'Project'"
/>
<el-input
v-model="item.Value"
placeholder="请输入物品，多个物品以逗号分隔"
clearable
style="flex: 1"
v-else-if="item.ParamCode == 'ItemCode'"
/>
</el-form-item>
<!-- 选择重量体积还是面积 -->
<el-form-item label="" label-width="0" class="err-240" v-if="index == 2">
<el-select v-model="item.ParamCode" placeholder="" @change="changeCalculation"
style="width: 110px;margin-right: 10px;">
<el-option :label="cur.label" :value="cur.value" v-for="cur in options.calculationTypeOptions"
:key="cur.value" />
<el-select
v-model="item.ParamCode"
placeholder=""
@change="changeCalculation"
style="width: 110px; margin-right: 10px"
>
<el-option
:label="cur.label"
:value="cur.value"
v-for="cur in options.calculationTypeOptions"
:key="cur.value"
/>
</el-select>
<el-select v-model="item.Operator" placeholder="请选择范围" style="width: 110px;;margin-right: 10px;">
<el-option :label="cur.label" :value="cur.value" v-for="cur in options.rangeOptions2"
:key="cur.value" />
<el-select
v-model="item.Operator"
placeholder="请选择范围"
style="width: 110px; margin-right: 10px"
>
<el-option
:label="cur.label"
:value="cur.value"
v-for="cur in options.rangeOptions2"
:key="cur.value"
/>
</el-select>
<el-input v-model="item.Value"
:placeholder="`请输入${item.ParamCode == 'Weight' ? '重量' : item.ParamCode == 'Area' ? '面积' : '体积'}`"
clearable style="flex: 1;" />
<el-input
v-model="item.Value"
:placeholder="`请输入${
item.ParamCode == 'Weight' ? '重量' : item.ParamCode == 'Area' ? '面积' : '体积'
}`"
clearable
style="flex: 1"
/>
</el-form-item>
<!-- 库存状态 -->
<el-form-item label="库存状态" class="err-120" v-if="index == 3">
<el-select v-model="item.Operator" placeholder="请选择范围" style="width: 110px;;margin-right: 10px;">
<el-option :label="cur.label" :value="cur.value" v-for="cur in options.rangeOptions1"
:key="cur.value" />
<el-select
v-model="item.Operator"
placeholder="请选择范围"
style="width: 110px; margin-right: 10px"
>
<el-option
:label="cur.label"
:value="cur.value"
v-for="cur in options.rangeOptions1"
:key="cur.value"
/>
</el-select>
<el-select v-model="item.Value" placeholder="请选择库存状态" style="flex: 1;" clearable>
<el-option v-for="cur in getStrDictOptions(DICT_TYPE.INVENTORY_STATUS)" :key="cur.value"
:label="cur.label" :value="cur.value" />
<el-select
v-model="item.Value"
placeholder="请选择库存状态"
style="flex: 1"
clearable
multiple
collapse-tags
>
<el-option
v-for="cur in getStrDictOptions(DICT_TYPE.INVENTORY_STATUS)"
:key="cur.value"
:label="cur.label"
:value="cur.value"
/>
</el-select>
</el-form-item>
<!-- 存储类型 -->
<el-form-item label="存储类型" class="err-120" v-if="index == 4">
<el-select v-model="item.Operator" placeholder="请选择范围" style="width: 110px;;margin-right: 10px;">
<el-option :label="cur.label" :value="cur.value" v-for="cur in options.rangeOptions1"
:key="cur.value" />
<el-select
v-model="item.Operator"
placeholder="请选择范围"
style="width: 110px; margin-right: 10px"
>
<el-option
:label="cur.label"
:value="cur.value"
v-for="cur in options.rangeOptions1"
:key="cur.value"
/>
</el-select>
<el-select v-model="item.Value" placeholder="请选择存储类型" style="flex: 1;" clearable>
<el-option v-for="cur in getStrDictOptions(DICT_TYPE.STORAGE_TYPE)" :key="cur.value" :label="cur.label"
:value="cur.value" />
<el-select
v-model="item.Value"
placeholder="请选择存储类型"
style="flex: 1"
clearable
multiple
collapse-tags
>
<el-option
v-for="cur in getStrDictOptions(DICT_TYPE.STORAGE_TYPE)"
:key="cur.value"
:label="cur.label"
:value="cur.value"
/>
</el-select>
</el-form-item>
<!-- 库存事务 -->
<el-form-item label="库存事务" class="err-120" v-if="index == 5">
<el-select v-model="item.Operator" placeholder="请选择范围" style="width: 110px;margin-right: 10px;">
<el-option :label="cur.label" :value="cur.value" v-for="cur in options.rangeOptions1"
:key="cur.value" />
<el-select
v-model="item.Operator"
placeholder="请选择范围"
style="width: 110px; margin-right: 10px"
>
<el-option
:label="cur.label"
:value="cur.value"
v-for="cur in options.rangeOptions1"
:key="cur.value"
/>
</el-select>
<el-input v-model="item.Value" placeholder="请输入库存事务" clearable style="flex: 1;" />
<el-input
v-model="item.Value"
placeholder="请输入库存事务，多个库存事务以逗号分隔"
clearable
style="flex: 1"
/>
</el-form-item>
</el-col>
</el-row>
@ -140,23 +303,75 @@
<el-row gutter="10">
<el-col :span="24">
<el-form-item label="" label-width="0" prop="warehouse" class="err-120">
<el-select v-model="warehouseType" placeholder="" style="width: 110px;margin-right: 10px;"
@change="changeWarehouse">
<el-option :label="cur.label" :value="cur.value" v-for="(cur, index) in options.warehouseTypeOptions"
:key="index" />
<el-select
v-model="warehouseType"
placeholder=""
style="width: 110px; margin-right: 10px"
@change="changeWarehouse"
>
<el-option
:label="cur.label"
:value="cur.value"
v-for="(cur, index) in options.warehouseTypeOptions"
:key="index"
/>
</el-select>
<el-select v-model="formData.configuration.WarehouseCode" v-if="warehouseType == 'WarehouseCode'" placeholder="请选择仓库" clearable style="flex: 1;">
<el-option v-for="cur in options.warehouseList" :key="cur.code" :label="cur.name" :value="cur.code" />
<el-select
v-model="formData.configuration.WarehouseCode"
v-if="warehouseType == 'WarehouseCode'"
placeholder="请选择仓库"
clearable
style="flex: 1"
>
<el-option
v-for="cur in options.warehouseList"
:key="cur.code"
:label="cur.code"
:value="cur.code"
/>
</el-select>
<el-select v-model="formData.configuration.AreaCode" v-if="warehouseType == 'AreaCode'" placeholder="请选择库区" clearable style="flex: 1;">
<el-option v-for="cur in options.warehouseList" :key="cur.code" :label="cur.name" :value="cur.code" />
<el-select
v-model="formData.configuration.AreaCode"
v-if="warehouseType == 'AreaCode'"
placeholder="请选择库区"
clearable
style="flex: 1"
>
<el-option
v-for="cur in options.warehouseList"
:key="cur.code"
:label="cur.code"
:value="cur.code"
/>
</el-select>
<el-select v-model="formData.configuration.LocationGroupCode" v-if="warehouseType == 'LocationGroupCode'" placeholder="请选择库位组" clearable style="flex: 1;">
<el-option v-for="cur in options.warehouseList" :key="cur.code" :label="cur.name" :value="cur.code" />
<el-select
v-model="formData.configuration.LocationGroupCode"
v-if="warehouseType == 'LocationGroupCode'"
placeholder="请选择库位组"
clearable
style="flex: 1"
>
<el-option
v-for="cur in options.warehouseList"
:key="cur.code"
:label="cur.code"
:value="cur.code"
/>
</el-select>
<el-select v-model="formData.configuration.LocationCode" v-if="warehouseType == 'LocationCode'" placeholder="请选择库位" clearable style="flex: 1;">
<el-option v-for="cur in options.warehouseList" :key="cur.code" :label="cur.name" :value="cur.code" />
<el-select
v-model="formData.configuration.LocationCode"
v-if="warehouseType == 'LocationCode'"
placeholder="请选择库位"
clearable
style="flex: 1"
>
<el-option
v-for="cur in options.warehouseList"
:key="cur.code"
:label="cur.code"
:value="cur.code"
/>
</el-select>
</el-form-item>
</el-col>
@ -165,8 +380,12 @@
<el-form-item label="数量排序方向" class="flex-top">
<div class="checkbox">
<el-radio-group v-model="formData.configuration.QtyOrder">
<el-radio :label="cur.value" v-for="cur in options.sortOptions" :key="cur.value">{{
cur.label }}</el-radio>
<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>
@ -176,8 +395,12 @@
<el-form-item label="巷道排序方向" class="flex-top">
<div class="checkbox">
<el-radio-group 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
:label="cur.value"
v-for="cur in options.sortOptions"
:key="cur.value"
>{{ cur.label }}</el-radio
>
</el-radio-group>
</div>
</el-form-item>
@ -187,8 +410,12 @@
<el-form-item label="货架排序方向" class="flex-top">
<div class="checkbox">
<el-radio-group 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
:label="cur.value"
v-for="cur in options.sortOptions"
:key="cur.value"
>{{ cur.label }}</el-radio
>
</el-radio-group>
</div>
</el-form-item>
@ -198,8 +425,12 @@
<el-form-item label="行排序方向" class="flex-top">
<div class="checkbox">
<el-radio-group 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
:label="cur.value"
v-for="cur in options.sortOptions"
:key="cur.value"
>{{ cur.label }}</el-radio
>
</el-radio-group>
</div>
</el-form-item>
@ -209,8 +440,12 @@
<el-form-item label="列排序方向" class="flex-top">
<div class="checkbox">
<el-radio-group 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
:label="cur.value"
v-for="cur in options.sortOptions"
:key="cur.value"
>{{ cur.label }}</el-radio
>
</el-radio-group>
</div>
</el-form-item>
@ -218,7 +453,11 @@
<!-- 优先整包 -->
<el-col :span="24">
<el-form-item label="优先整包">
<el-switch v-model="formData.configuration.EntirePackageFirst" active-value="TRUE" inactive-value="FALSE"/>
<el-switch
v-model="formData.configuration.EntirePackageFirst"
active-value="TRUE"
inactive-value="FALSE"
/>
</el-form-item>
</el-col>
<!-- 发料包装类型 -->
@ -226,8 +465,12 @@
<el-form-item label="发料包装类型">
<div class="checkbox">
<el-radio-group 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
: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>
@ -235,38 +478,62 @@
<!-- 多次发料 -->
<el-col :span="7">
<el-form-item label="多次发料">
<el-switch v-model="formData.configuration.IsSplit" active-value="TRUE" inactive-value="FALSE"/>
<el-switch
v-model="formData.configuration.IsSplit"
active-value="TRUE"
inactive-value="FALSE"
/>
</el-form-item>
</el-col>
<!-- 拆分次数 -->
<el-col :span="8">
<el-form-item label="拆分次数" label-width="70px">
<el-input-number v-model="formData.configuration.EachTimeQty" :min="0" controls-position="right" />
<el-input-number
v-model="formData.configuration.EachTimeQty"
:min="0"
controls-position="right"
/>
</el-form-item>
</el-col>
<!-- 时间间隔 -->
<el-col :span="9">
<el-form-item label="时间间隔" label-width="70px">
<el-input-number v-model="formData.configuration.TimeInterval" :min="0" style="flex:1;margin-right:10px"
controls-position="right" />小时
<el-input-number
v-model="formData.configuration.TimeInterval"
:min="0"
style="flex: 1; margin-right: 10px"
controls-position="right"
/>小时
</el-form-item>
</el-col>
<!-- 使用整理库位-->
<el-col :span="24">
<el-form-item label="使用整理库位">
<el-switch v-model="formData.configuration.UseOrganizeLocation" active-value="TRUE" inactive-value="FALSE"/>
<el-switch
v-model="formData.configuration.UseOrganizeLocation"
active-value="TRUE"
inactive-value="FALSE"
/>
</el-form-item>
</el-col>
<!-- 使用在途库位 -->
<el-col :span="24">
<el-form-item label="使用在途库位">
<el-switch v-model="formData.configuration.UseTransportLocation" active-value="TRUE" inactive-value="FALSE"/>
<el-switch
v-model="formData.configuration.UseTransportLocation"
active-value="TRUE"
inactive-value="FALSE"
/>
</el-form-item>
</el-col>
<!-- 生成接收任务 -->
<el-col :span="24">
<el-form-item label="生成接收任务">
<el-switch v-model="formData.configuration.CreateReceiptJob" active-value="TRUE" inactive-value="FALSE"/>
<el-switch
v-model="formData.configuration.CreateReceiptJob"
active-value="TRUE"
inactive-value="FALSE"
/>
</el-form-item>
</el-col>
</el-row>
@ -292,7 +559,6 @@ import * as RuleApi from '@/api/wms/rule'
import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
const { t } = useI18n() // 国际化
const message = useMessage() // 消息弹窗
@ -302,7 +568,6 @@ const formLoading = ref(false) // 表单的加载中：1）修改时的数据加
const formType = ref('') // 表单的类型：create - 新增；update - 修改
const formRef = ref() // 表单 Ref
const formStrategyCode = ref('')
// 仓库类型
const warehouseType = ref('WarehouseCode')
@ -318,53 +583,53 @@ const formData = ref({
//规则条件集合
condition: [
// 供应商
{ ParamCode: 'SupplierCode', Operator: "IN", Value: "" },
{ ParamCode: 'SupplierCode', Operator: 'IN', Value: '' },
// 物品类型/物品分组/物品/abc类/项目/
{ ParamCode: 'ItemType', Operator: "IN", Value: "" },
{ ParamCode: 'ItemType', Operator: 'IN', Value: '' },
// 重量/体积/面积
{ ParamCode: 'Weight', Operator: ">", Value: [] },
{ ParamCode: 'Weight', Operator: '>', Value: [] },
// 库存状态
{ ParamCode: 'InventoryStatus', Operator: "IN", Value: [] },
{ ParamCode: 'InventoryStatus', Operator: 'IN', Value: [] },
// 存储类型
{ ParamCode: 'StorageType', Operator: "IN", Value: [] },
{ ParamCode: 'StorageType', Operator: 'IN', Value: [] },
// 库存事务
{ ParamCode: 'TransactionType', Operator: "IN", Value: [] }
{ ParamCode: 'TransactionType', Operator: 'IN', Value: [] }
],
configuration: {
// 仓库代码
WarehouseCode:"",
WarehouseCode: '',
// 库区代码
AreaCode:"",
AreaCode: '',
// 库位组代码
LocationGroupCode:"",
LocationGroupCode: '',
// 库位代码
LocationCode:"",
LocationCode: '',
// 数量排序方向
QtyOrder:"ASC",
QtyOrder: 'ASC',
// 巷道排序方向
AisleOrder:"ASC",
AisleOrder: 'ASC',
// 货架排序方向
ShelfOrder:"ASC",
ShelfOrder: 'ASC',
// 行排序方向
RowOrder:"ASC",
RowOrder: 'ASC',
// 列排序方向
ColumOrder:"ASC",
ColumOrder: 'ASC',
// 优先整包
EntirePackageFirst: 'FALSE',
// 发料包装类型
IssueStorageType:"SINGLE",
IssueStorageType: 'SINGLE',
// 是否拆分发料
IsSplit:"",
IsSplit: '',
// 拆分数量
EachTimeQty:"",
EachTimeQty: '',
// 时间间隔
TimeInterval:"",
TimeInterval: '',
// 是否使用整理库位
UseOrganizeLocation: 'FALSE',
// 是否使用在途库位
UseTransportLocation: 'FALSE',
// 是否生成发料接收任务
CreateReceiptJob:'FALSE',
CreateReceiptJob: 'FALSE'
}
})
// 验证规则
@ -372,7 +637,7 @@ const rules = ref({
strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' }],
name: [{ required: true, message: '请输入名字', trigger: 'blur' }],
description: [{ required: true, message: '请输入描述', trigger: 'blur' }],
priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }],
priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }]
})
// 所有的范围类型
@ -386,11 +651,11 @@ const rangeOptions = [
{ value: 'IN', label: '包含' },
{ value: 'NOT IN', label: '不包含' },
{ value: 'NULL', label: '为空' },
{ value: 'NOT NULL', label: '不为空' },
{ value: 'NOT NULL', label: '不为空' }
]
const formatRangeOptions = (...rest) => {
// 交集
let result = rangeOptions.filter(aItem => rest.some(bItem => aItem.value === bItem));
let result = rangeOptions.filter((aItem) => rest.some((bItem) => aItem.value === bItem))
return result
}
@ -400,18 +665,39 @@ const options = reactive({
rangeOptions1: formatRangeOptions('IN', 'NOT IN'),
rangeOptions2: formatRangeOptions('>', '<', '>=', '<='),
// 供应商客户下拉框列表
typeOptions: [{ value: 'SupplierCode', label: '供应商' }, { value: 'CustomerCode', label: '客户' }],
typeOptions: [
{ value: 'SupplierCode', label: '供应商' },
{ value: 'CustomerCode', label: '客户' }
],
//供应商列表
supplierList: [],
// 物品类型列表
itemTypeOptions: [{ value: 'ItemType', label: '物品类型' }, { value: 'ItemGroup', label: '物品分组' }, { value: 'ItemCode', label: '物品' }, { value: 'Project', label: '项目' }, { value: 'AbcClass', label: 'ABC类' }],
itemTypeOptions: [
{ value: 'ItemType', label: '物品类型' },
{ value: 'ItemGroup', label: '物品分组' },
{ value: 'ItemCode', label: '物品' },
{ value: 'Project', label: '项目' },
{ value: 'AbcClass', label: 'ABC类' }
],
// 重量体积面积类型列表
calculationTypeOptions: [{ value: 'Weight', label: '重量' }, { value: 'Volume', label: '体积' }, { value: 'Area', label: '面积' }],
calculationTypeOptions: [
{ value: 'Weight', label: '重量' },
{ value: 'Volume', label: '体积' },
{ value: 'Area', label: '面积' }
],
//仓库列表
warehouseTypeOptions: [{ value: 'WarehouseCode', label: '仓库' }, { value: 'AreaCode', label: '库区' }, { value: 'LocationGroupCode', label: '库位组' }, { value: 'LocationCode', label: '库位' }],
warehouseTypeOptions: [
{ value: 'WarehouseCode', label: '仓库' },
{ value: 'AreaCode', label: '库区' },
{ value: 'LocationGroupCode', label: '库位组' },
{ value: 'LocationCode', label: '库位' }
],
warehouseList: [],
// 排列方式
sortOptions: [{ value: 'ASC', label: '从小到大' }, { value: 'DESC', label: '从大到小' }],
sortOptions: [
{ value: 'ASC', label: '从小到大' },
{ value: 'DESC', label: '从大到小' }
]
})
// 弹窗按钮
const Butttondata = ref([
@ -432,11 +718,11 @@ const buttonBaseClick = (val, item) => {
// 获取供应商列表
const getFormSupplierList = async () => {
options.supplierList = await getSupplierList();
options.supplierList = await getSupplierList()
}
// 获取客户列表
const getFormCustomerList = async () => {
options.supplierList = await getCustomerList();
options.supplierList = await getCustomerList()
}
// 选择客户还是承运商
const changeSupplierCustomer = (e) => {
@ -458,19 +744,19 @@ const changeCalculation = () => {
}
// 获取仓库列表
const getFormWarehouseList = async () => {
options.warehouseList = await getWarehouseList();
options.warehouseList = await getWarehouseList()
}
// 获取库区列表
const getFormAreaList = async () => {
options.warehouseList = await getAreaList();
options.warehouseList = await getAreaList()
}
// 获取库位组列表
const getFormLocationgrouList = async () => {
options.warehouseList = await getLocationgroupList();
options.warehouseList = await getLocationgroupList()
}
// 获取库位列表
const getFormLocationList = async () => {
options.warehouseList = await getLocationList();
options.warehouseList = await getLocationList()
}
getFormLocationList()
// 选择仓库/库位/库位组/库区
@ -532,16 +818,28 @@ const open = async (type: string, strategyCode: string, id?: number) => {
getFormCustomerList()
}
// 判断是获取仓库/库位/库位组/库区列表
if ('WarehouseCode' in formData.value.configuration && formData.value.configuration.WarehouseCode) {
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) {
} 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) {
} 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) {
} else if (
'LocationCode' in formData.value.configuration &&
formData.value.configuration.LocationCode
) {
warehouseType.value = 'LocationCode'
getFormLocationList()
}
@ -609,54 +907,54 @@ const resetForm = () => {
//规则条件集合
condition: [
// 供应商
{ ParamCode: 'SupplierCode', Operator: "IN", Value: "" },
{ ParamCode: 'SupplierCode', Operator: 'IN', Value: '' },
// 物品类型/物品分组/物品/abc类/项目/
{ ParamCode: 'ItemType', Operator: "IN", Value: "" },
{ ParamCode: 'ItemType', Operator: 'IN', Value: '' },
// /重量/体积/面积
{ ParamCode: 'Weight', Operator: ">", Value: [] },
{ ParamCode: 'Weight', Operator: '>', Value: [] },
// 库存状态
{ ParamCode: 'InventoryStatus', Operator: "IN", Value: [] },
{ ParamCode: 'InventoryStatus', Operator: 'IN', Value: [] },
// 存储类型
{ ParamCode: 'StorageType', Operator: "IN", Value: [] },
{ ParamCode: 'StorageType', Operator: 'IN', Value: [] },
// 库存事务
{ ParamCode: 'TransactionType', Operator: "IN", Value: [] }
{ ParamCode: 'TransactionType', Operator: 'IN', Value: [] }
],
configuration: {
// 仓库代码
WarehouseCode:"",
WarehouseCode: '',
// 库区代码
AreaCode:"",
AreaCode: '',
// 库位组代码
LocationGroupCode:"",
LocationGroupCode: '',
// 库位代码
LocationCode:"",
LocationCode: '',
// 数量排序方向
QtyOrder:"ASC",
QtyOrder: 'ASC',
// 巷道排序方向
AisleOrder:"ASC",
AisleOrder: 'ASC',
// 货架排序方向
ShelfOrder:"ASC",
ShelfOrder: 'ASC',
// 行排序方向
RowOrder:"ASC",
RowOrder: 'ASC',
// 列排序方向
ColumOrder:"ASC",
ColumOrder: 'ASC',
// 优先整包
EntirePackageFirst: 'FALSE',
// 发料包装类型
IssueStorageType:"SINGLE",
IssueStorageType: 'SINGLE',
// 是否拆分发料
IsSplit:"",
IsSplit: '',
// 拆分数量
EachTimeQty:"",
EachTimeQty: '',
// 时间间隔
TimeInterval:"",
TimeInterval: '',
// 是否使用整理库位
UseOrganizeLocation: 'FALSE',
// 是否使用在途库位
UseTransportLocation: 'FALSE',
// 是否生成发料接收任务
CreateReceiptJob:'FALSE',
CreateReceiptJob: 'FALSE'
}
}
}

2
src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue
View File

@ -132,7 +132,7 @@
:key="cur.value"
/>
</el-select>
<el-input v-model="item.Value" placeholder="请输入物品" clearable style="flex: 1" />
<el-input v-model="item.Value" placeholder="请输入物品，多个物品以逗号分隔" clearable style="flex: 1" />
</el-form-item>
</el-col>
</el-row>

344
src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue
View File

@ -1,15 +1,26 @@
<!-- 管理精度策略弹窗 -->
<template>
<Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px;">
<div class="p-20px m--10px" style="max-height: 50vh;overflow-y: auto;">
<el-form ref="formRef" :model="formData" :rules="rules" label-width="120px" label-position="left">
<Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px">
<div class="p-20px m--10px" style="max-height: 50vh; 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>
<el-col :span="24">
<el-form-item label="代码" prop="strategyCode">
<el-input v-model="formData.strategyCode" placeholder="请输入代码" clearable disabled />
<el-input
v-model="formData.strategyCode"
placeholder="请输入代码"
clearable
disabled
/>
</el-form-item>
</el-col>
<el-col :span="24">
@ -42,80 +53,226 @@
<el-col :span="24" v-for="(item, index) in formData.condition" :key="index">
<!-- 选择供应商和客户 -->
<el-form-item label="" label-width="0" class="err-240" v-if="index == 0">
<el-select v-model="item.ParamCode" placeholder="" style="width: 110px;margin-right: 10px;"
@change="changeSupplierCustomer">
<el-option :label="cur.label" :value="cur.value" v-for="(cur, index) in options.typeOptions"
:key="index" />
<el-select
v-model="item.ParamCode"
placeholder=""
style="width: 110px; margin-right: 10px"
@change="changeSupplierCustomer"
>
<el-option
:label="cur.label"
:value="cur.value"
v-for="(cur, index) in options.typeOptions"
:key="index"
/>
</el-select>
<el-select v-model="item.Operator" placeholder="请选择范围" style="width: 110px;;margin-right: 10px;">
<el-option :label="cur.label" :value="cur.value" v-for="cur in options.rangeOptions1"
:key="cur.value" />
<el-select
v-model="item.Operator"
placeholder="请选择范围"
style="width: 110px; margin-right: 10px"
>
<el-option
:label="cur.label"
:value="cur.value"
v-for="cur in options.rangeOptions1"
:key="cur.value"
/>
</el-select>
<el-select v-model="item.Value" :placeholder="`请选择${item.ParamCode == 'SupplierCode' ? '供应商' : '客户'}`"
style="flex: 1;" clearable>
<el-option v-for="cur in options.supplierList" :key="cur.id" :label="cur.name" :value="cur.id" />
<el-select
v-model="item.Value"
:placeholder="`请选择${item.ParamCode == 'SupplierCode' ? '供应商' : '客户'}`"
style="flex: 1"
clearable
multiple
collapse-tags
>
<el-option
v-for="cur in options.supplierList"
:key="cur.id"
:label="cur.name"
:value="cur.id"
/>
</el-select>
</el-form-item>
<!-- 选择物品类型 -->
<el-form-item label="" label-width="0" class="err-240" v-if="index == 1">
<el-select v-model="item.ParamCode" placeholder="" @change="changeItemsType"
style="width: 110px;margin-right: 10px;">
<el-option :label="item.label" :value="item.value" v-for="item in options.itemTypeOptions"
:key="item.value" />
<el-select
v-model="item.ParamCode"
placeholder=""
@change="changeItemsType"
style="width: 110px; margin-right: 10px"
>
<el-option
:label="item.label"
:value="item.value"
v-for="item in options.itemTypeOptions"
:key="item.value"
/>
</el-select>
<el-select v-model="item.Operator" placeholder="请选择范围" style="width: 110px;;margin-right: 10px;">
<el-option :label="cur.label" :value="cur.value" v-for="cur in options.rangeOptions1"
:key="cur.value" />
<el-select
v-model="item.Operator"
placeholder="请选择范围"
style="width: 110px; margin-right: 10px"
>
<el-option
:label="cur.label"
:value="cur.value"
v-for="cur in options.rangeOptions1"
:key="cur.value"
/>
</el-select>
<el-select v-model="item.Value" placeholder="请选择物品类型" style="flex: 1;" clearable
v-if="item.ParamCode == 'ItemType'">
<el-option v-for="cur in getStrDictOptions(DICT_TYPE.ITEM_TYPE)" :key="cur.value" :label="cur.label"
:value="cur.value" />
<el-select
v-model="item.Value"
placeholder="请选择物品类型"
style="flex: 1"
clearable
multiple
collapse-tags
v-if="item.ParamCode == 'ItemType'"
>
<el-option
v-for="cur in getStrDictOptions(DICT_TYPE.ITEM_TYPE)"
:key="cur.value"
:label="cur.label"
:value="cur.value"
/>
</el-select>
<el-select v-model="item.Value" placeholder="请选择ABC类" style="flex: 1;" clearable
v-else-if="item.ParamCode == 'AbcClass'">
<el-option v-for="cur in getStrDictOptions(DICT_TYPE.ABC_CLASS)" :key="cur.value" :label="cur.label"
:value="cur.value" />
<el-select
v-model="item.Value"
placeholder="请选择ABC类"
style="flex: 1"
clearable
multiple
collapse-tags
v-else-if="item.ParamCode == 'AbcClass'"
>
<el-option
v-for="cur in getStrDictOptions(DICT_TYPE.ABC_CLASS)"
:key="cur.value"
:label="cur.label"
:value="cur.value"
/>
</el-select>
<el-input v-model="item.Value" placeholder="请输入物品分组" clearable style="flex: 1;"
v-else-if="item.ParamCode == 'ItemGroup'" />
<el-input v-model="item.Value" placeholder="请输入项目" clearable style="flex: 1;"
v-else-if="item.ParamCode == 'Project'" />
<el-input v-model="item.Value" placeholder="请输入物品" clearable style="flex: 1;"
v-else-if="item.ParamCode == 'ItemCode'" />
<el-input
v-model="item.Value"
placeholder="请输入物品分组，多个物品分组以逗号分隔"
clearable
style="flex: 1"
v-else-if="item.ParamCode == 'ItemGroup'"
/>
<el-input
v-model="item.Value"
placeholder="请输入项目，多个项目以逗号分隔"
clearable
style="flex: 1"
v-else-if="item.ParamCode == 'Project'"
/>
<el-input
v-model="item.Value"
placeholder="请输入物品，多个物品以逗号分隔"
clearable
style="flex: 1"
v-else-if="item.ParamCode == 'ItemCode'"
/>
</el-form-item>
<!-- 仓库 库区 库位组 库位 -->
<el-form-item label="" label-width="0" class="err-240" v-if="index == 2">
<el-select v-model="item.ParamCode" placeholder="" style="width: 110px;margin-right: 10px;"
@change="changeWarehouse">
<el-option :label="cur.label" :value="cur.value" v-for="(cur, index) in options.warehouseTypeOptions"
:key="index" />
<el-select
v-model="item.ParamCode"
placeholder=""
style="width: 110px; margin-right: 10px"
@change="changeWarehouse"
>
<el-option
:label="cur.label"
:value="cur.value"
v-for="(cur, index) in options.warehouseTypeOptions"
:key="index"
/>
</el-select>
<el-select v-model="item.Operator" placeholder="请选择范围" style="width: 110px;;margin-right: 10px;">
<el-option :label="cur.label" :value="cur.value" v-for="cur in options.rangeOptions1"
:key="cur.value" />
<el-select
v-model="item.Operator"
placeholder="请选择范围"
style="width: 110px; margin-right: 10px"
>
<el-option
:label="cur.label"
:value="cur.value"
v-for="cur in options.rangeOptions1"
:key="cur.value"
/>
</el-select>
<el-select v-model="item.Value"
:placeholder="`请选择${item.ParamCode == 'WarehouseCode' ? '仓库' : item.ParamCode == 'AreaCode' ? '库区' : item.ParamCode == 'LocationGroupCode' ? '库位组' : item.ParamCode == 'LocationCode' ? '库位' : ''}`"
clearable style="flex: 1;">
<el-option v-for="cur in options.warehouseList" :key="cur.code" :label="cur.name" :value="cur.code" />
<el-select
v-model="item.Value"
:placeholder="`请选择${
item.ParamCode == 'WarehouseCode'
? '仓库'
: item.ParamCode == 'AreaCode'
? '库区'
: item.ParamCode == 'LocationGroupCode'
? '库位组'
: item.ParamCode == 'LocationCode'
? '库位'
: ''
}`"
clearable
multiple
collapse-tags
style="flex: 1"
>
<el-option
v-for="cur in options.warehouseList"
:key="cur.code"
:label="cur.code"
:value="cur.code"
/>
</el-select>
</el-form-item>
<!-- 忽略物品 -->
<el-form-item label="忽略物品" class="err-120" v-if="index == 3">
<el-select v-model="item.Operator" placeholder="请选择范围" style="width: 110px;;margin-right: 10px;">
<el-option :label="cur.label" :value="cur.value" v-for="cur in options.rangeOptions2"
:key="cur.value" />
<el-select
v-model="item.Operator"
placeholder="请选择范围"
style="width: 110px; margin-right: 10px"
>
<el-option
:label="cur.label"
:value="cur.value"
v-for="cur in options.rangeOptions2"
:key="cur.value"
/>
</el-select>
<el-input v-model="item.Value" placeholder="请输入忽略物品" clearable style="flex: 1;" />
<el-input
v-model="item.Value"
placeholder="请输入忽略物品，多个忽略物品以逗号分隔"
clearable
multiple
collapse-tags
style="flex: 1"
/>
</el-form-item>
<!-- 忽略库位 -->
<el-form-item label="忽略库位" class="err-120" v-if="index == 4">
<el-select v-model="item.Operator" placeholder="请选择范围" style="width: 110px;margin-right: 10px;">
<el-option :label="cur.label" :value="cur.value" v-for="cur in options.rangeOptions2"
:key="cur.value" />
<el-select
v-model="item.Operator"
placeholder="请选择范围"
style="width: 110px; margin-right: 10px"
>
<el-option
:label="cur.label"
:value="cur.value"
v-for="cur in options.rangeOptions2"
:key="cur.value"
/>
</el-select>
<el-input v-model="item.Value" placeholder="请输入忽略库位" clearable style="flex: 1;" />
<el-input
v-model="item.Value"
placeholder="请输入忽略库位，多个忽略库位以逗号分隔"
clearable
multiple
collapse-tags
style="flex: 1"
/>
</el-form-item>
</el-col>
</el-row>
@ -129,8 +286,12 @@
<el-form-item label="管理精度">
<div class="checkbox">
<el-radio-group v-model="formData.configuration.ManagementPrecision">
<el-radio :label="cur.value" v-for="cur in getStrDictOptions(DICT_TYPE.MANAGEMENT_MODE)"
:key="cur.value">{{ cur.label }}</el-radio>
<el-radio
:label="cur.value"
v-for="cur in getStrDictOptions(DICT_TYPE.MANAGEMENT_MODE)"
:key="cur.value"
>{{ cur.label }}</el-radio
>
</el-radio-group>
</div>
</el-form-item>
@ -167,7 +328,6 @@ const formLoading = ref(false) // 表单的加载中：1）修改时的数据加
const formType = ref('') // 表单的类型：create - 新增；update - 修改
const formRef = ref() // 表单 Ref
const formStrategyCode = ref('')
// form表单数据
const formData = ref({
@ -180,29 +340,27 @@ const formData = ref({
//规则条件集合
condition: [
// 供应商
{ ParamCode: 'SupplierCode', Operator: "IN", Value: "" },
{ ParamCode: 'SupplierCode', Operator: 'IN', Value: '' },
// 物品类型/物品分组/物品/abc类/项目/
{ ParamCode: 'ItemType', Operator: "IN", Value: "" },
{ ParamCode: 'ItemType', Operator: 'IN', Value: '' },
// 仓库
{ ParamCode: 'LocationCode', Operator: "IN", Value: "" },
{ ParamCode: 'LocationCode', Operator: 'IN', Value: '' },
// 忽略物品
{ ParamCode: 'IgnoreListOfItem', Operator: "IN", Value: "" },
{ ParamCode: 'IgnoreListOfItem', Operator: 'IN', Value: '' },
// 忽略库位
{ ParamCode: 'IgnoreListOfLocation', Operator: "IN", Value: "" },
{ ParamCode: 'IgnoreListOfLocation', Operator: 'IN', Value: '' }
],
configuration: {
// 管理精度
ManagementPrecision: 'BY_PACKAGING'
}
})
// 验证规则
const rules = ref({
strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' }],
name: [{ required: true, message: '请输入名字', trigger: 'blur' }],
description: [{ required: true, message: '请输入描述', trigger: 'blur' }],
priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }],
priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }]
})
// 所有的范围类型
@ -216,11 +374,11 @@ const rangeOptions = [
{ value: 'IN', label: '包含' },
{ value: 'NOT IN', label: '不包含' },
{ value: 'NULL', label: '为空' },
{ value: 'NOT NULL', label: '不为空' },
{ value: 'NOT NULL', label: '不为空' }
]
const formatRangeOptions = (...rest) => {
// 交集
let result = rangeOptions.filter(aItem => rest.some(bItem => aItem.value === bItem));
let result = rangeOptions.filter((aItem) => rest.some((bItem) => aItem.value === bItem))
return result
}
@ -230,18 +388,36 @@ const options = reactive({
rangeOptions1: formatRangeOptions('IN', 'NOT IN'),
rangeOptions2: formatRangeOptions('IN'),
// 供应商客户下拉框列表
typeOptions: [{ value: 'SupplierCode', label: '供应商' }, { value: 'CustomerCode', label: '客户' }],
typeOptions: [
{ value: 'SupplierCode', label: '供应商' },
{ value: 'CustomerCode', label: '客户' }
],
//供应商列表
supplierList: [],
// 物品类型列表
itemTypeOptions: [{ value: 'ItemType', label: '物品类型' }, { value: 'ItemGroup', label: '物品分组' }, { value: 'ItemCode', label: '物品' }, { value: 'Project', label: '项目' }, { value: 'AbcClass', label: 'ABC类' }],
itemTypeOptions: [
{ value: 'ItemType', label: '物品类型' },
{ value: 'ItemGroup', label: '物品分组' },
{ value: 'ItemCode', label: '物品' },
{ value: 'Project', label: '项目' },
{ value: 'AbcClass', label: 'ABC类' }
],
// 重量体积面积类型列表
calculationTypeOptions: [{ value: 'Weight', label: '重量' }, { value: 'Volume', label: '体积' }, { value: 'Area', label: '面积' }],
calculationTypeOptions: [
{ value: 'Weight', label: '重量' },
{ value: 'Volume', label: '体积' },
{ value: 'Area', label: '面积' }
],
warehouseTypeOptions: [{ value: 'WarehouseCode', label: '仓库' }, { value: 'AreaCode', label: '库区' }, { value: 'LocationGroupCode', label: '库位组' }, { value: 'LocationCode', label: '库位' }],
warehouseTypeOptions: [
{ value: 'WarehouseCode', label: '仓库' },
{ value: 'AreaCode', label: '库区' },
{ value: 'LocationGroupCode', label: '库位组' },
{ value: 'LocationCode', label: '库位' }
],
//仓库列表
warehouseList: [],
warehouseList: []
})
// 弹窗按钮
const Butttondata = ref([
@ -261,11 +437,11 @@ const buttonBaseClick = (val, item) => {
}
// 获取供应商列表
const getFormSupplierList = async () => {
options.supplierList = await getSupplierList();
options.supplierList = await getSupplierList()
}
// 获取客户列表
const getFormCustomerList = async () => {
options.supplierList = await getCustomerList();
options.supplierList = await getCustomerList()
}
// 选择客户还是承运商
const changeSupplierCustomer = (e) => {
@ -284,19 +460,19 @@ const changeItemsType = () => {
// 获取仓库列表
const getFormWarehouseList = async () => {
options.warehouseList = await getWarehouseList();
options.warehouseList = await getWarehouseList()
}
// 获取库区列表
const getFormAreaList = async () => {
options.warehouseList = await getAreaList();
options.warehouseList = await getAreaList()
}
// 获取库位组列表
const getFormLocationgrouList = async () => {
options.warehouseList = await getLocationgroupList();
options.warehouseList = await getLocationgroupList()
}
// 获取库位列表
const getFormLocationList = async () => {
options.warehouseList = await getLocationList();
options.warehouseList = await getLocationList()
}
getFormLocationList()
// 选择仓库/库位/库位组/库区
@ -363,7 +539,6 @@ const open = async (type: string, strategyCode: string, id?: number) => {
} else if (formData.value.condition[2].ParamCode == 'LocationCode') {
getFormLocationList()
}
} finally {
formLoading.value = false
}
@ -429,15 +604,15 @@ const resetForm = () => {
//规则条件集合
condition: [
// 供应商
{ ParamCode: 'SupplierCode', Operator: "IN", Value: "" },
{ ParamCode: 'SupplierCode', Operator: 'IN', Value: '' },
// 物品类型/物品分组/物品/abc类/项目/
{ ParamCode: 'ItemType', Operator: "IN", Value: "" },
{ ParamCode: 'ItemType', Operator: 'IN', Value: '' },
// 仓库
{ ParamCode: 'LocationCode', Operator: "IN", Value: "" },
{ ParamCode: 'LocationCode', Operator: 'IN', Value: '' },
// 忽略物品
{ ParamCode: 'IgnoreListOfItem', Operator: "IN", Value: "" },
{ ParamCode: 'IgnoreListOfItem', Operator: 'IN', Value: '' },
// 忽略库位
{ ParamCode: 'IgnoreListOfLocation', Operator: "IN", Value: "" },
{ ParamCode: 'IgnoreListOfLocation', Operator: 'IN', Value: '' }
],
configuration: {
// 管理精度
@ -445,7 +620,6 @@ const resetForm = () => {
}
}
}
</script>
<style scoped lang="scss">
.item {

2
src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue
View File

@ -107,6 +107,8 @@
placeholder="请选择供应商"
style="flex: 1"
clearable
multiple
collapse-tags
>
<el-option
v-for="cur in options.supplierList"

245
src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue
View File

@ -1,15 +1,26 @@
<!-- 补料策略弹窗 -->
<template>
<Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px;">
<div class="p-20px m--10px" style="max-height: 50vh;overflow-y: auto;">
<el-form ref="formRef" :model="formData" :rules="rules" label-width="120px" label-position="left">
<Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px">
<div class="p-20px m--10px" style="max-height: 50vh; 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 v-model="formData.strategyCode" placeholder="请输入代码" clearable disabled />
<el-input
v-model="formData.strategyCode"
placeholder="请输入代码"
clearable
disabled
/>
</el-form-item>
</el-col>
<el-col :span="24">
@ -42,47 +53,136 @@
<el-col :span="24" v-for="(item, index) in formData.condition" :key="index">
<!-- 选择物品类型 -->
<el-form-item label="" label-width="0" class="err-240" v-if="index == 0">
<el-select v-model="item.ParamCode" placeholder="" @change="changeItemsType"
style="width: 110px;margin-right: 10px;">
<el-option :label="cur.label" :value="cur.value" v-for="cur in options.itemTypeOptions"
:key="cur.value" />
<el-select
v-model="item.ParamCode"
placeholder=""
@change="changeItemsType"
style="width: 110px; margin-right: 10px"
>
<el-option
:label="cur.label"
:value="cur.value"
v-for="cur in options.itemTypeOptions"
:key="cur.value"
/>
</el-select>
<el-select v-model="item.Operator" placeholder="请选择范围" style="width: 110px;;margin-right: 10px;">
<el-option :label="cur.label" :value="cur.value" v-for="cur in options.rangeOptions1"
:key="cur.value" />
<el-select
v-model="item.Operator"
placeholder="请选择范围"
style="width: 110px; margin-right: 10px"
>
<el-option
:label="cur.label"
:value="cur.value"
v-for="cur in options.rangeOptions1"
:key="cur.value"
/>
</el-select>
<el-select v-model="item.Value" placeholder="请选择物品类型" style="flex: 1;" clearable
v-if="item.ParamCode == 'ItemType'">
<el-option v-for="cur in getStrDictOptions(DICT_TYPE.ITEM_TYPE)" :key="cur.value" :label="cur.label"
:value="cur.value" />
<el-select
v-model="item.Value"
placeholder="请选择物品类型"
style="flex: 1"
clearable
multiple
collapse-tags
v-if="item.ParamCode == 'ItemType'"
>
<el-option
v-for="cur in getStrDictOptions(DICT_TYPE.ITEM_TYPE)"
:key="cur.value"
:label="cur.label"
:value="cur.value"
/>
</el-select>
<el-select v-model="item.Value" placeholder="请选择ABC类" style="flex: 1;" clearable
v-else-if="item.ParamCode == 'AbcClass'">
<el-option v-for="cur in getStrDictOptions(DICT_TYPE.ABC_CLASS)" :key="cur.value" :label="cur.label"
:value="cur.value" />
<el-select
v-model="item.Value"
placeholder="请选择ABC类"
style="flex: 1"
clearable
multiple
collapse-tags
v-else-if="item.ParamCode == 'AbcClass'"
>
<el-option
v-for="cur in getStrDictOptions(DICT_TYPE.ABC_CLASS)"
:key="cur.value"
:label="cur.label"
:value="cur.value"
/>
</el-select>
<el-input v-model="item.Value" placeholder="请输入物品分组" clearable style="flex: 1;"
v-else-if="item.ParamCode == 'ItemGroup'" />
<el-input v-model="item.Value" placeholder="请输入项目" clearable style="flex: 1;"
v-else-if="item.ParamCode == 'Project'" />
<el-input v-model="item.Value" placeholder="请输入物品" clearable style="flex: 1;"
v-else-if="item.ParamCode == 'ItemCode'" />
<el-input
v-model="item.Value"
placeholder="请输入物品分组，多个物品分组以逗号分隔"
clearable
style="flex: 1"
v-else-if="item.ParamCode == 'ItemGroup'"
/>
<el-input
v-model="item.Value"
placeholder="请输入项目，多个项目以逗号分隔"
clearable
style="flex: 1"
v-else-if="item.ParamCode == 'Project'"
/>
<el-input
v-model="item.Value"
placeholder="请输入物品，多个物品以逗号分隔"
clearable
style="flex: 1"
v-else-if="item.ParamCode == 'ItemCode'"
/>
</el-form-item>
<!-- 仓库 库区 库位组 库位 -->
<el-form-item label="" label-width="0" class="err-240" v-if="index == 1">
<el-select v-model="item.ParamCode" placeholder="" style="width: 110px;margin-right: 10px;"
@change="changeWarehouse">
<el-option :label="cur.label" :value="cur.value" v-for="(cur, index) in options.warehouseTypeOptions"
:key="index" />
<el-select
v-model="item.ParamCode"
placeholder=""
style="width: 110px; margin-right: 10px"
@change="changeWarehouse"
>
<el-option
:label="cur.label"
:value="cur.value"
v-for="(cur, index) in options.warehouseTypeOptions"
:key="index"
/>
</el-select>
<el-select v-model="item.Operator" placeholder="请选择范围" style="width: 110px;;margin-right: 10px;">
<el-option :label="cur.label" :value="cur.value" v-for="cur in options.rangeOptions1"
:key="cur.value" />
<el-select
v-model="item.Operator"
placeholder="请选择范围"
style="width: 110px; margin-right: 10px"
>
<el-option
:label="cur.label"
:value="cur.value"
v-for="cur in options.rangeOptions1"
:key="cur.value"
/>
</el-select>
<el-select v-model="item.Value"
:placeholder="`请选择${item.ParamCode == 'WarehouseCode' ? '仓库' : item.ParamCode == 'AreaCode' ? '库区' : item.ParamCode == 'LocationGroupCode' ? '库位组' : item.ParamCode == 'LocationCode' ? '库位' : ''}`"
clearable style="flex: 1;">
<el-option v-for="cur in options.warehouseList" :key="cur.code" :label="cur.name" :value="cur.code" />
<el-select
v-model="item.Value"
:placeholder="`请选择${
item.ParamCode == 'WarehouseCode'
? '仓库'
: item.ParamCode == 'AreaCode'
? '库区'
: item.ParamCode == 'LocationGroupCode'
? '库位组'
: item.ParamCode == 'LocationCode'
? '库位'
: ''
}`"
clearable
multiple
collapse-tags
style="flex: 1"
>
<el-option
v-for="cur in options.warehouseList"
:key="cur.code"
:label="cur.code"
:value="cur.code"
/>
</el-select>
</el-form-item>
</el-col>
@ -95,32 +195,76 @@
<el-row gutter="10">
<!-- 最大库存 -->
<el-col :span="24">
<el-form-item label="最大库存" prop="configuration.MaxQty" :rules="[{ required: true, message: '请输入最小库存', trigger: 'change', }]">
<el-input-number v-model="formData.configuration.MaxQty" :min="-1" controls-position="right" />
<el-form-item
label="最大库存"
prop="configuration.MaxQty"
:rules="[{ required: true, message: '请输入最小库存', trigger: 'change' }]"
>
<el-input-number
v-model="formData.configuration.MaxQty"
:min="-1"
controls-position="right"
/>
</el-form-item>
</el-col>
<!-- 最小库存 -->
<el-col :span="24">
<el-form-item label="最小库存" prop="configuration.MinQty" :rules="[{ required: true, message: '请输入最小库存', trigger: 'change', }, { validator: validatorNum, message: '不可以大于最大库存', trigger: 'change', }]">
<el-input-number v-model="formData.configuration.MinQty" :min="0"
:max="formData.configuration.MaxQty != -1 ? formData.configuration.MaxQty : Infinity"
controls-position="right" />
<el-form-item
label="最小库存"
prop="configuration.MinQty"
:rules="[
{ required: true, message: '请输入最小库存', trigger: 'change' },
{ validator: validatorNum, message: '不可以大于最大库存', trigger: 'change' }
]"
>
<el-input-number
v-model="formData.configuration.MinQty"
:min="0"
:max="
formData.configuration.MaxQty != -1 ? formData.configuration.MaxQty : Infinity
"
controls-position="right"
/>
</el-form-item>
</el-col>
<!-- 安全库存 -->
<el-col :span="24">
<el-form-item label="安全库存" prop="configuration.SafetyQty" :rules="[{ required: true, message: '请输入安全库存', trigger: 'change', }, { validator: validatorNum, message: '不可以大于最大库存', trigger: 'change', }]">
<el-input-number v-model="formData.configuration.SafetyQty" :min="0"
:max="formData.configuration.MaxQty != -1 ? formData.configuration.MaxQty : Infinity"
controls-position="right" />
<el-form-item
label="安全库存"
prop="configuration.SafetyQty"
:rules="[
{ required: true, message: '请输入安全库存', trigger: 'change' },
{ validator: validatorNum, message: '不可以大于最大库存', trigger: 'change' }
]"
>
<el-input-number
v-model="formData.configuration.SafetyQty"
:min="0"
:max="
formData.configuration.MaxQty != -1 ? formData.configuration.MaxQty : Infinity
"
controls-position="right"
/>
</el-form-item>
</el-col>
<!-- 补料数量 -->
<el-col :span="24">
<el-form-item label="补料数量" prop="configuration.FeedQty" :rules="[{ required: true, message: '请输入补料数量', trigger: 'change', }, { validator: validatorNum, message: '不可以大于最大库存', trigger: 'change', }]">
<el-input-number v-model="formData.configuration.FeedQty" :min="0"
:max="formData.configuration.MaxQty != -1 ? formData.configuration.MaxQty : Infinity"
controls-position="right" />
<el-form-item
label="补料数量"
prop="configuration.FeedQty"
:rules="[
{ required: true, message: '请输入补料数量', trigger: 'change' },
{ validator: validatorNum, message: '不可以大于最大库存', trigger: 'change' }
]"
>
<el-input-number
v-model="formData.configuration.FeedQty"
:min="0"
:max="
formData.configuration.MaxQty != -1 ? formData.configuration.MaxQty : Infinity
"
controls-position="right"
/>
</el-form-item>
</el-col>
</el-row>
@ -419,7 +563,6 @@ const resetForm = () => {
}
}
const validatorNum = (rule: any, value: any, callback: any) => {
if (value && formData.value.configuration.MaxQty != -1) {
if (value > formData.value.configuration.MaxQty) {

14
src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue
View File

@ -83,6 +83,8 @@
placeholder="请选择物品类型"
style="flex: 1"
clearable
multiple
collapse-tags
v-if="item.ParamCode == 'ItemType'"
>
<el-option
@ -97,6 +99,8 @@
placeholder="请选择ABC类"
style="flex: 1"
clearable
multiple
collapse-tags
v-else-if="item.ParamCode == 'AbcClass'"
>
<el-option
@ -108,21 +112,21 @@
</el-select>
<el-input
v-model="item.Value"
placeholder="请输入物品分组"
placeholder="请输入物品分组，多个物品分组以逗号分隔"
clearable
style="flex: 1"
v-else-if="item.ParamCode == 'ItemGroup'"
/>
<el-input
v-model="item.Value"
placeholder="请输入项目"
placeholder="请输入项目，多个项目以逗号分隔"
clearable
style="flex: 1"
v-else-if="item.ParamCode == 'Project'"
/>
<el-input
v-model="item.Value"
placeholder="请输入物品"
placeholder="请输入物品，多个物品以逗号分隔"
clearable
style="flex: 1"
v-else-if="item.ParamCode == 'ItemCode'"
@ -169,12 +173,14 @@
: ''
}`"
clearable
multiple
collapse-tags
style="flex: 1"
>
<el-option
v-for="cur in options.warehouseList"
:key="cur.code"
:label="cur.name"
:label="cur.code"
:value="cur.code"
/>
</el-select>

8
src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue
View File

@ -107,6 +107,8 @@
placeholder="请选择供应商"
style="flex: 1"
clearable
multiple
collapse-tags
>
<el-option
v-for="cur in options.supplierList"
@ -195,7 +197,7 @@
<el-option
v-for="cur in options.warehouseList"
:key="cur.code"
:label="cur.name"
:label="cur.code"
:value="cur.code"
/>
</el-select>
@ -210,7 +212,7 @@
<el-option
v-for="cur in options.dockList"
:key="cur.code"
:label="cur.name"
:label="cur.code"
:value="cur.code"
/>
</el-select>
@ -225,7 +227,7 @@
<el-option
v-for="cur in options.locationList"
:key="cur.code"
:label="cur.name"
:label="cur.code"
:value="cur.code"
/>
</el-select>

26
src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
View File

@ -84,6 +84,8 @@
:placeholder="`请选择${item.ParamCode == 'SupplierCode' ? '供应商' : '客户'}`"
style="flex: 1"
clearable
multiple
collapse-tags
>
<el-option
v-for="cur in options.supplierList"
@ -125,6 +127,8 @@
placeholder="请选择物品类型"
style="flex: 1"
clearable
multiple
collapse-tags
v-if="item.ParamCode == 'ItemType'"
>
<el-option
@ -139,6 +143,8 @@
placeholder="请选择ABC类"
style="flex: 1"
clearable
multiple
collapse-tags
v-else-if="item.ParamCode == 'AbcClass'"
>
<el-option
@ -150,21 +156,21 @@
</el-select>
<el-input
v-model="item.Value"
placeholder="请输入物品分组"
placeholder="请输入物品分组，多个物品分组以逗号分隔"
clearable
style="flex: 1"
v-else-if="item.ParamCode == 'ItemGroup'"
/>
<el-input
v-model="item.Value"
placeholder="请输入项目"
placeholder="请输入项目，多个项目以逗号分隔"
clearable
style="flex: 1"
v-else-if="item.ParamCode == 'Project'"
/>
<el-input
v-model="item.Value"
placeholder="请输入物品"
placeholder="请输入物品，多个物品以逗号分隔"
clearable
style="flex: 1"
v-else-if="item.ParamCode == 'ItemCode'"
@ -225,6 +231,8 @@
placeholder="请选择库存状态"
style="flex: 1"
clearable
multiple
collapse-tags
>
<el-option
v-for="cur in getStrDictOptions(DICT_TYPE.INVENTORY_STATUS)"
@ -253,6 +261,8 @@
placeholder="请选择存储类型"
style="flex: 1"
clearable
multiple
collapse-tags
>
<el-option
v-for="cur in getStrDictOptions(DICT_TYPE.STORAGE_TYPE)"
@ -278,7 +288,7 @@
</el-select>
<el-input
v-model="item.Value"
placeholder="请输入库存事务"
placeholder="请输入库存事务，多个库存事务以逗号分隔"
clearable
style="flex: 1"
/>
@ -317,7 +327,7 @@
<el-option
v-for="cur in options.warehouseList"
:key="cur.code"
:label="cur.name"
:label="cur.code"
:value="cur.code"
/>
</el-select>
@ -331,7 +341,7 @@
<el-option
v-for="cur in options.warehouseList"
:key="cur.code"
:label="cur.name"
:label="cur.code"
:value="cur.code"
/>
</el-select>
@ -345,7 +355,7 @@
<el-option
v-for="cur in options.warehouseList"
:key="cur.code"
:label="cur.name"
:label="cur.code"
:value="cur.code"
/>
</el-select>
@ -360,7 +370,7 @@
<el-option
v-for="cur in options.warehouseList"
:key="cur.code"
:label="cur.name"
:label="cur.code"
:value="cur.code"
/>
</el-select>

198
src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/AddForm.vue
View File

@ -1,15 +1,26 @@
<!-- 器具容量策略弹窗 -->
<template>
<Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px;">
<div class="p-20px m--10px" style="max-height: 50vh;overflow-y: auto;">
<el-form ref="formRef" :model="formData" :rules="rules" label-width="120px" label-position="left">
<Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px">
<div class="p-20px m--10px" style="max-height: 50vh; 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 v-model="formData.strategyCode" placeholder="请输入代码" clearable disabled />
<el-input
v-model="formData.strategyCode"
placeholder="请输入代码"
clearable
disabled
/>
</el-form-item>
</el-col>
<el-col :span="24">
@ -41,47 +52,125 @@
<el-row gutter="10">
<el-col :span="24" v-for="(item, index) in formData.condition" :key="index">
<!-- 器具类型 -->
<el-form-item label="器具类型" class="err-120" v-if="index == 0" :prop="'condition.' + index + '.Value'" :rules="{
<el-form-item
label="器具类型"
class="err-120"
v-if="index == 0"
:prop="'condition.' + index + '.Value'"
:rules="{
required: true,
message: '请选择器具类型',
trigger: 'change',
}">
<el-select v-model="item.Operator" placeholder="请选择范围" style="width: 110px;;margin-right: 10px;">
<el-option :label="cur.label" :value="cur.value" v-for="cur in options.rangeOptions1"
:key="cur.value" />
trigger: 'change'
}"
>
<el-select
v-model="item.Operator"
placeholder="请选择范围"
style="width: 110px; margin-right: 10px"
>
<el-option
:label="cur.label"
:value="cur.value"
v-for="cur in options.rangeOptions1"
:key="cur.value"
/>
</el-select>
<el-select v-model="item.Value" placeholder="请选择器具类型" style="flex: 1;" clearable>
<el-option v-for="cur in getStrDictOptions(DICT_TYPE.CONTAINER_TYPE)" :key="cur.value"
:label="cur.label" :value="cur.value" />
<el-select
v-model="item.Value"
placeholder="请选择器具类型"
style="flex: 1"
clearable
multiple
collapse-tags
>
<el-option
v-for="cur in getStrDictOptions(DICT_TYPE.CONTAINER_TYPE)"
:key="cur.value"
:label="cur.label"
:value="cur.value"
/>
</el-select>
</el-form-item>
<!-- 选择物品类型 -->
<el-form-item label="" label-width="0" class="err-240" v-if="index == 1">
<el-select v-model="item.ParamCode" placeholder="" @change="changeItemsType"
style="width: 110px;margin-right: 10px;">
<el-option :label="cur.label" :value="cur.value" v-for="cur in options.itemTypeOptions"
:key="cur.value" />
<el-select
v-model="item.ParamCode"
placeholder=""
@change="changeItemsType"
style="width: 110px; margin-right: 10px"
>
<el-option
:label="cur.label"
:value="cur.value"
v-for="cur in options.itemTypeOptions"
:key="cur.value"
/>
</el-select>
<el-select v-model="item.Operator" placeholder="请选择范围" style="width: 110px;;margin-right: 10px;">
<el-option :label="cur.label" :value="cur.value" v-for="cur in options.rangeOptions1"
:key="cur.value" />
<el-select
v-model="item.Operator"
placeholder="请选择范围"
style="width: 110px; margin-right: 10px"
>
<el-option
:label="cur.label"
:value="cur.value"
v-for="cur in options.rangeOptions1"
:key="cur.value"
/>
</el-select>
<el-select v-model="item.Value" placeholder="请选择物品类型" style="flex: 1;" clearable
v-if="item.ParamCode == 'ItemType'">
<el-option v-for="cur in getStrDictOptions(DICT_TYPE.ITEM_TYPE)" :key="cur.value" :label="cur.label"
:value="cur.value" />
<el-select
v-model="item.Value"
placeholder="请选择物品类型"
style="flex: 1"
clearable
multiple
collapse-tags
v-if="item.ParamCode == 'ItemType'"
>
<el-option
v-for="cur in getStrDictOptions(DICT_TYPE.ITEM_TYPE)"
:key="cur.value"
:label="cur.label"
:value="cur.value"
/>
</el-select>
<el-select v-model="item.Value" placeholder="请选择ABC类" style="flex: 1;" clearable
v-else-if="item.ParamCode == 'AbcClass'">
<el-option v-for="cur in getStrDictOptions(DICT_TYPE.ABC_CLASS)" :key="cur.value" :label="cur.label"
:value="cur.value" />
<el-select
v-model="item.Value"
placeholder="请选择ABC类"
style="flex: 1"
clearable
multiple
collapse-tags
v-else-if="item.ParamCode == 'AbcClass'"
>
<el-option
v-for="cur in getStrDictOptions(DICT_TYPE.ABC_CLASS)"
:key="cur.value"
:label="cur.label"
:value="cur.value"
/>
</el-select>
<el-input v-model="item.Value" placeholder="请输入物品分组" clearable style="flex: 1;"
v-else-if="item.ParamCode == 'ItemGroup'" />
<el-input v-model="item.Value" placeholder="请输入项目" clearable style="flex: 1;"
v-else-if="item.ParamCode == 'Project'" />
<el-input v-model="item.Value" placeholder="请输入物品" clearable style="flex: 1;"
v-else-if="item.ParamCode == 'ItemCode'" />
<el-input
v-model="item.Value"
placeholder="请输入物品分组，多个物品分组以逗号分隔"
clearable
style="flex: 1"
v-else-if="item.ParamCode == 'ItemGroup'"
/>
<el-input
v-model="item.Value"
placeholder="请输入项目，多个项目以逗号分隔"
clearable
style="flex: 1"
v-else-if="item.ParamCode == 'Project'"
/>
<el-input
v-model="item.Value"
placeholder="请输入物品，多个物品以逗号分隔"
clearable
style="flex: 1"
v-else-if="item.ParamCode == 'ItemCode'"
/>
</el-form-item>
</el-col>
</el-row>
@ -93,9 +182,16 @@
<el-row gutter="10">
<el-col :span="24">
<!-- 容纳数量 -->
<el-form-item label="容纳数量" prop="configuration.ContentCount"
:rules="[{ required: true, message: '请输入容纳数量', trigger: 'change', }]">
<el-input-number v-model="formData.configuration.ContentCount" :min="-1" controls-position="right" />
<el-form-item
label="容纳数量"
prop="configuration.ContentCount"
:rules="[{ required: true, message: '请输入容纳数量', trigger: 'change' }]"
>
<el-input-number
v-model="formData.configuration.ContentCount"
:min="-1"
controls-position="right"
/>
</el-form-item>
</el-col>
</el-row>
@ -115,7 +211,6 @@ import * as RuleApi from '@/api/wms/rule'
import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
const { t } = useI18n() // 国际化
const message = useMessage() // 消息弹窗
@ -125,7 +220,6 @@ const formLoading = ref(false) // 表单的加载中：1）修改时的数据加
const formType = ref('') // 表单的类型：create - 新增；update - 修改
const formRef = ref() // 表单 Ref
const formStrategyCode = ref('')
// form表单数据
const formData = ref({
@ -138,22 +232,21 @@ const formData = ref({
//规则条件集合
condition: [
// 器具类型
{ ParamCode: 'ContainerType', Operator: "IN", Value: "" },
{ ParamCode: 'ContainerType', Operator: 'IN', Value: '' },
// 物品类型/物品分组/物品/abc类/项目/
{ ParamCode: 'ItemGroup', Operator: "IN", Value: "" },
{ ParamCode: 'ItemGroup', Operator: 'IN', Value: '' }
],
configuration: {
// 容纳数量
ContentCount: 0
}
})
// 验证规则
const rules = ref({
strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' }],
name: [{ required: true, message: '请输入名字', trigger: 'blur' }],
description: [{ required: true, message: '请输入描述', trigger: 'blur' }],
priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }],
priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }]
})
// 所有的范围类型
@ -167,11 +260,11 @@ const rangeOptions = [
{ value: 'IN', label: '包含' },
{ value: 'NOT IN', label: '不包含' },
{ value: 'NULL', label: '为空' },
{ value: 'NOT NULL', label: '不为空' },
{ value: 'NOT NULL', label: '不为空' }
]
const formatRangeOptions = (...rest) => {
// 交集
let result = rangeOptions.filter(aItem => rest.some(bItem => aItem.value === bItem));
let result = rangeOptions.filter((aItem) => rest.some((bItem) => aItem.value === bItem))
return result
}
@ -181,7 +274,11 @@ const options = reactive({
rangeOptions1: formatRangeOptions('IN', 'NOT IN'),
// 物品类型列表
itemTypeOptions: [{ value: 'ItemGroup', label: '物品分组' }, { value: 'ItemCode', label: '物品' }, { value: 'Project', label: '项目' }],
itemTypeOptions: [
{ value: 'ItemGroup', label: '物品分组' },
{ value: 'ItemCode', label: '物品' },
{ value: 'Project', label: '项目' }
]
})
// 弹窗按钮
const Butttondata = ref([
@ -239,7 +336,6 @@ const open = async (type: string, strategyCode: string, id?: number) => {
if (data.configuration) {
formData.value.configuration = JSON.parse(data.configuration)
}
} finally {
formLoading.value = false
}
@ -304,9 +400,9 @@ const resetForm = () => {
//规则条件集合
condition: [
// 器具类型
{ ParamCode: 'ContainerType', Operator: "IN", Value: "" },
{ ParamCode: 'ContainerType', Operator: 'IN', Value: '' },
// 物品类型/物品分组/物品/abc类/项目/
{ ParamCode: 'ItemGroup', Operator: "IN", Value: "" },
{ ParamCode: 'ItemGroup', Operator: 'IN', Value: '' }
],
configuration: {
// 容纳数量
@ -315,13 +411,11 @@ const resetForm = () => {
}
}
const validatorNum = (rule: any, value: any, callback: any) => {
if (value && formData.value.configuration[0].Value != -1) {
if (value > formData.value.configuration[0].Value) {
callback(new Error("11"))
callback(new Error('11'))
} else {
callback()
}
} else {

4
src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue
View File

@ -86,7 +86,7 @@
<el-option
v-for="cur in options.warehouseList"
:key="cur.code"
:label="cur.name"
:label="cur.code"
:value="cur.code"
/>
</el-select>
@ -125,7 +125,7 @@
<el-option
v-for="cur in options.overflowWarehouseList"
:key="cur.code"
:label="cur.name"
:label="cur.code"
:value="cur.code"
/>
</el-select>

Write Preview
Loading…
Cancel
Save