Merge branch 'feature/GFRS-2015【待确定】开门红需求-电投改造' into dev

# Conflicts:
#	src/views/ebiz/common/CalculatePremium.vue
This commit is contained in:
mengxiaolong
2020-12-03 17:49:47 +08:00

View File

@@ -295,7 +295,7 @@
</div> </div>
</template> </template>
<script> <script>
import { Tag, Icon, Dialog, ActionSheet, Popup, Picker, Stepper, Field, Checkbox, Radio, RadioGroup } from 'vant' import { Tag, Icon, Dialog, ActionSheet, Popup, Picker, Stepper, Field, Checkbox, RadioGroup, Radio } from 'vant'
import { trial } from '@/api/ebiz/common/common' import { trial } from '@/api/ebiz/common/common'
import { saveOrUpdateOrderInfo, getOrderDetail } from '@/api/ebiz/sale/sale' import { saveOrUpdateOrderInfo, getOrderDetail } from '@/api/ebiz/sale/sale'
import { saveProposal } from '@/api/ebiz/proposal/proposal.js' import { saveProposal } from '@/api/ebiz/proposal/proposal.js'
@@ -1237,6 +1237,10 @@ export default {
}) })
this.setRemitRisk() this.setRemitRisk()
let params = this.getParams() let params = this.getParams()
// 开门红产品试算增加标识
if (this.activeType == 'KMH' && this.isFrom != 'proposal') {
params.isKmh = 1
}
let resultData = await trial(params) let resultData = await trial(params)
//试算成功,信息返显 //试算成功,信息返显