From b0be896d7488991c09878a4e60d6b5fa11c14fcb Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Wed, 25 Dec 2024 10:00:14 +0800
Subject: [PATCH 1/2] =?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

---
 .../specialrebatecheck/specialrebatecheck.vue | 55 ++++++++++----
 .../specialrebatecheckAdd.vue                 | 73 ++++++++++++++----
 .../specialrebatecheckInfo.vue                | 76 ++++++++++++++++++-
 .../zhuanxiangfanliheduiDaiBanInfo.vue        | 49 +++++++++++-
 .../zhuanxiangfanliheduiEdit.vue              | 65 ++++++++++++----
 .../zhuanxiangfanliheduiYiBanInfo.vue         | 49 +++++++++++-
 6 files changed, 317 insertions(+), 50 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 7f548dea49..6de360904a 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
@@ -13,16 +13,30 @@
           <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-input v-model="listQuery.params.useOrgName" placeholder="" clearable/>
               </el-form-item>
-              <el-form-item label="申请名称">
-                <el-input v-model="listQuery.params.checkApply" placeholder="" clearable/>
+              <el-form-item label="申请部门">
+                <el-input v-model="listQuery.params.deptName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="申请人">
+                <el-input v-model="listQuery.params.createByName" placeholder="" clearable/>
               </el-form-item>
-              <el-form-item label="创建日期">
+              <el-form-item label="申请编号">
+                <el-input v-model="listQuery.params.billNo" 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.finishTimeStart" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker v-model="listQuery.params.finishTimeEnd" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
+              </el-form-item>
+              <el-form-item label="申请名称">
+                <el-input v-model="listQuery.params.checkApply" placeholder="" clearable/>
+              </el-form-item>
             </el-form>
             <div class="btn" style="text-align: center;">
               <el-button type="primary" icon="el-icon-search" @click="handleFilter" size="small">查询</el-button>
@@ -50,7 +64,12 @@
                 <span v-else @click="flowRecord(scope.row)" class="bluezi">{{ scope.row.nodeState }}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="createOrgName" label="分公司" align="center" width="200" />
+            <el-table-column prop="billNo" label="申请编号" align="center" width="180" />
+            <el-table-column prop="useOrgName" label="分公司" align="center" width="120" />
+            <el-table-column prop="deptName" label="申请部门" align="center" width="120" />
+            <el-table-column prop="createByName" label="申请人" align="center" width="120" />
+            <el-table-column prop="createTime" label="申请日期" align="center" width="120" />
+            <el-table-column prop="finishTime" label="办结日期" align="center" width="120" />
             <el-table-column label="名称" align="center" min-width="200">
               <template slot-scope="scope">
                 <span>{{ scope.row.checkApply }}专项返利核对申请</span>
@@ -62,10 +81,6 @@
             <el-table-column prop="stayDetermineMoney" label="其中待确定金额" align="center" width="160" />
             <el-table-column prop="money" label="其中费用" align="center" width="150" />
             <el-table-column prop="adjustmentMoney" label="调整金额" align="center" width="150" />
-            <el-table-column prop="createByName" label="申请人" align="center" width="120" />
-            <el-table-column prop="deptName" label="申请部门" align="center" width="140" />
-            <el-table-column prop="createTime" label="申请日期" align="center" width="120" />
-            <el-table-column prop="closeDate" label="办结日期" align="center" width="120" />
           </el-table>
         </div>
         <div class="pages">
