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

src/pages/config/pages/linkManage/index.vue

@@ -76,6 +76,7 @@
         <loading :loading="Loading">加载中...</loading>
         <!--    新增链接弹窗-->
         <el-dialog
+                :close-on-click-modal="false"
                 :title="dialogTitle"
                 :visible.sync="modalshowflag"
                 :wrapperClosable="false"
@@ -91,10 +92,14 @@
                 <el-form-item label="链接名称" prop="name" label-width="150px" class="add-form-item">
                     <el-input v-model="sarStandardsInfoEO.name"
                               placeholder="请输入链接名称"
+                              maxlength="30"
+                              show-word-limit
                               clearable></el-input>
                 </el-form-item>
                 <el-form-item label="链接" prop="url" label-width="150px" class="add-form-item">
                     <el-input v-model="sarStandardsInfoEO.url"
+                              maxlength="100"
+                              show-word-limit
                               placeholder="请输入链接">
                     </el-input>
                 </el-form-item>

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

@@ -919,10 +919,9 @@
                 }
             },
             getRule(){
-
-                if (this.formTongGuo.approvalOpinion === '0') {
-                    this.rules.commentText[0].required = false;
-                    this.$refs.formTongGuo.clearValidate('commentText')
+              if (this.formTongGuo.approvalOpinion === 0) {
+                this.rules.commentText[0].required = false;
+                   this.$refs.formTongGuo.clearValidate('commentText')
                 }else {
                     this.rules.commentText[0].required = true;
                 }
@@ -1055,11 +1054,12 @@
                 this.handleSubmit()
             },
             handle2(){
-                this.formTongGuo.approvalOpinion = 0
-                this.handleSubmit()
+              this.formTongGuo.approvalOpinion = 0
+              this.handleSubmit()
             },
             handleSubmit() {
-                const val= this.form.country;
+              this.getRule()
+              const val= this.form.country;
                 if (val !== '' && val !== null && typeof (val) !== 'undefined') {
                     if (val instanceof Array) {
                         this.form.country = val.join(",");

src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue

@@ -269,7 +269,7 @@ export default {
       } else {
         id = item.oriAttId
       }
-      window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
+      window.open('/static/pdf/web/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
     },
     getHistoryData () {
       this.$http.get('lawss/activiti/get_list_by_instance', {

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

@@ -249,7 +249,7 @@ export default {
       } else {
         id = item.oriAttId
       }
-      window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
+      window.open('/static/pdf/web/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
     },
     getHistoryData() {
       this.$http.get("lawss/activiti/get_list_by_instance", {

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

@@ -328,7 +328,7 @@ export default {
       } else {
         id = item.oriAttId
       }
-      window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
+      window.open('/static/pdf/web/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
     },
     getHistoryData() {
       this.$http.get('lawss/activiti/get_list_by_instance', {

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

@@ -307,7 +307,7 @@ export default {
       } else {
         id = item.oriAttId
       }
-      window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
+      window.open('/static/pdf/web/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
     },
     getHistoryData() {
       this.$http.get('lawss/activiti/get_list_by_instance', {

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

@@ -347,7 +347,7 @@ export default {
       } else {
         id = item.oriAttId
       }
-      window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
+      window.open('/static/pdf/web/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
     },
     getHistoryData() {
       this.$http.get("lawss/activiti/get_list_by_instance", {

src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue

@@ -331,7 +331,7 @@ export default {
       } else {
         id = item.oriAttId
       }
-      window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
+      window.open('/static/pdf/web/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
     },
     getHistoryData() {
       this.$http.get("lawss/activiti/get_list_by_instance", {

src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue

@@ -328,7 +328,7 @@ export default {
       } else {
         id = item.oriAttId
       }
-      window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
+      window.open('/static/pdf/web/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
     },
     getHistoryData() {
       this.$http.get('lawss/activiti/get_list_by_instance', {

src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue

@@ -328,7 +328,7 @@ export default {
       } else {
         id = item.oriAttId
       }
-      window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
+      window.open('/static/pdf/web/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
     },
     getHistoryData() {
       this.$http.get('lawss/activiti/get_list_by_instance', {

src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue

@@ -328,7 +328,7 @@ export default {
       } else {
         id = item.oriAttId
       }
-      window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
+      window.open('/static/pdf/web/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
     },
     getHistoryData() {
       this.$http.get("lawss/activiti/get_list_by_instance", {

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

@@ -2059,7 +2059,11 @@ export default {
               userId: this.$store.getters.userInfo.userId
           }, {}, res => {
               if (res.ok) {
+                for (let i in res.data) {
+                  let arr = res.data[i].children
+                  arr.push(arr.shift())
                   this.treeList = res.data
+                }
               }
           })
       },