From 070daafa6fca4d39fd895e604c50b65d62c0d4ca Mon Sep 17 00:00:00 2001 From: ljlong_2630 Date: Thu, 28 Nov 2024 12:00:01 +0800 Subject: [PATCH] =?UTF-8?q?YT-303=EF=BC=9A=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/deliverRecordMain/index.ts | 12 + src/components/BasicForm/src/BasicForm.vue | 2 +- src/utils/dict.ts | 1 + .../deliverJobMain/deliverJobMain.data.ts | 41 +- .../deliverRecordMain.data.ts | 37 +- .../deliverRequestMain.data.ts | 88 ++++- .../deliver/deliverRequestMain/index.vue | 2 +- .../deliverRecordMain.data.ts | 70 ++-- .../deliverRecordMain.data.ts | 359 ++++++++++-------- .../deliverRecordMain/index.vue | 131 ++++++- .../deliverRecordMain.data.ts | 28 +- .../deliverRecordMain.data.ts | 70 ++-- 12 files changed, 579 insertions(+), 262 deletions(-) diff --git a/src/api/wms/deliverRecordMain/index.ts b/src/api/wms/deliverRecordMain/index.ts index 0a59935f4..45b38bdea 100644 --- a/src/api/wms/deliverRecordMain/index.ts +++ b/src/api/wms/deliverRecordMain/index.ts @@ -97,6 +97,18 @@ export const inducedProductBatchUpdate = (data) => { return request.post({ url: '/wms/leadership-incorporation-doc-request/induced-product-batch-update',data }) } +// 修改发货记录信息 +export const inducedProductUpdate = () => { + return request.download({ url: '/wms/deliver-record-main/inducedProductUpdate' }) +} + +// 创建发货记录信息 +export const inducedProductCreate = () => { + return request.download({ url: '/wms/deliver-record-main/inducedProductCreate' }) +} + + + diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue index 5b4eaff32..e0aeebd07 100644 --- a/src/components/BasicForm/src/BasicForm.vue +++ b/src/components/BasicForm/src/BasicForm.vue @@ -622,6 +622,7 @@ const opensearchTable = ( const _searchTableTitle = searchTitle const _searchTableAllSchemas = searchAllSchemas const _searchTablePage = searchPage + debugger searchTableRef.value.open( _searchTableTitle, _searchTableAllSchemas, @@ -982,7 +983,6 @@ const handleDeleteTable = (row, index) => { // 输入框聚焦 const inpuFocus = (headerItem, row, index) => { emit('inpuFocus', headerItem, row, index) - opensearchTable( headerItem.field, headerItem.tableForm.searchField, diff --git a/src/utils/dict.ts b/src/utils/dict.ts index a9fa2e771..460094590 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -417,6 +417,7 @@ export enum DICT_TYPE { LEADERSHIP_MATERIAL_TYPE = 'leadership_material_type', SUPPLIER_TOOL_APPORT_STATEMENT_MAIN = 'supplier_tool_apport_statement_main', // 供应商模具费用主 SUPPLIER_TOOL_APPORT_STATEMENT_DETAIL = 'supplier_tool_apport_statement_detail', // 供应商模具费用子 + PRODUCTION_LINE_ITEM = 'production_line_item', //顺引生产线项 } diff --git a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts index 32382cec2..3b9025845 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts @@ -907,7 +907,15 @@ export const DeliverJobDetail = useCrudSchemas(reactive([ }, isTable: false, }, - + { + label: '创建者', + field: 'creator', + sort: 'custom', + table: { + width: 150 + }, + isTable: true, + }, { label: '创建时间', field: 'createTime', @@ -925,7 +933,7 @@ export const DeliverJobDetail = useCrudSchemas(reactive([ componentProps: { type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', + valueFormat: 'x' } }, isSearch: true, @@ -939,15 +947,38 @@ export const DeliverJobDetail = useCrudSchemas(reactive([ }, }, { - label: '创建者', - field: 'creator', + label: '最后更新者', + field: 'updater', sort: 'custom', table: { width: 150 }, isTable: true, + isForm: false + }, + { + label: '最后更新时间', + field: 'updateTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + isTable: true, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + }, + isForm: false }, - ])) //表单校验 diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts index e109f7bdd..3e75b3635 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts @@ -807,6 +807,15 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ width: 150 }, }, + { + label: '创建者', + field: 'creator', + sort: 'custom', + table: { + width: 150 + }, + isTable: true, + }, { label: '创建时间', field: 'createTime', @@ -838,13 +847,37 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ }, }, { - label: '创建者', - field: 'creator', + label: '最后更新者', + field: 'updater', sort: 'custom', table: { width: 150 }, isTable: true, + isForm: false + }, + { + label: '最后更新时间', + field: 'updateTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + isTable: true, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + }, + isForm: false }, // { diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts index bc2dd230c..69ed91560 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts @@ -831,13 +831,13 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ searchAllSchemas: Customeritem.allSchemas, searchPage: CustomerItemApi.getPageBusinessTypeToItemCode, verificationPage: CustomerItemApi.getCustomerItemListByCodes, // 校验数去焦点输入是否正确的方法 - verificationParams: [{ - key: 'itemCode', - action: '==', - value: '', - isMainValue: false, - isSearch: true, - isFormModel: true, + verificationParams: [{ + key: 'itemCode', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, }], // 失去焦点校验参数 }, form: { @@ -981,6 +981,38 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ isTableForm: false, isForm: false, }, + { + label: '顺序号', + field: 'serialNo', + sort: 'custom', + table: { + width: 150 + }, + isTable: false, + isForm: false, + tableForm: { + type: 'InputNumber', + min: 0, + max:999999, + // precision: 6 + } + }, + { + label: '班次', + field: 'classes', + sort: 'custom', + table: { + width: 150 + }, + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: false, + isForm: false, + tableForm: { + type: 'Select', + disabled: true + }, + }, { label: '包装号', field: 'packingNumber', @@ -1060,6 +1092,15 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ // }, // isForm: false, // }, + { + label: '创建者', + field: 'creator', + sort: 'custom', + table: { + width: 150 + }, + isTable: true, + }, { label: '创建时间', field: 'createTime', @@ -1075,10 +1116,9 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { - style: {width:'100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', + valueFormat: 'x' } }, isSearch: true, @@ -1090,18 +1130,38 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] }, }, - isTableForm: false, - isForm: false }, { - label: '创建者', - field: 'creator', + label: '最后更新者', + field: 'updater', sort: 'custom', table: { width: 150 }, isTable: true, - isTableForm: false, + isForm: false + }, + { + label: '最后更新时间', + field: 'updateTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + isTable: true, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + }, isForm: false }, diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue index b2bcae29e..dd94e3f2a 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue @@ -62,7 +62,7 @@ @tableSelectionDelete="tableSelectionDelete" @searchTableSuccess="searchTableSuccess" @submitForm="submitForm" - :isShowButton = isShowButton + :isShowButton=isShowButton @clearSearchInput="clearSearchInput" /> diff --git a/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts index 95800549b..38fede122 100644 --- a/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts @@ -160,39 +160,6 @@ export const DeliverRecordMain = useCrudSchemas( isTable: false, isForm: false, }, - { - label: '最后更新时间', - field: 'updateTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', - table: { - width: 180 - }, - isTable: false, - form: { - component: 'DatePicker', - componentProps: { - style: { width: '100%' }, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x' - } - }, - isForm: false - }, - { - label: '最后更新者', - field: 'updater', - sort: 'custom', - table: { - width: 150 - }, - isTable: false, - isForm: false - }, // { // label: '代码', // field: 'code', @@ -533,6 +500,15 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ width: 150 }, }, + { + label: '创建者', + field: 'creator', + sort: 'custom', + table: { + width: 150 + }, + isTable: true, + }, { label: '创建时间', field: 'createTime', @@ -564,13 +540,37 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ }, }, { - label: '创建者', - field: 'creator', + label: '最后更新者', + field: 'updater', sort: 'custom', table: { width: 150 }, isTable: true, + isForm: false + }, + { + label: '最后更新时间', + field: 'updateTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + isTable: true, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + }, + isForm: false }, // { // label: '任务明细ID', diff --git a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts index a536b9fdb..aa0d04312 100644 --- a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts @@ -2,6 +2,8 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import { dateFormatter, dateFormatter2 } from '@/utils/formatTime' import * as CustomerApi from '@/api/wms/customer' import { Customer } from '../../../basicDataManage/customerManage/customer/customer.data' +import * as CustomerItemApi from '@/api/wms/customeritem' +import { Customeritem } from '@/views/wms/basicDataManage/customerManage/customeritem/customeritem.data' /** * @returns {Array} 发货记录主表 @@ -16,48 +18,8 @@ export const DeliverRecordMain = useCrudSchemas( width: 180, fixed: 'left' }, - isSearch: true - }, - { - label: '申请单号', - field: 'requestNumber', - sort: 'custom', - table: { - width: 180 - }, - isTable: false, - isSearch: false - }, - { - label: '任务单号', - field: 'jobNumber', - sort: 'custom', - table: { - width: 180 - }, - isTable: false, - }, - { - label: '发货记录单号', - field: 'deliverRecordNumber', - sort: 'custom', - table: { - width: 150 - }, - isSearch: false, - isTable: false, + isSearch: true, isForm: false, - isDetail: false - }, - { - label: '发货计划单号', - field: 'deliverPlanNumber', - sort: 'custom', - table: { - width: 180 - }, - isTable: false, - isDetail: true }, { label: '发货类型', @@ -69,16 +31,15 @@ export const DeliverRecordMain = useCrudSchemas( dictClass: 'string', table: { width: 150 + }, + form: { + component: 'Select', + componentProps: { + disabled: true, + defaultValue: 'InducedProduct' + } } }, - // { - // label: '客户发货单号', - // field: 'customerDeliverNumber', - // sort: 'custom', - // table: { - // width: 150 - // }, - // }, { label: '客户订单号', field: 'customerOrderNumber', @@ -87,7 +48,7 @@ export const DeliverRecordMain = useCrudSchemas( width: 180 }, isTable: true, - isForm: true, + isForm: false, isSearch: true, search: { component: 'Input', @@ -95,26 +56,6 @@ export const DeliverRecordMain = useCrudSchemas( } }, - form: { - component: 'Input', - componentProps: { - - } - } - }, - { - label: '状态', - field: 'status', - dictType: DICT_TYPE.REQUEST_STATUS, - dictClass: 'string', - isSearch: false, - isTable: false, - isForm: false, - isDetail: false, - sort: 'custom', - table: { - width: 150 - } }, { label: '客户代码', @@ -123,9 +64,42 @@ export const DeliverRecordMain = useCrudSchemas( table: { width: 150 }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + enterSearch: true, + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择客户代码', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '客户信息', // 查询弹窗标题 + searchAllSchemas: Customer.allSchemas, // 查询弹窗所需类 + searchPage: CustomerApi.getCustomerPage, // 查询弹窗所需分页方法 + searchCondition: [ + { + key: 'available', + value: 'TRUE', + isMainValue: false + }, + { + key: 'type', + value: 'DEFAULT', + isMainValue: false + } + ], + verificationParams: [ + { + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true + } + ] // 失去焦点校验参数 + } + }, isSearch: true }, - { label: '客户月台代码', field: 'customerDockCode', @@ -133,7 +107,8 @@ export const DeliverRecordMain = useCrudSchemas( table: { width: 150 }, - isTable: false + isTable: false, + isForm: false, }, { label: '承运商', @@ -142,7 +117,8 @@ export const DeliverRecordMain = useCrudSchemas( table: { width: 150 }, - isTable: false + isTable: false, + isForm: false, }, { label: '运输方式', @@ -152,7 +128,8 @@ export const DeliverRecordMain = useCrudSchemas( table: { width: 150 }, - isTable: false + isTable: false, + isForm: false, }, { label: '车牌号', @@ -161,7 +138,8 @@ export const DeliverRecordMain = useCrudSchemas( table: { width: 150 }, - isTable: false + isTable: false, + isForm: false, }, { label: '申请时间', @@ -175,6 +153,7 @@ export const DeliverRecordMain = useCrudSchemas( width: 180 }, isTable: false, + isForm: false, form: { component: 'DatePicker', componentProps: { @@ -185,7 +164,7 @@ export const DeliverRecordMain = useCrudSchemas( } }, { - label: '截止时间', + label: '发运时间', field: 'dueTime', formatter: dateFormatter, detail: { @@ -195,7 +174,7 @@ export const DeliverRecordMain = useCrudSchemas( table: { width: 180 }, - isTable: false, + isTable: true, form: { component: 'DatePicker', componentProps: { @@ -205,6 +184,38 @@ export const DeliverRecordMain = useCrudSchemas( } } }, + { + label: '生产线项', + field: 'productionLine', + sort: 'custom', + table: { + width: 150 + }, + dictType: DICT_TYPE.PRODUCTION_LINE_ITEM, + dictClass: 'string', + form: { + component: 'Select', + componentProps: { + + } + }, + isSearch: true + }, + { + label: '顺引单据号', + field: 'billNo', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'Input', + componentProps: { + + } + }, + isSearch: false + }, { label: '执行时间', field: 'executeTime', @@ -217,6 +228,7 @@ export const DeliverRecordMain = useCrudSchemas( width: 180 }, isTable: false, + isForm: false, form: { component: 'DatePicker', componentProps: { @@ -238,6 +250,7 @@ export const DeliverRecordMain = useCrudSchemas( width: 180 }, isTable: false, + isForm: false, form: { component: 'DatePicker', componentProps: { @@ -255,7 +268,8 @@ export const DeliverRecordMain = useCrudSchemas( table: { width: 150 }, - isTable: false + isTable: false, + isForm: false, }, { label: '到仓库代码', @@ -264,7 +278,8 @@ export const DeliverRecordMain = useCrudSchemas( table: { width: 150 }, - isTable: false + isTable: false, + isForm: false, }, { label: '从库区类型范围', @@ -275,7 +290,8 @@ export const DeliverRecordMain = useCrudSchemas( sort: 'custom', table: { width: 150 - } + }, + isForm: false, }, { label: '到库区类型范围', @@ -286,7 +302,8 @@ export const DeliverRecordMain = useCrudSchemas( sort: 'custom', table: { width: 150 - } + }, + isForm: false, }, { label: '从库区代码范围', @@ -295,7 +312,8 @@ export const DeliverRecordMain = useCrudSchemas( table: { width: 150 }, - isTable: false + isTable: false, + isForm: false, }, { label: '到库区代码范围', @@ -304,7 +322,8 @@ export const DeliverRecordMain = useCrudSchemas( table: { width: 150 }, - isTable: false + isTable: false, + isForm: false, }, { label: '从月台代码', @@ -313,7 +332,8 @@ export const DeliverRecordMain = useCrudSchemas( table: { width: 150 }, - isTable: false + isTable: false, + isForm: false, }, { label: '出库事务类型', @@ -322,7 +342,8 @@ export const DeliverRecordMain = useCrudSchemas( table: { width: 150 }, - isTable: false + isTable: false, + isForm: false, }, { label: '入库事务类型', @@ -331,16 +352,8 @@ export const DeliverRecordMain = useCrudSchemas( table: { width: 150 }, - isTable: false - }, - { - label: '发货类型', - field: 'businessType', - sort: 'custom', - table: { - width: 150 - }, - isTable: false + isTable: false, + isForm: false, }, { label: '部门', @@ -349,7 +362,8 @@ export const DeliverRecordMain = useCrudSchemas( table: { width: 150 }, - isTable: false + isTable: false, + isForm: false, }, { label: '接口类型', @@ -360,7 +374,8 @@ export const DeliverRecordMain = useCrudSchemas( sort: 'custom', table: { width: 150 - } + }, + isForm: false, }, { label: '备注', @@ -392,6 +407,7 @@ export const DeliverRecordMain = useCrudSchemas( } }, isSearch: false, + isForm: false, search: { component: 'DatePicker', componentProps: { @@ -408,37 +424,8 @@ export const DeliverRecordMain = useCrudSchemas( table: { width: 150 }, - isTable: false - }, - { - label: '最后更新时间', - field: 'updateTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', - table: { - width: 180 - }, - isTable: false, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x' - } - } - }, - { - label: '最后更新者', - field: 'updater', - sort: 'custom', - table: { - width: 150 - }, isTable: false, + isForm: false, }, // { // label: '代码', @@ -455,6 +442,7 @@ export const DeliverRecordMain = useCrudSchemas( dictClass: 'string', isSearch: false, isTable: false, + isForm: false, sort: 'custom', table: { width: 150 @@ -546,24 +534,9 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ table: { width: 180 }, - isTable: false + isTable: false, + isTableForm: false, }, - // { - // label: '销售订单号', - // field: 'soNumber', - // sort: 'custom', - // table: { - // width: 150 - // }, - // }, - // { - // label: '销售订单行', - // field: 'soLine', - // sort: 'custom', - // table: { - // width: 150 - // }, - // }, { label: '物料代码', field: 'itemCode', @@ -571,7 +544,26 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ table: { width: 150 }, - isSearch: true + isSearch: true, + tableForm:{ + multiple:true, + isInpuFocusShow: true, // 开启查询弹窗 + isShowTableFormSearch: true, + searchListPlaceholder: '请选择物料代码', + searchField: 'itemCode', + searchTitle: '客户物料基础信息', + searchAllSchemas: Customeritem.allSchemas, + searchPage: CustomerItemApi.getPageBusinessTypeToItemCode, + verificationPage: CustomerItemApi.getCustomerItemListByCodes, // 校验数去焦点输入是否正确的方法 + verificationParams: [{ + key: 'itemCode', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 + }, }, { label: '物料名称', @@ -580,6 +572,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTableForm: false, }, { label: '物料描述1', @@ -588,7 +581,8 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ table: { width: 150 }, - hiddenInMain: true + hiddenInMain: true, + isTableForm: false, }, { label: '物料描述2', @@ -597,7 +591,8 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ table: { width: 150 }, - hiddenInMain: true + hiddenInMain: true, + isTableForm: false, }, { label: '批次', @@ -606,6 +601,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTableForm: false, }, { label: '包装号', @@ -614,6 +610,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTableForm: false, }, { label: '父包装号', @@ -623,6 +620,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ width: 150 }, isTable: false, + isTableForm: false, }, { label: '包装规格', @@ -635,6 +633,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTableForm: false, }, { label: '数量', @@ -645,6 +644,12 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ }, form: { component: 'InputNumber', + }, + tableForm: { + type: 'InputNumber', + min: 0, + max:999999, + // precision: 6 } }, { @@ -657,6 +662,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTableForm: false, }, { label: '单价', @@ -668,7 +674,8 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ hiddenInMain: true, form: { component: 'InputNumber', - } + }, + isTableForm: false, }, { label: '金额', @@ -680,7 +687,8 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ hiddenInMain: true, form: { component: 'InputNumber', - } + }, + isTableForm: false, }, { label: '在途库库位', @@ -690,6 +698,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ width: 150 }, isTable: false, + isTableForm: false, }, { label: '从库位', @@ -698,6 +707,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTableForm: false, }, { label: '到库位', @@ -706,6 +716,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTableForm: false, }, { label: '从库位组', @@ -715,6 +726,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ width: 150 }, hiddenInMain: true, + isTableForm: false, }, { label: '到库位组', @@ -724,6 +736,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ width: 150 }, hiddenInMain: true, + isTableForm: false, }, { label: '从库区', @@ -733,6 +746,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ width: 150 }, hiddenInMain: true, + isTableForm: false, }, { label: '到库区', @@ -742,6 +756,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ width: 150 }, hiddenInMain: true, + isTableForm: false, }, // { // label: '从器具号', @@ -771,6 +786,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTableForm: false, }, { label: '从货主代码', @@ -780,6 +796,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ width: 150 }, isTable: false, + isTableForm: false, }, { label: '到货主代码', @@ -789,6 +806,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ width: 150 }, isTable: false, + isTableForm: false, }, { label: '项目代码', @@ -798,6 +816,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ width: 150 }, isTable: false, + isTableForm: false, }, { label: '备注', @@ -818,7 +837,19 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTableForm: false, + }, + { + label: '创建者', + field: 'creator', + sort: 'custom', + table: { + width: 150 + }, + isTable: true, + isTableForm: false, }, + { label: '创建时间', field: 'createTime', @@ -831,6 +862,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ width: 180 }, isTable: true, + isTableForm: false, form: { component: 'DatePicker', componentProps: { @@ -850,15 +882,36 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ }, }, { - label: '创建者', - field: 'creator', + label: '最后更新者', + field: 'updater', sort: 'custom', table: { width: 150 }, isTable: true, }, - + { + label: '最后更新时间', + field: 'updateTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + isTable: true, + isTableForm: false, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + } + }, // { // label: '任务明细ID', // field: 'jobDetailId', @@ -1144,4 +1197,4 @@ export const ImportLeadershipDocErrorData = useCrudSchemas(reactive @@ -73,7 +87,7 @@ :isShowDownloadBtn="false" :confirmFormSuccess="confirmFormSuccess" @searchTableSuccess="searchTableSuccess" - sourcePage="inducedProduct" + sourcePage="InducedProduct" />