Browse Source

制品报废更新与增加BOM更新

master
zhaoxuebing 11 months ago
parent
commit
0715d3c596
  1. 5
      src/api/wms/productscrapRequestMain/index.ts
  2. 54
      src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
  3. 14
      src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts

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

@ -91,3 +91,8 @@ export const agreeProductscrapRequestMain = async (id) => {
export const handleProductscrapRequestMain = async (id) => { export const handleProductscrapRequestMain = async (id) => {
return await request.put({ url: `/wms/productscrap-request-main/handle?id=` + id }) return await request.put({ url: `/wms/productscrap-request-main/handle?id=` + id })
} }
// 修改制品报废BOM数据
export const updateProductscrapDetailRequestBom = async (id, data) => {
return await request.post({ url: `/wms/productscrap-request-main/updateBom?id=`+id, data })
}

54
src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue

@ -108,6 +108,8 @@ import * as ProductscrapRequestDetailApi from '@/api/wms/productscrapRequestDeta
import * as defaultButtons from '@/utils/disposition/defaultButtons' import * as defaultButtons from '@/utils/disposition/defaultButtons'
import * as BomDismantleApi from "@/api/wms/bomDismantle"; import * as BomDismantleApi from "@/api/wms/bomDismantle";
import {getProductscrapBomDismantlePage} from "@/api/wms/bomDismantle"; import {getProductscrapBomDismantlePage} from "@/api/wms/bomDismantle";
import * as dismantleRequestDetailbApi from "@/api/wms/dismantleRequestDetailb";
import {updateProductscrapDetailRequestBom} from "@/api/wms/productscrapRequestMain";
// //
defineOptions({ name: 'ProductscrapRequestMain' }) defineOptions({ name: 'ProductscrapRequestMain' })
@ -136,6 +138,8 @@ const buttondataTable = ref([{
const DialogTitle = ref('Bom信息') const DialogTitle = ref('Bom信息')
const bomModelVisible = ref(false) const bomModelVisible = ref(false)
const tableListBom = ref() const tableListBom = ref()
const lsBomSave = ref()
const rowId = ref()
const { tableObject: detatableDataBom, tableMethods: detatableMethodsBom } =useTable({ const { tableObject: detatableDataBom, tableMethods: detatableMethodsBom } =useTable({
getListApi: BomDismantleApi.getProductscrapBomDismantlePage getListApi: BomDismantleApi.getProductscrapBomDismantlePage
}) })
@ -151,12 +155,19 @@ const buttonBaseClickBom = (val) => {
if (val == 'save') { if (val == 'save') {
// //
tableListBom.value = detatableDataBom.tableList.filter(item => (item.qty!=0)) tableListBom.value = detatableDataBom.tableList.filter(item => (item.qty!=0))
tableData.value.forEach((item, index) => { if (lsBomSave.value) {
if(tableListBom.value[0].rowId == index) { tableData.value.forEach((item, index) => {
item.childList = tableListBom.value if(tableListBom.value[0].rowId == index) {
} item.childList = tableListBom.value
}) }
console.log(157, tableData.value) })
}else {
//
// bom
ProductscrapRequestMainApi.updateProductscrapDetailRequestBom(rowId.value, tableListBom.value)
message.success(t('common.updateSuccess'))
}
// console.log(157, tableData.value)
bomModelVisible.value = false bomModelVisible.value = false
} }
// //
@ -196,6 +207,7 @@ const tableFormButton = async (val , row) => {
bomVersion: row.bomVersion, bomVersion: row.bomVersion,
masterId: row.id masterId: row.id
} }
rowId.value = row.id
await getDetailListBom() await getDetailListBom()
} }
} }
@ -217,18 +229,9 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
}else if(formField == 'processCode'){ }else if(formField == 'processCode'){
row['processCode'] = val[0]['code'] row['processCode'] = val[0]['code']
}else if(formField == 'itemCode'){ }else if(formField == 'itemCode'){
console.log("aaaaaaaa",val);
row['itemCode'] = val[0]['itemCode'] row['itemCode'] = val[0]['itemCode']
row['fromLocationCode'] = val[0]['rawLocationCode'] row['fromLocationCode'] = val[0]['rawLocationCode']
} }
// row[formField] = val[0][searchField]
// row['containerNumber'] = val[0]['containerNumber']
// row['itemCode'] = val[0]['itemCode']
// row['packingNumber'] = val[0]['packingNumber']
// row['batch'] = val[0]['batch']
// row['uom'] = val[0]['uom']
// row['inventoryStatus'] = val[0]['inventoryStatus']
// row['fromLocationCode'] = val[0]['locationCode']
} else { } else {
const setV = {} const setV = {}
setV[formField] = val[0][searchField] setV[formField] = val[0][searchField]
@ -240,13 +243,18 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
const searchTableSuccessDetail = (formField, searchField, val, formRef ) => { const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
nextTick(() => { nextTick(() => {
const setV = {} const setV = {}
setV[formField] = val[0][searchField] console.log("formField=="+formField+",val=="+val)
setV['itemCode'] = val[0]['itemCode'] //
setV['packingNumber'] = val[0]['packingNumber'] if(formField == 'productionLineCode'){
setV['batch'] = val[0]['batch'] setV['productionLineCode'] = val[0]['code']
setV['uom'] = val[0]['uom'] }else if(formField == 'workStationCode'){
setV['inventoryStatus'] = val[0]['inventoryStatus'] setV['workStationCode'] = val[0]['code']
setV['fromLocationCode'] = val[0]['locationCode'] }else if(formField == 'processCode'){
setV['processCode'] = val[0]['code']
}else if(formField == 'itemCode'){
setV['itemCode'] = val[0]['itemCode']
setV['fromLocationCode'] = val[0]['rawLocationCode']
}
formRef.setValues(setV) formRef.setValues(setV)
}) })
} }
@ -410,12 +418,14 @@ const handleHandle = async (id: number) => {
const formRef = ref() const formRef = ref()
const openForm =async (type: string, row?: number) => { const openForm =async (type: string, row?: number) => {
tableData.value = [] // tableData.value = [] //
lsBomSave.value = true
formRef.value.open(type, row) formRef.value.open(type, row)
} }
/** 详情操作 */ /** 详情操作 */
const detailRef = ref() const detailRef = ref()
const openDetail = (row: any, titleName: any, titleValue: any) => { const openDetail = (row: any, titleName: any, titleValue: any) => {
lsBomSave.value = false
detailRef.value.openDetail(row, titleName, titleValue) detailRef.value.openDetail(row, titleName, titleValue)
} }

14
src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts

@ -646,6 +646,7 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
}, },
isTable: false, isTable: false,
isTableForm: false, isTableForm: false,
isForm: false,
tableForm:{ tableForm:{
isInpuFocusShow: false, isInpuFocusShow: false,
searchListPlaceholder: '请选择包装号', searchListPlaceholder: '请选择包装号',
@ -676,6 +677,7 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
}, },
isTable: false, isTable: false,
isTableForm: false, isTableForm: false,
isForm: false,
tableForm: { tableForm: {
disabled: true disabled: true
} }
@ -690,6 +692,7 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
}, },
isTable: false, isTable: false,
isTableForm: false, isTableForm: false,
isForm: false,
tableForm: { tableForm: {
disabled: true disabled: true
} }
@ -703,6 +706,11 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
}, },
tableForm: { tableForm: {
disabled: true disabled: true
},
form: {
componentProps:{
disabled: true
}
} }
}, },
{ {
@ -717,6 +725,7 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
width: 150, width: 150,
show: false show: false
}, },
isForm: false,
tableForm: { tableForm: {
disabled: true disabled: true
} }
@ -807,6 +816,11 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
tableForm: { tableForm: {
type: 'Select', type: 'Select',
disabled: true disabled: true
},
form: {
componentProps: {
disabled: true
}
} }
}, },
{ {

Loading…
Cancel
Save