diff --git a/src/api/wms/itemSyntheticRelation/index.ts b/src/api/wms/itemSyntheticRelation/index.ts index a3139afed..5272c3f1d 100644 --- a/src/api/wms/itemSyntheticRelation/index.ts +++ b/src/api/wms/itemSyntheticRelation/index.ts @@ -51,4 +51,12 @@ export const exportItemSyntheticRelation = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/item-synthetic-relation/get-import-template' }) -} \ No newline at end of file +} + +export async function enableItemSyntheticRelation(id: number) { + return await request.enable({ url: `/wms/item-synthetic-relation/enable?id=` + id }) +} + +export async function disableItemSyntheticRelation(id: number) { + return await request.disable({ url: `/wms/item-synthetic-relation/disable?id=` + id }) +} diff --git a/src/views/wms/basicDataManage/itemManage/itemSyntheticRelation/index.vue b/src/views/wms/basicDataManage/itemManage/itemSyntheticRelation/index.vue index aca0b5a0c..fdb7a3aa2 100644 --- a/src/views/wms/basicDataManage/itemManage/itemSyntheticRelation/index.vue +++ b/src/views/wms/basicDataManage/itemManage/itemSyntheticRelation/index.vue @@ -33,7 +33,7 @@ @@ -73,6 +73,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' +import * as SamplingProcessApi from "@/api/qms/samplingProcess"; defineOptions({ name: 'ItemSyntheticRelation' }) @@ -144,11 +145,27 @@ const buttonBaseClick = (val, item) => { } } -// 列表-操作按钮 -const butttondata = [ - defaultButtons.mainListEditBtn({hasPermi:'wms:itemSyntheticRelation:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:itemSyntheticRelation:delete'}), // 删除 -] +const isShowMainButton = (row, val) => { + if (val.indexOf(row.available) > -1) { + return false + } else { + return true + } +} + +const butttondata = (row) => { + return [ + defaultButtons.mainListEditBtn({hasPermi:'wms:itemSyntheticRelation:update'}), // 编辑 + defaultButtons.mainListEnableBtn({ + hide: isShowMainButton(row, ['FALSE']), + hasPermi: 'wms:itemSyntheticRelation:enable' + }), + defaultButtons.mainListDisableBtn({ + hide: isShowMainButton(row, ['TRUE']), + hasPermi: 'wms:itemSyntheticRelation:disable' + }), + ] +} // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { @@ -156,6 +173,10 @@ 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) } } @@ -208,6 +229,24 @@ const handleDelete = async (id: number) => { } catch {} } +const handleEnable = async (id: number) => { + try { + await ItemSyntheticRelationApi.enableItemSyntheticRelation(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} +const handleDisable = async (id: number) => { + try { + await ItemSyntheticRelationApi.disableItemSyntheticRelation(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + + /** 导出按钮操作 */ const exportLoading = ref(false) // 导出的加载中 const handleExport = async () => { diff --git a/src/views/wms/basicDataManage/itemManage/itemSyntheticRelation/itemSyntheticRelation.data.ts b/src/views/wms/basicDataManage/itemManage/itemSyntheticRelation/itemSyntheticRelation.data.ts index b7dfc09bd..c06a468ed 100644 --- a/src/views/wms/basicDataManage/itemManage/itemSyntheticRelation/itemSyntheticRelation.data.ts +++ b/src/views/wms/basicDataManage/itemManage/itemSyntheticRelation/itemSyntheticRelation.data.ts @@ -5,10 +5,23 @@ import * as ItembasicApi from "@/api/wms/itembasic"; // 表单校验 export const ItemSyntheticRelationRules = reactive({ name: [required], - itemCode: [required], + itemCode: [required, { validator: validateItemCodes, message: '应选择多个物料', trigger: 'blur' }], available: [required], }) +export function validateItemCodes(rule, value, callback) { + if (value) { + const Reg = /,/ + if (Reg.test(value)) { + callback() + } else { + callback(new Error('应选择多个物料')) + } + } else { + callback() + } +} + export const ItemSyntheticRelation = useCrudSchemas(reactive([ { label: '组合号', @@ -63,6 +76,12 @@ export const ItemSyntheticRelation = useCrudSchemas(reactive([ isSearch: false, isForm:false, }, + { + label: '备注', + field: 'remark', + sort: 'custom', + isSearch: false, + }, { label: '是否可用', field: 'available', @@ -73,14 +92,15 @@ export const ItemSyntheticRelation = useCrudSchemas(reactive([ table: { width: 120 }, - form: { - component: 'Switch', - value: 'TRUE', - componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE' - } - } + isForm:false, + // form: { + // component: 'Switch', + // value: 'TRUE', + // componentProps: { + // inactiveValue: 'FALSE', + // activeValue: 'TRUE' + // } + // } }, { label: '操作', diff --git a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts index 57c263447..2d31acb18 100644 --- a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts +++ b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts @@ -293,15 +293,15 @@ export const PreparetoissueMain = useCrudSchemas(reactive([ } } }, - { - label: '备注', - field: 'remark', - sort: 'custom', - table: { - width: 150 - }, - isTable: false - }, + // { + // label: '备注', + // field: 'remark', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTable: false + // }, { label: '是否可用', field: 'available', diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue index 92abf9afb..96d9a5118 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue @@ -838,7 +838,15 @@ const submitForm = async (formType, submitData) => { tableData.value.forEach((row, index) => { row['expireDate'] = row['expireTime']?addDay(row['produceDate'],row['expireTime']).valueOf():dayjs('2099-12-31').valueOf() }) - data.subList = tableData.value // 拼接子表数据参数 + let alalQty = 0 + tableData.value.forEach(item => { + alalQty += item.qty ? parseFloat(item.qty) : 0 + }) + if (alalQty == 0) { + message.error('收货总数量不可以为0') + return + } + data.subList = tableData.value.filter(item => parseFloat(item.qty) > 0) // 拼接子表数据参数 formRef.value.formLoading = true try { if (formType === 'create') { diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue index 4b23bcd71..33a6e4fe7 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue @@ -363,7 +363,10 @@ const submitForm = async (formType, submitData) => { if(item['allowOverShipment']!='TRUE'){ let qtyDefault = item['planQty'] - item['shippedQty'] if(item['qty']>qtyDefault){ - itemCodes.push(item['itemCode']) + itemCodes.push({ + itemCode:item['itemCode'], + poLine:item['poLine'] + }) } if(!itemCodeSum.includes(item['itemCode'])){ @@ -379,7 +382,11 @@ const submitForm = async (formType, submitData) => { } }) if(itemCodes.length>0){ - message.error(`${itemCodes.join(',')}${t('ts.不允许超发')}`) + let str = '' + itemCodes.forEach(cur => { + str += `【物料号${cur.itemCode}-订单行${cur.poLine}】` + }) + message.error(`${str}${t('ts.不允许超发')}`) return } if (itemCodeSum.length > 0) { @@ -436,7 +443,7 @@ const inputNumberChange = (field, val,row, index) => { if(row['allowOverShipment']!='TRUE'){ let qtyDefault = row['planQty'] - row['shippedQty'] if (row['qty'] > qtyDefault) { - message.error(`${row['itemCode']}${t('ts.不允许超发')}`) + message.error(`【物料号${row['itemCode']}-订单行${row['poLine']}】${t('ts.不允许超发')}`) } let planQty = row['planQty'] //计划数量 let sumQty = tableData.value.filter(item1=>item1['itemCode']==row['itemCode'] && item1['poLine']==row['poLine'] ).reduce((prev, item1) => prev + item1['qty'],0)