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

src/pages/processCenter/pages/creatProcess/bzpg/step3.vue

@@ -582,9 +582,11 @@ export default {
               projectNumbers += items.projectNumber;
               projectNumbers += ",";
             });
+            //去掉字符串的最后一个逗号
+            let dex = projectNumbers.lastIndexOf(",")
             this.dataList.push({
               projectName: projectNames,
-              projectNumber: projectNumbers,
+              projectNumber: projectNumbers.substring(0, dex),
               projectIds: projectIds,
               managementHostName: this.selectProjectList[0].managementHostName,
               developmentHostName: this.selectProjectList[0].developmentHostName,

src/pages/processCenter/pages/creatProcess/xmpg/step2.vue

@@ -244,6 +244,7 @@ export default {
     },
     //转办事件
     handleTransfer() {
+      this.nodeList = []
       this.drawerModal = true;
       this.drawerTitle = "转办处理人";
       this.selectPeople = row;

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

@@ -947,7 +947,8 @@ export default {
       exportTestItemNameFlag: false, // 导出模态框
       exportName: '', // 导出名称
       importExcelUrl: '/api/lawss/sarSarAccessInfo/importSarAccessInfo?accessId=', // 导入接口
-      importExcelUrls: '/api/sarLawsDetailedList/sar-laws-detailed-list/importData', // 导入接口
+      // importExcelUrls: '/api/sarLawsDetailedList/sar-laws-detailed-list/importData', // 导入接口
+      importExcelUrls: 'api/att/attFile/upload', // 导入EXCEL文档
       // 新增标准法规 验证
       addEntryFormRules: {
         code: [
@@ -1059,13 +1060,12 @@ export default {
         _formData.append('standNameSplit', files.standNameSplit)
         _formData.append('fileType', files.fileType)
         _formData.append('file', file.raw)
-        this.$http.postData('importWkExcel/importData', _formData,{
+        this.$http.postData('sarLawsDetailedList/sar-laws-detailed-list/importData', _formData,{
           _this: this
         }, res => {
-          console.log(res);
           if(res.ok){
             if(res.data.length){
-              this.qblx_pageData.qblxData = res.data
+              this.sarAccessInfoList = res.data
               this.$message.success('文件上传成功')
             }else{
               this.$message.warning('请勿上传为空的文件')