diff --git a/src/views/system/mail/template/MailTemplateForm.vue b/src/views/system/mail/template/MailTemplateForm.vue index d771921a5..ade78f131 100644 --- a/src/views/system/mail/template/MailTemplateForm.vue +++ b/src/views/system/mail/template/MailTemplateForm.vue @@ -115,6 +115,7 @@ const onChange = async (field, cur) => { } const resetReceiverType = () => { + if (!formRef.value) return // 初始化设置值 const setV = { roleIdList: [], diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts index e8f8bc2ea..9d561de4e 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts @@ -555,6 +555,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ field: 'action', isDetail: false, isForm: false, + isTable:false, table: { width: 120, fixed: 'right' diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue index 5802e5e1a..743c1eccd 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue @@ -66,7 +66,7 @@ :detailAllSchemasRules="ProductreceiptRequestDetailRules" :apiCreate="ProductreceiptRequestDetailApi.createProductreceiptRequestDetail" :apiUpdate="ProductreceiptRequestDetailApi.updateProductreceiptRequestDetail" - :apiPage="ProductreceiptRequestDetailApi.getProductreceiptRequestDetailPage" + :apiPage="ProductreceiptRequestDetailApi.getProductreceiptRequestDetailPageAssemble" :apiDelete="ProductreceiptRequestDetailApi.deleteProductreceiptRequestDetail" @searchTableSuccessDetail="searchTableSuccessDetail" :buttondataTable="buttondataTable" @@ -163,7 +163,7 @@ const isCreateLabel = ref(false) const formLabelRef = ref() const labelType = ref('') // 标签类别 采购还是制造等 const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({ - getListApi: ProductreceiptRequestDetailApi.getProductreceiptRequestDetailPage + getListApi: ProductreceiptRequestDetailApi.getProductreceiptRequestDetailPageAssemble }) const { getList:getDetailList } = detatableMethods