From ff08ed4e36f5922f5006b062e6f4151190780e6e Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Fri, 20 Dec 2024 16:43:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8D=95=E8=BD=A6=E8=BF=94?=
 =?UTF-8?q?=E5=88=A9=E6=A0=B8=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bicyclerebatecheck/bicyclerebatecheck.vue |  52 ++--
 .../bicyclerebatecheckAdd.vue                 | 231 +++++++-----------
 .../bicyclerebatecheckInfo.vue                | 198 +++++++--------
 .../bicyclerebatetobechecked.vue              |  26 +-
 .../bicyclerebatetobecheckedByUpdate.vue      |  12 +-
 .../relation/bicyclerebatetobecheckedAdd.vue  |  14 +-
 .../relation/bicyclerebatetobecheckedInfo.vue |   1 +
 .../relation/yiheduidanchefanli.vue           |   5 +-
 .../bicyclerebatewithholding.vue              |   2 +-
 .../bicyclerebatemanagement.vue               |  24 +-
 .../danchefanliheduiDaiBanInfo.vue            | 176 ++++++-------
 .../danchefanliheduiEdit.vue                  | 223 ++++++-----------
 .../danchefanliheduiYiBanInfo.vue             | 182 ++++++--------
 .../relation/bicycleInfo.vue                  |  12 +-
 .../relation/bicyclerebatetobecheckedAdd.vue  |  14 +-
 .../relation/bicyclerebatetobecheckedInfo.vue |   1 +
 .../relation/yiheduidanchefanli.vue           |   5 +-
 17 files changed, 490 insertions(+), 688 deletions(-)

diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheck.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheck.vue
index 2d79c90418..4dd78578dc 100644
--- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheck.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheck.vue
@@ -12,19 +12,31 @@
           <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-input v-model="listQuery.params.checkApply" placeholder="" clearable/>
+              <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.billNo" placeholder="" clearable/>
               </el-form-item>
-              <el-form-item label="创建日期">
+              <el-form-item label="申请日期">
                 <el-date-picker v-model="listQuery.params.createStartTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
                 <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.finishTimeStart" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker v-model="listQuery.params.finishTimeEnd" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
+              </el-form-item>
+              <el-form-item label="申请标题">
+                <el-input v-model="listQuery.params.checkApply" 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>
@@ -52,8 +64,12 @@
                 <span v-else @click="flowRecord(scope.row)" class="bluezi">{{ scope.row.nodeState }}</span>
               </template>
             </el-table-column>
+            <el-table-column prop="billNo" label="申请编号" align="center" width="180" />
             <el-table-column prop="createOrgName" label="分公司" align="center" width="150" />
-            <el-table-column prop="brandName" label="品牌" align="center" width="120" />
+            <el-table-column prop="deptName" label="申请部门" align="center" width="120" />
+            <el-table-column prop="createByName" label="申请人" align="center" width="120" />
+            <el-table-column prop="createTime" label="申请日期" align="center" width="120" />
+            <el-table-column prop="finishTime" label="办结日期" align="center" width="120" />
             <el-table-column label="名称" align="center" min-width="200">
               <template slot-scope="scope">
                 <span>{{ scope.row.checkApply }}单车返利上传核对审核申请</span>
@@ -65,8 +81,6 @@
             <el-table-column prop="stayDetermineMoney" label="其中待确定金额" align="center" width="160" />
             <el-table-column prop="money" label="其中费用" align="center" width="150" />
             <el-table-column prop="adjustmentMoney" label="调整金额" align="center" width="150" />
-            <el-table-column prop="createTime" label="创建日期" align="center" width="120" />
-            <el-table-column prop="createByName" label="创建人" align="center" width="120" />
           </el-table>
         </div>
         <div class="pages">
