完善单车返利管理

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

@@ -60,11 +60,16 @@
                 <el-button type="primary" size="mini" @click="toInfo(scope.row)">查看</el-button>
               </template>
             </el-table-column>
-            <el-table-column label="状态" align="center" width="200">
+            <el-table-column label="状态" align="center" width="150">
               <template slot-scope="scope">
                 <span>{{ scope.row.state == '0' ? '未计提' : scope.row.state == '1' ? '计提中' : scope.row.state == '2' ? '待核对' : scope.row.state == '3' ? '核对中' : scope.row.state == '4' ? '已核对' : '' }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="一次核对状态" align="center" width="160">
+              <template slot-scope="scope">
+                <span>{{ scope.row.onceCheckState == '1' ? '是' : scope.row.onceCheckState == '0' ? '否' : '' }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="品牌" align="center" width="200">
               <template slot-scope="scope">
                 <span>{{ scope.row.brandName }}</span>
@@ -75,17 +80,17 @@
                 <span>{{ scope.row.vehModelName }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="车架号" align="center" width="250">
+            <el-table-column label="车架号" align="center" width="150">
               <template slot-scope="scope">
                 <span>{{ scope.row.vinNo }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="厂家结算价" align="center" width="200">
+            <el-table-column label="厂家结算价" align="center" width="140">
               <template slot-scope="scope">
                 <span>{{ scope.row.manufactorSettlementPrice }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="其中运费" align="center" width="200">
+            <el-table-column label="其中运费" align="center" width="120">
               <template slot-scope="scope">
                 <span>{{ scope.row.freight }}</span>
               </template>
@@ -115,6 +120,11 @@
                 <span>{{ scope.row.estimateRebate }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="其中预计费用" align="center" width="160">
+              <template slot-scope="scope">
+                <span>{{ scope.row.expectCost }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="所属年月" align="center" width="120">
               <template slot-scope="scope">
                 <span>{{ scope.row.palceGenDate }}</span>
@@ -130,7 +140,7 @@
                 <span>{{ scope.row.uploadDate }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="上传金额" align="center" width="150">
+            <el-table-column label="上传金额" align="center" width="120">
               <template slot-scope="scope">
                 <span>{{ scope.row.uploadMoney }}</span>
               </template>
@@ -160,7 +170,12 @@
                 <span>{{ scope.row.isAdjustment }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="调整金额" align="center" width="100">
+            <el-table-column label="差异金额" align="center" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.diffAmount }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="调整金额" align="center" width="120">
               <template slot-scope="scope">
                 <span>{{ scope.row.adjustmentMoney }}</span>
               </template>
@@ -170,6 +185,11 @@
                 <span>{{ scope.row.adjustmentRemarks }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="备注" align="center" min-width="200">
+              <template slot-scope="scope">
+                <span>{{ scope.row.estimateRebate }}</span>
+              </template>
+            </el-table-column>
           </el-table>
         </div>
         <div class="pages">

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

@@ -16,53 +16,44 @@
       <!--Start 新增修改部分-->
       <div class="listconadd">
         <div class="titwu"><span>单车返利</span></div>
-        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formadd">
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
           <el-row style="border-top: 1px solid #E0E3EB">
-            <el-col :span="4" class="tleftb">
-              <span><span class="icon">*</span>返利类型</span>
-            </el-col>
-            <el-col :span="4">
+            <el-col :span="8">
+              <div class="span-sty"><span class="icon">*</span>采购方式</div>
               <el-form-item prop="rebateTypeValue">
-                <el-select v-model="formobj.rebateTypeValue" placeholder="请选择" filterable clearable @change="changeRebateType">
+                <el-select class="addinputInfo" v-model="formobj.rebateTypeValue" placeholder="请选择" filterable clearable @change="changeRebateType">
                   <el-option v-for="item in rebateType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="4" class="tleftb">
-              <span><span class="icon">*</span>厂家返利名称</span>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item prop="rebateName"><el-input v-model="formobj.rebateName" class="addinputw" placeholder="" clearable></el-input></el-form-item>
-            </el-col>
-            <el-col :span="4" class="tleftb">
-              <span><span class="icon">*</span>所属年月</span>
+            <el-col :span="8">
+              <div class="span-sty"><span class="icon">*</span>厂家返利名称</div>
+              <el-form-item prop="rebateName"><el-input class="addinputInfo addinputw" v-model="formobj.rebateName" placeholder="" clearable></el-input></el-form-item>
             </el-col>
-            <el-col :span="4">
-              <el-form-item prop="palceGenDate"><el-date-picker v-model="formobj.palceGenDate" type="month" clearable format="yyyy-MM" value-format="yyyy-MM" placeholder="选择日期"/></el-form-item>
+            <el-col :span="8">
+              <div class="span-sty"><span class="icon">*</span>所属年月</div>
+              <el-form-item prop="palceGenDate"><el-date-picker class="addinputInfo" v-model="formobj.palceGenDate" type="month" clearable format="yyyy-MM" value-format="yyyy-MM" placeholder="选择日期" /></el-form-item>
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="4" class="tleftb">
-              <span><span class="icon">*</span>计算方式</span>
-            </el-col>
-            <el-col :span="4">
+            <el-col :span="8">
+              <div class="span-sty"><span class="icon">*</span>计算方式</div>
               <el-form-item prop="calculationModeValue">
-                <el-select v-model="formobj.calculationModeValue" placeholder="请选择" filterable clearable @change="changeCalculationMode">
+                <el-select class="addinputInfo" v-model="formobj.calculationModeValue" placeholder="请选择" filterable clearable @change="changeCalculationMode">
                   <el-option v-for="item in calculationMode_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="4" class="tleftb">
-              <span><span class="icon">*</span>计算标准
+            <el-col :span="16">
+              <div class="span-sty">
+                <span class="icon">*</span>计算标准
                 <span v-if="formobj.calculationModeValue == '比例'">(%)</span>
                 <span v-else>(元)</span>
-              </span>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item prop="calculationStandard"><el-input v-model="formobj.calculationStandard" @keyup.native="formobj.calculationStandard = getNumber(formobj.calculationStandard, 2)" clearable placeholder="" class="addinputw"></el-input></el-form-item>
+              </div>
+              <el-form-item prop="calculationStandard"><el-input class="addinputInfo addinputw" v-model="formobj.calculationStandard" @keyup.native="formobj.calculationStandard = getNumber(formobj.calculationStandard, 2)" clearable placeholder="" /></el-form-item>
             </el-col>
           </el-row>
-          <div class="title">
+          <div class="title titleOne">
             <div>返利车辆列表</div>
             <div>
               <el-button type="primary" size="mini" icon="el-icon-plus" class="btntopblueline" @click="addjacket()">批量选择</el-button>
@@ -76,13 +67,29 @@
                 </el-button>
               </template>
             </el-table-column>
-            <el-table-column prop="vinNo" label="车架号" align="center" />
-            <el-table-column prop="manufactorSettlementPrice" label="厂家结算价" align="center" />
-            <el-table-column prop="freight" label="其中运费" align="center" />
-            <el-table-column prop="estimateRebate" label="预计返利" align="center" />
-            <el-table-column label="备注" align="center">
+            <el-table-column prop="vinNo" label="车架号" align="center" width="150" />
+            <el-table-column prop="manufactorSettlementPrice" label="厂家结算价" align="center" width="140"/>
+            <el-table-column prop="freight" label="其中运费" align="center" width="130" />
+            <el-table-column prop="topAmount" label="上装" align="center" width="120" />
+            <el-table-column prop="estimateRebate" label="预计返利" align="center" width="130" />
+            <el-table-column label="其中待支付费用" align="center" min-width="200">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.expectTreatCost" @keyup.native="scope.row.expectTreatCost = getNumber(scope.row.expectTreatCost, 2)" clearable placeholder=""></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column label="其中抵顶费用" align="center" min-width="200">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.expectSuppCost" @keyup.native="scope.row.expectSuppCost = getNumber(scope.row.expectSuppCost, 2)" clearable placeholder=""></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column label="抵顶费用说明" align="center" min-width="200">
               <template slot-scope="scope">
-                <el-input v-model="scope.row.remarks" clearable placeholder="" class="addinputw"></el-input>
+                <el-input v-model="scope.row.expectSuppRemark" clearable placeholder=""></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column label="备注" align="center" min-width="200">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.remarks" clearable placeholder=""></el-input>
               </template>
             </el-table-column>
           </el-table>
@@ -207,22 +214,32 @@ export default {
         value.forEach((e) => {
           this.formobj.scmVehRebateVehs.push({
             vinNo: e.vinNo,
+            vehSid: e.vehSid,
             manufactorSettlementPrice: e.manufactorSettlementPrice,
             freight: e.freight,
+            topAmount: e.topAmount,
+            estimateRebate: '',
+            expectTreatCost: '',
+            expectSuppCost: '',
+            expectSuppRemark: '',
             brandName: e.brandName,
             brandSid: e.brandSid,
             vehModelName: e.vehModelName,
             vehModelSid: e.vehModelSid,
-            vehSid: e.vehSid,
-            estimateRebate: '',
             remarks: ''
           })
         })
       }
       this.formobj.scmVehRebateVehs.forEach((e) => {
-        // 计算方式为比例时，预计返利 = （厂家结算价 - 运费） * （计算标准 / 100）
+        // 计算方式为比例时，
         if (this.formobj.calculationModeKey === '001') {
-          e.estimateRebate = Math.round(((parseFloat(e.manufactorSettlementPrice !== '' ? e.manufactorSettlementPrice : 0) - parseFloat(e.freight !== '' ? e.freight : 0)) * (parseFloat(this.formobj.calculationStandard) / 100)) * 100) / 100
+          if (e.brandName === '陕汽') {
+            // 预计返利 = （厂家结算价 - 运费 - 上装） * （计算标准 / 100）
+            e.estimateRebate = Math.round(((parseFloat(e.manufactorSettlementPrice !== '' ? e.manufactorSettlementPrice : 0) - parseFloat(e.freight !== '' ? e.freight : 0) - parseFloat(e.topAmount !== '' ? e.topAmount : 0)) * (parseFloat(this.formobj.calculationStandard) / 100)) * 100) / 100
+          } else {
+            // 预计返利 = （厂家结算价 - 运费） * （计算标准 / 100）
+            e.estimateRebate = Math.round(((parseFloat(e.manufactorSettlementPrice !== '' ? e.manufactorSettlementPrice : 0) - parseFloat(e.freight !== '' ? e.freight : 0)) * (parseFloat(this.formobj.calculationStandard) / 100)) * 100) / 100
+          }
         } else if (this.formobj.calculationModeKey === '002') {
           // 计算方式为固定金额时，预计返利 = 计算标准
           e.estimateRebate = this.formobj.calculationStandard
@@ -306,7 +323,20 @@ export default {
 }
 </script>
 <style scoped>
-.title {
+.span-sty {
+  width: 130px !important;
+}
+.addinputInfo {
+  margin-left: 120px !important;
+}
+.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+  margin-left: 120px !important;
+  width: calc(100% - 115px);
+}
+/deep/ .el-form-item__error {
+  margin-left: 120px !important;
+}
+.titleOne {
   padding: 7px;
   display: flex;
   flex-direction: row;

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

@@ -317,7 +317,8 @@ export default {
           manufactorSettlementPrice: element.costPrice,
           freight: element.freight,
           vehModelName: element.vehicleAlias,
-          vehModelSid: element.modelSid
+          vehModelSid: element.modelSid,
+          topAmount: element.topAmount
         })
       })
       this.sids = aa

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

@@ -7,8 +7,7 @@
         <div>{{ viewTitle }}</div>
         <!--start 添加修改按钮-->
         <div>
-          <el-button type="primary" size="small" :disabled="submitdisabled" @click="save()">保存
-          </el-button>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="save()">保存</el-button>
           <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
         </div>
       </div>
@@ -16,97 +15,82 @@
       <!--Start 新增修改部分-->
       <div class="listconadd">
         <div class="titwu"><span>单车返利</span></div>
-        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formadd">
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
           <el-row style="border-top: 1px solid #E0E3EB">
-            <el-col :span="4" class="tleftb">
-              <span><span class="icon">*</span>返利类型</span>
-            </el-col>
-            <el-col :span="4">
+            <el-col :span="8">
+              <div class="span-sty"><span class="icon">*</span>采购方式</div>
               <el-form-item prop="rebateTypeValue">
-                <el-select v-model="formobj.rebateTypeValue" placeholder="请选择" filterable clearable @change="changeRebateType">
+                <el-select class="addinputInfo" v-model="formobj.rebateTypeValue" placeholder="请选择" filterable clearable @change="changeRebateType">
                   <el-option v-for="item in rebateType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="4" class="tleftb">
-              <span><span class="icon">*</span>厂家返利名称</span>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item prop="rebateName"><el-input v-model="formobj.rebateName" class="addinputw" placeholder="" clearable></el-input></el-form-item>
-            </el-col>
-            <el-col :span="4" class="tleftb">
-              <span><span class="icon">*</span>所属年月</span>
+            <el-col :span="8">
+              <div class="span-sty"><span class="icon">*</span>厂家返利名称</div>
+              <el-form-item prop="rebateName"><el-input class="addinputInfo addinputw" v-model="formobj.rebateName" placeholder="" clearable></el-input></el-form-item>
             </el-col>
-            <el-col :span="4">
-              <el-form-item prop="palceGenDate"><el-date-picker v-model="formobj.palceGenDate" type="month" clearable format="yyyy-MM" value-format="yyyy-MM" placeholder="选择日期"/></el-form-item>
+            <el-col :span="8">
+              <div class="span-sty"><span class="icon">*</span>所属年月</div>
+              <el-form-item prop="palceGenDate"><el-date-picker class="addinputInfo" v-model="formobj.palceGenDate" type="month" clearable format="yyyy-MM" value-format="yyyy-MM" placeholder="选择日期" /></el-form-item>
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="4" class="tleftb">
-              <span><span class="icon">*</span>计算方式</span>
-            </el-col>
-            <el-col :span="4">
+            <el-col :span="8">
+              <div class="span-sty"><span class="icon">*</span>计算方式</div>
               <el-form-item prop="calculationModeValue">
-                <el-select v-model="formobj.calculationModeValue" placeholder="请选择" filterable clearable @change="changeCalculationMode">
+                <el-select class="addinputInfo" v-model="formobj.calculationModeValue" placeholder="请选择" filterable clearable @change="changeCalculationMode">
                   <el-option v-for="item in calculationMode_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="4" class="tleftb">
-              <span><span class="icon">*</span>计算标准
+            <el-col :span="16">
+              <div class="span-sty">
+                <span class="icon">*</span>计算标准
                 <span v-if="formobj.calculationModeValue == '比例'">(%)</span>
                 <span v-else>(元)</span>
-              </span>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item prop="calculationStandard"><el-input v-model="formobj.calculationStandard" @keyup.native="formobj.calculationStandard = getNumber(formobj.calculationStandard, 2)" clearable placeholder="" class="addinputw"></el-input></el-form-item>
+              </div>
+              <el-form-item prop="calculationStandard"><el-input class="addinputInfo addinputw" v-model="formobj.calculationStandard" @keyup.native="formobj.calculationStandard = getNumber(formobj.calculationStandard, 2)" clearable placeholder="" /></el-form-item>
             </el-col>
           </el-row>
-          <div class="title">
-            <div>返利车辆</div>
-          </div>
+          <div class="title">车辆信息({{ formobj.vinNo }})</div>
           <el-row>
-            <el-col :span="4" class="tleftb">
-              <span>车架号</span>
+            <el-col :span="8">
+              <div class="span-sty">厂家结算价</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.manufactorSettlementPrice }}</span></el-form-item>
             </el-col>
-            <el-col :span="4">
-              <el-form-item>
-                <span>{{ formobj.vinNo }}</span>
-              </el-form-item>
+            <el-col :span="8">
+              <div class="span-sty">运费</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.freight }}</span></el-form-item>
             </el-col>
-            <el-col :span="4" class="tleftb">
-              <span>厂家结算价</span>
+            <el-col :span="8">
+              <div class="span-sty">上装</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.topAmount }}</span></el-form-item>
             </el-col>
-            <el-col :span="4">
-              <el-form-item>
-                <span>{{ formobj.manufactorSettlementPrice }}</span>
-              </el-form-item>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">预计返利</div>
+              <el-form-item><span class="addinputInfo">{{ estimateRebateSum }}</span></el-form-item>
             </el-col>
-            <el-col :span="4" class="tleftb">
-              <span>其中运费</span>
+            <el-col :span="8">
+              <div class="span-sty">其中待支付费用</div>
+              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.expectTreatCost" @keyup.native="formobj.expectTreatCost = getNumber(formobj.expectTreatCost, 2)" clearable placeholder="" /></el-form-item>
             </el-col>
-            <el-col :span="4">
-              <el-form-item>
-                <span>{{ formobj.freight }}</span>
-              </el-form-item>
+            <el-col :span="8">
+              <div class="span-sty">其中抵顶费用</div>
+              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.expectSuppCost" @keyup.native="formobj.expectSuppCost = getNumber(formobj.expectSuppCost, 2)" clearable placeholder="" /></el-form-item>
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="4" class="tleftb">
-              <span>预计返利</span>
+            <el-col :span="24">
+              <div class="span-sty">抵顶费用说明</div>
+              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.expectSuppRemark" clearable placeholder="" /></el-form-item>
             </el-col>
-            <el-col :span="4">
-              <el-form-item>
-                <span>{{ estimateRebateSum }}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4" class="tleftb">
-              <span>备注</span>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item>
-                <el-input v-model="formobj.remarks" clearable placeholder="" class="addinputw"></el-input>
-              </el-form-item>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">备注</div>
+              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.remarks" clearable placeholder="" /></el-form-item>
             </el-col>
           </el-row>
         </el-form>
@@ -275,6 +259,20 @@ export default {
   }
 }
 </script>
+
 <style scoped>
+.span-sty {
+  width: 130px !important;
+}
+.addinputInfo {
+  margin-left: 120px !important;
+}
+.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+  margin-left: 120px !important;
+  width: calc(100% - 115px);
+}
+/deep/ .el-form-item__error {
+  margin-left: 120px !important;
+}
 </style>
 

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

@@ -14,89 +14,164 @@
       <!--Start 新增修改部分-->
       <div class="listconadd">
         <div class="titwu"><span>单车返利</span></div>
-        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formadd">
-          <el-row style="border-top: 1px solid #E0E3EB">
-            <el-col :span="4" class="tleftb">
-              <span>返利类型</span>
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+          <el-row style="border-top: 1px solid #e0e3eb">
+            <el-col :span="8">
+              <div class="span-sty">品牌</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.brandName }}</span></el-form-item>
             </el-col>
