Browse Source

科研成果隐藏下载模板功能

ljb 7 months ago
parent
commit
4148e88a77

+ 1 - 1
src/views/achievement/other-achievements.vue

@@ -104,7 +104,7 @@
 
 
     </avue-crud>
     </avue-crud>
 
 
-    <upload-excel-dialog ref="uploadExcelDialog" :uploadAfter="uploadAfter"/>
+    <upload-excel-dialog ref="uploadExcelDialog" :showTempBtn="false" :uploadAfter="uploadAfter"/>
 
 
     <WideTablePrinter
     <WideTablePrinter
       ref="printWideTable"
       ref="printWideTable"

+ 1 - 1
src/views/achievement/patent-achievement.vue

@@ -74,7 +74,7 @@
       </template>
       </template>
 
 
     </avue-crud>
     </avue-crud>
-    <upload-excel-dialog ref="uploadExcelDialog" :uploadAfter="uploadAfter"/>
+    <upload-excel-dialog ref="uploadExcelDialog" :showTempBtn="false" :uploadAfter="uploadAfter"/>
     <WideTablePrinter
     <WideTablePrinter
       ref="printWideTable"
       ref="printWideTable"
       :columns="wideTableColumns"
       :columns="wideTableColumns"

+ 1 - 1
src/views/achievement/research-paper.vue

@@ -62,7 +62,7 @@
       </template>
       </template>
     </avue-crud>
     </avue-crud>
 
 
-    <upload-excel-dialog ref="uploadExcelDialog" :uploadAfter="uploadAfter"/>
+    <upload-excel-dialog ref="uploadExcelDialog" :showTempBtn="false" :uploadAfter="uploadAfter"/>
 
 
     <WideTablePrinter
     <WideTablePrinter
       ref="printWideTable"
       ref="printWideTable"

+ 1 - 1
src/views/achievement/soft-works.vue

@@ -105,7 +105,7 @@
       </template>
       </template>
     </avue-crud>
     </avue-crud>
 
 
-    <upload-excel-dialog ref="uploadExcelDialog" :uploadAfter="uploadAfter"/>
+    <upload-excel-dialog ref="uploadExcelDialog" :showTempBtn="false" :uploadAfter="uploadAfter"/>
 
 
     <WideTablePrinter
     <WideTablePrinter
       ref="printWideTable"
       ref="printWideTable"

+ 1 - 1
src/views/achievement/technical-standard.vue

@@ -71,7 +71,7 @@
 
 
     </avue-crud>
     </avue-crud>
 
 
-    <upload-excel-dialog ref="uploadExcelDialog" :uploadAfter="uploadAfter"/>
+    <upload-excel-dialog ref="uploadExcelDialog" :showTempBtn="false" :uploadAfter="uploadAfter"/>
 
 
     <WideTablePrinter
     <WideTablePrinter
       ref="printWideTable"
       ref="printWideTable"

+ 4 - 3
src/views/external-reports/external-manage/107-2.vue

@@ -519,9 +519,10 @@ export default {
         this.loading = false;
         this.loading = false;
         if (data.code == 200) {
         if (data.code == 200) {
           this.isLoad = true;
           this.isLoad = true;
-          
-          let d43 = (new Decimal(data.data.d43 || 0).div(1000)).toFixed(2);
-          let d57 = (new Decimal(data.data.d7).sub(d43).sub(new Decimal(data.data.d58)).sub(new Decimal(data.data.d55)).sub(new Decimal(data.data.d56))).toFixed(2);
+
+          const { d7, d43, d58, d55, d56 } = data.data;
+          // let d43 = (new Decimal(data.data.d43 || 0).div(1000)).toFixed(2);
+          let d57 = (new Decimal(d7).sub(d43).sub(new Decimal(d58)).sub(new Decimal(d55)).sub(new Decimal(d56))).toFixed(2);
           this.formData = {
           this.formData = {
             ...data.data,
             ...data.data,
             d43,
             d43,