@@ -136,11 +150,16 @@ export default {
       brand_list: '',
       listQuery: {
         params: {
-          brandSid: '',
-          checkApply: '',
           createOrgSid: '',
+          useOrgName: '',
+          deptName: '',
+          createByName: '',
+          billNo: '',
           createEndTime: '',
           createStartTime: '',
+          finishTimeStart: '',
+          finishTimeEnd: '',
+          checkApply: '',
           orgPath: '',
           userSid: '',
           menuUrl: ''
@@ -262,11 +281,16 @@ export default {
     handleReset() {
       this.listQuery = {
         params: {
-          brandSid: '',
-          checkApply: '',
           createOrgSid: '',
+          useOrgName: '',
+          deptName: '',
+          createByName: '',
+          billNo: '',
           createEndTime: '',
           createStartTime: '',
+          finishTimeStart: '',
+          finishTimeEnd: '',
+          checkApply: '',
           orgPath: '',
           userSid: '',
           menuUrl: ''
diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckAdd.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckAdd.vue
index 1bc56c3d4c..5a2f855c92 100644
--- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckAdd.vue
@@ -17,35 +17,49 @@
       <div class="listconadd">
         <div class="titwu"><span>{{ formobj.checkApply }}单车返利上传核对审核申请</span></div>
         <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
-          <el-row class="rowStyle">
-            <el-col :span="6" class="colOneStyle">
-              <div class="span-sty" style="border-right: 0px !important;">品牌：</div>
-              <el-form-item>
-                <el-select class="addinputInfo" :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-row style="border-top: 1px solid #E0E3EB">
+            <el-col :span="16">
+              <div class="span-sty">申请编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
             </el-col>
-            <el-col :span="18" class="colOneStyle">
-              <div style="text-align: right"><el-button size="small" type="primary" class="btntopblueline" @click="handleSelect()">添加</el-button></div>
+            <el-col :span="8">
+              <div class="span-sty">申请日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
             </el-col>
           </el-row>
-          <div class="title">
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">分公司</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createOrgName }}</span></el-form-item>
+            </el-col>
+            <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="8">
+              <div class="span-sty">申请人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title titleOne">
             <div>本月上传核对情况(按返利类型统计)</div>
+            <el-button size="mini" type="primary" class="btntopblueline" @click="handleSelect()">选择</el-button>
           </div>
           <el-table :key="tableKey" :data="formobj.scmWhenVehrebateCheckapplydetailDetails" :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 prop="rebateTypeValue" label="返利类型" align="center" />
-            <el-table-column prop="num" label="数量" align="center" />
-            <el-table-column prop="withRebate" label="预提金额" align="center" />
-            <el-table-column prop="withholdCost" label="其中预提费用" align="center" />
-            <el-table-column prop="uploadMoney" label="上传金额" align="center" />
-            <el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" />
-            <el-table-column prop="money" label="其中费用" align="center" />
-            <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" />
-            <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" />
-            <el-table-column label="明细" align="center">
-              <template slot-scope="scope">
+            <el-table-column prop="purchaseSystemName" label="采购系统" align="center" min-width="120" />
+            <el-table-column prop="brandName" label="品牌" align="center" min-width="120" />
+            <el-table-column prop="rebateTypeValue" label="返利类型" align="center" min-width="120" />
+            <el-table-column prop="num" label="数量" align="center" min-width="100" />
+            <el-table-column prop="withRebate" label="预提金额" align="center" min-width="120" />
+            <el-table-column prop="withholdCost" label="其中预提费用" align="center" min-width="140" />
+            <el-table-column prop="uploadMoney" label="上传金额" align="center" min-width="120" />
+            <el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" min-width="150" />
+            <el-table-column prop="money" label="其中费用" align="center" min-width="120" />
+            <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
+            <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
+            <el-table-column label="明细" align="center" min-width="100">
+              <template>
                 <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
               </template>
             </el-table-column>
@@ -53,17 +67,19 @@
           <div class="title">本月上传核对情况(按预提年月统计)</div>
           <el-table :key="lastVehrebateKey" :data="formobj.scmLastVehrebateCheckapplydetailDetails" border style="width: 100%">
             <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column prop="withholdingDate" label="预提年月" align="center" />
-            <el-table-column prop="num" label="预提数量" align="center" />
-            <el-table-column prop="withRebate" label="预提金额" align="center" />
-            <el-table-column prop="withholdCost" label="其中预提费用" align="center" />
-            <el-table-column prop="uploadMoney" label="上传金额" align="center" />
-            <el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" />
-            <el-table-column prop="money" label="其中费用" align="center" />
-            <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" />
-            <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" />
-            <el-table-column label="明细" align="center">
-              <template slot-scope="scope">
+            <el-table-column prop="purchaseSystemName" label="采购系统" align="center" min-width="120" />
+            <el-table-column prop="brandName" label="品牌" align="center" min-width="120" />
+            <el-table-column prop="withholdingDate" label="预提年月" align="center" min-width="120" />
+            <el-table-column prop="num" label="预提数量" align="center" min-width="100" />
+            <el-table-column prop="withRebate" label="预提金额" align="center" min-width="120" />
+            <el-table-column prop="withholdCost" label="其中预提费用" align="center" min-width="140" />
+            <el-table-column prop="uploadMoney" label="上传金额" align="center" min-width="120" />
+            <el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" min-width="150" />
+            <el-table-column prop="money" label="其中费用" align="center" min-width="120" />
+            <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
+            <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
+            <el-table-column label="明细" align="center" min-width="100">
+              <template>
                 <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
               </template>
             </el-table-column>
@@ -85,7 +101,7 @@
 
 <script>
 import req from '@/api/bikerebate/bicyclerebatecheck'
-import { fetchBySid, brandDown } from '@/api/cheliang/dictcommons'
+import { fetchBySid } from '@/api/cheliang/dictcommons'
 import yiheduidanchefanli from './relation/yiheduidanchefanli'
 import bicyclerebatetobecheckedAdd from './relation/bicyclerebatetobecheckedAdd'
 
@@ -102,17 +118,17 @@ export default {
       index: 0,
       tableKey: 0,
       lastVehrebateKey: 1,
-      dialogStatus: '',
-      brand_list: [],
       // 表单数据
       formobj: {
         sid: '',
         createByName: '',
         createBySid: '',
-        brandName: '',
-        brandSid: '',
         checkApply: '',
+        billNo: '',
+        createTime: '',
         createOrgName: '',
+        deptName: '',
+        deptSid: '',
         createOrgSid: '',
         useOrgName: '',
         useOrgSid: '',
@@ -147,11 +163,6 @@ export default {
           this.formobj.useOrgName = res.data.name
         }
       })
-      brandDown({ useOrg: this.formobj.createOrgSid }).then((res) => {
-        if (res.success) {
-          this.brand_list = res.data
-        }
-      })
     },
     showAdd(createOrgSid) {
       this.$nextTick(() => {
@@ -159,19 +170,26 @@ export default {
         this.init()
         this.newDate()
       })
-      this.dialogStatus = 'add'
       this.formobj.createOrgSid = createOrgSid
       this.formobj.useOrgSid = createOrgSid
       this.formobj.createByName = window.sessionStorage.getItem('name')
       this.formobj.createBySid = window.sessionStorage.getItem('userSid')
       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)
+      var nowDate = new Date()
+      var date = {
+        year: nowDate.getFullYear(),
+        month: nowDate.getMonth() + 1,
+        day: nowDate.getDate()
+      }
+      this.formobj.createTime = date.year + '-' + (date.month >= 10 ? date.month : '0' + date.month) + '-' + (date.day >= 10 ? date.day : '0' + date.day)
       this.viewTitle = '【新增】单车返利核对审核申请'
     },
     showEdit(row) {
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
       })
-      this.dialogStatus = 'edit'
       this.viewTitle = '【编辑】单车返利核对审核申请'
       console.log('编辑回显', row.sid)
       req.fetchDetailsBySid(row.sid).then((resp) => {
@@ -183,22 +201,10 @@ 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.scmWhenVehrebateCheckapplydetailDetails, this.formobj.createOrgSid, this.formobj.brandSid)
+      this.$refs['divSelect'].showData(this.formobj.scmWhenVehrebateCheckapplydetailDetails, this.formobj.createOrgSid)
     },
     backData(val) {
       this.viewState = 1
@@ -212,7 +218,7 @@ export default {
       list.forEach((e) => {
         let v = 0
         for (var i in this.formobj.scmWhenVehrebateCheckapplydetailDetails) {
-          if (this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].rebateTypeValue === e.rebateTypeValue) {
+          if (this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].rebateTypeValue === e.rebateTypeValue && this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].purchaseSystemName === e.purchaseSystemName && this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].brandName === e.brandName) {
             this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].num = parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].num) + parseFloat(1)
             this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withRebate = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withRebate !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withRebate : 0) + parseFloat(e.estimateRebate !== '' ? e.estimateRebate : 0)) * 100) / 100
             this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withholdCost = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withholdCost !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withholdCost : 0) + parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100
@@ -236,6 +242,8 @@ export default {
             withholdCost: e.withholdCost,
             brandName: e.brandName,
             brandSid: e.brandSid,
+            purchaseSystemName: e.purchaseSystemName,
+            purchaseSystemSid: e.purchaseSystemSid,
             uploadMoney: Math.round((parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0)) * 100) / 100,
             stayDetermineMoney: e.stayDetermineMoney,
             adjustmentMoney: e.adjustmentMoney,
@@ -251,7 +259,7 @@ export default {
       // 按照预提年月统计
       list.forEach((s) => {
         for (var l in this.formobj.scmLastVehrebateCheckapplydetailDetails) {
-          if (this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate) {
+          if (this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate && this.formobj.scmLastVehrebateCheckapplydetailDetails[l].purchaseSystemName === s.purchaseSystemName && this.formobj.scmLastVehrebateCheckapplydetailDetails[l].brandName === s.brandName) {
             this.formobj.scmLastVehrebateCheckapplydetailDetails[l].num = parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].num) + parseFloat(1)
             this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withRebate = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withRebate !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withRebate : 0) + parseFloat(s.estimateRebate !== '' ? s.estimateRebate : 0)) * 100) / 100
             this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdCost = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdCost !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdCost : 0) + parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100
@@ -273,6 +281,8 @@ export default {
             withholdCost: s.withholdCost,
             brandName: s.brandName,
             brandSid: s.brandSid,
+            purchaseSystemName: s.purchaseSystemName,
+            purchaseSystemSid: s.purchaseSystemSid,
             uploadMoney: Math.round((parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0)) * 100) / 100,
             stayDetermineMoney: s.stayDetermineMoney,
             adjustmentMoney: s.adjustmentMoney,
@@ -309,7 +319,7 @@ export default {
       list.forEach((e) => {
         let v = 0
         for (var i in this.formobj.scmWhenVehrebateCheckapplydetailDetails) {
-          if (this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].rebateTypeValue === e.rebateTypeValue) {
+          if (this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].rebateTypeValue === e.rebateTypeValue && this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].purchaseSystemName === e.purchaseSystemName && this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].brandName === e.brandName) {
             this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].num = parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].num) + parseFloat(1)
             this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withRebate = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withRebate !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withRebate : 0) + parseFloat(e.estimateRebate !== '' ? e.estimateRebate : 0)) * 100) / 100
             this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withholdCost = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withholdCost !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withholdCost : 0) + parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100
@@ -333,6 +343,8 @@ export default {
             withholdCost: e.withholdCost,
             brandName: e.brandName,
             brandSid: e.brandSid,
+            purchaseSystemName: e.purchaseSystemName,
+            purchaseSystemSid: e.purchaseSystemSid,
             uploadMoney: Math.round((parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0)) * 100) / 100,
             stayDetermineMoney: e.stayDetermineMoney,
             adjustmentMoney: e.adjustmentMoney,
@@ -348,7 +360,7 @@ export default {
       // 按照预提年月统计
       list.forEach((s) => {
         for (var l in this.formobj.scmLastVehrebateCheckapplydetailDetails) {
-          if (this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate) {
+          if (this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate && this.formobj.scmLastVehrebateCheckapplydetailDetails[l].purchaseSystemName === s.purchaseSystemName && this.formobj.scmLastVehrebateCheckapplydetailDetails[l].brandName === s.brandName) {
             this.formobj.scmLastVehrebateCheckapplydetailDetails[l].num = parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].num) + parseFloat(1)
             this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withRebate = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withRebate !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withRebate : 0) + parseFloat(s.estimateRebate !== '' ? s.estimateRebate : 0)) * 100) / 100
             this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdCost = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdCost !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdCost : 0) + parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100
@@ -370,6 +382,8 @@ export default {
             withholdCost: s.withholdCost,
             brandName: s.brandName,
             brandSid: s.brandSid,
+            purchaseSystemName: s.purchaseSystemName,
+            purchaseSystemSid: s.purchaseSystemSid,
             uploadMoney: Math.round((parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0)) * 100) / 100,
             stayDetermineMoney: s.stayDetermineMoney,
             adjustmentMoney: s.adjustmentMoney,
@@ -432,78 +446,7 @@ export default {
           return
         }
         const values = data.map(item => Number(item[column.property]))