-            <el-col :span="4">
-              <el-form-item><span>{{ formobj.rebateTypeValue }}</span></el-form-item>
+            <el-col :span="8">
+              <div class="span-sty">车型</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.vehModelName }}</span></el-form-item>
             </el-col>
-            <el-col :span="4" class="tleftb">
-              <span>厂家返利名称</span>
+            <el-col :span="8">
+              <div class="span-sty">车架号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.vinNo }}</span></el-form-item>
             </el-col>
-            <el-col :span="4">
-              <el-form-item><span>{{ formobj.rebateName }}</span></el-form-item>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">厂家结算价</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.manufactorSettlementPrice }}</span></el-form-item>
             </el-col>
-            <el-col :span="4" class="tleftb">
-              <span>所属年月</span>
+            <el-col :span="8">
+              <div class="span-sty">运费</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.freight }}</span></el-form-item>
             </el-col>
-            <el-col :span="4">
-              <el-form-item><span>{{ formobj.palceGenDate }}</span></el-form-item>
+            <el-col :span="8">
+              <div class="span-sty">上装</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.topAmount }}</span></el-form-item>
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="4" class="tleftb">
-              <span>计算方式</span>
+            <el-col :span="8">
+              <div class="span-sty">返利类型</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.rebateTypeValue }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">返利名称</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.rebateName }}</span></el-form-item>
             </el-col>
