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

策略规则配置参数修改

master
zhang_li 1 year ago
parent
e3ede41a37
commit
61ee227554
15 changed files with 1310 additions and 800 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      src/utils/disposition/defaultButtons.ts
  2. 197
      src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue
  3. 47
      src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue
  4. 200
      src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
  5. 349
      src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue
  6. 20
      src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue
  7. 210
      src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue
  8. 148
      src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue
  9. 351
      src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue
  10. 89
      src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue
  11. 120
      src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
  12. 18
      src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/AddForm.vue
  13. 330
      src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue
  14. 7
      src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
  15. 12
      src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue

12
src/utils/disposition/defaultButtons.ts
View File

@ -614,6 +614,18 @@ export function mainListJobExeBtn(option:any) {
hasPermi: '' hasPermi: ''
}) })
} }
// 主列表-打印
export function mainListPointBtn(option:any) {
return __defaultBtnOption(option,{
label: '单据打印',
name: 'point',
hide: false,
type: 'primary',
color: '',
link: true, // 文本展现按钮
hasPermi: ''
})
}
// 默认按钮规则 // 默认按钮规则
function __defaultBtnOption(option:any,specific:any){ function __defaultBtnOption(option:any,specific:any){

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

@ -1,15 +1,26 @@
<!-- 到货验货任务拆分策略弹出层 --> <!-- 到货验货任务拆分策略弹出层 -->
<template> <template>
<Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px;"> <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px">
<div class="p-20px m--10px" style="max-height: 50vh;overflow-y: auto;"> <div class="p-20px m--10px" style="max-height: 50vh; overflow-y: auto">
<!-- 规则 --> <!-- 规则 -->
<el-form ref="formRef" :model="formData" :rules="rules" label-width="140px" label-position="left"> <el-form
ref="formRef"
:model="formData"
:rules="rules"
label-width="140px"
label-position="left"
>
<div class="item"> <div class="item">
<div class="title">规则</div> <div class="title">规则</div>
<el-row gutter="10"> <el-row gutter="10">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="代码" prop="strategyCode"> <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-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
@ -40,25 +51,68 @@
<el-row gutter="10"> <el-row gutter="10">
<el-col :span="24" v-for="(item, index) in formData.condition" :key="index"> <el-col :span="24" v-for="(item, index) in formData.condition" :key="index">
<!-- 供应商类型 --> <!-- 供应商类型 -->
<el-form-item v-if="item.ParamCode == 'SupplierType'" label="供应商类型" class="flex-top err-120"> <el-form-item
<el-select v-model="item.Operator" placeholder="请选择范围" style="width: 110px;;margin-right: 10px;"> v-if="item.ParamCode == 'SupplierType'"
<el-option :label="cur.label" :value="cur.value" v-for="cur in options.supplierTypeRangeOptions" label="供应商类型"
:key="cur.value" /> class="flex-top err-120"
>
<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.supplierTypeRangeOptions"
:key="cur.value"
/>
</el-select> </el-select>
<el-select v-model="item.Value" placeholder="请选择供应商类型" style="flex: 1;" clearable <el-select
@change="changeSupplierType"> v-model="item.Value"
<el-option v-for="dict in getStrDictOptions(DICT_TYPE.SUPPLIER_TYPE)" :key="dict.value" placeholder="请选择供应商类型"
:label="dict.label" :value="dict.value" /> style="flex: 1"
clearable
@change="changeSupplierType"
>
<el-option
v-for="dict in getStrDictOptions(DICT_TYPE.SUPPLIER_TYPE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- 供应商 --> <!-- 供应商 -->
<el-form-item v-else-if="item.ParamCode == 'SupplierCode'" label="供应商" class="err-120"> <el-form-item
<el-select v-model="item.Operator" placeholder="请选择范围" style="width: 110px;margin-right: 10px;"> v-else-if="item.ParamCode == 'SupplierCode'"
<el-option :label="cur.label" :value="cur.value" v-for="cur in options.supplierRangeOptions" label="供应商"
:key="cur.value" /> class="err-120"
>
<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.supplierRangeOptions"
:key="cur.value"
/>
</el-select> </el-select>
<el-select v-model="item.Value" placeholder="请选择供应商" style="flex: 1;" clearable> <el-select
<el-option v-for="cur in options.supplierList" :key="cur.id" :label="cur.name" :value="cur.id" /> v-model="item.Value"
placeholder="请选择供应商"
style="flex: 1"
clearable
>
<el-option
v-for="cur in options.supplierList"
:key="cur.id"
:label="cur.name"
:value="cur.id"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -68,14 +122,16 @@
<div class="item mt-20px"> <div class="item mt-20px">
<div class="title">规则配置</div> <div class="title">规则配置</div>
<el-row gutter="10"> <el-row gutter="10">
<el-col :span="24" v-for="(item, index) in formData.configuration" :key="index"> <el-col :span="24">
<!-- 按零件拆分 --> <!-- 按零件拆分 -->
<el-form-item v-if="item.ParamCode == 'ByItem'" label="按零件拆分"> <el-form-item label="按零件拆分">
<el-switch v-model="item.Value" /> <el-switch v-model="formData.configuration.ByItem" active-value="TRUE" inactive-value="FALSE"/>
</el-form-item> </el-form-item>
<!-- 按批次拆分 --> </el-col>
<el-form-item v-else-if="item.ParamCode == 'ByBatch'" label="按批次拆分"> <!-- 按批次拆分 -->
<el-switch v-model="item.Value" /> <el-col :span="24">
<el-form-item label="按批次拆分">
<el-switch v-model="formData.configuration.ByBatch" active-value="TRUE" inactive-value="FALSE"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -95,8 +151,6 @@ import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
import { getSupplierList } from '@/api/wms/supplier' import { getSupplierList } from '@/api/wms/supplier'
import * as RuleApi from '@/api/wms/rule' import * as RuleApi from '@/api/wms/rule'
const { t } = useI18n() // 国际化 const { t } = useI18n() // 国际化
const message = useMessage() // 消息弹窗 const message = useMessage() // 消息弹窗
@ -110,24 +164,24 @@ const formStrategyCode = ref('')
// form表单数据 // form表单数据
const formData = ref({ const formData = ref({
id: '', id: '',
strategyCode: formStrategyCode.value,//策略代码id strategyCode: formStrategyCode.value, //策略代码id
name: '',//名称 name: '', //名称
description: '',//描述 description: '', //描述
priority: '',//优先级 priority: '', //优先级
status: true,//状态 status: true, //状态
//规则条件集合 //规则条件集合
condition: [ condition: [
// 供应商类型 // 供应商类型
{ ParamCode: 'SupplierType', Operator: "==", Value: "" }, { ParamCode: 'SupplierType', Operator: '==', Value: '' },
// 供应商 // 供应商
{ ParamCode: 'SupplierCode', Operator: "IN", Value: "" } { ParamCode: 'SupplierCode', Operator: 'IN', Value: '' }
], ],
configuration: [ configuration: {
// 按零件拆分 // 按零件拆分
{ ParamCode: 'ByItem', Value: false }, ByItem: 'FALSE',
// 按批次拆分 // 按批次拆分
{ ParamCode: 'ByBatch', Value: false }, ByBatch: 'FALSE'
] }
}) })
// 验证规则 // 验证规则
@ -149,25 +203,31 @@ const rangeOptions = [
{ value: 'IN', label: '包含' }, { value: 'IN', label: '包含' },
{ value: 'NOT IN', label: '不包含' }, { value: 'NOT IN', label: '不包含' },
{ value: 'NULL', label: '为空' }, { value: 'NULL', label: '为空' },
{ value: 'NOT NULL', label: '不为空' }, { value: 'NOT NULL', label: '不为空' }
] ]
const formatRangeOptions = (...rest) => { 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 return result
} }
// 下拉框列表集合 // 下拉框列表集合
const options = reactive({ const options = reactive({
// 供应商类型范围下拉框列表 // 供应商类型范围下拉框列表
supplierTypeRangeOptions: formatRangeOptions('=='), supplierTypeRangeOptions: formatRangeOptions('=='),
// 供应商列表 // 供应商列表
supplierTypeOptions: [{ value: 1, label: '标准' }, { value: 2, label: '委外' }, { value: 3, label: '其他' }], supplierTypeOptions: [
{ value: 1, label: '标准' },
{ value: 2, label: '委外' },
{ value: 3, label: '其他' }
],
// 供应商范围下拉框列表 // 供应商范围下拉框列表
supplierRangeOptions: formatRangeOptions('IN', 'NOT IN'), supplierRangeOptions: formatRangeOptions('IN', 'NOT IN'),
//供应商列表 //供应商列表
supplierList: [{ value: 1, label: '供应商1' }, { value: 2, label: '供应商2' }, { value: 3, label: '供应商3' }], supplierList: [
{ value: 1, label: '供应商1' },
{ value: 2, label: '供应商2' },
{ value: 3, label: '供应商3' }
]
}) })
// 获取供应商列表的参数 // 获取供应商列表的参数
const querySupplierParams = ref({ const querySupplierParams = ref({
@ -175,7 +235,7 @@ const querySupplierParams = ref({
}) })
// 获取供应商列表 // 获取供应商列表
const getFormSupplierList = async () => { const getFormSupplierList = async () => {
options.supplierList = await getSupplierList(querySupplierParams.value); options.supplierList = await getSupplierList(querySupplierParams.value)
} }
// 选择供应商类型 // 选择供应商类型
@ -185,7 +245,6 @@ const changeSupplierType = (e) => {
getFormSupplierList() getFormSupplierList()
} }
getFormSupplierList() getFormSupplierList()
/** 打开弹窗 */ /** 打开弹窗 */
@ -215,7 +274,6 @@ const open = async (type: string, strategyCode: string, id?: number) => {
querySupplierParams.value.type = formData.value?.condition[0]?.Value || '' querySupplierParams.value.type = formData.value?.condition[0]?.Value || ''
getFormSupplierList() getFormSupplierList()
} finally { } finally {
formLoading.value = false formLoading.value = false
} }
@ -229,17 +287,25 @@ const submitForm = async () => {
// 校验表单 // 校验表单
if (!formRef) return if (!formRef) return
const valid = await formRef.value.validate() const valid = await formRef.value.validate()
if (!valid) return; if (!valid) return
let list = Object.values(formData.value.configuration)
let onlyOne = list.filter((item) => {
return item == 'TRUE'
})
if (onlyOne?.length != 1) {
message.error('只能选择一种拆分方式')
return
}
// 提交请求 // 提交请求
formLoading.value = true formLoading.value = true
try { try {
let data = { let data = {
id: formData.value.id, id: formData.value.id,
strategyCode: formData.value.strategyCode,//策略代码 strategyCode: formData.value.strategyCode, //策略代码
name: formData.value.name,//名称 name: formData.value.name, //名称
description: formData.value.description,//描述 description: formData.value.description, //描述
priority: formData.value.priority,//优先级 priority: formData.value.priority, //优先级
status: formData.value.status ? 0 : 1,//状态 status: formData.value.status ? 0 : 1, //状态
//规则条件集合 //规则条件集合
condition: JSON.stringify(formData.value.condition), condition: JSON.stringify(formData.value.condition),
configuration: JSON.stringify(formData.value.configuration) configuration: JSON.stringify(formData.value.configuration)
@ -263,33 +329,33 @@ const submitForm = async () => {
const resetForm = () => { const resetForm = () => {
formData.value = { formData.value = {
id: '', id: '',
strategyCode: formStrategyCode.value,//策略代码 strategyCode: formStrategyCode.value, //策略代码
name: '',//名称 name: '', //名称
description: '',//描述 description: '', //描述
priority: '',//优先级 priority: '', //优先级
status: true,//状态 status: true, //状态
//规则条件集合 //规则条件集合
condition: [ condition: [
// 供应商类型 // 供应商类型
{ ParamCode: 'SupplierType', Operator: "==", Value: "" }, { ParamCode: 'SupplierType', Operator: '==', Value: '' },
// 供应商 // 供应商
{ ParamCode: 'SupplierCode', Operator: "IN", Value: "" }, { ParamCode: 'SupplierCode', Operator: 'IN', Value: '' }
], ],
configuration: [ configuration: {
// 按零件拆分 // 按零件拆分
{ ParamCode: 'ByItem', Value: false }, ByItem: 'FALSE',
// 按批次拆分 // 按批次拆分
{ ParamCode: 'ByBatch', Value: false }, ByBatch: 'FALSE'
] }
} }
} }
// 弹窗按钮 // 弹窗按钮
const Butttondata = [ const Butttondata = [
defaultButtons.formSaveBtn(null), // 保存 defaultButtons.formSaveBtn(null), // 保存
defaultButtons.formCloseBtn(null), // 关闭 defaultButtons.formCloseBtn(null) // 关闭
] ]
// 按钮事件 // 按钮事件
const buttonBaseClick = (val, item) => { const buttonBaseClick = (val, item) => {
// 保存 // 保存
if (val == 'save') { if (val == 'save') {
@ -300,7 +366,6 @@ const buttonBaseClick = (val, item) => {
dialogVisible.value = false dialogVisible.value = false
} }
} }
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.item { .item {

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

@ -91,14 +91,14 @@
<div class="item mt-20px"> <div class="item mt-20px">
<div class="title">规则配置</div> <div class="title">规则配置</div>
<el-row gutter="10"> <el-row gutter="10">
<el-col :span="24" v-for="(item, index) in formData.configuration" :key="index"> <el-col :span="24">
<!-- 存储类型 --> <!-- 存储类型 -->
<el-form-item label="" label-width="0" class="flex-top" prop="configurationRules"> <el-form-item label="" label-width="0" class="flex-top" prop="configurationRules">
<div style="width: 100%;display:flex;align-items:center;margin-bottom:10px" <div style="width: 100%;display:flex;align-items:center;margin-bottom:10px"
v-for="(cur, key) in item.Value" :key="key"> v-for="(cur, key) in formData.configuration.ManagementPrecision" :key="key">
<div style="width: 26px;display: flex;"> <div style="width: 26px;display: flex;">
<Icon icon="ep:remove" color="#757575" size="26" style="cursor: pointer;" <Icon icon="ep:remove" color="#757575" size="26" style="cursor: pointer;"
@click="handleDeleteTable(item.Value, cur, key)" v-if="item.Value?.length > 1" /> @click="handleDeleteTable(formData.configuration.ManagementPrecision, cur, key)" v-if="formData?.configuration?.ManagementPrecision?.length > 1" />
</div> </div>
<div class="flex w-[28%]"> <div class="flex w-[28%]">
<div class="ml-10px mr-10px">批次类型</div> <div class="ml-10px mr-10px">批次类型</div>
@ -123,7 +123,7 @@
</div> </div>
</div> </div>
<div class="button flex"> <div class="button flex">
<div @click="handleAddTable(item.Value)"> <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>
</div> </div>
@ -175,17 +175,14 @@ const formData = ref({
// 物品类型/物品分组/物品/abc类/项目/ // 物品类型/物品分组/物品/abc类/项目/
{ ParamCode: 'ItemType', Operator: "IN", Value: "" }, { ParamCode: 'ItemType', Operator: "IN", Value: "" },
], ],
configuration: [ configuration: {
// 管理精度 // 管理精度
{ ManagementPrecision:[{
ParamCode: 'ManagementPrecision', Value: [{ BatchType: 'ARRIVE_TIME',
BatchType: 'ARRIVE_TIME', BatchFormat: '',
BatchFormat: '', BatchDirection: 'ASC',
BatchDirection: 'ASC', }]
}] },
},
],
configurationRules: '1'//规则配置验证 configurationRules: '1'//规则配置验证
}) })
@ -346,16 +343,14 @@ const resetForm = () => {
// 物品类型/物品分组/物品/abc类/项目/ // 物品类型/物品分组/物品/abc类/项目/
{ ParamCode: 'ItemType', Operator: "IN", Value: "" }, { ParamCode: 'ItemType', Operator: "IN", Value: "" },
], ],
configuration: [ configuration: {
// 管理精度 // 管理精度
{ ManagementPrecision:[{
ParamCode: 'ManagementPrecision', Value: [{ BatchType: 'ARRIVE_TIME',
BatchType: 'ARRIVE_TIME', BatchFormat: '',
BatchFormat: '', BatchDirection: 'ASC',
BatchDirection: 'ASC', }]
}] },
},
],
configurationRules: '1'//规则配置验证 configurationRules: '1'//规则配置验证
} }
} }
@ -391,16 +386,14 @@ const handleDeleteTable = (item, cur, key) => {
//失去焦点的时候验证 //失去焦点的时候验证
const inputBlur = () => { const inputBlur = () => {
let arr = [] let arr = []
formData.value.configuration.forEach(item => { formData.value.configuration.ManagementPrecision.forEach(item => {
let bol = false let bol = false
item.Value.forEach(cur => { if (!item.BatchFormat) {
if (!cur.BatchFormat) {
bol = false bol = false
} else { } else {
bol = true bol = true
} }
arr.push(bol) arr.push(bol)
})
}) })
const isEmpty = arr.some(cur => { const isEmpty = arr.some(cur => {
return !cur return !cur

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

@ -138,101 +138,135 @@
<div class="item mt-20px"> <div class="item mt-20px">
<div class="title">规则配置</div> <div class="title">规则配置</div>
<el-row gutter="10"> <el-row gutter="10">
<el-col :span="index == 8 ? 7: index == 9 ? 8 : index == 10 ? 9 : 24" v-for="(item, index) in formData.configuration" :key="index"> <el-col :span="24">
<!-- 仓库 库区 库位组 库位 --> <el-form-item label="" label-width="0" prop="warehouse" class="err-120">
<el-form-item label="" label-width="0" prop="warehouse" class="err-120" v-if="index == 0"> <el-select v-model="warehouseType" placeholder="" style="width: 110px;margin-right: 10px;"
<el-select v-model="item.ParamCode" placeholder="" style="width: 110px;margin-right: 10px;"
@change="changeWarehouse"> @change="changeWarehouse">
<el-option :label="cur.label" :value="cur.value" v-for="(cur, index) in options.warehouseTypeOptions" <el-option :label="cur.label" :value="cur.value" v-for="(cur, index) in options.warehouseTypeOptions"
:key="index" /> :key="index" />
</el-select> </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-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.id" :label="cur.name" :value="cur.id" />
</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.id" :label="cur.name" :value="cur.id" />
</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.id" :label="cur.name" :value="cur.id" />
</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.id" :label="cur.name" :value="cur.id" /> <el-option v-for="cur in options.warehouseList" :key="cur.id" :label="cur.name" :value="cur.id" />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
<!-- 数量排序方向 --> <!-- 数量排序方向 -->
<el-form-item label="数量排序方向" class="flex-top" v-else-if="index == 1"> <el-col :span="24">
<el-form-item label="数量排序方向" class="flex-top">
<div class="checkbox"> <div class="checkbox">
<el-radio-group v-model="item.Value"> <el-radio-group v-model="formData.configuration.QtyOrder">
<el-radio :label="cur.value" v-for="cur in options.sortOptions" :key="cur.value">{{ <el-radio :label="cur.value" v-for="cur in options.sortOptions" :key="cur.value">{{
cur.label }}</el-radio> cur.label }}</el-radio>
</el-radio-group> </el-radio-group>
</div> </div>
</el-form-item> </el-form-item>
</el-col>
<!-- 巷道排序方向 --> <!-- 巷道排序方向 -->
<el-form-item label="巷道排序方向" class="flex-top" v-else-if="index == 2"> <el-col :span="24">
<el-form-item label="巷道排序方向" class="flex-top">
<div class="checkbox"> <div class="checkbox">
<el-radio-group v-model="item.Value"> <el-radio-group v-model="formData.configuration.AisleOrder">
<el-radio :label="cur.value" v-for="cur in options.sortOptions" :key="cur.value">{{ <el-radio :label="cur.value" v-for="cur in options.sortOptions" :key="cur.value">{{
cur.label }}</el-radio> cur.label }}</el-radio>
</el-radio-group> </el-radio-group>
</div> </div>
</el-form-item> </el-form-item>
</el-col>
<!-- 货架排序方向 --> <!-- 货架排序方向 -->
<el-form-item label="货架排序方向" class="flex-top" v-else-if="index == 3"> <el-col :span="24">
<el-form-item label="货架排序方向" class="flex-top">
<div class="checkbox"> <div class="checkbox">
<el-radio-group v-model="item.Value"> <el-radio-group v-model="formData.configuration.ShelfOrder">
<el-radio :label="cur.value" v-for="cur in options.sortOptions" :key="cur.value">{{ <el-radio :label="cur.value" v-for="cur in options.sortOptions" :key="cur.value">{{
cur.label }}</el-radio> cur.label }}</el-radio>
</el-radio-group> </el-radio-group>
</div> </div>
</el-form-item> </el-form-item>
</el-col>
<!-- 行排序方向 --> <!-- 行排序方向 -->
<el-form-item label="行排序方向" class="flex-top" v-else-if="index == 4"> <el-col :span="24">
<el-form-item label="行排序方向" class="flex-top">
<div class="checkbox"> <div class="checkbox">
<el-radio-group v-model="item.Value"> <el-radio-group v-model="formData.configuration.RowOrder">
<el-radio :label="cur.value" v-for="cur in options.sortOptions" :key="cur.value">{{ <el-radio :label="cur.value" v-for="cur in options.sortOptions" :key="cur.value">{{
cur.label }}</el-radio> cur.label }}</el-radio>
</el-radio-group> </el-radio-group>
</div> </div>
</el-form-item> </el-form-item>
</el-col>
<!-- 列排序方向 --> <!-- 列排序方向 -->
<el-form-item label="列排序方向" class="flex-top" v-else-if="index == 5"> <el-col :span="24">
<el-form-item label="列排序方向" class="flex-top">
<div class="checkbox"> <div class="checkbox">
<el-radio-group v-model="item.Value"> <el-radio-group v-model="formData.configuration.ColumOrder">
<el-radio :label="cur.value" v-for="cur in options.sortOptions" :key="cur.value">{{ <el-radio :label="cur.value" v-for="cur in options.sortOptions" :key="cur.value">{{
cur.label }}</el-radio> cur.label }}</el-radio>
</el-radio-group> </el-radio-group>
</div> </div>
</el-form-item> </el-form-item>
</el-col>
<!-- 优先整包 --> <!-- 优先整包 -->
<el-form-item label="优先整包" v-else-if="index == 6"> <el-col :span="24">
<el-switch v-model="item.Value" /> <el-form-item label="优先整包">
<el-switch v-model="formData.configuration.EntirePackageFirst" active-value="TRUE" inactive-value="FALSE"/>
</el-form-item> </el-form-item>
</el-col>
<!-- 发料包装类型 --> <!-- 发料包装类型 -->
<el-form-item label="发料包装类型" v-else-if="index == 7"> <el-col :span="24">
<el-form-item label="发料包装类型">
<div class="checkbox"> <div class="checkbox">
<el-radio-group v-model="item.Value"> <el-radio-group v-model="formData.configuration.IssueStorageType">
<el-radio :label="cur.value" v-for="cur in getStrDictOptions(DICT_TYPE.STORAGE_TYPE)" <el-radio :label="cur.value" v-for="cur in getStrDictOptions(DICT_TYPE.STORAGE_TYPE)"
:key="cur.value">{{ cur.label }}</el-radio> :key="cur.value">{{ cur.label }}</el-radio>
</el-radio-group> </el-radio-group>
</div> </div>
</el-form-item> </el-form-item>
</el-col>
<!-- 多次发料 --> <!-- 多次发料 -->
<el-form-item label="多次发料" v-else-if="index == 8"> <el-col :span="7">
<el-switch v-model="item.Value" /> <el-form-item label="多次发料">
<el-switch v-model="formData.configuration.IsSplit" active-value="TRUE" inactive-value="FALSE"/>
</el-form-item> </el-form-item>
</el-col>
<!-- 拆分次数 --> <!-- 拆分次数 -->
<el-form-item label="拆分次数" label-width="70px" v-else-if="index == 9"> <el-col :span="8">
<el-input-number v-model="item.Value" :min="0" controls-position="right" /> <el-form-item label="拆分次数" label-width="70px">
<el-input-number v-model="formData.configuration.EachTimeQty" :min="0" controls-position="right" />
</el-form-item> </el-form-item>
</el-col>
<!-- 时间间隔 --> <!-- 时间间隔 -->
<el-form-item label="时间间隔" label-width="70px" v-else-if="index == 10"> <el-col :span="9">
<el-input-number v-model="item.Value" :min="0" style="flex:1;margin-right:10px" <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" />小时 controls-position="right" />小时
</el-form-item> </el-form-item>
</el-col>
<!-- 使用整理库位--> <!-- 使用整理库位-->
<el-form-item label="使用整理库位" v-else-if="index == 11"> <el-col :span="24">
<el-switch v-model="item.Value" /> <el-form-item label="使用整理库位">
<el-switch v-model="formData.configuration.UseOrganizeLocation" active-value="TRUE" inactive-value="FALSE"/>
</el-form-item> </el-form-item>
</el-col>
<!-- 使用在途库位 --> <!-- 使用在途库位 -->
<el-form-item label="使用在途库位" v-else-if="index == 12"> <el-col :span="24">
<el-switch v-model="item.Value" /> <el-form-item label="使用在途库位" >
<el-switch v-model="formData.configuration.UseTransportLocation" active-value="TRUE" inactive-value="FALSE"/>
</el-form-item> </el-form-item>
</el-col>
<!-- 生成接收任务 --> <!-- 生成接收任务 -->
<el-form-item label="生成接收任务" v-else-if="index == 13"> <el-col :span="24">
<el-switch v-model="item.Value" /> <el-form-item label="生成接收任务" >
<el-switch v-model="formData.configuration.CreateReceiptJob" active-value="TRUE" inactive-value="FALSE"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -270,6 +304,9 @@ const formRef = ref() // 表单 Ref
const formStrategyCode = ref('') const formStrategyCode = ref('')
// 仓库类型
const warehouseType = ref('WarehouseCode')
// form表单数据 // form表单数据
const formData = ref({ const formData = ref({
id: '', id: '',
@ -293,37 +330,42 @@ const formData = ref({
// 库存事务 // 库存事务
{ ParamCode: 'TransactionType', Operator: "IN", Value: [] } { ParamCode: 'TransactionType', Operator: "IN", Value: [] }
], ],
configuration: [ configuration: {
// 仓库 // 仓库代码
{ ParamCode: 'LocationCode', Value: "" }, WarehouseCode:"",
// 库区代码
AreaCode:"",
// 库位组代码
LocationGroupCode:"",
// 库位代码
LocationCode:"",
// 数量排序方向 // 数量排序方向
{ ParamCode: 'QtyOrder', Value: 'ASC' }, QtyOrder:"ASC",
// 巷道排序方向 // 巷道排序方向
{ ParamCode: 'AisleOrder', Value: 'ASC' }, AisleOrder:"ASC",
// 货架排序方向 // 货架排序方向
{ ParamCode: 'ShelfOrder', Value: 'ASC' }, ShelfOrder:"ASC",
// 行排序方向 // 行排序方向
{ ParamCode: 'RowOrder', Value: 'ASC' }, RowOrder:"ASC",
// 列排序方向 // 列排序方向
{ ParamCode: 'ColumOrder', Value: 'ASC' }, ColumOrder:"ASC",
// 优先整包 // 优先整包
{ ParamCode: 'EntirePackageFirst', Value: false }, EntirePackageFirst:'FALSE',
// 发料包装类型 // 发料包装类型
{ ParamCode: 'IssueStorageType', Value: 'SINGLE' }, IssueStorageType:"SINGLE",
// 是否拆分发料 // 是否拆分发料
{ ParamCode: 'IsSplit', Value: '' }, IsSplit:"",
// 拆分数量 // 拆分数量
{ ParamCode: 'EachTimeQty', Value: '' }, EachTimeQty:"",
// 时间间隔 // 时间间隔
{ ParamCode: 'TimeInterval', Value: '' }, TimeInterval:"",
// 是否使用整理库位 // 是否使用整理库位
{ ParamCode: 'UseOrganizeLocation', Value: false }, UseOrganizeLocation:'FALSE',
// 是否使用在途库位 // 是否使用在途库位
{ ParamCode: 'UseTransportLocation', Value: false }, UseTransportLocation:'FALSE',
// 是否生成发料接收任务 // 是否生成发料接收任务
{ ParamCode: 'CreateReceiptJob', Value: false }, CreateReceiptJob:'FALSE',
] }
}) })
// 验证规则 // 验证规则
const rules = ref({ const rules = ref({
@ -417,7 +459,10 @@ const getFormLocationList = async () => {
getFormLocationList() getFormLocationList()
// 选择仓库/库位/库位组/库区 // 选择仓库/库位/库位组/库区
const changeWarehouse = (e) => { const changeWarehouse = (e) => {
formData.value.configuration[0].Value = '' formData.value.configuration.WarehouseCode = ''
formData.value.configuration.AreaCode = ''
formData.value.configuration.LocationGroupCode = ''
formData.value.configuration.LocationCode = ''
if (e == 'WarehouseCode') { if (e == 'WarehouseCode') {
getFormWarehouseList() getFormWarehouseList()
} else if (e == 'AreaCode') { } else if (e == 'AreaCode') {
@ -434,6 +479,7 @@ const open = async (type: string, strategyCode: string, id?: number) => {
dialogVisible.value = true dialogVisible.value = true
dialogTitle.value = t('action.' + type) dialogTitle.value = t('action.' + type)
formType.value = type formType.value = type
warehouseType.value = 'WarehouseCode'
resetForm() resetForm()
// 修改时，设置数据 // 修改时，设置数据
if (id) { if (id) {
@ -459,13 +505,17 @@ const open = async (type: string, strategyCode: string, id?: number) => {
getFormCustomerList() getFormCustomerList()
} }
// 判断是获取仓库/库位/库位组/库区列表 // 判断是获取仓库/库位/库位组/库区列表
if (formData.value.configuration[0].ParamCode == 'WarehouseCode') { if ('WarehouseCode' in formData.value.configuration && formData.value.configuration.WarehouseCode) {
warehouseType.value = 'WarehouseCode'
getFormWarehouseList() getFormWarehouseList()
} else if (formData.value.configuration[0].ParamCode == 'AreaCode') { } else if ('AreaCode' in formData.value.configuration && formData.value.configuration.AreaCode) {
warehouseType.value = 'AreaCode'
getFormAreaList() getFormAreaList()
} else if (formData.value.configuration[0].ParamCode == 'LocationGroupCode') { } else if ('LocationGroupCode' in formData.value.configuration && formData.value.configuration.LocationGroupCode) {
warehouseType.value = 'LocationGroupCode'
getFormLocationgrouList() getFormLocationgrouList()
} else if (formData.value.configuration[0].ParamCode == 'LocationCode') { } else if ('LocationCode' in formData.value.configuration && formData.value.configuration.LocationCode) {
warehouseType.value = 'LocationCode'
getFormLocationList() getFormLocationList()
} }
} finally { } finally {
@ -536,36 +586,42 @@ const resetForm = () => {
{ ParamCode: 'TransactionType', Operator: "IN", Value: [] } { ParamCode: 'TransactionType', Operator: "IN", Value: [] }
], ],
configuration: [ configuration: {
// 仓库 // 仓库代码
{ ParamCode: 'LocationCode', Value: "" }, WarehouseCode:"",
// 库区代码
AreaCode:"",
// 库位组代码
LocationGroupCode:"",
// 库位代码
LocationCode:"",
// 数量排序方向 // 数量排序方向
{ ParamCode: 'QtyOrder', Value: 'ASC' }, QtyOrder:"ASC",
// 巷道排序方向 // 巷道排序方向
{ ParamCode: 'AisleOrder', Value: 'ASC' }, AisleOrder:"ASC",
// 货架排序方向 // 货架排序方向
{ ParamCode: 'ShelfOrder', Value: 'ASC' }, ShelfOrder:"ASC",
// 行排序方向 // 行排序方向
{ ParamCode: 'RowOrder', Value: 'ASC' }, RowOrder:"ASC",
// 列排序方向 // 列排序方向
{ ParamCode: 'ColumOrder', Value: 'ASC' }, ColumOrder:"ASC",
// 优先整包 // 优先整包
{ ParamCode: 'EntirePackageFirst', Value: false }, EntirePackageFirst:'FALSE',
// 发料包装类型 // 发料包装类型
{ ParamCode: 'IssueStorageType', Value: 'SINGLE' }, IssueStorageType:"SINGLE",
// 是否拆分发料 // 是否拆分发料
{ ParamCode: 'IsSplit', Value: '' }, IsSplit:"",
// 拆分数量 // 拆分数量
{ ParamCode: 'EachTimeQty', Value: '' }, EachTimeQty:"",
// 时间间隔 // 时间间隔
{ ParamCode: 'TimeInterval', Value: '' }, TimeInterval:"",
// 是否使用整理库位 // 是否使用整理库位
{ ParamCode: 'UseOrganizeLocation', Value: false }, UseOrganizeLocation:'FALSE',
// 是否使用在途库位 // 是否使用在途库位
{ ParamCode: 'UseTransportLocation', Value: false }, UseTransportLocation:'FALSE',
// 是否生成发料接收任务 // 是否生成发料接收任务
{ ParamCode: 'CreateReceiptJob', Value: false }, CreateReceiptJob:'FALSE',
] }
} }
} }

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

@ -1,16 +1,27 @@
<!-- 检验策略弹窗 --> <!-- 检验策略弹窗 -->
<template> <template>
<Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 800px;"> <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 800px">
<div class="p-20px m--10px" style="max-height: 50vh;overflow-y: auto;"> <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"> <el-form
ref="formRef"
:model="formData"
:rules="rules"
label-width="120px"
label-position="left"
>
<!-- 规则 --> <!-- 规则 -->
<div class="item"> <div class="item">
<div class="title">规则</div> <div class="title">规则</div>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="代码" prop="strategyCode"> <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-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
@ -42,38 +53,86 @@
<el-col :span="24" v-for="(item, index) in formData.condition" :key="index"> <el-col :span="24" v-for="(item, index) in formData.condition" :key="index">
<!-- 供应商类型 --> <!-- 供应商类型 -->
<el-form-item v-if="index == 0" label="供应商类型" class="flex-top err-120"> <el-form-item v-if="index == 0" label="供应商类型" class="flex-top err-120">
<el-select v-model="item.Operator" placeholder="请选择范围" style="width: 110px;;margin-right: 10px;"> <el-select
<el-option :label="cur.label" :value="cur.value" v-for="cur in options.supplierTypeRangeOptions" v-model="item.Operator"
:key="cur.value" /> placeholder="请选择范围"
style="width: 110px; margin-right: 10px"
>
<el-option
:label="cur.label"
:value="cur.value"
v-for="cur in options.supplierTypeRangeOptions"
:key="cur.value"
/>
</el-select> </el-select>
<el-select v-model="item.Value" placeholder="请选择供应商类型" style="flex: 1;" clearable <el-select
@change="changeSupplierType"> v-model="item.Value"
<el-option v-for="dict in getStrDictOptions(DICT_TYPE.SUPPLIER_TYPE)" :key="dict.value" placeholder="请选择供应商类型"
:label="dict.label" :value="dict.value" /> style="flex: 1"
clearable
@change="changeSupplierType"
>
<el-option
v-for="dict in getStrDictOptions(DICT_TYPE.SUPPLIER_TYPE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- 供应商 --> <!-- 供应商 -->
<el-form-item v-else-if="index == 1" label="供应商" class="err-120" :prop="'condition.' + index + '.Value'" <el-form-item
v-else-if="index == 1"
label="供应商"
class="err-120"
:prop="'condition.' + index + '.Value'"
:rules="{ :rules="{
required: true, required: true,
message: '请选择供应商', message: '请选择供应商',
trigger: 'change', 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.supplierRangeOptions" <el-select
:key="cur.value" /> v-model="item.Operator"
placeholder="请选择范围"
style="width: 110px; margin-right: 10px"
>
<el-option
:label="cur.label"
:value="cur.value"
v-for="cur in options.supplierRangeOptions"
:key="cur.value"
/>
</el-select> </el-select>
<el-select v-model="item.Value" placeholder="请选择供应商" style="flex: 1;" clearable> <el-select
<el-option v-for="cur in options.supplierList" :key="cur.id" :label="cur.name" :value="cur.id" /> v-model="item.Value"
placeholder="请选择供应商"
style="flex: 1"
clearable
>
<el-option
v-for="cur in options.supplierList"
:key="cur.id"
:label="cur.name"
:value="cur.id"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- 物品 --> <!-- 物品 -->
<el-form-item v-else-if="index == 2" label="物品" class="flex-top err-120"> <el-form-item v-else-if="index == 2" label="物品" class="flex-top err-120">
<el-select v-model="item.Operator" placeholder="请选择范围" style="width: 110px;;margin-right: 10px;"> <el-select
<el-option :label="cur.label" :value="cur.value" v-for="cur in options.ItemCodeRangeOptions" v-model="item.Operator"
:key="cur.value" /> placeholder="请选择范围"
style="width: 110px; margin-right: 10px"
>
<el-option
:label="cur.label"
:value="cur.value"
v-for="cur in options.ItemCodeRangeOptions"
:key="cur.value"
/>
</el-select> </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-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -83,46 +142,88 @@
<div class="title">规则配置</div> <div class="title">规则配置</div>
<el-row> <el-row>
<!-- 开始时间 --> <!-- 开始时间 -->
<el-col :span="24" v-for="(item, index) in formData.configuration" :key="index"> <el-col :span="24">
<!-- 检验方式 --> <!-- 检验方式 -->
<el-form-item label="检验方式" class="flex-top" v-if="index == 0"> <el-form-item label="检验方式" class="flex-top">
<div class="checkbox"> <div class="checkbox">
<el-radio-group v-model="item.Value"> <el-radio-group v-model="formData.configuration.InspectType">
<el-radio :label="cur.value" v-for="cur in getStrDictOptions(DICT_TYPE.INSPECT_TYPE)" <el-radio
:key="cur.value">{{ cur.label }}</el-radio> :label="cur.value"
v-for="cur in getStrDictOptions(DICT_TYPE.INSPECT_TYPE)"
:key="cur.value"
>{{ cur.label }}</el-radio
>
</el-radio-group> </el-radio-group>
</div> </div>
</el-form-item> </el-form-item>
<!-- 抽检方式 --> </el-col>
<el-form-item label="抽检方式" class="flex-top" v-if="index == 1"> <!-- 抽检方式 -->
<el-col :span="24">
<el-form-item label="抽检方式" class="flex-top">
<div class="checkbox"> <div class="checkbox">
<el-radio-group v-model="item.Value"> <el-radio-group v-model="formData.configuration.SampleMethod">
<el-radio :label="cur.value" v-for="cur in getStrDictOptions(DICT_TYPE.SAMPLE_METHOD)" @change="changeSampleMethod" <el-radio
:key="cur.value">{{ cur.label }}</el-radio> :label="cur.value"
v-for="cur in getStrDictOptions(DICT_TYPE.SAMPLE_METHOD)"
@change="changeSampleMethod"
:key="cur.value"
>{{ cur.label }}</el-radio
>
</el-radio-group> </el-radio-group>
</div> </div>
</el-form-item> </el-form-item>
<!-- 抽检规则 --> </el-col>
<el-form-item label="抽检规则" class="flex-top" v-if="index == 2" prop="configurationRules"> <!-- 抽检规则 -->
<div style="flex:1;display:flex;align-items:center;margin-bottom:10px" v-for="(cur, key) in item.Value" <el-col :span="24">
:key="key"> <el-form-item label="抽检规则" class="flex-top" prop="configurationRules">
<div style="width: 26px;display: flex;"> <div
<Icon icon="ep:remove" color="#757575" size="26" style="cursor: pointer;" style="flex: 1; display: flex; align-items: center; margin-bottom: 10px"
@click="handleDeleteTable(item.Value,cur, key)" v-if="item.Value?.length > 1" /> v-for="(cur, key) in formData.configuration.AqlList"
:key="key"
>
<div style="width: 26px; display: flex">
<Icon
icon="ep:remove"
color="#757575"
size="26"
style="cursor: pointer"
@click="handleDeleteTable(formData.configuration.AqlList, cur, key)"
v-if="formData.configuration.AqlList?.length > 1"
/>
</div> </div>
<el-input-number v-model="cur.FloorQty" :min="1" :max="cur.CeilingQty - 1" class='ml-20px mr-20px' <el-input-number
style="width:100px" controls-position="right" @blur="inputNumberBlur" /> v-model="cur.FloorQty"
:min="1"
:max="cur.CeilingQty - 1"
class="ml-20px mr-20px"
style="width: 100px"
controls-position="right"
@blur="inputNumberBlur"
/>
<div>至</div> <div>至</div>
<el-input-number v-model="cur.CeilingQty" :min="cur.FloorQty + 1" class='ml-20px mr-20px' style="width:100px" <el-input-number
controls-position="right" @blur="inputNumberBlur" /> v-model="cur.CeilingQty"
:min="cur.FloorQty + 1"
class="ml-20px mr-20px"
style="width: 100px"
controls-position="right"
@blur="inputNumberBlur"
/>
<div>抽样数</div> <div>抽样数</div>
<el-input-number v-model="cur.SampleValue" :min="1" :max="formData.configuration[1].Value == 'QTY'?Infinity:100" class='ml-20px mr-20px' style="width:100px" <el-input-number
controls-position="right" @blur="inputNumberBlur" /> v-model="cur.SampleValue"
<div>{{formData.configuration[1].Value == 'QTY'?'EA':'%'}}</div> :min="1"
:max="formData.configuration.SampleMethod == 'QTY' ? Infinity : 100"
class="ml-20px mr-20px"
style="width: 100px"
controls-position="right"
@blur="inputNumberBlur"
/>
<div>{{ formData.configuration.SampleMethod == 'QTY' ? 'EA' : '%' }}</div>
</div> </div>
<div class="button flex"> <div class="button flex">
<div @click="handleAddTable(item.Value)"> <div @click="handleAddTable(formData.configuration.AqlList)">
<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>
</div> </div>
</div> </div>
@ -145,8 +246,6 @@ import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
import { getSupplierList } from '@/api/wms/supplier' import { getSupplierList } from '@/api/wms/supplier'
import * as RuleApi from '@/api/wms/rule' import * as RuleApi from '@/api/wms/rule'
const { t } = useI18n() // 国际化 const { t } = useI18n() // 国际化
const message = useMessage() // 消息弹窗 const message = useMessage() // 消息弹窗
@ -160,35 +259,35 @@ const formStrategyCode = ref('')
// form表单数据 // form表单数据
const formData = ref({ const formData = ref({
id: '', id: '',
strategyCode: formStrategyCode.value,//策略代码id strategyCode: formStrategyCode.value, //策略代码id
name: '',//名称 name: '', //名称
description: '',//描述 description: '', //描述
priority: '',//优先级 priority: '', //优先级
status: true,//状态 status: true, //状态
//规则条件集合 //规则条件集合
condition: [ condition: [
// 供应商类型 // 供应商类型
{ ParamCode: 'SupplierType', Operator: "==", Value: "" }, { ParamCode: 'SupplierType', Operator: '==', Value: '' },
// 供应商 // 供应商
{ ParamCode: 'SupplierCode', Operator: "==", Value: "" }, { ParamCode: 'SupplierCode', Operator: '==', Value: '' },
// 物品代码 // 物品代码
{ ParamCode: 'ItemCode', Operator: "IN", Value: [] } { ParamCode: 'ItemCode', Operator: 'IN', Value: [] }
], ],
configuration: [ configuration: {
// 检验方式 // 检验方式
{ ParamCode: 'InspectType', Value: "EXAMPT" }, InspectType: 'EXEMPT',
// 抽检方式 // 抽检方式
{ ParamCode: 'SampleMethod', Value: "QTY" }, SampleMethod: 'QTY',
// 抽检规则列表 // 抽检规则列表
{ AqlList: [
ParamCode: 'AqlList', Value: [{ {
FloorQty: 1, FloorQty: 1,
CeilingQty:2, CeilingQty: 2,
SampleValue: 1, SampleValue: 1
}] }
} ]
], },
configurationRules: '1'//规则配置验证 configurationRules: '1' //规则配置验证
}) })
// 验证规则 // 验证规则
@ -197,7 +296,7 @@ const rules = ref({
name: [{ required: true, message: '请输入名字', trigger: 'blur' }], name: [{ required: true, message: '请输入名字', trigger: 'blur' }],
description: [{ required: true, message: '请输入描述', trigger: 'blur' }], description: [{ required: true, message: '请输入描述', trigger: 'blur' }],
priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }], priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }],
configurationRules: [{ required: true, message: '抽奖规则请填写完全', trigger: 'blur' }], configurationRules: [{ required: true, message: '抽奖规则请填写完全', trigger: 'blur' }]
}) })
// 所有的范围类型 // 所有的范围类型
@ -211,11 +310,11 @@ const rangeOptions = [
{ value: 'IN', label: '包含' }, { value: 'IN', label: '包含' },
{ value: 'NOT IN', label: '不包含' }, { value: 'NOT IN', label: '不包含' },
{ value: 'NULL', label: '为空' }, { value: 'NULL', label: '为空' },
{ value: 'NOT NULL', label: '不为空' }, { value: 'NOT NULL', label: '不为空' }
] ]
const formatRangeOptions = (...rest) => { 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 return result
} }
// 下拉框列表集合 // 下拉框列表集合
@ -229,7 +328,7 @@ const options = reactive({
//供应商列表 //供应商列表
supplierList: [], supplierList: [],
// 物品范围下拉框列表 // 物品范围下拉框列表
ItemCodeRangeOptions: formatRangeOptions('IN', 'NOT IN'), ItemCodeRangeOptions: formatRangeOptions('IN', 'NOT IN')
}) })
// 获取供应商列表的参数 // 获取供应商列表的参数
const querySupplierParams = ref({ const querySupplierParams = ref({
@ -237,7 +336,7 @@ const querySupplierParams = ref({
}) })
// 获取供应商列表 // 获取供应商列表
const getFormSupplierList = async () => { const getFormSupplierList = async () => {
options.supplierList = await getSupplierList(querySupplierParams.value); options.supplierList = await getSupplierList(querySupplierParams.value)
} }
// 选择供应商类型 // 选择供应商类型
@ -249,18 +348,15 @@ const changeSupplierType = (e) => {
getFormSupplierList() getFormSupplierList()
// 改变抽检方式的时候 // 改变抽检方式的时候
function changeSampleMethod(e){ function changeSampleMethod(e) {
console.log(e); console.log(e)
if(e == 'PERCENT'){ if (e == 'PERCENT') {
console.log(formData.value.configuration[2].Value) formData.value.configuration.AqlList.forEach((cur) => {
formData.value.configuration[2].Value.forEach(cur=>{ if (cur.SampleValue > 100) {
cur.SampleValue = 100
if(cur.SampleValue>100){
cur.SampleValue=100
} }
}) })
} }
} }
/** 打开弹窗 */ /** 打开弹窗 */
const open = async (type: string, strategyCode: string, id?: number) => { const open = async (type: string, strategyCode: string, id?: number) => {
@ -289,7 +385,6 @@ const open = async (type: string, strategyCode: string, id?: number) => {
querySupplierParams.value.type = formData.value?.condition[0]?.Value || '' querySupplierParams.value.type = formData.value?.condition[0]?.Value || ''
getFormSupplierList() getFormSupplierList()
} finally { } finally {
formLoading.value = false formLoading.value = false
} }
@ -310,11 +405,11 @@ const submitForm = async () => {
try { try {
let data = { let data = {
id: formData.value.id, id: formData.value.id,
strategyCode: formData.value.strategyCode,//策略代码 strategyCode: formData.value.strategyCode, //策略代码
name: formData.value.name,//名称 name: formData.value.name, //名称
description: formData.value.description,//描述 description: formData.value.description, //描述
priority: formData.value.priority,//优先级 priority: formData.value.priority, //优先级
status: formData.value.status ? 0 : 1,//状态 status: formData.value.status ? 0 : 1, //状态
//规则条件集合 //规则条件集合
condition: JSON.stringify(formData.value.condition), condition: JSON.stringify(formData.value.condition),
configuration: JSON.stringify(formData.value.configuration) configuration: JSON.stringify(formData.value.configuration)
@ -338,44 +433,44 @@ const submitForm = async () => {
const resetForm = () => { const resetForm = () => {
formData.value = { formData.value = {
id: '', id: '',
strategyCode: formStrategyCode.value,//策略代码 strategyCode: formStrategyCode.value, //策略代码
name: '',//名称 name: '', //名称
description: '',//描述 description: '', //描述
priority: '',//优先级 priority: '', //优先级
status: true,//状态 status: true, //状态
//规则条件集合 //规则条件集合
condition: [ condition: [
// 供应商类型 // 供应商类型
{ ParamCode: 'SupplierType', Operator: "==", Value: "" }, { ParamCode: 'SupplierType', Operator: '==', Value: '' },
// 供应商 // 供应商
{ ParamCode: 'SupplierCode', Operator: "==", Value: "" }, { ParamCode: 'SupplierCode', Operator: '==', Value: '' },
// 物品代码 // 物品代码
{ ParamCode: 'ItemCode', Operator: "IN", Value: [] } { ParamCode: 'ItemCode', Operator: 'IN', Value: [] }
], ],
configuration: [ configuration: {
// 检验方式 // 检验方式
{ ParamCode: 'InspectType', Value: "EXEMPT" }, InspectType: 'EXEMPT',
// 抽检方式 // 抽检方式
{ ParamCode: 'SampleMethod', Value: "QTY" }, SampleMethod: 'QTY',
// 抽检规则列表 // 抽检规则列表
{ AqlList: [
ParamCode: 'AqlList', Value: [{ {
FloorQty: 1, FloorQty: 1,
CeilingQty: 2, CeilingQty: 2,
SampleValue: 1, SampleValue: 1
}] }
}, ]
], },
configurationRules: '1'//规则配置验证 configurationRules: '1' //规则配置验证
} }
} }
// 弹窗按钮 // 弹窗按钮
const Butttondata = [ const Butttondata = [
defaultButtons.formSaveBtn(null), // 保存 defaultButtons.formSaveBtn(null), // 保存
defaultButtons.formCloseBtn(null), // 关闭 defaultButtons.formCloseBtn(null) // 关闭
] ]
// 按钮事件 // 按钮事件
const buttonBaseClick = (val, item) => { const buttonBaseClick = (val, item) => {
// 保存 // 保存
if (val == 'save') { if (val == 'save') {
@ -392,41 +487,35 @@ const handleAddTable = (item) => {
item.push({ item.push({
FloorQty: 1, FloorQty: 1,
CeilingQty: 2, CeilingQty: 2,
SampleValue: 1, SampleValue: 1
}) })
} }
// 删除抽查规则 // 删除抽查规则
const handleDeleteTable = (item,cur, key) => { const handleDeleteTable = (item, cur, key) => {
item.splice(key, 1) item.splice(key, 1)
} }
//失去焦点的时候验证 //失去焦点的时候验证
const inputNumberBlur=()=>{ const inputNumberBlur = () => {
let arr = [] let arr = []
formData.value.configuration.forEach(item => { formData.value.configuration.AqlList.forEach((item) => {
let bol = false let bol = false
if(item.ParamCode == 'AqlList'){ if (!item.FloorQty || !item.CeilingQty || !item.SampleValue) {
item.Value.forEach(cur => { bol = false
if (!cur.FloorQty|| !cur.CeilingQty || !cur.SampleValue) { } else {
bol = false bol = true
} else {
bol = true
}
arr.push(bol)
})
} }
arr.push(bol)
}) })
const isEmpty = arr.some(cur => { const isEmpty = arr.some((cur) => {
return !cur return !cur
}) })
if (isEmpty) { if (isEmpty) {
formData.value.configurationRules = '' formData.value.configurationRules = ''
return; return
} else { } else {
formData.value.configurationRules = '1' formData.value.configurationRules = '1'
} }
} }
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.item { .item {
@ -462,13 +551,13 @@ const inputNumberBlur=()=>{
padding-left: 120px !important; padding-left: 120px !important;
} }
.button { .button {
>div { > div {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
cursor: pointer; cursor: pointer;
>div { > div {
margin-left: 6px; margin-left: 6px;
text-decoration: underline; text-decoration: underline;
color: #409eff; color: #409eff;

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

@ -124,11 +124,11 @@
<div class="item mt-20px"> <div class="item mt-20px">
<div class="title">规则配置</div> <div class="title">规则配置</div>
<el-row gutter="10"> <el-row gutter="10">
<el-col :span="24" v-for="(item, index) in formData.configuration" :key="index"> <el-col :span="24">
<!-- 存储类型 --> <!-- 存储类型 -->
<el-form-item label="管理精度" v-if="index == 0"> <el-form-item label="管理精度">
<div class="checkbox"> <div class="checkbox">
<el-radio-group v-model="item.Value"> <el-radio-group v-model="formData.configuration.ManagementPrecision">
<el-radio :label="cur.value" v-for="cur in getStrDictOptions(DICT_TYPE.MANAGEMENT_MODE)" <el-radio :label="cur.value" v-for="cur in getStrDictOptions(DICT_TYPE.MANAGEMENT_MODE)"
:key="cur.value">{{ cur.label }}</el-radio> :key="cur.value">{{ cur.label }}</el-radio>
</el-radio-group> </el-radio-group>
@ -190,10 +190,10 @@ const formData = ref({
// 忽略库位 // 忽略库位
{ ParamCode: 'IgnoreListOfLocation', Operator: "IN", Value: "" }, { ParamCode: 'IgnoreListOfLocation', Operator: "IN", Value: "" },
], ],
configuration: [ configuration: {
// 管理精度 // 管理精度
{ ParamCode: 'ManagementPrecision', Value: "BY_PACKAGING" }, ManagementPrecision:'BY_PACKAGING'
] }
}) })
// 验证规则 // 验证规则
@ -403,10 +403,10 @@ const resetForm = () => {
// 忽略库位 // 忽略库位
{ ParamCode: 'IgnoreListOfLocation', Operator: "IN", Value: "" }, { ParamCode: 'IgnoreListOfLocation', Operator: "IN", Value: "" },
], ],
configuration: [ configuration: {
// 管理精度 // 管理精度
{ ParamCode: 'ManagementPrecision', Value: "BY_PACKAGING" }, ManagementPrecision:'BY_PACKAGING'
] }
} }
} }

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

@ -1,16 +1,27 @@
<!-- 采购收货任务拆分策略弹出层 --> <!-- 采购收货任务拆分策略弹出层 -->
<template> <template>
<Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px;"> <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px">
<div class="p-20px m--10px" style="max-height: 50vh;overflow-y: auto;"> <div class="p-20px m--10px" style="max-height: 50vh; overflow-y: auto">
<!-- 规则 --> <!-- 规则 -->
<el-form ref="formRef" :model="formData" :rules="rules" label-width="140px" label-position="left"> <el-form
ref="formRef"
:model="formData"
:rules="rules"
label-width="140px"
label-position="left"
>
<div class="item"> <div class="item">
<div class="title">规则</div> <div class="title">规则</div>
<el-row gutter="10"> <el-row gutter="10">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="代码" prop="strategyCode"> <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-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
@ -41,25 +52,68 @@
<el-row gutter="10"> <el-row gutter="10">
<el-col :span="24" v-for="(item, index) in formData.condition" :key="index"> <el-col :span="24" v-for="(item, index) in formData.condition" :key="index">
<!-- 供应商类型 --> <!-- 供应商类型 -->
<el-form-item v-if="item.ParamCode == 'SupplierType'" label="供应商类型" class="flex-top err-120"> <el-form-item
<el-select v-model="item.Operator" placeholder="请选择范围" style="width: 110px;;margin-right: 10px;"> v-if="item.ParamCode == 'SupplierType'"
<el-option :label="cur.label" :value="cur.value" v-for="cur in options.supplierTypeRangeOptions" label="供应商类型"
:key="cur.value" /> class="flex-top err-120"
>
<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.supplierTypeRangeOptions"
:key="cur.value"
/>
</el-select> </el-select>
<el-select v-model="item.Value" placeholder="请选择供应商类型" style="flex: 1;" clearable <el-select
@change="changeSupplierType"> v-model="item.Value"
<el-option v-for="dict in getStrDictOptions(DICT_TYPE.SUPPLIER_TYPE)" :key="dict.value" placeholder="请选择供应商类型"
:label="dict.label" :value="dict.value" /> style="flex: 1"
clearable
@change="changeSupplierType"
>
<el-option
v-for="dict in getStrDictOptions(DICT_TYPE.SUPPLIER_TYPE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- 供应商 --> <!-- 供应商 -->
<el-form-item v-else-if="item.ParamCode == 'SupplierCode'" label="供应商" class="err-120"> <el-form-item
<el-select v-model="item.Operator" placeholder="请选择范围" style="width: 110px;margin-right: 10px;"> v-else-if="item.ParamCode == 'SupplierCode'"
<el-option :label="cur.label" :value="cur.value" v-for="cur in options.supplierRangeOptions" label="供应商"
:key="cur.value" /> class="err-120"
>
<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.supplierRangeOptions"
:key="cur.value"
/>
</el-select> </el-select>
<el-select v-model="item.Value" placeholder="请选择供应商" style="flex: 1;" clearable> <el-select
<el-option v-for="cur in options.supplierList" :key="cur.id" :label="cur.name" :value="cur.id" /> v-model="item.Value"
placeholder="请选择供应商"
style="flex: 1"
clearable
>
<el-option
v-for="cur in options.supplierList"
:key="cur.id"
:label="cur.name"
:value="cur.id"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -69,23 +123,22 @@
<div class="item mt-20px"> <div class="item mt-20px">
<div class="title">规则配置</div> <div class="title">规则配置</div>
<el-row gutter="10"> <el-row gutter="10">
<el-col :span="24" v-for="(item, index) in formData.configuration" :key="index"> <el-col :span="24">
<!-- 按零件拆分 --> <!-- 按零件拆分 -->
<el-form-item v-if="item.ParamCode == 'ByItem'" label="按零件拆分"> <el-form-item label="按零件拆分">
<el-switch v-model="item.Value" /> <el-switch v-model="formData.configuration.ByItem" active-value="TRUE" inactive-value="FALSE"/>
</el-form-item> </el-form-item>
<!-- 按库位拆分 --> <!-- 按库位拆分 -->
<el-form-item v-else-if="item.ParamCode == 'ByLocation'" label="按库位拆分"> <el-form-item label="按库位拆分">
<el-switch v-model="item.Value" /> <el-switch v-model="formData.configuration.ByLocation" active-value="TRUE" inactive-value="FALSE"/>
</el-form-item> </el-form-item>
<!--按器具拆分--> <!--按器具拆分-->
<el-form-item v-else-if="item.ParamCode == 'ByContainer'" label="按器具拆分"> <el-form-item label="按器具拆分">
<el-switch v-model="item.Value" /> <el-switch v-model="formData.configuration.ByContainer" active-value="TRUE" inactive-value="FALSE"/>
</el-form-item> </el-form-item>
<!-- 每个任务明细数量 --> <!-- 每个任务明细数量 -->
<el-form-item v-else-if="item.ParamCode == 'JobDetailCount'" label="每个任务明细数量"> <el-form-item label="每个任务明细数量">
<!-- <el-input v-model="item.Value" placeholder="请输入每个任务明细数量" clearable /> --> <el-input-number v-model="formData.configuration.JobDetailCount" :min="0" />
<el-input-number v-model="item.Value" :min="0" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -104,8 +157,7 @@ defineOptions({ name: 'SupplieDeliveryStrategyAddForm' })
import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
import { getSupplierList } from '@/api/wms/supplier' import { getSupplierList } from '@/api/wms/supplier'
import * as RuleApi from '@/api/wms/rule' import * as RuleApi from '@/api/wms/rule'
import { object } from 'vue-types'
const { t } = useI18n() // 国际化 const { t } = useI18n() // 国际化
const message = useMessage() // 消息弹窗 const message = useMessage() // 消息弹窗
@ -120,28 +172,28 @@ const formStrategyCode = ref('')
// form表单数据 // form表单数据
const formData = ref({ const formData = ref({
id: '', id: '',
strategyCode: formStrategyCode.value,//策略代码id strategyCode: formStrategyCode.value, //策略代码id
name: '',//名称 name: '', //名称
description: '',//描述 description: '', //描述
priority: '',//优先级 priority: '', //优先级
status: true,//状态 status: true, //状态
//规则条件集合 //规则条件集合
condition: [ condition: [
// 供应商类型 // 供应商类型
{ ParamCode: 'SupplierType', Operator: "==", Value: "" }, { ParamCode: 'SupplierType', Operator: '==', Value: '' },
// 供应商 // 供应商
{ ParamCode: 'SupplierCode', Operator: "IN", Value: "" } { ParamCode: 'SupplierCode', Operator: 'IN', Value: '' }
], ],
configuration: [ configuration: {
// 按零件拆分 // 按零件拆分
{ ParamCode: 'ByItem', Value: false }, ByItem: 'FALSE',
// 按库位拆分 // 按库位拆分
{ ParamCode: 'ByLocation', Value: true }, ByLocation: 'TRUE',
// 按器具拆分 // 按器具拆分
{ ParamCode: 'ByContainer', Value: false }, ByContainer: 'FALSE',
// 每个任务明细数量 // 每个任务明细数量
{ ParamCode: 'JobDetailCount', Value: 0 }, JobDetailCount: 0
] }
}) })
// 验证规则 // 验证规则
@ -163,25 +215,31 @@ const rangeOptions = [
{ value: 'IN', label: '包含' }, { value: 'IN', label: '包含' },
{ value: 'NOT IN', label: '不包含' }, { value: 'NOT IN', label: '不包含' },
{ value: 'NULL', label: '为空' }, { value: 'NULL', label: '为空' },
{ value: 'NOT NULL', label: '不为空' }, { value: 'NOT NULL', label: '不为空' }
] ]
const formatRangeOptions = (...rest) => { 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 return result
} }
// 下拉框列表集合 // 下拉框列表集合
const options = reactive({ const options = reactive({
// 供应商类型范围下拉框列表 // 供应商类型范围下拉框列表
supplierTypeRangeOptions: formatRangeOptions('=='), supplierTypeRangeOptions: formatRangeOptions('=='),
// 供应商列表 // 供应商列表
supplierTypeOptions: [{ value: 1, label: '标准' }, { value: 2, label: '委外' }, { value: 3, label: '其他' }], supplierTypeOptions: [
{ value: 1, label: '标准' },
{ value: 2, label: '委外' },
{ value: 3, label: '其他' }
],
// 供应商范围下拉框列表 // 供应商范围下拉框列表
supplierRangeOptions: formatRangeOptions('IN', 'NOT IN'), supplierRangeOptions: formatRangeOptions('IN', 'NOT IN'),
//供应商列表 //供应商列表
supplierList: [{ value: 1, label: '供应商1' }, { value: 2, label: '供应商2' }, { value: 3, label: '供应商3' }], supplierList: [
{ value: 1, label: '供应商1' },
{ value: 2, label: '供应商2' },
{ value: 3, label: '供应商3' }
]
}) })
// 获取供应商列表的参数 // 获取供应商列表的参数
const querySupplierParams = ref({ const querySupplierParams = ref({
@ -189,7 +247,7 @@ const querySupplierParams = ref({
}) })
// 获取供应商列表 // 获取供应商列表
const getFormSupplierList = async () => { const getFormSupplierList = async () => {
options.supplierList = await getSupplierList(querySupplierParams.value); options.supplierList = await getSupplierList(querySupplierParams.value)
} }
// 选择供应商类型 // 选择供应商类型
@ -199,7 +257,6 @@ const changeSupplierType = (e) => {
getFormSupplierList() getFormSupplierList()
} }
getFormSupplierList() getFormSupplierList()
/** 打开弹窗 */ /** 打开弹窗 */
@ -229,7 +286,6 @@ const open = async (type: string, strategyCode: string, id?: number) => {
querySupplierParams.value.type = formData.value?.condition[0]?.Value || '' querySupplierParams.value.type = formData.value?.condition[0]?.Value || ''
getFormSupplierList() getFormSupplierList()
} finally { } finally {
formLoading.value = false formLoading.value = false
} }
@ -243,11 +299,12 @@ const submitForm = async () => {
// 校验表单 // 校验表单
if (!formRef) return if (!formRef) return
const valid = await formRef.value.validate() const valid = await formRef.value.validate()
if (!valid) return; if (!valid) return
let onlyOne = formData.value.configuration.filter(item=>{ let list = Object.values(formData.value.configuration)
return item.Value == true let onlyOne = list.filter((item) => {
return item == 'TRUE'
}) })
if(onlyOne?.length !=1){ if (onlyOne?.length != 1) {
message.error('只能选择一种拆分方式') message.error('只能选择一种拆分方式')
return return
} }
@ -256,11 +313,11 @@ const submitForm = async () => {
try { try {
let data = { let data = {
id: formData.value.id, id: formData.value.id,
strategyCode: formData.value.strategyCode,//策略代码 strategyCode: formData.value.strategyCode, //策略代码
name: formData.value.name,//名称 name: formData.value.name, //名称
description: formData.value.description,//描述 description: formData.value.description, //描述
priority: formData.value.priority,//优先级 priority: formData.value.priority, //优先级
status: formData.value.status ? 0 : 1,//状态 status: formData.value.status ? 0 : 1, //状态
//规则条件集合 //规则条件集合
condition: JSON.stringify(formData.value.condition), condition: JSON.stringify(formData.value.condition),
configuration: JSON.stringify(formData.value.configuration) configuration: JSON.stringify(formData.value.configuration)
@ -284,37 +341,37 @@ const submitForm = async () => {
const resetForm = () => { const resetForm = () => {
formData.value = { formData.value = {
id: '', id: '',
strategyCode: formStrategyCode.value,//策略代码 strategyCode: formStrategyCode.value, //策略代码
name: '',//名称 name: '', //名称
description: '',//描述 description: '', //描述
priority: '',//优先级 priority: '', //优先级
status: true,//状态 status: true, //状态
//规则条件集合 //规则条件集合
condition: [ condition: [
// 供应商类型 // 供应商类型
{ ParamCode: 'SupplierType', Operator: "==", Value: "" }, { ParamCode: 'SupplierType', Operator: '==', Value: '' },
// 供应商 // 供应商
{ ParamCode: 'SupplierCode', Operator: "IN", Value: "" }, { ParamCode: 'SupplierCode', Operator: 'IN', Value: '' }
], ],
configuration: [ configuration: {
// 按零件拆分 // 按零件拆分
{ ParamCode: 'ByItem', Value: false }, ByItem: 'FALSE',
// 按库位拆分 // 按库位拆分
{ ParamCode: 'ByLocation', Value: true }, ByLocation: 'TRUE',
// 按器具拆分 // 按器具拆分
{ ParamCode: 'ByContainer', Value: 'false' }, ByContainer: 'FALSE',
// 每个任务明细数量 // 每个任务明细数量
{ ParamCode: 'JobDetailCount', Value: 0 }, JobDetailCount: 0
] }
} }
} }
// 弹窗按钮 // 弹窗按钮
const Butttondata = [ const Butttondata = [
defaultButtons.formSaveBtn(null), // 保存 defaultButtons.formSaveBtn(null), // 保存
defaultButtons.formCloseBtn(null), // 关闭 defaultButtons.formCloseBtn(null) // 关闭
] ]
// 按钮事件 // 按钮事件
const buttonBaseClick = (val, item) => { const buttonBaseClick = (val, item) => {
// 保存 // 保存
if (val == 'save') { if (val == 'save') {
@ -325,7 +382,6 @@ const buttonBaseClick = (val, item) => {
dialogVisible.value = false dialogVisible.value = false
} }
} }
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.item { .item {

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

@ -93,31 +93,33 @@
<div class="item mt-20px"> <div class="item mt-20px">
<div class="title">规则配置</div> <div class="title">规则配置</div>
<el-row gutter="10"> <el-row gutter="10">
<el-col :span="24" v-for="(item, index) in formData.configuration" :key="index"> <!-- 最大库存 -->
<!-- 最大库存 --> <el-col :span="24">
<el-form-item label="最大库存" v-if="index == 0" :prop="'configuration.' + index + '.Value'" <el-form-item label="最大库存" prop="configuration.MaxQty" :rules="[{ required: true, message: '请输入最小库存', trigger: 'change', }]">
:rules="[{ required: true, message: '请输入最大库存', trigger: 'change', }]"> <el-input-number v-model="formData.configuration.MaxQty" :min="-1" controls-position="right" />
<el-input-number v-model="item.Value" :min="-1" controls-position="right" />
</el-form-item> </el-form-item>
<!-- 最小库存 --> </el-col>
<el-form-item label="最小库存" v-else-if="index == 1" :prop="'configuration.' + index + '.Value'" <!-- 最小库存 -->
:rules="[{ required: true, message: '请输入最小库存', trigger: 'change', }, { validator: validatorNum, message: '不可以大于最大库存', trigger: 'change', }]"> <el-col :span="24">
<el-input-number v-model="item.Value" :min="0" <el-form-item label="最小库存" prop="configuration.MinQty" :rules="[{ required: true, message: '请输入最小库存', trigger: 'change', }, { validator: validatorNum, message: '不可以大于最大库存', trigger: 'change', }]">
:max="formData.configuration[0].Value != -1 ? formData.configuration[0].Value : Infinity" <el-input-number v-model="formData.configuration.MinQty" :min="0"
:max="formData.configuration.MaxQty != -1 ? formData.configuration.MaxQty : Infinity"
controls-position="right" /> controls-position="right" />
</el-form-item> </el-form-item>
<!-- 安全库存 --> </el-col>
<el-form-item label="安全库存" v-else-if="index == 2" :prop="'configuration.' + index + '.Value'" <!-- 安全库存 -->
:rules="[{ required: true, message: '请输入最小库存', trigger: 'change', }, { validator: validatorNum, message: '不可以大于最大库存', trigger: 'change', }]"> <el-col :span="24">
<el-input-number v-model="item.Value" :min="0" <el-form-item label="安全库存" prop="configuration.SafetyQty" :rules="[{ required: true, message: '请输入安全库存', trigger: 'change', }, { validator: validatorNum, message: '不可以大于最大库存', trigger: 'change', }]">
:max="formData.configuration[0].Value != -1 ? formData.configuration[0].Value : Infinity" <el-input-number v-model="formData.configuration.SafetyQty" :min="0"
:max="formData.configuration.MaxQty != -1 ? formData.configuration.MaxQty : Infinity"
controls-position="right" /> controls-position="right" />
</el-form-item> </el-form-item>
<!-- 补料数量 --> </el-col>
<el-form-item label="补料数量" v-else-if="index == 3" :prop="'configuration.' + index + '.Value'" <!-- 补料数量 -->
:rules="[{ required: true, message: '请输入最小库存', trigger: 'change', }, { validator: validatorNum, message: '不可以大于最大库存', trigger: 'change', }]"> <el-col :span="24">
<el-input-number v-model="item.Value" :min="0" <el-form-item label="补料数量" prop="configuration.FeedQty" :rules="[{ required: true, message: '请输入补料数量', trigger: 'change', }, { validator: validatorNum, message: '不可以大于最大库存', trigger: 'change', }]">
:max="formData.configuration[0].Value != -1 ? formData.configuration[0].Value : Infinity" <el-input-number v-model="formData.configuration.FeedQty" :min="0"
:max="formData.configuration.MaxQty != -1 ? formData.configuration.MaxQty : Infinity"
controls-position="right" /> controls-position="right" />
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -142,7 +144,6 @@ import * as RuleApi from '@/api/wms/rule'
import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
const { t } = useI18n() // 国际化 const { t } = useI18n() // 国际化
const message = useMessage() // 消息弹窗 const message = useMessage() // 消息弹窗
@ -152,41 +153,40 @@ const formLoading = ref(false) // 表单的加载中：1）修改时的数据加
const formType = ref('') // 表单的类型：create - 新增；update - 修改 const formType = ref('') // 表单的类型：create - 新增；update - 修改
const formRef = ref() // 表单 Ref const formRef = ref() // 表单 Ref
const formStrategyCode = ref('') const formStrategyCode = ref('')
// form表单数据 // form表单数据
const formData = ref({ const formData = ref({
id: '', id: '',
strategyCode: formStrategyCode.value,//策略代码id strategyCode: formStrategyCode.value, //策略代码id
name: '',//名称 name: '', //名称
description: '',//描述 description: '', //描述
priority: '',//优先级 priority: '', //优先级
status: true,//状态 status: true, //状态
//规则条件集合 //规则条件集合
condition: [ condition: [
// 物品类型/物品分组/物品/abc类/项目/ // 物品类型/物品分组/物品/abc类/项目/
{ ParamCode: 'ItemGroup', Operator: "IN", Value: "" }, { ParamCode: 'ItemGroup', Operator: 'IN', Value: '' },
// 仓库 // 仓库
{ ParamCode: 'LocationCode', Operator: "IN", Value: "" }, { ParamCode: 'LocationCode', Operator: 'IN', Value: '' }
], ],
configuration: [ configuration: {
// 最大库存 // 最大库存
{ ParamCode: 'MaxQty', Value: 0 }, MaxQty: 0,
// 最小库存 // 最小库存
{ ParamCode: 'MinQty', Value: 0 }, MinQty: 0,
// 安全库存 // 安全库存
{ ParamCode: 'SafetyQty', Value: 0 }, SafetyQty: 0,
// 补料数量 // 补料数量
{ ParamCode: 'SafetyQty', Value: 0 }, FeedQty: 0
] }
}) })
// 验证规则 // 验证规则
const rules = ref({ const rules = ref({
strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' }], strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' }],
name: [{ required: true, message: '请输入名字', trigger: 'blur' }], name: [{ required: true, message: '请输入名字', trigger: 'blur' }],
description: [{ required: true, message: '请输入描述', trigger: 'blur' }], description: [{ required: true, message: '请输入描述', trigger: 'blur' }],
priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }], priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }]
}) })
// 所有的范围类型 // 所有的范围类型
@ -200,11 +200,11 @@ const rangeOptions = [
{ value: 'IN', label: '包含' }, { value: 'IN', label: '包含' },
{ value: 'NOT IN', label: '不包含' }, { value: 'NOT IN', label: '不包含' },
{ value: 'NULL', label: '为空' }, { value: 'NULL', label: '为空' },
{ value: 'NOT NULL', label: '不为空' }, { value: 'NOT NULL', label: '不为空' }
] ]
const formatRangeOptions = (...rest) => { 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 return result
} }
@ -214,10 +214,19 @@ const options = reactive({
rangeOptions1: formatRangeOptions('IN', 'NOT IN'), 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: '项目' }
],
//仓库列表 //仓库列表
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: [],
// 溢流库位列表 // 溢流库位列表
overflowWarehouseList: [] overflowWarehouseList: []
@ -230,22 +239,22 @@ const changeItemsType = () => {
// 获取仓库列表 // 获取仓库列表
const getFormWarehouseList = async () => { const getFormWarehouseList = async () => {
options.warehouseList = await getWarehouseList(); options.warehouseList = await getWarehouseList()
} }
// 获取库区列表 // 获取库区列表
const getFormAreaList = async () => { const getFormAreaList = async () => {
options.warehouseList = await getAreaList(); options.warehouseList = await getAreaList()
} }
// 获取库位组列表 // 获取库位组列表
const getFormLocationgrouList = async () => { const getFormLocationgrouList = async () => {
options.warehouseList = await getLocationgroupList(); options.warehouseList = await getLocationgroupList()
} }
// 获取库位列表 // 获取库位列表
const getFormLocationList = async (queryParms) => { const getFormLocationList = async (queryParms) => {
if (queryParms) { if (queryParms) {
options.overflowWarehouseList = await getLocationList(queryParms); options.overflowWarehouseList = await getLocationList(queryParms)
} else { } else {
options.warehouseList = await getLocationList(); options.warehouseList = await getLocationList()
} }
} }
getFormLocationList() getFormLocationList()
@ -321,11 +330,11 @@ const submitForm = async () => {
try { try {
let data = { let data = {
id: formData.value.id, id: formData.value.id,
strategyCode: formData.value.strategyCode,//策略代码 strategyCode: formData.value.strategyCode, //策略代码
name: formData.value.name,//名称 name: formData.value.name, //名称
description: formData.value.description,//描述 description: formData.value.description, //描述
priority: formData.value.priority,//优先级 priority: formData.value.priority, //优先级
status: formData.value.status ? 0 : 1,//状态 status: formData.value.status ? 0 : 1, //状态
//规则条件集合 //规则条件集合
condition: JSON.stringify(formData.value.condition), condition: JSON.stringify(formData.value.condition),
configuration: JSON.stringify(formData.value.configuration) configuration: JSON.stringify(formData.value.configuration)
@ -349,37 +358,37 @@ const submitForm = async () => {
const resetForm = () => { const resetForm = () => {
formData.value = { formData.value = {
id: '', id: '',
strategyCode: formStrategyCode.value,//策略代码id strategyCode: formStrategyCode.value, //策略代码id
name: '',//名称 name: '', //名称
description: '',//描述 description: '', //描述
priority: '',//优先级 priority: '', //优先级
status: true,//状态 status: true, //状态
//规则条件集合 //规则条件集合
condition: [ condition: [
// 物品类型/物品分组/物品/abc类/项目/ // 物品类型/物品分组/物品/abc类/项目/
{ ParamCode: 'ItemGroup', Operator: "IN", Value: "" }, { ParamCode: 'ItemGroup', Operator: 'IN', Value: '' },
// 仓库 // 仓库
{ ParamCode: 'LocationCode', Operator: "IN", Value: "" }, { ParamCode: 'LocationCode', Operator: 'IN', Value: '' }
], ],
configuration: [ configuration: {
// 最大库存 // 最大库存
{ ParamCode: 'MaxQty', Value: 0 }, MaxQty: 0,
// 最小库存 // 最小库存
{ ParamCode: 'MinQty', Value: 0 }, MinQty: 0,
// 安全库存 // 安全库存
{ ParamCode: 'SafetyQty', Value: 0 }, SafetyQty: 0,
// 补料数量 // 补料数量
{ ParamCode: 'SafetyQty', Value: 0 }, FeedQty: 0
] }
} }
} }
// 弹窗按钮 // 弹窗按钮
const Butttondata = [ const Butttondata = [
defaultButtons.formSaveBtn(null), // 保存 defaultButtons.formSaveBtn(null), // 保存
defaultButtons.formCloseBtn(null), // 关闭 defaultButtons.formCloseBtn(null) // 关闭
] ]
// 按钮事件 // 按钮事件
const buttonBaseClick = (val, item) => { const buttonBaseClick = (val, item) => {
// 保存 // 保存
if (val == 'save') { if (val == 'save') {
@ -392,11 +401,10 @@ const buttonBaseClick = (val, item) => {
} }
const validatorNum = (rule: any, value: any, callback: any) => { const validatorNum = (rule: any, value: any, callback: any) => {
if (value && formData.value.configuration[0].Value != -1) { if (value && formData.value.configuration.MaxQty != -1) {
if (value > formData.value.configuration[0].Value) { if (value > formData.value.configuration.MaxQty) {
callback(new Error("11")) callback(new Error('11'))
} else { } else {
callback() callback()
} }
} else { } else {

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

@ -1,15 +1,26 @@
<!-- 存储容量策略弹窗 --> <!-- 存储容量策略弹窗 -->
<template> <template>
<Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px;"> <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px">
<div class="p-20px m--10px" style="max-height: 50vh;overflow-y: auto;"> <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"> <el-form
ref="formRef"
:model="formData"
:rules="rules"
label-width="120px"
label-position="left"
>
<!-- 规则 --> <!-- 规则 -->
<div class="item"> <div class="item">
<div class="title">规则</div> <div class="title">规则</div>
<el-row gutter="10"> <el-row gutter="10">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="代码" prop="strategyCode"> <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-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
@ -42,47 +53,130 @@
<el-col :span="24" v-for="(item, index) in formData.condition" :key="index"> <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-form-item label="" label-width="0" class="err-240" v-if="index == 0">
<el-select v-model="item.ParamCode" placeholder="" @change="changeItemsType" <el-select
style="width: 110px;margin-right: 10px;"> v-model="item.ParamCode"
<el-option :label="cur.label" :value="cur.value" v-for="cur in options.itemTypeOptions" placeholder=""
:key="cur.value" /> @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>
<el-select v-model="item.Operator" placeholder="请选择范围" style="width: 110px;;margin-right: 10px;"> <el-select
<el-option :label="cur.label" :value="cur.value" v-for="cur in options.rangeOptions1" v-model="item.Operator"
:key="cur.value" /> 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>
<el-select v-model="item.Value" placeholder="请选择物品类型" style="flex: 1;" clearable <el-select
v-if="item.ParamCode == 'ItemType'"> v-model="item.Value"
<el-option v-for="cur in getStrDictOptions(DICT_TYPE.ITEM_TYPE)" :key="cur.value" :label="cur.label" placeholder="请选择物品类型"
:value="cur.value" /> 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> </el-select>
<el-select v-model="item.Value" placeholder="请选择ABC类" style="flex: 1;" clearable <el-select
v-else-if="item.ParamCode == 'AbcClass'"> v-model="item.Value"
<el-option v-for="cur in getStrDictOptions(DICT_TYPE.ABC_CLASS)" :key="cur.value" :label="cur.label" placeholder="请选择ABC类"
:value="cur.value" /> 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> </el-select>
<el-input v-model="item.Value" placeholder="请输入物品分组" clearable style="flex: 1;" <el-input
v-else-if="item.ParamCode == 'ItemGroup'" /> v-model="item.Value"
<el-input v-model="item.Value" placeholder="请输入项目" clearable style="flex: 1;" placeholder="请输入物品分组"
v-else-if="item.ParamCode == 'Project'" /> clearable
<el-input v-model="item.Value" placeholder="请输入物品" clearable style="flex: 1;" style="flex: 1"
v-else-if="item.ParamCode == 'ItemCode'" /> 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>
<!-- 仓库 库区 库位组 库位 --> <!-- 仓库 库区 库位组 库位 -->
<el-form-item label="" label-width="0" class="err-240" v-if="index == 1"> <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;" <el-select
@change="changeWarehouse"> v-model="item.ParamCode"
<el-option :label="cur.label" :value="cur.value" v-for="(cur, index) in options.warehouseTypeOptions" placeholder=""
:key="index" /> 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>
<el-select v-model="item.Operator" placeholder="请选择范围" style="width: 110px;;margin-right: 10px;"> <el-select
<el-option :label="cur.label" :value="cur.value" v-for="cur in options.rangeOptions1" v-model="item.Operator"
:key="cur.value" /> 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>
<el-select v-model="item.Value" <el-select
:placeholder="`请选择${item.ParamCode == 'WarehouseCode' ? '仓库' : item.ParamCode == 'AreaCode' ? '库区' : item.ParamCode == 'LocationGroupCode' ? '库位组' : item.ParamCode == 'LocationCode' ? '库位' : ''}`" v-model="item.Value"
clearable style="flex: 1;"> :placeholder="`请选择${
<el-option v-for="cur in options.warehouseList" :key="cur.id" :label="cur.name" :value="cur.id" /> item.ParamCode == 'WarehouseCode'
? '仓库'
: item.ParamCode == 'AreaCode'
? '库区'
: item.ParamCode == 'LocationGroupCode'
? '库位组'
: item.ParamCode == 'LocationCode'
? '库位'
: ''
}`"
clearable
style="flex: 1"
>
<el-option
v-for="cur in options.warehouseList"
:key="cur.id"
:label="cur.name"
:value="cur.id"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -93,42 +187,76 @@
<div class="item mt-20px"> <div class="item mt-20px">
<div class="title">规则配置</div> <div class="title">规则配置</div>
<el-row gutter="10"> <el-row gutter="10">
<el-col :span="24" v-for="(item, index) in formData.configuration" :key="index"> <el-col :span="24">
<!-- 存储类型 --> <!-- 存储类型 -->
<el-form-item label="存储类型" v-if="index == 0"> <el-form-item label="存储类型">
<div class="checkbox"> <div class="checkbox">
<el-radio-group v-model="item.Value"> <el-radio-group v-model="formData.configuration.StorageType">
<el-radio label="NOTLIMIT">不限制</el-radio> <el-radio label="NOTLIMIT">不限制</el-radio>
<el-radio :label="cur.value" v-for="cur in getStrDictOptions(DICT_TYPE.STORAGE_TYPE)" <el-radio
:key="cur.value">{{ cur.label }}</el-radio> :label="cur.value"
v-for="cur in getStrDictOptions(DICT_TYPE.STORAGE_TYPE)"
:key="cur.value"
>{{ cur.label }}</el-radio
>
</el-radio-group> </el-radio-group>
</div> </div>
</el-form-item> </el-form-item>
<!-- 存储容量 --> </el-col>
<el-form-item label="存储容量" v-else-if="index == 1"> <!-- 存储容量 -->
<el-input v-model="item.Value" placeholder="请输入存储容量" clearable /> <el-col :span="24">
<el-form-item label="存储容量">
<el-input
v-model="formData.configuration.StorageQty"
placeholder="请输入存储容量"
clearable
/>
</el-form-item> </el-form-item>
<!-- 替代存储类型 --> </el-col>
<el-form-item label="替代存储类型" v-if="index == 2"> <!-- 替代存储类型 -->
<el-col :span="24">
<el-form-item label="替代存储类型">
<div class="checkbox"> <div class="checkbox">
<el-radio-group v-model="item.Value"> <el-radio-group v-model="formData.configuration.AltStorageType">
<el-radio label="NOTLIMIT">不限制</el-radio> <el-radio label="NOTLIMIT">不限制</el-radio>
<el-radio :label="cur.value" v-for="cur in getStrDictOptions(DICT_TYPE.STORAGE_TYPE)" <el-radio
:key="cur.value">{{ cur.label }}</el-radio> :label="cur.value"
v-for="cur in getStrDictOptions(DICT_TYPE.STORAGE_TYPE)"
:key="cur.value"
>{{ cur.label }}</el-radio
>
</el-radio-group> </el-radio-group>
</div> </div>
</el-form-item> </el-form-item>
<!-- 替代容量 --> </el-col>
<el-form-item label="替代容量" v-else-if="index == 3"> <!-- 替代容量 -->
<el-input v-model="item.Value" placeholder="请输入替代容量" clearable /> <el-col :span="24">
<el-form-item label="替代容量">
<el-input
v-model="formData.configuration.AltStorageQty"
placeholder="请输入替代容量"
clearable
/>
</el-form-item> </el-form-item>
<!-- 固定位置 --> </el-col>
<el-form-item label="固定位置" v-else-if="index == 4"> <!-- 固定位置 -->
<el-switch v-model="item.Value" /> <el-col :span="24">
<el-form-item label="固定位置">
<el-switch
v-model="formData.configuration.IsFixed"
active-value="TRUE"
inactive-value="FALSE"
/>
</el-form-item> </el-form-item>
<!-- 占用相邻库位 --> </el-col>
<el-form-item label="占用相邻库位" v-else-if="index == 5"> <!-- 占用相邻库位 -->
<el-switch v-model="item.Value" /> <el-col :span="24">
<el-form-item label="占用相邻库位">
<el-switch
v-model="formData.configuration.IsOccupyAdjacent"
active-value="TRUE"
inactive-value="FALSE"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -152,7 +280,6 @@ import * as RuleApi from '@/api/wms/rule'
import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
const { t } = useI18n() // 国际化 const { t } = useI18n() // 国际化
const message = useMessage() // 消息弹窗 const message = useMessage() // 消息弹窗
@ -162,45 +289,43 @@ const formLoading = ref(false) // 表单的加载中：1）修改时的数据加
const formType = ref('') // 表单的类型：create - 新增；update - 修改 const formType = ref('') // 表单的类型：create - 新增；update - 修改
const formRef = ref() // 表单 Ref const formRef = ref() // 表单 Ref
const formStrategyCode = ref('') const formStrategyCode = ref('')
// form表单数据 // form表单数据
const formData = ref({ const formData = ref({
id: '', id: '',
strategyCode: formStrategyCode.value,//策略代码id strategyCode: formStrategyCode.value, //策略代码id
name: '',//名称 name: '', //名称
description: '',//描述 description: '', //描述
priority: '',//优先级 priority: '', //优先级
status: true,//状态 status: true, //状态
//规则条件集合 //规则条件集合
condition: [ condition: [
// 物品类型/物品分组/物品/abc类/项目/ // 物品类型/物品分组/物品/abc类/项目/
{ ParamCode: 'ItemGroup', Operator: "IN", Value: "" }, { ParamCode: 'ItemGroup', Operator: 'IN', Value: '' },
// 仓库 // 仓库
{ ParamCode: 'LocationCode', Operator: "IN", Value: "" }, { ParamCode: 'LocationCode', Operator: 'IN', Value: '' }
], ],
configuration: [ configuration: {
// 存储类型 // 存储类型
{ ParamCode: 'StorageType', Value: 'NOTLIMIT' }, StorageType: 'NOTLIMIT',
// 存储容量 // 存储容量
{ ParamCode: 'StorageQty', Value: '' }, StorageQty: '',
// 替代存储类型 // 替代存储类型
{ ParamCode: 'AltStorageType', Value: 'NOTLIMIT' }, AltStorageType: 'NOTLIMIT',
// 替代容量 // 替代容量
{ ParamCode: 'AltStorageQty', Value: '' }, AltStorageQty: '',
// 是否定制位置 // 是否定制位置
{ ParamCode: 'IsFixed', Value: false }, IsFixed: 'FALSE',
// 是否占用相邻库位 // 是否占用相邻库位
{ ParamCode: 'IsOccupyAdjacent', Value: false }, IsOccupyAdjacent: 'FALSE'
] }
}) })
// 验证规则 // 验证规则
const rules = ref({ const rules = ref({
strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' }], strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' }],
name: [{ required: true, message: '请输入名字', trigger: 'blur' }], name: [{ required: true, message: '请输入名字', trigger: 'blur' }],
description: [{ required: true, message: '请输入描述', trigger: 'blur' }], description: [{ required: true, message: '请输入描述', trigger: 'blur' }],
priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }], priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }]
}) })
// 所有的范围类型 // 所有的范围类型
@ -214,11 +339,11 @@ const rangeOptions = [
{ value: 'IN', label: '包含' }, { value: 'IN', label: '包含' },
{ value: 'NOT IN', label: '不包含' }, { value: 'NOT IN', label: '不包含' },
{ value: 'NULL', label: '为空' }, { value: 'NULL', label: '为空' },
{ value: 'NOT NULL', label: '不为空' }, { value: 'NOT NULL', label: '不为空' }
] ]
const formatRangeOptions = (...rest) => { 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 return result
} }
@ -228,10 +353,19 @@ const options = reactive({
rangeOptions1: formatRangeOptions('IN', 'NOT IN'), 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: '项目' }
],
//仓库列表 //仓库列表
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: [],
// 溢流库位列表 // 溢流库位列表
overflowWarehouseList: [] overflowWarehouseList: []
@ -244,22 +378,22 @@ const changeItemsType = () => {
// 获取仓库列表 // 获取仓库列表
const getFormWarehouseList = async () => { const getFormWarehouseList = async () => {
options.warehouseList = await getWarehouseList(); options.warehouseList = await getWarehouseList()
} }
// 获取库区列表 // 获取库区列表
const getFormAreaList = async () => { const getFormAreaList = async () => {
options.warehouseList = await getAreaList(); options.warehouseList = await getAreaList()
} }
// 获取库位组列表 // 获取库位组列表
const getFormLocationgrouList = async () => { const getFormLocationgrouList = async () => {
options.warehouseList = await getLocationgroupList(); options.warehouseList = await getLocationgroupList()
} }
// 获取库位列表 // 获取库位列表
const getFormLocationList = async (queryParms) => { const getFormLocationList = async (queryParms) => {
if (queryParms) { if (queryParms) {
options.overflowWarehouseList = await getLocationList(queryParms); options.overflowWarehouseList = await getLocationList(queryParms)
} else { } else {
options.warehouseList = await getLocationList(); options.warehouseList = await getLocationList()
} }
} }
getFormLocationList() getFormLocationList()
@ -335,11 +469,11 @@ const submitForm = async () => {
try { try {
let data = { let data = {
id: formData.value.id, id: formData.value.id,
strategyCode: formData.value.strategyCode,//策略代码 strategyCode: formData.value.strategyCode, //策略代码
name: formData.value.name,//名称 name: formData.value.name, //名称
description: formData.value.description,//描述 description: formData.value.description, //描述
priority: formData.value.priority,//优先级 priority: formData.value.priority, //优先级
status: formData.value.status ? 0 : 1,//状态 status: formData.value.status ? 0 : 1, //状态
//规则条件集合 //规则条件集合
condition: JSON.stringify(formData.value.condition), condition: JSON.stringify(formData.value.condition),
configuration: JSON.stringify(formData.value.configuration) configuration: JSON.stringify(formData.value.configuration)
@ -363,41 +497,41 @@ const submitForm = async () => {
const resetForm = () => { const resetForm = () => {
formData.value = { formData.value = {
id: '', id: '',
strategyCode: formStrategyCode.value,//策略代码id strategyCode: formStrategyCode.value, //策略代码id
name: '',//名称 name: '', //名称
description: '',//描述 description: '', //描述
priority: '',//优先级 priority: '', //优先级
status: true,//状态 status: true, //状态
//规则条件集合 //规则条件集合
condition: [ condition: [
// 物品类型/物品分组/物品/abc类/项目/ // 物品类型/物品分组/物品/abc类/项目/
{ ParamCode: 'ItemGroup', Operator: "IN", Value: "" }, { ParamCode: 'ItemGroup', Operator: 'IN', Value: '' },
// 仓库 // 仓库
{ ParamCode: 'LocationCode', Operator: "IN", Value: "" }, { ParamCode: 'LocationCode', Operator: 'IN', Value: '' }
], ],
configuration: [ configuration: {
// 存储类型 // 存储类型
{ ParamCode: 'StorageType', Value: 'NOTLIMIT' }, StorageType: 'NOTLIMIT',
// 存储容量 // 存储容量
{ ParamCode: 'StorageQty', Value: '' }, StorageQty: '',
// 替代存储类型 // 替代存储类型
{ ParamCode: 'AltStorageType', Value: 'NOTLIMIT' }, AltStorageType: 'NOTLIMIT',
// 替代容量 // 替代容量
{ ParamCode: 'AltStorageQty', Value: '' }, AltStorageQty: '',
// 是否定制位置 // 是否定制位置
{ ParamCode: 'IsFixed', Value: false }, IsFixed: 'FALSE',
// 是否占用相邻库位 // 是否占用相邻库位
{ ParamCode: 'IsOccupyAdjacent', Value: false }, IsOccupyAdjacent: 'FALSE'
] }
} }
} }
// 弹窗按钮 // 弹窗按钮
const Butttondata = [ const Butttondata = [
defaultButtons.formSaveBtn(null), // 保存 defaultButtons.formSaveBtn(null), // 保存
defaultButtons.formCloseBtn(null), // 关闭 defaultButtons.formCloseBtn(null) // 关闭
] ]
// 按钮事件 // 按钮事件
const buttonBaseClick = (val, item) => { const buttonBaseClick = (val, item) => {
// 保存 // 保存
if (val == 'save') { if (val == 'save') {
@ -408,7 +542,6 @@ const buttonBaseClick = (val, item) => {
dialogVisible.value = false dialogVisible.value = false
} }
} }
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.item { .item {

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

@ -82,59 +82,34 @@
<div class="title">规则配置</div> <div class="title">规则配置</div>
<el-row> <el-row>
<!-- 开始时间 --> <!-- 开始时间 -->
<el-col :span="24" v-for="(item, index) in formData.configuration" :key="index"> <el-col :span="24">
<!-- 开始时间 --> <!-- 开始时间 -->
<el-form-item v-if="item.ParamCode == 'BeginTime'" label="开始时间" :prop="'configuration.' + index + '.Value'" <el-form-item label="开始时间" prop="BeginTime">
:rules="{ <el-time-select v-model="formData.configuration.BeginTime" start="00:00" end="23:59" step="00:15" placeholder="请选择开始时间"
required: true,
message: '请选择开始时间',
trigger: 'change',
}">
<el-time-select v-model="item.Value" start="00:00" end="23:59" step="00:15" placeholder="请选择开始时间"
style="width: 100%;" /> style="width: 100%;" />
</el-form-item> </el-form-item>
<!-- 结束时间 --> <!-- 结束时间 -->
<el-form-item v-else-if="item.ParamCode == 'EndTime'" label="结束时间" <el-form-item label="结束时间" prop="EndTime">
:prop="'configuration.' + index + '.Value'" :rules="{ <el-time-select v-model="formData.configuration.EndTime" start="00:00" end="23:59" step="00:15" placeholder="请选择结束时间"
required: true,
message: '请选择结束时间',
trigger: 'change',
}">
<el-time-select v-model="item.Value" start="00:00" end="23:59" step="00:15" placeholder="请选择结束时间"
style="width: 100%;" /> style="width: 100%;" />
</el-form-item> </el-form-item>
<!-- 仓库 --> <!-- 仓库 -->
<el-form-item v-else-if="item.ParamCode == 'WarehouseCode'" label="仓库" <el-form-item label="仓库" prop="WarehouseCode">
:prop="'configuration.' + index + '.Value'" :rules="{ <el-select v-model="formData.configuration.WarehouseCode"
required: true, :placeholder="`请选择${formData.configuration.WarehouseCode == 'WarehouseCode' ? '仓库' : formData.configuration.WarehouseCode== 'AreaCode' ? '库区' : formData.configuration.WarehouseCode == 'LocationGroupCode' ? '库位组' : formData.configuration.WarehouseCode == 'LocationCode' ? '库位' : ''}`"
message: `请选择${item.ParamCode == 'WarehouseCode' ? '仓库' : item.ParamCode == 'AreaCode' ? '库区' : item.ParamCode == 'LocationGroupCode' ? '库位组' : item.ParamCode == 'LocationCode' ? '库位' : ''}`,
trigger: 'change',
}">
<el-select v-model="item.Value"
:placeholder="`请选择${item.ParamCode == 'WarehouseCode' ? '仓库' : item.ParamCode == 'AreaCode' ? '库区' : item.ParamCode == 'LocationGroupCode' ? '库位组' : item.ParamCode == 'LocationCode' ? '库位' : ''}`"
clearable> clearable>
<el-option v-for="cur in options.warehouseList" :key="cur.id" :label="cur.name" :value="cur.id" /> <el-option v-for="cur in options.warehouseList" :key="cur.id" :label="cur.name" :value="cur.id" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- 月台 --> <!-- 月台 -->
<el-form-item v-else-if="item.ParamCode == 'DockCode'" label="月台" <el-form-item label="月台" prop="DockCode" >
:prop="'configuration.' + index + '.Value'" :rules="{ <el-select v-model="formData.configuration.DockCode" placeholder="请选择月台" clearable>
required: true,
message: '请选择月台',
trigger: 'change',
}">
<el-select v-model="item.Value" placeholder="请选择月台" clearable>
<el-option v-for="cur in options.dockList" :key="cur.id" :label="cur.name" :value="cur.id" /> <el-option v-for="cur in options.dockList" :key="cur.id" :label="cur.name" :value="cur.id" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- 在途库位 --> <!-- 在途库位 -->
<el-form-item v-else-if="item.ParamCode == 'OnTheWayLocationCode'" label="在途库位" <el-form-item label="在途库位" prop="OnTheWayLocationCode" >
:prop="'configuration.' + index + '.Value'" :rules="{ <el-select v-model="formData.configuration.OnTheWayLocationCode" placeholder="请选择在途库位" clearable>
required: true,
message: '请选择在途库位',
trigger: 'change',
}">
<el-select v-model="item.Value" placeholder="请选择在途库位" clearable>
<el-option v-for="cur in options.locationList" :key="cur.id" :label="cur.name" :value="cur.id" /> <el-option v-for="cur in options.locationList" :key="cur.id" :label="cur.name" :value="cur.id" />
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -188,18 +163,18 @@ const formData = ref({
// 星期几 // 星期几
{ ParamCode: 'Weekday', Operator: "IN", Value: [] } { ParamCode: 'Weekday', Operator: "IN", Value: [] }
], ],
configuration: [ configuration: {
// 开始时间 // 开始时间
{ ParamCode: 'BeginTime', Value: "" }, BeginTime:"",
// 结束时间 // 结束时间
{ ParamCode: 'EndTime', Value: "" }, EndTime:"",
// 仓库代码 // 仓库代码
{ ParamCode: 'WarehouseCode', Value: '' }, WarehouseCode:"",
// 月台代码 // 月台代码
{ ParamCode: 'DockCode', Value: '' }, DockCode:"",
// 在途库位代码 // 在途库位代码
{ ParamCode: 'OnTheWayLocationCode', Value: '' }, OnTheWayLocationCode:"",
] }
}) })
// 验证规则 // 验证规则
@ -306,7 +281,7 @@ const open = async (type: string, strategyCode: string, id?: number) => {
formData.value.condition = JSON.parse(data.condition) formData.value.condition = JSON.parse(data.condition)
} }
if (data.configuration) { if (data.configuration) {
formData.value.configuration = JSON.parse(data.configuration) formData.value.configuration = JSON.parse(data.configuration)
} }
querySupplierParams.value.type = formData.value?.condition[0]?.Value || '' querySupplierParams.value.type = formData.value?.condition[0]?.Value || ''
@ -373,18 +348,18 @@ const resetForm = () => {
// 星期几 // 星期几
{ ParamCode: 'Weekday', Operator: "IN", Value: [] } { ParamCode: 'Weekday', Operator: "IN", Value: [] }
], ],
configuration: [ configuration: {
// 开始时间 // 开始时间
{ ParamCode: 'BeginTime', Value: "" }, BeginTime:"",
// 结束时间 // 结束时间
{ ParamCode: 'EndTime', Value: "" }, EndTime:"",
// 仓库代码 // 仓库代码
{ ParamCode: 'WarehouseCode', Value: '' }, WarehouseCode:"",
// 月台代码 // 月台代码
{ ParamCode: 'DockCode', Value: '' }, DockCode:"",
// 在途库位代码 // 在途库位代码
{ ParamCode: 'OnTheWayLocationCode', Value: '' }, OnTheWayLocationCode:"",
] }
} }
} }

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

@ -140,36 +140,56 @@
<div class="title">规则配置</div> <div class="title">规则配置</div>
<el-row> <el-row>
<!-- 仓库 库区 库位组 库位 --> <!-- 仓库 库区 库位组 库位 -->
<el-col :span="24" v-for="(item, index) in formData.configuration" :key="index"> <el-col :span="24">
<el-form-item label="" label-width="0" prop="warehouse" class="err-120" v-if="index == 0"> <el-form-item label="" label-width="0" prop="warehouse" class="err-120">
<el-select v-model="item.ParamCode" placeholder="" style="width: 110px;margin-right: 10px;" <el-select v-model="warehouseType" placeholder="" style="width: 110px;margin-right: 10px;"
@change="changeWarehouse"> @change="changeWarehouse">
<el-option :label="cur.label" :value="cur.value" v-for="(cur, index) in options.warehouseTypeOptions" <el-option :label="cur.label" :value="cur.value" v-for="(cur, index) in options.warehouseTypeOptions"
:key="index" /> :key="index" />
</el-select> </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-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.id" :label="cur.name" :value="cur.id" />
</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.id" :label="cur.name" :value="cur.id" />
</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.id" :label="cur.name" :value="cur.id" />
</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.id" :label="cur.name" :value="cur.id" /> <el-option v-for="cur in options.warehouseList" :key="cur.id" :label="cur.name" :value="cur.id" />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
<!-- 优先空位库 --> <!-- 优先空位库 -->
<el-form-item label="优先空位库" v-else-if="index == 1"> <el-col :span="24">
<el-switch v-model="item.Value" /> <el-form-item label="优先空位库">
<el-switch v-model="formData.configuration.EmptyLocationFirst" active-value="TRUE" inactive-value="FALSE"/>
</el-form-item> </el-form-item>
</el-col>
<!-- 优先非空位库 --> <!-- 优先非空位库 -->
<el-form-item label="优先非空位库" v-else-if="index == 2"> <el-col :span="24">
<el-switch v-model="item.Value" /> <el-form-item label="优先非空位库">
<el-switch v-model="formData.configuration.NotEmptyLocationFirst" active-value="TRUE" inactive-value="FALSE"/>
</el-form-item> </el-form-item>
</el-col>
<!-- 可以混物品 --> <!-- 可以混物品 -->
<el-form-item label="可以混物品" v-else-if="index == 3"> <el-col :span="24">
<el-switch v-model="item.Value" /> <el-form-item label="可以混物品">
<el-switch v-model="formData.configuration.EnableMixItem" active-value="TRUE" inactive-value="FALSE"/>
</el-form-item> </el-form-item>
</el-col>
<!-- 可以混批次 --> <!-- 可以混批次 -->
<el-form-item label="可以混批次" v-else-if="index == 4"> <el-col :span="24">
<el-switch v-model="item.Value" /> <el-form-item label="可以混批次">
<el-switch v-model="formData.configuration.EnableMixLot" active-value="TRUE" inactive-value="FALSE"/>
</el-form-item> </el-form-item>
</el-col>
<!-- 可以混状态 --> <!-- 可以混状态 -->
<el-form-item label="可以混状态" v-else-if="index == 5"> <el-col :span="24">
<el-switch v-model="item.Value" /> <el-form-item label="可以混状态">
<el-switch v-model="formData.configuration.EnableMixStatus" active-value="TRUE" inactive-value="FALSE"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -206,6 +226,10 @@ const formRef = ref() // 表单 Ref
const formStrategyCode = ref('') const formStrategyCode = ref('')
// 仓库类型
const warehouseType = ref('WarehouseCode')
// form表单数据 // form表单数据
const formData = ref({ const formData = ref({
id: '', id: '',
@ -229,21 +253,26 @@ const formData = ref({
// 库存事务 // 库存事务
{ ParamCode: 'TransactionType', Operator: "IN", Value: [] } { ParamCode: 'TransactionType', Operator: "IN", Value: [] }
], ],
configuration: [ configuration: {
// 仓库 // 仓库代码
{ ParamCode: 'LocationCode', Value: "" }, WarehouseCode:"",
// 库区代码
AreaCode:"",
// 库位组代码
LocationGroupCode:"",
// 库位代码
LocationCode:"",
// 优先空库位 // 优先空库位
{ ParamCode: 'EmptyLocationFirst', Value: false }, EmptyLocationFirst:'FALSE',
// 优先非空库位 // 优先非空库位
{ ParamCode: 'NotEmptyLocationFirst', Value: false }, NotEmptyLocationFirst:'FALSE',
// 可以混物品 // 可以混物品
{ ParamCode: 'EnableMixItem', Value: true }, EnableMixItem:'TRUE',
// 可以混批次 // 可以混批次
{ ParamCode: 'EnableMixLot', Value: true }, EnableMixLot:'TRUE',
// 可以混状态 // 可以混状态
{ ParamCode: 'EnableMixStatus', Value: true }, EnableMixStatus:'TRUE',
] }
}) })
// 验证规则 // 验证规则
const rules = ref({ const rules = ref({
@ -338,7 +367,10 @@ const getFormLocationList = async () => {
getFormLocationList() getFormLocationList()
// 选择仓库/库位/库位组/库区 // 选择仓库/库位/库位组/库区
const changeWarehouse = (e) => { const changeWarehouse = (e) => {
formData.value.configuration[0].Value = '' formData.value.configuration.WarehouseCode = ''
formData.value.configuration.AreaCode = ''
formData.value.configuration.LocationGroupCode = ''
formData.value.configuration.LocationCode = ''
if (e == 'WarehouseCode') { if (e == 'WarehouseCode') {
getFormWarehouseList() getFormWarehouseList()
} else if (e == 'AreaCode') { } else if (e == 'AreaCode') {
@ -355,6 +387,7 @@ const open = async (type: string, strategyCode: string, id?: number) => {
dialogVisible.value = true dialogVisible.value = true
dialogTitle.value = t('action.' + type) dialogTitle.value = t('action.' + type)
formType.value = type formType.value = type
warehouseType.value = 'WarehouseCode'
resetForm() resetForm()
// 修改时，设置数据 // 修改时，设置数据
if (id) { if (id) {
@ -380,13 +413,17 @@ const open = async (type: string, strategyCode: string, id?: number) => {
getFormCustomerList() getFormCustomerList()
} }
// 判断是获取仓库/库位/库位组/库区列表 // 判断是获取仓库/库位/库位组/库区列表
if (formData.value.configuration[0].ParamCode == 'WarehouseCode') { if ('WarehouseCode' in formData.value.configuration && formData.value.configuration.WarehouseCode) {
warehouseType.value = 'WarehouseCode'
getFormWarehouseList() getFormWarehouseList()
} else if (formData.value.configuration[0].ParamCode == 'AreaCode') { } else if ('AreaCode' in formData.value.configuration && formData.value.configuration.AreaCode) {
warehouseType.value = 'AreaCode'
getFormAreaList() getFormAreaList()
} else if (formData.value.configuration[0].ParamCode == 'LocationGroupCode') { } else if ('LocationGroupCode' in formData.value.configuration && formData.value.configuration.LocationGroupCode) {
warehouseType.value = 'LocationGroupCode'
getFormLocationgrouList() getFormLocationgrouList()
} else if (formData.value.configuration[0].ParamCode == 'LocationCode') { } else if ('LocationCode' in formData.value.configuration && formData.value.configuration.LocationCode) {
warehouseType.value = 'LocationCode'
getFormLocationList() getFormLocationList()
} }
@ -457,21 +494,26 @@ const resetForm = () => {
// 库存事务 // 库存事务
{ ParamCode: 'TransactionType', Operator: "IN", Value: [] } { ParamCode: 'TransactionType', Operator: "IN", Value: [] }
], ],
configuration: {
configuration: [ // 仓库代码
// 仓库 WarehouseCode:"",
{ ParamCode: 'LocationCode', Value: "" }, // 库区代码
AreaCode:"",
// 库位组代码
LocationGroupCode:"",
// 库位代码
LocationCode:"",
// 优先空库位 // 优先空库位
{ ParamCode: 'EmptyLocationFirst', Value: false }, EmptyLocationFirst:'FALSE',
// 优先非空库位 // 优先非空库位
{ ParamCode: 'NotEmptyLocationFirst', Value: false }, NotEmptyLocationFirst:'FALSE',
// 可以混物品 // 可以混物品
{ ParamCode: 'EnableMixItem', Value: true }, EnableMixItem:'TRUE',
// 可以混批次 // 可以混批次
{ ParamCode: 'EnableMixLot', Value: true }, EnableMixLot:'TRUE',
// 可以混状态 // 可以混状态
{ ParamCode: 'EnableMixStatus', Value: true }, EnableMixStatus:'TRUE',
] }
} }
} }

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

@ -91,11 +91,11 @@
<div class="item mt-20px"> <div class="item mt-20px">
<div class="title">规则配置</div> <div class="title">规则配置</div>
<el-row gutter="10"> <el-row gutter="10">
<el-col :span="24" v-for="(item, index) in formData.configuration" :key="index"> <el-col :span="24">
<!-- 容纳数量 --> <!-- 容纳数量 -->
<el-form-item label="容纳数量" v-if="index == 0" :prop="'configuration.' + index + '.Value'" <el-form-item label="容纳数量" prop="configuration.ContentCount"
:rules="[{ required: true, message: '请输入容纳数量', trigger: 'change', }]"> :rules="[{ required: true, message: '请输入容纳数量', trigger: 'change', }]">
<el-input-number v-model="item.Value" :min="-1" controls-position="right" /> <el-input-number v-model="formData.configuration.ContentCount" :min="-1" controls-position="right" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -142,10 +142,10 @@ const formData = ref({
// 物品类型/物品分组/物品/abc类/项目/ // 物品类型/物品分组/物品/abc类/项目/
{ ParamCode: 'ItemGroup', Operator: "IN", Value: "" }, { ParamCode: 'ItemGroup', Operator: "IN", Value: "" },
], ],
configuration: [ configuration: {
// 容纳数量 // 容纳数量
{ ParamCode: 'ContentCount', Value: 0 }, ContentCount:0
] }
}) })
// 验证规则 // 验证规则
@ -272,10 +272,10 @@ const resetForm = () => {
// 物品类型/物品分组/物品/abc类/项目/ // 物品类型/物品分组/物品/abc类/项目/
{ ParamCode: 'ItemGroup', Operator: "IN", Value: "" }, { ParamCode: 'ItemGroup', Operator: "IN", Value: "" },
], ],
configuration: [ configuration: {
// 容纳数量 // 容纳数量
{ ParamCode: 'ContentCount', Value: 0 }, ContentCount:0
] }
} }
} }

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

@ -1,15 +1,26 @@
<!-- 库位存储策略弹窗弹窗 --> <!-- 库位存储策略弹窗弹窗 -->
<template> <template>
<Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px;"> <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px">
<div class="p-20px m--10px" style="max-height: 50vh;overflow-y: auto;"> <div class="p-20px m--10px" style="max-height: 50vh; overflow-y: auto">
<el-form ref="formRef" :model="formData" :rules="rules" label-width="130px" label-position="left"> <el-form
ref="formRef"
:model="formData"
:rules="rules"
label-width="130px"
label-position="left"
>
<!-- 规则 --> <!-- 规则 -->
<div class="item"> <div class="item">
<div class="title">规则</div> <div class="title">规则</div>
<el-row gutter="10"> <el-row gutter="10">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="代码" prop="strategyCode"> <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-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
@ -43,13 +54,41 @@
<el-col :span="24" v-for="(item, index) in formData.condition" :key="index"> <el-col :span="24" v-for="(item, index) in formData.condition" :key="index">
<!-- 仓库 库区 库位组 库位 --> <!-- 仓库 库区 库位组 库位 -->
<el-form-item label="" label-width="0" class="err-130" v-if="index == 0"> <el-form-item label="" label-width="0" class="err-130" v-if="index == 0">
<el-select v-model="item.ParamCode" placeholder="" style="width: 120px;margin-right: 10px;" <el-select
@change="changeWarehouse"> v-model="item.ParamCode"
<el-option :label="cur.label" :value="cur.value" v-for="(cur, index) in options.warehouseTypeOptions" placeholder=""
:key="index" /> style="width: 120px; margin-right: 10px"
@change="changeWarehouse"
>
<el-option
:label="cur.label"
:value="cur.value"
v-for="(cur, index) in options.warehouseTypeOptions"
:key="index"
/>
</el-select> </el-select>
<el-select v-model="item.Value" :placeholder="`请选择${item.ParamCode == 'WarehouseCode'?'仓库': item.ParamCode == 'AreaCode' ? '库区' : item.ParamCode == 'LocationGroupCode' ? '库位组' : item.ParamCode == 'LocationCode' ? '库位' : ''}`" clearable style="flex: 1;"> <el-select
<el-option v-for="cur in options.warehouseList" :key="cur.id" :label="cur.name" :value="cur.id" /> v-model="item.Value"
:placeholder="`请选择${
item.ParamCode == 'WarehouseCode'
? '仓库'
: item.ParamCode == 'AreaCode'
? '库区'
: item.ParamCode == 'LocationGroupCode'
? '库位组'
: item.ParamCode == 'LocationCode'
? '库位'
: ''
}`"
clearable
style="flex: 1"
>
<el-option
v-for="cur in options.warehouseList"
:key="cur.id"
:label="cur.name"
:value="cur.id"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -60,73 +99,110 @@
<div class="item mt-20px"> <div class="item mt-20px">
<div class="title">规则配置</div> <div class="title">规则配置</div>
<el-row gutter="10"> <el-row gutter="10">
<el-col :span="index == 0 || index == 1 ? 24 : 12" v-for="(item, index) in formData.configuration" <el-col :span="24">
:key="index">
<!-- 默认库存状态 --> <!-- 默认库存状态 -->
<el-form-item label="默认库存状态" class="flex-top" v-if="index == 0"> <el-form-item label="默认库存状态" class="flex-top">
<div class="checkbox"> <div class="checkbox">
<el-radio-group v-model="item.Value"> <el-radio-group v-model="formData.configuration.DefaultInventoryStatus">
<el-radio :label="cur.value" v-for="cur in getStrDictOptions(DICT_TYPE.INVENTORY_STATUS)" <el-radio
:key="cur.value">{{ cur.label }}</el-radio> :label="cur.value"
v-for="cur in getStrDictOptions(DICT_TYPE.INVENTORY_STATUS)"
:key="cur.value"
>{{ cur.label }}</el-radio
>
</el-radio-group> </el-radio-group>
</div> </div>
</el-form-item> </el-form-item>
<!-- 溢流库位 --> </el-col>
<el-form-item label="溢流库位" v-else-if="index == 1"> <!-- 溢流库位 -->
<el-select v-model="item.Value" placeholder="请选择溢流库位" clearable> <el-col :span="24">
<el-option v-for="cur in options.overflowWarehouseList" :key="cur.id" :label="cur.name" <el-form-item label="溢流库位">
:value="cur.id" /> <el-select
v-model="formData.configuration.OverflowLocationCode"
placeholder="请选择溢流库位"
clearable
>
<el-option
v-for="cur in options.overflowWarehouseList"
:key="cur.id"
:label="cur.name"
:value="cur.id"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- 允许负库存 --> </el-col>
<el-form-item label="允许负库存" v-else-if="index == 2"> <!-- 允许负库存 -->
<el-switch v-model="item.Value" /> <el-col :span="12">
<el-form-item label="允许负库存">
<el-switch v-model="formData.configuration.EnableNegative" active-value="TRUE" inactive-value="FALSE"/>
</el-form-item> </el-form-item>
<!-- 保留零库存 --> </el-col>
<el-form-item label="保留零库存" v-else-if="index == 3"> <!-- 保留零库存 -->
<el-switch v-model="item.Value" /> <el-col :span="12">
<el-form-item label="保留零库存">
<el-switch v-model="formData.configuration.EnableKeepZero" active-value="TRUE" inactive-value="FALSE"/>
</el-form-item> </el-form-item>
<!-- 允许领料 --> </el-col>
<el-form-item label="允许领料" v-else-if="index == 4"> <!-- 允许领料 -->
<el-switch v-model="item.Value" /> <el-col :span="12">
<el-form-item label="允许领料">
<el-switch v-model="formData.configuration.EnablePick" active-value="TRUE" inactive-value="FALSE"/>
</el-form-item> </el-form-item>
<!-- 允许过量领料 --> </el-col>
<el-form-item label="允许过量领料" v-else-if="index == 5"> <!-- 允许过量领料 -->
<el-switch v-model="item.Value" /> <el-col :span="12">
<el-form-item label="允许过量领料">
<el-switch v-model="formData.configuration.EnableOverPick" active-value="TRUE" inactive-value="FALSE"/>
</el-form-item> </el-form-item>
<!-- 允许整包存储 --> </el-col>
<el-form-item label="允许整包存储" v-else-if="index == 6"> <!-- 允许整包存储 -->
<el-switch v-model="item.Value" /> <el-col :span="12">
<el-form-item label="允许整包存储">
<el-switch v-model="formData.configuration.EnableWholeStore" active-value="TRUE" inactive-value="FALSE"/>
</el-form-item> </el-form-item>
<!-- 允许散量存储 --> </el-col>
<el-form-item label="允许散量存储" v-else-if="index == 7"> <!-- 允许散量存储 -->
<el-switch v-model="item.Value" /> <el-col :span="12">
<el-form-item label="允许散量存储">
<el-switch v-model="formData.configuration.EnableBreakStore" active-value="TRUE" inactive-value="FALSE"/>
</el-form-item> </el-form-item>
<!-- 允许出库 --> </el-col>
<el-form-item label="允许出库" v-else-if="index == 8"> <!-- 允许出库 -->
<el-switch v-model="item.Value" /> <el-col :span="12">
<el-form-item label="允许出库">
<el-switch v-model="formData.configuration.EnableShip" active-value="TRUE" inactive-value="FALSE"/>
</el-form-item> </el-form-item>
<!-- 允许入库 --> </el-col>
<el-form-item label="允许入库" v-else-if="index == 9"> <!-- 允许入库 -->
<el-switch v-model="item.Value" /> <el-col :span="12">
<el-form-item label="允许入库">
<el-switch v-model="formData.configuration.EnableReceive" active-value="TRUE" inactive-value="FALSE"/>
</el-form-item> </el-form-item>
<!-- 允许退货到供应商 --> </el-col>
<el-form-item label="允许退货到供应商" v-else-if="index == 10"> <!-- 允许退货到供应商 -->
<el-switch v-model="item.Value" /> <el-col :span="12">
<el-form-item label="允许退货到供应商">
<el-switch v-model="formData.configuration.EnableReturnToSupplier" active-value="TRUE" inactive-value="FALSE"/>
</el-form-item> </el-form-item>
<!-- 允许接收客户退货 --> </el-col>
<el-form-item label="允许接收客户退货" v-else-if="index == 11"> <!-- 允许接收客户退货 -->
<el-switch v-model="item.Value" /> <el-col :span="12">
<el-form-item label="允许接收客户退货">
<el-switch v-model="formData.configuration.EnableReturnFromCustomer" active-value="TRUE" inactive-value="FALSE"/>
</el-form-item> </el-form-item>
</el-col>
<!-- 允许拆箱 --> <!-- 允许拆箱 -->
<el-form-item label="允许拆箱" v-else-if="index == 12"> <el-col :span="12">
<el-switch v-model="item.Value" /> <el-form-item label="允许拆箱">
<el-switch v-model="formData.configuration.EnableSplitBox" active-value="TRUE" inactive-value="FALSE"/>
</el-form-item> </el-form-item>
</el-col>
<!-- 允许拆托 --> <!-- 允许拆托 -->
<el-form-item label="允许拆托" v-else-if="index == 13"> <el-col :span="12">
<el-switch v-model="item.Value" /> <el-form-item label="允许拆托">
<el-switch v-model="formData.configuration.EnableSplitPallet" active-value="TRUE" inactive-value="FALSE"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -150,7 +226,6 @@ import * as RuleApi from '@/api/wms/rule'
import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
const { t } = useI18n() // 国际化 const { t } = useI18n() // 国际化
const message = useMessage() // 消息弹窗 const message = useMessage() // 消息弹窗
@ -160,59 +235,57 @@ const formLoading = ref(false) // 表单的加载中：1）修改时的数据加
const formType = ref('') // 表单的类型：create - 新增；update - 修改 const formType = ref('') // 表单的类型：create - 新增；update - 修改
const formRef = ref() // 表单 Ref const formRef = ref() // 表单 Ref
const formStrategyCode = ref('') const formStrategyCode = ref('')
// form表单数据 // form表单数据
const formData = ref({ const formData = ref({
id: '', id: '',
strategyCode: formStrategyCode.value,//策略代码id strategyCode: formStrategyCode.value, //策略代码id
name: '',//名称 name: '', //名称
description: '',//描述 description: '', //描述
priority: '',//优先级 priority: '', //优先级
status: true,//状态 status: true, //状态
//规则条件集合 //规则条件集合
condition: [ condition: [
// 仓库 // 仓库
{ ParamCode: 'LocationCode', Value: "" }, { ParamCode: 'LocationCode', Value: '' }
], ],
configuration: [ configuration: {
// 默认库存状态 // 默认库存状态
{ ParamCode: 'DefaultInventoryStatus', Value: 'OK' }, DefaultInventoryStatus: 'OK',
// 溢流库位 // 溢流库位
{ ParamCode: 'OverflowLocationCode', Value: '' }, OverflowLocationCode: '',
// 可以负库存 // 可以负库存
{ ParamCode: 'EnableNegative', Value: true }, EnableNegative: 'TRUE',
// 可以保留零库存 // 可以保留零库存
{ ParamCode: 'EnableKeepZero', Value: true }, EnableKeepZero: 'TRUE',
// 可以领料 // 可以领料
{ ParamCode: 'EnablePick', Value: true }, EnablePick: 'TRUE',
// 可以过量领料 // 可以过量领料
{ ParamCode: 'EnableOverPick', Value: true }, EnableOverPick: 'TRUE',
// 可以整包存储 // 可以整包存储
{ ParamCode: 'EnableWholeStore', Value: true }, EnableWholeStore: 'TRUE',
// 可以散件存储 // 可以散件存储
{ ParamCode: 'EnableBreakStore', Value: true }, EnableBreakStore: 'TRUE',
// 可以发出 // 可以发出
{ ParamCode: 'EnableShip', Value: true }, EnableShip: 'TRUE',
// 可以接收 // 可以接收
{ ParamCode: 'EnableReceive', Value: true }, EnableReceive: 'TRUE',
// 可以退货给供应商 // 可以退货给供应商
{ ParamCode: 'EnableReturnToSupplier', Value: true }, EnableReturnToSupplier: 'TRUE',
// 可以接收客户退货 // 可以接收客户退货
{ ParamCode: 'EnableReturnFromCustomer', Value: true }, EnableReturnFromCustomer: 'TRUE',
// 是否可以拆箱 // 是否可以拆箱
{ ParamCode: 'EnableSplitBox', Value: true }, EnableSplitBox: 'TRUE',
// 是否可以拆托 // 是否可以拆托
{ ParamCode: 'EnableSplitPallet', Value: true }, EnableSplitPallet: 'TRUE'
] }
}) })
// 验证规则 // 验证规则
const rules = ref({ const rules = ref({
strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' }], strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' }],
name: [{ required: true, message: '请输入名字', trigger: 'blur' }], name: [{ required: true, message: '请输入名字', trigger: 'blur' }],
description: [{ required: true, message: '请输入描述', trigger: 'blur' }], description: [{ required: true, message: '请输入描述', trigger: 'blur' }],
priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }], priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }]
}) })
// 所有的范围类型 // 所有的范围类型
@ -226,11 +299,11 @@ const rangeOptions = [
{ value: 'IN', label: '包含' }, { value: 'IN', label: '包含' },
{ value: 'NOT IN', label: '不包含' }, { value: 'NOT IN', label: '不包含' },
{ value: 'NULL', label: '为空' }, { value: 'NULL', label: '为空' },
{ value: 'NOT NULL', label: '不为空' }, { value: 'NOT NULL', label: '不为空' }
] ]
const formatRangeOptions = (...rest) => { 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 return result
} }
@ -241,32 +314,35 @@ const options = reactive({
rangeOptions2: formatRangeOptions('>', '<', '>=', '<='), rangeOptions2: formatRangeOptions('>', '<', '>=', '<='),
//仓库列表 //仓库列表
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: [],
// 溢流库位列表 // 溢流库位列表
overflowWarehouseList: [] overflowWarehouseList: []
}) })
// 获取仓库列表 // 获取仓库列表
const getFormWarehouseList = async () => { const getFormWarehouseList = async () => {
options.warehouseList = await getWarehouseList(); options.warehouseList = await getWarehouseList()
} }
// 获取库区列表 // 获取库区列表
const getFormAreaList = async () => { const getFormAreaList = async () => {
options.warehouseList = await getAreaList(); options.warehouseList = await getAreaList()
} }
// 获取库位组列表 // 获取库位组列表
const getFormLocationgrouList = async () => { const getFormLocationgrouList = async () => {
options.warehouseList = await getLocationgroupList(); options.warehouseList = await getLocationgroupList()
} }
// 获取库位列表 // 获取库位列表
const getFormLocationList = async (queryParms) => { const getFormLocationList = async (queryParms) => {
if (queryParms) { if (queryParms) {
options.overflowWarehouseList = await getLocationList(queryParms); options.overflowWarehouseList = await getLocationList(queryParms)
} else { } else {
options.warehouseList = await getLocationList(); options.warehouseList = await getLocationList()
} }
} }
getFormLocationList() getFormLocationList()
@ -342,11 +418,11 @@ const submitForm = async () => {
try { try {
let data = { let data = {
id: formData.value.id, id: formData.value.id,
strategyCode: formData.value.strategyCode,//策略代码 strategyCode: formData.value.strategyCode, //策略代码
name: formData.value.name,//名称 name: formData.value.name, //名称
description: formData.value.description,//描述 description: formData.value.description, //描述
priority: formData.value.priority,//优先级 priority: formData.value.priority, //优先级
status: formData.value.status ? 0 : 1,//状态 status: formData.value.status ? 0 : 1, //状态
//规则条件集合 //规则条件集合
condition: JSON.stringify(formData.value.condition), condition: JSON.stringify(formData.value.condition),
configuration: JSON.stringify(formData.value.configuration) configuration: JSON.stringify(formData.value.configuration)
@ -370,56 +446,56 @@ const submitForm = async () => {
const resetForm = () => { const resetForm = () => {
formData.value = { formData.value = {
id: '', id: '',
strategyCode: formStrategyCode.value,//策略代码id strategyCode: formStrategyCode.value, //策略代码id
name: '',//名称 name: '', //名称
description: '',//描述 description: '', //描述
priority: '',//优先级 priority: '', //优先级
status: true,//状态 status: true, //状态
//规则条件集合 //规则条件集合
condition: [ condition: [
// 仓库 // 仓库
{ ParamCode: 'LocationCode', Value: "" }, { ParamCode: 'LocationCode', Value: '' }
], ],
configuration: [ configuration: {
// 默认库存状态 // 默认库存状态
{ ParamCode: 'DefaultInventoryStatus', Value: 'OK' }, DefaultInventoryStatus: 'OK',
// 溢流库位 // 溢流库位
{ ParamCode: 'OverflowLocationCode', Value: '' }, OverflowLocationCode: '',
// 可以负库存 // 可以负库存
{ ParamCode: 'EnableNegative', Value: true }, EnableNegative: 'TRUE',
// 可以保留零库存 // 可以保留零库存
{ ParamCode: 'EnableKeepZero', Value: true }, EnableKeepZero: 'TRUE',
// 可以领料 // 可以领料
{ ParamCode: 'EnablePick', Value: true }, EnablePick: 'TRUE',
// 可以过量领料 // 可以过量领料
{ ParamCode: 'EnableOverPick', Value: true }, EnableOverPick: 'TRUE',
// 可以整包存储 // 可以整包存储
{ ParamCode: 'EnableWholeStore', Value: true }, EnableWholeStore: 'TRUE',
// 可以散件存储 // 可以散件存储
{ ParamCode: 'EnableBreakStore', Value: true }, EnableBreakStore: 'TRUE',
// 可以发出 // 可以发出
{ ParamCode: 'EnableShip', Value: true }, EnableShip: 'TRUE',
// 可以接收 // 可以接收
{ ParamCode: 'EnableReceive', Value: true }, EnableReceive: 'TRUE',
// 可以退货给供应商 // 可以退货给供应商
{ ParamCode: 'EnableReturnToSupplier', Value: true }, EnableReturnToSupplier: 'TRUE',
// 可以接收客户退货 // 可以接收客户退货
{ ParamCode: 'EnableReturnFromCustomer', Value: true }, EnableReturnFromCustomer: 'TRUE',
// 是否可以拆箱 // 是否可以拆箱
{ ParamCode: 'EnableSplitBox', Value: true }, EnableSplitBox: 'TRUE',
// 是否可以拆托 // 是否可以拆托
{ ParamCode: 'EnableSplitPallet', Value: true }, EnableSplitPallet: 'TRUE'
] }
} }
} }
// 弹窗按钮 // 弹窗按钮
const Butttondata = [ const Butttondata = [
defaultButtons.formSaveBtn(null), // 保存 defaultButtons.formSaveBtn(null), // 保存
defaultButtons.formCloseBtn(null), // 关闭 defaultButtons.formCloseBtn(null) // 关闭
] ]
// 按钮事件 // 按钮事件
const buttonBaseClick = (val, item) => { const buttonBaseClick = (val, item) => {
// 保存 // 保存
if (val == 'save') { if (val == 'save') {
@ -430,7 +506,6 @@ const buttonBaseClick = (val, item) => {
dialogVisible.value = false dialogVisible.value = false
} }
} }
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.item { .item {
@ -473,5 +548,4 @@ const buttonBaseClick = (val, item) => {
::v-deep .err-130 .el-form-item__error { ::v-deep .err-130 .el-form-item__error {
padding-left: 130px !important; padding-left: 130px !important;
} }
</style> </style>

7
src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
View File

@ -51,15 +51,10 @@ export const DeliverPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
label: '业务类型', label: '业务类型',
field: 'businessType', field: 'businessType',
sort: 'custom', sort: 'custom',
isForm:false,
table: { table: {
width: 150 width: 150
}, },
form: {
value: 'Deliver',
componentProps: {
disabled: true
}
}
}, },
{ {
label: '备注', label: '备注',

12
src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue
View File

@ -71,6 +71,7 @@
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { getAccessToken } from '@/utils/auth'
import download from '@/utils/download' import download from '@/utils/download'
import * as PurchaseclaimRequestMainApi from '@/api/wms/purchaseclaimRequestMain' import * as PurchaseclaimRequestMainApi from '@/api/wms/purchaseclaimRequestMain'
import * as PurchaseclaimRequestDetailApi from '@/api/wms/purchaseclaimRequestDetail' import * as PurchaseclaimRequestDetailApi from '@/api/wms/purchaseclaimRequestDetail'
@ -191,6 +192,7 @@ const buttondata = (row) => {
defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2'])}), // 审批通过 defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2'])}), // 审批通过
defaultButtons.mainListEditBtn({ hide:isShowMainButton(row,['1']),hasPermi: 'wms:purchaseclaim-request-main:update' }), // 编辑 defaultButtons.mainListEditBtn({ hide:isShowMainButton(row,['1']),hasPermi: 'wms:purchaseclaim-request-main:update' }), // 编辑
defaultButtons.mainListDeleteBtn({ hide:isShowMainButton(row,['1']),hasPermi: 'wms:purchaseclaim-request-main:delete' }), // 删除 defaultButtons.mainListDeleteBtn({ hide:isShowMainButton(row,['1']),hasPermi: 'wms:purchaseclaim-request-main:delete' }), // 删除
defaultButtons.mainListPointBtn(null), // 打印
] ]
} }
@ -220,6 +222,8 @@ const buttonTableClick = async (val, row) => {
openForm('update', row) openForm('update', row)
} else if (val == 'delete') { // 删除 } else if (val == 'delete') { // 删除
handleDelete(row.id) handleDelete(row.id)
} else if (val == 'point') { // 打印
handlePoint(row.id)
} }
} }
@ -267,6 +271,14 @@ const handleExport = async () => {
exportLoading.value = false exportLoading.value = false
} }
} }
const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
const src = ref(BASE_URL + '/jmreport/view/882550592342003712?token=' + getAccessToken())
console.log(src)
// 打印
const handlePoint = async (id) => {
window.open(src.value+'&id='+id)
}
/** /**
* tableForm方法 * tableForm方法
*/ */

Write Preview
Loading…
Cancel
Save