diff --git a/jshERP-web/src/views/bill/dialog/ImportItemModal.vue b/jshERP-web/src/views/bill/dialog/ImportItemModal.vue index 90bc5888..ee07741b 100644 --- a/jshERP-web/src/views/bill/dialog/ImportItemModal.vue +++ b/jshERP-web/src/views/bill/dialog/ImportItemModal.vue @@ -17,7 +17,7 @@ - 明细Excel模板[下载] + 明细Excel模板[下载] 收起扫码 + + 导入明细 + @@ -109,6 +113,7 @@ import VendorModal from '../../system/modules/VendorModal' import DepotModal from '../../system/modules/DepotModal' import BatchSetDepot from '../dialog/BatchSetDepot' + import ImportItemModal from '../dialog/ImportItemModal' import WorkflowIframe from '@/components/tools/WorkflowIframe' import { FormTypes } from '@/utils/JEditableTableUtil' import { JEditableTableMixin } from '@/mixins/JEditableTableMixin' @@ -124,6 +129,7 @@ VendorModal, DepotModal, BatchSetDepot, + ImportItemModal, WorkflowIframe, JUpload, JDate, diff --git a/jshERP-web/src/views/bill/modules/OtherOutModal.vue b/jshERP-web/src/views/bill/modules/OtherOutModal.vue index a66e3688..27f813a9 100644 --- a/jshERP-web/src/views/bill/modules/OtherOutModal.vue +++ b/jshERP-web/src/views/bill/modules/OtherOutModal.vue @@ -73,6 +73,9 @@ 收起扫码 + + 导入明细 + @@ -109,6 +113,7 @@ import CustomerModal from '../../system/modules/CustomerModal' import DepotModal from '../../system/modules/DepotModal' import BatchSetDepot from '../dialog/BatchSetDepot' + import ImportItemModal from '../dialog/ImportItemModal' import WorkflowIframe from '@/components/tools/WorkflowIframe' import { FormTypes } from '@/utils/JEditableTableUtil' import { JEditableTableMixin } from '@/mixins/JEditableTableMixin' @@ -124,6 +129,7 @@ CustomerModal, DepotModal, BatchSetDepot, + ImportItemModal, WorkflowIframe, JUpload, JDate, diff --git a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue index 58d7de61..a2545deb 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue @@ -75,20 +75,23 @@