节假日关联单位。

src/routers/modules/base.js

@@ -548,7 +548,7 @@ var routers = [
                 component: () => import('@/views/base/businessOut-list.vue'),
                 meta: {
                         roles: ["admin"],
-                        title: '外出记录'
+                        title: '外勤申请记录'
                 }
         }, 
         {

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

@@ -12,7 +12,30 @@
     <el-divider></el-divider>
     <!--
       要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"
+          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>
+        <el-button
+          type="primary"
+          size="mini"
+          icon="ios-search"
+          @click="changePage(1)"
+          :loading="loading"
+        >查询</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>
@@ -34,8 +57,9 @@
       @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="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}">
@@ -72,6 +96,7 @@ 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 NProgress from "nprogress"; // progress bar
 import "nprogress/nprogress.css"; // progress bar style
@@ -94,7 +119,11 @@ export default {
       multipleSelection: [],
       showModal: false,
       modalTitle: "",
-      businessKey: ""
+      businessKey: "",
+      queryModel: {
+        companyId: "",
+        holidayName: ""
+      }
     };
   },
   methods: {
@@ -108,6 +137,14 @@ export default {
       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);
       }
@@ -119,7 +156,7 @@ export default {
         .pageList(formData)
         .then(function(response) {
           self.loading = false;
-
+ 
           var jsonData = response.data.data;
 
           self.tableData = jsonData.data;
@@ -233,7 +270,8 @@ export default {
     });
   },
   components: {
-    "holidayInfo-detail": holidayInfoDetail
+    "holidayInfo-detail": holidayInfoDetail,
+    "el-select-tree": SelectTree
   }
 };
 </script>

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

@@ -137,19 +137,10 @@
                     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"