【nev-pc】报表更改先关挂接配置更改开发及新增报表开发+小bug修改

fe/PC/public/config.js

@@ -4,7 +4,7 @@
 // // window.SITE_CONFIG['print'] = 'print'
 // window.SITE_CONFIG['print'] = 'http://dev.ccwin-in.com:60074'
 // window.SITE_CONFIG['largeScreen'] = 'http://dev.ccwin-in.com:60073'
-// window.SITE_CONFIG['warehouseCode'] = 'T8'
+// window.SITE_CONFIG['warehouseCode'] = 'T9'
 // window.SITE_CONFIG['company'] = 'DongYang'
 // window.SITE_CONFIG['client_secret'] = '1q2w3E*'
 // window.SITE_CONFIG['reportsUrl'] = 'http://10.164.0.227:21093/#/reports/'
@@ -16,10 +16,10 @@ window.SITE_CONFIG['user'] = 'http://dev.ccwin-in.com:60099/api/auth'
 // window.SITE_CONFIG['print'] = 'print'21384
 window.SITE_CONFIG['print'] = 'http://dev.ccwin-in.com:60074'
 window.SITE_CONFIG['largeScreen'] = 'http://dev.ccwin-in.com:60073'
-window.SITE_CONFIG['warehouseCode'] = 'T8'
+window.SITE_CONFIG['warehouseCode'] = 'T9'
 window.SITE_CONFIG['company'] = 'DongYang'
 window.SITE_CONFIG['client_secret'] = '1q2w3E*'
-window.SITE_CONFIG['reportsUrl'] = 'http://dev.ccwin-in.com:60074/#/reports/'
+window.SITE_CONFIG['reportsUrl'] = 'http://dev.ccwin-in.com:60079/#/',//74/#/reports/
 window.SITE_CONFIG['versionUrl'] = 'http://dev.ccwin-in.com:60070'
 window.SITE_CONFIG['companyName'] = '长春一汽富维东阳汽车塑料零部件（安徽）有限公司'
 //pad-kitting组包页面刷新时间（毫秒）
