Merge branch 'develop' into 'test'

Develop

See merge request !82

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue

@@ -178,6 +178,7 @@
               show-overflow-tooltip
               fixed="left"
               width="180px"
+              align="center"
               label="标准号">
             <template slot-scope="scope">
               <span @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</span>
@@ -185,6 +186,7 @@
           </el-table-column>
           <el-table-column
               prop="standName"
+              align="center"
               label="标准名称"
           >
             <template slot-scope="scope">
@@ -194,6 +196,7 @@
           <el-table-column
               prop="issueTime"
               sortable
+              align="center"
               label="发布日期">
             <template slot-scope="scope">
               <span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}</span>
@@ -202,6 +205,7 @@
           <el-table-column
               prop="xcxssrqgj"
               sortable
+              align="center"
               label="新车型实施日期">
             <template slot-scope="scope">
               <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
@@ -211,6 +215,7 @@
               show-overflow-tooltip
               prop="zccssrqgj"
               sortable
+              align="center"
               label="在产车实施日期">
             <template slot-scope="scope">
               <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}</span>
@@ -220,6 +225,7 @@
               show-overflow-tooltip
               prop="textStatus"
               width="120px"
+              align="center"
               label="文本状态">
             <template slot-scope="scope">
               <span>{{ textStatusMap[scope.row.textStatus] }}</span>
@@ -268,6 +274,7 @@
             show-overflow-tooltip
             width="180px"
             fixed="left"
+            align="center"
             label="标准号">
           <template slot-scope="scope">
             <a  @click="handlePreview(scope.row)">{{ scope.row.standNumber }}</a>
@@ -276,6 +283,7 @@
         <el-table-column
             prop="standName"
             label="标准名称"
+            align="center"
             width="260px"
         >
           <template slot-scope="scope">
@@ -380,7 +388,7 @@
           width="210px"
           label="卡车VPPS中文名称">
         </el-table-column>
-        <el-table-column width="240" align="center" label="操作">
+        <el-table-column width="240" align="center"  fixed="right"  label="操作">
           <template slot-scope="scope">
             <el-button
               class="common-button-default"

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue

@@ -163,6 +163,7 @@
             show-overflow-tooltip
             fixed="left"
             width="180px"
+            align="center"
             label="标准号">
             <template slot-scope="scope">
               <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</a>
@@ -170,6 +171,7 @@
           </el-table-column>
           <el-table-column
             prop="standName"
+            align="center"
             label="标准名称"
           >
             <template slot-scope="scope">
@@ -178,6 +180,7 @@
           </el-table-column>
           <el-table-column
             prop="issueTime"
+            align="center"
             sortable
             label="发布日期">
             <template slot-scope="scope">
@@ -187,6 +190,7 @@
           <el-table-column
             prop="xcxssrqgj"
             sortable
+            align="center"
             label="新车型实施日期">
               <template slot-scope="scope">
                   <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
@@ -195,6 +199,7 @@
           <el-table-column
             show-overflow-tooltip
             prop="zccssrqgj"
+            align="center"
             sortable
             label="在产车实施日期">
               <template slot-scope="scope">
@@ -204,6 +209,7 @@
           <el-table-column
             show-overflow-tooltip
             prop="textStatus"
+            align="center"
             width="120px"
             label="文本状态">
             <template slot-scope="scope">
@@ -251,6 +257,7 @@
           prop="standNumber"
           show-overflow-tooltip
           width="180px"
+          align="center"
           fixed="left"
           label="标准号">
           <template slot-scope="scope">
@@ -259,6 +266,7 @@
         </el-table-column>
         <el-table-column
           prop="standName"
+          align="center"
           label="标准名称"
           width="260px"
         >
@@ -364,7 +372,7 @@
           width="210px"
           label="卡车VPPS中文名称">
         </el-table-column>
-        <el-table-column width="240" align="center" label="操作">
+        <el-table-column width="240" align="center"  fixed="right"  label="操作">
           <template slot-scope="scope">
             <el-button
               class="common-button-default"

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue

@@ -200,6 +200,7 @@
             prop="standNumber"
             show-overflow-tooltip
             fixed="left"
+            align="center"
             width="180px"
             label="标准号">
             <template slot-scope="scope">
@@ -208,6 +209,7 @@
           </el-table-column>
           <el-table-column
             prop="standName"
+            align="center"
             label="标准名称"
           >
             <template slot-scope="scope">
@@ -216,17 +218,20 @@
           </el-table-column>
           <el-table-column
             prop="typeApplicable"
+            align="center"
             label="适用车型"
           >
           </el-table-column>
           <el-table-column
             prop="syrz"
+            align="center"
             label="适用认证"
           >
           </el-table-column>
           <el-table-column
             prop="issueTime"
             sortable
+            align="center"
             label="发布日期">
             <template slot-scope="scope">
               <span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}</span>
@@ -235,6 +240,7 @@
           <el-table-column
             prop="xcxssrqgj"
             sortable
+            align="center"
             label="新车型实施日期">
             <template slot-scope="scope">
               <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
@@ -244,6 +250,7 @@
             show-overflow-tooltip
             prop="zccssrqgj"
             sortable
+            align="center"
             label="在产车实施日期">
             <template slot-scope="scope">
               <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}</span>
@@ -253,6 +260,7 @@
             show-overflow-tooltip
             prop="textStatus"
             width="120px"
+            align="center"
             label="文本状态">
             <template slot-scope="scope">
               <span>{{ textStatusMap[scope.row.textStatus] }}</span>
@@ -300,6 +308,7 @@
           show-overflow-tooltip
           width="180px"
           fixed="left"
+          align="center"
           label="标准号">
           <template slot-scope="scope">
             <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</a>
@@ -308,6 +317,7 @@
         <el-table-column
           prop="standName"
           label="标准名称"
+          align="center"
           width="260px"
         >
           <template slot-scope="scope">
@@ -412,7 +422,7 @@
           width="210px"
           label="卡车VPPS中文名称">
         </el-table-column>
-        <el-table-column width="240" align="center" label="操作">
+        <el-table-column width="240" align="center" fixed="right" label="操作">
           <template slot-scope="scope">
             <el-button
               class="common-button-default"
@@ -1376,6 +1386,7 @@ export default {
       }, e => {
       })
     },
+    //  查询按钮
     selectLawsStands () {
       if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
         this.sarAccessInfoSearch.standType = 'INLAND'
@@ -1402,6 +1413,7 @@ export default {
       }, e => {
       })
     },
+    // 高级查询-查询按钮
     selectBtn() {
       if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
         this.sarAccessInfoSearch.standType = 'INLAND'

src/pages/regulatoryRepository/partCodeApply/index.vue

@@ -14,8 +14,8 @@
 
           </el-input>
         </el-form-item>
-        <el-form-item label="零件分类号" class="search-item">
+        <el-form-item label="零部件分类代号" class="search-item">
-          <el-input placeholder="根据零件分类代号查询" clearable :maxlength="100" v-model="searchFormData.partCategoryCode">
+          <el-input placeholder="根据零部件分类代号查询" clearable :maxlength="100" v-model="searchFormData.partCategoryCode">
 
           </el-input>
         </el-form-item>
@@ -254,7 +254,7 @@ export default {
 
   .search-area {
     /deep/ .el-input__inner {
-      width: 185px;
+      width: 200px;
     }
   }