-        if (column.property === 'num') {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr)
-            if (!isNaN(value)) {
-              return prev + curr
-            } else {
-              return prev
-            }
-          }, 0)
-          sums[index] += ''
-          this.formobj.withRebateTotal = sums[index] += ''
-        } else if (column.property === 'withRebate') {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr)
-            if (!isNaN(value)) {
-              return prev + curr
-            } else {
-              return prev
-            }
-          }, 0)
-          sums[index] += ''
-        } else if (column.property === 'withholdCost') {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr)
-            if (!isNaN(value)) {
-              return prev + curr
-            } else {
-              return prev
-            }
-          }, 0)
-          sums[index] += ''
-        } else if (column.property === 'uploadMoney') {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr)
-            if (!isNaN(value)) {
-              return prev + curr
-            } else {
-              return prev
-            }
-          }, 0)
-          sums[index] += ''
-        } else if (column.property === 'stayDetermineMoney') {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr)
-            if (!isNaN(value)) {
-              return prev + curr
-            } else {
-              return prev
-            }
-          }, 0)
-          sums[index] += ''
-        } else if (column.property === 'money') {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr)
-            if (!isNaN(value)) {
-              return prev + curr
-            } else {
-              return prev
-            }
-          }, 0)
-          sums[index] += ''
-        } else if (column.property === 'adjustmentMoney') {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr)
-            if (!isNaN(value)) {
-              return prev + curr
-            } else {
-              return prev
-            }
-          }, 0)
-          sums[index] += ''
-        } else if (column.property === 'fyAdjustmentMoney') {
+        if (column.property !== 'purchaseSystemName' && column.property !== 'brandName' && column.property !== 'rebateTypeValue') {
           sums[index] = values.reduce((prev, curr) => {
             const value = Number(curr)
             if (!isNaN(value)) {
@@ -525,9 +468,11 @@ export default {
         sid: '',
         createByName: '',
         createBySid: '',
-        brandName: '',
-        brandSid: '',
         checkApply: '',
+        billNo: '',
+        createTime: '',
+        deptName: '',
+        deptSid: '',
         createOrgName: '',
         createOrgSid: '',
         useOrgName: '',
@@ -547,13 +492,6 @@ export default {
 }
 </script>
 <style scoped>
-.rowStyle {
-  border-left: 0px;
-}
-.colOneStyle {
-  border-right: 0px !important;
-  border-bottom: 0px !important;
-}
 .span-sty {
   width: 130px !important;
 }
@@ -564,5 +502,12 @@ export default {
   margin-left: 120px !important;
   width: calc(100% - 115px);
 }
+.titleOne {
+  padding: 7px;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+}
 </style>
 
diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckInfo.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckInfo.vue
index 21698742f7..85f949c9db 100644
--- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckInfo.vue
@@ -17,26 +17,46 @@
       <div class="listconadd">
         <div class="titwu"><span>{{ formobj.checkApply }}单车返利核对审核申请</span></div>
         <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
-          <el-row class="rowStyle">
-            <el-col :span="24" class="colOneStyle">
-              <div class="span-sty" style="border-right: 0px !important;">品牌：</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.brandName }}</span></el-form-item>
+          <el-row style="border-top: 1px solid #E0E3EB">
+            <el-col :span="16">
+              <div class="span-sty">申请编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">分公司</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createOrgName }}</span></el-form-item>
+            </el-col>
+            <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="8">
+              <div class="span-sty">申请人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
             </el-col>
           </el-row>
           <div class="title">本月上传核对情况(按返利类型统计)</div>
           <el-table :key="tableKey" :data="formobj.scmWhenVehrebateCheckapplydetailDetails" :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 prop="rebateTypeValue" label="返利类型" align="center" />
-            <el-table-column prop="num" label="数量" align="center" />
-            <el-table-column prop="withRebate" label="预提金额" align="center" />
-            <el-table-column prop="withholdCost" label="其中预提费用" align="center" />
-            <el-table-column prop="uploadMoney" label="上传金额" align="center" />
-            <el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" />
-            <el-table-column prop="money" label="其中费用" align="center" />
-            <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" />
-            <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" />
-            <el-table-column label="明细" align="center">
-              <template slot-scope="scope">
+            <el-table-column prop="purchaseSystemName" label="采购系统" align="center" min-width="120" />
+            <el-table-column prop="brandName" label="品牌" align="center" min-width="120" />
+            <el-table-column prop="rebateTypeValue" label="返利类型" align="center" min-width="120" />
+            <el-table-column prop="num" label="数量" align="center" min-width="100" />
+            <el-table-column prop="withRebate" label="预提金额" align="center" min-width="120" />
+            <el-table-column prop="withholdCost" label="其中预提费用" align="center" min-width="140" />
+            <el-table-column prop="uploadMoney" label="上传金额" align="center" min-width="120" />
+            <el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" min-width="150" />
+            <el-table-column prop="money" label="其中费用" align="center" min-width="120" />
+            <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
+            <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
+            <el-table-column label="明细" align="center" min-width="100">
+              <template>
                 <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
               </template>
             </el-table-column>
@@ -44,17 +64,19 @@
           <div class="title">本月上传核对情况(按预提年月统计)</div>
           <el-table :key="lastVehrebateKey" :data="formobj.scmLastVehrebateCheckapplydetailDetails" :index="index" border style="width: 100%">
             <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column prop="withholdingDate" label="预提年月" align="center" />
-            <el-table-column prop="num" label="预提数量" align="center" />
-            <el-table-column prop="withRebate" label="预提金额" align="center" />
-            <el-table-column prop="withholdCost" label="其中预提费用" align="center" />
-            <el-table-column prop="uploadMoney" label="上传金额" align="center" />
-            <el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" />
-            <el-table-column prop="money" label="其中费用" align="center" />
-            <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" />
-            <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" />
-            <el-table-column label="明细" align="center">
-              <template slot-scope="scope">
+            <el-table-column prop="purchaseSystemName" label="采购系统" align="center" min-width="120" />
+            <el-table-column prop="brandName" label="品牌" align="center" min-width="120" />
+            <el-table-column prop="withholdingDate" label="预提年月" align="center" min-width="120" />
+            <el-table-column prop="num" label="预提数量" align="center" min-width="100" />
+            <el-table-column prop="withRebate" label="预提金额" align="center" min-width="120" />
+            <el-table-column prop="withholdCost" label="其中预提费用" align="center" min-width="140" />
+            <el-table-column prop="uploadMoney" label="上传金额" align="center" min-width="120" />
+            <el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" min-width="150" />
+            <el-table-column prop="money" label="其中费用" align="center" min-width="120" />
+            <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
+            <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
+            <el-table-column label="明细" align="center" min-width="100">
+              <template>
                 <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
               </template>
             </el-table-column>
@@ -90,7 +112,27 @@ export default {
       lastVehrebateKey: 1,
       viewState: 1,
       // 表单数据
-      formobj: {},
+      formobj: {
+        sid: '',
+        createByName: '',
+        createBySid: '',
+        checkApply: '',
+        billNo: '',
+        createTime: '',
+        createOrgName: '',
+        deptName: '',
+        deptSid: '',
+        createOrgSid: '',
+        useOrgName: '',
+        useOrgSid: '',
+        remarks: '',
+        instanceId: '', // 流程实例ID
+        taskId: '', // 任务ID
+        orgPath: '',
+        scmWhenVehrebateCheckapplydetailDetails: [],
+        scmLastVehrebateCheckapplydetailDetails: [],
+        scmVehrebateCheckapplydetailList: []
+      },
       rules: {},
       submitdisabled: false
     }
@@ -127,78 +169,7 @@ export default {
           return
         }
         const values = data.map(item => Number(item[column.property]))
-        if (column.property === 'num') {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr)
-            if (!isNaN(value)) {
-              return prev + curr
-            } else {
-              return prev
-            }
-          }, 0)
-          sums[index] += ''
-          this.formobj.withRebateTotal = sums[index] += ''
-        } else if (column.property === 'withRebate') {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr)
-            if (!isNaN(value)) {
-              return prev + curr
-            } else {
-              return prev
-            }
-          }, 0)
-          sums[index] += ''
-        } else if (column.property === 'withholdCost') {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr)
-            if (!isNaN(value)) {
-              return prev + curr
-            } else {
-              return prev
-            }
-          }, 0)
-          sums[index] += ''
-        } else if (column.property === 'uploadMoney') {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr)
-            if (!isNaN(value)) {
-              return prev + curr
-            } else {
-              return prev
-            }
-          }, 0)
-          sums[index] += ''
-        } else if (column.property === 'stayDetermineMoney') {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr)
-            if (!isNaN(value)) {
-              return prev + curr
-            } else {
-              return prev
-            }
-          }, 0)
-          sums[index] += ''
-        } else if (column.property === 'money') {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr)
-            if (!isNaN(value)) {
-              return prev + curr
-            } else {
-              return prev
-            }
-          }, 0)
-          sums[index] += ''
-        } else if (column.property === 'adjustmentMoney') {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr)
-            if (!isNaN(value)) {
-              return prev + curr
-            } else {
-              return prev
-            }
-          }, 0)
-          sums[index] += ''
-        } else if (column.property === 'fyAdjustmentMoney') {
+        if (column.property !== 'purchaseSystemName' && column.property !== 'brandName' && column.property !== 'rebateTypeValue') {
           sums[index] = values.reduce((prev, curr) => {
             const value = Number(curr)
             if (!isNaN(value)) {
@@ -215,7 +186,27 @@ export default {
     // 返回（===既判断）
     handleReturn() {
       // 表单数据
-      this.formobj = {}
+      this.formobj = {
+        sid: '',
+        createByName: '',
+        createBySid: '',
+        checkApply: '',
+        billNo: '',
+        createTime: '',
+        createOrgName: '',
+        deptName: '',
+        deptSid: '',
+        createOrgSid: '',
+        useOrgName: '',
+        useOrgSid: '',
+        remarks: '',
+        instanceId: '', // 流程实例ID
+        taskId: '', // 任务ID
+        orgPath: '',
+        scmWhenVehrebateCheckapplydetailDetails: [],
+        scmLastVehrebateCheckapplydetailDetails: [],
+        scmVehrebateCheckapplydetailList: []
+      }
       this.$refs['form_obj'].resetFields()
       this.$emit('doback')
     }
@@ -223,13 +214,6 @@ export default {
 }
 </script>
 <style scoped>
-.rowStyle {
-  border-left: 0px;
-}
-.colOneStyle {
-  border-right: 0px !important;
-  border-bottom: 0px !important;
-}
 .span-sty {
   width: 130px !important;
 }
diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue
index 7785e0c01e..6865096a7c 100644
--- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue
@@ -12,10 +12,14 @@
           <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.useOrgName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="采购系统">
+                <el-input v-model="listQuery.params.purchaseSystemName" placeholder="" clearable/>
+              </el-form-item>
               <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-input v-model="listQuery.params.brandName" placeholder="" clearable/>
               </el-form-item>
               <el-form-item label="车架号">
                 <el-input v-model="listQuery.params.vinNo" placeholder="" clearable/>
@@ -68,6 +72,8 @@
                 <span>{{ scope.row.onceCheckState == '0' ? '否' : scope.row.onceCheckState == '1' ? '是' : scope.row.onceCheckState == '2' ? '一次核对中' : '' }}</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="vehModelName" label="车型" align="center" min-width="200" />
             <el-table-column prop="vinNo" label="车架号" align="center" width="150" />
@@ -287,7 +293,6 @@ export default {
       list: [],
       sids: [],
       FormLoading: false,
-      brand_list: [],
       rebateType_list: [],
       state_list: [
         {
@@ -302,7 +307,9 @@ export default {
       listLoading: false,
       listQuery: {
         params: {
-          brandSid: '',
+          useOrgName: '',
+          purchaseSystemName: '',
+          brandName: '',
           createOrgSid: '',
           vinNo: '',
           rebateTypeKey: '',
@@ -372,11 +379,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()
         }
       })
@@ -443,7 +445,9 @@ export default {
     handleReset() {
       this.listQuery = {
         params: {
-          brandSid: '',
+          useOrgName: '',
+          purchaseSystemName: '',
+          brandName: '',
           createOrgSid: '',
           vinNo: '',
           rebateTypeKey: '',
diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobecheckedByUpdate.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobecheckedByUpdate.vue
index 35976df2da..b8bd4875e8 100644
--- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobecheckedByUpdate.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobecheckedByUpdate.vue
@@ -17,11 +17,21 @@
         <div class="titwu"><span>单车返利</span></div>
         <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
           <el-row style="border-top: 1px solid #e0e3eb">
+            <el-col :span="8">
+              <div class="span-sty">分公司</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createOrgName }}</span></el-form-item>
+            </el-col>
+            <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="8">
               <div class="span-sty">品牌</div>
               <el-form-item><span class="addinputInfo">{{ formobj.brandName }}</span></el-form-item>
             </el-col>
-            <el-col :span="8">
+          </el-row>
+          <el-row>
+            <el-col :span="16">
               <div class="span-sty">车型</div>
               <el-form-item><span class="addinputInfo">{{ formobj.vehModelName }}</span></el-form-item>
             </el-col>
diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/relation/bicyclerebatetobecheckedAdd.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/relation/bicyclerebatetobecheckedAdd.vue
index e86f57cac1..ae9637eef0 100644
--- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/relation/bicyclerebatetobecheckedAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/relation/bicyclerebatetobecheckedAdd.vue
@@ -23,6 +23,7 @@
                 <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
               </template>
             </el-table-column>
+            <el-table-column prop="purchaseSystemName" label="采购系统" align="center" width="140" />
             <el-table-column prop="brandName" label="品牌" align="center" />
             <el-table-column prop="vehModelName" label="车型" align="center" width="200" />
             <el-table-column prop="vinNo" label="车架号" align="center" width="200" />
@@ -54,7 +55,6 @@
 </template>
 
 <script>
-import req from '@/api/bikerebate/bicyclerebatecheck'
 import bicyclerebatemanagementInfo from '../../bikerebatemanagement/bicyclerebatemanagementInfo'
 
 export default {
@@ -91,17 +91,7 @@ export default {
       })
       this.scmVehrebateCheckapplydetailList = JSON.parse(JSON.stringify(value))
       this.viewTitle = '单车返利核对审核申请明细'
-      if (sid !== '' && sid !== null) {
-        req.vehRebateCheckDetails(sid).then((resp) => {
-          if (resp.success) {
-            this.list = resp.data
-          }
-        }).catch((e) => {
-          this.list = []
-        })
-      } else {
-        this.list = this.scmVehrebateCheckapplydetailList
-      }
+      this.list = this.scmVehrebateCheckapplydetailList
     },
     handleDelete() {
       if (this.sids.length === 0) {
diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/relation/bicyclerebatetobecheckedInfo.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/relation/bicyclerebatetobecheckedInfo.vue
index 7f61a070ce..e74451d933 100644
--- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/relation/bicyclerebatetobecheckedInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/relation/bicyclerebatetobecheckedInfo.vue
@@ -21,6 +21,7 @@
                 <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
               </template>
             </el-table-column>
+            <el-table-column prop="purchaseSystemName" label="采购系统" align="center" width="140" />
             <el-table-column prop="brandName" label="品牌" align="center" />
             <el-table-column prop="vehModelName" label="车型" align="center" width="200" />
             <el-table-column prop="vinNo" label="车架号" align="center" width="200" />
diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/relation/yiheduidanchefanli.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/relation/yiheduidanchefanli.vue
index a8f2ac0a24..8bbf968c02 100644
--- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/relation/yiheduidanchefanli.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/relation/yiheduidanchefanli.vue
@@ -11,6 +11,7 @@
           <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
             <el-table-column fixed type="selection" align="center" width="50px"/>
             <el-table-column fixed label="序号" type="index" :index="indexMethod" align="center" width="80px"/>
+            <el-table-column prop="purchaseSystemName" label="采购系统" align="center" width="140" />
             <el-table-column prop="brandName" label="品牌" align="center" width="120" />
             <el-table-column prop="vehModelName" label="车型" align="center" min-width="200" />
             <el-table-column prop="vinNo" label="车架号" align="center" width="150" />
@@ -83,7 +84,6 @@ export default {
       listLoading: false,
       listQuery: {
         params: {
-          brandSid: '',
           createOrgSid: '',
           sidList: []
         },
@@ -148,9 +148,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++) {
diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholding.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholding.vue
index a3ddce1142..bf3d53d38b 100644
--- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholding.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholding.vue
@@ -14,7 +14,7 @@
               <el-form-item label="申请部门">
                 <el-input v-model="listQuery.params.deptName" placeholder="" clearable/>
               </el-form-item>
-              <el-form-item label="创建人">
+              <el-form-item label="申请人">
                 <el-input v-model="listQuery.params.createByName" placeholder="" clearable/>
               </el-form-item>
               <el-form-item label="申请编号">
diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagement.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagement.vue
index f197ebf753..98c86bfac1 100644
--- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagement.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagement.vue
@@ -15,9 +15,7 @@
                 <el-input v-model="listQuery.params.purchaseSystemName" placeholder="" clearable/>
               </el-form-item>
               <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-input v-model="listQuery.params.brandName" placeholder="" clearable/>
               </el-form-item>
               <el-form-item label="车型">
                 <el-input v-model="listQuery.params.vehModelName" placeholder="" clearable/>
@@ -161,7 +159,7 @@ import req from '@/api/bikerebate/bicyclerebatemanagement'
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
 import ButtonBar from '@/components/ButtonBar'
-import { getOrgSidByPath, typeValues, brandDown } from '@/api/cheliang/dictcommons'
+import { typeValues } from '@/api/cheliang/dictcommons'
 import bicyclerebatemanagementAdd from './bicyclerebatemanagementAdd'
 import bicyclerebatemanagementEdit from './bicyclerebatemanagementEdit'
 import bicyclerebatemanagementInfo from './bicyclerebatemanagementInfo'
@@ -218,7 +216,6 @@ export default {
       sids: [],
       FormLoading: false,
       listLoading: false,
-      brand_list: [],
       rebateType_list: [],
       state_list: [
         {
@@ -253,7 +250,7 @@ export default {
           purchaseSystemName: '',
           vinNo: '',
           vehModelName: '',
-          brandSid: '',
+          brandName: '',
           orgPath: '',
           userSid: '',
           menuUrl: ''
@@ -280,6 +277,7 @@ export default {
   created() {
     // 加载列表
     this.init()
+    this.getList()
   },
   mounted() {
     this.$refs['btnbar'].setButtonList(this.btnList)
@@ -291,16 +289,6 @@ export default {
           this.rebateType_list = res.data
         }
       })
-      getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
-        if (resp.success) {
-          brandDown({ useOrg: resp.data }).then((res) => {
-            if (res.success) {
-              this.brand_list = res.data
-            }
-          })
-          this.getList()
-        }
-      })
     },
     // 搜索条件效果
     clicksearchShow() {
@@ -379,7 +367,7 @@ export default {
           purchaseSystemName: '',
           vinNo: '',
           vehModelName: '',
-          brandSid: '',
+          brandName: '',
           orgPath: '',
           userSid: '',
           menuUrl: ''
@@ -388,7 +376,7 @@ export default {
         size: 5,
         total: 0
       }
-      this.init()
+      this.getList()
     },
     toAdd() {
       this.viewState = 2
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiDaiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiDaiBanInfo.vue
index a54b61a9ed..d2bb7aebeb 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiDaiBanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiDaiBanInfo.vue
@@ -17,26 +17,46 @@
       <div class="">
         <div class="titwu"><span>{{ formobj.checkApply }}单车返利核对审核申请</span></div>
         <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
-          <el-row class="rowStyle">
-            <el-col :span="24" class="colOneStyle">
-              <div class="span-sty" style="border-right: 0px !important;">品牌：</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.brandName }}</span></el-form-item>
+          <el-row style="border-top: 1px solid #E0E3EB">
+            <el-col :span="16">
+              <div class="span-sty">申请编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">分公司</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createOrgName }}</span></el-form-item>
+            </el-col>
+            <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="8">
+              <div class="span-sty">申请人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
             </el-col>
           </el-row>
           <div class="title">本月上传核对情况(按返利类型统计)</div>
           <el-table :key="tableKey" :data="formobj.scmWhenVehrebateCheckapplydetailDetails" :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 prop="rebateTypeValue" label="返利类型" align="center" />
-            <el-table-column prop="num" label="数量" align="center" />
-            <el-table-column prop="withRebate" label="预提金额" align="center" />
-            <el-table-column prop="withholdCost" label="其中预提费用" align="center" />
-            <el-table-column prop="uploadMoney" label="上传金额" align="center" />
-            <el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" />
-            <el-table-column prop="money" label="其中费用" align="center" />
-            <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" />
-            <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" />
-            <el-table-column label="明细" align="center">
-              <template slot-scope="scope">
+            <el-table-column prop="purchaseSystemName" label="采购系统" align="center" min-width="120" />
+            <el-table-column prop="brandName" label="品牌" align="center" min-width="120" />
+            <el-table-column prop="rebateTypeValue" label="返利类型" align="center" min-width="120" />
+            <el-table-column prop="num" label="数量" align="center" min-width="100" />
+            <el-table-column prop="withRebate" label="预提金额" align="center" min-width="120" />
+            <el-table-column prop="withholdCost" label="其中预提费用" align="center" min-width="140" />
+            <el-table-column prop="uploadMoney" label="上传金额" align="center" min-width="120" />
+            <el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" min-width="150" />
+            <el-table-column prop="money" label="其中费用" align="center" min-width="120" />
+            <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
+            <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
+            <el-table-column label="明细" align="center" min-width="100">
+              <template>
                 <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
               </template>
             </el-table-column>
@@ -44,17 +64,19 @@
           <div class="title">本月上传核对情况(按预提年月统计)</div>
           <el-table :key="lastVehrebateKey" :data="formobj.scmLastVehrebateCheckapplydetailDetails" :index="index" border style="width: 100%">
             <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column prop="withholdingDate" label="预提年月" align="center" />
-            <el-table-column prop="num" label="预提数量" align="center" />
-            <el-table-column prop="withRebate" label="预提金额" align="center" />
-            <el-table-column prop="withholdCost" label="其中预提费用" align="center" />
-            <el-table-column prop="uploadMoney" label="上传金额" align="center" />
-            <el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" />
-            <el-table-column prop="money" label="其中费用" align="center" />
-            <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" />
-            <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" />
-            <el-table-column label="明细" align="center">
-              <template slot-scope="scope">
+            <el-table-column prop="purchaseSystemName" label="采购系统" align="center" min-width="120" />
+            <el-table-column prop="brandName" label="品牌" align="center" min-width="120" />
+            <el-table-column prop="withholdingDate" label="预提年月" align="center" min-width="120" />
+            <el-table-column prop="num" label="预提数量" align="center" min-width="100" />
+            <el-table-column prop="withRebate" label="预提金额" align="center" min-width="120" />
+            <el-table-column prop="withholdCost" label="其中预提费用" align="center" min-width="140" />
+            <el-table-column prop="uploadMoney" label="上传金额" align="center" min-width="120" />
+            <el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" min-width="150" />
+            <el-table-column prop="money" label="其中费用" align="center" min-width="120" />
+            <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
+            <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
+            <el-table-column label="明细" align="center" min-width="100">
+              <template>
                 <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
               </template>
             </el-table-column>
@@ -123,7 +145,27 @@ export default {
       nodeDialogVisible: false,
       currentLink: true,
       // 表单数据
-      formobj: {},
+      formobj: {
+        sid: '',
+        createByName: '',
+        createBySid: '',
+        checkApply: '',
+        billNo: '',
+        createTime: '',
+        createOrgName: '',
+        deptName: '',
+        deptSid: '',
+        createOrgSid: '',
+        useOrgName: '',
+        useOrgSid: '',
+        remarks: '',
+        instanceId: '', // 流程实例ID
+        taskId: '', // 任务ID
+        orgPath: '',
+        scmWhenVehrebateCheckapplydetailDetails: [],
+        scmLastVehrebateCheckapplydetailDetails: [],
+        scmVehrebateCheckapplydetailList: []
+      },
       rules: {},
       submitdisabled: false,
       // 环节所需参数
@@ -198,78 +240,7 @@ export default {
           return
         }
         const values = data.map(item => Number(item[column.property]))
-        if (column.property === 'num') {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr)
-            if (!isNaN(value)) {
-              return prev + curr
-            } else {
-              return prev
-            }
-          }, 0)
-          sums[index] += ''
-          this.formobj.withRebateTotal = sums[index] += ''
-        } else if (column.property === 'withRebate') {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr)
-            if (!isNaN(value)) {
-              return prev + curr
-            } else {
-              return prev
-            }
-          }, 0)
-          sums[index] += ''
-        } else if (column.property === 'withholdCost') {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr)
-            if (!isNaN(value)) {
-              return prev + curr
-            } else {
-              return prev
-            }
-          }, 0)
-          sums[index] += ''
-        } else if (column.property === 'uploadMoney') {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr)
-            if (!isNaN(value)) {
-              return prev + curr
-            } else {
-              return prev
-            }
-          }, 0)
-          sums[index] += ''
-        } else if (column.property === 'stayDetermineMoney') {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr)
-            if (!isNaN(value)) {
-              return prev + curr
-            } else {
-              return prev
-            }
-          }, 0)
-          sums[index] += ''
-        } else if (column.property === 'money') {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr)
-            if (!isNaN(value)) {
-              return prev + curr
-            } else {
-              return prev
-            }
-          }, 0)
-          sums[index] += ''
-        } else if (column.property === 'adjustmentMoney') {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr)
-            if (!isNaN(value)) {
-              return prev + curr
-            } else {
-              return prev
-            }
-          }, 0)
-          sums[index] += ''
-        } else if (column.property === 'fyAdjustmentMoney') {
+        if (column.property !== 'purchaseSystemName' && column.property !== 'brandName' && column.property !== 'rebateTypeValue') {
           sums[index] = values.reduce((prev, curr) => {
             const value = Number(curr)
             if (!isNaN(value)) {
@@ -413,13 +384,6 @@ 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;
 }
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiEdit.vue
index f32263c5d3..efa0abfe7a 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiEdit.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiEdit.vue
@@ -16,35 +16,49 @@
       <div class="">
         <div class="titwu"><span>{{ formobj.checkApply }}单车返利核对审核申请</span></div>
         <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
-          <el-row class="rowStyle">
-            <el-col :span="6" class="colOneStyle">
-              <div class="span-sty" style="border-right: 0px !important;">品牌：</div>
-              <el-form-item>
-                <el-select class="addinputInfo" :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-row style="border-top: 1px solid #E0E3EB">
+            <el-col :span="16">
+              <div class="span-sty">申请编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
             </el-col>
-            <el-col :span="18" class="colOneStyle">
-              <div style="text-align: right"><el-button size="small" type="primary" class="btntopblueline" @click="handleSelect()">添加</el-button></div>
+            <el-col :span="8">
+              <div class="span-sty">申请日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
             </el-col>
           </el-row>
-          <div class="title">
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">分公司</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createOrgName }}</span></el-form-item>
+            </el-col>
+            <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="8">
+              <div class="span-sty">申请人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title titleOne">
             <div>本月上传核对情况(按返利类型统计)</div>
+            <el-button size="mini" type="primary" class="btntopblueline" @click="handleSelect()">选择</el-button>
           </div>
           <el-table :key="tableKey" :data="formobj.scmWhenVehrebateCheckapplydetailDetails" :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 prop="rebateTypeValue" label="返利类型" align="center" />
-            <el-table-column prop="num" label="数量" align="center" />
-            <el-table-column prop="withRebate" label="预提金额" align="center" />
-            <el-table-column prop="withholdCost" label="其中预提费用" align="center" />
-            <el-table-column prop="uploadMoney" label="上传金额" align="center" />
-            <el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" />
-            <el-table-column prop="money" label="其中费用" align="center" />
-            <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" />
-            <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" />
-            <el-table-column label="明细" align="center">
-              <template slot-scope="scope">
+            <el-table-column prop="purchaseSystemName" label="采购系统" align="center" min-width="120" />
+            <el-table-column prop="brandName" label="品牌" align="center" min-width="120" />
+            <el-table-column prop="rebateTypeValue" label="返利类型" align="center" min-width="120" />
+            <el-table-column prop="num" label="数量" align="center" min-width="100" />
+            <el-table-column prop="withRebate" label="预提金额" align="center" min-width="120" />
+            <el-table-column prop="withholdCost" label="其中预提费用" align="center" min-width="140" />
+            <el-table-column prop="uploadMoney" label="上传金额" align="center" min-width="120" />
+            <el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" min-width="150" />
+            <el-table-column prop="money" label="其中费用" align="center" min-width="120" />
+            <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
+            <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
+            <el-table-column label="明细" align="center" min-width="100">
+              <template>
                 <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
               </template>
             </el-table-column>
@@ -52,17 +66,19 @@
           <div class="title">本月上传核对情况(按预提年月统计)</div>
           <el-table :key="lastVehrebateKey" :data="formobj.scmLastVehrebateCheckapplydetailDetails" border style="width: 100%">
             <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column prop="withholdingDate" label="预提年月" align="center" />
-            <el-table-column prop="num" label="预提数量" align="center" />
-            <el-table-column prop="withRebate" label="预提金额" align="center" />
-            <el-table-column prop="withholdCost" label="其中预提费用" align="center" />
-            <el-table-column prop="uploadMoney" label="上传金额" align="center" />
-            <el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" />
-            <el-table-column prop="money" label="其中费用" align="center" />
-            <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" />
-            <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" />
-            <el-table-column label="明细" align="center">
-              <template slot-scope="scope">
+            <el-table-column prop="purchaseSystemName" label="采购系统" align="center" min-width="120" />
+            <el-table-column prop="brandName" label="品牌" align="center" min-width="120" />
+            <el-table-column prop="withholdingDate" label="预提年月" align="center" min-width="120" />
+            <el-table-column prop="num" label="预提数量" align="center" min-width="100" />
+            <el-table-column prop="withRebate" label="预提金额" align="center" min-width="120" />
+            <el-table-column prop="withholdCost" label="其中预提费用" align="center" min-width="140" />
+            <el-table-column prop="uploadMoney" label="上传金额" align="center" min-width="120" />
+            <el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" min-width="150" />
+            <el-table-column prop="money" label="其中费用" align="center" min-width="120" />
+            <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
+            <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
+            <el-table-column label="明细" align="center" min-width="100">
+              <template>
                 <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
               </template>
             </el-table-column>
@@ -84,7 +100,6 @@
 
 <script>
 import req from '@/api/bikerebate/bicyclerebatecheck'
-import { fetchBySid, brandDown } from '@/api/cheliang/dictcommons'
 import yiheduidanchefanli from './relation/yiheduidanchefanli'
 import bicyclerebatetobecheckedAdd from './relation/bicyclerebatetobecheckedAdd'
 
@@ -101,17 +116,17 @@ export default {
       index: 0,
       tableKey: 0,
       lastVehrebateKey: 1,
-      checkKey: 2,
-      dialogStatus: '',
-      brand_list: [],
       // 表单数据
       formobj: {
         sid: '',
         createByName: '',
-        brandName: '',
-        brandSid: '',
+        createBySid: '',
         checkApply: '',
+        billNo: '',
+        createTime: '',
         createOrgName: '',
+        deptName: '',
+        deptSid: '',
         createOrgSid: '',
         useOrgName: '',
         useOrgSid: '',
@@ -145,19 +160,6 @@ export default {
     }, '*')
   },
   methods: {
-    init() {
-      fetchBySid(this.formobj.createOrgSid).then((res) => {
-        if (res.success) {
-          this.formobj.createOrgName = res.data.name
-          this.formobj.useOrgName = res.data.name
-        }
-      })
-      brandDown({ useOrg: this.formobj.createOrgSid }).then((res) => {
-        if (res.success) {
-          this.brand_list = res.data
-        }
-      })
-    },
     showInfo(sid) {
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
@@ -174,22 +176,10 @@ 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.scmWhenVehrebateCheckapplydetailDetails, this.formobj.createOrgSid, this.formobj.brandSid)
+      this.$refs['divSelect'].showData(this.formobj.scmWhenVehrebateCheckapplydetailDetails, this.formobj.createOrgSid)
     },
     backData(val) {
       this.viewState = 1
@@ -203,7 +193,7 @@ export default {
       list.forEach((e) => {
         let v = 0
         for (var i in this.formobj.scmWhenVehrebateCheckapplydetailDetails) {
-          if (this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].rebateTypeValue === e.rebateTypeValue) {
+          if (this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].rebateTypeValue === e.rebateTypeValue && this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].purchaseSystemName === e.purchaseSystemName && this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].brandName === e.brandName) {
             this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].num = parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].num) + parseFloat(1)
             this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withRebate = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withRebate !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withRebate : 0) + parseFloat(e.estimateRebate !== '' ? e.estimateRebate : 0)) * 100) / 100
             this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withholdCost = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withholdCost !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withholdCost : 0) + parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100
