Merge remote-tracking branch 'origin/master'

src/api/modules/custody/early.js

@@ -0,0 +1,12 @@
+import { httpApi } from '../../request/httpApi'
+
+export default {
+  //档案预警-分页查询(需要整改的文件)
+  async warningPage(form, msg = true) {
+    return httpApi({
+        url: '/api/blade-archive/archivesauto/warningPage',
+        method: 'post',
+        data: form,
+    }, msg)
+},
+}

src/api/modules/transfer/write-conclusion.js

@@ -65,4 +65,12 @@ export default {
             data: form,
             }, msg)
     },
+    //编写结论-测回提交
+    async repealTable(form, msg = true) {
+        return httpApi({
+                url: '/api/blade-archive/archiveExpertConclusion/repealTable',
+                method: 'get',
+                params: form,
+                }, msg)
+        },
 }

src/views/custody/components/tab-reform.vue

@@ -20,6 +20,7 @@
 <script setup>
 import { nextTick, ref, watch } from 'vue'
 import archiveFileApi from '~api/archiveFile/archiveFile'
+import earlyApi from '~api/custody/early'
 import { getArrValue } from 'js-fast-way'
 
 //参数
@@ -119,26 +120,47 @@ const tableData = ref([])
 //获取数据
 const tableLoading = ref(false)
 const getTableData = async () => {
+    if (tabKey.value !== '1') {
         if (nodeData.value.id) {
             tableLoading.value = true
             const { error, code, data } = await archiveFileApi.getarchiveFilePage({
-            ...searchForm.value,
-            nodeIds: nodeData.value.id,
-            projectId: projectId.value,
-            contractId: contractId.value,
-            rectification:tabKey.value,
-        })
-        tableLoading.value = false
-        if (!error && code === 200) {
-            tableData.value = getArrValue(data['records'])
-            searchForm.value.total = data['total'] || 0
-        } else {
-            tableData.value = []
-            searchForm.value.total = 0
+                ...searchForm.value,
+                nodeIds: nodeData.value.id,
+                projectId: projectId.value,
+                contractId: contractId.value,
+                rectification:tabKey.value,
+            })
+            tableLoading.value = false
+            if (!error && code === 200) {
+                tableData.value = getArrValue(data['records'])
+                searchForm.value.total = data['total'] || 0
+            } else {
+                tableData.value = []
+                searchForm.value.total = 0
+            }
+        }
+    } else {
+        tableLoading.value = true
+            const { error, code, data } = await earlyApi.warningPage({
+                ...searchForm.value,
+                nodeIds: nodeData.value.id,
+                projectId: projectId.value,
+                contractId: contractId.value,
+                rectification:tabKey.value,
+            })
+            tableLoading.value = false
+            if (!error && code === 200) {
+                tableData.value = getArrValue(data['records'])
+                searchForm.value.total = data['total'] || 0
+            } else {
+                tableData.value = []
+                searchForm.value.total = 0
+            }
         }
     }
+        
+
 
-}
 // 暴露出去
 defineExpose({
     getTableData,

src/views/file/collection.vue

@@ -382,7 +382,7 @@
         <HcReport :show="isReport" :data="reportData" @finish="reportFinish" @hide="isReport = false" />
 
         <!-- 在线验签 -->
-        <hc-new-drawer v-model="isOnlineVerifyDrawer" modal-class="hc-online-verify-drawer" to-id="app" @close="onlineVerifyDrawerClose">
+        <hc-new-drawer v-model="isOnlineVerifyDrawer" modal-class="hc-online-verify-drawer" to-id="app" append-to-body @close="onlineVerifyDrawerClose">
             <hc-new-card>
                 <template #header>
                     <div class="online-verify-title">这是标题名称</div>
@@ -1730,4 +1730,13 @@ const onlineVerifyDrawerClose = () => {
         }
     }
 }
+html.dark .hc-online-verify-drawer .el-card.hc-new-card-box{
+    background-color:var(--hc-bg-color);
+    .hc-card-header-box {
+        .online-verify-icon {
+            color: var(--el-color-primary);
+           
+        }
+    }
+}
 </style>

src/views/transfer/components/conclusion/table-score.vue

@@ -1,5 +1,11 @@
 <template>
     <HcTable ui="no-border" is-new :column="tableColumn" :datas="tableData" :loading="tableLoading" :is-index="false">
+        <template #integrality="{ row }">
+            <div v-if="row.isEdit" class="table-score-input-box">
+                <el-input v-model="row.integrality" placeholder="" />
+            </div>
+            <span v-else>{{ row.integrality || '-' }}</span>
+        </template>
         <template #integralityDeduction="{ row }">
             <div v-if="row.isEdit" class="table-score-input-box">
                 <el-input v-model="row.integralityDeduction" placeholder="" />
@@ -12,6 +18,12 @@
             </div>
             <span v-else>{{ row.normativeDeduction || '-' }}</span>
         </template>
