diff --git a/src/api/wms/accountcalendar/index.ts b/src/api/wms/accountcalendar/index.ts index 984d36ba6..dd6446972 100644 --- a/src/api/wms/accountcalendar/index.ts +++ b/src/api/wms/accountcalendar/index.ts @@ -7,7 +7,7 @@ export interface AccountcalendarVO { beginTime: Date endTime: Date converttotime: Date - available: number + available: string activeTime: Date expireTime: Date remark: string @@ -31,6 +31,7 @@ export const getAccountcalendar = async (id: number) => { // 新增账期日历 export const createAccountcalendar = async (data: AccountcalendarVO) => { + data.available = 'TRUE' return await request.post({ url: `/wms/accountcalendar/create`, data }) } @@ -57,4 +58,14 @@ export const exportAccountcalendar = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/accountcalendar/get-import-template' }) +} + + +// 启用 +export const enableOption = async (id: number) => { + return await request.enable({ url: `/wms/accountcalendar/enable?id=` + id }) +} +// 禁用 +export const disableOption = async (id: number) => { + return await request.disable({ url: `/wms/accountcalendar/disable?id=` + id }) } \ No newline at end of file diff --git a/src/api/wms/agvLocationrelation/index.ts b/src/api/wms/agvLocationrelation/index.ts index 3bc7533f9..a5a75718d 100644 --- a/src/api/wms/agvLocationrelation/index.ts +++ b/src/api/wms/agvLocationrelation/index.ts @@ -29,6 +29,7 @@ export const getAgvLocationrelation = async (id: number) => { // 新增AGV库位转换 export const createAgvLocationrelation = async (data: AgvLocationrelationVO) => { + data.available = 'TRUE' return await request.post({ url: `/wms/agv-locationrelation/create`, data }) } @@ -57,3 +58,14 @@ export const exportAgvLocationrelation = async (params) => { export const importTemplate = () => { return request.download({ url: '/wms/agv-locationrelation/get-import-template' }) } + + + +// 启用 +export const enableOption = async (id: number) => { + return await request.enable({ url: `/wms/agv-locationrelation/enable?id=` + id }) +} +// 禁用 +export const disableOption = async (id: number) => { + return await request.disable({ url: `/wms/agv-locationrelation/disable?id=` + id }) +} \ No newline at end of file diff --git a/src/api/wms/areabasic/index.ts b/src/api/wms/areabasic/index.ts index 8554c5550..8eed0091d 100644 --- a/src/api/wms/areabasic/index.ts +++ b/src/api/wms/areabasic/index.ts @@ -7,7 +7,7 @@ export interface AreaVO { warehouseCode: string type: string isFunctional: number - available: number + available: string activeTime: Date expireTime: Date remark: string @@ -43,6 +43,7 @@ export const getArea = async (id: number) => { // 新增库区 export const createArea = async (data: AreaVO) => { + data.available = 'TRUE' return await request.post({ url: `/wms/areabasic/create`, data }) } @@ -74,4 +75,14 @@ export const importTemplate = () => { // 根据code获取数据列表 export const getAreabasicByCodes = async (params) => { return await request.get({ url: `/wms/areabasic/listByCodes`, params }) +} + + +// 启用 +export const enableOption = async (id: number) => { + return await request.enable({ url: `/wms/areabasic/enable?id=` + id }) +} +// 禁用 +export const disableOption = async (id: number) => { + return await request.disable({ url: `/wms/areabasic/disable?id=` + id }) } \ No newline at end of file diff --git a/src/api/wms/barbasic/index.ts b/src/api/wms/barbasic/index.ts index 0f7e161fd..6b82dcb85 100644 --- a/src/api/wms/barbasic/index.ts +++ b/src/api/wms/barbasic/index.ts @@ -12,6 +12,8 @@ export interface BarbasicVO { lastPrintTime: string lastPrintUserId: string lastPrintUserName: string + available: string + } // 查询条码实体基类列表 @@ -32,6 +34,7 @@ export const getBarbasic = async (id: number) => { // 新增条码实体基类 export const createBarbasic = async (data: BarbasicVO) => { + data.available = 'TRUE' return await request.post({ url: `/wms/barbasic/create`, data }) } @@ -60,3 +63,13 @@ export const exportBarbasic = async (params) => { export const importTemplate = () => { return request.download({ url: '/wms/barbasic/get-import-template' }) } + + +// 启用 +export const enableOption = async (id: number) => { + return await request.enable({ url: `/wms/barbasic/enable?id=` + id }) +} +// 禁用 +export const disableOption = async (id: number) => { + return await request.disable({ url: `/wms/barbasic/disable?id=` + id }) +} \ No newline at end of file diff --git a/src/api/wms/barcode/index.ts b/src/api/wms/barcode/index.ts index 38d00d6d6..f58f81fd0 100644 --- a/src/api/wms/barcode/index.ts +++ b/src/api/wms/barcode/index.ts @@ -15,6 +15,14 @@ export interface BarcodeVO { trimEnd: string isEncypt: string, labelType: string, + available: string +} + +export interface BarcodePageVO { + total: number + size: number + current: number + records: Array } // 查询条码片段列表 @@ -35,6 +43,7 @@ export const getBarcode = async (id: number) => { // 新增条码片段 export const createBarcode = async (data: BarcodeVO) => { + data.available = 'TRUE' return await request.post({ url: `/label/barcode/create`, data }) } @@ -63,3 +72,14 @@ export const exportBarcode = async (params) => { export const importTemplate = () => { return request.download({ url: '/label/barcode/get-import-template' }) } + + + +// 启用 +export const enableOption = async (id: number) => { + return await request.enable({ url: `/label/barcode/enable?id=` + id }) +} +// 禁用 +export const disableOption = async (id: number) => { + return await request.disable({ url: `/label/barcode/disable?id=` + id }) +} \ No newline at end of file diff --git a/src/api/wms/bom/index.ts b/src/api/wms/bom/index.ts index 84fa225de..25829588e 100644 --- a/src/api/wms/bom/index.ts +++ b/src/api/wms/bom/index.ts @@ -8,7 +8,7 @@ export interface BomVO { processCode: string version: string layer: number - available: number + available: string activeTime: Date expireTime: Date remark: string @@ -32,6 +32,7 @@ export const getBom = async (id: number) => { // 新增物料清单 export const createBom = async (data: BomVO) => { + data.available = 'TRUE' return await request.post({ url: `/wms/bom/create`, data }) } @@ -59,3 +60,14 @@ export const exportBom = async (params) => { export const importTemplate = () => { return request.download({ url: '/wms/bom/get-import-template' }) } + + +// 启用 +export const enableOption = async (id: number) => { + return await request.enable({ url: `/wms/bom/enable?id=` + id }) +} +// 禁用 +export const disableOption = async (id: number) => { + return await request.disable({ url: `/wms/bom/disable?id=` + id }) +} + diff --git a/src/api/wms/callmaterials/index.ts b/src/api/wms/callmaterials/index.ts index 198efd9cc..27df36a57 100644 --- a/src/api/wms/callmaterials/index.ts +++ b/src/api/wms/callmaterials/index.ts @@ -9,6 +9,7 @@ export interface CallmaterialsVO { location: string qty: number uom: string + available: string } // 查询叫料标签列表 @@ -29,6 +30,7 @@ export const getCallmaterials = async (id: number) => { // 新增叫料标签 export const createCallmaterials = async (data: CallmaterialsVO) => { + data.available = 'TRUE' return await request.post({ url: `/wms/callmaterials/create`, data }) } @@ -57,3 +59,13 @@ export const exportCallmaterials = async (params) => { export const importTemplate = () => { return request.download({ url: '/wms/callmaterials/get-import-template' }) } + + +// 启用 +export const enableOption = async (id: number) => { + return await request.enable({ url: `/wms/callmaterials/enable?id=` + id }) +} +// 禁用 +export const disableOption = async (id: number) => { + return await request.disable({ url: `/wms/callmaterials/disable?id=` + id }) +} \ No newline at end of file diff --git a/src/api/wms/carrier/index.ts b/src/api/wms/carrier/index.ts index 18d1c88fd..77f976aef 100644 --- a/src/api/wms/carrier/index.ts +++ b/src/api/wms/carrier/index.ts @@ -39,6 +39,7 @@ export const getCarrier = async (id: number) => { // 新增承运商 export const createCarrier = async (data: CarrierVO) => { + data.available = 'TRUE' return await request.post({ url: `/wms/carrier/create`, data }) } @@ -65,4 +66,14 @@ export const exportCarrier = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/carrier/get-import-template' }) +} + + +// 启用 +export const enableOption = async (id: number) => { + return await request.enable({ url: `/wms/carrier/enable?id=` + id }) +} +// 禁用 +export const disableOption = async (id: number) => { + return await request.disable({ url: `/wms/carrier/disable?id=` + id }) } \ No newline at end of file diff --git a/src/api/wms/currencyexchange/index.ts b/src/api/wms/currencyexchange/index.ts index 6e0777715..66347a7cf 100644 --- a/src/api/wms/currencyexchange/index.ts +++ b/src/api/wms/currencyexchange/index.ts @@ -4,7 +4,7 @@ export interface CurrencyexchangeVO { currency: string basiccurrency: string rate: number - available: number + available: string activeTime: Date expireTime: Date remark: string @@ -28,6 +28,7 @@ export const getCurrencyexchange = async (id: number) => { // 新增货币转换 export const createCurrencyexchange = async (data: CurrencyexchangeVO) => { + data.available = 'TRUE' return await request.post({ url: `/wms/currencyexchange/create`, data }) } @@ -54,4 +55,14 @@ export const exportCurrencyexchange = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/currencyexchange/get-import-template' }) +} + + +// 启用 +export const enableOption = async (id: number) => { + return await request.enable({ url: `/wms/currencyexchange/enable?id=` + id }) +} +// 禁用 +export const disableOption = async (id: number) => { + return await request.disable({ url: `/wms/currencyexchange/disable?id=` + id }) } \ No newline at end of file diff --git a/src/api/wms/customer/index.ts b/src/api/wms/customer/index.ts index 2ae4ee469..0a82231a0 100644 --- a/src/api/wms/customer/index.ts +++ b/src/api/wms/customer/index.ts @@ -15,7 +15,7 @@ export interface CustomerVO { currency: string taxRate: number type: string - available: number + available: string activeTime: Date expireTime: Date remark: string @@ -42,6 +42,7 @@ export const getCustomer = async (id: number) => { // 新增客户 export const createCustomer = async (data: CustomerVO) => { + data.available = 'TRUE' return await request.post({ url: `/wms/customer/create`, data }) } @@ -73,3 +74,13 @@ export const importTemplate = () => { export const getCustomerByCodes = async (params) => { return await request.get({ url: `/wms/customer/listByCodes`, params }) } + + +// 启用 +export const enableOption = async (id: number) => { + return await request.enable({ url: `/wms/customer/enable?id=` + id }) +} +// 禁用 +export const disableOption = async (id: number) => { + return await request.disable({ url: `/wms/customer/disable?id=` + id }) +} diff --git a/src/api/wms/customerdock/index.ts b/src/api/wms/customerdock/index.ts index a340407fe..22ff9d6eb 100644 --- a/src/api/wms/customerdock/index.ts +++ b/src/api/wms/customerdock/index.ts @@ -11,7 +11,7 @@ export interface CustomerdockVO { customerCode: string warehouseCode: string defaultLocationCode: string - available: number + available: string activeTime: Date expireTime: Date remark: string @@ -39,6 +39,7 @@ export const getCustomerdock = async (id: number) => { // 新增客户月台 export const createCustomerdock = async (data: CustomerdockVO) => { + data.available = 'TRUE' return await request.post({ url: `/wms/customerdock/create`, data }) } @@ -88,3 +89,12 @@ export const pageCustomerCodeToCustomerDockReceiving = async (params) => { return await request.get({ url: `/wms/customerdock/pageCustomerCodeToCustomerDockReceiving`, params }) } } + +// 启用 +export const enableOption = async (id: number) => { + return await request.enable({ url: `/wms/customerdock/enable?id=` + id }) +} +// 禁用 +export const disableOption = async (id: number) => { + return await request.disable({ url: `/wms/customerdock/disable?id=` + id }) +} diff --git a/src/api/wms/customeritem/index.ts b/src/api/wms/customeritem/index.ts index b9af7035d..606604a11 100644 --- a/src/api/wms/customeritem/index.ts +++ b/src/api/wms/customeritem/index.ts @@ -11,7 +11,7 @@ export interface CustomeritemVO { altPackUnit: string altPackQty: number packQtyOfContainer: number - available: number + available: string activeTime: Date expireTime: Date remark: string @@ -35,6 +35,7 @@ export const getCustomeritem = async (id: number) => { // 新增客户物料 export const createCustomeritem = async (data: CustomeritemVO) => { + data.available = 'TRUE' return await request.post({ url: `/wms/customeritem/create`, data }) } @@ -78,3 +79,13 @@ export const getPageBusinessTypeToItemCode = async (params) => { export const getCustomerItemListByCodes = async (data) => { return await request.get({ url: `/wms/customeritem/listByCodes?itemCodes=` + data.itemCodes + '&customerCode='+data.customerCode + '&businessType='+(data.businessType?data.businessType:'') }) } + + +// 启用 +export const enableOption = async (id: number) => { + return await request.enable({ url: `/wms/customeritem/enable?id=` + id }) +} +// 禁用 +export const disableOption = async (id: number) => { + return await request.disable({ url: `/wms/customeritem/disable?id=` + id }) +} diff --git a/src/api/wms/dock/index.ts b/src/api/wms/dock/index.ts index ece07e8e2..c46d8e342 100644 --- a/src/api/wms/dock/index.ts +++ b/src/api/wms/dock/index.ts @@ -11,7 +11,7 @@ export interface DockVO { defaultLocationCode: string contactPerson: string contactPhone: string - available: number + available: string activeTime: Date expireTime: Date remark: string @@ -38,6 +38,7 @@ export const getDock = async (id: number) => { // 新增月台 export const createDock = async (data: DockVO) => { + data.available = 'TRUE' return await request.post({ url: `/wms/dock/create`, data }) } @@ -64,4 +65,13 @@ export const exportDock = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/dock/get-import-template' }) +} + +// 启用 +export const enableOption = async (id: number) => { + return await request.enable({ url: `/wms/dock/enable?id=` + id }) +} +// 禁用 +export const disableOption = async (id: number) => { + return await request.disable({ url: `/wms/dock/disable?id=` + id }) } \ No newline at end of file diff --git a/src/api/wms/itemarea/index.ts b/src/api/wms/itemarea/index.ts index bf4973755..ac8d83f77 100644 --- a/src/api/wms/itemarea/index.ts +++ b/src/api/wms/itemarea/index.ts @@ -40,6 +40,7 @@ export const getItemarea = async (id: number) => { // 新增物料库区配置 export const createItemarea = async (data: ItemareaVO) => { + data.available = 'TRUE' return await request.post({ url: `/wms/itemarea/create`, data }) } @@ -66,4 +67,15 @@ export const exportItemarea = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/itemarea/get-import-template' }) -} \ No newline at end of file +} + + + +// 启用 +export const enableOption = async (id: number) => { + return await request.enable({ url: `/wms/itemarea/enable?id=` + id }) +} +// 禁用 +export const disableOption = async (id: number) => { + return await request.disable({ url: `/wms/itemarea/disable?id=` + id }) +} diff --git a/src/api/wms/itembasic/index.ts b/src/api/wms/itembasic/index.ts index 8698f7a3f..fd700dc55 100644 --- a/src/api/wms/itembasic/index.ts +++ b/src/api/wms/itembasic/index.ts @@ -23,10 +23,11 @@ export interface ItembasicVO { project: string eqLevel: string validityDays: number - available: number + available: string activeTime: Date expireTime: Date remark: string + } // 查询物料基本信息列表 @@ -50,6 +51,7 @@ export const getItembasic = async (id: number) => { // 新增物料基本信息 export const createItembasic = async (data: ItembasicVO) => { + data.available = 'TRUE' return await request.post({ url: `/wms/itembasic/create`, data }) } diff --git a/src/api/wms/itempackage/index.ts b/src/api/wms/itempackage/index.ts index 9fa24c8cb..9b9b018cd 100644 --- a/src/api/wms/itempackage/index.ts +++ b/src/api/wms/itempackage/index.ts @@ -13,7 +13,7 @@ export interface ItempackagingVO { altPackQty3: number altPackUnit4: string altPackQty4: number - available: number + available: string activeTime: Date expireTime: Date remark: string @@ -90,6 +90,7 @@ export const getItempackaging = async (id: number) => { // 新增物料包装信息 export const createItempackaging = async (data: ItempackagingVO) => { + data.available = 'TRUE' return await request.post({ url: `/wms/itempackage/create`, data }) } @@ -120,3 +121,14 @@ export const importTemplate = () => { export const getItemPackageunitListByCodes = async (data) => { return await request.get({ url: `/wms/itempackage/listByCodes?itemCode=` + data.itemCode + '&packUnit='+data.packUnit}) } + + +// 启用 +export const enableOption = async (id: number) => { + return await request.enable({ url: `/wms/itempackage/enable?id=` + id }) +} +// 禁用 +export const disableOption = async (id: number) => { + return await request.disable({ url: `/wms/itempackage/disable?id=` + id }) +} + diff --git a/src/api/wms/labeltype/index.ts b/src/api/wms/labeltype/index.ts index 148a1b95b..44c88cf10 100644 --- a/src/api/wms/labeltype/index.ts +++ b/src/api/wms/labeltype/index.ts @@ -19,6 +19,7 @@ export interface LabeltypeVO { labelCode: string isEncypt: string isCompress: string + available: string } // 查询标签定义列表 @@ -39,6 +40,7 @@ export const getLabeltype = async (id: number) => { // 新增标签定义 export const createLabeltype = async (data: LabeltypeVO) => { + data.available = 'TRUE' return await request.post({ url: `/wms/labeltype/create`, data }) } @@ -56,3 +58,12 @@ export const deleteLabeltype = async (id: number) => { export const exportLabeltype = async (params) => { return await request.download({ url: `/wms/labeltype/export-excel`, params }) } + +// 启用 +export const enableOption = async (id: number) => { + return await request.enable({ url: `/wms/labeltype/enable?id=` + id }) +} +// 禁用 +export const disableOption = async (id: number) => { + return await request.disable({ url: `/wms/labeltype/disable?id=` + id }) +} diff --git a/src/api/wms/location/index.ts b/src/api/wms/location/index.ts index 4cde26921..4b5dc96f2 100644 --- a/src/api/wms/location/index.ts +++ b/src/api/wms/location/index.ts @@ -18,7 +18,7 @@ export interface LocationVO { maxArea: number maxVolume: number userGroupCode: string - available: number + available: string activeTime: Date expireTime: Date remark: string @@ -69,6 +69,7 @@ export const getLocation = async (id: number) => { // 新增库位 export const createLocation = async (data: LocationVO) => { + data.available = 'TRUE' return await request.post({ url: `/wms/location/create`, data }) } @@ -168,4 +169,14 @@ export const getLocationByCodes = async (params) => { // 查询库位组列表 export const getLocationByOverflowAreaTypeByConfig = async (params) => { return await request.get({ url: `/wms/location/queryLocationByOverflowAreaTypeByConfig`, params }) -} \ No newline at end of file +} + + +// 启用 +export const enableOption = async (id: number) => { + return await request.enable({ url: `/wms/location/enable?id=` + id }) +} +// 禁用 +export const disableOption = async (id: number) => { + return await request.disable({ url: `/wms/location/disable?id=` + id }) +} diff --git a/src/api/wms/locationgroup/index.ts b/src/api/wms/locationgroup/index.ts index 7e84e6c05..9ec4be14c 100644 --- a/src/api/wms/locationgroup/index.ts +++ b/src/api/wms/locationgroup/index.ts @@ -6,7 +6,7 @@ export interface LocationgroupVO { description: string warehouseCode: string areaCode: string - available: number + available: string activeTime: Date expireTime: Date remark: string @@ -38,6 +38,7 @@ export const getLocationgroup = async (id: number) => { // 新增库位组 export const createLocationgroup = async (data: LocationgroupVO) => { + data.available = 'TRUE' return await request.post({ url: `/wms/locationgroup/create`, data }) } @@ -70,3 +71,13 @@ export const importTemplate = () => { export const getLocationgroupByCodes = async (params) => { return await request.get({ url: `/wms/locationgroup/listByCodes`, params }) } + + +// 启用 +export const enableOption = async (id: number) => { + return await request.enable({ url: `/wms/locationgroup/enable?id=` + id }) +} +// 禁用 +export const disableOption = async (id: number) => { + return await request.disable({ url: `/wms/locationgroup/disable?id=` + id }) +} \ No newline at end of file diff --git a/src/api/wms/mesBarCode/index.ts b/src/api/wms/mesBarCode/index.ts index 4d1e9b9c5..345464c6a 100644 --- a/src/api/wms/mesBarCode/index.ts +++ b/src/api/wms/mesBarCode/index.ts @@ -41,6 +41,7 @@ export const getMesBarCode = async (id: number) => { // 新增生产条码清单 export const createMesBarCode = async (data: MesBarCodeVO) => { + data.available = 'TRUE' return await request.post({ url: `/wms/mes-bar-code/create`, data }) } @@ -69,3 +70,13 @@ export const exportMesBarCode = async (params) => { export const importTemplate = () => { return request.download({ url: '/wms/mes-bar-code/get-import-template' }) } + + +// 启用 +export const enableOption = async (id: number) => { + return await request.enable({ url: `/wms/mes-bar-code/enable?id=` + id }) +} +// 禁用 +export const disableOption = async (id: number) => { + return await request.disable({ url: `/wms/mes-bar-code/disable?id=` + id }) +} \ No newline at end of file diff --git a/src/api/wms/mstr/index.ts b/src/api/wms/mstr/index.ts index f34bc2a89..13aa4b657 100644 --- a/src/api/wms/mstr/index.ts +++ b/src/api/wms/mstr/index.ts @@ -11,7 +11,8 @@ export interface MstrVO { remark: string extraProperties: string concurrencyStamp: number - siteId: string + siteId: string, + available: string } // 查询产品类信息列表 @@ -32,6 +33,7 @@ export const getMstr = async (id: number) => { // 新增产品类信息 export const createMstr = async (data: MstrVO) => { + data.available = 'TRUE' return await request.post({ url: `/wms/mstr/create`, data }) } @@ -53,4 +55,14 @@ export const exportMstr = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/mstr/get-import-template' }) +} + + +// 启用 +export const enableOption = async (id: number) => { + return await request.enable({ url: `/wms/mstr/enable?id=` + id }) +} +// 禁用 +export const disableOption = async (id: number) => { + return await request.disable({ url: `/wms/mstr/disable?id=` + id }) } \ No newline at end of file diff --git a/src/api/wms/owner/index.ts b/src/api/wms/owner/index.ts index e3e876161..0aabec54e 100644 --- a/src/api/wms/owner/index.ts +++ b/src/api/wms/owner/index.ts @@ -42,6 +42,7 @@ export const getOwner = async (id: number) => { // 新增货主 export const createOwner = async (data: OwnerVO) => { + data.available = 'TRUE' return await request.post({ url: `/wms/owner/create`, data }) } @@ -73,4 +74,14 @@ export const importTemplate = () => { // 根据code获取数据列表 export const getOwnerByCodes = async (params) => { return await request.get({ url: `/wms/owner/listByCodes`, params }) -} \ No newline at end of file +} + + +// 启用 +export const enableOption = async (id: number) => { + return await request.enable({ url: `/wms/owner/enable?id=` + id }) +} +// 禁用 +export const disableOption = async (id: number) => { + return await request.disable({ url: `/wms/owner/disable?id=` + id }) +} diff --git a/src/api/wms/packageunit/index.ts b/src/api/wms/packageunit/index.ts index 94f053f3a..eeb712103 100644 --- a/src/api/wms/packageunit/index.ts +++ b/src/api/wms/packageunit/index.ts @@ -60,6 +60,7 @@ export const getPackageunit = async (id: number) => { // 新增物品包装规格信息 export const createPackageunit = async (data: PackageunitVO) => { + data.available = 'TRUE' return await request.post({ url: `/wms/packageunit/create`, data }) } @@ -93,3 +94,14 @@ export const importTemplate = () => { export const getPackageunitListByCodes = async (codes: string) => { return await request.get({ url: `/wms/packageunit/listByCodes?codes=` + codes }) } + + + +// 启用 +export const enableOption = async (id: number) => { + return await request.enable({ url: `/wms/packageunit/enable?id=` + id }) +} +// 禁用 +export const disableOption = async (id: number) => { + return await request.disable({ url: `/wms/packageunit/disable?id=` + id }) +} \ No newline at end of file diff --git a/src/api/wms/process/index.ts b/src/api/wms/process/index.ts index dda9c6de1..c8cf39d28 100644 --- a/src/api/wms/process/index.ts +++ b/src/api/wms/process/index.ts @@ -7,7 +7,7 @@ export interface ProcessVO { type: string workshopCode: string productionLineCode: string - available: number + available: string activeTime: Date expireTime: Date remark: string @@ -31,6 +31,7 @@ export const getProcess = async (id: number) => { // 新增工序 export const createProcess = async (data: ProcessVO) => { + data.available = 'TRUE' return await request.post({ url: `/wms/process/create`, data }) } @@ -67,4 +68,14 @@ export const getProcessNoPage = async (params) => { // 根据code获取数据列表 export const getProcessByCodes = async (params) => { return await request.get({ url: `/wms/process/listByCodes`, params }) +} + + +// 启用 +export const enableOption = async (id: number) => { + return await request.enable({ url: `/wms/process/enable?id=` + id }) +} +// 禁用 +export const disableOption = async (id: number) => { + return await request.disable({ url: `/wms/process/disable?id=` + id }) } \ No newline at end of file diff --git a/src/api/wms/productionitemcodeSpareitemcode/index.ts b/src/api/wms/productionitemcodeSpareitemcode/index.ts index 69a32a030..43521e12e 100644 --- a/src/api/wms/productionitemcodeSpareitemcode/index.ts +++ b/src/api/wms/productionitemcodeSpareitemcode/index.ts @@ -37,6 +37,7 @@ export const getProductionitemcodeSpareitemcode = async (id: number) => { // 新增量产件备件关系 export const createProductionitemcodeSpareitemcode = async (data: ProductionitemcodeSpareitemcodeVO) => { + data.available = 'TRUE' return await request.post({ url: `/wms/productionitemcode-spareitemcode/create`, data }) } @@ -58,4 +59,14 @@ export const exportProductionitemcodeSpareitemcode = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/productionitemcode-spareitemcode/get-import-template' }) -} \ No newline at end of file +} + + +// 启用 +export const enableOption = async (id: number) => { + return await request.enable({ url: `/wms/productionitemcode-spareitemcode/enable?id=` + id }) +} +// 禁用 +export const disableOption = async (id: number) => { + return await request.disable({ url: `/wms/productionitemcode-spareitemcode/disable?id=` + id }) +} diff --git a/src/api/wms/productionline/index.ts b/src/api/wms/productionline/index.ts index 3a0176b79..b5fd08bf9 100644 --- a/src/api/wms/productionline/index.ts +++ b/src/api/wms/productionline/index.ts @@ -8,7 +8,7 @@ export interface ProductionlineVO { workshopCode: string rawLocationCode: string fgLocationCode: string - available: number + available: string activeTime: Date expireTime: Date remark: string @@ -32,6 +32,7 @@ export const getProductionline = async (id: number) => { // 新增生产线 export const createProductionline = async (data: ProductionlineVO) => { + data.available = 'TRUE' return await request.post({ url: `/wms/productionline/create`, data }) } @@ -69,4 +70,14 @@ export const getProductionlineNoPage = async (params) => { // 根据code获取数据列表 export const getProductionlineByCodes = async (params) => { return await request.get({ url: `/wms/productionline/listByCodes`, params }) +} + + +// 启用 +export const enableOption = async (id: number) => { + return await request.enable({ url: `/wms/productionline/enable?id=` + id }) +} +// 禁用 +export const disableOption = async (id: number) => { + return await request.disable({ url: `/wms/productionline/disable?id=` + id }) } \ No newline at end of file diff --git a/src/api/wms/productionlineitem/index.ts b/src/api/wms/productionlineitem/index.ts index 29715b3fe..e3975c07a 100644 --- a/src/api/wms/productionlineitem/index.ts +++ b/src/api/wms/productionlineitem/index.ts @@ -4,7 +4,7 @@ export interface ProductionlineitemVO { fgLocationCode: string productionLineCode: string itemCode: string - available: number + available: string activeTime: Date expireTime: Date remark: string @@ -52,6 +52,7 @@ export const getProductionlineitem = async (id: number) => { // 新增生产线物料关系 export const createProductionlineitem = async (data: ProductionlineitemVO) => { + data.available = 'TRUE' return await request.post({ url: `/wms/productionlineitem/create`, data }) } @@ -87,4 +88,13 @@ export const getProductionLineCodelistByCodes = async (params) => { export const selectItemCodeToProductionLineCode = async (itemCode: String) => { return await request.get({ url: `/wms/productionlineitem/selectItemCodeToProductionLineCode?itemCode=` + itemCode }) -} \ No newline at end of file +} + +// 启用 +export const enableOption = async (id: number) => { + return await request.enable({ url: `/wms/productionlineitem/enable?id=` + id }) +} +// 禁用 +export const disableOption = async (id: number) => { + return await request.disable({ url: `/wms/productionlineitem/disable?id=` + id }) +} diff --git a/src/api/wms/project/index.ts b/src/api/wms/project/index.ts index 2689abd43..a25e5c3a0 100644 --- a/src/api/wms/project/index.ts +++ b/src/api/wms/project/index.ts @@ -5,7 +5,7 @@ export interface ProjectVO { name: string description: string customerCode: string - available: number + available: string activeTime: Date expireTime: Date remark: string @@ -29,6 +29,7 @@ export const getProject = async (id: number) => { // 新增项目 export const createProject = async (data: ProjectVO) => { + data.available = 'TRUE' return await request.post({ url: `/wms/project/create`, data }) } @@ -55,4 +56,14 @@ export const exportProject = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/project/get-import-template' }) +} + + +// 启用 +export const enableOption = async (id: number) => { + return await request.enable({ url: `/wms/project/enable?id=` + id }) +} +// 禁用 +export const disableOption = async (id: number) => { + return await request.disable({ url: `/wms/project/disable?id=` + id }) } \ No newline at end of file diff --git a/src/api/wms/purchaseprice/index.ts b/src/api/wms/purchaseprice/index.ts index 03c6af883..87302294d 100644 --- a/src/api/wms/purchaseprice/index.ts +++ b/src/api/wms/purchaseprice/index.ts @@ -5,7 +5,7 @@ export interface PurchasepriceVO { itemCode: string currency: string price: number - available: number + available: string activeTime: Date expireTime: Date remark: string @@ -40,6 +40,7 @@ export const getPurchaseprice = async (id: number) => { // 新增采购价格单 export const createPurchaseprice = async (data: PurchasepriceVO) => { + data.available = 'TRUE' return await request.post({ url: `/wms/purchaseprice/create`, data }) } @@ -77,3 +78,13 @@ export const exportPurchasepriceSCP = async (params) => { export const importTemplate = () => { return request.download({ url: '/wms/purchaseprice/get-import-template' }) } + + +// 启用 +export const enableOption = async (id: number) => { + return await request.enable({ url: `/wms/purchaseprice/enable?id=` + id }) +} +// 禁用 +export const disableOption = async (id: number) => { + return await request.disable({ url: `/wms/purchaseprice/disable?id=` + id }) +} \ No newline at end of file diff --git a/src/api/wms/saleprice/index.ts b/src/api/wms/saleprice/index.ts index 6ac634e3d..4576e341a 100644 --- a/src/api/wms/saleprice/index.ts +++ b/src/api/wms/saleprice/index.ts @@ -5,7 +5,7 @@ export interface SalepriceVO { itemcode: string currency: string price: number - available: number + available: string activeTime: Date expireTime: Date remark: string @@ -29,6 +29,7 @@ export const getSaleprice = async (id: number) => { // 新增销售价格单 export const createSaleprice = async (data: SalepriceVO) => { + data.available = 'TRUE' return await request.post({ url: `/wms/saleprice/create`, data }) } @@ -55,4 +56,15 @@ export const exportSaleprice = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/saleprice/get-import-template' }) +} + + + +// 启用 +export const enableOption = async (id: number) => { + return await request.enable({ url: `/wms/saleprice/enable?id=` + id }) +} +// 禁用 +export const disableOption = async (id: number) => { + return await request.disable({ url: `/wms/saleprice/disable?id=` + id }) } \ No newline at end of file diff --git a/src/api/wms/shift/index.ts b/src/api/wms/shift/index.ts index f663b794f..1cf875f08 100644 --- a/src/api/wms/shift/index.ts +++ b/src/api/wms/shift/index.ts @@ -31,6 +31,7 @@ export const getShift = async (id: number) => { // 新增班次 export const createShift = async (data: ShiftVO) => { + data.available = 'TRUE' return await request.post({ url: `/wms/shift/create`, data }) } @@ -57,4 +58,14 @@ export const exportShift = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/shift/get-import-template' }) +} + + +// 启用 +export const enableOption = async (id: number) => { + return await request.enable({ url: `/wms/shift/enable?id=` + id }) +} +// 禁用 +export const disableOption = async (id: number) => { + return await request.disable({ url: `/wms/shift/disable?id=` + id }) } \ No newline at end of file diff --git a/src/api/wms/stdcostprice/index.ts b/src/api/wms/stdcostprice/index.ts index 171b6a907..08b089ba5 100644 --- a/src/api/wms/stdcostprice/index.ts +++ b/src/api/wms/stdcostprice/index.ts @@ -5,7 +5,7 @@ export interface StdcostpriceVO { itemCode: string currency: string price: number - available: number + available: string activeTime: Date expireTime: Date remark: string @@ -29,6 +29,7 @@ export const getStdcostprice = async (id: number) => { // 新增标准成本价格单 export const createStdcostprice = async (data: StdcostpriceVO) => { + data.available = 'TRUE' return await request.post({ url: `/wms/stdcostprice/create`, data }) } @@ -61,4 +62,14 @@ export const importTemplate = () => { // 查询标准成本价格单列表 export const queryStdcostpriceByItemCode = async (data) => { return await request.post({ url: `/wms/stdcostprice/queryStdcostpriceByItemCode`, data }) -} \ No newline at end of file +} + + +// 启用 +export const enableOption = async (id: number) => { + return await request.enable({ url: `/wms/stdcostprice/enable?id=` + id }) +} +// 禁用 +export const disableOption = async (id: number) => { + return await request.disable({ url: `/wms/stdcostprice/disable?id=` + id }) +} diff --git a/src/api/wms/subjectAccount/index.ts b/src/api/wms/subjectAccount/index.ts index 351203c3c..02ea77099 100644 --- a/src/api/wms/subjectAccount/index.ts +++ b/src/api/wms/subjectAccount/index.ts @@ -37,6 +37,7 @@ export const getSubjectAccount = async (id: number) => { // 新增科目账户配置 export const createSubjectAccount = async (data: SubjectAccountVO) => { + data.available = 'TRUE' return await request.post({ url: `/wms/subject-account/create`, data }) } @@ -63,4 +64,14 @@ export const exportSubjectAccount = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/subject-account/get-import-template' }) -} \ No newline at end of file +} + + +// 启用 +export const enableOption = async (id: number) => { + return await request.enable({ url: `/wms/subject-account/enable?id=` + id }) +} +// 禁用 +export const disableOption = async (id: number) => { + return await request.disable({ url: `/wms/subject-account/disable?id=` + id }) +} diff --git a/src/api/wms/supplier/index.ts b/src/api/wms/supplier/index.ts index 33bd05fc4..79f9ec1ec 100644 --- a/src/api/wms/supplier/index.ts +++ b/src/api/wms/supplier/index.ts @@ -15,7 +15,7 @@ export interface SupplierVO { currency: string taxRate: number type: string - available: number + available: string activeTime: Date expireTime: Date remark: string @@ -55,6 +55,7 @@ export const getSupplier = async (id: number) => { // 新增供应商 export const createSupplier = async (data: SupplierVO) => { + data.available = 'TRUE' return await request.post({ url: `/wms/supplier/create`, data }) } @@ -99,3 +100,11 @@ export const getSupplierListByCodes = async (params) => { return await request.get({ url: `/wms/supplier/listByCodes`, params }) } +// 启用 +export const enableOption = async (id: number) => { + return await request.enable({ url: `/wms/supplier/enable?id=` + id }) +} +// 禁用 +export const disableOption = async (id: number) => { + return await request.disable({ url: `/wms/supplier/disable?id=` + id }) +} \ No newline at end of file diff --git a/src/api/wms/supplieritem/index.ts b/src/api/wms/supplieritem/index.ts index 274469390..373f617f0 100644 --- a/src/api/wms/supplieritem/index.ts +++ b/src/api/wms/supplieritem/index.ts @@ -14,7 +14,7 @@ export interface SupplieritemVO { defaultWarehouseCode: string defaultLocationCode: string settlementType: string - available: number + available: string activeTime: Date expireTime: Date remark: string @@ -49,9 +49,11 @@ export const getSupplieritem = async (id: number) => { // 新增供应商物料 export const createSupplieritem = async (data: SupplieritemVO) => { + data.available = 'TRUE' return await request.post({ url: `/wms/supplieritem/create`, data }) } export const createSupplieritemSCP = async (data: SupplieritemVO) => { + data.available = 'TRUE' return await request.post({ url: `/wms/supplieritem/createSCP`, data }) } @@ -117,3 +119,13 @@ export const getDefaultLocationCode = async(data: SupplieritemVO)=> { export const getSupplierItemListByCodes = async (data) => { return await request.get({ url: `/wms/supplieritem/listByCodes?supplierCode=`+data.supplierCode +'&itemCodes='+data.itemCodes }) } + + +// 启用 +export const enableOption = async (id: number) => { + return await request.enable({ url: `/wms/supplieritem/enable?id=` + id }) +} +// 禁用 +export const disableOption = async (id: number) => { + return await request.disable({ url: `/wms/supplieritem/disable?id=` + id }) +} \ No newline at end of file diff --git a/src/api/wms/systemcalendar/index.ts b/src/api/wms/systemcalendar/index.ts index 0499f49c9..157d6b7c4 100644 --- a/src/api/wms/systemcalendar/index.ts +++ b/src/api/wms/systemcalendar/index.ts @@ -4,7 +4,7 @@ export interface SystemcalendarVO { module: string startTime: Date stopTime: Date - available: number + available: string activeTime: Date expireTime: Date remark: string @@ -28,6 +28,7 @@ export const getSystemcalendar = async (id: number) => { // 新增系统日历 export const createSystemcalendar = async (data: SystemcalendarVO) => { + data.available = 'TRUE' return await request.post({ url: `/wms/systemcalendar/create`, data }) } @@ -54,4 +55,14 @@ export const exportSystemcalendar = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/systemcalendar/get-import-template' }) +} + + +// 启用 +export const enableOption = async (id: number) => { + return await request.enable({ url: `/wms/systemcalendar/enable?id=` + id }) +} +// 禁用 +export const disableOption = async (id: number) => { + return await request.disable({ url: `/wms/systemcalendar/disable?id=` + id }) } \ No newline at end of file diff --git a/src/api/wms/team/index.ts b/src/api/wms/team/index.ts index ea1ee0a98..390c1c29b 100644 --- a/src/api/wms/team/index.ts +++ b/src/api/wms/team/index.ts @@ -45,6 +45,7 @@ export const getTeam = async (id: number) => { // 新增班组 export const createTeam = async (data: TeamVO) => { + data.available = 'TRUE' return await request.post({ url: `/wms/team/create`, data }) } @@ -72,3 +73,13 @@ export const exportTeam = async (params) => { export const importTemplate = () => { return request.download({ url: '/wms/team/get-import-template' }) } + + +// 启用 +export const enableOption = async (id: number) => { + return await request.enable({ url: `/wms/team/enable?id=` + id }) +} +// 禁用 +export const disableOption = async (id: number) => { + return await request.disable({ url: `/wms/team/disable?id=` + id }) +} \ No newline at end of file diff --git a/src/api/wms/warehouse/index.ts b/src/api/wms/warehouse/index.ts index 51e6eb71e..4d98aaeea 100644 --- a/src/api/wms/warehouse/index.ts +++ b/src/api/wms/warehouse/index.ts @@ -5,7 +5,7 @@ export interface WarehouseVO { name: string description: string type: string - available: number + available: string activeTime: Date expireTime: Date remark: string @@ -39,6 +39,7 @@ export const getWarehouse = async (id: number) => { // 新增仓库 export const createWarehouse = async (data: WarehouseVO) => { + data.available = 'TRUE' return await request.post({ url: `/wms/warehouse/create`, data }) } @@ -80,4 +81,14 @@ export const pageBusinessTypeToWarehouse = async (params) => { // 根据code获取数据列表 export const getWarehouseByCodes = async (params) => { return await request.get({ url: `/wms/warehouse/listByCodes`, params }) +} + + +// 启用 +export const enableOption = async (id: number) => { + return await request.enable({ url: `/wms/warehouse/enable?id=` + id }) +} +// 禁用 +export const disableOption = async (id: number) => { + return await request.disable({ url: `/wms/warehouse/disable?id=` + id }) } \ No newline at end of file diff --git a/src/api/wms/workshop/index.ts b/src/api/wms/workshop/index.ts index e2a23282a..1d5b8e5c8 100644 --- a/src/api/wms/workshop/index.ts +++ b/src/api/wms/workshop/index.ts @@ -5,7 +5,7 @@ export interface WorkshopVO { name: string description: string type: string - available: number + available: string activeTime: Date expireTime: Date remark: string @@ -29,6 +29,7 @@ export const getWorkshop = async (id: number) => { // 新增车间 export const createWorkshop = async (data: WorkshopVO) => { + data.available = 'TRUE' return await request.post({ url: `/wms/workshop/create`, data }) } @@ -60,4 +61,14 @@ export const importTemplate = () => { // 查询车间列表 export const getWorkshopNoPage = async (params) => { return await request.get({ url: `/wms/workshop/noPage`, params }) +} + + +// 启用 +export const enableOption = async (id: number) => { + return await request.enable({ url: `/wms/workshop/enable?id=` + id }) +} +// 禁用 +export const disableOption = async (id: number) => { + return await request.disable({ url: `/wms/workshop/disable?id=` + id }) } \ No newline at end of file diff --git a/src/api/wms/workstation/index.ts b/src/api/wms/workstation/index.ts index 499cf6987..db0af626e 100644 --- a/src/api/wms/workstation/index.ts +++ b/src/api/wms/workstation/index.ts @@ -9,7 +9,7 @@ export interface WorkstationVO { productionLineCode: string rawLocationCode: string fgLocationCode: string - available: number + available: string activeTime: Date expireTime: Date remark: string @@ -33,6 +33,7 @@ export const getWorkstation = async (id: number) => { // 新增工位 export const createWorkstation = async (data: WorkstationVO) => { + data.available = 'TRUE' return await request.post({ url: `/wms/workstation/create`, data }) } @@ -81,4 +82,14 @@ export const getWorkstationNoPage = async (params) => { // 根据code获取数据列表 export const getWorkstationByCodes = async (params) => { return await request.get({ url: `/wms/workstation/listByCodes`, params }) +} + + +// 启用 +export const enableOption = async (id: number) => { + return await request.enable({ url: `/wms/workstation/enable?id=` + id }) +} +// 禁用 +export const disableOption = async (id: number) => { + return await request.disable({ url: `/wms/workstation/disable?id=` + id }) } \ No newline at end of file diff --git a/src/directives/permission/hasPermi.ts b/src/directives/permission/hasPermi.ts index d86d2f54c..43d0ed232 100644 --- a/src/directives/permission/hasPermi.ts +++ b/src/directives/permission/hasPermi.ts @@ -9,7 +9,6 @@ export function hasPermi(app: App) { const { value } = binding const all_permission = '*:*:*' const permissions = wsCache.get(CACHE_KEY.USER).permissions - if (value && value instanceof Array && value.length > 0) { const permissionFlag = value diff --git a/src/views/qms/aql/index.vue b/src/views/qms/aql/index.vue index 46edb659b..83346a22d 100644 --- a/src/views/qms/aql/index.vue +++ b/src/views/qms/aql/index.vue @@ -344,7 +344,7 @@ const onChange = async (field, value, formRef) => { /** 初始化 **/ onMounted(async () => { tableObject.params = { - available: true + available: 'TRUE' } getList() importTemplateData.templateUrl = await AqlApi.importTemplate() diff --git a/src/views/qms/counter/index.vue b/src/views/qms/counter/index.vue index d3f7f0717..fbe3ef756 100644 --- a/src/views/qms/counter/index.vue +++ b/src/views/qms/counter/index.vue @@ -272,7 +272,7 @@ const searchFormClick = (searchData) => { /** 初始化 **/ onMounted(async () => { tableObject.params = { - available: true + available: 'TRUE' } getList() importTemplateData.templateUrl = await CounterApi.importTemplate() diff --git a/src/views/qms/dynamicRule/index.vue b/src/views/qms/dynamicRule/index.vue index 5b92d1745..394c8e223 100644 --- a/src/views/qms/dynamicRule/index.vue +++ b/src/views/qms/dynamicRule/index.vue @@ -464,7 +464,7 @@ const handleDetailSubmitForm = async (formType, data) => { /** 初始化 **/ onMounted(async () => { tableObject.params = { - available: true + available: 'TRUE' } getList() importTemplateData.templateUrl = await DynamicRuleApi.importTemplate() diff --git a/src/views/qms/inspectionMethod/index.vue b/src/views/qms/inspectionMethod/index.vue index dc1dca735..ea04c70f1 100644 --- a/src/views/qms/inspectionMethod/index.vue +++ b/src/views/qms/inspectionMethod/index.vue @@ -337,7 +337,7 @@ const searchFormClick = (searchData) => { /** 初始化 **/ onMounted(async () => { tableObject.params = { - available: true + available: 'TRUE' } getList() importTemplateData.templateUrl = await InspectionMethodApi.importTemplate() diff --git a/src/views/qms/inspectionScheme/index.vue b/src/views/qms/inspectionScheme/index.vue index 723f7763e..b6c3bd007 100644 --- a/src/views/qms/inspectionScheme/index.vue +++ b/src/views/qms/inspectionScheme/index.vue @@ -329,7 +329,7 @@ const importSuccess = () => { /** 初始化 **/ onMounted(async () => { tableObject.params = { - available: true + available: 'TRUE' } getList() importTemplateData.templateUrl = await InspectionSchemeApi.importTemplate() diff --git a/src/views/qms/inspectionTemplate/index.vue b/src/views/qms/inspectionTemplate/index.vue index 1ba2289e8..0a6c4fd41 100644 --- a/src/views/qms/inspectionTemplate/index.vue +++ b/src/views/qms/inspectionTemplate/index.vue @@ -299,7 +299,7 @@ const importSuccess = () => { /** 初始化 **/ onMounted(async () => { tableObject.params = { - available: true + available: 'TRUE' } getList() importTemplateData.templateUrl = await InspectionProcessPageApi.importTemplate() diff --git a/src/views/qms/sampleCode/index.vue b/src/views/qms/sampleCode/index.vue index 18204295e..809657373 100644 --- a/src/views/qms/sampleCode/index.vue +++ b/src/views/qms/sampleCode/index.vue @@ -324,7 +324,7 @@ const onChange = async (field, value, formRef) => { /** 初始化 **/ onMounted(async () => { tableObject.params = { - available: true + available: 'TRUE' } getList() importTemplateData.templateUrl = await SampleCodeApi.importTemplate() diff --git a/src/views/qms/samplingProcess/index.vue b/src/views/qms/samplingProcess/index.vue index 930106834..f4cc4a7ca 100644 --- a/src/views/qms/samplingProcess/index.vue +++ b/src/views/qms/samplingProcess/index.vue @@ -388,7 +388,7 @@ const searchFormClick = (searchData) => { /** 初始化 **/ onMounted(async () => { tableObject.params = { - available: true + available: 'TRUE' } getList() importTemplateData.templateUrl = await SamplingProcessApi.importTemplate() diff --git a/src/views/qms/samplingScheme/index.vue b/src/views/qms/samplingScheme/index.vue index 41b030803..dd2c9dabd 100644 --- a/src/views/qms/samplingScheme/index.vue +++ b/src/views/qms/samplingScheme/index.vue @@ -305,7 +305,7 @@ const searchFormClick = (searchData) => { /** 初始化 **/ onMounted(async () => { tableObject.params = { - available: true + available: 'TRUE' } getList() importTemplateData.templateUrl = await SamplingSchemeApi.importTemplate() diff --git a/src/views/qms/selectedSet/index.vue b/src/views/qms/selectedSet/index.vue index 08d1a9d4e..1e0a4c38f 100644 --- a/src/views/qms/selectedSet/index.vue +++ b/src/views/qms/selectedSet/index.vue @@ -481,7 +481,7 @@ const handleDetailSubmitForm = async (formType, data) => { /** 初始化 **/ onMounted(async () => { tableObject.params = { - available: true + available: 'TRUE' } getList() importTemplateData.templateUrl = await SelectedSetApi.importTemplate() diff --git a/src/views/wms/agvManage/agvLocationrelation/agvLocationrelation.data.ts b/src/views/wms/agvManage/agvLocationrelation/agvLocationrelation.data.ts index a144819ed..3edebdcca 100644 --- a/src/views/wms/agvManage/agvLocationrelation/agvLocationrelation.data.ts +++ b/src/views/wms/agvManage/agvLocationrelation/agvLocationrelation.data.ts @@ -114,13 +114,13 @@ export const AgvLocationrelation = useCrudSchemas(reactive([ { label: '是否可用', field: 'available', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isTable: true, - isSearch: false, sort: 'custom', - table: { - width: 150 + isSearch:true, + isForm: false, + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + search: { + value: 'TRUE', }, form: { component: 'Switch', @@ -129,6 +129,9 @@ export const AgvLocationrelation = useCrudSchemas(reactive([ inactiveValue: 'FALSE', activeValue: 'TRUE' } + }, + table: { + width: 110 } }, { diff --git a/src/views/wms/agvManage/agvLocationrelation/index.vue b/src/views/wms/agvManage/agvLocationrelation/index.vue index e10115293..827c99a2c 100644 --- a/src/views/wms/agvManage/agvLocationrelation/index.vue +++ b/src/views/wms/agvManage/agvLocationrelation/index.vue @@ -33,7 +33,7 @@ @@ -143,11 +143,22 @@ const buttonBaseClick = (val, item) => { } } +const isShowMainButton = (row, val) => { + if (val.indexOf(row.available) > -1) { + return false + } else { + return true + } +} + // 列表-操作按钮 -const butttondata = [ - defaultButtons.mainListEditBtn({hasPermi:'wms:agv-locationrelation:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:agv-locationrelation:delete'}), // 删除 -] +const butttondata = (row) => { + return[ + defaultButtons.mainListEditBtn({hasPermi:'wms:agv-locationrelation:update'}), // 编辑 + defaultButtons.mainListEnableBtn({hide: isShowMainButton(row, ['FALSE']),hasPermi: 'wms:agv-locationrelation:enable'}), //启用 + defaultButtons.mainListDisableBtn({hide: isShowMainButton(row, ['TRUE']),hasPermi: 'wms:agv-locationrelation:disable'}), //停用 + defaultButtons.mainListDeleteBtn({hasPermi:'wms:agv-locationrelation:delete'}), // 删除 +]} // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { @@ -155,9 +166,36 @@ const buttonTableClick = async (val, row) => { openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.id) + } else if (val == 'enable') { + handleEnable(row.id) + } else if (val == 'disable') { + handleDisable(row.id) } + +} + + +const handleEnable = async (id: number) => { + try { + await AgvLocationrelationApi.enableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} } + +const handleDisable = async (id: number) => { + try { + await AgvLocationrelationApi.disableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + + /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: any) => { @@ -278,6 +316,9 @@ const searchFormClick = (searchData) => { /** 初始化 **/ onMounted(async () => { + tableObject.params = { + available: 'TRUE' + } getList() importTemplateData.templateUrl = await AgvLocationrelationApi.importTemplate() }) diff --git a/src/views/wms/basicDataManage/customerManage/customer/customer.data.ts b/src/views/wms/basicDataManage/customerManage/customer/customer.data.ts index 7f0add9a9..9c1472a0a 100644 --- a/src/views/wms/basicDataManage/customerManage/customer/customer.data.ts +++ b/src/views/wms/basicDataManage/customerManage/customer/customer.data.ts @@ -139,13 +139,13 @@ export const Customer = useCrudSchemas(reactive([ { label: '是否可用', field: 'available', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isTable: true, - isSearch: true, sort: 'custom', - table: { - width: 150 + isSearch:true, + isForm: false, + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + search: { + value: 'TRUE', }, form: { component: 'Switch', @@ -155,6 +155,9 @@ export const Customer = useCrudSchemas(reactive([ activeValue: 'TRUE' } }, + table: { + width: 110 + } }, { label: '生效时间', diff --git a/src/views/wms/basicDataManage/customerManage/customer/index.vue b/src/views/wms/basicDataManage/customerManage/customer/index.vue index ee7cccf37..99931fae0 100644 --- a/src/views/wms/basicDataManage/customerManage/customer/index.vue +++ b/src/views/wms/basicDataManage/customerManage/customer/index.vue @@ -33,7 +33,7 @@ @@ -132,11 +132,24 @@ const buttonBaseClick = (val, item) => { } } +const isShowMainButton = (row, val) => { + if (val.indexOf(row.available) > -1) { + return false + } else { + return true + } +} + // 列表-操作按钮 -const butttondata = [ +const butttondata = (row) => { + return[ defaultButtons.mainListEditBtn({hasPermi:'wms:customer:update'}), // 编辑 + defaultButtons.mainListEnableBtn({hide: isShowMainButton(row, ['FALSE']),hasPermi: 'wms:customer:enable'}), + defaultButtons.mainListDisableBtn({hide: isShowMainButton(row, ['TRUE']),hasPermi: 'wms:customer:disable'}), defaultButtons.mainListDeleteBtn({hasPermi:'wms:customer:delete'}), // 删除 -] +]} + + // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { @@ -145,9 +158,32 @@ const buttonTableClick = async (val, row) => { openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.id) + } else if (val == 'enable') { + handleEnable(row.id) + } else if (val == 'disable') { + handleDisable(row.id) } } +const handleEnable = async (id: number) => { + try { + await CustomerApi.enableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + +const handleDisable = async (id: number) => { + try { + await CustomerApi.disableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: any) => { @@ -268,6 +304,9 @@ const searchFormClick = (searchData) => { /** 初始化 **/ onMounted(async() => { + tableObject.params = { + available: 'TRUE' + } getList() importTemplateData.templateUrl = await CustomerApi.importTemplate() }) diff --git a/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts b/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts index 55f5941d9..bf127e7f8 100644 --- a/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts +++ b/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts @@ -191,22 +191,25 @@ export const Customerdock = useCrudSchemas(reactive([ { label: '是否可用', field: 'available', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isSearch: true, sort: 'custom', - table: { - width: 150 + isSearch:true, + isForm: false, + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + search: { + value: 'TRUE', }, form: { component: 'Switch', value: 'TRUE', componentProps: { inactiveValue: 'FALSE', - activeValue: 'TRUE', - disabled: true + activeValue: 'TRUE' } }, + table: { + width: 110 + } }, { label: '生效时间', diff --git a/src/views/wms/basicDataManage/customerManage/customerdock/index.vue b/src/views/wms/basicDataManage/customerManage/customerdock/index.vue index eed1bd1e9..d4b08dbb9 100644 --- a/src/views/wms/basicDataManage/customerManage/customerdock/index.vue +++ b/src/views/wms/basicDataManage/customerManage/customerdock/index.vue @@ -28,12 +28,12 @@ v-model:sort="tableObject.sort" > @@ -131,11 +131,22 @@ const buttonBaseClick = (val, item) => { } } +const isShowMainButton = (row, val) => { + if (val.indexOf(row.available) > -1) { + return false + } else { + return true + } +} + // 列表-操作按钮 -const butttondata = [ - defaultButtons.mainListEditBtn({hasPermi:'wms:customerdock:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:customerdock:delete'}), // 删除 -] +const butttondata = (row) => { + return[ + defaultButtons.mainListEditBtn({hasPermi:'wms:customerdock:update'}), // 编辑 + defaultButtons.mainListEnableBtn({hide: isShowMainButton(row, ['FALSE']),hasPermi: 'wms:customerdock:enable'}), + defaultButtons.mainListDisableBtn({hide: isShowMainButton(row, ['TRUE']),hasPermi: 'wms:customerdock:disable'}), + defaultButtons.mainListDeleteBtn({hasPermi:'wms:customerdock:delete'}), // 删除 +]} // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { @@ -144,9 +155,33 @@ const buttonTableClick = async (val, row) => { openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.id) + } else if (val == 'enable') { + handleEnable(row.id) + } else if (val == 'disable') { + handleDisable(row.id) } } +const handleEnable = async (id: number) => { + try { + await CustomerdockApi.enableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + +const handleDisable = async (id: number) => { + try { + await CustomerdockApi.disableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: any) => { @@ -282,6 +317,9 @@ const searchFormClick = (searchData) => { /** 初始化 **/ onMounted(async() => { + tableObject.params = { + available: 'TRUE' + } getList() importTemplateData.templateUrl = await CustomerdockApi.importTemplate() }) diff --git a/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts b/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts index 5372ea34b..01ead97f0 100644 --- a/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts +++ b/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts @@ -178,23 +178,25 @@ export const Customeritem = useCrudSchemas(reactive([ { label: '是否可用', field: 'available', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isTable: true, sort: 'custom', - table: { - width: 150 + isSearch:true, + isForm: false, + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + search: { + value: 'TRUE', }, form: { component: 'Switch', value: 'TRUE', componentProps: { inactiveValue: 'FALSE', - activeValue: 'TRUE', - // disabled: true + activeValue: 'TRUE' } }, - isSearch: true + table: { + width: 110 + } }, { label: '生效时间', diff --git a/src/views/wms/basicDataManage/customerManage/customeritem/index.vue b/src/views/wms/basicDataManage/customerManage/customeritem/index.vue index 40ea29d56..d51b95a7b 100644 --- a/src/views/wms/basicDataManage/customerManage/customeritem/index.vue +++ b/src/views/wms/basicDataManage/customerManage/customeritem/index.vue @@ -33,7 +33,7 @@ @@ -136,11 +136,22 @@ const buttonBaseClick = (val, item) => { } } +const isShowMainButton = (row, val) => { + if (val.indexOf(row.available) > -1) { + return false + } else { + return true + } +} + // 列表-操作按钮 -const butttondata = [ - defaultButtons.mainListEditBtn({hasPermi:'wms:customeritem:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:customeritem:delete'}), // 删除 -] +const butttondata = (row) => { + return[ + defaultButtons.mainListEditBtn({hasPermi:'wms:customeritem:update'}), // 编辑 + defaultButtons.mainListEnableBtn({hide: isShowMainButton(row, ['FALSE']),hasPermi: 'wms:customeritem:enable'}), + defaultButtons.mainListDisableBtn({hide: isShowMainButton(row, ['TRUE']),hasPermi: 'wms:customeritem:disable'}), + defaultButtons.mainListDeleteBtn({hasPermi:'wms:customeritem:delete'}), // 删除 +]} // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { @@ -151,9 +162,35 @@ const buttonTableClick = async (val, row) => { openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.id) + } else if (val == 'enable') { + handleEnable(row.id) + } else if (val == 'disable') { + handleDisable(row.id) } } + +const handleEnable = async (id: number) => { + try { + await CustomeritemApi.enableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + +const handleDisable = async (id: number) => { + try { + await CustomeritemApi.disableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + + /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: any) => { @@ -306,6 +343,9 @@ const searchFormClick = (searchData) => { /** 初始化 **/ onMounted(async() => { + tableObject.params = { + available: 'TRUE' + } getList() importTemplateData.templateUrl = await CustomeritemApi.importTemplate() }) diff --git a/src/views/wms/basicDataManage/customerManage/project/index.vue b/src/views/wms/basicDataManage/customerManage/project/index.vue index 5983cbefe..9acfffa27 100644 --- a/src/views/wms/basicDataManage/customerManage/project/index.vue +++ b/src/views/wms/basicDataManage/customerManage/project/index.vue @@ -33,7 +33,7 @@ @@ -131,11 +131,22 @@ const buttonBaseClick = (val, item) => { } } +const isShowMainButton = (row, val) => { + if (val.indexOf(row.available) > -1) { + return false + } else { + return true + } +} + // 列表-操作按钮 -const butttondata = [ - defaultButtons.mainListEditBtn({hasPermi:'wms:project:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:project:delete'}), // 删除 -] +const butttondata = (row) => { + return[ + defaultButtons.mainListEditBtn({hasPermi:'wms:project:update'}), // 编辑 + defaultButtons.mainListEnableBtn({hide: isShowMainButton(row, ['FALSE']),hasPermi: 'wms:project:enable'}), + defaultButtons.mainListDisableBtn({hide: isShowMainButton(row, ['TRUE']),hasPermi: 'wms:project:disable'}), + defaultButtons.mainListDeleteBtn({hasPermi:'wms:project:delete'}), // 删除 +]} // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { @@ -144,9 +155,33 @@ const buttonTableClick = async (val, row) => { openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.id) + } else if (val == 'enable') { + handleEnable(row.id) + } else if (val == 'disable') { + handleDisable(row.id) } } +const handleEnable = async (id: number) => { + try { + await ProjectApi.enableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + +const handleDisable = async (id: number) => { + try { + await ProjectApi.disableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: any) => { @@ -276,6 +311,9 @@ const searchFormClick = (searchData) => { /** 初始化 **/ onMounted(async() => { + tableObject.params = { + available: 'TRUE' + } getList() importTemplateData.templateUrl = await ProjectApi.importTemplate() }) diff --git a/src/views/wms/basicDataManage/customerManage/project/project.data.ts b/src/views/wms/basicDataManage/customerManage/project/project.data.ts index d54cd7751..4fb2600d0 100644 --- a/src/views/wms/basicDataManage/customerManage/project/project.data.ts +++ b/src/views/wms/basicDataManage/customerManage/project/project.data.ts @@ -61,11 +61,14 @@ export const Project = useCrudSchemas(reactive([ { label: '是否可用', field: 'available', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isTable: true, - isSearch: true, sort: 'custom', + isSearch:true, + isForm: false, + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + search: { + value: 'TRUE', + }, form: { component: 'Switch', value: 'TRUE', @@ -74,6 +77,9 @@ export const Project = useCrudSchemas(reactive([ activeValue: 'TRUE' } }, + table: { + width: 110 + } }, { label: '生效时间', diff --git a/src/views/wms/basicDataManage/customerManage/saleprice/index.vue b/src/views/wms/basicDataManage/customerManage/saleprice/index.vue index 824a050df..1d22026fe 100644 --- a/src/views/wms/basicDataManage/customerManage/saleprice/index.vue +++ b/src/views/wms/basicDataManage/customerManage/saleprice/index.vue @@ -33,7 +33,7 @@ @@ -131,11 +131,23 @@ const buttonBaseClick = (val, item) => { } } +const isShowMainButton = (row, val) => { + if (val.indexOf(row.available) > -1) { + return false + } else { + return true + } +} + + // 列表-操作按钮 -const butttondata = [ - defaultButtons.mainListEditBtn({hasPermi:'wms:saleprice:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:saleprice:delete'}), // 删除 -] +const butttondata = (row) => { + return[ + defaultButtons.mainListEditBtn({hasPermi:'wms:saleprice:update'}), // 编辑 + defaultButtons.mainListEnableBtn({hide: isShowMainButton(row, ['FALSE']),hasPermi: 'wms:saleprice:enable'}), + defaultButtons.mainListDisableBtn({hide: isShowMainButton(row, ['TRUE']),hasPermi: 'wms:saleprice:disable'}), + defaultButtons.mainListDeleteBtn({hasPermi:'wms:saleprice:delete'}), // 删除 +]} // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { @@ -144,9 +156,34 @@ const buttonTableClick = async (val, row) => { openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.id) + } else if (val == 'enable') { + handleEnable(row.id) + } else if (val == 'disable') { + handleDisable(row.id) } } +const handleEnable = async (id: number) => { + try { + await SalepriceApi.enableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + +const handleDisable = async (id: number) => { + try { + await SalepriceApi.disableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + + /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: any) => { @@ -280,6 +317,9 @@ const searchFormClick = (searchData) => { /** 初始化 **/ onMounted(async() => { + tableObject.params = { + available: 'TRUE' + } getList() importTemplateData.templateUrl = await SalepriceApi.importTemplate() }) diff --git a/src/views/wms/basicDataManage/customerManage/saleprice/saleprice.data.ts b/src/views/wms/basicDataManage/customerManage/saleprice/saleprice.data.ts index 6b01575b9..3c13320b2 100644 --- a/src/views/wms/basicDataManage/customerManage/saleprice/saleprice.data.ts +++ b/src/views/wms/basicDataManage/customerManage/saleprice/saleprice.data.ts @@ -117,13 +117,13 @@ export const Saleprice = useCrudSchemas(reactive([ { label: '是否可用', field: 'available', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isTable: true, - isSearch: true, sort: 'custom', - table: { - width: 150 + isSearch:true, + isForm: false, + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + search: { + value: 'TRUE', }, form: { component: 'Switch', @@ -133,6 +133,9 @@ export const Saleprice = useCrudSchemas(reactive([ activeValue: 'TRUE' } }, + table: { + width: 110 + } }, { label: '生效时间', diff --git a/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts b/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts index 257a5f71a..72b225f28 100644 --- a/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts +++ b/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts @@ -110,12 +110,13 @@ export const Area = useCrudSchemas(reactive([ { label: '是否可用', field: 'available', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isTable: true, sort: 'custom', - table: { - width: 150 + isSearch:true, + isForm: false, + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + search: { + value: 'TRUE', }, form: { component: 'Switch', @@ -125,6 +126,9 @@ export const Area = useCrudSchemas(reactive([ activeValue: 'TRUE' } }, + table: { + width: 110 + } }, { label: '生效时间', diff --git a/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue b/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue index ee896d96d..6b96d6994 100644 --- a/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue +++ b/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue @@ -33,7 +33,7 @@ @@ -133,11 +133,23 @@ const buttonBaseClick = (val, item) => { } } + +const isShowMainButton = (row, val) => { + if (val.indexOf(row.available) > -1) { + return false + } else { + return true + } +} + // 列表-操作按钮 -const butttondata = [ - defaultButtons.mainListEditBtn({hasPermi:'wms:areabasic:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:areabasic:delete'}), // 删除 -] +const butttondata = (row) => { + return[ + defaultButtons.mainListEditBtn({hasPermi:'wms:areabasic:update'}), // 编辑 + defaultButtons.mainListEnableBtn({hide: isShowMainButton(row, ['FALSE']),hasPermi: 'wms:areabasic:enable'}), + defaultButtons.mainListDisableBtn({hide: isShowMainButton(row, ['TRUE']),hasPermi: 'wms:areabasic:disable'}), + defaultButtons.mainListDeleteBtn({hasPermi:'wms:areabasic:delete'}), // 删除 +]} // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { @@ -146,9 +158,34 @@ const buttonTableClick = async (val, row) => { openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.id) + } else if (val == 'enable') { + handleEnable(row.id) + } else if (val == 'disable') { + handleDisable(row.id) } } +const handleEnable = async (id: number) => { + try { + await AreaApi.enableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + +const handleDisable = async (id: number) => { + try { + await AreaApi.disableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + + /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: any) => { @@ -286,6 +323,9 @@ const onBlur = (field, e)=>{ /** 初始化 **/ onMounted(async() => { + tableObject.params = { + available: 'TRUE' + } getList() importTemplateData.templateUrl = await AreaApi.importTemplate() }) diff --git a/src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts b/src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts index 11a7c465a..9ec64df16 100644 --- a/src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts +++ b/src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts @@ -147,13 +147,13 @@ export const Dock = useCrudSchemas(reactive([ { label: '是否可用', field: 'available', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isTable: true, - isSearch: true, sort: 'custom', - table: { - width: 150 + isSearch:true, + isForm: false, + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + search: { + value: 'TRUE', }, form: { component: 'Switch', @@ -163,6 +163,9 @@ export const Dock = useCrudSchemas(reactive([ activeValue: 'TRUE' } }, + table: { + width: 110 + } }, { label: '生效时间', diff --git a/src/views/wms/basicDataManage/factoryModeling/dock/index.vue b/src/views/wms/basicDataManage/factoryModeling/dock/index.vue index 61fe79c53..b61d793c0 100644 --- a/src/views/wms/basicDataManage/factoryModeling/dock/index.vue +++ b/src/views/wms/basicDataManage/factoryModeling/dock/index.vue @@ -33,7 +33,7 @@ @@ -135,11 +135,24 @@ const buttonBaseClick = (val, item) => { } } + +const isShowMainButton = (row, val) => { + if (val.indexOf(row.available) > -1) { + return false + } else { + return true + } +} + + // 列表-操作按钮 -const butttondata = [ - defaultButtons.mainListEditBtn({hasPermi:'wms:dock:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:dock:delete'}), // 删除 -] +const butttondata = (row) => { + return[ + defaultButtons.mainListEditBtn({hasPermi:'wms:dock:update'}), // 编辑 + defaultButtons.mainListEnableBtn({hide: isShowMainButton(row, ['FALSE']),hasPermi: 'wms:dock:enable'}), + defaultButtons.mainListDisableBtn({hide: isShowMainButton(row, ['TRUE']),hasPermi: 'wms:dock:disable'}), + defaultButtons.mainListDeleteBtn({hasPermi:'wms:dock:delete'}), // 删除 +]} // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { @@ -148,9 +161,35 @@ const buttonTableClick = async (val, row) => { openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.id) + } else if (val == 'enable') { + handleEnable(row.id) + } else if (val == 'disable') { + handleDisable(row.id) } } + +const handleEnable = async (id: number) => { + try { + await DockApi.enableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + +const handleDisable = async (id: number) => { + try { + await DockApi.disableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + + /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: any) => { @@ -296,6 +335,9 @@ const searchFormClick = (searchData) => { /** 初始化 **/ onMounted(async() => { + tableObject.params = { + available: 'TRUE' + } getList() importTemplateData.templateUrl = await DockApi.importTemplate() }) diff --git a/src/views/wms/basicDataManage/factoryModeling/location/index.vue b/src/views/wms/basicDataManage/factoryModeling/location/index.vue index fd21fb680..16020175b 100644 --- a/src/views/wms/basicDataManage/factoryModeling/location/index.vue +++ b/src/views/wms/basicDataManage/factoryModeling/location/index.vue @@ -33,7 +33,7 @@ @@ -133,11 +133,22 @@ const buttonBaseClick = (val, item) => { } } +const isShowMainButton = (row, val) => { + if (val.indexOf(row.available) > -1) { + return false + } else { + return true + } +} + // 列表-操作按钮 -const butttondata = [ - defaultButtons.mainListEditBtn({hasPermi:'wms:location:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:location:delete'}), // 删除 -] +const butttondata = (row) => { + return[ + defaultButtons.mainListEditBtn({hasPermi:'wms:location:update'}), // 编辑 + defaultButtons.mainListEnableBtn({hide: isShowMainButton(row, ['FALSE']),hasPermi: 'wms:location:enable'}), + defaultButtons.mainListDisableBtn({hide: isShowMainButton(row, ['TRUE']),hasPermi: 'wms:location:disable'}), + defaultButtons.mainListDeleteBtn({hasPermi:'wms:location:delete'}), // 删除 +]} // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { @@ -146,9 +157,33 @@ const buttonTableClick = async (val, row) => { openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.id) + } else if (val == 'enable') { + handleEnable(row.id) + } else if (val == 'disable') { + handleDisable(row.id) } } +const handleEnable = async (id: number) => { + try { + await LocationApi.enableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + +const handleDisable = async (id: number) => { + try { + await LocationApi.disableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: any) => { @@ -301,6 +336,9 @@ const searchFormClick = (searchData) => { /** 初始化 **/ onMounted(async() => { + tableObject.params = { + available: 'TRUE' + } getList() importTemplateData.templateUrl = await LocationApi.importTemplate() }) diff --git a/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts b/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts index 07ef0409c..b8fc961d4 100644 --- a/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts +++ b/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts @@ -287,13 +287,13 @@ export const Location = useCrudSchemas(reactive([ { label: '是否可用', field: 'available', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isTable: true, - isSearch: true, sort: 'custom', - table: { - width: 150 + isSearch:true, + isForm: false, + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + search: { + value: 'TRUE', }, form: { component: 'Switch', @@ -302,6 +302,9 @@ export const Location = useCrudSchemas(reactive([ inactiveValue: 'FALSE', activeValue: 'TRUE' } + }, + table: { + width: 110 } }, { diff --git a/src/views/wms/basicDataManage/factoryModeling/locationgroup/index.vue b/src/views/wms/basicDataManage/factoryModeling/locationgroup/index.vue index a68c87e05..c79b4177e 100644 --- a/src/views/wms/basicDataManage/factoryModeling/locationgroup/index.vue +++ b/src/views/wms/basicDataManage/factoryModeling/locationgroup/index.vue @@ -33,7 +33,7 @@ @@ -132,11 +132,22 @@ const buttonBaseClick = (val, item) => { } } +const isShowMainButton = (row, val) => { + if (val.indexOf(row.available) > -1) { + return false + } else { + return true + } +} + // 列表-操作按钮 -const butttondata = [ - defaultButtons.mainListEditBtn({hasPermi:'wms:locationgroup:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:locationgroup:delete'}), // 删除 -] +const butttondata = (row) => { + return[ + defaultButtons.mainListEditBtn({hasPermi:'wms:locationgroup:update'}), // 编辑 + defaultButtons.mainListEnableBtn({hide: isShowMainButton(row, ['FALSE']),hasPermi: 'wms:locationgroup:enable'}), + defaultButtons.mainListDisableBtn({hide: isShowMainButton(row, ['TRUE']),hasPermi: 'wms:locationgroup:disable'}), + defaultButtons.mainListDeleteBtn({hasPermi:'wms:locationgroup:delete'}), // 删除 +]} // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { @@ -145,9 +156,35 @@ const buttonTableClick = async (val, row) => { openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.id) + } else if (val == 'enable') { + handleEnable(row.id) + } else if (val == 'disable') { + handleDisable(row.id) } } + +const handleEnable = async (id: number) => { + try { + await LocationgroupApi.enableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + +const handleDisable = async (id: number) => { + try { + await LocationgroupApi.disableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + + /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: any) => { @@ -281,6 +318,9 @@ const searchFormClick = (searchData) => { /** 初始化 **/ onMounted(async() => { + tableObject.params = { + available: 'TRUE' + } getList() importTemplateData.templateUrl = await LocationgroupApi.importTemplate() }) diff --git a/src/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data.ts b/src/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data.ts index 70ee060af..4a89679dc 100644 --- a/src/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data.ts +++ b/src/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data.ts @@ -109,13 +109,13 @@ export const Locationgroup = useCrudSchemas(reactive([ { label: '是否可用', field: 'available', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isTable: true, - isSearch: true, sort: 'custom', - table: { - width: 180 + isSearch:true, + isForm: false, + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + search: { + value: 'TRUE', }, form: { component: 'Switch', @@ -125,6 +125,9 @@ export const Locationgroup = useCrudSchemas(reactive([ activeValue: 'TRUE' } }, + table: { + width: 110 + } }, { label: '生效时间', diff --git a/src/views/wms/basicDataManage/factoryModeling/process/index.vue b/src/views/wms/basicDataManage/factoryModeling/process/index.vue index aabae0d63..23f6304b9 100644 --- a/src/views/wms/basicDataManage/factoryModeling/process/index.vue +++ b/src/views/wms/basicDataManage/factoryModeling/process/index.vue @@ -33,7 +33,7 @@ @@ -131,11 +131,25 @@ const buttonBaseClick = (val, item) => { } } + +const isShowMainButton = (row, val) => { + if (val.indexOf(row.available) > -1) { + return false + } else { + return true + } +} + + + // 列表-操作按钮 -const butttondata = [ - defaultButtons.mainListEditBtn({hasPermi:'wms:process:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:process:delete'}), // 删除 -] +const butttondata = (row) => { + return[ + defaultButtons.mainListEditBtn({hasPermi:'wms:process:update'}), // 编辑 + defaultButtons.mainListEnableBtn({hide: isShowMainButton(row, ['FALSE']),hasPermi: 'wms:process:enable'}), //启用 + defaultButtons.mainListDisableBtn({hide: isShowMainButton(row, ['TRUE']),hasPermi: 'wms:process:disable'}), //停用 + defaultButtons.mainListDeleteBtn({hasPermi:'wms:process:delete'}), // 删除 +]} // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { @@ -144,9 +158,37 @@ const buttonTableClick = async (val, row) => { openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.id) + } else if (val == 'enable') { + handleEnable(row.id) + } else if (val == 'disable') { + handleDisable(row.id) } } + +const handleEnable = async (id: number) => { + try { + await ProcessApi.enableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + +const handleDisable = async (id: number) => { + try { + await ProcessApi.disableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + + + + /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: any) => { @@ -288,6 +330,9 @@ const searchFormClick = (searchData) => { /** 初始化 **/ onMounted(async() => { + tableObject.params = { + available: 'TRUE' + } getList() importTemplateData.templateUrl = await ProcessApi.importTemplate() }) diff --git a/src/views/wms/basicDataManage/factoryModeling/process/process.data.ts b/src/views/wms/basicDataManage/factoryModeling/process/process.data.ts index 6db2fb2f5..230d20bc0 100644 --- a/src/views/wms/basicDataManage/factoryModeling/process/process.data.ts +++ b/src/views/wms/basicDataManage/factoryModeling/process/process.data.ts @@ -120,13 +120,13 @@ export const Process = useCrudSchemas(reactive([ { label: '是否可用', field: 'available', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isSearch: true, - isTable: true, sort: 'custom', - table: { - width: 150 + isSearch:true, + isForm: false, + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + search: { + value: 'TRUE', }, form: { component: 'Switch', @@ -136,6 +136,9 @@ export const Process = useCrudSchemas(reactive([ activeValue: 'TRUE' } }, + table: { + width: 110 + } }, { label: '生效时间', diff --git a/src/views/wms/basicDataManage/factoryModeling/productionline/index.vue b/src/views/wms/basicDataManage/factoryModeling/productionline/index.vue index 5880c4db2..c20790388 100644 --- a/src/views/wms/basicDataManage/factoryModeling/productionline/index.vue +++ b/src/views/wms/basicDataManage/factoryModeling/productionline/index.vue @@ -33,7 +33,7 @@ @@ -132,11 +132,23 @@ const buttonBaseClick = (val, item) => { } } +const isShowMainButton = (row, val) => { + if (val.indexOf(row.available) > -1) { + return false + } else { + return true + } +} + + // 列表-操作按钮 -const butttondata = [ - defaultButtons.mainListEditBtn({hasPermi:'wms:productionline:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:productionline:delete'}), // 删除 -] +const butttondata = (row) => { + return[ + defaultButtons.mainListEditBtn({hasPermi:'wms:productionline:update'}), // 编辑 + defaultButtons.mainListEnableBtn({hide: isShowMainButton(row, ['FALSE']),hasPermi: 'wms:productionline:enable'}), //启用 + defaultButtons.mainListDisableBtn({hide: isShowMainButton(row, ['TRUE']),hasPermi: 'wms:productionline:disable'}), //停用 + defaultButtons.mainListDeleteBtn({hasPermi:'wms:productionline:delete'}), // 删除 +]} // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { @@ -145,9 +157,36 @@ const buttonTableClick = async (val, row) => { openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.id) + } else if (val == 'enable') { + handleEnable(row.id) + } else if (val == 'disable') { + handleDisable(row.id) } + +} + + +const handleEnable = async (id: number) => { + try { + await ProductionlineApi.enableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} } + +const handleDisable = async (id: number) => { + try { + await ProductionlineApi.disableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + + /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: any) => { @@ -281,6 +320,9 @@ const searchFormClick = (searchData) => { /** 初始化 **/ onMounted(async() => { + tableObject.params = { + available: 'TRUE' + } getList() importTemplateData.templateUrl = await ProductionlineApi.importTemplate() }) diff --git a/src/views/wms/basicDataManage/factoryModeling/productionline/productionline.data.ts b/src/views/wms/basicDataManage/factoryModeling/productionline/productionline.data.ts index 72cee3e30..65f1a377a 100644 --- a/src/views/wms/basicDataManage/factoryModeling/productionline/productionline.data.ts +++ b/src/views/wms/basicDataManage/factoryModeling/productionline/productionline.data.ts @@ -130,13 +130,13 @@ export const Productionline = useCrudSchemas(reactive([ { label: '是否可用', field: 'available', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isSearch: true, - isTable: true, sort: 'custom', - table: { - width: 180 + isSearch:true, + isForm: false, + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + search: { + value: 'TRUE', }, form: { component: 'Switch', @@ -146,7 +146,11 @@ export const Productionline = useCrudSchemas(reactive([ activeValue: 'TRUE' } }, + table: { + width: 110 + } }, + { label: '生效时间', field: 'activeTime', diff --git a/src/views/wms/basicDataManage/factoryModeling/warehouse/index.vue b/src/views/wms/basicDataManage/factoryModeling/warehouse/index.vue index d6b2fb3d5..43f193711 100644 --- a/src/views/wms/basicDataManage/factoryModeling/warehouse/index.vue +++ b/src/views/wms/basicDataManage/factoryModeling/warehouse/index.vue @@ -33,7 +33,7 @@ @@ -131,11 +131,25 @@ const buttonBaseClick = (val, item) => { } } + +const isShowMainButton = (row, val) => { + if (val.indexOf(row.available) > -1) { + return false + } else { + return true + } +} + + + // 列表-操作按钮 -const butttondata = [ - defaultButtons.mainListEditBtn({hasPermi:'wms:warehouse:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:warehouse:delete'}), // 删除 -] +const butttondata = (row) => { + return[ + defaultButtons.mainListEditBtn({hasPermi:'wms:warehouse:update'}), // 编辑 + defaultButtons.mainListEnableBtn({hide: isShowMainButton(row, ['FALSE']),hasPermi: 'wms:warehouse:enable'}), + defaultButtons.mainListDisableBtn({hide: isShowMainButton(row, ['TRUE']),hasPermi: 'wms:warehouse:disable'}), + defaultButtons.mainListDeleteBtn({hasPermi:'wms:warehouse:delete'}), // 删除 +]} // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { @@ -144,9 +158,33 @@ const buttonTableClick = async (val, row) => { openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.id) + } else if (val == 'enable') { + handleEnable(row.id) + } else if (val == 'disable') { + handleDisable(row.id) } } +const handleEnable = async (id: number) => { + try { + await WarehouseApi.enableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + +const handleDisable = async (id: number) => { + try { + await WarehouseApi.disableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: any) => { @@ -262,6 +300,9 @@ const searchFormClick = (searchData) => { /** 初始化 **/ onMounted(async() => { + tableObject.params = { + available: 'TRUE' + } getList() importTemplateData.templateUrl = await WarehouseApi.importTemplate() }) diff --git a/src/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data.ts b/src/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data.ts index 3f82b7907..2c69e49df 100644 --- a/src/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data.ts +++ b/src/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data.ts @@ -51,13 +51,13 @@ export const Warehouse = useCrudSchemas(reactive([ { label: '是否可用', field: 'available', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isTable: true, - isSearch: true, sort: 'custom', - table: { - width: 150 + isSearch:true, + isForm: false, + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + search: { + value: 'TRUE', }, form: { component: 'Switch', @@ -67,6 +67,9 @@ export const Warehouse = useCrudSchemas(reactive([ activeValue: 'TRUE' } }, + table: { + width: 110 + } }, { label: '生效时间', diff --git a/src/views/wms/basicDataManage/factoryModeling/workshop/index.vue b/src/views/wms/basicDataManage/factoryModeling/workshop/index.vue index 2be522be7..55c1e18af 100644 --- a/src/views/wms/basicDataManage/factoryModeling/workshop/index.vue +++ b/src/views/wms/basicDataManage/factoryModeling/workshop/index.vue @@ -33,7 +33,7 @@ @@ -130,11 +130,22 @@ const buttonBaseClick = (val, item) => { } } +const isShowMainButton = (row, val) => { + if (val.indexOf(row.available) > -1) { + return false + } else { + return true + } +} + // 列表-操作按钮 -const butttondata = [ - defaultButtons.mainListEditBtn({hasPermi:'wms:workshop:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:workshop:delete'}), // 删除 -] +const butttondata = (row) => { + return[ + defaultButtons.mainListEditBtn({hasPermi:'wms:workshop:update'}), // 编辑 + defaultButtons.mainListEnableBtn({hide: isShowMainButton(row, ['FALSE']),hasPermi: 'wms:workshop:enable'}), //启用 + defaultButtons.mainListDisableBtn({hide: isShowMainButton(row, ['TRUE']),hasPermi: 'wms:workshop:disable'}), //禁用 + defaultButtons.mainListDeleteBtn({hasPermi:'wms:workshop:delete'}), // 删除 +]} // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { @@ -143,9 +154,35 @@ const buttonTableClick = async (val, row) => { openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.id) + } else if (val == 'enable') { + handleEnable(row.id) + } else if (val == 'disable') { + handleDisable(row.id) } } + +const handleEnable = async (id: number) => { + try { + await WorkshopApi.enableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + +const handleDisable = async (id: number) => { + try { + await WorkshopApi.disableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + + /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: any) => { @@ -263,6 +300,9 @@ const searchFormClick = (searchData) => { /** 初始化 **/ onMounted(async() => { + tableObject.params = { + available: 'TRUE' + } getList() importTemplateData.templateUrl = await WorkshopApi.importTemplate() }) diff --git a/src/views/wms/basicDataManage/factoryModeling/workshop/workshop.data.ts b/src/views/wms/basicDataManage/factoryModeling/workshop/workshop.data.ts index 569ded4e1..64d1ff05b 100644 --- a/src/views/wms/basicDataManage/factoryModeling/workshop/workshop.data.ts +++ b/src/views/wms/basicDataManage/factoryModeling/workshop/workshop.data.ts @@ -36,11 +36,14 @@ export const Workshop = useCrudSchemas(reactive([ { label: '是否可用', field: 'available', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isSearch: true, - isTable: true, sort: 'custom', + isSearch:true, + isForm: false, + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + search: { + value: 'TRUE', + }, form: { component: 'Switch', value: 'TRUE', @@ -49,6 +52,9 @@ export const Workshop = useCrudSchemas(reactive([ activeValue: 'TRUE' } }, + table: { + width: 110 + } }, { label: '生效时间', diff --git a/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue b/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue index 74b7ce79e..b5506d157 100644 --- a/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue +++ b/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue @@ -33,7 +33,7 @@ @@ -132,11 +132,25 @@ const buttonBaseClick = (val, item) => { } } + +const isShowMainButton = (row, val) => { + if (val.indexOf(row.available) > -1) { + return false + } else { + return true + } +} + + + // 列表-操作按钮 -const butttondata = [ +const butttondata = (row) => { + return[ defaultButtons.mainListEditBtn({hasPermi:'wms:workstation:update'}), // 编辑 + defaultButtons.mainListEnableBtn({hide: isShowMainButton(row, ['FALSE']),hasPermi: 'wms:workstation:enable'}), //启用 + defaultButtons.mainListDisableBtn({hide: isShowMainButton(row, ['TRUE']),hasPermi: 'wms:workstation:disable'}), //停用 defaultButtons.mainListDeleteBtn({hasPermi:'wms:workstation:delete'}), // 删除 -] +]} // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { @@ -145,9 +159,35 @@ const buttonTableClick = async (val, row) => { openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.id) + } else if (val == 'enable') { + handleEnable(row.id) + } else if (val == 'disable') { + handleDisable(row.id) } } + +const handleEnable = async (id: number) => { + try { + await WorkstationApi.enableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + +const handleDisable = async (id: number) => { + try { + await WorkstationApi.disableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + + /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: any) => { @@ -290,6 +330,9 @@ const searchFormClick = (searchData) => { /** 初始化 **/ onMounted(async() => { + tableObject.params = { + available: 'TRUE' + } getList() importTemplateData.templateUrl = await WorkstationApi.importWorkstationTemplate() }) diff --git a/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts b/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts index cebf01a68..2a0733b5d 100644 --- a/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts +++ b/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts @@ -206,12 +206,13 @@ export const Workstation = useCrudSchemas(reactive([ { label: '是否可用', field: 'available', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isTable: true, sort: 'custom', - table: { - width: 150 + isSearch:true, + isForm: false, + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + search: { + value: 'TRUE', }, form: { component: 'Switch', @@ -221,6 +222,9 @@ export const Workstation = useCrudSchemas(reactive([ activeValue: 'TRUE' } }, + table: { + width: 110 + } }, { label: '生效时间', diff --git a/src/views/wms/basicDataManage/itemManage/bom/bom.data.ts b/src/views/wms/basicDataManage/itemManage/bom/bom.data.ts index 9fd1cfb5d..2b03e0a20 100644 --- a/src/views/wms/basicDataManage/itemManage/bom/bom.data.ts +++ b/src/views/wms/basicDataManage/itemManage/bom/bom.data.ts @@ -206,10 +206,12 @@ export const Bom = useCrudSchemas(reactive([ label: '是否可用', field: 'available', sort: 'custom', + isSearch:true, + isForm: false, dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - table: { - width: 120 + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + search: { + value: 'TRUE', }, form: { component: 'Switch', @@ -218,6 +220,9 @@ export const Bom = useCrudSchemas(reactive([ inactiveValue: 'FALSE', activeValue: 'TRUE' } + }, + table: { + width: 110 } }, { diff --git a/src/views/wms/basicDataManage/itemManage/bom/index.vue b/src/views/wms/basicDataManage/itemManage/bom/index.vue index 095f8281a..5388cc315 100644 --- a/src/views/wms/basicDataManage/itemManage/bom/index.vue +++ b/src/views/wms/basicDataManage/itemManage/bom/index.vue @@ -33,7 +33,7 @@ @@ -135,11 +135,22 @@ const buttonBaseClick = (val, item) => { } } +const isShowMainButton = (row, val) => { + if (val.indexOf(row.available) > -1) { + return false + } else { + return true + } +} + // 列表-操作按钮 -const butttondata = [ - defaultButtons.mainListEditBtn({hasPermi:'wms:bom:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:bom:delete'}), // 删除 -] +const butttondata = (row) => { + return[ + defaultButtons.mainListEditBtn({hasPermi:'wms:bom:update'}), // 编辑 + defaultButtons.mainListEnableBtn({hide: isShowMainButton(row, ['FALSE']),hasPermi: 'wms:bom:enable'}), + defaultButtons.mainListDisableBtn({hide: isShowMainButton(row, ['TRUE']),hasPermi: 'wms:bom:disable'}), + defaultButtons.mainListDeleteBtn({hasPermi:'wms:bom:delete'}), // 删除 +]} // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { @@ -148,9 +159,33 @@ const buttonTableClick = async (val, row) => { openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.id) + } else if (val == 'enable') { + handleEnable(row.id) + } else if (val == 'disable') { + handleDisable(row.id) } } + +const handleEnable = async (id: number) => { + try { + await BomApi.enableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + +const handleDisable = async (id: number) => { + try { + await BomApi.disableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: any) => { @@ -300,6 +335,9 @@ const searchFormClick = (searchData) => { // } /** 初始化 **/ onMounted(async () => { + tableObject.params = { + available: 'TRUE' + } getList() importTemplateData.templateUrl = await BomApi.importTemplate() }) diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue index ffb66ec45..3ef652edc 100644 --- a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue +++ b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue @@ -239,7 +239,7 @@ const buttonBaseClick = (val, item) => { } // 根据状态返回该按钮是否显示 -const isShowMainButton = (row,val) => { +const isShowTheButton = (row,val) => { if (val.indexOf(row.status) > -1) { return false } else { @@ -247,12 +247,23 @@ const isShowMainButton = (row,val) => { } } +const isShowMainButton = (row, val) => { + if (val.indexOf(row.available) > -1) { + return false + } else { + return true + } +} + + // 列表-操作按钮 const butttondata = (row) => { row.status = "1" return [ - defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:itemarea:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:itemarea:delete'}), // 删除 + defaultButtons.mainListEditBtn({hide:isShowTheButton(row,['1']),hasPermi:'wms:itemarea:update'}), // 编辑 + defaultButtons.mainListEnableBtn({hide: isShowMainButton(row, ['FALSE']),hasPermi: 'wms:itemarea:enable'}), + defaultButtons.mainListDisableBtn({hide: isShowMainButton(row, ['TRUE']),hasPermi: 'wms:itemarea:disable'}), + defaultButtons.mainListDeleteBtn({hide:isShowTheButton(row,['1']),hasPermi:'wms:itemarea:delete'}), // 删除 ] } @@ -264,9 +275,33 @@ const buttonTableClick = async (val, row) => { openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.id) + } else if (val == 'enable') { + handleEnable(row.id) + } else if (val == 'disable') { + handleDisable(row.id) } } +const handleEnable = async (id: number) => { + try { + await ItemareaApi.enableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + +const handleDisable = async (id: number) => { + try { + await ItemareaApi.disableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + /** 添加/修改操作 */ const formRef = ref() const openForm =async (type: string, row?: number) => { @@ -419,6 +454,9 @@ const searchFormClick = (searchData) => { /** 初始化 **/ onMounted(async () => { + tableObject.params = { + available: 'TRUE' + } getList() importTemplateData.templateUrl = await ItemareaApi.importTemplate() }) diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts b/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts index 98b205c6f..939b782bd 100644 --- a/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts +++ b/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts @@ -409,13 +409,12 @@ export const Itemarea = useCrudSchemas(reactive([ label: '是否可用', field: 'available', sort: 'custom', - isSearch: false, + isSearch:true, + isForm: false, dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - // colorType: 'danger', - isTable: true, - table: { - width: 150 + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + search: { + value: 'TRUE', }, form: { component: 'Switch', @@ -425,6 +424,9 @@ export const Itemarea = useCrudSchemas(reactive([ activeValue: 'TRUE' } }, + table: { + width: 110 + } }, { label: '出库后剩余库存自动转换为出库包装规格', diff --git a/src/views/wms/basicDataManage/itemManage/itembasic/index.vue b/src/views/wms/basicDataManage/itemManage/itembasic/index.vue index e2600d741..2b891318f 100644 --- a/src/views/wms/basicDataManage/itemManage/itembasic/index.vue +++ b/src/views/wms/basicDataManage/itemManage/itembasic/index.vue @@ -386,6 +386,9 @@ const changeTabs = (item) => { /** 初始化 **/ onMounted(() => { + tableObject.params = { + available: 'TRUE' + } getList() }) diff --git a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts index d8677ce34..e250b441f 100644 --- a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts +++ b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts @@ -31,12 +31,12 @@ export const Itembasic = useCrudSchemas(reactive([ label: '是否可用', field: 'available', sort: 'custom', + isSearch:true, + isForm: false, dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isTable: true, - isSearch: true, - table: { - width: 120 + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + search: { + value: 'TRUE', }, form: { component: 'Switch', @@ -46,6 +46,9 @@ export const Itembasic = useCrudSchemas(reactive([ activeValue: 'TRUE' } }, + table: { + width: 110 + } }, { label: '描述1', diff --git a/src/views/wms/basicDataManage/itemManage/itempackage/index.vue b/src/views/wms/basicDataManage/itemManage/itempackage/index.vue index 9d98a90e0..2c166371b 100644 --- a/src/views/wms/basicDataManage/itemManage/itempackage/index.vue +++ b/src/views/wms/basicDataManage/itemManage/itempackage/index.vue @@ -38,7 +38,7 @@ @@ -159,11 +159,23 @@ const buttonBaseClick = (val, item) => { } } + +const isShowMainButton = (row, val) => { + if (val.indexOf(row.available) > -1) { + return false + } else { + return true + } +} + // 列表-操作按钮 -const butttondata = [ +const butttondata = (row) => { + return[ defaultButtons.mainListEditBtn({ hasPermi: 'wms:itempackage:update' }), // 编辑 + defaultButtons.mainListEnableBtn({hide: isShowMainButton(row, ['FALSE']),hasPermi: 'wms:itempackage:enable'}), + defaultButtons.mainListDisableBtn({hide: isShowMainButton(row, ['TRUE']),hasPermi: 'wms:itempackage:disable'}), defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:itempackage:delete' }) // 删除 -] +]} // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { @@ -174,9 +186,37 @@ const buttonTableClick = async (val, row) => { } else if (val == 'delete') { // 删除 handleDelete(row.id) + }else if (val == 'enable') { + handleEnable(row.id) + } else if (val == 'disable') { + handleDisable(row.id) } } + + +const handleEnable = async (id: number) => { + try { + await ItempackagingApi.enableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + +const handleDisable = async (id: number) => { + try { + await ItempackagingApi.disableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + + + /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: any) => { @@ -361,6 +401,9 @@ const searchFormClick = (searchData) => { /** 初始化 **/ onMounted(async () => { + tableObject.params = { + available: 'TRUE' + } await getList() importTemplateData.templateUrl = await ItempackagingApi.importTemplate() }) diff --git a/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts b/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts index bd8739244..bca65a1c6 100644 --- a/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts +++ b/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts @@ -160,10 +160,12 @@ export const Itempackaging = useCrudSchemas(reactive([ label: '是否可用', field: 'available', sort: 'custom', + isSearch:true, + isForm: false, dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - table: { - width: 120 + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + search: { + value: 'TRUE', }, form: { component: 'Switch', @@ -172,6 +174,9 @@ export const Itempackaging = useCrudSchemas(reactive([ inactiveValue: 'FALSE', activeValue: 'TRUE' } + }, + table: { + width: 110 } }, { diff --git a/src/views/wms/basicDataManage/itemManage/packageunit/index.vue b/src/views/wms/basicDataManage/itemManage/packageunit/index.vue index c57070b0d..78500a628 100644 --- a/src/views/wms/basicDataManage/itemManage/packageunit/index.vue +++ b/src/views/wms/basicDataManage/itemManage/packageunit/index.vue @@ -144,6 +144,14 @@ const buttonBaseClick = (val, item) => { } } +const isShowMainButton = (row, val) => { + if (val.indexOf(row.available) > -1) { + return false + } else { + return true + } +} + // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 @@ -152,6 +160,8 @@ const butttondata = (row,$index) => { } return [ defaultButtons.mainListEditBtn({hasPermi:'wms:packageunit:update',hide:isShowButton(row)}), // 编辑 + defaultButtons.mainListEnableBtn({hide: (isShowMainButton(row, ['FALSE']) || isShowButton(row)),hasPermi: 'wms:packageunit:enable'}), + defaultButtons.mainListDisableBtn({hide: (isShowMainButton(row, ['TRUE']) || isShowButton(row)),hasPermi: 'wms:packageunit:disable'}), defaultButtons.mainListDeleteBtn({hasPermi:'wms:packageunit:delete'}), // 删除 ] } @@ -169,9 +179,32 @@ const buttonTableClick = async (val, row) => { openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.id) + } else if (val == 'enable') { + handleEnable(row.id) + } else if (val == 'disable') { + handleDisable(row.id) } } +const handleEnable = async (id: number) => { + try { + await PackageunitApi.enableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + +const handleDisable = async (id: number) => { + try { + await PackageunitApi.disableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: any) => { @@ -306,6 +339,9 @@ const searchFormClick = (searchData) => { /** 初始化 **/ onMounted(async () => { + tableObject.params = { + available: 'TRUE' + } getList() importTemplateData.templateUrl = await PackageunitApi.importTemplate() }) diff --git a/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts b/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts index d290567a0..58bc61e64 100644 --- a/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts +++ b/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts @@ -428,8 +428,13 @@ export const Packageunit = useCrudSchemas(reactive([ label: '是否可用', field: 'available', sort: 'custom', + isSearch:true, + isForm: false, dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + search: { + value: 'TRUE', + }, form: { component: 'Switch', value: 'TRUE', @@ -439,8 +444,8 @@ export const Packageunit = useCrudSchemas(reactive([ } }, table: { - width: 150 - }, + width: 110 + } }, { label: '包装描述', diff --git a/src/views/wms/basicDataManage/itemManage/productionitemcodeSpareitemcode/index.vue b/src/views/wms/basicDataManage/itemManage/productionitemcodeSpareitemcode/index.vue index 90582059e..a7c8168e6 100644 --- a/src/views/wms/basicDataManage/itemManage/productionitemcodeSpareitemcode/index.vue +++ b/src/views/wms/basicDataManage/itemManage/productionitemcodeSpareitemcode/index.vue @@ -33,7 +33,7 @@ @@ -140,11 +140,23 @@ const buttonBaseClick = (val, item) => { } } +const isShowMainButton = (row, val) => { + if (val.indexOf(row.available) > -1) { + return false + } else { + return true + } +} + + // 列表-操作按钮 -const butttondata = [ +const butttondata = (row) => { + return[ defaultButtons.mainListEditBtn({hasPermi:'wms:productionitemcode-spareitemcode:update'}), // 编辑 + defaultButtons.mainListEnableBtn({hide: isShowMainButton(row, ['FALSE']),hasPermi: 'wms:productionitemcode-spareitemcode:enable'}), + defaultButtons.mainListDisableBtn({hide: isShowMainButton(row, ['TRUE']),hasPermi: 'wms:productionitemcode-spareitemcode:disable'}), defaultButtons.mainListDeleteBtn({hasPermi:'wms:productionitemcode-spareitemcode:delete'}), // 删除 -] +]} // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { @@ -152,9 +164,33 @@ const buttonTableClick = async (val, row) => { openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.id) + } else if (val == 'enable') { + handleEnable(row.id) + } else if (val == 'disable') { + handleDisable(row.id) } } +const handleEnable = async (id: number) => { + try { + await ProductionitemcodeSpareitemcodeApi.enableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + +const handleDisable = async (id: number) => { + try { + await ProductionitemcodeSpareitemcodeApi.disableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: any) => { @@ -275,6 +311,9 @@ const searchFormClick = (searchData) => { /** 初始化 **/ onMounted(async () => { + tableObject.params = { + available: 'TRUE' + } getList() importTemplateData.templateUrl = await ProductionitemcodeSpareitemcodeApi.importTemplate() }) diff --git a/src/views/wms/basicDataManage/itemManage/productionitemcodeSpareitemcode/productionitemcodeSpareitemcode.data.ts b/src/views/wms/basicDataManage/itemManage/productionitemcodeSpareitemcode/productionitemcodeSpareitemcode.data.ts index b9f6be7f2..d27f49652 100644 --- a/src/views/wms/basicDataManage/itemManage/productionitemcodeSpareitemcode/productionitemcodeSpareitemcode.data.ts +++ b/src/views/wms/basicDataManage/itemManage/productionitemcodeSpareitemcode/productionitemcodeSpareitemcode.data.ts @@ -92,19 +92,24 @@ export const ProductionitemcodeSpareitemcode = useCrudSchemas(reactive @@ -132,11 +132,25 @@ const buttonBaseClick = (val, item) => { } } + +const isShowMainButton = (row, val) => { + if (val.indexOf(row.available) > -1) { + return false + } else { + return true + } +} + + + // 列表-操作按钮 -const butttondata = [ +const butttondata = (row) => { + return[ defaultButtons.mainListEditBtn({hasPermi:'wms:productionlineitem:update'}), // 编辑 + defaultButtons.mainListEnableBtn({hide: isShowMainButton(row, ['FALSE']),hasPermi: 'wms:productionlineitem:enable'}), + defaultButtons.mainListDisableBtn({hide: isShowMainButton(row, ['TRUE']),hasPermi: 'wms:productionlineitem:disable'}), defaultButtons.mainListDeleteBtn({hasPermi:'wms:productionlineitem:delete'}), // 删除 -] +]} // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { @@ -145,9 +159,35 @@ const buttonTableClick = async (val, row) => { openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.id) + } else if (val == 'enable') { + handleEnable(row.id) + } else if (val == 'disable') { + handleDisable(row.id) } } + +const handleEnable = async (id: number) => { + try { + await ProductionlineitemApi.enableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + +const handleDisable = async (id: number) => { + try { + await ProductionlineitemApi.disableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + + /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: any) => { @@ -281,6 +321,9 @@ const searchFormClick = (searchData) => { /** 初始化 **/ onMounted(async () => { + tableObject.params = { + available: 'TRUE' + } getList() importTemplateData.templateUrl = await ProductionlineitemApi.importTemplate() }) diff --git a/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts b/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts index 34b928016..e0e5f7198 100644 --- a/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts +++ b/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts @@ -154,13 +154,13 @@ export const Productionlineitem = useCrudSchemas(reactive([ { label: '是否可用', field: 'available', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', sort: 'custom', - isSearch: false, - isTable: true, - table: { - width: 120 + isSearch:true, + isForm: false, + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + search: { + value: 'TRUE', }, form: { component: 'Switch', @@ -169,6 +169,9 @@ export const Productionlineitem = useCrudSchemas(reactive([ inactiveValue: 'FALSE', activeValue: 'TRUE' } + }, + table: { + width: 110 } }, { diff --git a/src/views/wms/basicDataManage/itemManage/stdcostprice/index.vue b/src/views/wms/basicDataManage/itemManage/stdcostprice/index.vue index 0fc1f8cb6..d00607fb4 100644 --- a/src/views/wms/basicDataManage/itemManage/stdcostprice/index.vue +++ b/src/views/wms/basicDataManage/itemManage/stdcostprice/index.vue @@ -33,7 +33,7 @@ @@ -133,11 +133,22 @@ const buttonBaseClick = (val, item) => { } } +const isShowMainButton = (row, val) => { + if (val.indexOf(row.available) > -1) { + return false + } else { + return true + } +} + // 列表-操作按钮 -const butttondata = [ +const butttondata = (row) => { + return[ defaultButtons.mainListEditBtn({hasPermi:'wms:stdcostprice:update'}), // 编辑 + defaultButtons.mainListEnableBtn({hide: isShowMainButton(row, ['FALSE']),hasPermi: 'wms:stdcostprice:enable'}), + defaultButtons.mainListDisableBtn({hide: isShowMainButton(row, ['TRUE']),hasPermi: 'wms:stdcostprice:disable'}), defaultButtons.mainListDeleteBtn({hasPermi:'wms:stdcostprice:delete'}), // 删除 -] +]} // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { @@ -146,9 +157,32 @@ const buttonTableClick = async (val, row) => { openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.id) + } else if (val == 'enable') { + handleEnable(row.id) + } else if (val == 'disable') { + handleDisable(row.id) } } +const handleEnable = async (id: number) => { + try { + await StdcostpriceApi.enableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + +const handleDisable = async (id: number) => { + try { + await StdcostpriceApi.disableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: any) => { @@ -272,7 +306,10 @@ const searchFormClick = (searchData) => { } /** 初始化 **/ -onMounted(async () => { +onMounted(async () => { + tableObject.params = { + available: 'TRUE' + } getList() importTemplateData.templateUrl = await StdcostpriceApi.importTemplate() }) diff --git a/src/views/wms/basicDataManage/itemManage/stdcostprice/stdcostprice.data.ts b/src/views/wms/basicDataManage/itemManage/stdcostprice/stdcostprice.data.ts index c8bc2b996..0c1184e0e 100644 --- a/src/views/wms/basicDataManage/itemManage/stdcostprice/stdcostprice.data.ts +++ b/src/views/wms/basicDataManage/itemManage/stdcostprice/stdcostprice.data.ts @@ -107,12 +107,13 @@ export const Stdcostprice = useCrudSchemas(reactive([ { label: '是否可用', field: 'available', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isTable: true, sort: 'custom', - table: { - width: 120 + isSearch:true, + isForm: false, + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + search: { + value: 'TRUE', }, form: { component: 'Switch', @@ -121,6 +122,9 @@ export const Stdcostprice = useCrudSchemas(reactive([ inactiveValue: 'FALSE', activeValue: 'TRUE' } + }, + table: { + width: 110 } }, { diff --git a/src/views/wms/basicDataManage/labelManage/barcode/barcode.data.ts b/src/views/wms/basicDataManage/labelManage/barcode/barcode.data.ts index 5679412b3..1ff36f879 100644 --- a/src/views/wms/basicDataManage/labelManage/barcode/barcode.data.ts +++ b/src/views/wms/basicDataManage/labelManage/barcode/barcode.data.ts @@ -209,6 +209,29 @@ export const Barcode = useCrudSchemas(reactive([ width: 150 } }, + { + label: '是否可用', + field: 'available', + sort: 'custom', + isSearch:true, + isForm: false, + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + search: { + value: 'TRUE', + }, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + }, + table: { + width: 110 + } + }, { label: '操作', field: 'action', diff --git a/src/views/wms/basicDataManage/labelManage/barcode/index.vue b/src/views/wms/basicDataManage/labelManage/barcode/index.vue index b2ccdfaf4..0228c7de1 100644 --- a/src/views/wms/basicDataManage/labelManage/barcode/index.vue +++ b/src/views/wms/basicDataManage/labelManage/barcode/index.vue @@ -33,7 +33,7 @@ @@ -132,11 +132,22 @@ const buttonBaseClick = (val, item) => { } } +const isShowMainButton = (row, val) => { + if (val.indexOf(row.available) > -1) { + return false + } else { + return true + } +} + // 列表-操作按钮 -const butttondata = [ +const butttondata = (row) => { + return[ defaultButtons.mainListEditBtn({hasPermi:'wms:barcode:update'}), // 编辑 + defaultButtons.mainListEnableBtn({hide: isShowMainButton(row, ['FALSE']),hasPermi: 'wms:barcode:enable'}), //启用 + defaultButtons.mainListDisableBtn({hide: isShowMainButton(row, ['TRUE']),hasPermi: 'wms:barcode:disable'}), //停用 defaultButtons.mainListDeleteBtn({hasPermi:'wms:barcode:delete'}), // 删除 -] +]} // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { @@ -145,9 +156,34 @@ const buttonTableClick = async (val, row) => { openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.id) + } else if (val == 'enable') { + handleEnable(row.id) + } else if (val == 'disable') { + handleDisable(row.id) } } + +const handleEnable = async (id: number) => { + try { + await BarcodeApi.enableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + +const handleDisable = async (id: number) => { + try { + await BarcodeApi.disableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: any) => { @@ -254,6 +290,9 @@ const searchFormClick = (searchData) => { /** 初始化 **/ onMounted(async() => { + tableObject.params = { + available: 'TRUE' + } getList() importTemplateData.templateUrl = await BarcodeApi.importTemplate() }) diff --git a/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts b/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts index caa6225a8..5be51a596 100644 --- a/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts +++ b/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts @@ -439,6 +439,29 @@ export const Callmaterials = useCrudSchemas(reactive([ // // } // // } // }, + { + label: '是否可用', + field: 'available', + sort: 'custom', + isSearch:true, + isForm: false, + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + search: { + value: 'TRUE', + }, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + }, + table: { + width: 110 + } + }, { label: '创建时间', field: 'createTime', diff --git a/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue b/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue index 9019dbc6c..d698ae13b 100644 --- a/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue +++ b/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue @@ -34,7 +34,7 @@ @@ -201,12 +201,24 @@ const buttonBaseClick = (val, item) => { } } +const isShowMainButton = (row, val) => { + if (val.indexOf(row.available) > -1) { + return false + } else { + return true + } +} + + // 列表-操作按钮 -const butttondata = [ +const butttondata = (row) => { + return[ defaultButtons.mainListEditBtn({hasPermi:'wms:callmaterials:update'}), // 编辑 + defaultButtons.mainListEnableBtn({hide: isShowMainButton(row, ['FALSE']),hasPermi: 'wms:callmaterials:enable'}), //启用 + defaultButtons.mainListDisableBtn({hide: isShowMainButton(row, ['TRUE']),hasPermi: 'wms:callmaterials:disable'}), //停用 defaultButtons.mainListDeleteBtn({hasPermi:'wms:callmaterials:delete'}), // 删除 defaultButtons.mainListPointBtn(null), // 标签打印 -] +]} // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { @@ -216,9 +228,33 @@ const buttonTableClick = async (val, row) => { handleDelete(row.id) } else if (val == 'point') { // 标签打印 handlePoint(row) + } else if (val == 'enable') { + handleEnable(row.id) + } else if (val == 'disable') { + handleDisable(row.id) } } +const handleEnable = async (id: number) => { + try { + await CallmaterialsApi.enableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + +const handleDisable = async (id: number) => { + try { + await CallmaterialsApi.disableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: any) => { @@ -391,6 +427,9 @@ const getSelectionRows = (currentPage,currentPageSelectionRows) => { } /** 初始化 **/ onMounted(async () => { + tableObject.params = { + available: true + } getList() importTemplateData.templateUrl = await CallmaterialsApi.importTemplate() }) diff --git a/src/views/wms/basicDataManage/labelManage/labeltype/index.vue b/src/views/wms/basicDataManage/labelManage/labeltype/index.vue index 3a8d47290..11b4ad08b 100644 --- a/src/views/wms/basicDataManage/labelManage/labeltype/index.vue +++ b/src/views/wms/basicDataManage/labelManage/labeltype/index.vue @@ -33,7 +33,7 @@ @@ -135,11 +135,22 @@ const buttonBaseClick = (val, item) => { } } +const isShowMainButton = (row, val) => { + if (val.indexOf(row.available) > -1) { + return false + } else { + return true + } +} + // 列表-操作按钮 -const butttondata = [ - defaultButtons.mainListEditBtn(null), // 编辑 - defaultButtons.mainListDeleteBtn(null), // 删除 -] +const butttondata = (row) => { + return[ + defaultButtons.mainListEditBtn(null), // 编辑 + defaultButtons.mainListEnableBtn({hide: isShowMainButton(row, ['FALSE']),hasPermi: 'wms:labeltypeService:enable'}), //启用 + defaultButtons.mainListDisableBtn({hide: isShowMainButton(row, ['TRUE']),hasPermi: 'wms:labeltypeService:disable'}), //停用 + defaultButtons.mainListDeleteBtn(null), // 删除 +]} // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { @@ -147,9 +158,33 @@ const buttonTableClick = async (val, row) => { openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.id) + } else if (val == 'enable') { + handleEnable(row.id) + } else if (val == 'disable') { + handleDisable(row.id) } } +const handleEnable = async (id: number) => { + try { + await LabeltypeApi.enableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + +const handleDisable = async (id: number) => { + try { + await LabeltypeApi.disableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: any) => { @@ -247,6 +282,9 @@ const searchFormClick = (searchData) => { /** 初始化 **/ onMounted(async () => { + tableObject.params = { + available: true + } getList() }) diff --git a/src/views/wms/basicDataManage/labelManage/labeltype/labeltype.data.ts b/src/views/wms/basicDataManage/labelManage/labeltype/labeltype.data.ts index c499afb9d..398cda999 100644 --- a/src/views/wms/basicDataManage/labelManage/labeltype/labeltype.data.ts +++ b/src/views/wms/basicDataManage/labelManage/labeltype/labeltype.data.ts @@ -179,6 +179,30 @@ export const Labeltype = useCrudSchemas(reactive([ } }, }, + { + label: '是否可用', + field: 'available', + sort: 'custom', + isSearch:true, + isForm: false, + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + search: { + value: 'TRUE', + }, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + }, + table: { + width: 110 + } + }, + { label: '创建时间', field: 'createTime', diff --git a/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue b/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue index e15d3f207..c72bec8b0 100644 --- a/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue +++ b/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue @@ -34,7 +34,7 @@ @@ -122,10 +122,22 @@ const buttonBaseClick = (val, item) => { } } +const isShowMainButton = (row, val) => { + if (val.indexOf(row.available) > -1) { + return false + } else { + return true + } +} + + // 列表-操作按钮 -const butttondata = [ +const butttondata = (row) => { + return[ defaultButtons.mainListPointBtn(null), // 标签打印 -] + defaultButtons.mainListEnableBtn({hide: isShowMainButton(row, ['FALSE']),hasPermi: 'wms:barbasic:enable'}), //启用 + defaultButtons.mainListDisableBtn({hide: isShowMainButton(row, ['TRUE']),hasPermi: 'wms:barbasic:disable'}), //停用 +]} // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { @@ -135,9 +147,35 @@ const buttonTableClick = async (val, row) => { handleDelete(row.id) } else if (val == 'point') { // 标签打印 handlePoint(row) + } else if (val == 'enable') { + handleEnable(row.id) + } else if (val == 'disable') { + handleDisable(row.id) } } + +const handleEnable = async (id: number) => { + try { + await BarbasicApi.enableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + +const handleDisable = async (id: number) => { + try { + await BarbasicApi.disableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + + /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: number) => { @@ -246,6 +284,9 @@ const getSelectionRows = (currentPage,currentPageSelectionRows) => { /** 初始化 **/ onMounted(async () => { + tableObject.params = { + available: true + } getList() }) diff --git a/src/views/wms/basicDataManage/labelManage/locationLabel/locationLabel.data.ts b/src/views/wms/basicDataManage/labelManage/locationLabel/locationLabel.data.ts index 8ee009d61..e242109ae 100644 --- a/src/views/wms/basicDataManage/labelManage/locationLabel/locationLabel.data.ts +++ b/src/views/wms/basicDataManage/labelManage/locationLabel/locationLabel.data.ts @@ -91,6 +91,29 @@ export const Package = useCrudSchemas(reactive([ width: 170, } }, + { + label: '是否可用', + field: 'available', + sort: 'custom', + isSearch:true, + isForm: false, + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + search: { + value: 'TRUE', + }, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + }, + table: { + width: 110 + } + }, { label: '创建时间', field: 'createTime', diff --git a/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue b/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue index 0247f00e0..64665c60a 100644 --- a/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue +++ b/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue @@ -33,7 +33,7 @@ @@ -189,12 +189,24 @@ const buttonBaseClick = (val, item) => { // ] // } +const isShowMainButton = (row, val) => { + if (val.indexOf(row.available) > -1) { + return false + } else { + return true + } +} + + // 列表-操作按钮 -const butttondata = [ +const butttondata = (row) => { + return[ // defaultButtons.mainListEditBtn({hasPermi:'wms:package:update'}), // 编辑 // defaultButtons.mainListDeleteBtn({hasPermi:'wms:package:delete'}), // 删除 defaultButtons.mainListPointBtn(null), // 标签打印 -] + defaultButtons.mainListEnableBtn({hide: isShowMainButton(row, ['FALSE']),hasPermi: 'wms:barbasic:enable'}), //启用 + defaultButtons.mainListDisableBtn({hide: isShowMainButton(row, ['TRUE']),hasPermi: 'wms:barbasic:disable'}), //停用 +]} // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { @@ -204,9 +216,34 @@ const buttonTableClick = async (val, row) => { handleDelete(row.id) } else if (val == 'point') { // 标签打印 handlePoint(row) + } else if (val == 'enable') { + handleEnable(row.id) + } else if (val == 'disable') { + handleDisable(row.id) } } +const handleEnable = async (id: number) => { + try { + await BarbasicApi.enableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + +const handleDisable = async (id: number) => { + try { + await BarbasicApi.disableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + + /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: number) => { @@ -340,6 +377,9 @@ const searchFormClick = (searchData) => { /** 初始化 **/ onMounted(async () => { + tableObject.params = { + available: true + } getList() }) diff --git a/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts b/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts index 327ae6a65..4ea0ae2bf 100644 --- a/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts +++ b/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts @@ -101,6 +101,29 @@ export const Package = useCrudSchemas(reactive([ width: 180, } }, + { + label: '是否可用', + field: 'available', + sort: 'custom', + isSearch:true, + isForm: false, + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + search: { + value: 'TRUE', + }, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + }, + table: { + width: 110 + } + }, { label: '创建时间', field: 'createTime', diff --git a/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue b/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue index 4d90e8bbf..19015cc1d 100644 --- a/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue +++ b/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue @@ -33,7 +33,7 @@ @@ -190,12 +190,23 @@ const buttonBaseClick = (val, item) => { // ] // } +const isShowMainButton = (row, val) => { + if (val.indexOf(row.available) > -1) { + return false + } else { + return true + } +} + // 列表-操作按钮 -const butttondata = [ +const butttondata = (row) => { + return[ // defaultButtons.mainListEditBtn({hasPermi:'wms:package:update'}), // 编辑 // defaultButtons.mainListDeleteBtn({hasPermi:'wms:package:delete'}), // 删除 defaultButtons.mainListPointBtn(null), // 标签打印 -] + defaultButtons.mainListEnableBtn({hide: isShowMainButton(row, ['FALSE']),hasPermi: 'wms:barbasic:enable'}), //启用 + defaultButtons.mainListDisableBtn({hide: isShowMainButton(row, ['TRUE']),hasPermi: 'wms:barbasic:disable'}), //停用 +]} // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { @@ -205,9 +216,33 @@ const buttonTableClick = async (val, row) => { handleDelete(row.id) } else if (val == 'point') { // 标签打印 handlePoint(row) + } else if (val == 'enable') { + handleEnable(row.id) + } else if (val == 'disable') { + handleDisable(row.id) } } +const handleEnable = async (id: number) => { + try { + await BarbasicApi.enableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + +const handleDisable = async (id: number) => { + try { + await BarbasicApi.disableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: number) => { @@ -336,6 +371,9 @@ const searchFormClick = (searchData) => { /** 初始化 **/ onMounted(async () => { + tableObject.params = { + available: true + } getList() }) diff --git a/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts b/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts index 77212d25c..e7920f846 100644 --- a/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts +++ b/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts @@ -111,6 +111,29 @@ export const Package = useCrudSchemas(reactive([ width: 180, } }, + { + label: '是否可用', + field: 'available', + sort: 'custom', + isSearch:true, + isForm: false, + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + search: { + value: 'TRUE', + }, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + }, + table: { + width: 110 + } + }, { label: '创建时间', field: 'createTime', diff --git a/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue b/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue index 8fc6390f6..9dd4ba9d0 100644 --- a/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue +++ b/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue @@ -33,7 +33,7 @@ @@ -177,12 +177,25 @@ const buttonBaseClick = (val, item) => { // ] // } + +const isShowMainButton = (row, val) => { + if (val.indexOf(row.available) > -1) { + return false + } else { + return true + } +} + + // 列表-操作按钮 -const butttondata = [ +const butttondata = (row) => { + return[ // defaultButtons.mainListEditBtn({hasPermi:'wms:package:update'}), // 编辑 // defaultButtons.mainListDeleteBtn({hasPermi:'wms:package:delete'}), // 删除 defaultButtons.mainListPointBtn(null), // 标签打印 -] + defaultButtons.mainListEnableBtn({hide: isShowMainButton(row, ['FALSE']),hasPermi: 'wms:barbasic:enable'}), //启用 + defaultButtons.mainListDisableBtn({hide: isShowMainButton(row, ['TRUE']),hasPermi: 'wms:barbasic:disable'}), //停用 +]} // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { @@ -192,9 +205,35 @@ const buttonTableClick = async (val, row) => { handleDelete(row.id) } else if (val == 'point') { // 标签打印 handlePoint(row) + } else if (val == 'enable') { + handleEnable(row.id) + } else if (val == 'disable') { + handleDisable(row.id) } } + +const handleEnable = async (id: number) => { + try { + await BarbasicApi.enableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + +const handleDisable = async (id: number) => { + try { + await BarbasicApi.disableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + + /** 添加/修改操作 */ const basicFormRef = ref() const openForm =async (type: string, row?: number) => { @@ -274,6 +313,9 @@ const searchFormClick = (searchData) => { /** 初始化 **/ onMounted(async () => { + tableObject.params = { + available: true + } getList() }) diff --git a/src/views/wms/basicDataManage/labelManage/utensilPackage/utensilPackage.data.ts b/src/views/wms/basicDataManage/labelManage/utensilPackage/utensilPackage.data.ts index ba2ac4af2..9326a2996 100644 --- a/src/views/wms/basicDataManage/labelManage/utensilPackage/utensilPackage.data.ts +++ b/src/views/wms/basicDataManage/labelManage/utensilPackage/utensilPackage.data.ts @@ -103,6 +103,29 @@ export const Package = useCrudSchemas(reactive([ width: 180, } }, + { + label: '是否可用', + field: 'available', + sort: 'custom', + isSearch:true, + isForm: false, + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + search: { + value: 'TRUE', + }, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + }, + table: { + width: 110 + } + }, { label: '创建时间', field: 'createTime', diff --git a/src/views/wms/basicDataManage/orderManage/carrier/carrier.data.ts b/src/views/wms/basicDataManage/orderManage/carrier/carrier.data.ts index 18eadba87..f8430a8ee 100644 --- a/src/views/wms/basicDataManage/orderManage/carrier/carrier.data.ts +++ b/src/views/wms/basicDataManage/orderManage/carrier/carrier.data.ts @@ -138,13 +138,13 @@ export const Carrier = useCrudSchemas(reactive([ { label: '是否可用', field: 'available', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isTable: true, - isSearch: true, sort: 'custom', - table: { - width: 150 + isSearch:true, + isForm: false, + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + search: { + value: 'TRUE', }, form: { component: 'Switch', @@ -154,6 +154,9 @@ export const Carrier = useCrudSchemas(reactive([ activeValue: 'TRUE' } }, + table: { + width: 110 + } }, { label: '生效时间', diff --git a/src/views/wms/basicDataManage/orderManage/carrier/index.vue b/src/views/wms/basicDataManage/orderManage/carrier/index.vue index d5948afae..ef2c07c70 100644 --- a/src/views/wms/basicDataManage/orderManage/carrier/index.vue +++ b/src/views/wms/basicDataManage/orderManage/carrier/index.vue @@ -33,7 +33,7 @@ @@ -130,11 +130,26 @@ const buttonBaseClick = (val, item) => { } } + + +const isShowMainButton = (row, val) => { + if (val.indexOf(row.available) > -1) { + return false + } else { + return true + } +} + + + // 列表-操作按钮 -const butttondata = [ - defaultButtons.mainListEditBtn({hasPermi:'wms:carrier:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:carrier:delete'}), // 删除 -] +const butttondata = (row) => { + return[ + defaultButtons.mainListEditBtn({hasPermi:'wms:carrier:update'}), // 编辑 + defaultButtons.mainListEnableBtn({hide: isShowMainButton(row, ['FALSE']),hasPermi: 'wms:carrier:enable'}), //启用 + defaultButtons.mainListDisableBtn({hide: isShowMainButton(row, ['TRUE']),hasPermi: 'wms:carrier:disable'}), //停用 + defaultButtons.mainListDeleteBtn({hasPermi:'wms:carrier:delete'}), // 删除 +]} // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { @@ -143,9 +158,36 @@ const buttonTableClick = async (val, row) => { openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.id) + } else if (val == 'enable') { + handleEnable(row.id) + } else if (val == 'disable') { + handleDisable(row.id) } } + +const handleEnable = async (id: number) => { + try { + await CarrierApi.enableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + +const handleDisable = async (id: number) => { + try { + await CarrierApi.disableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + + + /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: any) => { @@ -268,6 +310,9 @@ const searchFormClick = (searchData) => { /** 初始化 **/ onMounted(async() => { + tableObject.params = { + available: 'TRUE' + } getList() importTemplateData.templateUrl = await CarrierApi.importTemplate() }) diff --git a/src/views/wms/basicDataManage/orderManage/owner/index.vue b/src/views/wms/basicDataManage/orderManage/owner/index.vue index 7d9e7ab4c..17168e7cd 100644 --- a/src/views/wms/basicDataManage/orderManage/owner/index.vue +++ b/src/views/wms/basicDataManage/orderManage/owner/index.vue @@ -33,7 +33,7 @@ @@ -130,11 +130,27 @@ const buttonBaseClick = (val, item) => { } } + + +const isShowMainButton = (row, val) => { + if (val.indexOf(row.available) > -1) { + return false + } else { + return true + } +} + + + + // 列表-操作按钮 -const butttondata = [ - defaultButtons.mainListEditBtn({hasPermi:'wms:owner:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:owner:delete'}), // 删除 -] +const butttondata = (row) => { + return[ + defaultButtons.mainListEditBtn({hasPermi:'wms:owner:update'}), // 编辑 + defaultButtons.mainListEnableBtn({hide: isShowMainButton(row, ['FALSE']),hasPermi: 'wms:owner:enable'}), //启用 + defaultButtons.mainListDisableBtn({hide: isShowMainButton(row, ['TRUE']),hasPermi: 'wms:owner:disable'}), //停用 + defaultButtons.mainListDeleteBtn({hasPermi:'wms:owner:delete'}), // 删除 +]} // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { @@ -143,9 +159,36 @@ const buttonTableClick = async (val, row) => { openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.id) + } else if (val == 'enable') { + handleEnable(row.id) + } else if (val == 'disable') { + handleDisable(row.id) } } + +const handleEnable = async (id: number) => { + try { + await OwnerApi.enableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + +const handleDisable = async (id: number) => { + try { + await OwnerApi.disableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + + + /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: any) => { @@ -269,6 +312,9 @@ const searchFormClick = (searchData) => { /** 初始化 **/ onMounted(async() => { + tableObject.params = { + available: 'TRUE' + } getList() importTemplateData.templateUrl = await OwnerApi.importTemplate() }) diff --git a/src/views/wms/basicDataManage/orderManage/owner/owner.data.ts b/src/views/wms/basicDataManage/orderManage/owner/owner.data.ts index 1121ed880..817a2171e 100644 --- a/src/views/wms/basicDataManage/orderManage/owner/owner.data.ts +++ b/src/views/wms/basicDataManage/orderManage/owner/owner.data.ts @@ -138,13 +138,13 @@ export const Owner = useCrudSchemas(reactive([ { label: '是否可用', field: 'available', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isTable: true, - isSearch: true, sort: 'custom', - table: { - width: 150 + isSearch:true, + isForm: false, + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + search: { + value: 'TRUE', }, form: { component: 'Switch', @@ -154,6 +154,9 @@ export const Owner = useCrudSchemas(reactive([ activeValue: 'TRUE' } }, + table: { + width: 110 + } }, { label: '生效时间', diff --git a/src/views/wms/basicDataManage/orderManage/shift/index.vue b/src/views/wms/basicDataManage/orderManage/shift/index.vue index 3980d5577..f8d72f261 100644 --- a/src/views/wms/basicDataManage/orderManage/shift/index.vue +++ b/src/views/wms/basicDataManage/orderManage/shift/index.vue @@ -33,7 +33,7 @@ @@ -130,11 +130,26 @@ const buttonBaseClick = (val, item) => { } } + +const isShowMainButton = (row, val) => { + if (val.indexOf(row.available) > -1) { + return false + } else { + return true + } +} + + + + // 列表-操作按钮 -const butttondata = [ - defaultButtons.mainListEditBtn({hasPermi:'wms:shift:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:shift:delete'}), // 删除 -] +const butttondata = (row) => { + return[ + defaultButtons.mainListEditBtn({hasPermi:'wms:shift:update'}), // 编辑 + defaultButtons.mainListEnableBtn({hide: isShowMainButton(row, ['FALSE']),hasPermi: 'wms:shift:enable'}), //启用 + defaultButtons.mainListDisableBtn({hide: isShowMainButton(row, ['TRUE']),hasPermi: 'wms:shift:disable'}), //停用 + defaultButtons.mainListDeleteBtn({hasPermi:'wms:shift:delete'}), // 删除 +]} // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { @@ -143,9 +158,36 @@ const buttonTableClick = async (val, row) => { openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.id) + } else if (val == 'enable') { + handleEnable(row.id) + } else if (val == 'disable') { + handleDisable(row.id) } } + + +const handleEnable = async (id: number) => { + try { + await ShiftApi.enableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + +const handleDisable = async (id: number) => { + try { + await ShiftApi.disableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + + /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: any) => { @@ -275,6 +317,9 @@ const searchFormClick = (searchData) => { /** 初始化 **/ onMounted(async() => { + tableObject.params = { + available: 'TRUE' + } getList() importTemplateData.templateUrl = await ShiftApi.importTemplate() }) diff --git a/src/views/wms/basicDataManage/orderManage/shift/shift.data.ts b/src/views/wms/basicDataManage/orderManage/shift/shift.data.ts index 9f773e074..7aaa0d74e 100644 --- a/src/views/wms/basicDataManage/orderManage/shift/shift.data.ts +++ b/src/views/wms/basicDataManage/orderManage/shift/shift.data.ts @@ -111,13 +111,13 @@ export const Shift = useCrudSchemas( { label: '是否可用', field: 'available', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isTable: true, - isSearch: true, sort: 'custom', - table: { - width: 150 + isSearch:true, + isForm: false, + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + search: { + value: 'TRUE', }, form: { component: 'Switch', @@ -126,6 +126,9 @@ export const Shift = useCrudSchemas( inactiveValue: 'FALSE', activeValue: 'TRUE' } + }, + table: { + width: 110 } }, { diff --git a/src/views/wms/basicDataManage/orderManage/team/index.vue b/src/views/wms/basicDataManage/orderManage/team/index.vue index 102177447..1b13768ce 100644 --- a/src/views/wms/basicDataManage/orderManage/team/index.vue +++ b/src/views/wms/basicDataManage/orderManage/team/index.vue @@ -33,7 +33,7 @@ @@ -133,11 +133,22 @@ const buttonBaseClick = (val, item) => { } } +const isShowMainButton = (row, val) => { + if (val.indexOf(row.available) > -1) { + return false + } else { + return true + } +} + // 列表-操作按钮 -const butttondata = [ - defaultButtons.mainListEditBtn({hasPermi:'wms:team:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:team:delete'}), // 删除 -] +const butttondata = (row) => { + return[ + defaultButtons.mainListEditBtn({hasPermi:'wms:team:update'}), // 编辑 + defaultButtons.mainListEnableBtn({hide: isShowMainButton(row, ['FALSE']),hasPermi: 'wms:itembasic:enable'}), //启用 + defaultButtons.mainListDisableBtn({hide: isShowMainButton(row, ['TRUE']),hasPermi: 'wms:itembasic:disable'}), //停用 + defaultButtons.mainListDeleteBtn({hasPermi:'wms:team:delete'}), // 删除 +]} // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { @@ -147,9 +158,36 @@ const buttonTableClick = async (val, row) => { basicFormRef.value.open('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.id) + } else if (val == 'enable') { + handleEnable(row.id) + } else if (val == 'disable') { + handleDisable(row.id) } + +} + + +const handleEnable = async (id: number) => { + try { + await TeamApi.enableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} } + +const handleDisable = async (id: number) => { + try { + await TeamApi.disableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + + /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: any) => { @@ -263,6 +301,9 @@ const searchFormClick = (searchData) => { /** 初始化 **/ onMounted(async() => { + tableObject.params = { + available: 'TRUE' + } getList() importTemplateData.templateUrl = await TeamApi.importTemplate() }) diff --git a/src/views/wms/basicDataManage/orderManage/team/team.data.ts b/src/views/wms/basicDataManage/orderManage/team/team.data.ts index 46278d47e..08a062b76 100644 --- a/src/views/wms/basicDataManage/orderManage/team/team.data.ts +++ b/src/views/wms/basicDataManage/orderManage/team/team.data.ts @@ -74,11 +74,14 @@ export const Team = useCrudSchemas(reactive([ { label: '是否可用', field: 'available', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isTable: false, - isSearch: false, sort: 'custom', + isSearch:true, + isForm: false, + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + search: { + value: 'TRUE', + }, form: { component: 'Switch', value: 'TRUE', @@ -87,6 +90,9 @@ export const Team = useCrudSchemas(reactive([ activeValue: 'TRUE' } }, + table: { + width: 110 + } }, { label: '生效时间', diff --git a/src/views/wms/basicDataManage/orderManage/team/teamForm.vue b/src/views/wms/basicDataManage/orderManage/team/teamForm.vue index 6cc673472..6e287f29e 100644 --- a/src/views/wms/basicDataManage/orderManage/team/teamForm.vue +++ b/src/views/wms/basicDataManage/orderManage/team/teamForm.vue @@ -128,11 +128,11 @@ - + diff --git a/src/views/wms/basicDataManage/subject/mstr/index.vue b/src/views/wms/basicDataManage/subject/mstr/index.vue index 616377da4..64df63efc 100644 --- a/src/views/wms/basicDataManage/subject/mstr/index.vue +++ b/src/views/wms/basicDataManage/subject/mstr/index.vue @@ -33,7 +33,7 @@ @@ -139,11 +139,25 @@ const buttonBaseClick = (val, item) => { } } + +const isShowMainButton = (row, val) => { + if (val.indexOf(row.available) > -1) { + return false + } else { + return true + } +} + + + // 列表-操作按钮 -const butttondata = [ - defaultButtons.mainListEditBtn({hasPermi:'wms:mstr:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:mstr:delete'}), // 删除 -] +const butttondata = (row) => { + return[ + defaultButtons.mainListEditBtn({hasPermi:'wms:mstr:update'}), // 编辑 + defaultButtons.mainListEnableBtn({hide: isShowMainButton(row, ['FALSE']),hasPermi: 'wms:mstr:enable'}), //启用 + defaultButtons.mainListDisableBtn({hide: isShowMainButton(row, ['TRUE']),hasPermi: 'wms:mstr:disable'}), //停用 + defaultButtons.mainListDeleteBtn({hasPermi:'wms:mstr:delete'}), // 删除 +]} // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { @@ -151,9 +165,35 @@ const buttonTableClick = async (val, row) => { openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.id) + } else if (val == 'enable') { + handleEnable(row.id) + } else if (val == 'disable') { + handleDisable(row.id) } } + +const handleEnable = async (id: number) => { + try { + await MstrApi.enableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + +const handleDisable = async (id: number) => { + try { + await MstrApi.disableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + + /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: any) => { @@ -247,6 +287,9 @@ const searchFormClick = (searchData) => { /** 初始化 **/ onMounted(async () => { + tableObject.params = { + available: 'TRUE' + } getList() importTemplateData.templateUrl = await MstrApi.importTemplate() }) diff --git a/src/views/wms/basicDataManage/subject/mstr/mstr.data.ts b/src/views/wms/basicDataManage/subject/mstr/mstr.data.ts index d7304e8cb..c47bb8d74 100644 --- a/src/views/wms/basicDataManage/subject/mstr/mstr.data.ts +++ b/src/views/wms/basicDataManage/subject/mstr/mstr.data.ts @@ -136,6 +136,29 @@ export const Mstr = useCrudSchemas(reactive([ width: 150 } }, + { + label: '是否可用', + field: 'available', + sort: 'custom', + isSearch:true, + isForm: false, + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + search: { + value: 'TRUE', + }, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + }, + table: { + width: 110 + } + }, { label: '操作', field: 'action', diff --git a/src/views/wms/basicDataManage/subject/subjectAccount/index.vue b/src/views/wms/basicDataManage/subject/subjectAccount/index.vue index 659efc5b8..768f122ec 100644 --- a/src/views/wms/basicDataManage/subject/subjectAccount/index.vue +++ b/src/views/wms/basicDataManage/subject/subjectAccount/index.vue @@ -33,7 +33,7 @@ @@ -148,11 +148,22 @@ const buttonBaseClick = (val, item) => { } } +const isShowMainButton = (row, val) => { + if (val.indexOf(row.available) > -1) { + return false + } else { + return true + } +} + // 列表-操作按钮 -const butttondata = [ - defaultButtons.mainListEditBtn({hasPermi:'wms:subject-account:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:subject-account:delete'}), // 删除 -] +const butttondata = (row) => { + return[ + defaultButtons.mainListEditBtn({hasPermi:'wms:subject-account:update'}), // 编辑 + defaultButtons.mainListEnableBtn({hide: isShowMainButton(row, ['FALSE']),hasPermi: 'wms:subject-account:enable'}), //启用 + defaultButtons.mainListDisableBtn({hide: isShowMainButton(row, ['TRUE']),hasPermi: 'wms:subject-account:disable'}), //停用 + defaultButtons.mainListDeleteBtn({hasPermi:'wms:subject-account:delete'}), // 删除 +]} // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { @@ -160,9 +171,35 @@ const buttonTableClick = async (val, row) => { openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.id) + } else if (val == 'enable') { + handleEnable(row.id) + } else if (val == 'disable') { + handleDisable(row.id) } } + +const handleEnable = async (id: number) => { + try { + await SubjectAccountApi.enableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + +const handleDisable = async (id: number) => { + try { + await SubjectAccountApi.disableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + + /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: any) => { @@ -265,6 +302,9 @@ const searchFormClick = (searchData) => { /** 初始化 **/ onMounted(async () => { + tableObject.params = { + available: 'TRUE' + } getList() importTemplateData.templateUrl = await SubjectAccountApi.importTemplate() }) diff --git a/src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts b/src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts index 16ef56357..6cc5cd680 100644 --- a/src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts +++ b/src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts @@ -177,11 +177,12 @@ export const SubjectAccount = useCrudSchemas( label: '是否可用', field: 'available', sort: 'custom', + isSearch:true, + isForm: false, dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isTable: true, - table: { - width: 120 + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + search: { + value: 'TRUE', }, form: { component: 'Switch', @@ -190,6 +191,9 @@ export const SubjectAccount = useCrudSchemas( inactiveValue: 'FALSE', activeValue: 'TRUE' } + }, + table: { + width: 110 } }, { diff --git a/src/views/wms/basicDataManage/supplierManage/purchaseprice/index.vue b/src/views/wms/basicDataManage/supplierManage/purchaseprice/index.vue index 9d9f576fe..e9d244170 100644 --- a/src/views/wms/basicDataManage/supplierManage/purchaseprice/index.vue +++ b/src/views/wms/basicDataManage/supplierManage/purchaseprice/index.vue @@ -33,7 +33,7 @@ @@ -133,11 +133,22 @@ const buttonBaseClick = (val, item) => { } } +const isShowMainButton = (row, val) => { + if (val.indexOf(row.available) > -1) { + return false + } else { + return true + } +} + // 列表-操作按钮 -const butttondata = [ - defaultButtons.mainListEditBtn({hasPermi:'wms:purchaseprice:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:purchaseprice:delete'}), // 删除 -] +const butttondata = (row) => { + return[ + defaultButtons.mainListEditBtn({hasPermi:'wms:purchaseprice:update'}), // 编辑 + defaultButtons.mainListEnableBtn({hide: isShowMainButton(row, ['FALSE']),hasPermi: 'wms:purchaseprice:enable'}), + defaultButtons.mainListDisableBtn({hide: isShowMainButton(row, ['TRUE']),hasPermi: 'wms:purchaseprice:disable'}), + defaultButtons.mainListDeleteBtn({hasPermi:'wms:purchaseprice:delete'}), // 删除 +]} // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { @@ -146,9 +157,33 @@ const buttonTableClick = async (val, row) => { openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.id) + } else if (val == 'enable') { + handleEnable(row.id) + } else if (val == 'disable') { + handleDisable(row.id) } } +const handleEnable = async (id: number) => { + try { + await PurchasepriceApi.enableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + +const handleDisable = async (id: number) => { + try { + await PurchasepriceApi.disableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: any) => { @@ -286,6 +321,9 @@ const searchFormClick = (searchData) => { /** 初始化 **/ onMounted(async() => { + tableObject.params = { + available: 'TRUE' + } getList() importTemplateData.templateUrl = await PurchasepriceApi.importTemplate() }) diff --git a/src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts b/src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts index ad342343c..e32df87ff 100644 --- a/src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts +++ b/src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts @@ -117,13 +117,13 @@ export const Purchaseprice = useCrudSchemas(reactive([ { label: '是否可用', field: 'available', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isSearch: true, - isTable: true, sort: 'custom', - table: { - width: 180 + isSearch:true, + isForm: false, + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + search: { + value: 'TRUE', }, form: { component: 'Switch', @@ -133,6 +133,9 @@ export const Purchaseprice = useCrudSchemas(reactive([ activeValue: 'TRUE' } }, + table: { + width: 110 + } }, { label: '生效时间', diff --git a/src/views/wms/basicDataManage/supplierManage/supplier/index.vue b/src/views/wms/basicDataManage/supplierManage/supplier/index.vue index d18250465..2a1e44627 100644 --- a/src/views/wms/basicDataManage/supplierManage/supplier/index.vue +++ b/src/views/wms/basicDataManage/supplierManage/supplier/index.vue @@ -33,7 +33,7 @@ @@ -131,11 +131,23 @@ const buttonBaseClick = (val, item) => { } } +const isShowMainButton = (row, val) => { + if (val.indexOf(row.available) > -1) { + return false + } else { + return true + } +} + + // 列表-操作按钮 -const butttondata = [ +const butttondata = (row) => { + return[ defaultButtons.mainListEditBtn({hasPermi:'wms:supplier:update'}), // 编辑 + defaultButtons.mainListEnableBtn({hide: isShowMainButton(row, ['FALSE']),hasPermi: 'wms:supplier:enable'}), + defaultButtons.mainListDisableBtn({hide: isShowMainButton(row, ['TRUE']),hasPermi: 'wms:supplier:disable'}), defaultButtons.mainListDeleteBtn({hasPermi:'wms:supplier:delete'}), // 删除 -] +]} // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { @@ -144,9 +156,33 @@ const buttonTableClick = async (val, row) => { openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.id) + } else if (val == 'enable') { + handleEnable(row.id) + } else if (val == 'disable') { + handleDisable(row.id) } } +const handleEnable = async (id: number) => { + try { + await SupplierApi.enableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + +const handleDisable = async (id: number) => { + try { + await SupplierApi.disableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: any) => { @@ -267,6 +303,9 @@ const searchFormClick = (searchData) => { /** 初始化 **/ onMounted(async() => { + tableObject.params = { + available: 'TRUE' + } getList() importTemplateData.templateUrl = await SupplierApi.importTemplate() }) diff --git a/src/views/wms/basicDataManage/supplierManage/supplier/supplier.data.ts b/src/views/wms/basicDataManage/supplierManage/supplier/supplier.data.ts index b386fcf1a..21f7766b2 100644 --- a/src/views/wms/basicDataManage/supplierManage/supplier/supplier.data.ts +++ b/src/views/wms/basicDataManage/supplierManage/supplier/supplier.data.ts @@ -151,21 +151,23 @@ export const Supplier = useCrudSchemas(reactive([ label: '是否可用', field: 'available', sort: 'custom', + isSearch:true, + isForm: false, dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isSearch: true, - isTable: true, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + search: { + value: 'TRUE', + }, form: { component: 'Switch', value: 'TRUE', componentProps: { inactiveValue: 'FALSE', - activeValue: 'TRUE', - disabled: true + activeValue: 'TRUE' } }, table: { - width: 150 + width: 110 } }, { diff --git a/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue b/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue index 5b6bdb027..4e5861a98 100644 --- a/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue +++ b/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue @@ -33,7 +33,7 @@ @@ -136,11 +136,23 @@ const buttonBaseClick = (val, item) => { } } + +const isShowMainButton = (row, val) => { + if (val.indexOf(row.available) > -1) { + return false + } else { + return true + } +} + // 列表-操作按钮 -const butttondata = [ - defaultButtons.mainListEditBtn({hasPermi:'wms:supplieritem:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:supplieritem:delete'}), // 删除 -] +const butttondata = (row) => { + return[ + defaultButtons.mainListEditBtn({hasPermi:'wms:supplieritem:update'}), // 编辑 + defaultButtons.mainListEnableBtn({hide: isShowMainButton(row, ['FALSE']),hasPermi: 'wms:supplieritem:enable'}), //启用 + defaultButtons.mainListDisableBtn({hide: isShowMainButton(row, ['TRUE']),hasPermi: 'wms:supplieritem:disable'}), //禁用 + defaultButtons.mainListDeleteBtn({hasPermi:'wms:supplieritem:delete'}), // 删除 +]} // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { @@ -149,7 +161,32 @@ const buttonTableClick = async (val, row) => { openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.id) + } else if (val == 'enable') { + handleEnable(row.id) + } else if (val == 'disable') { + handleDisable(row.id) } + +} + + +const handleEnable = async (id: number) => { + try { + await SupplieritemApi.enableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + +const handleDisable = async (id: number) => { + try { + await SupplieritemApi.disableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} } /** 添加/修改操作 */ @@ -309,6 +346,9 @@ const searchFormClick = (searchData) => { /** 初始化 **/ onMounted(async() => { + tableObject.params = { + available: 'TRUE' + } getList() importTemplateData.templateUrl = await SupplieritemApi.importTemplate() }) diff --git a/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts b/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts index d1c0fe5b7..a04c95f49 100644 --- a/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts +++ b/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts @@ -259,11 +259,14 @@ export const Supplieritem = useCrudSchemas(reactive([ { label: '是否可用', field: 'available', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isSearch: true, - isTable: true, sort: 'custom', + isSearch:true, + isForm: false, + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + search: { + value: 'TRUE', + }, form: { component: 'Switch', value: 'TRUE', @@ -273,7 +276,7 @@ export const Supplieritem = useCrudSchemas(reactive([ } }, table: { - width: 150 + width: 110 } }, { diff --git a/src/views/wms/basicDataManage/systemSetting/accountcalendar/accountcalendar.data.ts b/src/views/wms/basicDataManage/systemSetting/accountcalendar/accountcalendar.data.ts index 6ce4163de..fd5e7780d 100644 --- a/src/views/wms/basicDataManage/systemSetting/accountcalendar/accountcalendar.data.ts +++ b/src/views/wms/basicDataManage/systemSetting/accountcalendar/accountcalendar.data.ts @@ -149,13 +149,13 @@ export const Accountcalendar = useCrudSchemas(reactive([ { label: '是否可用', field: 'available', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isSearch: true, - isTable: true, sort: 'custom', - table: { - width: 150 + isSearch:true, + isForm: false, + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + search: { + value: 'TRUE', }, form: { component: 'Switch', @@ -165,6 +165,9 @@ export const Accountcalendar = useCrudSchemas(reactive([ activeValue: 'TRUE' } }, + table: { + width: 110 + } }, { label: '生效时间', diff --git a/src/views/wms/basicDataManage/systemSetting/accountcalendar/index.vue b/src/views/wms/basicDataManage/systemSetting/accountcalendar/index.vue index 2343429a6..eb0a90c30 100644 --- a/src/views/wms/basicDataManage/systemSetting/accountcalendar/index.vue +++ b/src/views/wms/basicDataManage/systemSetting/accountcalendar/index.vue @@ -33,7 +33,7 @@ @@ -130,11 +130,25 @@ const buttonBaseClick = (val, item) => { } } + +const isShowMainButton = (row, val) => { + if (val.indexOf(row.available) > -1) { + return false + } else { + return true + } +} + + + // 列表-操作按钮 -const butttondata = [ - defaultButtons.mainListEditBtn({hasPermi:'wms:accountcalendar:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:accountcalendar:delete'}), // 删除 -] +const butttondata = (row) => { + return[ + defaultButtons.mainListEditBtn({hasPermi:'wms:accountcalendar:update'}), // 编辑 + defaultButtons.mainListEnableBtn({hide: isShowMainButton(row, ['FALSE']),hasPermi: 'wms:accountcalendar:enable'}), //启用 + defaultButtons.mainListDisableBtn({hide: isShowMainButton(row, ['TRUE']),hasPermi: 'wms:accountcalendar:disable'}), //停用 + defaultButtons.mainListDeleteBtn({hasPermi:'wms:accountcalendar:delete'}), // 删除 +]} // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { @@ -143,9 +157,36 @@ const buttonTableClick = async (val, row) => { openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.id) + } else if (val == 'enable') { + handleEnable(row.id) + } else if (val == 'disable') { + handleDisable(row.id) } } + +const handleEnable = async (id: number) => { + try { + await AccountcalendarApi.enableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + +const handleDisable = async (id: number) => { + try { + await AccountcalendarApi.disableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + + + /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: any) => { @@ -249,6 +290,9 @@ const searchFormClick = (searchData) => { /** 初始化 **/ onMounted(async() => { + tableObject.params = { + available: 'TRUE' + } getList() importTemplateData.templateUrl = await AccountcalendarApi.importTemplate() }) diff --git a/src/views/wms/basicDataManage/systemSetting/currencyexchange/currencyexchange.data.ts b/src/views/wms/basicDataManage/systemSetting/currencyexchange/currencyexchange.data.ts index 02366d873..9f25d162d 100644 --- a/src/views/wms/basicDataManage/systemSetting/currencyexchange/currencyexchange.data.ts +++ b/src/views/wms/basicDataManage/systemSetting/currencyexchange/currencyexchange.data.ts @@ -49,13 +49,13 @@ export const Currencyexchange = useCrudSchemas(reactive([ { label: '是否可用', field: 'available', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isSearch: true, - isTable: true, sort: 'custom', - table: { - width: 150 + isSearch:true, + isForm: false, + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + search: { + value: 'TRUE', }, form: { component: 'Switch', @@ -65,6 +65,9 @@ export const Currencyexchange = useCrudSchemas(reactive([ activeValue: 'TRUE' } }, + table: { + width: 110 + } }, { label: '生效时间', diff --git a/src/views/wms/basicDataManage/systemSetting/currencyexchange/index.vue b/src/views/wms/basicDataManage/systemSetting/currencyexchange/index.vue index 5feaff41b..7539af6cf 100644 --- a/src/views/wms/basicDataManage/systemSetting/currencyexchange/index.vue +++ b/src/views/wms/basicDataManage/systemSetting/currencyexchange/index.vue @@ -33,7 +33,7 @@ @@ -131,11 +131,25 @@ const buttonBaseClick = (val, item) => { } } + +const isShowMainButton = (row, val) => { + if (val.indexOf(row.available) > -1) { + return false + } else { + return true + } +} + + + // 列表-操作按钮 -const butttondata = [ - defaultButtons.mainListEditBtn({hasPermi:'wms:currencyexchange:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:currencyexchange:delete'}), // 删除 -] +const butttondata = (row) => { + return[ + defaultButtons.mainListEditBtn({hasPermi:'wms:currencyexchange:update'}), // 编辑 + defaultButtons.mainListEnableBtn({hide: isShowMainButton(row, ['FALSE']),hasPermi: 'wms:currencyexchange:enable'}), //启用 + defaultButtons.mainListDisableBtn({hide: isShowMainButton(row, ['TRUE']),hasPermi: 'wms:currencyexchange:disable'}), //停用 + defaultButtons.mainListDeleteBtn({hasPermi:'wms:currencyexchange:delete'}), // 删除 +]} // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { @@ -144,9 +158,36 @@ const buttonTableClick = async (val, row) => { openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.id) + } else if (val == 'enable') { + handleEnable(row.id) + } else if (val == 'disable') { + handleDisable(row.id) } } + +const handleEnable = async (id: number) => { + try { + await CurrencyexchangeApi.enableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + +const handleDisable = async (id: number) => { + try { + await CurrencyexchangeApi.disableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + + + /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: any) => { @@ -253,6 +294,9 @@ const formatter = (type)=>{ } /** 初始化 **/ onMounted(async() => { + tableObject.params = { + available: 'TRUE' + } getList() importTemplateData.templateUrl = await CurrencyexchangeApi.importTemplate() }) diff --git a/src/views/wms/basicDataManage/systemSetting/systemcalendar/index.vue b/src/views/wms/basicDataManage/systemSetting/systemcalendar/index.vue index e41a66b38..0d8090c8b 100644 --- a/src/views/wms/basicDataManage/systemSetting/systemcalendar/index.vue +++ b/src/views/wms/basicDataManage/systemSetting/systemcalendar/index.vue @@ -33,7 +33,7 @@ @@ -130,11 +130,25 @@ const buttonBaseClick = (val, item) => { } } + +const isShowMainButton = (row, val) => { + if (val.indexOf(row.available) > -1) { + return false + } else { + return true + } +} + + + // 列表-操作按钮 -const butttondata = [ - defaultButtons.mainListEditBtn({hasPermi:'wms:systemcalendar:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:systemcalendar:delete'}), // 删除 -] +const butttondata = (row) => { + return[ + defaultButtons.mainListEditBtn({hasPermi:'wms:systemcalendar:update'}), // 编辑 + defaultButtons.mainListEnableBtn({hide: isShowMainButton(row, ['FALSE']),hasPermi: 'wms:systemcalendar:enable'}), //启用 + defaultButtons.mainListDisableBtn({hide: isShowMainButton(row, ['TRUE']),hasPermi: 'wms:systemcalendar:disable'}), //停用 + defaultButtons.mainListDeleteBtn({hasPermi:'wms:systemcalendar:delete'}), // 删除 +]} // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { @@ -143,9 +157,35 @@ const buttonTableClick = async (val, row) => { openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.id) + } else if (val == 'enable') { + handleEnable(row.id) + } else if (val == 'disable') { + handleDisable(row.id) } } + +const handleEnable = async (id: number) => { + try { + await SystemcalendarApi.enableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + +const handleDisable = async (id: number) => { + try { + await SystemcalendarApi.disableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + + /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: any) => { @@ -249,6 +289,9 @@ const searchFormClick = (searchData) => { /** 初始化 **/ onMounted(async() => { + tableObject.params = { + available: 'TRUE' + } getList() importTemplateData.templateUrl = await SystemcalendarApi.importTemplate() }) diff --git a/src/views/wms/basicDataManage/systemSetting/systemcalendar/systemcalendar.data.ts b/src/views/wms/basicDataManage/systemSetting/systemcalendar/systemcalendar.data.ts index c413767db..eb3067a9f 100644 --- a/src/views/wms/basicDataManage/systemSetting/systemcalendar/systemcalendar.data.ts +++ b/src/views/wms/basicDataManage/systemSetting/systemcalendar/systemcalendar.data.ts @@ -82,13 +82,13 @@ export const Systemcalendar = useCrudSchemas(reactive([ { label: '是否可用', field: 'available', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isSearch: true, - isTable: true, sort: 'custom', - table: { - width: 150 + isSearch:true, + isForm: false, + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + search: { + value: 'TRUE', }, form: { component: 'Switch', @@ -98,6 +98,9 @@ export const Systemcalendar = useCrudSchemas(reactive([ activeValue: 'TRUE' } }, + table: { + width: 110 + } }, { label: '生效时间', diff --git a/src/views/wms/buttMesManage/mesBarCode/index.vue b/src/views/wms/buttMesManage/mesBarCode/index.vue index 35f970327..673b7b85d 100644 --- a/src/views/wms/buttMesManage/mesBarCode/index.vue +++ b/src/views/wms/buttMesManage/mesBarCode/index.vue @@ -40,7 +40,7 @@ @@ -151,11 +151,26 @@ const buttonBaseClick = (val, item) => { } } + +const isShowMainButton = (row, val) => { + if (val.indexOf(row.available) > -1) { + return false + } else { + return true + } +} + + + + // 列表-操作按钮 -const butttondata = [ - defaultButtons.mainListEditBtn({hasPermi:'wms:mes-bar-code:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:mes-bar-code:delete'}), // 删除 -] +const butttondata = (row) => { + return[ + defaultButtons.mainListEditBtn({hasPermi:'wms:mes-bar-code:update'}), // 编辑 + defaultButtons.mainListEnableBtn({hide: isShowMainButton(row, ['FALSE']),hasPermi: 'wms:mes-bar-code:enable'}), //启用 + defaultButtons.mainListDisableBtn({hide: isShowMainButton(row, ['TRUE']),hasPermi: 'wms:mes-bar-code:disable'}), //停用 + defaultButtons.mainListDeleteBtn({hasPermi:'wms:mes-bar-code:delete'}), // 删除 +]} // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { @@ -163,9 +178,36 @@ const buttonTableClick = async (val, row) => { openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.id) + } else if (val == 'enable') { + handleEnable(row.id) + } else if (val == 'disable') { + handleDisable(row.id) } } + +const handleEnable = async (id: number) => { + try { + await MesBarCodeApi.enableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + +const handleDisable = async (id: number) => { + try { + await MesBarCodeApi.disableOption(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + + + /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: any) => { @@ -258,6 +300,9 @@ const searchFormClick = (searchData) => { /** 初始化 **/ onMounted(async () => { + tableObject.params = { + available: 'TRUE' + } getList() importTemplateData.templateUrl = await MesBarCodeApi.importTemplate() }) diff --git a/src/views/wms/buttMesManage/mesBarCode/mesBarCode.data.ts b/src/views/wms/buttMesManage/mesBarCode/mesBarCode.data.ts index e46c7d34d..f5ee27716 100644 --- a/src/views/wms/buttMesManage/mesBarCode/mesBarCode.data.ts +++ b/src/views/wms/buttMesManage/mesBarCode/mesBarCode.data.ts @@ -197,10 +197,12 @@ export const MesBarCode = useCrudSchemas(reactive([ label: '是否可用', field: 'available', sort: 'custom', + isSearch:true, + isForm: false, dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - table: { - width: 120 + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + search: { + value: 'TRUE', }, form: { component: 'Switch', @@ -209,6 +211,9 @@ export const MesBarCode = useCrudSchemas(reactive([ inactiveValue: 'FALSE', activeValue: 'TRUE' } + }, + table: { + width: 110 } }, {