Merge remote-tracking branch 'origin/master'

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

@@ -52,7 +52,7 @@
               <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">车辆信息({{ formobj.vinNo }} — {{ formobj.brandName }} — {{ formobj.purchaseSystemName }})</div>
+          <div class="title">车辆信息({{ formobj.vinNo }} — {{ formobj.purchaseSystemName }} — {{ formobj.brandName }})</div>
           <el-row>
             <el-col :span="8">
               <div class="span-sty">厂家结算价</div>

anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanguanli/collectionrebatemanagement.vue

@@ -144,6 +144,7 @@
         <el-table-column prop="createOrgName" label="分公司" align="center" min-width="150" />
         <el-table-column prop="purchaseSystemName" label="采购系统" align="center" width="140" />
         <el-table-column prop="brandName" label="品牌" align="center" width="120" />
+        <el-table-column prop="costTitleValue" label="款项名称" align="center" min-width="120" />
         <el-table-column prop="collectionTypeValue" label="回款方式" align="center" width="150" />
         <el-table-column prop="manufaSaleChannelValue" label="厂家回款通路" align="center" width="160" />
         <el-table-column prop="collectionMoney" label="回款金额" align="center" width="130" />

anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobechecked.vue

@@ -82,7 +82,7 @@
             <el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="150" />
             <el-table-column prop="rebateName" label="返利名称" align="center" min-width="150" />
             <el-table-column prop="calculationStandard" label="计算标准" align="center" width="120" />
-            <el-table-column prop="estimateRebate" label="预计返利" align="center" width="130" />
+            <el-table-column prop="estimateRebate" label="预提返利" align="center" width="130" />
             <el-table-column prop="withholdingDate" label="预提日期" align="center" width="120" />
             <el-table-column prop="uploadDate" label="上传日期" align="center" width="120" />
             <el-table-column prop="uploadMoney" label="上传金额" align="center" width="130" />

anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobecheckedAdd.vue

@@ -47,7 +47,7 @@
           </el-row>
           <el-row>
             <el-col :span="8">
-              <div class="span-sty">预计返利</div>
+              <div class="span-sty">预提返利</div>
               <el-form-item><span class="addinputInfo">{{ formobj.estimateRebate }}</span></el-form-item>
             </el-col>
             <el-col :span="8">
@@ -80,7 +80,7 @@
             <el-table-column prop="carModelName" label="车型" align="center" min-width="150" />
             <el-table-column prop="vinNo" label="车架号" align="center" width="150" />
             <el-table-column prop="costPrice" label="回款金额" align="center" width="130" />
-            <el-table-column prop="estimateRebate" label="预计返利" align="center" width="130" />
+            <el-table-column prop="estimateRebate" label="预提返利" align="center" width="130" />
             <el-table-column prop="uploadMoney" label="上传金额" align="center" width="130" />
             <el-table-column prop="adjustmentMoney" label="调整金额" align="center" width="130" />
           </el-table>

anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobecheckedInfo.vue

@@ -45,7 +45,7 @@
           </el-row>
           <el-row>
             <el-col :span="8">
-              <div class="span-sty">预计返利</div>
+              <div class="span-sty">预提返利</div>
               <el-form-item><span class="addinputInfo">{{ formobj.estimateRebate }}</span></el-form-item>
             </el-col>
             <el-col :span="8">
@@ -73,7 +73,7 @@
             <el-table-column prop="carModelName" label="车型" align="center" min-width="150" />
             <el-table-column prop="vinNo" label="车架号" align="center" width="150" />
             <el-table-column prop="costPrice" label="回款金额" align="center" width="130" />
-            <el-table-column prop="estimateRebate" label="预计返利" align="center" width="130" />
+            <el-table-column prop="estimateRebate" label="预提返利" align="center" width="130" />
             <el-table-column prop="uploadMoney" label="上传金额" align="center" width="130" />
             <el-table-column prop="adjustmentMoney" label="调整金额" align="center" width="130" />
           </el-table>