From f8dafbb6df4ff2b29820a05687126423c1a7fe6b Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Wed, 8 May 2024 11:49:26 +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 --- .../productscrapRecordMain.data.ts | 23 ++----------------- .../productscrapRequestMain/index.vue | 1 + .../productscrapRequestMain.data.ts | 1 + 3 files changed, 4 insertions(+), 21 deletions(-) diff --git a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts index 19342b143..bee914239 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts +++ b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts @@ -1,25 +1,6 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' -import {Workshop} from "@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data"; -import * as WorkshopApi from "@/api/wms/workshop"; -import {Team} from "@/views/wms/basicDataManage/orderManage/team/team.data"; -import * as TeamApi from "@/api/wms/team"; -import {Shift} from "@/views/wms/basicDataManage/orderManage/shift/shift.data"; -import * as ShiftApi from "@/api/wms/shift"; -import { - Productionline -} from "@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data"; -import * as ProductionlineApi from "@/api/wms/productionline"; -import { - Workstation -} from "@/views/wms/basicDataManage/factoryModeling/workstation/workstation.data"; -import * as WorkstationApi from "@/api/wms/workstation"; -import {Process} from "@/views/wms/basicDataManage/factoryModeling/process/process.data"; -import * as ProcessApi from "@/api/wms/process"; -import { - Productionlineitem -} from "@/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data"; -import * as ProductionlineitemApi from "@/api/wms/productionlineitem"; + /** * @returns {Array} 制品报废记录主表 @@ -50,7 +31,7 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive([ dictType: DICT_TYPE.REQUEST_STATUS, dictClass: 'string', isForm:false, - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue index 649de62c4..87289e30e 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue +++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue @@ -648,6 +648,7 @@ const submitForm = async (formType, data) => { if (!item.childList) { childListRs = false } + item.productionLineCode = data.productionLineCode }) if (!childListRs) { message.warning('请填写Bom信息!') diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts index 0a9ce30f9..06833299d 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts +++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts @@ -1053,6 +1053,7 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive([ field: 'action', isDetail: false, isForm: false , + hiddenInMain:true, table: { width: 150, fixed: 'right'