Merge remote-tracking branch 'origin/master'

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/LoanSecondarySalesApply.java

@@ -91,6 +91,8 @@ public class LoanSecondarySalesApply extends BaseEntity {
     private String orgSidPath;
     @ApiModelProperty("销售订单sid")
     private String salesOrderSid;
+    @ApiModelProperty("有效期")
+    private String validityDate;
 
 
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/LoanSecondarySalesApplyDetailsVo.java

@@ -94,5 +94,8 @@ public class LoanSecondarySalesApplyDetailsVo {
     @ApiModelProperty("销售订单sid")
     private String salesOrderSid;
 
+    @ApiModelProperty("有效期")
+    private String validityDate;
+
 
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesbidding/SalesBiddingVo.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.riskcenter.api.loansecondarysalesbidding;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.ArrayList;
@@ -16,4 +17,6 @@ public class SalesBiddingVo {
     private String vinNo;
 
     private List<BiddingVo> biddingList = new ArrayList<>();
+    @ApiModelProperty("是否显示竞价按钮")
+    private boolean validate;
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyMapper.xml

@@ -27,7 +27,9 @@
         la.procInstId
         from loan_secondary_sales_apply la
                  left join loan_secondary_sales_cost lc on lc.mainSid = la.sid
-        left join (select group_concat(lv.vinNo) as vinNo,group_concat(lv.vehMark) as vehmark,lv.mainSid from loan_secondary_sales_veh lv group by lv.mainSid) ss on ss.mainSid = la.sid
+                 left join (select group_concat(lv.vinNo) as vinNo, group_concat(lv.vehMark) as vehmark, lv.mainSid
+                            from loan_secondary_sales_veh lv
+                            group by lv.mainSid) ss on ss.mainSid = la.sid
         <where>
             ${ew.sqlSegment}
         </where>
@@ -97,7 +99,8 @@
                la.beOverdueMoneyAndPeriod,
                la.loanSid,
                la.customerSid,
-               la.salesOrderSid
+               la.salesOrderSid,
+               la.validityDate
         from loan_secondary_sales_apply la
         where sid = #{sid}
     </select>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java

@@ -480,16 +480,7 @@ public class LoanSecondarySalesApplyService extends MybatisBaseService<LoanSecon
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
                 loanSecondarySalesApply = fetchBySid(businessSid);
                 loanSecondarySalesApply.setCloseDate(DateUtil.today());
-                baseMapper.updateById(loanSecondarySalesApply);
-                //推公告
-                PushNoticeQuery pushNoticeQuery = new PushNoticeQuery();
-                pushNoticeQuery.setApp_type("2");
-                pushNoticeQuery.setModuleAction("com.anrui.android.plugin.riskcontrol.activity.DetailCarSecondSaleBiddingActivity");
-                pushNoticeQuery.setUserSid(bv.getUserSid());
-                pushNoticeQuery.setModuleSid("fec4e243-491a-11ec-94cd-fa163e0cb33c");
-                pushNoticeQuery.setSid(businessSid);
-                pushNoticeQuery.setCreateTime(DateUtil.today());
-                pushNoticeQuery.setPcUrl("#/notificationannouncement/relation/secondarysaleannouncement");
+
                 DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
                 String closeDates = "";
                 try {
@@ -502,11 +493,24 @@ public class LoanSecondarySalesApplyService extends MybatisBaseService<LoanSecon
                 } catch (ParseException e) {
                     e.printStackTrace();
                 }
+                loanSecondarySalesApply.setValidityDate(closeDates);
+                baseMapper.updateById(loanSecondarySalesApply);
+                //推公告
+                PushNoticeQuery pushNoticeQuery = new PushNoticeQuery();
+                pushNoticeQuery.setApp_type("2");
+                pushNoticeQuery.setModuleAction("com.anrui.android.plugin.riskcontrol.activity.DetailCarSecondSaleBiddingActivity");
+                pushNoticeQuery.setUserSid(bv.getUserSid());
+                pushNoticeQuery.setModuleSid("fec4e243-491a-11ec-94cd-fa163e0cb33c");
+                pushNoticeQuery.setSid(businessSid);
+                pushNoticeQuery.setCreateTime(DateUtil.today());
+                pushNoticeQuery.setPcUrl("#/notificationannouncement/relation/secondarysaleannouncement");
+
                 pushNoticeQuery.setTitle(loanSecondarySalesApply.getUseOrgName() + "二手车销售公示（竞价截止日期：" + closeDates + "）");
                 pushNoticeQuery.setValidityDate(closeDates);
                 Map<String, Object> maps = new HashMap<>();
                 maps.put("sid", businessSid);
                 pushNoticeQuery.setArgs_json(JSONObject.toJSONString(maps));
+
                 ResultBean resultBeans = sysNoticeFeign.savePushNotice(pushNoticeQuery);
                 LoanSecondarySalesBiddingDto loanSecondarySalesBiddingDto = new LoanSecondarySalesBiddingDto();
                 loanSecondarySalesBiddingDto.setMainSid(businessSid);

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesbidding/LoanSecondarySalesBiddingService.java

@@ -7,10 +7,12 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
+import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.LoanSecondarySalesApply;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesbidding.BiddingVo;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesbidding.LoanSecondarySalesBidding;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesbidding.LoanSecondarySalesBiddingDto;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesbidding.SalesBiddingVo;
+import com.yxt.anrui.riskcenter.biz.loansecondarysalesapply.LoanSecondarySalesApplyService;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.base.utils.StringUtils;
@@ -21,7 +23,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -38,6 +44,8 @@ public class LoanSecondarySalesBiddingService extends MybatisBaseService<LoanSec
     private SysOrganizationFeign sysOrganizationFeign;
     @Autowired
     private SysUserFeign sysUserFeign;
+    @Autowired
+    private LoanSecondarySalesApplyService loanSecondarySalesApplyService;
 
     public ResultBean saveBidding(LoanSecondarySalesBiddingDto dto) {
         ResultBean rb = ResultBean.fireFail();
@@ -102,6 +110,20 @@ public class LoanSecondarySalesBiddingService extends MybatisBaseService<LoanSec
         salesBiddingVo.setBiddingList(list);
         String vinNo = baseMapper.getVinNo(sid);
         salesBiddingVo.setVinNo(vinNo);
+        DateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Date date = new Date();
+        String nowtime = sdf.format(date);//当前时间
+        LoanSecondarySalesApply loanSecondarySalesApply = loanSecondarySalesApplyService.fetchBySid(sid);
+        String endtime = loanSecondarySalesApply.getValidityDate();   //到期时间
+        try {
+            if (sdf.parse(nowtime).getTime() > sdf.parse(endtime).getTime()) {//转成long类型比较
+                salesBiddingVo.setValidate(false);
+            } else if (sdf.parse(nowtime).getTime() <= sdf.parse(endtime).getTime()) {
+                salesBiddingVo.setValidate(true);
+            }
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
         return rb.success().setData(salesBiddingVo);
     }
 }

anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js

@@ -489,19 +489,19 @@ const codemenu = [
       {
         path: '/bikerebate/bikerebatemanagement',
         component: () => import('@/views/bikerebate/bikerebatemanagement/bicyclerebatemanagement.vue'),
-        name: 'bicyclerebatemanagement',
+        name: 'BicycleRebateManagement',
         meta: { title: '单车返利管理', noCache: true }
       },
       {
         path: '/bikerebate/bicyclerebatewithholding',
         component: () => import('@/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholding.vue'),
-        name: 'bicyclerebatewithholding',
+        name: 'BicycleRebateWithholding',
         meta: { title: '单车返利预提', noCache: true }
       },
       {
         path: '/bikerebate/bicyclerebatecheck',
         component: () => import('@/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue'),
-        name: 'bicyclerebatetobechecked',
+        name: 'BicycleRebateToBeChecked',
         meta: { title: '单车返利核对', noCache: true }
       }
     ]
@@ -1076,42 +1076,42 @@ const codemenu = [
     path: '/danchefanliyutiFlow/danchefanliyutiDaiBanInfo',
     component: () =>
       import('@/views/workFlow/danchefanliyutiFlow/danchefanliyutiDaiBanInfo.vue'),
-    name: 'danchefanliyutiDaiBanInfo'
+    name: 'DanCheFanLiYuTiDaiBanInfo'
   },
   // 单车返利预提办理页面
   {
     path: '/danchefanliyutiFlow/danchefanliyutiYiBanInfo',
     component: () =>
       import('@/views/workFlow/danchefanliyutiFlow/danchefanliyutiYiBanInfo.vue'),
-    name: 'danchefanliyutiYiBanInfo'
+    name: 'DanCheFanLiYuTiYiBanInfo'
   },
   // 单车返利预提
   {
     path: '/danchefanliyutiFlow/danchefanliyutiEdit',
     component: () =>
       import('@/views/workFlow/danchefanliyutiFlow/danchefanliyutiEdit.vue'),
-    name: 'danchefanliyutiEdit'
+    name: 'DanCheFanLiYuTiEdit'
   },
   // 单车返利核对申请详情页面
   {
     path: '/danchefanliheduiFlow/danchefanliheduiDaiBanInfo',
     component: () =>
       import('@/views/workFlow/danchefanliheduiFlow/danchefanliheduiDaiBanInfo.vue'),
-    name: 'danchefanliheduiDaiBanInfo'
+    name: 'DanCheFanLiHeDuiDaiBanInfo'
   },
   // 单车返利核对办理页面
   {
     path: '/danchefanliheduiFlow/danchefanliheduiYiBanInfo',
     component: () =>
       import('@/views/workFlow/danchefanliheduiFlow/danchefanliheduiYiBanInfo.vue'),
-    name: 'danchefanliheduiYiBanInfo'
+    name: 'DanCheFanLiHeDuiYiBanInfo'
   },
   // 单车返利核对
   {
     path: '/danchefanliheduiFlow/danchefanliheduiEdit',
     component: () =>
       import('@/views/workFlow/danchefanliheduiFlow/danchefanliheduiEdit.vue'),
-    name: 'danchefanliheduiEdit'
+    name: 'DanCheFanLiHeDuiEdit'
   },
   // 专项返利预提申请详情页面
   {

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

@@ -129,7 +129,7 @@ import bicyclerebatecheckInfo from './bicyclerebatecheckInfo'
 import {getStorage} from "@/utils/auth";
 
 export default {
-  name: 'bicyclerebatecheck',
+  name: 'BicycleRebateCheck',
   components: {
     Pagination,
     pageye,
@@ -175,7 +175,10 @@ export default {
           checkApply: '',
           createOrgSid: '',
           createEndTime: '',
-          createStartTime: ''
+          createStartTime: '',
+          orgPath: '',
+          userSid: '',
+          menuUrl: ''
         },
         current: 1,
         size: 5,
@@ -275,6 +278,9 @@ export default {
     // 查询列表信息
     getList() {
       this.listLoading = true
+      this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
+      this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+      this.listQuery.params.menuUrl = this.$route.path
       req.pagelist(this.listQuery).then((response) => {
         console.log('列表查询结果：', response)
         this.listLoading = false
@@ -299,7 +305,10 @@ export default {
           checkApply: '',
           createOrgSid: '',
           createEndTime: '',
-          createStartTime: ''
+          createStartTime: '',
+          orgPath: '',
+          userSid: '',
+          menuUrl: ''
         },
         current: 1,
         size: 5,

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

@@ -200,7 +200,7 @@ import yiheduidanchefanli from './relation/yiheduidanchefanli'
 import bicyclerebatetobecheckedAdd from './relation/bicyclerebatetobecheckedAdd'
 
 export default {
-  name: 'bicyclerebatecheckAdd',
+  name: 'BicycleRebateCheckAdd',
   components: {
     yiheduidanchefanli,
     bicyclerebatetobecheckedAdd
@@ -233,6 +233,7 @@ export default {
         remarks: '',
         instanceId: '', // 流程实例ID
         taskId: '', // 任务ID
+        orgPath: '',
         scmWhenVehrebateCheckapplydetailDetails: [],
         scmLastVehrebateCheckapplydetailDetails: []
       },
@@ -272,6 +273,7 @@ export default {
       this.formobj.useOrgSid = createOrgSid
       this.formobj.createByName = window.sessionStorage.getItem('name')
       this.formobj.createBySid = window.sessionStorage.getItem('userSid')
+      this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath')
       this.viewTitle = '【新增】单车返利核对审核申请'
     },
     showEdit(row) {
@@ -531,6 +533,7 @@ export default {
         remarks: '',
         instanceId: '', // 流程实例ID
         taskId: '', // 任务ID
+        orgPath: '',
         scmWhenVehrebateCheckapplydetailDetails: [],
         scmLastVehrebateCheckapplydetailDetails: []
       }

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

@@ -146,7 +146,7 @@ import req from '@/api/bikerebate/bicyclerebatecheck'
 import bicyclerebatetobecheckedInfo from './relation/bicyclerebatetobecheckedInfo'
 
 export default {
-  name: 'bicyclerebatecheckInfo',
+  name: 'BicycleRebateCheckInfo',
   components: {
     bicyclerebatetobecheckedInfo
   },

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

@@ -277,7 +277,7 @@ import bicyclerebatecheckAdd from './bicyclerebatecheckAdd'
 import { brandDown, getOrgSidByPath, typeValues } from '@/api/cheliang/dictcommons'
 
 export default {
-  name: 'bicyclerebatetobechecked',
+  name: 'BicycleRebateToBeChecked',
   components: {
     Pagination,
     ButtonBar,
@@ -351,7 +351,10 @@ export default {
           rebateName: '',
           state: '',
           createEndTime: '',
-          createStartTime: ''
+          createStartTime: '',
+          orgPath: '',
+          userSid: '',
+          menuUrl: ''
         },
         current: 1,
         size: 5,
@@ -446,6 +449,9 @@ export default {
     // 查询列表信息
     getList() {
       this.listLoading = true
+      this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
+      this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+      this.listQuery.params.menuUrl = this.$route.path
       req.listPage(this.listQuery).then((response) => {
         console.log('列表查询结果：', response)
         this.listLoading = false
@@ -473,7 +479,10 @@ export default {
           rebateName: '',
           state: '',
           createEndTime: '',
-          createStartTime: ''
+          createStartTime: '',
+          orgPath: '',
+          userSid: '',
+          menuUrl: ''
         },
         current: 1,
         size: 5,

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

@@ -113,10 +113,9 @@
 
 <script>
 import req from '@/api/bikerebate/bicyclerebatecheck'
-import list from "@/views/vehicleModel/vehicleModelConfig/list";
 
 export default {
-  name: 'bicyclerebatetobecheckedAdd',
+  name: 'BicycleRebateToBeCheckedAdd',
   data() {
     return {
       viewTitle: '',

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

@@ -113,7 +113,7 @@
 import req from '@/api/bikerebate/bicyclerebatecheck'
 
 export default {
-  name: 'bicyclerebatetobecheckedInfo',
+  name: 'BicycleRebateToBeCheckedInfo',
   data() {
     return {
       viewTitle: '',

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

@@ -147,7 +147,7 @@ import Pagination from '@/components/pagination'
 import ButtonBar from '@/components/ButtonBar'
 
 export default {
-  name: 'yiheduidanchefanli',
+  name: 'YiHeDuiDanCheFanLi',
   components: {
     Pagination,
     ButtonBar

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

@@ -102,7 +102,7 @@ import bicyclerebatewithholdingInfo from './bicyclerebatewithholdingInfo'
 import { getStorage } from '@/utils/auth'
 
 export default {
-  name: 'bicyclerebatewithholding',
+  name: 'BicycleRebateWithholding',
   components: {
     Pagination,
     pageye,
@@ -151,9 +151,12 @@ export default {
       brand_list: [],
       listQuery: {
         params: {
-          createBySid: '',
+          brandSid: '',
           createEndTime: '',
-          createStartTime: ''
+          createStartTime: '',
+          orgPath: '',
+          userSid: '',
+          menuUrl: ''
         },
         current: 1,
         size: 5,
@@ -256,7 +259,9 @@ export default {
     // 查询列表信息
     getList() {
       this.listLoading = true
-      this.listQuery.params.createBySid = window.sessionStorage.getItem('userSid')
+      this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
+      this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+      this.listQuery.params.menuUrl = this.$route.path
       req.listPage(this.listQuery).then((response) => {
         console.log('列表查询结果：', response)
         this.listLoading = false
@@ -277,9 +282,12 @@ export default {
     handleReset() {
       this.listQuery = {
         params: {
-          createBySid: '',
+          brandSid: '',
           createEndTime: '',
-          createStartTime: ''
+          createStartTime: '',
+          orgPath: '',
+          userSid: '',
+          menuUrl: ''
         },
         current: 1,
         size: 5,

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

@@ -93,7 +93,7 @@ import danchefanliselect from './relation/danchefanliselect'
 import danchefanliAdd from './relation/danchefanliAdd'
 
 export default {
-  name: 'bicyclerebatewithholdingAdd',
+  name: 'BicycleRebateWithholdingAdd',
   components: {
     danchefanliselect,
     danchefanliAdd
@@ -120,6 +120,7 @@ export default {
         createBySid: '',
         instanceId: '', // 流程实例ID
         taskId: '', // 任务ID
+        orgPath: '',
         scmVehRebateWiths: []
       },
       rules: {},
@@ -159,6 +160,7 @@ export default {
       this.formobj.createOrgSid = createOrgSid
       this.formobj.useOrgSid = createOrgSid
       this.formobj.createByName = window.sessionStorage.getItem('name')
+      this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath')
       this.viewTitle = '【新增】预提申请'
     },
     showEdit(row) {
@@ -392,6 +394,7 @@ export default {
         createBySid: '',
         instanceId: '', // 流程实例ID
         taskId: '', // 任务ID
+        orgPath: '',
         scmVehRebateWiths: []
       }
       this.$refs['form_obj'].resetFields()

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

@@ -81,7 +81,7 @@ import req from '@/api/bikerebate/bicyclerebatewithholding'
 import danchefanliInfo from './relation/danchefanliInfo'
 
 export default {
-  name: 'bicyclerebatewithholdingInfo',
+  name: 'BicycleRebateWithholdingInfo',
   components: {
     danchefanliInfo
   },

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

@@ -85,7 +85,7 @@
 import req from '@/api/bikerebate/bicyclerebatewithholding'
 
 export default {
-  name: 'danchefanliAdd',
+  name: 'DanCheFanLiAdd',
   data() {
     return {
       viewTitle: '',

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

@@ -83,7 +83,7 @@
 import req from '@/api/bikerebate/bicyclerebatewithholding'
 
 export default {
-  name: 'danchefanliInfo',
+  name: 'DanCheFanLiInfo',
   data() {
     return {
       viewTitle: '',

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

@@ -115,7 +115,7 @@ import ButtonBar from '@/components/ButtonBar'
 import { typeValues } from '@/api/cheliang/dictcommons'
 
 export default {
-  name: 'danchefanliSelect',
+  name: 'DanCheFanLiSelect',
   components: {
     Pagination,
     ButtonBar

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

@@ -169,7 +169,7 @@ import req from '@/api/bikerebate/bicyclerebatecheck'
 import bicyclerebatetobecheckedInfo from './relation/bicyclerebatetobecheckedInfo'
 
 export default {
-  name: 'danchefanliheduiDaiBanInfo',
+  name: 'DanCheFanLiHeDuiDaiBanInfo',
   components: {
     bicyclerebatetobecheckedInfo
   },

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

@@ -199,7 +199,7 @@ import yiheduidanchefanli from './relation/yiheduidanchefanli'
 import bicyclerebatetobecheckedAdd from './relation/bicyclerebatetobecheckedAdd'
 
 export default {
-  name: 'danchefanliheduiEdit',
+  name: 'DanCheFanLiHeDuiEdit',
   components: {
     yiheduidanchefanli,
     bicyclerebatetobecheckedAdd
@@ -231,6 +231,7 @@ export default {
         remarks: '',
         instanceId: '', // 流程实例ID
         taskId: '', // 任务ID
+        orgPath: '',
         scmWhenVehrebateCheckapplydetailDetails: [],
         scmLastVehrebateCheckapplydetailDetails: []
       },

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

@@ -146,7 +146,7 @@ import req from '@/api/bikerebate/bicyclerebatecheck'
 import bicyclerebatetobecheckedInfo from './relation/bicyclerebatetobecheckedInfo'
 
 export default {
-  name: 'danchefanliheduiYiBanInfo',
+  name: 'DanCheFanLiHeDuiYiBanInfo',
   components: {
     bicyclerebatetobecheckedInfo
   },

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

@@ -113,10 +113,9 @@
 
 <script>
 import req from '@/api/bikerebate/bicyclerebatecheck'
-import list from "@/views/vehicleModel/vehicleModelConfig/list";
 
 export default {
-  name: 'bicyclerebatetobecheckedAdd',
+  name: 'BicycleRebateToBeCheckedAdd',
   data() {
     return {
       viewTitle: '',

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

@@ -113,7 +113,7 @@
 import req from '@/api/bikerebate/bicyclerebatecheck'
 
 export default {
-  name: 'bicyclerebatetobecheckedInfo',
+  name: 'BicycleRebateToBeCheckedInfo',
   data() {
     return {
       viewTitle: '',

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

@@ -147,7 +147,7 @@ import Pagination from '@/components/pagination'
 import ButtonBar from '@/components/ButtonBar'
 
 export default {
-  name: 'yiheduidanchefanli',
+  name: 'YiHeDuidDanCheFanLi',
   components: {
     Pagination,
     ButtonBar

anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/danchefanliyutiDaiBanInfo.vue

@@ -104,7 +104,7 @@ import req from '@/api/bikerebate/bicyclerebatewithholding'
 import danchefanliInfo from './relation/danchefanliInfo'
 
 export default {
-  name: 'danchefanliyutiDaiBanInfo',
+  name: 'DanCheFanLiYuTiDaiBanInfo',
   components: {
     danchefanliInfo
   },

anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/danchefanliyutiEdit.vue

@@ -87,12 +87,12 @@
 
 <script>
 import req from '@/api/bikerebate/bicyclerebatewithholding'
-import { brandDown, fetchBySid } from '@/api/cheliang/dictcommons'
+import { brandDown } from '@/api/cheliang/dictcommons'
 import danchefanlichoose from './relation/danchefanlichoose'
 import danchefanliAdd from './relation/danchefanliAdd'
 
 export default {
-  name: 'bicyclerebatewithholdingAdd',
+  name: 'DanCheFanLiYuTiEdit',
   components: {
     danchefanlichoose,
     danchefanliAdd
@@ -118,6 +118,7 @@ export default {
         createBySid: '',
         instanceId: '', // 流程实例ID
         taskId: '', // 任务ID
+        orgPath: '',
         scmVehRebateWiths: []
       },
       rules: {},

anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/danchefanliyutiYiBanInfo.vue

@@ -81,7 +81,7 @@ import req from '@/api/bikerebate/bicyclerebatewithholding'
 import danchefanliInfo from './relation/danchefanliInfo'
 
 export default {
-  name: 'danchefanliyutiYiBanInfo',
+  name: 'DanCheFanLiYuTiYiBanInfo',
   components: {
     danchefanliInfo
   },

anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/relation/danchefanliAdd.vue

@@ -85,7 +85,7 @@
 import req from '@/api/bikerebate/bicyclerebatewithholding'
 
 export default {
-  name: 'danchefanliAdd',
+  name: 'DanCheFanLiAdd',
   data() {
     return {
       viewTitle: '',

anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/relation/danchefanliInfo.vue

@@ -83,7 +83,7 @@
 import req from '@/api/bikerebate/bicyclerebatewithholding'
 
 export default {
-  name: 'danchefanliInfo',
+  name: 'DanCheFanLiInfo',
   data() {
     return {
       viewTitle: '',

anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/relation/danchefanlichoose.vue

@@ -115,7 +115,7 @@ import ButtonBar from '@/components/ButtonBar'
 import { typeValues } from '@/api/cheliang/dictcommons'
 
 export default {
-  name: 'danchefanlichoose',
+  name: 'DanCheFanLiChoose',
   components: {
     Pagination,
     ButtonBar