From 49123122881dcedb9428cf9b4fbbf5158fbdd0d2 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Sat, 27 Aug 2022 11:58:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E3=80=81=E5=AE=8C=E5=96=84?=
 =?UTF-8?q?=E5=8D=95=E8=BD=A6=E8=BF=94=E5=88=A9=E9=A2=84=E6=8F=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bikerebate/bicyclerebatewithholding.js    | 110 +++++
 .../src/router/modules/codemenu.js            |  26 +-
 .../bicyclerebatewithholding.vue              |  94 ++++-
 .../bicyclerebatewithholdingAdd.vue           | 341 +++++++++++----
 .../bicyclerebatewithholdingInfo.vue          | 131 +++---
 .../relation/danchefanliAdd.vue               | 114 +++--
 .../relation/danchefanliInfo.vue              |  99 ++---
 .../relation/danchefanliselect.vue            | 131 +++---
 .../danchefanliyutiDaiBanInfo.vue             | 373 ++++++++++++++++
 .../danchefanliyutiEdit.vue                   | 399 ++++++++++++++++++
 .../danchefanliyutiYiBanInfo.vue              | 249 +++++++++++
 .../relation/danchefanliAdd.vue               | 162 +++++++
 .../relation/danchefanliInfo.vue              | 129 ++++++
 .../relation/danchefanlichoose.vue            | 283 +++++++++++++
 14 files changed, 2300 insertions(+), 341 deletions(-)
 create mode 100644 anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatewithholding.js
 create mode 100644 anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/danchefanliyutiDaiBanInfo.vue
 create mode 100644 anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/danchefanliyutiEdit.vue
 create mode 100644 anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/danchefanliyutiYiBanInfo.vue
 create mode 100644 anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/relation/danchefanliAdd.vue
 create mode 100644 anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/relation/danchefanliInfo.vue
 create mode 100644 anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/relation/danchefanlichoose.vue

