验收申请保存接口调用

src/api/modules/initial/initial.js

@@ -9,5 +9,13 @@ export default {
             params: form,
         }, msg)
     },
+    //验收申请保存
+    async saveApply(form, msg = true) {
+        return httpApi({
+            url: '/api/blade-archive/archivesauto/saveApply',
+            method: 'post',
+            data: form,
+        }, msg)
+     },
  
 }

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

@@ -10,12 +10,12 @@
             <el-table :data="tableExpertsData" border style="width: 100%">
                 <el-table-column prop="name" label="姓名" align="center" width="120" />
                 <el-table-column prop="position" label="职位" align="center" width="130" />
-                <el-table-column prop="group" label="是否为组长" align="center" width="120">
+                <el-table-column prop="isLeader" label="是否为组长" align="center" width="120">
                     <template #default="scope">
-                        {{ arrKeyValue(groupSelectData, 'value', 'label', scope.row.group) }}
+                        {{ arrKeyValue(groupSelectData, 'value', 'label', scope.row.isLeader) }}
                     </template>
                 </el-table-column>
-                <el-table-column prop="idCard" label="身份证" align="center" />
+                <el-table-column prop="idNumber" label="身份证" align="center" />
                 <el-table-column prop="phone" label="手机号" align="center" width="140" />
                 <el-table-column prop="action" label="操作" align="center" width="140">
                     <template #default="scope">
@@ -36,13 +36,13 @@
             <el-form-item label="职位" prop="position">
                 <el-input v-model="formModel.position" placeholder="请输入职位" />
             </el-form-item>
-            <el-form-item label="组长" prop="group">
-                <el-select v-model="formModel.group" block>
+            <el-form-item label="组长" prop="isLeader">
+                <el-select v-model="formModel.isLeader" block>
                     <el-option v-for="item in groupSelectData" :label="item.label" :value="item.value" />
                 </el-select>
             </el-form-item>
-            <el-form-item label="身份证" prop="idCard">
-                <el-input v-model="formModel.idCard" placeholder="请输入身份证" />
+            <el-form-item label="身份证" prop="idNumber">
+                <el-input v-model="formModel.idNumber" placeholder="请输入身份证" />
             </el-form-item>
             <el-form-item label="手机号" prop="phone">
                 <el-input v-model="formModel.phone" placeholder="请输入手机号" />