@@ -134,11 +149,15 @@ export default {
       listLoading: false,
       listQuery: {
         params: {
-          createOrgName: '',
-          checkApply: '',
-          createOrgSid: '',
+          useOrgName: '',
+          deptName: '',
+          createByName: '',
+          billNo: '',
           createEndTime: '',
           createStartTime: '',
+          finishTimeStart: '',
+          finishTimeEnd: '',
+          checkApply: '',
           orgPath: '',
           userSid: '',
           menuUrl: ''
@@ -255,11 +274,15 @@ export default {
     handleReset() {
       this.listQuery = {
         params: {
-          createOrgName: '',
-          checkApply: '',
-          createOrgSid: '',
+          useOrgName: '',
+          deptName: '',
+          createByName: '',
+          billNo: '',
           createEndTime: '',
           createStartTime: '',
+          finishTimeStart: '',
+          finishTimeEnd: '',
+          checkApply: '',
           orgPath: '',
           userSid: '',
           menuUrl: ''
@@ -268,7 +291,7 @@ export default {
         size: 5,
         total: 0
       }
-      this.init()
+      this.getList()
     },
     handleClick() {
       this.$parent.resetState()
diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheckAdd.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheckAdd.vue
index 89467af237..61a8c52146 100644
--- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheckAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheckAdd.vue
@@ -17,14 +17,38 @@
       <div class="listconadd">
         <div class="titwu"><span>{{ formobj.checkApply }}专项返利核对审核申请</span></div>
         <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
-          <el-row class="rowStyle">
-            <el-col :span="24" class="colOneStyle">
-              <div style="text-align: right"><el-button size="small" type="primary" class="btntopblueline" @click="handleSelect()">添加</el-button></div>
+          <el-row style="border-top: 1px solid #E0E3EB">
+            <el-col :span="16">
+              <div class="span-sty">申请编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">分公司</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createOrgName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
             </el-col>
           </el-row>
-          <div class="title">本月上传返利核对情况(按返利类型统计)</div>
+          <div class="title titleOne">
+            <div>本月上传返利核对情况(按返利类型统计)</div>
+            <el-button size="mini" type="primary" class="btntopblueline" @click="handleSelect()">选择</el-button>
+          </div>
           <el-table :key="tableKey" :data="formobj.scmWhenSpecialrebateCheckapplydetailDetails" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
             <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column prop="purchaseSystemName" label="采购系统" align="center" min-width="120" />
+            <el-table-column prop="brandName" label="品牌" align="center" min-width="100" />
             <el-table-column prop="rebateTypeValue" label="返利类型" align="center" />
             <el-table-column prop="num" label="数量" align="center" />
             <el-table-column prop="withRebate" label="预提金额" align="center" />
@@ -43,6 +67,8 @@
           <div class="title">本月上传返利核对情况(按预提年月统计)</div>
           <el-table :key="lastSpecialrebateKey" :data="formobj.scmLastSpecialrebateCheckapplydetailDetails" border style="width: 100%">
             <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column prop="purchaseSystemName" label="采购系统" align="center" min-width="120" />
+            <el-table-column prop="brandName" label="品牌" align="center" min-width="100" />
             <el-table-column prop="withholdingDate" label="预提年月" align="center" />
             <el-table-column prop="num" label="预提数量" align="center" />
             <el-table-column prop="withRebate" label="预提金额" align="center" />
@@ -95,6 +121,7 @@ export default {
       // 表单数据
       formobj: {
         sid: '',
+        createTime: '',
         deptSid: '',
         deptName: '',
         createByName: '',
@@ -149,6 +176,13 @@ export default {
       this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath')
       this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1)
       this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1)
+      var nowDate = new Date()
+      var date = {
+        year: nowDate.getFullYear(),
+        month: nowDate.getMonth() + 1,
+        day: nowDate.getDate()
+      }
+      this.formobj.createTime = date.year + '-' + (date.month >= 10 ? date.month : '0' + date.month) + '-' + (date.day >= 10 ? date.day : '0' + date.day)
       this.viewTitle = '【新增】专项返利核对审核申请'
     },
     showEdit(row) {
@@ -183,7 +217,7 @@ export default {
       list.forEach((e) => {
         let v = 0
         for (var i in this.formobj.scmWhenSpecialrebateCheckapplydetailDetails) {
-          if (this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].rebateTypeValue === e.rebateTypeValue) {
+          if (this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].rebateTypeValue === e.rebateTypeValue && this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].purchaseSystemName === e.purchaseSystemName && this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].brandName === e.brandName) {
             this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].num = parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].num) + parseFloat(1)
             this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withRebate = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withRebate !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withRebate : 0) + parseFloat(e.estimateRebate !== '' ? e.estimateRebate : 0)) * 100) / 100
             this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withholdCost = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withholdCost !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withholdCost : 0) + parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100
@@ -205,6 +239,8 @@ export default {
             num: 1,
             withRebate: e.estimateRebate,
             withholdCost: e.withholdCost,
+            purchaseSystemName: e.purchaseSystemName,
+            purchaseSystemSid: e.purchaseSystemSid,
             brandName: e.brandName,
             brandSid: e.brandSid,
             uploadMoney: Math.round((parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0)) * 100) / 100,
@@ -222,7 +258,7 @@ export default {
       // 按照预提年月统计
       list.forEach((s) => {
         for (var l in this.formobj.scmLastSpecialrebateCheckapplydetailDetails) {
-          if (this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate) {
+          if (this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate && this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].purchaseSystemName === s.purchaseSystemName && this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].brandName === s.brandName) {
             this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].num = parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].num) + parseFloat(1)
             this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withRebate = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withRebate !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withRebate : 0) + parseFloat(s.estimateRebate !== '' ? s.estimateRebate : 0)) * 100) / 100
             this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdCost = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdCost !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdCost : 0) + parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100
@@ -242,6 +278,8 @@ export default {
             num: 1,
             withRebate: s.estimateRebate,
             withholdCost: s.withholdCost,
+            purchaseSystemName: s.purchaseSystemName,
+            purchaseSystemSid: s.purchaseSystemSid,
             brandName: s.brandName,
             brandSid: s.brandSid,
             uploadMoney: Math.round((parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0)) * 100) / 100,
@@ -280,7 +318,7 @@ export default {
       list.forEach((e) => {
         let v = 0
         for (var i in this.formobj.scmWhenSpecialrebateCheckapplydetailDetails) {
-          if (this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].rebateTypeValue === e.rebateTypeValue) {
+          if (this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].rebateTypeValue === e.rebateTypeValue && this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].purchaseSystemName === e.purchaseSystemName && this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].brandName === e.brandName) {
             this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].num = parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].num) + parseFloat(1)
             this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withRebate = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withRebate !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withRebate : 0) + parseFloat(e.estimateRebate !== '' ? e.estimateRebate : 0)) * 100) / 100
             this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withholdCost = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withholdCost !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withholdCost : 0) + parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100
@@ -302,6 +340,8 @@ export default {
             num: 1,
             withRebate: e.estimateRebate,
             withholdCost: e.withholdCost,
+            purchaseSystemName: e.purchaseSystemName,
+            purchaseSystemSid: e.purchaseSystemSid,
             brandName: e.brandName,
             brandSid: e.brandSid,
             uploadMoney: Math.round((parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0)) * 100) / 100,
@@ -319,7 +359,7 @@ export default {
       // 按照预提年月统计
       list.forEach((s) => {
         for (var l in this.formobj.scmLastSpecialrebateCheckapplydetailDetails) {
-          if (this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate) {
+          if (this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate && this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].purchaseSystemName === s.purchaseSystemName && this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].brandName === s.brandName) {
             this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].num = parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].num) + parseFloat(1)
             this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withRebate = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withRebate !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withRebate : 0) + parseFloat(s.estimateRebate !== '' ? s.estimateRebate : 0)) * 100) / 100
             this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdCost = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdCost !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdCost : 0) + parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100
@@ -339,6 +379,8 @@ export default {
             num: 1,
             withRebate: s.estimateRebate,
             withholdCost: s.withholdCost,
+            purchaseSystemName: s.purchaseSystemName,
+            purchaseSystemSid: s.purchaseSystemSid,
             brandName: s.brandName,
             brandSid: s.brandSid,
             uploadMoney: Math.round((parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0)) * 100) / 100,
