From 27ba504441037666e787ded85b4af2f65be65c17 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 29 4月 2025 18:06:07 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
HIAWms/web/src/widgets/HIAWms/Controllers/WmsMaterial.ts | 82 +++++++++++++++++++---------------------
1 files changed, 39 insertions(+), 43 deletions(-)
diff --git a/HIAWms/web/src/widgets/HIAWms/Controllers/WmsMaterial.ts b/HIAWms/web/src/widgets/HIAWms/Controllers/WmsMaterial.ts
index e56ccd0..3684341 100644
--- a/HIAWms/web/src/widgets/HIAWms/Controllers/WmsMaterial.ts
+++ b/HIAWms/web/src/widgets/HIAWms/Controllers/WmsMaterial.ts
@@ -10,7 +10,7 @@
index: number
}
export const useWmsMaterial = (props: any, ctx?: any) => {
- const wmsmaterial = injectModel<WmsMaterial>('wmsmaterial')
+ const wmsMaterial = injectModel<WmsMaterial>('wmsMaterial')
const { exportFile } = useFile()
/**
* 澶撮儴閰嶇疆
@@ -19,7 +19,7 @@
/**
* 鍔ㄦ�佸垪閰嶇疆
*/
- const wmsmaterialColumns = ref<Record<string, any>>([])
+ const wmsMaterialColumns = ref<Record<string, any>>([])
/**
* 鎼滅储鍊�
*/
@@ -85,40 +85,40 @@
divided: true,
icon: 'o',
},
- {
- label: '鍚戜笂娣诲姞',
- fn: (c: CurrentType, pageNum: number) => {
- current.value = null
- sort.value = c.index + 1 + (pageNum - 1) * 50
- dialogConfig.visible = true
- dialogConfig.title = '娣诲姞'
- dialogConfig.isAdd = false
- },
- divided: true,
- icon: 'up',
- },
- {
- label: '鍚戜笅娣诲姞',
- fn: (c: CurrentType, pageNum: number) => {
- current.value = null
- sort.value = c.index + 2 + (pageNum - 1) * 50
- dialogConfig.visible = true
- dialogConfig.title = '娣诲姞'
- dialogConfig.isAdd = false
- },
- divided: true,
- icon: 'down',
- },
- {
- label: '鍒涘缓鍓湰',
- fn: async ({ row }: CurrentType) => {
- await wmsmaterial.cloneData([row.id])
- ElMessage.success('鍒涘缓鍓湰鎴愬姛')
- tableRef.value?.getList()
- },
- divided: true,
- icon: 'copy',
- },
+ // {
+ // label: '鍚戜笂娣诲姞',
+ // fn: (c: CurrentType, pageNum: number) => {
+ // current.value = null
+ // sort.value = c.index + 1 + (pageNum - 1) * 50
+ // dialogConfig.visible = true
+ // dialogConfig.title = '娣诲姞'
+ // dialogConfig.isAdd = false
+ // },
+ // divided: true,
+ // icon: 'up',
+ // },
+ // {
+ // label: '鍚戜笅娣诲姞',
+ // fn: (c: CurrentType, pageNum: number) => {
+ // current.value = null
+ // sort.value = c.index + 2 + (pageNum - 1) * 50
+ // dialogConfig.visible = true
+ // dialogConfig.title = '娣诲姞'
+ // dialogConfig.isAdd = false
+ // },
+ // divided: true,
+ // icon: 'down',
+ // },
+ // {
+ // label: '鍒涘缓鍓湰',
+ // fn: async ({ row }: CurrentType) => {
+ // await wmsMaterial.cloneData([row.id])
+ // ElMessage.success('鍒涘缓鍓湰鎴愬姛')
+ // tableRef.value?.getList()
+ // },
+ // divided: true,
+ // icon: 'copy',
+ // },
{
label: '鍒犻櫎',
fn: async (c: CurrentType) => {
@@ -127,7 +127,7 @@
`鏄惁鍒犻櫎${names.length ? names.join(',') : c.row.name}`
).then(async () => {
const ids = selection.value.map((item: { id: string }) => item.id)
- await wmsmaterial.deleteWmsMaterials(ids.length ? ids : [c.row.id])
+ await wmsMaterial.deleteWmsMaterials(ids.length ? ids : [c.row.id])
ElMessage.success('鍒犻櫎鎴愬姛')
tableRef.value.getList()
})
@@ -172,11 +172,7 @@
*/
const onExport = () => {
const params = tableRef.value?.getParams()
- exportFile(
- '/api/v1/hiawms/wmsmaterial/export',
- params,
- 'hiawms'
- )
+ exportFile('/api/v1/hIAWms/wmsMaterial/export', params, 'hIAWms')
}
/**
@@ -245,7 +241,7 @@
current,
search,
sort,
- wmsmaterialColumns,
+ wmsMaterialColumns,
paginationParams,
headers,
onBeforeUpload,
--
Gitblit v1.9.3