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

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 })
 }
 

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

@@ -80,7 +80,7 @@
   />
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/wms/issue-request-main/import" :importTemplateData="importTemplateData" 
+  <ImportForm ref="importFormRef" url="/wms/issue-request-main/import" :importTemplateData="importTemplateData"
   @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
 </template>
 
@@ -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")
 }
 
 /** 删除按钮操作 */

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

@@ -76,7 +76,7 @@
   />
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/wms/repleinsh-request-main/import" :importTemplateData="importTemplateData" 
+  <ImportForm ref="importFormRef" url="/wms/repleinsh-request-main/import" :importTemplateData="importTemplateData"
   @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
 </template>
 
@@ -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) => {