查询条件添加

src/views/base/businessOut-list.vue

@@ -75,11 +75,12 @@
             end-placeholder="结束时间"
             placeholder="选择时间范围"
             value-format="yyyy-MM-dd"
+            :clearable="false"
            style="width:300px"
             >
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="审核时间">
+      <el-form-item label="审核时间" prop="auditTimeRange">
         <el-date-picker
             v-model="queryModel.auditTimeRange"
             type="daterange"
@@ -89,6 +90,7 @@
             end-placeholder="结束时间"
             placeholder="选择时间范围"
             value-format="yyyy-MM-dd"
+            :clearable="false"
            style="width:300px"
             >
         </el-date-picker>

src/views/business/fillAttendance-list.vue

@@ -13,9 +13,18 @@
     <!--
       要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="personName">
-        <el-input type="text" size="mini" v-model="queryModel.personName"></el-input>
+        <el-input
+          type="text"
+          size="mini"
+          v-model="queryModel.personName"
+        ></el-input>
       </el-form-item>
       <el-form-item label="单位" prop="parentId">
         <el-select-tree
@@ -24,8 +33,11 @@
           :options="companyResult"
           v-model="queryModel.parentId"
           height="200"
-        ></el-select-tree>&nbsp;
-        <el-checkbox v-model="queryModel.subordinate">是否包含下级单位</el-checkbox>
+        ></el-select-tree
+        >&nbsp;
+        <el-checkbox v-model="queryModel.subordinate"
+          >是否包含下级单位</el-checkbox
+        >
       </el-form-item>
       <el-form-item label="申请类型" prop="type">
         <el-select
@@ -33,13 +45,22 @@
           size="mini"
           filterable
           placeholder="请选择"
-          style="width:100px"
+          style="width: 100px"
         >
-          <el-option v-for="type in typeData" :key="type.value" :label="type.name" :value="type.value"></el-option>
+          <el-option
+            v-for="type in typeData"
+            :key="type.value"
+            :label="type.name"
+            :value="type.value"
+          ></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="审批状态" prop="status">
-        <el-input type="text" size="mini" v-model="queryModel.status"></el-input>
+        <el-input
+          type="text"
+          size="mini"
+          v-model="queryModel.status"
+        ></el-input>
       </el-form-item>
       <el-form-item>
         <el-button
@@ -48,13 +69,15 @@
           icon="ios-search"
           @click="changePage(1)"
           :loading="loading"
-        >查询</el-button>&nbsp;
+          >查询</el-button
+        >&nbsp;
         <el-button
           type="info"
           size="mini"
           style="margin-left: 8px"
           @click="handleReset('queryForm')"
-        >重置</el-button>&nbsp;
+          >重置</el-button
+        >&nbsp;
       </el-form-item>
       <el-form-item label="补卡日" prop="fillDayRange">
         <el-date-picker
@@ -64,33 +87,83 @@
           range-separator="至"
           placeholder="选择时间范围"
           value-format="yyyy-MM-dd"
-           style="width:300px"
+          :clearable="false"
+          style="width: 300px"
         >
         </el-date-picker>
       </el-form-item>
     </el-form>
     <el-divider></el-divider>
     <el-row class="button-group"></el-row>
-    <el-table 
+    <el-table
       ref="formTable"
       :data="tableData"
-      :height="tableHeight" 
-      v-loading="loading" 
-      stripe>
-      <el-table-column type="index" label="序号" :index="indexMethod" width="50"></el-table-column>
-      <el-table-column prop="personId" label="申请人编号" width="120"></el-table-column>
-      <el-table-column prop="personName" label="申请人" width="120"></el-table-column>
-      <el-table-column prop="companyName" label="申请单位" width="180"></el-table-column>
-      <el-table-column prop="typeN" label="申请类型" width="80"></el-table-column>
-      <el-table-column prop="fillDay" label="补卡日" width="120"></el-table-column>
-      <el-table-column prop="fillAttendanceTime" label="补卡时间" width="120"></el-table-column>
-      <el-table-column prop="content" label="内容" width="180" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="approvalPersonName" label="审批人" width="120"></el-table-column>
-      <el-table-column prop="statusN" label="审批状态" width="80"></el-table-column>
-      <el-table-column prop="createTime" label="创建时间" width="160"></el-table-column>
+      :height="tableHeight"
+      v-loading="loading"
+      stripe
+    >
+      <el-table-column
+        type="index"
+        label="序号"
+        :index="indexMethod"
+        width="50"
+      ></el-table-column>
+      <el-table-column
+        prop="personId"
+        label="申请人编号"
+        width="120"
+      ></el-table-column>
+      <el-table-column
+        prop="personName"
+        label="申请人"
+        width="120"
+      ></el-table-column>
+      <el-table-column
+        prop="companyName"
+        label="申请单位"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="typeN"
+        label="申请类型"
+        width="80"
+      ></el-table-column>
+      <el-table-column
+        prop="fillDay"
+        label="补卡日"
+        width="120"
+      ></el-table-column>
+      <el-table-column
+        prop="fillAttendanceTime"
+        label="补卡时间"
+        width="120"
+      ></el-table-column>
+      <el-table-column
+        prop="content"
+        label="内容"
+        width="180"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="approvalPersonName"
+        label="审批人"
+        width="120"
+      ></el-table-column>
+      <el-table-column
+        prop="statusN"
+        label="审批状态"
+        width="80"
+      ></el-table-column>
+      <el-table-column
+        prop="createTime"
+        label="创建时间"
+        width="160"
+      ></el-table-column>
       <el-table-column label fixed="right">
