Merge branch 'develop' into 'test'

Develop

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

src/pages/details/otherStandardDetails/index.vue

@@ -43,7 +43,7 @@
             <div class="details-content-modular basic-information" style="border-top:none">
               <div class="basic-information-content">
                 <!--                <p><label style=" margin-right: 150px;">标准类别</label><span>{{ sarStandardsInfoEO.standSort || '-' }}</span></p>-->
-                <p style="color: #C42626;">
+                <p style="color: #C42626;" class="half">
                   <label style=" margin-right: 164px;">标准号</label>
                   <span v-if="sarStandardsInfoEO.standYear">{{
                       sarStandardsInfoEO.standSortShow + ' ' + sarStandardsInfoEO.standNumber + '-' + sarStandardsInfoEO.standYear
@@ -51,30 +51,30 @@
                   <span v-else>{{ sarStandardsInfoEO.standSort + ' ' + sarStandardsInfoEO.standNumber }}</span>
                 </p>
                 <!--                <p><label style=" margin-right: 150px;">标准年份</label><span>{{ sarStandardsInfoEO.standYear || '-' }}</span></p>-->
-                <p><label style=" margin-right: 150px;">中文名称</label><span>{{
+                <p class="half"><label style=" margin-right: 150px;">中文名称</label><span>{{
                     sarStandardsInfoEO.standName || '-'
                   }}</span></p>
-                <p><label style=" margin-right: 150px;">英文名称</label><span>{{
+                <p class="half"><label style=" margin-right: 150px;">英文名称</label><span>{{
                     sarStandardsInfoEO.standEnName || '-'
                   }}</span></p>
-                <p><label style=" margin-right: 150px;">标准性质</label><span>{{
+                <p class="half"><label style=" margin-right: 150px;">标准性质</label><span>{{
                     standMap[sarStandardsInfoEO.standNature] || '-'
                   }}</span></p>
-                <p>
+                <p class="half">
                   <label style=" margin-right: 132px;"
                          title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。"
                   >文本状态</label>
                   <span style="color: #409EFF;">{{ textStatusMap[sarStandardsInfoEO.textStatus] || '-' }}</span>
                 </p>
-                <p><label style=" margin-right: 150px;">发布日期</label><span>{{
+                <p class="half"><label style=" margin-right: 150px;">发布日期</label><span>{{
                     sarStandardsInfoEO.issueTime || '-'
                   }}</span></p>
-                <p>
+                <p class="half">
                   <label style=" margin-right: 84px;">是否纳入认证清单</label><span>{{
                     sarStandardsInfoEO.isRelateAccess ? (sarStandardsInfoEO.isRelateAccess === '1' ? '是' : '否') : '-'
                   }}</span>
                 </p>
-                <p v-if="saveStandType === 'INLAND_STAND'"><label style=" margin-right: 150px;">标准体系</label><span>{{
+                <p class="half" v-if="saveStandType === 'INLAND_STAND'"><label style=" margin-right: 150px;">标准体系</label><span>{{
                     sarStandardsInfoEO.standSystem || '-'
                   }}</span></p>
                 <!--          <p><label>文本说明：</label><span style="color: #999999">{{ sarStandardsInfoEO.synopsis || '-' }}</span></p>-->
@@ -87,11 +87,10 @@
               v-for="(child, childIndex) in item.half"
               v-if="child.isShowImp === '0' && child.attrField !== 'CBCD'"
           >
-            <!--            代替标准编号-->
+            <!--     modular-item half       代替标准编号-->
             <div
                 :key="child.id"
-                class="modular-item"
-                :class="!(childIndex === item.half.length - 1) || childIndex % 2 === 1 ? 'half' : ''"
+                :class="item.label !== '文本信息' ? 'modular-item half' : 'modular-item'"
                 v-if=" child.attrField === 'DTBJH' || child.attrField === 'YYBJ' || child.attrField === 'BYYBJ' || child.attrField === 'CBBH' || child.attrField === 'DXBZ' || child.attrField === 'XGLC' || child.attrField === 'BDTBZBH' || child.attrField === 'BFDTBZ' || child.attrField === 'BBFDTBZ' "
             >
               <label class="modular-content-p-name" :title="child.attrName">{{ child.attrName }}</label>
@@ -137,9 +136,8 @@
             <div
                 v-else
                 :key="child.id"
-                class="modular-item"
-                :class="!(childIndex === item.half.length - 1) || childIndex % 2 === 1 ? 'half' : ''"
-            >
+                :class="item.label !== '文本信息' ? 'modular-item half' : 'modular-item'"
+                            >
               <label class="modular-content-p-name" :title="child.attrName">{{ child.attrName }}</label>
               <span
                   v-if="child.attrField === 'FGWHR'"
@@ -226,7 +224,7 @@
           >
             <div
                 :key="child.id"
-                class="modular-item"
+                :class="item.label !== '文本信息' ? 'modular-item half' : 'modular-item'"
             >
               <label class="modular-content-p-name" :title="child.attrName">{{ child.attrName }}</label>
               <!--相关流程-->
@@ -324,7 +322,7 @@
           >
             <div
                 :key="child.id"
-                class="modular-item"
+                :class="item.label !== '文本信息' ? 'modular-item half' : 'modular-item'"
             >
               <label class="modular-content-p-name" :title="child.attrName">{{ child.attrName }}</label>
               <!--相关流程-->

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

@@ -1149,6 +1149,27 @@ export default {
     addSarAccess() {
       //判断是否是清单类型
       if (this.selectedAccInfoSearchList.length > 0) {
+
+        //为空转换
+        for (let i = 0; i < this.selectedAccInfoSearchList.length; i++) {
+          //适用车型为空
+          if (this.selectedAccInfoSearchList[i].typeApplicable === '[]'){
+            this.selectedAccInfoSearchList[i].typeApplicable = null
+          }
+          //能源类型为空
+          if (this.selectedAccInfoSearchList[i].nylx === '[]'){
+            this.selectedAccInfoSearchList[i].nylx = null
+          }
+          //责任部门为空
+          if (this.selectedAccInfoSearchList[i].zrbm === '[]'){
+            this.selectedAccInfoSearchList[i].zrbm = null
+          }
+          //试用产品线为空
+          if (this.selectedAccInfoSearchList[i].sycpx === '[]'){
+            this.selectedAccInfoSearchList[i].sycpx = null
+          }
+        }
+
         // 追加字段
         this.selectedAccInfoSearchList.map(item => {
           let addList;

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

@@ -1097,6 +1097,27 @@ export default {
     addSarAccess () {
       //判断是否是清单类型
       if (this.selectedAccInfoSearchList.length > 0) {
+
+        //为空转换
+        for (let i = 0; i < this.selectedAccInfoSearchList.length; i++) {
+          //适用车型为空
+          if (this.selectedAccInfoSearchList[i].typeApplicable === '[]'){
+            this.selectedAccInfoSearchList[i].typeApplicable = null
+          }
+          //能源类型为空
+          if (this.selectedAccInfoSearchList[i].nylx === '[]'){
+            this.selectedAccInfoSearchList[i].nylx = null
+          }
+          //责任部门为空
+          if (this.selectedAccInfoSearchList[i].zrbm === '[]'){
+            this.selectedAccInfoSearchList[i].zrbm = null
+          }
+          //试用产品线为空
+          if (this.selectedAccInfoSearchList[i].sycpx === '[]'){
+            this.selectedAccInfoSearchList[i].sycpx = null
+          }
+        }
+
         // 追加字段
         this.selectedAccInfoSearchList.map(item => {
           let addList;

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

@@ -1097,6 +1097,27 @@ export default {
     addSarAccess() {
       //判断是否是清单类型
       if (this.selectedAccInfoSearchList.length > 0) {
+
+        //为空转换
+        for (let i = 0; i < this.selectedAccInfoSearchList.length; i++) {
+          //适用车型为空
+          if (this.selectedAccInfoSearchList[i].typeApplicable === '[]'){
+            this.selectedAccInfoSearchList[i].typeApplicable = null
+          }
+          //能源类型为空
+          if (this.selectedAccInfoSearchList[i].nylx === '[]'){
+            this.selectedAccInfoSearchList[i].nylx = null
+          }
+          //责任部门为空
+          if (this.selectedAccInfoSearchList[i].zrbm === '[]'){
+            this.selectedAccInfoSearchList[i].zrbm = null
+          }
+          //试用产品线为空
+          if (this.selectedAccInfoSearchList[i].sycpx === '[]'){
+            this.selectedAccInfoSearchList[i].sycpx = null
+          }
+        }
+
         // 追加字段
         this.selectedAccInfoSearchList.map(item => {
           let addList;
@@ -1515,6 +1536,18 @@ export default {
     pageInfo() {
       StandardsInfoPage(this.sarAccessInfoSearch).then(res => {
         this.sarAccessInfoSearchList = res.data.list
+
+        //为空转换
+        for (let i = 0; i < this.sarAccessInfoSearchList.length; i++) {
+          //适用车型为空
+          if (this.sarAccessInfoSearchList[i].attrInfoMap.CLLX === '[]'){
+            this.sarAccessInfoSearchList[i].attrInfoMap.CLLX = null
+          }
+          //适用认证为空
+          if (this.sarAccessInfoSearchList[i].attrInfoMap.SYRZ === '[]'){
+            this.sarAccessInfoSearchList[i].attrInfoMap.SYRZ = null
+          }
+        }
         this.sarAccessInfoSearchList.forEach(item => {
           if (item.standYear === null) {
             item.standNumber = item.standSortShow + ' ' + item.standNumber
@@ -1995,6 +2028,27 @@ export default {
         _this: this
       }, res => {
         this.sarAccessInfoList = res.data.records
+
+        //为空转换
+        for (let i = 0; i < this.sarAccessInfoList.length; i++) {
+          //适用车型为空
+          if (this.sarAccessInfoList[i].typeApplicable === '[]'){
+            this.sarAccessInfoList[i].typeApplicable = null
+          }
+          //能源类型为空
+          if (this.sarAccessInfoList[i].nylx === '[]'){
+            this.sarAccessInfoList[i].nylx = null
+          }
+          //责任部门为空
+          if (this.sarAccessInfoList[i].zrbm === '[]'){
+            this.sarAccessInfoList[i].zrbm = null
+          }
+          //试用产品线为空
+          if (this.sarAccessInfoList[i].sycpx === '[]'){
+            this.sarAccessInfoList[i].sycpx = null
+          }
+        }
+
         this.sarAccessInfoList.forEach(item => {
           if (item.standYear === null) {
             item.standNumber = item.standSortShow + ' ' + item.standNumber

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -166,7 +166,10 @@
               label="标准号"
             >
               <template slot-scope="scope">
-                <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+<!--                <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>-->
+<!--                暂时使用-->
+                <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+
                 <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</a>
               </template>
             </el-table-column>