Merge branch 'test-dev' of http://219.151.181.73:3000/web/saber into test-dev

src/api/formula/formula.js

@@ -10,7 +10,7 @@ export const getTypeMap = (params) => {
   })
 }
 
-export const saveFormula = ({formula,remark,nodeId,elementId,scale,number,map,scope,projectId,dev,ver,formulas}) => {
+export const saveFormula = ({formula,remark,nodeId,elementId,scale,number,map,scope,projectId,dev,ver,formulas,method}) => {
   return request({
     url: '/api/blade-manager/formula/save',
     method: 'post',
@@ -26,12 +26,13 @@ export const saveFormula = ({formula,remark,nodeId,elementId,scale,number,map,sc
       projectId,
       dev,
       ver,
-      formulas
+      formulas,
+      method
     }
   })
 }
 
-export const updateFormula = ({id,formula,remark,nodeId,elementId,scale,number,map,scope,dev,formulas}) => {
+export const updateFormula = ({id,formula,remark,nodeId,elementId,scale,number,map,scope,dev,formulas,method}) => {
   return request({
     url: '/api/blade-manager/formula/update',
     method: 'post',
@@ -46,7 +47,8 @@ export const updateFormula = ({id,formula,remark,nodeId,elementId,scale,number,m
       map,
       scope,
       dev,
-      formulas
+      formulas,
+      method
     }
   })
 }

src/views/certificate/list.vue

@@ -102,7 +102,7 @@
       :total="total"
       @size-change="handleSizeChange"
       @current-change="handleCurrentChange"
-      :current-page.sync="pageindex"
+      :current-page="pageindex"
       :page-size="pagesize"
     >
     </el-pagination>
@@ -128,8 +128,38 @@ export default {
       pageindex: 1,
       pagesize: 20,
       certificateTypeValue: null, //证书类型
+      nextId: null,
+
     };
   },
+  watch: {
+    // 监听路由变化，当从其他页面返回时更新状态
+    '$route.query': {
+      immediate: true,
+      handler(newQuery) {
+        if (newQuery.pageindex) {
+          this.pageindex = Number(newQuery.pageindex);
+        }
+        if (newQuery.value) {
+          this.value = newQuery.value;
+        }
+    
+        if (newQuery.pagesize) {
+          this.pagesize = Number(newQuery.pagesize);
+        }
+      }
+    },
+    searchinput: {
+      immediate: true,
+      handler(newQuery) {
+        if (newQuery) {
+          this.pageindex = 1;
+          this.pagesize=20
+
+        }
+      }
+    }
+  },
   methods: {
     //#region 页码
     handleSizeChange(val) {
@@ -141,25 +171,53 @@ export default {
       this.listpage();
     },
     typeChange() {
+      this.pageindex = 1;
+      this.pagesize = 20;
       this.listpage();
     },
     //#endregion
 
     //#region 头接口
-    pushRouter(id) {
-      this.$router.push({
-        path: "/certificate/list/addList",
-        query: {
-          id,
-          value: this.value,
-        },
-      });
-      console.log(this.value, "value");
-    },
+   // 修改pushRouter方法，传递完整的查询状态
+  // 在列表页的pushRouter方法中修改下一条ID的计算方式
+pushRouter(id) {
+  // 找到当前行在表格数据中的索引
+  const currentIndex = this.tableData.findIndex(row => row.id === id);
+  // 获取下一行数据的id（如果存在）
+  let nextId = null;
+  
+  // 如果是最后一条记录，查询下一页的第一条
+  if (currentIndex === this.tableData.length - 1) {
+    // 检查是否有下一页
+    if (this.pageindex * this.pagesize < this.total) {
+      // 这里只是标记需要加载下一页，实际数据在编辑页处理
+      nextId = 'nextPage';
+    }
+  } else {
+    // 正常获取下一条
+    const nextRow = this.tableData[currentIndex + 1];
+    nextId = nextRow ? nextRow.id : null;
+  }
+  
+  this.$router.push({
+    path: "/certificate/list/addList",
+    query: {
+      id,
+      value: this.value,
+      certificateTypeValue: this.certificateTypeValue,
+      searchinput: this.searchinput,
+      pageindex: this.pageindex,
+      pagesize: this.pagesize,
+      nextId: nextId
+    }
+  });
+},
     //#endregion
 
     //#region 列表接口
     projectChange() {
+           this.pageindex = 1;
+      this.pagesize = 20;
       //下拉框change事件
       this.listpage();
     },
@@ -196,19 +254,29 @@ export default {
         this.listpage();
       }
     },
-    async queryProjectList() {
-      //获取所有项目
-      const { data: res } = await queryProjectList();
-      if (res.code == 200) {
-        this.options = res.data;
-        if (this.$route.query.value) {
-          this.value = this.$route.query.value;
-        } else {
-          this.value = this.value = this.options[0].id;
-        }
-        this.listpage();
-      }
-    },
+   async queryProjectList() {
+  const { data: res } = await queryProjectList();
+  if (res.code == 200) {
+    this.options = res.data;
+    // 处理路由参数
+    if (this.$route.query.value) {
+      this.value = this.$route.query.value;
+      // 确保页码是数字类型
+      this.pageindex = Number(this.$route.query.pageindex) || 1;
+      this.pagesize = Number(this.$route.query.pagesize) || 20;
+      this.certificateTypeValue = this.$route.query.certificateTypeValue 
+        ? Number(this.$route.query.certificateTypeValue) 
+        : null;
+      this.searchinput = this.$route.query.searchinput || '';
+    } else {
+      this.value = this.options[0].id || '';
+    }
+    this.$nextTick(() => {
+      this.listpage();
+    });
+  }
+},
+
     async listpage() {
       //分页获取证书列表数据
       const { data: res } = await listpage({

src/views/certificate/lists/addList.vue

@@ -255,6 +255,13 @@
         v-throttle='2000'
         @click="savess()"
       >保存</el-button>
+      <el-button
+        class="marleft30"
+        type="warning"
+        v-if="fromId!=0"
+      
+        @click="nextClick()"
+      >下一个</el-button>
     </div>
   </basic-container>
 </template>
@@ -262,6 +269,11 @@
 <script>
 import { save, getById, findUserByName, queryRole, queryProjectAndContract, addFileInfo, update, findPfxType, picPresave, prePicture, compressAndUpload } from "@/api/certificate/list";
 import {getDictionary as getDictbiz} from "@/api/system/dictbiz";
+import {
+
+  listpage,
+
+} from "@/api/certificate/list";
 export default {
   data () {
     return {
@@ -305,6 +317,12 @@ export default {
       pfxType: [],//
       options:[],
       signatureId: '',
+      fromId: '',
+      tableData:[],
+      pageindex: 1,
+      total: 0,
+      currentPage:1
+
     }
   },
   methods: {
@@ -352,17 +370,27 @@ export default {
       this.updateDependentFieldValidation()
     },
     async init () {
-
+      this.fromId = this.$route.query.id;
       if (this.$route.query.id != 0) {
-        await this.getById()
+        await this.getById(this.fromId)
       }
       this.queryProjectAndContract()//获取项目和合同段
 
     },
     //#region
-    cancel () {//取消按钮
-      this.$router.push('/certificate/list')
-    },
+   cancel() {
+    const { value, certificateTypeValue, searchinput, pageindex, pagesize } = this.$route.query;
+    this.$router.push({
+      path: '/certificate/list',
+      query: {
+        value,
+        certificateTypeValue,
+        searchinput,
+        pageindex,
+        pagesize
+      }
+    });
+  },
     savess () {//保存按钮
       this.$refs.form.validate(async valid => {
         if (valid) {
@@ -510,8 +538,8 @@ export default {
     //#endregion
 
     //#region //接口
-    async getById () {//获取详细信息
-      const { data: res } = await getById({ id: this.$route.query.id })
+    async getById (id) {//获取详细信息
+      const { data: res } = await getById({ id: id })
       console.log(res);
       if (res.code == 200) {
         this.form = res.data
@@ -544,12 +572,16 @@ export default {
           message: '新增电签成功!'
         })
         // this.$router.push('/certificate/list')
-        this.$router.push({
+       this.$router.push({
           path: '/certificate/list',
           query: {
-            value:this.$route.query.value
+            value: this.$route.query.value,
+            certificateTypeValue: this.$route.query.certificateTypeValue,
+            searchinput: this.$route.query.searchinput,
+            pageindex: this.$route.query.pageindex,
+            pagesize: this.$route.query.pagesize
           }
-        })
+        });
       }
     },
     async findUserByName () { //关联用户
@@ -606,12 +638,16 @@ export default {
           message: '修改电签成功!'
         })
         // this.$router.push('/certificate/list')
-        this.$router.push({
+         this.$router.push({
           path: '/certificate/list',
           query: {
-            value:this.$route.query.value
+            value: this.$route.query.value,
+            certificateTypeValue: this.$route.query.certificateTypeValue,
+            searchinput: this.$route.query.searchinput,
+            pageindex: this.$route.query.pageindex,
+            pagesize: this.$route.query.pagesize
           }
-        })
+        });
       }
     },
     //#endregion
@@ -690,6 +726,83 @@ export default {
       return data.preUrl
     },
     stopClick() {},
+   async nextClick() {
+        let nextId = this.$route.query.nextId;
+        
+        // 处理需要加载下一页的情况
+        if (nextId === 'nextPage') {
+          nextId = await this.getNextPageData();
+        }
+        
+        if (nextId) {
+          // 获取下一条记录的详细信息
+          await this.getById(nextId);
+          
+          // 更新当前ID和下一条ID参数
+          const currentIndex = this.tableData.findIndex(row => row.id === nextId);
+          let newNextId = null;
+          
+          if (currentIndex === this.tableData.length - 1) {
+            newNextId = 'nextPage';
+          } else {
+            const nextRow = this.tableData[currentIndex + 1];
+            newNextId = nextRow ? nextRow.id : null;
+          }
+          
+          // 更新URL中的参数，保持浏览器历史正确
+        
+      this.$router.replace({
+        query: {
+          ...this.$route.query,
+          id: nextId,
+          nextId: newNextId,
+          pageindex: nextId === 'nextPage'?this.currentPage+1:this.currentPage, // 更新当前页码
+        }
+      });
+        } else {
+          this.$message({
+            type: 'info',
+            message: '已经是最后一条记录'
+          });
+        }
+    },
+    // 在编辑页添加获取列表数据的方法，用于计算下一条
+  async getTableData() {
+      const { data: res } = await listpage({
+        current: this.$route.query.pageindex || 1,
+        size: this.$route.query.pagesize || 20,
+        projectId: this.$route.query.value,
+        certificateUserName: this.$route.query.searchinput,
+        certificateType: this.$route.query.certificateTypeValue,
+      });
+      
+      if (res.code === 200) {
+        this.tableData = res.data.records;
+        this.total = res.data.total;
+        this.currentPage = res.data.current;
+      }
+  },
+    async getNextPageData() {
+    // 从路由参数中获取当前分页信息
+    const currentPage = Number(this.$route.query.pageindex) || 1;
+    const pageSize = Number(this.$route.query.pagesize) || 20;
+    console.log(currentPage,'currentPage');
+    
+    // 调用列表接口查询下一页数据
+    const { data: res } = await listpage({
+      current: currentPage + 1, // 下一页
+      size: pageSize,
+      projectId: this.$route.query.value,
+      certificateUserName: this.$route.query.searchinput,
+      certificateType: this.$route.query.certificateTypeValue,
+    });
+    
+    if (res.code === 200 && res.data.records.length > 0) {
+      // 返回下一页第一条记录的ID
+      return res.data.records[0].id;
+    }
+    return null; // 没有下一页数据
+  },
   },
   created () {
     this.getOptions()
@@ -697,6 +810,7 @@ export default {
     this.queryRole()//获取角色方
     this.findUserByName()//关联用户
     this.findPfxType();//查询企业签章类型
+      this.getTableData(); // 添加这行，获取列表数据用于计算下一条
   },
   mounted () {
     this.updateDependentFieldValidation();

src/views/formula/component/funComponent/ifelse.vue

@@ -23,6 +23,10 @@
         <el-option label="数据获取" value="3"></el-option>
       
       </el-select>
+      <el-select v-model="method" size="medium" placeholder="请选择"     v-if="symbol=='more'" class="mg-l-10">
+        <el-option label="总数" value="sum"></el-option>
+        <el-option label="平均值" value="avg"></el-option>
+      </el-select>
       <el-button class="mg-l-10" size="small" type="info" @click="showSelectEle">选择参数</el-button>
     </div>
 
@@ -473,7 +477,10 @@ export default {
         type: String,
         default:'',
       },
-    
+      method:{
+        type: String,
+        default:'',
+      }
     
 
   },
@@ -554,7 +561,8 @@ export default {
       elseTagsLeft: [],
       elseTagRight: '',
       elseTagsRight: [],
-      elseFocus: '' // 用于跟踪否则部分的焦点
+      elseFocus: '', // 用于跟踪否则部分的焦点
+ 
 
     }
   },

src/views/formula/component/funComponent/multiIfElseTools.js

@@ -125,7 +125,7 @@ export function formatArrayMore(inputArray) {
   return inputArray.map(item => processObject(item));
 }
 
-export function restoreArrayMore(processedArray, formulaDetailMap,remark) {
+export function restoreArrayMore(processedArray, formulaDetailMap, remark) {
   // 定义反转的字段映射关系（与原方法相反）
   const reverseMappings = {
       'parameter1': 'tag2',
@@ -168,7 +168,7 @@ export function restoreArrayMore(processedArray, formulaDetailMap,remark) {
       }
   };
   
-  // 解析表达式字符串为公式数组（修复符号与数字拆分问题）
+  // 解析表达式字符串为公式数组
   function parseExpressionToFormula(expression) {
       if (typeof expression !== 'string') return [];
       
@@ -177,7 +177,7 @@ export function restoreArrayMore(processedArray, formulaDetailMap,remark) {
       let currentPos = 0;
       
       // 定义所有运算符
-const operators = new Set(['+', '-', '*', '/', '%', '=', '>', '<', '!', '&', '|', '≥', '≤', '≠', '(', ')']);
+      const operators = new Set(['+', '-', '*', '/', '%', '=', '>', '<', '!', '&', '|', '≥', '≤', '≠', '(', ')']);
       
       // 检查是否为运算符
       const isOperatorChar = (char) => operators.has(char);
@@ -224,10 +224,7 @@ const operators = new Set(['+', '-', '*', '/', '%', '=', '>', '<', '!', '&', '|'
                   ft: operator,
                   template: { ft: operator },
                   name: operator,
-                  selected: false,
-                 
-                 
-                  
+                  selected: false
               });
           }
           // 处理文本（数字或其他字符）
@@ -249,7 +246,7 @@ const operators = new Set(['+', '-', '*', '/', '%', '=', '>', '<', '!', '&', '|'
                   formula.push({
                       type: 'Text',
                       name: text,
-                        selected: false,
+                      selected: false,
                   });
               }
               
@@ -272,51 +269,98 @@ const operators = new Set(['+', '-', '*', '/', '%', '=', '>', '<', '!', '&', '|'
   }
 
   // 还原单个对象的函数
-  function restoreObject(obj) {
-
+// 还原单个对象的函数
+function restoreObject(obj) {
+    const result = {};
+    
+    // 递归还原formulaIfElse（如果存在）
+    if (obj.formulaIfElse && Array.isArray(obj.formulaIfElse)) {
+        result.formulaIfElse = obj.formulaIfElse.map(item => {
+            const formulaItem = {};
+            // 处理parameter1
+            if (item.parameter1) {
+                const restoredValue = restoreValue(item.parameter1);
+                // 判断是否为E[]包裹的原生格式
+                if (item.parameter1.startsWith('E[')) {
+                    // 原生格式：设置tags2，清空tag2
+                    formulaItem.tags2 = [getTagElement(restoredValue)];
+                    formulaItem.tag2 = "";
+                } else {
+                    // 非原生格式：设置tag2，清空tags2
+                    formulaItem.tag2 = restoredValue;
+                    formulaItem.tags2 = [];
+                }
+            } else {
+                formulaItem.tags2 = [];
+                formulaItem.tag2 = "";
+            }
+            
+            // 处理parameter2
+            if (item.parameter2) {
+                const restoredValue = restoreValue(item.parameter2);
+                // 判断是否为E[]包裹的原生格式
+                if (item.parameter2.startsWith('E[')) {
+                    // 原生格式：设置tags3，清空tag3
+                    formulaItem.tags3 = [getTagElement(restoredValue)];
+                    formulaItem.tag3 = "";
+                } else {
+                    // 非原生格式：设置tag3，清空tags3
+                    formulaItem.tag3 = restoredValue;
+                    formulaItem.tags3 = [];
+                }
+            } else {
+                formulaItem.tags3 = [];
+                formulaItem.tag3 = "";
+            }
+            
+            // 处理其他字段（symbol、groupTerm等）
+            if (item.symbol) {
+                formulaItem.symbol1 = item.symbol;
+            }
+            if (item.groupTerm) {
+                formulaItem.logicSymbol = item.groupTerm;
+            }
+            
+            return formulaItem;
+        });
+    }
     
-      const result = {};
-      
-      // 递归还原formulaIfElse（如果存在）
-      if (obj.formulaIfElse && Array.isArray(obj.formulaIfElse)) {
-          result.formulaIfElse = obj.formulaIfElse.map(item => restoreObject(item));
-      }
-      
-      // 还原formula1和formula2
-      if (obj.trueData&&remark==='2') {
-          result.formula1 = parseExpressionToFormula(obj.trueData);
-      }
-      if (obj.falseData&&remark==='2') {
-          result.formula2 = parseExpressionToFormula(obj.falseData);
-      }
-      
-      // 处理参数与tags数组的还原
-      Object.keys(obj).forEach(key => {
-          const restoredValue = restoreValue(obj[key]);
-          
-          if (key === 'parameter1') {
-              result.tags2 = [getTagElement(restoredValue)];
-              result[reverseMappings[key]] = restoredValue;
-          }
-          else if (key === 'parameter2') {
-              result.tags3 = [getTagElement(restoredValue)];
-              result[reverseMappings[key]] = restoredValue;
-          }
-          else if (key === 'trueData') {
-              result.tags4 = [getTagElement(restoredValue)];
-              result[reverseMappings[key]] = restoredValue;
-          }
-          else if (key === 'falseData') {
-              result.tags5 = [getTagElement(restoredValue)];
-              result[reverseMappings[key]] = restoredValue;
-          }
-          else if (reverseMappings[key]) {
-              result[reverseMappings[key]] = restoredValue;
-          }
-      });
-      
-      return result;
-  }
+    // 根据remark值决定不同的还原逻辑
+    if (remark == 2) {
+        // 当remark等于2时：falseData/trueData还原成formula2/formula1
+        if (obj.trueData) {
+            result.formula1 = parseExpressionToFormula(obj.trueData);
+            result.tag4 = ""; // 清空tag4
+            result.tags4 = []; // 清空tags4数组
+        }
+        if (obj.falseData) {
+            result.formula2 = parseExpressionToFormula(obj.falseData);
+            result.tag5 = ""; // 清空tag5
+            result.tags5 = []; // 清空tags5数组
+        }
+    } else {
+        // 当remark不等于2时：falseData/trueData还原成tag4/tags4和tag5/tags5
+        if (obj.trueData) {
+            const restoredValue = restoreValue(obj.trueData);
+            result.tag4 = restoredValue;
+            result.tags4 = [getTagElement(restoredValue)];
+        } else {
+            result.tag4 = "";
+            result.tags4 = [];
+        }
+        
+        if (obj.falseData) {
+            const restoredValue = restoreValue(obj.falseData);
+            result.tag5 = restoredValue;
+            result.tags5 = [getTagElement(restoredValue)];
+        } else {
+            result.tag5 = "";
+            result.tags5 = [];
+        }
+    }
+    
+    return result;
+}
   
   // 还原整个数组
   return processedArray.map(item => restoreObject(item));

src/views/formula/edit.vue

@@ -220,6 +220,7 @@
                 :dataForm="dataForm"
                 :remark="remark"
                 @clickTag="handleClickTagElse"
+                :method="method"
                 >
               </component>
                 <div class="flex1" v-show="item.showSelectEle" style="margin-top:10px;margin-bottom:30px">
@@ -511,6 +512,10 @@ export default {
     iswbstype:{//是否是公共wbs
       type:String,
       default:''
+    },
+    pkeyId:{
+      type:String,
+      default:''//表单pkeyId
     }
   },
     mounted() {
@@ -630,6 +635,7 @@ export default {
       tableKey:'3',
       initTableNameDev:'',//初始表名 允许偏差值范围
       selectedTableKeyDev:'', // 存储
+      method:''
 
     };
   },
@@ -1570,7 +1576,11 @@ handleDelete(e) {
         console.log('this.$refs.conditionList[0]',this.$refs.dynamiccomponent[0].conditionList);
         let resMore=formatArrayMore(this.$refs.dynamiccomponent[0].conditionList);
         const resJson=generateResult(this.$refs.dynamiccomponent[0].conditionList);
-        let remark=this.$refs.dynamiccomponent[0].remark;
+        let remark=this.$refs.dynamiccomponent[0].result;
+        let method=this.$refs.dynamiccomponent[0].method;
+        console.log(method,'method');
+        
+
 console.log(remark,'remark');
 
         console.log(resJson,'resJson');
@@ -1590,7 +1600,8 @@ console.log(remark,'remark');
                 scope:this.globaltype,
                 // projectId:this.curProjiect.id||this.projectId,
                 projectId:this.curProjiect.id||this.pid,
-                dev:deviationRangeText
+                dev:deviationRangeText,
+                method:method
               }).then(()=>{
                 this.formulaStringToArray();
                 this.$message({
@@ -1612,7 +1623,9 @@ console.log(remark,'remark');
                 dev:deviationRangeText,
                 // projectId:this.curProjiect.id||this.projectId,
                 projectId:this.curProjiect.id||this.pid,
-                ver:this.version
+                ver:this.version,
+                method:method
+
               }).then((res)=>{
                 if(res.data.data){
                   this.formulaid = res.data.data;
@@ -1852,7 +1865,8 @@ console.log(remark,'remark');
         detail.formula = detail.formula.replace('FC.ifelseMulti','FC.ifelse');
         this.isMore = true;
             this.formulaDetailMap = detail.map;
-        this.moreConditions =  restoreArrayMore(detail.formulas,this.formulaDetailMap)
+            this.method=detail.method;
+        this.moreConditions =  restoreArrayMore(detail.formulas,this.formulaDetailMap,detail.remark)
     
       }else if(detail&&detail.formula.includes('FC.switchCase')){
         //数据获取
@@ -1958,7 +1972,10 @@ console.log(remark,'remark');
             // 获取点击节点的第一张表
             console.log(this.eleTableList[0],'this.eleTableList[0]');
             // let tabId= this.eleTableList[0].initTableId; pkeyId
-            let tabId= this.eleTableList[0].pkeyId!==-1&&this.eleTableList[0].pkeyId!==null?this.eleTableList[0].pkeyId:this.eleTableList[0].id;
+            // let tabId= this.eleTableList[0].pkeyId!==-1&&this.eleTableList[0].pkeyId!==null?this.eleTableList[0].pkeyId:this.eleTableList[0].id;
+            let tabId=this.pkeyId?this.pkeyId:this.eleTableList[0].pkeyId!==-1&&this.eleTableList[0].pkeyId!==null?this.eleTableList[0].pkeyId:this.eleTableList[0].id;
+            console.log(this.pkeyId,'this.pkeyId');
+            
             console.log("wbsPrivateGetNodeTabAndParam")
             this.getTableEle(tabId);
             setTimeout(() => {

src/views/manager/projectinfo/tree.vue

@@ -2004,6 +2004,8 @@
         :globaltype="formulaCurRow.globaltype"
         :iswbstype="0"
         @hideDialog="formulaCompVisible = false"
+        :pkeyId="curEleTable.pkeyId"
+
         v-if="formulaCompVisible"
       ></FormulaEdit>
     </el-dialog>
@@ -4558,6 +4560,8 @@ clearSearch1() {
        this.formulaCompVisible = true;
         this.formulaCurRow.elementType = false;
         this.istableType = true;
+        console.log(this.formulaCurRow,'this.formulaCurRow.elementType');
+        
     },
     //关闭公式弹窗
     closeformulaComp() {

src/views/system/user.vue

@@ -334,6 +334,7 @@
             :option="excelOption"
             v-model="excelForm"
             :upload-after="uploadAfter"
+             ref="excelForm"
           >
             <template slot="excelTemplate">
               <el-button
@@ -1538,12 +1539,24 @@ export default {
     },
     handleImport() {
       this.excelBox = true;
+         this.excelForm = {
+              excelFile: null,
+              isCovered: 0
+            };
     },
     uploadAfter(res, done, loading, column) {
-      window.console.log(column);
-      this.excelBox = false;
-      this.refreshChange();
-      done();
+      // window.console.log(column);
+      // this.excelBox = false;
+      // this.refreshChange();
+      // done();
+        // 关闭导入弹窗
+        this.excelBox = false;
+        // 刷新数据列表
+        this.refreshChange();
+        // 重置上传表单中的文件字段
+           // 方法1：重置整个表单
+
+        done();
     },
     handleExport() {
       this.$confirm("是否导出用户数据?", "提示", {