From 42f2efb4f4de93d7a0ddd787b73aa989bdbef9ba Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Mon, 6 May 2024 11:11:27 +0800 Subject: [PATCH] =?UTF-8?q?MES=E2=80=94=E2=80=94>=20PDA=20=20=E5=AD=97?= =?UTF-8?q?=E6=AE=B5maser=20=E6=9B=B4=E6=96=B0=20master?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/index/index.vue | 6 ++--- .../productOffline/createProductOffline.vue | 4 ++-- src/pages/mes/reworkSingle/create.vue | 4 ++-- src/pages/mes/workScheduling/bomInspect.vue | 9 ++++--- .../mes/workScheduling/equipmentInspect.vue | 6 ++--- .../mes/workScheduling/inspectionItems.vue | 24 +++++++++---------- .../mes/workScheduling/workScheduling.vue | 2 +- .../mes/workScheduling/workerInspect.vue | 6 ++--- 8 files changed, 30 insertions(+), 31 deletions(-) diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index cde5df9..fa6bd60 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -91,7 +91,7 @@ import { useCountStore } from '@/store' uni.hideLoading() if (res.menus.length > 0) { var menus = res.menus.filter(item => item.name == "PDA菜单管理") - console.log(11,menus) + //console.log(11,menus) if (menus.length > 0) { var tab = menus[0].children.filter(res => res.visible == true) tab.forEach(res => { @@ -106,7 +106,7 @@ import { useCountStore } from '@/store' this.tabbar.forEach(res => { res.children.forEach(res => { i++ - console.log(res.name, i) + //console.log(res.name, i) }) }) this.getDictory() @@ -170,7 +170,7 @@ import { useCountStore } from '@/store' var that = this; this.timer = setInterval(function() { that.getMainMessage(); - console.log('刷新菜单'); + //console.log('刷新菜单'); }, 1000 * 60) }, stopRefresh() { diff --git a/src/pages/mes/productOffline/createProductOffline.vue b/src/pages/mes/productOffline/createProductOffline.vue index e089cc2..d8dae91 100644 --- a/src/pages/mes/productOffline/createProductOffline.vue +++ b/src/pages/mes/productOffline/createProductOffline.vue @@ -165,7 +165,7 @@ function findProductByCode(productCode) { productItem.value = list.value.find(item => item.productCode === productCode); form.value.workBillno = productItem.value.schedulingCode - form.value.planCode = productItem.value.planMaserCode + form.value.planCode = productItem.value.planMasterCode form.value.processCode = productItem.value.workingNode form.value.stationCode = productItem.value.currentWorkstation } @@ -182,7 +182,7 @@ if (option.obj) { paramData.value = JSON.parse(decodeURIComponent(option.obj)); // 将字符串转换为对象并存入paramData form.value.workBillno = paramData.value.schedulingCode - form.value.planCode = paramData.value.planMaserCode + form.value.planCode = paramData.value.planMasterCode form.value.processCode = paramData.value.workingNode form.value.stationCode = paramData.value.currentWorkstation form.value.productCode = paramData.value.currentWorkstation diff --git a/src/pages/mes/reworkSingle/create.vue b/src/pages/mes/reworkSingle/create.vue index bb75146..93134f5 100644 --- a/src/pages/mes/reworkSingle/create.vue +++ b/src/pages/mes/reworkSingle/create.vue @@ -224,7 +224,7 @@ function findProductByCode(productCode) { productItem.value = list.value.find(item => item.productCode === productCode); form.value.workBillno = productItem.value.schedulingCode - form.value.planCode = productItem.value.planMaserCode + form.value.planCode = productItem.value.planMasterCode form.value.processCode = productItem.value.workingNode form.value.stationCode = productItem.value.currentWorkstation } @@ -241,7 +241,7 @@ if (option.obj) { paramData.value = JSON.parse(decodeURIComponent(option.obj)); // 将字符串转换为对象并存入paramData form.value.workBillno = paramData.value.schedulingCode - form.value.planCode = paramData.value.planMaserCode + form.value.planCode = paramData.value.planMasterCode form.value.processCode = paramData.value.workingNode form.value.stationCode = paramData.value.currentWorkstation form.value.productCode = paramData.value.currentWorkstation diff --git a/src/pages/mes/workScheduling/bomInspect.vue b/src/pages/mes/workScheduling/bomInspect.vue index b1dd4fc..f6aa428 100644 --- a/src/pages/mes/workScheduling/bomInspect.vue +++ b/src/pages/mes/workScheduling/bomInspect.vue @@ -45,7 +45,7 @@ const list = ref([]) const params = ref({ pageNo: 1, pageSize: 10, - planMaserCode: '' + planMasterCode: '' }) function getBomInspectList() { @@ -55,8 +55,6 @@ function getBomInspectList() { proxy.$modal.loading('加载中') orderDayPlanListApi.getBomInfoList(params.value).then((res) => { proxy.$modal.closeLoading() - console.log(params.value.pageNo) - console.log(res.data.list.length) if (res.data.list.length > 0) { list.value = list.value.concat(res.data.list) params.value.pageNo++ @@ -78,8 +76,9 @@ onReachBottom(() => { onLoad((option) => { - if (option.planMaserCode) { - params.value.planMaserCode = option.planMaserCode + console.log(option) + if (option.planMasterCode) { + params.value.planMasterCode = option.planMasterCode } }) onShow(() => { diff --git a/src/pages/mes/workScheduling/equipmentInspect.vue b/src/pages/mes/workScheduling/equipmentInspect.vue index 5d64fec..97898c1 100644 --- a/src/pages/mes/workScheduling/equipmentInspect.vue +++ b/src/pages/mes/workScheduling/equipmentInspect.vue @@ -45,7 +45,7 @@ const list = ref([]) const params = ref({ pageNo: 1, pageSize: 10, - planMaserCode: '' + planMasterCode: '' }) function getEquipmentInspectList() { @@ -78,8 +78,8 @@ onReachBottom(() => { onLoad((option) => { - if (option.planMaserCode) { - params.value.planMaserCode = option.planMaserCode + if (option.planMasterCode) { + params.value.planMasterCode = option.planMasterCode } }) onShow(() => { diff --git a/src/pages/mes/workScheduling/inspectionItems.vue b/src/pages/mes/workScheduling/inspectionItems.vue index a15b7d2..349e04c 100644 --- a/src/pages/mes/workScheduling/inspectionItems.vue +++ b/src/pages/mes/workScheduling/inspectionItems.vue @@ -17,7 +17,7 @@ - 明 细 + 明 细 - 明 细 + 明 细 - 明 细 + 明 细 质检模板号：{{ quaifyFormNo}} - 质检模板号：{{ bomInspectFlag}} + 主计划单号：{{ number}} 质检模板号：{{ bomRadioValue}} @@ -111,7 +111,7 @@ const equipmentRadioValue = ref('') const mesSchedulingParams = ref({ - planMaserCode: '', + planMasterCode: '', status: '', qualityFormNo: '', reason: '' @@ -135,7 +135,7 @@ function submit(index) { } if(mesSchedulingParams.value.status == '0'){ proxy.$modal.confirm("是否确认提交").then(()=>{ - mesSchedulingParams.value.planMaserCode = number.value + mesSchedulingParams.value.planMasterCode = number.value mesSchedulingParams.value.qualityFormNo = quaifyFormNo.value workSchedulingListApi.updateWorkSchedulingInfo(mesSchedulingParams.value).then((res) => { console.log(res.data) @@ -150,7 +150,7 @@ function submit(index) { function confirmReason() { mesSchedulingParams.value.reason = reasons.value proxy.$modal.confirm("是否确认提交").then(()=>{ - mesSchedulingParams.value.planMaserCode = number.value + mesSchedulingParams.value.planMasterCode = number.value mesSchedulingParams.value.qualityFormNo = quaifyFormNo.value console.log(mesSchedulingParams) workSchedulingListApi.updateWorkSchedulingInfo(mesSchedulingParams.value).then((res) => { @@ -165,22 +165,22 @@ function confirmReason() { } //打开明细 -function openDetail(index,itemVal) { +function openDetail(itemVal) { if(itemVal == 'bom'){ - proxy.$tab.navigateTo(`/pages/mes/workScheduling/bomInspect?planMaserCode=${index}`) + proxy.$tab.navigateTo(`/pages/mes/workScheduling/bomInspect?planMasterCode=${number.value}`) } if(itemVal == 'worker'){ - proxy.$tab.navigateTo(`/pages/mes/workScheduling/workerInspect?planMaserCode=${index}`) + proxy.$tab.navigateTo(`/pages/mes/workScheduling/workerInspect?planMasterCode=${number.value}`) } if(itemVal == 'equipment'){ - proxy.$tab.navigateTo(`/pages/mes/workScheduling/equipmentInspect?planMaserCode=${index}`) + proxy.$tab.navigateTo(`/pages/mes/workScheduling/equipmentInspect?planMasterCode=${number.value}`) } } onLoad((option) => { if (option.obj) { - number.value = JSON.parse(option.obj).planMaserCode + number.value = JSON.parse(option.obj).planMasterCode planDayId.value = JSON.parse(option.obj).id if( JSON.parse(option.obj).status == '-1'){ completeInspectStatus.value = true diff --git a/src/pages/mes/workScheduling/workScheduling.vue b/src/pages/mes/workScheduling/workScheduling.vue index eb8951a..3b16410 100644 --- a/src/pages/mes/workScheduling/workScheduling.vue +++ b/src/pages/mes/workScheduling/workScheduling.vue @@ -13,7 +13,7 @@ - {{item.planMasterCode}} + {{item.schedulingCode}} {{`${$time.formatDate(item.createTime)}`}} diff --git a/src/pages/mes/workScheduling/workerInspect.vue b/src/pages/mes/workScheduling/workerInspect.vue index b4269bc..3b582f0 100644 --- a/src/pages/mes/workScheduling/workerInspect.vue +++ b/src/pages/mes/workScheduling/workerInspect.vue @@ -44,7 +44,7 @@ const list = ref([]) const params = ref({ pageNo: 1, pageSize: 10, - planMaserCode: '' + planMasterCode: '' }) function getWorkerInspectList() { @@ -77,8 +77,8 @@ onReachBottom(() => { onLoad((option) => { - if (option.planMaserCode) { - params.value.planMaserCode = option.planMaserCode + if (option.planMasterCode) { + params.value.planMasterCode = option.planMasterCode } }) onShow(() => {