添加权限

src/views/networkAccess/userStatistics.vue

@@ -117,7 +117,7 @@
       <!-- 操作按钮区域 -->
       <div class="table-operator">
 <!--        <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:excel'" @click="excelOutExcel()">导出</a-button>
         <a-button type="primary" icon="download" v-has="'userStatistic:excelUp'" @click="excelOutUp()">导出并上报</a-button>
         <!-- 高级查询区域 -->
         <a-dropdown v-if="selectedRowKeys.length > 0">
@@ -307,6 +307,7 @@ export default {
       /* 查询条件-请不要在queryParam中声明非字符串值的属性 */
       queryParam: {},
       url: {
+        getType:"/businessReminderCard/type",
         getCompany: "/sysCompany/list",
         typeCount: "/businessReminderCard/type/count",
         list: "/businessReminderCard/list",
@@ -315,6 +316,7 @@ export default {
         restoreById: "/businessReminderCard/restoreById",
         notice: "/smsCheck/customerInfo/notice",
         exportXlsUrl: "/businessReminderCard/exportXls",
+        exportXlsUrlUp: "/businessReminderCard/exportXlsUp",
       },
       /**表单
        * 入网用户统计：身份证号/姓名/办理电话/创建人/创建人所属营业厅/更新人/更新人营业厅/研判结果/
@@ -353,12 +355,25 @@ export default {
           sorter: true,
           dataIndex: 'createTime'
         }, {
-          title: '创建人营业厅地址',
+          title: '创建人归属部门',
           align: "center",
           sorter: true,
           dataIndex: 'businessAddress'
           //scopedSlots: {customRender: 'sysBusinessHall'}
 
+        },{
+          title: '当前处理部门',
+          align: "center",
+          sorter: true,
+          dataIndex: 'businessAddress'
+          //scopedSlots: {customRender: 'sysBusinessHall'}
+
+        },{
+          title: '上报时间',
+          align: "center",
+          sorter: true,
+          dataIndex: 'upTime'
+          //scopedSlots: {customRender: 'sysBusinessHall'}
         },
         // {
         //   title: '更新人',
@@ -567,6 +582,11 @@ export default {
   },
   methods: {
 
+    excelOutExcel(){
+      this.handleExportXls(this.excelName)
+      //this.handleExportXlsData(this.excelName,'0',"out")
+
+    },
     excelOutUp(){
       if (this.selectionRows.length===0){
         return this.$message.warning('请重新选择数据...', 3);
@@ -576,34 +596,69 @@ export default {
           return this.$message.warning('选中数据中存在已上报的数据...', 3);
         }
       }
-      this.showImproveAndUploadList();
+      this.excelOut();
       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"){
-          this.handleExportXlsData('上报紫名单','4')
-          this.handleExportXlsData('上报蓝名单','3')
-        }
-      }else {
-        this.handleExportXls(this.excelName)
+      // if (this.queryParam.numberResults!==undefined&&this.queryParam.numberResults!==null && this.queryParam.numberResults.length===1){
+      //   if (this.queryParam.numberResults[0]==="3"){
+      //     this.handleExportXlsData('上报紫名单','4')
+      //     this.handleExportXlsData('上报蓝名单','3')
+      //   }
+      // }else {
+      //   this.handleExportXls(this.excelName)
+      // }
+      if (this.getQueryParams().numberResults!==undefined && this.getQueryParams().numberResults.indexOf('3')!==-1){
+        this.handleExportXlsData('上报紫名单','4',"up")
+        this.handleExportXlsData('上报蓝名单','3',"up")
+      }
+      if (this.getQueryParams().numberResults!==undefined && this.getQueryParams().numberResults.indexOf('1')!==-1){
+        this.handleExportXlsData('非高危','1',"up")
+      }
+      if (this.getQueryParams().numberResults!==undefined && this.getQueryParams().numberResults.indexOf('2')!==-1){
+        this.handleExportXlsData('上报关停','2',"up")
+      }
+      if (this.getQueryParams().numberResults===undefined  || this.getQueryParams().numberResults.length===0){
+        let url = this.url.getType;
+        const params = {
+          params:  this.selectionRows
+        };
+        postAction(url,  this.selectionRows).then(res => {
+          if (res.success) {
+            if (res.result.indexOf('2')!==-1){
+              this.handleExportXlsData('上报关停','2',"up")
+            }
+            if (res.result.indexOf('1')!==-1){
+              this.handleExportXlsData('非高危','1',"up")
+            }
+            if (res.result.indexOf('3')!==-1 || res.result.indexOf('4,3')!==-1 || res.result.indexOf('3,4')!==-1 || res.result.indexOf('4')!==-1) {
+              this.handleExportXlsData('上报紫名单','4',"up")
+              this.handleExportXlsData('上报蓝名单','3',"up")
+            }
+          }
+        })
+
       }
+      this.showImproveAndUploadList();
     },
-    handleExportXlsData(fileName,num){
+    handleExportXlsData(fileName,num,info){
       if(!fileName || typeof fileName != "string"){
         fileName = "导出文件"
       }
       let param = this.getQueryParams();
-      param.numberResults=[];
-     param.numberResults[0]=num;
+
+      if (info==="up"){
+        param.numberResults=[];
+        param.numberResults[0]=num;
+      }
       if(this.selectedRowKeys && this.selectedRowKeys.length>0){
         param['selections'] = this.selectedRowKeys.join(",")
       }
       console.log("导出参数",param)
-      downFile(this.url.exportXlsUrl,param).then((data)=>{
+      downFile(this.url.exportXlsUrlUp,param).then((data)=>{
         if (!data) {
           this.$message.warning("文件下载失败")
           return