@@ -423,6 +465,7 @@ export default {
       // 表单数据
       this.formobj = {
         sid: '',
+        createTime: '',
         deptSid: '',
         deptName: '',
         createByName: '',
@@ -449,13 +492,6 @@ export default {
 }
 </script>
 <style scoped>
-.rowStyle {
-  border-left: 0px;
-}
-.colOneStyle {
-  border-right: 0px !important;
-  border-bottom: 0px !important;
-}
 .span-sty {
   width: 130px !important;
 }
@@ -466,5 +502,12 @@ export default {
   margin-left: 120px !important;
   width: calc(100% - 115px);
 }
+.titleOne {
+  padding: 7px;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+}
 </style>
 
diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheckInfo.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheckInfo.vue
index 5465ed8353..0d7c0d8a52 100644
--- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheckInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheckInfo.vue
@@ -17,9 +17,35 @@
       <div class="listconadd">
         <div class="titwu"><span>{{ formobj.checkApply }}专项返利核对审核申请</span></div>
         <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+          <el-row style="border-top: 1px solid #E0E3EB">
+            <el-col :span="16">
+              <div class="span-sty">申请编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">分公司</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createOrgName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
+            </el-col>
+          </el-row>
           <div class="title">本月上传返利核对情况(按返利类型统计)</div>
           <el-table :key="tableKey" :data="formobj.scmWhenSpecialrebateCheckapplydetailDetails" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
             <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column prop="purchaseSystemName" label="采购系统" align="center" min-width="120" />
+            <el-table-column prop="brandName" label="品牌" align="center" min-width="100" />
             <el-table-column prop="rebateTypeValue" label="返利类型" align="center" />
             <el-table-column prop="num" label="数量" align="center" />
             <el-table-column prop="withRebate" label="预提金额" align="center" />
@@ -38,6 +64,8 @@
           <div class="title">本月上传返利核对情况(按预提年月统计)</div>
           <el-table :key="lastSpecialrebateKey" :data="formobj.scmLastSpecialrebateCheckapplydetailDetails" :index="index" border style="width: 100%">
             <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column prop="purchaseSystemName" label="采购系统" align="center" min-width="120" />
+            <el-table-column prop="brandName" label="品牌" align="center" min-width="100" />
             <el-table-column prop="withholdingDate" label="预提年月" align="center" />
             <el-table-column prop="num" label="预提数量" align="center" />
             <el-table-column prop="withRebate" label="预提金额" align="center" />
@@ -84,7 +112,26 @@ export default {
       lastSpecialrebateKey: 1,
       viewState: 1,
       // 表单数据
-      formobj: {},
+      formobj: {
+        sid: '',
+        createTime: '',
+        deptSid: '',
+        deptName: '',
+        createByName: '',
+        createBySid: '',
+        checkApply: '',
+        createOrgName: '',
+        createOrgSid: '',
+        useOrgName: '',
+        useOrgSid: '',
+        remarks: '',
+        instanceId: '', // 流程实例ID
+        taskId: '', // 任务ID
+        orgPath: '',
+        scmWhenSpecialrebateCheckapplydetailDetails: [],
+        scmLastSpecialrebateCheckapplydetailDetails: [],
+        scmSpecialrebateCheckapplydetailDetails: []
+      },
       rules: {},
       submitdisabled: false
     }
@@ -138,7 +185,26 @@ export default {
     // 返回（===既判断）
     handleReturn() {
       // 表单数据
-      this.formobj = {}
+      this.formobj = {
+        sid: '',
+        createTime: '',
+        deptSid: '',
+        deptName: '',
+        createByName: '',
+        createBySid: '',
+        checkApply: '',
+        createOrgName: '',
+        createOrgSid: '',
+        useOrgName: '',
+        useOrgSid: '',
+        remarks: '',
+        instanceId: '', // 流程实例ID
+        taskId: '', // 任务ID
+        orgPath: '',
+        scmWhenSpecialrebateCheckapplydetailDetails: [],
+        scmLastSpecialrebateCheckapplydetailDetails: [],
+        scmSpecialrebateCheckapplydetailDetails: []
+      }
       this.$refs['form_obj'].resetFields()
       this.$emit('doback')
     }
@@ -147,5 +213,11 @@ export default {
 </script>
 
 <style scoped>
+.span-sty {
+  width: 130px !important;
+}
+.addinputInfo {
+  margin-left: 120px !important;
+}
 </style>
 
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiDaiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiDaiBanInfo.vue
index 2a69cd0800..c1acbfa1cb 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiDaiBanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiDaiBanInfo.vue
@@ -17,9 +17,35 @@
       <div class="">
         <div class="titwu"><span>{{ formobj.checkApply }}专项返利核对审核申请</span></div>
         <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+          <el-row style="border-top: 1px solid #E0E3EB">
+            <el-col :span="16">
+              <div class="span-sty">申请编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">分公司</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createOrgName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
+            </el-col>
+          </el-row>
           <div class="title">本月上传返利核对情况(按返利类型统计)</div>
           <el-table :key="tableKey" :data="formobj.scmWhenSpecialrebateCheckapplydetailDetails" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
             <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column prop="purchaseSystemName" label="采购系统" align="center" min-width="120" />
+            <el-table-column prop="brandName" label="品牌" align="center" min-width="100" />
             <el-table-column prop="rebateTypeValue" label="返利类型" align="center" />
             <el-table-column prop="num" label="数量" align="center" />
             <el-table-column prop="withRebate" label="预提金额" align="center" />
@@ -38,6 +64,8 @@
           <div class="title">本月上传返利核对情况(按预提年月统计)</div>
           <el-table :key="lastSpecialrebateKey" :data="formobj.scmLastSpecialrebateCheckapplydetailDetails" :index="index" border style="width: 100%">
             <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column prop="purchaseSystemName" label="采购系统" align="center" min-width="120" />
+            <el-table-column prop="brandName" label="品牌" align="center" min-width="100" />
             <el-table-column prop="withholdingDate" label="预提年月" align="center" />
             <el-table-column prop="num" label="预提数量" align="center" />
             <el-table-column prop="withRebate" label="预提金额" align="center" />
@@ -117,7 +145,26 @@ export default {
       nodeDialogVisible: false,
       currentLink: true,
       // 表单数据
-      formobj: {},
+      formobj: {
+        sid: '',
+        createTime: '',
+        deptSid: '',
+        deptName: '',
+        createByName: '',
+        createBySid: '',
+        checkApply: '',
+        createOrgName: '',
+        createOrgSid: '',
+        useOrgName: '',
+        useOrgSid: '',
+        remarks: '',
+        instanceId: '', // 流程实例ID
+        taskId: '', // 任务ID
+        orgPath: '',
+        scmWhenSpecialrebateCheckapplydetailDetails: [],
+        scmLastSpecialrebateCheckapplydetailDetails: [],
+        scmSpecialrebateCheckapplydetailDetails: []
+      },
       rules: {},
       submitdisabled: false,
       // 环节所需参数
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiEdit.vue
index 2515e74a88..4241be551a 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiEdit.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiEdit.vue
@@ -16,14 +16,38 @@
       <div class="">
         <div class="titwu"><span>{{ formobj.checkApply }}专项返利核对审核申请</span></div>
         <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
-          <el-row class="rowStyle">
-            <el-col :span="24" class="colOneStyle">
-              <div style="text-align: right"><el-button size="small" type="primary" class="btntopblueline" @click="handleSelect()">添加</el-button></div>
+          <el-row style="border-top: 1px solid #E0E3EB">
+            <el-col :span="16">
+              <div class="span-sty">申请编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
             </el-col>
           </el-row>
-          <div class="title">本月上传返利核对情况(按返利类型统计)</div>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">分公司</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createOrgName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title titleOne">
+            <div>本月上传返利核对情况(按返利类型统计)</div>
+            <el-button size="mini" type="primary" class="btntopblueline" @click="handleSelect()">选择</el-button>
+          </div>
           <el-table :key="tableKey" :data="formobj.scmWhenSpecialrebateCheckapplydetailDetails" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
             <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column prop="purchaseSystemName" label="采购系统" align="center" min-width="120" />
+            <el-table-column prop="brandName" label="品牌" align="center" min-width="100" />
             <el-table-column prop="rebateTypeValue" label="返利类型" align="center" />
             <el-table-column prop="num" label="数量" align="center" />
             <el-table-column prop="withRebate" label="预提金额" align="center" />
@@ -42,6 +66,8 @@
           <div class="title">本月上传返利核对情况(按预提年月统计)</div>
           <el-table :key="lastSpecialrebateKey" :data="formobj.scmLastSpecialrebateCheckapplydetailDetails" border style="width: 100%">
             <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column prop="purchaseSystemName" label="采购系统" align="center" min-width="120" />
+            <el-table-column prop="brandName" label="品牌" align="center" min-width="100" />
             <el-table-column prop="withholdingDate" label="预提年月" align="center" />
             <el-table-column prop="num" label="预提数量" align="center" />
             <el-table-column prop="withRebate" label="预提金额" align="center" />
@@ -93,6 +119,7 @@ export default {
       // 表单数据
       formobj: {
         sid: '',
+        createTime: '',
         deptSid: '',
         deptName: '',
         createByName: '',
@@ -164,7 +191,7 @@ export default {
       list.forEach((e) => {
         let v = 0
         for (var i in this.formobj.scmWhenSpecialrebateCheckapplydetailDetails) {
-          if (this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].rebateTypeValue === e.rebateTypeValue) {
+          if (this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].rebateTypeValue === e.rebateTypeValue && this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].purchaseSystemName === e.purchaseSystemName && this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].brandName === e.brandName) {
             this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].num = parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].num) + parseFloat(1)
             this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withRebate = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withRebate !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withRebate : 0) + parseFloat(e.estimateRebate !== '' ? e.estimateRebate : 0)) * 100) / 100
             this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withholdCost = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withholdCost !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withholdCost : 0) + parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100
@@ -186,6 +213,8 @@ export default {
             num: 1,
             withRebate: e.estimateRebate,
             withholdCost: e.withholdCost,
+            purchaseSystemName: e.purchaseSystemName,
+            purchaseSystemSid: e.purchaseSystemSid,
             brandName: e.brandName,
             brandSid: e.brandSid,
             uploadMoney: Math.round((parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0)) * 100) / 100,
@@ -203,7 +232,7 @@ export default {
       // 按照预提年月统计
       list.forEach((s) => {
         for (var l in this.formobj.scmLastSpecialrebateCheckapplydetailDetails) {
-          if (this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate) {
+          if (this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate && this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].purchaseSystemName === s.purchaseSystemName && this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].brandName === s.brandName) {
             this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].num = parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].num) + parseFloat(1)
             this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withRebate = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withRebate !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withRebate : 0) + parseFloat(s.estimateRebate !== '' ? s.estimateRebate : 0)) * 100) / 100
             this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdCost = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdCost !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdCost : 0) + parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100
