Merge remote-tracking branch 'origin/master'

src/views/modules/changeManagement/changeRequest.vue

@@ -595,7 +595,7 @@
     <!-- ECN种类模态框 -->
     <el-dialog title="ECN种类" :close-on-click-modal="false" v-drag :visible.sync="EcnTypeModalFlag" width="900px">
       <el-form ref="dataForm" label-position="right">
-        <el-row v-for="(item, index) in form" :key="index" style="margin-top: 10px">
+        <el-row v-for="(item, index) in form" :key="index" style="padding-top: 10px;" :style="{borderTop:index === 0?'':'1px solid #ccc'}">
           <el-col :span="8">
             <el-form-item :prop="'input.'+index+'.value'">
               <el-checkbox v-model="item.flag" @change="(val)=>ecnTypeHeaderChange(val,index)" :indeterminate="item.list.filter(a => a.flag === 'Y').length !== 0 && item.list.filter(a => a.flag === 'Y').length !== item.list.length" true-label="Y">{{item.value}}</el-checkbox>

src/views/modules/project/projectPart/searchProjectPart.vue

@@ -804,6 +804,8 @@
           let inData = {
             site: this.currentRow.site,
             testPartNo: this.currentRow.testPartNo,
+            userName: this.$store.state.user.name,
+            projectId:this.currentRow.projectId,
             page: 1,
             limit: 1000
           }

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

@@ -230,25 +230,26 @@
       },
       openNewPage(url){
         // window.open(this.$store.state.user.bmPicUrl +url);
+        let urlIn=url.replaceAll('\\','/')
         if(url==null||url===''){
           this.$alert("链接没有数据！", '错误', {
             confirmButtonText: '确定'
           })
           return false;
         }
-        window.open(url);
-        // let data={
-        //   url:url
-        // }
-        // checkUrl(data).then(({data}) => {
-        //   if (data && data.code === 0) {
-        //     window.open(data.url);
-        //   } else {
-        //     this.$alert(data.msg, '错误', {
-        //       confirmButtonText: '确定'
-        //     })
-        //   }
-        // });
+        // window.open(url);
+        let data={
+          url:urlIn
+        }
+        checkUrl(data).then(({data}) => {
+          if (data && data.code === 0) {
+            window.open(data.url);
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        });
 
       },
       // 获取流程的配置权限