@@ -227,6 +217,8 @@ export default {
             withholdCost: e.withholdCost,
             brandName: e.brandName,
             brandSid: e.brandSid,
+            purchaseSystemName: e.purchaseSystemName,
+            purchaseSystemSid: e.purchaseSystemSid,
             uploadMoney: Math.round((parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0)) * 100) / 100,
             stayDetermineMoney: e.stayDetermineMoney,
             adjustmentMoney: e.adjustmentMoney,
@@ -242,7 +234,7 @@ export default {
       // 按照预提年月统计
       list.forEach((s) => {
         for (var l in this.formobj.scmLastVehrebateCheckapplydetailDetails) {
-          if (this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate) {
+          if (this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate && this.formobj.scmLastVehrebateCheckapplydetailDetails[l].purchaseSystemName === s.purchaseSystemName && this.formobj.scmLastVehrebateCheckapplydetailDetails[l].brandName === s.brandName) {
             this.formobj.scmLastVehrebateCheckapplydetailDetails[l].num = parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].num) + parseFloat(1)
             this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withRebate = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withRebate !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withRebate : 0) + parseFloat(s.estimateRebate !== '' ? s.estimateRebate : 0)) * 100) / 100
             this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdCost = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdCost !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdCost : 0) + parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100
@@ -264,6 +256,8 @@ export default {
             withholdCost: s.withholdCost,
             brandName: s.brandName,
             brandSid: s.brandSid,
+            purchaseSystemName: s.purchaseSystemName,
+            purchaseSystemSid: s.purchaseSystemSid,
             uploadMoney: Math.round((parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0)) * 100) / 100,
             stayDetermineMoney: s.stayDetermineMoney,
             adjustmentMoney: s.adjustmentMoney,
