From 122f6d1db1e0af5ede6f96cd390f393e5f222e99 Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期二, 12 十二月 2023 11:33:42 +0800
Subject: [PATCH] feat: bug修复
---
admin-web/src/api/exportExcel.js | 2
admin-web/src/views/systemSetting/department/edit.vue | 21 +++-------
admin-web/src/components/myTree/index.vue | 28 +++++++-------
admin-web/src/views/mixins/listPage.js | 6 ++-
admin-web/src/views/dashboard/index.vue | 5 ++
admin-web/src/views/systemManger/server/user/edit.vue | 2
6 files changed, 31 insertions(+), 33 deletions(-)
diff --git a/admin-web/src/api/exportExcel.js b/admin-web/src/api/exportExcel.js
index 0ed95f1..ccc2c98 100644
--- a/admin-web/src/api/exportExcel.js
+++ b/admin-web/src/api/exportExcel.js
@@ -4,7 +4,7 @@
export function outputExport(params) {
return request({
url: '/pc/l/wh/form/output/list/export',
- responseType: 'blob', // 鎸囧畾鍝嶅簲鏁版嵁绫诲瀷涓築lob
+ // responseType: 'blob', // 鎸囧畾鍝嶅簲鏁版嵁绫诲瀷涓築lob
method: 'get',
params,
});
diff --git a/admin-web/src/components/myTree/index.vue b/admin-web/src/components/myTree/index.vue
index 81ac3e2..6f5a7f7 100644
--- a/admin-web/src/components/myTree/index.vue
+++ b/admin-web/src/components/myTree/index.vue
@@ -1,16 +1,20 @@
<template>
<div>
- <el-input
- style='margin-bottom: 8px;width:100%'
- placeholder='鎼滅储'
- prefix-icon='el-icon-search'
- v-model='searchValue'
- clearable>
- </el-input>
- <div class='tree-box'>
+ <div style="display: flex;margin-bottom: 8px;">
+ <el-input
+ style='flex: 1'
+ placeholder='鎼滅储'
+ prefix-icon='el-icon-search'
+ v-model='searchValue'
+ clearable>
+ </el-input>
<div class='refresh-btn' v-if='treeList.length>0' @click='refshData'>
閲嶇疆<i class='el-icon-refresh'></i>
</div>
+ </div>
+
+ <div class='tree-box'>
+
<el-tree
ref='tree'
:data='treeList'
@@ -161,14 +165,10 @@
.refresh-btn {
cursor: pointer;
- position: absolute;
- top: 0;
- right: 0;
font-size: 14px;
- z-index: 101;
- line-height: 40px;
+ line-height: 32px;
color: #999;
- text-align: right;
+ margin-left: 10px;
}
.refresh-btn:hover {
diff --git a/admin-web/src/views/dashboard/index.vue b/admin-web/src/views/dashboard/index.vue
index eb6551d..c22c2a6 100644
--- a/admin-web/src/views/dashboard/index.vue
+++ b/admin-web/src/views/dashboard/index.vue
@@ -185,7 +185,10 @@
this.getAuditList()
this.getWarningList()
getGoodsNumPrice().then(res => {
- this.goodsNumPrice = res
+ if(res){
+ this.goodsNumPrice = res
+ }
+
})
},
methods: {
diff --git a/admin-web/src/views/mixins/listPage.js b/admin-web/src/views/mixins/listPage.js
index 416cae5..11c66fa 100644
--- a/admin-web/src/views/mixins/listPage.js
+++ b/admin-web/src/views/mixins/listPage.js
@@ -1,6 +1,7 @@
import * as DateFormatter from '@/utils/DateFormatter';
import {mapGetters} from 'vuex';
import * as dataExport from "@/api/exportExcel"
+import {downLoad} from "@/utils/base";
export default {
data() {
@@ -53,7 +54,7 @@
dataExport[api](params)
.then((res) => {
const blob = new Blob([res], {type: 'application/vnd.ms-excel'});
- if ('download' in document.createElement('a')) {
+ /*if ('download' in document.createElement('a')) {
// 闈濱E涓嬭浇
const elink = document.createElement('a');
elink.download = `${fileName}.xls`;
@@ -69,7 +70,8 @@
} else {
// IE10+涓嬭浇
navigator.msSaveBlob(blob, `${fileName}.xls`);
- }
+ }*/
+ downLoad(res)
this.$message.success('瀵煎嚭鎴愬姛锛�');
loading.close();
})
diff --git a/admin-web/src/views/systemManger/server/user/edit.vue b/admin-web/src/views/systemManger/server/user/edit.vue
index 395ee74..9e4d187 100644
--- a/admin-web/src/views/systemManger/server/user/edit.vue
+++ b/admin-web/src/views/systemManger/server/user/edit.vue
@@ -121,7 +121,7 @@
},
rules: {
sysDeptId: [
- {required: true, message: '璇疯緭鍏�', trigger: 'blur'}
+ {required: true, message: '璇烽�夋嫨閮ㄩ棬', trigger: 'change'}
],
userName: [
{required: true, message: '璇疯緭鍏ヤ汉鍛樺鍚�', trigger: 'blur'}
diff --git a/admin-web/src/views/systemSetting/department/edit.vue b/admin-web/src/views/systemSetting/department/edit.vue
index d23bddf..b0a657a 100644
--- a/admin-web/src/views/systemSetting/department/edit.vue
+++ b/admin-web/src/views/systemSetting/department/edit.vue
@@ -106,23 +106,16 @@
if (this.setting.id) {
// 缂栬緫鎺ュ彛
departmentEdit(params).then((res) => {
- if (res) {
- this.$message.success('淇濆瓨鎴愬姛锛�');
- this.close();
- this.$emit('search');
- } else {
- this.$message.error('淇濆瓨澶辫触');
- }
+
+ this.$message.success('淇濆瓨鎴愬姛锛�');
+ this.close();
+ this.$emit('search');
});
} else {
departmentAdd(params).then((res) => {
- if (res) {
- this.$message.success('淇濆瓨鎴愬姛锛�');
- this.close();
- this.$emit('search');
- } else {
- this.$message.error('淇濆瓨澶辫触');
- }
+ this.$message.success('淇濆瓨鎴愬姛锛�');
+ this.close();
+ this.$emit('search');
});
}
} else {
--
Gitblit v1.9.1