diff --git a/PC/UI.WinIn.FasterZ.AgGridReport/src/api/api.js b/PC/UI.WinIn.FasterZ.AgGridReport/src/api/api.js
index cd083f6..5246bab 100644
--- a/PC/UI.WinIn.FasterZ.AgGridReport/src/api/api.js
+++ b/PC/UI.WinIn.FasterZ.AgGridReport/src/api/api.js
@@ -1,29 +1,41 @@
import axiosUtil from '@/utils/request'
let baseURL = window.SITE_CONFIG['apiURL']
-let procApi = baseURL + '/api/app/report-proc/execute-procedure-by-sql?procName='
+let procApi = baseURL + '/api/app/report-proc/execute-procedure-by-proc?procName='
// 通用获取页面数据
export function getReportPageList(procName, data) {
- return axiosUtil.ajax_post(
- procApi+procName,
- data
- )
+ return axiosUtil.ajax_post(procApi+procName,data)
}
-// 获取物料
+// 获取 物料
export function getItemCodeList() {
return axiosUtil.ajax_post(procApi+'Proc_Zheng_InputWhere_ItemCode',{})
}
-// 获取库位组
+// 获取 ERP库位
+export function getLocationErpCodeList() {
+ return axiosUtil.ajax_post(procApi+'Proc_Zheng_InputWhere_LocationErpCode',{})
+}
+
+// 获取 库位组
export function getLocationGroupCodeList() {
return axiosUtil.ajax_post(procApi+'Proc_Zheng_InputWhere_LocationGroupCode',{})
}
-// 获取状态
+// 获取 状态
export function getInventoryStatusList() {
return axiosUtil.ajax_post(procApi+'Proc_Zheng_InputWhere_InventoryBalance_Status',{})
}
+// 获取 事务分类
+export function getTransTypeList() {
+ return axiosUtil.ajax_post(procApi+'Proc_Zheng_InputWhere_TransType',{})
+}
+
+// 获取 供应商
+export function getSupplierCodeList() {
+ return axiosUtil.ajax_post(procApi+'Proc_Zheng_InputWhere_SupplierCode',{})
+}
+
diff --git a/PC/UI.WinIn.FasterZ.AgGridReport/src/components/AgTable/index.vue b/PC/UI.WinIn.FasterZ.AgGridReport/src/components/AgTable/index.vue
index 771a46c..2fcc553 100644
--- a/PC/UI.WinIn.FasterZ.AgGridReport/src/components/AgTable/index.vue
+++ b/PC/UI.WinIn.FasterZ.AgGridReport/src/components/AgTable/index.vue
@@ -1,14 +1,31 @@
-
+
\ No newline at end of file
diff --git a/PC/UI.WinIn.FasterZ.AgGridReport/src/components/reportPage/index.vue b/PC/UI.WinIn.FasterZ.AgGridReport/src/components/reportPage/index.vue
index 549b492..1869650 100644
--- a/PC/UI.WinIn.FasterZ.AgGridReport/src/components/reportPage/index.vue
+++ b/PC/UI.WinIn.FasterZ.AgGridReport/src/components/reportPage/index.vue
@@ -11,9 +11,9 @@
:showReportTitle="showReportTitle"
>
diff --git a/PC/UI.WinIn.FasterZ.AgGridReport/src/components/reportPageHeader/index.vue b/PC/UI.WinIn.FasterZ.AgGridReport/src/components/reportPageHeader/index.vue
index e0a2c79..836fd49 100644
--- a/PC/UI.WinIn.FasterZ.AgGridReport/src/components/reportPageHeader/index.vue
+++ b/PC/UI.WinIn.FasterZ.AgGridReport/src/components/reportPageHeader/index.vue
@@ -47,7 +47,7 @@
v-model="searchForm[item.prop]"
type="date"
placeholder="选择日期"
- value-format="yyyy-MM-ddTHH:mm:ss"
+ value-format="yyyy-MM-dd"
>
@@ -77,8 +77,11 @@ import columnFilter from "@/components/columnFilter/index"
import exportExcel from "@/components/exportExcel/index"
import {
getItemCodeList,
+ getLocationErpCodeList,
getLocationGroupCodeList,
- getInventoryStatusList
+ getInventoryStatusList,
+ getTransTypeList,
+ getSupplierCodeList
} from '@/api/api'
export default {
name: "reportPageHeader",
@@ -142,6 +145,14 @@ export default {
item.opV="ItemCode"
})
}
+ // ERP库位
+ if(item.optionsProc == 'ErpLocationCode'){
+ getLocationErpCodeList().then(res=>{
+ item.options = res
+ item.opL="ErpLocationCode"
+ item.opV="ErpLocationCode"
+ })
+ }
// 库位组
if(item.optionsProc == 'LocationGroupCode'){
getLocationGroupCodeList().then(res=>{
@@ -153,12 +164,29 @@ export default {
// 状态
if(item.optionsProc == 'InventoryStatus'){
getInventoryStatusList().then(res=>{
- res.forEach(res_item=>res_item.sValue = String(res_item.Value))
+ res.forEach(res_item=>res_item.sValue = String(res_item['value'.toUpperCase()]))
item.options = res
- item.opL="Key"
+ item.opL='key'.toUpperCase()
item.opV="sValue"
})
}
+ // 事务分类
+ if(item.optionsProc == 'TransType'){
+ getTransTypeList().then(res=>{
+ res.forEach(res_item=>res_item.sValue = String(res_item['value'.toUpperCase()]))
+ item.options = res
+ item.opL='key'.toUpperCase()
+ item.opV="sValue"
+ })
+ }
+ // 供应商
+ if(item.optionsProc == 'SupplierCode'){
+ getSupplierCodeList().then(res=>{
+ item.options = res
+ item.opL='SupplierCode'
+ item.opV="SupplierCode"
+ })
+ }
}
})
},
@@ -184,7 +212,9 @@ export default {
\ No newline at end of file
diff --git a/PC/UI.WinIn.FasterZ.AgGridReport/src/views/inventoryAndAge.vue b/PC/UI.WinIn.FasterZ.AgGridReport/src/views/inventoryAndAge.vue
deleted file mode 100644
index 21302b6..0000000
--- a/PC/UI.WinIn.FasterZ.AgGridReport/src/views/inventoryAndAge.vue
+++ /dev/null
@@ -1,57 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/inventoryAndAge.vue b/PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/inventoryAndAge.vue
new file mode 100644
index 0000000..9dac885
--- /dev/null
+++ b/PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/inventoryAndAge.vue
@@ -0,0 +1,56 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/inventoryERPWMS.vue b/PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/inventoryERPWMS.vue
new file mode 100644
index 0000000..a561cdd
--- /dev/null
+++ b/PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/inventoryERPWMS.vue
@@ -0,0 +1,49 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/inventoryTrans.vue b/PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/inventoryTrans.vue
new file mode 100644
index 0000000..7703206
--- /dev/null
+++ b/PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/inventoryTrans.vue
@@ -0,0 +1,57 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/procureHasPOReport.vue b/PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/procureHasPOReport.vue
new file mode 100644
index 0000000..2836e01
--- /dev/null
+++ b/PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/procureHasPOReport.vue
@@ -0,0 +1,52 @@
+
+
+
+
+
\ No newline at end of file