Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/views/purchasingManagement/purchaseOrderList.vue

@@ -835,10 +835,10 @@
       :append-to-body="true"
     >
       <el-table :data="transactionRecordList">
-        <el-table-column prop="transactionPrice" label="成交价">
+        <el-table-column prop="transactionPrice" label="成交价（元）">
         </el-table-column>
-        <el-table-column prop="basis" label="基差"> </el-table-column>
-        <el-table-column prop="turnover" label="成交量"> </el-table-column>
+        <el-table-column prop="basis" label="基差（元）"> </el-table-column>
+        <el-table-column prop="turnover" label="成交量（吨）"> </el-table-column>
         <el-table-column prop="dealDate" label="成交日期"> </el-table-column>
       </el-table>
     </el-dialog>
@@ -853,9 +853,9 @@
       <el-table :data="closePositionList">
         <el-table-column prop="transactionPrice" label="成交价">
         </el-table-column>
-        <el-table-column prop="closingPrice" label="平仓价"> </el-table-column>
-        <el-table-column prop="basis" label="基差"> </el-table-column>
-        <el-table-column prop="turnover" label="平仓量"> </el-table-column>
+        <el-table-column prop="closingPrice" label="平仓价（元）"> </el-table-column>
+        <el-table-column prop="basis" label="基差（元）"> </el-table-column>
+        <el-table-column prop="turnover" label="平仓量（吨）"> </el-table-column>
         <el-table-column prop="dealDate" label="平仓日期"> </el-table-column>
       </el-table>
     </el-dialog>

src/views/salesManagement/salesPlanOrderList.vue

@@ -878,10 +878,10 @@
       :append-to-body="true"
     >
       <el-table :data="transactionRecordList">
-        <el-table-column prop="transactionPrice" label="成交价">
+        <el-table-column prop="transactionPrice" label="成交价（元）">
         </el-table-column>
-        <el-table-column prop="basis" label="基差"> </el-table-column>
-        <el-table-column prop="turnover" label="成交量"> </el-table-column>
+        <el-table-column prop="basis" label="基差（元）"> </el-table-column>
+        <el-table-column prop="turnover" label="成交量（吨）"> </el-table-column>
         <el-table-column prop="dealDate" label="成交日期"> </el-table-column>
       </el-table>
     </el-dialog>
@@ -894,11 +894,11 @@
       :append-to-body="true"
     >
       <el-table :data="closePositionList">
-        <el-table-column prop="transactionPrice" label="成交价">
+        <el-table-column prop="transactionPrice" label="成交价（元）">
         </el-table-column>
-        <el-table-column prop="closingPrice" label="平仓价"> </el-table-column>
-        <el-table-column prop="basis" label="基差"> </el-table-column>
-        <el-table-column prop="turnover" label="平仓量"> </el-table-column>
+        <el-table-column prop="closingPrice" label="平仓价（元）"> </el-table-column>
+        <el-table-column prop="basis" label="基差（元）"> </el-table-column>
+        <el-table-column prop="turnover" label="平仓量（吨）"> </el-table-column>
         <el-table-column prop="dealDate" label="平仓日期"> </el-table-column>
       </el-table>
     </el-dialog>