Merge branch 'develop' into 'FOTON'

Develop

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

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

@@ -1170,10 +1170,14 @@ export default {
       // 国内标准法规可查字段
       if (val === 'INLAND_STAND') {
         this.sarAccessInfo.dataSource = 'INLAND_STAND'
+        this.standLabelNum = '标准号'
+        this.standLabelName = '标准名称'
         this.selectLawsStands()
         // 海外标准法规可查字段
       } else if (val === 'FOREIGN_STAND') {
         this.sarAccessInfo.dataSource = 'FOREIGN_STAND'
+        this.standLabelNum = '标准号'
+        this.standLabelName = '英文名称'
         this.selectLawsStands()
         // 国内外政策可查字段
       } else if (val === 'FOREIGN_LAWS') {

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue

@@ -767,12 +767,12 @@ export default {
               if (item.xcxssrqgj === "undefined") {
                 item.xcxssrqgj = ''
               }
-              if (item.ssrq === "undefined" || item.ssrq === 'null' || item.ssrq) {
+              if (item.ssrq === "undefined" || item.ssrq === 'null' || !item.ssrq) {
                 item.ssrq = ''
               }
             });
             this.standinfoList = res.data.records;
-            this.standardFormTotal = res.data.total;
+            this.total = res.data.total;
             this.standinfoList.forEach(item => {
               if (item.standYear === null) {
                 item.standNumber = item.standSortShow + " " + item.standNumber;

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

@@ -1172,10 +1172,14 @@ export default {
       // 国内标准法规可查字段
       if (val === 'INLAND_STAND') {
         this.sarAccessInfo.dataSource = 'INLAND_STAND'
+        this.standLabelNum = '标准号'
+        this.standLabelName = '标准名称'
         this.selectLawsStands()
         // 海外标准法规可查字段
       } else if (val === 'FOREIGN_STAND') {
         this.sarAccessInfo.dataSource = 'FOREIGN_STAND'
+        this.standLabelNum = '标准号'
+        this.standLabelName = '英文名称'
         this.selectLawsStands()
         // 国内外政策可查字段
       } else if (val === 'FOREIGN_LAWS') {

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

@@ -1103,10 +1103,14 @@ export default {
       // 国内标准法规可查字段
       if (val === 'INLAND_STAND') {
         this.sarAccessInfo.dataSource = 'INLAND_STAND'
+        this.standLabelNum = '标准号'
+        this.standLabelName = '标准名称'
         this.selectLawsStands()
         // 海外标准法规可查字段
       } else if (val === 'FOREIGN_STAND') {
         this.sarAccessInfo.dataSource = 'FOREIGN_STAND'
+        this.standLabelNum = '标准号'
+        this.standLabelName = '英文名称'
         this.selectLawsStands()
         // 国内外政策可查字段
       } else if (val === 'FOREIGN_LAWS') {

src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue

@@ -135,7 +135,6 @@
         prop="actualCloseTime"
         width="130"
         align="center"
-        sortable
         label="实际关闭时间">
         <template slot-scope="scope">{{(scope.row.actualCloseTime ? scope.row.actualCloseTime.substring(0, 11): '')}}</template>
       </el-table-column>

src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue

@@ -185,7 +185,6 @@
             <el-table-column
               prop="planCloseTime"
               width="150"
-              sortable="custom"
               label="计划关闭时间">
               <template slot-scope="scope">
                 {{ (scope.row.planCloseTime ? scope.row.planCloseTime.substring(0, 11) : "") }}