From 11b78427aa8e79b9ca5789389286eae57d1e5b6e 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, 29 Nov 2023 10:38:22 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=AE=A1=E7=90=86=E5=BC=B9?= =?UTF-8?q?=E5=B1=82=E6=9D=A1=E4=BB=B6=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productdismantleRequestMain.data.ts | 16 ++++++ .../productputawayRequestMain.data.ts | 56 +++++++++---------- .../productreceiptRequestMain.data.ts | 44 +++++++++++---- .../productrepairRequestMain.data.ts | 16 ++++++ 4 files changed, 94 insertions(+), 38 deletions(-) diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts index 5fd8e2eb8..b74be8432 100644 --- a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts +++ b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts @@ -463,6 +463,10 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive([ + { + label: '物品代码', + field: 'itemCode', + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + isInpuFocusShow: true, + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择物品代码', // 输入框占位文本 + searchField: 'itemCode', // 查询弹窗赋值字段 + searchTitle: '库存余额信息', // 查询弹窗标题 + searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类 + searchPage: BalanceApi.getBalancePage // 查询弹窗所需分页方法 + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择物品代码', // 输入框占位文本 + searchField: 'itemCode', // 查询弹窗赋值字段 + searchTitle: '库存余额信息', // 查询弹窗标题 + searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类 + searchPage: BalanceApi.getBalancePage // 查询弹窗所需分页方法 + } + } + }, { label: '包装号', field: 'packingNumber', @@ -487,34 +515,6 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive } } }, - { - label: '物品代码', - field: 'itemCode', - sort: 'custom', - table: { - width: 150 - }, - tableForm:{ - isInpuFocusShow: true, - isSearchList: true, // 开启查询弹窗 - searchListPlaceholder: '请选择物品代码', // 输入框占位文本 - searchField: 'itemCode', // 查询弹窗赋值字段 - searchTitle: '库存余额信息', // 查询弹窗标题 - searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类 - searchPage: BalanceApi.getBalancePage // 查询弹窗所需分页方法 - }, - form: { - // labelMessage: '信息提示说明！！！', - componentProps: { - isSearchList: true, // 开启查询弹窗 - searchListPlaceholder: '请选择物品代码', // 输入框占位文本 - searchField: 'itemCode', // 查询弹窗赋值字段 - searchTitle: '库存余额信息', // 查询弹窗标题 - searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类 - searchPage: BalanceApi.getBalancePage // 查询弹窗所需分页方法 - } - } - }, { label: '备注', field: 'remark', diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts index d0509b717..82f99da55 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts @@ -17,8 +17,8 @@ import { Workstation } from '@/views/wms/basicDataManage/factoryModeling/worksta import * as ProcessApi from '@/api/wms/process' import { Process } from '@/views/wms/basicDataManage/factoryModeling/process/process.data' -import * as ItembasicApi from '@/api/wms/itembasic' -import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data' +import * as ProductionlineitemApi from '@/api/wms/productionlineitem' +import { Productionlineitem } from '@/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data' import * as ProductionlineApi from '@/api/wms/productionline' import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data' @@ -473,6 +473,10 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive key: 'available', value: 'TRUE', isMainValue: false + },{ + key: 'workshopCode', + value: 'workshopCode', + isMainValue: true }] }, form: { @@ -488,6 +492,10 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive key: 'available', value: 'TRUE', isMainValue: false + },{ + key: 'workshopCode', + value: 'workshopCode', + isMainValue: true }] } } @@ -510,6 +518,10 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive key: 'available', value: 'TRUE', isMainValue: false + },{ + key: 'productionLineCode', + value: 'productionLineCode', + isMainValue: true }] }, form: { @@ -525,6 +537,10 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive key: 'available', value: 'TRUE', isMainValue: false + },{ + key: 'productionLineCode', + value: 'productionLineCode', + isMainValue: true }] } } @@ -737,14 +753,18 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive tableForm:{ isInpuFocusShow: true, searchListPlaceholder: '请选择物品代码', - searchField: 'code', - searchTitle: '物品基础信息信息', - searchAllSchemas: Itembasic.allSchemas, - searchPage: ItembasicApi.getItembasicPage, + searchField: 'itemCode', + searchTitle: '生产线物品关系信息', + searchAllSchemas: Productionlineitem.allSchemas, + searchPage: ProductionlineitemApi.getProductionlineitemPage, searchCondition: [{ key: 'available', value: 'TRUE', isMainValue: false + },{ + key: 'productionLineCode', + value: 'productionLineCode', + isMainValue: true }] }, form: { @@ -752,14 +772,18 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive componentProps: { isSearchList: true, searchListPlaceholder: '请选择物品代码', - searchField: 'code', - searchTitle: '物品基础信息信息', - searchAllSchemas: Itembasic.allSchemas, - searchPage: ItembasicApi.getItembasicPage, + searchField: 'itemCode', + searchTitle: '生产线物品关系信息', + searchAllSchemas: Productionlineitem.allSchemas, + searchPage: ProductionlineitemApi.getProductionlineitemPage, searchCondition: [{ key: 'available', value: 'TRUE', isMainValue: false + },{ + key: 'productionLineCode', + value: 'productionLineCode', + isMainValue: true }] } } diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts index b17e744c9..f892031d5 100644 --- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts +++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts @@ -473,6 +473,10 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive key: 'available', value: 'TRUE', isMainValue: false + },{ + key: 'workshopCode', + value: 'workshopCode', + isMainValue: true }] }, form: { @@ -488,6 +492,10 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive key: 'available', value: 'TRUE', isMainValue: false + },{ + key: 'workshopCode', + value: 'workshopCode', + isMainValue: true }] } } @@ -510,6 +518,10 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive key: 'available', value: 'TRUE', isMainValue: false + },{ + key: 'productionLineCode', + value: 'productionLineCode', + isMainValue: true }] }, form: { @@ -525,6 +537,10 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive key: 'available', value: 'TRUE', isMainValue: false + },{ + key: 'productionLineCode', + value: 'productionLineCode', + isMainValue: true }] } }