1.优化文件生成操作

src/views/assets/workbench/cr/report/crBaseInfo.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="contrl" style="overflow: auto;height: 85vh;"  v-loading="loading" element-loading-text="生成债权分析报告中...">
+    <div class="contrl" style="overflow: auto;height: 85vh;" v-loading="loading" element-loading-text="生成债权分析报告中...">
         <el-divider content-position="left">
             <span style="color:#ff6154;">生成报告</span>
         </el-divider>
@@ -56,6 +56,12 @@
                             </el-form-item>
                         </el-col>
                     </el-row>
+                    <div>
+                        <el-button type="danger" style="float: right;" @click="generateCRReport()">生成报告</el-button>
+                    </div>
+                    <div style="margin-right:120px">
+                        <el-button type="danger" style="float: right;" @click="updateReportBaseInfo()">保存报告信息</el-button>
+                    </div>
                 </el-col>
                 <el-col :span="12">
                     <!-- <el-row :gutter="10">
@@ -114,12 +120,6 @@
                             </el-form-item>
                         </el-col>
                     </el-row> -->
-                    <div>
-                        <el-button type="danger" style="float: right;" @click="generateCRReport()">生成报告</el-button>
-                    </div>
-                    <div style="margin-right:120px">
-                        <el-button type="danger" style="float: right;" @click="updateReportBaseInfo()">保存报告信息</el-button>
-                    </div>
                 </el-col>
             </el-row>
         </el-form>

src/views/assets/workbench/eqpt/calculate/importInfo.vue

@@ -1,5 +1,5 @@
 <template>
-  <div id="contrl" class="contrl">
+  <div id="contrl" class="contrl" v-loading="loading" element-loading-text="生成机器设备测算表中...">
     <el-divider content-position="left">
       <span style="color:#ff6154;">测算表作价</span>
     </el-divider>
@@ -1190,7 +1190,9 @@ export default {
       //是否全屏显示，默认否
       fullBoolean: false,
       // 是否开启自动赋值
-      autoSetValueStatus: false
+      autoSetValueStatus: false,
+      // 加载遮罩层
+      loading: false
     }
   },
   components: {
@@ -1893,6 +1895,7 @@ export default {
     },
     // 生成测算表
     generateEquipmentCalculate() {
+      this.loading = true;
       generateEquipmentCalculate(this.projectStore.calculateProgress.id).then((res) => {
         if (res.code == 200) {
           ElMessage({
@@ -1903,6 +1906,7 @@ export default {
           // 更新本地缓存的测算表进度
           this.projectStore.calculateProgress.progress = 'FINISHED'
         }
+        this.loading = false;
       })
     },
     // 更新进口设备测算

src/views/assets/workbench/eqpt/report/eqptBaseInfo.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="contrl" style="overflow: auto;height: 85vh;">
+    <div class="contrl" style="overflow: auto;height: 85vh;" v-loading="loading" element-loading-text="生成机器设备报告中...">
         <el-divider content-position="left"><span style="color:#ff6154;">生成报告</span></el-divider>
         <h3 style="text-align: center;">{{ consignorCompanyNames }}拟进行{{ eqptBaseInfo.purpose
         }}所涉及的{{ ownerCompanyNames }}持有的{{ eqptBaseInfo.assetsInfo.assetCount }}台/套机器设备{{ eqptBaseInfo.valueType }}</h3>
@@ -397,6 +397,7 @@ import { processDate, formatDate } from '@/utils/date'
 export default {
     data() {
         return {
+            loading: false,
             reportValidityDatePicker: 'daterange',
             eqptBaseInfo: {
                 consignorInfos: [],
@@ -653,6 +654,7 @@ export default {
         },
         // 生成机器设备报告word文件
         generateEquipmentReport() {
+            this.loading = true;
             generateEquipmentReport(this.projectStore.reportProgress.id).then(res => {
                 if (res.code == 200) {
                     ElMessage({
@@ -663,6 +665,7 @@ export default {
                     // 更新本地缓存的测算表进度
                     this.projectStore.reportProgress.progress = 'FINISHED'
                 }
+                this.loading = false;
             })
         }
     }