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

public/static/ueditor/ADT/template/template.css

@@ -10,8 +10,8 @@
 .bottom{height:320px;width:100%;margin: 0 auto;}
 .transparent{ background: url("images/bg.gif") repeat;}
 .bottom table tr td{border:1px dashed #ccc;}
-#colorPicker{width: 17px;height: 17px;border: 1px solid #CCC;display: inline-block;3px;box-shadow: 2px 2px 5px #D3D6DA;}
-.border_style1{padding:2px;border: 1px solid #ccc;5px;box-shadow:2px 2px 5px #d3d6da;}
+#colorPicker{width: 17px;height: 17px;border: 1px solid #CCC;display: inline-block;box-shadow: 2px 2px 5px #D3D6DA;}
+.border_style1{padding:2px;border: 1px solid #ccc;box-shadow:2px 2px 5px #d3d6da;}
 p{margin: 5px 0}
 table{clear:both;margin-bottom:10px;border-collapse:collapse;word-break:break-all;}
 li{clear:both}

src/components/roleTree/index.vue

@@ -11,6 +11,7 @@
                     ref="attributeEO"
                     class="label-input-form"
                     :inline="true"
+                    @submit.native.prevent
             >
                 <el-form-item class="form-item-disabled" style="margin: 10px;">
                     <el-input

src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue

@@ -82,7 +82,7 @@
                   align="center"
           >
             <template slot-scope="scope">
-              {{ scope.row.prcName || getPrcName(scope.row.prcType) }}
+              <a @click="dealWith(scope.row)" class="table-jump">{{ scope.row.prcName|| getPrcName(scope.row.prcType)  }}</a>
             </template>
           </el-table-column>
 <!--          <el-table-column-->