新主题

src/global/components/hc-report-modal/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <hc-new-dialog v-model="isShow" :title="title" widths="47rem" @close="cancelReportClick">
+    <hc-new-dialog :show="isShow" :title="title" widths="47rem" @close="cancelReportClick">
         <el-form ref="formRef" :model="formModel" :rules="formRules" label-width="auto" size="large">
             <el-form-item label="任务名称" prop="taskName">
                 <el-input v-model="formModel.taskName" disabled />
@@ -7,25 +7,16 @@
             <el-form-item v-if="isDatas && reportDatas.length > 0" label="审批内容">
                 <div class="task-tag-data-box">
                     <template v-for="(item, index) in reportDatas" :key="item.id">
-                        <el-tag closable size="default" type="info" @close="taskTagClose(index)">
-                            {{ item.name }}
-                        </el-tag>
+                        <el-tag closable size="default" type="info" @close="taskTagClose(index)">{{ item.name }}</el-tag>
                     </template>
                 </div>
             </el-form-item>
             <el-form-item label="任务描述" prop="taskContent">
-                <el-input
-                    v-model="formModel.taskContent" :autosize="{ minRows: 3, maxRows: 5 }"
-                    placeholder="请输入任务描述"
-                    type="textarea"
-                />
+                <el-input v-model="formModel.taskContent" :autosize="{ minRows: 3, maxRows: 5 }" placeholder="请输入任务描述" type="textarea" />
             </el-form-item>
             <el-form-item label="任务流程" prop="fixedFlowId">
                 <el-select v-model="formModel.fixedFlowId" block @change="handleProcessValue">
-                    <el-option
-                        v-for="item in processData" :key="item.id"
-                        :disabled="item.disabled" :value="item.id" :label="item.fixedFlowName"
-                    >
+                    <el-option v-for="item in processData" :key="item.id" :disabled="item.disabled" :value="item.id" :label="item.fixedFlowName">
                         <el-tooltip
                             v-if="item.tips && item.disabled"
                             class="box-item"
@@ -41,13 +32,12 @@
             <el-form-item v-if="diyProcessUser" label="任务人" prop="userTasks">
                 <HcTasksUser
                     :contract-id="contractId" :project-id="projectId" :type="type" :type-data="typeData"
-                    ui="w-full" :classify-type="classifyType" :table-owner="tableOwner" :node-id="formModel.ids ? formModel.ids : nodeId " :info-ids="infoIds" @change="diyProcessUserChange"
+                    ui="w-full" :classify-type="classifyType" :table-owner="tableOwner" :node-id="formModel.ids ? formModel.ids : nodeId "
+                    :info-ids="infoIds" @change="diyProcessUserChange"
                 />
             </el-form-item>
             <el-form-item v-else label="任务人">
-                <div class="form-item-div">
-                    {{ linkUserJoinString }}
-                </div>
+                <div class="form-item-div">{{ linkUserJoinString }}</div>
             </el-form-item>
             <el-form-item label="上报批次">
                 <HcCounter v-model="formModel.batch" />
@@ -57,13 +47,9 @@
             </el-form-item>
         </el-form>
         <template #footer>
-            <div class="dialog-footer">
-                <el-button size="large" @click="cancelReportClick">
-                    取消
-                </el-button>
-                <el-button :loading="formReportLoading" hc-btn type="primary" @click="formReportClick">
-                    提交
-                </el-button>
+            <div class="dialog-footer text-center">
+                <el-button size="large" @click="cancelReportClick">取消</el-button>
+                <el-button :loading="formReportLoading" hc-btn type="primary" @click="formReportClick">提交</el-button>
             </div>
         </template>
     </hc-new-dialog>
@@ -71,7 +57,7 @@
 
 <script setup>
 import { onMounted, ref, watch } from 'vue'
-import tasksFlowApi from '~api/tasks/flow'
+//import tasksFlowApi from '~api/tasks/flow'
 import { ApprovalApi, queryFixedFlow, queryFixedFlow1 } from '~api/other'
 import { arrIndex, arrToId, formValidate, getArrValue } from 'js-fast-way'
 
@@ -140,7 +126,10 @@ const props = defineProps({
         type: [String, Number],
         default: '',
     },
-
+    reportArr: {
+        type: Array,
+        default: () => ([]),
+    },
 })
 
 const emit = defineEmits(['hide', 'finish', 'tagClose'])