流程步骤关联角色

src/views/workflow/processActivity-detail.vue

@@ -16,7 +16,7 @@
   >
   <h4>基本配置</h4>
     <div class="user-panel" v-loading="loading">
-      <el-form ref="form" :model="formModel" :rules="ruleValidate"  :label-width="'100px'">
+      <el-form ref="form" :model="formModel" :rules="ruleValidate"  :label-width="'130px'">
         <el-row>
             <el-col :span="12">
                 <el-form-item label="步骤名称" prop="name" style="width:350px">
@@ -31,11 +31,15 @@
         </el-row>
         <el-row>
             <el-col :span="12">
-                <el-form-item label="会签类型" prop="operation" style="width:350px">
-                    <el-radio-group v-model="formModel.operation">
-                        <el-radio label="or">或签</el-radio>
-                        <el-radio label="and">会签</el-radio>
-                    </el-radio-group>
+                <el-form-item label="流程步骤角色" style="width:350px" prop="personRoleId" >
+                    <el-select v-model="formModel.personRoleId" filterable placeholder="请选择角色" style="width:220px">
+                        <el-option
+                        v-for="item in roleIdList"
+                        :key="item.id"
+                        :label="item.personRoleName"
+                        :value="item.id">
+                        </el-option>
+                    </el-select>
                 </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -51,6 +55,16 @@
                 </el-form-item>
             </el-col>
         </el-row>
+        <el-row>
+            <el-col :span="12">
+                <el-form-item label="会签类型" prop="operation" style="width:350px">
+                    <el-radio-group v-model="formModel.operation">
+                        <el-radio label="or">或签</el-radio>
+                        <el-radio label="and">会签</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+            </el-col>
+        </el-row>
         <h4>审批设置</h4>
         <el-form-item label="审批者类型" prop="source" >
             <el-radio-group v-model="formModel.source">
@@ -129,6 +143,7 @@ export default {
           approvedPersonIdArray:[],
           companyId:"",
           roleId:"",
+          personRoleId:"",
       },
       ruleValidate: {
         name: [
@@ -137,6 +152,9 @@ export default {
         operation: [
           { required: true, message: "会签类型不能为空", trigger: "blur" }
         ],
+        personRoleId:[
+          { required: true, message: "流程步骤角色不能为空", trigger: "blur" }
+        ],
         source: [
           { required: true, message: "审批者类型不能为空", trigger: "blur" }
         ],

src/views/workflow/processActivity-list.vue

@@ -10,6 +10,35 @@
       </el-breadcrumb-item>
     </el-breadcrumb>
     <el-divider></el-divider>
+    <el-form ref="queryForm" :model="queryModel" inline class="demo-form-inline">
+      <el-form-item label="流程步骤角色" prop="personRoleId">
+        <el-select v-model="queryModel.personRoleId" filterable placeholder="请选择角色" style="width:220px" size="mini">
+            <el-option
+            v-for="item in roleIdList"
+            :key="item.id"
+            :label="item.personRoleName"
+            :value="item.id"
+            >
+            </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          size="mini"
+          icon="ios-search"
+          @click="changePage(1)"
+          :loading="loading"
+        >查询</el-button>&nbsp;
+        <el-button
+          type="info"
+          size="mini"
+          style="margin-left: 8px"
+          @click="handleReset('queryForm')"
+        >重置</el-button>&nbsp;
+      </el-form-item>
+    </el-form>
+    <el-divider></el-divider>
     <el-row class="button-group">
       <el-button type="primary" size="small" plain icon="el-icon-circle-plus" @click="handleAdd">新增</el-button>
     </el-row>
@@ -52,26 +81,27 @@
           </span>
         </template>
       </el-table-column>
+      <el-table-column prop="personRoleName" label="流程步骤角色" width="200"></el-table-column>
       <el-table-column prop="activityOrder" label="步骤序号" width="200"></el-table-column>
       <el-table-column label="操作" width="250" >
         <template slot-scope="{row}">
           <el-row>
-            <el-col :span="6">
+            <el-col :span="12">
               <el-link type="primary" @click="handleEdit(row)">编辑</el-link>
             </el-col>
-            <el-col :span="6">
+            <el-col :span="12">
               <el-link type="danger" @click="handleDelete(row)">删除</el-link>
             </el-col>
-            <el-col :span="6">
+            <!-- <el-col :span="6">
               <el-link v-if="row.activityOrder!=1" type="primary" @click="handleUp(row)">
                 上移
               </el-link>
               <span v-else>上移</span>
-            </el-col>
-            <el-col :span="6">
+            </el-col> -->
+            <!-- <el-col :span="6">
               <span v-if="tableData.length==row.activityOrder">下移</span>
               <el-link v-else type="primary" @click="handleDown(row)">下移</el-link>
-            </el-col>
+            </el-col> -->
           </el-row>
         </template>
       </el-table-column>
@@ -98,6 +128,7 @@ import processActivityDetail from "./processActivity-detail";
 import processActivityApi from "@/api/workflow/processActivity";
 import pageUtil from "@/utils/page";
 import "nprogress/nprogress.css"; // progress bar style
+import personRoleInfoApi from "@/api/base/personRoleInfo";
 
 export default {
   name: 'workflowProcessActivityList',
@@ -107,6 +138,7 @@ export default {
     return {
       queryModel: {
         name: "",
+        personRoleId:"",
       },
       processTemplateId:"",
       loading: false,
@@ -144,7 +176,16 @@ export default {
         label: "name",
         children: "children"
       },
+      roleIdList:[],
     };
+  },
+    created() {
+  
+      personRoleInfoApi.findAll().then(response => {
+          var jsonData = response.data;
+          this.roleIdList = jsonData.data;
+      });
+    
   },
   methods: {
     changePage(pageIndex) {
@@ -159,6 +200,8 @@ export default {
     formData.append("pageIndex", self.pageIndex);
     formData.append("pageSize", self.pageSize);
 
+    formData.append("personRoleId", self.queryModel.personRoleId);
+
     formData.append("processTemplateId",self.processTemplateId);
 
       processActivityApi