完善单车返利

anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheck.vue

@@ -62,9 +62,9 @@
                 <span>{{ scope.row.brandName }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="申请标题" align="center" width="200">
+            <el-table-column label="名称" align="center" width="200">
               <template slot-scope="scope">
-                <span>{{ scope.row.checkApply }}</span>
+                <span>{{ scope.row.checkApply }}单车返利上传核对审核申请</span>
               </template>
             </el-table-column>
             <el-table-column label="预提返利" align="center" width="250">

anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckAdd.vue

@@ -17,7 +17,7 @@
       <!--标题按钮部分结束-->
       <!--Start 新增修改部分-->
       <div class="listconadd">
-        <div class="titwu"><span>{{ formobj.checkApply }}单车返利核对审核申请</span></div>
+        <div class="titwu"><span>{{ formobj.checkApply }}单车返利上传核对审核申请</span></div>
         <el-form ref="form_obj" :model="formobj" :rules="rules" class="formadd">
           <el-row class="rowStyle">
             <el-col :span="2" class="tleftb colOneStyle">
@@ -35,7 +35,7 @@
             </el-col>
           </el-row>
           <div class="title">
-            <div>本月各项返利核对情况</div>
+            <div>本月上传核对情况(按返利类型统计)</div>
           </div>
           <el-table :key="tableKey" :data="formobj.scmWhenVehrebateCheckapplydetailDetails" :index="index" border style="width: 100%">
             <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
@@ -81,13 +81,13 @@
             </el-table-column>
           </el-table>
           <div class="divStyle">
-            <div>预提返利本月核对情况</div>
+            <div>本月上传核对情况(按预提年月统计)</div>
             <el-button type="primary" size="mini" class="btntopblueline" @click="handleCheck">往月核对情况</el-button>
           </div>
           <el-table :key="lastVehrebateKey" :data="formobj.scmLastVehrebateCheckapplydetailDetails" border style="width: 100%">
             <el-table-column label="预提年月" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.palceGenDate }}</span>
+                <span>{{ scope.row.withholdingDate }}</span>
               </template>
             </el-table-column>
             <el-table-column label="预提数量" align="center">
@@ -245,7 +245,7 @@ export default {
     newDate() {
       let date = new Date()
       let year = date.getFullYear() // 年
-      let month = date.getMonth() + 1 // 月
+      let month = date.getMonth() // 月
       this.formobj.checkApply = year + '年' + month + '月'
     },
     init() {
@@ -358,7 +358,7 @@ export default {
           }
           let v = 0
           for (var l in this.formobj.scmLastVehrebateCheckapplydetailDetails) {
-            if (this.formobj.scmLastVehrebateCheckapplydetailDetails[l].palceGenDate === bval.palceGenDate) {
+            if (this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdingDate === bval.withholdingDate) {
               this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdingAmount = parseInt(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdingAmount) + parseInt(1)
               this.formobj.scmLastVehrebateCheckapplydetailDetails[l].uploadAmount = parseInt(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].uploadAmount) + parseInt(1)
               this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withRebate = parseInt(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withRebate) + parseInt(bval.withRebate)
@@ -373,7 +373,7 @@ export default {
           }
           if (v === 0) {
             this.formobj.scmLastVehrebateCheckapplydetailDetails.push({
-              palceGenDate: bval.palceGenDate,
+              withholdingDate: bval.withholdingDate,
               withholdingAmount: 1,
               uploadAmount: 1,
               withRebate: bval.withRebate,

anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/relation/yiheduidanchefanli.vue

@@ -238,7 +238,7 @@ export default {
       const aa = []
       const bb = []
       row.forEach((element) => {
-        if (element.palceGenDateCopy === dateTime) {
+        if (element.withholdingDateCopy === dateTime) {
           aa.push({
             sid: element.sid,
             rebateTypeValue: element.rebateTypeValue,
@@ -254,7 +254,7 @@ export default {
         } else {
           bb.push({
             sid: element.sid,
-            palceGenDate: element.palceGenDateCopy,
+            withholdingDate: element.withholdingDateCopy,
             withRebate: element.estimateRebate,
             uploadMoney: element.uploadMoney,
             stayDetermineMoney: element.stayDetermineMoney,

anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholding.vue

@@ -55,9 +55,9 @@
                 <span>{{ scope.row.brandName }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="预提申请" align="center">
+            <el-table-column label="名称" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.withApply }}</span>
+                <span>{{ scope.row.withApply }}单车返利预提申请</span>
               </template>
             </el-table-column>
             <el-table-column label="预提返利" align="center">

anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholdingAdd.vue

@@ -143,8 +143,9 @@ export default {
     // 获取日期
     newDate() {
       let date = new Date()
+      console.log(date.getMonth(), 99999)
       let year = date.getFullYear() // 年
-      let month = date.getMonth() + 1 // 月
+      let month = date.getMonth() // 月
       this.formobj.withApply = year + '年' + month + '月'
     },
     showAdd(createOrgSid) {

anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiEdit.vue

@@ -86,7 +86,7 @@
           <el-table :key="lastVehrebateKey" :data="formobj.scmLastVehrebateCheckapplydetailDetails" border style="width: 100%">
             <el-table-column label="预提年月" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.palceGenDate }}</span>
+                <span>{{ scope.row.withholdingDate }}</span>
               </template>
             </el-table-column>
             <el-table-column label="预提数量" align="center">
@@ -353,7 +353,7 @@ export default {
           }
           let v = 0
           for (var l in this.formobj.scmLastVehrebateCheckapplydetailDetails) {
-            if (this.formobj.scmLastVehrebateCheckapplydetailDetails[l].palceGenDate === bval.palceGenDate) {
+            if (this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdingDate === bval.withholdingDate) {
               this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdingAmount = parseInt(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdingAmount) + parseInt(1)
               this.formobj.scmLastVehrebateCheckapplydetailDetails[l].uploadAmount = parseInt(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].uploadAmount) + parseInt(1)
               this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withRebate = parseInt(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withRebate) + parseInt(bval.withRebate)
@@ -368,7 +368,7 @@ export default {
           }
           if (v === 0) {
             this.formobj.scmLastVehrebateCheckapplydetailDetails.push({
-              palceGenDate: bval.palceGenDate,
+              withholdingDate: bval.withholdingDate,
               withholdingAmount: 1,
               uploadAmount: 1,
               withRebate: bval.withRebate,

anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/relation/yiheduidanchefanli.vue

@@ -238,7 +238,7 @@ export default {
       const aa = []
       const bb = []
       row.forEach((element) => {
-        if (element.palceGenDateCopy === dateTime) {
+        if (element.withholdingDateCopy === dateTime) {
           aa.push({
             sid: element.sid,
             rebateTypeValue: element.rebateTypeValue,
@@ -254,7 +254,7 @@ export default {
         } else {
           bb.push({
             sid: element.sid,
-            palceGenDate: element.palceGenDateCopy,
+            withholdingDate: element.withholdingDateCopy,
             withRebate: element.estimateRebate,
             uploadMoney: element.uploadMoney,
             stayDetermineMoney: element.stayDetermineMoney,