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

src/pages/details/otherStandardDetails/index.vue

@@ -1152,22 +1152,22 @@
       <div class="see-drawer-content">
         <div class="see-drawer-div">
           <label class="see-drawer-name" style="font-size: 14px" title="条款号">条款号</label>
-          <span class="see-drawer-val" :title="standShowItemEO.itemsNum">{{ standShowItemEO.itemsNum }}</span>
+          <span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.itemsNum">{{ standShowItemEO.itemsNum }}</span>
         </div>
         <div class="see-drawer-div">
-          <label class="see-drawer-name" style="font-size: 15px" title="条款名称">条款名称</label>
-          <span class="see-drawer-val" :title="standShowItemEO.itemsName">{{ standShowItemEO.itemsName }}</span>
+          <label class="see-drawer-name" style="font-size: 14px" title="条款名称">条款名称</label>
+          <span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.itemsName">{{ standShowItemEO.itemsName }}</span>
         </div>
         <div class="see-drawer-div">
-          <label class="see-drawer-name" style="font-size: 15px" title="内容简介">条款内容</label>
-          <span class="see-drawer-val"
+          <label class="see-drawer-name" style="font-size: 14px" title="内容简介">条款内容</label>
+          <span class="see-drawer-val" style="font-size: 12px"
                 :title="standShowItemEO.termsConditions ? standShowItemEO.termsConditions.replace(/<.*?>/ig, ' ') : ''">{{
               standShowItemEO.termsConditions ? standShowItemEO.termsConditions.replace(/<.*?>/ig, ' ') : ''
             }}</span>
         </div>
         <div class="see-drawer-div">
