Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrder.java

@@ -111,4 +111,6 @@ public class BusSalesOrder extends BaseEntity {
     private String customerClass;
     @ApiModelProperty(value = "客户头像")
     private String customerPhoto;
+    @ApiModelProperty(value = "任务编号id")
+    private String taskId;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderVo.java

@@ -77,4 +77,7 @@ public class BusSalesOrderVo implements Vo {
     @ApiModelProperty(value = "是否保险")
     private String isInsurance;
 
+    @ApiModelProperty(value = "任务编号id")
+    private String taskId;
+
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java

@@ -57,7 +57,7 @@ public interface BusSalesOrderMapper extends BaseMapper<BusSalesOrder> {
     IPage<BusSalesOrderVo> selectPageVo(IPage<BusSalesOrder> page, @Param(Constants.WRAPPER) Wrapper<BusSalesOrder> qw);
 
     void modifyFlowState(@Param("businessSid") String businessSid, @Param("procDefId") String procDefId, @Param("nodeState") String nodeState,
-                         @Param("procInstSid") String procInstSid, @Param("nodeSid") String nodeSid);
+                         @Param("procInstSid") String procInstSid, @Param("nodeSid") String nodeSid,@Param("taskId")String taskId);
 
 
     @Update("update bus_sales_order set oneBillMoney = #{oneBillMoney} where sid = #{orderSid}")

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml

@@ -17,7 +17,8 @@
                bd.depositAll,
                case bo.isInsurance
                    when 0 then '否'
-                   when 1 then '是' end                as isInsurance
+                   when 1 then '是' end                as isInsurance,
+               bo.taskId
         FROM bus_sales_order bo
                  left join bus_sales_order_model bm on bm.salesOrderSid = bo.sid
                  left join bus_sales_order_price bp on bp.salesOrderSid = bo.sid
@@ -32,7 +33,8 @@
         set procDefId=#{procDefId},
             nodeState=#{nodeState},
             procInstId=#{procInstSid},
-            nodeId=#{nodeSid}
+            nodeId=#{nodeSid},
+            taskId = #{taskId}
         where sid = #{businessSid}
     </update>
     <!--app查询销售订单列表-->

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -686,7 +686,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                         ProcDefEnum.SALESORDER.getProDefId(),
                         map.get("nodeState"),
                         map.get("procInsId"),
-                        map.get("taskDefKey")
+                        map.get("taskDefKey"),
+                        map.get("taskId")
                 );
             } else {
                 return rb.setMsg(businessResultBean.getMsg());
@@ -760,7 +761,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         ResultBean<BaseOrderPostPriceVo> resultBean1 = basePostPriceFeign.selectPostPrice(baseOrderPostPriceQuery);
         if (resultBean1.getSuccess()) {
             String price = resultBean1.getData().getPrice();
-            //ToDo:计算是否有权限：岗位权限（销售部经理权限、总经理权限）+总促销金额<总指导价-总成交价-优惠包总价值
+            //ToDo:计算是否超权限：岗位权限（销售部经理权限、总经理权限）+总促销金额<总指导价-总成交价-优惠包总价值
             //销售支持部经理的岗位权限价格
             BigDecimal bigDecimal2 = new BigDecimal(price);
             bigDecimalTwo = bigDecimal2.add(initBigDecimal);
@@ -822,12 +823,12 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
 
     private void modifyFlowState(String businessSid, String proDefId, String nodeState,
                                  String procInsId,
-                                 String taskDefKey) {
+                                 String taskDefKey,String taskId) {
         baseMapper.modifyFlowState(businessSid,
                 proDefId,
                 nodeState,
                 procInsId,
-                taskDefKey);
+                taskDefKey,taskId);
     }
 
     public ResultBean complete(BusSalesOrderFlowQuery busSalesOrderFlowQuery) {
@@ -842,6 +843,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         }
         String nodeState = "";
         String taskDefKey = "";
+        String taskId = "";
         Map<String, Object> map = new HashMap<>();
         map.put("businessSid", variables.get("businessSid").toString());
         if (resultBean.getData() != null) {
@@ -849,9 +851,12 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             if (listResultBean.getSuccess() && listResultBean.getData().size() != 0) {
                 nodeState = listResultBean.getData().get(0).getName_();
                 taskDefKey = listResultBean.getData().get(0).getTask_def_key_();
+                taskId = listResultBean.getData().get(0).getId_();
+
             } else {
                 nodeState = ProcessStateEnum.FINISHED.getStateName();
                 taskDefKey = "Event_end";
+                taskId = variables.get("taskId").toString();
                 map.put("flowState", SysFormLinkFlowStateEnum.FINISH.getCode());
                 //更新销售订单的状态为已通过的状态:审批通过2
                 //ToDo:
@@ -866,7 +871,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 ProcDefEnum.SALESORDER.getProDefId(),
                 nodeState,
                 variables.get("instanceId").toString(),
-                taskDefKey);
+                taskDefKey,
+                taskId);
        /* map.put("nodeState", nodeState);
         map.put("taskDefKey", taskDefKey);
         sysFormLinkFeign.updateFiled(map);*/
@@ -893,14 +899,21 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         String nodeState = resultBean.getData().get(0).getName_();
         String taskDefKey = resultBean.getData().get(0).getTask_def_key_();
         String incomingSourceRef = resultBean.getData().get(0).getIncomingSourceRef();
-        Map<String, Object> map = new HashMap<>();
+        //更新业务表中的流程状态
+        modifyFlowState(dto.getBusinessSid(),
+                ProcDefEnum.SALESORDER.getProDefId(),
+                nodeState,
+                dto.getInstanceId(),
+                taskDefKey,
+                resultBean.getData().get(0).getId_());
+       /* Map<String, Object> map = new HashMap<>();
         map.put("businessSid", dto.getBusinessSid());
         map.put("nodeState", nodeState);
         map.put("taskDefKey", taskDefKey);
         if (incomingSourceRef.contains("start")) {
             map.put("flowState", SysFormLinkFlowStateEnum.REJECT.getCode());
         }
-        sysFormLinkFeign.updateFiled(map);
+        sysFormLinkFeign.updateFiled(map);*/
         return new ResultBean().success();
     }
 
