Merge branch 'develop' into 'test'

Develop

See merge request LAWS/laws-system-front-FOTON!144

src/pages/home1/components/release/index.vue

@@ -2,9 +2,11 @@
 <template>
   <div class="release">
     <ul>
-      <li v-for="item in standardReleaseList" :key="item.id" class="time-title" v-if="updateTime>=item.issueTime">
+      <li v-for="item in standardReleaseList" :key="item.id" class="time-title" >
-        <a @click="handlePreview(item)" class="table-jump">{{ item.standName }}</a>
+          <div style="height: 18px;">
-        <span class="time">{{item.issueTime }}</span>
+            <a @click="handlePreview(item)" class="table-jump">{{ item.standName }}</a>
+              <span class="time">{{item.issueTime ? $moment(item.issueTime).format('YYYY-MM-DD') : '' }}</span>
+          </div>
       </li>
     </ul>
   </div>
@@ -19,7 +21,6 @@ export default {
     return {
       putTime: '',
       standardReleaseList: [],  //标准发布数据
-      updateTime:""
     }
   },
   computed: {},
@@ -30,19 +31,6 @@ export default {
     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({
@@ -65,7 +53,12 @@ export default {
       this.$http.get('sarStandardsInfo/sar-standards-info/getStandInfoByList', obj, {
         _this: this
       }, res => {
-        this.standardReleaseList = res.data
+        let arr = res.data
+        arr.forEach(item => {
+          if(item.standName !== ""){
+            this.standardReleaseList.push(item)
+          }
+        })
       }, e => {
       })
     },

src/pages/home1/components/solicitopinions/index.vue

@@ -2,9 +2,11 @@
 <template>
   <div class="solicitopinions">
     <ul>
-      <li v-for="item in domesticDynamics" :key="item.id" class="time-title" v-if="updateTime < item.endTime">
+      <li v-for="item in domesticDynamics" :key="item.id" class="time-title">
-        <a class="title" :title="item.cname" @click="standForComments(item)">{{ item.cname }}</a>
+        <div style="height: 18px">
-        <span class="time">{{ item.endTime }}</span>
+          <a class="title" :title="item.cname" @click="standForComments(item)">{{ item.cname }}</a>
+          <span class="time">{{ item.endTime }}</span>
+        </div>
       </li>
     </ul>
   </div>
@@ -27,22 +29,9 @@ export default {
   mounted() {
     this.getDate();
     this.getAdvice();
-    this.addDate();
+    // 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);
-    },
     //截取时间
     getDate(date) {
       return date != null ? date.substring(0, date.indexOf(" ")) : "";
@@ -51,11 +40,16 @@ export default {
     getAdvice() {
       this.$http.get("slrs/sar-public-idea/SelectAllPage", {
         page: 1,
-        size: 1000,
+        size: 1000
       }, {
         _this: this
       }, res => {
-        this.domesticDynamics = res.data.records
+        let arr = res.data.records;
+        arr.forEach(item => {
+          if (item.cname !== "") {
+            this.domesticDynamics.push(item);
+          }
+        });
       }, e => {
 
       });

src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue

@@ -93,6 +93,7 @@
                     </el-table-column>
                     <el-table-column
                             prop="chapterNumber"
+                            align="center"
                             label="章条编号"
                             width="170px">
                         <template slot-scope="scope">
@@ -101,6 +102,7 @@
                     </el-table-column>
                     <el-table-column
                             prop="chapterName"
+                            align="center"
                             label="章节名称"
                             width="170px">
                         <template slot-scope="scope">

src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue

@@ -75,11 +75,13 @@
           </el-table-column>
           <el-table-column
             prop="chapterNumber"
+            align="center"
             label="章条编号"
             width="170px">
           </el-table-column>
           <el-table-column
             prop="chapterName"
+            align="center"
             label="章节名称">
           </el-table-column>
           <el-table-column
@@ -104,10 +106,12 @@
           </el-table-column>
           <el-table-column
             prop="department"
+            align="center"
             label="提出部门">
           </el-table-column>
           <el-table-column
             prop="responUserName"
+            align="center"
             label="提出人">
           </el-table-column>
         </el-table>

src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue

@@ -75,11 +75,13 @@
           </el-table-column>
           <el-table-column
             prop="chapterNumber"
+            align="center"
             label="章条编号"
             width="170px">
           </el-table-column>
           <el-table-column
             prop="chapterName"
+            align="center"
             label="章节名称">
           </el-table-column>
           <el-table-column
@@ -128,14 +130,17 @@
           </el-table-column>
           <el-table-column
             prop="department"
+            align="center"
             label="提出部门">
           </el-table-column>
           <el-table-column
             prop="responUserName"
+            align="center"
             label="提出人">
           </el-table-column>
           <el-table-column
             prop="state"
+            align="center"
             label="处理意见">
             <template slot-scope="scope">
               <div style="margin: 5px 0;">

src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue

@@ -87,11 +87,13 @@
           </el-table-column>
           <el-table-column
             prop="chapterNumber"
+            align="center"
             label="章条编号"
             width="170px">
           </el-table-column>
           <el-table-column
             prop="chapterName"
+            align="center"
             label="章节名称">
           </el-table-column>
           <el-table-column
@@ -116,14 +118,17 @@
           </el-table-column>
           <el-table-column
             prop="department"
+            align="center"
             label="提出部门">
           </el-table-column>
           <el-table-column
             prop="responUserName"
+            align="center"
             label="提出人">
           </el-table-column>
           <el-table-column
             prop="state"
+            align="center"
             label="处理意见">
             <template slot-scope="scope">
               <div>{{ stateText(scope.row.state) }}</div>

src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue

@@ -87,11 +87,13 @@
           </el-table-column>
           <el-table-column
             prop="chapterNumber"
+            align="center"
             label="章条编号"
             width="170px">
           </el-table-column>
           <el-table-column
             prop="chapterName"
+            align="center"
             label="章节名称">
           </el-table-column>
           <el-table-column
@@ -116,14 +118,17 @@
           </el-table-column>
           <el-table-column
             prop="department"
+            align="center"
             label="提出部门">
           </el-table-column>
           <el-table-column
             prop="responUserName"
+            align="center"
             label="提出人">
           </el-table-column>
           <el-table-column
             prop="state"
+            align="center"
             label="处理意见">
             <template slot-scope="scope">
               <div>{{ stateText(scope.row.state) }}</div>

src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue

@@ -87,11 +87,13 @@
           </el-table-column>
           <el-table-column
             prop="chapterNumber"
+            align="center"
             label="章条编号"
             width="170px">
           </el-table-column>
           <el-table-column
             prop="chapterName"
+            align="center"
             label="章节名称">
           </el-table-column>
           <el-table-column
@@ -116,14 +118,17 @@
           </el-table-column>
           <el-table-column
             prop="department"
+            align="center"
             label="提出部门">
           </el-table-column>
           <el-table-column
             prop="responUserName"
+            align="center"
             label="提出人">
           </el-table-column>
           <el-table-column
             prop="state"
+            align="center"
             label="处理意见">
             <template slot-scope="scope">
               <div>{{ stateText(scope.row.state) }}</div>

src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue

@@ -87,11 +87,13 @@
           </el-table-column>
           <el-table-column
             prop="chapterNumber"
+            align="center"
             label="章条编号"
             width="170px">
           </el-table-column>
           <el-table-column
             prop="chapterName"
+            align="center"
             label="章节名称">
           </el-table-column>
           <el-table-column
@@ -116,14 +118,17 @@
           </el-table-column>
           <el-table-column
             prop="department"
+            align="center"
             label="提出部门">
           </el-table-column>
           <el-table-column
             prop="responUserName"
+            align="center"
             label="提出人">
           </el-table-column>
           <el-table-column
             prop="state"
+            align="center"
             label="处理意见">
             <template slot-scope="scope">
               <div>{{ stateText(scope.row.state) }}</div>

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -184,11 +184,16 @@
               label="标准号"
             >
               <template slot-scope="scope">
-                <a v-if="scope.row.standYear" class="table-jump"
+                <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" class="table-jump" style="color: #F56C6C"
                    @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
                     scope.row.standNumber
                   }}-{{ scope.row.standYear }}</a>
-                <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }}
+                <a v-else-if="scope.row.standYear" class="table-jump" style="color: #333333"
+                   @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
+                    scope.row.standNumber
+                  }}-{{ scope.row.standYear }}</a>
+                <a v-else @click="handlePreview(scope.row)" class="table-jump" style="color: #333333">
+                  {{ scope.row.standSortShow }}
                   {{ scope.row.standNumber }}</a>
               </template>
             </el-table-column>
@@ -198,7 +203,8 @@
               label="标准名称"
             >
               <template slot-scope="scope">
-                <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+                <a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" @click="handlePreview(scope.row)" class="table-jump" style="color: #F56C6C">{{ scope.row.standName }}</a>
+                <a v-else @click="handlePreview(scope.row)" style="color: #333333" class="table-jump">{{ scope.row.standName }}</a>
               </template>
             </el-table-column>
             <el-table-column
@@ -207,7 +213,8 @@
               width="110px"
               label="发布日期">
               <template slot-scope="scope">
-                {{ formatIssueDate(scope.row.issueTime) }}
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ formatIssueDate(scope.row.issueTime) }}</span>
+                <span v-else>{{ formatIssueDate(scope.row.issueTime) }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -217,7 +224,8 @@
               label="实施日期">
               <template slot-scope="scope">
                 <!--                {{ formatIssueDate(scope.row.putTime) }}-->
-                <span>{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
+                <span v-else>{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
 
               </template>
             </el-table-column>
@@ -228,7 +236,8 @@
               width="150px"
               label="新车型实施日期">
               <template slot-scope="scope">
-                <span>{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}</span>
+                <span v-else>{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -237,7 +246,8 @@
               width="150px"
               label="在产车实施日期">
               <template slot-scope="scope">
-                <span>{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}</span>
+                <span v-else>{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -251,7 +261,8 @@
               <!--                </el-tooltip>-->
               <!--              </template>-->
               <template slot-scope="scope">
-                <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ textStatusMap[scope.row.textStatus] }}</span>
+                <span v-else>{{ textStatusMap[scope.row.textStatus] }}</span>
               </template>
             </el-table-column>
             <el-table-column label="操作" align="center" width="50" fixed="right">

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -203,7 +203,11 @@
               width="110px"
               label="发布日期">
               <template slot-scope="scope">
-                {{ formatIssueDate(scope.row.issueTime) }}
+                <div>
+                  <a>
+                    {{ formatIssueDate(scope.row.issueTime) }}
+                  </a>
+                </div>
               </template>
             </el-table-column>
             <el-table-column
@@ -213,7 +217,7 @@
               label="实施日期">
               <template slot-scope="scope">
                 <!--                {{ formatIssueDate(scope.row.putTime) }}-->
-                <span>{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
+                <a>{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0,10) : '-' }}</a>
 
               </template>
             </el-table-column>
@@ -223,7 +227,7 @@
               width="150px"
               label="新车型实施日期">
               <template slot-scope="scope">
-                <span>{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}</span>
+                <a>{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0,10) : '-' }}</a>
               </template>
             </el-table-column>
             <el-table-column
@@ -232,7 +236,7 @@
               width="150px"
               label="在产车实施日期">
               <template slot-scope="scope">
-                <span>{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}</span>
+                <a>{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0,10) : '-' }}</a>
               </template>
             </el-table-column>
             <el-table-column
@@ -246,7 +250,7 @@
               <!--                </el-tooltip>-->
               <!--              </template>-->
               <template slot-scope="scope">
-                <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+                <a>{{ textStatusMap[scope.row.textStatus] }}</a>
               </template>
             </el-table-column>
             <el-table-column label="操作" align="center" width="50" fixed="right">