From 6442976b8d4d7ab7b4d7cfb18bf3b81289c757fd Mon Sep 17 00:00:00 2001 From: bb_pan Date: Thu, 26 Jun 2025 17:45:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=90=E6=96=99=E7=AB=99=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/materialsStation/index.js | 6 ++--- .../equipment/equipmentTracking/index.vue | 25 ++++++++---------- .../equipment/totalLeaseRecord/index.vue | 26 ++++--------------- .../equipment/totalReturnRecord/index.vue | 26 ++++--------------- .../apply/component/addToolsApply.vue | 1 + 5 files changed, 25 insertions(+), 59 deletions(-) diff --git a/src/api/materialsStation/index.js b/src/api/materialsStation/index.js index ef450dbf..3e01f290 100644 --- a/src/api/materialsStation/index.js +++ b/src/api/materialsStation/index.js @@ -491,7 +491,7 @@ export function updatePrintStatus(id) { // 保有设备总量查询 export function getRetainedEquipmentListApi(query) { return request({ - url: '/material/complex_query/getRetainedEquipmentList', + url: '/material/material_maMachine/getRetainedEquipmentList', method: 'get', params: query }) @@ -500,7 +500,7 @@ export function getRetainedEquipmentListApi(query) { // 保有设备总量查询-无分页 export function getRetainedEquipmentListNoPageApi(query) { return request({ - url: '/material/complex_query/getRetainedEquipmentListNoPage', + url: '/material/material_maMachine/getRetainedEquipmentListNoPage', method: 'get', params: query }) @@ -572,7 +572,7 @@ export function getAuditInputListApi(query) { // 机具追溯-列表 export const getMachineInfoApi = data => { return request({ - url: '/material/ma_machine/getMachineInfo', + url: '/material/material_maMachine/getMachineInfo', method: 'get', params: data }) diff --git a/src/views/materialsStation/equipment/equipmentTracking/index.vue b/src/views/materialsStation/equipment/equipmentTracking/index.vue index ffccfb36..15f7add0 100644 --- a/src/views/materialsStation/equipment/equipmentTracking/index.vue +++ b/src/views/materialsStation/equipment/equipmentTracking/index.vue @@ -11,7 +11,7 @@ style="width: 240px" /> - + + + - - + /> @@ -103,7 +100,7 @@ export default { keyWord: '', // 关键字 typeCodeId: undefined, // 设备类型ID typeCode: '', // 设备类型 - maModelId: undefined, // 规格型号ID + maModel: undefined, // 规格型号ID maModel: '' // 规格型号 }, typeCodeOpts: [], // 设备类型 @@ -111,7 +108,7 @@ export default { total: 0, // 总条数 // 表头 tableColumns: [ - { label: '物品类型', prop: 'typeName' }, + { label: '物品类型', prop: 'materialName' }, { label: '设备类型', prop: 'typeCode' }, { label: '规格型号', prop: 'maModel' }, { label: '设备编号', prop: 'maCode' }, @@ -129,7 +126,7 @@ export default { }, created() { this.getList() - this.getModelType() + // this.getModelType() }, methods: { // 查询 diff --git a/src/views/materialsStation/equipment/totalLeaseRecord/index.vue b/src/views/materialsStation/equipment/totalLeaseRecord/index.vue index cfca18ad..13a32532 100644 --- a/src/views/materialsStation/equipment/totalLeaseRecord/index.vue +++ b/src/views/materialsStation/equipment/totalLeaseRecord/index.vue @@ -109,7 +109,7 @@ :total="dlgTotal" :page.sync="dialogForm.pageNum" :limit.sync="dialogForm.pageSize" - @pagination="handleDlgQuery" + @pagination="getDetailsList" /> 关 闭 @@ -212,9 +212,9 @@ export default { } }, // 获取详情列表 - async getDetailsList(code) { + async getDetailsList() { try { - const res = await getDetailsListApi({ ...this.dialogForm, code }) + const res = await getDetailsListApi({ ...this.dialogForm }) console.log('🚀 ~ 获取详情列表 ~ res:', res) this.dialogList = res.data.rows this.dlgTotal = res.data.total @@ -230,7 +230,8 @@ export default { this.dialogTitle = '查看' this.dialogVisible = true setTimeout(() => { - this.getDetailsList(row.code) + this.dialogForm.code = row.code + this.getDetailsList() }, 100) }, // 领料单 @@ -266,23 +267,6 @@ export default { } catch (error) { console.log('导出数据失败', error) } - }, - // 弹框查询 - handleDlgQuery() { - console.log('弹框查询', this.dialogForm) - try { - // const res = await - } catch (error) { - console.log('弹框查询失败', error) - } - }, - // 弹框重置 - handleDlgReset() { - console.log('弹框重置') - this.dialogForm.pageNum = 1 - this.dialogForm.pageSize = 10 - this.dialogForm.keyWord = '' - this.handleDlgQuery() } } } diff --git a/src/views/materialsStation/equipment/totalReturnRecord/index.vue b/src/views/materialsStation/equipment/totalReturnRecord/index.vue index f74de5cb..a75d37b3 100644 --- a/src/views/materialsStation/equipment/totalReturnRecord/index.vue +++ b/src/views/materialsStation/equipment/totalReturnRecord/index.vue @@ -106,7 +106,7 @@ :total="dlgTotal" :page.sync="dialogForm.pageNum" :limit.sync="dialogForm.pageSize" - @pagination="handleDlgQuery" + @pagination="getDetailsList" /> 关 闭 @@ -200,9 +200,9 @@ export default { } }, // 获取详情列表 - async getDetailsList(code) { + async getDetailsList() { try { - const res = await getBackDetailsListApi({ code, ...this.dialogForm }) + const res = await getBackDetailsListApi({ ...this.dialogForm }) console.log('🚀 ~ 获取详情列表 ~ res:', res) this.dialogList = res.data.rows this.dlgTotal = res.data.total @@ -218,7 +218,8 @@ export default { this.dialogTitle = '查看' this.dialogVisible = true setTimeout(() => { - this.getDetailsList(row.code) + this.dialogForm.code = row.code + this.getDetailsList() }, 100) }, // 退料单 @@ -246,23 +247,6 @@ export default { } catch (error) { console.log('导出数据失败', error) } - }, - // 弹框查询 - handleDlgQuery() { - console.log('弹框查询', this.dialogForm) - try { - // const res = await - } catch (error) { - console.log('弹框查询失败', error) - } - }, - // 弹框重置 - handleDlgReset() { - console.log('弹框重置') - this.dialogForm.pageNum = 1 - this.dialogForm.pageSize = 10 - this.dialogForm.keyWord = '' - this.handleDlgQuery() } } } diff --git a/src/views/materialsStation/toolsLease/apply/component/addToolsApply.vue b/src/views/materialsStation/toolsLease/apply/component/addToolsApply.vue index 9f1e5165..c09961a7 100644 --- a/src/views/materialsStation/toolsLease/apply/component/addToolsApply.vue +++ b/src/views/materialsStation/toolsLease/apply/component/addToolsApply.vue @@ -145,6 +145,7 @@ +