@@ -43,7 +43,7 @@ window.SITE_CONFIG['pageHasMOrDList'] = [
 // window.SITE_CONFIG['user'] = 'http://dev.ccwin-in.com:60099/api/auth'
 // window.SITE_CONFIG['print'] = 'print'
 // window.SITE_CONFIG['largeScreen'] = 'http://dev.ccwin-in.com:60073'
-// window.SITE_CONFIG['warehouseCode'] = 'T8'
+// window.SITE_CONFIG['warehouseCode'] = 'T9'
 // window.SITE_CONFIG['company'] = 'DongYang'
 // window.SITE_CONFIG['client_secret'] = '1q2w3E*'
 // window.SITE_CONFIG['reportsUrl'] = 'http://10.164.0.227:59091/#/reports/'

fe/PC/src/filters/excelOrReportsOption.js

@@ -58,26 +58,58 @@ export const zpRequestExcel = {
 const reportsUrl = localStorage.getItem('reportsUrl')
 // 报表文件地址
 export const reportsAddress = {
-    PurchaseReceiptSummary:reportsUrl + '202211300914188516.rdlx',//供应商发货报表
-    Inventory_Detail:reportsUrl + '202211291142233052.rdlx',//库存账龄明细
-    InventoryAccountingPeriodDetails:reportsUrl + '202211300913580741.rdlx',//库存单据明细报表
-    FinishedProductDeliverySummary:reportsUrl + '202211300920074461.rdlx',//成品发货汇总表
-    CompletionReceiptSummary:reportsUrl + '202211300919413598.rdlx',//完工收货汇总表
-    UnPlannedReceiptSummary:reportsUrl + '202211300921294414.rdlx',//非生产退料汇总（原计划外入库汇总）
-    UnplannedDeliverSummary:reportsUrl + '202211300921505958.rdlx',//非生产领料汇总（原计划外出库汇总）
-    Scrap_Detail:reportsUrl + '202211300912414755.rdlx',//报废明细表
-    PurchaseSum:reportsUrl + '202211300913268367.rdlx',//订单汇总查询
-    PurchaseReturnSummary:reportsUrl + '202211300925599696.rdlx',//采购退货汇总
-    ProductionReturnSummary:reportsUrl + '202211300918259711.rdlx',//生产退料汇总表
-    ProductionIssueSummary_dy:reportsUrl + '202211300917169689.rdlx',//生产发料汇总表
-    InventoryBlanace:reportsUrl + '202211300922434081.rdlx',//库存余额报表
-    InventorySummary:reportsUrl + '202211300921065163.rdlx',//盘点记录汇总表
-    InventoryAgingSegmentSummary:reportsUrl + '202211300912101560.rdlx',//库存账龄分段汇总表
-    InventoryBookDetail:reportsUrl + '202212162111466911.rdlx',//库存流水帐明细
-    InventoryBookSummary:reportsUrl + '202212162112124488.rdlx',//库存流水帐汇总
-    inventoryBalanceReportLocationCode:reportsUrl + '202211300922434082.rdlx',//库存余额报表按库位
-    inventoryBalanceReportLocationErpCode:reportsUrl + '202211300922434083.rdlx',//库存余额报表按ERP库位
-    InventoryBookSummaryLocation:reportsUrl + '202212162112124489.rdlx',//库存流水帐汇总(库位)
-    InventoryBookSummaryERP_pay:reportsUrl + '库存流水帐汇总ERP.rdlx',//库存流水帐汇总（ERP储位）-账期
-    InventoryBookSummaryWMS_pay:reportsUrl + '库存流水账汇总库位.rdlx',//库存流水账汇总（WMS库位）-账期
+    PurchaseReceiptSummary:reportsUrl + 'SupplierDeliver',//供应商发货报表 SupplierDeliver
+    Inventory_Detail:reportsUrl + 'InventoryAgingDetail',//库存账龄明细 InventoryAgingDetail
+    FinishedProductDeliverySummary:reportsUrl + 'ProductDeliverySummary',//成品发货汇总表 ProductDeliverySummary
+    CompletionReceiptSummary:reportsUrl + 'ProductReceiptSummary',//完工收货汇总表 ProductReceiptSummary
+    UnPlannedReceiptSummary:reportsUrl + 'UnplannedReceiptSummary',//非生产退料汇总（原计划外入库汇总） UnplannedReceiptSummary
+    UnplannedDeliverSummary:reportsUrl + 'UnplannedIssueSummary',//非生产领料汇总（原计划外出库汇总） UnplannedIssueSummary
+    Scrap_Detail:reportsUrl + 'ScrapDetail',//报废明细表 ScrapDetail
+    PurchaseSum:reportsUrl + 'orderSummary',//订单汇总查询 orderSummary
+    PurchaseReturnSummary:reportsUrl + 'PurchaseReturnSummary',//采购退货汇总 PurchaseReturnSummary
+    ProductionReturnSummary:reportsUrl + 'ProductionReturnSummary',//生产退料汇总表 ProductionReturnSummary
+    ProductionIssueSummary_dy:reportsUrl + 'ProductionIssueSummary',//生产发料汇总表 ProductionIssueSummary
+    InventorySummary:reportsUrl + 'planNoteSummary',//盘点记录汇总表 planNoteSummary
+    InventoryAgingSegmentSummary:reportsUrl + 'InventoryAgingsectionSummary',//库存账龄分段汇总表 InventoryAgingsectionSummary
+    inventoryBalanceReportLocationCode:reportsUrl + 'InventoryBalanceLocation',//库存余额报表按库位 InventoryBalanceLocation
+    inventoryBalanceReportLocationErpCode:reportsUrl + 'InventoryBalanceERP',//库存余额报表按ERP库位 InventoryBalanceERP
+    InventoryBookSummaryLocation:reportsUrl + 'InventoryJournalLocation',//库存流水帐汇总(库位) InventoryJournalLocation
+    InventoryBookSummaryERP_pay:reportsUrl + 'InventoryJournalERP',//库存流水帐汇总（ERP储位） InventoryJournalERP
+    // 新增
+    ProductDeliveryNoPrice:reportsUrl + 'ProductDeliveryNoPrice',//成品发货汇总表(无价格) ProductDeliveryNoPrice
+    depositSummaryReport:reportsUrl + 'depositSummaryReport',//缴库汇总差异报表 depositSummaryReport
+    depositDetailsReport:reportsUrl + 'depositDetailsReport',//缴库明细报表 depositDetailsReport
+    interfaceError:reportsUrl + 'interfaceError',//接口错误报表 interfaceError
+    InventoryBalanceEnRoute:reportsUrl + 'InventoryBalanceEnRoute',//库存余额报表按在途库 InventoryBalanceEnRoute
+    
+    // InventoryBookDetail:reportsUrl + '202212162111466911.rdlx',//库存流水帐明细
+    // InventoryBookSummary:reportsUrl + '202212162112124488.rdlx',//库存流水帐汇总
+    // InventoryBlanace:reportsUrl + '202211300922434081.rdlx',//库存余额报表
+    // InventoryAccountingPeriodDetails:reportsUrl + '202211300913580741.rdlx',//库存单据明细报表
+    // InventoryBookSummaryWMS_pay:reportsUrl + '库存流水账汇总库位.rdlx',//库存流水账汇总（WMS库位）-账期 
 }
+
+// export const reportsAddress = {
+//     PurchaseReceiptSummary:reportsUrl + '202211300914188516.rdlx',//供应商发货报表 SupplierDeliver
+//     Inventory_Detail:reportsUrl + '202211291142233052.rdlx',//库存账龄明细 InventoryAgingDetail
+//     FinishedProductDeliverySummary:reportsUrl + '202211300920074461.rdlx',//成品发货汇总表 ProductDeliverySummary
+//     CompletionReceiptSummary:reportsUrl + '202211300919413598.rdlx',//完工收货汇总表 ProductReceiptSummary
+//     UnPlannedReceiptSummary:reportsUrl + '202211300921294414.rdlx',//非生产退料汇总（原计划外入库汇总） UnplannedReceiptSummary
+//     UnplannedDeliverSummary:reportsUrl + '202211300921505958.rdlx',//非生产领料汇总（原计划外出库汇总） UnplannedIssueSummary
+//     Scrap_Detail:reportsUrl + '202211300912414755.rdlx',//报废明细表 ScrapDetail
+//     PurchaseSum:reportsUrl + '202211300913268367.rdlx',//订单汇总查询 orderSummary
+//     PurchaseReturnSummary:reportsUrl + '202211300925599696.rdlx',//采购退货汇总 PurchaseReturnSummary
+//     ProductionReturnSummary:reportsUrl + '202211300918259711.rdlx',//生产退料汇总表 ProductionReturnSummary
+//     ProductionIssueSummary_dy:reportsUrl + '202211300917169689.rdlx',//生产发料汇总表 ProductionIssueSummary
+//     InventorySummary:reportsUrl + '202211300921065163.rdlx',//盘点记录汇总表 planNoteSummary
+//     InventoryAgingSegmentSummary:reportsUrl + '202211300912101560.rdlx',//库存账龄分段汇总表 InventoryAgingsectionSummary
+//     inventoryBalanceReportLocationCode:reportsUrl + '202211300922434082.rdlx',//库存余额报表按库位 InventoryBalanceLocation
+//     inventoryBalanceReportLocationErpCode:reportsUrl + '202211300922434083.rdlx',//库存余额报表按ERP库位 InventoryBalanceERP
+//     InventoryBookSummaryLocation:reportsUrl + '202212162112124489.rdlx',//库存流水帐汇总(库位) InventoryJournalLocation
+//     InventoryBookSummaryERP_pay:reportsUrl + '库存流水帐汇总ERP.rdlx',//库存流水帐汇总（ERP储位）-账期 InventoryJournalERP
+//     InventoryBookDetail:reportsUrl + '202212162111466911.rdlx',//库存流水帐明细
+//     InventoryBookSummary:reportsUrl + '202212162112124488.rdlx',//库存流水帐汇总
+//     InventoryBlanace:reportsUrl + '202211300922434081.rdlx',//库存余额报表
+//     InventoryAccountingPeriodDetails:reportsUrl + '202211300913580741.rdlx',//库存单据明细报表
+//     InventoryBookSummaryWMS_pay:reportsUrl + '库存流水账汇总库位.rdlx',//库存流水账汇总（WMS库位）-账期 
+// }

fe/PC/src/utils/detailsTableColumns/index.js

@@ -99,8 +99,8 @@ export const PurchaseOrder =  [
   { label: "备注", prop: 'remark' },
   { label: "订单备注", prop: 'orderRemark' },
   { label: "事务ID", prop: "tenantId" },
-  { label: "创建时间", prop: 'creationTime', type: "dateTime" },
-  { label: "创建者ID", prop: 'creatorId' },
+  // { label: "创建时间", prop: 'creationTime', type: "dateTime" },
+  // { label: "创建者ID", prop: 'creatorId' },
   // { label: "标包计量单位", prop: 'stdPackUom' },
   // ************** 确定隐藏 ************************
   // { label: "生产时间", prop: "produceDate", type: "dateTime" },
@@ -291,9 +291,9 @@ export const InspectRequest =  [
   { label: "合格数量", prop: 'goodQty' },
   { label: "不合格数量", prop: 'failedQty' },
   { label: "外观", prop: 'appearance' },
+  { label: "其他属性", prop: 'otherPropertyJson', width:300},
   { label: "尺寸", prop: 'volume' },
   { label: "重量", prop: 'weight' },
-  { label: "其他属性", prop: 'otherPropertyJson' },
   // { label: "状态", prop: "status", type: "tagFilter", filters: "requestStatus" },
   // ************** 确定隐藏 ************************
   // { label: "ID", prop: "id" },

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

@@ -0,0 +1,21 @@
+<template>
+  <!-- 库存余额报表按在途库 -->
+  <popUpPage :openHandle="openHandle"></popUpPage>
+</template>
+<script>
+import popUpPage from "../popUpPage/index.vue"
+import { reportsAddress } from "@/filters/excelOrReportsOption";
+import { createNewTabs } from '@/utils/index'
+export default {
+  name:"InventoryBalanceEnRoute",
+  components:{popUpPage},
+  mounted () {
+    this.openHandle()
+  },
+  methods:{
+    openHandle(){
+      createNewTabs(reportsAddress.InventoryBalanceEnRoute + '?title=' + this.$route.meta.title)
+    }
+  }
+}
+</script>

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

@@ -0,0 +1,21 @@
+<template>
+  <!-- 成品发货汇总表(无价格) -->
+  <popUpPage :openHandle="openHandle"></popUpPage>
+</template>
+<script>
+import popUpPage from "../popUpPage/index.vue"
+import { reportsAddress } from "@/filters/excelOrReportsOption";
+import { createNewTabs } from '@/utils/index'
+export default {
+  name:"ProductDeliveryNoPrice",
+  components:{popUpPage},
+  mounted () {
+    this.openHandle()
+  },
+  methods:{
+    openHandle(){
+      createNewTabs(reportsAddress.ProductDeliveryNoPrice + '?title=' + this.$route.meta.title)
+    }
+  }
+}
+</script>

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

@@ -0,0 +1,21 @@
+<template>
+  <!-- 缴库明细报表 -->
+  <popUpPage :openHandle="openHandle"></popUpPage>
+</template>
+<script>
+import popUpPage from "../popUpPage/index.vue"
+import { reportsAddress } from "@/filters/excelOrReportsOption";
+import { createNewTabs } from '@/utils/index'
+export default {
+  name:"depositDetailsReport",
+  components:{popUpPage},
+  mounted () {
+    this.openHandle()
+  },
+  methods:{
+    openHandle(){
+      createNewTabs(reportsAddress.depositDetailsReport + '?title=' + this.$route.meta.title)
+    }
+  }
+}
+</script>

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

@@ -0,0 +1,21 @@
+<template>
+  <!-- 缴库汇总差异报表 -->
+  <popUpPage :openHandle="openHandle"></popUpPage>
+</template>
+<script>
+import popUpPage from "../popUpPage/index.vue"
+import { reportsAddress } from "@/filters/excelOrReportsOption";
+import { createNewTabs } from '@/utils/index'
+export default {
+  name:"depositSummaryReport",
+  components:{popUpPage},
+  mounted () {
+    this.openHandle()
+  },
+  methods:{
+    openHandle(){
+      createNewTabs(reportsAddress.depositSummaryReport + '?title=' + this.$route.meta.title)
+    }
+  }
+}
+</script>

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

@@ -0,0 +1,21 @@
+<template>
+  <!-- 接口错误报表 -->
+  <popUpPage :openHandle="openHandle"></popUpPage>
+</template>
+<script>
+import popUpPage from "../popUpPage/index.vue"
+import { reportsAddress } from "@/filters/excelOrReportsOption";
+import { createNewTabs } from '@/utils/index'
+export default {
+  name:"interfaceError",
+  components:{popUpPage},
+  mounted () {
+    this.openHandle()
+  },
+  methods:{
+    openHandle(){
+      createNewTabs(reportsAddress.interfaceError + '?title=' + this.$route.meta.title)
+    }
+  }
+}
+</script>

fe/PC/src/views/labelManage/PartiallyPreparedProducts/splitLabels.vue

@@ -353,7 +353,7 @@ export default {
           toLocationErpCode: this.selectItemInfo.locationErpCode || (this.InventoryInfo ? this.InventoryInfo.locationErpCode : null),
           toLot: this.selectItemInfo.lot,
           toPackingCode: newCode,
-          toWarehouseCode: this.InventoryInfo ? this.InventoryInfo.warehouseCode : "T8",//没有值特殊处理？
+          toWarehouseCode: this.InventoryInfo ? this.InventoryInfo.warehouseCode : localStorage.getItem('warehouseCode'),
           uom: this.selectItemInfo.uom,
           itemDesc1: this.selectItemInfo.itemDesc1,
           onTheWayLocationCode: "",