From 2975a35b3fb9b8589f6702e2e3fe173509a62c22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B3=BD=E8=85=BE?= <1178634255@qq.com> Date: Fri, 25 Aug 2023 09:28:52 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E8=B5=84=E8=B4=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/inventory/deviceCert.js | 68 +++ src/views/inventory/DeptDeviceDetail.vue | 29 +- src/views/inventory/invDeviceEditDialog.vue | 471 ++++++++++++++++++++ src/views/system/dept/invWarehouse.vue | 1 - 4 files changed, 560 insertions(+), 9 deletions(-) create mode 100644 src/api/inventory/deviceCert.js create mode 100644 src/views/inventory/invDeviceEditDialog.vue diff --git a/src/api/inventory/deviceCert.js b/src/api/inventory/deviceCert.js new file mode 100644 index 00000000..546c596d --- /dev/null +++ b/src/api/inventory/deviceCert.js @@ -0,0 +1,68 @@ +import axios from "@/utils/request"; + +export function filterDeviceCert(query) { + return axios( + { + url: "/inv/device/cert/filter", + method: "get", + params: query + } + ) +} + + +export function insertCompanyCert(query) { + return axios( + { + url: "/sup/info/insertCompanyCert", + method: "post", + data: query + } + ); +} + +export function updateCompanyCert(query) { + return axios( + { + url: "/sup/info/updateCompanyCert", + method: "post", + data: query + } + ); +} + +export function auditSupCert(query) { + return axios( + { + url: "/sale/sup/cert/audit", + method: "post", + data: query + } + ); +} + + +export function deleteCompanyCert(query) { + return axios( + { + url: "/sup/info/deleteCompanyCert", + method: "post", + data: query + } + ); +} + + +export function revokeSupCert(query) { + return axios( + { + url: "/sale/sup/cert/revoke", + method: "post", + data: query + } + ); +} + + + + diff --git a/src/views/inventory/DeptDeviceDetail.vue b/src/views/inventory/DeptDeviceDetail.vue index 3564481c..50a1328f 100644 --- a/src/views/inventory/DeptDeviceDetail.vue +++ b/src/views/inventory/DeptDeviceDetail.vue @@ -43,7 +43,6 @@ - @@ -66,7 +65,6 @@ - @@ -107,7 +105,6 @@ -
显示/隐藏搜索栏 @@ -116,10 +113,9 @@ 添加设备
- - @@ -176,18 +172,24 @@ > - + + + + + + - - { + this.selectedRowData = row // 将选中的行数据保存到 selectedRow 变量中 + + }) + }, hideSearch() { this.showSearch = !this.showSearch; }, @@ -505,6 +517,7 @@ export default { }; }, components: { + checkResultPanel, deptDeviceModifyDialog, inspectSetModifyDialog }, diff --git a/src/views/inventory/invDeviceEditDialog.vue b/src/views/inventory/invDeviceEditDialog.vue new file mode 100644 index 00000000..e11cdf87 --- /dev/null +++ b/src/views/inventory/invDeviceEditDialog.vue @@ -0,0 +1,471 @@ + + + + diff --git a/src/views/system/dept/invWarehouse.vue b/src/views/system/dept/invWarehouse.vue index 6f064617..fd5d6c01 100644 --- a/src/views/system/dept/invWarehouse.vue +++ b/src/views/system/dept/invWarehouse.vue @@ -375,7 +375,6 @@ - From 05d23b9c7bbfd93c3a34a5fbdac5bcf4479dad90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B3=BD=E8=85=BE?= <1178634255@qq.com> Date: Fri, 25 Aug 2023 09:53:06 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E8=B5=84=E8=B4=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inventory/DeptDeviceDetail.vue | 29 ++++++++++++++++----- src/views/inventory/invDeviceEditDialog.vue | 4 +-- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/src/views/inventory/DeptDeviceDetail.vue b/src/views/inventory/DeptDeviceDetail.vue index 50a1328f..b0514a71 100644 --- a/src/views/inventory/DeptDeviceDetail.vue +++ b/src/views/inventory/DeptDeviceDetail.vue @@ -115,7 +115,7 @@ @@ -323,13 +323,30 @@ export default { }; }, methods: { + handInvChange(row) { //列表选中 + this.invManage(row); + + }, + invManage(row) { + this.selectedRowData = { + deptCode: this.$store.getters.locDeptCode, + invCode: this.$store.getters.locInvCode, + deviceName: null, + code: null, + ggxh: null, + batchNo: null, + status: 1, + addType: 1, + page: 1 + }; + }, listClick(row) { - this.selectedRowData = null - // 处理行点击事件 异步操作，nexgtTick是先让selectedRow更新完在做的执行操作 - this.$nextTick(res=>{ + // this.selectedRowData = null + // // 处理行点击事件 异步操作，nexgtTick是先让selectedRow更新完在做的执行操作 + // this.$nextTick(res=>{ this.selectedRowData = row // 将选中的行数据保存到 selectedRow 变量中 - - }) + // + // }) }, hideSearch() { this.showSearch = !this.showSearch; diff --git a/src/views/inventory/invDeviceEditDialog.vue b/src/views/inventory/invDeviceEditDialog.vue index e11cdf87..049d214e 100644 --- a/src/views/inventory/invDeviceEditDialog.vue +++ b/src/views/inventory/invDeviceEditDialog.vue @@ -278,9 +278,9 @@ export default { console.log("第一次this.rowData:") console.log(this.rowData) // if (this.editType == 1) { - // this.getCompanyCertList();获取资质证书 + this.getDeviceCertList(); // } - this.getDeviceCertList(); + this.getBasicUnitMaintainsList(); this.headers = { ADMIN_ID: store.getters.adminId,