@@ -223,6 +252,8 @@ export default {
             num: 1,
             withRebate: s.estimateRebate,
             withholdCost: s.withholdCost,
+            purchaseSystemName: s.purchaseSystemName,
+            purchaseSystemSid: s.purchaseSystemSid,
             brandName: s.brandName,
             brandSid: s.brandSid,
             uploadMoney: Math.round((parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0)) * 100) / 100,
@@ -261,7 +292,7 @@ export default {
       list.forEach((e) => {
         let v = 0
         for (var i in this.formobj.scmWhenSpecialrebateCheckapplydetailDetails) {
-          if (this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].rebateTypeValue === e.rebateTypeValue) {
+          if (this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].rebateTypeValue === e.rebateTypeValue && this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].purchaseSystemName === e.purchaseSystemName && this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].brandName === e.brandName) {
             this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].num = parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].num) + parseFloat(1)
             this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withRebate = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withRebate !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withRebate : 0) + parseFloat(e.estimateRebate !== '' ? e.estimateRebate : 0)) * 100) / 100
             this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withholdCost = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withholdCost !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withholdCost : 0) + parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100
@@ -283,6 +314,8 @@ export default {
             num: 1,
             withRebate: e.estimateRebate,
             withholdCost: e.withholdCost,
+            purchaseSystemName: e.purchaseSystemName,
+            purchaseSystemSid: e.purchaseSystemSid,
             brandName: e.brandName,
             brandSid: e.brandSid,
             uploadMoney: Math.round((parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0)) * 100) / 100,
