From 187ee29fa278a103cac1e8ce89b7faa75881ac4e Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Sat, 12 Oct 2024 13:33:27 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CrmCustomerTempService.java                | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java
index b8320e2040..4e92d6ec58 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java
@@ -242,18 +242,20 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
         IPage<CrmCustomerTempVo> pagging = baseMapper.selectPageVo(page, qw);
         for (CrmCustomerTempVo record : pagging.getRecords()) {
             String createOrgSid = record.getCreateOrgSid();
-            String staffSid = record.getStaffSid();
             String createOrgName = sysOrganizationFeign.fetchBySid(createOrgSid).getData().getName();
             record.setCreateOrgName(createOrgName);
 //            String staffName = sysStaffinfoFeign.fetchBySid(staffSid).getData().getName();
 //            record.setStaffName(staffName);
-            List<SysStaffOrgVo> sysStaffOrgVos = sysStaffOrgFeign.getSysStaffOrgListByStaffSid(staffSid).getData();
-            for (SysStaffOrgVo sysStaffOrgVo : sysStaffOrgVos) {
-                SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(sysStaffOrgVo.getOrgSid()).getData();
-                String psid = sysOrganizationVo.getPsid();
-                if (psid.equals(createOrgSid)) {
-                    String orgName = sysStaffOrgVo.getOrgName();
-                    record.setDeptName(orgName);
+            if (StringUtils.isNotBlank(record.getStaffSid())) {
+                String staffSid = record.getStaffSid();
+                List<SysStaffOrgVo> sysStaffOrgVos = sysStaffOrgFeign.getSysStaffOrgListByStaffSid(staffSid).getData();
+                for (SysStaffOrgVo sysStaffOrgVo : sysStaffOrgVos) {
+                    SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(sysStaffOrgVo.getOrgSid()).getData();
+                    String psid = sysOrganizationVo.getPsid();
+                    if (psid.equals(createOrgSid)) {
+                        String orgName = sysStaffOrgVo.getOrgName();
+                        record.setDeptName(orgName);
+                    }
                 }
             }
         }

From 67256bcf0ba548c3970df0f4fc39e0e77d1c33f6 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Sat, 12 Oct 2024 14:43:15 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=BD=A6=E8=BE=86?=
 =?UTF-8?q?=E7=BB=93=E6=B8=85=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 anrui-riskcenter-ui/src/views/settle/settleAdd.vue          | 6 +++++-
 .../src/views/workFlow/jieqingFlow/settleEdit.vue           | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/anrui-riskcenter-ui/src/views/settle/settleAdd.vue b/anrui-riskcenter-ui/src/views/settle/settleAdd.vue
index eafab542f4..be7c7220d9 100644
--- a/anrui-riskcenter-ui/src/views/settle/settleAdd.vue
+++ b/anrui-riskcenter-ui/src/views/settle/settleAdd.vue
@@ -185,7 +185,7 @@
               <el-form-item><span class="addinputInfo">{{ calculateBankSettlePrice }}</span></el-form-item>
             </el-col>
             <el-col :span="8">
-              <div class="span-sty">资方收款账号</div>
+              <div class="span-sty"><span class="icon">*</span>资方收款账号</div>
               <el-form-item>
                 <el-select class="addinputInfo" v-model="formobj.loanSettleBankCostVo.bankAccount" placeholder="请选择" clearable filterable @change="bankAccountChange">
                   <el-option v-for="item in bank_list" :key="item.bankAccount" :label="item.bankAccount" :value="item.bankAccount"></el-option>
@@ -631,6 +631,10 @@ export default {
       })
     },
     submit() {
+      if (this.formobj.loanSettleBankCostVo.bankAccount === '') {
+        this.$message({ showClose: true, type: 'error', message: '资方收款账号不能为空' })
+        return
+      }
       this.formobj.loanSettleBankCostVo.bankSettlePrice = this.calculateBankSettlePrice
       this.formobj.loanSettleCompanyCostVo.settleAll = this.calculateSettleAll
       this.formobj.loanSettleCompanyReductionVo.amountTo = this.calculateAmountTo
diff --git a/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleEdit.vue b/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleEdit.vue
index c415dfacca..8a9ba47e96 100644
--- a/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleEdit.vue
+++ b/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleEdit.vue
@@ -184,7 +184,7 @@
               <el-form-item><span class="addinputInfo">{{ calculateBankSettlePrice }}</span></el-form-item>
             </el-col>
             <el-col :span="8">
-              <div class="span-sty">资方收款账号</div>
+              <div class="span-sty"><span class="icon">*</span>资方收款账号</div>
               <el-form-item>
                 <el-select class="addinputInfo" v-model="formobj.loanSettleBankCostVo.bankAccount" placeholder="请选择" clearable filterable @change="bankAccountChange">
                   <el-option v-for="item in bank_list" :key="item.bankAccount" :label="item.bankAccount" :value="item.bankAccount"></el-option>
@@ -614,6 +614,10 @@ export default {
       })
     },
     submit() {
+      if (this.formobj.loanSettleBankCostVo.bankAccount === '') {
+        this.$message({ showClose: true, type: 'error', message: '资方收款账号不能为空' })
+        return
+      }
       this.formobj.loanSettleBankCostVo.bankSettlePrice = this.calculateBankSettlePrice
       this.formobj.loanSettleCompanyCostVo.settleAll = this.calculateSettleAll
       this.formobj.loanSettleCompanyReductionVo.amountTo = this.calculateAmountTo

From 512b7539b04736a08255a449fe4606d1051f99a9 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Sat, 12 Oct 2024 17:05:22 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=B8=93=E9=A1=B9?=
 =?UTF-8?q?=E8=BF=94=E5=88=A9=E6=A0=B8=E5=AF=B9=E3=80=81=E9=A2=84=E6=8F=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../specialrebate/specialrebatecheck/specialrebatecheck.vue | 2 +-
 .../specialrebatewithholding/specialrebatewithholding.vue   | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheck.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheck.vue
index 01b2bff585..7f548dea49 100644
--- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheck.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheck.vue
@@ -53,7 +53,7 @@
             <el-table-column prop="createOrgName" label="分公司" align="center" width="200" />
             <el-table-column label="名称" align="center" min-width="200">
               <template slot-scope="scope">
-                <span>{{ scope.row.checkApply }}单车返利上传核对审核申请</span>
+                <span>{{ scope.row.checkApply }}专项返利核对申请</span>
               </template>
             </el-table-column>
             <el-table-column prop="estimateRebate" label="预提返利" align="center" width="140" />
diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/specialrebatewithholding.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/specialrebatewithholding.vue
index a92ba78489..37e71c7a83 100644
--- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/specialrebatewithholding.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/specialrebatewithholding.vue
@@ -52,7 +52,11 @@
               </template>
             </el-table-column>
             <el-table-column prop="createOrgName" label="分公司" align="center" />
-            <el-table-column prop="withApply" label="名称" align="center" />
+            <el-table-column label="名称" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.withApply }}专项返利预提申请</span>
+              </template>
+            </el-table-column>
             <el-table-column prop="withRebateTotal" label="预提返利" align="center" />
             <el-table-column prop="withholdCost" label="其中预提费用" align="center" />
             <el-table-column prop="createByName" label="申请人" align="center" width="120" />

From f3a05ef6262ded038f2c3938cf107c3b9d563b8f Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Sat, 12 Oct 2024 17:25:43 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=B8=93=E9=A1=B9?=
 =?UTF-8?q?=E8=BF=94=E5=88=A9=E6=A0=B8=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../relation/specialrebatetobecheckedInfo.vue                   | 2 +-
 .../relation/specialrebatetobecheckedInfo.vue                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/relation/specialrebatetobecheckedInfo.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/relation/specialrebatetobecheckedInfo.vue
index 2dcafaf925..e7f03baa4b 100644
--- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/relation/specialrebatetobecheckedInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/relation/specialrebatetobecheckedInfo.vue
@@ -76,7 +76,7 @@ export default {
       })
       this.viewTitle = '专项返利核对审核申请明细'
       console.log('编辑回显', row)
