diff --git a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/collectionrebatewithholding.vue b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/collectionrebatewithholding.vue
index 83f69359ae..0403b4be0b 100644
--- a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/collectionrebatewithholding.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/collectionrebatewithholding.vue
@@ -8,12 +8,16 @@
           <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
           <div v-show="isSearchShow" class="search">
             <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
-              <el-form-item label="品牌">
-                <el-select v-model="listQuery.params.brandSid" placeholder="请选择" filterable clearable>
-                  <el-option v-for="item in brand_list" :key="item.sid" :label="item.brandName" :value="item.sid"/>
-                </el-select>
+              <el-form-item label="分公司">
+                <el-input v-model="listQuery.params.useOrgName" placeholder="" clearable/>
               </el-form-item>
-              <el-form-item label="申请标题">
+              <el-form-item label="申请部门">
+                <el-input v-model="listQuery.params.deptName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="申请人">
+                <el-input v-model="listQuery.params.createByName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="申请名称">
                 <el-input v-model="listQuery.params.collectionApply" clearable placeholder=""></el-input>
               </el-form-item>
               <el-form-item label="创建日期">
@@ -21,6 +25,11 @@
                 <span style="padding: 0 8px">至</span>
                 <el-date-picker v-model="listQuery.params.createEndTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
               </el-form-item>
+              <el-form-item label="办结日期">
+                <el-date-picker v-model="listQuery.params.closeStartDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker v-model="listQuery.params.closeEndDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
+              </el-form-item>
             </el-form>
             <div class="btn" style="text-align: center;">
               <el-button type="primary" icon="el-icon-search" @click="handleFilter" size="small">查询</el-button>
@@ -48,46 +57,18 @@
                 <span v-else @click="flowRecord(scope.row)" class="bluezi">{{ scope.row.nodeState }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="分公司" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.createOrgName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="品牌" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.brandName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="申请标题" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.collectionApply }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="回款金额" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.withRebateTotal }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="运费" align="center" width="120">