@@ -300,7 +333,7 @@ export default {
       // 按照预提年月统计
       list.forEach((s) => {
         for (var l in this.formobj.scmLastSpecialrebateCheckapplydetailDetails) {
-          if (this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate) {
+          if (this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate && this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].purchaseSystemName === s.purchaseSystemName && this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].brandName === s.brandName) {
             this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].num = parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].num) + parseFloat(1)
             this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withRebate = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withRebate !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withRebate : 0) + parseFloat(s.estimateRebate !== '' ? s.estimateRebate : 0)) * 100) / 100
             this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdCost = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdCost !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdCost : 0) + parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100
@@ -320,6 +353,8 @@ export default {
             num: 1,
             withRebate: s.estimateRebate,
             withholdCost: s.withholdCost,
+            purchaseSystemName: s.purchaseSystemName,
+            purchaseSystemSid: s.purchaseSystemSid,
             brandName: s.brandName,
             brandSid: s.brandSid,
             uploadMoney: Math.round((parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0)) * 100) / 100,
@@ -421,13 +456,6 @@ export default {
   text-align: center;
   padding: 30px 0 20px 0;
 }
-.rowStyle {
-  border-left: 0px;
-}
-.colOneStyle {
-  border-right: 0px !important;
-  border-bottom: 0px !important;
-}
 .span-sty {
   width: 130px !important;
 }
@@ -438,5 +466,12 @@ export default {
   margin-left: 120px !important;
   width: calc(100% - 115px);
 }
+.titleOne {
+  padding: 7px;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+}
 </style>
 
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiYiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiYiBanInfo.vue
index 07e565e8e1..21dfea469a 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiYiBanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiYiBanInfo.vue
@@ -15,9 +15,35 @@
       <div class="">
         <div class="titwu"><span>{{ formobj.checkApply }}专项返利核对审核申请</span></div>
         <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+          <el-row style="border-top: 1px solid #E0E3EB">
+            <el-col :span="16">
+              <div class="span-sty">申请编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">分公司</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createOrgName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
+            </el-col>
+          </el-row>
           <div class="title">本月上传返利核对情况(按返利类型统计)</div>
           <el-table :key="tableKey" :data="formobj.scmWhenSpecialrebateCheckapplydetailDetails" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
             <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column prop="purchaseSystemName" label="采购系统" align="center" min-width="120" />
+            <el-table-column prop="brandName" label="品牌" align="center" min-width="100" />
             <el-table-column prop="rebateTypeValue" label="返利类型" align="center" />
             <el-table-column prop="num" label="数量" align="center" />
             <el-table-column prop="withRebate" label="预提金额" align="center" />
@@ -36,6 +62,8 @@
           <div class="title">本月上传返利核对情况(按预提年月统计)</div>
           <el-table :key="lastSpecialrebateKey" :data="formobj.scmLastSpecialrebateCheckapplydetailDetails" :index="index" border style="width: 100%">
             <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column prop="purchaseSystemName" label="采购系统" align="center" min-width="120" />
+            <el-table-column prop="brandName" label="品牌" align="center" min-width="100" />
             <el-table-column prop="withholdingDate" label="预提年月" align="center" />
             <el-table-column prop="num" label="预提数量" align="center" />
             <el-table-column prop="withRebate" label="预提金额" align="center" />
@@ -82,7 +110,26 @@ export default {
       lastSpecialrebateKey: 1,
       viewState: 1,
       // 表单数据
-      formobj: {},
+      formobj: {
+        sid: '',
+        createTime: '',
+        deptSid: '',
+        deptName: '',
+        createByName: '',
+        createBySid: '',
+        checkApply: '',
+        createOrgName: '',
+        createOrgSid: '',
+        useOrgName: '',
+        useOrgSid: '',
+        remarks: '',
+        instanceId: '', // 流程实例ID
+        taskId: '', // 任务ID
+        orgPath: '',
+        scmWhenSpecialrebateCheckapplydetailDetails: [],
+        scmLastSpecialrebateCheckapplydetailDetails: [],
+        scmSpecialrebateCheckapplydetailDetails: []
+      },
       rules: {},
       submitdisabled: false,
       // 环节所需参数

From 205283ac0fcabd7da5e312a44c4629cc8bc8f7aa Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Wed, 25 Dec 2024 10:01:55 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=B8=93=E9=A1=B9?=
 =?UTF-8?q?=E8=BF=94=E5=88=A9=E9=A2=84=E6=8F=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../specialrebatewithholding.vue              |  54 +++---
 .../specialrebatewithholdingAdd.vue           |  45 ++++-
 .../specialrebatewithholdingInfo.vue          |  68 ++++++-
 .../zhuanxiangfanliyutiDaiBanInfo.vue         | 170 +++++++++++-------
 .../zhuanxiangfanliyutiEdit.vue               |  37 +++-
 .../zhuanxiangfanliyutiYiBanInfo.vue          |  49 ++++-
 6 files changed, 310 insertions(+), 113 deletions(-)

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 37e71c7a83..f2f0bc4406 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
@@ -9,20 +9,29 @@
           <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-input v-model="listQuery.params.useOrgName" placeholder="" clearable/>
               </el-form-item>
-              <el-form-item label="申请名称">
-                <el-input v-model="listQuery.params.withApply" clearable placeholder=""></el-input>
+              <el-form-item label="申请部门">
+                <el-input v-model="listQuery.params.deptName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="申请人">
+                <el-input v-model="listQuery.params.createByName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="申请编号">
+                <el-input v-model="listQuery.params.billNo" placeholder="" clearable/>
               </el-form-item>
-              <el-form-item label="创建日期">
+              <el-form-item label="申请日期">
                 <el-date-picker v-model="listQuery.params.createStartTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
                 <span style="padding: 0 8px">至</span>
                 <el-date-picker v-model="listQuery.params.createEndTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
               </el-form-item>
               <el-form-item label="办结日期">
-                <el-date-picker v-model="listQuery.params.closeStartDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
+                <el-date-picker v-model="listQuery.params.finishTimeStart" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
                 <span style="padding: 0 8px">至</span>
-                <el-date-picker v-model="listQuery.params.closeEndDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
+                <el-date-picker v-model="listQuery.params.finishTimeEnd" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
+              </el-form-item>
+              <el-form-item label="申请名称">
+                <el-input v-model="listQuery.params.withApply" placeholder="" clearable/>
               </el-form-item>
             </el-form>
             <div class="btn" style="text-align: center;">
@@ -51,7 +60,12 @@
                 <span v-else @click="flowRecord(scope.row)" class="bluezi">{{ scope.row.nodeState }}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="createOrgName" label="分公司" align="center" />
+            <el-table-column prop="billNo" label="申请编号" align="center" width="180" />
+            <el-table-column prop="useOrgName" label="分公司" align="center" width="120" />
+            <el-table-column prop="deptName" label="申请部门" align="center" width="120" />
+            <el-table-column prop="createByName" label="申请人" align="center" width="120" />
+            <el-table-column prop="createTime" label="申请日期" align="center" width="120" />
+            <el-table-column prop="finishTime" label="办结日期" align="center" width="120" />
             <el-table-column label="名称" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.withApply }}专项返利预提申请</span>
