Merge branch 'dev' into limingyu-20240416-一公司动火作业地图

src/views/security_commitment/promise_book/components/list.vue

@@ -50,6 +50,20 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row>
+        <el-col :span="7">
+          <el-form-item label="添加时间">
+            <el-date-picker
+            v-model="ADDTIME"
+            type="daterange"
+            value-format="yyyy-MM-dd"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            class="filter-item"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <el-table
       v-loading="listLoading"
@@ -131,7 +145,8 @@ export default {
       stateList: [
         { ID: '0', NAME: '启用' },
         { ID: '1', NAME: '禁用' }
-      ]
+      ],
+      ADDTIME: []
     }
   },
   created() {
@@ -174,6 +189,9 @@ export default {
     },
     // 搜索
     getQuery() {
+      if (this.ADDTIME == null | this.ADDTIME == undefined ){
+        this.ADDTIME = []
+      }
       this.getList()
     },
     // 搜索
@@ -182,6 +200,7 @@ export default {
       this.LEVEL = ''
       this.DEPARTMENT_ID = []
       this.STATUS = ''
+      this.ADDTIME = []
       this.listQuery = {
         page: 1,
         limit: 20
@@ -198,7 +217,9 @@ export default {
           KEYWORDS: this.KEYWORDS,
           DEPARTMENT_IDS: this.DEPARTMENT_ID.join(','),
           LEVEL: this.LEVEL,
-          STATUS: this.STATUS
+          STATUS: this.STATUS,
+          ADDSTART: this.ADDTIME==undefined?'':this.ADDTIME[0],
+          ADDEND: this.ADDTIME==undefined?'':this.ADDTIME[1]
         }
       ).then((data) => {
         this.listLoading = false