From 5cc28dc32efcd712aa5e72936549d4de65a04e9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BE=99=E8=BF=90=E6=A8=A1?= <1724894114@qq.com>
Date: Tue, 5 Nov 2024 11:27:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=87=BA=E7=9A=84?=
=?UTF-8?q?=E7=A6=81=E7=94=A8=E7=8A=B6=E6=80=81=E5=92=8C=E5=A2=9E=E5=8A=A0?=
=?UTF-8?q?=E7=94=A8=E6=88=B7=E6=97=A5=E5=BF=97=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/model/user.js | 7 +++++
src/components/scExport/index.vue | 7 +++--
src/views/cost/feeRecords/index.vue | 2 +-
src/views/cost/shipmentStatistics/index.vue | 2 +-
src/views/docsManager/document.vue | 2 +-
src/views/finance/feesStatistics/index.vue | 2 +-
src/views/inventory/inoutRecord/index.vue | 2 +-
src/views/order/inventoryStatistics/index.vue | 2 +-
src/views/order/orderList/index.vue | 2 +-
src/views/reports/keepRepairReports/index.vue | 2 +-
src/views/reports/shipmentReports/index.vue | 2 +-
src/views/setting/bom/index.vue | 1 -
src/views/setting/company/index.vue | 2 +-
.../setting/partsMag/components/info.vue | 2 +-
.../setting/partsMag/components/library.vue | 2 +-
.../shipment/shipmentDataConfirm/index.vue | 2 +-
.../shipment/shipmentStatistics/index.vue | 2 +-
src/views/userCenter/user/logs.vue | 27 +++++++++++++++++--
18 files changed, 51 insertions(+), 19 deletions(-)
diff --git a/src/api/model/user.js b/src/api/model/user.js
index 8cf170c..2cbb531 100644
--- a/src/api/model/user.js
+++ b/src/api/model/user.js
@@ -93,6 +93,13 @@ export default {
return await http.post(this.url, params);
},
},
+ export:{
+ url: `${config.API_URL}/user.log.export`,
+ name: "用户日志导出",
+ post: async function (params) {
+ return await http.post(this.url,params);
+ }
+ },
subscribe:{
list:{
url: `${config.API_URL}/messages.subscribe.list`,
diff --git a/src/components/scExport/index.vue b/src/components/scExport/index.vue
index 58f782c..4a1c444 100644
--- a/src/components/scExport/index.vue
+++ b/src/components/scExport/index.vue
@@ -47,7 +47,7 @@ export default {
},
methods:{
getWsResult(res){
- if(res.data && (res.data.type == 6 || res.data.type == 7 || res.data.type == 8 || res.data.type == 11 || res.data.type == 19 || res.data.type == 20 || res.data.type == 29 || res.data.type == 30 || res.data.type == 32 || res.data.type == 33)){
+ if(res.data && (res.data.type == 6 || res.data.type == 7 || res.data.type == 8 || res.data.type == 11 || res.data.type == 19 || res.data.type == 20 || res.data.type == 29 || res.data.type == 30 || res.data.type == 32 || res.data.type == 33 || res.data.type == 34)){
let item = {
type:res.data.type,
type_desc:res.data.type_desc,
@@ -83,9 +83,12 @@ export default {
case 32:
this.list[8] = item;
break;
- default:
+ case 33:
this.list[9] = item;
break;
+ default:
+ this.list[10] = item;
+ break;
}
if(res.data && res.data.status == 1100){
diff --git a/src/views/cost/feeRecords/index.vue b/src/views/cost/feeRecords/index.vue
index 4737f2c..1b03f5f 100644
--- a/src/views/cost/feeRecords/index.vue
+++ b/src/views/cost/feeRecords/index.vue
@@ -16,7 +16,7 @@
- 下载
+ 下载
diff --git a/src/views/cost/shipmentStatistics/index.vue b/src/views/cost/shipmentStatistics/index.vue
index 975498f..0dd8283 100644
--- a/src/views/cost/shipmentStatistics/index.vue
+++ b/src/views/cost/shipmentStatistics/index.vue
@@ -24,7 +24,7 @@
- 下载
+ 下载
diff --git a/src/views/docsManager/document.vue b/src/views/docsManager/document.vue
index f772f04..57a6dad 100644
--- a/src/views/docsManager/document.vue
+++ b/src/views/docsManager/document.vue
@@ -55,7 +55,7 @@
- 下载
+ 下载
diff --git a/src/views/finance/feesStatistics/index.vue b/src/views/finance/feesStatistics/index.vue
index b568ca2..49a4257 100644
--- a/src/views/finance/feesStatistics/index.vue
+++ b/src/views/finance/feesStatistics/index.vue
@@ -8,7 +8,7 @@
查询
重置
- 下载
+ 下载
diff --git a/src/views/inventory/inoutRecord/index.vue b/src/views/inventory/inoutRecord/index.vue
index ef1806c..7a7df60 100644
--- a/src/views/inventory/inoutRecord/index.vue
+++ b/src/views/inventory/inoutRecord/index.vue
@@ -14,7 +14,7 @@
- 下载
+ 下载
diff --git a/src/views/order/inventoryStatistics/index.vue b/src/views/order/inventoryStatistics/index.vue
index e84f612..16fc4e4 100644
--- a/src/views/order/inventoryStatistics/index.vue
+++ b/src/views/order/inventoryStatistics/index.vue
@@ -14,7 +14,7 @@
- 下载
+ 下载
diff --git a/src/views/order/orderList/index.vue b/src/views/order/orderList/index.vue
index 302cfa4..3475297 100644
--- a/src/views/order/orderList/index.vue
+++ b/src/views/order/orderList/index.vue
@@ -17,7 +17,7 @@
- 下载
+ 下载
diff --git a/src/views/reports/keepRepairReports/index.vue b/src/views/reports/keepRepairReports/index.vue
index ef1806c..7a7df60 100644
--- a/src/views/reports/keepRepairReports/index.vue
+++ b/src/views/reports/keepRepairReports/index.vue
@@ -14,7 +14,7 @@
- 下载
+ 下载
diff --git a/src/views/reports/shipmentReports/index.vue b/src/views/reports/shipmentReports/index.vue
index ef1806c..7a7df60 100644
--- a/src/views/reports/shipmentReports/index.vue
+++ b/src/views/reports/shipmentReports/index.vue
@@ -14,7 +14,7 @@
- 下载
+ 下载
diff --git a/src/views/setting/bom/index.vue b/src/views/setting/bom/index.vue
index 82ec86b..66e9916 100644
--- a/src/views/setting/bom/index.vue
+++ b/src/views/setting/bom/index.vue
@@ -162,7 +162,6 @@ export default {
if(params.type == 33){
this.exportShow = params.status==0?true:false
}
- console.log('我接受的消息：',params.type, params.status,this.exportShow)
},
async exportData() {
if(this.exportShow) return
diff --git a/src/views/setting/company/index.vue b/src/views/setting/company/index.vue
index e5e6134..842a7a4 100644
--- a/src/views/setting/company/index.vue
+++ b/src/views/setting/company/index.vue
@@ -14,7 +14,7 @@
- 下载
+ 下载
diff --git a/src/views/setting/partsMag/components/info.vue b/src/views/setting/partsMag/components/info.vue
index 0779388..9373702 100644
--- a/src/views/setting/partsMag/components/info.vue
+++ b/src/views/setting/partsMag/components/info.vue
@@ -15,7 +15,7 @@
- 下载
+ 下载
diff --git a/src/views/setting/partsMag/components/library.vue b/src/views/setting/partsMag/components/library.vue
index a6c1630..4931dcb 100644
--- a/src/views/setting/partsMag/components/library.vue
+++ b/src/views/setting/partsMag/components/library.vue
@@ -15,7 +15,7 @@
- 下载
+ 下载
diff --git a/src/views/shipment/shipmentDataConfirm/index.vue b/src/views/shipment/shipmentDataConfirm/index.vue
index c8c642a..b563375 100644
--- a/src/views/shipment/shipmentDataConfirm/index.vue
+++ b/src/views/shipment/shipmentDataConfirm/index.vue
@@ -14,7 +14,7 @@
- 下载
+ 下载
diff --git a/src/views/shipment/shipmentStatistics/index.vue b/src/views/shipment/shipmentStatistics/index.vue
index 1d3dbe2..55f0108 100644
--- a/src/views/shipment/shipmentStatistics/index.vue
+++ b/src/views/shipment/shipmentStatistics/index.vue
@@ -14,7 +14,7 @@
- 下载
+ 下载
diff --git a/src/views/userCenter/user/logs.vue b/src/views/userCenter/user/logs.vue
index a9142b3..a6c728c 100644
--- a/src/views/userCenter/user/logs.vue
+++ b/src/views/userCenter/user/logs.vue
@@ -8,6 +8,11 @@
查询
重置
+
+
+ 下载
+
+
@@ -34,6 +39,7 @@
column: [],
},
infoDrawer: false,
+ exportShow:false,
searchList:[
{name:'操作日期',type:'date',code:'created_at'},
@@ -55,7 +61,12 @@
}
},
async getTypeList(data,params) {
- const res = await this.$API.system.log.operation.post(params);
+ let objData = this.$TOOL.objCopy(params);
+ objData.creator_id = {
+ operator:"in",
+ value:[this.$TOOL.data.get('USER_INFO').id]
+ };
+ const res = await this.$API.system.log.operation.post(objData);
if(res.code == 200){
res.data.forEach(item=>{
item.id = item.type;
@@ -68,7 +79,19 @@
})
}
},
-
+ // 下载导出
+ exportChangeShow(params){
+ if(params.type == 34){
+ this.exportShow = params.status==0?true:false
+ }
+ },
+ async exportData() {
+ if(this.exportShow) return
+ const res = await this.$API.user.export.post(this.params);
+ if(res.code == 200){
+ this.$message.success('开始导出');
+ }
+ },
upSearch(){
this.$refs.table.upData(this.params);
},