update 添加示方书维护、文件上传下载

master
yinq 4 months ago
parent f4a636cb88
commit 33476702ad

@ -0,0 +1,81 @@
import request from '@/utils/request';
import { AxiosPromise } from 'axios';
import {
SamplePrescriptionVO,
SamplePrescriptionForm,
SamplePrescriptionQuery
} from '@/api/mes/samplePrescription/types';
/**
*
* @param query
* @returns {*}
*/
export const listSamplePrescription = (query?: SamplePrescriptionQuery): AxiosPromise<SamplePrescriptionVO[]> => {
return request({
url: '/mes/samplePrescription/list',
method: 'get',
params: query
});
};
/**
*
* @param sampleId
*/
export const getSamplePrescription = (sampleId: string | number): AxiosPromise<SamplePrescriptionVO> => {
return request({
url: '/mes/samplePrescription/' + sampleId,
method: 'get'
});
};
/**
*
* @param data
*/
export const addSamplePrescription = (data: SamplePrescriptionForm) => {
return request({
url: '/mes/samplePrescription',
method: 'post',
data: data
});
};
/**
*
* @param data
*/
export const updateSamplePrescription = (data: SamplePrescriptionForm) => {
return request({
url: '/mes/samplePrescription',
method: 'put',
data: data
});
};
/**
*
* @param sampleId
*/
export const delSamplePrescription = (sampleId: string | number | Array<string | number>) => {
return request({
url: '/mes/samplePrescription/' + sampleId,
method: 'delete'
});
};
/**
*
* @param query
* @returns {*}
*/
export function getProdSamplePrescriptionList(query) {
return request({
url: '/mes/samplePrescription/getProdSamplePrescriptionList',
method: 'get',
params: query
});
};

@ -0,0 +1,186 @@
export interface SamplePrescriptionVO {
/**
*
*/
sampleId: string | number;
/**
* ID
*/
processId: string | number;
/**
* ID
*/
materialId: string | number;
/**
* BOMID
*/
materialBomId: string | number;
/**
* ID
*/
technologyId: string | number;
/**
* ID
*/
oosId: string | number;
/**
*
*/
originalName: string;
/**
*
*/
fileUrl: string;
/**
* 1 0
*/
activeFlag: string;
/**
*
*/
remark: string;
/**
*
*/
createBy: number;
/**
*
*/
createTime: string;
}
export interface SamplePrescriptionForm extends BaseEntity {
/**
*
*/
sampleId?: string | number;
/**
* ID
*/
processId?: string | number;
/**
* ID
*/
materialId?: string | number;
/**
* BOMID
*/
materialBomId?: string | number;
/**
* ID
*/
technologyId?: string | number;
/**
* ID
*/
oosId?: string | number;
/**
*
*/
originalName?: string;
/**
*
*/
fileUrl?: string;
/**
* 1 0
*/
activeFlag?: string;
/**
*
*/
remark?: string;
/**
*
*/
file?: string | [];
}
export interface SamplePrescriptionQuery extends PageQuery {
/**
*
*/
sampleId?: string | number;
/**
* ID
*/
processId?: string | number;
/**
* ID
*/
materialId?: string | number;
/**
* BOMID
*/
materialBomId?: string | number;
/**
* ID
*/
technologyId?: string | number;
/**
* ID
*/
oosId?: string | number;
/**
*
*/
originalName?: string;
/**
*
*/
fileUrl?: string;
/**
* 1 0
*/
activeFlag?: string;
/**
*
*/
createBy?: number;
/**
*
*/
createTime?: string;
/**
*
*/
params?: any;
}

@ -176,7 +176,8 @@ const uploadedSuccessfully = () => {
fileList.value = fileList.value.filter((f) => f.url !== undefined).concat(uploadList.value);
uploadList.value = [];
number.value = 0;
emit('update:modelValue', listToString(fileList.value));
// emit('update:modelValue', listToString(fileList.value));
emit('update:modelValue', fileList.value);
proxy?.$modal.closeLoading();
}
};

