20 changed files with 699 additions and 36 deletions
@ -0,0 +1,57 @@ |
|||
import request from '@/config/axios' |
|||
|
|||
export interface RecommendLocationHistoryVO { |
|||
id: number |
|||
businessNumber: string |
|||
businessId: number |
|||
toLocation: string |
|||
ruleName: string |
|||
priority: string |
|||
locationCollect: string |
|||
balanceLocationCollect: string |
|||
expectinLocationCollect: string |
|||
remark: string |
|||
extraProperties: string |
|||
concurrencyStamp: number |
|||
} |
|||
|
|||
// 查询推荐库位推荐记录列表
|
|||
export const getRecommendLocationHistoryPage = async (params) => { |
|||
if (params.isSearch) { |
|||
delete params.isSearch |
|||
const data = {...params} |
|||
return await request.post({ url: '/wms/recommend-location-history/senior', data }) |
|||
} else { |
|||
return await request.get({ url: `/wms/recommend-location-history/page`, params }) |
|||
} |
|||
} |
|||
|
|||
// 查询推荐库位推荐记录详情
|
|||
export const getRecommendLocationHistory = async (id: number) => { |
|||
return await request.get({ url: `/wms/recommend-location-history/get?id=` + id }) |
|||
} |
|||
|
|||
// 新增推荐库位推荐记录
|
|||
export const createRecommendLocationHistory = async (data: RecommendLocationHistoryVO) => { |
|||
return await request.post({ url: `/wms/recommend-location-history/create`, data }) |
|||
} |
|||
|
|||
// 修改推荐库位推荐记录
|
|||
export const updateRecommendLocationHistory = async (data: RecommendLocationHistoryVO) => { |
|||
return await request.put({ url: `/wms/recommend-location-history/update`, data }) |
|||
} |
|||
|
|||
// 删除推荐库位推荐记录
|
|||
export const deleteRecommendLocationHistory = async (id: number) => { |
|||
return await request.delete({ url: `/wms/recommend-location-history/delete?id=` + id }) |
|||
} |
|||
|
|||
// 导出推荐库位推荐记录 Excel
|
|||
export const exportRecommendLocationHistory = async (params) => { |
|||
return await request.download({ url: `/wms/recommend-location-history/export-excel`, params }) |
|||
} |
|||
|
|||
// 下载用户导入模板
|
|||
export const importTemplate = () => { |
|||
return request.download({ url: '/wms/recommend-location-history/get-import-template' }) |
|||
} |
|||
@ -0,0 +1,3 @@ |
|||
import Distinction from './src/Distinction.vue' |
|||
|
|||
export { Distinction } |
|||
@ -0,0 +1,51 @@ |
|||
<!-- 变更记录组件 --> |
|||
<template> |
|||
<el-dialog v-model="dialogVisible" title="变更详情" width="80%" :before-close="handleClose"> |
|||
<div style="display: flex"> |
|||
<div style="flex: 1; width: 0px"> |
|||
<div style="font-size: 16px; font-weight: bold; margin-bottom: 10px"> 变更前 </div> |
|||
<Descriptions :data="beforeContent" :schema="schema" :columns="2" /> |
|||
</div> |
|||
<div style="flex: 1; width: 0px; margin-left: 20px"> |
|||
<div style="font-size: 16px; font-weight: bold; margin-bottom: 10px"> 变更后 </div> |
|||
<Descriptions :data="afterContent" :schema="schema" :columns="2" /> |
|||
</div> |
|||
</div> |
|||
<template #footer> |
|||
<div class="dialog-footer"> |
|||
<el-button @click="dialogVisible = false">关闭</el-button> |
|||
</div> |
|||
</template> |
|||
</el-dialog> |
|||
</template> |
|||
|
|||
<script lang="ts" setup> |
|||
defineComponent({ |
|||
name: 'Distinction' |
|||
}) |
|||
// 接收父组件数据 |
|||
const props = defineProps({ |
|||
schema: { |
|||
type: Array, |
|||
required: true |
|||
} |
|||
}) |
|||
const schema = ref(props.schema.filter(item => { |
|||
return item.field !='updater' && item.field !='updateTime' && item.field !='creator' && item.field !='createTime' |
|||
})) |
|||
const dialogVisible = ref(false) |
|||
const afterContent = ref('') |
|||
const beforeContent = ref('') |
|||
const openDistinction = (row) => { |
|||
afterContent.value = JSON.parse(row.afterContent) |
|||
beforeContent.value = JSON.parse(row.beforeContent) |
|||
console.log(222,props.schema) |
|||
dialogVisible.value = true |
|||
} |
|||
|
|||
defineExpose({ dialogVisible, openDistinction }) // 提供 open 方法，用于打开弹窗 |
|||
</script> |
|||
|
|||
|
|||
<style scoped lang="scss"> |
|||
</style> |
|||
@ -0,0 +1,244 @@ |
|||
<template> |
|||
<ContentWrap> |
|||
<!-- 搜索工作栏 --> |
|||
<Search :schema="RecommendLocationHistory.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" /> |
|||
</ContentWrap> |
|||
|
|||
<!-- 列表头部 --> |
|||
<TableHead |
|||
:HeadButttondata="HeadButttondata" |
|||
@button-base-click="buttonBaseClick" |
|||
:routeName="routeName" |
|||
@updataTableColumns="updataTableColumns" |
|||
@searchFormClick="searchFormClick" |
|||
:allSchemas="RecommendLocationHistory.allSchemas" |
|||
/> |
|||
|
|||
<!-- 列表 --> |
|||
<ContentWrap> |
|||
<Table |
|||
:columns="tableColumns" |
|||
:data="tableObject.tableList" |
|||
:loading="tableObject.loading" |
|||
:pagination="{ |
|||
total: tableObject.total |
|||
}" |
|||
v-model:pageSize="tableObject.pageSize" |
|||
v-model:currentPage="tableObject.currentPage" |
|||
v-model:sort="tableObject.sort" |
|||
> |
|||
<template #code="{row}"> |
|||
<el-button type="primary" link @click="openDetail(row, '代码', row.code)"> |
|||
<span>{{ row.code }}</span> |
|||
</el-button> |
|||
</template> |
|||
<template #action="{ row }"> |
|||
<ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" /> |
|||
</template> |
|||
</Table> |
|||
</ContentWrap> |
|||
|
|||
<!-- 表单弹窗：添加/修改 --> |
|||
<BasicForm |
|||
ref="basicFormRef" |
|||
@success="formsSuccess" |
|||
:rules="RecommendLocationHistoryRules" |
|||
:formAllSchemas="RecommendLocationHistory.allSchemas" |
|||
:apiUpdate="RecommendLocationHistoryApi.updateRecommendLocationHistory" |
|||
:apiCreate="RecommendLocationHistoryApi.createRecommendLocationHistory" |
|||
@searchTableSuccess="searchTableSuccess" |
|||
:isBusiness="false" |
|||
/> |
|||
|
|||
<!-- 详情 --> |
|||
<Detail ref="detailRef" :isBasic="true" :allSchemas="RecommendLocationHistory.allSchemas" /> |
|||
|
|||
<!-- 导入 --> |
|||
<ImportForm ref="importFormRef" url="/wms/recommend-location-history/import" :importTemplateData="importTemplateData" @success="importSuccess" /> |
|||
</template> |
|||
|
|||
<script setup lang="ts"> |
|||
import download from '@/utils/download' |
|||
import { RecommendLocationHistory,RecommendLocationHistoryRules } from './recommendLocationHistory.data' |
|||
import * as RecommendLocationHistoryApi from '@/api/wms/recommendLocationHistory' |
|||
import * as defaultButtons from '@/utils/disposition/defaultButtons' |
|||
import TableHead from '@/components/TableHead/src/TableHead.vue' |
|||
import ImportForm from '@/components/ImportForm/src/ImportForm.vue' |
|||
import Detail from '@/components/Detail/src/Detail.vue' |
|||
|
|||
defineOptions({ name: 'RecommendLocationHistory' }) |
|||
|
|||
const message = useMessage() // 消息弹窗 |
|||
const { t } = useI18n() // 国际化 |
|||
|
|||
const route = useRoute() // 路由信息 |
|||
const routeName = ref() |
|||
routeName.value = route.name |
|||
const tableColumns = ref(RecommendLocationHistory.allSchemas.tableColumns) |
|||
|
|||
// 查询页面返回 |
|||
const searchTableSuccess = (formField, searchField, val, formRef) => { |
|||
nextTick(() => { |
|||
const setV = {} |
|||
setV[formField] = val[0][searchField] |
|||
formRef.setValues(setV) |
|||
}) |
|||
} |
|||
|
|||
// 字段设置 更新主列表字段 |
|||
const updataTableColumns = (val) => { |
|||
tableColumns.value = val |
|||
} |
|||
|
|||
const { tableObject, tableMethods } = useTable({ |
|||
getListApi: RecommendLocationHistoryApi.getRecommendLocationHistoryPage // 分页接口 |
|||
}) |
|||
|
|||
// 获得表格的各种操作 |
|||
const { getList, setSearchParams } = tableMethods |
|||
|
|||
// 列表头部按钮 |
|||
const HeadButttondata = [ |
|||
defaultButtons.defaultAddBtn({hasPermi:'wms:recommendLocationHistory:create'}), // 新增 |
|||
defaultButtons.defaultImportBtn({hasPermi:'wms:recommendLocationHistory:import'}), // 导入 |
|||
defaultButtons.defaultExportBtn({hasPermi:'wms:recommendLocationHistory:export'}), // 导出 |
|||
defaultButtons.defaultFreshBtn(null), // 刷新 |
|||
defaultButtons.defaultFilterBtn(null), // 筛选 |
|||
defaultButtons.defaultSetBtn(null), // 设置 |
|||
// { |
|||
// label: '自定义扩展按钮', |
|||
// name: 'zdy', |
|||
// hide: false, |
|||
// type: 'primary', |
|||
// icon: 'Select', |
|||
// color: '' |
|||
// }, |
|||
] |
|||
|
|||
// 头部按钮事件 |
|||
const buttonBaseClick = (val, item) => { |
|||
if (val == 'add') { // 新增 |
|||
openForm('create') |
|||
} 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:recommendLocationHistory:update'}), // 编辑 |
|||
defaultButtons.mainListDeleteBtn({hasPermi:'wms:recommendLocationHistory:delete'}), // 删除 |
|||
] |
|||
|
|||
// 列表-操作按钮事件 |
|||
const buttonTableClick = async (val, row) => { |
|||
if (val == 'edit') { // 编辑 |
|||
openForm('update', row) |
|||
} else if (val == 'delete') { // 删除 |
|||
handleDelete(row.id) |
|||
} |
|||
} |
|||
|
|||
/** 添加/修改操作 */ |
|||
const basicFormRef = ref() |
|||
const openForm = (type: string, row?: any) => { |
|||
basicFormRef.value.open(type, row) |
|||
} |
|||
|
|||
// form表单提交 |
|||
const formsSuccess = async (formType,data) => { |
|||
var isHave =RecommendLocationHistory.allSchemas.formSchema.some(function (item) { |
|||
return item.field === 'activeTime' || item.field === 'expireTime'; |
|||
}); |
|||
if(isHave){ |
|||
if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){ |
|||
message.error('失效时间要大于生效时间') |
|||
return; |
|||
} |
|||
} |
|||
if(data.activeTime==0)data.activeTime = null; |
|||
if(data.expireTime==0)data.expireTime = null; |
|||
if (formType === 'create') { |
|||
await RecommendLocationHistoryApi.createRecommendLocationHistory(data) |
|||
message.success(t('common.createSuccess')) |
|||
} else { |
|||
await RecommendLocationHistoryApi.updateRecommendLocationHistory(data) |
|||
message.success(t('common.updateSuccess')) |
|||
} |
|||
basicFormRef.value.dialogVisible = false |
|||
getList() |
|||
} |
|||
|
|||
/** 详情操作 */ |
|||
const detailRef = ref() |
|||
const openDetail = (row: any, titleName: any, titleValue: any) => { |
|||
detailRef.value.openDetail(row, titleName, titleValue, 'basicRecommendLocationHistory') |
|||
} |
|||
|
|||
/** 删除按钮操作 */ |
|||
const handleDelete = async (id: number) => { |
|||
try { |
|||
// 删除的二次确认 |
|||
await message.delConfirm() |
|||
// 发起删除 |
|||
await RecommendLocationHistoryApi.deleteRecommendLocationHistory(id) |
|||
message.success(t('common.delSuccess')) |
|||
// 刷新列表 |
|||
await getList() |
|||
} catch {} |
|||
} |
|||
|
|||
/** 导出按钮操作 */ |
|||
const exportLoading = ref(false) // 导出的加载中 |
|||
const handleExport = async () => { |
|||
try { |
|||
// 导出的二次确认 |
|||
await message.exportConfirm() |
|||
// 发起导出 |
|||
exportLoading.value = true |
|||
const data = await RecommendLocationHistoryApi.exportRecommendLocationHistory(tableObject.params) |
|||
download.excel(data, '推荐库位推荐记录.xlsx') |
|||
} catch { |
|||
} finally { |
|||
exportLoading.value = false |
|||
} |
|||
} |
|||
|
|||
/** 导入 */ |
|||
const importFormRef = ref() |
|||
const handleImport = () => { |
|||
importFormRef.value.open() |
|||
} |
|||
// 导入附件弹窗所需的参数 |
|||
const importTemplateData = reactive({ |
|||
templateUrl: '', |
|||
templateTitle: '推荐库位推荐记录导入模版.xlsx' |
|||
}) |
|||
// 导入成功之后 |
|||
const importSuccess = () => { |
|||
getList() |
|||
} |
|||
|
|||
// 筛选提交 |
|||
const searchFormClick = (searchData) => { |
|||
tableObject.params = { |
|||
isSearch: true, |
|||
filters: searchData.filters |
|||
} |
|||
getList() // 刷新当前列表 |
|||
} |
|||
|
|||
/** 初始化 **/ |
|||
onMounted(async () => { |
|||
getList() |
|||
importTemplateData.templateUrl = await RecommendLocationHistoryApi.importTemplate() |
|||
}) |
|||
|
|||
</script> |
|||
@ -0,0 +1,93 @@ |
|||
import type { CrudSchema } from '@/hooks/web/useCrudSchemas' |
|||
import { dateFormatter } from '@/utils/formatTime' |
|||
|
|||
// 表单校验
|
|||
export const RecommendLocationHistoryRules = reactive({ |
|||
concurrencyStamp: [required], |
|||
}) |
|||
|
|||
export const RecommendLocationHistory = useCrudSchemas(reactive<CrudSchema[]>([ |
|||
{ |
|||
label: '业务编号', |
|||
field: 'businessNumber', |
|||
sort: 'custom', |
|||
isSearch: true, |
|||
}, |
|||
{ |
|||
label: '业务ID', |
|||
field: 'businessId', |
|||
sort: 'custom', |
|||
isSearch: true, |
|||
form: { |
|||
component: 'InputNumber', |
|||
value: 0 |
|||
}, |
|||
}, |
|||
{ |
|||
label: '推荐的库位', |
|||
field: 'toLocation', |
|||
sort: 'custom', |
|||
isSearch: true, |
|||
}, |
|||
{ |
|||
label: '规则名称', |
|||
field: 'ruleName', |
|||
sort: 'custom', |
|||
}, |
|||
{ |
|||
label: '规则优先级', |
|||
field: 'priority', |
|||
sort: 'custom', |
|||
}, |
|||
{ |
|||
label: '规则可选库位集合', |
|||
field: 'locationCollect', |
|||
sort: 'custom', |
|||
}, |
|||
{ |
|||
label: '库存余额库位集合', |
|||
field: 'balanceLocationCollect', |
|||
sort: 'custom', |
|||
}, |
|||
{ |
|||
label: '预计入库位集合', |
|||
field: 'expectinLocationCollect', |
|||
sort: 'custom', |
|||
}, |
|||
{ |
|||
label: '备注', |
|||
field: 'remark', |
|||
sort: 'custom', |
|||
}, |
|||
{ |
|||
label: '创建时间', |
|||
field: 'createTime', |
|||
sort: 'custom', |
|||
formatter: dateFormatter, |
|||
search: { |
|||
component: 'DatePicker', |
|||
componentProps: { |
|||
valueFormat: 'YYYY-MM-DD HH:mm:ss', |
|||
type: 'daterange', |
|||
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] |
|||
} |
|||
}, |
|||
isForm: false, |
|||
}, |
|||
{ |
|||
label: '扩展属性', |
|||
field: 'extraProperties', |
|||
sort: 'custom', |
|||
isTable:false, |
|||
}, |
|||
{ |
|||
label: '并发乐观锁', |
|||
field: 'concurrencyStamp', |
|||
sort: 'custom', |
|||
isTable:false, |
|||
form: { |
|||
component: 'InputNumber', |
|||
value: 0 |
|||
}, |
|||
}, |
|||
])) |
|||
@ -0,0 +1,97 @@ |
|||
import type { CrudSchema } from '@/hooks/web/useCrudSchemas' |
|||
import * as ItembasicApi from '@/api/wms/itembasic' |
|||
import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data' |
|||
/** |
|||
* @returns {Array} 库存余额 |
|||
*/ |
|||
|
|||
|
|||
export const BalanceSummarySearch = useCrudSchemas( |
|||
reactive<CrudSchema[]>([ |
|||
{ |
|||
label: '物料代码', |
|||
field: 'itemCode', |
|||
sort: 'custom', |
|||
table: { |
|||
width: 150 |
|||
}, |
|||
isSearch: true, |
|||
search: { |
|||
componentProps: { |
|||
enterSearch: true, //可输入回车
|
|||
isSearchList: true, // 开启查询弹窗
|
|||
searchListPlaceholder: '请选择物料代码', // 输入框占位文本
|
|||
searchField: 'code', // 查询弹窗赋值字段
|
|||
searchTitle: '物料基础信息', // 查询弹窗标题
|
|||
searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
|
|||
searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
|
|||
searchCondition: [{ |
|||
key: 'available', |
|||
value: 'TRUE', |
|||
isMainValue: false |
|||
}], |
|||
verificationParams: [{ |
|||
key: 'code', |
|||
action: '==', |
|||
value: '', |
|||
isMainValue: false, |
|||
isSearch: 'true', |
|||
isFormModel: true |
|||
}], // 失去焦点校验参数
|
|||
} |
|||
} |
|||
},{ |
|||
label: '物料描述', |
|||
field: 'desc1', |
|||
sort: 'custom', |
|||
table: { |
|||
width: 150 |
|||
}, |
|||
isSearch: true, |
|||
search: { |
|||
componentProps: { |
|||
disabled: true |
|||
} |
|||
} |
|||
} |
|||
]) |
|||
) |
|||
|
|||
export const BalanceSummary = useCrudSchemas( |
|||
reactive<CrudSchema[]>([ |
|||
{ |
|||
label: ' ', |
|||
field: 'name', |
|||
sort: 'custom', |
|||
}, |
|||
{ |
|||
label: '总数', |
|||
field: 'num1', |
|||
sort: 'custom' |
|||
}, |
|||
{ |
|||
label: '合格数', |
|||
field: 'num2', |
|||
sort: 'custom', |
|||
isSearch: true |
|||
}, |
|||
{ |
|||
label: '待检数', |
|||
field: 'num2', |
|||
sort: 'custom', |
|||
isSearch: true |
|||
}, |
|||
{ |
|||
label: '隔离数', |
|||
field: 'num2', |
|||
sort: 'custom', |
|||
isSearch: true |
|||
}, |
|||
{ |
|||
label: '不合格数', |
|||
field: 'num2', |
|||
sort: 'custom', |
|||
isSearch: true |
|||
} |
|||
]) |
|||
) |
|||
@ -0,0 +1,85 @@ |
|||
<template> |
|||
<ContentWrap> |
|||
<!-- 搜索工作栏 --> |
|||
<Search :schema="BalanceSummarySearch.allSchemas.searchSchema" @search="searchList" @reset="searchList" @searchTableSuccess="searchQueryTableSuccess"/> |
|||
</ContentWrap> |
|||
<el-table |
|||
:data="tableData" |
|||
style="width: 100%" |
|||
row-key="id" |
|||
border |
|||
lazy |
|||
:load="load" |
|||
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }" |
|||
> |
|||
<el-table-column v-for="column in tableColumns" :prop="column['field']" :label="column['label']" :width="column['width']" :fixed="column['fixed']" :align="column['align']||'center'"/> |
|||
</el-table> |
|||
</template> |
|||
<script setup lang="ts"> |
|||
import { BalanceSummary,BalanceSummarySearch } from './balanceSummary.data' |
|||
const tableColumns = ref(BalanceSummary.allSchemas.tableColumns) |
|||
console.log('tableColumns',tableColumns) |
|||
const tableData= ref([ |
|||
{ |
|||
id: 1, |
|||
date: '2016-05-02', |
|||
name: 'wangxiaohu', |
|||
num: 1, |
|||
}, |
|||
{ |
|||
id: 2, |
|||
date: '2016-05-04', |
|||
name: 'wangxiaohu', |
|||
num: 2, |
|||
}, |
|||
{ |
|||
id: 3, |
|||
date: '2016-05-01', |
|||
name: 'wangxiaohu', |
|||
hasChildren: true, |
|||
num: 3, |
|||
}, |
|||
{ |
|||
id: 4, |
|||
date: '2016-05-03', |
|||
name: 'wangxiaohu', |
|||
num: 4, |
|||
}, |
|||
]) |
|||
const load = ( row, treeNode,resolve) => { |
|||
console.log('load',row, treeNode,resolve) |
|||
setTimeout(() => { |
|||
resolve([ |
|||
{ |
|||
id: Math.random(), |
|||
date: '2016-05-01', |
|||
name: 'wangxiaohu', |
|||
num: 5, |
|||
}, |
|||
{ |
|||
id: Math.random(), |
|||
date: '2016-05-01', |
|||
name: 'wangxiaohu', |
|||
num: 6, |
|||
hasChildren: true, |
|||
}, |
|||
]) |
|||
}, 1000) |
|||
} |
|||
|
|||
const searchList = (model)=>{ |
|||
console.log('searchList',model) |
|||
|
|||
} |
|||
|
|||
const searchQueryTableSuccess = (formField, searchField, val, formRef, type, row ) => { |
|||
console.log('searchQueryTableSuccess',formField, searchField, val, formRef, type, row ) |
|||
nextTick(() => { |
|||
const setV = {} |
|||
setV[formField] = val[0][searchField] |
|||
setV['desc1'] = val[0]['desc1'] |
|||
formRef.setValues(setV) |
|||
}) |
|||
} |
|||
</script> |
|||
<style lang="scss" scoped></style> |
|||
Loading…
Reference in new issue