Browse Source

Merge branch 'develop_fenbiao0309' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh13

# Conflicts:
#	public/version.json
lilei 2 năm trước cách đây
mục cha
commit
d8664f2582

+ 0 - 20
src/config/router.config.js

@@ -1367,26 +1367,6 @@ export const asyncRouterMap = [
                   replaceTab: true,
                   hidden: true
                 }
-              },
-              {
-                path: 'explainXsbz',
-                name: 'intelligentReplenishmentExplainXsbz',
-                component: () => import(/* webpackChunkName: "inventoryManagement" */ '@/views/inventoryManagement/intelligentReplenishment/explainXsbz.vue'),
-                meta: {
-                  title: '销售保障法-说明',
-                  icon: 'monitor',
-                  hidden: true
-                }
-              },
-              {
-                path: 'explainQspj',
-                name: 'intelligentReplenishmentExplainQspj',
-                component: () => import(/* webpackChunkName: "inventoryManagement" */ '@/views/inventoryManagement/intelligentReplenishment/explainQspj.vue'),
-                meta: {
-                  title: '趋势平均法-说明',
-                  icon: 'monitor',
-                  hidden: true
-                }
               }
             ]
           }

+ 19 - 6
src/views/inventoryManagement/intelligentReplenishment/edit.vue

@@ -79,21 +79,37 @@
     </a-spin>
     <!-- 服务水平 -->
     <replenishment-service-level-modal :openModal="openModal" :itemSn="form.trendSn" @close="openModal=false" @ok="handleOk" />
+    <!-- 算法说明 -->
+    <commonModal
+      :modalTit="explainType=='qspj'?'趋势平均法说明':'销售保障法说明'"
+      bodyPadding="10px"
+      width="1024px"
+      :showFooter="false"
+      :openModal="showDetailModal"
+      @cancel="showDetailModal=false">
+       <explainQspj v-if="explainType=='qspj'" @close="showDetailModal=false"></explainQspj>
+       <explainXsbz v-if="explainType=='xsbz'" @close="showDetailModal=false"></explainXsbz>
+    </commonModal>
   </div>
 </template>
 
 <script>
 import { commonMixin } from '@/utils/mixin'
+import commonModal from '@/views/common/commonModal.vue'
 import ReplenishmentServiceLevelModal from './serviceLevelModal.vue'
+import explainQspj from './explainQspj.vue'
+import explainXsbz from './explainXsbz.vue'
 import productRange from './productRange.vue'
 import { predictDetail, predictRangeSave, predictSave, predictTrendList, predictRun } from '@/api/predict'
 export default {
   name: 'IntelligentReplenishmentEdit',
   mixins: [commonMixin],
-  components: { ReplenishmentServiceLevelModal, productRange },
+  components: { ReplenishmentServiceLevelModal, productRange, commonModal, explainQspj, explainXsbz },
   data () {
     return {
       spinning: false,
+      showDetailModal: false,
+      explainType: 0,
       tableHeight: 0,
       formItemLayout: {
         labelCol: { span: 2 },
@@ -210,11 +226,8 @@ export default {
     },
     // 算法说明
     handleExplain (type) {
-      if (type == 'xsbz') {
-        this.$router.push({ path: `/inventoryManagement/intelligentReplenishment/explainXsbz` })
-      } else if (type == 'qspj') {
-        this.$router.push({ path: `/inventoryManagement/intelligentReplenishment/explainQspj` })
-      }
+      this.explainType = type
+      this.showDetailModal = true
     },
     // 服务水平选择
     handleOk (val) {

+ 8 - 0
src/views/inventoryManagement/intelligentReplenishment/explainQspj.vue

@@ -83,6 +83,9 @@
           <p class="item-txt">计算预计需求量 = 54 × (45/30) + 13 = 94</p>
         </div>
       </div>
+      <div style="text-align:center;padding: 20px;">
+        <a-button type="default" @click="closePage">关闭</a-button>
+      </div>
     </div>
   </a-card>
 </template>
@@ -152,6 +155,11 @@ export default {
         { title: '实际销量', january: 1, february: 1, march: 0, april: 4, may: 16, june: 9, july: 4, august: 4, september: 4, october: 4, november: 1, december: 25, sum: 73 }
       ]
     }
+  },
+  methods:{
+    closePage(){
+      this.$emit('close')
+    }
   }
 }
 </script>

+ 8 - 0
src/views/inventoryManagement/intelligentReplenishment/explainXsbz.vue

@@ -50,6 +50,9 @@
           <p class="item-txt">计算预计需求量 = 59 × 保障倍数1.5 = 88.5 ≈ 89(假设保障倍数为1.5)</p>
         </div>
       </div>
+      <div style="text-align:center;padding: 20px;">
+        <a-button type="default" @click="closePage">关闭</a-button>
+      </div>
     </div>
   </a-card>
 </template>
@@ -76,6 +79,11 @@ export default {
         { january: 55, february: 53, march: 54, april: 56, may: 58, june: 57, july: 52, august: 52, september: 56, october: 52, november: 53, december: 59 }
       ]
     }
+  },
+  methods:{
+    closePage(){
+      this.$emit('close')
+    }
   }
 }
 </script>