-      req.specialRebateCheckDetails(row.specialRebateSid).then((resp) => {
+      req.specialRebateCheckDetails(row.specialRebateSids).then((resp) => {
         if (resp.success) {
           this.list = resp.data
         }
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/relation/specialrebatetobecheckedInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/relation/specialrebatetobecheckedInfo.vue
index d1261baaae..6590fb795b 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/relation/specialrebatetobecheckedInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/relation/specialrebatetobecheckedInfo.vue
@@ -76,7 +76,7 @@ export default {
       })
       this.viewTitle = '专项返利核对审核申请明细'
       console.log('编辑回显', row)
-      req.specialRebateCheckDetails(row.specialRebateSid).then((resp) => {
+      req.specialRebateCheckDetails(row.specialRebateSids).then((resp) => {
         if (resp.success) {
           this.list = resp.data
         }

From a537c2b1aa070540bcaba21660eebed646405c5c Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Sat, 12 Oct 2024 17:52:20 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=B8=93=E9=A1=B9?=
 =?UTF-8?q?=E8=BF=94=E5=88=A9=E5=88=86=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../relation/daifeipeizhuanxiang.vue          | 109 +++++--------
 .../relation/selectvehicle.vue                | 149 ++++--------------
 .../specialrebatedistribution.vue             |  81 ++++------
 .../specialrebatedistributionAdd.vue          | 135 +++++-----------
 .../specialrebatedistributionInfo.vue         |  81 +++-------
 .../specialrebatetobeallocated.vue            | 104 ++++++------
 .../specialrebatetobeallocatedAdd.vue         | 118 ++++++--------
 .../specialrebatetobeallocatedByDisNum.vue    |  36 +----
 .../relation/daifeipeizhuanxiang.vue          | 111 +++++--------
 .../zhuanxiangfanlifenpeiDaiBanInfo.vue       |  89 +++--------
 .../zhuanxiangfanlifenpeiEdit.vue             | 132 +++++-----------
 .../zhuanxiangfanlifenpeiYiBanInfo.vue        |  81 +++-------
 12 files changed, 395 insertions(+), 831 deletions(-)

diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/relation/daifeipeizhuanxiang.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/relation/daifeipeizhuanxiang.vue
index edec40a88a..c9be90c2c7 100644
--- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/relation/daifeipeizhuanxiang.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/relation/daifeipeizhuanxiang.vue
@@ -8,6 +8,12 @@
           <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
           <div v-show="isSearchShow" class="search">
             <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
+              <el-form-item label="采购系统">
+                <el-input v-model="listQuery.params.purchaseSystemName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="品牌">
+                <el-input v-model="listQuery.params.brandName" placeholder="" clearable/>
+              </el-form-item>
               <el-form-item label="创建日期">
                 <el-date-picker v-model="listQuery.params.createStartTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
                 <span style="padding: 0 8px">至</span>
@@ -21,6 +27,11 @@
               <el-form-item label="返利名称">
                 <el-input v-model="listQuery.params.rebateName" placeholder="" clearable/>
               </el-form-item>
+              <el-form-item label="所属年月">
+                <el-date-picker v-model="listQuery.params.palceGenDateStart" type="month" clearable format="yyyy-MM" value-format="yyyy-MM" placeholder="选择日期" />
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker v-model="listQuery.params.palceGenDateEnd" type="month" clearable format="yyyy-MM" value-format="yyyy-MM" placeholder="选择日期" />
+              </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>
@@ -35,41 +46,17 @@
           <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">
-              <template slot-scope="scope">
-                <span>{{ scope.row.disNum }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="品牌" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.brandName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="创建日期" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.createTime }}</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.rebateTypeValue }}</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.uploadMoney }}</span>
-              </template>
-            </el-table-column>
+            <el-table-column prop="disNum" label="分配车辆" align="center" width="120" />
+            <el-table-column prop="createOrgName" label="分公司" align="center" width="150" />
+            <el-table-column prop="purchaseSystemName" label="采购系统" align="center" width="140" />
+            <el-table-column prop="brandName" label="品牌" align="center" width="120" />
+            <el-table-column prop="createTime" label="创建日期" align="center" width="120" />
+            <el-table-column prop="rebateName" label="返利名称" align="center" min-width="150" />
+            <el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="130" />
+            <el-table-column prop="estimateRebate" label="预计返利" align="center" width="140" />
+            <el-table-column prop="uploadMoney" label="上传总金额" align="center" width="150" />
+            <el-table-column prop="withholdingDate" label="预提日期" align="center" width="120" />
+            <el-table-column prop="palceGenDate" label="所属年月" align="center" width="120" />
           </el-table>
         </div>
         <div class="pages">
@@ -120,36 +107,19 @@ export default {
       list: [],
       sids: [],
       rebateType_list: [],
-      state_list: [
-        {
-          dictKey: 0,
-          dictValue: '未上传'
-        },
-        {
-          dictKey: 1,
-          dictValue: '已上传'
-        },
-        {
-          dictKey: 2,
-          dictValue: '未调整'
-        },
-        {
-          dictKey: 3,
-          dictValue: '已调整'
-        }
-      ],
       listLoading: false,
       listQuery: {
         params: {
-          brandSid: '',
+          purchaseSystemName: '',
+          brandName: '',
           createOrgSid: '',
-          vinNo: '',
           rebateTypeKey: '',
           rebateName: '',
           state: '',
           createEndTime: '',
           createStartTime: '',
-          isPage: '0',
+          palceGenDateStart: '',
+          palceGenDateEnd: '',
           sidList: []
         },
         current: 1,
@@ -206,8 +176,11 @@ export default {
           specialRebateSid: element.sid,
           brandName: element.brandName,
           brandSid: element.brandSid,
-          createTime: element.createTime,
+          purchaseSystemName: element.purchaseSystemName,
+          purchaseSystemSid: element.purchaseSystemSid,
           rebateName: element.rebateName,
+          palceGenDate: element.palceGenDate,
+          withholdingDate: element.withholdingDate,
           rebateTypeValue: element.rebateTypeValue,
           estimateRebate: element.estimateRebate,
           uploadMoney: element.uploadMoney,
@@ -223,7 +196,7 @@ export default {
       req.stayDisRebate(this.listQuery).then((response) => {
         console.log('列表查询结果：', response)
         this.listLoading = false
-        if (response.success && response.data && response.data.total > 0) {
+        if (response.success) {
           this.list = response.data.records
           this.listQuery.total = response.data.total
         } else {
@@ -232,9 +205,8 @@ export default {
         }
       })
     },
-    showData(value, createOrgSid, brandSid) {
+    showData(value, createOrgSid) {
       this.listQuery.params.createOrgSid = createOrgSid
-      this.listQuery.params.brandSid = brandSid
       const aa = []
       if (value.length > 0) {
         for (var i = 0; i < value.length; i++) {
@@ -255,28 +227,25 @@ export default {
       this.getList()
     },
     handleReset() {
-      this.listQuery.params.vinNo = ''
+      this.listQuery.params.purchaseSystemName = ''
+      this.listQuery.params.brandName = ''
       this.listQuery.params.rebateTypeKey = ''
       this.listQuery.params.rebateName = ''
       this.listQuery.params.createEndTime = ''
       this.listQuery.params.createStartTime = ''
+      this.listQuery.params.palceGenDateStart = ''
+      this.listQuery.params.palceGenDateEnd = ''
       this.listQuery.params.state = ''
-      this.listQuery.params.isPage = '0'
       this.listQuery.current = 1
       this.listQuery.total = 0
       this.listQuery.size = 5
       this.init()
     },
     doConfirm() {
-      if (this.sids.length > 0 || this.sids_list.length > 0) {
-        this.$emit('backData', this.sids, this.sids_list)
+      if (this.sids.length > 0) {
+        this.$emit('backData', this.sids)
       } else {
-        this.$notify({
-          title: '提示',
-          message: '请选择至少一条记录!',
-          type: 'error',
-          duration: 2000
-        })
+        this.$notify({ title: '提示', message: '请选择至少一条记录!', type: 'error', duration: 2000 })
       }
     },
     doClose() {
diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/relation/selectvehicle.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/relation/selectvehicle.vue
index 5f52347508..c789bd5d78 100644
--- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/relation/selectvehicle.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/relation/selectvehicle.vue
@@ -13,54 +13,26 @@
           <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="120px" class="tab-header">
-              <el-form-item label="功能:" class="searchlist">
-                <el-select v-model="listQuery.params.vehicleType" placeholder="请选择" filterable clearable>
-                  <el-option v-for="item in vehicleType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
-                </el-select>
-              </el-form-item>
-              <el-form-item label="系列:" class="searchlist">
-                <el-select v-model="listQuery.params.productLine" placeholder="请选择" filterable clearable>
-                  <el-option v-for="item in productLine_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
-                </el-select>
-              </el-form-item>
-              <el-form-item label="变速箱:" class="searchlist">
-                <el-select v-model="listQuery.params.gearboxType" placeholder="请选择" filterable clearable>
-                  <el-option v-for="item in gearboxType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
-                </el-select>
-              </el-form-item>
-              <el-form-item label="驱动:" class="searchlist">
-                <el-select v-model="listQuery.params.driveForm" placeholder="请选择" filterable clearable>
-                  <el-option v-for="item in driveForm_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
-                </el-select>
-              </el-form-item>
-              <el-form-item label="排放标准:" class="searchlist">
-                <el-select v-model="listQuery.params.emissionStandard" placeholder="请选择" filterable clearable>
-                  <el-option v-for="item in emissionStandard_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
-                </el-select>
-              </el-form-item>
-              <el-form-item label="马力:" class="searchlist">
-                <el-select v-model="listQuery.params.power" placeholder="请选择" filterable clearable>
-                  <el-option v-for="item in power_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
-                </el-select>
-              </el-form-item>
-              <el-form-item label="燃料:" class="searchlist">
-                <el-select v-model="listQuery.params.fuelType" placeholder="请选择" filterable clearable>
-                  <el-option v-for="item in fuelType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
-                </el-select>
+              <el-form-item label="车型">
+                <el-input v-model="listQuery.params.vehicleAlias" placeholder="" clearable style="width: 150px"/>
               </el-form-item>
-              <el-form-item label="版本:" class="searchlist">
-                <el-select v-model="listQuery.params.vehicleVersion" placeholder="请选择" filterable clearable>
-                  <el-option v-for="item in vehicleVersion_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
-                </el-select>
+              <el-form-item label="车架号">
+                <el-input v-model="listQuery.params.vinNo" placeholder="" clearable style="width: 150px"/>
               </el-form-item>
-              <el-form-item label="车型:" class="searchlist">
-                <el-input v-model="listQuery.params.vehicleAlias" placeholder="" clearable style="width: 150px"/>
+              <el-form-item label="入库日期">
+                <el-date-picker v-model="listQuery.params.applicationDateStart" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker v-model="listQuery.params.applicationDateEnd" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
               </el-form-item>
-              <el-form-item label="采购订单编号:" class="searchlist">
-                <el-input v-model="listQuery.params.orderingNo" placeholder="" clearable style="width: 150px"/>
+              <el-form-item label="销售日期">
+                <el-date-picker v-model="listQuery.params.salesStartDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker v-model="listQuery.params.salesEndDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
               </el-form-item>
-              <el-form-item label="快捷检索:" class="searchlist">
-                <el-input v-model="listQuery.params.modelName" placeholder="" clearable style="width: 150px"/>
+              <el-form-item label="买断日期">
+                <el-date-picker v-model="listQuery.params.solidStartDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker v-model="listQuery.params.solidEndDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
               </el-form-item>
             </el-form>
             <div class="btn" style="text-align: center;">
@@ -122,7 +94,6 @@
 <script>
 import Pagination from '@/components/pagination'
 import req from '@/api/specialrebate/specialrebatedistribution'
-import { typeValues } from '@/api/cheliang/dictcommons.js'
 
 export default {
   name: 'selectvehicle',
@@ -131,14 +102,6 @@ export default {
   },
   data() {
     return {
-      vehicleType_list: [],
-      productLine_list: [],
-      gearboxType_list: [],
-      driveForm_list: [],
-      emissionStandard_list: [],
-      power_list: [],
-      fuelType_list: [],
-      vehicleVersion_list: [],
       isSearchShow: false,
       searchxianshitit: '隐藏查询条件',
       tableKey: 0,
@@ -150,19 +113,17 @@ export default {
         current: 1,
         size: 5,
         params: {
+          purchaseSystemSid: '',
           brandSid: '',
-          driveForm: '',
-          emissionStandard: '',
-          fuelType: '',
-          gearboxType: '',
-          modelName: '',
-          power: '',
-          productLine: '',
           vehicleAlias: '',
-          vehicleType: '',
-          vehicleVersion: '',
+          vinNo: '',
+          applicationDateStart: '',
+          applicationDateEnd: '',
+          salesStartDate: '',
+          salesEndDate: '',
+          solidStartDate: '',
+          solidEndDate: '',
           createOrgSid: '',
-          orderingNo: '',
           vehSids: []
         },
         total: 0
@@ -184,46 +145,6 @@ export default {
       this.getList()
     },
     shujuzidian() {
-      typeValues({ type: 'vehicleFunction' }).then((res) => {
-        if (res.success) {
-          this.vehicleType_list = res.data
-        }
-      })
-      typeValues({ type: 'productLine' }).then((res) => {
-        if (res.code === '200') {
-          this.productLine_list = res.data
-        }
-      })
-      typeValues({ type: 'driver' }).then((res) => {
-        if (res.code === '200') {
-          this.driveForm_list = res.data
-        }
-      })
-      typeValues({ type: 'horsepower' }).then((res) => {
-        if (res.code === '200') {
-          this.power_list = res.data
-        }
-      })
-      typeValues({ type: 'vehicleVersion' }).then((res) => {
-        if (res.code === '200') {
-          this.vehicleVersion_list = res.data
-        }
-      })
-      typeValues({ type: 'fuelType' }).then((res) => {
-        if (res.code === '200') {
-          this.fuelType_list = res.data
-        }
-      })
-      typeValues({ type: 'gearbox' }).then((res) => {
-        if (res.code === '200') {
-          this.gearboxType_list = res.data
-        }
-      })
-      typeValues({ type: 'emissionStandard' }).then((res) => {
-        if (res.code === '200') {
-          this.emissionStandard_list = res.data
-        }
-      })
     },
     indexMethod(index) {
       var pagestart = (this.listQuery.current - 1) * this.listQuery.size
@@ -255,18 +176,15 @@ export default {
       this.listQuery.current = 1
       this.listQuery.size = 5
       this.listQuery.total = 0
-      this.listQuery.params.driveForm = ''
-      this.listQuery.params.emissionStandard = ''
-      this.listQuery.params.fuelType = ''
-      this.listQuery.params.gearboxType = ''
-      this.listQuery.params.modelName = ''
-      this.listQuery.params.power = ''
-      this.listQuery.params.productLine = ''
       this.listQuery.params.vehicleAlias = ''
-      this.listQuery.params.vehicleType = ''
-      this.listQuery.params.vehicleVersion = ''
       this.listQuery.params.createOrgSid = ''
-      this.listQuery.params.orderingNo = ''
+      this.listQuery.params.vinNo = ''
+      this.listQuery.params.applicationDateStart = ''
+      this.listQuery.params.applicationDateEnd = ''
+      this.listQuery.params.salesStartDate = ''
+      this.listQuery.params.salesEndDate = ''
+      this.listQuery.params.solidStartDate = ''
+      this.listQuery.params.solidEndDate = ''
       this.getList()
     },
     handleSelectionChange(row) {
@@ -286,16 +204,17 @@ export default {
       })
       this.sids = aa
     },
-    showData(value, brandSid, createOrgSid) {
+    showData(value, purchaseSystemSid, brandSid, createOrgSid) {
       const aa = []
       if (value.length > 0) {
         for (var i = 0; i < value.length; i++) {
-          aa.push(value[i].vinNo)
+          aa.push(value[i].vehSid)
         }
         this.listQuery.params.vehSids = aa
       } else {
         this.listQuery.params.vehSids = []
       }
+      this.listQuery.params.purchaseSystemSid = purchaseSystemSid
       this.listQuery.params.brandSid = brandSid
       this.listQuery.params.createOrgSid = createOrgSid
       this.listQuery.current = 1
diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatedistribution.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatedistribution.vue
index 99e818a2f2..94bbd8713e 100644
--- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatedistribution.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatedistribution.vue
@@ -12,19 +12,22 @@
           <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
           <div v-show="isSearchShow" class="search">
             <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
-              <el-form-item label="品牌">
-                <el-select v-model="listQuery.params.brandSid" placeholder="请选择" filterable clearable>
-                  <el-option v-for="item in brand_list" :key="item.sid" :label="item.brandName" :value="item.sid"/>
-                </el-select>
+              <el-form-item label="分公司">
+                <el-input v-model="listQuery.params.createOrgName" placeholder="" clearable/>
               </el-form-item>
-              <el-form-item label="申请标题">
-                <el-input v-model="listQuery.params.checkApply" placeholder="" clearable/>
+              <el-form-item label="申请名称">
+                <el-input v-model="listQuery.params.title" 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-date-picker v-model="listQuery.params.finishStartTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker v-model="listQuery.params.finishEndTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
+              </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>
@@ -33,7 +36,7 @@
           </div>
         </div>
         <div class="listtop">
-          <div class="tit">回款返利预提申请列表</div>
+          <div class="tit">专项返利分配申请列表</div>
           <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
         </div>
         <div class="">
@@ -52,41 +55,19 @@
                 <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">
-              <template slot-scope="scope">
-                <span>{{ scope.row.createOrgName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="品牌" align="center" width="200">
-              <template slot-scope="scope">
-                <span>{{ scope.row.brandName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="名称" align="center" width="200">
-              <template slot-scope="scope">
-                <span>{{ scope.row.title }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="预提返利" align="center" width="250">
-              <template slot-scope="scope">
-                <span>{{ scope.row.withRebate }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="分配总金额" align="center" width="250">
-              <template slot-scope="scope">
-                <span>{{ scope.row.distributionMoneyTotal }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="申请日期" align="center" width="250">
-              <template slot-scope="scope">
-                <span>{{ scope.row.createTime }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="审批完成日期" align="center" width="250">
+            <el-table-column prop="createOrgName" label="分公司" align="center" min-width="150" />
+            <el-table-column label="名称" align="center" min-width="200">
               <template slot-scope="scope">
-                <span>{{ scope.row.approvalCompleteDate }}</span>
+                <span>{{ scope.row.title }}专项返利分配申请</span>
               </template>
             </el-table-column>
+            <el-table-column prop="withRebate" label="预提返利" align="center" width="140" />
+            <el-table-column prop="uploadMoney" label="上传返利总金额" align="center" width="160" />
+            <el-table-column prop="distributionMoneyTotal" label="分配总金额" align="center" width="150" />
+            <el-table-column prop="createByName" label="申请人" align="center" width="120" />
+            <el-table-column prop="deptName" label="申请部门" align="center" width="120" />
+            <el-table-column prop="createTime" label="申请日期" align="center" width="120" />
+            <el-table-column prop="finishTime" label="办结日期" align="center" width="120" />
           </el-table>
         </div>
         <div class="pages">
@@ -108,7 +89,7 @@ import req from '@/api/specialrebate/specialrebatedistribution'
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
 import ButtonBar from '@/components/ButtonBar'
-import { brandDown, getOrgSidByPath } from '@/api/cheliang/dictcommons'
+import { getOrgSidByPath } from '@/api/cheliang/dictcommons'
 import specialrebatedistributionAdd from './specialrebatedistributionAdd'
 import specialrebatedistributionInfo from './specialrebatedistributionInfo'
 import { getStorage } from '@/utils/auth'
@@ -153,14 +134,15 @@ export default {
       sids: [],
       FormLoading: false,
       listLoading: false,
-      brand_list: '',
       listQuery: {
         params: {
-          brandSid: '',
-          checkApply: '',
+          createOrgName: '',
+          title: '',
           createOrgSid: '',
           createEndTime: '',
           createStartTime: '',
+          finishStartTime: '',
+          finishEndTime: '',
           orgPath: '',
           userSid: '',
           menuUrl: ''
@@ -211,11 +193,6 @@ export default {
       getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
         if (resp.success) {
           this.listQuery.params.createOrgSid = resp.data
-          brandDown({ useOrg: this.listQuery.params.createOrgSid }).then((res) => {
-            if (res.success) {
-              this.brand_list = res.data
-            }
-          })
           this.getList()
         }
       })
@@ -265,7 +242,7 @@ export default {
       req.listPage(this.listQuery).then((response) => {
         console.log('列表查询结果：', response)
         this.listLoading = false
-        if (response.success && response.data && response.data.total > 0) {
+        if (response.success) {
           this.list = response.data.records
           this.listQuery.total = response.data.total
         } else {
@@ -282,11 +259,13 @@ export default {
     handleReset() {
       this.listQuery = {
         params: {
-          brandSid: '',
-          checkApply: '',
+          createOrgName: '',
+          title: '',
           createOrgSid: '',
           createEndTime: '',
           createStartTime: '',
+          finishStartTime: '',
+          finishEndTime: '',
           orgPath: '',
           userSid: '',
           menuUrl: ''
diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatedistributionAdd.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatedistributionAdd.vue
index 4a3d2e6aa7..460b321d34 100644
--- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatedistributionAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatedistributionAdd.vue
@@ -20,64 +20,30 @@
         <div class="titwu"><span>{{ formobj.title }}专项返利分配申请</span></div>
         <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
           <el-row class="rowStyle">
-            <el-col :span="2" class="tleftb colOneStyle">
-              <span>品牌:</span>
+            <el-col :span="6" class="colOneStyle">
+              <div class="span-sty" style="border-right: 0px !important;">分公司：</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createOrgName }}</span></el-form-item>
             </el-col>
-            <el-col :span="4" class="colOneStyle">
-              <el-form-item>
-                <el-select :disabled="dialogStatus === 'edit'" v-model="formobj.brandName" placeholder="请选择" filterable clearable @change="changeBrand">
-                  <el-option v-for="item in brand_list" :key="item.sid" :label="item.brandName" :value="item.brandName"/>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="18" class="tleftb colOneStyle">
-              <el-button size="small" type="primary" @click="handleAdd()">添加</el-button>
-              <el-button size="small" type="danger" @click="handleDelete()">删除</el-button>
+            <el-col :span="18" class="colOneStyle">
+              <div style="text-align: right">
+                <el-button size="small" type="primary" @click="handleAdd()">添加</el-button>
+                <el-button size="small" type="danger" @click="handleDelete()">删除</el-button>
+              </div>
             </el-col>
           </el-row>
           <el-table :key="tableKey" :data="formobj.scmSpecialrebatedistributedetails" :index="index" border style="width: 100%" @selection-change="handleSelectionChange" show-summary :summary-method="getSummaries">
             <el-table-column fixed type="selection" align="center" width="60px"/>
             <el-table-column fixed width="80" 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.createTime }}</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.rebateTypeValue }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="estimateRebate" label="预提返利" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.estimateRebate }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="uploadMoney" label="上传总金额" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.uploadMoney }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="分配数量" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.disNum }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="单车分配金额" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.unitSetAllocationMoney }}</span>
-              </template>
-            </el-table-column>
+            <el-table-column prop="purchaseSystemName" label="采购系统" align="center" width="120" />
+            <el-table-column prop="brandName" label="品牌" align="center" width="120" />
+            <el-table-column prop="rebateName" label="返利名称" align="center" min-width="150" />
+            <el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="140" />
+            <el-table-column prop="palceGenDate" label="所属年月" align="center" width="140" />
+            <el-table-column prop="withholdingDate" label="预提日期" align="center" width="140" />
+            <el-table-column prop="estimateRebate" label="预提返利" align="center" width="140" />
+            <el-table-column prop="uploadMoney" label="上传返利总金额" align="center" width="160" />
+            <el-table-column prop="disNum" label="分配车辆" align="center" width="120" />
+            <el-table-column prop="unitSetAllocationMoney" label="单车分配金额" align="center" width="150" />
           </el-table>
         </el-form>
       </div>
@@ -90,7 +56,7 @@
 <script>
 import req from '@/api/specialrebate/specialrebatedistribution'
 import daifeipeizhuanxiang from './relation/daifeipeizhuanxiang'
-import { fetchBySid, brandDown } from '@/api/cheliang/dictcommons'
+import { fetchBySid } from '@/api/cheliang/dictcommons'
 
 export default {
   name: 'SpecialRebateDistributionAdd',
@@ -103,14 +69,12 @@ export default {
       viewState: 1,
       index: 0,
       tableKey: 0,
-      brand_list: [],
       sids: [],
       // 表单数据
       formobj: {
         sid: '', // 一条数据的sid
-        approvalCompleteDate: '',
-        brandName: '',
-        brandSid: '',
+        deptName: '',
+        deptSid: '',
         createOrgName: '',
         createOrgSid: '',
         distributionMoneyTotal: '',
@@ -126,7 +90,6 @@ export default {
         scmSpecialrebatedistributedetails: []
       },
       rules: {},
-      dialogStatus: '',
       submitdisabled: false
     }
   },
@@ -138,17 +101,12 @@ export default {
           this.formobj.useOrgName = res.data.name
         }
       })
-      brandDown({ useOrg: this.formobj.createOrgSid }).then((resp) => {
-        if (resp.success) {
-          this.brand_list = resp.data
-        }
-      })
     },
     // 获取制单日期
     newDate() {
       let date = new Date()
       let year = date.getFullYear() // 年
-      let month = date.getMonth() + 1 // 月
+      let month = date.getMonth() // 月
       this.formobj.title = year + '年' + month + '月'
     },
     showAdd(createOrgSid) {
@@ -157,19 +115,19 @@ export default {
         this.init()
         this.newDate()
       })
-      this.dialogStatus = 'add'
       this.formobj.createOrgSid = createOrgSid
       this.formobj.useOrgSid = createOrgSid
       this.formobj.createByName = window.sessionStorage.getItem('name')
       this.formobj.createBySid = window.sessionStorage.getItem('userSid')
       this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+      this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1)
+      this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1)
       this.viewTitle = '【新增】专项返利分配申请'
     },
     showEdit(row) {
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
       })
-      this.dialogStatus = 'edit'
       this.viewTitle = '【编辑】专项返利分配申请'
       console.log('编辑回显', row.sid)
       req.fetchDetailsBySid(row.sid).then((resp) => {
@@ -183,12 +141,8 @@ export default {
     },
     // 明细表添加一行数据
     handleAdd() {
-      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.scmSpecialrebatedistributedetails, this.formobj.createOrgSid, this.formobj.brandSid)
+      this.$refs['divSelect'].showData(this.formobj.scmSpecialrebatedistributedetails, this.formobj.createOrgSid)
     },
     handleSelectionChange(row) {
       const aa = []
@@ -227,11 +181,14 @@ export default {
             mainSid: '',
             sid: '',
             specialRebateSid: e.specialRebateSid,
+            purchaseSystemName: e.purchaseSystemName,
+            purchaseSystemSid: e.purchaseSystemSid,
             brandName: e.brandName,
             brandSid: e.brandSid,
-            createTime: e.createTime,
             rebateName: e.rebateName,
             rebateTypeValue: e.rebateTypeValue,
+            palceGenDate: e.palceGenDate,
+            withholdingDate: e.withholdingDate,
             estimateRebate: e.estimateRebate,
             uploadMoney: e.uploadMoney,
             disNum: e.disNum,
@@ -240,14 +197,6 @@ export default {
         })
       }
     },
-    changeBrand(value) {
-      const choose = this.brand_list.filter((item) => item.brandName === value)
-      if (choose !== null && choose.length > 0) {
-        this.formobj.brandSid = choose[0].sid
-      } else {
-        this.formobj.brandSid = ''
-      }
-    },
     saveOrUpdate() {
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
@@ -324,21 +273,6 @@ export default {
           }, 0)
           sums[index] += ''
           this.formobj.distributionMoneyTotal = 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
@@ -348,9 +282,8 @@ export default {
       if (isreload === 'true') this.$emit('reloadlist')
       this.formobj = {
         sid: '', // 一条数据的sid
-        approvalCompleteDate: '',
-        brandName: '',
-        brandSid: '',
+        deptName: '',
+        deptSid: '',
         createOrgName: '',
         createOrgSid: '',
         distributionMoneyTotal: '',
@@ -383,5 +316,11 @@ export default {
   border-right: 0px !important;
   border-bottom: 0px !important;
 }
+.span-sty {
+  width: 130px !important;
+}
+.addinputInfo {
+  margin-left: 120px !important;
+}
 </style>
 
diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatedistributionInfo.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatedistributionInfo.vue
index db85498ed3..8b12439fee 100644
--- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatedistributionInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatedistributionInfo.vue
@@ -16,57 +16,23 @@
         <div class="titwu"><span>{{ formobj.title }}专项返利分配申请</span></div>
         <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
           <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 :span="24" class="colOneStyle">
+              <div class="span-sty" style="border-right: 0px !important;">分公司：</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createOrgName }}</span></el-form-item>
             </el-col>
           </el-row>
           <el-table :key="tableKey" :data="formobj.scmSpecialrebatedistributedetails" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
             <el-table-column fixed width="80" 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.createTime }}</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.rebateTypeValue }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="estimateRebate" label="预提返利" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.estimateRebate }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="uploadMoney" label="上传总金额" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.uploadMoney }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="分配数量" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.disNum }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="单车分配金额" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.unitSetAllocationMoney }}</span>
-              </template>
-            </el-table-column>
+            <el-table-column prop="purchaseSystemName" label="采购系统" align="center" width="120" />
+            <el-table-column prop="brandName" label="品牌" align="center" width="120" />
+            <el-table-column prop="rebateName" label="返利名称" align="center" min-width="150" />
+            <el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="140" />
+            <el-table-column prop="palceGenDate" label="所属年月" align="center" width="140" />
+            <el-table-column prop="withholdingDate" label="预提日期" align="center" width="140" />
+            <el-table-column prop="estimateRebate" label="预提返利" align="center" width="140" />
+            <el-table-column prop="uploadMoney" label="上传返利总金额" align="center" width="160" />
+            <el-table-column prop="disNum" label="分配车辆" align="center" width="120" />
+            <el-table-column prop="unitSetAllocationMoney" label="单车分配金额" align="center" width="150" />
           </el-table>
         </el-form>
       </div>
@@ -139,21 +105,6 @@ export default {
           }, 0)
           sums[index] += ''
           this.formobj.distributionMoneyTotal = 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
@@ -176,5 +127,11 @@ export default {
   border-right: 0px !important;
   border-bottom: 0px !important;
 }
+.span-sty {
+  width: 130px !important;
+}
+.addinputInfo {
+  margin-left: 120px !important;
+}
 </style>
 
diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatetobeallocated.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatetobeallocated.vue
index cbfc97b4cd..3cc4acdc48 100644
--- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatetobeallocated.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatetobeallocated.vue
@@ -12,10 +12,14 @@
           <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
           <div v-show="isSearchShow" class="search">
             <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
+              <el-form-item label="分公司">
+                <el-input v-model="listQuery.params.createOrgName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="采购系统">
+                <el-input v-model="listQuery.params.purchaseSystemName" placeholder="" clearable/>
+              </el-form-item>
               <el-form-item label="品牌">
-                <el-select v-model="listQuery.params.brandSid" placeholder="请选择" filterable clearable>
-                  <el-option v-for="item in brand_list" :key="item.sid" :label="item.brandName" :value="item.sid"/>
-                </el-select>
+                <el-input v-model="listQuery.params.brandName" placeholder="" clearable/>
               </el-form-item>
               <el-form-item label="创建日期">
                 <el-date-picker v-model="listQuery.params.createStartTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
@@ -30,6 +34,11 @@
               <el-form-item label="返利名称">
                 <el-input v-model="listQuery.params.rebateName" placeholder="" clearable/>
               </el-form-item>
+              <el-form-item label="所属年月">
+                <el-date-picker v-model="listQuery.params.palceGenDateStart" type="month" clearable format="yyyy-MM" value-format="yyyy-MM" placeholder="选择日期" />
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker v-model="listQuery.params.palceGenDateEnd" type="month" clearable format="yyyy-MM" value-format="yyyy-MM" placeholder="选择日期" />
+              </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>
@@ -46,43 +55,22 @@
         </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">
+            <el-table-column fixed type="selection" align="center" width="50" />
+            <el-table-column fixed label="序号" type="index" :index="indexMethod" align="center" width="80" />
+            <el-table-column label="分配车辆" align="center" width="120">
               <template slot-scope="scope">
                 <span class="bluezi" @click="handleLook(scope.row)">{{ scope.row.disNum }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="品牌" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.brandName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="创建日期" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.createTime }}</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.rebateTypeValue }}</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.uploadMoney }}</span>
-              </template>
-            </el-table-column>
+            <el-table-column prop="createOrgName" label="分公司" align="center" width="150" />
+            <el-table-column prop="purchaseSystemName" label="采购系统" align="center" width="140" />
+            <el-table-column prop="brandName" label="品牌" align="center" width="100" />
+            <el-table-column prop="createTime" label="创建日期" align="center" width="120" />
+            <el-table-column prop="rebateName" label="返利名称" align="center" min-width="140" />
+            <el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="130" />
+            <el-table-column prop="estimateRebate" label="预计返利" align="center" width="130" />
+            <el-table-column prop="uploadMoney" label="上传返利总金额" align="center" width="160" />
+            <el-table-column prop="palceGenDate" label="所属年月" align="center" width="120" />
           </el-table>
         </div>
         <div class="pages">
@@ -91,9 +79,13 @@
         </div>
       </div>
     </div>
+    <!-- 返利分配申请列表 -->
     <specialrebatedistribution v-show="viewState == 2" ref="divCheck" @doback="resetState"/>
+    <!-- 选择车辆 -->
     <specialrebatetobeallocatedAdd v-show="viewState == 3" ref="divCheckAdd" @doback="resetState" @reloadlist="getList"/>
+    <!-- 发起返利分配申请 -->
     <specialrebatedistributionAdd v-show="viewState == 4" ref="divAdd" @doback="resetState"/>
+    <!-- 查看分配的车辆列表 -->
     <specialrebatetobeallocatedByDisNum v-show="viewState == 5" ref="divInfo" @doback="backState"/>
   </div>
 </template>
@@ -106,7 +98,7 @@ import specialrebatedistribution from './specialrebatedistribution'
 import specialrebatetobeallocatedAdd from './specialrebatetobeallocatedAdd'
 import specialrebatedistributionAdd from './specialrebatedistributionAdd'
 import specialrebatetobeallocatedByDisNum from './specialrebatetobeallocatedByDisNum'
-import { brandDown, getOrgSidByPath, typeValues } from '@/api/cheliang/dictcommons'
+import { getOrgSidByPath, typeValues } from '@/api/cheliang/dictcommons'
 
 export default {
   name: 'SpecialRebateToBeAllocated',
@@ -137,12 +129,13 @@ export default {
       tableKey: 0,
       list: [],
       sids: [],
-      brand_list: [],
       rebateType_list: [],
       listLoading: false,
       listQuery: {
         params: {
-          brandSid: '',
+          createOrgName: '',
+          purchaseSystemName: '',
+          brandName: '',
           createOrgSid: '',
           vinNo: '',
           rebateTypeKey: '',
@@ -150,6 +143,8 @@ export default {
           state: '',
           createEndTime: '',
           createStartTime: '',
+          palceGenDateStart: '',
+          palceGenDateEnd: '',
           sidList: [],
           orgPath: '',
           userSid: '',
@@ -180,11 +175,6 @@ export default {
       getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
         if (resp.success) {
           this.listQuery.params.createOrgSid = resp.data
-          brandDown({ useOrg: this.listQuery.params.createOrgSid }).then((res) => {
-            if (res.success) {
-              this.brand_list = res.data
-            }
-          })
           this.getList()
         }
       })
@@ -221,7 +211,9 @@ export default {
           sid: element.sid,
           brandName: element.brandName,
           brandSid: element.brandSid,
-          estimateRebate: element.estimateRebate
+          purchaseSystemName: element.purchaseSystemName,
+          purchaseSystemSid: element.purchaseSystemSid,
+          uploadMoney: element.uploadMoney
         })
       })
       this.sids = aa
@@ -236,7 +228,7 @@ export default {
       req.stayDisRebate(this.listQuery).then((response) => {
         console.log('列表查询结果：', response)
         this.listLoading = false
-        if (response.success && response.data && response.data.total > 0) {
+        if (response.success) {
           this.list = response.data.records
           this.listQuery.total = response.data.total
         } else {
@@ -253,7 +245,9 @@ export default {
     handleReset() {
       this.listQuery = {
         params: {
-          brandSid: '',
+          createOrgName: '',
+          purchaseSystemName: '',
+          brandName: '',
           createOrgSid: '',
           vinNo: '',
           rebateTypeKey: '',
@@ -261,6 +255,8 @@ export default {
           state: '',
           createEndTime: '',
           createStartTime: '',
+          palceGenDateStart: '',
+          palceGenDateEnd: '',
           sidList: [],
           orgPath: '',
           userSid: '',
@@ -271,7 +267,7 @@ export default {
         size: 5,
         total: 0
       }
-      this.init()
+      this.getList()
     },
     handleClick() {
       this.viewState = 2
@@ -283,8 +279,8 @@ export default {
         return
       } else {
         for (var i = 0; i < this.sids.length; i++) {
-          if (this.sids[i].brandName !== this.sids[this.sids.length - 1].brandName) {
-            this.$message({ showClose: true, type: 'error', message: '请选择相同品牌的记录' })
+          if (this.sids[i].brandName !== this.sids[this.sids.length - 1].brandName && this.sids[i].purchaseSystemName !== this.sids[this.sids.length - 1].purchaseSystemName) {
+            this.$message({ showClose: true, type: 'error', message: '请选择相同采购系统且相同品牌的记录' })
             return
           } else {
             this.viewState = 3
@@ -324,4 +320,12 @@ export default {
   color: white;
   font-weight: 600;
 }
+/*表格列设置fixed后固定列出现下边框的设置*/
+/deep/ .el-table__fixed {
+  height: 100% !important;
+}
+/*表格列设置fixed后固定列出现下边框的设置*/
+/deep/ .el-table__fixed-right {
+  height: 100% !important;
+}
 </style>
diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatetobeallocatedAdd.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatetobeallocatedAdd.vue
index 9093af4c5e..f979e14a26 100644
--- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatetobeallocatedAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatetobeallocatedAdd.vue
@@ -7,8 +7,7 @@
         <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="save()">保存</el-button>
           <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
         </div>
       </div>
@@ -16,39 +15,32 @@
       <!--Start 新增修改部分-->
       <div class="listconadd">
         <div class="titwu"><span>返利分配选择车辆</span></div>
-        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formadd">
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
           <el-row style="border-top: 1px solid #E0E3EB">
-            <el-col :span="4" class="tleftb">
-              <span>品牌</span>
+            <el-col :span="8">
+              <div class="span-sty">采购系统</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.purchaseSystemName }}</span></el-form-item>
             </el-col>
-            <el-col :span="4">
-              <el-form-item><span>{{ formobj.brandName }}</span></el-form-item>
-            </el-col>
-            <el-col :span="4" class="tleftb">
-              <span>分配总金额</span>
+            <el-col :span="8">
+              <div class="span-sty">品牌</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.brandName }}</span></el-form-item>
             </el-col>
             <el-col :span="4">
-              <el-form-item><span>{{ formobj.allocationMoney }}</span></el-form-item>
-            </el-col>
-            <el-col :span="4" class="tleftb">
-              <span>选择条数</span>
+              <div class="span-sty">分配总金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.allocationMoney }}</span></el-form-item>
             </el-col>
             <el-col :span="4">
-              <el-form-item><span>{{ formobj.number }}</span></el-form-item>
+              <el-form-item><el-button type="primary" size="mini" class="btntopblueline" @click="handleLook()">查看返利明细</el-button></el-form-item>
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="4" class="tleftb">
-              <span>车辆台数</span>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item><span>{{ formobj.setNumber }}</span></el-form-item>
+            <el-col :span="8">
+              <div class="span-sty">车辆台数</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.setNumber }}</span></el-form-item>
             </el-col>
-            <el-col :span="4" class="tleftb">
-              <span>单台预计分配金额</span>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item><span>{{ formobj.unitSetAllocationMoney }}</span></el-form-item>
+            <el-col :span="16">
+              <div class="span-sty">单台预计分配金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.unitSetAllocationMoney }}</span></el-form-item>
             </el-col>
           </el-row>
           <div class="title">
@@ -59,54 +51,34 @@
           </div>
           <el-table :key="tableKey" :data="formobj.scmSpecialrebateVehsVehSidAndVinNos" :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.modelName }}</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.costPrice }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="入库日期" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.priceDate }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="销售日期" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.salesDate }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="买断日期" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.solidDate }}</span>
-              </template>
-            </el-table-column>
+            <el-table-column prop="modelName" label="车型" align="center" min-width="150" />
+            <el-table-column prop="vinNo" label="车架号" align="center" width="150" />
+            <el-table-column prop="costPrice" label="厂家结算价" align="center" width="140" />
+            <el-table-column prop="priceDate" label="入库日期" align="center" width="120" />
+            <el-table-column prop="salesDate" label="销售日期" align="center" width="120" />
+            <el-table-column prop="solidDate" label="买断日期" align="center" width="120" />
           </el-table>
         </el-form>
       </div>
     </div>
     <!--End 添加修改部分-->
-    <!--选择车型和常用配置-->
+    <!--选择车辆-->
     <selectvehicle v-show="viewState == 2" ref="divVehicle" @backData="backData" @doback="closePage"/>
+    <!---->
+    <specialrebatetobecheckedInfo v-show="viewState == 3" ref="divCheckInfo" @doback="closePage" />
   </div>
 </template>
 
 <script>
 import req from '@/api/specialrebate/specialrebatedistribution'
 import selectvehicle from './relation/selectvehicle.vue'
+import specialrebatetobecheckedInfo from '../../specialrebate/specialrebatecheck/relation/specialrebatetobecheckedInfo'
 
 export default {
   name: 'SpecialrebatetobeallocatedAdd',
   components: {
-    selectvehicle
+    selectvehicle,
+    specialrebatetobecheckedInfo
   },
   data() {
     return {
@@ -118,8 +90,9 @@ export default {
       formobj: {
         brandSid: '',
         brandName: '',
+        purchaseSystemName: '',
+        purchaseSystemSid: '',
         allocationMoney: '',
-        number: '',
         setNumber: '',
         unitSetAllocationMoney: '',
         createOrgSid: '',
@@ -132,11 +105,6 @@ export default {
     }
   },
   methods: {
-    // 明细表添加一行数据
-    addCommodity() {
-      this.viewState = 2
-      this.$refs['divVehicle'].showData(this.formobj.scmSpecialrebateVehsVehSidAndVinNos, this.formobj.brandSid, this.formobj.createOrgSid)
-    },
     showEdit(createOrgSid, sids) {
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
@@ -146,20 +114,31 @@ export default {
       if (sids.length > 0) {
         this.formobj.brandSid = sids[0].brandSid
         this.formobj.brandName = sids[0].brandName
-        this.formobj.number = sids.length
+        this.formobj.purchaseSystemName = sids[0].purchaseSystemName
+        this.formobj.purchaseSystemSid = sids[0].purchaseSystemSid
         var aa = 0
         const bb = []
         for (var i = 0; i < sids.length; i++) {
-          aa = parseInt(aa) + parseInt(sids[i].estimateRebate)
+          aa = Math.round((parseFloat(aa) + parseFloat(sids[i].uploadMoney)) * 100) / 100
           bb.push(sids[i].sid)
         }
         this.formobj.allocationMoney = aa
         this.formobj.specialRebateSids = bb
       }
     },
+    handleLook() {
+      this.viewState = 3
+      this.$refs['divCheckInfo'].showInfo(this.formobj)
+    },
+    // 明细表添加一行数据
+    addCommodity() {
+      this.viewState = 2
+      this.$refs['divVehicle'].showData(this.formobj.scmSpecialrebateVehsVehSidAndVinNos, this.formobj.purchaseSystemSid, this.formobj.brandSid, this.formobj.createOrgSid)
+    },
     // 车型常用配置列表--新增确定返回的数据
     backData(value) {
       this.viewState = 1
+      value = JSON.parse(JSON.stringify(value))
       if (value.length > 0) {
         this.formobj.setNumber = value.length
         this.formobj.unitSetAllocationMoney = Math.round((parseFloat(this.formobj.allocationMoney) / parseFloat(this.formobj.setNumber)) * 100) / 100
@@ -202,8 +181,9 @@ export default {
       this.formobj = {
         brandSid: '',
         brandName: '',
+        purchaseSystemName: '',
+        purchaseSystemSid: '',
         allocationMoney: '',
-        number: '',
         setNumber: '',
         unitSetAllocationMoney: '',
         createOrgSid: '',
@@ -228,5 +208,11 @@ export default {
   justify-content: space-between;
   align-items: center;
 }
+.span-sty {
+  width: 130px !important;
+}
+.addinputInfo {
+  margin-left: 120px !important;
+}
 </style>
 
diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatetobeallocatedByDisNum.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatetobeallocatedByDisNum.vue
index b214ded884..0a0181e6f1 100644
--- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatetobeallocatedByDisNum.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatetobeallocatedByDisNum.vue
@@ -16,36 +16,12 @@
           <el-table :key="tableKey" ref="multipleTable" v-loading="listLoading" :data="list" border style="width: 100%" @selection-change="handleSelectionChange">
             <el-table-column width="50px" type="selection" align="center"/>
             <el-table-column 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.modelName }}</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.color }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="存放地点" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.location }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="销售指导价(元)" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.costPrice }}</span>
-              </template>
-            </el-table-column>
+            <el-table-column prop="modelName" label="车型" align="center" min-width="150" />
+            <el-table-column prop="vinNo" label="车架号" align="center" width="150" />
+            <el-table-column prop="costPrice" label="厂家结算价" align="center" width="140" />
+            <el-table-column prop="priceDate" label="入库日期" align="center" width="120" />
+            <el-table-column prop="salesDate" label="销售日期" align="center" width="120" />
+            <el-table-column prop="solidDate" label="买断日期" align="center" width="120" />
           </el-table>
         </el-form>
       </div>
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanlifenpeiFlow/relation/daifeipeizhuanxiang.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanlifenpeiFlow/relation/daifeipeizhuanxiang.vue
index 9098c04914..d0d3ff3f26 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanlifenpeiFlow/relation/daifeipeizhuanxiang.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanlifenpeiFlow/relation/daifeipeizhuanxiang.vue
@@ -8,6 +8,12 @@
           <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
           <div v-show="isSearchShow" class="search">
             <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
+              <el-form-item label="采购系统">
+                <el-input v-model="listQuery.params.purchaseSystemName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="品牌">
+                <el-input v-model="listQuery.params.brandName" placeholder="" clearable/>
+              </el-form-item>
               <el-form-item label="创建日期">
                 <el-date-picker v-model="listQuery.params.createStartTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
                 <span style="padding: 0 8px">至</span>
@@ -21,6 +27,11 @@
               <el-form-item label="返利名称">
                 <el-input v-model="listQuery.params.rebateName" placeholder="" clearable/>
               </el-form-item>
+              <el-form-item label="所属年月">
+                <el-date-picker v-model="listQuery.params.palceGenDateStart" type="month" clearable format="yyyy-MM" value-format="yyyy-MM" placeholder="选择日期" />
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker v-model="listQuery.params.palceGenDateEnd" type="month" clearable format="yyyy-MM" value-format="yyyy-MM" placeholder="选择日期" />
+              </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>
@@ -35,41 +46,17 @@
           <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">
-              <template slot-scope="scope">
-                <span>{{ scope.row.disNum }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="品牌" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.brandName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="创建日期" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.createTime }}</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.rebateTypeValue }}</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.uploadMoney }}</span>
-              </template>
-            </el-table-column>
+            <el-table-column prop="disNum" label="分配车辆" align="center" width="120" />
+            <el-table-column prop="createOrgName" label="分公司" align="center" width="150" />
+            <el-table-column prop="purchaseSystemName" label="采购系统" align="center" width="140" />
+            <el-table-column prop="brandName" label="品牌" align="center" width="120" />
+            <el-table-column prop="createTime" label="创建日期" align="center" width="120" />
+            <el-table-column prop="rebateName" label="返利名称" align="center" min-width="150" />
+            <el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="130" />
+            <el-table-column prop="estimateRebate" label="预计返利" align="center" width="140" />
+            <el-table-column prop="uploadMoney" label="上传总金额" align="center" width="150" />
+            <el-table-column prop="withholdingDate" label="预提日期" align="center" width="120" />
+            <el-table-column prop="palceGenDate" label="所属年月" align="center" width="120" />
           </el-table>
         </div>
         <div class="pages">
@@ -88,7 +75,7 @@ import ButtonBar from '@/components/ButtonBar'
 import { typeValues } from '@/api/cheliang/dictcommons'
 
 export default {
-  name: 'DaiFenPeiZhuanXiang',
+  name: 'daifenpeizhuanxiang',
   components: {
     Pagination,
     ButtonBar
@@ -120,36 +107,19 @@ export default {
       list: [],
       sids: [],
       rebateType_list: [],
-      state_list: [
-        {
-          dictKey: 0,
-          dictValue: '未上传'
-        },
-        {
-          dictKey: 1,
-          dictValue: '已上传'
-        },
-        {
-          dictKey: 2,
-          dictValue: '未调整'
-        },
-        {
-          dictKey: 3,
-          dictValue: '已调整'
-        }
-      ],
       listLoading: false,
       listQuery: {
         params: {
-          brandSid: '',
+          purchaseSystemName: '',
+          brandName: '',
           createOrgSid: '',
-          vinNo: '',
           rebateTypeKey: '',
           rebateName: '',
           state: '',
           createEndTime: '',
           createStartTime: '',
-          isPage: '0',
+          palceGenDateStart: '',
+          palceGenDateEnd: '',
           sidList: []
         },
         current: 1,
@@ -206,8 +176,11 @@ export default {
           specialRebateSid: element.sid,
           brandName: element.brandName,
           brandSid: element.brandSid,
-          createTime: element.createTime,
+          purchaseSystemName: element.purchaseSystemName,
+          purchaseSystemSid: element.purchaseSystemSid,
           rebateName: element.rebateName,
+          palceGenDate: element.palceGenDate,
+          withholdingDate: element.withholdingDate,
           rebateTypeValue: element.rebateTypeValue,
           estimateRebate: element.estimateRebate,
           uploadMoney: element.uploadMoney,
@@ -223,7 +196,7 @@ export default {
       req.stayDisRebate(this.listQuery).then((response) => {
         console.log('列表查询结果：', response)
         this.listLoading = false
-        if (response.success && response.data && response.data.total > 0) {
+        if (response.success) {
           this.list = response.data.records
           this.listQuery.total = response.data.total
         } else {
@@ -232,9 +205,8 @@ export default {
         }
       })
     },
-    showData(value, createOrgSid, brandSid) {
+    showData(value, createOrgSid) {
       this.listQuery.params.createOrgSid = createOrgSid
-      this.listQuery.params.brandSid = brandSid
       const aa = []
       if (value.length > 0) {
         for (var i = 0; i < value.length; i++) {
@@ -255,28 +227,25 @@ export default {
       this.getList()
     },
     handleReset() {
-      this.listQuery.params.vinNo = ''
+      this.listQuery.params.purchaseSystemName = ''
+      this.listQuery.params.brandName = ''
       this.listQuery.params.rebateTypeKey = ''
       this.listQuery.params.rebateName = ''
       this.listQuery.params.createEndTime = ''
       this.listQuery.params.createStartTime = ''
+      this.listQuery.params.palceGenDateStart = ''
+      this.listQuery.params.palceGenDateEnd = ''
       this.listQuery.params.state = ''
-      this.listQuery.params.isPage = '0'
       this.listQuery.current = 1
       this.listQuery.total = 0
       this.listQuery.size = 5
       this.init()
     },
     doConfirm() {
-      if (this.sids.length > 0 || this.sids_list.length > 0) {
-        this.$emit('backData', this.sids, this.sids_list)
+      if (this.sids.length > 0) {
+        this.$emit('backData', this.sids)
       } else {
-        this.$notify({
-          title: '提示',
-          message: '请选择至少一条记录!',
-          type: 'error',
-          duration: 2000
-        })
+        this.$notify({ title: '提示', message: '请选择至少一条记录!', type: 'error', duration: 2000 })
       }
     },
     doClose() {
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanlifenpeiFlow/zhuanxiangfanlifenpeiDaiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanlifenpeiFlow/zhuanxiangfanlifenpeiDaiBanInfo.vue
index 3d1466c49b..ba559f502d 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanlifenpeiFlow/zhuanxiangfanlifenpeiDaiBanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanlifenpeiFlow/zhuanxiangfanlifenpeiDaiBanInfo.vue
@@ -18,57 +18,23 @@
         <div class="titwu"><span>{{ formobj.title }}专项返利分配申请</span></div>
         <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
           <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 :span="24" class="colOneStyle">
+              <div class="span-sty" style="border-right: 0px !important;">分公司：</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createOrgName }}</span></el-form-item>
             </el-col>
           </el-row>
           <el-table :key="tableKey" :data="formobj.scmSpecialrebatedistributedetails" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
             <el-table-column fixed width="80" 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.createTime }}</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.rebateTypeValue }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="estimateRebate" label="预提返利" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.estimateRebate }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="uploadMoney" label="上传总金额" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.uploadMoney }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="分配数量" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.disNum }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="单车分配金额" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.unitSetAllocationMoney }}</span>
-              </template>
-            </el-table-column>
+            <el-table-column prop="purchaseSystemName" label="采购系统" align="center" width="120" />
+            <el-table-column prop="brandName" label="品牌" align="center" width="120" />
+            <el-table-column prop="rebateName" label="返利名称" align="center" min-width="150" />
+            <el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="140" />
+            <el-table-column prop="palceGenDate" label="所属年月" align="center" width="140" />
+            <el-table-column prop="withholdingDate" label="预提日期" align="center" width="140" />
+            <el-table-column prop="estimateRebate" label="预提返利" align="center" width="140" />
+            <el-table-column prop="uploadMoney" label="上传返利总金额" align="center" width="160" />
+            <el-table-column prop="disNum" label="分配车辆" align="center" width="120" />
+            <el-table-column prop="unitSetAllocationMoney" label="单车分配金额" align="center" width="150" />
           </el-table>
         </el-form>
       </div>
@@ -79,14 +45,14 @@
       <el-form class="formaddcopy02" >
         <el-row v-show="currentLink" style="border-top: 1px solid #e0e3eb">
           <el-col :span="24">
-            <div class="span-sty spanTwoWidth"><span>当前环节:</span></div>
-            <el-form-item><span class="addinputInfo addinputOne">{{ current.taskName }}->{{ nextNode.name }}</span></el-form-item>
+            <div class="span-sty"><span>当前环节:</span></div>
+            <el-form-item><span class="addinputInfo">{{ current.taskName }}->{{ nextNode.name }}</span></el-form-item>
           </el-col>
         </el-row>
         <el-row :class="{ rowClass:!currentLink }">
           <el-col :span="24">
-            <div class="span-sty spanTwoWidth"><span>意见:</span></div>
-            <el-form-item><el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw addinputOne" clearable ></el-input></el-form-item>
+            <div class="span-sty"><span>意见:</span></div>
+            <el-form-item><el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputInfo addinputw" clearable ></el-input></el-form-item>
           </el-col>
         </el-row>
         <div style="text-align:center;margin-top: 20px;">
@@ -212,21 +178,6 @@ export default {
           }, 0)
           sums[index] += ''
           this.formobj.distributionMoneyTotal = 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
@@ -372,5 +323,11 @@ export default {
 .rowClass {
   border-top: 1px solid #E0E3EB;
 }
+.span-sty {
+  width: 130px !important;
+}
+.addinputInfo {
+  margin-left: 120px !important;
+}
 </style>
 
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanlifenpeiFlow/zhuanxiangfanlifenpeiEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanlifenpeiFlow/zhuanxiangfanlifenpeiEdit.vue
index 081584e1da..325fb66c52 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanlifenpeiFlow/zhuanxiangfanlifenpeiEdit.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanlifenpeiFlow/zhuanxiangfanlifenpeiEdit.vue
@@ -7,8 +7,7 @@
         <div>{{ viewTitle }}</div>
         <!--start 添加修改按钮-->
         <div>
-          <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate()">保存
-          </el-button>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate()">保存</el-button>
           <el-button type="primary" size="small" @click="submitVehicleApply()">提交
           </el-button>
         </div>
@@ -19,64 +18,30 @@
         <div class="titwu"><span>{{ formobj.title }}专项返利分配申请</span></div>
         <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
           <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 :span="6" class="colOneStyle">
+              <div class="span-sty" style="border-right: 0px !important;">分公司：</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createOrgName }}</span></el-form-item>
             </el-col>
-            <el-col :span="18" class="tleftb colOneStyle">
-              <el-button size="small" type="primary" @click="handleAdd()">添加</el-button>
-              <el-button size="small" type="danger" @click="handleDelete()">删除</el-button>
+            <el-col :span="18" class="colOneStyle">
+              <div style="text-align: right">
+                <el-button size="small" type="primary" @click="handleAdd()">添加</el-button>
+                <el-button size="small" type="danger" @click="handleDelete()">删除</el-button>
+              </div>
             </el-col>
           </el-row>
           <el-table :key="tableKey" :data="formobj.scmSpecialrebatedistributedetails" :index="index" border style="width: 100%" @selection-change="handleSelectionChange" show-summary :summary-method="getSummaries">
             <el-table-column fixed type="selection" align="center" width="60px"/>
             <el-table-column fixed width="80" 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.createTime }}</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.rebateTypeValue }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="estimateRebate" label="预提返利" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.estimateRebate }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="uploadMoney" label="上传总金额" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.uploadMoney }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="分配数量" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.disNum }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="单车分配金额" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.unitSetAllocationMoney }}</span>
