Browse Source

单件.批量 返工返修更新

master_hella_20240701
gaojs 8 months ago
parent
commit
94784eb8f8
  1. 76
      src/api/mes/reworkBatch/index.ts
  2. 16
      src/api/mes/reworkSingle/index.ts
  3. 53
      src/utils/disposition/defaultButtons.ts
  4. 318
      src/views/mes/reworkBatch/index.vue
  5. 229
      src/views/mes/reworkBatch/reworkBatch.data.ts
  6. 74
      src/views/mes/reworkSingle/index.vue

76
src/api/mes/reworkBatch/index.ts

@ -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' })
}

16
src/api/mes/reworkSingle/index.ts

@ -49,6 +49,22 @@ export const deleteReworkSingle = async (id: number) => {
return await request.delete({ url: `/mes/rework-single/delete?id=` + id }) return await request.delete({ url: `/mes/rework-single/delete?id=` + id })
} }
// 中止返工登记单件
export const suspendReworkSingle = async (id: number) => {
return await request.delete({ url: `/mes/rework-single/suspend?id=` + id })
}
// 领取返工登记单件
export const receiveReworkSingle = async (id: number) => {
return await request.put({ url: `/mes/rework-single/receive?id=` + id })
}
// 完成返工登记单件
export const finishReworkSingle = async (id: number) => {
return await request.put({ url: `/mes/rework-single/finish?id=` + id })
}
// 导出返工登记单件 Excel // 导出返工登记单件 Excel
export const exportReworkSingle = async (params) => { export const exportReworkSingle = async (params) => {
return await request.download({ url: `/mes/rework-single/export-excel`, params }) return await request.download({ url: `/mes/rework-single/export-excel`, params })

53
src/utils/disposition/defaultButtons.ts

@ -250,6 +250,59 @@ export function mainListDeleteBtn(option:any) {
hasPermi: '' hasPermi: ''
}) })
} }
// 主列表-中止按钮1
export function mainListSuspend1Btn(option:any) {
return __defaultBtnOption(option,{
label: '中止',
name: 'suspend',
hide: false,
type: 'danger',
color: '',
link: true, // 文本展现按钮
hasPermi: ''
})
}
// 主列表-中止按钮2
export function mainListSuspend2Btn(option:any) {
return __defaultBtnOption(option,{
label: '中止',
name: 'suspend',
hide: false,
type: 'danger',
color: '',
link: true, // 文本展现按钮
hasPermi: ''
})
}
// 主列表-领取按钮
export function mainListReceiveBtn(option:any) {
return __defaultBtnOption(option,{
label: '领取',
name: 'receive',
hide: false,
type: 'primary',
color: '',
link: true, // 文本展现按钮
hasPermi: ''
})
}
// 主列表-完成按钮
export function mainListFinishBtn(option:any) {
return __defaultBtnOption(option,{
label: '完成',
name: 'finish',
hide: false,
type: 'primary',
color: '',
link: true, // 文本展现按钮
hasPermi: ''
})
}
// 主列表-绑定 // 主列表-绑定
export function mainListBindBtn(option:any) { export function mainListBindBtn(option:any) {
return __defaultBtnOption(option,{ return __defaultBtnOption(option,{

318
src/views/mes/reworkBatch/index.vue

@ -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>

229
src/views/mes/reworkBatch/reworkBatch.data.ts

@ -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'
}
}
]))

74
src/views/mes/reworkSingle/index.vue

@ -33,7 +33,7 @@
</el-button> </el-button>
</template> </template>
<template #action="{ row }"> <template #action="{ row }">
<ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" /> <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
</template> </template>
</Table> </Table>
</ContentWrap> </ContentWrap>
@ -131,18 +131,38 @@ const buttonBaseClick = (val, item) => {
} }
} }
//
const isShowMainButton = (row,val) => {
if (val.indexOf(row.status) > -1) {
return false
} else {
return true
}
}
// - // -
const butttondata = [ const butttondata = (row) => {
defaultButtons.mainListEditBtn({hasPermi:'mes:reworkSingle:update'}), // return [
defaultButtons.mainListDeleteBtn({hasPermi:'mes:reworkSingle:delete'}), // 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) => { const buttonTableClick = async (val, row) => {
if (val == 'edit') { // if (val == 'edit') { //
openForm('update', row) openForm('update', row)
} else if (val == 'delete') { // } else if (val == 'suspend') { // 1
handleDelete(row.id) 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)
} }
} }
@ -209,6 +229,46 @@ const handleDelete = async (id: number) => {
} catch {} } catch {}
} }
/** 中止按钮操作 */
const handleSuspend = async (id: number) => {
try {
//
await message.delConfirm('是否中止所选中任务?');
//
await ReworkSingleApi.suspendReworkSingle(id)
message.success(t('中止成功'))
//
await getList()
} catch {}
}
/** 领取按钮操作 */
const handleReceive = async (id: number) => {
try {
//
await message.delConfirm('是否领取所选中任务?');
//
await ReworkSingleApi.receiveReworkSingle(id)
message.success(t('领取成功'))
//
await getList()
} catch {}
}
/** 完成按钮操作 */
const handleFinish = async (id: number) => {
try {
//
await message.delConfirm('是否完成所选中任务?');
//
await ReworkSingleApi.finishReworkSingle(id)
message.success(t('任务已完成'))
//
await getList()
} catch {}
}
/** 导出按钮操作 */ /** 导出按钮操作 */
const exportLoading = ref(false) // const exportLoading = ref(false) //
const handleExport = async () => { const handleExport = async () => {

Loading…
Cancel
Save