@@ -913,12 +926,19 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         if (!resultBean.getSuccess()) {
             return resultBean;
         }
-        Map<String, Object> map = new HashMap<>();
+        //更新业务表中的流程状态
+        modifyFlowState(dto.getBusinessSid(),
+                ProcDefEnum.SALESORDER.getProDefId(),
+                String.valueOf(resultBean.getData()),
+                dto.getInstanceId(),
+                "Event_end",
+                dto.getTaskId());
+       /* Map<String, Object> map = new HashMap<>();
         map.put("businessSid", dto.getBusinessSid());
         map.put("nodeState", String.valueOf(resultBean.getData()));
         map.put("taskDefKey", "Event_end");
         map.put("flowState", SysFormLinkFlowStateEnum.BREAK.getCode());
-        sysFormLinkFeign.updateFiled(map);
+        sysFormLinkFeign.updateFiled(map);*/
         return resultBean.success();
     }
 
@@ -932,7 +952,18 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         String nodeState = resultBean.getData().get(0).getName_();
         String taskDefKey = resultBean.getData().get(0).getTask_def_key_();
         String inComingSourceRef = resultBean.getData().get(0).getIncomingSourceRef();
-        Map<String, Object> map = new HashMap<>();
+        if (inComingSourceRef.contains("start")) {
+            nodeState = SysFormLinkFlowStateEnum.UNCOMMITTED.getState();
+        } else {
+            nodeState = nodeState;
+
+        }
+        modifyFlowState(dto.getBusinessSid(),
+                ProcDefEnum.SALESORDER.getProDefId(),
+                nodeState,
+                dto.getInstanceId(),
+                taskDefKey,resultBean.getData().get(0).getId_());
+       /* Map<String, Object> map = new HashMap<>();
         map.put("businessSid", dto.getBusinessSid());
         if (inComingSourceRef.contains("start")) {
             map.put("nodeState", SysFormLinkFlowStateEnum.UNCOMMITTED.getState());
@@ -942,7 +973,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             map.put("nodeState", nodeState);
             map.put("taskDefKey", taskDefKey);
         }
-        sysFormLinkFeign.updateFiled(map);
+        sysFormLinkFeign.updateFiled(map);*/
         return new ResultBean().success();
     }
 

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanEdit.vue

@@ -524,7 +524,6 @@
             <el-col :span="4" class="baoxianInput">
               <el-form-item>
                 <el-input v-model="temp.busSalesOrderInsurance.insuranceNum"
-                          oninput="temp.busSalesOrderInsurance.insuranceNum=temp.busSalesOrderInsurance.insuranceNum.replace(/[^\d]/g,'')"
                           class="addinputw" clearable
                           placeholder="请输入公司入保期数"/>
               </el-form-item>

anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/xiaoshoudingdanAdd.vue

@@ -445,7 +445,7 @@
             </el-row>
           </div>
           <!-- ==================== 主车优惠明细 ======================================== -->
-          <el-collapse v-model="activeNames" @change="handleChange">
+          <el-collapse v-model="activeNames">
             <el-collapse-item name="2">
               <template slot="title">
                 主车优惠明细
@@ -526,7 +526,6 @@
             <el-col :span="4" class="baoxianInput">
               <el-form-item>
                 <el-input v-model="temp.busSalesOrderInsurance.insuranceNum"
-                          oninput="temp.busSalesOrderInsurance.insuranceNum=temp.busSalesOrderInsurance.insuranceNum.replace(/[^\d]/g,'')"
                           class="addinputw" clearable
                           placeholder="请输入公司入保期数"/>
               </el-form-item>
@@ -1375,9 +1374,6 @@ export default {
       this.getType()
     },
 
