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

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

@@ -617,15 +617,15 @@ export default {
     },
     //流程提交
     handleSubmit() {
-      if(this.$route.query.prcNum === undefined){
+      if(this.$route.query.prcNum === undefined || this.$route.query.type == '2'){
         this.$refs['qbfsForm'].validate((valid) => {
           if (valid) {
             this.$refs['roleForm'].validate((valid) => {
               if (valid) {
-                if (this.$route.query.type === 2) {
+                if (this.$route.query.type == '2') {
                   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/completeTaskNew', {
                     taskIds: this.$route.query.taskIds,
                     userId : this.$store.getters.userInfo.userId,

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue

@@ -133,7 +133,7 @@
           <el-table-column
             prop="standName"
             label="中文名称"
-            width="180px"
+            min-width="180px"
           >
             <template slot-scope="scope">
               <a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
@@ -142,7 +142,7 @@
           <el-table-column
             prop="standEnName"
             align="center"
-            width="180px"
+            min-width="180px"
             label="英文名称">
             <template slot-scope="scope">
               <a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standEnName }}</a>
@@ -189,7 +189,7 @@
           <el-table-column
             show-overflow-tooltip
             prop="sycpx"
-            width="180px"
+            min-width="180px"
             align="center"
             label="适用产品线">
           </el-table-column>