md

src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue

@@ -220,6 +220,19 @@
 
       <div slot="toolbar"  v-if="actionType==4">
         <el-row :gutter="10" class="mb8">
+              <el-col :span="1.5"  v-if="activeTab=='waitMerge'">
+                <div style="display:inline-flex;">
+                  <span>账单名称:</span>
+                  <el-input
+                    v-model="billName"
+                    :placeholder="$t('账单名称')"
+                    clearable
+                  />
+                  <span>选择账期:</span>
+                  <el-date-picker v-model="billMonth" type="month" placeholder="账期"    value-format="yyyy-MM"></el-date-picker>
+                </div>
+              </el-col>
+
               <el-col :span="1.5"  v-if="activeTab=='waitMerge'">
                 <el-button
                   type="primary"
@@ -383,6 +396,10 @@
 
     </XdTable>
 
+    <el-dialog :title="titleMergeForm" :visible.sync="openMergeForm" width="80%" :destroy-on-close="true" v-dialogDrag append-to-body>
+      <MergeBillForm :selectBillList="selectBillList"   @on-changed="handleFormChanged" @on-cancel="cancelForm"></MergeBillForm>
+    </el-dialog>
+
     <el-dialog :title="openTraceInfoTitle" :visible.sync="openTraceInfo" width="80%" :close-on-click-modal="false"  v-dialogDrag append-to-body>
       <TraceWaybillDetailView  :key="currentTraceBillCode" :scanBillCode="currentTraceBillCode" :billDetail="currentTraceBillItem"></TraceWaybillDetailView>
     </el-dialog>
@@ -437,6 +454,9 @@ import ProblemTypePicker from '@/views/emis/EmisBaseTools/ProblemTypePicker.vue'
 import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue';
 import TraceWaybillDetailView from '@/views/emis/customerService/traceWaybillDetailView.vue';
 
+import MergeBillForm from '@/views/emis/emisSettleSubBill/MergeBillForm.vue';
+
+
 export default {
   name: "SubBillConfirmByMoneyList",
   // name: "SubBillConfirmByMonthList",
@@ -457,8 +477,8 @@ export default {
     EmisSiteSimplePicker2,
     ProblemTypePicker,
 
-    TraceWaybillDetailView
+    TraceWaybillDetailView,
-
+    MergeBillForm
   },
   dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
         'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type',
@@ -487,11 +507,15 @@ export default {
       actionType:null,
       settleType:null,
 
+      billName:null,
+      billMonth:null,
+
 
       titleMergeForm:null,
       openMergeForm:false,
       selectBillList:[],
 
+
       storageName:null,
 
       queryStatInfoMap:null,
@@ -707,6 +731,10 @@ export default {
       else if(this.actionType==3){
         this.storageName="SubBillConfirmBySitehList_main";
       }
+      else if(this.actionType==4){
+        this.storageName="subBillMergeMgnt_main";
+        this.activeTab='waitMerge';
+      }
     },
     handleClick(tab, event) {
 				// console.log(tab, event);

src/views/monitor/logininfor/index.vue

@@ -263,11 +263,58 @@ export default {
       }).catch(() => {});
     },
     /** 导出按钮操作 */
+    // handleExport() {
+    //   this.download('monitor/logininfor/export', {
+    //     ...this.queryParams
+    //   }, `logininfor_${new Date().getTime()}.xlsx`)
+    // }
+    /** 导出按钮操作 */
     handleExport() {
-      this.download('monitor/logininfor/export', {
+    //   this.download('system/sysLogininfor/export', {
-        ...this.queryParams
+    //     ...this.queryParams
-      }, `logininfor_${new Date().getTime()}.xlsx`)
+    //   }, `sysLogininfor_${new Date().getTime()}.xlsx`)
-    }
+     const loadingInstance = this.$loading({
+            text: '正在导出...'
+        })
+       var qParam = {...this.queryParams};
+       qParam.pageNum=1;
+       qParam.pageSize=5000;
+
+       list(qParam).then(response => {
+        this.downloadLoading = false
+        if (response.code === 200) {
+                const curList = response.rows
+                import('@/vendor/Export2Excel').then(excel => {
+                  const tHeader = ['访问ID','登录账号','用户名称','登录IP地址','登录地点','浏览器类型','操作系统','登录状态（0成功','提示消息','访问时间','创建者','创建时间','创建站点','data_from','登录网点名称','登录网点编码',];
+                  const filterVal = ['infoId','userName','nickName','ipaddr','loginLocation','browser','os','status','msg','loginTime','createBy','createTime','createSite','dataFrom','loginSiteName','loginSiteCode',];
+                  const data = this.formatJson(filterVal, curList, response.rows)
+                  excel.export_json_to_excel({
+                    header: tHeader,
+                    data,
+                    filename: '系统访问记录',
+                    autoWidth: true
+                  })
+                  loadingInstance.close()
+                })
+        }
+      });
+    },
+    formatJson(filterVal, jsonData, resData) {
+      let index = 0
+      return jsonData.map(v => filterVal.map(j => {
+        if (j === 'index') {
+          return ++index
+        }
+        if (j === 'status') {
+          var statusStr='成功'
+          if(v[j] == 1){
+              statusStr='失败'
+          }
+          return statusStr;
+        }
+        return v[j]
+      }))
+    },
   }
 };
 </script>