-              </template>
-            </el-table-column>
+            <el-table-column prop="purchaseSystemName" label="采购系统" align="center" width="120" />
+            <el-table-column prop="brandName" label="品牌" align="center" width="120" />
+            <el-table-column prop="rebateName" label="返利名称" align="center" min-width="150" />
+            <el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="140" />
+            <el-table-column prop="palceGenDate" label="所属年月" align="center" width="140" />
+            <el-table-column prop="withholdingDate" label="预提日期" align="center" width="140" />
+            <el-table-column prop="estimateRebate" label="预提返利" align="center" width="140" />
+            <el-table-column prop="uploadMoney" label="上传返利总金额" align="center" width="160" />
+            <el-table-column prop="disNum" label="分配车辆" align="center" width="120" />
+            <el-table-column prop="unitSetAllocationMoney" label="单车分配金额" align="center" width="150" />
           </el-table>
         </el-form>
       </div>
@@ -101,14 +66,12 @@ export default {
       viewState: 1,
       index: 0,
       tableKey: 0,
-      brand_list: [],
       sids: [],
       // 表单数据
       formobj: {
         sid: '', // 一条数据的sid
-        approvalCompleteDate: '',
-        brandName: '',
-        brandSid: '',
+        deptName: '',
+        deptSid: '',
         createOrgName: '',
         createOrgSid: '',
         distributionMoneyTotal: '',
@@ -120,10 +83,10 @@ export default {
         withRebate: '',
         taskId: '',
         instanceId: '',
+        orgPath: '',
         scmSpecialrebatedistributedetails: []
       },
       rules: {},
-      dialogStatus: '',
       submitdisabled: false
     }
   },