-          <label class="see-drawer-name" style="font-size: 15px" title="解读内容">解读内容</label>
-          <span class="see-drawer-val"
+          <label class="see-drawer-name" style="font-size: 14px" title="解读内容">解读内容</label>
+          <span class="see-drawer-val" style="font-size: 12px"
                 :title="standShowItemEO.readContent ? standShowItemEO.readContent.replace(/<.*?>/ig, ' ') : ''">
             {{
               standShowItemEO.readContent ? standShowItemEO.readContent.replace(/<.*?>/ig, ' ') : ''
@@ -1175,49 +1175,49 @@
         </div>
 
         <div class="see-drawer-div">
-          <label class="see-drawer-name" style="font-size: 15px" title="新车型实施日期">新车型实施日期</label>
-          <span class="see-drawer-val"
+          <label class="see-drawer-name" style="font-size: 14px" title="新车型实施日期">新车型实施日期</label>
+          <span class="see-drawer-val" style="font-size: 12px"
                 :title="standShowItemEO.xcxssrq">{{
               standShowItemEO.xccssrq
             }}</span>
         </div>
         <div class="see-drawer-div">
-          <label class="see-drawer-name" style="font-size: 15px" title="在产车实施日期">在产车实施日期</label>
-          <span class="see-drawer-val"
+          <label class="see-drawer-name" style="font-size: 14px" title="在产车实施日期">在产车实施日期</label>
+          <span class="see-drawer-val" style="font-size: 12px"
                 :title="standShowItemEO.zccssrq">{{
               standShowItemEO.zccssrq
             }}</span>
         </div>
         <div class="see-drawer-div">
-          <label class="see-drawer-name" style="font-size: 15px" title="适用车型">适用车型</label>
-          <span class="see-drawer-val" :title="standShowItemEO.applyArctic">{{ standShowItemEO.applyArctic }}</span>
+          <label class="see-drawer-name" style="font-size: 14px" title="适用车型">适用车型</label>
+          <span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.applyArctic">{{ standShowItemEO.applyArctic }}</span>
         </div>
         <div class="see-drawer-div">
-          <label class="see-drawer-name" style="font-size: 15px" title="责任部门">责任部门</label>
-          <span class="see-drawer-val" :title="standShowItemEO.responsibleUnit">{{
+          <label class="see-drawer-name" style="font-size: 14px" title="责任部门">责任部门</label>
+          <span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.responsibleUnit">{{
               standShowItemEO.responsibleUnit
             }}</span>
         </div>
         <div class="see-drawer-div">
-          <label class="see-drawer-name" style="font-size: 15px" title="责任工程师">责任工程师</label>
-          <span class="see-drawer-val" :title="standShowItemEO.dutyEngineer">
+          <label class="see-drawer-name" style="font-size: 14px" title="责任工程师">责任工程师</label>
+          <span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.dutyEngineer">
             {{ standShowItemEO.dutyEngineer }}</span>
         </div>
         <div class="see-drawer-div">
-          <label class="see-drawer-name" style="font-size: 15px" title="基于上一版本差异">基于上一版本差异</label>
-          <span class="see-drawer-val" :title="standShowItemEO.comparedWithPrevious">
+          <label class="see-drawer-name" style="font-size: 14px" title="基于上一版本差异">基于上一版本差异</label>
+          <span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.comparedWithPrevious">
             {{ standShowItemEO.comparedWithPrevious }}</span>
         </div>
 
         <div class="see-drawer-div">
-          <label class="see-drawer-name" style="font-size: 15px" title="符合性状态">符合性状态</label>
-          <span class="see-drawer-val" :title="standShowItemEO.complianceRequire">
+          <label class="see-drawer-name" style="font-size: 14px" title="符合性状态">符合性状态</label>
+          <span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.complianceRequire">
             {{ standShowItemEO.complianceRequire }}</span>
         </div>
 
         <div class="see-drawer-div">
-          <label class="see-drawer-name" style="font-size: 15px" title="合规性分析">合规性分析</label>
-          <span class="see-drawer-val" :title="standShowItemEO.complianceState">
+          <label class="see-drawer-name" style="font-size: 14px" title="合规性分析">合规性分析</label>
+          <span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.complianceState">
             {{ standShowItemEO.complianceState }}</span>
         </div>
         <!--        <div class="see-drawer-div">-->

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

@@ -81,9 +81,9 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="标准号/标准名称" class="search-item">
+            <el-form-item label="标准号" class="search-item">
               <el-input
-                  v-model="sarAccessInfoSearch.standName"
+                  v-model="sarAccessInfoSearch.standNumber"
                   placeholder="请输入"
                   :maxlength="100"
               ></el-input>
@@ -202,7 +202,6 @@
           </el-table-column>
           <el-table-column
               prop="issueTime"
-              sortable
               align="center"
               width="110"
               label="发布日期">
@@ -212,7 +211,6 @@
           </el-table-column>
           <el-table-column
               prop="xcxssrq"
-              sortable
               align="center"
               width="150"
               label="新车型实施日期">
@@ -220,7 +218,6 @@
           <el-table-column
               show-overflow-tooltip
               prop="zccssrq"
-              sortable
               align="center"
               width="150"
               label="在产车实施日期">
@@ -327,7 +324,6 @@
         </el-table-column>
         <el-table-column
             prop="ssrq"
-            sortable
             align="center"
             width="210px"
             label="标准实施日期">
@@ -335,14 +331,12 @@
         <el-table-column
             show-overflow-tooltip
             prop="zccssrqgj"
-            sortable
             width="210px"
             align="center"
             label="在产车实施日期">
         </el-table-column>
         <el-table-column
             prop="xcxssrqgj"
-            sortable
             align="center"
             width="210px"
             label="新车型实施日期">
@@ -635,9 +629,10 @@ export default {
       // 新增、编辑 数据搜索字段
       sarAccessInfoSearch: {
         id: '',
-        standName: '',
+        standNumber: '',
         askType: '', // 监管类型
         dataSource: 'INLAND_STAND', // 数据来源
+        pageNo: 1,
         page: 1,
         pageSize: this.$store.getters.userInfo.configContent,
         validFlag: 0,
@@ -649,6 +644,7 @@ export default {
         standName: '',
         askType: '', // 监管类型
         dataSource: 'INLAND_STAND', // 数据来源
+        pageNo: 1,
         page: 1,
         pageSize: this.$store.getters.userInfo.configContent,
         validFlag: 0,
@@ -998,7 +994,7 @@ export default {
     clearSearchLaws() {
       this.sarAccessInfoSearch.askType = '' // 监管类型
       this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' // 数据来源
-      this.sarAccessInfoSearch.standName = ''
+      this.sarAccessInfoSearch.standNumber = ''
       this.sarAccessInfo.standName = ''
       this.sarAccessInfo.standNumber = ''
       this.isListType = false
@@ -1476,6 +1472,8 @@ export default {
       })
     },
     pageInfo() {
+      this.sarAccessInfoSearch.pageNo = 1
+      this.sarAccessInfoSearch.page = 1
       if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND' || this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND'){
         StandardsInfoPage(this.sarAccessInfoSearch).then(res => {
           this.sarAccessInfoSearchList = res.data.list
@@ -1526,6 +1524,8 @@ export default {
 
     },
     selectPage() {
+      this.sarAccessInfo.pageNo = 1
+      this.sarAccessInfo.page = 1
       StandardsInfoPage(this.sarAccessInfo).then(res => {
         this.sarAccessInfoSearchList = res.data.list
         this.sarAccessInfoSearchList.forEach(item => {

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

@@ -182,12 +182,10 @@
           <el-table-column
             prop="issueTime"
             align="center"
-            sortable
             label="发布日期">
           </el-table-column>
           <el-table-column
             prop="xcxssrq"
-            sortable
             align="center"
             label="新车型实施日期">
           </el-table-column>
@@ -195,7 +193,6 @@
             show-overflow-tooltip
             prop="zccssrq"
             align="center"
-            sortable
             label="在产车实施日期">
           </el-table-column>
           <el-table-column
@@ -297,7 +294,6 @@
         </el-table-column>
         <el-table-column
           prop="ssrq"
-          sortable
           align="center"
           width="210px"
           label="标准实施日期">
@@ -305,14 +301,12 @@
         <el-table-column
           show-overflow-tooltip
           prop="zccssrq"
-          sortable
           width="210px"
           align="center"
           label="在产车实施日期">
         </el-table-column>
         <el-table-column
           prop="xcxssrq"
-          sortable
           align="center"
           width="210px"
           label="新车型实施日期">
@@ -499,6 +493,7 @@ export default {
         askType: '', // 监管类型
         dataSource: 'INLAND_STAND', // 数据来源
         page: 1,
+        pageNo: 1,
         Size: this.$store.getters.userInfo.configContent,
         validFlag: 0,
         advanceSearchVOStr: ''
@@ -510,6 +505,7 @@ export default {
         askType: '', // 监管类型
         dataSource: 'INLAND_STAND', // 数据来源
         page: 1,
+        pageNo: 1,
         pageSize: this.$store.getters.userInfo.configContent,
         validFlag: 0,
         advanceSearchVOStr: ''
@@ -832,6 +828,8 @@ export default {
     // 点数据搜索 查询按钮 事件
     searchLawsStands () {
       this.showTableFlag = false
+      this.sarAccessInfoSearch.pageNo = 1
+      this.sarAccessInfoSearch.page = 1
       this.selectLawsStands()
     },
     // 点击清空查询条件 按钮事件
@@ -1232,6 +1230,8 @@ export default {
       })
     },
     pageInfo() {
+      this.sarAccessInfoSearch.pageNo = 1
+      this.sarAccessInfoSearch.page = 1
       if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND' || this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND') {
         StandardsInfoPage(this.sarAccessInfoSearch).then(res => {
           this.sarAccessInfoSearchList = res.data.list
@@ -1282,6 +1282,8 @@ export default {
       }
     },
     selectPage() {
+      this.sarAccessInfo.page = 1
+      this.sarAccessInfo.pageNo = 1
       StandardsInfoPage(this.sarAccessInfo).then(res =>{
         this.sarAccessInfoSearchList = res.data.list
         this.sarAccessInfoSearchList.forEach(item => {
@@ -1297,6 +1299,7 @@ export default {
     },
     // 高级检索查询按钮
     selectBtn() {
+      this.sarAccessInfo.pageNo = 1
       if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
         this.sarAccessInfoSearch.standType = 'INLAND'
         this.selectPage()

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

@@ -238,20 +238,17 @@
           </el-table-column>
           <el-table-column
               prop="issueTime"
-              sortable
               align="center"
               label="发布日期">
           </el-table-column>
           <el-table-column
               prop="xcxssrq"
-              sortable
               align="center"
               label="新车型实施日期">
           </el-table-column>
           <el-table-column
               show-overflow-tooltip
               prop="zccssrq"
-              sortable
               align="center"
               label="在产车实施日期">
           </el-table-column>
@@ -355,7 +352,6 @@
         </el-table-column>
         <el-table-column
             prop="ssrq"
-            sortable
             align="center"
             width="210px"
             label="标准实施日期">
@@ -363,14 +359,12 @@
         <el-table-column
             show-overflow-tooltip
             prop="zccssrq"
-            sortable
             width="210px"
             align="center"
             label="在产车实施日期">
         </el-table-column>
         <el-table-column
             prop="xcxssrq"
-            sortable
             align="center"
             width="210px"
             label="新车型实施日期">
@@ -569,6 +563,7 @@ export default {
         syrz: '',
         typeApplicable: '',
         dataSource: 'INLAND_STAND', // 数据来源
+        pageNo: 1,
         page: 1,
         pageSize: this.$store.getters.userInfo.configContent,
         validFlag: 0,
@@ -582,6 +577,7 @@ export default {
         typeApplicable: '',
         askType: '', // 监管类型
         dataSource: 'INLAND_STAND', // 数据来源
+        pageNo: 1,
         page: 1,
         pageSize: this.$store.getters.userInfo.configContent,
         validFlag: 0,
@@ -1355,6 +1351,8 @@ export default {
     },
     //  查询按钮
     selectLawsStands() {
+      this.sarAccessInfoSearch.pageNo = 1
+      this.sarAccessInfoSearch.page = 1
       if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
         this.sarAccessInfoSearch.standType = 'INLAND'
         this.pageInfo()
@@ -1371,6 +1369,8 @@ export default {
     },
     /** 高级查询查询按钮*/
     selectPage() {
+      this.sarAccessInfo.pageNo = 1
+      this.sarAccessInfo.page = 1
       StandardsInfoPage(this.sarAccessInfo).then(res => {
         this.sarAccessInfoSearchList = res.data.list
         this.sarAccessInfoSearchList.forEach(item => {