Merge branch 'develop' into FOTON

src/pages/details/otherBussStandardDetails/index.vue

@@ -363,14 +363,14 @@
                                 title="下载"
                                 @click="downloadFile(file.id)"
                                 class="icon-download"
-                                v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '9882f477aad895ec56a7464f3e9c0b11'"
+                                v-btn-permission="QFTP ? '9d42af4ee6d03b028eaa0c417532d79e' : '9882f477aad895ec56a7464f3e9c0b11'"
                             />
                             <i
                                 title="下载带水印"
                                 v-show="file.fileSuffix === 'pdf' || file.fileSuffix === 'PDF'"
                                 @click="downloadFileByWater(file.id, file.fileSuffix)"
                                 class="icon-download2"
-                                v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '9bab2662fbd9d0507b39be813371a597'"
+                                v-btn-permission="QFTP ? '797062ee00c826466eb9c40cac2ecaa0' : '9bab2662fbd9d0507b39be813371a597'"
                             />
                             <!--                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
                             </span>
@@ -384,13 +384,13 @@
                                 title="下载"
                                 @click="downloadFile(file.id)"
                                 class="icon-download"
-                                v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
+                                v-btn-permission="QFTP ? '9d42af4ee6d03b028eaa0c417532d79e' : '9882f477aad895ec56a7464f3e9c0b11'"
                               />
                               <i
                                 title="下载带水印"
                                 @click="downloadFileByWater(file.id, file.fileSuffix)"
                                 class="icon-download2"
-                                v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
+                                v-btn-permission="QFTP ? '797062ee00c826466eb9c40cac2ecaa0' : '9bab2662fbd9d0507b39be813371a597'"
                               />
                             </span>
                         <!--                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
@@ -1316,6 +1316,7 @@ export default {
   },
   data () {
     return {
+      QFTP: false,
       textOptions: [],
       commentAverageScoreTag: '1',
       qualityFirstHistoryPeopleId: '',//质量评价最新评价的人的id
@@ -2260,12 +2261,14 @@ export default {
     },
     selectStandMessage () {
       let url = this.$route.params.pageType === 'SUB' ? 'lawss/sarSubsionessStand/getStandInfoById' : 'lawss/sarBussionessStand/getStandInfoById'
-
       return new Promise((resolve, reject) => {
         this.$http.get(url, {id: this.sarStandardsInfoEO.id}, {
           _this: this
         }, res => {
           this.sarStandardsInfoEO = res.data || {}
+          if (this.sarStandardsInfoEO.standCode.indexOf('Q/FT P') !== -1) {
+            this.QFTP = true
+          }
           // this.textOptions.forEach(item => {
           //   if(this.sarStandardsInfoEO.textStatusBuss === item.value){
           //     this.sarStandardsInfoEO.textStatusBuss = item.label
@@ -3156,7 +3159,6 @@ export default {
           }
         })
       })
-
       displayLocation.forEach(location => {
         // 动态属性字段-FBGBJBD 单独添加至基础信息
         const list = displayLocation.filter ( item => item.label === '过程稿件');
@@ -3170,7 +3172,7 @@ export default {
         }
 
         for (let i = 0; i < displayLocation.length; i++) {
-          //  sss
+          //  sss11
           if(displayLocation[i].label !== '基础信息' && displayLocation[i].label !== '过程稿件'){
             const childList = displayLocation[i].child.filter ( item => item.value !== null && item.value !== '');
             if(childList.length === 0){

src/pages/processCenter/pages/creatProcess/qbfs/common/formList.vue

@@ -678,6 +678,17 @@ export default {
     ...mapGetters(['userInfo'])
   },
   methods: {
+      assemble(ids,names){
+          let list= new Array();
+          if(ids && ids !== '' && names && names !== ''){
+              let idArray=ids.split(',');
+              let nameArray=names.split(',');
+              for(let i=0; i<idArray.length; i++){
+                  list.push({id:idArray[i],name:nameArray[i]});
+              }
+          }
+          return list;
+      },
       detail(row){
           this.showDrawerTitle = '查看'
           this.showDrawer = true

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

@@ -453,8 +453,6 @@ export default {
         this.LSBBBUSSFileList=this.assemble(this.qbfsForm.LSBBBUSS,this.qbfsForm.LSBBBUSSName);
         this.QTWJBUSSFileList=this.assemble(this.qbfsForm.QTWJBUSS,this.qbfsForm.QTWJBUSSName);
         this.GLWJBUSSFileList=this.assemble(this.qbfsForm.GLWJBUSS,this.qbfsForm.GLWJBUSSName);
-        this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName);
-        this.FSDList=this.assemble(this.qbfsForm.FSD,this.qbfsForm.FSDName);
         this.standardDrawer = false
         this.verifySarStandard = true
         this.formKey++