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

src/pages/details/otherStandardDetails/index.vue

@@ -3177,7 +3177,6 @@ export default {
       displayLocation.forEach(location => {
         // 动态属性字段-FBGBJBD 单独添加至基础信息
         const list = displayLocation.filter(item => item.label === '过程稿件');
-        console.log()
         if (location.label === '基础信息' && list && list.length > 0) {
           if (!list[0].child) {
             location['child1'] = []
@@ -3207,7 +3206,6 @@ export default {
             }
           }
         }
-
         const child = location.child || []
         const one = []
         const half = []
@@ -3232,7 +3230,6 @@ export default {
         location.showAll = false
       })
       console.log(displayLocation)
-
       this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list', {
         id: this.$route.params.id
       }, {
@@ -3240,6 +3237,29 @@ export default {
       }, res => {
         displayLocation.map(item => {
           if (item.value === '2URVBGR2Y4UG77KZ5YPL') {
+            item.child.forEach(items =>{
+              let accessCountry = JSON.parse(sessionStorage.getItem("accessCountry"));
+              if (accessCountry.country === undefined) {
+                accessCountry.country = '文本'
+              }
+              if(items.attrField === 'SSRQ') {
+                items.attrName = '实施日期' + '(' + accessCountry.country + ')' + ':'
+                if (accessCountry.ssrq !== undefined) {
+                  item.value = accessCountry.ssrq
+                }
+              } else if (items.attrField === 'ZCCSSRQ') {
+                items.attrName = '在产车实施日期' + '(' + accessCountry.country + ')' + ':'
+                if (accessCountry.zccssrqgj !== undefined) {
+                  item.value = accessCountry.zccssrqgj
+                }
+              } else if(items.attrField === 'XCXSSRQ') {
+                items.attrName = '新车型实施日期' + '(' + accessCountry.country + ')' + ':'
+                if (accessCountry.xcxssrqgj !== undefined) {
+                  item.value = accessCountry.xcxssrqgj
+                }
+
+              }
+            })
             for (let key in res.data) {
               item.one.push({
                 attrName: key,

src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue

@@ -203,7 +203,8 @@
           >
             <el-date-picker
                 v-model="attributeEO.implTime"
-                type="date"
+                type="dates"
+                prefix-icon="none"
                 placeholder="请选择实施时间">
             </el-date-picker>
           </el-form-item>

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

@@ -418,7 +418,8 @@ export default {
       dialogColor: false,
       dialogType: "",
       color: "",
-      isShow: false
+      isShow: false,
+      countryAreaShow: ''
     };
   },
   methods: {
@@ -654,11 +655,18 @@ export default {
     },
     // 点击查看
     handlePreview(data) {
+      let item = {
+        country: this.countryAreaShow,
+        ssrq: data.ssrq,
+        xcxssrqgj: data.xcxssrqgj,
+        zccssrqgj: data.zccssrqgj
+      }
+      sessionStorage.setItem("accessCountry", JSON.stringify(item));
       let routeUrl = this.$router.resolve({
         name: "OtherStandardDetails",
         params: {
           id: data.id,
-          pageType: data.standType
+          pageType: data.standType,
         }
       });
       window.open(routeUrl.href, "_blank");
@@ -773,6 +781,7 @@ export default {
       let accessRow = JSON.parse(sessionStorage.getItem("accessRow"));
       this.pageId = accessRow.id;
       this.sarAccessEO = accessRow;
+      this.countryAreaShow = accessRow.countryAreaShow
       this.selectInfobyAccid();
       this.getOrgTreeSource();
       this.getFileInfo();