Merge remote-tracking branch 'origin/dev' into dev

src/views/bpm/processInstance/detail.vue

@@ -160,6 +160,10 @@ export default {
         return false
       }
       const map = {
+      "shippingDetail": {
+          component: "shippingDetail",
+          processId: this.processInstance.businessKey,
+        },
         // 报价单特价审核，原来配置的组件名
         "special-discount": {
           component: 'OfferSpecialDetail',

src/views/ecw/financial/creatCollection.vue

@@ -606,7 +606,7 @@
           <el-input v-model="discountForm.discountRemark" type="textarea" style="width: 300px"></el-input>
         </el-form-item>
         <el-form-item label="优惠后">
-          {{ selectListRow.totalAmount - (discountForm.discountTotal || 0) }}
+          {{ (selectListRow.totalAmount - (discountForm.discountTotal || 0)).toFixed(2)}}
           <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="selectListRow.currencyId" />
         </el-form-item>
         <el-form-item v-if="opnotice" label="操作人">