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

src/pages/phone/phoneHome.vue

@@ -4,7 +4,7 @@
     <div class="search-top">
       <div class="top-title">
       </div>
-      <h3 class="home-title">标 准 法 规 管 理 系 统 S P R S</h3>
+      <h3 class="home-title">标 准 与 政 策 法 规 管 理 系 统 S P R S</h3>
     </div>
     <div class="search-head">
       <van-search

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

@@ -744,6 +744,7 @@
         </div>
       </el-upload>
     </el-dialog>
+    <loading :loading="importDataLoading">{{导入数据中}}</loading>
   </div>
 </template>
 <script>
@@ -946,7 +947,9 @@ export default {
       drawerPage: 1, // 数据搜索table页码
       drawerTotal: 0, // 数据搜索table总条数
       dataLoading: false, // 数据搜索 table 查询loading
+      importLoading: false, //导入loading
       exportTestItemNameFlag: false, // 导出模态框
+      importDataLoading: false,// 导入数据loading
       exportName: '', // 导出名称
       importExcelUrl: '/api/lawss/sarSarAccessInfo/importSarAccessInfo?accessId=', // 导入接口
       // importExcelUrls: '/api/sarLawsDetailedList/sar-laws-detailed-list/importData', // 导入接口
@@ -1048,6 +1051,8 @@ export default {
     importFileStand (res, file, fileList) {
       let files = {}
       if (res.ok) {
+        this.importModalshowflag = false
+        this.importDataLoading = true
         files.attId = res.data.attId
         files.fileName = res.data.name
         if (res.data.standNum != null && res.data.standNum !== '') {
@@ -1062,10 +1067,12 @@ export default {
         _formData.append('standNameSplit', files.standNameSplit)
         _formData.append('fileType', files.fileType)
         _formData.append('file', file.raw)
+        this.importLoading = true
         this.$http.postData('sarLawsDetailedList/sar-laws-detailed-list/importData', _formData,{
           _this: this
         }, res => {
           if(res.ok){
+            this.importDataLoading = false
             if(res.data.length){
               res.data.forEach(item => {
                 // 适用认证转换
@@ -1133,15 +1140,18 @@ export default {
               }else{
                 this.sarAccessInfoList = res.data
               }
+              this.importLoading = false
               if(repeatIndex > 0){
                this.$message.warning('请勿上传重复标准，重复标准未添加')
               }else{
                 this.$message.success('导入文件成功')
               }
             }else{
+              this.importLoading = false
               this.$message.warning('请勿上传为空的文件')
             }
           }else{
+            this.importDataLoading = false
             const arr = res.data.split('；')
             let newDatas = [],h = this.$createElement;
             for (const i in arr) {
@@ -1158,7 +1168,7 @@ export default {
             });
           }
         })
-        this.importModalshowflag = false
+
         this.$nextTick(() => {
           this.$refs.importFileAboutStand.clearFiles()
         })

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

@@ -1952,6 +1952,7 @@ export default {
       bussionessStandNodes: [],
       sarBussionessStandEO: {
         TXLBBUSS: '',
+        txlbId:'',
         VPPSBMBUSS: '',
         KCVPPSBMBUSS: '',
         KCVPPSCNBUSS: '',
@@ -2867,6 +2868,7 @@ export default {
         if (checkedData.length > 0) {
           this.sarBussionessStandEO.TXLBBUSS = checkedData.map(item => item.menuName).join(",")
           this.sarBussionessStandEO.menuId = checkedData.map(item => item.menuId).join(",")
+          this.sarBussionessStandEO.txlbId = checkedData.map(item => item.menuId).join(",")
           this.sarBussionessStandEO.treeType = checkedData.map(item => item.treeType).join(",")
           this.sarBussionessSearch.TXLBBUSS = checkedData.map(item => item.menuName).join(",")
         } else {
@@ -2876,6 +2878,7 @@ export default {
           }
           this.sarBussionessStandEO.TXLBBUSS = checkedData.menuName
           this.sarBussionessStandEO.menuId = checkedData.id
+          this.sarBussionessStandEO.txlbId = checkedData.id
           this.sarBussionessStandEO.treeType = checkedData.treeType
           this.sarBussionessSearch.TXLBBUSS = checkedData.menuName
         }