档案抽检修改

src/views/transfer/components/carry-spot-checks.vue

@@ -129,18 +129,18 @@
                         </div>
                     </div>
                     <div class="btn-box">
-                        <el-button hc-btn @click="onCarrySpotChecksDrawerClose">
+                        <el-button hc-btn style="height: 40px; padding: 0 15px;" type="warning" @click="onCarrySpotChecksDrawerClose">
                             <HcIcon name="close" />
                             <span>{{ closeText }}</span>
                         </el-button>
-                        <el-button :loading="submitLoading" hc-btn type="primary" @click="submitOpinion">
+                        <el-button :loading="submitLoading" hc-btn type="primary" style="height: 40px; padding: 0 15px;" @click="submitOpinion">
                             <HcIcon name="check" />
                             <span>{{ checkText }}</span>
                         </el-button>
                     </div>
                 </div>
                 <div v-if="checkId.length == 0" class="btn-box" style="text-align: center;">
-                    <el-button hc-btn @click="onCarrySpotChecksDrawerClose">
+                    <el-button hc-btn style="height: 40px; padding: 0 15px;" type="warning" @click="onCarrySpotChecksDrawerClose">
                         <HcIcon name="close" />
                         <span>取消查阅</span>
                     </el-button>
@@ -251,25 +251,26 @@ watch(() => [
 
     if (fileId.value && isDrawer.value) {
         getArchiveFileListData()
-        let url
-        viewPdf(fileId.value).then((res) => {
-            console.log(res, 'res')
-            url = res
-            pdfUrl.value = url
-            if (pdfUrl.value && pdfUrl?.value.length > 0) {
-                setTimeout(() => {
-
-                    if (isDrawer.value) {
-                        serReviewFile()
-                    }
-
-                }, 30000)
-            }
-        })
+        // let url
+        // viewPdf(fileId.value).then((res) => {
+        //     console.log(res, 'res')
+        //     url = res
+        //     pdfUrl.value = url
+        //     if (pdfUrl.value && pdfUrl?.value.length > 0) {
+        //         setTimeout(() => {
+
+        //             if (isDrawer.value) {
+        //                 serReviewFile()
+        //             }
+
+        //         }, 30000)
+        //     }
+        // })
 
     }
     if (isO) {
-        checkId.value = fileInfo.value.fileId || ''
+        // checkId.value = fileInfo.value.fileId || ''
+          checkId.value = fileInfo.value.id || ''
         ishowAllopinion.value = true
         getopiniondata()
     } else {
@@ -305,10 +306,13 @@ const cscTableData1 = ref([])
 //获取卷内文件数据
 
 const getArchiveFileListData = async () => {
+    cscTableLoading.value = true
+
     const { error, code, msg, data } = await archiveQueryApi.getArchiveFileList({
         id: fileId.value, //案卷id
 
     })
+    cscTableLoading.value = false
     //处理返回数据
     if (!error && code === 200) {
         //  fileInfo.value = data
@@ -322,12 +326,17 @@ const getArchiveFileListData = async () => {
         cscTableData1.value = getArrValue(data['approvalFileList'])
         if (cscTableData1.value.length > 0) {
             checkmetaFileId.value = cscTableData1.value[0].id
+            pdfUrl.value = cscTableData1.value[0].pdfFileUrl
+            checkId.value = cscTableData1.value[0].id
             getmetaInfo()
         }
 
     } else {
 
         cscTableData1.value = []
+        pdfUrl.value = ''
+       
+        checkId.value = ''
     }
 }
 const ishowFile = ref(false)
@@ -541,6 +550,8 @@ const onCarrySpotChecksDrawerClose = () => {
     ishowFile.value = false
     checkmetaFileId.value = ''
     checkId.value = ''
+    pdfUrl.value = ''
+    cscTableData1.value = []
     emit('close', false)
 }
 

src/views/transfer/preliminary-examination.vue

@@ -5,9 +5,9 @@
                 <div class="hc-project-icon-box">
                     <HcIcon name="stack" />
                 </div>
-                <div class="ml-2 project-name-box">
-                    <span class="text-xl text-cut project-alias">{{ projectInfo.projectAlias }}</span>
-                    <div class="text-xs text-cut project-name">{{ projectInfo.name }}</div>
+                <div class="project-name-box ml-2">
+                    <span class="text-cut project-alias text-xl">{{ projectInfo.projectAlias }}</span>
+                    <div class="text-cut project-name text-xs">{{ projectInfo.name }}</div>
                 </div>
             </div>
             <div class="hc-tree-new-switch">
@@ -31,11 +31,11 @@
                 <template #header>
                     <HcIcon name="volume-up" />
                     <span class="ml-2">您本次验收抽检案卷共</span>
-                    <span class="text-orange mx-2">{{ stats?.total }}</span>
+                    <span class="mx-2 text-orange">{{ stats?.total }}</span>
                     <span>卷，目前已抽检</span>
-                    <span class="text-green mx-2">{{ stats?.reviewed }}</span>
+                    <span class="mx-2 text-green">{{ stats?.reviewed }}</span>
                     <span>卷，抽检率为</span>
-                    <span class="text-blue mx-2">{{ stats?.ratio }}</span>
+                    <span class="mx-2 text-blue">{{ stats?.ratio }}</span>
                 </template>
                 <template #extra>
                     <el-button type="danger" round @click="writingConclusion">编写结论</el-button>
@@ -43,7 +43,7 @@
                     <el-button type="danger" plain round @click="toBackHomeClick">返回主页</el-button>
                 </template>
                 <div class="hc-card-diy-search-box">
-                    <div class="text-gray text-sm mr-4 hc-card-diy-tip-view">
+                    <div class="hc-card-diy-tip-view mr-4 text-sm text-gray">
                         <span class="mr-4">通过关键词、题名、桩号等相关信息进行搜索:</span>
                         <el-radio-group v-model="checkList" class="ml-4" @change="getTableData">
                             <el-radio label="1" size="large">案卷</el-radio>
@@ -185,7 +185,7 @@ const tableColumn = ref([
     { key: 'unit', name: '立卷单位' },
     { key: 'inspectStatusName', name: '抽检状态' },
     { key: 'updateStatusName', name: '抽检意见' },
-    { key: 'action', name: '操作', width: 100 },
+    { key: 'action', name: '操作', width: 100, align:'center' },
 ])
 const tableData = ref([])
 
@@ -247,7 +247,10 @@ const tableClick = (row) => {
     isCarrySpotChecksDrawer.value = true
     fileId.value = row.id
     fileInfo.value = row
-    isOpinion.value = false
+    console.log(fileInfo.value, 'fileInfo.value')
+    
+    // isOpinion.value = false
+    isOpinion.value = true
   
 }
 const changeFile = (row)=>{

src/views/transfer/writing-conclusion.vue

@@ -6,9 +6,9 @@
                     <div class="hc-conclusion-icon-box">
                         <HcIcon name="file-ppt-2" fill />
                     </div>
-                    <div class="ml-2 conclusion-name-box">
-                        <span class="text-xl text-cut conclusion-alias">编写结论、提交报告</span>
-                        <div class="text-xs text-cut conclusion-name">{{ projectInfo.name }}</div>
+                    <div class="conclusion-name-box ml-2">
+                        <span class="text-cut conclusion-alias text-xl">编写结论、提交报告</span>
+                        <div class="text-cut conclusion-name text-xs">{{ projectInfo.name }}</div>
                     </div>
                 </div>
             </template>
@@ -55,13 +55,13 @@
             <div class="hc-table-opinion-text">
                 <div class="title">案卷题名：{{ opRow.archiveName }}</div>
                 <div class="opinion-text">
-                    <div class="text-1">抽检意见：</div>
+                    <div class="text-4">抽检意见：</div>
                     <div v-if="!opinionTextEdit" class="text-2">{{ opinionText }}</div>
-                    <div v-if="opinionTextEdit" class="text-2 input">
+                    <div v-if="opinionTextEdit" class="input text-2">
                         <el-input v-model="opinionText" style="flex: 1;" :rows="3" placeholder="请输入抽检意见" type="textarea" resize="none" />
                         <el-button class="ml-4" hc-btn type="primary" :loading="submitLoading" @click="opinionTextEditHihe">保存</el-button>
                     </div>
-                    <div v-if="!opinionTextEdit " class="text-blue text-hover icon-1" @click="opinionTextEditShow">
+                    <div v-if="!opinionTextEdit " class="text-hover icon-1 text-blue" @click="opinionTextEditShow">
                         <HcIcon v-if="!state" name="edit-2" />
                     </div>
                 </div>