Browse Source

生产退料申请、隔离退料申请、生产退料任务、生产退料记录、bug修复

hella_online_20240829
TengXF 4 months ago
parent
commit
2c3da301df
  1. 2
      src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue
  2. 2
      src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue
  3. 4
      src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
  4. 8
      src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue

2
src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue

@ -260,7 +260,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,"jobProductionreturnMain")
} }
/** 导出按钮操作 */ /** 导出按钮操作 */

2
src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue

@ -144,7 +144,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,"recordProductionreturnMain")
} }
/** 导出按钮操作 */ /** 导出按钮操作 */

4
src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue

@ -191,7 +191,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
if(tableData.value.find(item1=>item1['itemCode'] == val[0]['itemCode'])){ if(tableData.value.find(item1=>item1['itemCode'] == val[0]['itemCode'])){
message.warning(`物料${val[0]['itemCode']}已经存在`) message.warning(`物料${val[0]['itemCode']}已经存在`)
return return
} }
const isType = await isItemType(val[0]['itemCode'], labelType.value) const isType = await isItemType(val[0]['itemCode'], labelType.value)
if(!isType){ if(!isType){
@ -574,7 +574,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,"requestProductionreturnMain")
} }
/** 详情操作——子表表单 */ /** 详情操作——子表表单 */
const detailOpenForm = (type, row) => { const detailOpenForm = (type, row) => {

8
src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue

@ -181,12 +181,12 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
message.warning(`物料${val[0]['itemCode']}已经存在`) message.warning(`物料${val[0]['itemCode']}已经存在`)
return return
} }
const isType = await isItemType(val[0]['itemCode'], labelType.value) const isType = await isItemType(val[0]['itemCode'], labelType.value)
if(!isType){ if(!isType){
message.warning('当前物料可制造与其他数据不一致,请重新选择!') message.warning('当前物料可制造与其他数据不一致,请重新选择!')
} else { } else {
row['batch'] = val[0]['batch']==''?formatTime(new Date(), 'yyyyMMdd'):val[0]['batch'] row['batch'] = val[0]['batch']==''?formatTime(new Date(), 'yyyyMMdd'):val[0]['batch']
row['itemCode'] = val[0]['itemCode'] row['itemCode'] = val[0]['itemCode']
row['uom'] = val[0]['uom'] row['uom'] = val[0]['uom']
@ -524,7 +524,7 @@ const openForm =async (type: string, row?: number) => {
/** 详情操作 */ /** 详情操作 */
const detailRef = ref() const detailRef = ref()
const openDetail = (row: any, titleName: any, titleValue: any) => { const openDetail = (row: any, titleName: any, titleValue: any) => {
detailRef.value.openDetail(row, titleName, titleValue) detailRef.value.openDetail(row, titleName, titleValue,"requestProductionreturnMainNo")
} }
/** 删除按钮操作 */ /** 删除按钮操作 */
@ -716,7 +716,7 @@ const labelPrint = async (row) => {
// --退 // --退
const searchTableSuccess1 = async (formField, searchField, val, formRef, type, row) => { const searchTableSuccess1 = async (formField, searchField, val, formRef, type, row) => {
console.log('批量打印',val) console.log('批量打印',val)
// let rows:any = [] // let rows:any = []
// val.forEach(item=>{ // val.forEach(item=>{

Loading…
Cancel
Save