diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts index 1525201c3..56ad57950 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts @@ -121,6 +121,7 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive([ // width: 150 // }, // }, + { label: '从库区类型范围', field: 'fromAreaTypes', @@ -144,6 +145,24 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive([ width: 150 }, }, + { + label: '领用代码', + field: 'usageCode', + sort: 'custom', + table: { + width: 150 + }, + isForm: false, + isTable:false, + }, + { + label: '领用描述', + field: 'usageDescription', + sort: 'custom', + table: { + width: 150 + }, + }, { label: '优先级', field: 'priority', @@ -695,6 +714,22 @@ export const UnplannedreceiptJobDetail = useCrudSchemas(reactive([ width: 150 }, }, + { + label: '成本中心代码', + field: 'costcentreCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '科目代码', + field: 'qadProjectCode', + sort: 'custom', + table: { + width: 150 + }, + }, { label: '原因', field: 'reason', diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue index 4de91f7c6..20a7dce2a 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue @@ -90,9 +90,9 @@ :isShowButton="false" @handleAddTable="handleAddTable" @handleDeleteTable="handleDeleteTable" - @searchTableSuccess="searchTableSuccess" + @searchTableSuccess="searchTableLabelSuccess" + :isShowReduceButton="false" @submitForm="submitFormLabel" - /> @@ -231,6 +231,23 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => { }) } + +// 查询标签表格页面返回 +const searchTableLabelSuccess = (formField, searchField, val, formRef, type, row ) => { + nextTick(async () => { + if (type == 'tableForm') { + if(formField === 'packUnit'){ + row['packUnit'] = val[0]['packUnit'] + row['packQty'] = val[0]['packQty'] + } + } else { + const setV = {} + setV[formField] = val[0][searchField] + formRef.setValues(setV) + } + }) +} + // 子表新增的时候选择表格之后需要会显得字段 // const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom'] const Echo = [] diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts index db47c288f..0df221d91 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts @@ -12,14 +12,8 @@ import {Warehouse} from "@/views/wms/basicDataManage/factoryModeling/warehouse/w import * as WarehouseApi from "@/api/wms/warehouse"; import {Location} from "@/views/wms/basicDataManage/factoryModeling/location/location.data"; import * as LocationApi from "@/api/wms/location"; -import { - Productionlineitem -} from "@/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data"; -import * as ProductionlineitemApi from "@/api/wms/productionlineitem"; -import { - Supplieritem -} from "@/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data"; -import * as SupplieritemApi from "@/api/wms/supplieritem"; +import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data' +import * as ItemPackageApi from '@/api/wms/itempackage/index' const { t } = useI18n() // 国际化 @@ -1024,64 +1018,50 @@ export const UnplannedreceiptRequestDetailRules = reactive({ */ export const UnplannedreceiptRequestDetailLabel = useCrudSchemas(reactive([ { - label: '生产线代码', - field: 'productionLineCodePackage', + label: '物料代码', + field: 'itemCode', sort: 'custom', table: { width: 150 }, - tableForm:{ - isInpuFocusShow: true, - searchListPlaceholder: '请选择生产线代码', // 输入框占位文本 - searchField: 'productionLineCode', // 查询弹窗赋值字段 - searchTitle: '生产线物料关系信息', // 查询弹窗标题 - searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类 - searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法 - searchCondition:[{ - key: 'itemCode', - value: 'itemCode', - message: '请填写物料代码！', - isMainValue: true - }] + tableForm: { + disabled: true + }, + form: { + componentProps: { + disabled: true + } } }, { - label: '供应商代码', - field: 'supplierItemCode', + label: '物料名称', + field: 'itemName', sort: 'custom', table: { width: 150 }, - tableForm:{ - isInpuFocusShow: true, - searchListPlaceholder: '请选择供应商代码', // 输入框占位文本 - searchField: 'supplierCode', // 查询弹窗赋值字段 - searchTitle: '供应商信息', // 查询弹窗标题 - searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类 - searchPage: SupplieritemApi.getSupplieritemPage, // 查询弹窗所需分页方法 - searchCondition:[{ - key: 'itemCode', - value: 'itemCode', - message: '请填写物料代码！', - isMainValue: true - }] - } + isTableForm: false, + isForm: false, }, { - label: '物料代码', - field: 'itemCode', + label: '物料描述1', + field: 'itemDesc1', sort: 'custom', table: { width: 150 }, - tableForm: { - disabled: true + isTableForm: false, + isForm: false, + }, + { + label: '物料描述2', + field: 'itemDesc2', + sort: 'custom', + table: { + width: 150 }, - form: { - componentProps: { - disabled: true - } - } + isTableForm: false, + isForm: false, }, { label: '批次', @@ -1239,24 +1219,8 @@ export const UnplannedreceiptRequestDetailLabel = useCrudSchemas(reactive