diff --git a/src/api/wms/barbasic/index.ts b/src/api/wms/barbasic/index.ts new file mode 100644 index 000000000..e5a23798d --- /dev/null +++ b/src/api/wms/barbasic/index.ts @@ -0,0 +1,56 @@ +import request from '@/config/axios' + +export interface BarbasicVO { + id: number + number: string + type: string + template: string + status: string + relateNumber: string + barcodeString: string + printTimes: number + lastPrintTime: string + lastPrintUserId: string + lastPrintUserName: string +} + +// 查询条码实体基类列表 +export const getBarbasicPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/barbasic/senior', data }) + } else { + return await request.get({ url: `/wms/barbasic/page`, params }) + } +} + +// 查询条码实体基类详情 +export const getBarbasic = async (id: number) => { + return await request.get({ url: `/wms/barbasic/get?id=` + id }) +} + +// 新增条码实体基类 +export const createBarbasic = async (data: BarbasicVO) => { + return await request.post({ url: `/wms/barbasic/create`, data }) +} + +// 修改条码实体基类 +export const updateBarbasic = async (data: BarbasicVO) => { + return await request.put({ url: `/wms/barbasic/update`, data }) +} + +// 删除条码实体基类 +export const deleteBarbasic = async (id: number) => { + return await request.delete({ url: `/wms/barbasic/delete?id=` + id }) +} + +// 导出条码实体基类 Excel +export const exportBarbasic = async (params) => { + return await request.download({ url: `/wms/barbasic/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/barbasic/get-import-template' }) +} \ No newline at end of file diff --git a/src/api/wms/barcode/index.ts b/src/api/wms/barcode/index.ts index 74b03a09c..80739036c 100644 --- a/src/api/wms/barcode/index.ts +++ b/src/api/wms/barcode/index.ts @@ -13,7 +13,8 @@ export interface BarcodeVO { encyptMethod: string masterId: number trimEnd: string - isEncypt: string + isEncypt: string, + labelType: string, } // 查询条码片段列表 @@ -21,38 +22,38 @@ export const getBarcodePage = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return await request.post({ url: '/wms/barcode/senior', data }) + return await request.post({ url: '/label/barcode/senior', data }) } else { - return await request.get({ url: `/wms/barcode/page`, params }) + return await request.get({ url: `/label/barcode/page`, params }) } } // 查询条码片段详情 export const getBarcode = async (id: number) => { - return await request.get({ url: `/wms/barcode/get?id=` + id }) + return await request.get({ url: `/label/barcode/get?id=` + id }) } // 新增条码片段 export const createBarcode = async (data: BarcodeVO) => { - return await request.post({ url: `/wms/barcode/create`, data }) + return await request.post({ url: `/label/barcode/create`, data }) } // 修改条码片段 export const updateBarcode = async (data: BarcodeVO) => { - return await request.put({ url: `/wms/barcode/update`, data }) + return await request.put({ url: `/label/barcode/update`, data }) } // 删除条码片段 export const deleteBarcode = async (id: number) => { - return await request.delete({ url: `/wms/barcode/delete?id=` + id }) + return await request.delete({ url: `/label/barcode/delete?id=` + id }) } // 导出条码片段 Excel export const exportBarcode = async (params) => { - return await request.download({ url: `/wms/barcode/export-excel`, params }) + return await request.download({ url: `/label/barcode/export-excel`, params }) } // 下载用户导入模板 export const importTemplate = () => { - return request.download({ url: '/wms/barcode/get-import-template' }) + return request.download({ url: '/label/barcode/get-import-template' }) } \ No newline at end of file diff --git a/src/api/wms/labeltype/index.ts b/src/api/wms/labeltype/index.ts new file mode 100644 index 000000000..5a08bf37b --- /dev/null +++ b/src/api/wms/labeltype/index.ts @@ -0,0 +1,63 @@ +import request from '@/config/axios' + +export interface LabeltypeVO { + id: number + labelType: string + description: string + dataProtocol: string + splitMehod: string + header: string + version: string + separators: string + validateMethod: string + validateNumber: number + encyptEthod: string + compressMethod: string + templateName: string + templateFile: string + barcodeSegments: string + labelCode: string + isEncypt: string + isCompress: string +} + +// 查询标签定义列表 +export const getLabeltypePage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/labeltype/senior', data }) + } else { + return await request.get({ url: `/wms/labeltype/page`, params }) + } +} + +// 查询标签定义详情 +export const getLabeltype = async (id: number) => { + return await request.get({ url: `/wms/labeltype/get?id=` + id }) +} + +// 新增标签定义 +export const createLabeltype = async (data: LabeltypeVO) => { + return await request.post({ url: `/wms/labeltype/create`, data }) +} + +// 修改标签定义 +export const updateLabeltype = async (data: LabeltypeVO) => { + return await request.put({ url: `/wms/labeltype/update`, data }) +} + +// 删除标签定义 +export const deleteLabeltype = async (id: number) => { + return await request.delete({ url: `/wms/labeltype/delete?id=` + id }) +} + +// 导出标签定义 Excel +export const exportLabeltype = async (params) => { + return await request.download({ url: `/wms/labeltype/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/labeltype/get-import-template' }) +} \ No newline at end of file diff --git a/src/components/Descriptions/src/Descriptions.vue b/src/components/Descriptions/src/Descriptions.vue index 18f54ea9f..56540d68b 100644 --- a/src/components/Descriptions/src/Descriptions.vue +++ b/src/components/Descriptions/src/Descriptions.vue @@ -15,6 +15,9 @@ const mobile = computed(() => appStore.getMobile) const attrs = useAttrs() const slots = useSlots() +const height = ref('200px') +const isShow = ref(false) + const props = defineProps({ title: propTypes.string.def(''), @@ -68,6 +71,15 @@ const toggleClick = () => { show.value = !unref(show) } } +const showAll = () =>{ + if(isShow.value){ + height.value ='200px' + }else{ + height.value ='auto' + } + isShow.value = !isShow.value + +} diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue index 84873ef74..ec5c5f57b 100644 --- a/src/components/Detail/src/Detail.vue +++ b/src/components/Detail/src/Detail.vue @@ -110,6 +110,7 @@ import TableHead from '@/components/TableHead/src/TableHead.vue' defineOptions({ name: 'Detail' }) + const message = useMessage() // 消息弹窗 const { t } = useI18n() // 国际化 @@ -118,6 +119,7 @@ const routeName = ref() routeName.value = route.name routeName.value = routeName.value.substring(0, routeName.value.length - 4) + 'Detail' + const props = defineProps({ // 标签参数 tabs: { @@ -290,12 +292,18 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName: getFileList() getChangeRecordList() // 判断详情新增按钮是否显示 - HeadButttondata.value = [ - defaultButtons.defaultAddBtn({ - hide: isShowMainButton(row, ['1']) - }), // 新增 - defaultButtons.defaultFilterBtn(null) // 筛选 - ] + if(routeName.value.indexOf('Job') > -1){ + HeadButttondata.value = [ + defaultButtons.defaultFilterBtn(null) // 筛选 + ] + }else{ + HeadButttondata.value = [ + defaultButtons.defaultAddBtn({ + hide: isShowMainButton(row, ['1']) + }), // 新增 + defaultButtons.defaultFilterBtn(null) // 筛选 + ] + } // 动态显示操作列按钮 buttondata.value = [ defaultButtons.mainListEditBtn({ @@ -437,28 +445,44 @@ const handleDelete = async (id: number) => { } // 筛选提交 const searchFormClick = (searchData) => { - tableObjectRef.value.params = { + const { tableObject, tableMethods } = useTable({ + getListApi: props.apiPage // 分页接口 + }) + tableObject.params = { isSearch: true, filters: searchData.filters ? searchData.filters : [{ column: 'masterId', action: '==', value: masterParmas.value.masterId }] } - getList() // 刷新当前列表 + detailAllSchemasRef.value = props.detailAllSchemas + tableObjectRef.value = tableObject + tableMethodsRef.value = tableMethods + tableObjectRef.value.tableList = [] + const { getList } = tableMethods + getList() + // tableObjectRef.value.params = { + // isSearch: true, + // filters: searchData.filters + // ? searchData.filters + // : [{ column: 'masterId', action: '==', value: masterParmas.value.masterId }] + // } + // getList() // 刷新当前列表 } //监视属性 watch( - () => props.apiPage, + () =>props.apiPage, () => { const { tableObject, tableMethods } = useTable({ getListApi: props.apiPage // 分页接口 }) + tableObject.params.masterId = masterParmas.value.masterId detailAllSchemasRef.value = props.detailAllSchemas tableObjectRef.value = tableObject tableMethodsRef.value = tableMethods const { getList } = tableMethods getList() - } + }, )