完善回款返利管理--增加款项名称、车辆列表增加上装、运费

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

@@ -82,6 +82,7 @@
             <el-table-column prop="createOrgName" label="分公司" align="center" 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" width="150" />
             <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/huikuanguanli/collectionrebatemanagementAdd.vue

@@ -17,18 +17,22 @@
         <div class="titwu"><span>回款返利</span></div>
         <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
           <el-row style="border-top: 1px solid #e0e3eb">
-            <el-col :span="8">
+            <el-col :span="6">
               <div class="span-sty">分公司</div>
               <el-form-item><span class="addinputInfo">{{ formobj.useOrgName }}</span></el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
               <div class="span-sty">采购系统</div>
               <el-form-item><span class="addinputInfo">{{ formobj.purchaseSystemName }}</span></el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
               <div class="span-sty">品牌</div>
               <el-form-item><span class="addinputInfo">{{ formobj.brandName }}</span></el-form-item>
             </el-col>
+            <el-col :span="6">
+              <div class="span-sty">款项名称</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.costTitleValue }}</span></el-form-item>
+            </el-col>
           </el-row>
           <el-row>
             <el-col :span="6">
@@ -117,6 +121,8 @@
           <el-table :key="tableKey" :data="formobj.scmCollectionRebateVehs" :index="index" border style="width: 100%">
             <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
             <el-table-column prop="vinNo" label="车架号" align="center" />
+            <el-table-column prop="freight" label="运费" align="center" />
+            <el-table-column prop="topAmount" label="上装金额" align="center" />
             <el-table-column prop="costPrice" label="厂家结算价" align="center" />
             <el-table-column prop="estimateRebate" label="预计返利" align="center" />
           </el-table>
@@ -148,6 +154,7 @@ export default {
         adjustmentRemarks: '',
         purchaseSystemSid: '',
         purchaseSystemName: '',
+        costTitleValue: '',
         rebateTypeKey: '',
         rebateTypeValue: '',
         rebateName: '',
@@ -305,6 +312,7 @@ export default {
         adjustmentRemarks: '',
         purchaseSystemSid: '',
         purchaseSystemName: '',
+        costTitleValue: '',
         rebateTypeKey: '',
         rebateTypeValue: '',
         rebateName: '',

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

@@ -11,18 +11,22 @@
         <div class="titwu"><span>回款返利</span></div>
         <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
           <el-row style="border-top: 1px solid #e0e3eb">
-            <el-col :span="8">
+            <el-col :span="6">
               <div class="span-sty">分公司</div>
               <el-form-item><span class="addinputInfo">{{ formobj.useOrgName }}</span></el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
               <div class="span-sty">采购系统</div>
               <el-form-item><span class="addinputInfo">{{ formobj.purchaseSystemName }}</span></el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
               <div class="span-sty">品牌</div>
               <el-form-item><span class="addinputInfo">{{ formobj.brandName }}</span></el-form-item>
             </el-col>
+            <el-col :span="6">
+              <div class="span-sty">款项名称</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.costTitleValue }}</span></el-form-item>
+            </el-col>
           </el-row>
           <el-row>
             <el-col :span="6">
@@ -116,6 +120,8 @@
           <el-table :key="tableKey" :data="formobj.scmCollectionRebateVehs" :index="index" border style="width: 100%">
             <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
             <el-table-column prop="vinNo" label="车架号" align="center" />
+            <el-table-column prop="freight" label="运费" align="center" />
+            <el-table-column prop="topAmount" label="上装金额" align="center" />
             <el-table-column prop="costPrice" label="厂家结算价" align="center" />
             <el-table-column prop="estimateRebate" label="预计返利" align="center" />
           </el-table>

anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/relation/huikuanfanliguanliInfo.vue

@@ -11,18 +11,22 @@
         <div class="titwu"><span>回款返利</span></div>
         <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
           <el-row style="border-top: 1px solid #e0e3eb">
-            <el-col :span="8">
+            <el-col :span="6">
               <div class="span-sty">分公司</div>
               <el-form-item><span class="addinputInfo">{{ formobj.useOrgName }}</span></el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
               <div class="span-sty">采购系统</div>
               <el-form-item><span class="addinputInfo">{{ formobj.purchaseSystemName }}</span></el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
               <div class="span-sty">品牌</div>
               <el-form-item><span class="addinputInfo">{{ formobj.brandName }}</span></el-form-item>
             </el-col>
+            <el-col :span="6">
+              <div class="span-sty">品牌</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.costTitleValue }}</span></el-form-item>
+            </el-col>
           </el-row>
           <el-row>
             <el-col :span="6">
@@ -116,6 +120,8 @@
           <el-table :key="tableKey" :data="formobj.scmCollectionRebateVehs" :index="index" border style="width: 100%">
             <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
             <el-table-column prop="vinNo" label="车架号" align="center" />
+            <el-table-column prop="freight" label="运费" align="center" />
+            <el-table-column prop="topAmount" label="上装金额" align="center" />
             <el-table-column prop="costPrice" label="厂家结算价" align="center" />
             <el-table-column prop="estimateRebate" label="预计返利" align="center" />
           </el-table>