diff --git a/fe/UI.DY.AgGridReport/src/api/api.js b/fe/UI.DY.AgGridReport/src/api/api.js
index 3c6eea401..7e2444ea0 100644
--- a/fe/UI.DY.AgGridReport/src/api/api.js
+++ b/fe/UI.DY.AgGridReport/src/api/api.js
@@ -46,3 +46,7 @@ export function getUnplannedReceiptType() {
export function getInventoryBalanceStatus() {
return axiosUtil.ajax_post(procApi+'Proc_InputWhere_InventoryBalance_Status',{})
}
+
+export function inventoryTransactionSerial() {
+ return axiosUtil.ajax_post('http://dev.ccwin-in.com:60085/api/wms/inventory/inventory-transaction/item-serial-list?startDateTime=2024-07-01&endDateTime=2024-07-09T23:59:59&erpLocationCode=null')
+}
\ No newline at end of file
diff --git a/fe/UI.DY.AgGridReport/src/components/AgTable/index.vue b/fe/UI.DY.AgGridReport/src/components/AgTable/index.vue
index 6f3418f76..ae89deb58 100644
--- a/fe/UI.DY.AgGridReport/src/components/AgTable/index.vue
+++ b/fe/UI.DY.AgGridReport/src/components/AgTable/index.vue
@@ -211,6 +211,24 @@ export default {
&.centerAlign{
justify-content: center;
}
+
+ &.stateTag_danger{
+ background:#ff2f00;
+ justify-content: center;
+ color:#fff
+ }
+
+ &.stateTag_warning{
+ background:#ff9000;
+ justify-content: center;
+ color:#fff
+ }
+
+ &.stateTag_success{
+ background:green;
+ justify-content: center;
+ color:#fff
+ }
}
.ag-cell-value{
diff --git a/fe/UI.DY.AgGridReport/src/router/index.js b/fe/UI.DY.AgGridReport/src/router/index.js
index 44ad36432..f2ba52c7e 100644
--- a/fe/UI.DY.AgGridReport/src/router/index.js
+++ b/fe/UI.DY.AgGridReport/src/router/index.js
@@ -24,9 +24,10 @@ import ProductionIssueSummary from '../views/report/ProductionIssueSummary.vue'
import ProductionReturnSummary from '../views/report/ProductionReturnSummary.vue'
import ProductReceiptSummary from '../views/report/ProductReceiptSummary.vue'
import SupplierAndOrderSummary from '../views/report/SupplierAndOrderSummary.vue'
+import rawScrapList from '../views/report/rawScrapList.vue'
+import InventoryBookDetail from '../views/report/InventoryBookDetail.vue'
Vue.use(VueRouter)
-
const routes = [
{
path: '/',
@@ -220,6 +221,22 @@ const routes = [
title:"供应商发货订单汇总报表",
}
},
+ {
+ path: '/rawScrapList',
+ name: 'rawScrapList',
+ component: rawScrapList,
+ meta:{
+ title:"原物料过期报表",
+ }
+ },
+ // {
+ // path: '/InventoryBookDetail',
+ // name: 'InventoryBookDetail',
+ // component: InventoryBookDetail,
+ // meta:{
+ // title:"库存流水账明细",
+ // }
+ // },
]
const router = new VueRouter({
diff --git a/fe/UI.DY.AgGridReport/src/utils/util.js b/fe/UI.DY.AgGridReport/src/utils/util.js
index 19a06a811..b9dd17c90 100644
--- a/fe/UI.DY.AgGridReport/src/utils/util.js
+++ b/fe/UI.DY.AgGridReport/src/utils/util.js
@@ -75,11 +75,17 @@ var numberPercentFormatter = function(number,isPercent,fixed){
return _res;
}
+// 状态类型颜色变化
+var stateTagClass = function(data,options){
+ return options[data.value] || options.init
+}
+
export default {
waitTime:20000,//滚屏列表刷新等待间隔配置项
addEventResizeFlesh:addEventResizeFlesh,
dateFilterParams:dateFilterParams,
numberFixedFormatter,
numberPercentFormatter,
- formatTimeStrToStr
+ formatTimeStrToStr,
+ stateTagClass
}
\ No newline at end of file
diff --git a/fe/UI.DY.AgGridReport/src/views/report/InventoryBookDetail.vue b/fe/UI.DY.AgGridReport/src/views/report/InventoryBookDetail.vue
new file mode 100644
index 000000000..f4cbf9534
--- /dev/null
+++ b/fe/UI.DY.AgGridReport/src/views/report/InventoryBookDetail.vue
@@ -0,0 +1,59 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/fe/UI.DY.AgGridReport/src/views/report/rawScrapList.vue b/fe/UI.DY.AgGridReport/src/views/report/rawScrapList.vue
new file mode 100644
index 000000000..c52dd722a
--- /dev/null
+++ b/fe/UI.DY.AgGridReport/src/views/report/rawScrapList.vue
@@ -0,0 +1,60 @@
+
+
+
+
+
\ No newline at end of file