Merge branch 'master' of http://47.101.159.18:3000/Muchinfo/MTP2.0_WEB

src/views/report/spot-report/list/spot_report/index.vue

@@ -54,18 +54,36 @@
                rowKey="key"
                :data-source="detailTableList"
                :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }">
-        <template #curaverageprice="{ record }">
-          <span>{{ record.curaverageprice.toFixed(2) }}</span>
-        </template>
-        <template #curspotprice="{ record }">
-          <span>{{ record.curspotprice.toFixed(2) }}</span>
-        </template>
-        <template #curmarketvalue="{ record }">
-          <span>{{ record.curmarketvalue.toFixed(2) }}</span>
-        </template>
-        <template #floatpl="{ record }">
-          <span>{{ record.floatpl.toFixed(2) }}</span>
-        </template>
+          <template #curaverageprice="{ record }">
+              <span>{{ record.curaverageprice.toFixed(2) }}</span>
+          </template>
+          <template #oriaverageprice="{ record }">
+              <span>{{ record.oriaverageprice.toFixed(2) }}</span>
+          </template>
+          <template #oriamount="{ record }">
+              <span>{{ record.oriamount.toFixed(2) }}</span>
+          </template>
+          <template #todaybuyamount="{ record }">
+              <span>{{ record.todaybuyamount.toFixed(2) }}</span>
+          </template>
+          <template #todaybuyaverageprice="{ record }">
+              <span>{{ record.todaybuyaverageprice.toFixed(2) }}</span>
+          </template>
+          <template #todaysellaverageprice="{ record }">
+              <span>{{ record.todaysellaverageprice.toFixed(2) }}</span>
+          </template>
+          <template #actualpl="{ record }">
+              <span>{{ record.actualpl.toFixed(2) }}</span>
+          </template>
+          <template #curspotprice="{ record }">
+              <span>{{ record.curspotprice.toFixed(2) }}</span>
+          </template>
+          <template #floatpl="{ record }">
+              <span>{{ record.floatpl.toFixed(2) }}</span>
+          </template>
+          <template #curmarketvalue="{ record }">
+              <span>{{ record.curmarketvalue.toFixed(2) }}</span>
+          </template>
       </a-table>
     </Description>
   </div>