Merge branch 'V2' of http://47.92.161.104:10080/zq/jp-housekeeper-portal into V2

src/api/base/alarmConfig.js

@@ -41,6 +41,11 @@ function batchRemove(idList){
   });
 }
 
+function exportXls(formData) {
+  //导出xls
+  return request.post(constant.serverUrl + "/base/alarmConfig/exportXls", formData);
+}
+
 export default {
-  pageList,create,edit,add,update,remove,batchRemove
+  pageList,create,edit,add,update,remove,batchRemove,exportXls
 }

src/api/base/businessOut.js

@@ -45,6 +45,10 @@ function createWord(formData) {
   return request.post(constant.serverUrl + "/base/businessOut/createWord", formData);
 }
 
+function flowList(id){
+  return request.post(constant.serverUrl + "/base/businessOut/flowList/" + id);
+}
+
 export default {
-  pageList,create,edit,add,update,remove,batchRemove,createWord
+  pageList,create,edit,add,update,remove,batchRemove,createWord,flowList
 }

src/api/base/holidayInfo.js

@@ -41,6 +41,11 @@ function batchRemove(idList){
   });
 }
 
+function exportXls(formData) {
+  //导出xls
+  return request.post(constant.serverUrl + "/base/holidayInfo/exportXls", formData);
+}
+
 export default {
-  pageList,create,edit,add,update,remove,batchRemove
+  pageList,create,edit,add,update,remove,batchRemove,exportXls
 }

src/routers/modules/base.js

@@ -548,7 +548,7 @@ var routers = [
                 component: () => import('@/views/base/businessOut-list.vue'),
                 meta: {
                         roles: ["admin"],
-                        title: '外出记录'
+                        title: '外勤申请记录'
                 }
         }, 
         {
@@ -566,7 +566,7 @@ var routers = [
                 component: () => import('@/views/base/companyPayment-list.vue'),
                 meta: {
                         roles: ["admin"],
-                        title: '物业公司收款账户管理'
+                        title: '收款账户管理'
                 }
         }, 
 ]

src/routers/modules/business.js

