Sfoglia il codice sorgente

部门和角色改为只能单选

yanliming 4 anni fa
parent
commit
639293a294
1 ha cambiato i file con 33 aggiunte e 24 eliminazioni
  1. 33 24
      src/views/workflow/processActivity-detail.vue

+ 33 - 24
src/views/workflow/processActivity-detail.vue

@@ -59,7 +59,7 @@
                 <el-radio label="3">相对职位</el-radio>
             </el-radio-group>
         </el-form-item>
-        <el-form-item label="审批人" prop="approvedPersonIdArray" style="width:350px">
+        <el-form-item label="审批人" prop="approvedPersonIdArray" style="width:350px" v-if="formModel.source=='1'">
             <el-select v-model="formModel.approvedPersonIdArray" multiple filterable placeholder="请选择审批人" style="width:250px">
                 <el-option
                 v-for="item in approvedPersonList"
@@ -71,8 +71,8 @@
         </el-form-item>
         <el-row>
             <el-col :span="12">
-                <el-form-item label="部门" prop="companyIdArray" style="width:350px">
-                    <el-select v-model="formModel.companyIdArray" filterable multiple placeholder="请选择部门" style="width:250px">
+                <el-form-item label="部门" prop="companyId" style="width:350px" v-if="formModel.source=='2'">
+                    <el-select v-model="formModel.companyId" filterable placeholder="请选择部门" style="width:250px">
                         <el-option
                         v-for="item in companyList"
                         :key="item.id"
@@ -83,8 +83,8 @@
                 </el-form-item>
             </el-col>
             <el-col :span="12">
-                <el-form-item label="角色" style="width:350px" prop="roleIdArray">
-                    <el-select v-model="formModel.roleIdArray" filterable multiple placeholder="请选择角色" style="width:250px">
+                <el-form-item label="角色" style="width:350px" prop="roleId" v-if="formModel.source=='2'">
+                    <el-select v-model="formModel.roleId" filterable placeholder="请选择角色" style="width:250px">
                         <el-option
                         v-for="item in roleIdList"
                         :key="item.id"
@@ -95,7 +95,7 @@
                 </el-form-item>
             </el-col>
         </el-row>
-        <el-form-item label="相对职位" prop="relativePosition" >
+        <el-form-item label="相对职位" prop="relativePosition"  v-if="formModel.source=='3'">
             <el-select v-model="formModel.relativePosition"  style="width:250px">
                 <el-option v-for="(item,index) in relativePositionList" 
                 :label="item.name" :value="item.value" :key="index"></el-option>
@@ -127,8 +127,8 @@ export default {
           operation:"",
           ccPersonIdArray:[],
           approvedPersonIdArray:[],
-          companyIdArray:[],
-          roleIdArray:[],
+          companyId:"",
+          roleId:"",
       },
       ruleValidate: {
         name: [
@@ -140,6 +140,15 @@ export default {
         source: [
           { required: true, message: "审批者类型不能为空", trigger: "blur" }
         ],
+        approvedPersonIdArray: [
+          { required: true, message: "审批人不能为空", trigger: "blur" }
+        ],
+        companyId: [
+          { required: true, message: "部门不能为空", trigger: "blur" }
+        ],
+        roleId: [
+          { required: true, message: "角色不能为空", trigger: "blur" }
+        ],
       },
       showDialog: true,
       loading: false,
@@ -262,23 +271,23 @@ export default {
               self.formModel.approvedPersonIdArray = approvedPersonIdArray;
             }
 
-            if(jsonData.data.companyIdList!=null&&jsonData.data.companyIdList.length>0){
-              var companyIdList = jsonData.data.companyIdList;
-              var companyIdArray = new Array();
-              companyIdList.forEach((item, index) => {
-                companyIdArray.push(item)
-              })
-              self.formModel.companyIdArray = companyIdArray;
-            }
+            // if(jsonData.data.companyIdList!=null&&jsonData.data.companyIdList.length>0){
+            //   var companyIdList = jsonData.data.companyIdList;
+            //   var companyIdArray = new Array();
+            //   companyIdList.forEach((item, index) => {
+            //     companyIdArray.push(item)
+            //   })
+            //   self.formModel.companyIdArray = companyIdArray;
+            // }
 
-            if(jsonData.data.roleIdList!=null&&jsonData.data.roleIdList.length>0){
-              var roleIdList = jsonData.data.roleIdList;
-              var roleIdArray = new Array();
-              roleIdList.forEach((item, index) => {
-                roleIdArray.push(item)
-              })
-              self.formModel.roleIdArray = roleIdArray;
-            }
+            // if(jsonData.data.roleIdList!=null&&jsonData.data.roleIdList.length>0){
+            //   var roleIdList = jsonData.data.roleIdList;
+            //   var roleIdArray = new Array();
+            //   roleIdList.forEach((item, index) => {
+            //     roleIdArray.push(item)
+            //   })
+            //   self.formModel.roleIdArray = roleIdArray;
+            // }
             
 
         } else {