Merge pull request 'master' (#605) from master into prod

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/605

src/fvcomponents/fvSearchForm/index.vue

@@ -23,6 +23,7 @@
                 v-bind="item.props || {}"
                 v-on="item.on || {}"
                 v-model="form[item.prop]"
+                @keyup.enter.native="getValues"
             >
             </component>
           </template>

src/views/workflow/process/DefaultNodeProps.js

@@ -9,6 +9,7 @@ export const APPROVAL_PROPS = {
     assignedUser: [] //审批人列表
   },
   matrixApproval: true,
+  dstiMatrix: false,
   skipSelf: true,
   timeLimit: { //边界事件
     timeout: { //超时提醒时间

src/views/workflow/process/config/ApprovalNodeConfig.vue

@@ -58,7 +58,8 @@
       </div>
       <div v-else-if="nodeProps.assignedType === 'FORM_USER'">
         <el-form-item label="选择表单联系人项" prop="text" class="approve-end">
-          <el-select style="width: 80%;" size="small" v-model="nodeProps.formUser" placeholder="请选择包含联系人的表单项"
+          <el-select style="width: 80%;" size="small" v-model="nodeProps.formUser"
+                     placeholder="请选择包含联系人的表单项"
                      filterable clearable>
             <el-option v-for="(op,i) in forms" :label="op.title" :value="op.id" :key="i"></el-option>
           </el-select>
@@ -104,6 +105,10 @@
     <el-form-item label="是否使用矩阵审批" prop="text">
       <el-switch inactive-text="不用" active-text="使用" v-model="nodeProps.matrixApproval"></el-switch>
     </el-form-item>
+    <el-form-item label="科创部矩阵" prop="text">
+      <el-switch inactive-text="审批" active-text="跳过" v-if="nodeProps.assignedType === 'SELF'"
+                 v-model="nodeProps.dstiMatrix"></el-switch>
+    </el-form-item>
     <el-form-item v-if="nodeProps.matrixApproval && nodeProps.assignedType === 'SELF'" label="是否跳过自己" prop="text">
       <!--      {{nodeProps.skipSelf}}-->
       <el-switch inactive-text="不跳过" active-text="跳过" v-model="nodeProps.skipSelf"></el-switch>

src/views/workflow/process/nodes/ApprovalNode.vue

@@ -67,6 +67,8 @@ const content = computed(() => {
       }
     case "SELF":
       return '发起人自己'
+    case "DSTI_MATRIX":
+      return '科创部用户跳过'
     case "SELF_SELECT":
       return config.selfSelect.multiple ? '发起人自选多人' : '发起人自选一人'
     case "LEADER_TOP":