@@ -300,7 +294,7 @@ export default {
       list.forEach((e) => {
         let v = 0
         for (var i in this.formobj.scmWhenVehrebateCheckapplydetailDetails) {
-          if (this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].rebateTypeValue === e.rebateTypeValue) {
+          if (this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].rebateTypeValue === e.rebateTypeValue && this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].purchaseSystemName === e.purchaseSystemName && this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].brandName === e.brandName) {
             this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].num = parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].num) + parseFloat(1)
             this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withRebate = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withRebate !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withRebate : 0) + parseFloat(e.estimateRebate !== '' ? e.estimateRebate : 0)) * 100) / 100
             this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withholdCost = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withholdCost !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withholdCost : 0) + parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100
@@ -324,6 +318,8 @@ export default {
             withholdCost: e.withholdCost,
             brandName: e.brandName,
             brandSid: e.brandSid,
+            purchaseSystemName: e.purchaseSystemName,
+            purchaseSystemSid: e.purchaseSystemSid,
             uploadMoney: Math.round((parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0)) * 100) / 100,
             stayDetermineMoney: e.stayDetermineMoney,
             adjustmentMoney: e.adjustmentMoney,
@@ -339,7 +335,7 @@ export default {
       // 按照预提年月统计
       list.forEach((s) => {
         for (var l in this.formobj.scmLastVehrebateCheckapplydetailDetails) {
-          if (this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate) {
+          if (this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate && this.formobj.scmLastVehrebateCheckapplydetailDetails[l].purchaseSystemName === s.purchaseSystemName && this.formobj.scmLastVehrebateCheckapplydetailDetails[l].brandName === s.brandName) {
             this.formobj.scmLastVehrebateCheckapplydetailDetails[l].num = parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].num) + parseFloat(1)
             this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withRebate = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withRebate !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withRebate : 0) + parseFloat(s.estimateRebate !== '' ? s.estimateRebate : 0)) * 100) / 100
             this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdCost = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdCost !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdCost : 0) + parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100