-        <template slot-scope="{row}">
-          <el-button size="mini" type="warning" @click="handleOpenFiles(row)">查看附件</el-button>
+        <template slot-scope="{ row }">
+          <el-button size="mini" type="warning" @click="handleOpenFiles(row)"
+            >查看附件</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
@@ -130,10 +203,10 @@ export default {
       queryModel: {
         personName: "",
         parentId: "",
-        subordinate:false,
+        subordinate: false,
         type: "",
         status: "",
-        fillDayRange:["",""],
+        fillDayRange: ["", ""],
       },
       loading: false,
       tableData: [],
@@ -155,22 +228,22 @@ export default {
         // 配置项（必选）
         value: "id",
         label: "name",
-        children: "children"
+        children: "children",
       },
-      tableHeight: 400
+      tableHeight: 400,
     };
   },
   created() {
     var formData = new FormData();
     formData.append("catalogName", "补卡类型");
-    dataDictionaryApi.findByCatalogName(formData).then(response => {
+    dataDictionaryApi.findByCatalogName(formData).then((response) => {
       var jsonData = response.data;
       this.typeData = jsonData.data;
     });
 
-    companyInfoApi.treeList().then((response)=>{
+    companyInfoApi.treeList().then((response) => {
       var jsonData = response.data;
-      
+
       if (jsonData.result) {
         if (jsonData.data != null && jsonData.data != "") {
           this.companyResult = jsonData.data;
@@ -180,9 +253,9 @@ export default {
 
     this.loadTree();
 
-    setTimeout(()=>{
+    setTimeout(() => {
       this.tableHeight = pageUtil.autoAdjustHeight(this.$refs.formTable.$el);
-    },1000);
+    }, 1000);
   },
   methods: {
     getSelectedValue(value) {
@@ -191,7 +264,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) {
@@ -205,7 +278,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) {
@@ -236,15 +309,13 @@ export default {
       formData.append("type", self.queryModel.type);
       formData.append("status", self.queryModel.status);
 
-
-      if(self.queryModel.fillDayRange[0] != null){
+      if (self.queryModel.fillDayRange[0] != null) {
         formData.append("startTime", self.queryModel.fillDayRange[0]);
       }
 
-      if(self.queryModel.fillDayRange[1] != null){
+      if (self.queryModel.fillDayRange[1] != null) {
         formData.append("endTime", self.queryModel.fillDayRange[1]);
       }
-      
 
       if (this.field != null) {
         formData.append("field", this.field);
@@ -256,7 +327,7 @@ export default {
 
       fillAttendanceApi
         .pageList(formData)
-        .then(function(response) {
+        .then(function (response) {
           self.loading = false;
 
           var jsonData = response.data.data;
@@ -265,7 +336,7 @@ export default {
           self.totalPages = jsonData.totalPages;
           self.totalElements = jsonData.recordsTotal;
         })
-        .catch(error => {
+        .catch((error) => {
           self.loading = false;
           // self.$message.error(error + "");
         });
@@ -297,15 +368,15 @@ export default {
       if (refreshed) {
         this.changePage(this.pageIndex);
       }
-    }
+    },
   },
   components: {
     "fillAttendanceFiles-list": FillAttendanceFilesList,
-    "el-select-tree": SelectTree
+    "el-select-tree": SelectTree,
   },
-  mounted: function() {
+  mounted: function () {
     this.changePage(1);
-  }
+  },
 };
 </script>
 <style lang="scss" scoped>