@@ -59,10 +73,6 @@
             </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" />
-            <el-table-column prop="deptName" label="申请部门" align="center" width="120" />
-            <el-table-column prop="createTime" label="申请日期" align="center" width="120" />
-            <el-table-column prop="closeDate" label="办结日期" align="center" width="120" />
           </el-table>
         </div>
         <div class="pages">
@@ -138,13 +148,15 @@ export default {
       listLoading: false,
       listQuery: {
         params: {
-          createOrgSid: '',
+          useOrgName: '',
+          deptName: '',
+          createByName: '',
+          billNo: '',
           createEndTime: '',
           createStartTime: '',
-          closeStartDate: '',
-          closeEndDate: '',
+          finishTimeStart: '',
+          finishTimeEnd: '',
           withApply: '',
-          createOrgName: '',
           orgPath: '',
           userSid: '',
           menuUrl: ''
@@ -268,13 +280,15 @@ export default {
     handleReset() {
       this.listQuery = {
         params: {
-          createOrgSid: '',
+          useOrgName: '',
+          deptName: '',
+          createByName: '',
+          billNo: '',
           createEndTime: '',
           createStartTime: '',
-          closeStartDate: '',
-          closeEndDate: '',
+          finishTimeStart: '',
+          finishTimeEnd: '',
           withApply: '',
-          createOrgName: '',
           orgPath: '',
           userSid: '',
           menuUrl: ''
@@ -283,7 +297,7 @@ export default {
         size: 5,
         total: 0
       }
-      this.init()
+      this.getList()
     },
     toAdd() {
       this.viewState = 2
diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/specialrebatewithholdingAdd.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/specialrebatewithholdingAdd.vue
index a34f43c307..d94bb7cb6d 100644
--- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/specialrebatewithholdingAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/specialrebatewithholdingAdd.vue
@@ -22,15 +22,33 @@
               <div style="text-align: right;font-weight: bold">金额单位：元</div>
             </el-col>
           </el-row>
-          <el-row class="rowStyle">
-            <el-col :span="6" class="colOneStyle">
-              <div class="span-sty" style="border-right: 0px !important;">分公司：</div>
+          <el-row>
+            <el-col :span="16">
+              <div class="span-sty">申请编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">分公司</div>
               <el-form-item><span class="addinputInfo">{{ formobj.createOrgName }}</span></el-form-item>
             </el-col>
-            <el-col :span="18" class="colOneStyle">
-              <div style="text-align: right"><el-button size="small" type="primary" class="btntopblueline" @click="handleSelect()">选择</el-button></div>
+            <el-col :span="8">
+              <div class="span-sty">申请部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
             </el-col>
           </el-row>
+          <div class="title titleOne">
+            <el-button size="mini" type="primary" class="btntopblueline" @click="handleSelect()">选择</el-button>
+          </div>
           <el-table :key="tableKey" :data="formobj.scmSpecialRebateWiths" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
             <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
             <el-table-column prop="purchaseSystemName" label="采购系统" align="center" min-width="120" />
@@ -83,6 +101,7 @@ export default {
       // 表单数据
       formobj: {
         sid: '',
+        createTime: '',
         withApply: '',
         deptName: '',
         deptSid: '',
@@ -137,6 +156,13 @@ export default {
       this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath')
       this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1)
       this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1)
+      var nowDate = new Date()
+      var date = {
+        year: nowDate.getFullYear(),
+        month: nowDate.getMonth() + 1,
+        day: nowDate.getDate()
+      }
+      this.formobj.createTime = date.year + '-' + (date.month >= 10 ? date.month : '0' + date.month) + '-' + (date.day >= 10 ? date.day : '0' + date.day)
       this.viewTitle = '【新增】专项返利预提申请'
     },
     showEdit(row) {
@@ -367,6 +393,7 @@ export default {
       // 表单数据
       this.formobj = {
         sid: '',
+        createTime: '',
         withApply: '',
         deptName: '',
         deptSid: '',
@@ -395,7 +422,6 @@ export default {
 }
 .colOneStyle {
   border-right: 0px !important;
-  border-bottom: 0px !important;
 }
 .span-sty {
   width: 130px !important;
@@ -403,4 +429,11 @@ export default {
 .addinputInfo {
   margin-left: 120px !important;
 }
+.titleOne {
+  padding: 7px;
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-end;
+  align-items: center;
+}
 </style>
diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/specialrebatewithholdingInfo.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/specialrebatewithholdingInfo.vue
index 1262138565..6a34f71a55 100644
--- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/specialrebatewithholdingInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/specialrebatewithholdingInfo.vue
@@ -22,15 +22,34 @@
               <div style="text-align: right;font-weight: bold">金额单位：元</div>
             </el-col>
           </el-row>
-          <el-row class="rowStyle">
-            <el-col :span="24" class="colOneStyle">
-              <div class="span-sty" style="border-right: 0px !important;">分公司：</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.useOrgName }}</span></el-form-item>
+          <el-row>
+            <el-col :span="16">
+              <div class="span-sty">申请编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">分公司</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createOrgName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
             </el-col>
           </el-row>
           <el-table :key="tableKey" :data="formobj.scmSpecialRebateWiths" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
             <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
             <el-table-column prop="purchaseSystemName" label="采购系统" align="center" min-width="120" />
+            <el-table-column prop="brandName" label="品牌" align="center" min-width="100" />
             <el-table-column prop="rebateTypeValue" label="返利类型" align="center" min-width="120" />
             <el-table-column prop="withRebate" label="预提返利" align="center" min-width="120" />
             <el-table-column prop="expectItureCost" label="其中支出费用" align="center" min-width="130" />
@@ -72,7 +91,25 @@ export default {
       tableKey: 0,
       viewState: 1,
       // 表单数据
-      formobj: {},
+      formobj: {
+        sid: '',
+        createTime: '',
+        withApply: '',
+        deptName: '',
+        deptSid: '',
+        createOrgName: '',
+        createOrgSid: '',
+        useOrgName: '',
+        useOrgSid: '',
+        remarks: '',
+        withRebateTotal: '',
+        createByName: '',
+        createBySid: '',
+        instanceId: '', // 流程实例ID
+        taskId: '', // 任务ID
+        orgPath: '',
+        scmSpecialRebateWiths: []
+      },
       rules: {},
       submitdisabled: false
     }
@@ -156,7 +193,25 @@ export default {
     // 返回（===既判断）
     handleReturn() {
       // 表单数据
-      this.formobj = {}
+      this.formobj = {
+        sid: '',
+        createTime: '',
+        withApply: '',
+        deptName: '',
+        deptSid: '',
+        createOrgName: '',
+        createOrgSid: '',
+        useOrgName: '',
+        useOrgSid: '',
+        remarks: '',
+        withRebateTotal: '',
+        createByName: '',
+        createBySid: '',
+        instanceId: '', // 流程实例ID
+        taskId: '', // 任务ID
+        orgPath: '',
+        scmSpecialRebateWiths: []
+      }
       this.$refs['form_obj'].resetFields()
       this.$emit('doback')
     }
@@ -169,7 +224,6 @@ export default {
 }
 .colOneStyle {
   border-right: 0px !important;
-  border-bottom: 0px !important;
 }
 .span-sty {
   width: 130px !important;
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiDaiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiDaiBanInfo.vue
index 19ba0cb24e..0321dee819 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiDaiBanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiDaiBanInfo.vue
@@ -22,15 +22,34 @@
               <div style="text-align: right;font-weight: bold">金额单位：元</div>
             </el-col>
           </el-row>
-          <el-row class="rowStyle">
-            <el-col :span="24" class="colOneStyle">
-              <div class="span-sty" style="border-right: 0px !important;">分公司：</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.useOrgName }}</span></el-form-item>
+          <el-row>
+            <el-col :span="16">
+              <div class="span-sty">申请编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">分公司</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createOrgName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
             </el-col>
           </el-row>
           <el-table :key="tableKey" :data="formobj.scmSpecialRebateWiths" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
             <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
             <el-table-column prop="purchaseSystemName" label="采购系统" align="center" min-width="120" />
+            <el-table-column prop="brandName" label="品牌" align="center" min-width="100" />
             <el-table-column prop="rebateTypeValue" label="返利类型" align="center" min-width="120" />
             <el-table-column prop="withRebate" label="预提返利" align="center" min-width="120" />
             <el-table-column prop="expectItureCost" label="其中支出费用" align="center" min-width="130" />
@@ -105,7 +124,25 @@ export default {
       nodeDialogVisible: false,
       currentLink: true,
       // 表单数据
-      formobj: {},
+      formobj: {
+        sid: '',
+        createTime: '',
+        withApply: '',
+        deptName: '',
+        deptSid: '',
+        createOrgName: '',
+        createOrgSid: '',
+        useOrgName: '',
+        useOrgSid: '',
+        remarks: '',
+        withRebateTotal: '',
+        createByName: '',
+        createBySid: '',
+        instanceId: '', // 流程实例ID
+        taskId: '', // 任务ID
+        orgPath: '',
+        scmSpecialRebateWiths: []
+      },
       rules: {},
       submitdisabled: false,
       // 环节所需参数
@@ -163,6 +200,67 @@ export default {
         this.formobj = {}
       })
     },
+    handleLook(row) {
+      this.viewState = 2
+      this.$refs['divInfo'].showInfo(row)
+    },
+    resetState() {
+      this.viewState = 1
+    },
+    // 合计
+    getSummaries(param) {
+      const { columns, data } = param
+      const sums = []
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '合计'
+          return
+        }
+        const values = data.map(item => Number(item[column.property]))
+        if (column.property === 'withRebate') {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr)
+            if (!isNaN(value)) {
+              return prev + curr
+            } else {
+              return prev
+            }
+          }, 0)
+          sums[index] += ''
+        } else if (column.property === 'expectItureCost') {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr)
+            if (!isNaN(value)) {
+              return prev + curr
+            } else {
+              return prev
+            }
+          }, 0)
+          sums[index] += ''
+        } else if (column.property === 'expectTreatCost') {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr)
+            if (!isNaN(value)) {
+              return prev + curr
+            } else {
+              return prev
+            }
+          }, 0)
+          sums[index] += ''
+        } else if (column.property === 'expectSuppCost') {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr)
+            if (!isNaN(value)) {
+              return prev + curr
+            } else {
+              return prev
+            }
+          }, 0)
+          sums[index] += ''
+        }
+      })
+      return sums
+    },
     // 同意
     openAgree(val) {
       this.operation = val
@@ -283,67 +381,6 @@ export default {
           }, '*')
         }
       })
