Browse Source

Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

hella_online_20240829
wangyufei 4 months ago
parent
commit
2d89b6aa33
  1. 3
      src/api/wms/remark/index.ts
  2. 2
      src/views/wms/issueManage/issue/issueRequestMain/index.vue
  3. 2
      src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue

3
src/api/wms/remark/index.ts

@ -1,6 +1,9 @@
import request from '@/config/axios' import request from '@/config/axios'
// 查询备注列表 // 查询备注列表
export const getRemarkPage = async (params) => { export const getRemarkPage = async (params) => {
if (params.tableName){
params.tableName = toSnakeCase(params.tableName)
}
return await request.get({ url: `/infra/remark/list`, params }) return await request.get({ url: `/infra/remark/list`, params })
} }

2
src/views/wms/issueManage/issue/issueRequestMain/index.vue

@ -403,7 +403,7 @@ const detailRef = ref()
const openDetail = (row: any, titleName: any, titleValue: any) => { const openDetail = (row: any, titleName: any, titleValue: any) => {
const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode)) if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
detailRef.value.openDetail(row, titleName, titleValue) detailRef.value.openDetail(row, titleName, titleValue,"requestIssueMain")
} }
/** 删除按钮操作 */ /** 删除按钮操作 */

2
src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue

@ -317,7 +317,7 @@ const detailRef = ref()
const openDetail = (row: any, titleName: any, titleValue: any) => { const openDetail = (row: any, titleName: any, titleValue: any) => {
const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode)) if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
detailRef.value.openDetail(row, titleName, titleValue) detailRef.value.openDetail(row, titleName, titleValue,"requestRepleinshMain")
} }
/** 删除按钮操作 */ /** 删除按钮操作 */

Loading…
Cancel
Save