From dac9009488cb1b4ab6baab95d5124db263272923 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Thu, 11 Jul 2024 10:11:54 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=AE=A1=E9=87=8F=E5=8D=95=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventorymoveRequestMain/inventorymoveRequestMain.data.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts index d22558b36..1bd34a6ae 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts @@ -632,7 +632,8 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( width: 150 }, tableForm: { - type: 'Select' + type: 'Select', + disabled: true }, form: { componentProps: { From 20a42cb609564df2fc089d854d172a14b9c24e28 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 11 Jul 2024 10:34:45 +0800 Subject: [PATCH 2/6] =?UTF-8?q?bom=E9=BB=98=E8=AE=A4=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productdismantleRequestMain/index.vue | 16 ++++++++++++++++ .../productrepairRequestMain/index.vue | 16 ++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue index 06a8d79a5..8f9c31ca3 100644 --- a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue +++ b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue @@ -111,6 +111,7 @@ import * as ProductdismantleRequestDetailApi from '@/api/wms/productdismantleReq import * as defaultButtons from '@/utils/disposition/defaultButtons' import * as BomDismantleApi from '@/api/wms/bomDismantle' import * as dismantleRequestDetailbApi from '@/api/wms/dismantleRequestDetailb' +import * as BomApi from "@/api/wms/bom"; // 制品拆解申请 @@ -270,6 +271,21 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => row['expireDate'] = val[0]['expireDate'] row['bomVersion'] = '' row['childList'] = [] + // 查看BOM版本 + const param1 = { + productItemCode: val[0]['itemCode'], + available: 'TRUE', + pageSize: 20, + pageNo: 1, + sort: '', + by: 'ASC', + } + BomApi.getBomPage(param1).then(res => { + console.log(res) + if(res?.list?.length>0){ + row['bomVersion'] = res.list[0].version + } + }) } else { val.forEach(item=>{ const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue index 3bc4b80e4..8c2482afd 100644 --- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue +++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue @@ -116,6 +116,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import * as BomDismantleApi from '@/api/wms/bomDismantle' import * as dismantleRequestDetailbApi from "@/api/wms/dismantleRequestDetailb"; import {updateProductscrapDetailRequestBom} from "@/api/wms/productrepairRequestMain"; +import * as BomApi from "@/api/wms/bom"; // 制品返修申请 @@ -246,6 +247,21 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => row['fgFromLocationCode'] = val[0]['locationCode'] row['bomVersion'] = '' row['childList'] = [] + // 查看BOM版本 + const param1 = { + productItemCode: val[0]['itemCode'], + available: 'TRUE', + pageSize: 20, + pageNo: 1, + sort: '', + by: 'ASC', + } + BomApi.getBomPage(param1).then(res => { + console.log(res) + if(res?.list?.length>0){ + row['bomVersion'] = res.list[0].version + } + }) } else if(formField == 'productionLineCode'){ row['productionLineCode'] = val[0]['code'] } else if(formField == 'workStationCode'){ From e7dedabe7c1928f7a1d263fd3b51c80a2b23d003 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 11 Jul 2024 10:54:33 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?= =?UTF-8?q?=E7=A5=A8=E8=AE=B0=E5=BD=95=E4=B8=AD=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoiceRecordMain.data.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts index fe31c9a12..a73fe67a4 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts @@ -987,7 +987,7 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive Date: Thu, 11 Jul 2024 11:05:47 +0800 Subject: [PATCH 4/6] =?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 --- src/views/qms/inspectionJob/inspectionJobMain.data.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/qms/inspectionJob/inspectionJobMain.data.ts b/src/views/qms/inspectionJob/inspectionJobMain.data.ts index 1db4e1263..51c9b2d86 100644 --- a/src/views/qms/inspectionJob/inspectionJobMain.data.ts +++ b/src/views/qms/inspectionJob/inspectionJobMain.data.ts @@ -444,7 +444,7 @@ export const InspectionJobMain = useCrudSchemas( isDetail: false, isForm: false, table: { - width: 200, + width: 250, fixed: 'right' } } From 1e10a40f9ccdfe9d74b12ea9916047d27c55d532 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Thu, 11 Jul 2024 11:18:03 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E9=9A=90=E8=97=8F=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=A4=87=E6=96=99=E8=AE=A1=E5=88=92=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionplan/productionMain/index.vue | 20 +++++++++---------- .../productionMainAssemble/index.vue | 20 +++++++++---------- .../productionMainAssembleSparePart/index.vue | 20 +++++++++---------- .../productionMainPredictSparePart/index.vue | 20 +++++++++---------- 4 files changed, 40 insertions(+), 40 deletions(-) diff --git a/src/views/wms/productionManage/productionplan/productionMain/index.vue b/src/views/wms/productionManage/productionplan/productionMain/index.vue index 17b8a3676..a71293867 100644 --- a/src/views/wms/productionManage/productionplan/productionMain/index.vue +++ b/src/views/wms/productionManage/productionplan/productionMain/index.vue @@ -252,16 +252,16 @@ const butttondata = (row,$index) => { defaultButtons.mainListPlanResBtn({hide:isShowMainButton(row,['4']),hasPermi:'wms:production-main:resetting'}), // 重置 defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:update'}), // 编辑 // defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:delete'}), // 删除 - { - label: '生成备料计划', - name: 'scbljh', - hide: isShowMainButton(row,['6']), - type: 'primary', - icon: 'Select', - hasPermi:'wms:production-main:publish', - link: true, // 文本展现按钮 - color: '' - }, + // { + // label: '生成备料计划', + // name: 'scbljh', + // hide: isShowMainButton(row,['6']), + // type: 'primary', + // icon: 'Select', + // hasPermi:'wms:production-main:publish', + // link: true, // 文本展现按钮 + // color: '' + // }, { label: '生成收货申请', name: 'scshsq', diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue index 9547ad2f5..850ebebeb 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue +++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue @@ -245,16 +245,16 @@ const butttondata = (row,$index) => { defaultButtons.mainListPlanResBtn({hide:isShowMainButton(row,['4']),hasPermi:'wms:production-main:resetting'}), // 重置 defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:update'}), // 编辑 // defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:delete'}), // 删除 - { - label: '生成备料计划', - name: 'scbljh', - hide: isShowMainButton(row,['6']), - type: 'primary', - icon: 'Select', - hasPermi:'wms:production-main:publish', - link: true, // 文本展现按钮 - color: '' - }, + // { + // label: '生成备料计划', + // name: 'scbljh', + // hide: isShowMainButton(row,['6']), + // type: 'primary', + // icon: 'Select', + // hasPermi:'wms:production-main:publish', + // link: true, // 文本展现按钮 + // color: '' + // }, { label: '生成收货申请', name: 'scshsq', diff --git a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue index 09206440d..86075935e 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue +++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue @@ -245,16 +245,16 @@ const butttondata = (row,$index) => { defaultButtons.mainListPlanResBtn({hide:isShowMainButton(row,['4']),hasPermi:'wms:production-main:resetting'}), // 重置 defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:update'}), // 编辑 // defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:delete'}), // 删除 - { - label: '生成备料计划', - name: 'scbljh', - hide: isShowMainButton(row,['6']), - type: 'primary', - icon: 'Select', - hasPermi:'wms:production-main:publish', - link: true, // 文本展现按钮 - color: '' - }, + // { + // label: '生成备料计划', + // name: 'scbljh', + // hide: isShowMainButton(row,['6']), + // type: 'primary', + // icon: 'Select', + // hasPermi:'wms:production-main:publish', + // link: true, // 文本展现按钮 + // color: '' + // }, { label: '生成收货申请', name: 'scshsq', diff --git a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue index 13bbfbac3..15a77d617 100644 --- a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue +++ b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue @@ -245,16 +245,16 @@ const butttondata = (row,$index) => { defaultButtons.mainListPlanResBtn({hide:isShowMainButton(row,['4']),hasPermi:'wms:production-main:resetting'}), // 重置 defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:update'}), // 编辑 // defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:delete'}), // 删除 - { - label: '生成备料计划', - name: 'scbljh', - hide: isShowMainButton(row,['6']), - type: 'primary', - icon: 'Select', - hasPermi:'wms:production-main:publish', - link: true, // 文本展现按钮 - color: '' - }, + // { + // label: '生成备料计划', + // name: 'scbljh', + // hide: isShowMainButton(row,['6']), + // type: 'primary', + // icon: 'Select', + // hasPermi:'wms:production-main:publish', + // link: true, // 文本展现按钮 + // color: '' + // }, { label: '生成收货申请', name: 'scshsq', From 11b3d63acaba85379d9613387ef1f54957808484 Mon Sep 17 00:00:00 2001 From: chenfang Date: Thu, 11 Jul 2024 11:35:30 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=B8=8D=E5=90=88=E6=A0=BC=E8=BD=AC?= =?UTF-8?q?=E9=9A=94=E7=A6=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventorymoveRequestMain/index.vue | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue index 9eceed8a9..30e3cdf70 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue @@ -123,6 +123,15 @@ const { tableObject, tableMethods } = useTable({ toInventoryStatus.value = "HOLD" businessType.value = 'OkToHold' importFileName.value = '合格转隔离申请' +}else if ( routeName.value == 'NoktoholdRequestMain') { + tableObject.params = { + fromInventoryStatus: 'NOK', + toInventoryStatus:'HOLD' + } + fromInventoryStatus.value = 'NOK' + toInventoryStatus.value = "HOLD" + businessType.value = 'NokToHold' + importFileName.value = '不合格转隔离申请' } else if ( routeName.value == 'HoldtookRequestMain') { tableObject.params = { fromInventoryStatus: 'HOLD', @@ -344,6 +353,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => newRow['qty'] = item['packQty'] if(routeName.value == 'OktoholdRequestMain'){ newRow['toInventoryStatus'] = "HOLD" + }else if(routeName.value == 'NoktoholdRequestMain'){ + newRow['toInventoryStatus'] = "HOLD" }else if ( routeName.value == 'HoldtookRequestMain') { newRow['toInventoryStatus'] = "OK" }else if ( routeName.value == 'HoldtoscrapRequestMain') { @@ -396,6 +407,8 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => { setV['uom'] = val[0]['uom'] if(routeName.value == 'OktoholdRequestMain'){ setV['toInventoryStatus'] = "HOLD" + }else if(routeName.value == 'NoktoholdRequestMain'){ + setV['toInventoryStatus'] = "HOLD" }else if ( routeName.value == 'HoldtookRequestMain') { setV['toInventoryStatus'] = "OK" }else if ( routeName.value == 'HoldtoscrapRequestMain') {