sunyize 2 anni fa
parent
commit
714ac74265
1 ha cambiato i file con 17 aggiunte e 2 eliminazioni
  1. 17 2
      src/views/networkAccess/userStatistics.vue

+ 17 - 2
src/views/networkAccess/userStatistics.vue

@@ -116,9 +116,9 @@
 
       <!-- 操作按钮区域 -->
       <div class="table-operator">
-        <a-button type="primary" icon="download" @click="handleExportXls('入网统计')">导出</a-button>
+<!--        <a-button type="primary" icon="download" @click="handleExportXls('入网统计')">导出</a-button>-->
         <a-button type="primary" icon="download" v-has="'userStatistic:excel'" @click="excelOut()">导出</a-button>
-        <a-button type="primary" icon="download" v-has="'userStatistic:excelUp'" @click="handleExportXls('入网统计')">导出并上报</a-button>
+        <a-button type="primary" icon="download" v-has="'userStatistic:excelUp'" @click="excelOutUp()">导出并上报</a-button>
         <!-- 高级查询区域 -->
         <a-dropdown v-if="selectedRowKeys.length > 0">
           <a-menu slot="overlay">
@@ -567,6 +567,21 @@ export default {
   },
   methods: {
 
+    excelOutUp(){
+      if (this.selectionRows.length===0){
+        return this.$message.warning('请重新选择数据...', 3);
+      }
+      for (let i = 0; i < this.selectionRows.length; i++) {
+        if(this.selectionRows[i].status==='1'){
+          return this.$message.warning('选中数据中存在已上报的数据...', 3);
+        }
+      }
+      this.showImproveAndUploadList();
+      this.loadData();
+      this.selectionRows=[];
+      this.excelOut();
+
+    },
     excelOut(){
       if (this.queryParam.numberResults!==undefined&&this.queryParam.numberResults!==null && this.queryParam.numberResults.length===1){
         if (this.queryParam.numberResults[0]==="3"){