formVariables 业务参数集合 不能为空！

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnDto.java

@@ -60,4 +60,6 @@ public class ScmVehicleReturnDto implements Dto {
 
     @ApiModelProperty(value = "费用说明")
     private String remarks;
+    @ApiModelProperty(value = "createBySid")
+    private String createBySid;
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java

@@ -25,8 +25,10 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
+import com.yxt.anrui.portal.api.sysuser.SysUser;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserInfoVo;
+import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.scm.api.scmvehiclereturn.*;
 import com.yxt.anrui.scm.api.scmvehiclereturndetails.ScmVehicleReturnDetails;
 import com.yxt.anrui.scm.api.scmvehiclereturndetails.ScmVehicleReturnDetailsDto;
@@ -285,7 +287,8 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
             Map<String, Object> stringObjectMap = BeanUtil.beanToMap(rb1.getData());
             updateFlowFiled(stringObjectMap);
             if("Event_end".equals(taskDefKey)){
-                List<ScmVehicleReturnDetailsDto> detailsList = booad.getDetailsList();
+               // List<ScmVehicleReturnDetailsDto> detailsList = booad.getDetailsList();
+                List<ScmVehicleReturnDetailssVo> detailsList = scmVehicleReturnDetailsService.detailsList(bv.getBusinessSid());
                 List<String> vino=new ArrayList<>();
                 detailsList.forEach(item->vino.add(item.getVinNo()));
                 BaseVehicleUpdateQuery updateQuery = new BaseVehicleUpdateQuery();
@@ -301,8 +304,8 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
                 SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
                 brd.setAppluDate(sdf.format(booad.getCreateTime())); // 申请日期
                 brd.setNum(detailsList.size()+""); // 车辆台数
-                ResultBean<SysUserInfoVo> sysUserInfoVoResultBean = sysUserFeign.selectUserInfoByUserSid(booad.getUserSid());
-                ResultBean<SysStaffOrg>  staff = sysStaffOrgFeign.getOrgByStaffSid(sysUserInfoVoResultBean.getData().getStaffSid());
+                ResultBean<SysUserVo> sysUserResultBean = sysUserFeign.fetchBySid(booad.getCreateBySid());
+                ResultBean<SysStaffOrg>  staff = sysStaffOrgFeign.getOrgByStaffSid(sysUserResultBean.getData().getStaffSid());
                 brd.setCreateOrgSid(staff.getData().getOrgSid()); // 创建组织sid
                 List<BaseManufacturerRetwareVehDto> baseManufacturerRetwareVehs=new ArrayList<>();
                 //detailsList.forEach(item->baseManufacturerRetwareVehs.add(new BaseManufacturerRetwareVehDto()));

anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplication.vue

@@ -355,6 +355,7 @@ export default {
     },
     // 驳回
     openReject() {
+      this.formobj.comment=''
           req.getPreviousNodesForReject(this.formobj).then(resp=>{
             if (resp.success) {
               var arr= resp.data;
@@ -371,7 +372,8 @@ export default {
     },
     // 同意
     openAgree() {
-      this.formobj.comment="同意"
+      this.$set(this.formobj, "comment", "同意")
+      //this.formobj.comment = "同意"
       //查验下一环节要用到，流程定义的id
       req.getNextNodesForSubmit(this.formobj).then(resp=>{
         if (resp.success) {

anrui-scm/anrui-scm-ui/src/views/workFlow/caigoutuikuFlow/caigoutuiku.vue

@@ -101,7 +101,7 @@
         <el-row>
           <el-col :span="4" class="tleftb">意见</el-col>
           <el-col :span="20" class="trightb">
-            <el-input size="small" v-model="formobj.comment" placeholder="审批意见"  class="addinputw" clearable ></el-input>
+            <el-input size="small" v-model="formobj.comment" class="addinputw" clearable ></el-input>
           </el-col>
         </el-row>
         <div style="text-align:center;margin-top: 20px;">
@@ -268,7 +268,8 @@
 
       // 同意
       openAgree() {
-        this.formobj.comment='同意'
+        this.$set(this.formobj, "comment", "同意")//this.obj  对象，name   设置的属性， 99  设置的值
+       // this.formobj.comment = '同意'
         //查验下一环节要用到，流程定义的id
         this.formobj.businessSid = this.obj.businessSid
         this.formobj.instanceId = this.obj.instanceId
@@ -288,7 +289,7 @@
       },
       //同意任务
       agree() {
-        if(this.formobj.comment==''){
+        if(this.formobj.comment == ''){
           alert('请填写审批意见!');
           return;
         }
@@ -340,6 +341,7 @@
       },
       // 驳回
       openReject() {
+        this.formobj.comment = ''
        /* this.$confirm('是否确认执行驳回操作', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',