diff --git a/src/api/wms/demandforecastingDetail/index.ts b/src/api/wms/demandforecastingDetail/index.ts index 059cc4ce2..e3303bbd1 100644 --- a/src/api/wms/demandforecastingDetail/index.ts +++ b/src/api/wms/demandforecastingDetail/index.ts @@ -115,6 +115,6 @@ export const getPageTableHead = async (params) => { // 查询版本号 -export const queryVersion = async (data) => { - return await request.post({ url: `/wms/demandforecasting-detail/queryVersion`, data }) +export const queryVersion = async (params) => { + return await request.get({ url: `/wms/demandforecasting-detail/queryVersion`, params }) } \ No newline at end of file diff --git a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/productionreturnJobMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/productionreturnJobMain.data.ts index 805da1f6f..4af5ac021 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/productionreturnJobMain.data.ts +++ b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/productionreturnJobMain.data.ts @@ -672,14 +672,14 @@ export const ProductionreturnJobDetail = useCrudSchemas(reactive([ width: 150 }, }, - { - label: '包装规格', - field: 'packUnit', - sort: 'custom', - table: { - width: 120 - }, - }, + // { + // label: '包装规格', + // field: 'packUnit', + // sort: 'custom', + // table: { + // width: 120 + // }, + // }, { label: '数量', field: 'qty', diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts index 0a86385ae..b2826ee28 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts +++ b/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts @@ -15,18 +15,18 @@ export const ProductionreturnRecordMain = useCrudSchemas(reactive( }, isSearch: true }, - { - label: '状态', - field: 'status', - dictType: DICT_TYPE.REQUEST_STATUS, - dictClass: 'string', - isForm: false, - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - }, + // { + // label: '状态', + // field: 'status', + // dictType: DICT_TYPE.REQUEST_STATUS, + // dictClass: 'string', + // isForm: false, + // isTable: true, + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, { label: '车间代码', field: 'workshopCode', @@ -504,23 +504,23 @@ export const ProductionreturnRecordDetail = useCrudSchemas(reactive row['bomVersion'] = res.list[0].version } }) - } else { + } else if(formField == 'productionLineCode'){ val.forEach(item=>{ const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) newRow[formField] = item[searchField] tableData.value.push(newRow) }) + }else{ + row[formField] = val[0][searchField] + } } else { const setV = {} diff --git a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts index e388beb2f..268d5311d 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts @@ -38,7 +38,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ }, { label: '车间代码', - field: 'workshopCode', + field: 'workShopCode', sort: 'custom', table: { width: 150 diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts index b5ffc30ab..007f65edc 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts @@ -47,7 +47,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ }, { label: '生产线代码', - field: 'productionPlanNumber', + field: 'productionLineCode', sort: 'custom', table: { width: 150 @@ -626,6 +626,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain:true }, { label: '工位代码', diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts index f447fd858..3d838cd3d 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts @@ -728,7 +728,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( isDetail: false, isForm: false , table: { - width: 150, + width: 220, fixed: 'right' }, hiddenInMain: false, diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/productreceiptscrapJobMain.data.ts b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/productreceiptscrapJobMain.data.ts index 1c13b442b..08a551d97 100644 --- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/productreceiptscrapJobMain.data.ts +++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/productreceiptscrapJobMain.data.ts @@ -38,7 +38,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ }, { label: '车间代码', - field: 'workshopCode', + field: 'workShopCode', sort: 'custom', table: { width: 150 diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue index e9a80a163..c053bb4b0 100644 --- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue @@ -220,7 +220,7 @@ const searchTableSuccess = async (formField, searchField, val, formRef, type, ro row['bomVersion'] = res.list[0].version } }) - }else{ + }else if(formField == 'productionLineCode'){ //添加明细 val.forEach(item=>{ const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) @@ -228,6 +228,9 @@ const searchTableSuccess = async (formField, searchField, val, formRef, type, ro newRow[formField] = item[searchField] tableData.value.push(newRow) }) + }else{ + row[formField] = val[0][searchField] + } } else { const setV = {} diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts index 668c03dbc..95d6f73fa 100644 --- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts @@ -523,8 +523,9 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive width: 150 }, tableForm:{ + disabled:true, multiple: true, - isInpuFocusShow: true, + // isInpuFocusShow: true, searchListPlaceholder: '请选择生产线代码', searchField: 'code', searchTitle: '生产线信息', diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue index 83247227f..2e2eff60e 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue @@ -12,7 +12,7 @@