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

src/views/safetyenvironmental/archive/components/info.vue

@@ -258,7 +258,6 @@
                 :preview-src-list="new Array(config.fileUrl + pd.INSPECTED_SITEUSER_SIGN_IMG)"
                 style="width: 100px; height: 100px"/>
             </div>
-            <span>{{ pd.INSPECTED_SITEUSER_SIGN_TIME }}</span>
           </div>
         </div>
       </div>

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

@@ -59,6 +59,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"
@@ -136,7 +150,8 @@ export default {
       varList: [],
       levelList: [],
       treeData: [],
-      treeData1: []
+      treeData1: [],
+      ADDTIME: []
     }
   },
   created() {
@@ -180,6 +195,9 @@ export default {
     },
     // 搜索
     getQuery() {
+      if (this.ADDTIME == null | this.ADDTIME == undefined ){
+        this.ADDTIME = []
+      }
       this.getList()
     },
     // 搜索
@@ -188,6 +206,7 @@ export default {
       this.LEVEL = ''
       this.DEPARTMENT_ID = []
       this.CORPDEPARTMENT_ID = []
+      this.ADDTIME = []
       this.listQuery = {
         page: 1,
         limit: 20
@@ -204,7 +223,9 @@ export default {
           KEYWORDS: this.KEYWORDS,
           DEPARTMENT_ID: this.DEPARTMENT_ID.join(','),
           CORPDEPARTMENT_ID: this.CORPDEPARTMENT_ID.join(','),
-          LEVEL: this.LEVEL
+          LEVEL: this.LEVEL,
+          ADDSTART: this.ADDTIME==undefined?'':this.ADDTIME[0],
+          ADDEND: this.ADDTIME==undefined?'':this.ADDTIME[1]
         }
       ).then((data) => {
         this.listLoading = false