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

src/App.vue

@@ -50,4 +50,19 @@ body{
     margin-bottom: 10px;
   }
 }
+
+.role-permission {
+  .el-transfer-panel {
+    border: 1px solid #ebeef5;
+    border-radius: 4px;
+    overflow: hidden;
+    background: #fff;
+    display: inline-block;
+    vertical-align: middle;
+    width: 320px;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    position: relative;
+  }
+}
 </style>

src/api/base/iconInfo.js

@@ -49,6 +49,10 @@ function getIconTypeList(){
   return request.post(constant.serverUrl + "/base/iconInfo/getIconTypeList");
 }
 
+function findAll() {
+  return request.post(constant.serverUrl + "/base/iconInfo/list");
+}
+
 export default {
-  pageList,create,edit,add,update,remove,batchRemove,listByRoleId,getIconTypeList
+  pageList,create,edit,add,update,remove,batchRemove,listByRoleId,getIconTypeList,findAll
 }

src/api/base/personPopedomIcon.js

@@ -0,0 +1,19 @@
+import request from '@/utils/request'
+import constant from '@/constant'
+
+function findRelatedIcon(personPopedomId){
+    return request.get(constant.serverUrl + `/base/personPopedomIcon/findRelatedIcon?personPopedomId=${personPopedomId}`);
+}
+
+function saveRelatedIcon(personPopedomId,idList){
+    var formData = new FormData();
+  
+    formData.append("personPopedomId",personPopedomId);
+    formData.append("idList",idList.join(","));
+  
+    return request.post(constant.serverUrl + "/base/personPopedomIcon/saveRelatedIcon",formData);
+}
+
+export default {
+    findRelatedIcon, saveRelatedIcon
+}

src/views/base/activityInfo-list.vue

@@ -235,7 +235,7 @@ export default {
     },
     sortChange(data) {
       this.field = data.column.field;
-      this.direction = data.order;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
 
       this.changePage(this.pageIndex);
     },

src/views/base/alarmConfig-list.vue

@@ -245,7 +245,7 @@ export default {
     },
     sortChange(data) {
       this.field = data.column.field;
-      this.direction = data.order;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
 
       this.changePage(this.pageIndex);
     },

src/views/base/alarmInfo-alert-list.vue

@@ -165,7 +165,7 @@ export default {
     },
     sortChange(data) {
       this.field = data.column.field;
-      this.direction = data.order;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
 
       this.changePage(this.pageIndex);
     },

src/views/base/alarmInfo-fence-list.vue

@@ -165,7 +165,7 @@ export default {
     },
     sortChange(data) {
       this.field = data.column.field;
-      this.direction = data.order;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
 
       this.changePage(this.pageIndex);
     },

src/views/base/applicationExamine-list.vue

@@ -37,6 +37,7 @@
           <el-select
             v-model="queryModel.applicationRoleId"
             filterable
+            clearable
             placeholder="请选择"
             style="width: 200"
             size="mini"
@@ -381,7 +382,7 @@ export default {
     },
     sortChange(data) {
       this.field = data.column.field;
-      this.direction = data.order;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
 
       this.changePage(this.pageIndex);
     },

src/views/base/businessOut-list.vue

@@ -307,7 +307,7 @@ export default {
     },
     sortChange(data) {
       this.field = data.column.field;
-      this.direction = data.order;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
 
       this.changePage(this.pageIndex);
     },

src/views/base/companyDeviceRelation-list.vue

@@ -182,7 +182,7 @@ export default {
     },
     sortChange(data) {
       this.field = data.column.field;
-      this.direction = data.order;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
 
       this.changePage(this.pageIndex);
     },

src/views/base/companyInfo-list.vue

@@ -477,7 +477,7 @@ export default {
     },
     sortChange(data) {
       this.field = data.column.field;
-      this.direction = data.order;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
 
       this.changePage(this.pageIndex);
     },

src/views/base/companyPosition-list.vue

@@ -271,7 +271,7 @@ export default {
     },
     sortChange(data) {
       this.field = data.column.field;
-      this.direction = data.order;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
 
       this.changePage(this.pageIndex);
     },

src/views/base/electricClientInfo-list.vue

