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

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

master
陈薪名 1 year ago
parent
0cf2e1c093 aea52b62e9
commit
83753c494e
11 changed files with 1524 additions and 120 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      src/api/wms/dock/index.ts
  2. 4
      src/api/wms/location/index.ts
  3. 1
      src/api/wms/rule/index.ts
  4. 6
      src/api/wms/supplier/index.ts
  5. 5
      src/api/wms/warehouse/index.ts
  6. 454
      src/views/wms/strategy/arrivalInspectionStrategy/AddForm.vue
  7. 127
      src/views/wms/strategy/arrivalInspectionStrategy/index.vue
  8. 454
      src/views/wms/strategy/purchaseReceiptStrategy/AddForm.vue
  9. 127
      src/views/wms/strategy/purchaseReceiptStrategy/index.vue
  10. 376
      src/views/wms/strategy/supplieDeliveryStrategy/AddForm.vue
  11. 85
      src/views/wms/strategy/supplieDeliveryStrategy/index.vue

5
src/api/wms/dock/index.ts
View File

@ -21,7 +21,10 @@ export interface DockVO {
export const getDockPage = async (params) => {
return await request.get({ url: `/wms/dock/page`, params })
}
// 查询月台列表
export const getDockList = async (params) => {
return await request.get({ url: `/wms/dock/list`, params })
}
// 查询月台详情
export const getDock = async (id: number) => {
return await request.get({ url: `/wms/dock/get?id=` + id })

4
src/api/wms/location/index.ts
View File

@ -28,6 +28,10 @@ export interface LocationVO {
export const getLocationPage = async (params) => {
return await request.get({ url: `/wms/location/page`, params })
}
// 查询库位所有列表
export const getLocationList = async (params) => {
return await request.get({ url: `/wms/location/list`, params })
}
// 查询库位详情
export const getLocation = async (id: number) => {

1
src/api/wms/rule/index.ts
View File

@ -6,6 +6,7 @@ export interface RuleVO {
code: string
name: string
description: string
status: number
condition: string
configuration: string
}

6
src/api/wms/supplier/index.ts
View File

@ -21,10 +21,14 @@ export interface SupplierVO {
remark: string
}
// 查询供应商列表
// 查询供应商列表分页
export const getSupplierPage = async (params) => {
return await request.get({ url: `/wms/supplier/page`, params })
}
// 查询供应商列表
export const getSupplierList = async (params) => {
return await request.get({ url: `/wms/supplier/list`, params })
}
// 查询供应商详情
export const getSupplier = async (id: number) => {

5
src/api/wms/warehouse/index.ts
View File

@ -15,7 +15,10 @@ export interface WarehouseVO {
export const getWarehousePage = async (params) => {
return await request.get({ url: `/wms/warehouse/page`, params })
}
// 查询仓库所有列表
export const getWarehouseList = async (params) => {
return await request.get({ url: `/wms/warehouse/list`, params })
}
// 查询仓库详情
export const getWarehouse = async (id: number) => {
return await request.get({ url: `/wms/warehouse/get?id=` + id })

454
src/views/wms/strategy/arrivalInspectionStrategy/AddForm.vue
View File

@ -0,0 +1,454 @@
<!-- 供应商送货策略弹出层 -->
<template>
<Dialog :title="dialogTitle" v-model="dialogVisible">
<div class="p-20px m--10px" style="max-height: 500px;overflow-y: auto;">
<!-- 规则 -->
<div class="item">
<div class="title">规则</div>
<el-form ref="formRef1" :model="formData" :rules="rules" label-width="120px" label-position="left">
<el-row>
<el-col :span="24">
<el-form-item label="代码" prop="code">
<el-input v-model="formData.code" placeholder="请输入代码" clearable disabled />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="名称" prop="name">
<el-input v-model="formData.name" placeholder="请输入名称" clearable />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="描述" prop="description">
<el-input v-model="formData.description" placeholder="请输入描述" clearable />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="优先级" prop="priority">
<el-input-number v-model="formData.priority" :min="1" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="状态" prop="status">
<el-switch v-model="formData.status" />
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
<!-- 规则条件 -->
<div class="item mt-20px">
<div class="title">规则条件</div>
<el-form ref="formRef2" :model="formData" :rules="rules" label-width="120px" label-position="left">
<el-row>
<el-col :span="24" v-for="(item, index) in formData.condition" :key="index">
<!-- 供应商类型 -->
<el-form-item v-if="item.ParamCode == 'SupplierType'" label="供应商类型" 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 v-model="item.Value" placeholder="请选择供应商类型" 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>
<!-- </div> -->
</el-form-item>
<!-- 供应商 -->
<el-form-item v-else-if="item.ParamCode == 'SupplierCode'" label="供应商" 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 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-form-item>
<!-- 星期几 -->
<el-form-item v-else-if="item.ParamCode == 'Weekday'" label="星期几" 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.weekRangeOptions"
:key="cur.value" />
</el-select>
<div class="checkbox">
<el-checkbox-group v-model="item.Value" @change="change">
<el-checkbox :label="cur.label" v-for="cur in options.weekOptions" :key="cur.value" />
</el-checkbox-group>
</div>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
<!-- 规则配置 -->
<div class="item mt-20px">
<div class="title">规则配置</div>
<el-form ref="formRef3" :model="formData" label-width="120px" label-position="left">
<el-row>
<!-- 开始时间 -->
<el-col :span="24" v-for="(item, index) in formData.configuration" :key="index">
<!-- 开始时间 -->
<el-form-item v-if="item.ParamCode == 'BeginTime'" label="开始时间" :prop="'configuration.' + index + '.Value'"
:rules="{
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%;" />
</el-form-item>
<!-- 结束时间 -->
<el-form-item v-else-if="item.ParamCode == 'EndTime'" label="结束时间"
:prop="'configuration.' + index + '.Value'" :rules="{
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%;" />
</el-form-item>
<!-- 仓库 -->
<el-form-item v-else-if="item.ParamCode == 'WarehouseCode'" label="仓库"
:prop="'configuration.' + index + '.Value'" :rules="{
required: true,
message: '请选择仓库',
trigger: 'change',
}">
<el-select v-model="item.Value" placeholder="请选择仓库" clearable>
<el-option v-for="cur in options.warehouseList" :key="cur.id" :label="cur.name" :value="cur.id" />
</el-select>
</el-form-item>
<!-- 月台 -->
<el-form-item v-else-if="item.ParamCode == 'DockCode'" label="月台"
:prop="'configuration.' + index + '.Value'" :rules="{
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-select>
</el-form-item>
<!-- 在途库位 -->
<el-form-item v-else-if="item.ParamCode == 'OnTheWayLocationCode'" label="在途库位"
:prop="'configuration.' + index + '.Value'" :rules="{
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-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</div>
<template #footer>
<!-- 按钮-->
<TableHead :HeadButttondata="Butttondata" @buttonBaseClick="buttonBaseClick" />
</template>
</Dialog>
</template>
<script setup lang="ts">
import * as defaultButtons from '@/utils/disposition/defaultButtons'
defineOptions({ name: 'SupplieDeliveryStrategyAddForm' })
import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
import { getSupplierList } from '@/api/wms/supplier'
import { getWarehouseList } from '@/api/wms/warehouse'
import { getDockList } from '@/api/wms/dock'
import { getLocationList } from '@/api/wms/location'
import * as RuleApi from '@/api/wms/rule'
const { t } = useI18n() // 国际化
const message = useMessage() // 消息弹窗
const dialogVisible = ref(false) // 弹窗的是否展示
const dialogTitle = ref('') // 弹窗的标题
const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
const formType = ref('') // 表单的类型：create - 新增；update - 修改
const formRef1 = ref() // 表单 Ref
const formRef2 = ref() // 表单 Ref
const formRef3 = ref() // 表单 Ref
const change = (e) => {
console.log(e);
}
const formStrategyCode = ref('')
// form表单数据
const formData = ref({
strategyCode: formStrategyCode.value,//策略代码
code: formStrategyCode.value,//规则代码
name: '',//名称
description: '',//描述
priority: '',//优先级
status: true,//状态
//规则条件集合
condition: [
// 供应商类型
{ ParamCode: 'SupplierType', Operator: "==", Value: "" },
// 供应商
{ ParamCode: 'SupplierCode', Operator: "IN", Value: "" },
// 星期几
{ ParamCode: 'Weekday', Operator: "IN", Value: [] }
],
configuration: [
// 开始时间
{ ParamCode: 'BeginTime', Value: "" },
// 结束时间
{ ParamCode: 'EndTime', Value: "" },
// 仓库代码
{ ParamCode: 'WarehouseCode', Value: '' },
// 月台代码
{ ParamCode: 'DockCode', Value: '' },
// 在途库位代码
{ ParamCode: 'OnTheWayLocationCode', Value: '' },
]
})
// 验证规则
const rules = ref({
code: [{ required: true, message: '请输入代码', trigger: 'blur' }],
name: [{ required: true, message: '请输入名字', trigger: 'blur' }],
description: [{ required: true, message: '请输入描述', trigger: 'blur' }],
priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }],
BeginTime: [{ required: true, message: '请选择开始时间', trigger: 'change' }],
EndTime: [{ required: true, message: '请选择结束时间', trigger: 'change' }],
WarehouseCode: [{ required: true, message: '请选择仓库', trigger: 'change' }],
DockCode: [{ required: true, message: '请选择月台', trigger: 'change' }],
OnTheWayLocationCode: [{ required: true, message: '请选择在途库位', trigger: 'change' }],
})
// 所有的范围类型
const rangeOptions = [
{ value: '==', label: '等于' },
{ value: '!=', label: '不等于' },
{ value: '>', label: '大于' },
{ value: '<', label: '小于' },
{ value: '>=', label: '大于等于' },
{ value: '<=', label: '小于等于' },
{ value: 'IN', label: '包含' },
{ value: 'NOT IN', label: '不包含' },
{ value: 'NULL', label: '为空' },
{ value: 'NOT NULL', label: '不为空' },
]
const formatRangeOptions = (...rest) => {
// 交集
let result = rangeOptions.filter(aItem => rest.some(bItem => aItem.value === bItem));
return result
}
// 下拉框列表集合
const options = reactive({
// 供应商类型范围下拉框列表
supplierTypeRangeOptions: formatRangeOptions('=='),
// 供应商列表
supplierTypeOptions: [{ value: 1, label: '标准' }, { value: 2, label: '委外' }, { value: 3, label: '其他' }],
// 供应商范围下拉框列表
supplierRangeOptions: formatRangeOptions('IN', 'NOT IN'),
//供应商列表
supplierList: [{ value: 1, label: '供应商1' }, { value: 2, label: '供应商2' }, { value: 3, label: '供应商3' }],
// 星期几范围下拉框列表
weekRangeOptions: formatRangeOptions('IN', 'NOT IN'),
//星期几列表
weekOptions: [{ value: 1, label: '星期一' }, { value: 2, label: '星期二' }, { value: 3, label: '星期三' }, { value: 4, label: '星期四' }, { value: 5, label: '星期五' }, { value: 6, label: '星期六' }, { value: 7, label: '星期日' }],
//仓库列表
warehouseList: [],
//月台列表
dockList: [],
//在途库位列表
locationList: [],
})
// 获取供应商列表的参数
const querySupplierParams = ref({
type: ''
})
// 获取供应商列表
const getFormSupplierList = async () => {
options.supplierList = await getSupplierList(querySupplierParams.value);
}
// 选择供应商类型
const changeSupplierType = (e) => {
querySupplierParams.value.type = e
getFormSupplierList()
}
// 获取仓库列表
const getFormWarehouseList = async () => {
options.warehouseList = await getWarehouseList();
}
// 获取月台列表
const getFormDockList = async () => {
options.dockList = await getDockList();
}
// 获取库位列表
const getFormLocationList = async () => {
options.locationList = await getLocationList({ type: 'TRANSPORT' });
}
getFormSupplierList()
getFormWarehouseList()
getFormDockList()
getFormLocationList()
/** 打开弹窗 */
const open = async (type: string, strategyCode: string, id?: number) => {
formStrategyCode.value = strategyCode
dialogVisible.value = true
dialogTitle.value = t('action.' + type)
formType.value = type
resetForm()
// 修改时，设置数据
if (id) {
formLoading.value = true
try {
let data = await RuleApi.getRule(id)
formData.value.strategyCode = data.strategyCode
formData.value.code = data.code
formData.value.name = data.name
formData.value.description = data.description
formData.value.priority = data.priority
formData.value.status = data.status==1?true:false
if(data.condition){
formData.value.condition = JSON.parse(data.condition)
}
if(data.configuration){
formData.value.configuration = JSON.parse(data.configuration)
}
} finally {
formLoading.value = false
}
}
}
defineExpose({ open }) // 提供 open 方法，用于打开弹窗
/** 提交表单 */
const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
const submitForm = async () => {
// 校验表单
if (!formRef1 || !formRef2 || !formRef3) return
const valid2 = formRef2.value.validate()
const valid1 = formRef1.value.validate()
const valid3 = await formRef3.value.validate()
if (!valid1 || !valid2 || !valid3) return
// 提交请求
formLoading.value = true
try {
let data = {
strategyCode: formData.value.strategyCode,//策略代码
code: formData.value.code,//规则代码
name: formData.value.name,//名称
description: formData.value.description,//描述
priority: formData.value.priority,//优先级
status: formData.value.status?1:0,//状态
//规则条件集合
condition: JSON.stringify(formData.value.condition),
configuration: JSON.stringify(formData.value.configuration)
}
if (formType.value === 'create') {
await RuleApi.createRule(data)
message.success(t('common.createSuccess'))
} else {
await RuleApi.updateRule(data)
message.success(t('common.updateSuccess'))
}
dialogVisible.value = false
// 发送操作成功的事件
emit('success')
} finally {
formLoading.value = false
}
}
/** 重置表单 */
const resetForm = () => {
formData.value = {
strategyCode: formStrategyCode.value,//策略代码
code: formStrategyCode.value,//规则代码
name: '',//名称
description: '',//描述
priority: '',//优先级
status: true,//状态
//规则条件集合
condition: [
// 供应商类型
{ ParamCode: 'SupplierType', Operator: "==", Value: "" },
// 供应商
{ ParamCode: 'SupplierCode', Operator: "IN", Value: "" },
// 星期几
{ ParamCode: 'Weekday', Operator: "IN", Value: [] }
],
configuration: [
// 开始时间
{ ParamCode: 'BeginTime', Value: "" },
// 结束时间
{ ParamCode: 'EndTime', Value: "" },
// 仓库代码
{ ParamCode: 'WarehouseCode', Value: '' },
// 月台代码
{ ParamCode: 'DockCode', Value: '' },
// 在途库位代码
{ ParamCode: 'OnTheWayLocationCode', Value: '' },
]
}
}
// 弹窗按钮
const Butttondata = [
defaultButtons.formSaveBtn(null), // 保存
defaultButtons.formCloseBtn(null), // 关闭
]
// 按钮事件
const buttonBaseClick = (val, item) => {
// 保存
if (val == 'save') {
submitForm()
}
// 关闭
else if (val == 'close') {
dialogVisible.value = false
}
}
</script>
<style scoped lang="scss">
.item {
border: 1px solid #dedede;
border-radius: 4px;
padding: 30px 30px 5px;
position: relative;
.title {
position: absolute;
background: white;
padding: 0px 10px;
position: absolute;
top: 0px;
height: 30px;
line-height: 30px;
margin-top: -15px;
}
}
.checkbox {
background: #f5f5f5;
flex: 1;
padding: 0px 15px;
border-radius: 2px;
}
::v-deep .flex-top .el-form-item__content {
align-items: flex-start !important;
}
::v-deep .err-120 .el-form-item__error {
padding-left: 120px !important;
}
</style>

127
src/views/wms/strategy/arrivalInspectionStrategy/index.vue
View File

@ -0,0 +1,127 @@
<!-- 到货验货任务拆分策略 -->
<template>
<!-- 列表头部 -->
<TableHead :HeadButttondata="HeadButttondata" @buttonBaseClick="buttonBaseClick" />
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="list">
<el-table-column align="center" label="策略代码" prop="strategyCode" />
<el-table-column align="center" label="策略名称" prop="name" show-overflow-tooltip />
<el-table-column align="center" label="策略描述" prop="description" />
<el-table-column align="center" label="优先级" prop="priority" />
<el-table-column align="center" label="状态" prop="status">
<template #default="scope">
<dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<!-- <el-table-column label="创建时间" align="center" prop="createTime" width="180" :formatter="dateFormatter" /> -->
<el-table-column align="center" label="操作" fixed="right" width="240">
<template #default="scope">
<ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event, scope.row)" />
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<Pagination v-model:limit="queryParams.pageSize" v-model:page="queryParams.pageNo" :total="total"
@pagination="getList" />
</ContentWrap>
<!-- 表单弹窗：添加/修改 -->
<AddForm ref="formRef" @success="getList" />
</template>
<script setup lang="ts">
import { DICT_TYPE } from '@/utils/dict'
import * as defaultButtons from '@/utils/disposition/defaultButtons'
import * as RuleApi from '@/api/wms/rule'
import AddForm from './AddForm.vue'
// import { dateFormatter } from '@/utils/formatTime'
defineOptions({ name: 'ArrivalInspectionStrategy' })
const { t } = useI18n() // 国际化
const message = useMessage() // 消息弹窗
const loading = ref(true) // 列表的加载中
const total = ref(0) // 列表的总页数
const list = ref([]) // 字典表格数据
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
strategyCode: 'S001',
})
/** 查询字典类型列表 */
const getList = async () => {
loading.value = true
try {
const data = await RuleApi.getRulePage(queryParams)
list.value = data.list
total.value = data.total
} finally {
loading.value = false
}
}
// 显示弹窗
const formRef = ref()
const openForm = (type: string, strategyCode: string, id: number) => {
formRef.value.open(type, strategyCode, id)
}
/** 删除按钮操作 */
const handleDelete = async (id: number) => {
try {
// 删除的二次确认
await message.delConfirm()
// 发起删除
await RuleApi.deleteRule(id)
message.success(t('common.delSuccess'))
// 刷新列表
await getList()
} catch { }
}
// 列表头部按钮
const HeadButttondata = [
defaultButtons.defaultAddBtn(null), // 新增
]
// 头部按钮事件
const buttonBaseClick = (val, item) => {
if (val == 'add') { // 新增
openForm('create', queryParams.strategyCode)
} else if (val == 'import') { // 导入
handleImport()
} else if (val == 'export') { // 导出
handleExport()
} else if (val == 'refresh') { // 刷新
getList()
} else if (val == 'filtrate') { // 筛选
} else { // 其他按钮
console.log('其他按钮', item)
}
}
// 列表-操作按钮
const butttondata = [
defaultButtons.mainListEditBtn({ hasPermi: 'wms:itembasic:update' }), // 编辑
defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:itembasic:delete' }), // 删除
]
// 列表-操作按钮事件
const buttonTableClick = (val, row) => {
if (val == 'edit') { // 编辑
openForm('update', queryParams.strategyCode, row.id)
} else if (val == 'delete') { // 删除
handleDelete(row.id)
}
}
/** 初始化 **/
onMounted(() => {
getList()
})
</script>

454
src/views/wms/strategy/purchaseReceiptStrategy/AddForm.vue
View File

@ -0,0 +1,454 @@
<!-- 供应商送货策略弹出层 -->
<template>
<Dialog :title="dialogTitle" v-model="dialogVisible">
<div class="p-20px m--10px" style="max-height: 500px;overflow-y: auto;">
<!-- 规则 -->
<div class="item">
<div class="title">规则</div>
<el-form ref="formRef1" :model="formData" :rules="rules" label-width="120px" label-position="left">
<el-row>
<el-col :span="24">
<el-form-item label="代码" prop="code">
<el-input v-model="formData.code" placeholder="请输入代码" clearable disabled />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="名称" prop="name">
<el-input v-model="formData.name" placeholder="请输入名称" clearable />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="描述" prop="description">
<el-input v-model="formData.description" placeholder="请输入描述" clearable />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="优先级" prop="priority">
<el-input-number v-model="formData.priority" :min="1" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="状态" prop="status">
<el-switch v-model="formData.status" />
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
<!-- 规则条件 -->
<div class="item mt-20px">
<div class="title">规则条件</div>
<el-form ref="formRef2" :model="formData" :rules="rules" label-width="120px" label-position="left">
<el-row>
<el-col :span="24" v-for="(item, index) in formData.condition" :key="index">
<!-- 供应商类型 -->
<el-form-item v-if="item.ParamCode == 'SupplierType'" label="供应商类型" 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 v-model="item.Value" placeholder="请选择供应商类型" 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>
<!-- </div> -->
</el-form-item>
<!-- 供应商 -->
<el-form-item v-else-if="item.ParamCode == 'SupplierCode'" label="供应商" 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 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-form-item>
<!-- 星期几 -->
<el-form-item v-else-if="item.ParamCode == 'Weekday'" label="星期几" 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.weekRangeOptions"
:key="cur.value" />
</el-select>
<div class="checkbox">
<el-checkbox-group v-model="item.Value" @change="change">
<el-checkbox :label="cur.label" v-for="cur in options.weekOptions" :key="cur.value" />
</el-checkbox-group>
</div>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
<!-- 规则配置 -->
<div class="item mt-20px">
<div class="title">规则配置</div>
<el-form ref="formRef3" :model="formData" label-width="120px" label-position="left">
<el-row>
<!-- 开始时间 -->
<el-col :span="24" v-for="(item, index) in formData.configuration" :key="index">
<!-- 开始时间 -->
<el-form-item v-if="item.ParamCode == 'BeginTime'" label="开始时间" :prop="'configuration.' + index + '.Value'"
:rules="{
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%;" />
</el-form-item>
<!-- 结束时间 -->
<el-form-item v-else-if="item.ParamCode == 'EndTime'" label="结束时间"
:prop="'configuration.' + index + '.Value'" :rules="{
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%;" />
</el-form-item>
<!-- 仓库 -->
<el-form-item v-else-if="item.ParamCode == 'WarehouseCode'" label="仓库"
:prop="'configuration.' + index + '.Value'" :rules="{
required: true,
message: '请选择仓库',
trigger: 'change',
}">
<el-select v-model="item.Value" placeholder="请选择仓库" clearable>
<el-option v-for="cur in options.warehouseList" :key="cur.id" :label="cur.name" :value="cur.id" />
</el-select>
</el-form-item>
<!-- 月台 -->
<el-form-item v-else-if="item.ParamCode == 'DockCode'" label="月台"
:prop="'configuration.' + index + '.Value'" :rules="{
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-select>
</el-form-item>
<!-- 在途库位 -->
<el-form-item v-else-if="item.ParamCode == 'OnTheWayLocationCode'" label="在途库位"
:prop="'configuration.' + index + '.Value'" :rules="{
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-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</div>
<template #footer>
<!-- 按钮-->
<TableHead :HeadButttondata="Butttondata" @buttonBaseClick="buttonBaseClick" />
</template>
</Dialog>
</template>
<script setup lang="ts">
import * as defaultButtons from '@/utils/disposition/defaultButtons'
defineOptions({ name: 'SupplieDeliveryStrategyAddForm' })
import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
import { getSupplierList } from '@/api/wms/supplier'
import { getWarehouseList } from '@/api/wms/warehouse'
import { getDockList } from '@/api/wms/dock'
import { getLocationList } from '@/api/wms/location'
import * as RuleApi from '@/api/wms/rule'
const { t } = useI18n() // 国际化
const message = useMessage() // 消息弹窗
const dialogVisible = ref(false) // 弹窗的是否展示
const dialogTitle = ref('') // 弹窗的标题
const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
const formType = ref('') // 表单的类型：create - 新增；update - 修改
const formRef1 = ref() // 表单 Ref
const formRef2 = ref() // 表单 Ref
const formRef3 = ref() // 表单 Ref
const change = (e) => {
console.log(e);
}
const formStrategyCode = ref('')
// form表单数据
const formData = ref({
strategyCode: formStrategyCode.value,//策略代码
code: formStrategyCode.value,//规则代码
name: '',//名称
description: '',//描述
priority: '',//优先级
status: true,//状态
//规则条件集合
condition: [
// 供应商类型
{ ParamCode: 'SupplierType', Operator: "==", Value: "" },
// 供应商
{ ParamCode: 'SupplierCode', Operator: "IN", Value: "" },
// 星期几
{ ParamCode: 'Weekday', Operator: "IN", Value: [] }
],
configuration: [
// 开始时间
{ ParamCode: 'BeginTime', Value: "" },
// 结束时间
{ ParamCode: 'EndTime', Value: "" },
// 仓库代码
{ ParamCode: 'WarehouseCode', Value: '' },
// 月台代码
{ ParamCode: 'DockCode', Value: '' },
// 在途库位代码
{ ParamCode: 'OnTheWayLocationCode', Value: '' },
]
})
// 验证规则
const rules = ref({
code: [{ required: true, message: '请输入代码', trigger: 'blur' }],
name: [{ required: true, message: '请输入名字', trigger: 'blur' }],
description: [{ required: true, message: '请输入描述', trigger: 'blur' }],
priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }],
BeginTime: [{ required: true, message: '请选择开始时间', trigger: 'change' }],
EndTime: [{ required: true, message: '请选择结束时间', trigger: 'change' }],
WarehouseCode: [{ required: true, message: '请选择仓库', trigger: 'change' }],
DockCode: [{ required: true, message: '请选择月台', trigger: 'change' }],
OnTheWayLocationCode: [{ required: true, message: '请选择在途库位', trigger: 'change' }],
})
// 所有的范围类型
const rangeOptions = [
{ value: '==', label: '等于' },
{ value: '!=', label: '不等于' },
{ value: '>', label: '大于' },
{ value: '<', label: '小于' },
{ value: '>=', label: '大于等于' },
{ value: '<=', label: '小于等于' },
{ value: 'IN', label: '包含' },
{ value: 'NOT IN', label: '不包含' },
{ value: 'NULL', label: '为空' },
{ value: 'NOT NULL', label: '不为空' },
]
const formatRangeOptions = (...rest) => {
// 交集
let result = rangeOptions.filter(aItem => rest.some(bItem => aItem.value === bItem));
return result
}
// 下拉框列表集合
const options = reactive({
// 供应商类型范围下拉框列表
supplierTypeRangeOptions: formatRangeOptions('=='),
// 供应商列表
supplierTypeOptions: [{ value: 1, label: '标准' }, { value: 2, label: '委外' }, { value: 3, label: '其他' }],
// 供应商范围下拉框列表
supplierRangeOptions: formatRangeOptions('IN', 'NOT IN'),
//供应商列表
supplierList: [{ value: 1, label: '供应商1' }, { value: 2, label: '供应商2' }, { value: 3, label: '供应商3' }],
// 星期几范围下拉框列表
weekRangeOptions: formatRangeOptions('IN', 'NOT IN'),
//星期几列表
weekOptions: [{ value: 1, label: '星期一' }, { value: 2, label: '星期二' }, { value: 3, label: '星期三' }, { value: 4, label: '星期四' }, { value: 5, label: '星期五' }, { value: 6, label: '星期六' }, { value: 7, label: '星期日' }],
//仓库列表
warehouseList: [],
//月台列表
dockList: [],
//在途库位列表
locationList: [],
})
// 获取供应商列表的参数
const querySupplierParams = ref({
type: ''
})
// 获取供应商列表
const getFormSupplierList = async () => {
options.supplierList = await getSupplierList(querySupplierParams.value);
}
// 选择供应商类型
const changeSupplierType = (e) => {
querySupplierParams.value.type = e
getFormSupplierList()
}
// 获取仓库列表
const getFormWarehouseList = async () => {
options.warehouseList = await getWarehouseList();
}
// 获取月台列表
const getFormDockList = async () => {
options.dockList = await getDockList();
}
// 获取库位列表
const getFormLocationList = async () => {
options.locationList = await getLocationList({ type: 'TRANSPORT' });
}
getFormSupplierList()
getFormWarehouseList()
getFormDockList()
getFormLocationList()
/** 打开弹窗 */
const open = async (type: string, strategyCode: string, id?: number) => {
formStrategyCode.value = strategyCode
dialogVisible.value = true
dialogTitle.value = t('action.' + type)
formType.value = type
resetForm()
// 修改时，设置数据
if (id) {
formLoading.value = true
try {
let data = await RuleApi.getRule(id)
formData.value.strategyCode = data.strategyCode
formData.value.code = data.code
formData.value.name = data.name
formData.value.description = data.description
formData.value.priority = data.priority
formData.value.status = data.status==1?true:false
if(data.condition){
formData.value.condition = JSON.parse(data.condition)
}
if(data.configuration){
formData.value.configuration = JSON.parse(data.configuration)
}
} finally {
formLoading.value = false
}
}
}
defineExpose({ open }) // 提供 open 方法，用于打开弹窗
/** 提交表单 */
const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
const submitForm = async () => {
// 校验表单
if (!formRef1 || !formRef2 || !formRef3) return
const valid2 = formRef2.value.validate()
const valid1 = formRef1.value.validate()
const valid3 = await formRef3.value.validate()
if (!valid1 || !valid2 || !valid3) return
// 提交请求
formLoading.value = true
try {
let data = {
strategyCode: formData.value.strategyCode,//策略代码
code: formData.value.code,//规则代码
name: formData.value.name,//名称
description: formData.value.description,//描述
priority: formData.value.priority,//优先级
status: formData.value.status?1:0,//状态
//规则条件集合
condition: JSON.stringify(formData.value.condition),
configuration: JSON.stringify(formData.value.configuration)
}
if (formType.value === 'create') {
await RuleApi.createRule(data)
message.success(t('common.createSuccess'))
} else {
await RuleApi.updateRule(data)
message.success(t('common.updateSuccess'))
}
dialogVisible.value = false
// 发送操作成功的事件
emit('success')
} finally {
formLoading.value = false
}
}
/** 重置表单 */
const resetForm = () => {
formData.value = {
strategyCode: formStrategyCode.value,//策略代码
code: formStrategyCode.value,//规则代码
name: '',//名称
description: '',//描述
priority: '',//优先级
status: true,//状态
//规则条件集合
condition: [
// 供应商类型
{ ParamCode: 'SupplierType', Operator: "==", Value: "" },
// 供应商
{ ParamCode: 'SupplierCode', Operator: "IN", Value: "" },
// 星期几
{ ParamCode: 'Weekday', Operator: "IN", Value: [] }
],
configuration: [
// 开始时间
{ ParamCode: 'BeginTime', Value: "" },
// 结束时间
{ ParamCode: 'EndTime', Value: "" },
// 仓库代码
{ ParamCode: 'WarehouseCode', Value: '' },
// 月台代码
{ ParamCode: 'DockCode', Value: '' },
// 在途库位代码
{ ParamCode: 'OnTheWayLocationCode', Value: '' },
]
}
}
// 弹窗按钮
const Butttondata = [
defaultButtons.formSaveBtn(null), // 保存
defaultButtons.formCloseBtn(null), // 关闭
]
// 按钮事件
const buttonBaseClick = (val, item) => {
// 保存
if (val == 'save') {
submitForm()
}
// 关闭
else if (val == 'close') {
dialogVisible.value = false
}
}
</script>
<style scoped lang="scss">
.item {
border: 1px solid #dedede;
border-radius: 4px;
padding: 30px 30px 5px;
position: relative;
.title {
position: absolute;
background: white;
padding: 0px 10px;
position: absolute;
top: 0px;
height: 30px;
line-height: 30px;
margin-top: -15px;
}
}
.checkbox {
background: #f5f5f5;
flex: 1;
padding: 0px 15px;
border-radius: 2px;
}
::v-deep .flex-top .el-form-item__content {
align-items: flex-start !important;
}
::v-deep .err-120 .el-form-item__error {
padding-left: 120px !important;
}
</style>