@@ -361,6 +357,8 @@ export default {
             withholdCost: s.withholdCost,
             brandName: s.brandName,
             brandSid: s.brandSid,
+            purchaseSystemName: s.purchaseSystemName,
+            purchaseSystemSid: s.purchaseSystemSid,
             uploadMoney: Math.round((parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0)) * 100) / 100,
             stayDetermineMoney: s.stayDetermineMoney,
             adjustmentMoney: s.adjustmentMoney,
@@ -386,78 +384,7 @@ export default {
           return
         }
         const values = data.map(item => Number(item[column.property]))
-        if (column.property === 'num') {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr)
-            if (!isNaN(value)) {
-              return prev + curr
-            } else {
-              return prev
-            }
-          }, 0)
-          sums[index] += ''
-          this.formobj.withRebateTotal = sums[index] += ''
-        } else if (column.property === 'withRebate') {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr)
-            if (!isNaN(value)) {
-              return prev + curr
-            } else {
-              return prev
-            }
-          }, 0)
-          sums[index] += ''
-        } else if (column.property === 'withholdCost') {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr)
-            if (!isNaN(value)) {
-              return prev + curr
-            } else {
-              return prev
-            }
-          }, 0)
-          sums[index] += ''
-        } else if (column.property === 'uploadMoney') {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr)
-            if (!isNaN(value)) {
-              return prev + curr
-            } else {
-              return prev
-            }
-          }, 0)
-          sums[index] += ''
-        } else if (column.property === 'stayDetermineMoney') {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr)
-            if (!isNaN(value)) {
-              return prev + curr
-            } else {
-              return prev
-            }
-          }, 0)
-          sums[index] += ''
-        } else if (column.property === 'money') {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr)
-            if (!isNaN(value)) {
-              return prev + curr
-            } else {
-              return prev
-            }
-          }, 0)
-          sums[index] += ''
-        } else if (column.property === 'adjustmentMoney') {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr)
-            if (!isNaN(value)) {
-              return prev + curr
-            } else {
-              return prev
-            }
-          }, 0)
-          sums[index] += ''
-        } else if (column.property === 'fyAdjustmentMoney') {
+        if (column.property !== 'purchaseSystemName' && column.property !== 'brandName' && column.property !== 'rebateTypeValue') {
           sums[index] = values.reduce((prev, curr) => {
             const value = Number(curr)
             if (!isNaN(value)) {
@@ -531,13 +458,6 @@ export default {
   text-align: center;
   padding: 30px 0 20px 0;
 }
-.rowStyle {
-  border-left: 0px;
-}
-.colOneStyle {
-  border-right: 0px !important;
-  border-bottom: 0px !important;
-}
 .span-sty {
   width: 130px !important;
 }
@@ -548,5 +468,12 @@ export default {
   margin-left: 120px !important;
   width: calc(100% - 115px);
 }
+.titleOne {
+  padding: 7px;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+}
 </style>
 
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiYiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiYiBanInfo.vue
index e4d0890d57..7c20f454d9 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiYiBanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiYiBanInfo.vue
@@ -7,6 +7,8 @@
         <div>{{ viewTitle }}</div>
         <!--start 添加修改按钮-->
         <div>
+          <el-button type="primary" size="small">导出</el-button>
+          <el-button type="primary" size="small">下载</el-button>
           <el-button type="danger" size="small" @click="openRevoke()">撤回</el-button>
         </div>
       </div>
@@ -15,44 +17,66 @@
       <div class="">
         <div class="titwu"><span>{{ formobj.checkApply }}单车返利核对审核申请</span></div>
         <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
-          <el-row class="rowStyle">
-            <el-col :span="24" class="colOneStyle">
-              <div class="span-sty" style="border-right: 0px !important;">品牌：</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.brandName }}</span></el-form-item>
+          <el-row style="border-top: 1px solid #E0E3EB">
+            <el-col :span="16">
+              <div class="span-sty">申请编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">分公司</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createOrgName }}</span></el-form-item>
+            </el-col>
+            <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="8">
+              <div class="span-sty">申请人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
             </el-col>
           </el-row>
           <div class="title">本月上传核对情况(按返利类型统计)</div>
           <el-table :key="tableKey" :data="formobj.scmWhenVehrebateCheckapplydetailDetails" :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 prop="rebateTypeValue" label="返利类型" align="center" />
-            <el-table-column prop="num" label="数量" align="center" />
-            <el-table-column prop="withRebate" label="预提金额" align="center" />
-            <el-table-column prop="withholdCost" label="其中预提费用" align="center" />
-            <el-table-column prop="uploadMoney" label="上传金额" align="center" />
-            <el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" />
-            <el-table-column prop="money" label="其中费用" align="center" />
-            <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" />
-            <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" />
-            <el-table-column label="明细" align="center">
-              <template slot-scope="scope">
-                <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
+            <el-table-column prop="purchaseSystemName" label="采购系统" align="center" min-width="120" />
+            <el-table-column prop="brandName" label="品牌" align="center" min-width="120" />
+            <el-table-column prop="rebateTypeValue" label="返利类型" align="center" min-width="120" />
+            <el-table-column prop="num" label="数量" align="center" min-width="100" />
+            <el-table-column prop="withRebate" label="预提金额" align="center" min-width="120" />
+            <el-table-column prop="withholdCost" label="其中预提费用" align="center" min-width="140" />
+            <el-table-column prop="uploadMoney" label="上传金额" align="center" min-width="120" />
+            <el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" min-width="150" />
+            <el-table-column prop="money" label="其中费用" align="center" min-width="120" />
+            <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
+            <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
+            <el-table-column label="明细" align="center" min-width="100">
+              <template>
+                <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
           <div class="title">本月上传核对情况(按预提年月统计)</div>
           <el-table :key="lastVehrebateKey" :data="formobj.scmLastVehrebateCheckapplydetailDetails" :index="index" border style="width: 100%">
             <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column prop="withholdingDate" label="预提年月" align="center" />
-            <el-table-column prop="num" label="预提数量" align="center" />
-            <el-table-column prop="withRebate" label="预提金额" align="center" />
-            <el-table-column prop="withholdCost" label="其中预提费用" align="center" />
-            <el-table-column prop="uploadMoney" label="上传金额" align="center" />
-            <el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" />
-            <el-table-column prop="money" label="其中费用" align="center" />
-            <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" />
-            <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" />
-            <el-table-column label="明细" align="center">
-              <template slot-scope="scope">
+            <el-table-column prop="purchaseSystemName" label="采购系统" align="center" min-width="120" />
+            <el-table-column prop="brandName" label="品牌" align="center" min-width="120" />
+            <el-table-column prop="withholdingDate" label="预提年月" align="center" min-width="120" />
+            <el-table-column prop="num" label="预提数量" align="center" min-width="100" />
+            <el-table-column prop="withRebate" label="预提金额" align="center" min-width="120" />
+            <el-table-column prop="withholdCost" label="其中预提费用" align="center" min-width="140" />
+            <el-table-column prop="uploadMoney" label="上传金额" align="center" min-width="120" />
+            <el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" min-width="150" />
+            <el-table-column prop="money" label="其中费用" align="center" min-width="120" />
+            <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
+            <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
+            <el-table-column label="明细" align="center" min-width="100">
+              <template>
                 <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
               </template>
             </el-table-column>
@@ -88,7 +112,27 @@ export default {
       lastVehrebateKey: 1,
       viewState: 1,
       // 表单数据
-      formobj: {},
+      formobj: {
+        sid: '',
+        createByName: '',
+        createBySid: '',
+        checkApply: '',
+        billNo: '',
+        createTime: '',
+        createOrgName: '',
+        deptName: '',
+        deptSid: '',
+        createOrgSid: '',
+        useOrgName: '',
+        useOrgSid: '',
+        remarks: '',
+        instanceId: '', // 流程实例ID
+        taskId: '', // 任务ID
+        orgPath: '',
+        scmWhenVehrebateCheckapplydetailDetails: [],
+        scmLastVehrebateCheckapplydetailDetails: [],
+        scmVehrebateCheckapplydetailList: []
+      },
       rules: {},
       submitdisabled: false,
       // 环节所需参数
@@ -161,78 +205,7 @@ export default {
           return
         }
         const values = data.map(item => Number(item[column.property]))
-        if (column.property === 'num') {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr)
-            if (!isNaN(value)) {
-              return prev + curr
-            } else {
-              return prev
-            }
-          }, 0)
-          sums[index] += ''
-          this.formobj.withRebateTotal = sums[index] += ''
-        } else if (column.property === 'withRebate') {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr)
-            if (!isNaN(value)) {
-              return prev + curr
-            } else {
-              return prev
-            }
-          }, 0)
-          sums[index] += ''
-        } else if (column.property === 'withholdCost') {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr)
-            if (!isNaN(value)) {
-              return prev + curr
-            } else {
-              return prev
-            }
-          }, 0)
-          sums[index] += ''
-        } else if (column.property === 'uploadMoney') {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr)
-            if (!isNaN(value)) {
-              return prev + curr
-            } else {
-              return prev
-            }
-          }, 0)
-          sums[index] += ''
-        } else if (column.property === 'stayDetermineMoney') {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr)
-            if (!isNaN(value)) {
-              return prev + curr
-            } else {
-              return prev
-            }
-          }, 0)
-          sums[index] += ''
-        } else if (column.property === 'money') {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr)
-            if (!isNaN(value)) {
-              return prev + curr
-            } else {
-              return prev
-            }
-          }, 0)
-          sums[index] += ''
-        } else if (column.property === 'adjustmentMoney') {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr)
-            if (!isNaN(value)) {
-              return prev + curr
-            } else {
-              return prev
-            }
-          }, 0)
-          sums[index] += ''
-        } else if (column.property === 'fyAdjustmentMoney') {
+        if (column.property !== 'purchaseSystemName' && column.property !== 'brandName' && column.property !== 'rebateTypeValue') {
           sums[index] = values.reduce((prev, curr) => {
             const value = Number(curr)
             if (!isNaN(value)) {
@@ -282,7 +255,7 @@ export default {
           }, '*')
         }
       })
-    },
+    }
   }
 }
 </script>