@@ -149,7 +112,6 @@ export default {
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
       })
-      this.dialogStatus = 'edit'
       this.viewTitle = '【编辑】专项返利分配申请'
       console.log('编辑回显', sid)
       req.fetchDetailsBySid(sid).then((resp) => {
@@ -163,12 +125,8 @@ export default {
     },
     // 明细表添加一行数据
     handleAdd() {
-      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.scmSpecialrebatedistributedetails, this.formobj.createOrgSid, this.formobj.brandSid)
+      this.$refs['divSelect'].showData(this.formobj.scmSpecialrebatedistributedetails, this.formobj.createOrgSid)
     },
     handleSelectionChange(row) {
       const aa = []
@@ -207,30 +165,29 @@ export default {
             mainSid: '',
             sid: '',
             specialRebateSid: e.specialRebateSid,
+            purchaseSystemName: e.purchaseSystemName,
+            purchaseSystemSid: e.purchaseSystemSid,
             brandName: e.brandName,
             brandSid: e.brandSid,
-            createTime: e.createTime,
             rebateName: e.rebateName,
             rebateTypeValue: e.rebateTypeValue,
+            palceGenDate: e.palceGenDate,
+            withholdingDate: e.withholdingDate,
             estimateRebate: e.estimateRebate,
             uploadMoney: e.uploadMoney,
             disNum: e.disNum,
-            unitSetAllocationMoney: Math.round((parseInt(e.uploadMoney) / parseInt(e.disNum)) * 100) / 100
+            unitSetAllocationMoney: Math.round((parseFloat(e.uploadMoney) / parseFloat(e.disNum)) * 100) / 100
           })
         })
       }
     },