-    handleChange(val) {
-      console.log(val);
-    },
     // // ---------------- 上传附件 ----------------
     // 上传附件 服务器返回的内容
     uploadSuccessHetong(response, file) {
@@ -1387,11 +1383,8 @@ export default {
       console.log('已上传成功的合同', this.temp.busSalesOrderMakeup.contractPath)
     },
     uploadSuccessKuanxiang(response, file) {
-      console.log('112233', scope.row.payPath)
       console.log('上传款项附件response:', response)
       console.log('上传款项附件file:', file)
-      // row.payPath = response.data.fullUrl
-      // console.log('款项payPath',row.payPath)
     },
 
     // ---------------- 计算属性 ----------------
@@ -1425,15 +1418,12 @@ export default {
       }
       // 选择采购订单时
       if (this.isXuanzeShow == '2') {
-        console.log('采购订单长度',this.temp.busSalesVehicleOrderList)
         if (this.temp.busSalesVehicleOrderList.length > 0) {
           const taishu = []
           this.temp.busSalesVehicleOrderList.forEach((element) => {
-            console.log('采购订单本次使用的台数',element.usingNum)
             if (element.usingNum !== undefined) {
               taishu.push(element.usingNum)
             }
-            console.log('台数', element.usingNum)
           })
           if (taishu.length > 0) {
             this.temp.busSalesOrderPrice.quantity = taishu.reduce(this.getSum);
@@ -2061,7 +2051,6 @@ export default {
     },
     // 现车查询
     getXiancheList() {
-      console.log('type',this.temp.busSalesOrderModel.type)
       this.xiancheLoading = true
       this.xiancheList.params.customerSid = this.temp.customerSid
       this.xiancheList.params.modelConfigSid = this.temp.busSalesOrderModel.modelConfigSid
@@ -2174,7 +2163,6 @@ export default {
             return
           } else {
             const caigouSids = []
-            console.log('123',this.caigouChoice[i])
             // this.temp.busSalesVehicleOrderList.push(this.caigouChoice[i])
             this.temp.busSalesVehicleOrderList.push({
               linkNo: this.caigouChoice[i].linkNo,

anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/xiaoshoudingdanSubmit.vue

@@ -441,32 +441,23 @@ export default {
       const choosetItem = this.zhongjie_list.filter(
         (item) => item.distributorSid == val
       )
-      this.temp.busSalesOrderSubmit.distributorName = choosetItem[0].distributorName
-      this.temp.busSalesOrderSubmit.distributorMobile = choosetItem[0].businessMobile
+      this.busSalesOrderSubmit.distributorName = choosetItem[0].distributorName
+      this.busSalesOrderSubmit.distributorMobile = choosetItem[0].businessMobile
     },
     // 引荐人
     yinjianChange(val) {
       const choosetItem = this.yinjian_list.filter(
         (item) => item.staffSid == val
       )
-      this.temp.busSalesOrderSubmit.name = choosetItem[0].staffName
+      this.busSalesOrderSubmit.name = choosetItem[0].staffName
     },
     showSubmit(temp, nodeState) {
       this.temp = temp
       console.log('提交时的temp', this.temp)
-      const index = this.temp.busSalesOrderMakeup.contractPath.lastIndexOf('/')
-      this.contractName = this.temp.busSalesOrderMakeup.contractPath.substring(index + 1, this.temp.busSalesOrderMakeup.contractPath.length)
-      // this.temp.busSalesOrderSubmit = {
-      //   priceRemarks: '',  // 价格说明
-      //   discountRemarks: '',  // 优惠说明
-      //   distributorName: '',  // 中介名称
-      //   distributorMobile: '',  // 联系电话
-      //   distributorSid: '',  // 中介单位sid
-      //   distributorPrice: '',  // 单车中介服务费
-      //   distributorPriceAll: '',  // 返利合计
-      //   name: '',  // 内部引荐人
-      //   userSid: '',  // 内部引荐人sid
-      // }
+      if (this.temp.busSalesOrderMakeup){
+        const index = this.temp.busSalesOrderMakeup.contractPath.lastIndexOf('/')
+        this.contractName = this.temp.busSalesOrderMakeup.contractPath.substring(index + 1, this.temp.busSalesOrderMakeup.contractPath.length)
+      }
       this.nodeState = nodeState
       this.relState = '3'
       this.getType()
@@ -483,6 +474,17 @@ export default {
           this.FormLoading = false
           if (response.code === '200' && response.success) {
             this.$emit('returnHome','ture')
+            this.busSalesOrderSubmit = {
+              priceRemarks: '',  // 价格说明
+                discountRemarks: '',  // 优惠说明
+                distributorName: '',  // 中介名称
+                distributorMobile: '',  // 联系电话
+                distributorSid: '',  // 中介单位sid
+                distributorPrice: '',  // 单车中介服务费
+                distributorPriceAll: '',  // 返利合计
+                name: '',  // 内部引荐人
+                userSid: '',  // 内部引荐人sid
+            }
           } else {
             this.$message({
               showClose: true,

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableService.java

@@ -59,6 +59,7 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
         map.put("nodeState", nodeState);
         map.put("procInsId", rb.getData().getProcInsId());
         map.put("taskDefKey", task_def_key_);
+        map.put("taskId",list.get(0).getId_());
         return new ResultBean().success().setData(map);
     }