Merge branch 'dev_web' of http://dev.ccwin-in.com:3000/BoXu.Zheng/WZC2 into dev_web

fe/PC/src/layout/components/AppMain.vue

@@ -8,36 +8,99 @@
 			<!-- 不要缓存，即切换tab页就刷新 -->
 			<router-view v-if="$route.meta.keepAlive" :key="key" />
 		</transition>
+		<!--iframe页-->
+		<!-- <component
+			v-for="item in hasOpenComponentsArr"
+			:key="item.path"
+			:is="item.name"
+			v-show="$route.path.indexOf(item.path) > -1"
+		></component> -->
 	</section>
 </template>
 
 <script>
+// import Vue from 'vue'
 import Bus from '../Bus.js';
 export default {
 	name: "AppMain",
+	// data() {
+	// 	return {
+	// 		componentsArr: []
+	// 	}
+	// },
 	computed: {
 		cachedViews() {
 			return this.$store.state.tagsView.cachedViews;
 		},
 		key() {
 			return this.$route.fullPath;
-		}
+		},
+		// 实现懒加载，只渲染已经打开过（hasOpen:true）的iframe页
+		// hasOpenComponentsArr() {
+		// 	return this.componentsArr.filter(item => {
+		// 	return item.hasOpen
+		// 	});
+		// }
 	},
+	// watch: {
+	// 	$route() {
+	// 		// 判断当前路由是否iframe页
+	// 		this.isOpenIframePage();
+	// 	}
+	// },
 	mounted() {
+		// 设置iframe页的数组对象
+		// setTimeout(() => {
+		// 	const componentsArr = this.getComponentsArr();
+		// 	componentsArr.forEach((item) => {
+		// 		Vue.component(item.name, item.component);
+		// 	});
+		// 	this.componentsArr = componentsArr;
+		// 	// 判断当前路由是否iframe页
+		// 	this.isOpenIframePage();
+		// }, 1000)
+
 		// 关闭标签触发
 		Bus.$on('removeCache', (name, view) => {
 			this.removeCache(name, view);
 		});
-        //刷新标签触发
+		//刷新标签触发
-        Bus.$on('removeRedirect', (name, view) => {
+		Bus.$on('removeRedirect', (name, view) => {
-            this.removeRedirect(name, view);
+			this.removeRedirect(name, view);
-        })
+		})
+	},
+	beforeDestroy() {
+		Bus.$off('removeCache');
+		Bus.$off('removeRedirect');
 	},
