Skip to content

J
jiedao-app-operator-master
Commit 1d4583e5 authored by chenjiuping's avatar chenjiuping
Browse files
Options

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

parents 845f4f24 95325a84
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 1 deletion
src/views/bpm/processInstance/detail.vue
View file @ 1d4583e5
...@@ -160,6 +160,10 @@ export default { ...@@ -160,6 +160,10 @@ export default {
return false return false
} }
const map = { const map = {
"shippingDetail": {
component: "shippingDetail",
processId: this.processInstance.businessKey,
},
// 报价单特价审核，原来配置的组件名 // 报价单特价审核，原来配置的组件名
"special-discount": { "special-discount": {
component: 'OfferSpecialDetail', component: 'OfferSpecialDetail',
......
src/views/ecw/financial/creatCollection.vue
View file @ 1d4583e5
...@@ -606,7 +606,7 @@ ...@@ -606,7 +606,7 @@
<el-input v-model="discountForm.discountRemark" type="textarea" style="width: 300px"></el-input> <el-input v-model="discountForm.discountRemark" type="textarea" style="width: 300px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="优惠后"> <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" /> <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="selectListRow.currencyId" />
</el-form-item> </el-form-item>
<el-form-item v-if="opnotice" label="操作人"> <el-form-item v-if="opnotice" label="操作人">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment