Merge remote-tracking branch 'origin/master'

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskDoVo.java

@@ -47,4 +47,7 @@ public class FlowTaskDoVo implements Vo {
     @ApiModelProperty("办理的url")
     @JsonIgnore
     private SysProUrlVo sysProUrlVo;
+
+    @ApiModelProperty("流程ID")
+    private String procDefId;
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskFinishVo.java

@@ -19,8 +19,9 @@ import java.util.Map;
 @Data
 public class FlowTaskFinishVo implements Vo {
     private static final long serialVersionUID = -5936470750210770833L;
-
-    @ApiModelProperty(value = "流程id")
+    @ApiModelProperty("流程ID")
+    private String procDefId;
+    @ApiModelProperty(value = "流程部署id")
     private String deployId;
     @ApiModelProperty(value = "流程实例id")
     private String procInsId;

anrui-scm/anrui-scm-ui/src/views/guache/guachetaizhang/guachetaizhangAdd.vue

@@ -370,7 +370,8 @@ export default {
         vehicleModel: '',
         noticeModel: '',
         salesOrderNumber: '',
-        dateOfSalesOrder: ''
+        dateOfSalesOrder: '',
+        userSid: ''
       },
       rules: {
         zcvinNo: [{ required: true, message: '主车车架号不能为空', trigger: 'change' }],
@@ -410,6 +411,7 @@ export default {
       this.viewTitle = '【入库】挂车'
       this.dialogStatus = 'add'
       this.formobj.departmentSid = window.sessionStorage.getItem('departmentSid')
+      this.formobj.userSid = window.sessionStorage.getItem('userSid')
       this.formobj.useOrgSid = useOrgSid
       this.formobj.stockStateValue = '库存'
       this.formobj.stockStateKey = '0001'
@@ -710,7 +712,8 @@ export default {
         vehicleModel: '',
         noticeModel: '',
         salesOrderNumber: '',
-        dateOfSalesOrder: ''
+        dateOfSalesOrder: '',
+        userSid: ''
       }
       this.imgList = []
       this.imgList2 = []

anrui-scm/anrui-scm-ui/src/views/shangzhuang/shangzhuangtaizhangguanli/shangzhuangtaizhangAdd.vue

@@ -169,6 +169,7 @@ export default {
         salesDate: '',
         useOrgSid: '',
         createOrg: '',
+        userSid: '',
         baseVehinstallmodel: {
           vehicleTypeValue: '',
           installNameValue: '',
@@ -217,6 +218,7 @@ export default {
     showAdd(createOrgSid) {
       this.formobj.useOrgSid = createOrgSid
       this.formobj.createOrg = createOrgSid
+      this.formobj.userSid = window.sessionStorage.getItem('userSid')
       this.formobj.departmentSid = window.sessionStorage.getItem('departmentSid')
       this.selExistingCar()
     },
@@ -334,6 +336,7 @@ export default {
         salesDate: '',
         useOrgSid: '',
         createOrg: '',
+        userSid: '',
         baseVehinstallmodel: {
           vehicleTypeValue: '',
           installNameValue: '',