@ -0,0 +1,415 @@
<template>
<div class='p-2'>
<transition :enter-active-class='proxy?.animate.searchAnimate.enter'
:leave-active-class='proxy?.animate.searchAnimate.leave'>
<div v-show='showSearch' class='mb-[10px]'>
<el-card shadow='hover'>
<el-form ref='queryFormRef' :model='queryParams' :inline='true'>
<el-form-item label='工序名称' prop='processId'>
<el-select v-model='queryParams.processId' placeholder='请选择工序名称' clearable @keyup.enter='handleQuery'>
<el-option
v-for='item in processInfoList'
:key='item.processId'
:label='item.processName'
:value='item.processId'
/>
</el-select>
</el-form-item>
<el-form-item label='物料名称' prop='materialId'>
<el-input v-model='queryParams.materialId' placeholder='请输入物料名称' clearable @keyup.enter='handleQuery' />
</el-form-item>
<el-form-item label='文件名' prop='originalName'>
<el-input v-model='queryParams.originalName' placeholder='请输入文件名' clearable @keyup.enter='handleQuery' />
</el-form-item>
<!-- <el-form-item label='上传人' prop='createBy'>-->
<!-- <el-input v-model='queryParams.createBy' placeholder='请输入上传人' clearable @keyup.enter='handleQuery' />-->
<!-- </el-form-item>-->
<!-- <el-form-item label='创建时间' prop='createTime'>-->
<!-- <el-date-picker clearable-->
<!-- v-model='queryParams.createTime'-->
<!-- type='date'-->
<!-- value-format='YYYY-MM-DD'-->
<!-- placeholder='请选择创建时间'-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item>
<el-button type='primary' icon='Search' @click='handleQuery'>搜索</el-button>
<el-button icon='Refresh' @click='resetQuery'>重置</el-button>
</el-form-item>
</el-form>
</el-card>
</div>
</transition>
<el-card shadow='never'>
<template #header>
<el-row :gutter='10' class='mb8'>
<el-col :span='1.5'>
<el-button type='primary' plain icon='Plus' @click='handleAdd' v-hasPermi="['mes:samplePrescription:add']">
新增
</el-button>
</el-col>
<el-col :span='1.5'>
<el-button type='success' plain icon='Edit' :disabled='single' @click='handleUpdate()'
v-hasPermi="['mes:samplePrescription:edit']">修改
</el-button>
</el-col>
<el-col :span='1.5'>
<el-button type='danger' plain icon='Delete' :disabled='multiple' @click='handleDelete()'
v-hasPermi="['mes:samplePrescription:remove']">删除
</el-button>
</el-col>
<el-col :span='1.5'>
<el-button type='warning' plain icon='Download' @click='handleExport'
v-hasPermi="['mes:samplePrescription:export']">导出
</el-button>
</el-col>
<right-toolbar v-model:showSearch='showSearch' :columns='columns' :search='true'
@queryTable='getList'></right-toolbar>
</el-row>
</template>
<el-table v-loading='loading' :data='samplePrescriptionList' @selection-change='handleSelectionChange'>
<el-table-column type='selection' width='55' align='center' />
<el-table-column label='主键标识' align='center' prop='sampleId' v-if='columns[0].visible' />
<el-table-column label='工序名称' align='center' prop='processName' v-if='columns[2].visible' />
<el-table-column label='物料名称' align='center' prop='materialName' v-if='columns[3].visible' width='300'/>
<el-table-column label='物料BOMID' align='center' prop='materialBomId' v-if='columns[4].visible' />
<el-table-column label='工艺ID' align='center' prop='technologyId' v-if='columns[5].visible' />
<el-table-column label='对象存储ID' align='center' prop='oosId' v-if='columns[6].visible' />
<el-table-column label='文件名' align='center' prop='originalName' v-if='columns[7].visible' />
<el-table-column label='文件地址' align='center' prop='fileUrl' v-if='columns[8].visible' />
<el-table-column label='激活标识' align='center' prop='activeFlag' v-if='columns[9].visible'>
<template #default='scope'>
<dict-tag :options='active_flag' :value='scope.row.activeFlag' />
</template>
</el-table-column>
<el-table-column label='备注' align='center' prop='remark' v-if='columns[10].visible' />
<el-table-column label='上传人' align='center' prop='createBy' v-if='columns[12].visible' />
<el-table-column label='创建时间' align='center' prop='createTime' width='180' v-if='columns[13].visible'>
<template #default='scope'>
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label='操作' align='center' class-name='small-padding fixed-width'>
<template #default='scope'>
<el-button link type='primary' icon='Download' @click='handleDownload(scope.row)'
>下载</el-button>
<el-button link type='primary' icon='Edit' @click='handleUpdate(scope.row)'
v-hasPermi="['mes:samplePrescription:edit']">修改</el-button>
<!-- <el-tooltip content='删除' placement='top'>-->
<!-- <el-button link type='primary' icon='Delete' @click='handleDelete(scope.row)'-->
<!-- v-hasPermi="['mes:samplePrescription:remove']"></el-button>-->
<!-- </el-tooltip>-->
</template>
</el-table-column>
</el-table>
<pagination v-show='total > 0' :total='total' v-model:page='queryParams.pageNum'
v-model:limit='queryParams.pageSize' @pagination='getList' />
</el-card>
<!-- 添加或修改示方书维护对话框 -->
<el-dialog :title='dialog.title' v-model='dialog.visible' width='500px' append-to-body>
<el-form ref='samplePrescriptionFormRef' :model='form' :rules='rules' label-width='80px'>
<el-form-item label='工序名称' prop='processId'>
<el-select v-model='form.processId' placeholder='请选择工序名称'>
<el-option
v-for='item in processInfoList'
:key='item.processId'
:label='item.processName'
:value='item.processId'
/>
</el-select>
</el-form-item>
<el-form-item label='物料名称' prop='materialName'>
<el-input v-model='form.materialName' placeholder='请点击检索物料' @click='handleMaterialAdd' readonly>
<template #append>
<el-icon class='el-input__icon'>
<search />
</el-icon>
</template>
</el-input>
</el-form-item>
<!-- <el-form-item label='物料BOMID' prop='materialBomId'>-->
<!-- <el-input v-model='form.materialBomId' placeholder='请输入物料BOMID' />-->
<!-- </el-form-item>-->
<!-- <el-form-item label='工艺ID' prop='technologyId'>-->
<!-- <el-input v-model='form.technologyId' placeholder='请输入工艺ID' />-->
<!-- </el-form-item>-->
<el-form-item label='示方书' prop='originalName'>
<fileUpload v-if='isInsert === 0' v-model='form.file' />
<el-input v-if='isInsert === 1' v-model='form.originalName' disabled/>
</el-form-item>
<!-- <el-form-item label='激活标识' prop='activeFlag'>-->
<!-- <el-radio-group v-model='form.activeFlag'>-->
<!-- <el-radio-->
<!-- v-for='dict in active_flag'-->
<!-- :key='dict.value'-->
<!-- :value='dict.value'-->
<!-- >{{ dict.label }}-->
<!-- </el-radio>-->
<!-- </el-radio-group>-->
<!-- </el-form-item>-->
<!-- <el-form-item label='备注' prop='remark'>-->
<!-- <el-input v-model='form.remark' placeholder='请输入备注' />-->
<!-- </el-form-item>-->
</el-form>
<template #footer>
<div class='dialog-footer'>
<el-button :loading='buttonLoading' type='primary' @click='submitForm'> </el-button>
<el-button @click='cancel'> </el-button>
</div>
</template>
</el-dialog>
<!-- 添加物料信息对话框 -->
<el-dialog title='选择物料信息' v-model='materialOpen' width='1200px' append-to-body>
<MaterialSelect @selection='handleSelection' ref='materialSelectRef' v-if='materialOpen'></MaterialSelect>
<div slot='footer' class='dialog-footer'>
<el-button type='primary' @click='submitMaterialForm'> </el-button>
<el-button @click='materialOpen = false'> </el-button>
</div>
</el-dialog>
</div>
</template>
<script setup name='SamplePrescription' lang='ts'>
import {
listSamplePrescription,
getSamplePrescription,
delSamplePrescription,
addSamplePrescription,
updateSamplePrescription
} from '@/api/mes/samplePrescription';
import {
SamplePrescriptionVO,
SamplePrescriptionQuery,
SamplePrescriptionForm
} from '@/api/mes/samplePrescription/types';
import { getProcessInfoList } from '@/api/mes/baseProcessInfo';
import MaterialSelect from '@/views/mes/baseMaterialInfo/addMaterial.vue';
import { OssVO } from '@/api/system/oss/types';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { active_flag } = toRefs<any>(proxy?.useDict('active_flag'));
const samplePrescriptionList = ref<SamplePrescriptionVO[]>([]);
const buttonLoading = ref(false);
const loading = ref(true);
const showSearch = ref(true);
const ids = ref<Array<string | number>>([]);
const single = ref(true);
const multiple = ref(true);
const total = ref(0);
const isInsert = ref(0);
const queryFormRef = ref<ElFormInstance>();
const samplePrescriptionFormRef = ref<ElFormInstance>();
const dialog = reactive<DialogOption>({
visible: false,
title: ''
});
const processInfoList = ref([]);
const materialOpen = ref(false);
const materialSelectRef = ref();
/** 查询工序下拉树结构 */
const getProcessInfoListSelect = async () => {
let res = await getProcessInfoList(null);
processInfoList.value = res.data;
};
//
const columns = ref<FieldOption[]>([
{ key: 0, label: `主键标识`, visible: false },
{ key: 1, label: `租户编号`, visible: false },
{ key: 2, label: `工序名称`, visible: true },
{ key: 3, label: `物料名称`, visible: true },
{ key: 4, label: `物料BOMID`, visible: false },
{ key: 5, label: `工艺ID`, visible: false },
{ key: 6, label: `对象存储ID`, visible: false },
{ key: 7, label: `文件名`, visible: true },
{ key: 8, label: `文件地址`, visible: false },
{ key: 9, label: `激活标识`, visible: true },
{ key: 10, label: `备注`, visible: false },
{ key: 11, label: `创建部门`, visible: false },
{ key: 12, label: `上传人`, visible: false },
{ key: 13, label: `创建时间`, visible: false },
{ key: 14, label: `更新人`, visible: false },
{ key: 15, label: `更新时间`, visible: false }
]);
const initFormData: SamplePrescriptionForm = {
sampleId: undefined,
processId: undefined,
materialId: undefined,
materialBomId: undefined,
technologyId: undefined,
oosId: undefined,
originalName: undefined,
fileUrl: undefined,
activeFlag: '1',
remark: undefined,
file: undefined
};
const data = reactive<PageData<SamplePrescriptionForm, SamplePrescriptionQuery>>({
form: { ...initFormData },
queryParams: {
pageNum: 1,
pageSize: 10,
sampleId: undefined,
processId: undefined,
materialId: undefined,
materialBomId: undefined,
technologyId: undefined,
oosId: undefined,
originalName: undefined,
fileUrl: undefined,
activeFlag: undefined,
createBy: undefined,
createTime: undefined,
params: {}
},
rules: {
processId: [
{ required: true, message: '工序名称不能为空', trigger: 'blur' }
],
materialId: [
{ required: true, message: '物料名称不能为空', trigger: 'blur' }
],
activeFlag: [
{ required: true, message: '激活标识不能为空', trigger: 'change' }
]
}
});
const { queryParams, form, rules } = toRefs(data);
/** 查询示方书维护列表 */
const getList = async () => {
loading.value = true;
const res = await listSamplePrescription(queryParams.value);
samplePrescriptionList.value = res.rows;
total.value = res.total;
loading.value = false;
};
/** 取消按钮 */
const cancel = () => {
reset();
dialog.visible = false;
};
/** 表单重置 */
const reset = () => {
form.value = { ...initFormData };
samplePrescriptionFormRef.value?.resetFields();
};
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.value.pageNum = 1;
getList();
};
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value?.resetFields();
handleQuery();
};
/** 新增物料按钮操作 */
const handleMaterialAdd = () => {
isInsert.value = 0;
materialOpen.value = true;
};
/** 下载按钮操作 */
const handleDownload = (row) => {
console.log(row);
proxy?.$download.oss(row.oosId);
};
/** 提交物料选择 */
const submitMaterialForm = () => {
const selectedRow = materialSelectRef.value.tableRef.store.states.currentRow.value;
form.value.materialId = selectedRow.materialId;
form.value.materialName = selectedRow.materialName;
materialOpen.value = false;
};
/** 多选框选中数据 */
const handleSelectionChange = (selection: SamplePrescriptionVO[]) => {
ids.value = selection.map(item => item.sampleId);
single.value = selection.length != 1;
multiple.value = !selection.length;
};
/** 新增按钮操作 */
const handleAdd = () => {
reset();
dialog.visible = true;
dialog.title = '添加示方书维护';
};
/** 修改按钮操作 */
const handleUpdate = async (row?: SamplePrescriptionVO) => {
reset();
const _sampleId = row?.sampleId || ids.value[0];
const res = await getSamplePrescription(_sampleId);
Object.assign(form.value, res.data);
isInsert.value = 1;
dialog.visible = true;
dialog.title = '修改示方书维护';
};
/** 提交按钮 */
const submitForm = () => {
samplePrescriptionFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
buttonLoading.value = true;
if (form.value.sampleId) {
await updateSamplePrescription(form.value).finally(() => buttonLoading.value = false);
} else {
if (form.value.file === null || form.value.file.length === 0) {
proxy?.$modal.warning('请上传示方书!');
return;
}
for (let e of form.value.file) {
form.value.oosId = e.ossId;
form.value.originalName = e.name;
form.value.fileUrl = e.url;
await addSamplePrescription(form.value).finally(() => buttonLoading.value = false);
}
}
proxy?.$modal.msgSuccess('操作成功');
dialog.visible = false;
await getList();
}
});
};
/** 删除按钮操作 */
const handleDelete = async (row?: SamplePrescriptionVO) => {
const _sampleIds = row?.sampleId || ids.value;
await proxy?.$modal.confirm('是否确认删除示方书维护编号为"' + _sampleIds + '"的数据项?').finally(() => loading.value = false);
await delSamplePrescription(_sampleIds);
proxy?.$modal.msgSuccess('删除成功');
await getList();
};
/** 导出按钮操作 */
const handleExport = () => {
proxy?.download('mes/samplePrescription/export', {
...queryParams.value
}, `samplePrescription_${new Date().getTime()}.xlsx`);
};
onMounted(() => {
getProcessInfoListSelect();
getList();
});
</script>
Loading…
Cancel
Save