From 73b12ba6d1d931582a1f32f56a7e95b6c5d7dfa1 Mon Sep 17 00:00:00 2001 From: zhousq Date: Mon, 29 Apr 2024 11:34:57 +0800 Subject: [PATCH 1/3] =?UTF-8?q?2024-04-29=20=E4=BF=AE=E5=A4=8D=E5=B7=A5?= =?UTF-8?q?=E8=89=BA=E8=B7=AF=E7=BA=BF=E9=85=8D=E7=BD=AE=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E5=B7=A5=E5=BA=8FBOM=E5=85=B3=E8=81=94=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/mes/processroute/index.ts | 6 ++-- .../processroute/components/configDialog.vue | 33 ++++++++++++------- 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/src/api/mes/processroute/index.ts b/src/api/mes/processroute/index.ts index b18879dc3..c889e2dff 100644 --- a/src/api/mes/processroute/index.ts +++ b/src/api/mes/processroute/index.ts @@ -82,9 +82,9 @@ export const getPatternPage = async (code:String) => { return await request.get({ url: `/mes/mes-process-pattern/pagePatternByProcessCode?pageSize=25&processCode=`+code }) } -// 查询物料列表 -export const getItembasicPage = async (code:String) => { - return await request.get({ url: `/mes/mes-process-itembasic/pageByProcessCode?pageSize=25&processCode=`+code}) +// 查询产品物料列表 +export const getProcessBomList = async (params) => { + return await request.get({ url: `/mes/common/getBomListByProductAndProcess`,params}) } export const getWorkstationPage = async (code:String) => { diff --git a/src/views/mes/processroute/components/configDialog.vue b/src/views/mes/processroute/components/configDialog.vue index 2193afb2d..c10f2af27 100644 --- a/src/views/mes/processroute/components/configDialog.vue +++ b/src/views/mes/processroute/components/configDialog.vue @@ -96,10 +96,11 @@ - - = - - + + + + + @@ -210,6 +211,7 @@ const deleteNode=(row)=>{ processData.value.splice(processData.value.indexOf(row),1) graph.value.removeNode(row.code) } +const productCode=ref() //初始化图形组件 const graph = ref() const rowData = ref() @@ -219,6 +221,7 @@ const openDetail = (row: any) => { titleNameRef.value = rowData.value.processrouteCode titleValueRef.value = rowData.value.processName processRouteId.value = rowData.value.id + productCode.value=rowData.value.productCode routeVersion.value=rowData.value.routeVersion remarksData.data = { tableId: rowData.value.id, @@ -261,11 +264,17 @@ const getProcessInfo = async (id: any) => { /** 获取产品信息 */ const getItembasicInfo = async (code: String) => { const res = await ProcessrouteApi.getProductInfo(code) + console.log('productData',res) productData.value = res } /** 获取物料列表 */ -const getItembasicPage = async (code) => { - return await ProcessrouteApi.getItembasicPage(code); +const getProcessBomList = async (pcode,processCode) => { + let params={ + code:pcode ,//"产品编码" + //version:version,//bom版本" + processCode:processCode + } + return await ProcessrouteApi.getProcessBomList(params); } /** 查询模具基本信息列表 */ const getPatternPage = async (code) => { @@ -290,7 +299,7 @@ const getWorkstationPage = async (code) => { // } /**获取工艺路线定义的工序列表 */ const getProcessList = async (code) => { - console.log('code',code) + //console.log('code',code) const res = await ProcessrouteApi.getProcessrouteNodeList(code) processData.value = res //return res @@ -299,15 +308,15 @@ const getProcessList = async (code) => { const nodeClick = (e, x, y, node, view) => { Promise.all([ getProcessInfo(node.id), - getItembasicPage(node.id), + getProcessBomList(productCode.value,node.id), getPatternPage(node.id), getWorkstationPage(node.id) - ]).then(([processIndoList,itembasicPage, patternPage,workstationInfoList]) => { + ]).then(([processIndoList,basicBom, patternPage,workstationInfoList]) => { // 在这里处理所有异步操作的结果 - message.info(JSON.stringify(processIndoList)) - console.log(processIndoList) + //message.info(JSON.stringify(processIndoList)) + console.log('basicBom',basicBom) //获取绑定的物料信息 - materialData.value = itembasicPage.list + materialData.value = basicBom //获取绑定的模具信息 mouldData.value = patternPage.list //获取绑定的工位信息 From 3fa440547a9e34ef3d5e901b59761dc0abd3eb96 Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Mon, 29 Apr 2024 11:53:34 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9Bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inspectionTemplate/addForm.vue | 2 +- .../inspectionRequest/inspectionMain.data.ts | 105 +++--------------- 2 files changed, 15 insertions(+), 92 deletions(-) diff --git a/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue b/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue index cd63b2c85..729e1fcef 100644 --- a/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue +++ b/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue @@ -783,7 +783,7 @@ const submitForm = async () => { console.log(99,arr2) if (arr2 && arr2.length > 0) { const str = arr2.map((item) => item.description).join(',') - message.error(`${str}上限值应大目标值大于下限值`) + message.error(`${str}上限值应大于目标值大于下限值`) return } if (formType.value == 'create') { diff --git a/src/views/qms/inspection/inspectionRequest/inspectionMain.data.ts b/src/views/qms/inspection/inspectionRequest/inspectionMain.data.ts index 9d2643818..68489bf6c 100644 --- a/src/views/qms/inspection/inspectionRequest/inspectionMain.data.ts +++ b/src/views/qms/inspection/inspectionRequest/inspectionMain.data.ts @@ -15,10 +15,10 @@ export const InspectionMainRules = reactive({ requestInspectionNum: [required,{ validator:validateTwoNum, message: '小数点后最多2位', trigger: 'blur'}], referenceCertificateRow: [{ validator:validateInteger, message: '请输入正确的整数', trigger: 'blur'}], inspectionType: [required], + minPackageQty: [required], }) export const InspectionMain = useCrudSchemas(reactive([ - { label: '申请编码', field: 'number', @@ -311,15 +311,6 @@ export const InspectionMain = useCrudSchemas(reactive([ width: 150 } }, - // { - // label: '检验方案编码', - // field: 'inspectionSchemeCode', - // sort: 'custom', - // isSearch: false, - // table: { - // width: 150 - // } - // }, { label: '检验类型', field: 'inspectionType', @@ -335,77 +326,19 @@ export const InspectionMain = useCrudSchemas(reactive([ width: 175 } }, - // { - // label: '检验阶段', - // field: 'inspectionStage', - // sort: 'custom', - // isSearch: false, - // form: { - // component: 'InputNumber', - // value: 0, - // componentProps: { - // disabled: true - // } - // }, - // table: { - // width: 130 - // } - // }, - // { - // label: '检验严格性', - // field: 'inspectionStringency', - // sort: 'custom', - // isSearch: false, - // dictType: DICT_TYPE.INSPECTION_SEVERITY, - // dictClass: 'string', - // form: { - // componentProps: { - // disabled: true - // } - // }, - // table: { - // width: 150 - // } - // }, - // { - // label: '检验申请包装列表', - // field: 'applicationPackageCode', - // sort: 'custom', - // isSearch: false, - // table: { - // width: 150 - // } - // }, - // { - // label: '检验水平', - // field: 'inspectionLevel', - // dictType: DICT_TYPE.INSPECTION_LEVEL, - // sort: 'custom', - // isSearch: false, - // table: { - // width: 150 - // } - // }, - // { - // label: 'AQL值', - // field: 'aqlValue', - // sort: 'custom', - // isSearch: false, - // dictType: DICT_TYPE.BASIC_AQL, - // table: { - // width: 150 - // } - // }, - // { - // label: '是否可用', - // field: 'available', - // sort: 'custom', - // isSearch: false, - // dictType: DICT_TYPE.TRUE_FALSE, - // table: { - // width: 150 - // } - // }, + { + label: '小包装数', + field: 'minPackageQty', + sort: 'custom', + isSearch: false, + form: { + component: 'InputNumber', + value: 0 + }, + table: { + width: 150 + } + }, { label: '操作', field: 'action', @@ -498,15 +431,5 @@ export const InspectionRequestPackage = useCrudSchemas(reactive([ table:{ width:150 } - }, - { - label: '操作', - field: 'action', - isForm: false, - isTable:true, - table: { - width: 120, - fixed: 'right' - } } ])) From aafb817be312a13c1bc6c9f1b683022351cc5afc Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Mon, 29 Apr 2024 12:16:34 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=B8=BB=E5=AD=90=E8=A1=A8=E5=90=88?= =?UTF-8?q?=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stockupMainJob/stockupMainJob.data.ts | 103 ++++++++++++------ .../stockupMainRecord.data.ts | 62 +++++++++-- .../stockup/stockupMainRequest/index.vue | 15 ++- .../stockupMainRequest.data.ts | 58 +++++++--- .../productreceiptRequestMain/index.vue | 16 ++- .../productreceiptRequestMain.data.ts | 59 +++++++++- .../index.vue | 19 +++- .../productreceiptAssembleRequestMain.data.ts | 60 +++++++++- 8 files changed, 326 insertions(+), 66 deletions(-) diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts index ae116f734..6946ee9f8 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts @@ -17,7 +17,7 @@ export const StockupMainJob = useCrudSchemas(reactive([ }, }, { - label: '发货记录单号', + label: '发货计划单号', field: 'deliverPlanNumber', sort: 'custom', isForm: false, @@ -33,24 +33,27 @@ export const StockupMainJob = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false }, { - label: '从仓库代码', + label: '从仓库', field: 'fromWarehouseCode', sort: 'custom', isForm: false, table: { width: 150 }, + sortTableDefault:1000 }, { - label: '到仓库代码', + label: '到仓库', field: 'toWarehouseCode', sort: 'custom', isForm: false, table: { width: 150 }, + sortTableDefault:1000 }, { label: '状态', @@ -58,7 +61,7 @@ export const StockupMainJob = useCrudSchemas(reactive([ dictType: DICT_TYPE.REQUEST_STATUS, dictClass: 'string', isSearch: true, - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -73,6 +76,7 @@ export const StockupMainJob = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, search: { component: 'DatePicker', componentProps: { @@ -97,6 +101,7 @@ export const StockupMainJob = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, search: { component: 'DatePicker', componentProps: { @@ -122,6 +127,7 @@ export const StockupMainJob = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, search: { component: 'DatePicker', componentProps: { @@ -142,11 +148,13 @@ export const StockupMainJob = useCrudSchemas(reactive([ label: '部门', field: 'departmentCode', sort: 'custom', + isTable: false, }, { label: '承接人用户名', field: 'acceptUserName', sort: 'custom', + isTable: false, table: { width: 150 }, @@ -159,6 +167,7 @@ export const StockupMainJob = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, search: { component: 'DatePicker', componentProps: { @@ -182,6 +191,7 @@ export const StockupMainJob = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '完成时间', @@ -191,6 +201,7 @@ export const StockupMainJob = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, search: { component: 'DatePicker', componentProps: { @@ -212,7 +223,7 @@ export const StockupMainJob = useCrudSchemas(reactive([ field: 'fromAreaTypes', dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -224,7 +235,7 @@ export const StockupMainJob = useCrudSchemas(reactive([ field: 'toAreaTypes', dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -235,17 +246,19 @@ export const StockupMainJob = useCrudSchemas(reactive([ label: '业务类型', field: 'businessType', sort: 'custom', - form: { - component: 'SelectV2' - }, - table: { - width: 120 - }, + isTable: false, + form: { + component: 'SelectV2' + }, + table: { + width: 120 + }, }, { label: '备注', field: 'remark', sort: 'custom', + isTable: false, }, { label: '自动完成', @@ -254,6 +267,7 @@ export const StockupMainJob = useCrudSchemas(reactive([ table: { width: 120 }, + isTable: false, }, { label: '允许修改库位', @@ -262,6 +276,7 @@ export const StockupMainJob = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '允许修改数量', @@ -270,6 +285,7 @@ export const StockupMainJob = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '允许大于推荐数量', @@ -278,6 +294,7 @@ export const StockupMainJob = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, }, { label: '允许小于推荐数量', @@ -286,6 +303,7 @@ export const StockupMainJob = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, }, { label: '允许修改库存状态', @@ -294,6 +312,7 @@ export const StockupMainJob = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'Radio' }, @@ -305,6 +324,7 @@ export const StockupMainJob = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '允许部分完成', @@ -313,6 +333,7 @@ export const StockupMainJob = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '允许修改批次', @@ -321,6 +342,7 @@ export const StockupMainJob = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '允许修改箱码', @@ -329,6 +351,7 @@ export const StockupMainJob = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '从库区代码范围', @@ -337,6 +360,7 @@ export const StockupMainJob = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '到库区代码范围', @@ -345,6 +369,7 @@ export const StockupMainJob = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '入库库存状态范围', @@ -353,6 +378,7 @@ export const StockupMainJob = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, }, { label: '出库库存状态范围', @@ -361,6 +387,7 @@ export const StockupMainJob = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, }, { label: '创建者', @@ -369,6 +396,7 @@ export const StockupMainJob = useCrudSchemas(reactive([ table: { width: 120 }, + isTable: false, }, { label: '创建时间', @@ -378,6 +406,7 @@ export const StockupMainJob = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, search: { component: 'DatePicker', componentProps: { @@ -412,6 +441,7 @@ export const StockupDetailJob = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain:true }, { label: '包装号', @@ -421,6 +451,7 @@ export const StockupDetailJob = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain:true }, { label: '批次', @@ -430,6 +461,7 @@ export const StockupDetailJob = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain:true }, { label: '库存状态', @@ -439,6 +471,7 @@ export const StockupDetailJob = useCrudSchemas(reactive([ form: { component: 'Radio' }, + hiddenInMain:true, table: { width: 120 }, @@ -451,6 +484,7 @@ export const StockupDetailJob = useCrudSchemas(reactive([ table: { width: 120 }, + hiddenInMain:true, }, { label: '器具号', @@ -460,27 +494,11 @@ export const StockupDetailJob = useCrudSchemas(reactive([ table: { width: 120 }, + hiddenInMain:true, }, + { - label: '从库位代码', - field: 'fromLocationCode', - sort: 'custom', - isSearch: true, - table: { - width: 120 - }, - }, - { - label: '到库位代码', - field: 'toLocationCode', - sort: 'custom', - isSearch: true, - table: { - width: 120 - }, - }, - { - label: '物品代码', + label: '物料代码', field: 'itemCode', sort: 'custom', isSearch: true, @@ -505,6 +523,7 @@ export const StockupDetailJob = useCrudSchemas(reactive([ table: { width: 120 }, + hiddenInMain:true, }, { label: '物品描述2', @@ -514,6 +533,7 @@ export const StockupDetailJob = useCrudSchemas(reactive([ table: { width: 120 }, + hiddenInMain:true, }, { label: '项目代码', @@ -523,6 +543,7 @@ export const StockupDetailJob = useCrudSchemas(reactive([ table: { width: 120 }, + hiddenInMain:true, }, { label: '数量', @@ -550,11 +571,30 @@ export const StockupDetailJob = useCrudSchemas(reactive([ } } }, + { + label: '从库位', + field: 'fromLocationCode', + sort: 'custom', + isSearch: true, + table: { + width: 120 + }, + }, + { + label: '到库位', + field: 'toLocationCode', + sort: 'custom', + isSearch: true, + table: { + width: 120 + }, + }, { label: '备注', field: 'remark', sort: 'custom', isSearch: true, + hiddenInMain:true, }, { label: '创建时间', @@ -562,6 +602,7 @@ export const StockupDetailJob = useCrudSchemas(reactive([ sort: 'custom', formatter: dateFormatter, isSearch: true, + hiddenInMain:true, search: { component: 'DatePicker', componentProps: { diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts index b44bd6867..8e1a229d2 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts @@ -17,7 +17,7 @@ export const StockupMainRecord = useCrudSchemas(reactive([ }, }, { - label: '发货记录单号', + label: '发货计划单号', field: 'deliverPlanNumber', sort: 'custom', isForm: false, @@ -33,6 +33,7 @@ export const StockupMainRecord = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, }, { label: '任务单号', @@ -42,22 +43,25 @@ export const StockupMainRecord = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, }, { - label: '从仓库代码', + label: '从仓库', field: 'fromWarehouseCode', sort: 'custom', table: { width: 150 }, + sortTableDefault:1000 }, { - label: '到仓库代码', + label: '到仓库', field: 'toWarehouseCode', sort: 'custom', table: { width: 150 }, + sortTableDefault:1000 }, { label: '出库事务类型', @@ -65,7 +69,7 @@ export const StockupMainRecord = useCrudSchemas(reactive([ sort: 'custom', dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', - isTable: true, + isTable: false, table: { width: 150 }, @@ -76,7 +80,7 @@ export const StockupMainRecord = useCrudSchemas(reactive([ field: 'inTransactionType', dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -88,7 +92,7 @@ export const StockupMainRecord = useCrudSchemas(reactive([ field: 'fromAreaTypes', dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 180 @@ -99,6 +103,7 @@ export const StockupMainRecord = useCrudSchemas(reactive([ field: 'fromAreaCodes', sort: 'custom', isSearch: true, + isTable: false, table: { width: 180 }, @@ -108,7 +113,7 @@ export const StockupMainRecord = useCrudSchemas(reactive([ field: 'toAreaTypes', dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 180 @@ -118,6 +123,7 @@ export const StockupMainRecord = useCrudSchemas(reactive([ label: '到库区代码范围', field: 'toAreaCodes', sort: 'custom', + isTable: false, table: { width: 180 }, @@ -138,6 +144,7 @@ export const StockupMainRecord = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -157,6 +164,7 @@ export const StockupMainRecord = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -174,6 +182,7 @@ export const StockupMainRecord = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -199,6 +208,7 @@ export const StockupMainRecord = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -223,6 +233,7 @@ export const StockupMainRecord = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, isForm: false, }, { @@ -232,13 +243,14 @@ export const StockupMainRecord = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '接口类型', field: 'interfaceType', dictType: DICT_TYPE.INTERFACE_TYPE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -251,13 +263,14 @@ export const StockupMainRecord = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '是否可用', field: 'available', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -278,6 +291,7 @@ export const StockupMainRecord = useCrudSchemas(reactive([ table: { width: 100 }, + isTable: false, }, { label: '操作', @@ -303,6 +317,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ table: { width: 180 }, + hiddenInMain: true }, { label: '包装号', @@ -312,6 +327,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain: true }, { label: '批次', @@ -321,6 +337,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain: true }, { label: '从器具号', @@ -330,9 +347,10 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain: true }, { - label: '物品代码', + label: '物料代码', field: 'itemCode', sort: 'custom', isSearch: true, @@ -357,6 +375,8 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain: true + }, { label: '物品描述2', @@ -366,6 +386,8 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain: true + }, { label: '项目代码', @@ -375,6 +397,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain: true }, { label: '数量', @@ -406,6 +429,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain: true }, { label: '从货主代码', @@ -415,9 +439,10 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain: true }, { - label: '从库位代码', + label: '从库位', field: 'fromLocationCode', sort: 'custom', isSearch: true, @@ -433,6 +458,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain: true }, { label: '从库区代码', @@ -442,6 +468,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain: true }, { label: '到货主代码', @@ -451,6 +478,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain: true }, { label: '到器具号', @@ -460,9 +488,10 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain: true }, { - label: '到库位代码', + label: '到库位', field: 'toLocationCode', sort: 'custom', isSearch: true, @@ -475,6 +504,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ field: 'toLocationGroupCode', sort: 'custom', isSearch: true, + hiddenInMain: true, table: { width: 150 }, @@ -484,6 +514,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ field: 'toAreaCode', sort: 'custom', isSearch: true, + hiddenInMain: true, table: { width: 150 }, @@ -493,6 +524,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ field: 'singlePrice', sort: 'custom', isSearch: true, + hiddenInMain: true, table: { width: 150 }, @@ -502,6 +534,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ field: 'amount', sort: 'custom', isSearch: true, + hiddenInMain: true, table: { width: 150 }, @@ -512,6 +545,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ dictType: DICT_TYPE.INTERFACE_TYPE, dictClass: 'string', isTable: true, + hiddenInMain: true, sort: 'custom', table: { width: 150 @@ -524,6 +558,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ dictClass: 'string', isSearch: true, isTable: true, + hiddenInMain: true, sort: 'custom', table: { width: 150 @@ -546,6 +581,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ table: { width: 180 }, + hiddenInMain: true, search: { component: 'DatePicker', componentProps: { @@ -561,6 +597,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ field: 'remark', sort: 'custom', isSearch: true, + hiddenInMain: true, table: { width: 150 }, @@ -569,6 +606,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ label: '操作', field: 'action', isForm: false, + hiddenInMain: true, table: { width: 150, fixed: 'right' diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue index d6549f63a..0797f4453 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue @@ -43,6 +43,8 @@ const setV = {} setV[formField] = val[0][searchField] if (type == 'tableForm') { + // if(formField == 'itemCode') { + // row['itemCode'] = val[0]['code'] + // row['uom'] = val[0]['uom'] + // } if(formField == 'itemCode') { - row['itemCode'] = val[0]['code'] - row['uom'] = val[0]['uom'] + val.forEach(item=>{ + if(tableData.value.find(item1=>item1['id'] == item['id'])) return + const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) + newRow['uom'] = item['uom'] + newRow['itemCode'] = item['code'] + tableData.value.push(newRow) + }) } if(formField == 'toLocationCode'){ row['toLocationCode'] = val[0]['code'] diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts index eafa982ad..4d95a75b1 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts @@ -81,13 +81,14 @@ export const StockupMainRequest = useCrudSchemas(reactive([ } }, { - label: '从仓库代码', + label: '从仓库', field: 'fromWarehouseCode', sort: 'custom', isSearch: false, table: { width: 120 }, + sortTableDefault:1000, // form: { // // labelMessage: '信息提示说明！！！', // componentProps: { @@ -107,7 +108,7 @@ export const StockupMainRequest = useCrudSchemas(reactive([ isForm: false }, { - label: '到仓库代码', + label: '到仓库', field: 'toWarehouseCode', sort: 'custom', isSearch: false, @@ -115,13 +116,15 @@ export const StockupMainRequest = useCrudSchemas(reactive([ width: 120 }, isForm: false, + sortTableDefault:1000, + }, { label: '从库区类型范围', field: 'fromAreaTypes', dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -136,6 +139,7 @@ export const StockupMainRequest = useCrudSchemas(reactive([ table: { width: 160 }, + isTable: false, isForm: false }, { @@ -143,6 +147,7 @@ export const StockupMainRequest = useCrudSchemas(reactive([ field: 'businessType', sort: 'custom', isSearch: false, + isTable: false, form: { value: 'Stockup', componentProps: { @@ -168,6 +173,7 @@ export const StockupMainRequest = useCrudSchemas(reactive([ defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } }, + isTable: false, table: { width: 180 }, @@ -179,6 +185,7 @@ export const StockupMainRequest = useCrudSchemas(reactive([ sort: 'custom', formatter: dateFormatter, isSearch: false, + isTable: false, search: { component: 'DatePicker', componentProps: { @@ -204,6 +211,7 @@ export const StockupMainRequest = useCrudSchemas(reactive([ sort: 'custom', formatter: dateFormatter, isSearch: false, + isTable: false, search: { component: 'DatePicker', componentProps: { @@ -229,6 +237,7 @@ export const StockupMainRequest = useCrudSchemas(reactive([ sort: 'custom', formatter: dateFormatter, isSearch: false, + isTable: false, search: { component: 'DatePicker', componentProps: { @@ -255,6 +264,7 @@ export const StockupMainRequest = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, formatter: (_: Recordable, __: TableColumn, cellValue: number) => { return userDeptArray.find((account) => account.id == cellValue)?.name }, @@ -278,7 +288,7 @@ export const StockupMainRequest = useCrudSchemas(reactive([ dictClass: 'string', isSearch: true, isForm: false, - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -289,13 +299,14 @@ export const StockupMainRequest = useCrudSchemas(reactive([ field: 'remark', sort: 'custom', isSearch: false, + isTable: false, }, { label: '自动提交', field: 'autoCommit', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, isForm: false, sort: 'custom', table: { @@ -316,7 +327,7 @@ export const StockupMainRequest = useCrudSchemas(reactive([ field: 'autoAgree', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, isForm: false, sort: 'custom', table: { @@ -337,7 +348,7 @@ export const StockupMainRequest = useCrudSchemas(reactive([ field: 'autoExecute', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, isForm: false, sort: 'custom', table: { @@ -379,7 +390,7 @@ export const StockupMainRequest = useCrudSchemas(reactive([ field: 'toAreaTypes', dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -394,6 +405,7 @@ export const StockupMainRequest = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isForm: false }, { @@ -405,7 +417,7 @@ export const StockupMainRequest = useCrudSchemas(reactive([ }, dictType: DICT_TYPE.INVENTORY_STATUS, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', tableForm: { disabled: true, @@ -424,7 +436,7 @@ export const StockupMainRequest = useCrudSchemas(reactive([ }, dictType: DICT_TYPE.INVENTORY_STATUS, dictClass: 'string', - isTable: true, + isTable: false, tableForm: { disabled: true, type: 'Select', @@ -477,6 +489,7 @@ export const StockupDetailRequest = useCrudSchemas(reactive([ table: { width: 180 }, + hiddenInMain: true }, // { // label: '包装号', @@ -565,7 +578,7 @@ export const StockupDetailRequest = useCrudSchemas(reactive([ // } // }, { - label: '物品代码', + label: '物料代码', field: 'itemCode', sort: 'custom', isSearch: true, @@ -573,7 +586,7 @@ export const StockupDetailRequest = useCrudSchemas(reactive([ width: 150 }, tableForm:{ - isInpuFocusShow: true, // 开启查询弹窗 + isInpuFocusShow: false, // 开启查询弹窗 searchListPlaceholder: '请选择物料代码', searchField: 'code', searchTitle: '物料基础信息', @@ -620,6 +633,7 @@ export const StockupDetailRequest = useCrudSchemas(reactive([ table: { width: 120 }, + hiddenInMain: true }, { label: '物品描述2', @@ -630,6 +644,7 @@ export const StockupDetailRequest = useCrudSchemas(reactive([ table: { width: 120 }, + hiddenInMain: true }, { label: '项目代码', @@ -640,12 +655,18 @@ export const StockupDetailRequest = useCrudSchemas(reactive([ table: { width: 120 }, + hiddenInMain: true }, { label: '数量', field: 'qty', sort: 'custom', isSearch: true, + tableForm: { + type: 'InputNumber', + min: 1, + precision: 6 + }, }, { label: '计量单位', @@ -668,7 +689,15 @@ export const StockupDetailRequest = useCrudSchemas(reactive([ } }, { - label: '到库位代码', + label: '从库位', + field: 'fromLocationCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '到库位', field: 'toLocationCode', sort: 'custom', isSearch: true, @@ -719,6 +748,7 @@ export const StockupDetailRequest = useCrudSchemas(reactive([ field: 'remark', sort: 'custom', isSearch: true, + hiddenInMain: true }, { label: '创建时间', @@ -729,6 +759,7 @@ export const StockupDetailRequest = useCrudSchemas(reactive([ table: { width: 120 }, + hiddenInMain: true, search: { component: 'DatePicker', componentProps: { @@ -748,6 +779,7 @@ export const StockupDetailRequest = useCrudSchemas(reactive([ width: 150, fixed: 'right' }, + hiddenInMain: true, isTableForm:false, } ])) diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue index 1c32efa9a..de72d02f2 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue @@ -55,7 +55,15 @@ @handleDeleteTable="handleDeleteTable" @searchTableSuccess="searchTableSuccess" @submitForm="submitForm" - /> + > + + if (formField == 'secondPackUnit') { row['secondPackUnit'] = val[0]['packUnit'] row['secondPackQty'] = val[0]['packQty'] + }else if (formField == 'itemCode') { + row['uom'] = val[0]['uom'] + row['produceDate'] = dayjs().valueOf() } // 明细查询页赋值 row[formField] = val[0][searchField] @@ -544,6 +555,9 @@ const handleDeleteTable = (item, index) => { // 主子数据 提交 const submitForm = async (formType, data) => { + tableData.value.forEach((row, index) => { + row['expireDate'] = row['expireTime']?addDay(row['produceDate'],row['expireTime']).valueOf():dayjs('2099-12-31').valueOf() + }) data.type = 'predict' data.subList = tableData.value // 拼接子表数据参数 if(data.subList.find(item => (item.qty <= 0))) { diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts index 2b2d3db60..a17068459 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts @@ -122,6 +122,54 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ } } }, + { + label: '生产线代码', + field: 'productionLineCode', + sort: 'custom', + table: { + width: 150 + }, + isTable: false, + tableForm:{ + isInpuFocusShow: true, + searchListPlaceholder: '请选择生产线代码', + searchField: 'code', + searchTitle: '生产线信息', + searchAllSchemas: Productionline.allSchemas, + searchPage: ProductionlineApi.getProductionlinePage, + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + },{ + key: 'workshopCode', + value: 'workshopCode', + message: '请填写车间代码！', + isMainValue: true + }] + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: true, + searchListPlaceholder: '请选择生产线代码', + searchField: 'code', + searchTitle: '生产线信息', + searchAllSchemas: Productionline.allSchemas, + searchPage: ProductionlineApi.getProductionlinePage, + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + },{ + key: 'workshopCode', + value: 'workshopCode', + message: '请填写车间代码！', + isMainValue: true + }] + } + } + }, { label: '班组', field: 'team', @@ -515,6 +563,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + isTableForm: false, tableForm:{ isInpuFocusShow: true, searchListPlaceholder: '请选择生产线代码', @@ -990,9 +1039,13 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive table: { width: 180 }, - tableForm: { - type: 'FormDate', - valueFormat: 'x', + // tableForm: { + // type: 'FormDate', + // valueFormat: 'x', + // }, + tableForm:{ + type: 'slot', + disabled: true }, form: { component: 'DatePicker', diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue index e0ede38f8..aa20da612 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue @@ -55,7 +55,15 @@ @handleDeleteTable="handleDeleteTable" @searchTableSuccess="searchTableSuccess" @submitForm="submitForm" - /> + > + +