From 8776771768094f20a1d219923e46e54edd9f837a Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Thu, 26 Sep 2024 18:12:08 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=BC=E5=90=88=E6=9F=A5=E8=AF=A2=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E9=A2=86=E6=96=99=E5=87=BA=E5=BA=93=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E5=87=BA=E7=AD=89=E5=8A=9F=E8=83=BD=EF=BC=8C?= =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E6=A8=A1=E5=9D=97=E4=BC=98=E5=8C=96=EF=BC=8C?= =?UTF-8?q?=E9=A2=86=E6=96=99=E5=87=BA=E5=BA=93=E6=A8=A1=E5=9D=97=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=87=BA=E5=BA=93=E8=AE=B0=E5=BD=95=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E5=87=BA=E7=AD=89=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/claimAndRefund/receive.js | 8 + src/api/stquery/outboundPreview.js | 13 + .../claimAndreturn/picking/outbound/index.vue | 147 ++++++++++- src/views/repairTest/repair/dialogOneForm.vue | 16 +- src/views/repairTest/repair/dialogTwoForm.vue | 8 +- src/views/repairTest/repair/index.vue | 4 +- .../components/outbound-form.vue | 163 ++++++++++++ .../components/outbound-order.vue | 247 ++++++++++++++++++ .../components/outbound-table.vue | 127 +++++++++ src/views/stquery/outboundPreview/index.vue | 15 ++ .../toolsAcceptance/component/addTools.vue | 17 -- vue.config.js | 4 +- 12 files changed, 736 insertions(+), 33 deletions(-) create mode 100644 src/api/stquery/outboundPreview.js create mode 100644 src/views/stquery/outboundPreview/components/outbound-form.vue create mode 100644 src/views/stquery/outboundPreview/components/outbound-order.vue create mode 100644 src/views/stquery/outboundPreview/components/outbound-table.vue create mode 100644 src/views/stquery/outboundPreview/index.vue diff --git a/src/api/claimAndRefund/receive.js b/src/api/claimAndRefund/receive.js index 4834fd9..fc7656f 100644 --- a/src/api/claimAndRefund/receive.js +++ b/src/api/claimAndRefund/receive.js @@ -312,3 +312,11 @@ export function pushSmartEngineeringApi(data) { data, }) } +// 推送智慧工程 +export function getLeaseOutDetailRecordApi(data) { + return request({ + url: '/material/base/tm_task/getLeaseOutDetailRecord', + method: 'get', + params: data, + }) +} diff --git a/src/api/stquery/outboundPreview.js b/src/api/stquery/outboundPreview.js new file mode 100644 index 0000000..9806bde --- /dev/null +++ b/src/api/stquery/outboundPreview.js @@ -0,0 +1,13 @@ +import request from '@/utils/request' + +/** + * 出库查询页面接口 + */ + +/* 出库列表数据 */ + +export const getOutboundListApi = (data) => { + return request.get('/material/inputRecord/getOutputRecordList', { + params: data, + }) +} diff --git a/src/views/claimAndreturn/picking/outbound/index.vue b/src/views/claimAndreturn/picking/outbound/index.vue index 1436135..0e0e69b 100644 --- a/src/views/claimAndreturn/picking/outbound/index.vue +++ b/src/views/claimAndreturn/picking/outbound/index.vue @@ -189,7 +189,7 @@ + + + + + + + + + + + + + 查询 + 重置 + 导出 + + + + + + + + + + + + + @@ -522,6 +615,7 @@ import { getDetailsByTypeId, submitOut, submitNumOut, + getLeaseOutDetailRecordApi, } from '@/api/claimAndRefund/receive.js' import { getTypeList } from '@/api/store/warehousing' import { equipmentTypeTree } from '@/api/store/tools' @@ -604,6 +698,16 @@ export default { outCodeList: [], //编码弹窗表格数据 outNumList: [], //数量弹窗表格数据 leaseType: '', // 领用类型 0 为工程租赁 1 为长期领用 + + outRecordVisible: false, + leaseOutDetailParams: { + id: '', + typeId: '', + startTime: '', + endTime: '', + }, + leaseOutDetailsList: [], + outTime: [], } }, created() { @@ -685,6 +789,7 @@ export default { this.openLeaseDevices = true this.isView = true this.dialogQuery.id = row.id + this.leaseOutDetailParams.id = row.id this.resetDialogQuery() // this.getDialogList(); }, @@ -841,6 +946,46 @@ export default { `领料出库_${new Date().getTime()}.xlsx`, ) }, + + /* 查看出库记录 */ + onPreviewRecord(row) { + this.leaseOutDetailParams.typeId = row.typeId + this.onHandleQuery().then(() => { + this.outRecordVisible = true + }) + }, + + async onHandleQuery() { + const res = await getLeaseOutDetailRecordApi( + this.leaseOutDetailParams, + ) + this.leaseOutDetailsList = res.data + }, + onHandleReset() { + this.outTime = [] + this.leaseOutDetailParams.startTime = '' + this.leaseOutDetailParams.endTime = '' + this.onHandleQuery() + }, + onHandleExport() { + this.download( + 'material/base/tm_task/exportLeaseOutDetailRecord', + { + ...this.leaseOutDetailParams, + }, + `机具出库列表.xlsx`, + ) + }, + onOutTimeChange(val) { + if (val.length > 0) { + const [_1, _2] = val + this.leaseOutDetailParams.startTime = _1 + this.leaseOutDetailParams.endTime = _2 + } else { + this.leaseOutDetailParams.startTime = '' + this.leaseOutDetailParams.endTime = '' + } + }, }, } diff --git a/src/views/repairTest/repair/dialogOneForm.vue b/src/views/repairTest/repair/dialogOneForm.vue index e046eb7..4a82f36 100644 --- a/src/views/repairTest/repair/dialogOneForm.vue +++ b/src/views/repairTest/repair/dialogOneForm.vue @@ -37,7 +37,7 @@ noResultsText="没有搜索结果" placeholder="请选择配件" :disable-branch-nodes="true" - @input="handleSelectTree" + @input="handleSelectTree($event, index)" /> - 是 否 - + --> - 是 否 - + --> - 是 否 - + --> - 是 否 - + -->
- 维修合格 - + --> +
+ + + + + + + + + + + + + + + + + + + + + + 查询 + 重置 + 导出 + 出库单 + + + + +
+ + + diff --git a/src/views/stquery/outboundPreview/components/outbound-order.vue b/src/views/stquery/outboundPreview/components/outbound-order.vue new file mode 100644 index 0000000..36f1ded --- /dev/null +++ b/src/views/stquery/outboundPreview/components/outbound-order.vue @@ -0,0 +1,247 @@ + + + + + diff --git a/src/views/stquery/outboundPreview/components/outbound-table.vue b/src/views/stquery/outboundPreview/components/outbound-table.vue new file mode 100644 index 0000000..eee7a40 --- /dev/null +++ b/src/views/stquery/outboundPreview/components/outbound-table.vue @@ -0,0 +1,127 @@ + + + diff --git a/src/views/stquery/outboundPreview/index.vue b/src/views/stquery/outboundPreview/index.vue new file mode 100644 index 0000000..cee063c --- /dev/null +++ b/src/views/stquery/outboundPreview/index.vue @@ -0,0 +1,15 @@ + + + diff --git a/src/views/warehouseManage/newPurchase/toolsAcceptance/component/addTools.vue b/src/views/warehouseManage/newPurchase/toolsAcceptance/component/addTools.vue index 371a8da..4a0400f 100644 --- a/src/views/warehouseManage/newPurchase/toolsAcceptance/component/addTools.vue +++ b/src/views/warehouseManage/newPurchase/toolsAcceptance/component/addTools.vue @@ -809,23 +809,6 @@ export default { }, } -// - -