-    },
-    handleLook(row) {
-      this.viewState = 2
-      this.$refs['divInfo'].showInfo(row)
-    },
-    resetState() {
-      this.viewState = 1
-    },
-    // 合计
-    getSummaries(param) {
-      const { columns, data } = param
-      const sums = []
-      columns.forEach((column, index) => {
-        if (index === 0) {
-          sums[index] = '合计'
-          return
-        }
-        const values = data.map(item => Number(item[column.property]))
-        if (column.property === 'withRebate') {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr)
-            if (!isNaN(value)) {
-              return prev + curr
-            } else {
-              return prev
-            }
-          }, 0)
-          sums[index] += ''
-        } else if (column.property === 'expectItureCost') {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr)
-            if (!isNaN(value)) {
-              return prev + curr
-            } else {
-              return prev
-            }
-          }, 0)
-          sums[index] += ''
-        } else if (column.property === 'expectTreatCost') {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr)
-            if (!isNaN(value)) {
-              return prev + curr
-            } else {
-              return prev
-            }
-          }, 0)
-          sums[index] += ''
-        } else if (column.property === 'expectSuppCost') {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr)
-            if (!isNaN(value)) {
-              return prev + curr
-            } else {
-              return prev
-            }
-          }, 0)
-          sums[index] += ''
-        }
-      })
-      return sums
     }
   }
 }
