Merge remote-tracking branch 'origin/master'

src/api/sampleManagement/technicalSpecificationList.js

@@ -99,3 +99,4 @@ export const searchBMRemarkPage= data => createAPI(`/technicalSpecification/sear
 export const updateBMRemarkPage= data => createAPI(`/technicalSpecification/updateBMRemarkPage`,'post',data)
 export const updateBMProcess= data => createAPI(`/technicalSpecification/updateBMProcess`,'post',data)
 export const searchPartLastQuotationNo= data => createAPI(`/technicalSpecification/searchPartLastQuotationNo`,'post',data)
+export const checkUrl= data => createAPI(`/technicalSpecification/checkUrl`,'post',data)

src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue

@@ -94,6 +94,7 @@
     saveBMPropertiesValue,
     refreshBMPageModal,
     searchBMPropertiesHeaderForBM,
+    checkUrl,
   } from "@/api/sampleManagement/technicalSpecificationList.js"
 
   export default {
@@ -194,7 +195,26 @@
         });
       },
       openNewPage(url){
-        window.open(this.$store.state.user.bmPicUrl +url);
+        // window.open(this.$store.state.user.bmPicUrl +url);
+        if(url==null||url===''){
+          this.$alert("链接没有数据！", '错误', {
+            confirmButtonText: '确定'
+          })
+          return false;
+        }
+
+        let data={
+          url:url
+        }
+        checkUrl(data).then(({data}) => {
+          if (data && data.code === 0) {
+            window.open(data.url);
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        });
 
       },
     },