127
src/views/wms/strategy/purchaseReceiptStrategy/index.vue
View File

@ -0,0 +1,127 @@
<!-- 采购收货任务拆分策略 -->
<template>
<!-- 列表头部 -->
<TableHead :HeadButttondata="HeadButttondata" @buttonBaseClick="buttonBaseClick" />
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="list">
<el-table-column align="center" label="策略代码" prop="strategyCode" />
<el-table-column align="center" label="策略名称" prop="name" show-overflow-tooltip />
<el-table-column align="center" label="策略描述" prop="description" />
<el-table-column align="center" label="优先级" prop="priority" />
<el-table-column align="center" label="状态" prop="status">
<template #default="scope">
<dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<!-- <el-table-column label="创建时间" align="center" prop="createTime" width="180" :formatter="dateFormatter" /> -->
<el-table-column align="center" label="操作" fixed="right" width="240">
<template #default="scope">
<ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event, scope.row)" />
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<Pagination v-model:limit="queryParams.pageSize" v-model:page="queryParams.pageNo" :total="total"
@pagination="getList" />
</ContentWrap>
<!-- 表单弹窗：添加/修改 -->
<AddForm ref="formRef" @success="getList" />
</template>
<script setup lang="ts">
import { DICT_TYPE } from '@/utils/dict'
import * as defaultButtons from '@/utils/disposition/defaultButtons'
import * as RuleApi from '@/api/wms/rule'
import AddForm from './AddForm.vue'
// import { dateFormatter } from '@/utils/formatTime'
defineOptions({ name: 'PurchaseReceiptStrategy' })
const { t } = useI18n() // 国际化
const message = useMessage() // 消息弹窗
const loading = ref(true) // 列表的加载中
const total = ref(0) // 列表的总页数
const list = ref([]) // 字典表格数据
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
strategyCode: 'S001',
})
/** 查询字典类型列表 */
const getList = async () => {
loading.value = true
try {
const data = await RuleApi.getRulePage(queryParams)
list.value = data.list
total.value = data.total
} finally {
loading.value = false
}
}
// 显示弹窗
const formRef = ref()
const openForm = (type: string, strategyCode: string, id: number) => {
formRef.value.open(type, strategyCode, id)
}
/** 删除按钮操作 */
const handleDelete = async (id: number) => {
try {
// 删除的二次确认
await message.delConfirm()
// 发起删除
await RuleApi.deleteRule(id)
message.success(t('common.delSuccess'))
// 刷新列表
await getList()
} catch { }
}
// 列表头部按钮
const HeadButttondata = [
defaultButtons.defaultAddBtn(null), // 新增
]
// 头部按钮事件
const buttonBaseClick = (val, item) => {
if (val == 'add') { // 新增
openForm('create', queryParams.strategyCode)
} else if (val == 'import') { // 导入
handleImport()
} else if (val == 'export') { // 导出
handleExport()
} else if (val == 'refresh') { // 刷新
getList()
} else if (val == 'filtrate') { // 筛选
} else { // 其他按钮
console.log('其他按钮', item)
}
}
// 列表-操作按钮
const butttondata = [
defaultButtons.mainListEditBtn({ hasPermi: 'wms:itembasic:update' }), // 编辑
defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:itembasic:delete' }), // 删除
]
// 列表-操作按钮事件
const buttonTableClick = (val, row) => {
if (val == 'edit') { // 编辑
openForm('update', queryParams.strategyCode, row.id)
} else if (val == 'delete') { // 删除
handleDelete(row.id)
}
}
/** 初始化 **/
onMounted(() => {
getList()
})
</script>