-            <el-col :span="4">
-              <el-form-item><span>{{ formobj.calculationModeValue }}</span></el-form-item>
+            <el-col :span="8">
+              <div class="span-sty">所属年月</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.palceGenDate }}</span></el-form-item>
             </el-col>
-            <el-col :span="4" class="tleftb">
-              <span>计算标准
-                <span v-if="formobj.calculationModeValue == '比例'">(%)</span>
-                <span v-else>(元)</span>
-              </span>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">计算方式</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.calculationModeValue }}</span></el-form-item>
             </el-col>
-            <el-col :span="12">
-              <el-form-item><span>{{ formobj.calculationStandard }}</span></el-form-item>
+            <el-col :span="8">
+              <div class="span-sty">计算标准</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.calculationStandard }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">状态</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.state == '0' ? '未计提' : formobj.state == '1' ? '计提中' : formobj.state == '2' ? '待核对' : formobj.state == '3' ? '核对中' : formobj.state == '4' ? '已核对' : '' }}</span></el-form-item>
             </el-col>
           </el-row>
-          <div class="title">
-            <div>返利车辆</div>
-          </div>
           <el-row>
-            <el-col :span="4" class="tleftb">
-              <span>车架号</span>
+            <el-col :span="8">
+              <div class="span-sty">预提返利</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.estimateRebate }}</span></el-form-item>
             </el-col>
