Explorar o código

Merge branch 'deploy_0804' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into deploy_0804

lilei %!s(int64=3) %!d(string=hai) anos
pai
achega
7acde6df0d
Modificáronse 1 ficheiros con 3 adicións e 6 borrados
  1. 3 6
      src/views/allocationManagement/transferOut/detail.vue

+ 3 - 6
src/views/allocationManagement/transferOut/detail.vue

@@ -34,7 +34,7 @@
       </a-card>
       <a-card size="small" :bordered="false" class="allocateBillDetail-cont">
         <!-- 总计 -->
-        <a-alert type="info" showIcon style="margin-bottom:15px">
+        <a-alert type="info" style="margin-bottom:15px">
           <div slot="message">
             总数量:<strong>{{ (productTotal&&(productTotal.totalQty || productTotal.totalQty==0)) ? productTotal.totalQty : '--' }}</strong> ,
             总成本(¥):<strong>{{ (productTotal&&(productTotal.totalCost || productTotal.totalCost==0)) ? productTotal.totalCost : '--' }}</strong> ,
@@ -84,8 +84,8 @@ export default {
         { title: '成本价', dataIndex: 'cost', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '售价', dataIndex: 'price', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '调出数量', dataIndex: 'qty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '成本小计(¥)', dataIndex: 'costSubtotal', width: 115, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '售价小计(¥)', dataIndex: 'priceSubtotal', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
+        { title: '成本小计(¥)', dataIndex: 'totalCost', width: 115, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '售价小计(¥)', dataIndex: 'totalPrice', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -94,9 +94,6 @@ export default {
           const no = (data.pageNo - 1) * data.pageSize
           for (var i = 0; i < data.list.length; i++) {
             data.list[i].no = no + i + 1
-            // 成本小计  由于数据库内小数位数为4位,页面则需显示2位。因此会做小数运算精度处理
-            data.list[i].costSubtotal = getOperationalPrecision(data.list[i].cost, data.list[i].qty)
-            data.list[i].priceSubtotal = getOperationalPrecision(data.list[i].price, data.list[i].qty)
           }
           this.localDataSource = data.list
           return data