@@ -91,7 +91,7 @@ const groupSelectData = [
 //表单
 const formRef = ref(null)
 const formModel = ref({
-    name: '', position: '', group: '', idCard: '', phone: '',
+    name: '', position: '', isLeader: '', idNumber: '', phone: '',
 })
 
 const formRules = ref({
@@ -105,12 +105,12 @@ const formRules = ref({
         trigger: 'blur',
         message: '请输入职位',
     },
-    group: {
+    isLeader: {
         required: true,
         trigger: 'blur',
         message: '请选择是否为组长',
     },
-    idCard: {
+    idNumber: {
         required: true,
         validator: (rule, value, callback) => {
             if (!value) {

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

@@ -4,8 +4,8 @@
             <el-form-item label="任务名称" prop="taskName">
                 <el-input v-model="formModel.taskName" disabled />
             </el-form-item>
-            <el-form-item label="验收日期" prop="date">
-                <el-date-picker v-model="formModel.date" type="date" class="block" value-format="YYYY-MM-DD" :clearable="false" />
+            <el-form-item label="验收日期" prop="startDate">
+                <el-date-picker v-model="formModel.startDate" type="date" class="block" value-format="YYYY-MM-DD" :clearable="false" />
             </el-form-item>
             <el-form-item v-if="isDatas && reportDatas.length > 0" label="申请内容">
                 <div class="task-tag-data-box">
@@ -16,16 +16,12 @@
             </el-form-item>
             <el-form-item label="上传附件">
                 <HcFormUpload
-                    v-model="formModel.pdfUrl"
-                    accept="application/pdf,.doc,.docx,application/msword"
-                    format-tip="PDF、Word格式文件"
-                    @item="formItemClick"
+                    :src="formModel.attachmentPdfUrlName"
                     @upload="formItemUpload"
-                    @change="formItemChange"
                 />
             </el-form-item>
-            <el-form-item label="验收专家信息" prop="experts">
-                <HcReportExperts v-model="formModel.experts" />
+            <el-form-item label="验收专家信息" prop="list">
+                <HcReportExperts v-model="formModel.list" />
             </el-form-item>
             <el-form-item label="申请说明">
                 <el-input v-model="formModel.taskContent" type="textarea" placeholder="请输入申请说明" :autosize="{ minRows: 3, maxRows: 5 }" />
@@ -54,7 +50,7 @@
                 </el-button>
             </div>
         </template>
-        <HcUploadFile ref="HcUploadFileRef" :options="UploadFileOptions" @finish="HcUploadFileFinish" />
+        <HcUploadFile ref="HcUploadFileRef" :options="UploadFileOptions" @finish="HcUploadFileFinish" @success="HcUploadFileSuccess" />
     </hc-new-dialog>
 </template>
 
@@ -63,6 +59,7 @@ import { onMounted, ref, watch } from 'vue'
 import tasksFlowApi from '~api/tasks/flow'
 import { arrIndex, formValidate, getArrValue } from 'js-fast-way'
 import { getTokenHeader } from '~src/api/request/header'
+import initialgApi from '~api/initial/initial'
 
 const props = defineProps({
     show: {
@@ -123,16 +120,16 @@ const reportDatas = ref(props.datas)
 const formRef = ref(null)
 const processData = ref([])
 const formModel = ref({
-    projectId: projectId.value, contractId: contractId.value, ids: props.ids, experts: [],
+    projectId: projectId.value, contractId: contractId.value, archiveIds: props.ids, list: [],
     userTasks: null, taskName: props.taskName, fixedFlowId: '', ...props.addition,
 })
 const formRules = ref({
-    date: {
+    startDate: {
         required: true,
         trigger: 'blur',
         message: '请选择验收日期',
     },
-    experts: {
+    list: {
         required: true,
         trigger: 'blur',
         message: '请完善专家信息',
@@ -153,21 +150,21 @@ const formRules = ref({
 watch(() => [
     props.show,
     props.projectId,
-    props.contractId,
+
     props.taskName,
     props.ids,
     props.url,
     props.addition,
     props.datas,
-], ([val, pid, cid, name, ids, url, addition, datas]) => {
+], ([val, pid, name, ids, url, addition, datas]) => {
     isShow.value = val
     projectId.value = pid
-    contractId.value = cid
+
     ApiUrl.value = url
     //更新到表单数据
     formModel.value = {
-        projectId: pid, contractId: cid, ids: ids, taskName: name,
-        taskContent: '', fixedFlowId: '', experts: [],
+        projectId: pid, archiveIds: ids, taskName: name,
+        taskContent: '', fixedFlowId: '', list: [],
         ...addition,
     }
     reportDatas.value = datas
@@ -250,13 +247,10 @@ const formReportClick = async () => {
 const formReportLoading = ref(false)
 const batchApprovalApi = async () => {
     console.log(formModel.value)
-    /*formReportLoading.value = true
+    formReportLoading.value = true
     //发起请求
-    const { error, code, data } = await ApprovalApi(ApiUrl.value, {
-        projectId: projectId.value,
-        contractId: contractId.value,
-        ...formModel.value
-    })
+    const { error, code, data } = await initialgApi.saveApply (formModel.value)
+    
     linkUserJoinString.value = ''
     formReportLoading.value = false
     if (!error && code === 200) {
@@ -266,12 +260,14 @@ const batchApprovalApi = async () => {
         emit('finish', data)
     } else {
         processData.value = []
-    }*/
+    }
 }
 //上传配置
 const UploadFileOptions = {
     //此处设置header
     headers: getTokenHeader(),
+    accept:'application/pdf,.doc,.docx,application/msword',
+    accept_tip: 'PDF、Word格式文件',
 }
 const HcUploadFileRef = ref(null)
 //上传
@@ -281,19 +277,19 @@ const formItemUpload = () => {
 
 
 
-const formItemClick = ({ item, index }) => {
 
-}
 
-//文件变化
-const formItemChange = (src) => {
-    formModel.value.key5 = src
-}
+
 // 文件全部上传完成
 const HcUploadFileFinish = () => {
   
     HcUploadFileRef?.value.setModalShow(false)
 }
+// 文件全部上传成功
+const HcUploadFileSuccess = (res) => {
+    formModel.value.attachmentPdfUrl = res.resData.link
+    formModel.value.attachmentPdfUrlName = res.resData.originalName
+}
 </script>
 
 <style lang="scss">

src/global/components/hc-tasks-user/index.vue

@@ -70,7 +70,7 @@
                         <HcIcon name="close" />
                         <span>取消</span>
                     </el-button>
-                    <el-button hc-btn type="primary" :loading="sureSignUserLoading" @click="sureSignUserClick">
+                    <el-button hc-btn type="primary" size="large" :loading="sureSignUserLoading" @click="sureSignUserClick">
                         <HcIcon name="check" />
                         <span>确定</span>
                     </el-button>

src/views/transfer/components/table-collect.vue

@@ -28,18 +28,6 @@
                         @selection-change="tableSelection"
                     />
                 </HcCardItem>
-
-            <!-- <HcCardItem ui="h-half">
-                <template #header>
-                    <span>二、勘察设计文件</span>
-                    <span class="text-gray">（95卷）</span>
-                </template>
-                <HcTable
-                    ref="tableFileRef" :column="tableFileColumn" :datas="tableFileData" :loading="tableFileLoading"
-                    heights="auto" is-new :index-style="{ width: 60 }" is-check :check-style="{ width: 29 }"
-                    @selection-change="tableeFileSelection"
-                />
-            </HcCardItem> -->
             </div>
         </div>
     </hc-new-card>
@@ -48,7 +36,7 @@
     <HcReportModal
         title="申请验收"
         widths="1080px"
-        url="informationWriteQuery/batchTask"
+        url="archivesauto/saveApply"
         :show="showReportModal"
         :project-id="projectId"
         :contract-id="contractId"
@@ -235,6 +223,7 @@ const showReportModal = ref(false)
 const reportLoading = ref(false)
 const reportModalClick = async () => {
     const rows = tableKeys.value
+    console.log(rows, 'rows验收申请行')
     if (rows.length > 0) {
         //初始ID
         const row = getObjValue(rows[0])