-            <el-col :span="4">
-              <el-form-item>
-                <span>{{ formobj.vinNo }}</span>
-              </el-form-item>
+            <el-col :span="8">
+              <div class="span-sty">其中待支付费用</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.expectTreatCost }}</span></el-form-item>
             </el-col>
-            <el-col :span="4" class="tleftb">
-              <span>厂家结算价</span>
+            <el-col :span="8">
+              <div class="span-sty">其中抵顶费用</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.expectSuppCost }}</span></el-form-item>
             </el-col>
-            <el-col :span="4">
-              <el-form-item>
-                <span>{{ formobj.manufactorSettlementPrice }}</span>
-              </el-form-item>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">抵顶费用说明</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.expectSuppRemark }}</span></el-form-item>
             </el-col>
-            <el-col :span="4" class="tleftb">
-              <span>其中运费</span>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">备注</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">一次上传</div>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">上传日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.uploadDate }}</span></el-form-item>
             </el-col>
-            <el-col :span="4">
-              <el-form-item>
-                <span>{{ formobj.freight }}</span>
-              </el-form-item>
+            <el-col :span="8">
+              <div class="span-sty">上传金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.uploadMoney }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">其中待确定金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.stayDetermineMoney }}</span></el-form-item>
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="4" class="tleftb">
-              <span>预计返利</span>
+            <el-col :span="8">
+              <div class="span-sty">其中待支付费用</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.onceTreatCost }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">其中抵顶费用</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.onceSuppCost }}</span></el-form-item>
             </el-col>
