Merge branch 'mengzixuan' of http://gitlab.91isoft.com:90/car-test/web into develop

src/views/informationBase/viewStandard/index.vue

@@ -15,6 +15,7 @@
       </el-table-column>
       <el-table-column
         label="标准分类"
+        sortable
         min-width="200"
         prop="standardType"
         align="left"
@@ -74,7 +75,7 @@
         prop="releaseDate"
       >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.releaseDate) }}</span>
+          <span>{{ parseTime(scope.row.releaseDate, '{y}-{m}-{d} {h}') }}</span>
         </template>
       </el-table-column>
       <el-table-column
@@ -85,7 +86,9 @@
         prop="implementationDate"
       >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.implementationDate) }}</span>
+          <span>{{
+            parseTime(scope.row.implementationDate, '{y}-{m}-{d} {h}')
+          }}</span>
         </template>
       </el-table-column>
     </el-table>

src/views/informationBase/viewStandardTerms/index.vue

@@ -74,7 +74,13 @@
           <span>{{ scope.$index + 1 }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="chapter" label="标准章节" align="center">
+      <el-table-column
+        prop="chapter"
+        label="标准章节"
+        sortable
+        width="140"
+        align="center"
+      >
       </el-table-column>
       <el-table-column prop="text" label="标准要求" align="center">
       </el-table-column>
@@ -85,7 +91,12 @@
         align="center"
       >
       </el-table-column>
-      <el-table-column label="操作" align="left" class-name="fixed-width">
+      <el-table-column
+        label="操作"
+        align="left"
+        width="240"
+        class-name="fixed-width"
+      >
         <template slot-scope="scope">
           <div class="button-bar">
             <page-button
@@ -147,7 +158,7 @@ export default {
           value: 'car'
         },
         {
-          label: '文档审查',
+          label: '车型试验',
           value: 'test'
         }
       ],

src/views/setting/standard/index.vue

@@ -15,6 +15,7 @@
       </el-table-column>
       <el-table-column
         label="标准分类"
+        sortable
         min-width="200"
         prop="standardType"
         align="left"
@@ -74,7 +75,7 @@
         prop="releaseDate"
       >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.releaseDate) }}</span>
+          <span>{{ parseTime(scope.row.releaseDate, '{y}-{m}-{d} {h}') }}</span>
         </template>
       </el-table-column>
       <el-table-column
@@ -85,7 +86,9 @@
         prop="implementationDate"
       >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.implementationDate) }}</span>
+          <span>{{
+            parseTime(scope.row.implementationDate, '{y}-{m}-{d} {h}')
+          }}</span>
         </template>
       </el-table-column>
       <el-table-column

src/views/setting/standardTerms/components/vehicleModelDialog.vue

@@ -38,7 +38,7 @@
                       reviewSceneIndex
                     "
                   >
-                    <span>{{ a.text }}</span>
+                    <span>{{ reviewSceneIndex + 1 + '、' + a.text }}</span>
                     <br />
                   </div>
                 </template>

src/views/setting/standardTerms/index.vue

@@ -73,7 +73,13 @@
           <span>{{ scope.$index + 1 }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="chapter" label="标准章节" align="center">
+      <el-table-column
+        prop="chapter"
+        label="标准章节"
+        sortable
+        width="140"
+        align="center"
+      >
       </el-table-column>
       <el-table-column prop="text" label="标准要求" align="center">
       </el-table-column>
@@ -84,7 +90,12 @@
         align="center"
       >
       </el-table-column>
-      <el-table-column label="操作" align="left" class-name="fixed-width">
+      <el-table-column
+        label="操作"
+        align="left"
+        width="240"
+        class-name="fixed-width"
+      >
         <template slot-scope="scope">
           <div class="button-bar">
             <page-button
@@ -146,7 +157,7 @@ export default {
           value: 'car'
         },
         {
-          label: '文档审查',
+          label: '车型试验',
           value: 'test'
         }
       ],