@@ -292,13 +265,6 @@ export default {
   text-align: center;
   padding: 30px 0 20px 0;
 }
-.rowStyle {
-  border-left: 0px;
-}
-.colOneStyle {
-  border-right: 0px !important;
-  border-bottom: 0px !important;
-}
 .span-sty {
   width: 130px !important;
 }
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/relation/bicycleInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/relation/bicycleInfo.vue
index 49fb94bfbd..eb7a1ddb1b 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/relation/bicycleInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/relation/bicycleInfo.vue
@@ -16,11 +16,21 @@
         <div class="titwu"><span>单车返利</span></div>
         <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
           <el-row style="border-top: 1px solid #e0e3eb">
+            <el-col :span="8">
+              <div class="span-sty">分公司</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createOrgName }}</span></el-form-item>
+            </el-col>
+            <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="8">
               <div class="span-sty">品牌</div>
               <el-form-item><span class="addinputInfo">{{ formobj.brandName }}</span></el-form-item>
             </el-col>
-            <el-col :span="8">
+          </el-row>
+          <el-row>
+            <el-col :span="16">
               <div class="span-sty">车型</div>
               <el-form-item><span class="addinputInfo">{{ formobj.vehModelName }}</span></el-form-item>
             </el-col>
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/relation/bicyclerebatetobecheckedAdd.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/relation/bicyclerebatetobecheckedAdd.vue
index 08d3612810..f69fb97ec6 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/relation/bicyclerebatetobecheckedAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/relation/bicyclerebatetobecheckedAdd.vue
@@ -23,6 +23,7 @@
                 <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
               </template>
             </el-table-column>