@@ -230,7 +230,7 @@ export default {
     },
     sortChange(data) {
       this.field = data.column.field;
-      this.direction = data.order;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
       this.changePage(this.pageIndex);
     },
     handleSelectionChange(val) {

src/views/base/electricMeterInfo-list.vue

@@ -206,7 +206,7 @@ export default {
     },
     sortChange(data) {
       this.field = data.column.field;
-      this.direction = data.order;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
 
       this.changePage(this.pageIndex);
     },

src/views/base/employeeInfo-list.vue

@@ -224,7 +224,7 @@ export default {
     },
     sortChange(data) {
       this.field = data.column.field;
-      this.direction = data.order;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
 
       this.changePage(this.pageIndex);
     },

src/views/base/holidayInfo-list.vue

@@ -141,7 +141,7 @@ export default {
     },
     sortChange(data) {
       this.field = data.column.field;
-      this.direction = data.order;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
 
       this.changePage(this.pageIndex);
     },

src/views/base/iconInfo-list.vue

@@ -265,7 +265,7 @@ export default {
     },
     sortChange(data) {
       this.field = data.column.field;
-      this.direction = data.order;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
 
       this.changePage(this.pageIndex);
     },

src/views/base/informationInfo-complaint-list.vue

@@ -188,7 +188,7 @@ export default {
     },
     sortChange(data) {
       this.field = data.column.field;
-      this.direction = data.order;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
 
       this.changePage(this.pageIndex);
     },

src/views/base/informationInfo-warranty-list.vue

@@ -199,7 +199,7 @@ export default {
     },
     sortChange(data) {
       this.field = data.column.field;
-      this.direction = data.order;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
 
       this.changePage(this.pageIndex);
     },

src/views/base/messageInfo-list.vue

@@ -285,7 +285,7 @@ export default {
     },
     sortChange(data) {
       this.field = data.column.field;
-      this.direction = data.order;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
 
       this.changePage(this.pageIndex);
     },

src/views/base/messageInfo-send.vue

@@ -271,7 +271,7 @@ export default {
     },
     sortChange(data) {
       this.field = data.column.field;
-      this.direction = data.order;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
 
       this.changePage(this.pageIndex);
     },

src/views/base/messageNotice-list.vue

@@ -232,7 +232,7 @@ export default {
     },
     sortChange(data) {
       this.field = data.column.field;
-      this.direction = data.order;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
 
       this.changePage(this.pageIndex);
     },

src/views/base/messageReceiver-list.vue

@@ -275,7 +275,7 @@ export default {
     },
     sortChange(data) {
       this.field = data.column.field;
-      this.direction = data.order;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
 
       this.changePage(this.pageIndex);
     },

src/views/base/messageReport-list.vue

@@ -142,7 +142,7 @@ export default {
     },
     sortChange(data) {
       this.field = data.column.field;
-      this.direction = data.order;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
 
       this.changePage(this.pageIndex);
     },

src/views/base/messageSendCondition-list.vue

@@ -147,7 +147,7 @@ export default {
     },
     sortChange(data) {
       this.field = data.column.field;
-      this.direction = data.order;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
 
       this.changePage(this.pageIndex);
     },

src/views/base/mobileBannerInfo-list.vue

@@ -246,7 +246,7 @@ export default {
     },
     sortChange(data) {
       this.field = data.column.field;
-      this.direction = data.order;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
 
       this.changePage(this.pageIndex);
     },

src/views/base/ownerInfo-list.vue

@@ -238,7 +238,7 @@ export default {
     },
     sortChange(data) {
       this.field = data.column.field;
-      this.direction = data.order;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
 
       this.changePage(this.pageIndex);
     },

src/views/base/parkingApply-list.vue

@@ -194,7 +194,7 @@ export default {
     },
     sortChange(data) {
       this.field = data.column.field;
-      this.direction = data.order;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
 
       this.changePage(this.pageIndex);
     },

src/views/base/parkingInfo-list.vue

@@ -228,7 +228,7 @@ export default {
     },
     sortChange(data) {
       this.field = data.column.field;
-      this.direction = data.order;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
 
       this.changePage(this.pageIndex);
     },

src/views/base/personDeviceLog-list.vue

@@ -356,7 +356,7 @@ export default {
     },
     sortChange(data) {
       this.field = data.column.field;
-      this.direction = data.order;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
 
       this.changePage(this.pageIndex);
     },

src/views/base/personDeviceRelation-BoundList.vue

@@ -245,7 +245,7 @@ export default {
     },
     sortChange(data) {
       this.field = data.column.field;
-      this.direction = data.order;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
 
       this.changePage(this.pageIndex);
     },

src/views/base/personDeviceRelation-list.vue

@@ -200,7 +200,7 @@ export default {
     },
     sortChange(data) {
       this.field = data.column.field;
-      this.direction = data.order;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
 
       this.changePage(this.pageIndex);
     },

src/views/base/personInfo-detail.vue

@@ -123,6 +123,7 @@
           <el-col :span="24">
             <el-form-item label="工作状态" prop="workStatus">
               <el-select
+                clearable
                 v-model="formModel.workStatus"
                 filterable
                 placeholder="请选择"
@@ -301,6 +302,7 @@ export default {
         personRoleId: [
           { required: true, message: "请选择身份", trigger: "blur" },
         ],
+        workStatus: [{required: true, message: "工作状态不能为空", trigger: "blur"}]
         // idCard: [
         //   { required: false, message: "身份证不能为空", trigger: "blur" },
         //   {

src/views/base/personInfo-list.vue

@@ -360,10 +360,11 @@
       ></el-table-column>
       <el-table-column label="工作状态" width="120">
         <template slot-scope="{ row }">
-          <span v-if="row.workStatus == 2">外出</span>
+          <span v-if="row.workStatus == 1">工作</span>
+          <span v-else-if="row.workStatus == 2">外出</span>
           <span v-else-if="row.workStatus == 3">出差</span>
           <span v-else-if="row.workStatus == 4">休假</span>
-          <span v-else>工作</span>
+          <span v-else>未设置</span>
         </template>
       </el-table-column>
       <el-table-column

src/views/base/personPopedom-icon.vue

@@ -0,0 +1,166 @@
+<template>
+    <el-dialog
+      :visible.sync="showDialog"
+      :title="title"
+      width="900px"
+      :modal-append-to-body="true"
+      append-to-body
+      style="text-align:left;"
+      @close="closeDialog"
+      :close-on-click-modal="false"
+    >
+    <div class="flex-row">
+      <div class="role-permission">
+          <el-transfer
+          v-model="relatedMenus"
+          :data="menuList"
+          v-loading="loading"
+          filterable
+          target-order="push"
+          :filter-method="filterMethod"
+          filter-placeholder="请输入关键字"
+          :props="{key: 'id',label: 'description'}"
+          :titles="['未分配菜单','已分配菜单']"
+          @right-check-change="rightCheckChange"
+          ></el-transfer>
+      </div>
+      <div class="flex-col">
+        <div>
+          <el-button round size="mini" @click="moveUp">上移</el-button>
+          <div style="height:10px;"></div>
+          <el-button round size="mini" @click="moveDown">下移</el-button>
+        </div>
+      </div>
+    </div>
+    <span slot="footer" class="dialog-footer">
+        <el-button @click="closeDialog">取 消</el-button>
+        <el-button type="primary" @click="handleSubmit" :loading="submitting">确 定</el-button>
+    </span>
+    </el-dialog>
+</template>
+<script>
+import iconApi from "@/api/base/iconInfo";
+import personPopedomIconApi from "@/api/base/personPopedomIcon";
+
+export default {
+  props: ["personPopedomId","title"],
+  data() {
+    return {
+      menuList: [],
+      relatedMenus: [],
+      loading: false,
+      showDialog: true,
+      submitting: false,
+      rightCheckedItems: []
+    };
+  }, 
+  methods: {
+    closeDialog() {
+      this.$emit("close",false);
+    },
+    handleSubmit() {
+      var self = this;
+
+      personPopedomIconApi
+        .saveRelatedIcon(this.personPopedomId,this.relatedMenus)
+        .then(function(response) {
+          var jsonData = response.data;
+          self.submitting = false;
+
+          if (jsonData.result) {
+            self.$message({
+              message: "保存成功!",
+              type: "success"
+            });
+
+            self.$emit("close",true);
+          } else {
+            self.$message({
+              message: jsonData.message + "",
+              type: "warning"
+            });
+
+            self.$emit("close",false);
+          }
+        });
+    },
+    filterMethod(query, item) {
+      return item.description.indexOf(query) > -1;
+    },
+    queryRelatedMenuList() {
+      var self = this;
+
+      self.loading = true;
+
+      self.menuList = [];
+      self.relatedMenus= [];
+
+      iconApi.findAll()
+        .then(response => {
+          var jsonData = response.data;
+
+          self.menuList = jsonData.data.map(item => {
+            return {
+              id: item.id,
+              description: "[" + item.iconTypeName + "]" + item.iconName
+            };
+          });
+
+          return personPopedomIconApi.findRelatedIcon(self.personPopedomId);
+        })
+        .then(response => {
+          var jsonData = response.data;
+
+          self.relatedMenus = jsonData.data.map(item => {
+            return item.iconId;
+          });
+
+          //console.log(self.relatedMenus);
+
+          self.loading = false;
+        });
+    },
+    rightCheckChange(checkedItems) {
+      this.rightCheckedItems = checkedItems;
+    },
+    moveUp() {
+      this.rightCheckedItems.forEach(id=>{
+        var index = this.relatedMenus.indexOf(id);
+
+        if(index>0){
+          console.log(index + "," + id);
+          this.relatedMenus.splice(index,1);
+          this.relatedMenus.splice(index-1,0,id);
+        }
+      })
+    },
+    moveDown() {
+      this.rightCheckedItems.forEach(id=>{
+        var index = this.relatedMenus.indexOf(id);
+
+        if(index<this.relatedMenus.length-1){
+          console.log(index + "," + id);
+          this.relatedMenus.splice(index,1);
+          this.relatedMenus.splice(index+1,0,id);
+        }
+      })
+    }
+  },
+  mounted() {
+    this.queryRelatedMenuList();
+  }
+};
+</script>
+<style lang="scss" scoped>
+.flex-row{
+  display:flex;
+  flex-direction: row;
+}
+
+.flex-col{
+  display: flex;
+  flex-direction: col;
+  justify-content: center; /* 水平居中 */
+  align-items: center;     /* 垂直居中 */
+}
+</style>

src/views/base/personPopedom-list.vue

@@ -114,14 +114,13 @@
             ></el-switch>
           </template>
         </el-table-column>
-        <el-table-column label="操作" width="100">
+        <el-table-column label="操作" width="200">
           <template slot-scope="{ row }">
-            <el-link type="warning" :underline="false" @click="handleEdit(row)"
-              >编辑</el-link
-            >-
-            <el-link type="danger" :underline="false" @click="handleDelete(row)"
-              >删除</el-link
-            >
+            <el-link type="primary" :underline="false" @click="handleAllocMenu(row)">自定义菜单</el-link>
+            -
+            <el-link type="warning" :underline="false" @click="handleEdit(row)">编辑</el-link>
+            -
+            <el-link type="danger" :underline="false" @click="handleDelete(row)">删除</el-link>
           </template>
         </el-table-column>
       </el-table>
@@ -140,12 +139,19 @@
         @close="onDetailModalClose"
         :personId="personId"
       ></personPopedom-detail>
+      <personPopedom-icon
+        v-if="showIconModal"
+        :personPopedomId="businessKey"
+        :title="iconModalTitle"
+        @close="onIconModalClose"
+      ></personPopedom-icon>
     </div>
   </el-dialog>
 </template>
 <script>
 import Constant from "@/constant";
 import PersonPopedomDetail from "./personPopedom-detail";
+import PersonPopedomIcon from "./personPopedom-icon";
 import personPopedomApi from "@/api/base/personPopedom";
 import NProgress from "nprogress"; // progress bar
 import "nprogress/nprogress.css"; // progress bar style
@@ -172,6 +178,8 @@ export default {
       showModal: false,
       modalTitle: "",
       showDialog: true,
+      showIconModal: false,
+      iconModalTitle: ""
     };
   },
   methods: {
@@ -220,7 +228,7 @@ export default {
     },
     sortChange(data) {
       this.field = data.column.field;
-      this.direction = data.order;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
 
       this.changePage(this.pageIndex);
     },
@@ -287,6 +295,9 @@ export default {
         this.changePage(this.pageIndex);
       }
     },
+    onIconModalClose() {
+      this.showIconModal = false;
+    },
     handleReLoad() {
       var self = this;
       self.changePage(self.pageIndex);
@@ -319,12 +330,18 @@ export default {
         }
       });
     },
