diff --git a/src/components/Form/src/Form.vue b/src/components/Form/src/Form.vue index 105da516f..2e599dd83 100644 --- a/src/components/Form/src/Form.vue +++ b/src/components/Form/src/Form.vue @@ -276,6 +276,7 @@ export default defineComponent({ if(event.keyCode === 13){ //回车 emit('onEnter',item.field,formModel.value[item.field],event) + event.target.blur();//回车之后自动失去焦点 } }} onBlur={(e) => { onBlur(item.field,formModel.value[item.field]) }} @@ -409,6 +410,7 @@ export default defineComponent({ if(event.keyCode === 13){ //回车 emit('onEnter',item.field,formModel.value[item.field],event) + event.target.blur();//回车之后自动失去焦点 } }} {...(notRenderOptions.includes(item?.component as string) && diff --git a/src/views/wms/basicDataManage/itemManage/productionlineitem/index.vue b/src/views/wms/basicDataManage/itemManage/productionlineitem/index.vue index 3badcc8e2..5314a421e 100644 --- a/src/views/wms/basicDataManage/itemManage/productionlineitem/index.vue +++ b/src/views/wms/basicDataManage/itemManage/productionlineitem/index.vue @@ -220,32 +220,36 @@ const openForm = (type: string, row?: any) => { // form表单提交 const formsSuccess = async (formType,data) => { + try{ var isHave =Productionlineitem.allSchemas.formSchema.some(function (item) { - return item.field === 'activeTime' || item.field === 'expireTime'; - }); - if(isHave){ - if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){ - message.error('失效时间要大于生效时间') - return; - } - } - if(data.activeTime==0)data.activeTime = null; - if(data.expireTime==0)data.expireTime = null; - basicFormRef.value.formLoading = true - if (formType === 'create') { - await ProductionlineitemApi.createProductionlineitem(data) - message.success(t('common.createSuccess')) - } else { - await ProductionlineitemApi.updateProductionlineitem(data) - message.success(t('common.updateSuccess')) - } - basicFormRef.value.formLoading = false - basicFormRef.value.dialogVisible = false - if (formType === 'create') { - getList() - }else{ - buttonBaseClick('refresh',null) + return item.field === 'activeTime' || item.field === 'expireTime'; + }); + if(isHave){ + if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){ + message.error('失效时间要大于生效时间') + return; } + } + if(data.activeTime==0)data.activeTime = null; + if(data.expireTime==0)data.expireTime = null; + basicFormRef.value.formLoading = true + if (formType === 'create') { + await ProductionlineitemApi.createProductionlineitem(data) + message.success(t('common.createSuccess')) + } else { + await ProductionlineitemApi.updateProductionlineitem(data) + message.success(t('common.updateSuccess')) + } + basicFormRef.value.formLoading = false + basicFormRef.value.dialogVisible = false + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } + } catch { + basicFormRef.value.formLoading = false + } } // 查询页面返回 diff --git a/src/views/wms/basicDataManage/itemManage/stdcostprice/index.vue b/src/views/wms/basicDataManage/itemManage/stdcostprice/index.vue index d00607fb4..d1035afbe 100644 --- a/src/views/wms/basicDataManage/itemManage/stdcostprice/index.vue +++ b/src/views/wms/basicDataManage/itemManage/stdcostprice/index.vue @@ -206,33 +206,38 @@ const openForm = (type: string, row?: any) => { } // form表单提交 -const formsSuccess = async (formType,data) => { - var isHave =Stdcostprice.allSchemas.formSchema.some(function (item) { - return item.field === 'activeTime' || item.field === 'expireTime'; - }); - if(isHave){ - if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){ - message.error('失效时间要大于生效时间') - return; - } - } - if(data.activeTime==0)data.activeTime = null; - if(data.expireTime==0)data.expireTime = null; - basicFormRef.value.formLoading = true - if (formType === 'create') { - await StdcostpriceApi.createStdcostprice(data) - message.success(t('common.createSuccess')) - } else { - await StdcostpriceApi.updateStdcostprice(data) - message.success(t('common.updateSuccess')) - } - basicFormRef.value.dialogVisible = false - basicFormRef.value.formLoading = false - if (formType === 'create') { - getList() - }else{ - buttonBaseClick('refresh',null) +const formsSuccess = async (formType, data) => { + try{ + var isHave =Stdcostprice.allSchemas.formSchema.some(function (item) { + return item.field === 'activeTime' || item.field === 'expireTime'; + }); + if(isHave){ + if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){ + message.error('失效时间要大于生效时间') + return; } + } + if(data.activeTime==0)data.activeTime = null; + if(data.expireTime==0)data.expireTime = null; + basicFormRef.value.formLoading = true + if (formType === 'create') { + await StdcostpriceApi.createStdcostprice(data) + message.success(t('common.createSuccess')) + } else { + await StdcostpriceApi.updateStdcostprice(data) + message.success(t('common.updateSuccess')) + } + basicFormRef.value.dialogVisible = false + basicFormRef.value.formLoading = false + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } + } catch { + basicFormRef.value.formLoading = false + + } } // 查询页面返回 diff --git a/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue b/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue index 64665c60a..4101909ad 100644 --- a/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue +++ b/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue @@ -378,7 +378,8 @@ const searchFormClick = (searchData) => { /** 初始化 **/ onMounted(async () => { tableObject.params = { - available: true + available: true, + type: 'MakeLabel' } getList() }) diff --git a/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts b/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts index 4ea0ae2bf..147b93726 100644 --- a/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts +++ b/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts @@ -31,7 +31,7 @@ export const Package = useCrudSchemas(reactive([ label: '标签类型', field: 'type', sort: 'custom', - isSearch: true, + isSearch: false, dictType: DICT_TYPE.LABEL_TYPE, dictClass: 'string' }, @@ -52,6 +52,7 @@ export const Package = useCrudSchemas(reactive([ label: '关联号', field: 'relateNumber', sort: 'custom', + isSearch:true }, { label: '标签条码字符串', diff --git a/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue b/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue index 96d5f49b4..dfe1acbee 100644 --- a/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue +++ b/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue @@ -401,7 +401,8 @@ const searchFormClick = (searchData) => { /** 初始化 **/ onMounted(async () => { tableObject.params = { - available: true + available: true, + type: 'PurchaseLabel' } getList() }) diff --git a/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts b/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts index 838b2edb9..0acf47726 100644 --- a/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts +++ b/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts @@ -43,7 +43,7 @@ export const Package = useCrudSchemas(reactive([ label: '标签类型', field: 'type', sort: 'custom', - isSearch: true, + isSearch: false, dictType: DICT_TYPE.LABEL_TYPE, dictClass: 'string' }, diff --git a/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/deliverRecordMain.data.ts index c0afdfae0..0741ab595 100644 --- a/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/deliverRecordMain.data.ts @@ -330,6 +330,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, hiddenInMain: true, }, { @@ -397,6 +398,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, hiddenInMain: true, }, { diff --git a/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts index 7881765dd..71dd8f3e0 100644 --- a/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts @@ -376,6 +376,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, hiddenInMain: true, }, { diff --git a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts index 76749405d..226862371 100644 --- a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts @@ -25,6 +25,7 @@ export const DeliverRecordMain = useCrudSchemas( table: { width: 180 }, + isTable: false, isSearch: false }, { @@ -33,7 +34,8 @@ export const DeliverRecordMain = useCrudSchemas( sort: 'custom', table: { width: 180 - } + }, + isTable: false, }, { label: '发货记录单号', @@ -54,7 +56,7 @@ export const DeliverRecordMain = useCrudSchemas( table: { width: 180 }, - isTable: true, + isTable: false, isDetail: true }, { @@ -332,7 +334,7 @@ export const DeliverRecordMain = useCrudSchemas( isTable: false }, { - label: '业务类型', + label: '发货类型', field: 'businessType', sort: 'custom', table: { @@ -590,6 +592,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '包装规格', @@ -656,6 +659,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '从库位', @@ -937,7 +941,7 @@ export const DeliverRecordImport = useCrudSchemas(reactive([ } }, { - label: '物料类型', + label: '类型', field: 'type', sort: 'custom', dictType: DICT_TYPE.LEADERSHIP_MATERIAL_TYPE, diff --git a/src/views/wms/deliversettlementManage/ssSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/ssSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts index 28fc088e2..54ddf8364 100644 --- a/src/views/wms/deliversettlementManage/ssSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/ssSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts @@ -352,6 +352,8 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, + hiddenInMain: true, }, { label: '包装规格', @@ -418,6 +420,8 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, + hiddenInMain: true, }, { label: '从库位', diff --git a/src/views/wms/deliversettlementManage/tjdtSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/tjdtSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts index d39c4d472..4340d7d6f 100644 --- a/src/views/wms/deliversettlementManage/tjdtSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/tjdtSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts @@ -298,6 +298,8 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, + hiddenInMain: true, }, { label: '包装规格', @@ -364,6 +366,8 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, + hiddenInMain: true, }, { label: '从库位', diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts index 8d30ff991..3e2a1d128 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts @@ -1378,9 +1378,9 @@ export const ProductionreturnRequestDetailRules = reactive({ qty:[ { validator:validateQty, message: '数量必须大于0', trigger: 'change'} ], - // batch: [ - // { required: true, message: '请输入批次', trigger: 'blur' } - // ], + batch: [ + { required: true, message: '请输入批次', trigger: 'blur' } + ], inventoryStatus: [ { required: true, message: '请选择库存状态', trigger: 'change' } ], diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts index 1aa573789..4cec77298 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts @@ -1705,56 +1705,36 @@ export const BackflushDetailRequest = useCrudSchemas(reactive([ /** - * @returns {Array} 制品收货申请创建标签 + * @returns {Array} 号口品收货申请创建标签 */ export const ProductreceiptRequestLabel = useCrudSchemas(reactive([ { - label: '生产线代码', - field: 'productionLineCodePackage', + label: '物料代码', + field: 'itemCode', sort: 'custom', table: { width: 150 }, - tableForm:{ + tableForm: { disabled: true - // isInpuFocusShow: true, - // searchListPlaceholder: '请选择生产线代码', // 输入框占位文本 - // searchField: 'productionLineCode', // 查询弹窗赋值字段 - // searchTitle: '生产线物料关系信息', // 查询弹窗标题 - // searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类 - // searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法 - // searchCondition:[{ - // key: 'itemCode', - // value: 'itemCode', - // isMainValue: true - // }] + }, + form: { + componentProps: { + disabled: true + } } }, { - label: '供应商代码', - field: 'supplierItemCode', + label: '批次', + field: 'batch', sort: 'custom', table: { width: 150 }, - tableForm:{ - isInpuFocusShow: true, - searchListPlaceholder: '请选择供应商代码', // 输入框占位文本 - searchField: 'supplierCode', // 查询弹窗赋值字段 - searchTitle: '供应商信息', // 查询弹窗标题 - searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类 - searchPage: SupplieritemApi.getSupplieritemPage, // 查询弹窗所需分页方法 - searchCondition:[{ - key: 'itemCode', - value: 'itemCode', - message: '请填写物料代码！', - isMainValue: true - }] - } }, { - label: '物料代码', - field: 'itemCode', + label: '数量', + field: 'qty', sort: 'custom', table: { width: 150 @@ -1769,38 +1749,132 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive( } }, { - label: '物料名称', - field: 'itemName', + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 }, - isTableForm: false, - isForm: false, + tableForm: { + disabled: true + }, + form: { + componentProps: { + disabled: true + } + } }, { - label: '物料描述1', - field: 'itemDesc1', + label: '包装规格', + field: 'packUnit', + sort: 'custom', + table: { + width: 150, + componentProps: { + disabled: true, + isSearchList: true, + searchListPlaceholder: '请选择包装', + searchField: 'packUnit', + searchTitle: '物品包装信息', + searchAllSchemas: Itempackaging.allSchemas, + searchPage: ItemPackageApi.getItemPackagingPageByItemCode, + searchCondition: [ + { + key: 'itemCode', + value: 'itemCode', + message: '请选择订单行', + isMainValue: true + }, + { + key: 'available', + value: 'TRUE', + isMainValue: false + } + ] + + } + }, + tableForm: { + disabled: true, + isInpuFocusShow: true, + searchListPlaceholder: '请选择包装', + searchField: 'packUnit', + searchTitle: '物品包装信息', + searchAllSchemas: Itempackaging.allSchemas, + searchPage: ItemPackageApi.getItemPackagingPageByItemCode, + searchCondition: [ + { + key: 'itemCode', + value: 'itemCode', + message: '请选择订单行', + isMainValue: true + }, + { + key: 'available', + value: 'TRUE', + isMainValue: false + }] + }, + }, + { + label: '包装数量', + field: 'packQty', sort: 'custom', table: { width: 150 }, - isTableForm: false, - isForm: false, + form: { + componentProps: { + disabled: true + } + }, + tableForm: { + disabled: true, + } }, { - label: '物料描述2', - field: 'itemDesc2', + label: '标签生产线代码', + field: 'productionLineCodePackage', sort: 'custom', table: { width: 150 }, + isTable: false, + tableForm: { + disabled: true, + }, + }, + { + label: '供应商代码', + field: 'supplierItemCode', + sort: 'custom', isTableForm: false, isForm: false, + table: { + width: 150 + }, + tableForm: { + isInpuFocusShow: true, + searchListPlaceholder: '请选择供应商代码', // 输入框占位文本 + searchField: 'supplierCode', // 查询弹窗赋值字段 + searchTitle: '供应商信息', // 查询弹窗标题 + searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类 + searchPage: SupplieritemApi.getSupplieritemPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'itemCode', + value: 'itemCode', + message: '请填写物料代码！', + isMainValue: true + }] + } }, + { - label: '项目代码', - field: 'projectCode', + label: '物料名称', + field: 'itemName', sort: 'custom', table: { width: 150 @@ -1809,56 +1883,36 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive( isForm: false, }, { - label: '批次', - field: 'batch', + label: '物料描述1', + field: 'itemDesc1', sort: 'custom', table: { width: 150 }, - tableForm: { - disabled: true, - }, - form: { - componentProps: { - disabled: true - } - } + isTableForm: false, + isForm: false, }, { - label: '数量', - field: 'qty', + label: '物料描述2', + field: 'itemDesc2', sort: 'custom', table: { width: 150 }, - tableForm: { - disabled: true - }, - form: { - componentProps: { - disabled: true - } - } + isTableForm: false, + isForm: false, }, { - label: '计量单位', - field: 'uom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', - isTable: true, + label: '项目代码', + field: 'projectCode', sort: 'custom', table: { width: 150 }, - tableForm: { - disabled: true - }, - form: { - componentProps: { - disabled: true - } - } + isTableForm: false, + isForm: false, }, + { label: '库存状态', field: 'inventoryStatus', @@ -1866,6 +1920,8 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive( dictClass: 'string', isTable: true, sort: 'custom', + isTableForm: false, + isForm: false, table: { width: 150 }, @@ -1883,22 +1939,8 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive( label: '来源生产线代码', field: 'productionLineCode', sort: 'custom', - table: { - width: 150 - }, - tableForm: { - disabled: true - }, - form: { - componentProps: { - disabled: true - } - } - }, - { - label: '来源生产线代码', - field: 'productionLineCode', - sort: 'custom', + isTableForm: false, + isForm: false, table: { width: 150 }, @@ -1915,6 +1957,8 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive( label: '来源工位代码', field: 'workStationCode', sort: 'custom', + isTableForm: false, + isForm: false, table: { width: 150 }, @@ -1931,6 +1975,8 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive( label: '来源库位代码', field: 'fromLocationCode', sort: 'custom', + isTableForm: false, + isForm: false, table: { width: 150 }, @@ -1957,78 +2003,13 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive( } } }, - { - label: '包装规格1', - field: 'packUnit', - sort: 'custom', - table: { - width: 150, - componentProps: { - disabled: true, - isSearchList: true, - searchListPlaceholder: '请选择包装', - searchField: 'packUnit', - searchTitle: '物品包装信息', - searchAllSchemas: Itempackaging.allSchemas, - searchPage: ItemPackageApi.getItempackagingPageByProductreceipt, - searchCondition: [ - { - key: 'itemCode', - value: 'itemCode', - message: '请选择订单行', - isMainValue: true - }, - { - key: 'available', - value: 'TRUE', - isMainValue: false - } - ] - } - }, - tableForm: { - disabled: true, - isInpuFocusShow: true, - searchListPlaceholder: '请选择包装', - searchField: 'packUnit', - searchTitle: '物品包装信息', - searchAllSchemas: Itempackaging.allSchemas, - searchPage: ItemPackageApi.getItempackagingPageByProductreceipt, - searchCondition: [ - { - key: 'itemCode', - value: 'itemCode', - message: '请选择订单行', - isMainValue: true - }, - { - key: 'available', - value: 'TRUE', - isMainValue: false - }] - } - }, - { - label: '包装数量1', - field: 'packQty', - sort: 'custom', - table: { - width: 150 - }, - form: { - componentProps: { - disabled: true - } - }, - tableForm: { - disabled: true, - } - }, { label: '包装规格2', field: 'secondPackUnit', sort: 'custom', + isTableForm: false, + isForm: false, table: { width: 150, componentProps: { @@ -2056,6 +2037,7 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive( } }, tableForm: { + enterSearch: true, disabled: true, isInpuFocusShow: true, searchListPlaceholder: '请选择包装', @@ -2081,12 +2063,14 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive( label: '包装数量2', field: 'secondPackQty', sort: 'custom', + isTableForm: false, + isForm: false, table: { width: 150 }, form: { componentProps: { - disabled:true + disabled: true } }, tableForm: { diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts index a4de606ac..92724f740 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts @@ -108,9 +108,7 @@ export const DemandforecastingMain = useCrudSchemas(reactive([ label: '计划员', field: 'planerId', sort: 'custom', - table: { - width: 150 - }, + isTable:false, isForm: false, isSearch:true, @@ -182,9 +180,7 @@ export const DemandforecastingMain = useCrudSchemas(reactive([ label: '物料代码', field: 'itemCode', sort: 'custom', - table: { - width: 150 - }, + isSearch:true, isTable:true, isForm: false, @@ -217,9 +213,7 @@ export const DemandforecastingMain = useCrudSchemas(reactive([ label: '版本号', field: 'version', sort: 'custom', - table: { - width: 150 - }, + isSearch:true, search: { // labelMessage: '信息提示说明！！！', diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts index b9168dcd2..ba5671a8d 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts @@ -550,6 +550,21 @@ export const PurchasePlanMainRules = reactive({ */ export const PurchasePlanDetail = useCrudSchemas( reactive([ + { + label: '要货计划单号', + field: 'number', + sort: 'custom', + isTableForm: false, + hiddenInMain: true, + table: { + width: 180 + }, + form: { + componentProps: { + disabled: true + } + } + }, { label: '采购订单号', field: 'poNumber', @@ -861,21 +876,7 @@ export const PurchasePlanDetail = useCrudSchemas( } }, - { - label: '要货计划单号', - field: 'number', - sort: 'custom', - isTableForm: false, - hiddenInMain: true, - table: { - width: 180 - }, - form: { - componentProps: { - disabled: true - } - } - }, + { label: '已收货数量', field: 'receivedQty', diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts index 43f5db515..6bff0c144 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts @@ -88,6 +88,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive( // labelMessage: '信息提示说明！！！', componentProps: { enterSearch: true, + isEnter:true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择供应商代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段