diff --git a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts index 8b51c9881..7db799ca6 100644 --- a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts +++ b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts @@ -465,6 +465,15 @@ export const Itembasic = useCrudSchemas(reactive([ isForm: false, isTable: false }, + { + label: '产品类', + field: 'prodCla', + sort: 'custom', + isForm:false, + table: { + width: 100 + } , + }, { label: '备注', field: 'remark', sort: 'custom', isTable: false}, { label: '操作', diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts index 2e481c612..b9c9fbe01 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts @@ -6,7 +6,7 @@ import * as getRequestsettingApi from '@/api/wms/requestsetting/index' import * as DeliverPlanMainApi from '@/api/wms/deliverPlanMain' import * as DeliverPlanDetailApi from '@/api/wms/deliverPlanDetail' -import { DeliverPlanMain ,DeliverPlanDetail} from '../../deliverplan/deliverPlanMain/deliverPlanMain.data' +import { DeliverPlanMain ,DeliverPlanDetail,DeliverPlanDetailRequest} from '../../deliverplan/deliverPlanMain/deliverPlanMain.data' import * as CustomerItemApi from '@/api/wms/customeritem' import { Customeritem } from '@/views/wms/basicDataManage/customerManage/customeritem/customeritem.data' @@ -190,7 +190,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ searchListPlaceholder: '请选择发货计划单号', // 输入框占位文本 searchField: 'number', // 查询弹窗赋值字段 searchTitle: '发货计划信息', // 查询弹窗标题 - searchAllSchemas: DeliverPlanDetail.allSchemas, // 查询弹窗所需类 + searchAllSchemas: DeliverPlanDetailRequest.allSchemas, // 查询弹窗所需类 searchPage: DeliverPlanDetailApi.getDeliverPlanDetailPage, // 查询弹窗所需分页方法 searchCondition: [{ key: 'available', diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts index 753350d31..fac92203b 100644 --- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts @@ -873,3 +873,89 @@ export const DeliverPlanDetailRules = reactive({ { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], }) + +/** + * @returns {Array} 发货计划子表 + */ +export const DeliverPlanDetailRequest = useCrudSchemas(reactive([ + { + label: '单据号', + field: 'number', + sort: 'custom', + table: { + width: 180 + }, + form: { + componentProps: { + disabled: true + } + } + }, + { + label: '物料代码', + field: 'itemCode', + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + multiple:true, + isInpuFocusShow: true, // 开启查询弹窗 + searchListPlaceholder: '请选择物料代码', + searchField: 'itemCode', + searchTitle: '客户物料基础信息', + searchAllSchemas: Customeritem.allSchemas, + searchPage: CustomerItemApi.getPageBusinessTypeToItemCode, + }, + form: { + componentProps: { + isSearchList: true, + searchListPlaceholder: '请选择物料代码', + searchField: 'itemCode', + searchTitle: '客户物料基础信息', + searchAllSchemas: Customeritem.allSchemas, + searchPage: CustomerItemApi.getPageBusinessTypeToItemCode, + } + } + }, + { + label: '计划数量', + field: 'planQty', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber', + componentProps: { + min: 0, + precision: 6 + } + }, + tableForm: { + type: 'InputNumber', + min: 0, + precision: 6 + } + }, + { + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + tableForm: { + disabled: true, + type: 'Select' + }, + form: { + componentProps: { + disabled: true + } + } + }, +])) \ No newline at end of file diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue index 345042c99..ce5ab9968 100644 --- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue +++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue @@ -299,7 +299,7 @@ const searchFormClick = (searchData) => { const cmd = { 'column':'type', 'action':'==', - 'value':'predict' + 'value':'scrap' } searchData.filters.push(cmd) tableObject.params = { diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue index 84962d800..e5f369ecc 100644 --- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue +++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue @@ -208,6 +208,12 @@ const handleExport = async () => { // 筛选提交 const searchFormClick = (searchData) => { + const cmd = { + 'column':'type', + 'action':'==', + 'value':'scrap' + } + searchData.filters.push(cmd) tableObject.params = { isSearch: true, filters: searchData.filters