+    handleAllocMenu(record){
+      this.iconModalTitle = "自定义菜单";
+      this.businessKey = record.id;
+      this.showIconModal = true;
+    }
   },
   mounted: function () {
     this.changePage(1);
   },
   components: {
     "personPopedom-detail": PersonPopedomDetail,
+    "personPopedom-icon": PersonPopedomIcon
   },
 };
 </script>

src/views/base/personRoleInfo-icon.vue

@@ -150,21 +150,6 @@ export default {
 };
 </script>
 <style lang="scss">
-.role-permission {
-  .el-transfer-panel {
-    border: 1px solid #ebeef5;
-    border-radius: 4px;
-    overflow: hidden;
-    background: #fff;
-    display: inline-block;
-    vertical-align: middle;
-    width: 320px;
-    -webkit-box-sizing: border-box;
-    box-sizing: border-box;
-    position: relative;
-  }
-}
-
 .flex-row{
   display:flex;
   flex-direction: row;

src/views/base/personRoleInfo-list.vue

@@ -261,7 +261,7 @@ export default {
     },
     sortChange(data) {
       this.field = data.column.field;
-      this.direction = data.order;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
 
       this.changePage(this.pageIndex);
     },

src/views/base/problemFeedback-list.vue

@@ -223,7 +223,7 @@ export default {
     },
     sortChange(data) {
       this.field = data.column.field;
-      this.direction = data.order;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
 
       this.changePage(this.pageIndex);
     },

src/views/base/punchLocation-list.vue

@@ -293,7 +293,7 @@ export default {
     },
     sortChange(data) {
       this.field = data.column.field;
-      this.direction = data.order;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
 
       this.changePage(this.pageIndex);
     },

src/views/base/punchRecord-list.vue

@@ -257,7 +257,7 @@ export default {
     },
     sortChange(data) {
       this.field = data.column.field;
-      this.direction = data.order;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
 
       this.changePage(this.pageIndex);
     },

src/views/base/rechange-list.vue

@@ -277,7 +277,7 @@ export default {
     },
     sortChange(data) {
       this.field = data.column.field;
-      this.direction = data.order;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
       this.changePage(this.pageIndex);
     },
     handleSelectionChange(val) {

src/views/base/rechargeRecord-list.vue

@@ -323,7 +323,7 @@ export default {
     },
     sortChange(data) {
       this.field = data.column.field;
-      this.direction = data.order;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
 
       this.changePage(this.pageIndex);
     },

src/views/base/rechargeRecordProperty-list.vue

@@ -309,7 +309,7 @@ export default {
     },
     sortChange(data) {
       this.field = data.column.field;
-      this.direction = data.order;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
 
       this.changePage(this.pageIndex);
     },

src/views/base/rechargeRecordWater-list.vue

@@ -325,7 +325,7 @@ export default {
     },
     sortChange(data) {
       this.field = data.column.field;
-      this.direction = data.order;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
 
       this.changePage(this.pageIndex);
     },

src/views/base/roomInfo-list.vue

@@ -186,7 +186,7 @@ export default {
     },
     sortChange(data) {
       this.field = data.column.field;
-      this.direction = data.order;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
 
       this.changePage(this.pageIndex);
     },

src/views/base/temperatureRecord-list.vue

@@ -298,7 +298,7 @@ export default {
     },
     sortChange(data) {
       this.field = data.column.field;
-      this.direction = data.order;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
 
       this.changePage(this.pageIndex);
     },

src/views/base/terminalInfo-list.vue

@@ -170,7 +170,7 @@ export default {
     },
     sortChange(data) {
       this.field = data.column.field;
-      this.direction = data.order;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
 
       this.changePage(this.pageIndex);
     },

src/views/base/warningPusher-list.vue

@@ -272,7 +272,7 @@ export default {
     },
     sortChange(data) {
       this.field = data.column.field;
-      this.direction = data.order;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
 
       this.changePage(this.pageIndex);
     },

src/views/business/billPush-list.vue

@@ -9,7 +9,8 @@
                 <a href="#">账单推送管理</a>
             </el-breadcrumb-item>
             </el-breadcrumb>
-        <el-divider></el-divider>
+        <el-divider></el-divider>        
+        <div v-show="queryFormVisible">
         <el-form ref="queryForm" :model="queryModel" inline class="demo-form-inline">
             <el-form-item label="账单名称" prop="name">
                 <el-input type="text" size="mini" v-model="queryModel.name"></el-input>
@@ -30,7 +31,6 @@
                     v-model="queryModel.companyId"
                     height="200"
                 ></el-select-tree>
-
             </el-form-item>
             <el-form-item label="推送状态" prop="status">
                 <el-select v-model="queryModel.status"  size="mini"  >
@@ -125,8 +125,16 @@
                 >重置</el-button>&nbsp;
             </el-form-item>
         </el-form>
+        </div>
         <el-divider></el-divider>
         <el-row class="button-group">
+            <el-button
+                type="primary"
+                size="small"
+                plain
+                icon="el-icon-upload2"
+                @click="toggleQueryForm()"
+            >{{queryFormVisible ? '隐藏' : '显示'}}查询面板</el-button>
             <el-button
                 type="primary"
                 size="small"
@@ -141,9 +149,9 @@
         :data="tableData" 
         :height="tableHeight"
         v-loading="loading" stripe>
-            <el-table-column type="index" label="序号" width="50"></el-table-column>
-            <el-table-column prop="name" label="账单名称" width="180"></el-table-column>
-            <el-table-column prop="companyName" label="缴费单位" width="180"></el-table-column>
+            <el-table-column type="index" label="序号" :index="indexMethod" width="50" fixed="left"></el-table-column>
+            <el-table-column prop="companyName" label="缴费单位" width="120" fixed="left"></el-table-column>
+            <el-table-column prop="name" label="账单名称" width="120"></el-table-column>
             <el-table-column prop="personName" label="推送用户" width="150">
                 <template slot-scope="{row}">
                     <div>{{row.personName}}</div>
@@ -177,7 +185,7 @@
             <el-table-column prop="payTime" label="缴费时间" width="180"></el-table-column>
             <el-table-column prop="payName" label="支付方式" ></el-table-column>
             <el-table-column prop="payee" label="收款方" ></el-table-column>
-            <el-table-column prop="isOpenWechat"  label="支持微信支付"  >
+            <el-table-column prop="isOpenWechat"  label="微信支付" fixed="right">
                 <template slot-scope="{row}">
                     <el-switch v-if="row.isMobilePayment"
                         v-model="row.isOpenWechat"
@@ -187,7 +195,7 @@
                     </el-switch>
                 </template>
             </el-table-column>
-            <el-table-column prop="isOpenAlipay"  label="支持支付宝支付"  >
+            <el-table-column prop="isOpenAlipay"  label="支付宝" fixed="right">
                 <template slot-scope="{row}">
                     <el-switch v-if="row.isMobilePayment"
                         v-model="row.isOpenAlipay"
@@ -350,12 +358,11 @@ export default {
                 label: "name",
                 children: "children"
             },
-            tableHeight: 400
+            tableHeight: 400,
+            queryFormVisible: true
         }
     },