+        <template #normative="{ row }">
+            <div v-if="row.isEdit" class="table-score-input-box">
+                <el-input v-model="row.normative" placeholder="" />
+            </div>
+            <span v-else>{{ row.normative || '-' }}</span>
+        </template>
         <template #action="{ row }">
             <el-button v-if="row.isEdit" type="success" size="small" @click="saveClick(row)">
                 保存

src/views/transfer/report-detail.vue

@@ -76,8 +76,8 @@ const props = defineProps({
         }),
     },
     state:{
-        type:Boolean,
-        default:false,
+        type:[String, Number],
+        default:1,
     },
   
 })

src/views/transfer/submit-report.vue

@@ -37,7 +37,7 @@
                         <template #extra>
                             <div class="w-40">
                                 <el-select v-model="searchFormScore.type" placeholder="参建方类型表">
-                                    <el-option label="业主建设单位" value="1" />
+                                    <el-option label="总承包单位" value="1" />
                                     <el-option label="监理单位" value="2" />
                                     <el-option label="施工单位" value="3" />
                                 </el-select>

src/views/transfer/write-report.vue

@@ -1,5 +1,5 @@
 <template>
-    <div id="submit-report-layout-target" class="hc-page-box write-report">
+    <div id="submit-report-layout-target1" class="hc-page-box write-report">
         <hc-new-card>
             <template #header>
                 <div class="hc-conclusion-header-box">
@@ -14,9 +14,9 @@
             </template>
             <template #extra>
                 <el-button v-if="state === 2" type="success" round @click="onSubmitReportClick">查看验收意见</el-button>
-                <el-button v-if="state === 2" type="danger" round>撤回提交</el-button>
-                <el-button v-if="isShowSubmit && state !== 2" type="danger" round @click="submissionClick">确认提交</el-button>
-                <el-button color="#7729F5" round :loading="saveDraftLaod" @click="officeDraft">暂存草稿</el-button>
+                <el-button v-if="state === 2" type="danger" round :loading="cancelLoading" @click="cancleSubmit">撤回提交</el-button>
+                <el-button v-if="isShowSubmit && state !== 2" type="danger" round :loading="subLoading" @click="submissionClick">确认提交</el-button>
+                <el-button color="#7729F5" round :loading="saveDraftLaod" :disabled="state === 2" @click="officeDraft">暂存草稿</el-button>
                 <el-button round plain type="danger" @click="previousStep">上一步</el-button>
                 <el-button type="danger" round plain @click="toBackClick">返回主页</el-button>
             </template>
@@ -35,7 +35,7 @@
     
         <!-- 历史报告 -->
         <HcDrawer
-            :show="isSubmitReportDrawer" to-id="submit-report-layout-target" uis="hc-submit-report-target"
+            :show="isSubmitReportDrawer" to-id="submit-report-layout-target1" uis="hc-submit-report-target"
             @close="onSubmitReportDrawerClose"
         >
             <template #header>
@@ -127,13 +127,16 @@ const getIsSubmit = async ()=>{
 //短信验证
 const SMSAuthLoading = ref(false)
 const SMSAuthShow = ref(false)
+const subLoading = ref(false)
 const SMSAuthConfirm = async () => {
     SMSAuthShow.value = false
 
     //确认提交调接口
+    subLoading.value = true
     const { error, code, msg } = await writeApi.submitTable({
       ...consolusionData.value,
     })
+    subLoading.value = false
     if (!error && code === 200) {
       window.$message.success(msg)
     //   state.value = 2
@@ -152,6 +155,7 @@ const previousStep = () => {
 
 //返回主页
 const toBackClick = () => {
+ 
     router.push({
         name: 'transfer-initial-expert',
     })
@@ -214,7 +218,6 @@ const getConclusion = async ()=>{
         projectId: projectId.value,
     })
     if (!error && code === 200) {
-        console.log(data, 'data')
         consolusionData.value = getObjValue(data)
         state.value = data['status']
     } else {
@@ -227,6 +230,20 @@ const getConclusion = async ()=>{
      
     }
 }
+//撤回提交
+const cancelLoading = ref(false)
+const cancleSubmit = async ()=>{
+    cancelLoading.value = true
+    const { error, code, data, msg } = await writeApi.repealTable({
+        id: consolusionData.value.id,
+    })
+    cancelLoading.value = false
+    if (!error && code === 200) {
+        window.$message.success(msg)
+        getConclusion()
+     
+    } 
+}
 </script>
 
 <style lang="scss" scoped>

src/views/transfer/writing-conclusion.vue

@@ -33,7 +33,7 @@
                         <template #extra>
                             <div class="w-40">
                                 <el-select v-model="searchFormScore.unitType" placeholder="参建方类型表">
-                                    <el-option label="业主建设单位" value="1" />
+                                    <el-option label="总承包单位" value="1" />
                                     <el-option label="监理单位" value="2" />
                                     <el-option label="施工单位" value="3" />
                                 </el-select>