From d869654779aff83ecae7499147eda646c7856d7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E8=83=9C=E6=A5=A0?= <2792649152@qq.com> Date: Fri, 10 Nov 2023 11:20:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=B6=E5=93=81=E8=BF=94=E4=BF=AE=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productrepairRequestMain/index.vue | 19 ++++- .../productrepairRequestMain.data.ts | 71 +++++++++++-------- 2 files changed, 60 insertions(+), 30 deletions(-) diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue index 09226e211..f4d3d0ce3 100644 --- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue +++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue @@ -103,7 +103,17 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => nextTick(() => { if (type == 'tableForm') { // 明细查询页赋值 - row[formField] = val[0][searchField] + if(formField == 'packingNumber'){ + row['containerNumber'] = val[0]['containerNumber'] + row['itemCode'] = val[0]['itemCode'] + row['packingNumber'] = val[0]['packingNumber'] + row['batch'] = val[0]['batch'] + row['uom'] = val[0]['uom'] + row['inventoryStatus'] = val[0]['inventoryStatus'] + row['fromLocationCode'] = val[0]['locationCode'] + } else { + row[formField] = val[0][searchField] + } } else { const setV = {} setV[formField] = val[0][searchField] @@ -116,6 +126,13 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => { nextTick(() => { const setV = {} setV[formField] = val[0][searchField] + setV['containerNumber'] = val[0]['containerNumber'] + setV['itemCode'] = val[0]['itemCode'] + setV['packingNumber'] = val[0]['packingNumber'] + setV['batch'] = val[0]['batch'] + setV['uom'] = val[0]['uom'] + setV['inventoryStatus'] = val[0]['inventoryStatus'] + setV['fromLocationCode'] = val[0]['locationCode'] formRef.setValues(setV) }) } diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts index 17b24c777..7c4f6fad7 100644 --- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts +++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts @@ -20,8 +20,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 BalanceApi from '@/api/wms/balance' +import { Balance } from '@/views/wms/inventoryManage/balance/balance.data' const { t } = useI18n() // 国际化 @@ -180,6 +180,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: { width:'100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -210,6 +211,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: { width:'100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -231,6 +233,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: { width:'100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -283,6 +286,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: { width:'100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -524,8 +528,25 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive table: { width: 150 }, - isTableForm: false, - isForm: false, + tableForm:{ + isInpuFocusShow: true, + searchListPlaceholder: '请选择包装号', + searchField: 'packingNumber', + searchTitle: '库存余额信息', + searchAllSchemas: Balance.allSchemas, + searchPage: BalanceApi.getBalancePage + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: true, + searchListPlaceholder: '请选择包装号', + searchField: 'packingNumber', + searchTitle: '库存余额信息', + searchAllSchemas: Balance.allSchemas, + searchPage: BalanceApi.getBalancePage + } + } }, { label: '器具号', @@ -534,8 +555,9 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive table: { width: 150 }, - isTableForm: false, - isForm: false, + tableForm: { + disabled: true + } }, { label: '批次', @@ -544,6 +566,9 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive table: { width: 150 }, + tableForm: { + disabled: true + } }, { label: '从库位代码', @@ -552,8 +577,9 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive table: { width: 150 }, - isTableForm: false, - isForm: false, + tableForm: { + disabled: true + } }, { label: '库存状态', @@ -565,8 +591,10 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive table: { width: 150 }, - isTableForm: false, - isForm: false, + tableForm: { + disabled: true, + type: 'Select' + } }, { label: '单据号', @@ -589,25 +617,8 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive table: { width: 150 }, - tableForm:{ - isInpuFocusShow: true, - isSearchList: 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 // 查询弹窗所需分页方法 - } + tableForm: { + disabled: true } }, { @@ -632,6 +643,7 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive form: { component: 'DatePicker', componentProps: { + style: { width:'100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -738,6 +750,7 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive form: { component: 'DatePicker', componentProps: { + style: { width:'100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x',