-            <el-col :span="4">
-              <el-form-item>
-                <span>{{ formobj.estimateRebate }}</span>
-              </el-form-item>
+            <el-col :span="8">
+              <div class="span-sty">抵顶费用说明</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.onceSuppRemark }}</span></el-form-item>
             </el-col>
-            <el-col :span="4" class="tleftb">
-              <span>备注</span>
+          </el-row>
+          <div class="title">二次上传</div>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">上传日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.secondaryUploadDate }}</span></el-form-item>
             </el-col>
-            <el-col :span="12">
-              <el-form-item>
-                <span>{{ formobj.remarks }}</span>
-              </el-form-item>
+            <el-col :span="8">
+              <div class="span-sty">上传金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.secondaryUploadMoney }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">其中待支付费用</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.secondTreatCost }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">其中抵顶费用</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.secondSuppCost }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">抵顶费用说明</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.secondSuppRemark }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">调整说明</div>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">差异金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.diffAmount }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">是否调整</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.isAdjustment }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">调整金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.adjustmentMoney }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">调整说明</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.adjustmentRemarks }}</span></el-form-item>
             </el-col>
           </el-row>
         </el-form>
@@ -146,5 +221,11 @@ export default {
 }
 </script>
 <style scoped>
+.span-sty {
+  width: 130px !important;
+}
+.addinputInfo {
+  margin-left: 120px !important;
+}
 </style>