Merge branch 'develop' into 'FOTON'

Develop

See merge request LAWS/laws-system-front-FOTON!321

src/pages/processCenter/pages/creatProcess/bzrk/step1.vue

@@ -2072,7 +2072,7 @@ export default {
         this.defaultCheckedKeys3 = [this.form.dybxh]
         this.treeCheckedKeys = this.form.treeListId.split(',')
         this.form.standType = this.form.standInData === "0" ? 'INLAND' : 'FOREIGN'
-        this.form.standYear = this.form.standYear ? parseInt(this.form.standYear) : ''
+        this.form.standYear = this.form.standYear ? this.form.standYear : ''
         if (this.form.country !== undefined && this.form.country !== null && this.form.country !== '') {
           this.form.country = this.form.country.split(",");
         }
@@ -2211,7 +2211,7 @@ export default {
                 this.key2++
                 this.key3++
                 this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
-                this.form.standYear = bringData.standYear ? parseInt(bringData.standYear) : ''
+                this.form.standYear = bringData.standYear ? bringData.standYear : ''
                 this.form.prcNum = this.prcNum
                 this.form.prcName = this.prcName
                 this.form['id'] = bringData.id

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

@@ -1091,7 +1091,7 @@ export default {
         this.defaultCheckedKeys2 = [this.form.kccvppsbm]
         this.defaultCheckedKeys3 = [this.form.dybxh]
         this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
-        this.form.standYear = this.form.standYear ? parseInt(this.form.standYear) : ''
+        this.form.standYear = this.form.standYear ? this.form.standYear : ''
         this.form.prcNum = this.prcNum
         this.form.prcName = this.prcName
         if( this.form.country !== undefined &&   this.form.country !== null &&   this.form.country !== ''){

src/pages/processCenter/pages/creatProcess/bzrk/step4.vue

@@ -2540,11 +2540,14 @@ export default {
         }).then(res => {
           if (res) {
             const processForm = JSON.parse(res.mesg)
+            console.log(processForm);
+            console.log(this.form);
             // this.commentText = processForm.commentText
             if (processForm.form === undefined) {
               this.getFormFieldList(processForm)
             } else {
               //表单文件处理
+              console.log(2);
               this.getFormFieldList(processForm.form)
             }
           }
@@ -2565,7 +2568,7 @@ export default {
         this.defaultCheckedKeys3 = [this.form.dybxh];
         this.treeCheckedKeys = this.form.treeListId.split(',')
         this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
-        this.form.standYear = this.form.standYear ? parseInt(this.form.standYear) : ''
+        this.form.standYear = this.form.standYear ? this.form.standYear : ''
         this.form.prcNum = this.prcNum
         this.form.prcName = this.prcName
         this.form['id'] = item.id

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

@@ -640,7 +640,11 @@ export default {
     },
     //查询项目下的标准
     getStandData() {
-      this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: this.projectId }, {
+      this.$http.get("sarStandProjectLibrary/queryStandInfo", {
+        id: this.projectId,
+        current: this.pageNo,
+        PageSize: this.pageSizeNo
+      }, {
         _this: this
       }, res => {
         res.data.records.forEach(item => {
@@ -649,6 +653,7 @@ export default {
           }
         })
         this.standData = res.data.records;
+        this.totalNo = res.data.total
         let ids = [];
         this.standData.forEach(item => {
           ids.push(item.standId);

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

@@ -769,6 +769,10 @@ export default {
           if(index > -1){
             dataListChildren.splice(index, 1)
           }
+          dataListChildren.forEach(item => {
+            item.workPeople = this.$store.getters.userInfo.userName
+            item.workPeopleId = this.$store.getters.userInfo.userId
+          })
           this.dataList = dataListChildren;
           this.total = this.dataList.length;
         } else {

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

@@ -465,13 +465,13 @@ export default {
           dataListChildren = dataListChildren.concat(item);
         });
         dataListChildren = this.dataList.concat(dataListChildren);
-        let index = dataListChildren.findIndex(item => {
+        let newDataListChildren = []
-          return item.people
+        dataListChildren.forEach(item => {
+          if(!item.people){
+            newDataListChildren.push(item)
+          }
         })
-        if(index > -1){
+        this.dataList = newDataListChildren;
-          dataListChildren.splice(index, 1)
-        }
-        this.dataList = dataListChildren;
         this.total = this.dataList.length;
       });
     },

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -3677,6 +3677,8 @@ export default {
       this.selectSarMenu = treeNode
       this.standCommonlySearch.menuId = treeNode.id
       this.sarStandardsSearch.menuId = treeNode.id // 将当前二级菜单的id传回后台做标准的条件查询
+      this.standCommonlySearch.treeType = treeNode.treeType
+      this.sarStandardsSearch.treeType = treeNode.treeType
       this.sarStandardsSearch.page = 1
       this.standCommonlySearch.page = 1
       //搜索后点击属性菜单依然显示搜索条件的数据
@@ -3797,7 +3799,7 @@ export default {
     async getTreeAsync(){
 
       let tsResource = await this.selectMenu1()
-      let sarMenuStandard = await this.selectMenu2()
+      // let sarMenuStandard = await this.selectMenu2()
 
       let list1 = []
       let list2 = []
@@ -3805,13 +3807,14 @@ export default {
         list1 = tsResource.data
       }
 
-      if(sarMenuStandard && sarMenuStandard.ok && sarMenuStandard.data){
+      // 国内技术系列 逻辑 注释掉
-        list2 = sarMenuStandard.data
+      // if(sarMenuStandard && sarMenuStandard.ok && sarMenuStandard.data){
-      }
+      //   list2 = sarMenuStandard.data
+      // }
 
-      if(list2.length > 0){
+      // if(list2.length > 0){
-        list1 = list1.concat(list2)
+      //   list1 = list1.concat(list2)
-      }
+      // }
 
       if(list1.length > 0){
         this.treeList = this.sortByKey(list1,"displaySeq")
@@ -4480,8 +4483,10 @@ export default {
       const formData = {...data}
       if (!item) {
         formData.menuId = this.sarStandardsSearch.menuId
+        formData.treeType = this.sarStandardsSearch.treeType
       } else {
         formData.menuId = this.selectSarMenu.id
+        formData.treeType = this.selectSarMenu.treeType
       }
 
       // 排序
@@ -5114,7 +5119,14 @@ export default {
               })
             } else {
               this.configStandFlag = true
-              this.sarConfigStandSearch.menuId = 'nomenu'
+              if(this.selectSarMenu.treeType === 'sarMs'){
+                this.sarConfigStandSearch.menuId = 'nomenu'
+                this.sarConfigStandSearch.sarMsMenuId = menuId
+                this.sarConfigStandSearch.sarMsType = 'filterSarMsMenu'
+              }else {
+                this.sarConfigStandSearch.menuId = 'nomenu'
+                this.sarConfigStandSearch.sarMsType = ''
+              }
               this.sarConfigStandSearch.page = 1
               this.sarConfigStandSearch.country = ''
               this.sarConfigStandSearch.standNumber = ''