Merge remote-tracking branch 'origin/master'

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java

@@ -404,7 +404,9 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
         if (!voucherDetails.isEmpty()) {
             for (GeneralVoucher.GeneralVoucherDetail voucherDetail : voucherDetails) {
                 timeFlag = voucherDetail.getTimeFlag();
-                deptNo = voucherDetail.getDeptCode();
+                if (!voucherDetail.getRemarks().equals("金融贴息")) {
+                    deptNo = voucherDetail.getDeptCode();
+                }
                 manufacturer = voucherDetail.getManufacturer();
                 if (voucherDetail.getRemarks().equals("金融贴息")) {
                     if (voucherDetail.getSceneCode().equals("1161.01.16")) {

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java

@@ -68,7 +68,6 @@ import com.yxt.anrui.scm.api.scmvehrebatecheckapply.flow.SubmitScmVehRebateCheck
 import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailDetailsVo;
 import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailDto;
 import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailVo;
-import com.yxt.anrui.scm.api.scmvehrebatewithapply.ScmVehRebateWithApply;
 import com.yxt.anrui.scm.biz.scmvehrebate.ScmVehRebateService;
 import com.yxt.anrui.scm.biz.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailService;
 import com.yxt.anrui.scm.biz.scmvehrebatewithapply.ScmVehRebateWithApplyService;
@@ -534,8 +533,8 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
             String finalSummaryTag = summaryTag;
             String[] split = finalSummaryTag.split("年");
             String y1 = split[0]; //预提申请标题年份
-            map.forEach((k, v) -> {
+            for (Map.Entry<String, List<ScmVehRebate>> entry : map.entrySet()) {
-                List<ScmVehRebate> rebates = v;
+                List<ScmVehRebate> v = entry.getValue();
                 GeneralVoucher generalVoucher = new GeneralVoucher();
                 generalVoucher.setBussDate(format);
                 List<GeneralVoucher.GeneralVoucherDetail> voucherDetails = new ArrayList<>();
@@ -712,7 +711,7 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
                                             voucherDetail2.setTimeFlag(finalSummaryTag);
                                             voucherDetail2.setCustomerCode("DZFCJFL"); //客户编码
                                             voucherDetail2.setAmount(adMoney);
-                                            voucherDetail2.setSceneCode("1161.04.00");
+                                            voucherDetail2.setSceneCode("2181.07.00");
                                             voucherDetail2.setRemarks("预留费用调整");
                                             voucherDetails.add(voucherDetail2);
                                         }
@@ -827,12 +826,12 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
                         generalVoucher.setVoucherDetails(voucherDetails);
                         finKingDeeFeign.saveRebateReviewVoucher(generalVoucher);
                     }
-                    if (!resultDetails.isEmpty()) {
+//                    if (!resultDetails.isEmpty()) {
-                        costAdjustmentsBill.setResultDetails(resultDetails);
+//                        costAdjustmentsBill.setResultDetails(resultDetails);
-                        finKingDeeFeign.pushCostAdjustmentsBill(costAdjustmentsBill);
+//                        finKingDeeFeign.pushCostAdjustmentsBill(costAdjustmentsBill);
-                    }
+//                    }
                 }
-            });
+            }
         }
 
 

anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatecheck.js

@@ -100,9 +100,9 @@ export default {
     })
   },
   // 查看明细
-  vehRebateCheckDetails: function(data) {
+  vehRebateGroupDetails: function(data) {
     return request({
-      url: '/scm/v1/scmvehrebatecheckapplydetail/vehRebateCheckDetails/' + data,
+      url: '/scm/v1/scmvehrebatecheckapplydetail/vehRebateGroupDetails/' + data,
       method: 'get'
     })
   },

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

@@ -366,9 +366,9 @@ export default {
           })
         }
       })
-      let k = 0
       // 按照预提年月统计
       this.formobj.scmVehrebateCheckapplydetailList.forEach((s) => {
+        let k = 0
         for (var l in this.formobj.scmLastVehrebateCheckapplydetailDetails) {
           if (this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate && this.formobj.scmLastVehrebateCheckapplydetailDetails[l].purchaseSystemName === s.purchaseSystemName && this.formobj.scmLastVehrebateCheckapplydetailDetails[l].brandName === s.brandName) {
             this.formobj.scmLastVehrebateCheckapplydetailDetails[l].num = parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].num) + parseFloat(1)

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

@@ -56,8 +56,8 @@
             <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
             <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
             <el-table-column label="明细" align="center" min-width="100">
-              <template>
+              <template slot-scope="scope">
-                <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
+                <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -76,8 +76,8 @@
             <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
             <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
             <el-table-column label="明细" align="center" min-width="100">
-              <template>
+              <template slot-scope="scope">
-                <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
+                <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -153,9 +153,9 @@ export default {
         this.formobj = row
       })
     },
