浏览代码

修复自定义任务流程的任务人选择

iZaiZaiA 2 年之前
父节点
当前提交
97909ff166
共有 1 个文件被更改,包括 5 次插入13 次删除
  1. 5 13
      src/global/components/hc-report-modal/index.vue

+ 5 - 13
src/global/components/hc-report-modal/index.vue

@@ -12,7 +12,7 @@
                     <el-option v-for="item in processData" :label="item.fixedFlowName" :disabled="item.disabled" :value="item.id"/>
                 </el-select>
             </el-form-item>
-            <el-form-item label="任务人" prop="user" v-if="diyProcessUser">
+            <el-form-item label="任务人" prop="userTasks" v-if="diyProcessUser">
                 <HcTasksUser ui="w-full" :projectId="projectId" :contractId="contractId" :type="type" :typeData="typeData" @change="diyProcessUserChange"/>
             </el-form-item>
             <el-form-item label="任务人" v-else>
@@ -94,7 +94,7 @@ const typeDatas = ref(props.typeData)
 const formRef = ref(null)
 const processData = ref([])
 const formModel = ref({
-    projectId: projectId.value, contractId: contractId.value, ids: props.ids,
+    projectId: projectId.value, contractId: contractId.value, ids: props.ids, userTasks: null,
     taskName: props.taskName, taskContent: '', fixedFlowId: '', batch: 1, restrictDay: 1,
     ...props.addition
 })
@@ -109,7 +109,7 @@ const formRules = ref({
         trigger: "blur",
         message: "请选择任务流程"
     },
-    user: {
+    userTasks: {
         required: true,
         trigger: "blur",
         message: "请选择任务人"
@@ -219,9 +219,8 @@ const handleProcessValue = (val) => {
 }
 
 //自定义流程任务人选择完毕
-const userTasks = ref([])
 const diyProcessUserChange = (user) => {
-    userTasks.value = user
+    formModel.value.userTasks = user
 }
 
 //上报批次改变
@@ -251,19 +250,12 @@ const formReportClick = async () => {
 //上报请求
 const formReportLoading = ref(false)
 const batchApprovalApi = async () => {
-    const type = isTypes.value
     formReportLoading.value = true
-    //处理数据
-    let flowJson = {}
-    if (type === 'first' || type === 'log' || type === 'wbs') {
-        flowJson['userTasks'] = userTasks.value
-    }
     //发起请求
     const { error, code, data } = await ApprovalApi(ApiUrl.value, {
         projectId: projectId.value,
         contractId: contractId.value,
-        ...formModel.value,
-        ...flowJson
+        ...formModel.value
     })
     linkUserJoinString.value = ''
     formReportLoading.value = false