diff --git a/anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatewithholding.js b/anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatewithholding.js
new file mode 100644
index 0000000000..709f249902
--- /dev/null
+++ b/anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatewithholding.js
@@ -0,0 +1,110 @@
+import request from '@/utils/request'
+
+export default {
+  // 查询分页列表
+  listPage: function(data) {
+    return request({
+      url: '/scm/v1/scmvehrebatewithapply/listPage',
+      method: 'post',
+      data: data,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 选择车辆信息--查询分页列表
+  pageList: function(data) {
+    return request({
+      url: '/scm/v1/scmvehrebate/withApplyGetVehRebate',
+      method: 'post',
+      data: data,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 删除
+  delete: function(params) {
+    return request({
+      url: '/scm/v1/scmvehrebatewithapply/delBySids',
+      method: 'DELETE',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 新增保存修改记录
+  save: function(data) {
+    return request({
+      url: '/scm/v1/scmvehrebatewithapply/save',
+      method: 'post',
+      data: data,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 通过sid查询一条记录
+  fetchBySid: function(data) {
+    return request({
+      url: '/scm/v1/scmvehrebatewithapply/fetchDetailsBySid/' + data,
+      method: 'get'
+    })
+  },
+  // 查看明细
+  vehRebateWithDetails: function(data) {
+    return request({
+      url: '/scm/v1/scmvehrebatewith/vehRebateWithDetails/' + data,
+      method: 'get'
+    })
+  },
+  // 提交流程
+  submitVehicleApply: function(params) {
+    return request({
+      url: '/scm/v1/scmvehrebatewithapply/submitVehRebateWithApply',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 代办任务同意办理
+  complete: function(params) {
+    return request({
+      url: '/scm/v1/scmvehrebatewithapply/complete',
+      method: 'post',
+      data: params
+    })
+  },
+  // 代办任务驳回任务
+  reject: function(params) {
+    return request({
+      url: '/scm/v1/scmvehrebatewithapply/reject',
+      method: 'post',
+      data: params
+    })
+  },
+  // 代办任务终止任务
+  breakProcess: function(params) {
+    return request({
+      url: '/scm/v1/scmvehrebatewithapply/breakProcess',
+      method: 'post',
+      data: params
+    })
+  },
+  // 代办任务撤回任务
+  revokeProcess: function(params) {
+    return request({
+      url: '/scm/v1/scmvehrebatewithapply/revokeProcess',
+      method: 'post',
+      data: params
+    })
+  },
+
+  getNextNodesForSubmit: function(data) {
+    return request({
+      url: '/scm/v1/scmvehrebatewithapply/getNextNodesForSubmit',
+      method: 'get',
+      params: data
+    })
+  },
+  getPreviousNodesForReject(data) {
+    return request({
+      url: '/scm/v1/scmvehrebatewithapply/getPreviousNodesForReject',
+      method: 'get',
+      params: data
+    })
+  }
+}
diff --git a/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js b/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js
index b5b7ffeefa..a6a656f408 100644
--- a/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js
+++ b/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js
@@ -403,7 +403,7 @@ const codemenu = [
         path: '/kucunguanli/rukuguanli',
         component: () => import('@/views/supplychain/rukuguanli/rukuguanliAwait.vue'),
         name: 'rukuguanliawait',
-        meta: { title: '收车车辆管理', noCache: true }
+        meta: { title: '收车管理', noCache: true }
       }
     ]
   },
@@ -903,7 +903,7 @@ const codemenu = [
       import('@/views/workFlow/shangzhuangtiaojiaFlow/shangzhuangtiaojiaguanli/shangzhuangtiaojiaDaiBanInfo.vue'),
     name: 'shangzhuangtiaojiaDaiBanInfo'
   },
-  // 调账申请审批环节办理页面
+  // 上装调价审批环节办理页面
   {
     path: '/shangzhuangtiaojiaFlow/shangzhuangtiaojiaguanli/shangzhuangtiaojiaYiBanInfo',
     component: () =>
@@ -915,7 +915,27 @@ const codemenu = [
     component: () =>
       import('@/views/workFlow/shangzhuangtiaojiaFlow/shangzhuangtiaojiaguanli/shangzhuangtiaojiaEdit.vue'),
     name: 'shangzhuangtiaojiaEdit'
+  },
+  // 单车返利预提申请详情页面
+  {
+    path: '/danchefanliyutiFlow/danchefanliyutiDaiBanInfo',
+    component: () =>
+      import('@/views/workFlow/danchefanliyutiFlow/danchefanliyutiDaiBanInfo.vue'),
+    name: 'danchefanliyutiDaiBanInfo'
+  },
+  // 单车返利预提办理页面
+  {
+    path: '/danchefanliyutiFlow/danchefanliyutiYiBanInfo',
+    component: () =>
+      import('@/views/workFlow/danchefanliyutiFlow/danchefanliyutiYiBanInfo.vue'),
+    name: 'danchefanliyutiYiBanInfo'
+  },
+  // 单车返利预提
+  {
+    path: '/danchefanliyutiFlow/danchefanliyutiEdit',
+    component: () =>
+      import('@/views/workFlow/danchefanliyutiFlow/danchefanliyutiEdit.vue'),
+    name: 'danchefanliyutiEdit'
   }
-
 ]
 export default codemenu
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 db5c7c79ba..a75511327a 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
@@ -9,7 +9,9 @@
           <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.mainSid" placeholder="请输入车架号" clearable/>
+                <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>
               <el-form-item label="创建日期">
                 <el-date-picker v-model="listQuery.params.createStartTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
@@ -33,43 +35,44 @@
             <el-table-column fixed label="序号" type="index" :index="indexMethod" align="center" width="80px"/>
             <el-table-column fixed label="操作" align="center" width="180px" >
               <template slot-scope="scope">
-                <el-button type="primary" size="mini" @click="toEdit(scope.row)">办理</el-button>
+                <el-button type="primary" size="mini" :disabled="scope.row.nodeState =='发起申请' ? false : scope.row.nodeState == '待提交' ? false : true" @click="toEdit(scope.row)">办理</el-button>
                 <el-button type="primary" size="mini" @click="toInfo(scope.row)">查看</el-button>
               </template>
             </el-table-column>
-            <el-table-column label="状态" align="center" width="200">
+            <el-table-column label="状态" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.nodeState }}</span>
+                <span v-if="scope.row.nodeState=='待提交'" type="primary" size="mini">待提交</span>
+                <span v-else @click="flowRecord(scope.row)" class="bluezi">{{ scope.row.nodeState }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="分公司" align="center" width="200">
+            <el-table-column label="分公司" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.createTime }}</span>
+                <span>{{ scope.row.createOrgName }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="品牌" align="center" width="200">
+            <el-table-column label="品牌" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.createTime }}</span>
+                <span>{{ scope.row.brandName }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="预提申请" align="center" width="200">
+            <el-table-column label="预提申请" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.applyPeoName }}</span>
+                <span>{{ scope.row.withApply }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="预提返利" align="center" width="250">
+            <el-table-column label="预提返利" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.createOrgName }}</span>
+                <span>{{ scope.row.withRebateTotal }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="创建日期" align="center" width="200">
+            <el-table-column label="创建日期" align="center" width="120">
               <template slot-scope="scope">
-                <span>{{ scope.row.applyTitle }}</span>
+                <span>{{ scope.row.createTime }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="创建人" align="center" width="200">
+            <el-table-column label="创建人" align="center" width="120">
               <template slot-scope="scope">
-                <span>{{ scope.row.modpriceReason }}</span>
+                <span>{{ scope.row.createByName }}</span>
               </template>
             </el-table-column>
           </el-table>
@@ -82,16 +85,21 @@
     </div>
     <bicyclerebatewithholdingAdd v-show="viewState == 2 || viewState == 3" ref="divAdd" @doback="resetState" @reloadlist="getList"/>
     <bicyclerebatewithholdingInfo v-show="viewState == 4" ref="divInfo" @doback="resetState"/>
+    <el-dialog title="" :visible.sync="centerDialogVisible" width="78%" height="1%" :before-close="closeIt" center>
+      <iframe frameborder="0" id="iframe" style="width:100%;" scrolling="no" :src="this.centerDialogVisible === true ? url :''"></iframe>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import req from '@/api/othermenu/shangzhuangtiaojia'
+import req from '@/api/bikerebate/bicyclerebatewithholding'
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
 import ButtonBar from '@/components/ButtonBar'
+import { brandDown, getPathSidByUserSid } from '@/api/cheliang/dictcommons'
 import bicyclerebatewithholdingAdd from './bicyclerebatewithholdingAdd'
 import bicyclerebatewithholdingInfo from './bicyclerebatewithholdingInfo'
+import { getStorage } from '@/utils/auth'
 
 export default {
   name: 'bicyclerebatewithholding',
@@ -104,6 +112,9 @@ export default {
   },
   data() {
     return {
+      url: '',
+      dialogHeight: '80%',
+      centerDialogVisible: false,
       btndisabled: false,
       btnList: [
         {
@@ -137,6 +148,7 @@ export default {
       sids: [],
       FormLoading: false,
       listLoading: false,
+      brand_list: [],
       listQuery: {
         params: {
           createBySid: '',
@@ -152,12 +164,56 @@ export default {
   },
   created() {
     // 加载列表
-    this.getList()
+    this.init()
   },
   mounted() {
+    // 在外部vue的window上添加postMessage的监听，而且绑定处理函数handleMessage
+    window.addEventListener('message', this.handleMessage)
     this.$refs['btnbar'].setButtonList(this.btnList)
   },
   methods: {
+    async handleMessage(event) {
+      var code = ''
+      if (event.data.params !== null && event.data.params !== undefined) {
+        code = event.data.params.code
+      }
+      if (code === 1) {
+        this.init()
+        this.centerDialogVisible = false
+      } else if (code === 2) {
+        this.dialogHeight = event.data.params.data
+        this.setIframeHeight(document.getElementById('iframe'))
+      }
+    },
+    closeIt() {
+      this.url = ''
+      this.centerDialogVisible = false
+    },
+    setIframeHeight(iframe) {
+      iframe.height = this.dialogHeight
+    },
+    flowRecord(row) {
+      this.centerDialogVisible = true
+      var params = {
+        deployId: row.procDefId,
+        procInsId: row.procInstId,
+        token: getStorage()
+      }
+      this.url = '/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params)))
+    },
+    init() {
+      getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).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()
+        }
+      })
+    },
     // 搜索条件效果
     clicksearchShow() {
       this.isSearchShow = !this.isSearchShow
@@ -229,7 +285,7 @@ export default {
         size: 5,
         total: 0
       }
-      this.getList()
+      this.init()
     },
     toAdd() {
       this.viewState = 2
diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholdingAdd.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholdingAdd.vue
index a527c6ad21..30a8103128 100644
--- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholdingAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholdingAdd.vue
@@ -9,40 +9,51 @@
         <div>
           <el-button type="primary" size="small" :disabled="submitdisabled" @click="save()">保存
           </el-button>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="submit()">提交
+          </el-button>
           <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
         </div>
       </div>
       <!--标题按钮部分结束-->
       <!--Start 新增修改部分-->
       <div class="listconadd">
-        <div class="titwu"><span>单车返利预提申请</span></div>
+        <div class="titwu"><span>{{ formobj.withApply }}单车返利预提申请</span></div>
         <el-form ref="form_obj" :model="formobj" :rules="rules" class="formadd">
           <el-row class="rowStyle">
             <el-col :span="24" class="tleftb colOneStyle">
+              <div><span style="font-size: 16px">金额单位：元</span></div>
+            </el-col>
+          </el-row>
+          <el-row class="rowStyle">
+            <el-col :span="2" class="tleftb colOneStyle">
+              <span>品牌:</span>
+            </el-col>
+            <el-col :span="4" class="colOneStyle">
+              <el-form-item>
+                <el-select :disabled="dialogStatus === 'edit'" v-model="formobj.brandName" placeholder="请选择" filterable clearable @change="changeBrand">
+                  <el-option v-for="item in brand_list" :key="item.sid" :label="item.brandName" :value="item.brandName"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="18" class="tleftb colOneStyle">
               <el-button size="small" type="primary" @click="handleSelect()">选择</el-button>
             </el-col>
           </el-row>
-          <el-table :key="tableKey" :data="formobj.baseVehinstallModpricedetails" :index="index" border style="width: 100%">
+          <el-table :key="tableKey" :data="formobj.scmVehRebateWiths" :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 fixed prop="name" label="操作" width="100px" align="center" header-align="center">
-              <template slot-scope="scope">
-                <el-button size="mini" type="danger" @click="dataDelete(scope.$index)">删除
-                </el-button>
-              </template>
-            </el-table-column>
             <el-table-column label="返利类型" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.jacketName }}</span>
+                <span>{{ scope.row.rebateTypeValue }}</span>
               </template>
             </el-table-column>
             <el-table-column label="台数" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.vinNo }}</span>
+                <span>{{ scope.row.num }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="预提返利" align="center">
+            <el-table-column prop="withRebate" label="预提返利" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.modelName }}</span>
+                <span>{{ scope.row.withRebate }}</span>
               </template>
             </el-table-column>
             <el-table-column label="明细" align="center">
@@ -52,27 +63,40 @@
             </el-table-column>
             <el-table-column label="备注" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.costPrice }}</span>
+                <el-input v-model="scope.row.remarks" clearable placeholder="" class="addinputw"></el-input>
               </template>
             </el-table-column>
           </el-table>
+          <el-row>
+            <el-col :span="2" class="tleftb">
+              <span>备注</span>
+            </el-col>
+            <el-col :span="22">
+              <el-form-item>
+                <el-input v-model="formobj.remarks" clearable placeholder="" class="addinputw"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
         </el-form>
       </div>
     </div>
     <!--End 添加修改部分-->
     <danchefanliselect v-show="viewState == 2" ref="divSelect" @doback="resetState" @backData="backData"/>
+    <danchefanliAdd v-show="viewState == 3" ref="divAdd" @backAdd="backAdd" />
   </div>
 </template>
 
 <script>
-import req from '@/api/othermenu/shangzhuangtiaojia'
-import { getPathSidByUserSid, fetchBySid } from '@/api/cheliang/dictcommons'
+import req from '@/api/bikerebate/bicyclerebatewithholding'
+import { brandDown, fetchBySid } from '@/api/cheliang/dictcommons'
 import danchefanliselect from './relation/danchefanliselect'
+import danchefanliAdd from './relation/danchefanliAdd'
 
 export default {
   name: 'bicyclerebatewithholdingAdd',
   components: {
-    danchefanliselect
+    danchefanliselect,
+    danchefanliAdd
   },
   data() {
     return {
@@ -80,107 +104,189 @@ export default {
       index: 0,
       tableKey: 0,
       viewState: 1,
+      dialogStatus: '',
+      brand_list: [],
       // 表单数据
       formobj: {
-        applyPeoName: '',
-        applyTitle: '',
-        createBySid: '',
+        sid: '',
+        withApply: '',
         createOrgName: '',
         createOrgSid: '',
-        modpriceReason: '',
-        nodeState: '',
-        sid: '',
         useOrgName: '',
         useOrgSid: '',
-        baseVehinstallModpricedetails: []
+        remarks: '',
+        withRebateTotal: '',
+        createByName: '',
+        createBySid: '',
+        instanceId: '', // 流程实例ID
+        taskId: '', // 任务ID
+        scmVehRebateWiths: []
       },
       rules: {},
       submitdisabled: false
     }
   },
   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
+        }
+      })
+    },
+    // 获取日期
     newDate() {
       let date = new Date()
       let year = date.getFullYear() // 年
       let month = date.getMonth() + 1 // 月
-      let day = date.getDate() // 日
-      if (month < 10) {
-        month = '0' + month
-      }
-      if (day < 10) {
-        day = '0' + day
-      }
-      this.formobj.createTime = year + '-' + month + '-' + day
-    },
-    init() {
-      getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((resp) => {
-        if (resp.success) {
-          this.formobj.createOrgSid = resp.data
-          this.formobj.useOrgSid = resp.data
-          fetchBySid(this.formobj.createOrgSid).then((res) => {
-            if (res.success) {
-              this.formobj.createOrgName = res.data.name
-              this.formobj.useOrgName = res.data.name
-            }
-          })
-        }
-      })
+      this.formobj.withApply = year + '年' + month + '月'
     },
-    showAdd() {
-      this.init()
-      this.newDate()
+    showAdd(createOrgSid) {
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
+        this.init()
+        this.newDate()
       })
+      this.dialogStatus = 'add'
       this.formobj.createBySid = window.sessionStorage.getItem('userSid')
-      this.formobj.applyPeoName = window.sessionStorage.getItem('name')
-      this.viewTitle = '【新增】单车返利预提申请'
+      this.formobj.createOrgSid = createOrgSid
+      this.formobj.useOrgSid = createOrgSid
+      this.formobj.createByName = window.sessionStorage.getItem('name')
+      this.viewTitle = '【新增】预提申请'
     },
     showEdit(row) {
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
       })
-      this.viewTitle = '【编辑】单车返利预提申请'
+      this.dialogStatus = 'edit'
+      this.viewTitle = '【编辑】预提申请'
       console.log('编辑回显', row.sid)
       req.fetchBySid(row.sid).then((resp) => {
         this.formobj = resp.data
+        this.formobj.instanceId = resp.data.procInstId
       }).catch((e) => {
         this.formobj = row
       })
     },
-    // 明细表添加一行数据
+    changeBrand(value) {
+      let bb = null
+      this.brand_list.forEach((e) => {
+        if (e.brandName === value) {
+          bb = {
+            name: e.brandName,
+            sid: e.sid
+          }
+        }
+      })
+      this.formobj.brandSid = bb.sid
+    },
+    // 列表--选择
     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.baseVehinstallModpricedetails)
+      this.$refs['divSelect'].showData(this.formobj.scmVehRebateWiths, this.formobj.createOrgSid, this.formobj.brandSid)
     },
+    // 列表--选择返回数据
     backData(value) {
       this.viewState = 1
-      if (value.length > 0) {
-        value.forEach((e) => {
-          this.formobj.baseVehinstallModpricedetails.push({
-            adjustVehGuidedPrice: '',
-            costPrice: e.costPrice,
-            guidedPrice: e.guidedPrice,
-            incOrDecInPrice: '',
-            jacketName: e.jacketName,
-            jacketSid: e.jacketSid,
-            mainSid: '',
-            modelName: e.modelName,
-            modelSid: e.modelSid,
+      for (var i in value) {
+        let cval = value[i]
+        if (!this.formobj.scmVehRebateWiths || this.formobj.scmVehRebateWiths.length === 0) {
+          this.formobj.scmVehRebateWiths = []
+        }
+        let v = 0
+        for (var j in this.formobj.scmVehRebateWiths) {
+          if (this.formobj.scmVehRebateWiths[j].rebateTypeValue === cval.rebateTypeValue) {
+            this.formobj.scmVehRebateWiths[j].num = parseInt(this.formobj.scmVehRebateWiths[j].num) + parseInt(1)
+            this.formobj.scmVehRebateWiths[j].withRebate = parseInt(this.formobj.scmVehRebateWiths[j].withRebate) + parseInt(cval.withRebate)
+            this.formobj.scmVehRebateWiths[j].vehRebateSids.push(cval.sid)
+            v = 1
+            break
+          }
+        }
+        if (v === 0) {
+          this.formobj.scmVehRebateWiths.push({
+            rebateTypeKey: cval.rebateTypeKey,
+            rebateTypeValue: cval.rebateTypeValue,
+            num: 1,
+            withRebate: cval.withRebate,
+            brandName: cval.brandName,
+            brandSid: cval.brandSid,
+            vehRebateSids: [cval.sid],
+            remarks: '',
             sid: '',
-            vehGuidedPrice: '',
-            vinNo: e.vinNo,
-            remarks: ''
+            mainSid: ''
           })
-        })
+        }
       }
     },
-    // 明细表删除一行数据
-    dataDelete(index) {
-      this.formobj.baseVehinstallModpricedetails.splice(index, 1)
+    // 明细--查看
+    handleLook(row) {
+      this.viewState = 3
+      this.$refs['divAdd'].showInfo(row)
+    },
+    // 明细--查看返回数据
+    backAdd(value, rebateType) {
+      this.viewState = 1
+      const aa = []
+      if (value.length > 0) {
+        for (var i in value) {
+          let cval = value[i]
+          let v = 0
+          for (var j in aa) {
+            if (aa[j].rebateTypeValue === cval.rebateTypeValue) {
+              aa[j].num = parseInt(aa[j].num) + parseInt(1)
+              aa[j].withRebate = parseInt(aa[j].withRebate) + parseInt(cval.withRebate)
+              aa[j].vehRebateSids.push(cval.sid)
+              v = 1
+              break
+            }
+          }
+          if (v === 0) {
+            aa.push({
+              rebateTypeKey: cval.rebateTypeKey,
+              rebateTypeValue: cval.rebateTypeValue,
+              num: 1,
+              withRebate: cval.withRebate,
+              brandName: cval.brandName,
+              brandSid: cval.brandSid,
+              vehRebateSids: [cval.sid],
+              remarks: '',
+              sid: '',
+              mainSid: ''
+            })
+          }
+        }
+        for (var k = 0; k < this.formobj.scmVehRebateWiths.length; k++) {
+          if (this.formobj.scmVehRebateWiths[k].rebateTypeValue === rebateType) {
+            this.formobj.scmVehRebateWiths[k].rebateTypeKey = aa[0].rebateTypeKey
+            this.formobj.scmVehRebateWiths[k].rebateTypeValue = aa[0].rebateTypeValue
+            this.formobj.scmVehRebateWiths[k].num = aa[0].num
+            this.formobj.scmVehRebateWiths[k].withRebate = aa[0].withRebate
+            this.formobj.scmVehRebateWiths[k].brandName = aa[0].brandName
+            this.formobj.scmVehRebateWiths[k].brandSid = aa[0].brandSid
+            this.formobj.scmVehRebateWiths[k].vehRebateSids = aa[0].vehRebateSids
+            break
+          }
+        }
+      } else if (value.length === 0) {
+        for (var l = 0; l < this.formobj.scmVehRebateWiths.length; l++) {
+          if (this.formobj.scmVehRebateWiths[l].rebateTypeValue === rebateType) {
+            this.formobj.scmVehRebateWiths.splice(l, 1)
+            break
+          }
+        }
+      }
     },
-    handleLook(row) {},
     resetState() {
       this.viewState = 1
     },
@@ -188,7 +294,29 @@ export default {
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
           this.submitdisabled = true
-          req.saveOrUpdate(this.formobj).then((resp) => {
+          req.save(this.formobj).then((resp) => {
+            this.submitdisabled = false
+            if (resp.success) {
+              this.$message({
+                showClose: true,
+                type: 'success',
+                message: resp.msg
+              })
+              this.handleReturn('true')
+            }
+          }).catch(() => {
+            this.submitdisabled = false
+          })
+        } else {
+          return false
+        }
+      })
+    },
+    submit() {
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          this.submitdisabled = true
+          req.submitVehicleApply(this.formobj).then((resp) => {
             this.submitdisabled = false
             if (resp.success) {
               this.$message({
@@ -206,22 +334,64 @@ export default {
         }
       })
     },
+    // 合计
+    getSummaries(param) {
+      const { columns, data } = param
+      const sums = []
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '合计'
+          return
+        }
+        const values = data.map(item => Number(item[column.property]))
+        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] += ''
+          this.formobj.withRebateTotal = sums[index] += ''
+        } else {
+          if (!values.every(value => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr)
+              if (!isNaN(value)) {
+                return prev + curr
+              } else {
+                return prev
+              }
+            }, 0)
+            sums[index] += ''
+            this.amount = sums[index] += ''
+          } else {
+            sums[index] = ''
+          }
+        }
+      })
+      return sums
+    },
     // 返回（===既判断）
     handleReturn(isreload) {
       if (isreload === 'true') this.$emit('reloadlist')
       // 表单数据
       this.formobj = {
-        applyPeoName: '',
-        applyTitle: '',
-        createBySid: '',
+        sid: '',
+        withApply: '',
         createOrgName: '',
         createOrgSid: '',
-        modpriceReason: '',
-        nodeState: '',
-        sid: '',
         useOrgName: '',
         useOrgSid: '',
-        baseVehinstallModpricedetails: []
+        remarks: '',
+        withRebateTotal: '',
+        createByName: '',
+        createBySid: '',
+        instanceId: '', // 流程实例ID
+        taskId: '', // 任务ID
+        scmVehRebateWiths: []
       }
       this.$refs['form_obj'].resetFields()
       this.$emit('doback')
@@ -230,13 +400,6 @@ export default {
 }
 </script>
 <style scoped>
-.title {
-  padding: 7px;
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-  align-items: center;
-}
 .rowStyle {
   border-left: 0px;
 }
diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholdingInfo.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholdingInfo.vue
index c8ce22c360..0beb7de3d3 100644
--- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholdingInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholdingInfo.vue
@@ -13,23 +13,38 @@
       <!--标题按钮部分结束-->
       <!--Start 新增修改部分-->
       <div class="listconadd">
-        <div class="titwu"><span>单车返利预提申请</span></div>
+        <div class="titwu"><span>{{ formobj.withApply }}单车返利预提申请</span></div>
         <el-form ref="form_obj" :model="formobj" :rules="rules" class="formadd">
-          <el-table :key="tableKey" :data="formobj.baseVehinstallModpricedetails" :index="index" border style="width: 100%">
+          <el-row class="rowStyle">
+            <el-col :span="24" class="tleftb colOneStyle">
+              <div><span style="font-size: 16px">金额单位：元</span></div>
+            </el-col>
+          </el-row>
+          <el-row class="rowStyle">
+            <el-col :span="2" class="tleftb colOneStyle">
+              <span>品牌:</span>
+            </el-col>
+            <el-col :span="22" class="colOneStyle">
+              <el-form-item>
+                <span>{{ formobj.brandName }}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-table :key="tableKey" :data="formobj.scmVehRebateWiths" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
             <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
             <el-table-column label="返利类型" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.jacketName }}</span>
