From b0530fb999f5aa77aaf6be34d4206cdf1bad2604 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 09:34:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=B6=E5=93=81=E6=8A=A5=E5=BA=9F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productscrapRequestMain/index.vue | 13 ++++ .../productscrapRequestMain.data.ts | 69 +++++++++++-------- 2 files changed, 54 insertions(+), 28 deletions(-) diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue index 77b14ddcb..cacabb896 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue +++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue @@ -104,6 +104,13 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => if (type == 'tableForm') { // 明细查询页赋值 row[formField] = val[0][searchField] + 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 { const setV = {} setV[formField] = val[0][searchField] @@ -116,6 +123,12 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => { nextTick(() => { const setV = {} setV[formField] = val[0][searchField] + 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/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts index a7f8272da..005672495 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts +++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts @@ -2,8 +2,8 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import { dateFormatter } from '@/utils/formatTime' import * as getRequestsettingApi from '@/api/wms/requestsetting/index' -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() // 国际化 @@ -105,6 +105,7 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -135,6 +136,7 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -156,6 +158,7 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -208,6 +211,7 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -371,8 +375,25 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, - isForm: false, - isTableForm: 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: '器具号', @@ -381,8 +402,9 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, - isForm: false, - isTableForm: false, + tableForm: { + disabled: true + } }, { label: '批次', @@ -391,6 +413,9 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + tableForm: { + disabled: true + } }, { label: '从库位代码', @@ -399,8 +424,9 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, - isForm: false, - isTableForm: false, + tableForm: { + disabled: true + } }, { label: '库存状态', @@ -412,8 +438,9 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, - isForm: false, - isTableForm: false, + tableForm: { + disabled: true + } }, { label: '原因', @@ -516,6 +543,7 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -555,24 +583,8 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive([ 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 - } + tableForm: { + disabled: true } }, { @@ -597,6 +609,7 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x',