diff --git a/src/api/wms/remark/index.ts b/src/api/wms/remark/index.ts
index 3ee317540..b650d78aa 100644
--- a/src/api/wms/remark/index.ts
+++ b/src/api/wms/remark/index.ts
@@ -1,6 +1,9 @@
import request from '@/config/axios'
// 查询备注列表
export const getRemarkPage = async (params) => {
+ if (params.tableName){
+ params.tableName = toSnakeCase(params.tableName)
+ }
return await request.get({ url: `/infra/remark/list`, params })
}
diff --git a/src/views/wms/issueManage/issue/issueRequestMain/index.vue b/src/views/wms/issueManage/issue/issueRequestMain/index.vue
index f8406acad..db8125f6d 100644
--- a/src/views/wms/issueManage/issue/issueRequestMain/index.vue
+++ b/src/views/wms/issueManage/issue/issueRequestMain/index.vue
@@ -80,7 +80,7 @@
/>
-
@@ -364,7 +364,7 @@ const buttonTableClick = async (val, row) => {
tableObject.loading = false
console.log(err)
})
- } else if (val == 'edit') { // 编辑
+ } else if (val == 'edit') { // 编辑
openForm('update', row)
} else if (val == 'delete') { // 删除
handleDelete(row.masterId)
@@ -403,7 +403,7 @@ const detailRef = ref()
const openDetail = (row: any, titleName: any, titleValue: any) => {
const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
- detailRef.value.openDetail(row, titleName, titleValue)
+ detailRef.value.openDetail(row, titleName, titleValue,"requestIssueMain")
}
/** 删除按钮操作 */
diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue
index 47f275fad..b01025176 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue
+++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue
@@ -76,7 +76,7 @@
/>
-
@@ -116,7 +116,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
if(tableData.value.find(item1=>item1['itemCode'] == item['code'])){
message.warning(`物料${item['code']}已经存在`)
return
- }
+ }
const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
newRow['itemCode'] = item['code']
newRow['uom'] = item['uom']
@@ -317,7 +317,7 @@ const detailRef = ref()
const openDetail = (row: any, titleName: any, titleValue: any) => {
const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
- detailRef.value.openDetail(row, titleName, titleValue)
+ detailRef.value.openDetail(row, titleName, titleValue,"requestRepleinshMain")
}
/** 删除按钮操作 */
@@ -363,7 +363,7 @@ const tableData = ref([])
// 添加明细
const handleAddTable = () => {
tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
-
+
}
// 删除明细
const handleDeleteTable = (item, index) => {