+                <span>{{ scope.row.rebateTypeValue }}</span>
               </template>
             </el-table-column>
             <el-table-column label="台数" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.vinNo }}</span>
+                <span>{{ scope.row.num }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="预提返利" align="center">
+            <el-table-column prop="withRebate" label="预提返利" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.modelName }}</span>
+                <span>{{ scope.row.withRebate }}</span>
               </template>
             </el-table-column>
             <el-table-column label="明细" align="center">
@@ -39,10 +54,20 @@
             </el-table-column>
             <el-table-column label="备注" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.costPrice }}</span>
+                <span>{{ scope.row.remarks }}</span>
               </template>
             </el-table-column>
           </el-table>
+          <el-row>
+            <el-col :span="2" class="tleftb">
+              <span>备注</span>
+            </el-col>
+            <el-col :span="22">
+              <el-form-item>
+                <span>{{ formobj.remarks }}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
         </el-form>
       </div>
     </div>
@@ -52,7 +77,7 @@
 </template>
 
 <script>
-import req from '@/api/othermenu/shangzhuangtiaojia'
+import req from '@/api/bikerebate/bicyclerebatewithholding'
 import danchefanliInfo from './relation/danchefanliInfo'
 
 export default {
@@ -67,43 +92,17 @@ export default {
       tableKey: 0,
       viewState: 1,
       // 表单数据
-      formobj: {
-        applyPeoName: '',
-        applyTitle: '',
-        createBySid: '',
-        createOrgName: '',
-        createOrgSid: '',
-        modpriceReason: '',
-        nodeState: '',
-        sid: '',
-        useOrgName: '',
-        useOrgSid: '',
-        baseVehinstallModpricedetails: []
-      },
+      formobj: {},
       rules: {},
       submitdisabled: false
     }
   },
   methods: {
-    init() {
-      getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((resp) => {
-        if (resp.success) {
-          this.formobj.createOrgSid = resp.data
-          this.formobj.useOrgSid = resp.data
-          fetchBySid(this.formobj.createOrgSid).then((res) => {
-            if (res.success) {
-              this.formobj.createOrgName = res.data.name
-              this.formobj.useOrgName = res.data.name
-            }
-          })
-        }
-      })
-    },
     showInfo(row) {
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
       })
-      this.viewTitle = '单车返利预提申请详情'
+      this.viewTitle = '预提申请详情'
       console.log('编辑回显', row.sid)
       req.fetchBySid(row.sid).then((resp) => {
         this.formobj = resp.data
@@ -118,23 +117,50 @@ export default {
     resetState() {
       this.viewState = 1
     },
+    // 合计
+    getSummaries(param) {
+      const { columns, data } = param
+      const sums = []
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '合计'
+          return
+        }
+        const values = data.map(item => Number(item[column.property]))
+        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 (!values.every(value => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr)
+              if (!isNaN(value)) {
+                return prev + curr
+              } else {
+                return prev
+              }
+            }, 0)
+            sums[index] += ''
+            this.amount = sums[index] += ''
+          } else {
+            sums[index] = ''
+          }
+        }
+      })
+      return sums
+    },
     // 返回（===既判断）
     handleReturn(isreload) {
       if (isreload === 'true') this.$emit('reloadlist')
       // 表单数据
-      this.formobj = {
-        applyPeoName: '',
-        applyTitle: '',
-        createBySid: '',
-        createOrgName: '',
-        createOrgSid: '',
-        modpriceReason: '',
-        nodeState: '',
-        sid: '',
-        useOrgName: '',
-        useOrgSid: '',
-        baseVehinstallModpricedetails: []
-      }
+      this.formobj = {}
       this.$refs['form_obj'].resetFields()
       this.$emit('doback')
     }
@@ -142,5 +168,12 @@ export default {
 }
 </script>
 <style scoped>
+.rowStyle {
+  border-left: 0px;
+}
+.colOneStyle {
+  border-right: 0px !important;
+  border-bottom: 0px !important;
+}
 </style>
 
diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/relation/danchefanliAdd.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/relation/danchefanliAdd.vue
index 23a062e367..4c35b05ff0 100644
--- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/relation/danchefanliAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/relation/danchefanliAdd.vue
@@ -7,71 +7,70 @@
         <div>{{ viewTitle }}</div>
         <!--start 添加修改按钮-->
         <div>
-          <el-button type="danger" size="small">删除</el-button>
+          <el-button type="danger" size="small" @click="handleDelete">删除</el-button>
           <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
         </div>
       </div>
       <!--标题按钮部分结束-->
       <!--Start 新增修改部分-->
       <div class="listconadd">
-        <div class="titwu"><span>待预提单车返利明细</span></div>
-        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formadd">
-          <el-table :key="tableKey" :data="formobj.baseVehinstallModpricedetails" :index="index" border style="width: 100%" @selection-change="handleSelectionChange">
+        <el-form ref="form_obj" :rules="rules" class="formadd">
+          <el-table :key="tableKey" :data="list" :index="index" border style="width: 100%" @selection-change="handleSelectionChange">
             <el-table-column fixed type="selection" align="center" width="50px"/>
             <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
             <el-table-column label="品牌" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.jacketName }}</span>
+                <span>{{ scope.row.brandName }}</span>
               </template>
             </el-table-column>
             <el-table-column label="车型" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.vinNo }}</span>
+                <span>{{ scope.row.vehModelName }}</span>
               </template>
             </el-table-column>
             <el-table-column label="车架号" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.modelName }}</span>
+                <span>{{ scope.row.vinNo }}</span>
               </template>
             </el-table-column>
             <el-table-column label="厂家结算价" align="center">
               <template slot-scope="scope">
-                <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
+                <span>{{ scope.row.manufactorSettlementPrice }}</span>
               </template>
             </el-table-column>
             <el-table-column label="其中运费" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.costPrice }}</span>
+                <span>{{ scope.row.freight }}</span>
               </template>
             </el-table-column>
             <el-table-column label="创建日期" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.costPrice }}</span>
+                <span>{{ scope.row.createTime }}</span>
               </template>
             </el-table-column>
             <el-table-column label="返利类型" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.costPrice }}</span>
+                <span>{{ scope.row.rebateTypeValue }}</span>
               </template>
             </el-table-column>
             <el-table-column label="返利名称" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.costPrice }}</span>
+                <span>{{ scope.row.rebateName }}</span>
               </template>
             </el-table-column>
             <el-table-column label="计算标准" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.costPrice }}</span>
