Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-web into dev

# Conflicts:
#	.env.development

src/views/secondDev/createFlow.vue

@@ -271,6 +271,15 @@
             data.submitLoading = false;
             return;
         }
+        
+        if (!nextNodes[0]?.chooseAssign) {
+          const nextTaskUser = {};
+          let arr = (nextNodes[0]?.userList||[]).map(v =>v.F_UserId)
+          nextTaskUser[nextNodes[0]?.activityId] = arr.join(',')
+          approvalData.nextTaskUser = nextTaskUser
+          onFinish({})
+          return
+        }
         opinionDlg.value.toggleDialog({
             action: 'agree',
             actionFlowType: 'submit',

src/views/secondDev/customFormConfig.ts

@@ -17,6 +17,7 @@ export const customFormConfig = {
     'ContractProc',
     'PricePurPngApp',
     'PriceSalesPngApp',
-    'ContractPurLng'
+    'ContractPurLng',
+    'LngSettleHdr'
   ],
 };