From ab1d7b132aaca00849b0a2c5e2051501422a4fa8 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Mon, 16 Aug 2021 13:51:11 +0800
Subject: [PATCH] commit

---
 src/pages/home1/components/release/index.vue    | 17 ++++++++++++++++-
 .../pages/creatProcess/bzrk/step1.vue           |  7 ++++++-
 .../domesticStandardsAndRegulations/index.vue   |  4 ++--
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/pages/home1/components/release/index.vue b/src/pages/home1/components/release/index.vue
index ec017fa9b..dda733226 100644
--- a/src/pages/home1/components/release/index.vue
+++ b/src/pages/home1/components/release/index.vue
@@ -2,7 +2,7 @@
 <template>
   <div class="release">
     <ul>
-      <li v-for="item in standardReleaseList" :key="item.id" class="time-title">
+      <li v-for="item in standardReleaseList" :key="item.id" class="time-title" v-if="updateTime>=item.issueTime">
         <a @click="handlePreview(item)" class="table-jump">{{ item.standName }}</a>
         <span class="time">{{item.issueTime }}</span>
       </li>
@@ -19,6 +19,7 @@ export default {
     return {
       putTime: '',
       standardReleaseList: [],  //标准发布数据
+      updateTime:""
     }
   },
   computed: {},
@@ -26,8 +27,22 @@ export default {
   mounted() {
     this.getDate()
     this.getAdvice()
+    this.addDate()
   },
   methods: {
+    //获取当前年月日
+    addDate(){
+      const nowDate = new Date();
+      const date = {
+        year: nowDate.getFullYear(),
+        month: nowDate.getMonth() + 1,
+        date: nowDate.getDate(),
+      }
+      const newmonth = date.month>10?date.month:'0'+date.month
+      const day = date.date>10?date.date:'0'+date.date
+      this.updateTime = date.year + '-' + newmonth + '-' + day
+      console.log("当前时间"+this.updateTime)
+    },
     // 点击查看
     handlePreview (item) {
       let routeUrl = this.$router.resolve({
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index 7c63493a8..bb62223f3 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -122,6 +122,7 @@
                                             clearable
                                     ></el-input>
                                 </el-form-item>
+
                                 <el-form-item class="add-form-item form-item-disabled" style="margin-left: -210px">
                                     <el-button
                                             type="primary"
@@ -1456,9 +1457,13 @@
                         { type: 'number', message: '年标准年份必须为数字值'}
                     ],
                     standName: [
-                        { required: true, message: '请输入标准名称', trigger: 'blur' },
+                        { required: true, message: '请输入标准中文名称', trigger: 'blur' },
                         { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }
                     ],
+                  standEnName: [
+                    { required: true, message: '请输入标准英文名称', trigger: 'blur' },
+                    { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }
+                  ],
                     standNature: [
                         { required: true, message: '请选择标准性质', trigger: 'change' }
                     ],
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index fcddc5ce9..d04d3de6c 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -1492,7 +1492,7 @@
           <el-button
               class="common-button-default"
               icon="el-icon-close"
-              @click="clearAllSearch('sarStandardsSearch')">取消</el-button>
+              @click="clearAllSearch('sarStandardsSearch')">清空</el-button>
         </div>
       </el-drawer>
     </div>
@@ -2824,7 +2824,7 @@ export default {
     // 高级检索
     selectMoreBtn () {
       this.isAdvancedSearch = true
-      this.sarStandardsSearch = []
+      // this.sarStandardsSearch = []
     },
     treeCollapse () {
       this.sideClose = !this.sideClose