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

src/main.js

@@ -71,6 +71,10 @@ router.beforeEach(function (to, from, next) {
     return
   }
 
+  if(webLoginType === 'idm' && toName === 'Login'){
+    window.location.href = ssoLoginUrlDev
+  }
+
   let fromName = from.name
   let token = store.state.token
   let path = to.path;

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

@@ -970,7 +970,7 @@
     .bzjdStep3 {
       .itemsTextBox {
         min-height: 300px;
-        max-height: 500px;
+        max-height: 835px;
         overflow: auto;
         line-height: 20px;
         /deep/ td {

src/pages/processCenter/pages/creatProcess/bzpg/step8-1.vue

@@ -316,7 +316,7 @@
           <el-table-column
             prop="createTime"
             label="创建时间"
-            align="center"
+            align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>

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

@@ -898,7 +898,7 @@ export default {
     form: {
         handler: function (val) {
             if(val){
-                this.$emit('formCancel', this.form, this.FBGBUSSFileList,this.LSBBBUSSFileList,this.BZSMBUSSFileList,this.QTWJBUSSFileList,this.GLWJBUSSFileList,this.FSDList,this.LXDList);
+                this.$emit('formCancel', this.form, this.FBGBUSSFileList,this.LSBBBUSSFileList,this.BZSMBUSSFileList,this.QTWJBUSSFileList,this.GLWJBUSSFileList,this.LXDList,this.FSDList);
             }
         },
         deep: true //对象的深度验证

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

@@ -178,6 +178,8 @@ export default {
             callback(new Error('请先在线编辑,再提交流程！'))
           }
         }
+      }else {
+          callback(new Error('请先在线编辑,再提交流程！'))
       }
     };
     return {
@@ -307,7 +309,7 @@ export default {
       handler (val) {
         if (val !== '' && val !== null && typeof (val) !== 'undefined') {
             if(val === '1'){
-              if (this.bpnId === undefined) {
+              if (this.bpnId === undefined || this.bpnId === "") {
                 this.getFsFile()
               }
             }
@@ -385,7 +387,6 @@ export default {
       this.choiceZRRList(type, title, id)
     },
     formCancel (form, list1,list2,list3,list4,list5,list6,list7) {
-        console.log(form)
           this.qbfsForm = form
           this.FBGBUSSFileList = list1
           this.LSBBBUSSFileList = list2

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

@@ -178,6 +178,8 @@ export default {
                       callback(new Error('请先在线编辑,再提交流程！'))
                   }
               }
+          }else {
+            callback(new Error('请先在线编辑,再提交流程！'))
           }
       };
     const validateFsOnlineFile = async (rule, value, callback) => {
@@ -192,6 +194,8 @@ export default {
             callback(new Error('请先在线编辑,再提交流程！'))
           }
         }
+      }else {
+        callback(new Error('请先在线编辑,再提交流程！'))
       }
     };
     return {
@@ -316,7 +320,7 @@ export default {
               this.qbfsForm.QCRBUSS=nameList;
               this.formKey++
           }
-          if(data !== undefined && data && data.length > 0){
+          if(data && data.length > 0){
               const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
               const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
               this.qbfsForm.QCDWID = institutionIdList

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

@@ -647,7 +647,7 @@ export default {
                 } else {
                   this.isSubmit = true
                   this.standardSearch.commentText = this.commentText
-                  var json = Object.assign(this.standardSearch, this.roleForm)
+                  var json = Object.assign(this.roleForm, this.standardSearch)
                   this.$http.post('lawss/activiti/startProcessRollBack', {
                     createUser: this.$store.getters.userInfo.userId,
                     createUserName: this.$store.getters.userInfo.userName,