Merge remote-tracking branch 'origin/master'

anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementEdit.vue

@@ -122,10 +122,16 @@ export default {
         calculationStandard: '',
         sid: '',
         vinNo: '',
+        brandName: '',
+        purchaseSystemName: '',
         manufactorSettlementPrice: '',
         freight: '',
+        topAmount: '',
         estimateRebate: '',
-        remarks: ''
+        remarks: '',
+        expectTreatCost: '',
+        expectSuppCost: '',
+        expectSuppRemark: ''
       },
       rules: {
         rebateTypeValue: [{ required: true, message: '返利类型不能为空', trigger: 'change' }],
@@ -140,9 +146,15 @@ export default {
   computed: {
     estimateRebateSum() {
       let estimateRebate = '0'
+      // 计算方式为比例时，
       if (this.formobj.calculationModeKey === '001') {
-        // 计算方式为比例时，预计返利 = （车辆入库价 - 运费） * （计算标准 / 100）
-        estimateRebate = Math.round(((parseFloat(this.formobj.manufactorSettlementPrice !== '' ? this.formobj.manufactorSettlementPrice : 0) - parseFloat(this.formobj.freight !== '' ? this.formobj.freight : 0)) * (parseFloat(this.formobj.calculationStandard) / 100)) * 100) / 100
+        if (this.formobj.brandName === '陕汽') {
+          // 预计返利 = （车辆入库价 - 运费 - 上装） * （计算标准 / 100）
+          estimateRebate = Math.round(((parseFloat(this.formobj.manufactorSettlementPrice !== '' ? this.formobj.manufactorSettlementPrice : 0) - parseFloat(this.formobj.freight !== '' ? this.formobj.freight : 0) - parseFloat(this.formobj.topAmount !== '' ? this.formobj.topAmount : 0)) * (parseFloat(this.formobj.calculationStandard) / 100)) * 100) / 100
+        } else {
+          // 预计返利 = （车辆入库价 - 运费） * （计算标准 / 100）
+          estimateRebate = Math.round(((parseFloat(this.formobj.manufactorSettlementPrice !== '' ? this.formobj.manufactorSettlementPrice : 0) - parseFloat(this.formobj.freight !== '' ? this.formobj.freight : 0)) * (parseFloat(this.formobj.calculationStandard) / 100)) * 100) / 100
+        }
       } else if (this.formobj.calculationModeKey === '002') {
         // 计算方式为固定金额时，预计返利 = 计算标准
         estimateRebate = this.formobj.calculationStandard
@@ -243,15 +255,17 @@ export default {
         calculationModeValue: '',
         calculationStandard: '',
         sid: '',
-        createOrgSid: '',
-        createOrgName: '',
-        useOrgSid: '',
-        useOrgName: '',
         vinNo: '',
+        brandName: '',
+        purchaseSystemName: '',
         manufactorSettlementPrice: '',
         freight: '',
+        topAmount: '',
         estimateRebate: '',
-        remarks: ''
+        remarks: '',
+        expectTreatCost: '',
+        expectSuppCost: '',
+        expectSuppRemark: ''
       }
       this.$refs['form_obj'].resetFields()
       this.$emit('doback')