-    changeBrand(value) {
-      const choose = this.brand_list.filter((item) => item.brandName === value)
-      if (choose !== null && choose.length > 0) {
-        this.formobj.brandSid = choose[0].sid
-      } else {
-        this.formobj.brandSid = ''
-      }
-    },
     saveOrUpdate() {
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
+          if (this.formobj.scmSpecialrebatedistributedetails.length === 0) {
+            this.$message({ showClose: true, type: 'error', message: '专项返利分配申请列表不能为空' })
+            return
+          }
           this.submitdisabled = true
           req.saveOrUpdate(this.formobj).then((resp) => {
             this.submitdisabled = false
@@ -256,6 +213,10 @@ export default {
     submitVehicleApply() {
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
+          if (this.formobj.scmSpecialrebatedistributedetails.length === 0) {
+            this.$message({ showClose: true, type: 'error', message: '专项返利分配申请列表不能为空' })
+            return
+          }
           this.submitdisabled = true
           req.submitVehicleApply(this.formobj).then((resp) => {
             this.submitdisabled = false
@@ -310,21 +271,6 @@ export default {
           }, 0)
           sums[index] += ''
           this.formobj.distributionMoneyTotal = 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
@@ -349,5 +295,11 @@ export default {
   border-right: 0px !important;
   border-bottom: 0px !important;
 }
+.span-sty {
+  width: 130px !important;
+}
+.addinputInfo {
+  margin-left: 120px !important;
+}
 </style>
 
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanlifenpeiFlow/zhuanxiangfanlifenpeiYiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanlifenpeiFlow/zhuanxiangfanlifenpeiYiBanInfo.vue
index d1fefaae00..2a531021c2 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanlifenpeiFlow/zhuanxiangfanlifenpeiYiBanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanlifenpeiFlow/zhuanxiangfanlifenpeiYiBanInfo.vue
@@ -16,57 +16,23 @@
         <div class="titwu"><span>{{ formobj.title }}专项返利分配申请</span></div>
         <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
           <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 :span="24" class="colOneStyle">
+              <div class="span-sty" style="border-right: 0px !important;">分公司：</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createOrgName }}</span></el-form-item>
             </el-col>
           </el-row>
           <el-table :key="tableKey" :data="formobj.scmSpecialrebatedistributedetails" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
             <el-table-column fixed width="80" 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.createTime }}</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.rebateTypeValue }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="estimateRebate" label="预提返利" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.estimateRebate }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="uploadMoney" label="上传总金额" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.uploadMoney }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="分配数量" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.disNum }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="单车分配金额" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.unitSetAllocationMoney }}</span>