-    beforeDestroy() {
-        Bus.$off('removeCache');
-        Bus.$off('removeRedirect');
-    },
 	methods: {
+		// iframe 页面 缓存处理-----------------start
+		// 根据当前路由设置hasOpen
+		// isOpenIframePage() {
+		// 	const target = this.componentsArr.find(item => {
+		// 		return this.$route.path.indexOf(item.path) > -1
+		// 	});
+		// 	if (target && !target.hasOpen) {
+		// 		target.hasOpen = true;
+		// 	}
+		// },
+		// // 遍历路由的所有页面，把含有iframeComponent标识的收集起来
+		// getComponentsArr() {
+		// 	const activeReportManage = this.$store.getters.permission_routes.find(item => item.path == '/activeReportManage')
+		// 	console.log('permission_routes', this.$store.getters.permission_routes)
+		// 	console.log('activeReportManage', activeReportManage)
+		// 	const reportForm = activeReportManage.children.find(item => item.path == 'reportForm').children
+		// 	console.log('reportForm', reportForm)
+		// 	// const reportForm = this.$store.getters.permission_routes.find(item => item.path == '/activeReportManage').children.find(item => item.path == 'reportForm').children
+		// 	const iframeArr = []
+		// 	reportForm.forEach(item => {
+		// 		item.component = item.iframeComponent
+		// 		iframeArr.push(item)
+		// 	})
+		// 	return iframeArr
+		// },
+		// iframe 页面 缓存处理-----------------end
+
 		// 获取有keep-alive子节点的Vnode
 		getVnode() {
 			// 判断子集非空
@@ -52,14 +115,14 @@ export default {
 			}
 			return vnode ? vnode : false;
 		},
-        //移除redirect组件缓存
+		//移除redirect组件缓存
-        removeRedirect(view={}){
+		removeRedirect(view={}){
-            const viewNew = {
+			const viewNew = {
-                fullPath:`/redirect${view.fullPath}`,
+				fullPath:`/redirect${view.fullPath}`,
-                path:`/redirect${view.path}`
+				path:`/redirect${view.path}`
-            }
+			}
-            this.removeCache('closeSelectedTag',viewNew);
+			this.removeCache('closeSelectedTag',viewNew);
-        },
+		},
 		// 移除keep-alive缓存
 		removeCache(name, view = {}) {
 			let vnode = this.getVnode();
@@ -69,7 +132,6 @@ export default {
 			let keyStart = vnode.key.split('/')[0];
 			let thisKey = `${keyStart}${view.fullPath}`;
 			let regKey = `${keyStart}${view.path}`;
-
 			this[name]({ componentInstance, thisKey, regKey });
 		},
 		// 移除其他

fe/PC/src/store/modules/permission.js

@@ -46,6 +46,12 @@ export function generaMenu(routes, data) {
     } else {
       menu.level = 3
     }
+    // iframe页面处理
+    // if (item.permission.indexOf('Report') > -1) {
+    //   // delete menu.component
+    //   menu.iframeComponent = item.component === '@/layout' ? Layout : loadView(item.component)
+    //   menu.hasOpen = false // 是否打开过，默认false
+    // }
     if (item.children && item.children.length > 0) {
       generaMenu(menu.children, item.children)
     }

fe/PC/src/utils/index.js

@@ -545,4 +545,9 @@ export function dictFormatData() {
 // 像接口传参时候需要补充.0000000 否则会报错情况下转义
 export function initDataToHttpFormat (date) {
   return date ? date + '.0000000' : undefined
+}
+
+// 新建浏览器标签页面
+export function createNewTabs (url) {
+  window.open(url, "_blank")
 }

fe/PC/src/views/activeReportManage/reportForm/InventoryAgingSegmentSummary.vue

@@ -4,12 +4,21 @@
 </template>
 <script>
 import { reportsAddress } from "@/filters/excelOrReportsOption";
+import { createNewTabs } from '@/utils/index'
 export default {
   name:"InventoryAgingSegmentSummary",
+  // data() {
+  //   return {
+  //     url:reportsAddress.InventoryAgingSegmentSummary,
+  //   }
+  // },
   data() {
     return {
-      url:reportsAddress.InventoryAgingSegmentSummary,
+      url:null
     }
   },
+  activated () {
+    createNewTabs(reportsAddress.InventoryAgingSegmentSummary)
+  }
 }
 </script>

fe/PC/src/views/activeReportManage/reportForm/InventoryBookDetail.vue

@@ -4,12 +4,21 @@
 </template>
 <script>
 import { reportsAddress } from "@/filters/excelOrReportsOption";
+import { createNewTabs } from '@/utils/index'
 export default {
   name:"InventoryBookDetail",
+  // data() {
+  //   return {
+  //     url:reportsAddress.InventoryBookDetail,
+  //   }
+  // },
   data() {
     return {
-      url:reportsAddress.InventoryBookDetail,
+      url:null
     }
   },
+  activated () {
+    createNewTabs(reportsAddress.InventoryBookDetail)
+  }
 }
 </script>

fe/PC/src/views/activeReportManage/reportForm/InventoryBookSummary.vue

@@ -4,12 +4,21 @@
 </template>
 <script>
 import { reportsAddress } from "@/filters/excelOrReportsOption";
+import { createNewTabs } from '@/utils/index'
 export default {
   name:"InventoryBookSummary",
+  // data() {
+  //   return {
+  //     url:reportsAddress.InventoryBookSummary,
+  //   }
+  // },
   data() {
     return {
-      url:reportsAddress.InventoryBookSummary,
+      url:null
     }
   },
+  activated () {
+    createNewTabs(reportsAddress.InventoryBookSummary)
+  }
 }
 </script>

fe/PC/src/views/activeReportManage/reportForm/InventoryDetailReport.vue

@@ -4,12 +4,21 @@
 </template>
 <script>
 import { reportsAddress } from "@/filters/excelOrReportsOption";
+import { createNewTabs } from '@/utils/index'
 export default {
   name:"InventoryDetailReport",
+  // data() {
+  //   return {
+  //     url:reportsAddress.Inventory_Detail,
+  //   }
+  // },
   data() {
     return {
-      url:reportsAddress.Inventory_Detail,
+      url:null
     }
   },
+  activated () {
+    createNewTabs(reportsAddress.Inventory_Detail)
+  }
 }
 </script>

fe/PC/src/views/activeReportManage/reportForm/UnplannedDeliverSummary.vue

@@ -4,12 +4,21 @@
 </template>
 <script>
 import { reportsAddress } from "@/filters/excelOrReportsOption";
+import { createNewTabs } from '@/utils/index'
 export default {
   name:"UnplannedDeliverSummary",
+  // data() {
+  //   return {
+  //     url:reportsAddress.UnplannedDeliverSummary,
+  //   }
+  // },
   data() {
     return {
-      url:reportsAddress.UnplannedDeliverSummary,
+      url:null
     }
   },
+  activated () {
+    createNewTabs(reportsAddress.UnplannedDeliverSummary)
+  }
 }
 </script>

fe/PC/src/views/activeReportManage/reportForm/completionReceiptSummary.vue

@@ -4,12 +4,21 @@
 </template>
 <script>
 import { reportsAddress } from "@/filters/excelOrReportsOption";
+import { createNewTabs } from '@/utils/index'
 export default {
   name:"completionReceiptSummary",
+  // data() {
+  //   return {
+  //     url: reportsAddress.CompletionReceiptSummary,
+  //   }
+  // },
   data() {
     return {
-      url:reportsAddress.CompletionReceiptSummary,
+      url:null
     }
   },
+  activated () {
+    createNewTabs(reportsAddress.CompletionReceiptSummary)
+  }
 }
 </script>

fe/PC/src/views/activeReportManage/reportForm/finishedProductDeliverySummary.vue

@@ -4,12 +4,21 @@
 </template>
 <script>
 import { reportsAddress } from "@/filters/excelOrReportsOption";
+import { createNewTabs } from '@/utils/index'
 export default {
   name:"finishedProductDeliverySummary",
+  // data() {
+  //   return {
+  //     url:reportsAddress.FinishedProductDeliverySummary,
+  //   }
+  // },
   data() {
     return {
-      url:reportsAddress.FinishedProductDeliverySummary,
+      url:null
     }
   },
+  activated () {
+    createNewTabs(reportsAddress.FinishedProductDeliverySummary)
+  }
 }
 </script>

fe/PC/src/views/activeReportManage/reportForm/inventoryBalanceReport.vue

@@ -4,12 +4,21 @@
 </template>
 <script>
 import { reportsAddress } from "@/filters/excelOrReportsOption";
+import { createNewTabs } from '@/utils/index'
 export default {
   name:"inventoryBalanceReport",
+  // data() {
+  //   return {
+  //     url:reportsAddress.InventoryBlanace,
+  //   }
+  // },
   data() {
     return {
-      url:reportsAddress.InventoryBlanace,
+      url:null
     }
   },
+  activated () {
+    createNewTabs(reportsAddress.InventoryBlanace)
+  }
 }
 </script>

fe/PC/src/views/activeReportManage/reportForm/inventoryReport.vue

@@ -4,12 +4,21 @@
 </template>
 <script>
 import { reportsAddress } from "@/filters/excelOrReportsOption";
+import { createNewTabs } from '@/utils/index'
 export default {
   name:"inventoryReport",
+  // data() {
+  //   return {
+  //     url:reportsAddress.InventoryAccountingPeriodDetails,
+  //   }
+  // },
   data() {
     return {
-      url:reportsAddress.InventoryAccountingPeriodDetails,
+      url:null
     }
   },
+  activated () {
+    createNewTabs(reportsAddress.InventoryAccountingPeriodDetails)
+  }
 }
 </script>

fe/PC/src/views/activeReportManage/reportForm/inventorySummary.vue

@@ -4,12 +4,21 @@
 </template>
 <script>
 import { reportsAddress } from "@/filters/excelOrReportsOption";
+import { createNewTabs } from '@/utils/index'
 export default {
   name:"inventorySummary",
+  // data() {
+  //   return {
+  //     url:reportsAddress.InventorySummary,
+  //   }
+  // },
   data() {
     return {
-      url:reportsAddress.InventorySummary,
+      url:null
     }
   },
+  activated () {
+    createNewTabs(reportsAddress.InventorySummary)
+  }
 }
 </script>

fe/PC/src/views/activeReportManage/reportForm/productionIssuanceSummary.vue

@@ -4,12 +4,21 @@
 </template>
 <script>
 import { reportsAddress } from "@/filters/excelOrReportsOption";
+import { createNewTabs } from '@/utils/index'
 export default {
   name:"productionIssuanceSummary",
+  // data() {
+  //   return {
+  //     url:reportsAddress.ProductionIssueSummary_dy,
+  //   }
+  // },
   data() {
     return {
-      url:reportsAddress.ProductionIssueSummary_dy,
+      url:null
     }
   },
+  activated () {
+    createNewTabs(reportsAddress.ProductionIssueSummary_dy)
+  }
 }
 </script>

fe/PC/src/views/activeReportManage/reportForm/productionReturnSummary.vue

@@ -4,12 +4,21 @@
 </template>
 <script>
 import { reportsAddress } from "@/filters/excelOrReportsOption";
+import { createNewTabs } from '@/utils/index'
 export default {
   name:"productionReturnSummary",
+  // data() {
+  //   return {
+  //     url:reportsAddress.ProductionReturnSummary,
+  //   }
+  // },
   data() {
     return {
-      url:reportsAddress.ProductionReturnSummary,
+      url:null
     }
   },
+  activated () {
+    createNewTabs(reportsAddress.ProductionReturnSummary)
+  }
 }
 </script>

fe/PC/src/views/activeReportManage/reportForm/purchaseReceiptSummary.vue

@@ -4,12 +4,21 @@
 </template>
 <script>
 import { reportsAddress } from "@/filters/excelOrReportsOption";
+import { createNewTabs } from '@/utils/index'
 export default {
   name:"purchaseReceiptSummary",
+  // data() {
+  //   return {
+  //     url:reportsAddress.PurchaseReceiptSummary,
+  //   }
+  // },
   data() {
     return {
-      url:reportsAddress.PurchaseReceiptSummary,
+      url:null
     }
   },
+  activated () {
+    createNewTabs(reportsAddress.PurchaseReceiptSummary)
+  }
 }
 </script>

fe/PC/src/views/activeReportManage/reportForm/purchaseReturnSummaryReport.vue

@@ -4,12 +4,21 @@
 </template>
 <script>
 import { reportsAddress } from "@/filters/excelOrReportsOption";
+import { createNewTabs } from '@/utils/index'
 export default {
   name:"purchaseReturnSummaryReport",
+  // data() {
+  //   return {
+  //     url:reportsAddress.PurchaseReturnSummary,
+  //   }
+  // },
   data() {
     return {
-      url:reportsAddress.PurchaseReturnSummary,
+      url:null
     }
   },
+  activated () {
+    createNewTabs(reportsAddress.PurchaseReturnSummary)
+  }
 }
 </script>

fe/PC/src/views/activeReportManage/reportForm/purchaseSum.vue

@@ -4,12 +4,21 @@
 </template>
 <script>
 import { reportsAddress } from "@/filters/excelOrReportsOption";
+import { createNewTabs } from '@/utils/index'
 export default {
   name:"purchaseSum",
+  // data() {
+  //   return {
+  //     url:reportsAddress.PurchaseSum,
+  //   }
+  // },
   data() {
     return {
-      url:reportsAddress.PurchaseSum,
+      url:null
     }
   },
+  activated () {
+    createNewTabs(reportsAddress.PurchaseSum)
+  }
 }
 </script>

fe/PC/src/views/activeReportManage/reportForm/scrapDetails.vue

@@ -4,12 +4,21 @@
 </template>
 <script>
 import { reportsAddress } from "@/filters/excelOrReportsOption";
+import { createNewTabs } from '@/utils/index'
 export default {
   name:"scrapDetails",
+  // data() {
+  //   return {
+  //     url:reportsAddress.Scrap_Detail,
+  //   }
+  // },
   data() {
     return {
-      url:reportsAddress.Scrap_Detail,
+      url:null
     }
   },
+  activated () {
+    createNewTabs(reportsAddress.Scrap_Detail)
+  }
 }
 </script>

fe/PC/src/views/activeReportManage/reportForm/unplannedReceiptSummary.vue

@@ -4,12 +4,21 @@
 </template>
 <script>
 import { reportsAddress } from "@/filters/excelOrReportsOption";
+import { createNewTabs } from '@/utils/index'
 export default {
   name:"unplannedReceiptSummary",
+  // data() {
+  //   return {
+  //     url:reportsAddress.UnPlannedReceiptSummary,
+  //   }
+  // },
   data() {
     return {
-      url:reportsAddress.UnPlannedReceiptSummary,
+      url:null
     }
   },
+  activated () {
+    createNewTabs(reportsAddress.UnPlannedReceiptSummary)
+  }
 }
 </script>