Merge remote-tracking branch 'origin/dev' into dev

CHANGELOG.md

+## 1.0.1
+`2021-04-09 17:30`
+#### 其它变更 
+- change @lmmax 
+
 ## 1.0.0
 `2021-04-09 12:01`
 #### 其它变更 

src/views/projectCostReport/ProjectCostReportList.vue

@@ -4,11 +4,20 @@
       <a-form layout="horizontal" class="ant-advanced-search-form">
         <div>
           <a-row>
-            <a-col :span="12">
+            <a-col :span="6">
               <a-form-item
-                label="登记日期"
+                label="项目名称"
                 :labelCol="{ span: 8 }"
                 :wrapperCol="{ span: 16 }"
+              >
+                <a-input style="width: 100%" v-model="query.projectName" placeholder="请输入"/>
+              </a-form-item>
+            </a-col>
+            <a-col :span="10">
+              <a-form-item
+                label="登记日期"
+                :labelCol="{ span: 6 }"
+                :wrapperCol="{ span: 18 }"
               >
                 <a-range-picker @change="onChange" />
               </a-form-item>
@@ -44,7 +53,6 @@
 
 <script>
 import { getProjectCostReport } from "@/api/report/report";
-import moment from "moment";
 import { formatDate } from "@/util/util";
 const dataSource = [];
 const columns = [
@@ -78,7 +86,7 @@ export default {
     return {
       isFirstLoad: true,
       query: {
-        name: "",
+        projectName: "",
         beginDate: null,
         endDate: null,
       },