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

src/views/base/businessOut-list.vue

@@ -138,6 +138,11 @@
         label="预估天数"
         width="100"
       ></el-table-column>
+      <el-table-column
+        prop="endTime"
+        label="结束时间"
+        width="150"
+      ></el-table-column>
       <el-table-column
         prop="content"
         label="内容"

src/views/business/workAttendance-list.vue

@@ -48,9 +48,7 @@
               height="200"
             ></el-select-tree>
             &nbsp;
-            <el-checkbox v-model="queryModel.subordinate"
-              >是否包含下级单位</el-checkbox
-            >
+            <el-checkbox v-model="queryModel.subordinate">是否包含下级单位</el-checkbox>
           </el-form-item>
           <el-form-item label="统计区间" prop="timeRanges">
             <el-date-picker
@@ -64,8 +62,6 @@
               size="mini"
             ></el-date-picker>
           </el-form-item>
-        </el-row>
-        <el-row>
           <el-form-item label="姓名" prop="name">
             <el-input type="text" size="mini" v-model="queryModel.name" style="width:100px;"></el-input>
           </el-form-item>