-              <template slot-scope="scope">
-                <span>{{ scope.row.createTime }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="预提返利" align="center" width="120">
-              <template slot-scope="scope">
-                <span>{{ scope.row.createTime }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="创建日期" align="center" width="120">
-              <template slot-scope="scope">
-                <span>{{ scope.row.createTime }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="创建人" align="center" width="120">
+            <el-table-column prop="useOrgName" label="分公司" align="center" width="150" />
+            <el-table-column label="申请名称" align="center" min-width="150">
               <template slot-scope="scope">
-                <span>{{ scope.row.createByName }}</span>
+                <span>{{ scope.row.collectionApply }}厂家回款返利预提</span>
               </template>
             </el-table-column>
+            <el-table-column prop="estimateRebate" label="预提返利" align="center" width="140" />
+            <el-table-column prop="remarks" label="备注" align="center" min-width="120" />
+            <el-table-column prop="createByName" label="申请人" align="center" width="120" />
+            <el-table-column prop="deptName" label="申请部门" align="center" width="120" />
+            <el-table-column prop="createTime" label="申请日期" align="center" width="120" />
+            <el-table-column prop="closeDate" label="办结日期" align="center" width="120" />
           </el-table>
         </div>
         <div class="pages">
@@ -109,7 +90,7 @@ import req from '@/api/manufacturerrebates/collectionrebatewithholding'
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
 import ButtonBar from '@/components/ButtonBar'
-import { brandDown, getOrgSidByPath } from '@/api/cheliang/dictcommons'
+import { getOrgSidByPath } from '@/api/cheliang/dictcommons'
 import collectionrebatewithholdingAdd from './collectionrebatewithholdingAdd'
 import collectionrebatewithholdingInfo from './collectionrebatewithholdingInfo'
 import { getStorage } from '@/utils/auth'
@@ -161,14 +142,17 @@ export default {
       sids: [],
       FormLoading: false,
       listLoading: false,
-      brand_list: [],
       listQuery: {
         params: {
           createOrgSid: '',
-          brandSid: '',
+          useOrgName: '',
+          deptName: '',
+          createByName: '',
           collectionApply: '',
           createEndTime: '',
           createStartTime: '',
+          closeStartDate: '',
+          closeEndDate: '',
           orgPath: '',
           userSid: '',
           menuUrl: ''
@@ -223,11 +207,6 @@ export default {
       getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
         if (resp.success) {
           this.listQuery.params.createOrgSid = resp.data
-          brandDown({ useOrg: this.listQuery.params.createOrgSid }).then((res) => {
-            if (res.success) {
-              this.brand_list = res.data
-            }
-          })
           this.getList()
         }
       })
@@ -280,7 +259,7 @@ export default {
       req.listPage(this.listQuery).then((response) => {
         console.log('列表查询结果：', response)
         this.listLoading = false
-        if (response.success && response.data && response.data.total > 0) {
+        if (response.success) {
           this.list = response.data.records
           this.listQuery.total = response.data.total
         } else {
@@ -298,10 +277,14 @@ export default {
       this.listQuery = {
         params: {
           createOrgSid: '',
-          brandSid: '',
+          useOrgName: '',
+          deptName: '',
+          createByName: '',
           collectionApply: '',
           createEndTime: '',
           createStartTime: '',
+          closeStartDate: '',
+          closeEndDate: '',
           orgPath: '',
           userSid: '',
           menuUrl: ''
diff --git a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/collectionrebatewithholdingAdd.vue b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/collectionrebatewithholdingAdd.vue
index df9fa7aeee..fc6ef48f5d 100644
--- a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/collectionrebatewithholdingAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/collectionrebatewithholdingAdd.vue
@@ -18,68 +18,43 @@
       <!--Start 新增修改部分-->
       <div class="listconadd">
         <div class="titwu"><span>{{ formobj.collectionApply }}回款返利预提申请</span></div>
-        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formadd">
-          <el-row class="rowStyle">
-            <el-col :span="24" class="tleftb colOneStyle">
-              <div><span style="font-size: 16px">金额单位：元</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">
+              <div class="span-sty">分公司</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createOrgName }}</span></el-form-item>
             </el-col>
-          </el-row>
-          <el-row class="rowStyle">
-            <el-col :span="2" class="tleftb colOneStyle">
-              <span>品牌:</span>
+            <el-col :span="8">
+              <div class="span-sty">申请部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
             </el-col>
-            <el-col :span="4" class="colOneStyle">
-              <el-form-item>
-                <el-select :disabled="dialogStatus === 'edit'" v-model="formobj.brandName" placeholder="请选择" filterable clearable @change="changeBrand">
-                  <el-option v-for="item in brand_list" :key="item.sid" :label="item.brandName" :value="item.brandName"/>
-                </el-select>
-              </el-form-item>
+            <el-col :span="8">
+              <div class="span-sty">申请人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
             </el-col>
-            <el-col :span="18" class="tleftb colOneStyle">
-              <el-button size="small" type="primary" @click="handleSelect()">选择</el-button>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div style="text-align: right"><el-button size="small" type="primary" class="btntopblueline" @click="handleSelect()">选择</el-button></div>
             </el-col>
           </el-row>
           <el-table :key="tableKey" :data="formobj.scmCollectionRebateWiths" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
             <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column label="回款方式" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.collectionTypeValue }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="回款金额" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.collectionMoney }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="运费" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.freight }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="计算标准" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.calculationStandard }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="estimateRebate" label="预计返利" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.estimateRebate }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="明细" align="center">
+            <el-table-column prop="purchaseSystemName" label="采购系统" align="center" min-width="150" />
+            <el-table-column prop="brandName" label="品牌" align="center" min-width="150" />
+            <el-table-column prop="rebateTypeValue" label="返利类型" align="center" min-width="150" />
+            <el-table-column prop="rebateName" label="返利名称" align="center" min-width="150" />
+            <el-table-column prop="estimateRebate" label="预计返利" align="center" min-width="150"/>
+            <el-table-column label="明细" align="center" width="100">
               <template slot-scope="scope">
                 <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
           <el-row>
-            <el-col :span="2" class="tleftb">
-              <span>备注</span>
-            </el-col>
-            <el-col :span="22">
-              <el-form-item>
-                <el-input v-model="formobj.remarks" clearable placeholder="" class="addinputw"></el-input>
-              </el-form-item>
+            <el-col :span="24">
+              <div class="span-sty">备注</div>
+              <el-form-item><el-input v-model="formobj.remarks" clearable placeholder="" class="addinputInfo addinputw"></el-input></el-form-item>
             </el-col>
           </el-row>
         </el-form>
@@ -93,7 +68,7 @@
 
 <script>
 import req from '@/api/manufacturerrebates/collectionrebatewithholding'
-import { brandDown, fetchBySid } from '@/api/cheliang/dictcommons'
+import { fetchBySid } from '@/api/cheliang/dictcommons'
 import huikuanfanliselect from './relation/huikuanfanliselect'
 import huikuanfanliAdd from './relation/huikuanfanliAdd'
 
@@ -109,16 +84,14 @@ export default {
       index: 0,
       tableKey: 0,
       viewState: 1,
-      dialogStatus: '',
-      brand_list: [],
       // 表单数据
       formobj: {
         sid: '',
-        brandName: '',
-        brandSid: '',
+        deptName: '',
+        deptSid: '',
         collectionApply: '',
         createOrgName: '',
-        createOrgSId: '',
+        createOrgSid: '',
         useOrgName: '',
         useOrgSid: '',
         remarks: '',
@@ -142,17 +115,12 @@ export default {
           this.formobj.useOrgName = res.data.name
         }
       })
-      brandDown({ useOrg: this.formobj.createOrgSid }).then((res) => {
-        if (res.success) {
-          this.brand_list = res.data
-        }
-      })
     },
     // 获取日期
     newDate() {
       let date = new Date()
       let year = date.getFullYear() // 年
-      let month = date.getMonth() + 1 // 月
+      let month = date.getMonth() // 月
       this.formobj.collectionApply = year + '年' + month + '月'
     },
     showAdd(createOrgSid) {
@@ -161,19 +129,19 @@ export default {
         this.init()
         this.newDate()
       })
-      this.dialogStatus = 'add'
       this.formobj.createBySid = window.sessionStorage.getItem('userSid')
       this.formobj.createOrgSid = createOrgSid
       this.formobj.useOrgSid = createOrgSid
       this.formobj.createByName = window.sessionStorage.getItem('name')
       this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+      this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1)
+      this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1)
       this.viewTitle = '【新增】回款返利预提申请'
     },
     showEdit(row) {
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
       })
-      this.dialogStatus = 'edit'
       this.viewTitle = '【编辑】回款返利预提申请'
       console.log('编辑回显', row.sid)
       req.fetchBySid(row.sid).then((resp) => {
@@ -185,26 +153,15 @@ export default {
         this.formobj = row
       })
     },
-    changeBrand(value) {
-      const choose = this.brand_list.filter((item) => item.brandName === value)
-      if (choose !== null && choose.length > 0) {
-        this.formobj.brandSid = choose[0].sid
-      } else {
-        this.formobj.brandSid = ''
-      }
-    },
     // 列表--选择
     handleSelect() {
-      if (this.formobj.brandName === '' || this.formobj.brandName === null || this.formobj.brandName === undefined) {
-        this.$message({ showClose: true, type: 'error', message: '请先选择品牌' })
-        return
-      }
       this.viewState = 2
-      this.$refs['divSelect'].showData(this.formobj.scmCollectionRebateWiths, this.formobj.createOrgSid, this.formobj.brandSid)
+      this.$refs['divSelect'].showData(this.formobj.scmCollectionRebateWiths, this.formobj.createOrgSid)
     },
     // 列表--选择返回数据
     backData(value) {
       this.viewState = 1
+      value = JSON.parse(JSON.stringify(value))
       for (var i in value) {
         let cval = value[i]
         if (!this.formobj.scmCollectionRebateWiths || this.formobj.scmCollectionRebateWiths.length === 0) {
@@ -212,10 +169,8 @@ export default {
         }
         let v = 0
         for (var j in this.formobj.scmCollectionRebateWiths) {
-          if (this.formobj.scmCollectionRebateWiths[j].collectionTypeValue === cval.collectionTypeValue && this.formobj.scmCollectionRebateWiths[j].calculationStandard === cval.calculationStandard) {
-            this.formobj.scmCollectionRebateWiths[j].collectionMoney = parseFloat(this.formobj.scmCollectionRebateWiths[j].collectionMoney !== '' ? this.formobj.scmCollectionRebateWiths[j].collectionMoney : 0) + parseFloat(cval.collectionMoney !== '' ? cval.collectionMoney : 0)
-            this.formobj.scmCollectionRebateWiths[j].freight = parseFloat(this.formobj.scmCollectionRebateWiths[j].freight !== '' ? this.formobj.scmCollectionRebateWiths[j].freight : 0) + parseFloat(cval.freight !== '' ? cval.freight : 0)
-            this.formobj.scmCollectionRebateWiths[j].estimateRebate = parseFloat(this.formobj.scmCollectionRebateWiths[j].estimateRebate !== '' ? this.formobj.scmCollectionRebateWiths[j].estimateRebate : 0) + parseFloat(cval.estimateRebate !== '' ? cval.estimateRebate : 0)
+          if (this.formobj.scmCollectionRebateWiths[j].purchaseSystemName === cval.purchaseSystemName && this.formobj.scmCollectionRebateWiths[j].brandName === cval.brandName && this.formobj.scmCollectionRebateWiths[j].rebateTypeValue === cval.rebateTypeValue && this.formobj.scmCollectionRebateWiths[j].rebateName === cval.rebateName) {
+            this.formobj.scmCollectionRebateWiths[j].estimateRebate = Math.round((parseFloat(this.formobj.scmCollectionRebateWiths[j].estimateRebate !== '' ? this.formobj.scmCollectionRebateWiths[j].estimateRebate : 0) + parseFloat(cval.estimateRebate !== '' ? cval.estimateRebate : 0)) * 100) / 100
             this.formobj.scmCollectionRebateWiths[j].collectionRebateSids.push(cval.sid)
             v = 1
             break
@@ -223,14 +178,14 @@ export default {
         }
         if (v === 0) {
           this.formobj.scmCollectionRebateWiths.push({
-            collectionTypeKey: cval.collectionTypeKey,
-            collectionTypeValue: cval.collectionTypeValue,
-            collectionMoney: cval.collectionMoney,
-            freight: cval.freight,
-            calculationStandard: cval.calculationStandard,
-            estimateRebate: cval.estimateRebate,
+            purchaseSystemName: cval.purchaseSystemName,
+            purchaseSystemSid: cval.purchaseSystemSid,
             brandName: cval.brandName,
             brandSid: cval.brandSid,
+            rebateTypeKey: cval.rebateTypeKey,
+            rebateTypeValue: cval.rebateTypeValue,
+            rebateName: cval.rebateName,
+            estimateRebate: cval.estimateRebate,
             collectionRebateSids: [cval.sid],
             sid: '',
             mainSid: ''
@@ -244,7 +199,7 @@ export default {
       this.$refs['divAdd'].showInfo(row)
     },
     // 明细--查看返回数据
-    backAdd(value, collectionTypeValue, calculationStandard) {
+    backAdd(value, purchaseSystemName, brandName, rebateTypeValue, rebateName) {
       this.viewState = 1
       const aa = []
       if (value.length > 0) {
@@ -252,10 +207,8 @@ export default {
           let cval = value[i]
           let v = 0
           for (var j in aa) {
-            if (aa[j].collectionTypeValue === cval.collectionTypeValue && aa[j].calculationStandard === cval.calculationStandard) {
-              aa[j].collectionMoney = parseFloat(aa[j].collectionMoney !== '' ? aa[j].collectionMoney : 0) + parseFloat(cval.collectionMoney !== '' ? cval.collectionMoney : 0)
-              aa[j].freight = parseFloat(aa[j].freight !== '' ? aa[j].freight : 0) + parseFloat(cval.freight !== '' ? cval.freight : 0)
-              aa[j].estimateRebate = parseFloat(aa[j].estimateRebate !== '' ? aa[j].estimateRebate : 0) + parseFloat(cval.estimateRebate !== '' ? cval.estimateRebate : 0)
+            if (aa[j].purchaseSystemName === cval.purchaseSystemName && aa[j].brandName === cval.brandName && aa[j].rebateTypeValue === cval.rebateTypeValue && aa[j].rebateName === cval.rebateName) {
+              aa[j].estimateRebate = Math.round((parseFloat(aa[j].estimateRebate !== '' ? aa[j].estimateRebate : 0) + parseFloat(cval.estimateRebate !== '' ? cval.estimateRebate : 0)) * 100) / 100
               aa[j].collectionRebateSids.push(cval.sid)
               v = 1
               break
@@ -263,14 +216,14 @@ export default {
           }
           if (v === 0) {
             aa.push({
-              collectionTypeKey: cval.collectionTypeKey,
-              collectionTypeValue: cval.collectionTypeValue,
-              collectionMoney: cval.collectionMoney,
-              freight: cval.freight,
-              calculationStandard: cval.calculationStandard,
-              estimateRebate: cval.estimateRebate,
+              purchaseSystemName: cval.purchaseSystemName,
+              purchaseSystemSid: cval.purchaseSystemSid,
               brandName: cval.brandName,
               brandSid: cval.brandSid,
+              rebateTypeKey: cval.rebateTypeKey,
+              rebateTypeValue: cval.rebateTypeValue,
+              rebateName: cval.rebateName,
+              estimateRebate: cval.estimateRebate,
               collectionRebateSids: [cval.sid],
               sid: '',
               mainSid: ''
@@ -278,22 +231,22 @@ export default {
           }
         }
         for (var k = 0; k < this.formobj.scmCollectionRebateWiths.length; k++) {
-          if (this.formobj.scmCollectionRebateWiths[k].collectionTypeValue === collectionTypeValue && this.formobj.scmCollectionRebateWiths[k].calculationStandard === calculationStandard) {
-            this.formobj.scmCollectionRebateWiths[k].collectionTypeKey = aa[0].collectionTypeKey
-            this.formobj.scmCollectionRebateWiths[k].collectionTypeValue = aa[0].collectionTypeValue
-            this.formobj.scmCollectionRebateWiths[k].collectionMoney = aa[0].collectionMoney
-            this.formobj.scmCollectionRebateWiths[k].estimateRebate = aa[0].estimateRebate
-            this.formobj.scmCollectionRebateWiths[k].freight = aa[0].freight
-            this.formobj.scmCollectionRebateWiths[k].calculationStandard = aa[0].calculationStandard
+          if (this.formobj.scmCollectionRebateWiths[k].purchaseSystemName === purchaseSystemName && this.formobj.scmCollectionRebateWiths[k].brandName === brandName && this.formobj.scmCollectionRebateWiths[k].rebateTypeValue === rebateTypeValue && this.formobj.scmCollectionRebateWiths[k].rebateName === rebateName) {
+            this.formobj.scmCollectionRebateWiths[k].purchaseSystemName = aa[0].purchaseSystemName
+            this.formobj.scmCollectionRebateWiths[k].purchaseSystemSid = aa[0].purchaseSystemSid
             this.formobj.scmCollectionRebateWiths[k].brandName = aa[0].brandName
             this.formobj.scmCollectionRebateWiths[k].brandSid = aa[0].brandSid
+            this.formobj.scmCollectionRebateWiths[k].rebateTypeKey = aa[0].rebateTypeKey
+            this.formobj.scmCollectionRebateWiths[k].rebateTypeValue = aa[0].rebateTypeValue
+            this.formobj.scmCollectionRebateWiths[k].rebateName = aa[0].rebateName
+            this.formobj.scmCollectionRebateWiths[k].estimateRebate = aa[0].estimateRebate
             this.formobj.scmCollectionRebateWiths[k].vehRebateSids = aa[0].vehRebateSids
             break
           }
         }
       } else if (value.length === 0) {
         for (var l = 0; l < this.formobj.scmCollectionRebateWiths.length; l++) {
-          if (this.formobj.scmCollectionRebateWiths[l].collectionTypeValue === collectionTypeValue && this.formobj.scmCollectionRebateWiths[l].calculationStandard === calculationStandard) {
+          if (this.formobj.scmCollectionRebateWiths[l].purchaseSystemName === purchaseSystemName && this.formobj.scmCollectionRebateWiths[l].brandName === brandName && this.formobj.scmCollectionRebateWiths[l].rebateTypeValue === rebateTypeValue && this.formobj.scmCollectionRebateWiths[l].rebateName === rebateName) {
             this.formobj.scmCollectionRebateWiths.splice(l, 1)
             break
           }
@@ -358,21 +311,6 @@ export default {
           }, 0)
           sums[index] += ''
           this.formobj.withRebateTotal = sums[index] += ''
-        } else {
-          if (!values.every(value => isNaN(value))) {
-            sums[index] = values.reduce((prev, curr) => {
-              const value = Number(curr)
-              if (!isNaN(value)) {
-                return prev + curr
-              } else {
-                return prev
-              }
-            }, 0)
-            sums[index] += ''
-            this.amount = sums[index] += ''
-          } else {
-            sums[index] = ''
-          }
         }
       })
       return sums
@@ -383,11 +321,11 @@ export default {
       // 表单数据
       this.formobj = {
         sid: '',
-        brandName: '',
-        brandSid: '',
+        deptName: '',
+        deptSid: '',
         collectionApply: '',
         createOrgName: '',
-        createOrgSId: '',
+        createOrgSid: '',
         useOrgName: '',
         useOrgSid: '',
         remarks: '',
@@ -406,13 +344,13 @@ export default {
   }
 }
 </script>
+
 <style scoped>
-.rowStyle {
-  border-left: 0px;
+.span-sty {
+  width: 130px !important;
 }
-.colOneStyle {
-  border-right: 0px !important;
-  border-bottom: 0px !important;
+.addinputInfo {
+  margin-left: 120px !important;
 }
 </style>
 
diff --git a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/collectionrebatewithholdingInfo.vue b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/collectionrebatewithholdingInfo.vue
index 50c4d123e3..76a00ba3a0 100644
--- a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/collectionrebatewithholdingInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/collectionrebatewithholdingInfo.vue
@@ -14,65 +14,38 @@
       <!--Start 新增修改部分-->
       <div class="listconadd">
         <div class="titwu"><span>{{ formobj.collectionApply }}回款返利预提申请</span></div>
-        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formadd">
-          <el-row class="rowStyle">
-            <el-col :span="24" class="tleftb colOneStyle">
-              <div><span style="font-size: 16px">金额单位：元</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">
+              <div class="span-sty">分公司</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createOrgName }}</span></el-form-item>
             </el-col>
-          </el-row>
-          <el-row class="rowStyle">
-            <el-col :span="2" class="tleftb colOneStyle">
-              <span>品牌:</span>
-            </el-col>
-            <el-col :span="4" class="colOneStyle">
-              <el-form-item>
-                <span>{{ formobj.brandName }}</span>
-              </el-form-item>
+            <el-col :span="8">
+              <div class="span-sty">申请部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
             </el-col>
-            <el-col :span="18" class="tleftb colOneStyle">
+            <el-col :span="8">
+              <div class="span-sty">申请人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
             </el-col>
           </el-row>
           <el-table :key="tableKey" :data="formobj.scmCollectionRebateWiths" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
             <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column label="回款方式" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.collectionTypeValue }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="回款金额" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.collectionMoney }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="运费" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.freight }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="计算标准" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.calculationStandard }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="estimateRebate" label="预计返利" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.estimateRebate }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="明细" align="center">
+            <el-table-column prop="purchaseSystemName" label="采购系统" align="center" min-width="150" />
+            <el-table-column prop="brandName" label="品牌" align="center" min-width="150" />
+            <el-table-column prop="rebateTypeValue" label="返利类型" align="center" min-width="150" />
+            <el-table-column prop="rebateName" label="返利名称" align="center" min-width="150" />
+            <el-table-column prop="estimateRebate" label="预计返利" align="center" min-width="150"/>
+            <el-table-column label="明细" align="center" width="100">
               <template slot-scope="scope">
                 <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
           <el-row>
-            <el-col :span="2" class="tleftb">
-              <span>备注</span>
-            </el-col>
-            <el-col :span="22">
-              <el-form-item>
-                <span>{{ formobj.remarks }}</span>
-              </el-form-item>
+            <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>
         </el-form>
@@ -101,11 +74,11 @@ export default {
       // 表单数据
       formobj: {
         sid: '',
-        brandName: '',
-        brandSid: '',
+        deptName: '',
+        deptSid: '',
         collectionApply: '',
         createOrgName: '',
-        createOrgSId: '',
+        createOrgSid: '',
         useOrgName: '',
         useOrgSid: '',
         remarks: '',
@@ -165,21 +138,6 @@ export default {
           }, 0)
           sums[index] += ''
           this.formobj.withRebateTotal = sums[index] += ''
-        } else {
-          if (!values.every(value => isNaN(value))) {
-            sums[index] = values.reduce((prev, curr) => {
-              const value = Number(curr)
-              if (!isNaN(value)) {
-                return prev + curr
-              } else {
-                return prev
-              }
-            }, 0)
-            sums[index] += ''
-            this.amount = sums[index] += ''
-          } else {
-            sums[index] = ''
-          }
         }
       })
       return sums
@@ -190,11 +148,11 @@ export default {
       // 表单数据
       this.formobj = {
         sid: '',
-        brandName: '',
-        brandSid: '',
+        deptName: '',
+        deptSid: '',
         collectionApply: '',
         createOrgName: '',
-        createOrgSId: '',
+        createOrgSid: '',
         useOrgName: '',
         useOrgSid: '',
         remarks: '',
@@ -213,11 +171,10 @@ export default {
 }
 </script>
 <style scoped>
-.rowStyle {
-  border-left: 0px;
+.span-sty {
+  width: 130px !important;
 }
-.colOneStyle {
-  border-right: 0px !important;
-  border-bottom: 0px !important;
+.addinputInfo {
+  margin-left: 120px !important;
 }
 </style>
diff --git a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/relation/huikuanfanliAdd.vue b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/relation/huikuanfanliAdd.vue
index aabbebde32..8aa1048a9d 100644
--- a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/relation/huikuanfanliAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/relation/huikuanfanliAdd.vue
@@ -23,46 +23,20 @@
                 <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
               </template>
             </el-table-column>
-            <el-table-column label="品牌" align="center" width="200">
-              <template slot-scope="scope">
-                <span>{{ scope.row.brandName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="回款方式" align="center" width="200">
-              <template slot-scope="scope">
-                <span>{{ scope.row.collectionTypeValue }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="厂家回款账号" align="center" width="">
-              <template slot-scope="scope">
-                <span>{{ scope.row.manufaBankAccount }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="回款金额" align="center" width="150">
-              <template slot-scope="scope">
-                <span>{{ scope.row.collectionMoney }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="运费" align="center" width="150">
-              <template slot-scope="scope">
-                <span>{{ scope.row.freight }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="回款日期" align="center" width="100">
-              <template slot-scope="scope">
-                <span>{{ scope.row.collectionDate }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="计算标准" align="center" width="120">
-              <template slot-scope="scope">
-                <span>{{ scope.row.calculationStandard }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="预计返利" align="center" width="120">
-              <template slot-scope="scope">
-                <span>{{ scope.row.estimateRebate }}</span>
-              </template>
-            </el-table-column>
+            <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="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" />
+            <el-table-column prop="collectionDate" label="回款日期" align="center" width="120" />
+            <el-table-column prop="freight" label="运费" align="center" width="130" />
+            <el-table-column prop="topAmount" label="上装金额" align="center" width="130" />
+            <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="remarks" label="备注" align="center" min-width="200" />
           </el-table>
         </el-form>
       </div>
@@ -87,8 +61,10 @@ export default {
       index: 0,
       tableKey: 0,
       viewState: 1,
-      collectionTypeValue: '',
-      calculationStandard: '',
+      purchaseSystemName: '',
+      brandName: '',
+      rebateTypeValue: '',
+      rebateName: '',
       sids: [],
       // 表单数据
       list: [],
@@ -110,11 +86,15 @@ export default {
         this.$refs['form_obj'].clearValidate()
       })
       this.viewTitle = '待预提回款返利明细'
-      this.collectionTypeValue = row.collectionTypeValue
-      this.calculationStandard = row.calculationStandard
+      this.purchaseSystemName = row.purchaseSystemName
+      this.brandName = row.brandName
+      this.rebateTypeValue = row.rebateTypeValue
+      this.rebateName = row.rebateName
       console.log('编辑回显', row.sid)
       req.collectionRebateWithDetails(row.collectionRebateSids).then((resp) => {
-        this.list = resp.data
+        if (resp.success) {
+          this.list = resp.data
+        }
       }).catch((e) => {
         this.formobj = row
       })
@@ -149,17 +129,17 @@ export default {
       for (var i = 0; i < this.list.length; i++) {
         data_list.push({
           sid: this.list[i].sid,
-          collectionTypeValue: this.list[i].collectionTypeValue,
-          collectionTypeKey: this.list[i].collectionTypeKey,
-          collectionMoney: this.list[i].collectionMoney,
-          freight: this.list[i].freight,
-          estimateRebate: this.list[i].estimateRebate,
-          calculationStandard: this.list[i].calculationStandard,
+          purchaseSystemName: this.list[i].purchaseSystemName,
+          purchaseSystemSid: this.list[i].purchaseSystemSid,
           brandName: this.list[i].brandName,
-          brandSid: this.list[i].brandSid
+          brandSid: this.list[i].brandSid,
+          rebateTypeKey: this.list[i].rebateTypeKey,
+          rebateTypeValue: this.list[i].rebateTypeValue,
+          rebateName: this.list[i].rebateName,
+          estimateRebate: this.list[i].estimateRebate
         })
       }
-      this.$emit('backAdd', data_list, this.collectionTypeValue, this.calculationStandard)
+      this.$emit('backAdd', data_list, this.purchaseSystemName, this.brandName, this.rebateTypeValue, this.rebateName)
     }
   }
 }
diff --git a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/relation/huikuanfanliInfo.vue b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/relation/huikuanfanliInfo.vue
index 140d584f0b..082aadda8e 100644
--- a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/relation/huikuanfanliInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/relation/huikuanfanliInfo.vue
@@ -21,46 +21,20 @@
                 <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
               </template>
             </el-table-column>
-            <el-table-column label="品牌" align="center" width="200">
-              <template slot-scope="scope">
-                <span>{{ scope.row.brandName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="回款方式" align="center" width="200">
-              <template slot-scope="scope">
-                <span>{{ scope.row.collectionTypeValue }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="厂家回款账号" align="center" width="">
-              <template slot-scope="scope">
-                <span>{{ scope.row.manufaBankAccount }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="回款金额" align="center" width="150">
-              <template slot-scope="scope">
-                <span>{{ scope.row.collectionMoney }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="运费" align="center" width="150">
-              <template slot-scope="scope">
-                <span>{{ scope.row.freight }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="回款日期" align="center" width="100">
-              <template slot-scope="scope">
-                <span>{{ scope.row.collectionDate }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="计算标准" align="center" width="120">
-              <template slot-scope="scope">
-                <span>{{ scope.row.calculationStandard }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="预计返利" align="center" width="120">
-              <template slot-scope="scope">
-                <span>{{ scope.row.estimateRebate }}</span>
-              </template>
-            </el-table-column>
+            <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="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" />
+            <el-table-column prop="collectionDate" label="回款日期" align="center" width="120" />
+            <el-table-column prop="freight" label="运费" align="center" width="130" />
+            <el-table-column prop="topAmount" label="上装金额" align="center" width="130" />
+            <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="remarks" label="备注" align="center" min-width="200" />
           </el-table>
         </el-form>
       </div>
@@ -99,7 +73,9 @@ export default {
       this.viewTitle = '待预提回款返利明细'
       console.log('编辑回显', row.sid)
       req.collectionRebateWithDetails(row.collectionRebateSids).then((resp) => {
-        this.list = resp.data
+        if (resp.success) {
+          this.list = resp.data
+        }
       }).catch((e) => {
         this.formobj = row
       })
@@ -112,8 +88,7 @@ export default {
       this.viewState = 1
     },
     // 返回（===既判断）
-    handleReturn(isreload) {
-      if (isreload === 'true') this.$emit('reloadlist')
+    handleReturn() {
       // 表单数据
       this.list = []
       this.$refs['form_obj'].resetFields()
diff --git a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/relation/huikuanfanliselect.vue b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/relation/huikuanfanliselect.vue
index d1cafc3361..15f04558b0 100644
--- a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/relation/huikuanfanliselect.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/relation/huikuanfanliselect.vue
@@ -8,6 +8,12 @@
           <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
           <div v-show="isSearchShow" class="search">
             <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
+              <el-form-item label="采购系统">
+                <el-input v-model="listQuery.params.purchaseSystemName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="品牌">
+                <el-input v-model="listQuery.params.brandName" placeholder="" clearable/>
+              </el-form-item>
               <el-form-item label="回款方式">
                 <el-select v-model="listQuery.params.collectionTypeKey" placeholder="请选择" filterable clearable>
                   <el-option v-for="item in collectionType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
@@ -23,6 +29,14 @@
                 <span style="padding: 0 8px">至</span>
                 <el-date-picker v-model="listQuery.params.createEndTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
               </el-form-item>
+              <el-form-item label="返利类型">
+                <el-select v-model="listQuery.params.rebateTypeKey" placeholder="请选择" filterable clearable>
+                  <el-option v-for="item in rebateType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="返利名称">
+                <el-input v-model="listQuery.params.rebateName" placeholder="" clearable/>
+              </el-form-item>
             </el-form>
             <div class="btn" style="text-align: center;">
               <el-button type="primary" icon="el-icon-search" @click="handleFilter" size="small">查询</el-button>
@@ -43,46 +57,20 @@
                 <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
               </template>
             </el-table-column>
-            <el-table-column label="品牌" align="center" width="200">
-              <template slot-scope="scope">
-                <span>{{ scope.row.brandName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="回款方式" align="center" width="200">
-              <template slot-scope="scope">
-                <span>{{ scope.row.collectionTypeValue }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="厂家回款账号" align="center" width="">
-              <template slot-scope="scope">
-                <span>{{ scope.row.manufaBankAccount }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="回款金额" align="center" width="150">
-              <template slot-scope="scope">
-                <span>{{ scope.row.collectionMoney }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="运费" align="center" width="150">
-              <template slot-scope="scope">
-                <span>{{ scope.row.freight }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="回款日期" align="center" width="100">
-              <template slot-scope="scope">
-                <span>{{ scope.row.collectionDate }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="计算标准" align="center" width="120">
-              <template slot-scope="scope">
-                <span>{{ scope.row.calculationStandard }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="预计返利" align="center" width="120">
-              <template slot-scope="scope">
-                <span>{{ scope.row.estimateRebate }}</span>
-              </template>
-            </el-table-column>
+            <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="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" />
+            <el-table-column prop="collectionDate" label="回款日期" align="center" width="120" />
+            <el-table-column prop="freight" label="运费" align="center" width="130" />
+            <el-table-column prop="topAmount" label="上装金额" align="center" width="130" />
+            <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="remarks" label="备注" align="center" min-width="200" />
           </el-table>
         </div>
         <div class="pages">
@@ -130,10 +118,14 @@ export default {
       sids: [],
       FormLoading: false,
       listLoading: false,
+      rebateType_list: [],
       collectionType_list: [],
       listQuery: {
         params: {
-          brandSid: '',
+          purchaseSystemName: '',
+          brandName: '',
+          rebateTypeKey: '',
+          rebateName: '',
           collectionEndDate: '',
           collectionStartDate: '',
           collectionTypeKey: '',
@@ -160,6 +152,11 @@ export default {
           this.collectionType_list = res.data
         }
       })
+      typeValues({ type: 'rebateType' }).then((res) => {
+        if (res.success) {
+          this.rebateType_list = res.data
+        }
+      })
     },
     // 搜索条件效果
     clicksearchShow() {
@@ -187,22 +184,7 @@ export default {
       return pageindex
     },
     handleSelectionChange(row) {
-      const aa = []
-      row.forEach((element) => {
-        aa.push({
-          sid: element.sid,
-          collectionTypeValue: element.collectionTypeValue,
-          collectionTypeKey: element.collectionTypeKey,
-          collectionMoney: element.collectionMoney,
-          freight: element.freight,
-          estimateRebate: element.estimateRebate,
-          calculationStandard: element.calculationStandard,
-          brandName: element.brandName,
-          brandSid: element.brandSid
-        })
-      })
-      this.sids = aa
-      console.log('sids', this.sids)
+      this.sids = row
     },
     // 查询列表信息
     getList() {
@@ -210,7 +192,7 @@ export default {
       req.pageList(this.listQuery).then((response) => {
         console.log('列表查询结果：', response)
         this.listLoading = false
-        if (response.success && response.data && response.data.total > 0) {
+        if (response.success) {
           this.list = response.data.records
           this.listQuery.total = response.data.total
         } else {
@@ -219,9 +201,8 @@ export default {
         }
       })
     },
-    showData(value, createOrgSid, brandSid) {
+    showData(value, createOrgSid) {
       this.listQuery.params.createOrgSid = createOrgSid
-      this.listQuery.params.brandSid = brandSid
       const aa = []
       if (value.length > 0) {
         for (var i = 0; i < value.length; i++) {
@@ -245,6 +226,10 @@ export default {
       this.listQuery.current = 1
       this.listQuery.total = 0
       this.listQuery.size = 5
+      this.listQuery.params.purchaseSystemName = ''
+      this.listQuery.params.brandName = ''
+      this.listQuery.params.rebateTypeKey = ''
+      this.listQuery.params.rebateName = ''
       this.listQuery.params.createStartTime = ''
       this.listQuery.params.createEndTime = ''
       this.listQuery.params.collectionEndDate = ''
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/huikuanfanliyutiDanBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/huikuanfanliyutiDanBanInfo.vue
index ae9c230fc3..ef1e7a9ff6 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/huikuanfanliyutiDanBanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/huikuanfanliyutiDanBanInfo.vue
@@ -16,65 +16,38 @@
       <!--Start 新增修改部分-->
       <div class="">
         <div class="titwu"><span>{{ formobj.collectionApply }}回款返利预提申请</span></div>
-        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formadd">
-          <el-row class="rowStyle">
-            <el-col :span="24" class="tleftb colOneStyle">
-              <div><span style="font-size: 16px">金额单位：元</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">
+              <div class="span-sty">分公司</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createOrgName }}</span></el-form-item>
             </el-col>
-          </el-row>
-          <el-row class="rowStyle">
-            <el-col :span="2" class="tleftb colOneStyle">
-              <span>品牌:</span>
-            </el-col>
-            <el-col :span="4" class="colOneStyle">
-              <el-form-item>
-                <span>{{ formobj.brandName }}</span>
-              </el-form-item>
+            <el-col :span="8">
+              <div class="span-sty">申请部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
             </el-col>
-            <el-col :span="18" class="tleftb colOneStyle">
+            <el-col :span="8">
+              <div class="span-sty">申请人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
             </el-col>
           </el-row>
           <el-table :key="tableKey" :data="formobj.scmCollectionRebateWiths" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
             <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column label="回款方式" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.collectionTypeValue }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="回款金额" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.collectionMoney }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="运费" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.freight }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="计算标准" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.calculationStandard }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="estimateRebate" label="预计返利" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.estimateRebate }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="明细" align="center">
+            <el-table-column prop="purchaseSystemName" label="采购系统" align="center" min-width="150" />
+            <el-table-column prop="brandName" label="品牌" align="center" min-width="150" />
+            <el-table-column prop="rebateTypeValue" label="返利类型" align="center" min-width="150" />
+            <el-table-column prop="rebateName" label="返利名称" align="center" min-width="150" />
+            <el-table-column prop="estimateRebate" label="预计返利" align="center" min-width="150"/>
+            <el-table-column label="明细" align="center" width="100">
               <template slot-scope="scope">
                 <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
           <el-row>
-            <el-col :span="2" class="tleftb">
-              <span>备注</span>
-            </el-col>
-            <el-col :span="22">
-              <el-form-item>
-                <span>{{ formobj.remarks }}</span>
-              </el-form-item>
+            <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>
         </el-form>
@@ -87,14 +60,14 @@
       <el-form class="formaddcopy02" >
         <el-row v-show="currentLink" style="border-top: 1px solid #e0e3eb">
           <el-col :span="24">
-            <div class="span-sty spanTwoWidth"><span>当前环节:</span></div>
-            <el-form-item><span class="addinputInfo addinputOne">{{ current.taskName }}->{{ nextNode.name }}</span></el-form-item>
+            <div class="span-sty"><span>当前环节:</span></div>
+            <el-form-item><span class="addinputInfo">{{ current.taskName }}->{{ nextNode.name }}</span></el-form-item>
           </el-col>
         </el-row>
         <el-row :class="{ rowClass:!currentLink }">
           <el-col :span="24">
-            <div class="span-sty spanTwoWidth"><span>意见:</span></div>
-            <el-form-item><el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw addinputOne" clearable ></el-input></el-form-item>
+            <div class="span-sty"><span>意见:</span></div>
+            <el-form-item><el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputInfo addinputw" clearable ></el-input></el-form-item>
           </el-col>
         </el-row>
         <div style="text-align:center;margin-top: 20px;">
@@ -124,11 +97,11 @@ export default {
       // 表单数据
       formobj: {
         sid: '',
-        brandName: '',
-        brandSid: '',
+        deptName: '',
+        deptSid: '',
         collectionApply: '',
         createOrgName: '',
-        createOrgSId: '',
+        createOrgSid: '',
         useOrgName: '',
         useOrgSid: '',
         remarks: '',
@@ -359,21 +332,6 @@ export default {
           }, 0)
           sums[index] += ''
           this.formobj.withRebateTotal = sums[index] += ''
-        } else {
-          if (!values.every(value => isNaN(value))) {
-            sums[index] = values.reduce((prev, curr) => {
-              const value = Number(curr)
-              if (!isNaN(value)) {
-                return prev + curr
-              } else {
-                return prev
-              }
-            }, 0)
-            sums[index] += ''
-            this.amount = sums[index] += ''
-          } else {
-            sums[index] = ''
-          }
         }
       })
       return sums
@@ -387,14 +345,13 @@ export default {
   text-align: center;
   padding: 30px 0 20px 0;
 }
-.rowStyle {
-  border-left: 0px;
-}
-.colOneStyle {
-  border-right: 0px !important;
-  border-bottom: 0px !important;
-}
 .rowClass {
   border-top: 1px solid #E0E3EB;
 }
+.span-sty {
+  width: 130px !important;
+}
+.addinputInfo {
+  margin-left: 120px !important;
+}
 </style>
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/huikuanfanliyutiEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/huikuanfanliyutiEdit.vue
index 6b1ef4fee8..5e5012dba3 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/huikuanfanliyutiEdit.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/huikuanfanliyutiEdit.vue
@@ -7,78 +7,51 @@
         <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="submit()">提交
-          </el-button>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="save()">保存</el-button>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="submit()">提交</el-button>
         </div>
       </div>
       <!--标题按钮部分结束-->
       <!--Start 新增修改部分-->
       <div class="">
         <div class="titwu"><span>{{ formobj.collectionApply }}回款返利预提申请</span></div>
-        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formadd">
-          <el-row class="rowStyle">
-            <el-col :span="24" class="tleftb colOneStyle">
-              <div><span style="font-size: 16px">金额单位：元</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">
+              <div class="span-sty">分公司</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createOrgName }}</span></el-form-item>
             </el-col>
-          </el-row>
-          <el-row class="rowStyle">
-            <el-col :span="2" class="tleftb colOneStyle">
-              <span>品牌:</span>
+            <el-col :span="8">
+              <div class="span-sty">申请部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
             </el-col>
-            <el-col :span="4" class="colOneStyle">
-              <el-form-item>
-                <el-select :disabled="dialogStatus === 'edit'" v-model="formobj.brandName" placeholder="请选择" filterable clearable @change="changeBrand">
-                  <el-option v-for="item in brand_list" :key="item.sid" :label="item.brandName" :value="item.brandName"/>
-                </el-select>
-              </el-form-item>
+            <el-col :span="8">
+              <div class="span-sty">申请人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
             </el-col>
-            <el-col :span="18" class="tleftb colOneStyle">
-              <el-button size="small" type="primary" @click="handleSelect()">选择</el-button>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div style="text-align: right"><el-button size="small" type="primary" class="btntopblueline" @click="handleSelect()">选择</el-button></div>
             </el-col>
           </el-row>
           <el-table :key="tableKey" :data="formobj.scmCollectionRebateWiths" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
             <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column label="回款方式" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.collectionTypeValue }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="回款金额" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.collectionMoney }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="运费" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.freight }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="计算标准" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.calculationStandard }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="estimateRebate" label="预计返利" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.estimateRebate }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="明细" align="center">
+            <el-table-column prop="purchaseSystemName" label="采购系统" align="center" min-width="150" />
+            <el-table-column prop="brandName" label="品牌" align="center" min-width="150" />
+            <el-table-column prop="rebateTypeValue" label="返利类型" align="center" min-width="150" />
+            <el-table-column prop="rebateName" label="返利名称" align="center" min-width="150" />
+            <el-table-column prop="estimateRebate" label="预计返利" align="center" min-width="150"/>
+            <el-table-column label="明细" align="center" width="100">
               <template slot-scope="scope">
                 <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
           <el-row>
-            <el-col :span="2" class="tleftb">
-              <span>备注</span>
-            </el-col>
-            <el-col :span="22">
-              <el-form-item>
-                <el-input v-model="formobj.remarks" clearable placeholder="" class="addinputw"></el-input>
-              </el-form-item>
+            <el-col :span="24">
+              <div class="span-sty">备注</div>
+              <el-form-item><el-input v-model="formobj.remarks" clearable placeholder="" class="addinputInfo addinputw"></el-input></el-form-item>
             </el-col>
           </el-row>
         </el-form>
@@ -92,7 +65,6 @@
 
 <script>
 import req from '@/api/manufacturerrebates/collectionrebatewithholding'
-import { brandDown } from '@/api/cheliang/dictcommons'
 import huikuanfanliselect from './relation/huikuanfanliselect'
 import huikuanfanliAdd from './relation/huikuanfanliAdd'
 
@@ -108,16 +80,14 @@ export default {
       index: 0,
       tableKey: 0,
       viewState: 1,
-      dialogStatus: '',
-      brand_list: [],
       // 表单数据
       formobj: {
         sid: '',
-        brandName: '',
-        brandSid: '',
+        deptName: '',
+        deptSid: '',
         collectionApply: '',
         createOrgName: '',
-        createOrgSId: '',
+        createOrgSid: '',
         useOrgName: '',
         useOrgSid: '',
         remarks: '',
@@ -151,25 +121,10 @@ export default {
     }, '*')
   },
   methods: {
-    init() {
-      brandDown({ useOrg: this.formobj.createOrgSid }).then((res) => {
-        if (res.success) {
-          this.brand_list = res.data
-        }
-      })
-    },
-    // 获取日期
-    newDate() {
-      let date = new Date()
-      let year = date.getFullYear() // 年
-      let month = date.getMonth() + 1 // 月
-      this.formobj.collectionApply = year + '年' + month + '月'
-    },
     showInfo(sid) {
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
       })
-      this.dialogStatus = 'edit'
       this.viewTitle = '【编辑】回款返利预提申请'
       console.log('编辑回显', sid)
       req.fetchBySid(sid).then((resp) => {
@@ -181,26 +136,15 @@ export default {
         this.formobj = {}
       })
     },
-    changeBrand(value) {
-      const choose = this.brand_list.filter((item) => item.brandName === value)
-      if (choose !== null && choose.length > 0) {
-        this.formobj.brandSid = choose[0].sid
-      } else {
-        this.formobj.brandSid = ''
-      }
-    },
     // 列表--选择
     handleSelect() {
-      if (this.formobj.brandName === '' || this.formobj.brandName === null || this.formobj.brandName === undefined) {
-        this.$message({ showClose: true, type: 'error', message: '请先选择品牌' })
-        return
-      }
       this.viewState = 2
-      this.$refs['divSelect'].showData(this.formobj.scmCollectionRebateWiths, this.formobj.createOrgSid, this.formobj.brandSid)
+      this.$refs['divSelect'].showData(this.formobj.scmCollectionRebateWiths, this.formobj.createOrgSid)
     },
     // 列表--选择返回数据
     backData(value) {
       this.viewState = 1
+      value = JSON.parse(JSON.stringify(value))
       for (var i in value) {
         let cval = value[i]
         if (!this.formobj.scmCollectionRebateWiths || this.formobj.scmCollectionRebateWiths.length === 0) {
@@ -208,10 +152,8 @@ export default {
         }
         let v = 0
         for (var j in this.formobj.scmCollectionRebateWiths) {
-          if (this.formobj.scmCollectionRebateWiths[j].collectionTypeValue === cval.collectionTypeValue) {
-            this.formobj.scmCollectionRebateWiths[j].collectionMoney = parseFloat(this.formobj.scmCollectionRebateWiths[j].collectionMoney !== '' ? this.formobj.scmCollectionRebateWiths[j].collectionMoney : 0) + parseFloat(cval.collectionMoney !== '' ? cval.collectionMoney : 0)
-            this.formobj.scmCollectionRebateWiths[j].freight = parseFloat(this.formobj.scmCollectionRebateWiths[j].freight !== '' ? this.formobj.scmCollectionRebateWiths[j].freight : 0) + parseFloat(cval.freight !== '' ? cval.freight : 0)
-            this.formobj.scmCollectionRebateWiths[j].estimateRebate = parseFloat(this.formobj.scmCollectionRebateWiths[j].estimateRebate !== '' ? this.formobj.scmCollectionRebateWiths[j].estimateRebate : 0) + parseFloat(cval.estimateRebate !== '' ? cval.estimateRebate : 0)
+          if (this.formobj.scmCollectionRebateWiths[j].purchaseSystemName === cval.purchaseSystemName && this.formobj.scmCollectionRebateWiths[j].brandName === cval.brandName && this.formobj.scmCollectionRebateWiths[j].rebateTypeValue === cval.rebateTypeValue && this.formobj.scmCollectionRebateWiths[j].rebateName === cval.rebateName) {
+            this.formobj.scmCollectionRebateWiths[j].estimateRebate = Math.round((parseFloat(this.formobj.scmCollectionRebateWiths[j].estimateRebate !== '' ? this.formobj.scmCollectionRebateWiths[j].estimateRebate : 0) + parseFloat(cval.estimateRebate !== '' ? cval.estimateRebate : 0)) * 100) / 100
             this.formobj.scmCollectionRebateWiths[j].collectionRebateSids.push(cval.sid)
             v = 1
             break
@@ -219,14 +161,14 @@ export default {
         }
         if (v === 0) {
           this.formobj.scmCollectionRebateWiths.push({
-            collectionTypeKey: cval.collectionTypeKey,
-            collectionTypeValue: cval.collectionTypeValue,
-            collectionMoney: cval.collectionMoney,
-            freight: cval.freight,
-            calculationStandard: cval.calculationStandard,
-            estimateRebate: cval.estimateRebate,
+            purchaseSystemName: cval.purchaseSystemName,
+            purchaseSystemSid: cval.purchaseSystemSid,
             brandName: cval.brandName,
             brandSid: cval.brandSid,
+            rebateTypeKey: cval.rebateTypeKey,
+            rebateTypeValue: cval.rebateTypeValue,
+            rebateName: cval.rebateName,
+            estimateRebate: cval.estimateRebate,
             collectionRebateSids: [cval.sid],
             sid: '',
             mainSid: ''
@@ -240,7 +182,7 @@ export default {
       this.$refs['divAdd'].showInfo(row)
     },
     // 明细--查看返回数据
-    backAdd(value, collectionTypeValue) {
+    backAdd(value, purchaseSystemName, brandName, rebateTypeValue, rebateName) {
       this.viewState = 1
       const aa = []
       if (value.length > 0) {
@@ -248,10 +190,8 @@ export default {
           let cval = value[i]
           let v = 0
           for (var j in aa) {
-            if (aa[j].collectionTypeValue === cval.collectionTypeValue) {
-              aa[j].collectionMoney = parseFloat(aa[j].collectionMoney !== '' ? aa[j].collectionMoney : 0) + parseFloat(cval.collectionMoney !== '' ? cval.collectionMoney : 0)
-              aa[j].freight = parseFloat(aa[j].freight !== '' ? aa[j].freight : 0) + parseFloat(cval.freight !== '' ? cval.freight : 0)
-              aa[j].estimateRebate = parseFloat(aa[j].estimateRebate !== '' ? aa[j].estimateRebate : 0) + parseFloat(cval.estimateRebate !== '' ? cval.estimateRebate : 0)
+            if (aa[j].purchaseSystemName === cval.purchaseSystemName && aa[j].brandName === cval.brandName && aa[j].rebateTypeValue === cval.rebateTypeValue && aa[j].rebateName === cval.rebateName) {
+              aa[j].estimateRebate = Math.round((parseFloat(aa[j].estimateRebate !== '' ? aa[j].estimateRebate : 0) + parseFloat(cval.estimateRebate !== '' ? cval.estimateRebate : 0)) * 100) / 100
               aa[j].collectionRebateSids.push(cval.sid)
               v = 1
               break
@@ -259,14 +199,14 @@ export default {
           }
           if (v === 0) {
             aa.push({
-              collectionTypeKey: cval.collectionTypeKey,
-              collectionTypeValue: cval.collectionTypeValue,
-              collectionMoney: cval.collectionMoney,
-              freight: cval.freight,
-              calculationStandard: cval.calculationStandard,
-              estimateRebate: cval.estimateRebate,
+              purchaseSystemName: cval.purchaseSystemName,
+              purchaseSystemSid: cval.purchaseSystemSid,
               brandName: cval.brandName,
               brandSid: cval.brandSid,
+              rebateTypeKey: cval.rebateTypeKey,
+              rebateTypeValue: cval.rebateTypeValue,
+              rebateName: cval.rebateName,
+              estimateRebate: cval.estimateRebate,
               collectionRebateSids: [cval.sid],
               sid: '',
               mainSid: ''
@@ -274,22 +214,22 @@ export default {
           }
         }
         for (var k = 0; k < this.formobj.scmCollectionRebateWiths.length; k++) {
-          if (this.formobj.scmCollectionRebateWiths[k].collectionTypeValue === collectionTypeValue) {
-            this.formobj.scmCollectionRebateWiths[k].collectionTypeKey = aa[0].collectionTypeKey
-            this.formobj.scmCollectionRebateWiths[k].collectionTypeValue = aa[0].collectionTypeValue
-            this.formobj.scmCollectionRebateWiths[k].collectionMoney = aa[0].collectionMoney
-            this.formobj.scmCollectionRebateWiths[k].estimateRebate = aa[0].estimateRebate
-            this.formobj.scmCollectionRebateWiths[k].freight = aa[0].freight
-            this.formobj.scmCollectionRebateWiths[k].calculationStandard = aa[0].calculationStandard
+          if (this.formobj.scmCollectionRebateWiths[k].purchaseSystemName === purchaseSystemName && this.formobj.scmCollectionRebateWiths[k].brandName === brandName && this.formobj.scmCollectionRebateWiths[k].rebateTypeValue === rebateTypeValue && this.formobj.scmCollectionRebateWiths[k].rebateName === rebateName) {
+            this.formobj.scmCollectionRebateWiths[k].purchaseSystemName = aa[0].purchaseSystemName
+            this.formobj.scmCollectionRebateWiths[k].purchaseSystemSid = aa[0].purchaseSystemSid
             this.formobj.scmCollectionRebateWiths[k].brandName = aa[0].brandName
             this.formobj.scmCollectionRebateWiths[k].brandSid = aa[0].brandSid
+            this.formobj.scmCollectionRebateWiths[k].rebateTypeKey = aa[0].rebateTypeKey
+            this.formobj.scmCollectionRebateWiths[k].rebateTypeValue = aa[0].rebateTypeValue
+            this.formobj.scmCollectionRebateWiths[k].rebateName = aa[0].rebateName
+            this.formobj.scmCollectionRebateWiths[k].estimateRebate = aa[0].estimateRebate
             this.formobj.scmCollectionRebateWiths[k].vehRebateSids = aa[0].vehRebateSids
             break
           }
         }
       } else if (value.length === 0) {
         for (var l = 0; l < this.formobj.scmCollectionRebateWiths.length; l++) {
-          if (this.formobj.scmCollectionRebateWiths[l].collectionTypeValue === collectionTypeValue) {
+          if (this.formobj.scmCollectionRebateWiths[l].purchaseSystemName === purchaseSystemName && this.formobj.scmCollectionRebateWiths[l].brandName === brandName && this.formobj.scmCollectionRebateWiths[l].rebateTypeValue === rebateTypeValue && this.formobj.scmCollectionRebateWiths[l].rebateName === rebateName) {
             this.formobj.scmCollectionRebateWiths.splice(l, 1)
             break
           }
@@ -368,21 +308,6 @@ export default {
           }, 0)
           sums[index] += ''
           this.formobj.withRebateTotal = sums[index] += ''
-        } else {
-          if (!values.every(value => isNaN(value))) {
-            sums[index] = values.reduce((prev, curr) => {
-              const value = Number(curr)
-              if (!isNaN(value)) {
-                return prev + curr
-              } else {
-                return prev
-              }
-            }, 0)
-            sums[index] += ''
-            this.amount = sums[index] += ''
-          } else {
-            sums[index] = ''
-          }
         }
       })
       return sums
@@ -396,12 +321,11 @@ export default {
   text-align: center;
   padding: 30px 0 20px 0;
 }
-.rowStyle {
-  border-left: 0px;
+.span-sty {
+  width: 130px !important;
 }
-.colOneStyle {
-  border-right: 0px !important;
-  border-bottom: 0px !important;
+.addinputInfo {
+  margin-left: 120px !important;
 }
 </style>
 
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/huikuanfanliyutiYiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/huikuanfanliyutiYiBanInfo.vue
index c19d2e7fb9..b9ef10b0b7 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/huikuanfanliyutiYiBanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/huikuanfanliyutiYiBanInfo.vue
@@ -14,65 +14,38 @@
       <!--Start 新增修改部分-->
       <div class="">
         <div class="titwu"><span>{{ formobj.collectionApply }}回款返利预提申请</span></div>
-        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formadd">
-          <el-row class="rowStyle">
-            <el-col :span="24" class="tleftb colOneStyle">
-              <div><span style="font-size: 16px">金额单位：元</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">
+              <div class="span-sty">分公司</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createOrgName }}</span></el-form-item>
             </el-col>
-          </el-row>
-          <el-row class="rowStyle">
-            <el-col :span="2" class="tleftb colOneStyle">
-              <span>品牌:</span>
-            </el-col>
-            <el-col :span="4" class="colOneStyle">
-              <el-form-item>
-                <span>{{ formobj.brandName }}</span>
-              </el-form-item>
+            <el-col :span="8">
+              <div class="span-sty">申请部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
             </el-col>
-            <el-col :span="18" class="tleftb colOneStyle">
+            <el-col :span="8">
+              <div class="span-sty">申请人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
             </el-col>
           </el-row>
           <el-table :key="tableKey" :data="formobj.scmCollectionRebateWiths" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
             <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column label="回款方式" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.collectionTypeValue }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="回款金额" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.collectionMoney }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="运费" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.freight }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="计算标准" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.calculationStandard }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="estimateRebate" label="预计返利" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.estimateRebate }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="明细" align="center">
+            <el-table-column prop="purchaseSystemName" label="采购系统" align="center" min-width="150" />
+            <el-table-column prop="brandName" label="品牌" align="center" min-width="150" />
+            <el-table-column prop="rebateTypeValue" label="返利类型" align="center" min-width="150" />
+            <el-table-column prop="rebateName" label="返利名称" align="center" min-width="150" />
+            <el-table-column prop="estimateRebate" label="预计返利" align="center" min-width="150"/>
+            <el-table-column label="明细" align="center" width="100">
               <template slot-scope="scope">
                 <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
           <el-row>
-            <el-col :span="2" class="tleftb">
-              <span>备注</span>
-            </el-col>
-            <el-col :span="22">
-              <el-form-item>
-                <span>{{ formobj.remarks }}</span>
-              </el-form-item>
+            <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>
         </el-form>
@@ -101,11 +74,11 @@ export default {
       // 表单数据
       formobj: {
         sid: '',
-        brandName: '',
-        brandSid: '',
+        deptName: '',
+        deptSid: '',
         collectionApply: '',
         createOrgName: '',
-        createOrgSId: '',
+        createOrgSid: '',
         useOrgName: '',
         useOrgSid: '',
         remarks: '',
@@ -238,21 +211,6 @@ export default {
           }, 0)
           sums[index] += ''
           this.formobj.withRebateTotal = sums[index] += ''
-        } else {
-          if (!values.every(value => isNaN(value))) {
-            sums[index] = values.reduce((prev, curr) => {
-              const value = Number(curr)
-              if (!isNaN(value)) {
-                return prev + curr
-              } else {
-                return prev
-              }
-            }, 0)
-            sums[index] += ''
-            this.amount = sums[index] += ''
-          } else {
-            sums[index] = ''
-          }
         }
       })
       return sums
@@ -266,11 +224,10 @@ export default {
   text-align: center;
   padding: 30px 0 20px 0;
 }
-.rowStyle {
-  border-left: 0px;
+.span-sty {
+  width: 130px !important;
 }
-.colOneStyle {
-  border-right: 0px !important;
-  border-bottom: 0px !important;
+.addinputInfo {
+  margin-left: 120px !important;
 }
 </style>
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/relation/huikuanfanliAdd.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/relation/huikuanfanliAdd.vue
index 50e45fbe59..65eefb0681 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/relation/huikuanfanliAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/relation/huikuanfanliAdd.vue
@@ -23,63 +23,37 @@
                 <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
               </template>
             </el-table-column>
-            <el-table-column label="品牌" align="center" width="200">
-              <template slot-scope="scope">
-                <span>{{ scope.row.brandName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="回款方式" align="center" width="200">
-              <template slot-scope="scope">
-                <span>{{ scope.row.collectionTypeValue }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="厂家回款账号" align="center" width="">
-              <template slot-scope="scope">
-                <span>{{ scope.row.manufaBankAccount }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="回款金额" align="center" width="150">
-              <template slot-scope="scope">
-                <span>{{ scope.row.collectionMoney }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="运费" align="center" width="150">
-              <template slot-scope="scope">
-                <span>{{ scope.row.freight }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="回款日期" align="center" width="100">
-              <template slot-scope="scope">
-                <span>{{ scope.row.collectionDate }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="计算标准" align="center" width="120">
-              <template slot-scope="scope">
-                <span>{{ scope.row.calculationStandard }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="预计返利" align="center" width="120">
-              <template slot-scope="scope">
-                <span>{{ scope.row.estimateRebate }}</span>
-              </template>
-            </el-table-column>
+            <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="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" />
+            <el-table-column prop="collectionDate" label="回款日期" align="center" width="120" />
+            <el-table-column prop="freight" label="运费" align="center" width="130" />
+            <el-table-column prop="topAmount" label="上装金额" align="center" width="130" />
+            <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="remarks" label="备注" align="center" min-width="200" />
           </el-table>
         </el-form>
       </div>
     </div>
     <!--End 添加修改部分-->
-    <huikuanfanliguanliInfo v-show="viewState == 2" ref="divInfo" @doback="resetState"/>
+    <collectionrebatemanagementInfo v-show="viewState == 2" ref="divInfo" @doback="resetState"/>
   </div>
 </template>
 
 <script>
 import req from '@/api/manufacturerrebates/collectionrebatewithholding'
-import huikuanfanliguanliInfo from './huikuanfanliguanliInfo'
+import collectionrebatemanagementInfo from '../../../manufacturerrebates/huikuanguanli/collectionrebatemanagementInfo'
 
 export default {
-  name: 'huikuanfanliAdd',
+  name: 'HuiKuanFanLiAdd',
   components: {
-    huikuanfanliguanliInfo
+    collectionrebatemanagementInfo
   },
   data() {
     return {
@@ -87,7 +61,10 @@ export default {
       index: 0,
       tableKey: 0,
       viewState: 1,
-      collectionTypeValue: '',
+      purchaseSystemName: '',
+      brandName: '',
+      rebateTypeValue: '',
+      rebateName: '',
       sids: [],
       // 表单数据
       list: [],
@@ -109,10 +86,15 @@ export default {
         this.$refs['form_obj'].clearValidate()
       })
       this.viewTitle = '待预提回款返利明细'
-      this.collectionTypeValue = row.collectionTypeValue
+      this.purchaseSystemName = row.purchaseSystemName
+      this.brandName = row.brandName
+      this.rebateTypeValue = row.rebateTypeValue
+      this.rebateName = row.rebateName
       console.log('编辑回显', row.sid)
       req.collectionRebateWithDetails(row.collectionRebateSids).then((resp) => {
-        this.list = resp.data
+        if (resp.success) {
+          this.list = resp.data
+        }
       }).catch((e) => {
         this.formobj = row
       })
@@ -147,17 +129,17 @@ export default {
       for (var i = 0; i < this.list.length; i++) {
         data_list.push({
           sid: this.list[i].sid,
-          collectionTypeValue: this.list[i].collectionTypeValue,
-          collectionTypeKey: this.list[i].collectionTypeKey,
-          collectionMoney: this.list[i].collectionMoney,
-          freight: this.list[i].freight,
-          estimateRebate: this.list[i].estimateRebate,
-          calculationStandard: this.list[i].calculationStandard,
+          purchaseSystemName: this.list[i].purchaseSystemName,
+          purchaseSystemSid: this.list[i].purchaseSystemSid,
           brandName: this.list[i].brandName,
-          brandSid: this.list[i].brandSid
+          brandSid: this.list[i].brandSid,
+          rebateTypeKey: this.list[i].rebateTypeKey,
+          rebateTypeValue: this.list[i].rebateTypeValue,
+          rebateName: this.list[i].rebateName,
+          estimateRebate: this.list[i].estimateRebate
         })
       }
-      this.$emit('backAdd', data_list, this.collectionTypeValue)
+      this.$emit('backAdd', data_list, this.purchaseSystemName, this.brandName, this.rebateTypeValue, this.rebateName)
     }
   }
 }
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/relation/huikuanfanliInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/relation/huikuanfanliInfo.vue
index 6ec40e6aeb..4af227f52e 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/relation/huikuanfanliInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/relation/huikuanfanliInfo.vue
@@ -21,63 +21,37 @@
                 <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
               </template>
             </el-table-column>
-            <el-table-column label="品牌" align="center" width="200">
-              <template slot-scope="scope">
-                <span>{{ scope.row.brandName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="回款方式" align="center" width="200">
-              <template slot-scope="scope">
-                <span>{{ scope.row.collectionTypeValue }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="厂家回款账号" align="center" width="">
-              <template slot-scope="scope">
-                <span>{{ scope.row.manufaBankAccount }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="回款金额" align="center" width="150">
-              <template slot-scope="scope">
-                <span>{{ scope.row.collectionMoney }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="运费" align="center" width="150">
-              <template slot-scope="scope">
-                <span>{{ scope.row.freight }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="回款日期" align="center" width="100">
-              <template slot-scope="scope">
-                <span>{{ scope.row.collectionDate }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="计算标准" align="center" width="120">
-              <template slot-scope="scope">
-                <span>{{ scope.row.calculationStandard }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="预计返利" align="center" width="120">
-              <template slot-scope="scope">
-                <span>{{ scope.row.estimateRebate }}</span>
-              </template>
-            </el-table-column>
+            <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="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" />
+            <el-table-column prop="collectionDate" label="回款日期" align="center" width="120" />
+            <el-table-column prop="freight" label="运费" align="center" width="130" />
+            <el-table-column prop="topAmount" label="上装金额" align="center" width="130" />
+            <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="remarks" label="备注" align="center" min-width="200" />
           </el-table>
         </el-form>
       </div>
     </div>
     <!--End 添加修改部分-->
-    <huikuanfanliguanliInfo v-show="viewState == 2" ref="divInfo" @doback="resetState"/>
+    <collectionrebatemanagementInfo v-show="viewState == 2" ref="divInfo" @doback="resetState"/>
   </div>
 </template>
 
 <script>
 import req from '@/api/manufacturerrebates/collectionrebatewithholding'
-import huikuanfanliguanliInfo from './huikuanfanliguanliInfo'
+import collectionrebatemanagementInfo from '../../../manufacturerrebates/huikuanguanli/collectionrebatemanagementInfo'
 
 export default {
-  name: 'huikuanfanliInfo',
+  name: 'HuiKuanFanLiInfo',
   components: {
-    huikuanfanliguanliInfo
+    collectionrebatemanagementInfo
   },
   data() {
     return {
@@ -99,7 +73,9 @@ export default {
       this.viewTitle = '待预提回款返利明细'
       console.log('编辑回显', row.sid)
       req.collectionRebateWithDetails(row.collectionRebateSids).then((resp) => {
-        this.list = resp.data
+        if (resp.success) {
+          this.list = resp.data
+        }
       }).catch((e) => {
         this.formobj = row
       })
@@ -112,8 +88,7 @@ export default {
       this.viewState = 1
     },
     // 返回（===既判断）
-    handleReturn(isreload) {
-      if (isreload === 'true') this.$emit('reloadlist')
+    handleReturn() {
       // 表单数据
       this.list = []
       this.$refs['form_obj'].resetFields()
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/relation/huikuanfanliguanliInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/relation/huikuanfanliguanliInfo.vue
index 3f157d6829..497441d4d1 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/relation/huikuanfanliguanliInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/relation/huikuanfanliguanliInfo.vue
@@ -9,83 +9,115 @@
       </div>
       <div class="">
         <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="3" class="tleftb">
-              <span>回款方式</span>
-            </el-col>
-            <el-col :span="3">
-              <el-form-item>
-                <span>{{ formobj.collectionTypeValue }}</span>
-              </el-form-item>
+        <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.useOrgName }}</span></el-form-item>
             </el-col>
-            <el-col :span="3" class="tleftb">
-              <span>厂家销售通路</span>
+            <el-col :span="8">
+              <div class="span-sty">采购系统</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.purchaseSystemName }}</span></el-form-item>
             </el-col>
-            <el-col :span="3">
-              <el-form-item><span>{{ formobj.manufaSaleChannelValue }}</span></el-form-item>
+            <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="3" class="tleftb">
-              <span>回款日期</span>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <div class="span-sty">回款方式</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.collectionTypeValue }}</span></el-form-item>
             </el-col>
-            <el-col :span="3">
-              <el-form-item><span>{{ formobj.collectionDate }}</span></el-form-item>
+            <el-col :span="6">
+              <div class="span-sty">厂家销售通路</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.manufaSaleChannelValue }}</span></el-form-item>
             </el-col>
-            <el-col :span="3" class="tleftb">
-              <span>回款金额</span>
+            <el-col :span="6">
+              <div class="span-sty">回款日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.collectionDate }}</span></el-form-item>
             </el-col>
-            <el-col :span="3">
-              <el-form-item><span>{{ formobj.collectionMoney }}</span></el-form-item>
+            <el-col :span="6">
+              <div class="span-sty">回款金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.collectionMoney }}</span></el-form-item>
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="3" class="tleftb">
-              <span>是否减运费</span>
+            <el-col :span="6">
+              <div class="span-sty">是否减运费</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.isReduceFreight == '1' ? '是' : '否' }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty">运费</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.freight }}</span>
+              </el-form-item>
             </el-col>
-            <el-col :span="3">
-              <el-form-item>
-                <span>{{ formobj.isReduceFreight === '1' ? '是' : '否' }}</span>
+            <el-col :span="6">
+              <div class="span-sty">是否减上装</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.isReduceTop == '1' ? '是' : '否' }}</span>
               </el-form-item>
             </el-col>
-            <el-col :span="3" class="tleftb">
-              <span>运费</span>
+            <el-col :span="6">
+              <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="6">
+              <div class="span-sty">返利类型</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.rebateTypeValue }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty">返利名称</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.rebateName }}</span></el-form-item>
             </el-col>
-            <el-col :span="3">
-              <el-form-item><span>{{ formobj.freight }}</span></el-form-item>
+            <el-col :span="6">
+              <div class="span-sty">计算标准(%)</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.calculationStandard }}</span></el-form-item>
             </el-col>
-            <el-col :span="3" class="tleftb">
-              <span>计算标准(%)</span>
+            <el-col :span="6">
+              <div class="span-sty">预计返利</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.estimateRebate }}</span></el-form-item>
             </el-col>
-            <el-col :span="3">
-              <el-form-item><span>{{ formobj.calculationStandard }}</span></el-form-item>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <div class="span-sty">预提日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.withholdingDate }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty">上传日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.uploadDate }}</span></el-form-item>
             </el-col>
-            <el-col :span="3" class="tleftb">
-              <span>预计返利</span>
+            <el-col :span="6">
+              <div class="span-sty">上传金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.uploadMoney }}</span></el-form-item>
             </el-col>
-            <el-col :span="3">
-              <el-form-item><span>{{ formobj.estimateRebate }}</span></el-form-item>
+            <el-col :span="6">
+              <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>
-          <div class="title">
-            <div>车辆回款返利列表</div>
-          </div>
+          <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-table :key="tableKey" :data="formobj.scmCollectionRebateVehs" :index="index" border style="width: 100%">
-            <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column label="车架号" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.vinNo }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="厂家结算价" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.costPrice }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="" label="预计返利" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.estimateRebate }}</span>
-              </template>
-            </el-table-column>
+            <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="costPrice" label="厂家结算价" align="center" />
+            <el-table-column prop="estimateRebate" label="预计返利" align="center" />
           </el-table>
         </el-form>
       </div>
@@ -133,5 +165,11 @@ export default {
   text-align: center;
   padding: 30px 0 20px 0;
 }
+.span-sty {
+  width: 130px !important;
+}
+.addinputInfo {
+  margin-left: 120px !important;
+}
 </style>
 
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/relation/huikuanfanliselect.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/relation/huikuanfanliselect.vue
index 2f5b333ccb..5aff058034 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/relation/huikuanfanliselect.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/relation/huikuanfanliselect.vue
@@ -8,6 +8,12 @@
           <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
           <div v-show="isSearchShow" class="search">
             <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
+              <el-form-item label="采购系统">
+                <el-input v-model="listQuery.params.purchaseSystemName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="品牌">
+                <el-input v-model="listQuery.params.brandName" placeholder="" clearable/>
+              </el-form-item>
               <el-form-item label="回款方式">
                 <el-select v-model="listQuery.params.collectionTypeKey" placeholder="请选择" filterable clearable>
                   <el-option v-for="item in collectionType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
@@ -23,6 +29,14 @@
                 <span style="padding: 0 8px">至</span>
                 <el-date-picker v-model="listQuery.params.createEndTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
               </el-form-item>
+              <el-form-item label="返利类型">
+                <el-select v-model="listQuery.params.rebateTypeKey" placeholder="请选择" filterable clearable>
+                  <el-option v-for="item in rebateType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="返利名称">
+                <el-input v-model="listQuery.params.rebateName" placeholder="" clearable/>
+              </el-form-item>
             </el-form>
             <div class="btn" style="text-align: center;">
               <el-button type="primary" icon="el-icon-search" @click="handleFilter" size="small">查询</el-button>
@@ -43,46 +57,20 @@
                 <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
               </template>
             </el-table-column>
-            <el-table-column label="品牌" align="center" width="200">
-              <template slot-scope="scope">
-                <span>{{ scope.row.brandName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="回款方式" align="center" width="200">
-              <template slot-scope="scope">
-                <span>{{ scope.row.collectionTypeValue }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="厂家回款账号" align="center" width="">
-              <template slot-scope="scope">
-                <span>{{ scope.row.manufaBankAccount }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="回款金额" align="center" width="150">
-              <template slot-scope="scope">
-                <span>{{ scope.row.collectionMoney }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="运费" align="center" width="150">
-              <template slot-scope="scope">
-                <span>{{ scope.row.freight }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="回款日期" align="center" width="100">
-              <template slot-scope="scope">
-                <span>{{ scope.row.collectionDate }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="计算标准" align="center" width="120">
-              <template slot-scope="scope">
-                <span>{{ scope.row.calculationStandard }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="预计返利" align="center" width="120">
-              <template slot-scope="scope">
-                <span>{{ scope.row.estimateRebate }}</span>
-              </template>
-            </el-table-column>
+            <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="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" />
+            <el-table-column prop="collectionDate" label="回款日期" align="center" width="120" />
+            <el-table-column prop="freight" label="运费" align="center" width="130" />
+            <el-table-column prop="topAmount" label="上装金额" align="center" width="130" />
+            <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="remarks" label="备注" align="center" min-width="200" />
           </el-table>
         </div>
         <div class="pages">
@@ -91,7 +79,7 @@
         </div>
       </div>
     </div>
-    <huikuanfanliguanliInfo v-show="viewState == 2" ref="divInfo" @doback="resetState"/>
+    <collectionrebatemanagementInfo v-show="viewState == 2" ref="divInfo" @doback="resetState"/>
   </div>
 </template>
 
@@ -100,14 +88,14 @@ import req from '@/api/manufacturerrebates/collectionrebatewithholding'
 import Pagination from '@/components/pagination'
 import ButtonBar from '@/components/ButtonBar'
 import { typeValues } from '@/api/cheliang/dictcommons'
-import huikuanfanliguanliInfo from './huikuanfanliguanliInfo'
+import collectionrebatemanagementInfo from '../../../manufacturerrebates/huikuanguanli/collectionrebatemanagementInfo'
 
 export default {
   name: 'HuiKuanFanLiSelect',
   components: {
     Pagination,
     ButtonBar,
-    huikuanfanliguanliInfo
+    collectionrebatemanagementInfo
   },
   data() {
     return {
@@ -130,10 +118,14 @@ export default {
       sids: [],
       FormLoading: false,
       listLoading: false,
+      rebateType_list: [],
       collectionType_list: [],
       listQuery: {
         params: {
-          brandSid: '',
+          purchaseSystemName: '',
+          brandName: '',
+          rebateTypeKey: '',
+          rebateName: '',
           collectionEndDate: '',
           collectionStartDate: '',
           collectionTypeKey: '',
@@ -160,6 +152,11 @@ export default {
           this.collectionType_list = res.data
         }
       })
+      typeValues({ type: 'rebateType' }).then((res) => {
+        if (res.success) {
+          this.rebateType_list = res.data
+        }
+      })
     },
     // 搜索条件效果
     clicksearchShow() {
@@ -187,22 +184,7 @@ export default {
       return pageindex
     },
     handleSelectionChange(row) {
-      const aa = []
-      row.forEach((element) => {
-        aa.push({
-          sid: element.sid,
-          collectionTypeValue: element.collectionTypeValue,
-          collectionTypeKey: element.collectionTypeKey,
-          collectionMoney: element.collectionMoney,
-          freight: element.freight,
-          estimateRebate: element.estimateRebate,
-          calculationStandard: element.calculationStandard,
-          brandName: element.brandName,
-          brandSid: element.brandSid
-        })
-      })
-      this.sids = aa
-      console.log('sids', this.sids)
+      this.sids = row
     },
     // 查询列表信息
     getList() {
@@ -219,9 +201,8 @@ export default {
         }
       })
     },
-    showData(value, createOrgSid, brandSid) {
+    showData(value, createOrgSid) {
       this.listQuery.params.createOrgSid = createOrgSid
-      this.listQuery.params.brandSid = brandSid
       const aa = []
       if (value.length > 0) {
         for (var i = 0; i < value.length; i++) {
@@ -245,6 +226,10 @@ export default {
       this.listQuery.current = 1
       this.listQuery.total = 0
       this.listQuery.size = 5
+      this.listQuery.params.purchaseSystemName = ''
+      this.listQuery.params.brandName = ''
+      this.listQuery.params.rebateTypeKey = ''
+      this.listQuery.params.rebateName = ''
       this.listQuery.params.createStartTime = ''
       this.listQuery.params.createEndTime = ''
       this.listQuery.params.collectionEndDate = ''