duy 4 months ago
parent
commit
2350f00d99

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

@@ -342,7 +342,7 @@ const getArchiveFileListData = async () => {
 const ishowFile = ref(false)
 const pdfLoading = ref(false)
 const pdfUrl = ref('')
-const ishowPdf = ref(false)
+const ishowPdf = ref(true)
 const checkId = ref('')
 const checkmetaFileId = ref('')
 const ishowAllopinion = ref(false)

+ 18 - 2
src/views/transfer/components/table-classify.vue

@@ -58,8 +58,9 @@
                 <el-select v-model="pdfDateId" placeholder="选择日期" @change="changePdfDate">
                     <el-option v-for="item in reportData" :key="item.id" :label="item.approveDate" :value="item.id" />
                 </el-select>
+                <div class="hc-title-view">{{ tableTitle }}111111111)</div>
             </div>
-            <div class="hc-title-view">{{ tableTitle }})</div>
+   
         
           
             <HcPdf
@@ -286,5 +287,20 @@ const changePdfDate = (val) => {
 </script>
 
 <style lang="scss" scoped>
-
+.hc-select-view {
+    display: flex;
+    align-items: center;
+}
+.hc-title-view {
+    margin-left: 16px;
+    display: flex;
+    align-items: center;
+    color: white;
+}
+html.dark{
+    .hc-select-view {
+   
+    background-color: rgba(35, 35, 39, 1);
+    }
+}
 </style>

+ 23 - 3
src/views/transfer/components/table-collect.vue

@@ -72,12 +72,13 @@
             v-model="isSubmitReportDrawer" to-id="submit-report-layout-target2" uis="hc-submit-report-target2"
             is-close @close="onSubmitReportDrawerClose"
         >
-            <div class="hc-select-view w-52">
-                <el-select v-model="pdfDateId" placeholder="选择日期" @change="changePdfDate">
+            <div class="hc-select-view mb-2">
+                <el-select v-model="pdfDateId" placeholder="选择日期" class="w-52" @change="changePdfDate">
                     <el-option v-for="item in reportData" :key="item.id" :label="item.approveDate" :value="item.id" />
                 </el-select>
+                <div class="hc-title-view">{{ tableTitle }}</div>
             </div>
-            <div class="hc-title-view">{{ tableTitle }}</div>
+          
           
          
             <HcPdf
@@ -364,3 +365,22 @@ html.dark {
     }
 }
 </style>
+
+<style lang="scss" scoped>
+.hc-select-view {
+    display: flex;
+    align-items: center;
+}
+.hc-title-view {
+    margin-left: 16px;
+    display: flex;
+    align-items: center;
+    color: white;
+}
+html.dark{
+    .hc-select-view {
+   
+    background-color: rgba(35, 35, 39, 1);
+    }
+}
+</style>

+ 5 - 3
src/views/transfer/write-report.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>
@@ -122,6 +122,7 @@ const getIsSubmit = async ()=>{
     })
     if (!error && code === 200) {
         isShowSubmit.value = data
+        getConclusion()
 
     } else {
         isShowSubmit.value = false
@@ -138,6 +139,7 @@ const SMSAuthConfirm = async () => {
     subLoading.value = true
     const { error, code, msg } = await writeApi.submitTable({
       ...consolusionData.value,
+      status:2,
     })
     subLoading.value = false
     if (!error && code === 200) {