diff --git a/jshERP-web/src/components/jeecgbiz/JSelectList.vue b/jshERP-web/src/components/jeecgbiz/JSelectList.vue index 23047f61..44e0377c 100644 --- a/jshERP-web/src/components/jeecgbiz/JSelectList.vue +++ b/jshERP-web/src/components/jeecgbiz/JSelectList.vue @@ -1,6 +1,6 @@ @@ -105,7 +107,9 @@ export default { name: 'JSelectMaterialModal', mixins:[JeecgListMixin], - components: {}, + components: { + MaterialModal: () => import('@/views/material/modules/MaterialModal') + }, props: ['rows', 'multi', 'barCode'], data() { return { @@ -289,6 +293,10 @@ that.selectedRowKeys = []; that.selectMaterialIds = []; }, + addMaterial() { + this.$refs.modalForm.add() + this.$refs.modalForm.title = '新增商品' + }, close() { this.searchReset(0); this.visible = false; diff --git a/jshERP-web/src/views/material/modules/MaterialModal.vue b/jshERP-web/src/views/material/modules/MaterialModal.vue index d6d2d6c8..5b0da28c 100644 --- a/jshERP-web/src/views/material/modules/MaterialModal.vue +++ b/jshERP-web/src/views/material/modules/MaterialModal.vue @@ -4,6 +4,7 @@ :width="1300" :visible="visible" :confirmLoading="confirmLoading" + :maskClosable="false" v-bind:prefixNo="prefixNo" switchHelp switchFullscreen