From 6255871682a95fa3d92de3067098d9a42fa03b6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E8=83=9C=E6=A5=A0?= <2792649152@qq.com> Date: Wed, 15 Nov 2023 15:41:51 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionMain/productionMain.data.ts | 107 +++++++++++++----- 1 file changed, 76 insertions(+), 31 deletions(-) diff --git a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts index 21bd14e86..3d25bae46 100644 --- a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts @@ -1,7 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import { dateFormatter } from '@/utils/formatTime' -import * as ItembasicApi from '@/api/wms/itembasic' -import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data' import * as WorkMainApi from '@/api/wms/workMain' import * as WorkDetailApi from '@/api/wms/workDetail' import { WorkDetail, WorkMain } from '../workMain/workMain.data' @@ -13,6 +11,10 @@ import * as ShiftApi from '@/api/wms/shift' import { Shift } from '@/views/wms/basicDataManage/orderManage/shift/shift.data' import * as TeamApi from '@/api/wms/team' import { Team } from '@/views/wms/basicDataManage/orderManage/team/team.data' +import * as ProductionlineitemApi from '@/api/wms/productionlineitem' +import { Productionlineitem } from '@/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data' +import * as BomApi from '@/api/wms/bom' +import { Bom } from '@/views/wms/basicDataManage/itemManage/bom/bom.data' const { t } = useI18n() // 国际化 /** @@ -269,7 +271,9 @@ export const ProductionMain = useCrudSchemas(reactive([ searchAllSchemas: WorkMain.allSchemas, searchPage: WorkMainApi.getWorkMainPage } - } + }, + isTable: false, + isForm: false, }, { label: '订单行', @@ -288,7 +292,9 @@ export const ProductionMain = useCrudSchemas(reactive([ searchAllSchemas: WorkDetail.allSchemas, searchPage: WorkDetailApi.getWorkDetailPage } - } + }, + isTable: false, + isForm: false, }, { label: '最后更新者', @@ -388,6 +394,43 @@ export const ProductionMainRules = reactive({ * @returns {Array} 生产计划子表 */ export const ProductionDetail = useCrudSchemas(reactive([ + { + label: '物品代码', + field: 'itemCode', + sort: 'custom', + table: { + width: 150 + }, + form: { + // labelMessage: '信息提示说明!!!', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择物品代码', // 输入框占位文本 + searchField: 'itemCode', // 查询弹窗赋值字段 + searchTitle: '生产线物品关系信息', // 查询弹窗标题 + searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类 + searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key:'productionLineCode', + value:'prodLine', + isMainValue: true + }] + } + }, + tableForm:{ + isInpuFocusShow: true, + searchListPlaceholder: '请选择物品代码', // 输入框占位文本 + searchField: 'itemCode', // 查询弹窗赋值字段 + searchTitle: '生产线物品关系信息', // 查询弹窗标题 + searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类 + searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key:'productionLineCode', + value:'productionLine', + isMainValue: true + }] + }, + }, { label: 'Bom版本', field: 'bomVersion', @@ -395,6 +438,35 @@ export const ProductionDetail = useCrudSchemas(reactive([ table: { width: 150 }, + form: { + // labelMessage: '信息提示说明!!!', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择Bom版本', // 输入框占位文本 + searchField: 'version', // 查询弹窗赋值字段 + searchTitle: '生产线物品关系信息', // 查询弹窗标题 + searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类 + searchPage: BomApi.getBomPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key:'productItemCode', + value:'itemCode', + isMainValue: true + }] + } + }, + tableForm:{ + isInpuFocusShow: true, + searchListPlaceholder: '请选择Bom版本', // 输入框占位文本 + searchField: 'version', // 查询弹窗赋值字段 + searchTitle: '生产线物品关系信息', // 查询弹窗标题 + searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类 + searchPage: BomApi.getBomPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key:'productItemCode', + value:'itemCode', + isMainValue: true + }] + }, }, { label: '合格数量', @@ -454,33 +526,6 @@ export const ProductionDetail = useCrudSchemas(reactive([ } } }, - { - label: '物品代码', - field: 'itemCode', - sort: 'custom', - table: { - width: 150 - }, - tableForm:{ - isInpuFocusShow: true, - searchListPlaceholder: '请选择物品代码', - searchField: 'code', - searchTitle: '物品基础信息', - searchAllSchemas: Itembasic.allSchemas, - searchPage: ItembasicApi.getItembasicPage - }, - form: { - // labelMessage: '信息提示说明!!!', - componentProps: { - isSearchList: true, - searchListPlaceholder: '请选择物品代码', - searchField: 'code', - searchTitle: '物品基础信息', - searchAllSchemas: Itembasic.allSchemas, - searchPage: ItembasicApi.getItembasicPage - } - } - }, { label: '备注', field: 'remark',