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

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -2757,8 +2757,12 @@ export default {
       window.open(routeUrl.href, '_blank')
     },
     // 编辑标准属性
-    selectStandardPro(item, state) {
+    selectStandardPro(row, state) {
-      this.id = item.id
+      this.id = row.id
+      this.$http.get('sarStandardsInfo/sar-standards-info/getStandInfoUpdateById', {id: row.id}, {
+                _this: this
+              }, res => {
+                const item = res.data || {}
                 this.collectId = item.collectId
                 this.addOrUPdateFlag = 2
                 this.modalshowtitle = '编辑国内标准'
@@ -2821,6 +2825,7 @@ export default {
                   this.loading = false
                 })
               })
+      })
     },
     // 修改过程中，将resId 修改成 attid
     updateResidToAttid(filetype) {
@@ -3753,15 +3758,10 @@ export default {
               res.data.list[i].cancelCollectBtn = false
             }
             res.data.list[i].isSubmit = false
-            if (res.data.list[i].attrInfoMap && res.data.list[i].attrInfoMap.XCXSSRQ) {
+            res.data.list[i].XCXSSRQ = res.data.list[i].xcxssrq
-              res.data.list[i].XCXSSRQ = res.data.list[i].attrInfoMap.XCXSSRQ
+            res.data.list[i].ZCCSSRQ = res.data.list[i].zccssrq
-            }
+            res.data.list[i].SSRQ = res.data.list[i].ssrq
-            if (res.data.list[i].attrInfoMap && res.data.list[i].attrInfoMap.ZCCSSRQ) {
+
-              res.data.list[i].ZCCSSRQ = res.data.list[i].attrInfoMap.ZCCSSRQ
-            }
-            if (res.data.list[i].attrInfoMap && res.data.list[i].attrInfoMap.SSRQ) {
-              res.data.list[i].SSRQ = res.data.list[i].attrInfoMap.SSRQ
-            }
           }
           this.stahndinfoList = res.data.list
           this.total = res.data.count

src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue

@@ -2669,7 +2669,11 @@ export default {
       window.open(routeUrl.href, '_blank')
     },
     // 编辑
-    selectStandardPro (item, state) {
+    selectStandardPro (row, state) {
+        this.$http.get('lawss/sarBussionessStand/getStandInfoUpdateById', {id: row.id}, {
+                _this: this
+            }, res => {
+                const item = res.data || {}
             this.drawerTitle = '修改企业标准'
             this.modalshowflag = true
             this.resolveFormFieldList(true)
@@ -2734,6 +2738,7 @@ export default {
                     this.sarBussionessStandEO.orgName = item.responsibleUnitShow
                 }
             })
+        })
     },
     // 部门树结构，通过id，查出对应的树节点
     getTreeNameByid (treeid) {

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -2576,11 +2576,14 @@ export default {
       window.open(routeUrl.href, '_blank')
     },
     // 编辑标准属性
-    selectStandardPro(item, state) {
+    selectStandardPro(row, state) {
       // this.sarStandardsInfoEO.country=JSON.parse(item.country );
 
       // console.log(this.sarStandardsInfoEO.country);
-
+      this.$http.get('sarStandardsInfo/sar-standards-info/getStandInfoUpdateById', {id: row.id}, {
+                _this: this
+              }, res => {
+        const item = res.data || {}
         this.addOrUPdateFlag = 2
         this.modalshowtitle = '编辑海外标准'
         this.modalshowflag = true
@@ -2645,6 +2648,8 @@ export default {
             this.loading = false
           })
         })
+      })
+
     },
     // 查询二级菜单
     selectChildMenu(row) {
@@ -3526,15 +3531,9 @@ export default {
               res.data.list[i].cancelCollectBtn = false
             }
             res.data.list[i].isSubmit = false
-            if (res.data.list[i].attrInfoMap && res.data.list[i].attrInfoMap.XCXSSRQ) {
+            res.data.list[i].XCXSSRQ = res.data.list[i].xcxssrq
-              res.data.list[i].XCXSSRQ = res.data.list[i].attrInfoMap.XCXSSRQ.split(',')[0]
+            res.data.list[i].ZCCSSRQ = res.data.list[i].zccssrq
-            }
+            res.data.list[i].SSRQ = res.data.list[i].ssrq
-            if (res.data.list[i].attrInfoMap && res.data.list[i].attrInfoMap.ZCCSSRQ) {
-              res.data.list[i].ZCCSSRQ = res.data.list[i].attrInfoMap.ZCCSSRQ.split(',')[0]
-            }
-            if (res.data.list[i].attrInfoMap && res.data.list[i].attrInfoMap.SSRQ) {
-              res.data.list[i].SSRQ = res.data.list[i].attrInfoMap.SSRQ
-            }
           }
           this.stahndinfoList = res.data.list
           this.total = res.data.count

src/sysConfig/index.js

@@ -12,7 +12,7 @@ const devInterfacePORT = '8033'
 // 配置 idm 认证
 const ssoLogin = 'http://sso.foton.com.cn/oauth2.0/authorize?client_id=app_slrs&response_type=code&redirect_uri='
 // 配置 前端服务
-const devWebUrl = 'https://slrs.foton.com.cn/#/'
+const devWebUrl = 'http://62.234.136.153:8038/#/'
 // webLoginType : idm (线上统一登录) 、 webLoginType: dev (测试环境登录)
 const webLoginType = 'dev'
 // 云端端口号