review code

mrtylerzhou · Dec 28, 2024 · 55253b2 · 55253b2
1 parent 87340cd
commit 55253b2
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 21 deletions.
diff --git a/antflow-vue/src/components/Workflow/dialog/employeesDialog.vue b/antflow-vue/src/components/Workflow/dialog/employeesDialog.vue
@@ -78,11 +78,11 @@ let resList = computed(()=>{
 watch(()=> props.visible, (val)=>{
   if(val){
     getDepartmentList();
-    searchVal.value = "";
-    checkedEmployessList.value = props.data.filter(item=>item.type===1).map(({name,targetId})=>({
+    searchVal.value = ""; 
+    checkedEmployessList.value = props.data.filter(item=>item.type===5).map(({name,targetId})=>({
       employeeName: name,
       id: targetId
-    }));
+    })); 
     checkedDepartmentList.value = props.data.filter(item=>item.type===3).map(({name,targetId})=>({
       departmentName: name,
       id: targetId

diff --git a/antflow-vue/src/components/Workflow/dialog/employeesRoleDialog.vue b/antflow-vue/src/components/Workflow/dialog/employeesRoleDialog.vue
@@ -2,15 +2,7 @@
   <el-dialog title="选择成员" v-model="visibleDialog" style="width: 650px !important;"  append-to-body class="promoter_person">
       <div class="person_body clear">
           <div class="person_tree l">
-              <input type="text" placeholder="搜索成员" v-model="searchVal" @input="getDebounceData($event,activeName)">
-              <el-tabs v-model="activeName" @tab-change="handleClick">
-                  <el-tab-pane label="组织架构" name="1"></el-tab-pane>
-                  <el-tab-pane label="角色列表" name="2"></el-tab-pane>
-              </el-tabs>
-              <p class="ellipsis tree_nav" v-if="activeName === '1' && !searchVal"> 
-                  <span v-for="(item,index) in departments.titleDepartments" class="ellipsis" 
-                  :key="index+'a'" @click="getDepartmentList(item.id)">{{item.departmentName}}</span>   
-              </p>
+              <input type="text" placeholder="搜索成员" v-model="searchVal" @input="getDebounceData($event,activeName)"> 
               <selectBox :list="list" style="height: 360px;"/>
           </div>
           <selectResult :total="total" @del="delList" :list="resList"/>

diff --git a/antflow-vue/src/components/Workflow/drawer/approverDrawer.vue b/antflow-vue/src/components/Workflow/drawer/approverDrawer.vue
@@ -197,9 +197,6 @@ watch(approverConfig1, (val) => {
 watch(approverConfig1, (val) => {
     approvalPageBtns.value = val.value.buttons?.approvalPage;
     if (val.value.nodeProperty == 6) {
-        // val.value.nodeApproveList.length > 0 && val.value.nodeApproveList.map(item => {
-        //     checkedHRBP.value = item.targetId
-        // })
         checkedHRBP.value =  val.value.property.hrbpConfType 
     }
 })
@@ -299,12 +296,12 @@ const changePermVal = (data) => {
 
 .selected_list {
     margin-bottom: 20px;
-    line-height: 30px;
+    line-height: 40px;
 }
 
 .selected_list span {
-    margin-right: 10px;
-    padding: 8px;
+    margin-right: 10px; 
+    padding: 5px;
     line-height: 12px;
     white-space: nowrap;
     border-radius: 5px;

diff --git a/antflow-vue/src/components/Workflow/nodeWrap.vue b/antflow-vue/src/components/Workflow/nodeWrap.vue
@@ -136,8 +136,7 @@ const resetConditionNodesErr = () => {
 }
 onMounted(() => {
     if (props.nodeConfig.nodeType == 4) { 
-        props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig);
-        console.log("props.nodeConfig.error", props.nodeConfig.error);
+        props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig); 
     } else if (props.nodeConfig.nodeType == 6) {
         props.nodeConfig.error = !$func.copyerStr(props.nodeConfig);
     } else if (props.nodeConfig.nodeType == 2) {

diff --git a/antflow-vue/src/components/Workflow/selectResult.vue b/antflow-vue/src/components/Workflow/selectResult.vue
@@ -56,7 +56,7 @@ let emits = defineEmits(['del'])
   width: 320px;
   height: 100%;
   font-size: 12px; 
-  margin-left: -30px;
+  margin-left: 0px;
   ul {
     height: 460px;
     overflow-y: auto;