376
src/views/wms/strategy/supplieDeliveryStrategy/AddForm.vue
View File

@ -6,21 +6,21 @@
<!-- 规则 -->
<div class="item">
<div class="title">规则</div>
<el-form ref="formRef1" :model="formData" :rules="rules" label-width="120px" label-position="left">
<el-form ref="formRef1" :model="formData" :rules="rules" label-width="120px" label-position="left">
<el-row>
<el-col :span="24">
<el-form-item label="代码" prop="code">
<el-input v-model="formData.code" placeholder="请输入代码" clearable/>
<el-input v-model="formData.code" placeholder="请输入代码" clearable disabled />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="名称" prop="name">
<el-input v-model="formData.name" placeholder="请输入名称" clearable/>
<el-form-item label="名称" prop="name">
<el-input v-model="formData.name" placeholder="请输入名称" clearable />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="描述" prop="describe">
<el-input v-model="formData.describe" placeholder="请输入描述" clearable/>
<el-form-item label="描述" prop="description">
<el-input v-model="formData.description" placeholder="请输入描述" clearable />
</el-form-item>
</el-col>
<el-col :span="12">
@ -39,43 +39,41 @@
<!-- 规则条件 -->
<div class="item mt-20px">
<div class="title">规则条件</div>
<el-form ref="formRef2" :model="formData" :rules="rules" label-width="120px" label-position="left" >
<el-form ref="formRef2" :model="formData" :rules="rules" label-width="120px" label-position="left">
<el-row>
<el-col :span="24">
<el-form-item label="供应商类型" class="flex-top err-120" prop="supplierType">
<el-select v-model="formData.supplierTypeRange" placeholder="请选择范围"
style="width: 110px;;margin-right: 10px;">
<el-option :label="item.label" :value="item.value" v-for="item in options.rangeOptions"
:key="item.value" />
<el-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-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>
<div class="checkbox">
<el-checkbox-group v-model="formData.supplierType">
<el-checkbox :label="item.label" v-for="item in options.supplierTypeOptions" :key="item.value" />
</el-checkbox-group>
</div>
<el-select v-model="item.Value" placeholder="请选择供应商类型" 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>
<!-- </div> -->
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="供应商" prop="supplier" class="err-120" >
<el-select v-model="formData.supplierRange" placeholder="请选择范围" style="width: 110px;;margin-right: 10px;">
<el-option :label="item.label" :value="item.value" v-for="item in options.rangeOptions"
:key="item.value" />
<!-- 供应商 -->
<el-form-item v-else-if="item.ParamCode == 'SupplierCode'" label="供应商" 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 v-model="formData.supplier" placeholder="请选择供应商" style="flex: 1;" clearable>
<el-option v-for="item in options.supplierList" :key="item.value" :label="item.label"
:value="item.value" />
<el-select 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-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="星期几" class="flex-top err-120" prop="week">
<el-select v-model="formData.weekRange" placeholder="请选择范围" style="width: 110px;;margin-right: 10px;">
<el-option :label="item.label" :value="item.value" v-for="item in options.rangeOptions"
:key="item.value" />
<!-- 星期几 -->
<el-form-item v-else-if="item.ParamCode == 'Weekday'" label="星期几" 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.weekRangeOptions"
:key="cur.value" />
</el-select>
<div class="checkbox">
<el-checkbox-group v-model="formData.week">
<el-checkbox :label="item.label" v-for="item in options.weekOptions" :key="item.value" />
<el-checkbox-group v-model="item.Value" @change="change">
<el-checkbox :label="cur.label" v-for="cur in options.weekOptions" :key="cur.value" />
</el-checkbox-group>
</div>
</el-form-item>
@ -86,31 +84,61 @@
<!-- 规则配置 -->
<div class="item mt-20px">
<div class="title">规则配置</div>
<el-form ref="formRef3" :model="formData" :rules="rules" label-width="120px" label-position="left">
<el-form ref="formRef3" :model="formData" label-width="120px" label-position="left">
<el-row>
<el-col :span="24">
<el-form-item label="开始时间" prop="startTime">
<el-date-picker v-model="formData.startTime" type="datetime" placeholder="请选择开始时间" style="width: 100%;"/>
<!-- 开始时间 -->
<el-col :span="24" v-for="(item, index) in formData.configuration" :key="index">
<!-- 开始时间 -->
<el-form-item v-if="item.ParamCode == 'BeginTime'" label="开始时间" :prop="'configuration.' + index + '.Value'"
:rules="{
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%;" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="结束时间" prop="endTime">
<el-date-picker v-model="formData.endTime" type="datetime" placeholder="请选择结束时间" style="width: 100%;"/>
<!-- 结束时间 -->
<el-form-item v-else-if="item.ParamCode == 'EndTime'" label="结束时间"
:prop="'configuration.' + index + '.Value'" :rules="{
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%;" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="仓库" prop="warehouse">
<el-select v-model="formData.warehouse" placeholder="请选择仓库" clearable>
<el-option v-for="item in options.warehouseList" :key="item.value" :label="item.label"
:value="item.value" />
<!-- 仓库 -->
<el-form-item v-else-if="item.ParamCode == 'WarehouseCode'" label="仓库"
:prop="'configuration.' + index + '.Value'" :rules="{
required: true,
message: '请选择仓库',
trigger: 'change',
}">
<el-select v-model="item.Value" placeholder="请选择仓库" clearable>
<el-option v-for="cur in options.warehouseList" :key="cur.id" :label="cur.name" :value="cur.id" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="月台" prop="moon">
<el-select v-model="formData.moon" placeholder="请选择月台" clearable>
<el-option v-for="item in options.moonList" :key="item.value" :label="item.label"
:value="item.value" />
<!-- 月台 -->
<el-form-item v-else-if="item.ParamCode == 'DockCode'" label="月台"
:prop="'configuration.' + index + '.Value'" :rules="{
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-select>
</el-form-item>
<!-- 在途库位 -->
<el-form-item v-else-if="item.ParamCode == 'OnTheWayLocationCode'" label="在途库位"
:prop="'configuration.' + index + '.Value'" :rules="{
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-select>
</el-form-item>
</el-col>
@ -127,6 +155,14 @@
<script setup lang="ts">
import * as defaultButtons from '@/utils/disposition/defaultButtons'
defineOptions({ name: 'SupplieDeliveryStrategyAddForm' })
import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
import { getSupplierList } from '@/api/wms/supplier'
import { getWarehouseList } from '@/api/wms/warehouse'
import { getDockList } from '@/api/wms/dock'
import { getLocationList } from '@/api/wms/location'
import * as RuleApi from '@/api/wms/rule'
const { t } = useI18n() // 国际化
const message = useMessage() // 消息弹窗
@ -138,66 +174,158 @@ const formType = ref('') // 表单的类型：create - 新增；update - 修改
const formRef1 = ref() // 表单 Ref
const formRef2 = ref() // 表单 Ref
const formRef3 = ref() // 表单 Ref
const change = (e) => {
console.log(e);
}
const formStrategyCode = ref('')
// form表单数据
const formData = ref({
code: '',//代码
strategyCode: formStrategyCode.value,//策略代码
code: formStrategyCode.value,//规则代码
name: '',//名称
describe: '',//描述
description: '',//描述
priority: '',//优先级
status: false,//状态
supplierTypeRange: 1,//供应商类型范围
supplierType: [],//选择的供应商类型
supplierRange: 1,//供应商范围
supplier: '',//选择的供应商
weekRange: 1,//星期几范围
week: [],//选择的星期几
startTime:'',//开始时间
endTime: '',//开始时间
warehouse: '',//选择的仓库
moon: '',//选择的月台
status: true,//状态
//规则条件集合
condition: [
// 供应商类型
{ ParamCode: 'SupplierType', Operator: "==", Value: "" },
// 供应商
{ ParamCode: 'SupplierCode', Operator: "IN", Value: "" },
// 星期几
{ ParamCode: 'Weekday', Operator: "IN", Value: [] }
],
configuration: [
// 开始时间
{ ParamCode: 'BeginTime', Value: "" },
// 结束时间
{ ParamCode: 'EndTime', Value: "" },
// 仓库代码
{ ParamCode: 'WarehouseCode', Value: '' },
// 月台代码
{ ParamCode: 'DockCode', Value: '' },
// 在途库位代码
{ ParamCode: 'OnTheWayLocationCode', Value: '' },
]
})
// 验证规则
const rules = ref({
code: [{ required: true, message: '请输入代码', trigger: 'blur' }],
name: [{ required: true, message: '请输入名字', trigger: 'blur' }],
describe: [{ required: true, message: '请输入描述', trigger: 'blur' }],
description: [{ required: true, message: '请输入描述', trigger: 'blur' }],
priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }],
supplierType: [{ required: true, message: '请选择供应商类型', trigger: 'change' }],
supplier: [{ required: true, message: '请选择供应商', trigger: 'change' }],
week: [{ required: true, message: '请选择星期几', trigger: 'change' }],
startTime: [{ required: true, message: '请选择开始时间', trigger: 'change' }],
endTime: [{ required: true, message: '请选择结束时间', trigger: 'change' }],
warehouse: [{ required: true, message: '请选择仓库', trigger: 'change' }],
moon: [{ required: true, message: '请选择月台', trigger: 'change' }],
BeginTime: [{ required: true, message: '请选择开始时间', trigger: 'change' }],
EndTime: [{ required: true, message: '请选择结束时间', trigger: 'change' }],
WarehouseCode: [{ required: true, message: '请选择仓库', trigger: 'change' }],
DockCode: [{ required: true, message: '请选择月台', trigger: 'change' }],
OnTheWayLocationCode: [{ required: true, message: '请选择在途库位', trigger: 'change' }],
})
// 所有的范围类型
const rangeOptions = [
{ value: '==', label: '等于' },
{ value: '!=', label: '不等于' },
{ value: '>', label: '大于' },
{ value: '<', label: '小于' },
{ value: '>=', label: '大于等于' },
{ value: '<=', label: '小于等于' },
{ value: 'IN', label: '包含' },
{ value: 'NOT IN', label: '不包含' },
{ value: 'NULL', label: '为空' },
{ value: 'NOT NULL', label: '不为空' },
]
const formatRangeOptions = (...rest) => {
// 交集
let result = rangeOptions.filter(aItem => rest.some(bItem => aItem.value === bItem));
return result
}
// 下拉框列表集合
const options = reactive({
// 范围下拉框列表
rangeOptions: [{ value: 1, label: '包含' }, { value: 2, label: '大于', }],
// 供应商类型列表
// 供应商类型范围下拉框列表
supplierTypeRangeOptions: formatRangeOptions('=='),
// 供应商列表
supplierTypeOptions: [{ value: 1, label: '标准' }, { value: 2, label: '委外' }, { value: 3, label: '其他' }],
// 供应商范围下拉框列表
supplierRangeOptions: formatRangeOptions('IN', 'NOT IN'),
//供应商列表
supplierList: [{ value: 1, label: '供应商1' }, { value: 2, label: '供应商2' }, { value: 3, label: '供应商3' }],
// 星期几范围下拉框列表
weekRangeOptions: formatRangeOptions('IN', 'NOT IN'),
//星期几列表
weekOptions: [{ value: 1, label: '星期一' }, { value: 2, label: '星期二' }, { value: 3, label: '星期三' }, { value: 4, label: '星期四' }, { value: 5, label: '星期五' }, { value: 6, label: '星期六' }, { value: 7, label: '星期日' }],
//仓库列表
warehouseList: [{ value: 1, label: '仓库1' }, { value: 2, label: '仓库2' }, { value: 3, label: '仓库3' }],
warehouseList: [],
//月台列表
moonList: [{ value: 1, label: '月台1' }, { value: 2, label: '月台2' }, { value: 3, label: '月台3' }],
dockList: [],
//在途库位列表
locationList: [],
})
// 获取供应商列表的参数
const querySupplierParams = ref({
type: ''
})
// 获取供应商列表
const getFormSupplierList = async () => {
options.supplierList = await getSupplierList(querySupplierParams.value);
}
// 选择供应商类型
const changeSupplierType = (e) => {
querySupplierParams.value.type = e
getFormSupplierList()
}
// 获取仓库列表
const getFormWarehouseList = async () => {
options.warehouseList = await getWarehouseList();
}
// 获取月台列表
const getFormDockList = async () => {
options.dockList = await getDockList();
}
// 获取库位列表
const getFormLocationList = async () => {
options.locationList = await getLocationList({ type: 'TRANSPORT' });
}
getFormSupplierList()
getFormWarehouseList()
getFormDockList()
getFormLocationList()
/** 打开弹窗 */
const open = async (type: string, id?: number) => {
const open = async (type: string, strategyCode: string, id?: number) => {
formStrategyCode.value = strategyCode
dialogVisible.value = true
dialogTitle.value = t('action.' + type)
formType.value = type
resetForm()
// 修改时，设置数据
if (id) {
formLoading.value = true
try {
let data = await RuleApi.getRule(id)
formData.value.strategyCode = data.strategyCode
formData.value.code = data.code
formData.value.name = data.name
formData.value.description = data.description
formData.value.priority = data.priority
formData.value.status = data.status==1?true:false
if(data.condition){
formData.value.condition = JSON.parse(data.condition)
}
if(data.configuration){
formData.value.configuration = JSON.parse(data.configuration)
}
} finally {
formLoading.value = false
}
}
}
defineExpose({ open }) // 提供 open 方法，用于打开弹窗
@ -209,33 +337,66 @@ const submitForm = async () => {
const valid2 = formRef2.value.validate()
const valid1 = formRef1.value.validate()
const valid3 = await formRef3.value.validate()
if (!valid1 || !valid2 ||!valid3) return
if (!valid1 || !valid2 || !valid3) return
// 提交请求
formLoading.value = true
try {
let data = {
strategyCode: formData.value.strategyCode,//策略代码
code: formData.value.code,//规则代码
name: formData.value.name,//名称
description: formData.value.description,//描述
priority: formData.value.priority,//优先级
status: formData.value.status?1:0,//状态
//规则条件集合
condition: JSON.stringify(formData.value.condition),
configuration: JSON.stringify(formData.value.configuration)
}
if (formType.value === 'create') {
await RuleApi.createRule(data)
message.success(t('common.createSuccess'))
} else {
await RuleApi.updateRule(data)
message.success(t('common.updateSuccess'))
}
dialogVisible.value = false
// 发送操作成功的事件
emit('success')
} finally {
formLoading.value = false
}
}
/** 重置表单 */
const resetForm = () => {
formData.value = {
code: '',
name: '',
describe: '',
priority: '',
status: false,
supplierTypeRange: 1,//供应商类型范围
supplierType: [],//选择的供应商类型
supplierRange: 1,//供应商范围
supplier: '',//选择的供应商
weekRange: 1,//星期几范围
week: [],//选择的星期几
startTime: '',//开始时间
endTime: '',//开始时间
warehouse: '',//选择的仓库
moon: '',//选择的月台
strategyCode: formStrategyCode.value,//策略代码
code: formStrategyCode.value,//规则代码
name: '',//名称
description: '',//描述
priority: '',//优先级
status: true,//状态
//规则条件集合
condition: [
// 供应商类型
{ ParamCode: 'SupplierType', Operator: "==", Value: "" },
// 供应商
{ ParamCode: 'SupplierCode', Operator: "IN", Value: "" },
// 星期几
{ ParamCode: 'Weekday', Operator: "IN", Value: [] }
],
configuration: [
// 开始时间
{ ParamCode: 'BeginTime', Value: "" },
// 结束时间
{ ParamCode: 'EndTime', Value: "" },
// 仓库代码
{ ParamCode: 'WarehouseCode', Value: '' },
// 月台代码
{ ParamCode: 'DockCode', Value: '' },
// 在途库位代码
{ ParamCode: 'OnTheWayLocationCode', Value: '' },
]
}
}
@ -286,6 +447,7 @@ const buttonBaseClick = (val, item) => {
::v-deep .flex-top .el-form-item__content {
align-items: flex-start !important;
}
::v-deep .err-120 .el-form-item__error {
padding-left: 120px !important;
}

85
src/views/wms/strategy/supplieDeliveryStrategy/index.vue
View File

@ -3,27 +3,87 @@
<template>
<!-- 列表头部 -->
<TableHead :HeadButttondata="HeadButttondata" @buttonBaseClick="buttonBaseClick" />
<!-- 表单弹窗：添加/修改 -->
<AddForm ref="formRef" @success="getList" />
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="list">
<el-table-column align="center" label="策略代码" prop="strategyCode" />
<el-table-column align="center" label="策略名称" prop="name" show-overflow-tooltip />
<el-table-column align="center" label="策略描述" prop="description" />
<el-table-column align="center" label="优先级" prop="priority" />
<el-table-column align="center" label="状态" prop="status">
<template #default="scope">
<dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<!-- <el-table-column label="创建时间" align="center" prop="createTime" width="180" :formatter="dateFormatter" /> -->
<el-table-column align="center" label="操作" fixed="right" width="240">
<template #default="scope">
<ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event, scope.row)" />
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<Pagination v-model:limit="queryParams.pageSize" v-model:page="queryParams.pageNo" :total="total"
@pagination="getList" />
</ContentWrap>
<!-- 表单弹窗：添加/修改 -->
<AddForm ref="formRef" @success="getList" />
</template>
<script setup lang="ts">
import { DICT_TYPE } from '@/utils/dict'
import * as defaultButtons from '@/utils/disposition/defaultButtons'
import * as RuleApi from '@/api/wms/rule'
import AddForm from './AddForm.vue'
// import { dateFormatter } from '@/utils/formatTime'
defineOptions({ name: 'SupplieDeliveryStrategy' })
const { t } = useI18n() // 国际化
const message = useMessage() // 消息弹窗
const loading = ref(true) // 列表的加载中
const total = ref(0) // 列表的总页数
const list = ref([]) // 字典表格数据
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
strategyCode: 'S001',
})
/** 查询字典类型列表 */
const getList = async () => {
loading.value = true
try {
const data = await RuleApi.getRulePage(queryParams)
list.value = data.list
total.value = data.total
} finally {
loading.value = false
}
}
// 显示弹窗
const formRef = ref()
const openForm = (type: string) => {
formRef.value.open(type)
const openForm = (type: string, strategyCode: string, id: number) => {
formRef.value.open(type, strategyCode, id)
}
/** 删除按钮操作 */
const handleDelete = async (id: number) => {
try {
// 删除的二次确认
await message.delConfirm()
// 发起删除
await RuleApi.deleteRule(id)
message.success(t('common.delSuccess'))
// 刷新列表
await getList()
} catch { }
}
// 列表头部按钮
const HeadButttondata = [
defaultButtons.defaultAddBtn(null), // 新增
defaultButtons.defaultImportBtn(null), // 导入
defaultButtons.defaultExportBtn(null), // 导出
// defaultButtons.defaultFilterBtn(), // 筛选
defaultButtons.defaultFreshBtn(null), // 刷新
]
@ -31,7 +91,7 @@ const HeadButttondata = [
// 头部按钮事件
const buttonBaseClick = (val, item) => {
if (val == 'add') { // 新增
openForm('create')
openForm('create', queryParams.strategyCode)
} else if (val == 'import') { // 导入
handleImport()
} else if (val == 'export') { // 导出
@ -53,10 +113,15 @@ const butttondata = [
// 列表-操作按钮事件
const buttonTableClick = (val, row) => {
if (val == 'edit') { // 编辑
openForm('update', row.id)
openForm('update', queryParams.strategyCode, row.id)
} else if (val == 'delete') { // 删除
handleDelete(row.id)
}
}
/** 初始化 **/
onMounted(() => {
getList()
})
</script>

Write Preview
Loading…
Cancel
Save