-              </template>
-            </el-table-column>
+            <el-table-column prop="purchaseSystemName" label="采购系统" align="center" width="120" />
+            <el-table-column prop="brandName" label="品牌" align="center" width="120" />
+            <el-table-column prop="rebateName" label="返利名称" align="center" min-width="150" />
+            <el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="140" />
+            <el-table-column prop="palceGenDate" label="所属年月" align="center" width="140" />
+            <el-table-column prop="withholdingDate" label="预提日期" align="center" width="140" />
+            <el-table-column prop="estimateRebate" label="预提返利" align="center" width="140" />
+            <el-table-column prop="uploadMoney" label="上传返利总金额" align="center" width="160" />
+            <el-table-column prop="disNum" label="分配车辆" align="center" width="120" />
+            <el-table-column prop="unitSetAllocationMoney" label="单车分配金额" align="center" width="150" />
           </el-table>
         </el-form>
       </div>
@@ -175,21 +141,6 @@ export default {
           }, 0)
           sums[index] += ''
           this.formobj.distributionMoneyTotal = 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
@@ -248,5 +199,11 @@ export default {
   border-right: 0px !important;
   border-bottom: 0px !important;
 }
+.span-sty {
+  width: 130px !important;
+}
+.addinputInfo {
+  margin-left: 120px !important;
+}
 </style>
 

