diff --git a/src/resources/assets/languages/term/en.json b/src/resources/assets/languages/term/en.json
index aadf2ddb7bc082de00b2bf1807cb2862f57f95a6..ff03d4d739b3d0e2f0eaedafbaa43def892a1712 100644
--- a/src/resources/assets/languages/term/en.json
+++ b/src/resources/assets/languages/term/en.json
@@ -631,7 +631,8 @@
     "seeprocessconfig": "View the current work order process configuration",
     "editprocessconfig": "Edit the current work order process configuration",
     "stepishandledby": "Step Handling Human",
-    "sercalendar": "Service Calendar"
+    "sercalendar": "Service Calendar",
+    "flowauthuserupdatetip": "The processor includes all step handlers"
   },
   "autoexec": {
     "addrootdirectory": "Add root directory",
diff --git a/src/resources/assets/languages/term/zh.json b/src/resources/assets/languages/term/zh.json
index 89f6a010a16b67634db68448e4e073427d2f0280..989a686bc871187d25dab9c704d4982132f554d9 100644
--- a/src/resources/assets/languages/term/zh.json
+++ b/src/resources/assets/languages/term/zh.json
@@ -631,7 +631,8 @@
     "seeprocessconfig": "查看当前工单流程配置",
     "editprocessconfig": "编辑当前工单流程配置",
     "stepishandledby": "步骤处理人为",
-    "sercalendar": "服务日历"
+    "sercalendar": "服务日历",
+    "flowauthuserupdatetip": "处理人包含所有步骤处理人"
   },
   "autoexec": {
     "addrootdirectory": "添加根目录",
diff --git a/src/views/pages/process/flow/flowedit/components/nodesetting/authority-setting.vue b/src/views/pages/process/flow/flowedit/components/nodesetting/authority-setting.vue
index b632e9db827969ba96bf7c51c595577bd17c9482..b794f3c53a51fa5e57bc6f462a40f2404043ba8b 100644
--- a/src/views/pages/process/flow/flowedit/components/nodesetting/authority-setting.vue
+++ b/src/views/pages/process/flow/flowedit/components/nodesetting/authority-setting.vue
@@ -23,15 +23,14 @@
     </div>
     <div v-if="isActive == 1" class="permission-list">
       <div v-for="(item,index) of authorityList" :key="index" class="list list-bottom">
-        <div class="second-title text-grey">{{ item.text }}</div>
-        <div>
+        <TsFormItem labelPosition="top" :label="item.text" :tooltip="authorityTipMap[item.action] || ''">
           <UserSelect
             :value.sync="item.acceptList"
             :groupList="item.groupList"
             border="border"
             width="100%"
           ></UserSelect>
-        </div>
+        </TsFormItem>
       </div>
     </div>
   </div>
@@ -42,7 +41,8 @@ export default {
   name: 'AuthoritySetting',
   components: {
     TsFormSwitch: () => import('@/resources/plugins/TsForm/TsFormSwitch'),
-    UserSelect: () => import('@/resources/components/UserSelect/UserSelect')
+    UserSelect: () => import('@/resources/components/UserSelect/UserSelect'),
+    TsFormItem: () => import('@/resources/plugins/TsForm/TsFormItem')
   },
   mixins: [itemmixin],
   props: {
@@ -67,7 +67,10 @@ export default {
   data() {
     return {
       isActive: this.defaultIsActive,
-      authorityList: this.list
+      authorityList: this.list,
+      authorityTipMap: {
+        update: this.$t('term.process.flowauthuserupdatetip')
+      }
     };
   },
   beforeCreate() {},
diff --git a/src/views/pages/process/task/processdetail/workorder/common/button-bar.vue b/src/views/pages/process/task/processdetail/workorder/common/button-bar.vue
index 4b28b7ec6b122d8befdea4af2b906dfc65115a9f..edbd3bfbe2007255fd0494f7895ed5134bd555a5 100644
--- a/src/views/pages/process/task/processdetail/workorder/common/button-bar.vue
+++ b/src/views/pages/process/task/processdetail/workorder/common/button-bar.vue
@@ -103,10 +103,16 @@
           <DropdownItem v-if="actionConfig.copyprocesstask" @click.native="doBtnBarAction('copyProcessTask')">
             {{ actionConfig.copyprocesstask }}
           </DropdownItem>
-          <!-- 编辑表单 -->
-          <DropdownItem v-if="processTaskConfig && processTaskConfig.formConfig && ($AuthUtils.hasRole('PROCESSTASK_MODIFY') || actionConfig.update)" @click.native="editForm()">
-            {{ $t('dialog.title.edittarget',{'target':$t('page.form')}) }}
-          </DropdownItem>
+          <!-- 编辑表单 工单管理员可编辑所以表单组件，无需校验-->
+          <template v-if="processTaskConfig && processTaskConfig.formConfig">
+            <DropdownItem v-if="$AuthUtils.hasRole('PROCESSTASK_MODIFY')" @click.native="editForm(false)">
+              {{ $t('dialog.title.edittarget',{'target':$t('page.form')}) }}
+            </DropdownItem>
+            <!--  只有修改工单上报内容权限，根据上报节点场景修改表单，需要校验-->
+            <DropdownItem v-else-if="actionConfig.update" @click.native="editForm(true)">
+              {{ $t('dialog.title.edittarget',{'target':$t('page.form')}) }}
+            </DropdownItem>
+          </template>
           <!-- 转为知识 -->
           <DropdownItem v-if="knowledgeConfig && knowledgeConfig.isTransferKnowledge == 1" @click.native="doBtnBarAction('createKnowledge')">
             {{ $t('term.process.converttoknowdoc') }}
@@ -171,7 +177,12 @@
         @click="doBtnBarAction('redoTask')"
       >{{ getRedoText }}</Button>
     </span>
-    <FormEditDialog v-if="isShowFormModal" :processTaskConfig="processTaskConfig" @close="closeFormDialog()"></FormEditDialog>
+    <FormEditDialog
+      v-if="isShowFormModal"
+      :processTaskConfig="processTaskConfig"
+      :isNeedFormSceneUuid="isNeedFormSceneUuid"
+      @close="closeFormDialog()"
+    ></FormEditDialog>
     <ProcessTaskTopo v-if="isShowProcessTaskTopo" :processTaskId="processTaskConfig.id" @close="isShowProcessTaskTopo=false"></ProcessTaskTopo>
     <TransfereoastepDialog v-if="isShowTransfereoastep" :processTaskId="processTaskConfig.id" @close="isShowTransfereoastep=false"></TransfereoastepDialog>
     <ReactivateDialog v-if="isShowReactivateStep" :processTaskId="processTaskConfig.id" @close="isShowReactivateStep=false"></ReactivateDialog>
@@ -201,7 +212,8 @@ export default {
       isShowFormModal: false,
       isShowProcessTaskTopo: false,
       isShowTransfereoastep: false,
-      isShowReactivateStep: false
+      isShowReactivateStep: false,
+      isNeedFormSceneUuid: false //是否需要表单场景uuid
     };
   },
   beforeCreate() {},
@@ -218,7 +230,8 @@ export default {
     doBtnBarAction(actionName, ...args) {
       this.$emit('doAction', actionName, ...args);
     },
-    editForm() {
+    editForm(isNeedFormSceneUuid) {
+      this.isNeedFormSceneUuid = isNeedFormSceneUuid;
       this.isShowFormModal = true;
     },
     closeFormDialog() {
diff --git a/src/views/pages/process/task/processdetail/workorder/common/form-edit-dialog.vue b/src/views/pages/process/task/processdetail/workorder/common/form-edit-dialog.vue
index d6a104991fea85af7e55cde81a7ee8cde3e1351f..0fe63214c653575d2db7c105dd19a0b5be1a4bbb 100644
--- a/src/views/pages/process/task/processdetail/workorder/common/form-edit-dialog.vue
+++ b/src/views/pages/process/task/processdetail/workorder/common/form-edit-dialog.vue
@@ -9,14 +9,15 @@
       @on-close="closeDialog"
     >
       <template v-slot>
-        <div>
+        <div v-if="isReady">
           <TsSheet
             ref="formSheet"
             mode="read"
             :value="formConfig"
             :data="processTaskConfig.formAttributeDataMap"
-            :isClearSpecifiedAttr="true"
-            :isNeedValid="false"
+            :isClearSpecifiedAttr="!isNeedFormSceneUuid"
+            :isNeedValid="isNeedFormSceneUuid"
+            :formSceneUuid="isNeedFormSceneUuid ? formSceneUuid : ''"
             @emit="formSheetEmitData"
           ></TsSheet>
         </div>
@@ -31,14 +32,17 @@ export default {
     TsSheet: () => import('@/resources/plugins/TsSheet/TsSheet.vue')
   },
   props: {
-    processTaskConfig: Object
+    processTaskConfig: Object,
+    isNeedFormSceneUuid: Boolean
   },
   data() {
     return {
+      isReady: false,
       formConfig: {},
       defaultPriorityUuid: '',
       priorityList: [],
-      priorityUuid: ''
+      priorityUuid: '',
+      formSceneUuid: ''
     };
   },
   beforeCreate() {},
@@ -58,14 +62,20 @@ export default {
     initConfig() {
       if (this.processTaskConfig) {
         this.defaultPriorityUuid = this.$utils.deepClone(this.processTaskConfig.defaultPriorityUuid);
+        let formSceneUuid = this.processTaskConfig.startProcessTaskStep.formSceneUuid;
         if (this.processTaskConfig.formConfig) {
           let formConfig = this.$utils.deepClone(this.processTaskConfig.formConfig) || {};
           //清除组件只读属性
           formConfig.readOnly = false;
           formConfig.reaction = {};
           this.formConfig = formConfig;
+          if (!formSceneUuid) {
+            formSceneUuid = this.processTaskConfig.formConfig.defaultSceneUuid;
+          }
         }
+        this.formSceneUuid = formSceneUuid;
       }
+      this.isReady = true;
     },
     async okDialog() {
       let errorMap = null;