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

src/pages/regulatoryRepository/standardForComments/index.vue

@@ -16,14 +16,26 @@
               <el-input v-model="standCommonlySearch.cname" class="s-c-input" placeholder="请输入关键字" clearable
                         :maxlength="100"></el-input>
             </el-formItem>
-            <el-formItem label="开始日期" class="search-item">
-              <el-datePicker v-model="standCommonlySearch.start" :editable="false"
-                             placeholder="请选择开始日期"></el-datePicker>
-            </el-formItem>
-            <el-formItem label="结束日期" class="search-item">
-              <el-datePicker v-model="standCommonlySearch.end" :editable="false"
-                             placeholder="请选择结束日期"></el-datePicker>
-            </el-formItem>
+            <el-form-item label="开始日期" >
+              <el-date-picker
+                v-model="standCommonlySearch.start"
+                type="date"
+                :editable="false"
+                placeholder="请选择开始日期"
+                size="small"
+                value-format="yyyy-MM-dd">
+              </el-date-picker>
+            </el-form-item>
+            <el-form-item label="结束日期" >
+              <el-date-picker
+                v-model="standCommonlySearch.end"
+                type="date"
+                :editable="false"
+                placeholder="请选择结束日期"
+                size="small"
+                value-format="yyyy-MM-dd">
+              </el-date-picker>
+            </el-form-item>
             <el-formItem class="search-item btn-box">
               <el-button
                 type="primary"
@@ -139,18 +151,11 @@ export default {
       this.splitInfoPage = 1;
       this.sarStandCompareHis();
     },
-//     getTime(time){
-//       let date = new Date(time + 8 * 3600 * 1000); // 增加8小时
-//       console.log(date.toJSON().substr(0, 19).replace('T', ' '));
-//       return  date.toJSON().substr(0, 19).replace('T', ' ');
-//     },
     // 查询表格
     sarStandCompareHis() {
       this.spinShow = true;
-      this.standCommonlySearch.start = new Date(this.standCommonlySearch.start).getTime() //转换为毫秒时间戳
       this.standCommonlySearch.type = 1;
       var form = this.standCommonlySearch;
-      console.log(form);
       this.$http.get("slrs/sar-public-idea/SelectAllPage", form, {
         _this: this
       }, res => {