From 332e20763352253119a991d2b33fb92a5875fa0a Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Tue, 2 Jan 2024 12:02:23 +0800 Subject: [PATCH] =?UTF-8?q?Bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productdismantleRequestMain.data.ts | 99 +++---------------- .../productrepairRecordMain.data.ts | 79 --------------- .../productrepairRequestMain/index.vue | 4 + .../productrepairRequestMain.data.ts | 79 --------------- .../productscrapRecordMain.data.ts | 79 --------------- .../productscrapRequestMain/index.vue | 1 + .../productscrapRequestMain.data.ts | 89 ++--------------- 7 files changed, 26 insertions(+), 404 deletions(-) diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts index f614ddfc3..92be1b24a 100644 --- a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts +++ b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts @@ -1207,6 +1207,16 @@ export const BomDismantle = useCrudSchemas(reactive([ disabled: true } }, + { + label: 'Bom数量', + field: 'bomQty', + tableForm: { + disabled: true, + type: 'InputNumber', + min: 0, + precision: 6 + } + }, { label: '数量', field: 'qty', @@ -1329,91 +1339,4 @@ export const BomDismantle = useCrudSchemas(reactive([ disabled: true } }, - { - label: '备注', - field: 'remark', - sort: 'custom', - table: { - width: 150, - show: false - }, - isTableForm: false, - tableForm:{ - disabled: true - } - }, - { - label: '创建时间', - field: 'createTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', - table: { - width: 180, - show: false - }, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } - }, - isTableForm: false, - tableForm:{ - disabled: true - } - }, - { - label: '创建者', - field: 'creator', - sort: 'custom', - table: { - width: 150, - show: false - }, - isTableForm: false, - tableForm:{ - disabled: true - } - }, - { - label: '最后更新时间', - field: 'updateTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', - table: { - width: 180, - show: false - }, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } - }, - tableForm:{ - disabled: true - } - }, - { - label: '最后更新者', - field: 'updater', - sort: 'custom', - table: { - width: 150, - show: false - }, - tableForm:{ - disabled: true - } - } -])) \ No newline at end of file +])) diff --git a/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts b/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts index 251c5f111..6afffb80f 100644 --- a/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts +++ b/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts @@ -845,84 +845,5 @@ export const BomDismantle = useCrudSchemas(reactive([ tableForm:{ disabled: true } - }, - { - label: '备注', - field: 'remark', - sort: 'custom', - table: { - width: 150 - }, - tableForm:{ - disabled: true - } - }, - { - label: '创建时间', - field: 'createTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', - table: { - width: 180 - }, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } - }, - tableForm:{ - disabled: true - } - }, - { - label: '创建者', - field: 'creator', - sort: 'custom', - table: { - width: 150 - }, - tableForm:{ - disabled: true - } - }, - { - label: '最后更新时间', - field: 'updateTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', - table: { - width: 180 - }, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } - }, - tableForm:{ - disabled: true - } - }, - { - label: '最后更新者', - field: 'updater', - sort: 'custom', - table: { - width: 150 - }, - tableForm:{ - disabled: true - } } ])) diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue index 87fc2bde8..bb63af787 100644 --- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue +++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue @@ -415,6 +415,7 @@ const handleHandle = async (id: number) => { const formRef = ref() const openForm =async (type: string, row?: number) => { tableData.value = [] // 重置明细数据 + detatableDataBom.params = []; // 重置Bom请求参数 lsBomSave.value = true formRef.value.open(type, row) } @@ -470,6 +471,7 @@ const handleAddTable = () => { message.warning("请选择车间代码"); return; } + tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys))) } // 删除明细 @@ -537,6 +539,7 @@ const searchFormClick = (searchData) => { // 查看 Bom 按钮回调事件 const tableFormButton = async (val , row) => { + console.log("BBBBB",row.id); if (val == 'bom') { // 查看 bom bomModelVisible.value = true DialogTitle.value = '物品代码【' + row.itemCode + '】——Bom信息' @@ -545,6 +548,7 @@ const tableFormButton = async (val , row) => { bomVersion: row.bomVersion, masterId: row.id } + console.log("AAAAA",row.id); rowId.value = row.id await getDetailListBom() } diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts index d48a6349e..a2e9b0218 100644 --- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts +++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts @@ -1289,85 +1289,6 @@ export const BomDismantle = useCrudSchemas(reactive([ tableForm:{ disabled: true } - }, - { - label: '备注', - field: 'remark', - sort: 'custom', - table: { - width: 150 - }, - tableForm:{ - disabled: true - } - }, - { - label: '创建时间', - field: 'createTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', - table: { - width: 180 - }, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } - }, - tableForm:{ - disabled: true - } - }, - { - label: '创建者', - field: 'creator', - sort: 'custom', - table: { - width: 150 - }, - tableForm:{ - disabled: true - } - }, - { - label: '最后更新时间', - field: 'updateTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', - table: { - width: 180 - }, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } - }, - tableForm:{ - disabled: true - } - }, - { - label: '最后更新者', - field: 'updater', - sort: 'custom', - table: { - width: 150 - }, - tableForm:{ - disabled: true - } } ])) diff --git a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts index 61a38b90c..64da98bdd 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts +++ b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts @@ -806,84 +806,5 @@ export const ProdcutscrapRecordBomDismantle = useCrudSchemas(reactive { const formRef = ref() const openForm =async (type: string, row?: number) => { tableData.value = [] // 重置明细数据 + detatableDataBom.params = []; // 重置Bom请求参数 lsBomSave.value = true formRef.value.open(type, row) } diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts index 78324cd84..fda7d92ec 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts +++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts @@ -973,6 +973,16 @@ export const ProdcutscrapBomDismantle = useCrudSchemas(reactive([ disabled: true } }, + { + label: 'Bom数量', + field: 'bomQty', + tableForm: { + disabled: true, + type: 'InputNumber', + min: 0, + precision: 6 + } + }, { label: '数量', field: 'qty', @@ -1094,84 +1104,5 @@ export const ProdcutscrapBomDismantle = useCrudSchemas(reactive([ tableForm:{ disabled: true } - }, - { - label: '备注', - field: 'remark', - sort: 'custom', - table: { - width: 150 - }, - tableForm:{ - disabled: true - } - }, - { - label: '创建时间', - field: 'createTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', - table: { - width: 180 - }, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } - }, - tableForm:{ - disabled: true - } - }, - { - label: '创建者', - field: 'creator', - sort: 'custom', - table: { - width: 150 - }, - tableForm:{ - disabled: true - } - }, - { - label: '最后更新时间', - field: 'updateTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', - table: { - width: 180 - }, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } - }, - tableForm:{ - disabled: true - } - }, - { - label: '最后更新者', - field: 'updater', - sort: 'custom', - table: { - width: 150 - }, - tableForm:{ - disabled: true - } } ]))