Browse Source

任务流程修改

duy 1 year ago
parent
commit
e693b4080c
2 changed files with 11 additions and 5 deletions
  1. 10 4
      src/components/hc-tasks-user/index.vue
  2. 1 1
      src/views/tasks/flow.vue

+ 10 - 4
src/components/hc-tasks-user/index.vue

@@ -13,7 +13,7 @@
         <!-- 选择任务人 -->
         <el-dialog v-model="showModal" title="选择任务人" width="62rem" class="hc-modal-border hc-modal-nop" draggable destroy-on-close append-to-body>
             <div class="hc-tasks-user-modal-content-box">
-                <div class="tasks-name-box">
+                <div v-if="UserDataList.length > 0 || isShowTaskName" class="tasks-name-box">
                     <p class="mb-2">创建任务人流程</p>
                     <div class="flex pt-2">
                         <el-input v-model="taskNameinput" placeholder="请输入" size="default" class="mr-4" />  
@@ -21,7 +21,7 @@
                     </div>
                     <div class="task-list-box">
                         <div v-for="(item, index) in taskNameList" class="task-list-box-item">
-                            <el-tooltip :content="item.type === 1 ? '平行审批' : '任务审批'" placement="right">
+                            <el-tooltip :content="item.type === 2 ? '流程审批' : '平行审批'" placement="right">
                                 <el-button size="default">
                                     {{ item.title }}
                                     <HcIcon v-if="item.type === 1" name="links" class="ml-2" @click="item.type = 2" />
@@ -146,10 +146,14 @@ const props = defineProps({
         type: [String, Number],
         default: '',
     },
+    isShowTaskName:{
+        type:Boolean,
+        default:false,
+    },
 })
-
 //事件
 const emit = defineEmits(['change'])
+const isShowTaskName = ref(props.isShowTaskName)
 //变量
 const showModal = ref(false)
 const sequenceModal = ref(false)
@@ -172,10 +176,12 @@ watch(() => [
     props.users,
     props.projectId,
     props.contractId,
-], ([users, pid, cid]) => {
+    props.isShowTaskName,
+], ([users, pid, cid, ishow]) => {
     projectId.value = pid
     contractId.value = cid
     setUserDataList(users)
+    isShowTaskName.value = ishow
 })
 
 //渲染完成

+ 1 - 1
src/views/tasks/flow.vue

@@ -22,7 +22,7 @@
                     <el-input v-model="flowFormData.fixedFlowName" placeholder="请输入流程名称" />
                 </el-form-item>
                 <el-form-item label="任务人" prop="linkUserJoinString">
-                    <hc-tasks-user :contract-id="contractId" :project-id="projectId" :users="flowFormData.linkUserJoinString" ui="w-full" @change="tasksUserChange" />
+                    <hc-tasks-user :contract-id="contractId" :project-id="projectId" :users="flowFormData.linkUserJoinString" ui="w-full" :is-show-task-name="true" @change="tasksUserChange" />
                 </el-form-item>
             </el-form>
             <template #footer>