diff --git a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue index ffeaf4fa7..d2717d85e 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue @@ -185,10 +185,10 @@ const butttondata = (row,$index) => { return [] } return [ - defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接 - defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭 - defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃 - defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行 + // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接 + // defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭 + // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃 + // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行 ] } diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts index 0f55e8f0c..fce77e26e 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts @@ -1,13 +1,6 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import { dateFormatter } from '@/utils/formatTime' -// 表单校验 -export const SupplierdeliverInspectionDetailRules = reactive({ - itemCode: [required], - uom: [required], - concurrencyStamp: [required], -}) - export const SupplierdeliverInspectionDetail = useCrudSchemas(reactive([ { label: '上传质检报告', @@ -20,14 +13,16 @@ export const SupplierdeliverInspectionDetail = useCrudSchemas(reactive([ componentProps: { upData:{ tableId: '', - tableName: 'UploadQualityReport' + tableName: 'UploadQualityReport', + fileType:['apk'], + fileSize:100 }, limit:1, } @@ -1681,7 +1683,16 @@ export const UploadQualityReport = useCrudSchemas(reactive([ } }, { - label: '数量', + label: '供应商批次', + field: 'batch', + sort: 'custom', + isForm:false, + table: { + width: 150 + }, + }, + { + label: '发货数量', field: 'planQty', table: { width: 150 @@ -1693,15 +1704,6 @@ export const UploadQualityReport = useCrudSchemas(reactive([ precision: 6 } }, - { - label: '批次', - field: 'batch', - sort: 'custom', - isForm:false, - table: { - width: 150 - }, - }, ])) export const SupplierdeliverRequestPackage = useCrudSchemas(reactive([ {