Merge branch 'mergeBranch' into redUrgent

src/HDrpManagement/logistics/modules/dispatchTable.vue

@@ -84,6 +84,7 @@
           })
           this.tool.showMessage(res,()=>{
             this.listData()
+            this.$emit('delSuccess')
           })
         } else {
           this.tableData = this.tableData.filter(e=>{

src/HDrpManagement/logistics/modules/edit.vue

@@ -65,7 +65,7 @@ ed<template>
         </div>
         <el-row :gutter="10">
           <el-col :span="setcol">
-            <dispatch-table type="edit" :needQuery="true" ref="dislist" @isCorrelation="isCorrelation"></dispatch-table>
+            <dispatch-table type="edit" :needQuery="true" ref="dislist" @isCorrelation="isCorrelation" @delSuccess="delSuccess"></dispatch-table>
           </el-col>
           <el-col :span="24 - setcol">
             <add-disbill ref="addbill" :data="enterpriseInfo" @onConfirm="onConfirm"></add-disbill>
@@ -151,6 +151,9 @@ export default {
       })
 
     },
+    delSuccess(){
+      this.$refs['addbill'].listData()
+    },
     isCorrelation(val){
       this.isCorrelate = val
     },

src/HDrpManagement/orderManage/details/tabs/productlist.vue

@@ -182,6 +182,15 @@
           <div v-else-if="scope.column.columnname === 'price'">
             <p>¥&nbsp;{{tool.formatAmount(scope.column.data.price,2)}}</p>
           </div>
+          <div v-else-if="scope.column.columnname === 'invoiceamount'">
+            <p>¥&nbsp;{{tool.formatAmount(scope.column.data.price,2)}}</p>
+          </div>
+          <div v-else-if="scope.column.columnname === 'writeoffamount'">
+            <p>¥&nbsp;{{tool.formatAmount(scope.column.data.price,2)}}</p>
+          </div>
+          <div v-else-if="scope.column.columnname === 'aftersalesmagamount'">
+            <p>¥&nbsp;{{tool.formatAmount(scope.column.data.price,2)}}</p>
+          </div>
           <div v-else-if="scope.column.columnname === 'amount'">
             <p style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.column.data.amount,2)}}</p>
           </div>