Browse Source

Revert "HL-4935 WMS WEB端预生产和装配报工记录中增加撤销报工操作选项,实现快速制品回收"

This reverts commit 7a3c3a414c.
hella_online_20240821
李达明 3 months ago
parent
commit
3747a83ed4
  1. 5
      src/api/wms/productreceiptRecordMain/index.ts
  2. 2
      src/locales/en-US.ts
  3. 1
      src/locales/zh-CN.ts
  4. 12
      src/utils/disposition/defaultButtons.ts
  5. 16
      src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue
  6. 13
      src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue

5
src/api/wms/productreceiptRecordMain/index.ts

@ -126,8 +126,3 @@ export const createPutawayRequest = async (number:string) => {
export const createInspectRequest = async (number:string) => { export const createInspectRequest = async (number:string) => {
return await request.post({ url: `/wms/productreceipt-record-main/createInspectRequest?number=`+number }) return await request.post({ url: `/wms/productreceipt-record-main/createInspectRequest?number=`+number })
} }
//制品收货记录子执行回收操作
export const handleRecoveryProductreceiptRecord = async (data: ProductreceiptRecordMainVO) => {
return await request.put({ url: `/wms/productreceipt-record-main/handleRecovery`, data })
}

2
src/locales/en-US.ts

@ -1280,7 +1280,7 @@ export default {
:'Rule configuration', :'Rule configuration',
:'Please enter a contact number', :'Please enter a contact number',
:'Please enter a name', :'Please enter a name',
'确认撤销报工吗?':'Are you sure to cancel the job application?',
}, },

1
src/locales/zh-CN.ts

@ -1276,7 +1276,6 @@ export default {
:'规则配置', :'规则配置',
:'请输入联系电话', :'请输入联系电话',
:'请选择范围', :'请选择范围',
'确认撤销报工吗?':"确认撤销报工吗?",
}, },
} }

12
src/utils/disposition/defaultButtons.ts

@ -1054,18 +1054,6 @@ export function mainListPointBtn(option: any) {
hasPermi: '' hasPermi: ''
}) })
} }
// 主列表-回收
export function mainListRecoveryBtn(option: any) {
return __defaultBtnOption(option, {
label: t(`ts.撤销报工`).replace('ts.', ''),
name: 'recovery',
hide: false,
type: 'primary',
color: '',
link: true, // 文本展现按钮
hasPermi: ''
})
}
// 主列表-批量打印 // 主列表-批量打印
export function mainLisSelectiontPointBtn(option: any) { export function mainLisSelectiontPointBtn(option: any) {
return __defaultBtnOption(option, { return __defaultBtnOption(option, {

16
src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue

@ -198,7 +198,6 @@ const butttondata = (row,$index) => {
// defaultButtons.mainInspectRequestBtn({hasPermi:'wms:productreceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag == "FALSE" }),// // defaultButtons.mainInspectRequestBtn({hasPermi:'wms:productreceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag == "FALSE" }),//
defaultButtons.mainInspectRequestBtn({hide:row.inspectRequestFlag == "FALSE" }),// defaultButtons.mainInspectRequestBtn({hide:row.inspectRequestFlag == "FALSE" }),//
defaultButtons.mainListPointBtn(null), // defaultButtons.mainListPointBtn(null), //
defaultButtons.mainListRecoveryBtn(null), //
] ]
} }
@ -208,11 +207,8 @@ const buttonTableClick = async (val, row) => {
handleCreateInspectRequest(row.number) handleCreateInspectRequest(row.number)
} else if (val == 'point') { // } else if (val == 'point') { //
labelPrint(row) labelPrint(row)
} else if (val == 'recovery') { //
labelRecovery(row)
} }
} }
const BASE_URL = getJmreportBaseUrl() const BASE_URL = getJmreportBaseUrl()
// //
const searchTableRef = ref() const searchTableRef = ref()
@ -245,18 +241,6 @@ const labelPrint = async (row) => {
}) })
searchTableRef.value.openData("标签信息",tableObjectPrint,{tableColumns},true) searchTableRef.value.openData("标签信息",tableObjectPrint,{tableColumns},true)
} }
//
const labelRecovery = async (row) => {
try {
await message.confirm(t('ts.确认撤销报工吗?'))
tableObject.loading = true
let resType = await ProductreceiptRecordMainApi.handleRecoveryProductreceiptRecord(row)
message.success(t('ts.确认撤销报工成功'))
} catch {
} finally {
tableObject.loading = false
}
}
// -- // --
const searchTableSuccessLabel = async (formField, searchField, val, formRef, type, row) => { const searchTableSuccessLabel = async (formField, searchField, val, formRef, type, row) => {
console.log('批量打印',val) console.log('批量打印',val)

13
src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue

@ -236,7 +236,6 @@ const butttondata = (row,$index) => {
defaultButtons.mainInspectRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag == "FALSE" }),// defaultButtons.mainInspectRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag == "FALSE" }),//
defaultButtons.mainPutawayRequestCpBtn({hasPermi:'wms:purchasereceipt-record-main:createPutawayRequest',hide:row.putawayRequestFlag == "FALSE" }),// defaultButtons.mainPutawayRequestCpBtn({hasPermi:'wms:purchasereceipt-record-main:createPutawayRequest',hide:row.putawayRequestFlag == "FALSE" }),//
defaultButtons.mainListPointBtn(null), // defaultButtons.mainListPointBtn(null), //
defaultButtons.mainListRecoveryBtn(null), //
] ]
} }
@ -248,8 +247,6 @@ const buttonTableClick = async (val, row) => {
handleCreateInspectRequest(row.number) handleCreateInspectRequest(row.number)
}else if (val == 'putawayRequest') { // }else if (val == 'putawayRequest') { //
handleCreatePutawayRequest(row.number) handleCreatePutawayRequest(row.number)
} else if (val == 'recovery') { //
labelRecovery(row)
} }
} }
/** 生成到货检验申请按钮操作 */ /** 生成到货检验申请按钮操作 */
@ -277,16 +274,6 @@ const handleCreatePutawayRequest = async (number:string) => {
tableObject.loading = false tableObject.loading = false
} }
} }
const labelRecovery = async (row) => {
try {
await message.confirm(t('ts.确认撤销报工吗?'))
let resType = await ProductreceiptRecordMainApi.handleRecoveryProductreceiptRecord(row)
message.success(t('ts.确认撤销报工成功'))
} catch {
} finally {
tableObject.loading = false
}
}
const searchTableRef = ref() const searchTableRef = ref()
const labelType = ref('') // const labelType = ref('') //

Loading…
Cancel
Save