-    handleLook() {
+    handleLook(row) {
       this.viewState = 2
-      this.$refs['divInfo'].showInfo(this.formobj.sid)
+      this.$refs['divInfo'].showInfo(row.vehRebateSids)
     },
     resetState() {
       this.viewState = 1

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

@@ -30,9 +30,7 @@
                 <el-date-picker v-model="listQuery.params.createEndTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
               </el-form-item>
               <el-form-item label="返利类型">
-                <el-select v-model="listQuery.params.rebateTypeKey" placeholder="请选择" filterable clearable>
+                <el-input v-model="listQuery.params.rebateTypeValue" placeholder="" clearable/>
-                  <el-option v-for="item in rebateType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
-                </el-select>
               </el-form-item>
               <el-form-item label="返利名称">
                 <el-input v-model="listQuery.params.rebateName" placeholder="" clearable/>
@@ -254,7 +252,7 @@ import ButtonBar from '@/components/ButtonBar'
 import bicyclerebatecheck from './bicyclerebatecheck'
 import bicyclerebatecheckAdd from './bicyclerebatecheckAdd'
 import bicyclerebatetobecheckedByUpdate from './bicyclerebatetobecheckedByUpdate'
-import { brandDown, getOrgSidByPath, typeValues } from '@/api/cheliang/dictcommons'
+import { getOrgSidByPath } from '@/api/cheliang/dictcommons'
 
 export default {
   name: 'BicycleRebateToBeChecked',
@@ -293,7 +291,6 @@ export default {
       list: [],
       sids: [],
       FormLoading: false,
-      rebateType_list: [],
       state_list: [
         {
           dictKey: '0',
@@ -312,7 +309,7 @@ export default {
           brandName: '',
           createOrgSid: '',
           vinNo: '',
-          rebateTypeKey: '',
+          rebateTypeValue: '',
           rebateName: '',
           state: '',
           createEndTime: '',
@@ -371,11 +368,6 @@ export default {
   },
   methods: {
     init() {
-      typeValues({ type: 'rebateType' }).then((res) => {
-        if (res.success) {
-          this.rebateType_list = res.data
-        }
-      })
       getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
         if (resp.success) {
           this.listQuery.params.createOrgSid = resp.data
@@ -450,7 +442,7 @@ export default {
           brandName: '',
           createOrgSid: '',
           vinNo: '',
-          rebateTypeKey: '',
+          rebateTypeValue: '',
           rebateName: '',
           state: '',
           createEndTime: '',

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

@@ -75,12 +75,12 @@ export default {
     }
   },
   methods: {
-    showInfo(sid) {
+    showInfo(vehRebateSids) {
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
       })
       this.viewTitle = '单车返利核对审核申请明细'
-      req.vehRebateCheckDetails(sid).then((resp) => {
+      req.vehRebateGroupDetails(vehRebateSids).then((resp) => {
         if (resp.success) {
           this.list = resp.data
         }

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

@@ -56,8 +56,8 @@
             <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
             <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
             <el-table-column label="明细" align="center" min-width="100">
-              <template>
+              <template slot-scope="scope">
-                <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
+                <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -76,8 +76,8 @@
             <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
             <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
             <el-table-column label="明细" align="center" min-width="100">
-              <template>
+              <template slot-scope="scope">
-                <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
+                <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -223,9 +223,9 @@ export default {
         this.formobj = {}
       })
     },
-    handleLook() {
+    handleLook(row) {
       this.viewState = 2
-      this.$refs['divInfo'].showInfo(this.formobj.sid)
+      this.$refs['divInfo'].showInfo(row.vehRebateSids)
     },
     resetState() {
       this.viewState = 1

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

@@ -334,9 +334,9 @@ export default {
           })
         }
       })
-      let k = 0
       // 按照预提年月统计
       this.formobj.scmVehrebateCheckapplydetailList.forEach((s) => {
+        let k = 0
         for (var l in this.formobj.scmLastVehrebateCheckapplydetailDetails) {
           if (this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate && this.formobj.scmLastVehrebateCheckapplydetailDetails[l].purchaseSystemName === s.purchaseSystemName && this.formobj.scmLastVehrebateCheckapplydetailDetails[l].brandName === s.brandName) {
             this.formobj.scmLastVehrebateCheckapplydetailDetails[l].num = parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].num) + parseFloat(1)

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

@@ -56,8 +56,8 @@
             <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
             <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
             <el-table-column label="明细" align="center" min-width="100">
-              <template>
+              <template slot-scope="scope">
-                <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
+                <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -76,8 +76,8 @@
             <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
             <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
             <el-table-column label="明细" align="center" min-width="100">
-              <template>
+              <template slot-scope="scope">
-                <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
+                <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -189,9 +189,9 @@ export default {
         this.formobj = {}
       })
     },
-    handleLook() {
+    handleLook(row) {
       this.viewState = 2
-      this.$refs['divInfo'].showInfo(this.formobj.sid)
+      this.$refs['divInfo'].showInfo(row.vehRebateSids)
     },
     resetState() {
       this.viewState = 1

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

@@ -75,12 +75,12 @@ export default {
     }
   },
   methods: {
-    showInfo(sid) {
+    showInfo(vehRebateSids) {
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
       })
       this.viewTitle = '单车返利核对审核申请明细'
-      req.vehRebateCheckDetails(sid).then((resp) => {
+      req.vehRebateGroupDetails(vehRebateSids).then((resp) => {
         if (resp.success) {
           this.list = resp.data
         }