+
本月退货明细
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ formatter(scope.row.inventoryStatus,DICT_TYPE.INVENTORY_STATUS) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ formatter(scope.row.uom,DICT_TYPE.UOM) }}
+
+
+
+
+
+
+ {{ formatDate(scope.row.createTime) }}
+
+
+
-
+
本月索赔明细
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+ {{ formatDate(scope.row.createTime) }}
+
+
+
@@ -111,6 +231,10 @@
import { set } from 'lodash-es'
import { EChartsOption } from 'echarts'
import { lineOptions, pieOptions } from '../echarts-data'
+import { formatDate } from '@/utils/formatTime'
+import * as NotifyMessageApi from '@/api/system/notify/message'
+import * as IndexApi from '@/api/home'
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
const { t } = useI18n()
const tableData = [
{
@@ -150,60 +274,31 @@ const tableData = [
text: 'No. 189, Grove St, Los Angeles'
}
]
+const supplierData = ref()
+const lineIndex = ref(0)
// 本月发货单趋势
const lineOptionsData = reactive
(lineOptions) as EChartsOption
const getInvoiceCharts = async () => {
- const data = [
- { value: 20, name: '1日' },
- { value: 50, name: '2日' },
- { value: 250, name: '3日' },
- { value: 220, name: '4日' },
- { value: 230, name: '5日' },
- { value: 160, name: '6日' },
- { value: 120, name: '7日' },
- { value: 160, name: '8日' },
- { value: 130, name: '9日' },
- { value: 240, name: '10日' },
- { value: 230, name: '11日' },
- { value: 100, name: '12日' },
- { value: 40, name: '13日' },
- { value: 80, name: '14日' },
- { value: 30, name: '15日' },
- { value: 88, name: '16日' },
- { value: 134, name: '17日' },
- { value: 156, name: '18日' },
- { value: 143, name: '19日' },
- { value: 240, name: '20日' },
- { value: 160, name: '21日' },
- { value: 160, name: '22日' },
- { value: 160, name: '23日' },
- { value: 160, name: '24日' },
- { value: 160, name: '25日' },
- { value: 160, name: '26日' },
- { value: 160, name: '27日' },
- { value: 160, name: '28日' },
- { value: 160, name: '29日' },
- { value: 160, name: '30日' }
- ]
set(
lineOptionsData,
'xAxis.data',
- data.map((v) => t(v.name))
+ supplierData.value.supplierdeliverMonthCount.map((v) => v.date)
)
+ set(lineOptionsData, 'legend.data', ['本月发货单趋势'])
set(lineOptionsData, 'series', [
{
- name: '哈哈',
+ name: '本月发货单趋势',
smooth: true,
type: 'line',
itemStyle: {},
animationDuration: 2800,
animationEasing: 'quadraticOut',
- data: data.map((v) => v.value)
+ data: supplierData.value.supplierdeliverMonthCount.map((v) => v.count)
}
])
+ lineIndex.value++
}
//本月发货零件TOP10
-
const pieOptionsData = reactive(pieOptions) as EChartsOption
const getPartTOPCharts = async () => {
const data = [
@@ -213,21 +308,56 @@ const getPartTOPCharts = async () => {
{ value: 135, name: 'analysis.videoAdvertising' },
{ value: 1548, name: 'analysis.searchEngines' }
]
+ console.log(supplierData.value.supplierdeliverItemMonthTop)
set(
pieOptionsData,
'legend.data',
- data.map((v) => t(v.name))
+ supplierData.value.supplierdeliverItemMonthTop.map((v) => v.itemCode)
)
- pieOptionsData!.series![0].data = data.map((v) => {
+ pieOptionsData!.series![0].data = supplierData.value.supplierdeliverItemMonthTop.map((v) => {
return {
- name: t(v.name),
- value: v.value
+ name: v.itemCode,
+ value: v.qty
}
})
+ lineIndex.value++
+}
+// 获取供应商数据
+const getSupplierData = async () => {
+ IndexApi.getSupplierData().then((res) => {
+ supplierData.value = res
+ getInvoiceCharts()
+ getPartTOPCharts()
+ })
}
-
-getInvoiceCharts()
-getPartTOPCharts()
+// 最新消息
+const notaicList = ref([]) // 列表的数据
+const queryParams = reactive({
+ pageNo: 1,
+ pageSize: 10,
+ userType: undefined,
+ userId: undefined,
+ templateCode: undefined,
+ templateType: undefined,
+ createTime: []
+})
+/** 查询列表 */
+const getList = async () => {
+ try {
+ const data = await NotifyMessageApi.getNotifyMessagePage(queryParams)
+ notaicList.value = data.list
+ } finally {
+ }
+}
+const formatter = (type,dict) => {
+ let str = getStrDictOptions(dict).filter((item) => type == item.value)[0]
+ .label
+ return str
+}
+onMounted(async () => {
+ await getSupplierData()
+ getList()
+})
diff --git a/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts b/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts
index 4ab68b185..251c5f111 100644
--- a/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts
+++ b/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts
@@ -7,14 +7,23 @@ import * as BomApi from "@/api/wms/bom";
* @returns {Array} 制品返修记录主表
*/
export const ProductrepairRecordMain = useCrudSchemas(reactive([
+ {
+ label: '单据号',
+ field: 'number',
+ sort: 'custom',
+ table: {
+ width: 150,
+ fixed: 'left'
+ },
+ isSearch: true
+ },
{
label: '申请单号',
field: 'requestNumber',
sort: 'custom',
table: {
width: 150
- },
- isSearch: true
+ }
},
{
label: '车间代码',
@@ -155,16 +164,7 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive([
width: 150
},
},
- {
- label: '单据号',
- field: 'number',
- sort: 'custom',
- table: {
- width: 150,
- fixed: 'left'
- },
- isSearch: true
- },
+
{
label: '业务类型',
field: 'businessType',
@@ -368,6 +368,14 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive([
width: 150
},
},
+ {
+ label: '成品库位代码',
+ field: 'fgFromLocationCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ }
+ },
{
label: '批次',
field: 'batch',
diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
index bf945fa2b..cd6ec9525 100644
--- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
+++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
@@ -211,6 +211,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
row['batch'] = val[0]['batch']
row['uom'] = val[0]['uom']
row['inventoryStatus'] = val[0]['inventoryStatus']
+ row['fgFromLocationCode'] = val[0]['locationCode']
} else if(formField == 'productionLineCode'){
row['productionLineCode'] = val[0]['code']
} else if(formField == 'workStationCode'){
@@ -242,6 +243,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
setV['batch'] = val[0]['batch']
setV['uom'] = val[0]['uom']
setV['inventoryStatus'] = val[0]['inventoryStatus']
+ setV['fgFromLocationCode'] = val[0]['locationCode']
// setV['fromLocationCode'] = val[0]['locationCode']
} else if(formField == 'productionLineCode'){
setV['productionLineCode'] = val[0]['code']
diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
index 571592466..f5b11b88b 100644
--- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
+++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
@@ -549,6 +549,17 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive
}
}
},
+ {
+ label: 'Bom来源库位代码',
+ field: 'fromLocationCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ tableForm: {
+ disabled: true
+ }
+ },
{
label: '工序代码',
field: 'processCode',
@@ -586,6 +597,17 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive
}
}
},
+ {
+ label: '物品代码',
+ field: 'itemCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ tableForm: {
+ disabled: true
+ }
+ },
{
label: '包装号',
field: 'packingNumber',
@@ -595,7 +617,7 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive
},
tableForm:{
isInpuFocusShow: true,
- searchListPlaceholder: '请选择包装号',
+ searchListPlaceholder: '请选择物料',
searchField: 'packingNumber',
searchTitle: '库存余额信息',
searchAllSchemas: Balance.allSchemas,
@@ -610,7 +632,7 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive
// labelMessage: '信息提示说明！！！',
componentProps: {
isSearchList: true,
- searchListPlaceholder: '请选择包装号',
+ searchListPlaceholder: '请选择物料',
searchField: 'packingNumber',
searchTitle: '库存余额信息',
searchAllSchemas: Balance.allSchemas,
@@ -624,8 +646,8 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive
}
},
{
- label: '器具号',
- field: 'containerNumber',
+ label: '成品库位代码',
+ field: 'fgFromLocationCode',
sort: 'custom',
table: {
width: 150
@@ -635,8 +657,8 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive
}
},
{
- label: '批次',
- field: 'batch',
+ label: '器具号',
+ field: 'containerNumber',
sort: 'custom',
table: {
width: 150
@@ -646,8 +668,8 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive
}
},
{
- label: '从库位代码',
- field: 'fromLocationCode',
+ label: '批次',
+ field: 'batch',
sort: 'custom',
table: {
width: 150
@@ -656,6 +678,7 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive
disabled: true
}
},
+
{
label: '库存状态',
field: 'inventoryStatus',
@@ -685,17 +708,7 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive
}
}
},
- {
- label: '物品代码',
- field: 'itemCode',
- sort: 'custom',
- table: {
- width: 150
- },
- tableForm: {
- disabled: true
- }
- },
+
{
label: '备注',
field: 'remark',
+ 
+ 
+ 
+ 
@@ -62,23 +63,80 @@