-    created() {
-
-        
+    created() {        
         this.loadTree();
 
         // companyInfoApi.list().then((response)=>{
@@ -373,6 +380,16 @@ export default {
         },1000);
     },
     methods: {
+        indexMethod(index) {
+            return (this.pageIndex - 1) * this.pageSize + (index + 1);
+        },
+        toggleQueryForm(){
+            this.queryFormVisible = !this.queryFormVisible;
+
+            this.$nextTick(()=>{
+                this.tableHeight = pageUtil.autoAdjustHeight(this.$refs.formTable.$el);
+            });
+        },
         changePage(pageIndex) {
             var self = this;
 

src/views/business/clockOut-list.vue

@@ -256,7 +256,7 @@ export default {
     },
     sortChange(data) {
       this.field = data.column.field;
-      this.direction = data.order;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
 
       this.changePage(this.pageIndex);
     },

src/views/business/fillAttendance-list.vue

@@ -252,7 +252,7 @@ export default {
     },
     sortChange(data) {
       this.field = data.column.field;
-      this.direction = data.order;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
 
       this.changePage(this.pageIndex);
     },

src/views/sys/dataDictionary-list.vue

@@ -238,7 +238,7 @@ export default {
     },
     sortChange(data) {
       this.field = data.column.field;
-      this.direction = data.order;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
 
       this.changePage(this.pageIndex);
     },

src/views/sys/menu-list.vue

@@ -233,7 +233,7 @@ export default {
     },
     sortChange(data) {
       this.field = data.column.field;
-      this.direction = data.order;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
 
       this.changePage(this.pageIndex);
     },

src/views/sys/permission-list.vue

@@ -194,7 +194,7 @@ export default {
     },
     sortChange(data) {
       this.field = data.column.field;
-      this.direction = data.order;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
 
       this.changePage(this.pageIndex);
     },

src/views/sys/role-list.vue

@@ -211,7 +211,7 @@ export default {
     },
     sortChange(data) {
       this.field = data.column.field;
-      this.direction = data.order;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
 
       this.changePage(this.pageIndex);
     },

src/views/sys/user-list.vue

@@ -280,7 +280,7 @@ export default {
     },
     sortChange(data) {
       this.field = data.column.field;
-      this.direction = data.order;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
 
       this.changePage(this.pageIndex);
     },