feat: bug修复

石广澎

2023-12-12 122f6d1db1e0af5ede6f96cd390f393e5f222e99

feat:
bug修复

 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', // 指定响应数据类型为Blob
        // responseType: 'blob', // 指定响应数据类型为Blob
        method: 'get',
        params,
    });

 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 {

 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: {

 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')) {
            // 非IE下载
            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();
        })

 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'}

 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 {