Prechádzať zdrojové kódy

1.表尾合计段落模板
2.新增列原值增值率

GouGengquan 6 mesiacov pred
rodič
commit
f27148e1f8

+ 4 - 0
src/views/assets/template/createCalculate.vue

@@ -194,6 +194,10 @@ export default {
                     label: '机器设备-主模板-设备信息-段落模板',
                 },
                 {
+                    value: 'MAIN_BOTTOM_TOTAL',
+                    label: '机器设备-主模板-表尾合计-段落模板',
+                },
+                {
                     value: 'IMPORTED',
                     label: '机器设备-进口设备-段落模板',
                 },

+ 11 - 2
src/views/assets/workbench/calculate/importInfo.vue

@@ -331,10 +331,19 @@
               </span>
             </template>
           </vxe-column>
-          <vxe-column field="valueAddedRate" title="增值率%" width="160">
+          <vxe-column field="originalValueAddedRate" title="原值增值率%" width="160">
+            <template #default="{ row }">
+              <span :style="{color : (row.originalValueAddedRate > 0.3 || row.originalValueAddedRate < -0.3) ? 'red' : ''}">
+                {{ ((row.originalValueAddedRate = ((row.evaluateOriginalValue * 1 - row.bookOriginalValue * 1)
+                /
+                row.bookOriginalValue).toFixed(4)) * 100).toFixed(2) }}
+              </span>
+            </template>
+          </vxe-column>
+          <vxe-column field="netValueAddedRate" title="净值增值率%" width="160">
             <template #default="{ row }">
               <span>
-                {{ ((row.valueAddedRate = ((row.evaluateOriginalValue * 1 - row.bookNetValue * 1)
+                {{ ((row.netValueAddedRate = ((row.evaluateNetValue * 1 - row.bookNetValue * 1)
                 /
                 row.bookNetValue).toFixed(4)) * 100).toFixed(2) }}
               </span>