+                <span>{{ scope.row.calculationStandard }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="预计金额" align="center">
+            <el-table-column label="预计返利" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.costPrice }}</span>
+                <span>{{ scope.row.estimateRebate }}</span>
               </template>
             </el-table-column>
             <el-table-column label="所属年月" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.costPrice }}</span>
+                <span>{{ scope.row.palceGenDate }}</span>
               </template>
             </el-table-column>
           </el-table>
@@ -83,8 +82,7 @@
 </template>
 
 <script>
-import req from '@/api/othermenu/shangzhuangtiaojia'
-import { getPathSidByUserSid, fetchBySid } from '@/api/cheliang/dictcommons'
+import req from '@/api/bikerebate/bicyclerebatewithholding'
 
 export default {
   name: 'danchefanliAdd',
@@ -94,40 +92,15 @@ export default {
       index: 0,
       tableKey: 0,
       viewState: 1,
+      rebateType: '',
       sids: [],
       // 表单数据
-      formobj: {
-        applyPeoName: '',
-        applyTitle: '',
-        createBySid: '',
-        createOrgName: '',
-        createOrgSid: '',
-        modpriceReason: '',
-        nodeState: '',
-        sid: '',
-        useOrgName: '',
-        useOrgSid: '',
-        baseVehinstallModpricedetails: []
-      },
+      list: [],
       rules: {},
       submitdisabled: false
     }
   },
   methods: {
-    init() {
-      getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((resp) => {
-        if (resp.success) {
-          this.formobj.createOrgSid = resp.data
-          this.formobj.useOrgSid = resp.data
-          fetchBySid(this.formobj.createOrgSid).then((res) => {
-            if (res.success) {
-              this.formobj.createOrgName = res.data.name
-              this.formobj.useOrgName = res.data.name
-            }
-          })
-        }
-      })
-    },
     handleSelectionChange(row) {
       const aa = []
       row.forEach((element) => {
@@ -141,32 +114,45 @@ export default {
         this.$refs['form_obj'].clearValidate()
       })
       this.viewTitle = '待预提单车返利明细'
+      this.rebateType = row.rebateTypeValue
       console.log('编辑回显', row.sid)
-      req.fetchBySid(row.sid).then((resp) => {
-        this.formobj = resp.data
+      req.vehRebateWithDetails(row.vehRebateSids).then((resp) => {
+        this.list = resp.data
       }).catch((e) => {
         this.formobj = row
       })
     },
+    handleDelete() {
+      if (this.sids.length === 0) {
+        this.$message({
+          showClose: true,
+          type: 'error',
+          message: '请选择至少一条记录进行删除操作'
+        })
+        return
+      }
+      for (var i = 0; i < this.list.length; i++) {
+        for (var j = 0; j < this.sids.length; j++) {
+          if (this.list[i].sid === this.sids[j]) {
+            this.list.splice(i, 1)
+          }
+        }
+      }
+    },
     // 返回（===既判断）
-    handleReturn(isreload) {
-      if (isreload === 'true') this.$emit('reloadlist')
-      // 表单数据
-      this.formobj = {
-        applyPeoName: '',
-        applyTitle: '',
-        createBySid: '',
-        createOrgName: '',
-        createOrgSid: '',
-        modpriceReason: '',
-        nodeState: '',
-        sid: '',
-        useOrgName: '',
-        useOrgSid: '',
-        baseVehinstallModpricedetails: []
+    handleReturn() {
+      const data_list = []
+      for (var i = 0; i < this.list.length; i++) {
+        data_list.push({
+          sid: this.list[i].sid,
+          rebateTypeValue: this.list[i].rebateTypeValue,
+          rebateTypeKey: this.list[i].rebateTypeKey,
+          withRebate: this.list[i].estimateRebate,
+          brandName: this.list[i].brandName,
+          brandSid: this.list[i].brandSid
+        })
       }
-      this.$refs['form_obj'].resetFields()
-      this.$emit('doback')
+      this.$emit('backAdd', data_list, this.rebateType)
     }
   }
 }
diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/relation/danchefanliInfo.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/relation/danchefanliInfo.vue
index 0d8677fb78..a763bfeb99 100644
--- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/relation/danchefanliInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/relation/danchefanliInfo.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <div v-show="viewState == 1">
+    <div>
       <!--标题按钮部分开始-->
       <div class="tab-header webtop">
         <!--标题-->
@@ -13,63 +13,62 @@
       <!--标题按钮部分结束-->
       <!--Start 新增修改部分-->
       <div class="listconadd">
-        <div class="titwu"><span>待预提单车返利明细</span></div>
-        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formadd">
-          <el-table :key="tableKey" :data="formobj.baseVehinstallModpricedetails" :index="index" border style="width: 100%">
+        <el-form ref="form_obj" :rules="rules" class="formadd">
+          <el-table :key="tableKey" :data="list" :index="index" border style="width: 100%">
             <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
             <el-table-column label="品牌" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.jacketName }}</span>
+                <span>{{ scope.row.brandName }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="车型" align="center">
+            <el-table-column label="车型" align="center" width="220">
               <template slot-scope="scope">
-                <span>{{ scope.row.vinNo }}</span>
+                <span>{{ scope.row.vehModelName }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="车架号" align="center">
+            <el-table-column label="车架号" align="center" width="200">
               <template slot-scope="scope">
-                <span>{{ scope.row.modelName }}</span>
+                <span>{{ scope.row.vinNo }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="厂家结算价" align="center">
+            <el-table-column label="厂家结算价" align="center" width="120">
               <template slot-scope="scope">
-                <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
+                <span>{{ scope.row.manufactorSettlementPrice }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="其中运费" align="center">
+            <el-table-column label="其中运费" align="center" width="120">
               <template slot-scope="scope">
-                <span>{{ scope.row.costPrice }}</span>
+                <span>{{ scope.row.freight }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="创建日期" align="center">
+            <el-table-column label="创建日期" align="center" width="120">
               <template slot-scope="scope">
-                <span>{{ scope.row.costPrice }}</span>
+                <span>{{ scope.row.createTime }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="返利类型" align="center">
+            <el-table-column label="返利类型" align="center" width="120">
               <template slot-scope="scope">
-                <span>{{ scope.row.costPrice }}</span>
+                <span>{{ scope.row.rebateTypeValue }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="返利名称" align="center">
+            <el-table-column label="返利名称" align="center" width="120">
               <template slot-scope="scope">
-                <span>{{ scope.row.costPrice }}</span>
+                <span>{{ scope.row.rebateName }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="计算标准" align="center">
+            <el-table-column label="计算标准" align="center" width="120">
               <template slot-scope="scope">
-                <span>{{ scope.row.costPrice }}</span>
+                <span>{{ scope.row.calculationStandard }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="预计金额" align="center">
+            <el-table-column label="预计返利" align="center" width="120">
               <template slot-scope="scope">
-                <span>{{ scope.row.costPrice }}</span>
+                <span>{{ scope.row.estimateRebate }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="所属年月" align="center">
+            <el-table-column label="所属年月" align="center" width="120">
               <template slot-scope="scope">
-                <span>{{ scope.row.costPrice }}</span>
+                <span>{{ scope.row.palceGenDate }}</span>
               </template>
             </el-table-column>
           </el-table>
@@ -81,8 +80,7 @@
 </template>
 
 <script>
-import req from '@/api/othermenu/shangzhuangtiaojia'
-import { getPathSidByUserSid, fetchBySid } from '@/api/cheliang/dictcommons'
+import req from '@/api/bikerebate/bicyclerebatewithholding'
 
 export default {
   name: 'danchefanliInfo',
@@ -91,48 +89,21 @@ export default {
       viewTitle: '',
       index: 0,
       tableKey: 0,
-      viewState: 1,
+      list: [],
       // 表单数据
-      formobj: {
-        applyPeoName: '',
-        applyTitle: '',
-        createBySid: '',
-        createOrgName: '',
-        createOrgSid: '',
-        modpriceReason: '',
-        nodeState: '',
-        sid: '',
-        useOrgName: '',
-        useOrgSid: '',
-        baseVehinstallModpricedetails: []
-      },
       rules: {},
       submitdisabled: false
     }
   },
   methods: {
-    init() {
-      getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((resp) => {
-        if (resp.success) {
-          this.formobj.createOrgSid = resp.data
-          this.formobj.useOrgSid = resp.data
-          fetchBySid(this.formobj.createOrgSid).then((res) => {
-            if (res.success) {
-              this.formobj.createOrgName = res.data.name
-              this.formobj.useOrgName = res.data.name
-            }
-          })
-        }
-      })
-    },
     showInfo(row) {
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
       })
       this.viewTitle = '待预提单车返利明细'
       console.log('编辑回显', row.sid)
-      req.fetchBySid(row.sid).then((resp) => {
-        this.formobj = resp.data
+      req.vehRebateWithDetails(row.vehRebateSids).then((resp) => {
+        this.list = resp.data
       }).catch((e) => {
         this.formobj = row
       })
@@ -141,19 +112,7 @@ export default {
     handleReturn(isreload) {
       if (isreload === 'true') this.$emit('reloadlist')
       // 表单数据
-      this.formobj = {
-        applyPeoName: '',
-        applyTitle: '',
-        createBySid: '',
-        createOrgName: '',
-        createOrgSid: '',
-        modpriceReason: '',
-        nodeState: '',
-        sid: '',
-        useOrgName: '',
-        useOrgSid: '',
-        baseVehinstallModpricedetails: []
-      }
+      this.list = []
       this.$refs['form_obj'].resetFields()
       this.$emit('doback')
     }
diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/relation/danchefanliselect.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/relation/danchefanliselect.vue
index 47d772837c..cffcbe2c30 100644
--- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/relation/danchefanliselect.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/relation/danchefanliselect.vue
@@ -8,14 +8,11 @@
           <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.mainSid" placeholder="请输入车架号" clearable/>
-              </el-form-item>
               <el-form-item label="车型">
-                <el-input v-model="listQuery.params.mainSid" placeholder="请输入车架号" clearable/>
+                <el-input v-model="listQuery.params.vehModelName" placeholder="请输入车架号" clearable/>
               </el-form-item>
               <el-form-item label="车架号">
-                <el-input v-model="listQuery.params.mainSid" placeholder="请输入车架号" clearable/>
+                <el-input v-model="listQuery.params.vinNo" placeholder="请输入车架号" clearable/>
               </el-form-item>
               <el-form-item label="创建日期">
                 <el-date-picker v-model="listQuery.params.createStartTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
@@ -23,13 +20,12 @@
                 <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-input v-model="listQuery.params.mainSid" placeholder="请输入车架号" clearable/>
+                <el-select v-model="listQuery.params.rebateTypeKey" placeholder="请选择" filterable clearable>
+                  <el-option v-for="item in rebateType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                </el-select>
               </el-form-item>
               <el-form-item label="返利名称">
-                <el-input v-model="listQuery.params.mainSid" placeholder="请输入车架号" clearable/>
-              </el-form-item>
-              <el-form-item label="状态">
-                <el-input v-model="listQuery.params.mainSid" placeholder="请输入车架号" clearable/>
+                <el-input v-model="listQuery.params.rebateName" placeholder="" clearable/>
               </el-form-item>
             </el-form>
             <div class="btn" style="text-align: center;">
@@ -40,70 +36,65 @@
         </div>
         <div class="listtop">
           <div class="tit">待预提单车返利列表</div>
-          <el-button size="small" type="primary">确定</el-button>
+          <el-button size="small" type="primary" @click="handleConfirm">确定</el-button>
         </div>
         <div class="">
           <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 label="状态" align="center" width="200">
-              <template slot-scope="scope">
-                <span>{{ scope.row.nodeState }}</span>
-              </template>
-            </el-table-column>
             <el-table-column label="品牌" align="center" width="200">
               <template slot-scope="scope">
-                <span>{{ scope.row.createTime }}</span>
+                <span>{{ scope.row.brandName }}</span>
               </template>
             </el-table-column>
             <el-table-column label="车型" align="center" width="200">
               <template slot-scope="scope">
-                <span>{{ scope.row.applyPeoName }}</span>
+                <span>{{ scope.row.vehModelName }}</span>
               </template>
             </el-table-column>
             <el-table-column label="车架号" align="center" width="250">
               <template slot-scope="scope">
-                <span>{{ scope.row.createOrgName }}</span>
+                <span>{{ scope.row.vinNo }}</span>
               </template>
             </el-table-column>
             <el-table-column label="厂家结算价" align="center" width="200">
               <template slot-scope="scope">
-                <span>{{ scope.row.applyTitle }}</span>
+                <span>{{ scope.row.manufactorSettlementPrice }}</span>
               </template>
             </el-table-column>
             <el-table-column label="其中运费" align="center" width="200">
               <template slot-scope="scope">
-                <span>{{ scope.row.modpriceReason }}</span>
+                <span>{{ scope.row.freight }}</span>
               </template>
             </el-table-column>
             <el-table-column label="创建日期" align="center" width="120">
               <template slot-scope="scope">
-                <span>{{ scope.row.modpriceReason }}</span>
+                <span>{{ scope.row.createTime }}</span>
               </template>
             </el-table-column>
             <el-table-column label="返利类型" align="center" width="150">
               <template slot-scope="scope">
-                <span>{{ scope.row.modpriceReason }}</span>
+                <span>{{ scope.row.rebateTypeValue }}</span>
               </template>
             </el-table-column>
             <el-table-column label="返利名称" align="center" width="150">
               <template slot-scope="scope">
-                <span>{{ scope.row.modpriceReason }}</span>
+                <span>{{ scope.row.rebateName }}</span>
               </template>
             </el-table-column>
             <el-table-column label="计算标准" align="center" width="100">
               <template slot-scope="scope">
-                <span>{{ scope.row.modpriceReason }}</span>
+                <span>{{ scope.row.calculationStandard }}</span>
               </template>
             </el-table-column>
             <el-table-column label="预计返利" align="center" width="120">
               <template slot-scope="scope">
-                <span>{{ scope.row.modpriceReason }}</span>
+                <span>{{ scope.row.estimateRebate }}</span>
               </template>
             </el-table-column>
             <el-table-column label="所属年月" align="center" width="120">
               <template slot-scope="scope">
-                <span>{{ scope.row.modpriceReason }}</span>
+                <span>{{ scope.row.palceGenDate }}</span>
               </template>
             </el-table-column>
           </el-table>
@@ -118,12 +109,13 @@
 </template>
 
 <script>
-import req from '@/api/othermenu/shangzhuangtiaojia'
+import req from '@/api/bikerebate/bicyclerebatewithholding'
 import Pagination from '@/components/pagination'
 import ButtonBar from '@/components/ButtonBar'
+import { typeValues } from '@/api/cheliang/dictcommons'
 
 export default {
-  name: 'bicyclerebatemanagement',
+  name: 'danchefanliSelect',
   components: {
     Pagination,
     ButtonBar
@@ -148,11 +140,18 @@ export default {
       sids: [],
       FormLoading: false,
       listLoading: false,
+      rebateType_list: [],
       listQuery: {
         params: {
-          createBySid: '',
+          createOrgSid: '',
+          brandSid: '',
+          vehModelName: '',
+          vinNo: '',
+          rebateTypeKey: '',
+          rebateName: '',
           createEndTime: '',
-          createStartTime: ''
+          createStartTime: '',
+          sidList: []
         },
         current: 1,
         size: 5,
@@ -161,14 +160,17 @@ export default {
       rules: {}
     }
   },
-  created() {
-    // 加载列表
-    this.getList()
-  },
   mounted() {
     this.$refs['btnbar'].setButtonList(this.btnList)
   },
   methods: {
+    init() {
+      typeValues({ type: 'rebateType' }).then((res) => {
+        if (res.success) {
+          this.rebateType_list = res.data
+        }
+      })
+    },
     // 搜索条件效果
     clicksearchShow() {
       this.isSearchShow = !this.isSearchShow
@@ -197,7 +199,14 @@ export default {
     handleSelectionChange(row) {
       const aa = []
       row.forEach((element) => {
-        aa.push(element.sid)
+        aa.push({
+          sid: element.sid,
+          rebateTypeValue: element.rebateTypeValue,
+          rebateTypeKey: element.rebateTypeKey,
+          withRebate: element.estimateRebate,
+          brandName: element.brandName,
+          brandSid: element.brandSid
+        })
       })
       this.sids = aa
       console.log('sids', this.sids)
@@ -206,7 +215,7 @@ export default {
     getList() {
       this.listLoading = true
       this.listQuery.params.createBySid = window.sessionStorage.getItem('userSid')
-      req.listPage(this.listQuery).then((response) => {
+      req.pageList(this.listQuery).then((response) => {
         console.log('列表查询结果：', response)
         this.listLoading = false
         if (response.success && response.data && response.data.total > 0) {
@@ -218,24 +227,52 @@ export default {
         }
       })
     },
+    showData(value, createOrgSid, brandSid) {
+      this.listQuery.params.createOrgSid = createOrgSid
+      this.listQuery.params.brandSid = brandSid
+      const aa = []
+      if (value.length > 0) {
+        for (var i = 0; i < value.length; i++) {
+          for (var j = 0; j < value[i].vehRebateSids.length; j++) {
+            aa.push(value[i].vehRebateSids[j])
+          }
+        }
+        this.listQuery.params.sidList = aa
+      } else {
+        this.listQuery.params.sidList = []
+      }
+      this.init()
+      this.getList()
+    },
     // 查询按钮
     handleFilter() {
       this.listQuery.current = 1
       this.getList()
     },
     handleReset() {
-      this.listQuery = {
-        params: {
-          createBySid: '',
-          createEndTime: '',
-          createStartTime: ''
-        },
-        current: 1,
-        size: 5,
-        total: 0
-      }
+      this.listQuery.current = 1
+      this.listQuery.total = 0
+      this.listQuery.size = 5
+      this.listQuery.params.createStartTime = ''
+      this.listQuery.params.createEndTime = ''
+      this.listQuery.params.vinNo = ''
+      this.listQuery.params.vehModelName = ''
+      this.listQuery.params.rebateTypeKey = ''
+      this.listQuery.params.rebateName = ''
       this.getList()
     },
+    handleConfirm() {
+      if (this.sids.length > 0) {
+        this.$emit('backData', this.sids)
+      } else {
+        this.$notify({
+          title: '提示',
+          message: '请选择至少一条记录!',
+          type: 'error',
+          duration: 2000
+        })
+      }
+    },
     doClose() {
       this.$emit('doback')
     }
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/danchefanliyutiDaiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/danchefanliyutiDaiBanInfo.vue
new file mode 100644
index 0000000000..40c76fa33f
--- /dev/null
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/danchefanliyutiDaiBanInfo.vue
@@ -0,0 +1,373 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <!--标题按钮部分开始-->
+      <div class="tab-header webtop">
+        <!--标题-->
+        <div>{{ viewTitle }}</div>
+        <!--start 添加修改按钮-->
+        <div>
+          <el-button type="primary" size="small" @click="openAgree('同意')">同 意</el-button>
+          <el-button type="danger" size="small" @click="openReject('驳回')">驳 回</el-button>
+          <el-button type="danger" size="small" @click="openStop('终止')">终 止</el-button>
+        </div>
+      </div>
+      <!--标题按钮部分结束-->
+      <!--Start 新增修改部分-->
+      <div class="">
+        <div class="titwu"><span>{{ formobj.withApply }}单车返利预提申请</span></div>
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formadd">
+          <el-row class="rowStyle">
+            <el-col :span="24" class="tleftb colOneStyle">
+              <div><span style="font-size: 16px">金额单位：元</span></div>
+            </el-col>
+          </el-row>
+          <el-row class="rowStyle">
+            <el-col :span="2" class="tleftb colOneStyle">
+              <span>品牌:</span>
+            </el-col>
+            <el-col :span="22" class="colOneStyle">
+              <el-form-item>
+                <span>{{ formobj.brandName }}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-table :key="tableKey" :data="formobj.scmVehRebateWiths" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
+            <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column label="返利类型" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.rebateTypeValue }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="台数" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.num }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="withRebate" label="预提返利" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.withRebate }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="明细" align="center">
+              <template slot-scope="scope">
+                <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
+              </template>
+            </el-table-column>
+            <el-table-column label="备注" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.remarks }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+          <el-row>
+            <el-col :span="2" class="tleftb">
+              <span>备注</span>
+            </el-col>
+            <el-col :span="22">
+              <el-form-item>
+                <span>{{ formobj.remarks }}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </div>
+    <!--End 添加修改部分-->
+    <danchefanliInfo v-show="viewState == 2" ref="divInfo" @doback="resetState"/>
+    <!-- 选择待办人 的弹出框-->
+    <el-dialog title="填写审批意见" :visible.sync="nodeDialogVisible" width="80%">
+      <el-form class="formaddcopy02" >
+        <el-row v-show="currentLink" style="border-top: 1px solid #e0e3eb">
+          <el-col :span="24">
+            <div class="span-sty spanTwoWidth"><span>当前环节:</span></div>
+            <el-form-item><span class="addinputInfo addinputOne">{{ current.taskName }}->{{ nextNode.name }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :class="{ rowClass:!currentLink }">
+          <el-col :span="24">
+            <div class="span-sty spanTwoWidth"><span>意见:</span></div>
+            <el-form-item><el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw addinputOne" clearable ></el-input></el-form-item>
+          </el-col>
+        </el-row>
+        <div style="text-align:center;margin-top: 20px;">
+          <el-button type="primary" size="mini" @click="reject">确 定</el-button>
+          <el-button type="info " size="mini" @click="nodeDialogVisible = false">取 消</el-button>
+        </div>
+      </el-form>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import req from '@/api/bikerebate/bicyclerebatewithholding'
+import danchefanliInfo from './relation/danchefanliInfo'
+
+export default {
+  name: 'danchefanliyutiDaiBanInfo',
+  components: {
+    danchefanliInfo
+  },
+  data() {
+    return {
+      viewTitle: '',
+      index: 0,
+      tableKey: 0,
+      viewState: 1,
+      operation: '', // 点击操作按钮
+      dialogList: {
+        comment: ''
+      },
+      startTask: true,
+      current: {
+        taskDefKey: '',
+        taskName: '' // 当前环节名称
+      },
+      nextNode: {}, // 下一环节
+      nodeDialogVisible: false,
+      currentLink: true,
+      // 表单数据
+      formobj: {},
+      rules: {},
+      submitdisabled: false,
+      // 环节所需参数
+      linkByParameter: {
+        businessSid: '',
+        comment: '',
+        instanceId: '',
+        taskId: '',
+        orgSidPath: '',
+        taskDefKey: '',
+        userSid: ''
+      }
+    }
+  },
+  created() {
+    console.log('url:' + window.location.href)
+    var one = window.location.href.indexOf('&data') + 6
+    const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用
+    const obj = JSON.parse(decodeURIComponent(data))
+    console.log('iframe页面获取的obj:', obj)
+    // 点击（同意、终止、驳回、驳回）操作时所需的参数
+    this.linkByParameter.businessSid = obj.businessSid
+    this.linkByParameter.instanceId = obj.instanceId
+    this.linkByParameter.taskId = obj.taskId
+    this.linkByParameter.taskDefKey = obj.taskDefKey
+    this.linkByParameter.orgSidPath = window.sessionStorage.getItem('orgSidPath')
+    this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
+    this.current.taskDefKey = obj.taskDefKey
+    this.current.taskName = obj.taskName
+    // 加载表单数据
+    this.showInfo(obj.businessSid)
+  },
+  mounted() {
+    window.parent.postMessage({
+      cmd: 'returnHeight',
+      params: {
+        // 告诉父级页面，子页面的弹框高度。
+        code: 2,
+        data: 390 + 'px'
+      }
+    }, '*')
+  },
+  methods: {
+    showInfo(sid) {
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      this.viewTitle = '预提申请详情'
+      console.log('编辑回显', sid)
+      req.fetchBySid(sid).then((resp) => {
+        this.formobj = resp.data
+      }).catch((e) => {
+        this.formobj = {}
+      })
+    },
+    handleLook(row) {
+      this.viewState = 2
+      this.$refs['divInfo'].showInfo(row)
+    },
+    resetState() {
+      this.viewState = 1
+    },
+    // 同意
+    openAgree(val) {
+      this.operation = val
+      this.currentLink = true
+      this.dialogList.comment = '同意'
+      req.getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey }).then((resp) => {
+        if (resp.success) {
+          var arr = resp.data
+          this.nextNode = arr[0]
+          this.nodeDialogVisible = true
+        }
+        this.submitdisabled = false
+      })
+    },
+    // 驳回
+    openReject(val) {
+      this.operation = val
+      this.currentLink = true
+      this.dialogList.comment = ''
+      req.getPreviousNodesForReject({ taskDefKey: this.current.taskDefKey }).then((resp) => {
+        if (resp.success) {
+          var arr = resp.data
+          this.nextNode = arr[0]
+          this.nodeDialogVisible = true
+        }
+        this.submitdisabled = false
+      })
+    },
+    // 终止
+    openStop(val) {
+      this.operation = val
+      this.currentLink = false
+      this.dialogList.comment = ''
+      this.nodeDialogVisible = true
+    },
+    reject() {
+      if (this.operation === '同意') {
+        this.handleAgree()
+      } else if (this.operation === '驳回') {
+        if (this.dialogList.comment === '') {
+          this.$message({ showClose: true, type: 'error', message: '请填写审批意见' })
+        } else {
+          this.handleReject()
+        }
+      } else if (this.operation === '终止') {
+        if (this.dialogList.comment === '') {
+          this.$message({ showClose: true, type: 'error', message: '请填写审批意见' })
+        } else {
+          this.handleStop()
+        }
+      }
+    },
+    /** 同意任务 */
+    handleAgree() {
+      this.linkByParameter.comment = this.dialogList.comment
+      req.complete(this.linkByParameter).then((response) => {
+        if (response.success) {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
+    },
+    /** 驳回任务 */
+    handleReject() {
+      this.linkByParameter.comment = this.dialogList.comment
+      req.reject(this.linkByParameter).then((response) => {
+        if (response.success) {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
+    },
+    /** 终止任务 */
+    handleStop() {
+      this.linkByParameter.comment = this.dialogList.comment
+      req.breakProcess(this.linkByParameter).then((response) => {
+        if (response.success) {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
+    },
+    // 合计
+    getSummaries(param) {
+      const { columns, data } = param
+      const sums = []
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '合计'
+          return
+        }
+        const values = data.map(item => Number(item[column.property]))
+        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 (!values.every(value => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr)
+              if (!isNaN(value)) {
+                return prev + curr
+              } else {
+                return prev
+              }
+            }, 0)
+            sums[index] += ''
+            this.amount = sums[index] += ''
+          } else {
+            sums[index] = ''
+          }
+        }
+      })
+      return sums
+    }
+  }
+}
+</script>
+<style scoped>
+.titwu {
+  font-size: 28px;
+  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;
+}
+</style>
+
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/danchefanliyutiEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/danchefanliyutiEdit.vue
new file mode 100644
index 0000000000..3ce3ea4841
--- /dev/null
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/danchefanliyutiEdit.vue
@@ -0,0 +1,399 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <!--标题按钮部分开始-->
+      <div class="tab-header webtop">
+        <!--标题-->
+        <div>{{ viewTitle }}</div>
+        <!--start 添加修改按钮-->
+        <div>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="save()">保存
+          </el-button>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="submit()">提交
+          </el-button>
+        </div>
+      </div>
+      <!--标题按钮部分结束-->
+      <!--Start 新增修改部分-->
+      <div class="">
+        <div class="titwu"><span>{{ formobj.withApply }}单车返利预提申请</span></div>
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formadd">
+          <el-row class="rowStyle">
+            <el-col :span="24" class="tleftb colOneStyle">
+              <div><span style="font-size: 16px">金额单位：元</span></div>
+            </el-col>
+          </el-row>
+          <el-row class="rowStyle">
+            <el-col :span="2" class="tleftb colOneStyle">
+              <span>品牌:</span>
+            </el-col>
+            <el-col :span="4" class="colOneStyle">
+              <el-form-item>
+                <el-select disabled v-model="formobj.brandName" placeholder="请选择" filterable clearable @change="changeBrand">
+                  <el-option v-for="item in brand_list" :key="item.sid" :label="item.brandName" :value="item.brandName"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="18" class="tleftb colOneStyle">
+              <el-button size="small" type="primary" @click="handleSelect()">选择</el-button>
+            </el-col>
+          </el-row>
+          <el-table :key="tableKey" :data="formobj.scmVehRebateWiths" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
+            <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column label="返利类型" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.rebateTypeValue }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="台数" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.num }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="withRebate" label="预提返利" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.withRebate }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="明细" align="center">
+              <template slot-scope="scope">
+                <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
+              </template>
+            </el-table-column>
+            <el-table-column label="备注" align="center">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.remarks" clearable placeholder="" class="addinputw"></el-input>
+              </template>
+            </el-table-column>
+          </el-table>
+          <el-row>
+            <el-col :span="2" class="tleftb">
+              <span>备注</span>
+            </el-col>
+            <el-col :span="22">
+              <el-form-item>
+                <el-input v-model="formobj.remarks" clearable placeholder="" class="addinputw"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </div>
+    <!--End 添加修改部分-->
+    <danchefanlichoose v-show="viewState == 2" ref="divSelect" @doback="resetState" @backData="backData"/>
+    <danchefanliAdd v-show="viewState == 3" ref="divAdd" @backAdd="backAdd" />
+  </div>
+</template>
+
+<script>
+import req from '@/api/bikerebate/bicyclerebatewithholding'
+import { brandDown, fetchBySid } from '@/api/cheliang/dictcommons'
+import danchefanlichoose from './relation/danchefanlichoose'
+import danchefanliAdd from './relation/danchefanliAdd'
+
+export default {
+  name: 'bicyclerebatewithholdingAdd',
+  components: {
+    danchefanlichoose,
+    danchefanliAdd
+  },
+  data() {
+    return {
+      viewTitle: '',
+      index: 0,
+      tableKey: 0,
+      viewState: 1,
+      brand_list: [],
+      // 表单数据
+      formobj: {
+        sid: '',
+        withApply: '',
+        createOrgName: '',
+        createOrgSid: '',
+        useOrgName: '',
+        useOrgSid: '',
+        remarks: '',
+        withRebateTotal: '',
+        createByName: '',
+        createBySid: '',
+        instanceId: '', // 流程实例ID
+        taskId: '', // 任务ID
+        scmVehRebateWiths: []
+      },
+      rules: {},
+      submitdisabled: false
+    }
+  },
+  created() {
+    console.log('url:' + window.location.href)
+    var one = window.location.href.indexOf('&data') + 6
+    const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用
+    const obj = JSON.parse(decodeURIComponent(data))
+    this.showInfo(obj.businessSid)
+  },
+  mounted() {
+    window.parent.postMessage({
+      cmd: 'returnHeight',
+      params: {
+        // 告诉父级页面，子页面的弹框高度。
+        code: 2,
+        data: 390 + 'px'
+      }
+    }, '*')
+  },
+  methods: {
+    init() {
+      brandDown({ useOrg: this.formobj.createOrgSid }).then((res) => {
+        if (res.success) {
+          this.brand_list = res.data
+        }
+      })
+    },
+    showInfo(sid) {
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+        this.init()
+      })
+      this.viewTitle = '【编辑】预提申请'
+      console.log('编辑回显', sid)
+      req.fetchBySid(sid).then((resp) => {
+        this.formobj = resp.data
+        this.formobj.instanceId = resp.data.procInstId
+      }).catch((e) => {
+        this.formobj = {}
+      })
+    },
+    changeBrand(value) {
+      let bb = null
+      this.brand_list.forEach((e) => {
+        if (e.brandName === value) {
+          bb = {
+            name: e.brandName,
+            sid: e.sid
+          }
+        }
+      })
+      this.formobj.brandSid = bb.sid
+    },
+    // 列表--选择
+    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.scmVehRebateWiths, this.formobj.createOrgSid, this.formobj.brandSid)
+    },
+    // 列表--选择返回数据
+    backData(value) {
+      this.viewState = 1
+      for (var i in value) {
+        let cval = value[i]
+        if (!this.formobj.scmVehRebateWiths || this.formobj.scmVehRebateWiths.length === 0) {
+          console.log(11111)
+          this.formobj.scmVehRebateWiths = []
+        }
+        let v = 0
+        for (var j in this.formobj.scmVehRebateWiths) {
+          if (this.formobj.scmVehRebateWiths[j].rebateTypeValue === cval.rebateTypeValue) {
+            this.formobj.scmVehRebateWiths[j].num = parseInt(this.formobj.scmVehRebateWiths[j].num) + parseInt(1)
+            this.formobj.scmVehRebateWiths[j].withRebate = parseInt(this.formobj.scmVehRebateWiths[j].withRebate) + parseInt(cval.withRebate)
+            this.formobj.scmVehRebateWiths[j].vehRebateSids.push(cval.sid)
+            v = 1
+            break
+          }
+        }
+        if (v === 0) {
+          console.log(v, 44444)
+          this.formobj.scmVehRebateWiths.push({
+            rebateTypeKey: cval.rebateTypeKey,
+            rebateTypeValue: cval.rebateTypeValue,
+            num: 1,
+            withRebate: cval.withRebate,
+            brandName: cval.brandName,
+            brandSid: cval.brandSid,
+            vehRebateSids: [cval.sid],
+            remarks: '',
+            sid: '',
+            mainSid: ''
+          })
+        }
+      }
+    },
+    // 明细--查看
+    handleLook(row) {
+      this.viewState = 3
+      this.$refs['divAdd'].showInfo(row)
+    },
+    // 明细--查看返回数据
+    backAdd(value, rebateType) {
+      this.viewState = 1
+      const aa = []
+      if (value.length > 0) {
+        for (var i in value) {
+          let cval = value[i]
+          let v = 0
+          for (var j in aa) {
+            if (aa[j].rebateTypeValue === cval.rebateTypeValue) {
+              aa[j].num = parseInt(aa[j].num) + parseInt(1)
+              aa[j].withRebate = parseInt(aa[j].withRebate) + parseInt(cval.withRebate)
+              aa[j].vehRebateSids.push(cval.sid)
+              v = 1
+              break
+            }
+          }
+          if (v === 0) {
+            aa.push({
+              rebateTypeKey: cval.rebateTypeKey,
+              rebateTypeValue: cval.rebateTypeValue,
+              num: 1,
+              withRebate: cval.withRebate,
+              brandName: cval.brandName,
+              brandSid: cval.brandSid,
+              vehRebateSids: [cval.sid],
+              remarks: '',
+              sid: '',
+              mainSid: ''
+            })
+          }
+        }
+        for (var k = 0; k < this.formobj.scmVehRebateWiths.length; k++) {
+          if (this.formobj.scmVehRebateWiths[k].rebateTypeValue === rebateType) {
+            this.formobj.scmVehRebateWiths[k].rebateTypeKey = aa[0].rebateTypeKey
+            this.formobj.scmVehRebateWiths[k].rebateTypeValue = aa[0].rebateTypeValue
+            this.formobj.scmVehRebateWiths[k].num = aa[0].num
+            this.formobj.scmVehRebateWiths[k].withRebate = aa[0].withRebate
+            this.formobj.scmVehRebateWiths[k].brandName = aa[0].brandName
+            this.formobj.scmVehRebateWiths[k].brandSid = aa[0].brandSid
+            this.formobj.scmVehRebateWiths[k].vehRebateSids = aa[0].vehRebateSids
+            break
+          }
+        }
+      } else if (value.length === 0) {
+        for (var l = 0; l < this.formobj.scmVehRebateWiths.length; l++) {
+          if (this.formobj.scmVehRebateWiths[l].rebateTypeValue === rebateType) {
+            this.formobj.scmVehRebateWiths.splice(l, 1)
+            break
+          }
+        }
+      }
+    },
+    // 合计
+    getSummaries(param) {
+      const { columns, data } = param
+      const sums = []
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '合计'
+          return
+        }
+        const values = data.map(item => Number(item[column.property]))
+        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] += ''
+          this.formobj.withRebateTotal = sums[index] += ''
+        } else {
+          if (!values.every(value => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr)
+              if (!isNaN(value)) {
+                return prev + curr
+              } else {
+                return prev
+              }
+            }, 0)
+            sums[index] += ''
+            this.amount = sums[index] += ''
+          } else {
+            sums[index] = ''
+          }
+        }
+      })
+      return sums
+    },
+    resetState() {
+      this.viewState = 1
+    },
+    save() {
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          this.submitdisabled = true
+          req.save(this.formobj).then((resp) => {
+            this.submitdisabled = false
+            if (resp.success) {
+              this.$message({
+                showClose: true,
+                type: 'success',
+                message: resp.msg
+              })
+              // 子页面向父级页面传递值(关闭弹框)
+              window.parent.postMessage({
+                cmd: 'returnHeight',
+                params: {
+                  // 操作成功，告诉父级页面关闭弹框
+                  code: 1
+                }
+              }, '*')
+            }
+          }).catch(() => {
+            this.submitdisabled = false
+          })
+        } else {
+          return false
+        }
+      })
+    },
+    submit() {
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          this.submitdisabled = true
+          req.submitVehicleApply(this.formobj).then((resp) => {
+            this.submitdisabled = false
+            if (resp.success) {
+              this.$message({
+                showClose: true,
+                type: 'success',
+                message: resp.msg
+              })
+              // 子页面向父级页面传递值(关闭弹框)
+              window.parent.postMessage({
+                cmd: 'returnHeight',
+                params: {
+                  // 操作成功，告诉父级页面关闭弹框
+                  code: 1
+                }
+              }, '*')
+            }
+          }).catch(() => {
+            this.submitdisabled = false
+          })
+        } else {
+          return false
+        }
+      })
+    }
+  }
+}
+</script>
+<style scoped>
+.titwu {
+  font-size: 28px;
+  text-align: center;
+  padding: 30px 0 20px 0;
+}
+.rowStyle {
+  border-left: 0px;
+}
+.colOneStyle {
+  border-right: 0px !important;
+  border-bottom: 0px !important;
+}
+</style>
+
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/danchefanliyutiYiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/danchefanliyutiYiBanInfo.vue
new file mode 100644
index 0000000000..8badbeee6d
--- /dev/null
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/danchefanliyutiYiBanInfo.vue
@@ -0,0 +1,249 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <!--标题按钮部分开始-->
+      <div class="tab-header webtop">
+        <!--标题-->
+        <div>{{ viewTitle }}</div>
+        <!--start 添加修改按钮-->
+        <div>
+          <el-button type="danger" size="small" @click="openRevoke()">撤回</el-button>
+        </div>
+      </div>
+      <!--标题按钮部分结束-->
+      <!--Start 新增修改部分-->
+      <div class="">
+        <div class="titwu"><span>{{ formobj.withApply }}单车返利预提申请</span></div>
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formadd">
+          <el-row class="rowStyle">
+            <el-col :span="24" class="tleftb colOneStyle">
+              <div><span style="font-size: 16px">金额单位：元</span></div>
+            </el-col>
+          </el-row>
+          <el-row class="rowStyle">
+            <el-col :span="2" class="tleftb colOneStyle">
+              <span>品牌:</span>
+            </el-col>
+            <el-col :span="22" class="colOneStyle">
+              <el-form-item>
+                <span>{{ formobj.brandName }}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-table :key="tableKey" :data="formobj.scmVehRebateWiths" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
+            <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column label="返利类型" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.rebateTypeValue }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="台数" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.num }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="withRebate" label="预提返利" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.withRebate }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="明细" align="center">
+              <template slot-scope="scope">
+                <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
+              </template>
+            </el-table-column>
+            <el-table-column label="备注" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.remarks }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+          <el-row>
+            <el-col :span="2" class="tleftb">
+              <span>备注</span>
+            </el-col>
+            <el-col :span="22">
+              <el-form-item>
+                <span>{{ formobj.remarks }}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </div>
+    <!--End 添加修改部分-->
+    <danchefanliInfo v-show="viewState == 2" ref="divInfo" @doback="resetState"/>
+  </div>
+</template>
+
+<script>
+import req from '@/api/bikerebate/bicyclerebatewithholding'
+import danchefanliInfo from './relation/danchefanliInfo'
+
+export default {
+  name: 'danchefanliyutiYiBanInfo',
+  components: {
+    danchefanliInfo
+  },
+  data() {
+    return {
+      viewTitle: '',
+      index: 0,
+      tableKey: 0,
+      viewState: 1,
+      // 表单数据
+      formobj: {},
+      rules: {},
+      submitdisabled: false,
+      // 环节所需参数
+      linkByParameter: {
+        businessSid: '',
+        comment: '',
+        instanceId: '',
+        taskId: '',
+        orgSidPath: '',
+        taskDefKey: '',
+        userSid: ''
+      }
+    }
+  },
+  created() {
+    console.log('url:' + window.location.href)
+    var one = window.location.href.indexOf('&data') + 6
+    const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用
+    const obj = JSON.parse(decodeURIComponent(data))
+    console.log('iframe页面获取的obj:', obj)
+    // 点击（同意、终止、驳回、驳回）操作时所需的参数
+    this.linkByParameter.businessSid = obj.businessSid
+    this.linkByParameter.instanceId = obj.instanceId
+    this.linkByParameter.taskId = obj.taskId
+    this.linkByParameter.taskDefKey = obj.taskDefKey
+    this.linkByParameter.orgSidPath = window.sessionStorage.getItem('orgSidPath')
+    this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
+    // 加载表单数据
+    this.showInfo(obj.businessSid)
+  },
+  mounted() {
+    window.parent.postMessage({
+      cmd: 'returnHeight',
+      params: {
+        // 告诉父级页面，子页面的弹框高度。
+        code: 2,
+        data: 390 + 'px'
+      }
+    }, '*')
+  },
+  methods: {
+    showInfo(sid) {
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      this.viewTitle = '预提申请详情'
+      console.log('编辑回显', sid)
+      req.fetchBySid(sid).then((resp) => {
+        this.formobj = resp.data
+      }).catch((e) => {
+        this.formobj = {}
+      })
+    },
+    handleLook(row) {
+      this.viewState = 2
+      this.$refs['divInfo'].showInfo(row)
+    },
+    resetState() {
+      this.viewState = 1
+    },
+    /** 确认撤回任务 */
+    openRevoke() {
+      this.$confirm('是否确认执行撤回操作', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.handleRevoke()
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消撤回'
+        })
+      })
+    },
+    /** 撤回任务 */
+    handleRevoke() {
+      req.revokeProcess(this.linkByParameter).then((response) => {
+        if (response.success) {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
+    },
+    // 合计
+    getSummaries(param) {
+      const { columns, data } = param
+      const sums = []
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '合计'
+          return
+        }
+        const values = data.map(item => Number(item[column.property]))
+        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 (!values.every(value => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr)
+              if (!isNaN(value)) {
+                return prev + curr
+              } else {
+                return prev
+              }
+            }, 0)
+            sums[index] += ''
+            this.amount = sums[index] += ''
+          } else {
+            sums[index] = ''
+          }
+        }
+      })
+      return sums
+    }
+  }
+}
+</script>
+<style scoped>
+.titwu {
+  font-size: 28px;
+  text-align: center;
+  padding: 30px 0 20px 0;
+}
+.rowStyle {
+  border-left: 0px;
+}
+.colOneStyle {
+  border-right: 0px !important;
+  border-bottom: 0px !important;
+}
+</style>
+
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/relation/danchefanliAdd.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/relation/danchefanliAdd.vue
new file mode 100644
index 0000000000..156cdcc7e9
--- /dev/null
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/relation/danchefanliAdd.vue
@@ -0,0 +1,162 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <!--标题按钮部分开始-->
+      <div class="tab-header webtop">
+        <!--标题-->
+        <div>{{ viewTitle }}</div>
+        <!--start 添加修改按钮-->
+        <div>
+          <el-button type="danger" size="small" @click="handleDelete">删除</el-button>
+          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+        </div>
+      </div>
+      <!--标题按钮部分结束-->
+      <!--Start 新增修改部分-->
+      <div class="">
+        <el-form ref="form_obj" :rules="rules" class="formadd">
+          <el-table :key="tableKey" :data="list" :index="index" border style="width: 100%" @selection-change="handleSelectionChange">
+            <el-table-column fixed type="selection" align="center" width="50px"/>
+            <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column label="品牌" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.brandName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="车型" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.vehModelName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="车架号" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.vinNo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="厂家结算价" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.manufactorSettlementPrice }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="其中运费" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.freight }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="创建日期" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.createTime }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="返利类型" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.rebateTypeValue }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="返利名称" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.rebateName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="计算标准" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.calculationStandard }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="预计返利" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.estimateRebate }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="所属年月" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.palceGenDate }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-form>
+      </div>
+    </div>
+    <!--End 添加修改部分-->
+  </div>
+</template>
+
+<script>
+import req from '@/api/bikerebate/bicyclerebatewithholding'
+
+export default {
+  name: 'danchefanliAdd',
+  data() {
+    return {
+      viewTitle: '',
+      index: 0,
+      tableKey: 0,
+      viewState: 1,
+      rebateType: '',
+      sids: [],
+      // 表单数据
+      list: [],
+      rules: {},
+      submitdisabled: false
+    }
+  },
+  methods: {
+    handleSelectionChange(row) {
+      const aa = []
+      row.forEach((element) => {
+        aa.push(element.sid)
+      })
+      this.sids = aa
+      console.log('sids', this.sids)
+    },
+    showInfo(row) {
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      this.viewTitle = '待预提单车返利明细'
+      this.rebateType = row.rebateTypeValue
+      console.log('编辑回显', row.sid)
+      req.vehRebateWithDetails(row.vehRebateSids).then((resp) => {
+        this.list = resp.data
+      }).catch((e) => {
+        this.formobj = row
+      })
+    },
+    handleDelete() {
+      if (this.sids.length === 0) {
+        this.$message({
+          showClose: true,
+          type: 'error',
+          message: '请选择至少一条记录进行删除操作'
+        })
+        return
+      }
+      for (var i = 0; i < this.list.length; i++) {
+        for (var j = 0; j < this.sids.length; j++) {
+          if (this.list[i].sid === this.sids[j]) {
+            this.list.splice(i, 1)
+          }
+        }
+      }
+    },
+    // 返回（===既判断）
+    handleReturn() {
+      const data_list = []
+      for (var i = 0; i < this.list.length; i++) {
+        data_list.push({
+          sid: this.list[i].sid,
+          rebateTypeValue: this.list[i].rebateTypeValue,
+          rebateTypeKey: this.list[i].rebateTypeKey,
+          withRebate: this.list[i].estimateRebate,
+          brandName: this.list[i].brandName,
+          brandSid: this.list[i].brandSid
+        })
+      }
+      this.$emit('backAdd', data_list, this.rebateType)
+    }
+  }
+}
+</script>
+<style scoped>
+</style>
+
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/relation/danchefanliInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/relation/danchefanliInfo.vue
new file mode 100644
index 0000000000..2db40c70eb
--- /dev/null
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/relation/danchefanliInfo.vue
@@ -0,0 +1,129 @@
+<template>
+  <div class="app-container">
+    <div>
+      <!--标题按钮部分开始-->
+      <div class="tab-header webtop">
+        <!--标题-->
+        <div>{{ viewTitle }}</div>
+        <!--start 添加修改按钮-->
+        <div>
+          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+        </div>
+      </div>
+      <!--标题按钮部分结束-->
+      <!--Start 新增修改部分-->
+      <div class="">
+        <el-form ref="form_obj" :rules="rules" class="formadd">
+          <el-table :key="tableKey" :data="list" :index="index" border style="width: 100%">
+            <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column label="品牌" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.brandName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="车型" align="center" width="220">
+              <template slot-scope="scope">
+                <span>{{ scope.row.vehModelName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="车架号" align="center" width="200">
+              <template slot-scope="scope">
+                <span>{{ scope.row.vinNo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="厂家结算价" align="center" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.manufactorSettlementPrice }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="其中运费" align="center" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.freight }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="创建日期" align="center" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.createTime }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="返利类型" align="center" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.rebateTypeValue }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="返利名称" align="center" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.rebateName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="计算标准" align="center" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.calculationStandard }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="预计返利" align="center" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.estimateRebate }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="所属年月" align="center" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.palceGenDate }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-form>
+      </div>
+    </div>
+    <!--End 添加修改部分-->
+  </div>
+</template>
+
+<script>
+import req from '@/api/bikerebate/bicyclerebatewithholding'
+
+export default {
+  name: 'danchefanliInfo',
+  data() {
+    return {
+      viewTitle: '',
+      index: 0,
+      tableKey: 0,
+      list: [],
+      // 表单数据
+      rules: {},
+      submitdisabled: false
+    }
+  },
+  methods: {
+    showInfo(row) {
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      this.viewTitle = '待预提单车返利明细'
+      console.log('编辑回显', row.sid)
+      req.vehRebateWithDetails(row.vehRebateSids).then((resp) => {
+        this.list = resp.data
+      }).catch((e) => {
+        this.formobj = row
+      })
+    },
+    // 返回（===既判断）
+    handleReturn(isreload) {
+      if (isreload === 'true') this.$emit('reloadlist')
+      // 表单数据
+      this.list = []
+      this.$refs['form_obj'].resetFields()
+      this.$emit('doback')
+    }
+  }
+}
+</script>
+<style scoped>
+.titwu {
+  font-size: 28px;
+  text-align: center;
+  padding: 30px 0 20px 0;
+}
+</style>
+
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/relation/danchefanlichoose.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/relation/danchefanlichoose.vue
new file mode 100644
index 0000000000..011bfb7357
--- /dev/null
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/relation/danchefanlichoose.vue
@@ -0,0 +1,283 @@
+<template>
+  <div class="app-container">
+    <!-- Start 列表页面 -->
+    <div>
+      <button-bar view-title="待预提单车返利列表" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
+      <div class="">
+        <div class="searchcon">
+          <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.vehModelName" placeholder="请输入车架号" clearable/>
+              </el-form-item>
+              <el-form-item label="车架号">
+                <el-input v-model="listQuery.params.vinNo" placeholder="请输入车架号" clearable/>
+              </el-form-item>
+              <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-select v-model="listQuery.params.rebateTypeKey" placeholder="请选择" filterable clearable>
+                  <el-option v-for="item in rebateType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="返利名称">
+                <el-input v-model="listQuery.params.rebateName" placeholder="" clearable/>
+              </el-form-item>
+            </el-form>
+            <div class="btn" style="text-align: center;">
+              <el-button type="primary" icon="el-icon-search" @click="handleFilter" size="small">查询</el-button>
+              <el-button type="primary" icon="el-icon-refresh" @click="handleReset" size="small">重置</el-button>
+            </div>
+          </div>
+        </div>
+        <div class="listtop">
+          <div class="tit">待预提单车返利列表</div>
+          <el-button size="small" type="primary" @click="handleConfirm">确定</el-button>
+        </div>
+        <div class="">
+          <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 label="品牌" align="center" width="200">
+              <template slot-scope="scope">
+                <span>{{ scope.row.brandName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="车型" align="center" width="200">
+              <template slot-scope="scope">
+                <span>{{ scope.row.vehModelName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="车架号" align="center" width="250">
+              <template slot-scope="scope">
+                <span>{{ scope.row.vinNo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="厂家结算价" align="center" width="200">
+              <template slot-scope="scope">
+                <span>{{ scope.row.manufactorSettlementPrice }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="其中运费" align="center" width="200">
+              <template slot-scope="scope">
+                <span>{{ scope.row.freight }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="创建日期" align="center" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.createTime }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="返利类型" align="center" width="150">
+              <template slot-scope="scope">
+                <span>{{ scope.row.rebateTypeValue }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="返利名称" align="center" width="150">
+              <template slot-scope="scope">
+                <span>{{ scope.row.rebateName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="计算标准" align="center" width="100">
+              <template slot-scope="scope">
+                <span>{{ scope.row.calculationStandard }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="预计返利" align="center" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.estimateRebate }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="所属年月" align="center" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.palceGenDate }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+        <div class="pages">
+          <!-- 翻页 -->
+          <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import req from '@/api/bikerebate/bicyclerebatewithholding'
+import Pagination from '@/components/pagination'
+import ButtonBar from '@/components/ButtonBar'
+import { typeValues } from '@/api/cheliang/dictcommons'
+
+export default {
+  name: 'danchefanlichoose',
+  components: {
+    Pagination,
+    ButtonBar
+  },
+  data() {
+    return {
+      btndisabled: false,
+      btnList: [
+        {
+          type: 'info',
+          size: 'small',
+          icon: 'cross',
+          btnKey: 'doClose',
+          btnLabel: '关闭'
+        }
+      ],
+      isSearchShow: false,
+      searchxianshitit: '显示查询条件',
+      // 查询条件 -----------
+      tableKey: 0,
+      list: [],
+      sids: [],
+      FormLoading: false,
+      listLoading: false,
+      rebateType_list: [],
+      listQuery: {
+        params: {
+          createOrgSid: '',
+          brandSid: '',
+          vehModelName: '',
+          vinNo: '',
+          rebateTypeKey: '',
+          rebateName: '',
+          createEndTime: '',
+          createStartTime: '',
+          sidList: []
+        },
+        current: 1,
+        size: 5,
+        total: 0
+      },
+      rules: {}
+    }
+  },
+  mounted() {
+    this.$refs['btnbar'].setButtonList(this.btnList)
+  },
+  methods: {
+    init() {
+      typeValues({ type: 'rebateType' }).then((res) => {
+        if (res.success) {
+          this.rebateType_list = res.data
+        }
+      })
+    },
+    // 搜索条件效果
+    clicksearchShow() {
+      this.isSearchShow = !this.isSearchShow
+      if (this.isSearchShow) {
+        this.searchxianshitit = '隐藏查询条件'
+      } else {
+        this.searchxianshitit = '显示查询条件'
+      }
+    },
+    btnHandle(btnKey) {
+      console.log('XXXXXXXXXXXXXXX    ' + btnKey)
+      switch (btnKey) {
+        case 'doClose':
+          this.doClose()
+          break
+        default:
+          break
+      }
+    },
+    // 序号
+    indexMethod(index) {
+      var pagestart = (this.listQuery.current - 1) * this.listQuery.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    handleSelectionChange(row) {
+      const aa = []
+      row.forEach((element) => {
+        aa.push({
+          sid: element.sid,
+          rebateTypeValue: element.rebateTypeValue,
+          rebateTypeKey: element.rebateTypeKey,
+          withRebate: element.estimateRebate,
+          brandName: element.brandName,
+          brandSid: element.brandSid
+        })
+      })
+      this.sids = aa
+      console.log('sids', this.sids)
+    },
+    // 查询列表信息
+    getList() {
+      this.listLoading = true
+      this.listQuery.params.createBySid = window.sessionStorage.getItem('userSid')
+      req.pageList(this.listQuery).then((response) => {
+        console.log('列表查询结果：', response)
+        this.listLoading = false
+        if (response.success && response.data && response.data.total > 0) {
+          this.list = response.data.records
+          this.listQuery.total = response.data.total
+        } else {
+          this.list = []
+          this.listQuery.total = 0
+        }
+      })
+    },
+    showData(value, createOrgSid, brandSid) {
+      this.listQuery.params.createOrgSid = createOrgSid
+      this.listQuery.params.brandSid = brandSid
+      const aa = []
+      if (value.length > 0) {
+        for (var i = 0; i < value.length; i++) {
+          for (var j = 0; j < value[i].vehRebateSids.length; j++) {
+            aa.push(value[i].vehRebateSids[j])
+          }
+        }
+        this.listQuery.params.sidList = aa
+      } else {
+        this.listQuery.params.sidList = []
+      }
+      this.init()
+      this.getList()
+    },
+    // 查询按钮
+    handleFilter() {
+      this.listQuery.current = 1
+      this.getList()
+    },
+    handleReset() {
+      this.listQuery.current = 1
+      this.listQuery.total = 0
+      this.listQuery.size = 5
+      this.listQuery.params.createStartTime = ''
+      this.listQuery.params.createEndTime = ''
+      this.listQuery.params.vinNo = ''
+      this.listQuery.params.vehModelName = ''
+      this.listQuery.params.rebateTypeKey = ''
+      this.listQuery.params.rebateName = ''
+      this.getList()
+    },
+    handleConfirm() {
+      if (this.sids.length > 0) {
+        this.$emit('backData', this.sids)
+      } else {
+        this.$notify({
+          title: '提示',
+          message: '请选择至少一条记录!',
+          type: 'error',
+          duration: 2000
+        })
+      }
+    },
+    doClose() {
+      this.$emit('doback')
+    }
+  }
+}
+</script>
+<style scoped>
+</style>