From 516656d252184c2c541876dd3584cd75d2795c30 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Mon, 14 Oct 2024 09:27:37 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yxt-as-ui/src/views/purchase/procurement/procurement.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/yxt-as-ui/src/views/purchase/procurement/procurement.vue b/yxt-as-ui/src/views/purchase/procurement/procurement.vue
index be7bd310c8..eb2e4c6958 100644
--- a/yxt-as-ui/src/views/purchase/procurement/procurement.vue
+++ b/yxt-as-ui/src/views/purchase/procurement/procurement.vue
@@ -8,7 +8,7 @@
         <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 ref="listQueryform" :inline="true" :model="listQuery" class="tab-header">
               <el-form-item label="分公司">
                 <el-input v-model="listQuery.params.createOrgName" placeholder="" clearable/>
               </el-form-item>
@@ -54,6 +54,9 @@
                   <el-option v-for="item in state_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
                 </el-select>
               </el-form-item>
+              <el-form-item label="厂家订单号">
+                <el-input v-model="listQuery.params.manufacturersOrderNumber" placeholder="" clearable/>
+              </el-form-item>
             </el-form>
             <div class="btn" style="text-align: center;">
               <el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button>
@@ -265,6 +268,7 @@ export default {
           finishEndTime: '',
           purchaseTypeValue: '',
           purchaseReasonValue: '',
+          manufacturersOrderNumber: '',
           payTypeValue: '',
           supplierName: '',
           isInvoicing: '',
@@ -413,6 +417,7 @@ export default {
           finishEndTime: '',
           purchaseTypeValue: '',
           purchaseReasonValue: '',
+          manufacturersOrderNumber: '',
           payTypeValue: '',
           supplierName: '',
           isInvoicing: '',

From 2fc465a63f6bd5bb5f03f05f0ff59444736ac873 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Mon, 14 Oct 2024 11:47:30 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=B4=E4=BF=AE?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basicinformation/maintenanceitem/maintenanceitem.vue   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitem.vue b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitem.vue
index 2870b8d280..0a0310c12a 100644
--- a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitem.vue
+++ b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitem.vue
@@ -63,15 +63,16 @@
             </el-table-column>
             <el-table-column prop="sitemName" label="项目名称" align="center" width="130" />
             <el-table-column prop="sitemCode" label="项目编码" align="center" width="100" />
-            <el-table-column prop="serviceType" label="分类" align="center" width="100" />
+            <el-table-column prop="serviceType" label="工种" align="center" width="100" />
+            <el-table-column prop="subjectName" label=科目 align="center" width="100" />
             <el-table-column prop="manufacturer" label="厂家" align="center" width="100" />
             <el-table-column prop="goodsModel" label="车型" align="center" min-width="300" />
             <el-table-column prop="remarks" label="备注" align="center" min-width="200" />
             <el-table-column prop="hourPrice" label="工时单价" align="center" width="100" />
             <el-table-column prop="hours" label="工时数" align="center" width="100" />
+            <el-table-column prop="cost" label="外协成本" align="center" width="100" />
             <el-table-column prop="price" label="销售价" align="center" width="100" />
-            <el-table-column prop="examineHourPrice" label="考核价" align="center" width="100" />
-            <el-table-column prop="cost" label="成本" align="center" width="100" />
+            <el-table-column prop="examineHourPrice" label="工时提成" align="center" width="100" />
             <el-table-column label="预约项目" align="center" width="100">
               <template slot-scope="scope">
                 <span>{{ scope.row.isReserve == '1' ? '是' : '否' }}</span>

From 5c8d96159495bad02c5434660a47cf3e65b3278e Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Mon, 14 Oct 2024 11:48:12 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=B4=E4=BF=AE?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/publicPage/selectCustomer.vue  |  2 +-
 .../operation/repairbill/repairbillAdd.vue    | 31 ++++++++++---------
 .../operation/repairbill/repairbillInfo.vue   | 14 +++------
 3 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/yxt-as-ui/src/components/publicPage/selectCustomer.vue b/yxt-as-ui/src/components/publicPage/selectCustomer.vue
index e4c60f22d3..5354962470 100644
--- a/yxt-as-ui/src/components/publicPage/selectCustomer.vue
+++ b/yxt-as-ui/src/components/publicPage/selectCustomer.vue
@@ -16,7 +16,7 @@
                 <el-input v-model="listQuery.params.vehMark" placeholder="" clearable/>
               </el-form-item>
               <el-form-item label="车架号">
-                <el-input v-model="listQuery.params.vinNo" placeholder="" clearable/>
+                <el-input v-model="listQuery.params.vinNo" placeholder="请输入4位以上的车架号" clearable/>
               </el-form-item>
               <el-form-item label="联系电话">
                 <el-input v-model="listQuery.params.mobile" placeholder="" clearable/>
diff --git a/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue b/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue
index 6db719d719..b996ddea05 100644
--- a/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue
+++ b/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue
@@ -30,7 +30,7 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="6">
+            <el-col :span="8">
               <div class="span-sty"><span class="icon">*</span>维修单类型</div>
               <el-form-item prop="billType">
                 <el-select class="addinputInfo" v-model="formobj.billType" :disabled="formobj.nodeName == '维修' || formobj.nodeName == '结算'" placeholder="请选择" @change="billTypeChange" clearable filterable>
@@ -38,7 +38,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col :span="8">
               <div class="span-sty"><span class="icon">*</span>科目</div>
               <el-form-item prop="subject">
                 <el-select class="addinputInfo" :disabled="formobj.sitemVos.length > 0 || formobj.nodeName == '维修' || formobj.nodeName == '结算'" v-model="formobj.subject" placeholder="请选择" @change="changeSubject" clearable filterable>
@@ -46,20 +46,17 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
-              <div class="span-sty">索赔厂家</div>
-              <el-form-item>
-                <el-select class="addinputInfo" :disabled="formobj.nodeName == '维修' || formobj.nodeName == '结算'" v-model="formobj.claimManufacturer" placeholder="请选择" @change="changeClaimManufacturer" clearable filterable>
-                  <el-option v-for="item in claimManufacturer_list" :key="item.sid" :label="item.claiManuName" :value="item.claiManuName"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <div class="span-sty">索赔类型</div>
+            <el-col :span="8">
+              <div class="span-sty">索赔厂家及厂家</div>
               <el-form-item>
-                <el-select class="addinputInfo" :disabled="formobj.nodeName == '维修' || formobj.nodeName == '结算'" v-model="formobj.shClaimTypeKey" placeholder="请选择" @change="changeShClaimType" clearable filterable>
-                  <el-option v-for="item in shClaimType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
-                </el-select>
+                <div class="addinputInfo" style="display: flex;flex-direction: row;justify-content: flex-start;align-items: center">
+                  <el-select :disabled="formobj.nodeName == '维修' || formobj.nodeName == '结算'" v-model="formobj.claimManufacturer" placeholder="请选择" @change="changeClaimManufacturer" clearable filterable>
+                    <el-option v-for="item in claimManufacturer_list" :key="item.sid" :label="item.claiManuName" :value="item.claiManuName"></el-option>
+                  </el-select>
+                  <el-select :disabled="formobj.nodeName == '维修' || formobj.nodeName == '结算'" v-model="formobj.shClaimTypeKey" placeholder="请选择" @change="changeShClaimType" clearable filterable>
+                    <el-option v-for="item in shClaimType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
+                  </el-select>
+                </div>
               </el-form-item>
             </el-col>
           </el-row>
@@ -1298,6 +1295,10 @@ export default {
       }
     },
     serviceAdd() {
+      if (this.formobj.subject === '') {
+        this.$message({ showClose: true, type: 'error', message: '请先选择科目' })
+        return
+      }
       this.formobj.sitemVos.push({
         serviceItemSid: '',
         serviceItem: '',
diff --git a/yxt-as-ui/src/views/operation/repairbill/repairbillInfo.vue b/yxt-as-ui/src/views/operation/repairbill/repairbillInfo.vue
index cca7e0822e..79fa00a186 100644
--- a/yxt-as-ui/src/views/operation/repairbill/repairbillInfo.vue
+++ b/yxt-as-ui/src/views/operation/repairbill/repairbillInfo.vue
@@ -25,21 +25,17 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="6">
+            <el-col :span="8">
               <div class="span-sty">维修单类型</div>
               <el-form-item><span class="addinputInfo">{{ formobj.billType }}</span></el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col :span="8">
               <div class="span-sty">科目</div>
               <el-form-item><span class="addinputInfo">{{ formobj.subject }}</span></el-form-item>
             </el-col>
-            <el-col :span="6">
-              <div class="span-sty">索赔厂家</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.claimManufacturer }}</span></el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <div class="span-sty">索赔类型</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.shClaimTypeValue }}</span></el-form-item>
+            <el-col :span="8">
+              <div class="span-sty">索赔厂家及类型</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.claimManufacturer }} {{ formobj.shClaimTypeValue }}</span></el-form-item>
             </el-col>
           </el-row>
           <el-row>

