diff --git a/jshERP-web/src/utils/util.js b/jshERP-web/src/utils/util.js index f2e816d9..f6c90d1f 100644 --- a/jshERP-web/src/utils/util.js +++ b/jshERP-web/src/utils/util.js @@ -667,7 +667,8 @@ export function handleIntroJs(module, cur_version) { //有新版本更新时才出现一次引导页, 第二次进入进不再出现, 这里有缓存来判断 let introJsObj = introJs() if(module !== 'indexChart') { - introJsObj = introJs('.ant-modal-cust-warp') + let idElement = '#' + module + introJsObj = introJs(idElement) } if (Vue.ls.get('intro_cache_' + module) === cur_version) { return; diff --git a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue index d14d8bce..0764de04 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue @@ -13,6 +13,7 @@ @ok="handleOk" @cancel="handleCancel" wrapClassName="ant-modal-cust-warp" + :id="prefixNo" style="top:5%;height: 100%;overflow-y: hidden"> diff --git a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue index e1302375..349f1078 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue @@ -13,6 +13,7 @@ @ok="handleOk" @cancel="handleCancel" wrapClassName="ant-modal-cust-warp" + :id="prefixNo" style="top:5%;height: 100%;overflow-y: hidden"> diff --git a/jshERP-web/src/views/bill/modules/RetailOutModal.vue b/jshERP-web/src/views/bill/modules/RetailOutModal.vue index 460edc58..8e0b3566 100644 --- a/jshERP-web/src/views/bill/modules/RetailOutModal.vue +++ b/jshERP-web/src/views/bill/modules/RetailOutModal.vue @@ -7,10 +7,13 @@ :maskClosable="false" :keyboard="false" :forceRender="true" + v-bind:prefixNo="prefixNo" + switchHelp switchFullscreen @ok="handleOk" @cancel="handleCancel" wrapClassName="ant-modal-cust-warp" + :id="prefixNo" style="top:5%;height: 100%;overflow-y: hidden"> diff --git a/jshERP-web/src/views/bill/modules/SaleOrderModal.vue b/jshERP-web/src/views/bill/modules/SaleOrderModal.vue index 95a3637c..2210955b 100644 --- a/jshERP-web/src/views/bill/modules/SaleOrderModal.vue +++ b/jshERP-web/src/views/bill/modules/SaleOrderModal.vue @@ -13,6 +13,7 @@ @ok="handleOk" @cancel="handleCancel" wrapClassName="ant-modal-cust-warp" + :id="prefixNo" style="top:5%;height: 100%;overflow-y: hidden"> diff --git a/jshERP-web/src/views/bill/modules/SaleOutModal.vue b/jshERP-web/src/views/bill/modules/SaleOutModal.vue index 4c64dbff..7bfa4a34 100644 --- a/jshERP-web/src/views/bill/modules/SaleOutModal.vue +++ b/jshERP-web/src/views/bill/modules/SaleOutModal.vue @@ -13,6 +13,7 @@ @ok="handleOk" @cancel="handleCancel" wrapClassName="ant-modal-cust-warp" + :id="prefixNo" style="top:5%;height: 100%;overflow-y: hidden"> diff --git a/jshERP-web/src/views/material/modules/MaterialModal.vue b/jshERP-web/src/views/material/modules/MaterialModal.vue index 4355aa9c..28109230 100644 --- a/jshERP-web/src/views/material/modules/MaterialModal.vue +++ b/jshERP-web/src/views/material/modules/MaterialModal.vue @@ -1,13 +1,17 @@