Browse Source

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

dev_web_online
安虹睿 2 years ago
parent
commit
e25d1b0795
  1. 98
      fe/PC/src/layout/components/AppMain.vue
  2. 6
      fe/PC/src/store/modules/permission.js
  3. 5
      fe/PC/src/utils/index.js
  4. 11
      fe/PC/src/views/activeReportManage/reportForm/InventoryAgingSegmentSummary.vue
  5. 11
      fe/PC/src/views/activeReportManage/reportForm/InventoryBookDetail.vue
  6. 11
      fe/PC/src/views/activeReportManage/reportForm/InventoryBookSummary.vue
  7. 11
      fe/PC/src/views/activeReportManage/reportForm/InventoryDetailReport.vue
  8. 11
      fe/PC/src/views/activeReportManage/reportForm/UnplannedDeliverSummary.vue
  9. 11
      fe/PC/src/views/activeReportManage/reportForm/completionReceiptSummary.vue
  10. 11
      fe/PC/src/views/activeReportManage/reportForm/finishedProductDeliverySummary.vue
  11. 11
      fe/PC/src/views/activeReportManage/reportForm/inventoryBalanceReport.vue
  12. 11
      fe/PC/src/views/activeReportManage/reportForm/inventoryReport.vue
  13. 11
      fe/PC/src/views/activeReportManage/reportForm/inventorySummary.vue
  14. 11
      fe/PC/src/views/activeReportManage/reportForm/productionIssuanceSummary.vue
  15. 11
      fe/PC/src/views/activeReportManage/reportForm/productionReturnSummary.vue
  16. 11
      fe/PC/src/views/activeReportManage/reportForm/purchaseReceiptSummary.vue
  17. 11
      fe/PC/src/views/activeReportManage/reportForm/purchaseReturnSummaryReport.vue
  18. 11
      fe/PC/src/views/activeReportManage/reportForm/purchaseSum.vue
  19. 11
      fe/PC/src/views/activeReportManage/reportForm/scrapDetails.vue
  20. 11
      fe/PC/src/views/activeReportManage/reportForm/unplannedReceiptSummary.vue

98
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:trueiframe
// 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) => {
this.removeRedirect(name, view);
})
//
Bus.$on('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-aliveVnode
getVnode() {
//
@ -52,14 +115,14 @@ export default {
}
return vnode ? vnode : false;
},
//redirect
removeRedirect(view={}){
const viewNew = {
fullPath:`/redirect${view.fullPath}`,
path:`/redirect${view.path}`
}
this.removeCache('closeSelectedTag',viewNew);
},
//redirect
removeRedirect(view={}){
const viewNew = {
fullPath:`/redirect${view.fullPath}`,
path:`/redirect${view.path}`
}
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 });
},
//

6
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)
}

5
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")
}

11
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>

11
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>

11
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>

11
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>

11
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>

11
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>

11
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>

11
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>

11
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>

11
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>

11
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>

11
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>

11
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>

11
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>

11
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>

11
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>

11
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>
Loading…
Cancel
Save