@@ -359,7 +396,6 @@ export default {
 }
 .colOneStyle {
   border-right: 0px !important;
-  border-bottom: 0px !important;
 }
 .rowClass {
   border-top: 1px solid #E0E3EB;
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiEdit.vue
index c746bd3795..0cb0db8d49 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiEdit.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiEdit.vue
@@ -21,15 +21,33 @@
               <div style="text-align: right;font-weight: bold">金额单位：元</div>
             </el-col>
           </el-row>
-          <el-row class="rowStyle">
-            <el-col :span="6" class="colOneStyle">
-              <div class="span-sty" style="border-right: 0px !important;">分公司：</div>
+          <el-row>
+            <el-col :span="16">
+              <div class="span-sty">申请编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">分公司</div>
               <el-form-item><span class="addinputInfo">{{ formobj.createOrgName }}</span></el-form-item>
             </el-col>
-            <el-col :span="18" class="colOneStyle">
-              <div style="text-align: right"><el-button size="small" type="primary" class="btntopblueline" @click="handleSelect()">选择</el-button></div>
+            <el-col :span="8">
+              <div class="span-sty">申请部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
             </el-col>
           </el-row>
+          <div class="title titleOne">
+            <el-button size="mini" type="primary" class="btntopblueline" @click="handleSelect()">选择</el-button>
+          </div>
           <el-table :key="tableKey" :data="formobj.scmSpecialRebateWiths" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
             <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
             <el-table-column prop="purchaseSystemName" label="采购系统" align="center" min-width="120" />
@@ -81,6 +99,7 @@ export default {
       // 表单数据
       formobj: {
         sid: '',
+        createTime: '',
         withApply: '',
         deptName: '',
         deptSid: '',
@@ -369,7 +388,6 @@ export default {
 }
 .colOneStyle {
   border-right: 0px !important;
-  border-bottom: 0px !important;
 }
 .span-sty {
   width: 130px !important;
@@ -377,4 +395,11 @@ export default {
 .addinputInfo {
   margin-left: 120px !important;
 }
+.titleOne {
+  padding: 7px;
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-end;
+  align-items: center;
+}
 </style>
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiYiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiYiBanInfo.vue
index 1cb5d5fa2b..b0ebae17c1 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiYiBanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiYiBanInfo.vue
@@ -20,15 +20,34 @@
               <div style="text-align: right;font-weight: bold">金额单位：元</div>
             </el-col>
           </el-row>
-          <el-row class="rowStyle">
-            <el-col :span="24" class="colOneStyle">
-              <div class="span-sty" style="border-right: 0px !important;">分公司：</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.useOrgName }}</span></el-form-item>
+          <el-row>
+            <el-col :span="16">
+              <div class="span-sty">申请编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">分公司</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createOrgName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
             </el-col>
           </el-row>
           <el-table :key="tableKey" :data="formobj.scmSpecialRebateWiths" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
             <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
             <el-table-column prop="purchaseSystemName" label="采购系统" align="center" min-width="120" />
+            <el-table-column prop="brandName" label="品牌" align="center" min-width="100" />
             <el-table-column prop="rebateTypeValue" label="返利类型" align="center" min-width="120" />
             <el-table-column prop="withRebate" label="预提返利" align="center" min-width="120" />
             <el-table-column prop="expectItureCost" label="其中支出费用" align="center" min-width="130" />
@@ -70,9 +89,26 @@ export default {
       tableKey: 0,
       viewState: 1,
       // 表单数据
-      formobj: {},
+      formobj: {
+        sid: '',
+        createTime: '',
+        withApply: '',
+        deptName: '',
+        deptSid: '',
+        createOrgName: '',
+        createOrgSid: '',
+        useOrgName: '',
+        useOrgSid: '',
+        remarks: '',
+        withRebateTotal: '',
+        createByName: '',
+        createBySid: '',
+        instanceId: '', // 流程实例ID
+        taskId: '', // 任务ID
+        orgPath: '',
+        scmSpecialRebateWiths: []
+      },
       rules: {},
-      submitdisabled: false,
       // 环节所需参数
       linkByParameter: {
         businessSid: '',
@@ -238,7 +274,6 @@ export default {
 }
 .colOneStyle {
   border-right: 0px !important;
-  border-bottom: 0px !important;
 }
 .span-sty {
   width: 130px !important;