+            <el-table-column prop="purchaseSystemName" label="采购系统" align="center" width="140" />
             <el-table-column prop="brandName" label="品牌" align="center" />
             <el-table-column prop="vehModelName" label="车型" align="center" width="200" />
             <el-table-column prop="vinNo" label="车架号" align="center" width="200" />
@@ -54,7 +55,6 @@
 </template>
 
 <script>
-import req from '@/api/bikerebate/bicyclerebatecheck'
 import bicyclerebatemanagementInfo from './bicycleInfo'
 
 export default {
@@ -91,17 +91,7 @@ export default {
       })
       this.scmVehrebateCheckapplydetailList = JSON.parse(JSON.stringify(value))
       this.viewTitle = '单车返利核对审核申请明细'
-      if (sid !== '' && sid !== null) {
-        req.vehRebateCheckDetails(sid).then((resp) => {
-          if (resp.success) {
-            this.list = resp.data
-          }
-        }).catch((e) => {
-          this.list = []
-        })
-      } else {
-        this.list = this.scmVehrebateCheckapplydetailList
-      }
+      this.list = this.scmVehrebateCheckapplydetailList
     },
     handleDelete() {
       if (this.sids.length === 0) {
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/relation/bicyclerebatetobecheckedInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/relation/bicyclerebatetobecheckedInfo.vue
index 0d8767ebea..1daa25cfd8 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/relation/bicyclerebatetobecheckedInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/relation/bicyclerebatetobecheckedInfo.vue
@@ -21,6 +21,7 @@
                 <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
               </template>
             </el-table-column>
+            <el-table-column prop="purchaseSystemName" label="采购系统" align="center" width="140" />
             <el-table-column prop="brandName" label="品牌" align="center" />
             <el-table-column prop="vehModelName" label="车型" align="center" width="200" />
             <el-table-column prop="vinNo" label="车架号" align="center" width="200" />
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/relation/yiheduidanchefanli.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/relation/yiheduidanchefanli.vue
index 7b14272911..69f800da8e 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/relation/yiheduidanchefanli.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/relation/yiheduidanchefanli.vue
@@ -11,6 +11,7 @@
           <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
             <el-table-column fixed type="selection" align="center" width="50px"/>
             <el-table-column fixed label="序号" type="index" :index="indexMethod" align="center" width="80px"/>
+            <el-table-column prop="purchaseSystemName" label="采购系统" align="center" width="140" />
             <el-table-column prop="brandName" label="品牌" align="center" width="120" />
             <el-table-column prop="vehModelName" label="车型" align="center" min-width="200" />
             <el-table-column prop="vinNo" label="车架号" align="center" width="150" />
@@ -83,7 +84,6 @@ export default {
       listLoading: false,
       listQuery: {
         params: {
-          brandSid: '',
           createOrgSid: '',
           sidList: []
         },
@@ -148,9 +148,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++) {