diff --git a/src/api/mes/qualityform/index.ts b/src/api/mes/qualityform/index.ts index df55b949a..40041b661 100644 --- a/src/api/mes/qualityform/index.ts +++ b/src/api/mes/qualityform/index.ts @@ -48,8 +48,3 @@ export const deleteQualityform = async (id: number) => { export const exportQualityform = async (params) => { return await request.download({ url: `/mes/qualityform/export-excel`, params }) } - -// 下载用户导入模板 -export const importTemplate = () => { - return request.download({ url: '/mes/qualityform/get-import-template' }) -} \ No newline at end of file diff --git a/src/api/mes/qualityformdetail/index.ts b/src/api/mes/qualityformdetail/index.ts index dea2b85a0..8526e446e 100644 --- a/src/api/mes/qualityformdetail/index.ts +++ b/src/api/mes/qualityformdetail/index.ts @@ -54,8 +54,3 @@ export const deleteQualityformdetail = async (id: number) => { export const exportQualityformdetail = async (params) => { return await request.download({ url: `/mes/qualityformdetail/export-excel`, params }) } - -// 下载用户导入模板 -export const importTemplate = () => { - return request.download({ url: '/mes/qualityformdetail/get-import-template' }) -} \ No newline at end of file diff --git a/src/api/mes/qualityformlog/index.ts b/src/api/mes/qualityformlog/index.ts index bc19550b6..31b7d2f3b 100644 --- a/src/api/mes/qualityformlog/index.ts +++ b/src/api/mes/qualityformlog/index.ts @@ -51,8 +51,3 @@ export const deleteQualityformlog = async (id: number) => { export const exportQualityformlog = async (params) => { return await request.download({ url: `/mes/qualityformlog/export-excel`, params }) } - -// 下载用户导入模板 -export const importTemplate = () => { - return request.download({ url: '/mes/qualityformlog/get-import-template' }) -} \ No newline at end of file diff --git a/src/api/wms/supplierdeliverInspectionDetail/index.ts b/src/api/wms/supplierdeliverInspectionDetail/index.ts new file mode 100644 index 000000000..cd689c6f7 --- /dev/null +++ b/src/api/wms/supplierdeliverInspectionDetail/index.ts @@ -0,0 +1,54 @@ +import request from '@/config/axios' + +export interface SupplierdeliverInspectionDetailVO { + id: number + itemCode: string + uom: string + batch: string + planQty: number + remark: string + extraProperties: string + concurrencyStamp: number + siteId: string +} + +// 查询供应商发货申请质检信息子列表 +export const getSupplierdeliverInspectionDetailPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/supplierdeliver-inspection-detail/senior', data }) + } else { + return await request.get({ url: `/wms/supplierdeliver-inspection-detail/page`, params }) + } +} + +// 查询供应商发货申请质检信息子详情 +export const getSupplierdeliverInspectionDetail = async (id: number) => { + return await request.get({ url: `/wms/supplierdeliver-inspection-detail/get?id=` + id }) +} + +// 新增供应商发货申请质检信息子 +export const createSupplierdeliverInspectionDetail = async (data: SupplierdeliverInspectionDetailVO) => { + return await request.post({ url: `/wms/supplierdeliver-inspection-detail/create`, data }) +} + +// 修改供应商发货申请质检信息子 +export const updateSupplierdeliverInspectionDetail = async (data: SupplierdeliverInspectionDetailVO) => { + return await request.put({ url: `/wms/supplierdeliver-inspection-detail/update`, data }) +} + +// 删除供应商发货申请质检信息子 +export const deleteSupplierdeliverInspectionDetail = async (id: number) => { + return await request.delete({ url: `/wms/supplierdeliver-inspection-detail/delete?id=` + id }) +} + +// 导出供应商发货申请质检信息子 Excel +export const exportSupplierdeliverInspectionDetail = async (params) => { + return await request.download({ url: `/wms/supplierdeliver-inspection-detail/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/supplierdeliver-inspection-detail/get-import-template' }) +} \ No newline at end of file diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue index 5f7a5e26c..0f0132a20 100644 --- a/src/components/Detail/src/Detail.vue +++ b/src/components/Detail/src/Detail.vue @@ -110,16 +110,18 @@ :annexData="annexData" @handleAnnexSuccess="handleAnnexSuccess" @deleteAnnexSuccess="deleteAnnexSuccess" - :upData="remarksData.data" + :upData="remarksData.data" + :key="count" /> - + @@ -362,7 +364,6 @@ const otherList = [...props.annexTable,{ label:'变更记录', prop:'ChangeRecord' }] - tabsList.value = [...tabsList?.value,...otherList] if (!tabsList.value || tabsList.value && tabsList.value.length == otherList.length) { @@ -498,6 +499,7 @@ const searchTableFormType = ref('') // 表单的类型：create - 新增；updat const formRef = ref() const titleNameRef = ref() const titleValueRef = ref() +const count =ref(0) const openDetail = async (row: any, titleName: any, titleValue: any, tableName: any) => { titleNameRef.value = titleName titleValueRef.value = titleValue @@ -505,6 +507,7 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName: tableId: row.id, tableName: tableName } + count.value++ // 加载明细列表 if (!props.isBasic) { // 设置主表id @@ -713,7 +716,6 @@ const opensearchTable = ( // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { - debugger if (val == 'edit') { // 编辑 if(props.isOpenSearchTable){ @@ -759,6 +761,7 @@ const submitForm = async (formType, data) => { await props.apiUpdate(data) message.success(t('common.updateSuccess')) } + emit('handleMainFefresh') formRef.value.dialogVisible = false // 刷新当前列表 await getList() @@ -802,6 +805,7 @@ const handleDelete = async (id: number) => { await props.apiDelete(id) tableObject.loading = false message.success(t('common.delSuccess')) + emit('handleMainFefresh') // 刷新列表 await getList() updateKey.value += 1 diff --git a/src/views/mes/dismantlingMain/dismantlingMain.data.ts b/src/views/mes/dismantlingMain/dismantlingMain.data.ts index 7de151710..0df99a562 100644 --- a/src/views/mes/dismantlingMain/dismantlingMain.data.ts +++ b/src/views/mes/dismantlingMain/dismantlingMain.data.ts @@ -143,13 +143,21 @@ export const DismantlingMain = useCrudSchemas(reactive([ }, { label: '工单状态', + field: 'workbillStatus', + sort: 'custom', + dictType: DICT_TYPE.DISMANTLING_MATERIAL_HANDLE_STATUS, + dictClass: 'string', + isSearch: true, + }, + { + label: '是否可用', field: 'status', sort: 'custom', dictType: DICT_TYPE.QUALIFY_STATUS, dictClass: 'string', - isForm: true, - isSearch: true, - isTable: true, + isForm: false, + isSearch: false, + isTable: false, form: { component: 'Switch', value: '2', diff --git a/src/views/mes/dismantlingMain/index.vue b/src/views/mes/dismantlingMain/index.vue index d617b45e1..b41931c64 100644 --- a/src/views/mes/dismantlingMain/index.vue +++ b/src/views/mes/dismantlingMain/index.vue @@ -63,6 +63,7 @@ :detailButtonIsShowAdd="true" :detailButtonIsShowEdit="true" :detailButtonIsShowDelete="true" + @handleMainFefresh="handleMainFefresh" @searchTableSuccessDetail="searchTableSuccessDetail" :key="count" /> @@ -170,9 +171,29 @@ const buttonTableClick = async (val, row) => { } } +let count = ref(0) +const handleMainFefresh = async()=>{ + count.value++; + await getList() +} + /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: any) => { + if(type == "create"){ + DismantlingMain.allSchemas.formSchema.forEach((item) => { + if(item.field == 'workbillStatus'){ + item.value = '2'; + item.componentProps.disabled = true + } + }) + }else{ + DismantlingMain.allSchemas.formSchema.forEach((item) => { + if(item.field == 'workbillStatus'){ + item.componentProps.disabled = true + } + }) + } basicFormRef.value.open(type, row) } diff --git a/src/views/mes/qualityform/index.vue b/src/views/mes/qualityform/index.vue index fafd85101..27052503c 100644 --- a/src/views/mes/qualityform/index.vue +++ b/src/views/mes/qualityform/index.vue @@ -63,14 +63,11 @@ :detailButtonIsShowAdd="true" :detailButtonIsShowEdit="true" :detailButtonIsShowDelete="true" - @handleDeleteDetail="handleDeleteDetail" - @handleCreateDetail="handleCreateDetail" + @handleMainFefresh="handleMainFefresh" @searchTableSuccessDetail="searchTableSuccessDetail" :key="count" /> - - diff --git a/src/views/mes/qualityformlog/index.vue b/src/views/mes/qualityformlog/index.vue index bcde626fc..9404ddf09 100644 --- a/src/views/mes/qualityformlog/index.vue +++ b/src/views/mes/qualityformlog/index.vue @@ -27,9 +27,9 @@ v-model:currentPage="tableObject.currentPage" v-model:sort="tableObject.sort" > -