gaojs
8 months ago
6 changed files with 759 additions and 7 deletions
@ -0,0 +1,76 @@ |
|||
import request from '@/config/axios' |
|||
|
|||
export interface ReworkBatchVO { |
|||
deleteTime: Date |
|||
id: number |
|||
status: string |
|||
concurrencyStamp: number |
|||
remark: string |
|||
deleter: string |
|||
siteId: number |
|||
reworkType: string |
|||
productionCode: string |
|||
productionCount: string |
|||
reworkAction: string |
|||
replaceFlag: string |
|||
reworkPersoncode: string |
|||
reworkTime: Date |
|||
reworkResult: string |
|||
reworkbillNo: string |
|||
} |
|||
|
|||
// 查询返工登记批量列表
|
|||
export const getReworkBatchPage = async (params) => { |
|||
if (params.isSearch) { |
|||
delete params.isSearch |
|||
const data = {...params} |
|||
return await request.post({ url: '/mes/rework-batch/senior', data }) |
|||
} else { |
|||
return await request.get({ url: `/mes/rework-batch/page`, params }) |
|||
} |
|||
} |
|||
|
|||
// 查询返工登记批量详情
|
|||
export const getReworkBatch = async (id: number) => { |
|||
return await request.get({ url: `/mes/rework-batch/get?id=` + id }) |
|||
} |
|||
|
|||
// 新增返工登记批量
|
|||
export const createReworkBatch = async (data: ReworkBatchVO) => { |
|||
return await request.post({ url: `/mes/rework-batch/create`, data }) |
|||
} |
|||
|
|||
// 修改返工登记批量
|
|||
export const updateReworkBatch = async (data: ReworkBatchVO) => { |
|||
return await request.put({ url: `/mes/rework-batch/update`, data }) |
|||
} |
|||
|
|||
// 删除返工登记批量
|
|||
export const deleteReworkBatch = async (id: number) => { |
|||
return await request.delete({ url: `/mes/rework-batch/delete?id=` + id }) |
|||
} |
|||
|
|||
// 中止返工登记单件
|
|||
export const suspendReworkSingle = async (id: number) => { |
|||
return await request.delete({ url: `/mes/rework-batch/suspend?id=` + id }) |
|||
} |
|||
|
|||
// 领取返工登记单件
|
|||
export const receiveReworkSingle = async (id: number) => { |
|||
return await request.put({ url: `/mes/rework-batch/receive?id=` + id }) |
|||
} |
|||
|
|||
// 完成返工登记单件
|
|||
export const finishReworkSingle = async (id: number) => { |
|||
return await request.put({ url: `/mes/rework-batch/finish?id=` + id }) |
|||
} |
|||
|
|||
// 导出返工登记批量 Excel
|
|||
export const exportReworkBatch = async (params) => { |
|||
return await request.download({ url: `/mes/rework-batch/export-excel`, params }) |
|||
} |
|||
|
|||
// 下载用户导入模板
|
|||
export const importTemplate = () => { |
|||
return request.download({ url: '/mes/rework-batch/get-import-template' }) |
|||
} |
@ -0,0 +1,318 @@ |
|||
<template> |
|||
<ContentWrap> |
|||
<!-- 搜索工作栏 --> |
|||
<Search :schema="ReworkBatch.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" /> |
|||
</ContentWrap> |
|||
|
|||
<!-- 列表头部 --> |
|||
<TableHead |
|||
:HeadButttondata="HeadButttondata" |
|||
@button-base-click="buttonBaseClick" |
|||
:routeName="routeName" |
|||
@updataTableColumns="updataTableColumns" |
|||
@searchFormClick="searchFormClick" |
|||
:allSchemas="ReworkBatch.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 #reworkbillNo="{row}"> |
|||
<el-button type="primary" link @click="openDetail(row, '单据号', row.reworkbillNo)"> |
|||
<span>{{ row.reworkbillNo }}</span> |
|||
</el-button> |
|||
</template> |
|||
<template #action="{ row }"> |
|||
<ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" /> |
|||
</template> |
|||
</Table> |
|||
</ContentWrap> |
|||
|
|||
<!-- 表单弹窗:添加/修改 --> |
|||
<BasicForm |
|||
ref="basicFormRef" |
|||
@success="formsSuccess" |
|||
:rules="ReworkBatchRules" |
|||
:formAllSchemas="ReworkBatch.allSchemas" |
|||
:apiUpdate="ReworkBatchApi.updateReworkBatch" |
|||
:apiCreate="ReworkBatchApi.createReworkBatch" |
|||
@searchTableSuccess="searchTableSuccess" |
|||
:isBusiness="false" |
|||
/> |
|||
|
|||
<!-- 详情 --> |
|||
<Detail ref="detailRef" :isBasic="true" :allSchemas="ReworkBatch.allSchemas" /> |
|||
|
|||
<!-- 导入 --> |
|||
<ImportForm ref="importFormRef" url="/mes/rework-batch/import" :importTemplateData="importTemplateData" @success="importSuccess" /> |
|||
</template> |
|||
|
|||
<script setup lang="ts"> |
|||
import download from '@/utils/download' |
|||
import { ReworkBatch,ReworkBatchRules } from './reworkBatch.data' |
|||
import * as ReworkBatchApi from '@/api/mes/reworkBatch' |
|||
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: 'MesReworkBatch' }) |
|||
|
|||
const message = useMessage() // 消息弹窗 |
|||
const { t } = useI18n() // 国际化 |
|||
|
|||
const route = useRoute() // 路由信息 |
|||
const routeName = ref() |
|||
routeName.value = route.name |
|||
const tableColumns = ref(ReworkBatch.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: ReworkBatchApi.getReworkBatchPage // 分页接口 |
|||
}) |
|||
|
|||
// 获得表格的各种操作 |
|||
const { getList, setSearchParams } = tableMethods |
|||
|
|||
// 列表头部按钮 |
|||
const HeadButttondata = [ |
|||
defaultButtons.defaultAddBtn({hasPermi:'mes:reworkBatch:create'}), // 新增 |
|||
//defaultButtons.defaultImportBtn({hasPermi:'mes:reworkBatch:import'}), // 导入 |
|||
defaultButtons.defaultExportBtn({hasPermi:'mes:reworkBatch: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 isShowMainButton = (row,val) => { |
|||
if (val.indexOf(row.status) > -1) { |
|||
return false |
|||
} else { |
|||
return true |
|||
} |
|||
} |
|||
|
|||
// 列表-操作按钮 |
|||
const butttondata = (row) => { |
|||
return [ |
|||
defaultButtons.mainListEditBtn({hide: isShowMainButton(row,['1']),hasPermi:'mes:reworkSingle:update'}), // 编辑 |
|||
defaultButtons.mainListSuspend1Btn({hide: isShowMainButton(row,['1']),hasPermi:'mes:reworkSingle:delete'}), // 中止1 |
|||
defaultButtons.mainListReceiveBtn({hide: isShowMainButton(row,['1']),hasPermi:'mes:reworkSingle:update'}), // 领取 |
|||
defaultButtons.mainListSuspend2Btn({hide: isShowMainButton(row,['2']),hasPermi:'mes:reworkSingle:delete'}), // 中止2 |
|||
defaultButtons.mainListFinishBtn({hide: isShowMainButton(row,['2']),hasPermi:'mes:reworkSingle:update'}), // 完成 |
|||
] |
|||
} |
|||
|
|||
// 列表-操作按钮事件 |
|||
const buttonTableClick = async (val, row) => { |
|||
if (val == 'edit') { // 编辑 |
|||
openForm('update', row) |
|||
} else if (val == 'suspend') { // 中止1 |
|||
handleSuspend(row.id) |
|||
} else if (val == 'receive') { // 领取 |
|||
handleReceive(row.id) |
|||
} else if (val == 'suspend') { // 中止2 |
|||
handleSuspend(row.id) |
|||
} else if (val == 'finish') { // 完成 |
|||
handleFinish(row.id) |
|||
} |
|||
} |
|||
|
|||
/** 添加/修改操作 */ |
|||
const basicFormRef = ref() |
|||
const openForm = (type: string, row?: any) => { |
|||
if(type == "create"){ |
|||
ReworkBatch.allSchemas.formSchema.forEach((item) => { |
|||
if(item.field == 'status'){ |
|||
item.value = '1'; |
|||
item.componentProps.disabled = true |
|||
} |
|||
}) |
|||
}else{ |
|||
ReworkBatch.allSchemas.formSchema.forEach((item) => { |
|||
if(item.field == 'status'){ |
|||
item.componentProps.disabled = false |
|||
} |
|||
}) |
|||
} |
|||
basicFormRef.value.open(type, row) |
|||
} |
|||
|
|||
// form表单提交 |
|||
const formsSuccess = async (formType,data) => { |
|||
var isHave =ReworkBatch.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 ReworkBatchApi.createReworkBatch(data) |
|||
message.success(t('common.createSuccess')) |
|||
} else { |
|||
await ReworkBatchApi.updateReworkBatch(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, 'basicReworkBatch') |
|||
} |
|||
|
|||
/** 删除按钮操作 */ |
|||
const handleDelete = async (id: number) => { |
|||
try { |
|||
// 删除的二次确认 |
|||
await message.delConfirm() |
|||
// 发起删除 |
|||
await ReworkBatchApi.deleteReworkBatch(id) |
|||
message.success(t('common.delSuccess')) |
|||
// 刷新列表 |
|||
await getList() |
|||
} catch {} |
|||
} |
|||
|
|||
/** 中止按钮操作 */ |
|||
const handleSuspend = async (id: number) => { |
|||
try { |
|||
// 中止的二次确认 |
|||
await message.delConfirm('是否中止所选中任务?'); |
|||
// 发起删除 |
|||
await ReworkBatchApi.suspendReworkSingle(id) |
|||
message.success(t('中止成功')) |
|||
// 刷新列表 |
|||
await getList() |
|||
} catch {} |
|||
} |
|||
|
|||
|
|||
/** 领取按钮操作 */ |
|||
const handleReceive = async (id: number) => { |
|||
try { |
|||
// 中止的二次确认 |
|||
await message.delConfirm('是否领取所选中任务?'); |
|||
// 发起删除 |
|||
await ReworkBatchApi.receiveReworkSingle(id) |
|||
message.success(t('领取成功')) |
|||
// 刷新列表 |
|||
await getList() |
|||
} catch {} |
|||
} |
|||
|
|||
/** 完成按钮操作 */ |
|||
const handleFinish = async (id: number) => { |
|||
try { |
|||
// 中止的二次确认 |
|||
await message.delConfirm('是否完成所选中任务?'); |
|||
// 发起删除 |
|||
await ReworkBatchApi.finishReworkSingle(id) |
|||
message.success(t('任务已完成')) |
|||
// 刷新列表 |
|||
await getList() |
|||
} catch {} |
|||
} |
|||
|
|||
/** 导出按钮操作 */ |
|||
const exportLoading = ref(false) // 导出的加载中 |
|||
const handleExport = async () => { |
|||
try { |
|||
// 导出的二次确认 |
|||
await message.exportConfirm() |
|||
// 发起导出 |
|||
exportLoading.value = true |
|||
const data = await ReworkBatchApi.exportReworkBatch(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 ReworkBatchApi.importTemplate() |
|||
}) |
|||
|
|||
</script> |
@ -0,0 +1,229 @@ |
|||
import type { CrudSchema } from '@/hooks/web/useCrudSchemas' |
|||
import { dateFormatter } from '@/utils/formatTime' |
|||
import * as ItembasicApi from '@/api/wms/itembasic' |
|||
import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data' |
|||
|
|||
// 表单校验
|
|||
export const ReworkBatchRules = reactive({ |
|||
reworkType: [required], |
|||
productionCode:[required], |
|||
replaceFlag:[required], |
|||
status:[required], |
|||
}) |
|||
|
|||
export const ReworkBatch = useCrudSchemas(reactive<CrudSchema[]>([ |
|||
{ |
|||
label: '删除时间', |
|||
field: 'deleteTime', |
|||
sort: 'custom', |
|||
formatter: dateFormatter, |
|||
isSearch: false, |
|||
isTable: false, |
|||
isForm:false, |
|||
isDetail:false, |
|||
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')] |
|||
} |
|||
}, |
|||
form: { |
|||
component: 'DatePicker', |
|||
componentProps: { |
|||
type: 'datetime', |
|||
valueFormat: 'x' |
|||
} |
|||
}, |
|||
}, |
|||
{ |
|||
label: '主键', |
|||
field: 'id', |
|||
sort: 'custom', |
|||
isSearch: false, |
|||
isTable: false, |
|||
isForm:false, |
|||
isDetail:false, |
|||
}, |
|||
{ |
|||
label: '并发乐观锁', |
|||
field: 'concurrencyStamp', |
|||
sort: 'custom', |
|||
isSearch: false, |
|||
isTable: false, |
|||
isForm:false, |
|||
isDetail:false, |
|||
form: { |
|||
component: 'InputNumber', |
|||
value: 0 |
|||
}, |
|||
}, |
|||
|
|||
{ |
|||
label: '创建时间', |
|||
field: 'createTime', |
|||
sort: 'custom', |
|||
formatter: dateFormatter, |
|||
isSearch: false, |
|||
isTable: false, |
|||
isForm:false, |
|||
isDetail:false, |
|||
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')] |
|||
} |
|||
}, |
|||
}, |
|||
{ |
|||
label: '删除用户名', |
|||
field: 'deleter', |
|||
sort: 'custom', |
|||
isSearch: false, |
|||
isTable: false, |
|||
isForm:false, |
|||
isDetail:false, |
|||
}, |
|||
{ |
|||
label: '位置ID', |
|||
field: 'siteId', |
|||
sort: 'custom', |
|||
isSearch: false, |
|||
isTable: false, |
|||
isForm:false, |
|||
isDetail:false, |
|||
form: { |
|||
component: 'InputNumber', |
|||
value: 0 |
|||
}, |
|||
}, |
|||
{ |
|||
label: '单据号', |
|||
field: 'reworkbillNo', |
|||
sort: 'custom', |
|||
isSearch: true, |
|||
isForm: false, |
|||
isDetail: true |
|||
}, |
|||
{ |
|||
label: '工作类型', |
|||
field: 'reworkType', |
|||
sort: 'custom', |
|||
isSearch: true, |
|||
dictType: DICT_TYPE.REWORK_TYPE, |
|||
dictClass: 'string', |
|||
}, |
|||
{ |
|||
label: '产品编码', |
|||
field: 'productionCode', |
|||
sort: 'custom', |
|||
isSearch: true, |
|||
form: { |
|||
componentProps: { |
|||
isSearchList: true, // 开启查询弹窗
|
|||
searchTitle: '产品编码', // 查询弹窗标题
|
|||
searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
|
|||
searchField: 'code', // 查询弹窗赋值字段
|
|||
searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
|
|||
searchCondition: [{ |
|||
key: 'available', |
|||
value: 'TRUE', |
|||
isMainValue: false |
|||
}, |
|||
{ |
|||
key: 'type', |
|||
action: 'in', // 查询拼接条件
|
|||
isSearch: true, // 使用自定义拼接条件
|
|||
value: 'BCP,CCP',//,SEMI]
|
|||
isMainValue: false |
|||
}] |
|||
} |
|||
} |
|||
}, |
|||
{ |
|||
label: '数量', |
|||
field: 'productionCount', |
|||
sort: 'custom', |
|||
isSearch: true, |
|||
form: { |
|||
component: 'InputNumber', |
|||
value: 0 |
|||
}, |
|||
}, |
|||
{ |
|||
label: '返修动作', |
|||
field: 'reworkAction', |
|||
sort: 'custom', |
|||
isSearch: true, |
|||
}, |
|||
{ |
|||
label: '是否有替换件', |
|||
field: 'replaceFlag', |
|||
sort: 'custom', |
|||
isSearch: true, |
|||
dictType: DICT_TYPE.REWORK_REPLACE_FLAG, |
|||
dictClass: 'string', |
|||
}, |
|||
{ |
|||
label: '返修人员', |
|||
field: 'reworkPersoncode', |
|||
sort: 'custom', |
|||
isSearch: true, |
|||
}, |
|||
{ |
|||
label: '返修时间', |
|||
field: 'reworkTime', |
|||
sort: 'custom', |
|||
formatter: dateFormatter, |
|||
isSearch: true, |
|||
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')] |
|||
} |
|||
}, |
|||
form: { |
|||
component: 'DatePicker', |
|||
componentProps: { |
|||
type: 'datetime', |
|||
valueFormat: 'x' |
|||
} |
|||
}, |
|||
}, |
|||
{ |
|||
label: '返修结果', |
|||
field: 'reworkResult', |
|||
sort: 'custom', |
|||
isSearch: true, |
|||
}, |
|||
|
|||
{ |
|||
label: '状态', |
|||
field: 'status', |
|||
sort: 'custom', |
|||
isSearch: true, |
|||
dictType: DICT_TYPE.REWORK_STATUS, |
|||
dictClass: 'string', |
|||
}, |
|||
{ |
|||
label: '备注', |
|||
field: 'remark', |
|||
sort: 'custom', |
|||
isSearch: false, |
|||
isTable: false, |
|||
}, |
|||
{ |
|||
label: '操作', |
|||
field: 'action', |
|||
isForm: false, |
|||
table: { |
|||
width: 150, |
|||
fixed: 'right' |
|||
} |
|||
} |
|||
])) |
Loading…
Reference in new issue