@@ -54,7 +54,7 @@ var routers = [
         {
                 //账单推送管理
                 path: '/business/billPush/list',
-                name: 'business-billPush-list',
+                name: 'businessBillPushList',
                 // route level code-splitting
                 // this generates a separate chunk (about.[hash].js) for this route
                 // which is lazy-loaded when the route is visited.

src/views/base/alarmConfig-list.vue

@@ -13,7 +13,12 @@
     <!--
       要resetFields起作用，必须配置:model和prop
     -->
-    <el-form ref="queryForm" :model="queryModel" inline class="demo-form-inline">
+    <el-form
+      ref="queryForm"
+      :model="queryModel"
+      inline
+      class="demo-form-inline"
+    >
       <el-form-item label="单位" prop="companyId">
         <!-- <el-select
           v-model="queryModel.companyId"
@@ -44,20 +49,46 @@
           icon="ios-search"
           @click="changePage(1)"
           :loading="loading"
-        >查询</el-button>&nbsp;
+          >查询</el-button
+        >&nbsp;
       </el-form-item>
     </el-form>
     <el-divider></el-divider>
     <el-row class="button-group">
-      <el-button type="primary" size="small" plain icon="el-icon-circle-plus" @click="handleAdd">新增</el-button>
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-circle-plus"
+        @click="handleAdd"
+        >新增</el-button
+      >
       <el-button
         type="primary"
         size="small"
         plain
         icon="el-icon-remove"
-        :disabled="multipleSelection.length==0"
+        :disabled="multipleSelection.length == 0"
         @click="handleBatchDelete"
-      >删除选中项</el-button>
+        >删除选中项</el-button
+      >
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-upload2"
+        @click="batchImportVisible = true"
+        >导入</el-button
+      >
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-download"
+        :loading="xlsLoading"
+        @click="downloadAll"
+        >导出数据</el-button
+      >
     </el-row>
     <el-table
       ref="formTable"
@@ -69,37 +100,67 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55"></el-table-column>
-      <el-table-column prop="companyName" label="单位" width="220" fixed="left"></el-table-column>
+      <el-table-column
+        prop="companyName"
+        label="单位"
+        width="220"
+        fixed="left"
+      ></el-table-column>
       <el-table-column prop="subordinate" label="是否包含下级单位" width="150">
-        <template slot-scope="{row}">
-          <span v-html="row.subordinate ? '是': '否'"></span>
+        <template slot-scope="{ row }">
+          <span v-html="row.subordinate ? '是' : '否'"></span>
         </template>
       </el-table-column>
-      <el-table-column prop="weekdays" label="周工作日" show-overflow-tooltip width="150"></el-table-column>
-      <el-table-column prop="startTime" label="开始时间" width="120"></el-table-column>
-      <el-table-column prop="attendanceTime" label="考勤时间" width="120"></el-table-column>
-      <el-table-column prop="endTime" label="结束时间" width="120"></el-table-column>
+      <el-table-column
+        prop="weekdays"
+        label="周工作日"
+        show-overflow-tooltip
+        width="150"
+      ></el-table-column>
+      <el-table-column
+        prop="startTime"
+        label="开始时间"
+        width="120"
+      ></el-table-column>
+      <el-table-column
+        prop="attendanceTime"
+        label="考勤时间"
+        width="120"
+      ></el-table-column>
+      <el-table-column
+        prop="endTime"
+        label="结束时间"
+        width="120"
+      ></el-table-column>
       <el-table-column prop="attendanceType" label="考勤类型" width="120">
-        <template slot-scope="{row}">
-          <span v-html="row.attendanceType==1 ? '内勤': ''"></span>
-          <span v-html="row.attendanceType==2 ? '外勤': ''"></span>
+        <template slot-scope="{ row }">
+          <span v-html="row.attendanceType == 1 ? '内勤' : ''"></span>
+          <span v-html="row.attendanceType == 2 ? '外勤' : ''"></span>
         </template>
       </el-table-column>
       <el-table-column prop="classifier" label="考勤分类" width="120">
-        <template slot-scope="{row}">
-          <span v-html="row.classifier==1 ? '上班时间': ''"></span>
-          <span v-html="row.classifier==2 ? '下班时间': ''"></span>
+        <template slot-scope="{ row }">
+          <span v-html="row.classifier == 1 ? '上班时间' : ''"></span>
+          <span v-html="row.classifier == 2 ? '下班时间' : ''"></span>
         </template>
       </el-table-column>
-      <el-table-column prop="needMeasureTemperature" label="是否要求测温" width="120">
-        <template slot-scope="{row}">
-          <span v-html="row.needMeasureTemperature ? '是': '否'"></span>
+      <el-table-column
+        prop="needMeasureTemperature"
+        label="是否要求测温"
+        width="120"
+      >
+        <template slot-scope="{ row }">
+          <span v-html="row.needMeasureTemperature ? '是' : '否'"></span>
         </template>
       </el-table-column>
       <el-table-column label="操作" width="200" fixed="right">
-        <template slot-scope="{row}">
-          <el-button size="mini" type="warning" @click="handleEdit(row)">修改</el-button>
-          <el-button size="mini" type="danger" @click="handleDelete(row)">删除</el-button>
+        <template slot-scope="{ row }">
+          <el-button size="mini" type="warning" @click="handleEdit(row)"
+            >修改</el-button
+          >
+          <el-button size="mini" type="danger" @click="handleDelete(row)"
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
@@ -118,6 +179,67 @@
       :companyResult="companyResult"
       @close="onDetailModalClose"
     ></alarmConfig-detail>
+    <!--批量导入s-->
+    <el-dialog
+      title="批量导入考勤时间设置"
+      :visible.sync="batchImportVisible"
+      :modal-append-to-body="false"
+      style="text-align: left"
+      :close-on-click-modal="false"
+    >
+      <el-form label-width="150px">
+        <el-form-item label="模板下载">
+          <el-link
+            href="http://rccs.oss-cn-hangzhou.aliyuncs.com/smart/personInfo/2020/10/%E8%80%83%E5%8B%A4%E6%97%B6%E9%97%B4%E8%AE%BE%E7%BD%AE%E5%AF%BC%E5%85%A5%E6%A8%A1%E6%9D%BF.xls"
+            type="primary"
+            target="_blank"
+            >点击下载模板</el-link
+          >
+        </el-form-item>
+        <el-form-item label="单位">
+          <el-select-tree
+            size="large"
+            :props="props"
+            :options="companyResult"
+            v-model="uploadXlsData.companyId"
+            height="200"
+            width="300px"
+          ></el-select-tree>
+        </el-form-item>
+        <el-form-item label="上传文件">
+          <el-upload
+            class="upload-demo"
+            accept=".xls"
+            :action="uploadUrlXls"
+            :data="uploadXlsData"
+            :headers="headers"
+            :on-preview="handleBatchImportPreview"
+            name="uploadFile"
+            :multiple="true"
+            :limit="1"
+            :on-remove="handleBatchImportRemove"
+            :before-remove="beforeBatchImportRemove"
+            :before-upload="beforeUpload"
+            :on-exceed="handleBatchImportExceed"
+            :on-success="handleBatchImportSuccess"
+            :file-list="batchImportFileList"
+          >
+            <el-button size="small" type="primary" :loading="xlsLoading"
+              >点击上传</el-button
+            >
+            <div slot="tip" class="el-upload__tip">
+              只能上传xls文件，且不超过500kb
+            </div>
+          </el-upload>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="batchImportVisible = false"
+          >关 闭</el-button
+        >
+      </div>
+    </el-dialog>
+    <!--批量导入E-->
   </div>
 </template>
 <script>
@@ -127,6 +249,7 @@ import alarmConfigApi from "@/api/base/alarmConfig";
 import companyInfoApi from "@/api/base/companyInfo";
 import SelectTree from "@/components/SelectTree";
 import pageUtil from "@/utils/page";
+import { getToken } from "@/utils/auth"; // get token from cookie
 
 import NProgress from "nprogress"; // progress bar
 import "nprogress/nprogress.css"; // progress bar style
@@ -138,7 +261,7 @@ export default {
 
     return {
       queryModel: {
-        companyId: ""
+        companyId: "",
       },
       loading: false,
       tableData: [],
@@ -160,8 +283,19 @@ export default {
         // 配置项（必选）
         value: "id",
         label: "name",
-        children: "children"
-      }
+        children: "children",
+      },
+      batchImportVisible: false,
+      batchImportFileList: [],
+      uploadUrlXls: Constant.serverUrl + "/base/alarmConfig/importXls",
+      uploadXlsData: {
+        subFolder: "company",
+        companyId: "",
+      },
+      headers: {
+        Authorization: getToken(),
+      },
+      xlsLoading: false,
     };
   },
   created() {
@@ -174,7 +308,7 @@ export default {
     loadTree() {
       var formData = new FormData();
 
-      companyInfoApi.loadChildren(formData).then(resp => {
+      companyInfoApi.loadChildren(formData).then((resp) => {
         var jsonData = resp.data;
 
         if (jsonData.result) {
@@ -190,7 +324,7 @@ export default {
       var formData = new FormData();
       formData.append("parentId", tree.id);
 
-      companyInfoApi.loadChildren(formData).then(resp => {
+      companyInfoApi.loadChildren(formData).then((resp) => {
         var jsonData = resp.data;
 
         if (jsonData.result) {
@@ -226,7 +360,7 @@ export default {
 
       alarmConfigApi
         .pageList(formData)
-        .then(function(response) {
+        .then(function (response) {
           self.loading = false;
 
           var jsonData = response.data.data;
@@ -235,7 +369,7 @@ export default {
           self.totalPages = jsonData.totalPages;
           self.totalElements = jsonData.recordsTotal;
         })
-        .catch(error => {
+        .catch((error) => {
           self.loading = false;
           // self.$message.error(error + "");
         });
@@ -272,10 +406,10 @@ export default {
         .$confirm("是否确认删除?", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
-          type: "warning"
+          type: "warning",
         })
         .then(() => {
-          alarmConfigApi.remove(record.id).then(function(response) {
+          alarmConfigApi.remove(record.id).then(function (response) {
             var jsonData = response.data;
 
             if (jsonData.result) {
@@ -285,7 +419,7 @@ export default {
 
               self.$message({
                 type: "success",
-                message: "删除成功!"
+                message: "删除成功!",
               });
             }
           });
@@ -294,16 +428,16 @@ export default {
     handleBatchDelete() {
       var self = this;
 
-      var idList = this.multipleSelection.map(record => {
+      var idList = this.multipleSelection.map((record) => {
         return record.id;
       });
 
       this.$confirm("是否确认删除选中项？", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning"
+        type: "warning",
       }).then(() => {
-        alarmConfigApi.batchRemove(idList).then(function(response) {
+        alarmConfigApi.batchRemove(idList).then(function (response) {
           var jsonData = response.data;
 
           if (jsonData.result) {
@@ -311,7 +445,7 @@ export default {
 
             self.$message({
               type: "success",
-              message: "删除成功!"
+              message: "删除成功!",
             });
           }
         });
@@ -324,27 +458,129 @@ export default {
       if (refreshed) {
         this.changePage(this.pageIndex);
       }
-    }
+    },
+    beforeUpload(file, fileList) {
+      //导入前判断
+      var self = this;
+      var companyId = self.uploadXlsData.companyId;
+
+      if (companyId == null || companyId.length == 0) {
+        self.$message({
+          type: "warning",
+          message: "请选择单位!",
+        });
+        self.xlsLoading = false;
+        return false;
+      } else {
+        self.xlsLoading = true;
+        return true;
+      }
+    },
+    //批量导入-上传成功
+    handleBatchImportSuccess(response, file, fileList) {
+      var self = this;
+      self.xlsLoading = false;
+      self.uploadXlsData.companyId = null;
+
+      if (response.result) {
+        self.$message.success(response.message);
+        this.batchImportFileList = [];
+        this.changePage(1);
+
+        this.batchImportVisible = false;
+      } else {
+        //this.$message.error(response.message);
+        this.batchImportFileList = [];
+        this.changePage(1);
+
+        if (response.data != null) {
+          //下载有错误信息提示的报表
+          //window.open(response.data);
+          self.$message({
+            showClose: true,
+            dangerouslyUseHTMLString: true,
+            message:
+              response.message +
+              `,<a href="${response.data}" target="_blank">点击下载未导入的数据报表</a>&nbsp;`,
+            duration: 30000,
+          });
+        }
+      }
+    },
+    //批量导入-预览
+    handleBatchImportPreview(file) {
+      console.log(file.url);
+    },
+    //批量导入-移除
+    handleBatchImportRemove(file, fileList) {
+      console.log(file, fileList);
+    },
+    //批量导入-移除前操作
+    beforeBatchImportRemove(file, fileList) {
+      console.log(file, fileList);
+    },
+    //批量导入-文件超出个数限制时的钩子
+    handleBatchImportExceed(files, fileList) {
+      this.$message.warning(
+        `当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${
+          files.length + fileList.length
+        } 个文件`
+      );
+    },
+    downloadAll() {
+      //导出
+      var self = this;
+      var formData = new FormData();
+
+      if (self.queryModel.companyId == null) {
+        self.queryModel.companyId = "";
+      }
+      formData.append("companyId", self.queryModel.companyId);
+
+      self.loading = true;
+      self.xlsLoading = true;
+
+      alarmConfigApi.exportXls(formData).then(function (response) {
+        self.loading = false;
+        self.xlsLoading = false;
+        var jsonData = response.data;
+        if (jsonData.result) {
+          if (jsonData.data != null) {
+            if (document.location.href.startsWith("https://")) {
+              jsonData.data = jsonData.data.replace("http://", "https://");
+            }
+
+            self.$message({
+              showClose: true,
+              type: "success",
+              dangerouslyUseHTMLString: true,
+              message: `报表已生成，<a href="${jsonData.data}" target="_blank">点击下载报表</a>&nbsp;`,
+              duration: 30000,
+            });
+          }
+        }
+      });
+    },
   },
-  mounted: function() {
+  mounted: function () {
     var self = this;
     this.changePage(1);
 
-    companyInfoApi.list().then(function(response) {
+    companyInfoApi.list().then(function (response) {
       var jsonData = response.data;
       if (jsonData.result) {
         self.companyResult = jsonData.data;
       }
     });
 
-    setTimeout(()=>{
+    setTimeout(() => {
       this.tableHeight = pageUtil.autoAdjustHeight(this.$refs.formTable.$el);
-    },1000);
+    }, 1000);
   },
   components: {
     "alarmConfig-detail": alarmConfigDetail,
-    "el-select-tree": SelectTree
-  }
+    "el-select-tree": SelectTree,
+  },
 };
 </script>
 <style lang="scss" scoped>

src/views/base/applicationExamine-detail.vue

@@ -20,7 +20,7 @@
         :rules="ruleValidate"
         :label-width="'130px'"
       >
-        <el-form-item label="申请者公司" prop="applicationCompanyId">
+        <el-form-item label="申请者单位" prop="applicationCompanyId">
           <el-select-tree
             :props="props"
             :options="companyResult"
@@ -29,10 +29,19 @@
             height="200"
           ></el-select-tree>
         </el-form-item>
-        <el-form-item label="申请者角色" prop="applicationRoleId">
-          <el-select
+        <el-form-item label="包括下级单位" prop="includeSubordinate">
+          <el-switch 
+            v-model="formModel.includeSubordinate"
+            active-color="#13ce66"
+            inactive-color="#ff4949"
+          >
+          </el-switch>
+        </el-form-item>                    
+        <el-form-item label="申请者身份" prop="applicationRoleId">
+          <el-select 
             v-model="formModel.applicationRoleId"
             filterable
+            multiple
             placeholder="请选择"
             style="width: 280px"
           >
@@ -44,7 +53,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="审核人公司" prop="examineCompanyId">
+        <el-form-item label="审核人单位" prop="examineCompanyId">
           <el-select-tree
             :props="props"
             :options="companyResult"
@@ -53,7 +62,7 @@
             height="200"
           ></el-select-tree>
         </el-form-item>
-        <el-form-item label="审核人角色" prop="examineRoleId">
+        <el-form-item label="审核人身份" prop="examineRoleId">
           <el-select
             v-model="formModel.examineRoleId"
             filterable
@@ -86,15 +95,16 @@
         <el-form-item label="审批等级" prop="level">
           <el-input-number
             v-model="formModel.level"
-            placeholder="请输入备注信息"
+            placeholder="请输入审批等级"
             style="width: 300px"
-            min="1"
+            :min="1"
           ></el-input-number>
+          <span>&nbsp;表示第几轮审批</span>
         </el-form-item>
-        <el-form-item label="请假天数" prop="days">
+        <el-form-item label="请假超过天数" prop="days" v-if="formModel.type=='4'">
           <el-input-number
             v-model="formModel.days"
-            placeholder="请输入备注信息"
+            placeholder="请输入天数"
             style="width: 300px"
           ></el-input-number>
         </el-form-item>
@@ -237,10 +247,17 @@ export default {
           (function () {
             var id = self.formModel.id;
 
+            var submitModel = JSON.parse(JSON.stringify(self.formModel));
+
+            if (submitModel.applicationRoleId != null) {
+              var applicationRoleId = submitModel.applicationRoleId.join(",");
+              submitModel.applicationRoleId = applicationRoleId;
+            }
+
             if (id == null || id.length == 0) {
-              return applicationExamineApi.add(self.formModel);
+              return applicationExamineApi.add(submitModel);
             } else {
-              return applicationExamineApi.update(self.formModel);
+              return applicationExamineApi.update(submitModel);
             }
           })().then(function (response) {
             var jsonData = response.data;
@@ -280,6 +297,12 @@ export default {
         self.loading = false;
 
         if (jsonData.result) {
+          var applicationRoleId = jsonData.data.applicationRoleId;
+
+          if (applicationRoleId != null) {
+            jsonData.data.applicationRoleId = applicationRoleId.split(",");
+          }
+
           self.formModel = jsonData.data;
         } else {
           self.$message.error(jsonData.message + "");

src/views/base/applicationExamine-list.vue

@@ -145,14 +145,29 @@
       ></el-table-column>
       <el-table-column
         prop="applicationCompanyName"
-        label="申请者公司"
+        label="申请者单位"
         width="180"
       ></el-table-column>
       <el-table-column
         prop="applicationRoleName"
-        label="申请者角色"
+        label="申请者身份"
         width="150"
       ></el-table-column>
+      <el-table-column
+        prop="includeSubordinate"
+        label="是否包括下级单位"
+        width="150"
+      >
+        <template slot-scope="{row}">
+            <el-switch 
+                v-model="row.includeSubordinate"
+                active-color="#13ce66"
+                inactive-color="#ff4949"
+                @change="handleUpdate(row)"
+              >
+            </el-switch>
+        </template>
+      </el-table-column>
       <el-table-column
         prop="typeName"
         label="审批类型"
@@ -160,31 +175,28 @@
       ></el-table-column>
       <el-table-column prop="level" label="审批等级" width="100">
         <template slot-scope="{ row }">
-          <span v-if="row.level != '' && row.level != null"
-            >lv.{{ row.level }}</span
-          >
+          <span v-if="row.level != '' && row.level != null">lv.{{ row.level }}</span>
           <span v-else>{{ row.level }}</span>
-        </template></el-table-column
-      >
+        </template>
+      </el-table-column>
       <el-table-column
         prop="examineCompanyName"
-        label="审核人公司"
+        label="审核人单位"
         width="180"
       ></el-table-column>
       <el-table-column
         prop="examineRoleName"
-        label="审核人角色"
+        label="审核人身份"
         width="150"
       ></el-table-column>
       <el-table-column
         prop="days"
-        label="请假天数"
+        label="请假超过天数"
         width="100"
       ></el-table-column>
       <el-table-column
         prop="remark"
         label="备注信息"
-        width="150"
       ></el-table-column>
       <el-table-column label="操作" width="130" fixed="right">
         <template slot-scope="{ row }">
@@ -462,6 +474,24 @@ export default {
         this.changePage(this.pageIndex);
       }
     },
+    handleUpdate(row){
+        applicationExamineApi.update(row).then((response)=>{
+          var jsonData = response.data;
+
+          if(jsonData.result){
+            this.$message({
+              type: "success",
+              message: "修改成功!",
+            });
+          }
+          else{            
+            this.$message({
+              type: "error",
+              message: "修改失败!" + jsonData.data.message,
+            });
+          }
+        });
+    }
   },
   mounted: function () {
     this.changePage(1);

src/views/base/businessOut-flow.vue

@@ -0,0 +1,137 @@
+
+<style scoped>
+.user-panel {
+  margin: 10px auto;
+}
+</style>
+<template>
+  <el-dialog
+    :visible.sync="showDialog"
+    :title="title"
+    :modal-append-to-body="false"
+    style="text-align: left"
+    @close="closeDialog"
+    :close-on-click-modal="false"
+  >
+    <div class="user-panel" v-loading="loading">
+      <el-table
+      :data="tableData"
+      style="min-height: 400px"
+      v-loading="loading"
+      stripe
+    >
+      <el-table-column
+        type="index"
+        label="序号"
+        :index="indexMethod"
+        width="50"
+      ></el-table-column>
+      <el-table-column
+        prop="approvalPersonName"
+        label="审批人"
+        width="100"
+      ></el-table-column>
+      <el-table-column
+        prop="approvalPersonRoleName"
+        label="审批人角色"
+        width="100"
+      ></el-table-column>
+      <el-table-column prop="status" label="审批状态" width="100">
+        <template slot-scope="{ row }">
+          <span v-if="row.status == 1" style="color: green">同意</span>
+          <span v-else-if="row.status == 2" style="color: red">拒绝</span>
+          <span v-else>待处理</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="approvalContent"
+        label="审核意见"
+        width="150"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="approvalTime"
+        label="审核时间"
+        width="150"
+      ></el-table-column>
+    </el-table>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="closeDialog">关 闭</el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+import Constant from "@/constant";
+import businessOutApi from "@/api/base/businessOut";
+
+export default {
+  props: ["businessKey", "title"],
+  data() {
+    return {
+      formModel: {},
+      showDialog: true,
+      loading: false,
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      submitting: false,
+    };
+  },
+  methods: {
+    closeDialog() {
+      this.$emit("close", false);
+    },
+    indexMethod(index) {
+      return (this.pageIndex - 1) * this.pageSize + (index + 1);
+    },
+    changePage(pageIndex) {
+      var self = this;
+
+      self.loading = true;
+
+      businessOutApi
+        .flowList(self.businessKey)
+        .then(function (response) {
+          self.loading = false;
+
+          var jsonData = response.data.data;
+
+          self.tableData = jsonData.data;
+        })
+        .catch((error) => {
+          self.loading = false;
+          // self.$message.error(error + "");
+        });
+    },
+  },
+  mounted: function () {
+    var self = this;
+
+    (function () {
+      if (self.businessKey.length == 0) {
+        return businessOutApi.create();
+      } else {
+        return businessOutApi.edit(self.businessKey);
+      }
+    })()
+      .then((response) => {
+        this.changePage(1);
+
+        var jsonData = response.data;
+        self.loading = false;
+
+        if (jsonData.result) {
+          self.formModel = jsonData.data;
+        } else {
+          self.$message.error(jsonData.message + "");
+        }
+      })
+      .catch((error) => {
+        self.$message.error(error + "");
+      });
+  },
+};
+</script>

src/views/base/businessOut-list.vue

@@ -171,15 +171,15 @@
         show-overflow-tooltip
       ></el-table-column>
       <el-table-column prop="remark" label="备注" width="120"></el-table-column>
-      <el-table-column label="操作" width="100">
+      <el-table-column label="操作" width="140" fixed="right">
         <template slot-scope="{ row }">
           <el-row>
             <el-col :span="12">
               <el-link v-if="row.type == 3" type="primary" @click="createWord(row)">下载</el-link>
             </el-col>
-            <!-- <el-col :span="12">
-              <el-link type="danger" @click="handleDelete(row)">删除</el-link>
-            </el-col> -->
+            <el-col :span="12">
+              <el-link v-if="row.type == 3" type="success" @click="handleFlow(row)">审核详情</el-link>
+            </el-col>
           </el-row>
         </template>
       </el-table-column>
@@ -198,11 +198,18 @@
       :title="modalTitle"
       @close="onDetailModalClose"
     ></businessOut-detail>
+    <businessOut-flow
+      v-if="showModal1"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></businessOut-flow>
   </div>
 </template>
 <script>
 import Constant from "@/constant";
 import BusinessOutDetail from "./businessOut-detail";
+import BusinessOutFlow from "./businessOut-flow";
 import businessOutApi from "@/api/base/businessOut";
 import NProgress from "nprogress"; // progress bar
 import "nprogress/nprogress.css"; // progress bar style
@@ -229,6 +236,7 @@ export default {
       pageSizeList: [10, 20, 30],
       multipleSelection: [],
       showModal: false,
+      showModal1: false,
       modalTitle: "",
       businessKey: "",
     };
@@ -327,6 +335,11 @@ export default {
       this.businessKey = record.id;
       this.showModal = true;
     },
+    handleFlow(record) {
+      this.modalTitle = "审核详情";
+      this.businessKey = record.id;
+      this.showModal1 = true;
+    },
     handleDelete(record) {
       var self = this;
 
@@ -382,6 +395,7 @@ export default {
     onDetailModalClose(refreshed) {
       //保存成功后回调
       this.showModal = false;
+      this.showModal1 = false;
 
       if (refreshed) {
         this.changePage(this.pageIndex);
@@ -393,6 +407,7 @@ export default {
   },
   components: {
     "businessOut-detail": BusinessOutDetail,
+    "businessOut-flow": BusinessOutFlow,
   },
 };
 </script>

src/views/base/checkinInfo-list.vue

@@ -3,7 +3,7 @@
     <el-breadcrumb separator=">">
       <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
       <el-breadcrumb-item>
-        <a href="#">系统管理</a>
+        <a href="#">园区管理</a>
       </el-breadcrumb-item>
       <el-breadcrumb-item>
         <a href="/base/checkinInfo">租户管理</a>

src/views/base/companyInfo-list.vue

@@ -165,6 +165,11 @@
         label="地区"
         width="90"
       ></el-table-column>
+      <el-table-column
+        prop="typeName"
+        label="单位类别"
+        width="90"
+      ></el-table-column>
       <el-table-column
         prop="remark"
         sort-by="remark_"

src/views/base/companyPayment-detail.vue

@@ -5,6 +5,7 @@
         :modal-append-to-body="false"
         style="text-align: left"
         @close="closeDialog"
+        width="1000px"
         :close-on-click-modal="false"
       >
       <div class="user-panel" v-loading="loading">
@@ -12,7 +13,7 @@
             ref="form"
             :model="formModel"
             :rules="ruleValidate"
-            :label-width="'180px'"
+            :label-width="'150px'"
             inline
         >
             <el-form-item label="物业公司" prop="companyId">
@@ -29,81 +30,83 @@
                     :options="treeData"
                     v-model="formModel.companyId"
                     height="200"
-                    style="width: 400px"
+                    style="width: 300px"
                 ></el-select-tree>
             </el-form-item>
             <el-form-item label="账户名称" prop="name">
                 <el-input
                     v-model="formModel.name"
                     placeholder="请输入账户名称"
-                    style="width: 400px"
+                    style="width: 300px"
                 ></el-input>
             </el-form-item>
             <el-form-item label="结算周期" prop="cycle">
                 <el-input
                     v-model="formModel.cycle"
                     placeholder="结算周期"
-                    style="width: 400px"
-                ></el-input>
+                    style="width: 300px"
+                >
+                     <template slot="append">天以内</template>
+                </el-input>
             </el-form-item>
-            <el-form-item label="微信mchId" prop="mchId">
+            <el-form-item label="微信商户号" prop="mchId">
                 <el-input
                     v-model="formModel.mchId"
                     placeholder="请输入微信mchId"
-                    style="width: 400px"
+                    style="width: 300px"
                 ></el-input>
             </el-form-item>
-            <el-form-item label="微信subMchId" prop="subMchId">
+            <el-form-item label="微信子商户号" prop="subMchId">
                 <el-input
                     v-model="formModel.subMchId"
                     placeholder="请输入微信subMchId"
-                    style="width: 400px"
+                    style="width: 300px"
                 ></el-input>
             </el-form-item>
-            <el-form-item label="支付宝appAuthToken" prop="appAuthToken">
+            <el-form-item label="支付宝令牌" prop="appAuthToken">
                 <el-input
                     v-model="formModel.appAuthToken"
                     placeholder="请输入支付宝appAuthToken"
-                    style="width: 400px"
+                    style="width: 300px"
                 ></el-input>
             </el-form-item>
             <el-form-item label="开户名称" prop="bankName">
                 <el-input
                     v-model="formModel.bankName"
                     placeholder="请输入开户名称"
-                    style="width: 400px"
+                    style="width: 300px"
                 ></el-input>
             </el-form-item>
                         <el-form-item label="开户银行" prop="bank">
                 <el-input
                     v-model="formModel.bank"
                     placeholder="请输入开户银行"
-                    style="width: 400px"
+                    style="width: 300px"
                 ></el-input>
             </el-form-item>
             <el-form-item label="账号" prop="account">
                 <el-input
                     v-model="formModel.account"
                     placeholder="请输入账号"
-                    style="width: 400px"
+                    style="width: 300px"
                 ></el-input>
             </el-form-item>
             <el-form-item label="财务人员手机账户" prop="financePersonId">
-                <el-select v-model="formModel.financePersonId" filterable style="width: 400px">
+                <el-select v-model="formModel.financePersonId" filterable style="width: 300px">
                     <el-option
                         v-for="result in personList"
                         :key="result.id"
-                        :label="result.name"
+                        :label="result.name + '(' + result.phone + ')'"
                         :value="result.id"
                     ></el-option>
                 </el-select>
             </el-form-item>
             <el-form-item label="财务人员后台账户" prop="financeUserId">
-                <el-select v-model="formModel.financeUserId" filterable style="width: 400px">
+                <el-select v-model="formModel.financeUserId" filterable style="width: 300px">
                     <el-option
                         v-for="result in userList"
                         :key="result.id"
-                        :label="result.realName"
+                        :label="result.realName + '(' + result.userName + ')'"
                         :value="result.id"
                     ></el-option>
                 </el-select>

src/views/base/companyPayment-list.vue

@@ -6,7 +6,7 @@
             <a href="#">系统管理</a>
         </el-breadcrumb-item>
         <el-breadcrumb-item>
-            <a href="#">物业公司收款账户管理</a>
+            <a href="#">园区管理</a>
         </el-breadcrumb-item>
         </el-breadcrumb>
         <el-divider></el-divider>
@@ -75,15 +75,19 @@
             >
             <el-table-column prop="companyName"  label="物业公司" ></el-table-column>
             <el-table-column prop="name"  label="账户名称" ></el-table-column>
-            <el-table-column prop="cycle"  label="结算周期"  ></el-table-column>
+            <el-table-column prop="cycle"  label="结算周期"  >
+                <template slot-scope="{row}">
+                    {{row.cycle}}天以内
+                </template>
+            </el-table-column>
             <el-table-column prop="mchId"  label="微信mchId" ></el-table-column>
             <el-table-column prop="subMchId"  label="微信subMchId" ></el-table-column>
             <el-table-column prop="appAuthToken"  label="支付宝appAuthToken"  ></el-table-column>
-            <el-table-column prop="bankName"  label="账户名称"  ></el-table-column>
+            <el-table-column prop="bankName"  label="开户名称"  ></el-table-column>
             <el-table-column prop="bank"  label="开户银行"  ></el-table-column>
             <el-table-column prop="account"  label="账号"  ></el-table-column>
             <el-table-column prop="createTime"  label="创建时间"  ></el-table-column>
-            <el-table-column prop="isDefault"  label="是否默认账户"  >
+            <el-table-column prop="isDefault"  label="默认账户">
                 <template slot-scope="{row}">
                     <el-switch
                         v-model="row.isDefault"
@@ -113,7 +117,7 @@
                     </el-switch>
                 </template>
             </el-table-column> -->
-            <el-table-column label="操作" fixed="right" width="130px">
+            <el-table-column label="操作" fixed="right" width="180px">
                 <template slot-scope="{row}">
                 <el-link size="mini" type="primary" @click="handleEdit(row)">编辑</el-link>-
                 <el-link size="mini" type="warning" @click="handleManagePayService(row)">收费项目</el-link>-

src/views/base/deviceInfo-list.vue

@@ -615,6 +615,10 @@ export default {
           
           if(jsonData.result) {
             if(exportFlag){
+              if(document.location.href.startsWith("https://")){
+                  jsonData.data = jsonData.data.replace("http://","https://");
+              }
+
               //导出
               self.$message({
                 showClose: true,

src/views/base/holidayInfo-detail.vue

@@ -13,16 +13,24 @@
     width="800px;"
     @close="closeDialog"
     :close-on-click-modal="false"
-  >
+  > 
     <div class="user-panel" v-loading="loading">
       <el-form ref="form" :model="formModel" :rules="ruleValidate" :label-width="'150px'">
+        <el-form-item label="单位名称" prop="companyId">
+          <el-select-tree
+            :props="props"
+            :options="companyResult"
+            v-model="formModel.companyId"
+            height="200"
+            size="mediumn"
+          ></el-select-tree>
+        </el-form-item>
         <el-form-item label="节假日名称" prop="holidayName">
           <el-input v-model="formModel.holidayName" placeholder="请输入电表名称" style="width:300px"></el-input>
         </el-form-item>
         <el-form-item label="开始时间" prop="beginDate">
           <el-date-picker v-model="formModel.beginDate" value-format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
         </el-form-item>
-
         <el-form-item label="结束时间" prop="endDate">
           <el-date-picker v-model="formModel.endDate" value-format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
         </el-form-item>
@@ -56,13 +64,17 @@
 import Constant from "@/constant";
 import holidayInfoApi from "@/api/base/holidayInfo";
 import { quillEditor } from "vue-quill-editor";
+import SelectTree from "@/components/SelectTree";
 
 export default {
   props: ["businessKey", "title", "companyResult"],
   data() {
     return {
       ruleValidate: {
-        companyId: [{ required: true, message: "不能为空", trigger: "blur" }]
+        companyId: [{ required: true, message: "不能为空", trigger: "blur" }],
+        holidayName: [{ required: true, message: "不能为空", trigger: "blur" }],
+        beginDate: [{ required: true, message: "不能为空", trigger: "blur" }],
+        endDate: [{ required: true, message: "不能为空", trigger: "blur" }]
       },
       showDialog: true,
       loading: false,
@@ -71,35 +83,35 @@ export default {
       rangeTime: "",
       options: [
         {
-          value: "",
+          value: 0,
           label: "无"
         },
         {
-          value: "1",
+          value: 1,
           label: "周一"
         },
         {
-          value: "2",
+          value: 2,
           label: "周二"
         },
         {
-          value: "3",
+          value: 3,
           label: "周三"
         },
         {
-          value: "4",
+          value: 4,
           label: "周四"
         },
         {
-          value: "5",
+          value: 5,
           label: "周五"
         },
         {
-          value: "6",
+          value: 6,
           label: "周六"
         },
         {
-          value: "7",
+          value: 7,
           label: "星期天"
         }
       ],
@@ -191,6 +203,9 @@ export default {
       .catch(error => {
         self.$message.error(error + "");
       });
+  },
+  components: {
+    "el-select-tree": SelectTree
   }
 };
 </script>

src/views/base/holidayInfo-list.vue

@@ -13,20 +13,98 @@
     <!--
       要resetFields起作用，必须配置:model和prop
     -->
+    <el-form
+      ref="queryForm"
+      :model="queryModel"
+      inline
+      class="demo-form-inline"
+    >
+      <el-form-item label="单位" prop="companyId">
+        <el-select-tree
+          :props="props"
+          aria-setsize="mini"
+          :options="companyResult"
+          v-model="queryModel.companyId"
+          size="mini"
+          height="200"
+        ></el-select-tree>
+      </el-form-item>
+      <el-form-item label="假日名称" prop="companyId">
+        <el-input
+          type="text"
+          size="mini"
+          v-model="queryModel.holidayName"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="假日区间" prop="timeRanges">
+        <el-date-picker
+          v-model="queryModel.timeRanges"
+          type="daterange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          value-format="yyyy-MM-dd"
+          :default-time="timeRangesDefaultTime"
+          size="mini"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          size="mini"
+          icon="ios-search"
+          @click="changePage(1)"
+          :loading="loading"
+          >查询</el-button
+        >&nbsp;
+        <el-button
+          type="info"
+          size="mini"
+          style="margin-left: 8px"
+          @click="handleReset('queryForm')"
+          >重置</el-button
+        >
+      </el-form-item>
+    </el-form>
     <el-divider></el-divider>
     <el-row class="button-group">
-      <el-button type="primary" size="small" plain icon="el-icon-circle-plus" @click="handleAdd">新增</el-button>
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-circle-plus"
+        @click="handleAdd"
+        >新增</el-button
+      >
       <el-button
         type="primary"
         size="small"
         plain
         icon="el-icon-remove"
-        :disabled="multipleSelection.length==0"
+        :disabled="multipleSelection.length == 0"
         @click="handleBatchDelete"
-      >删除选中项</el-button>
+        >删除选中项</el-button
+      >
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-upload2"
+        @click="batchImportVisible = true"
+        >导入</el-button
+      >
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-download"
+        :loading="xlsLoading"
+        @click="downloadAll"
+        >导出数据</el-button
+      >
     </el-row>
     <el-table
-    ref="formTable"
+      ref="formTable"
       :data="tableData"
       v-loading="loading"
       stripe
@@ -34,19 +112,44 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55"></el-table-column>
-      <el-table-column prop="holidayName" label="节假日名称" width="220" fixed="left"></el-table-column>
-      <el-table-column prop="beginDate" label="开始日期" show-overflow-tooltip width="150"></el-table-column>
-      <el-table-column prop="endDate" label="结束日期" width="150"></el-table-column>
+      <el-table-column
+        prop="companyName"
+        label="单位名称"
+        width="220"
+      ></el-table-column>
+      <el-table-column
+        prop="holidayName"
+        label="节假日名称"
+        width="220"
+      ></el-table-column>
+      <el-table-column
+        prop="beginDate"
+        label="开始日期"
+        width="150"
+      ></el-table-column>
+      <el-table-column
+        prop="endDate"
+        label="结束日期"
+        width="150"
+      ></el-table-column>
       <el-table-column prop="working" label="是否需要上班" width="120">
         <template slot-scope="{row}">
-          <span v-html="row.working ? '是': '否'"></span>
+          <span v-html="row.working ? '是' : '否'"></span>
         </template>
       </el-table-column>
-      <el-table-column prop="refWeekday" label="参考上班日" width="120"></el-table-column>
+      <el-table-column
+        prop="refWeekdayN"
+        label="参考上班日"
+        width="120"
+      ></el-table-column>
       <el-table-column label="操作" width="200" fixed="right">
-        <template slot-scope="{row}">
-          <el-button size="mini" type="warning" @click="handleEdit(row)">修改</el-button>
-          <el-button size="mini" type="danger" @click="handleDelete(row)">删除</el-button>
+        <template slot-scope="{ row }">
+          <el-button size="mini" type="warning" @click="handleEdit(row)"
+            >修改</el-button
+          >
+          <el-button size="mini" type="danger" @click="handleDelete(row)"
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
@@ -65,6 +168,67 @@
       :companyResult="companyResult"
       @close="onDetailModalClose"
     ></holidayInfo-detail>
+    <!--批量导入s-->
+    <el-dialog
+      title="批量导入考勤时间设置"
+      :visible.sync="batchImportVisible"
+      :modal-append-to-body="false"
+      style="text-align: left"
+      :close-on-click-modal="false"
+    >
+      <el-form label-width="150px">
+        <el-form-item label="模板下载">
+          <el-link
+            href="http://rccs.oss-cn-hangzhou.aliyuncs.com/smart/personInfo/2020/10/%E8%8A%82%E5%81%87%E6%97%A5%E8%AE%BE%E7%BD%AE%E5%AF%BC%E5%85%A5%E6%A8%A1%E6%9D%BF.xls"
+            type="primary"
+            target="_blank"
+            >点击下载模板</el-link
+          >
+        </el-form-item>
+        <el-form-item label="单位">
+          <el-select-tree
+            size="large"
+            :props="props"
+            :options="companyResult"
+            v-model="uploadXlsData.companyId"
+            height="200"
+            width="300px"
+          ></el-select-tree>
+        </el-form-item>
+        <el-form-item label="上传文件">
+          <el-upload
+            class="upload-demo"
+            accept=".xls"
+            :action="uploadUrlXls"
+            :data="uploadXlsData"
+            :headers="headers"
+            :on-preview="handleBatchImportPreview"
+            name="uploadFile"
+            :multiple="true"
+            :limit="1"
+            :on-remove="handleBatchImportRemove"
+            :before-remove="beforeBatchImportRemove"
+            :before-upload="beforeUpload"
+            :on-exceed="handleBatchImportExceed"
+            :on-success="handleBatchImportSuccess"
+            :file-list="batchImportFileList"
+          >
+            <el-button size="small" type="primary" :loading="xlsLoading"
+              >点击上传</el-button
+            >
+            <div slot="tip" class="el-upload__tip">
+              只能上传xls文件，且不超过500kb
+            </div>
+          </el-upload>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="batchImportVisible = false"
+          >关 闭</el-button
+        >
+      </div>
+    </el-dialog>
+    <!--批量导入E-->
   </div>
 </template>
 <script>
@@ -72,7 +236,9 @@ import Constant from "@/constant";
 import holidayInfoDetail from "./holidayInfo-detail";
 import holidayInfoApi from "@/api/base/holidayInfo";
 import companyInfoApi from "@/api/base/companyInfo";
+import SelectTree from "@/components/SelectTree";
 
+import { getToken } from "@/utils/auth"; // get token from cookie
 import NProgress from "nprogress"; // progress bar
 import "nprogress/nprogress.css"; // progress bar style
 
@@ -92,11 +258,45 @@ export default {
       direction: "",
       pageSizeList: [10, 20, 30],
       multipleSelection: [],
+      timeRangesDefaultTime: [],
       showModal: false,
       modalTitle: "",
-      businessKey: ""
+      businessKey: "",
+      queryModel: {
+        companyId: "",
+        holidayName: "",
+        timeRanges: "",
+      },
+      companyResult: [],
+      treeData: [],
+      props: {
+        // 配置项（必选）
+        value: "id",
+        label: "name",
+        children: "children",
+      },
+      batchImportVisible: false,
+      batchImportFileList: [],
+      uploadUrlXls: Constant.serverUrl + "/base/holidayInfo/importXls",
+      uploadXlsData: {
+        subFolder: "company",
+        companyId: "",
+      },
+      headers: {
+        Authorization: getToken(),
+      },
+      xlsLoading: false,
     };
   },
+  created() {
+    var self = this;
+    companyInfoApi.list().then(function (response) {
+      var jsonData = response.data;
+      if (jsonData.result) {
+        self.companyResult = jsonData.data;
+      }
+    });
+  },
   methods: {
     changePage(pageIndex) {
       var self = this;
@@ -105,9 +305,29 @@ export default {
       self.pageIndex = pageIndex;
       var formData = new FormData();
 
+      var startDate = "";
+      var endDate = "";
+      var timeRanges = self.queryModel.timeRanges + "";
+
+      if (timeRanges != "" && timeRanges != null) {
+        timeRanges = timeRanges.split(",");
+        startDate = timeRanges[0];
+        endDate = timeRanges[1];
+      }
+
+      formData.append("startDate", startDate);
+      formData.append("endDate", endDate);
       formData.append("pageIndex", self.pageIndex);
       formData.append("pageSize", self.pageSize);
 
+      if (self.queryModel.companyId != null) {
+        formData.append("companyId", self.queryModel.companyId);
+      }
+
+      if (self.queryModel.holidayName) {
+        formData.append("holidayName", self.queryModel.holidayName);
+      }
+
       if (this.field != null) {
         formData.append("field", this.field);
       }
@@ -117,7 +337,7 @@ export default {
       }
       holidayInfoApi
         .pageList(formData)
-        .then(function(response) {
+        .then(function (response) {
           self.loading = false;
 
           var jsonData = response.data.data;
@@ -131,7 +351,7 @@ export default {
           self.tableHeight =
             window.innerHeight - self.$refs.formTable.$el.offsetTop - 45;
         })
-        .catch(error => {
+        .catch((error) => {
           self.loading = false;
           // self.$message.error(error + "");
         });
@@ -168,10 +388,10 @@ export default {
         .$confirm("是否确认删除?", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
-          type: "warning"
+          type: "warning",
         })
         .then(() => {
-          holidayInfoApi.remove(record.id).then(function(response) {
+          holidayInfoApi.remove(record.id).then(function (response) {
             var jsonData = response.data;
 
             if (jsonData.result) {
@@ -181,7 +401,7 @@ export default {
 
               self.$message({
                 type: "success",
-                message: "删除成功!"
+                message: "删除成功!",
               });
             }
           });
@@ -190,16 +410,16 @@ export default {
     handleBatchDelete() {
       var self = this;
 
-      var idList = this.multipleSelection.map(record => {
+      var idList = this.multipleSelection.map((record) => {
         return record.id;
       });
 
       this.$confirm("是否确认删除选中项？", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning"
+        type: "warning",
       }).then(() => {
-        holidayInfoApi.batchRemove(idList).then(function(response) {
+        holidayInfoApi.batchRemove(idList).then(function (response) {
           var jsonData = response.data;
 
           if (jsonData.result) {
@@ -207,7 +427,7 @@ export default {
 
             self.$message({
               type: "success",
-              message: "删除成功!"
+              message: "删除成功!",
             });
           }
         });
@@ -219,22 +439,134 @@ export default {
       if (refreshed) {
         this.changePage(this.pageIndex);
       }
-    }
+    },
+    beforeUpload(file, fileList) {
+      //导入前判断
+      var self = this;
+      var companyId = self.uploadXlsData.companyId;
+
+      if (companyId == null || companyId.length == 0) {
+        self.$message({
+          type: "warning",
+          message: "请选择单位!",
+        });
+        self.xlsLoading = false;
+        return false;
+      } else {
+        self.xlsLoading = true;
+        return true;
+      }
+    },
+    //批量导入-上传成功
+    handleBatchImportSuccess(response, file, fileList) {
+      var self = this;
+      self.xlsLoading = false;
+      self.uploadXlsData.companyId = null;
+
+      if (response.result) {
+        self.$message.success(response.message);
+        this.batchImportFileList = [];
+        this.changePage(1);
+
+        this.batchImportVisible = false;
+      } else {
+        //this.$message.error(response.message);
+        this.batchImportFileList = [];
+        this.changePage(1);
+
+        if (response.data != null) {
+          //下载有错误信息提示的报表
+          //window.open(response.data);
+          self.$message({
+            showClose: true,
+            dangerouslyUseHTMLString: true,
+            message:
+              response.message +
+              `,<a href="${response.data}" target="_blank">点击下载未导入的数据报表</a>&nbsp;`,
+            duration: 30000,
+          });
+        }
+      }
+    },
+    //批量导入-预览
+    handleBatchImportPreview(file) {
+      console.log(file.url);
+    },
+    //批量导入-移除
+    handleBatchImportRemove(file, fileList) {
+      console.log(file, fileList);
+    },
+    //批量导入-移除前操作
+    beforeBatchImportRemove(file, fileList) {
+      console.log(file, fileList);
+    },
+    //批量导入-文件超出个数限制时的钩子
+    handleBatchImportExceed(files, fileList) {
+      this.$message.warning(
+        `当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${
+          files.length + fileList.length
+        } 个文件`
+      );
+    },
+    downloadAll() {
+      //导出
+      var self = this;
+      var formData = new FormData();
+
+      var startDate = "";
+      var endDate = "";
+      var timeRanges = self.queryModel.timeRanges + "";
+
+      if (timeRanges != "" && timeRanges != null) {
+        timeRanges = timeRanges.split(",");
+        startDate = timeRanges[0];
+        endDate = timeRanges[1];
+      }
+
+      formData.append("startDate", startDate);
+      formData.append("endDate", endDate);
+
+      if (self.queryModel.companyId != null) {
+        formData.append("companyId", self.queryModel.companyId);
+      }
+
+      if (self.queryModel.holidayName) {
+        formData.append("holidayName", self.queryModel.holidayName);
+      }
+
+      self.loading = true;
+      self.xlsLoading = true;
+
+      holidayInfoApi.exportXls(formData).then(function (response) {
+        self.loading = false;
+        self.xlsLoading = false;
+        var jsonData = response.data;
+        if (jsonData.result) {
+          if (jsonData.data != null) {
+            if (document.location.href.startsWith("https://")) {
+              jsonData.data = jsonData.data.replace("http://", "https://");
+            }
+
+            self.$message({
+              showClose: true,
+              type: "success",
+              dangerouslyUseHTMLString: true,
+              message: `报表已生成，<a href="${jsonData.data}" target="_blank">点击下载报表</a>&nbsp;`,
+              duration: 30000,
+            });
+          }
+        }
+      });
+    },
   },
-  mounted: function() {
+  mounted: function () {
     var self = this;
     this.changePage(1);
-
-    companyInfoApi.list().then(function(response) {
-      var jsonData = response.data;
-      if (jsonData.result) {
-        self.companyResult = jsonData.data;
-      }
-    });
   },
   components: {
-    "holidayInfo-detail": holidayInfoDetail
-  }
+    "holidayInfo-detail": holidayInfoDetail,
+    "el-select-tree": SelectTree,
+  },
 };
 </script>
 <style lang="scss" scoped>

src/views/base/iconInfo-detail.vue

@@ -12,6 +12,7 @@
     style="text-align: left"
     width="80%"
     @close="closeDialog"
+    :close-on-click-modal="false"
   >
     <div class="user-panel" v-loading="loading">
       <el-form
@@ -120,60 +121,18 @@ export default {
       iconTypeList: [],
       formModel: {},
       ruleValidate: {
-        id: [{ required: true, message: "不能为空", trigger: "blur" }],
         iconName: [
           { required: true, message: "图标名称不能为空", trigger: "blur" },
         ],
         iconRoute: [
           { required: true, message: "图标路由不能为空", trigger: "blur" },
         ],
-        iconSubRoute: [
-          {
-            required: true,
-            message: "图标的子页面路由不能为空",
-            trigger: "blur",
-          },
-        ],
-        iconUrl: [
-          { required: true, message: "图标url不能为空", trigger: "blur" },
-        ],
-        iconParam: [
-          { required: true, message: "参数不能为空", trigger: "blur" },
-        ],
-        useEnable: [
-          { required: true, message: "是否启用不能为空", trigger: "blur" },
-        ],
         iconPic: [
           { required: true, message: "图标图片不能为空", trigger: "blur" },
         ],
-        iconCommonPic: [
-          {
-            required: true,
-            message: "通用功能展示的图片不能为空",
-            trigger: "blur",
-          },
-        ],
         iconTypeId: [
           { required: true, message: "图标类型id不能为空", trigger: "blur" },
         ],
-        delFlag: [
-          { required: true, message: "是否删除不能为空", trigger: "blur" },
-        ],
-        createBy: [
-          { required: true, message: "创建人不能为空", trigger: "blur" },
-        ],
-        createTime: [
-          { required: true, message: "创建时间不能为空", trigger: "blur" },
-        ],
-        updateBy: [
-          { required: true, message: "更新人不能为空", trigger: "blur" },
-        ],
-        updateTime: [
-          { required: true, message: "更新时间不能为空", trigger: "blur" },
-        ],
-        remark: [
-          { required: true, message: "备注信息不能为空", trigger: "blur" },
-        ],
       },
       showDialog: true,
       loading: false,

src/views/base/iconInfo-list.vue

@@ -83,52 +83,94 @@
       <el-table-column
         prop="iconName"
         label="图标名称"
-        width="180"
+        width="130"
       ></el-table-column>
       <el-table-column
         prop="iconRoute"
         label="图标路由"
-        width="180"
+        show-overflow-tooltip
+        width="220"
       ></el-table-column>
       <el-table-column
         prop="iconSubRoute"
-        label="图标的子页面路由"
-        width="180"
+        label="子页面路由"
+        width="200"
+        show-overflow-tooltip
       ></el-table-column>
       <el-table-column
         prop="iconUrl"
         label="图标url"
-        width="180"
+        show-overflow-tooltip
+        width="150"
       ></el-table-column>
       <el-table-column
         prop="iconParam"
         label="参数"
-        width="180"
+        width="150"
+        show-overflow-tooltip
       ></el-table-column>
+      <el-table-column
+        prop="useEnable"
+        label="是否启用"
+        width="120"
+      >
+      <template slot-scope="{ row }">
+          <el-switch
+            v-model="row.useEnable"
+            active-color="#13ce66"
+            inactive-color="#ff4949"
+            @change="updateEnabled(row)"
+          ></el-switch>
+        </template>
+      </el-table-column>
       <el-table-column
         prop="iconPic"
         label="图标图片"
-        width="180"
-      ></el-table-column>
+        width="80"
+      >
+      <template slot-scope="{ row }">
+          <a :href="row.iconPic" target="_blank">
+            <el-avatar
+              :size="48"
+              shape="circle"
+              :src="
+                row.iconPic +
+                '?x-oss-process=image/resize,m_fill,w_64,h_64'
+              "
+              :key="row.id"
+            ></el-avatar>
+          </a>
+        </template>
+      </el-table-column>
       <el-table-column
         prop="iconCommonPic"
         label="通用功能展示的图片"
-        width="180"
-      ></el-table-column>
+        width="150"
+      >
+      <template slot-scope="{ row }">
+          <a :href="row.iconCommonPic" target="_blank">
+            <el-avatar
+              :size="48"
+              shape="circle"
+              :src="
+                row.iconCommonPic +
+                '?x-oss-process=image/resize,m_fill,w_64,h_64'
+              "
+              :key="row.id"
+            ></el-avatar>
+          </a>
+        </template>
+      </el-table-column>
       <el-table-column
         prop="iconTypeName"
         label="图标类型"
-        width="180"
+        width="120"
       ></el-table-column>
       <el-table-column
         prop="remark"
         label="备注信息"
         width="180"
-      ></el-table-column>
-      <el-table-column
-        prop="useEnableName"
-        label="是否启用"
-        width="180"
+        show-overflow-tooltip
       ></el-table-column>
       <el-table-column label="操作" fixed="right" width="150">
         <template slot-scope="{ row }">
@@ -345,6 +387,9 @@ export default {
         this.changePage(this.pageIndex);
       }
     },
+    updateEnabled(row) {
+      iconInfoApi.update(row);
+    },
   },
   mounted: function () {
     this.changePage(1);

src/views/base/personInfo-list.vue

@@ -92,10 +92,11 @@
             >是否包含下级单位</el-checkbox
           >
         </el-form-item>
-        <el-form-item label="角色" prop="roleId">
+        <el-form-item label="身份" prop="roleId">
         <el-select
           v-model="queryModel.roleId"
           filterable
+          clearable
           size="mini"
           placeholder="请选择"
           style="width: 120px"
@@ -1268,6 +1269,10 @@ export default {
         var jsonData = response.data;
         if (jsonData.result) {
           if (jsonData.data != null) {
+            if(document.location.href.startsWith("https://")){
+                jsonData.data = jsonData.data.replace("http://","https://");
+            }
+            
             self.$message({
               showClose: true,
               type: "success",

src/views/base/personRoleInfo-detail.vue

@@ -31,13 +31,14 @@
           <el-select
             v-model="formModel.parentId"
             filterable
+            clearable
             placeholder="请选择"
             style="width: 300px"
           >
             <el-option
               v-for="result in personRoleList"
               :key="result.id"
-              :label="result.personRoleName"
+              :label="result.personRoleName + '-' + result.sceneName"
               :value="result.id"
             ></el-option>
           </el-select>

src/views/base/personRoleInfo-list.vue

@@ -136,7 +136,7 @@
           <el-link type="primary" @click="showIconList(row,'default')">默认菜单</el-link>
         </template>
       </el-table-column>
-      <el-table-column prop="remark" label="备注" width="180"></el-table-column>
+      <el-table-column prop="remark" label="备注"></el-table-column>
       <el-table-column label="操作" fixed="right" width="200">
         <template slot-scope="{ row }">
           <el-button size="mini" type="warning" @click="handleEdit(row)"

src/views/business/billPush-checkIn-detail.vue

@@ -217,6 +217,10 @@ export default {
 
                 if(jsonData.result) {
                     if(exportFlag){
+                        if(document.location.href.startsWith("https://")){
+                            jsonData.data = jsonData.data.replace("http://","https://");
+                        }
+                        
                         //导出
                         self.$message({
                             showClose: true,

src/views/business/billPush-detail-list.vue

@@ -88,6 +88,19 @@
                         </el-col>
                     </el-row>
                     <el-row :gutter="20" >
+                        <el-col :span="8">
+                            <div class="grid-content bg-purple">
+                                <span class="fontText">是否开票</span> 
+                                <span class="data">
+                                    <el-switch
+                                        v-model="formModel.invoiced"
+                                        active-color="#13ce66"
+                                        inactive-color="#ff4949"
+                                        @change="handleSwitchChange(formModel,'2')">
+                                    </el-switch>
+                                </span>
+                            </div>
+                        </el-col>
                         <el-col :span="8">
                             <div class="grid-content bg-purple" v-if="formModel.isMobilePayment">
                                 <span class="fontText">微信支付</span> 
@@ -96,7 +109,7 @@
                                         v-model="formModel.isOpenWechat"
                                         active-color="#13ce66"
                                         inactive-color="#ff4949"
-                                        @change="handlChange(row)">
+                                        @change="handleSwitchChange(formModel,'0')">
                                     </el-switch>
                                 </span>
                             </div>
@@ -108,7 +121,7 @@
                                     v-model="formModel.isOpenAlipay"
                                     active-color="#13ce66"
                                     inactive-color="#ff4949"
-                                    @change="handlChange(row)">
+                                    @change="handleSwitchChange(formModel,'1')">
                                 </el-switch>
                             </span>
                         </el-col>
@@ -118,25 +131,16 @@
             <el-divider></el-divider>
             <el-row class="button-group" >
                 <el-button type="success" size="small" v-if="formModel.status=='1'" @click="handleQucodePay(formModel.orderId)">付款码</el-button>
-                <el-button type="success" size="small" plain icon="el-icon-download" @click="exportXls()">导出数据</el-button>
+                <el-button type="success" size="small" plain icon="el-icon-download" @click="exportXls()">导出账单</el-button>
                 <el-button
                     type="primary"
                     size="small"
                     plain
                     icon="el-icon-edit"
-                    @click="handleEdit" v-if="formModel.status=='0'"
+                    @click="handleEdit" 
+                    :disabled="formModel.status=='1'"
                     >修改账单</el-button
                 >
-                <el-button
-                    type="primary"
-                    size="small"
-                    plain
-                    icon="el-icon-edit"
-                    disabled
-                    @click="handleEdit" v-else
-                    >修改账单</el-button
-                >
-
                 <el-button
                     type="warning"
                     size="small"
@@ -281,6 +285,10 @@ export default {
 
                 if(jsonData.result) {
                     if(exportFlag){
+                        if(document.location.href.startsWith("https://")){
+                            jsonData.data = jsonData.data.replace("http://","https://");
+                        }
+
                         //导出
                         self.$message({
                             showClose: true,
@@ -437,7 +445,40 @@ export default {
 
                 });
             });
-        },
+        },        
+        handleSwitchChange(record,type){
+            var self = this;
+
+            var formData = new FormData();
+            self.loading = true;
+
+            formData.append("id", self.businessKey);
+
+            if(type=="0"){
+                formData.append("isOpen", record.isOpenWechat);
+            }
+            else if(type=="1"){
+                formData.append("isOpen", record.isOpenAlipay);
+            }
+            else if(type=="2"){
+                formData.append("isOpen", record.invoiced);
+            }
+
+            formData.append("type", type);
+
+            billPushApi.updateIsOpenWechatOrAlipay(formData).then(function (response) {
+                var jsonData = response.data;
+                self.loading = false;
+                if (jsonData.result) {
+                    //self.changePage(self.pageIndex);
+                    self.modified = true;
+                }
+                else{
+                    self.$message.error(jsonData.message + "");
+                }
+            });
+
+        }
     },
     components: {
         "billPush-detail": billPushDetail,

src/views/business/billPush-detail.vue

@@ -2,7 +2,7 @@
   <el-dialog
     :visible.sync="showDialog"
     :title="title"
-    width="83%"
+    width="95%"
     :modal-append-to-body="true"
     style="text-align:left;"
     @close="closeDialog"
@@ -39,7 +39,7 @@
               ></el-option>
           </el-select>
         </el-form-item> 
-        <el-form-item label="推送用户：" prop="personId" >
+        <el-form-item label="推送用户：" prop="personName" >
         <!--
             <el-input v-model="formModel.personId" style="display:none"></el-input>
         -->
@@ -98,7 +98,6 @@
                     <el-select 
                     v-model="scope.row.goodsId" 
                     placeholder="请选择" 
-                    style="width:150px;" 
                     @change="handGoodsChange(scope)" size="mini">
                         <el-option
                         v-for="result in goodsList"
@@ -130,7 +129,7 @@
                     </el-form-item>
                 </template>
             </el-table-column>
-            <el-table-column prop="numStr" label="数量"  width="320">
+            <el-table-column prop="numStr" label="数量"  width="310">
                 <template slot-scope="scope">
                     <el-form-item
                     :prop="'billPushGoodsList.' + scope.$index + '.numStr3'"
@@ -147,24 +146,27 @@
                     </el-form-item>
                 </template>
             </el-table-column>
-            <el-table-column prop="standard" label="收费标准(元)" width="120">
+            <el-table-column prop="standard" label="收费标准" width="200">
                 <template slot-scope="scope">
                     <el-form-item
-                    :prop="'billPushGoodsList.' + scope.$index + '.standard'"
-                    :rules="ruleValidate['standard']"
+                    :prop="'billPushGoodsList.' + scope.$index + '.unitPrice'"
+                    :rules="ruleValidate['unitPrice']"
+                    size="mini"
                     >
-                    <el-input v-model="scope.row.unit" style="display:none"></el-input>
-                    <el-input placeholder="收费标准" v-model="scope.row.standard" size="mini"></el-input>
+                        <el-input placeholder="收费标准" v-model="scope.row.unitPrice" @change="handNumChange(scope)" size="mini">
+                            <template slot="append">{{scope.row.unit}}</template>
+                        </el-input>
                     </el-form-item>
                 </template>
             </el-table-column>
-            <el-table-column prop="totalFee" label="合计金额(元)" width="120">
+            <el-table-column prop="totalFee" label="合计金额(元)">
                 <template slot-scope="scope">
                     <el-form-item
                     :prop="'billPushGoodsList.' + scope.$index + '.totalFee'"
-                    :rules="ruleValidate['totalFee']"
+                    :rules="ruleValidate['totalFee']" size="mini"
                     >
-                    <el-input placeholder="合计金额" :value="scope.row.totalFee" readonly="readonly" size="mini"></el-input>
+                    <el-input placeholder="合计金额" :value="scope.row.totalFee" readonly="readonly" size="mini">
+                    </el-input>
                     </el-form-item>
                 </template>
             </el-table-column>
@@ -210,9 +212,10 @@ export default {
         return {
             ruleValidate: {
                 name: [{ required: true, message: "账单名称不能为空", trigger: "blur" }],
-                companyId: [{ required: true, message: "缴费单位不能为空", trigger: "blur" }],
-                payService: [{ required: true, message: "收费项目不能为空", trigger: "blur" }],
-                // personId: [{ required: true, message: "推送用户不能为空", trigger: "blur" }]
+                checkinInfoId: [{ required: true, message: "缴费单位不能为空", trigger: "blur" }],
+                // payService: [{ required: true, message: "收费项目不能为空", trigger: "blur" }],
+                invoiceType: [{ required: true, message: "开票类型不能为空", trigger: "blur" }],
+                personName: [{ required: true, message: "推送用户不能为空", trigger: "blur" }],
                 beginEndTime:[{ required: true, message: "起止时间不能为空", trigger: "blur" }],
                 numStr3:[{ required: true, message: "数量不能为空", trigger: "blur" }],                
                 goodsId:[{ required: true, message: "收费项目未选择", trigger: "blur" }]
@@ -221,7 +224,7 @@ export default {
                 name:"",
                 payee:"",
                 companyId:"",
-                payService:"",
+                // payService:"",
                 collectionAccountId:"",
                 collectionAccountName:"",
                 bak:"",
@@ -310,18 +313,26 @@ export default {
 
                     for(var i=0;i<billPushGoodsList.length;i++){
                         billPushGoodsList[i].sortNo = i+1;
-                        billPushGoodsList[i].beginDate = billPushGoodsList[i].beginEndTime[0];
-                        billPushGoodsList[i].endDate = billPushGoodsList[i].beginEndTime[1]
-                        billPushGoodsList[i].beginEndTime=null;
+
+                        if(billPushGoodsList[i].beginEndTime!=null){
+                            billPushGoodsList[i].beginDate = billPushGoodsList[i].beginEndTime[0];
+                            billPushGoodsList[i].endDate = billPushGoodsList[i].beginEndTime[1]
+                            billPushGoodsList[i].beginEndTime=null;
+                        }
+                        
+                        billPushGoodsList[i].standard = billPushGoodsList[i].unitPrice + billPushGoodsList[i].unit;
                     }
 
                     var removeBillPushGoodsList = requestData.removeBillPushGoodsList;
 
                     for(var j=0;j<removeBillPushGoodsList.length;j++){
                         removeBillPushGoodsList[j].sortNo = j+1;
-                        removeBillPushGoodsList[j].beginDate = removeBillPushGoodsList[j].beginEndTime[0];
-                        removeBillPushGoodsList[j].endDate = removeBillPushGoodsList[j].beginEndTime[1]
-                        removeBillPushGoodsList[j].beginEndTime=null;
+
+                        if(removeBillPushGoodsList[j].beginEndTime!=null){
+                            removeBillPushGoodsList[j].beginDate = removeBillPushGoodsList[j].beginEndTime[0];
+                            removeBillPushGoodsList[j].endDate = removeBillPushGoodsList[j].beginEndTime[1];
+                            removeBillPushGoodsList[j].beginEndTime=null;
+                        }
                     }
 
                     (function() {
@@ -450,8 +461,12 @@ export default {
                     // row.unit = data.unitPrice;
                     // row.goodTypeId = data.goodType;
                     this.$set(row,"standard",data.unitPriceStr);
-                    this.$set(row,"unit",data.unitPrice);
+                    this.$set(row,"unit",data.unit);
+                    this.$set(row,"unitPrice",data.unitPrice);
                     this.$set(row,"goodTypeId",data.goodType);
+
+                    //如果是电费会返回起码
+                    this.$set(row,"numStr", data.numStr);
                 }
             });
             // },100);
@@ -460,9 +475,8 @@ export default {
             var row = scope.row;
 
             var num = row.numStr3;
-            var unit = row.unit;
-
-            var totalFee = num*1*unit*1;
+            var unitPrice = row.unitPrice;
+            var totalFee = num*1*unitPrice*1;
 
             if(totalFee!=null){
                 this.formModel.billPushGoodsList[scope.$index].totalFee = totalFee.toFixed(2);
@@ -473,8 +487,7 @@ export default {
 
             var num1=row.numStr;
             var num2=row.numStr2;
-            var unit = row.unit;
-
+            var unitPrice = row.unitPrice;
 
             setTimeout(()=>{         
                 if(num1!=null&&num2!=null){
@@ -482,7 +495,7 @@ export default {
 
                     this.formModel.billPushGoodsList[scope.$index].numStr3 = num3;
 
-                    var totalFee = num3*1*unit*1;
+                    var totalFee = num3*1*unitPrice*1;
 
                     if(totalFee!=null){
                         this.formModel.billPushGoodsList[scope.$index].totalFee = totalFee.toFixed(2);
@@ -533,7 +546,7 @@ export default {
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
 .input-form-main{
-    width: 250px;
+    width: 300px;
 }
 .link-span{
     margin-right: 20px;

src/views/business/billPush-list.vue

@@ -3,7 +3,7 @@
         <el-breadcrumb separator=">">
             <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
             <el-breadcrumb-item>
-                <a href="#">系统管理</a>
+                <a href="#">园区管理</a>
             </el-breadcrumb-item>
             <el-breadcrumb-item>
                 <a href="#">账单推送管理</a>
@@ -62,6 +62,12 @@
                     ></el-option>
                 </el-select>
             </el-form-item>
+            <el-form-item label="是否开票" prop="invoiced">
+                <el-select v-model="queryModel.invoiced"  size="mini" clearable>
+                    <el-option label="是" :value="true"></el-option>
+                    <el-option label="否" :value="false"></el-option>
+                </el-select>
+            </el-form-item>
             <el-form-item label="收款账户" prop="collectionAccount">
                 <el-select v-model="queryModel.collectionAccount"  size="mini"  >
                     <el-option
@@ -184,24 +190,34 @@
             </el-table-column>
             <el-table-column prop="payTime" label="缴费时间" width="180"></el-table-column>
             <el-table-column prop="payName" label="支付方式" ></el-table-column>
+            <el-table-column prop="invoiced"  label="是否开票">
+                <template slot-scope="{row}">
+                    <el-switch 
+                        v-model="row.invoiced"
+                        active-color="#13ce66"
+                        inactive-color="#ff4949"
+                        @change="handleSwitchChange(row,'2')">
+                    </el-switch>
+                </template>
+            </el-table-column>
             <el-table-column prop="payee" label="收款方" ></el-table-column>
-            <el-table-column prop="isOpenWechat"  label="微信支付" fixed="right">
+            <el-table-column prop="isOpenWechat"  label="微信支付">
                 <template slot-scope="{row}">
                     <el-switch v-if="row.isMobilePayment"
                         v-model="row.isOpenWechat"
                         active-color="#13ce66"
                         inactive-color="#ff4949"
-                        @change="handlChange(row,'0')">
+                        @change="handleSwitchChange(row,'0')">
                     </el-switch>
                 </template>
             </el-table-column>
-            <el-table-column prop="isOpenAlipay"  label="支付宝" fixed="right">
+            <el-table-column prop="isOpenAlipay"  label="支付宝">
                 <template slot-scope="{row}">
                     <el-switch v-if="row.isMobilePayment"
                         v-model="row.isOpenAlipay"
                         active-color="#13ce66"
                         inactive-color="#ff4949"
-                        @change="handlChange(row,'1')">
+                        @change="handleSwitchChange(row,'1')">
                     </el-switch>
                 </template>
             </el-table-column>
@@ -213,7 +229,7 @@
                     </div>
                     <div v-if="row.status=='0'">
                         <span class="link-span"><el-link  type="warning" @click="handleClose(row)">作废账单</el-link></span>
-                        <!-- <el-link  type="danger" @click="handleDelete(row)">删除账单</el-link> -->
+                        <el-link  type="danger" @click="handleDelete(row)">删除账单</el-link>
                     </div>
                     <div v-if="row.payStatus=='10'">
                         <span class="link-span"><el-link  type="primary" @click="handlePayTime(row)">确认收款</el-link></span>
@@ -279,6 +295,7 @@ export default {
                 pushTimeRange: "",
                 payTimeRange:"",
                 payStatus:"",
+                invoiced: null
             },
             treeData: [],
             loading: false,
@@ -336,10 +353,18 @@ export default {
                     id:"alipay",
                     name:"支付宝",
                 },
+                {
+                    id:"transfer",
+                    name:"对公转账"
+                },
                 {
                     id:"cash",
-                    name:"现金",
+                    name:"现金支付"
                 },
+                {
+                    id:"individual",
+                    name:"个人账户"
+                }
             ],
             collectionAccountList:[],
             companyList:[],
@@ -414,6 +439,9 @@ export default {
             formData.append("payTimeRange", self.queryModel.payTimeRange);
             formData.append("payStatus", self.queryModel.payStatus);
 
+            if(self.queryModel.invoiced!=null){
+                formData.append("invoiced", self.queryModel.invoiced);
+            }
 
             billPushApi.pageList(formData)
                 .then(function(response) {
@@ -490,18 +518,18 @@ export default {
         handleReset(name) {
             this.$refs[name].resetFields();
         },
-        handChange(selVal){
+        // handleChange(selVal){
 
-            this.queryModel.payService = "";
+        //     this.queryModel.payService = "";
 
-            var formData = new FormData();
-            formData.append("companyId", selVal);
+        //     var formData = new FormData();
+        //     formData.append("companyId", selVal);
 
-            billPushApi.payServiceList(formData).then((response)=>{
-                var jsonData = response.data;
-                this.payServiceList = jsonData.data;
-            });
-        },
+        //     billPushApi.payServiceList(formData).then((response)=>{
+        //         var jsonData = response.data;
+        //         this.payServiceList = jsonData.data;
+        //     });
+        // },
         handleDetailList(record){
             this.modalTitle2 = "账单推送详情";
             this.operation = "detail";
@@ -525,7 +553,7 @@ export default {
                 billPushApi.pushBill(formData).then((response)=>{
                     var jsonData = response.data;
 
-                    alert(jsonData.result)
+                    //alert(jsonData.result)
 
                     if (jsonData.result) {
                         this.changePage(this.pageIndex);
@@ -611,26 +639,31 @@ export default {
             this.businessKey = record.id;
             this.showModal3 = true;
         },
-        handlChange(record,type){
+        handleSwitchChange(record,type){
             var self = this;
 
             var formData = new FormData();
             self.loading = true;
 
             formData.append("id", record.id);
+
             if(type=="0"){
                 formData.append("isOpen", record.isOpenWechat);
             }
-            else{
+            else if(type=="1"){
                 formData.append("isOpen", record.isOpenAlipay);
             }
+            else if(type=="2"){
+                formData.append("isOpen", record.invoiced);
+            }
+
             formData.append("type", type);
 
             billPushApi.updateIsOpenWechatOrAlipay(formData).then(function (response) {
                 var jsonData = response.data;
                 self.loading = false;
                 if (jsonData.result) {
-                    self.changePage(self.pageIndex);
+                    //self.changePage(self.pageIndex);
                 }
                 else{
                     self.$message.error(jsonData.message + "");

src/views/business/requestForLeave-list.vue

@@ -285,6 +285,10 @@ export default {
 
           if(jsonData.result) {
             if(exportFlag){
+              if(document.location.href.startsWith("https://")){
+                  jsonData.data = jsonData.data.replace("http://","https://");
+              }
+              
               //导出
               self.$message({
                 showClose: true,

src/views/business/workAttendance-list.vue

@@ -499,6 +499,10 @@ export default {
             self.downloadLoading = false;
 
             if (jsonData.result) {
+              if(document.location.href.startsWith("https://")){
+                  jsonData.data = jsonData.data.replace("http://","https://");
+              }
+
               self.$message({
                 type: "success",
                 message: `报表已生成，<a href="${jsonData.data}">请点击链接下载</a>`,

src/views/old/oldPersonInfo-list.vue

@@ -1197,6 +1197,10 @@ export default {
         var jsonData = response.data;
         if (jsonData.result) {
           if (jsonData.data != null) {
+            if(document.location.href.startsWith("https://")){
+                jsonData.data = jsonData.data.replace("http://","https://");
+            }
+
             self.$message({
               showClose: true,
               type: "success",

src/views/sys/dataDictionary-list.vue

@@ -93,7 +93,7 @@
       ></el-table-column>
       <el-table-column prop="name" sort-by="name_" label="名称" sortable="custom" width="180"></el-table-column>
       <el-table-column prop="value" sort-by="value_" label="数值" sortable="custom" width="180"></el-table-column>
-      <el-table-column prop="sortNo" sort-by="sort_no" label="排序号" sortable="custom" width="180"></el-table-column>
+      <el-table-column prop="sortNo" sort-by="sort_no" label="排序号" sortable="custom"></el-table-column>
       <el-table-column label="操作" fixed="right" width="200">
         <template slot-scope="{row}">
           <el-row v-if="row.dataType=='1'">