From d76deef6447bd878d9cebea57158665a4caf9cb2 Mon Sep 17 00:00:00 2001
From: myTest383 <address>
Date: Mon, 14 Oct 2024 11:55:38 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=AE=A1=E8=AE=A1?=
 =?UTF-8?q?=E7=9B=91=E7=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../auditSupervision/auditSupervision.vue     | 14 +++++-
 .../auditSupervision/auditSupervisionAdd.vue  | 45 ++++++++++++++++---
 .../auditSupervision/auditSupervisionInfo.vue | 18 +++++++-
 3 files changed, 66 insertions(+), 11 deletions(-)

diff --git a/anrui-riskcenter-ui/src/views/auditSupervision/auditSupervision.vue b/anrui-riskcenter-ui/src/views/auditSupervision/auditSupervision.vue
index 4da70d2be0..c07c8f42bf 100644
--- a/anrui-riskcenter-ui/src/views/auditSupervision/auditSupervision.vue
+++ b/anrui-riskcenter-ui/src/views/auditSupervision/auditSupervision.vue
@@ -287,7 +287,7 @@
         if (this.sids.length != 1) {
           this.$message({
             showClose: true,
-            type: 'error',
+            type: 'warning',
             message: '请选择一条记录进行操作'
           })
           return
@@ -298,6 +298,14 @@
       },
       toResult() {
 
+        if (this.sids.length == 0) {
+          this.$message({
+            showClose: true,
+            type: 'warning',
+            message: '请至少选择一条记录进行操作'
+          })
+          return
+        }
         this.dialogVisible = true
 
       },
@@ -316,7 +324,9 @@
           if (valid) {
             req.saveResult(this.formobj).then((res) => {
               if (res.success) {
+                this.getList()
                 this.handleClose()
+
               }
             })
 
@@ -329,7 +339,7 @@
         if (this.sids.length === 0) {
           this.$message({
             showClose: true,
-            type: 'error',
+            type: 'warning',
             message: '请选择至少一条记录进行删除操作'
           })
           return
diff --git a/anrui-riskcenter-ui/src/views/auditSupervision/auditSupervisionAdd.vue b/anrui-riskcenter-ui/src/views/auditSupervision/auditSupervisionAdd.vue
index 3218bbefea..75af850175 100644
--- a/anrui-riskcenter-ui/src/views/auditSupervision/auditSupervisionAdd.vue
+++ b/anrui-riskcenter-ui/src/views/auditSupervision/auditSupervisionAdd.vue
@@ -44,6 +44,25 @@
                 class="addinputInfo addinputw" /></el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="8">
+            <div class="span-sty">审计开始日期</div>
+            <el-form-item> <el-date-picker v-model=" formobj.createStartDate" value-format="yyyy-MM-dd"
+                format="yyyy-MM-dd" type="date" placeholder="选择日期"
+                class="addinputInfo addinputw"></el-date-picker></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">审计结束日期</div>
+            <el-form-item> <el-date-picker v-model=" formobj.createEndDate" value-format="yyyy-MM-dd"
+                format="yyyy-MM-dd" type="date" placeholder="选择日期"
+                class="addinputInfo addinputw"></el-date-picker></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty"></div>
+            <el-form-item></el-form-item>
+          </el-col>
+        </el-row>
+
         <el-row>
           <el-col :span="24">
             <div class="span-sty">备注</div>
@@ -51,11 +70,12 @@
                 class="addinputInfo addinputw" /></el-form-item>
           </el-col>
         </el-row>
+
         <el-row>
           <el-col :span="24">
             <div class="span-sty">附件</div>
             <el-form-item>
-              <upload-img ref="uploadImg" class="addinputw addinputInfo" v-model="formobj.urls" :limit="1" bucket="map"
+              <upload-img ref="uploadImg" class="addinputw addinputInfo" v-model="imgList" :limit="1" bucket="map"
                 :upload-data="{ type: '0001' }" @change="backData" />
             </el-form-item>
           </el-col>
@@ -73,9 +93,6 @@
     getOrgSidByPath,
     fetchBySid
   } from '@/api/Common/dictcommons'
-  import {
-    getCurrentDate,
-  } from '@/utils/index'
 
   export default {
     name: 'AuditSupervisionAdd',
@@ -91,7 +108,7 @@
           "useOrgName": "",
           "useOrgSid": "",
           "auditMatters": "",
-          "createStartDate": getCurrentDate(),
+          "createStartDate": '',
           "createEndDate": "",
           "auditor": "",
           "auditResults": "",
@@ -120,6 +137,7 @@
           }],
         },
         orgList: [],
+        imgList: []
       }
     },
     methods: {
@@ -149,7 +167,12 @@
 
         console.log('backData》》》》', value)
 
-        this.formobj.urls = value
+        // this.formobj.urls = value
+        this.formobj.urls = []
+        for (var i = 0; i < value.length; i++) {
+          this.formobj.urls.push(value[i].url)
+        }
+
 
       },
       showAdd() {
@@ -168,6 +191,13 @@
         req.init(sid).then((res) => {
           if (res.success) {
             this.formobj = res.data
+            this.imgList = []
+            for (var i = 0; i < this.formobj.urls.length; i++) {
+              this.imgList.push({
+                url: this.formobj.urls[i]
+              })
+            }
+
           }
         })
       },
@@ -201,7 +231,7 @@
           "useOrgName": "",
           "useOrgSid": "",
           "auditMatters": "",
-          "createStartDate": getCurrentDate(),
+          "createStartDate": '',
           "createEndDate": "",
           "auditor": "",
           "auditResults": "",
@@ -213,6 +243,7 @@
           "createOrgName": '',
         }
         this.submitdisabled = false
+        this.imgList = []
         this.$emit('doback')
       },
       seleOrgName(val) {
diff --git a/anrui-riskcenter-ui/src/views/auditSupervision/auditSupervisionInfo.vue b/anrui-riskcenter-ui/src/views/auditSupervision/auditSupervisionInfo.vue
index 9df407d424..6abd4f9a77 100644
--- a/anrui-riskcenter-ui/src/views/auditSupervision/auditSupervisionInfo.vue
+++ b/anrui-riskcenter-ui/src/views/auditSupervision/auditSupervisionInfo.vue
@@ -36,6 +36,20 @@
             <el-form-item><span class="addinputInfo">{{ formobj.auditMatters }}</span></el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="8">
+            <div class="span-sty">审计开始日期</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.createStartDate }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">审计结束日期</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.createEndDate }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty"></div>
+            <el-form-item></el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="24">
             <div class="span-sty">备注</div>
@@ -49,8 +63,8 @@
               <template slot-scope="scope">
                 <span v-for="(item,index) in formobj.urls" :key="index" class="addinputInfo">
                   <el-popover placement="left" trigger="click" width="300">
-                    <img :src="item.url" width="100%" />
-                    <img slot="reference" :src="item.url" :alt="item.url"
+                    <img :src="item" width="100%" />
+                    <img slot="reference" :src="item" :alt="item"
                       style="max-height: 70px;max-width: 70px; padding: 5px" />
                   </el-popover>
                 </span>