From 592c840c1ad8dedef1d019f7938f83d64bc7e2e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Thu, 4 Nov 2021 01:34:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=B0=E4=BA=BA=E5=BC=95?=
 =?UTF-8?q?=E5=AF=BC=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/utils/util.js                             | 3 ++-
 jshERP-web/src/views/bill/modules/PurchaseInModal.vue    | 1 +
 jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue | 1 +
 jshERP-web/src/views/bill/modules/RetailOutModal.vue     | 3 +++
 jshERP-web/src/views/bill/modules/SaleOrderModal.vue     | 1 +
 jshERP-web/src/views/bill/modules/SaleOutModal.vue       | 1 +
 jshERP-web/src/views/material/modules/MaterialModal.vue  | 9 +++++++--
 7 files changed, 16 insertions(+), 3 deletions(-)

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">
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
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">
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
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">
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
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">
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
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">
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
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 @@
 <template>
-  <a-modal
+  <j-modal
     :title="title"
     :width="1300"
     :visible="visible"
     :confirmLoading="confirmLoading"
+    v-bind:prefixNo="prefixNo"
+    switchHelp
+    switchFullscreen
     @ok="handleOk"
     @cancel="handleCancel"
     cancelText="关闭"
     wrapClassName="ant-modal-cust-warp"
+    :id="prefixNo"
     style="top:5%;height: 100%;overflow-y: hidden">
     <template slot="footer">
       <a-button key="back" v-if="isReadOnly" @click="handleCancel">
@@ -261,7 +265,7 @@
       </a-form>
     </a-spin>
     <unit-modal ref="unitModalForm" @ok="unitModalFormOk"></unit-modal>
-  </a-modal>
+  </j-modal>
 </template>
 <script>
   import pick from 'lodash.pick'
@@ -305,6 +309,7 @@
         switchDisabled: false, //开关的启用状态
         barCodeSwitch: false, //生成条码开关
         maxBarCodeInfo: '', //最大条码
+        prefixNo: 'material',
         sku: {
           manyColor: '多颜色',
           manySize: '多尺寸',