From a0e3ce5753c201a92934bdf233e7509085ca6be9 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Mon, 6 Mar 2023 13:45:57 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=8C=82=E8=BD=A6?=
 =?UTF-8?q?=E5=8F=B0=E8=B4=A6=E3=80=81=E4=B8=8A=E8=A3=85=E5=8F=B0=E8=B4=A6?=
 =?UTF-8?q?--=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7sid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/guache/guachetaizhang/guachetaizhangAdd.vue  | 7 +++++--
 .../shangzhuangtaizhangguanli/shangzhuangtaizhangAdd.vue   | 3 +++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/anrui-scm/anrui-scm-ui/src/views/guache/guachetaizhang/guachetaizhangAdd.vue b/anrui-scm/anrui-scm-ui/src/views/guache/guachetaizhang/guachetaizhangAdd.vue
index e1ad60649c..4a3a1fb87e 100644
--- a/anrui-scm/anrui-scm-ui/src/views/guache/guachetaizhang/guachetaizhangAdd.vue
+++ b/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 = []
diff --git a/anrui-scm/anrui-scm-ui/src/views/shangzhuang/shangzhuangtaizhangguanli/shangzhuangtaizhangAdd.vue b/anrui-scm/anrui-scm-ui/src/views/shangzhuang/shangzhuangtaizhangguanli/shangzhuangtaizhangAdd.vue
index 58533be3ac..866e105ab0 100644
--- a/anrui-scm/anrui-scm-ui/src/views/shangzhuang/shangzhuangtaizhangguanli/shangzhuangtaizhangAdd.vue
+++ b/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: '',

From 8f80fe5c76af9fbe98e5f9380e8fde05fd7bdcd3 Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Mon, 6 Mar 2023 13:49:12 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/yxt/anrui/portal/api/flow/app/FlowTaskDoVo.java | 3 +++
 .../com/yxt/anrui/portal/api/flow/app/FlowTaskFinishVo.java  | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskDoVo.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskDoVo.java
index f41e816546..2bbef6e64c 100644
--- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskDoVo.java
+++ b/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;
 }
diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskFinishVo.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskFinishVo.java
index cf0408e031..f889fe27f2 100644
--- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskFinishVo.java
+++ b/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;