diff --git a/package.json b/package.json
index f0a69e9..5ba8cef 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
   "dependencies": {
     "@crazydos/vue-markdown": "^1.1.4",
     "@dnd-kit/core": "^6.1.0",
-    "@element-plus/icons-vue": "^2.3.1",
+    "@element-plus/icons-vue": "^2.3.2",
     "@onlyoffice/document-editor-vue": "^1.5.0",
     "@sv-print/vue3": "^0.2.2",
     "@tinymce/tinymce-vue": "^5.1.1",
diff --git a/src/api/DesignForm/type.ts b/src/api/DesignForm/type.ts
index 6a18c2f..d1d3527 100644
--- a/src/api/DesignForm/type.ts
+++ b/src/api/DesignForm/type.ts
@@ -152,6 +152,8 @@ export interface hanziToPinyin{
 //获取工作流步进节点
 export interface nodeFlow extends enableVersionId{
 	conditionList?:conditionInfo[]
+	nodelPeople?:any[]
+	oldFlow?:any
 }
 export interface conditionInfo{
 	factorid:string;
diff --git a/src/api/DesignForm/types.ts b/src/api/DesignForm/types.ts
index 3081a6e..40bf9f7 100644
--- a/src/api/DesignForm/types.ts
+++ b/src/api/DesignForm/types.ts
@@ -36,6 +36,7 @@ export interface FormData {
 	list: FormList[]
 	form: any // form所有props
 	config: {
+      groupKey: any
 	  style?: string // 表单css样式，相当于scope
 	  hideField?: string[] // 使用v-if隐藏的字段，用于交互
 	  requestUrl?: string // 表单数据请求url
@@ -160,7 +161,7 @@ export interface formStruct{
     designType: any; // 当前页面设计类型，有效值search
     formDict: any;
     formOtherData:formOtherData;
-	echatsViews:echatsViews[];
+	echatsViews:echatsViewStruct[];
 }
 
 export interface DrawerStruct{
@@ -234,7 +235,7 @@ export interface appSetUpContent{
 	appdescribe?:string;
 }
 //图标结构
-export interface echatsViews {
+export interface echatsViewStruct {
   widthBox: number
   styles: any
 	uuid:string;
diff --git a/src/api/hr/org/type.ts b/src/api/hr/org/type.ts
index 01dec8a..b1b3a6c 100644
--- a/src/api/hr/org/type.ts
+++ b/src/api/hr/org/type.ts
@@ -162,6 +162,7 @@ export interface searchCriteriaForPeople extends PageQuery{
 }
 
 export interface criteriaForPeopleList{
+	noedit: any;
 	id: number
 	userkey: string
 	number: string
diff --git a/src/api/taskapi/types.ts b/src/api/taskapi/types.ts
index af21294..423b331 100644
--- a/src/api/taskapi/types.ts
+++ b/src/api/taskapi/types.ts
@@ -45,6 +45,8 @@ export interface customerFormLogo{
 }
  //自定义表单版本内容
 export interface customerFormVersionCont{
+  structure: any;
+  tableData: any;
 	id:number;
 	tablekey:string;
 	version:number;
@@ -62,7 +64,8 @@ export interface customerFormVersionCont{
 //获取工作流步进节点
 export interface nodeFlow extends customerFormLogo{
 	conditionList?:conditionInfo[];
-	nodelPeople?:nodelPeoples[]
+	nodelPeople?:nodelPeoples[];
+	oldFlow?:any
 }
 export interface nodelPeoples {
 	factorid?:string;
diff --git a/src/assets/icons/caogaoxiang.svg b/src/assets/icons/caogaoxiang.svg
index 918d62a..d0ab871 100644
--- a/src/assets/icons/caogaoxiang.svg
+++ b/src/assets/icons/caogaoxiang.svg
@@ -1 +1 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1700784220084" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="17019" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M755.2 857.6H262.4c-54.4 0-98.5-44.1-98.5-98.6V512.7h49.3v-312c0-27.2 22.1-49.3 49.3-49.3h492.7c27.2 0 49.3 22.1 49.3 49.3v312h49.3v246.4c-0.1 54.4-44.2 98.5-98.6 98.5z m0-656.9H262.4v312h147.8v98.6h197.1v-98.6h147.8v-312zM804.4 562H656.6v49.3c0 27.2-22.1 49.3-49.3 49.3H410.2c-27.2 0-49.3-22.1-49.3-49.3V562H213.1v197.1c0 27.2 22.1 49.3 49.3 49.3h492.7c27.2 0 49.3-22.1 49.3-49.3V562z m0 0" fill="#8a8a8a" p-id="17020"></path><path d="M656.8 330.2H361.2c-13.6 0-24.6-11-24.6-24.6 0-13.6 11-24.6 24.6-24.6h295.6c13.6 0 24.6 11 24.6 24.6 0.1 13.6-10.9 24.6-24.6 24.6z m0 0M484.4 445.3H361.2c-13.6 0-24.6-11-24.6-24.6s11-24.6 24.6-24.6h123.2c13.6 0 24.6 11 24.6 24.6s-11 24.6-24.6 24.6z m0 0" fill="#8a8a8a" p-id="17021"></path></svg>
\ No newline at end of file
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1700784220084" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="17019" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M755.2 857.6H262.4c-54.4 0-98.5-44.1-98.5-98.6V512.7h49.3v-312c0-27.2 22.1-49.3 49.3-49.3h492.7c27.2 0 49.3 22.1 49.3 49.3v312h49.3v246.4c-0.1 54.4-44.2 98.5-98.6 98.5z m0-656.9H262.4v312h147.8v98.6h197.1v-98.6h147.8v-312zM804.4 562H656.6v49.3c0 27.2-22.1 49.3-49.3 49.3H410.2c-27.2 0-49.3-22.1-49.3-49.3V562H213.1v197.1c0 27.2 22.1 49.3 49.3 49.3h492.7c27.2 0 49.3-22.1 49.3-49.3V562z m0 0"  p-id="17020"></path><path d="M656.8 330.2H361.2c-13.6 0-24.6-11-24.6-24.6 0-13.6 11-24.6 24.6-24.6h295.6c13.6 0 24.6 11 24.6 24.6 0.1 13.6-10.9 24.6-24.6 24.6z m0 0M484.4 445.3H361.2c-13.6 0-24.6-11-24.6-24.6s11-24.6 24.6-24.6h123.2c13.6 0 24.6 11 24.6 24.6s-11 24.6-24.6 24.6z m0 0"  p-id="17021"></path></svg>
diff --git a/src/assets/icons/csr.svg b/src/assets/icons/csr.svg
new file mode 100644
index 0000000..30e6bc0
--- /dev/null
+++ b/src/assets/icons/csr.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1769739922509" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="29847" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M277.76 302.72a242.496 242.496 0 0 0 102.4 148.48 242.496 242.496 0 0 0 80 33.92 234.048 234.048 0 0 0 103.68 0 242.496 242.496 0 0 0 148.48-102.4 242.496 242.496 0 0 0 33.92-80 234.048 234.048 0 0 0 0-103.68 242.496 242.496 0 0 0-102.4-148.48A242.496 242.496 0 0 0 563.84 16.64a234.048 234.048 0 0 0-103.68 0 242.496 242.496 0 0 0-80 33.92c-13.44 8.96-26.24 19.2-37.76 30.72s-21.76 24.32-30.72 37.76a242.496 242.496 0 0 0-33.92 80 234.048 234.048 0 0 0 0 103.68z m62.72-91.52c2.56-10.24 5.12-19.84 9.6-29.44 3.84-9.6 8.96-19.2 14.72-27.52 6.4-10.24 14.08-19.2 23.04-28.16 8.96-8.96 17.92-16.64 28.16-23.04 8.96-5.76 17.92-10.88 27.52-14.72 9.6-3.84 19.2-7.04 29.44-9.6 12.8-3.2 25.6-4.48 39.68-4.48s26.88 1.28 39.04 4.48c9.6 2.56 19.84 5.12 28.8 9.6 9.6 3.84 19.2 8.96 27.52 14.72 10.24 6.4 19.2 14.08 28.16 23.04 8.96 8.96 16.64 17.92 23.04 28.16 5.76 8.96 10.88 17.92 14.72 27.52 3.84 9.6 7.04 19.2 9.6 28.8 3.2 12.8 4.48 26.24 4.48 39.68s-1.28 26.88-4.48 39.04c-2.56 10.24-5.12 19.84-9.6 29.44-3.84 9.6-8.96 19.2-14.72 27.52-6.4 10.24-14.08 19.2-23.04 28.16-8.96 8.96-17.92 16.64-28.16 23.04-8.96 5.76-17.92 10.88-27.52 14.72-9.6 3.84-19.2 7.04-29.44 9.6-12.8 3.2-25.6 4.48-39.68 4.48s-26.88-1.28-39.68-4.48c-9.6-2.56-19.84-5.12-29.44-9.6-9.6-3.84-19.2-8.96-27.52-14.72-10.24-6.4-19.2-14.08-28.16-23.04-8.96-8.96-16.64-17.92-23.04-28.16-5.76-8.96-10.88-17.92-14.72-27.52-3.84-9.6-7.04-19.2-9.6-29.44-3.2-12.8-4.48-26.24-4.48-39.68s1.28-26.88 4.48-39.04zM1008.64 608.64c-1.92-9.6-5.12-19.84-8.96-28.8-3.84-9.6-8.32-18.56-14.08-26.88-6.4-10.24-14.08-19.2-22.4-28.16-8.96-8.96-17.92-16-28.16-23.04-8.32-5.12-17.28-9.6-26.88-13.44-9.6-3.84-19.2-6.4-28.8-8.96-10.88-2.56-22.4-3.2-33.92-3.2s-22.4 1.28-33.92 3.2c-9.6 1.92-19.2 5.12-28.8 8.96-9.6 3.84-18.56 8.32-27.52 14.08-9.6 6.4-19.2 14.08-27.52 22.4l-51.2 51.84c-12.8 12.8-12.8 32.64 0 45.44 12.8 12.8 32.64 12.8 45.44 0l51.2-51.84c5.76-5.76 11.52-10.24 17.92-14.08 5.12-3.2 10.24-5.76 16-8.32 5.76-2.56 11.52-3.84 17.28-5.12a119.68 119.68 0 0 1 43.52 0c5.76 1.28 11.52 3.2 17.28 5.12 5.76 2.56 11.52 5.12 16.64 8.32 6.4 3.84 11.52 8.32 17.28 13.44 5.76 5.76 10.24 11.52 14.72 17.92 3.2 5.12 5.76 10.24 7.68 15.36 2.56 5.76 3.84 11.52 5.12 17.28a117.824 117.824 0 0 1 0 42.24c-1.28 5.76-3.2 11.52-5.12 17.28-2.56 5.76-5.12 10.88-8.32 16.64-3.84 6.4-8.96 12.16-14.08 17.28l-51.84 51.2c-12.8 12.8-12.8 32.64 0 45.44 12.8 12.8 32.64 12.8 45.44 0l51.84-51.2a162.56 162.56 0 0 0 36.48-55.04c3.84-9.6 7.04-19.2 8.96-28.8 1.92-10.88 3.2-22.4 3.2-33.28s-1.28-22.4-3.2-33.28zM454.4 949.12H168.96c-4.48 0-8.32-0.64-12.16-2.56-3.2-1.28-6.4-3.84-9.6-6.4a25.344 25.344 0 0 1-6.4-9.6 25.984 25.984 0 0 1-2.56-12.16c0-24.32 2.56-48 7.68-71.04 3.84-18.56 10.24-36.48 17.28-53.76 7.68-17.92 16.64-34.56 26.88-50.56 12.16-18.56 26.24-35.2 41.6-51.2 16-16 33.28-30.08 51.2-41.6 16-10.24 32.64-19.2 50.56-26.88s35.84-13.44 53.76-17.28c23.04-5.12 46.72-7.68 71.04-7.68h101.76l59.52-59.52c-19.2-2.56-38.4-4.48-58.24-4.48H457.6c-28.8 0-56.32 3.2-83.84 8.96-22.4 5.12-44.8 12.16-65.92 21.12-21.76 8.96-42.24 20.48-61.44 32.64a345.6 345.6 0 0 0-60.8 49.92c-18.56 18.56-35.2 39.04-49.92 60.8-12.8 19.2-23.68 39.68-32.64 61.44-8.96 21.76-16 43.52-21.12 65.92-5.76 27.52-8.96 55.04-8.96 83.84 0 7.04 0.64 14.08 1.92 20.48 1.28 5.76 3.2 10.88 5.12 16 2.56 5.76 5.12 10.88 8.32 16 3.2 5.12 7.04 9.6 11.52 14.08 4.48 4.48 9.6 8.32 14.72 12.16 5.12 3.2 10.24 5.76 15.36 8.32 5.12 2.56 10.88 3.84 16 5.12 6.4 1.28 13.44 2.56 20.48 2.56h343.68c-6.4-5.12-12.8-10.88-18.56-17.28-14.72-14.72-26.88-30.08-37.12-46.72z"  p-id="29848"></path><path d="M779.52 663.04l-103.68 103.68c-12.8 12.8-12.8 32.64 0 45.44 12.8 12.8 32.64 12.8 45.44 0l103.68-103.68c12.8-12.8 12.8-32.64 0-45.44s-32.64-12.8-45.44 0z"  p-id="29849"></path><path d="M778.88 853.12l-51.2 51.84c-5.12 5.12-10.24 9.6-16.64 13.44-5.76 3.84-11.52 6.4-17.28 8.96-5.76 2.56-11.52 3.84-17.28 5.12-7.04 1.28-14.08 2.56-21.76 2.56s-14.72-0.64-21.76-2.56c-5.76-1.28-11.52-3.2-17.28-5.12-5.76-2.56-10.88-5.12-16-8.32-6.4-3.84-12.16-8.96-17.92-14.08-5.12-5.12-9.6-10.24-13.44-16.64-3.84-5.76-6.4-11.52-8.96-17.28-2.56-5.76-3.84-11.52-5.12-17.28a119.68 119.68 0 0 1 0-43.52c1.28-5.76 3.2-11.52 5.12-17.28 2.56-5.76 5.12-10.88 8.32-16 3.84-6.4 8.96-12.16 14.08-17.92l51.84-51.2c12.8-12.8 12.8-32.64 0-45.44-12.8-12.8-32.64-12.8-45.44 0l-51.84 51.2c-8.32 8.32-16 17.92-22.4 27.52-5.76 8.32-10.24 17.92-14.08 27.52-3.84 9.6-6.4 19.2-8.96 28.8-2.56 10.88-3.2 22.4-3.2 33.92s1.28 22.4 3.2 33.92c1.92 9.6 5.12 19.2 8.96 28.8a162.56 162.56 0 0 0 36.48 55.04c8.32 8.32 17.92 16 27.52 22.4 8.32 5.76 17.92 10.24 27.52 14.08 9.6 3.84 19.2 6.4 28.8 8.96 10.88 2.56 22.4 3.2 33.92 3.2s22.4-1.28 33.92-3.2c9.6-1.92 19.2-5.12 28.8-8.96a162.56 162.56 0 0 0 55.04-36.48l51.2-51.84c12.8-12.8 12.8-32.64 0-45.44-12.8-12.8-32.64-12.8-45.44 0z"  p-id="29850"></path></svg>
diff --git a/src/assets/icons/faqiren.svg b/src/assets/icons/faqiren.svg
new file mode 100644
index 0000000..63a18ea
--- /dev/null
+++ b/src/assets/icons/faqiren.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1769738394292" class="icon" viewBox="0 0 1147 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6496" xmlns:xlink="http://www.w3.org/1999/xlink" width="224.0234375" height="200"><path d="M768.00532 940.28436l82.502369-40.691214a435.283996 435.283996 0 0 1 15.212541 115.913963v8.492891h-89.78199V1017.28035a301.637623 301.637623 0 0 0-7.93292-76.99599zM612.146771 718.629238a337.755742 337.755742 0 0 0-179.004011-50.957346C243.872618 667.858549 89.78731 824.370397 89.78731 1017.28035v6.71965H0.00532v-8.492891a438.643821 438.643821 0 0 1 325.156398-425.85782A307.983959 307.983959 0 0 1 133.465035 305.184105C133.465035 137.099526 267.484722 0 433.14276 0s299.677725 136.446227 299.677726 305.184105A304.810791 304.810791 0 0 1 541.31046 589.089318a441.443675 441.443675 0 0 1 115.260664 49.090777zM224.460296 305.184105c0 117.033904 94.0751 212.882246 208.682464 212.882246a211.202333 211.202333 0 0 0 208.682465-212.975574A211.015676 211.015676 0 0 0 433.14276 92.768502 211.109005 211.109005 0 0 0 224.460296 305.184105zM774.631641 586.009479l47.877507 35.744805L632.119064 877.287641l-47.877507-35.931462z" fill="" p-id="6497"></path><path d="M839.961572 530.199052l26.691943 9.332847A232.107911 232.107911 0 0 1 979.954281 628.473934l20.065621 30.331753a162.858184 162.858184 0 0 0 69.436384 59.823551l58.890266 26.038644a29.30514 29.30514 0 0 1 13.905942 43.117754l-112.740794 151.658768a27.998542 27.998542 0 0 1-33.971564 7.279621l-58.890267-26.131973a229.1214 229.1214 0 0 1-98.274881-83.06234l-20.065622-30.331754A163.604812 163.604812 0 0 0 737.300252 743.174626l-26.691943-9.332847a29.398469 29.398469 0 0 1-16.425811-43.677725l113.207437-152.12541a31.265038 31.265038 0 0 1 32.571637-7.839592z" fill="" p-id="6498"></path></svg>
diff --git a/src/assets/icons/shenpi.svg b/src/assets/icons/shenpi.svg
new file mode 100644
index 0000000..45bd97d
--- /dev/null
+++ b/src/assets/icons/shenpi.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1769738970750" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="12083" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M928 960a32 32 0 1 1 0 64h-832a32 32 0 1 1 0-64h832zM512 0a256 256 0 0 1 123.392 480.32L663.872 576 832 576a128 128 0 0 1 128 128v64a128 128 0 0 1-128 128H192a128 128 0 0 1-128-128v-64a128 128 0 0 1 128-128h168.704l30.656-94.208A256 256 0 0 1 512 0z m0 64a192 192 0 0 0-69.76 370.88l1.728 0.832 1.856 0.832 0.96 0.576-4.544-2.24a32.128 32.128 0 0 1 20.096 34.112l-0.192 1.024a31.872 31.872 0 0 1-0.448 2.24l-0.64 2.368-46.656 143.296a32 32 0 0 1-30.336 22.08H192a64 64 0 0 0-63.552 56.512L128 704v64a64 64 0 0 0 56.512 63.552L192 832h640a64 64 0 0 0 63.552-56.512L896 768v-64a64 64 0 0 0-56.512-63.552L832 640h-192a32 32 0 0 1-30.72-22.848l-43.072-144.704-0.32-1.472-0.32-1.024a31.808 31.808 0 0 1-0.256-1.664l0.896 4.16a32.064 32.064 0 0 1 18.56-38.72A192 192 0 0 0 512 63.936z" p-id="12084"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/spr.svg b/src/assets/icons/spr.svg
new file mode 100644
index 0000000..820f948
--- /dev/null
+++ b/src/assets/icons/spr.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1769739576182" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="15863" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M978.125808 1009.088932c-13.27917 13.311168-32.413974 13.311168-42.685332 13.311168h-313.196426c-37.533654 0-57.372414-19.870758-57.372415-57.532404v-23.070559c0-34.653834 22.494594-57.020436 57.372415-57.020436h57.884382l1.055934-1.087932c29.374164-24.414474 23.230548-32.861946 2.783826-60.796201a505.248424 505.248424 0 0 0-3.135804-4.31973 145.206925 145.206925 0 0 1-8.191488-11.99925l-0.47997-0.511968a127.928005 127.928005 0 0 1-27.454284-79.291044c0-71.835511 59.484282-130.263859 132.567715-130.263859h3.647772c70.587589 1.5999 128.439973 59.548278 128.951941 129.207925 0 22.71858-5.471658 44.509218-15.871008 63.03606l-16.606962 24.830448c-21.310668 32.79795-26.590338 43.261296-6.463596 65.627899a13.375164 13.375164 0 0 1 2.335854 2.943816 17.5989 17.5989 0 0 1 2.23986 2.623836h59.420286c47.421036 0 57.372414 31.006062 57.372415 57.020436v23.070559c0.191988 19.67877-4.575714 34.589838-14.175115 44.221236z m-152.598463-237.553154l10.847322-15.871008c4.7997-8.607462 7.135554-18.622836 6.655584-28.734204-0.47997-33.693894-29.694144-62.460097-63.740016-62.908069h-2.015874c-35.933754 0-65.179927 28.606212-65.179927 63.740017 0 13.791138 4.735704 27.070308 13.727142 38.461596l4.767702 6.943566c2.207862 3.03981 4.63971 6.3996 6.71958 9.695394l0.991938 1.471908c26.622336 33.565902 34.429848 68.283733 22.718581 100.441723h34.749828c-14.71908-43.805262 9.183426-81.274921 25.214424-106.361353v-0.031998l4.543716-6.847572z m109.209175 199.763516v-29.278171h-311.244548v29.278171h311.244548zM490.956255 684.501217H483.18074c-178.772827 3.007812-333.611151 131.959753-368.168991 306.572841a39.773514 39.773514 0 0 1-39.741516 32.893944l-1.151928-0.031998H65.926817c-23.390538-5.023686-37.629648-26.526342-33.085932-48.988938a457.571404 457.571404 0 0 1 279.822512-339.306795 330.283359 330.283359 0 0 1-169.653397-293.421662c0-188.66021 154.454347-342.218613 344.298482-342.218613 189.812138 0 344.266485 153.558403 344.266485 342.250611v0.031998c-1.567902 188.244236-151.158553 338.538843-340.618712 342.218612z m-4.159741-602.650337c-144.470971 0-261.967628 116.792701-261.967628 260.399727 2.527842 139.959253 114.488845 254.352104 254.89607 260.399726h11.167303c143.319043-3.551778 256.847948-117.912631 258.383852-260.431724 0-143.575027-117.784639-260.367728-262.479597-260.367729z"  p-id="15864"></path></svg>
diff --git a/src/assets/icons/zxr.svg b/src/assets/icons/zxr.svg
new file mode 100644
index 0000000..e880b0b
--- /dev/null
+++ b/src/assets/icons/zxr.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1769739269992" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="14857" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M390.826667 503.876267a221.866667 221.866667 0 1 1 0-443.733334 221.866667 221.866667 0 0 1 0 443.733334z m0-34.133334a187.733333 187.733333 0 1 0 0-375.466666 187.733333 187.733333 0 0 0 0 375.466666zM66.56 946.653867a17.066667 17.066667 0 1 1-34.133333 0v-187.733334c0-113.4592 99.6352-204.8 221.866666-204.8h273.066667c34.6112 0 68.164267 7.338667 98.542933 21.265067a17.066667 17.066667 0 0 1-14.2336 31.061333 202.171733 202.171733 0 0 0-84.309333-18.193066h-273.066667c-104.0384 0-187.733333 76.8-187.733333 170.666666v187.733334zM556.475733 727.790933a38.058667 38.058667 0 0 0 0 53.8624l90.999467 90.965334a38.058667 38.058667 0 1 0 53.828267-53.8624l-90.965334-90.965334a38.058667 38.058667 0 0 0-53.8624 0z m-24.132266-24.132266a72.192 72.192 0 0 1 102.126933 0l90.965333 90.965333a72.192 72.192 0 1 1-102.0928 102.126933l-90.999466-90.965333a72.192 72.192 0 0 1 0-102.126933zM764.416 519.850667a38.058667 38.058667 0 0 0 0 53.8624l90.999467 90.965333a38.058667 38.058667 0 1 0 53.828266-53.8624l-90.965333-90.965333a38.058667 38.058667 0 0 0-53.8624 0z m-24.132267-24.132267a72.192 72.192 0 0 1 102.126934 0l90.965333 90.965333a72.192 72.192 0 1 1-102.0928 102.126934l-90.999467-90.965334a72.192 72.192 0 0 1 0-102.126933z"  p-id="14858"></path><path d="M630.101333 699.255467l99.7376 99.771733 105.813334-105.813333-99.7376-99.771734-105.813334 105.813334z m105.813334-154.077867l148.002133 148.036267-154.077867 154.077866-148.036266-148.036266 154.112-154.077867z"  p-id="14859"></path><path d="M933.376 937.608533a28.8768 28.8768 0 0 0 40.8576-40.8576l-146.909867-146.909866-40.8576 40.823466 146.909867 146.944z m-106.052267-236.066133l171.008 171.076267a63.010133 63.010133 0 0 1-89.088 89.088l-171.042133-171.008 89.088-89.156267zM531.319467 980.753067a17.066667 17.066667 0 1 1 0-34.133334h226.065066a17.066667 17.066667 0 0 1 0 34.133334h-226.065066zM254.293333 946.653867a17.066667 17.066667 0 1 1-34.133333 0v-167.799467a17.066667 17.066667 0 1 1 34.133333 0v167.799467z"  p-id="14860"></path></svg>
diff --git a/src/components/DesignForm/app/index.vue b/src/components/DesignForm/app/index.vue
index e3f3e8c..3e12ce1 100644
--- a/src/components/DesignForm/app/index.vue
+++ b/src/components/DesignForm/app/index.vue
@@ -6,11 +6,9 @@
 <script lang="ts" setup>
 import {
   json2string,
-  objToStringify,
-  string2json,
   stringToObj,
 } from "@/utils/DesignForm/form";
-import { onBeforeRouteLeave, useRoute, useRouter } from "vue-router";
+import { useRoute, useRouter } from "vue-router";
 import { useDesignFormStore } from "@/store/DesignForm/designForm";
 import {
   attrButton,
@@ -28,28 +26,28 @@ import {
   checkboxUnit,
   orgDeptUnit,
 } from "@/api/DesignForm/fieldUnit";
-import type { FormInstance, FormRules } from "element-plus";
+import type { FormInstance } from "element-plus";
 import { ElLoading, ElMessage, ElNotification } from "element-plus";
 import html2canvas from "html2canvas";
-import JSZip, { forEach } from "jszip";
+import JSZip from "jszip";
 import { gainFormPageListCont } from "@/api/DesignForm/requestapi";
-import { Picture, InfoFilled, QuestionFilled } from "@element-plus/icons-vue";
+import { Picture, QuestionFilled } from "@element-plus/icons-vue";
 import request from "@/utils/request";
 import {
   softDeletion,
   retractRunWorkFlow,
-  recallSendMsg,
   recalSendMsg,
 } from "@/api/taskapi/management";
 
 import { formatNumber } from "@/api/DesignForm/utils";
 
 import { formHasPower } from "@/directive/permission/button";
-import {printHtmlPage} from '../printHtmlRender.ts'
+import {printHtmlPage} from '../printHtmlRender.js'
 
 //引入组件
 import FormPageCont from "@/components/DesignForm/tableListPage/formPageCont.vue";
-import TableFlow from "@/views/sysworkflow/lowcodepage/pageFlow/appTableFlow.vue";
+
+import NewFormPageCont from "@/components/DesignForm/tableListPage/newFormPageCont.vue";
 
 import NewTableFlow from "@/views/sysworkflow/lowcodepage/pageFlow/newTableFlow.vue";
 
@@ -61,24 +59,23 @@ import GanttPageIng from "@/components/DesignForm/app/gannttPage.vue";
 import MapPage from "@/components/DesignForm/app/mapPage.vue";
 import CalendarPage from "@/components/DesignForm/app/calendar/calendar1/calendarPage.vue";
 import SearchSelect from "@/components/DesignForm/app/calendar/selectSearch.vue";
-import AKSelect from "@/components/DesignForm/public/form/select.vue";
 
-import ContainerPath from "@/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/container.vue";
 import SeeContChart from "@/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/seeContChart.vue";
 
 import exportPanel from "../exportPanel.vue";
 import importPanel from "../importPanel.vue";
 import { EpPropMergeType } from "element-plus/es/utils";
 import { RendererNode, RendererElement } from "vue";
-import { echatsViews } from "@/api/DesignForm/types";
+import { echatsViewStruct } from '@/api/DesignForm/types';
 
 const props = withDefaults(
   defineProps<{
-    data: FormPageList;
-    searchData?: attrButton[];
+    data: FormPageList | any;
+    searchData?: attrButton[] | any;
     config?: FormPageConfig|any;
     appKey?: string;
     formId?: string;
+    formKey?:string;
     signCode?: string;
     beforeRequest?: (params: any, rout: any) => any;
     afterResponse?: (result: any) => any | string;
@@ -99,7 +96,7 @@ const props = withDefaults(
     formBasicConfig?: any;
     fieldsDetailList?: any;
     orgAndManTree?: any;
-    echatsViews: echatsViews;
+    echatsViews: echatsViewStruct;
   }>(),
   {
     showPage: true,
@@ -118,6 +115,12 @@ const props = withDefaults(
     appKey: () => {
       return "";
     },
+     requestUrl: () => {
+            return "";
+        },
+        deleteUrl: () => {
+            return "";
+        },
     formId: () => {
       return "";
     },
@@ -127,7 +130,7 @@ const props = withDefaults(
     versionid: () => {
       return "";
     },
-    signCode: () => {
+    formKey: () => {
       return "";
     },
     versiontitle: () => {
@@ -154,13 +157,25 @@ const props = withDefaults(
     orgAndManTree: () => {
       return {};
     },
+    pickAppMenu: () => {
+            return {};
+        },
+        beforeRequest: (_params: any, _rout: any):any => {
+            return
+        },
+        afterResponse: (_result: any):any | string => {
+            return
+        },
+        beforeDelete: (_params: any, _rout: any):any => {
+            return
+        }
   }
 );
 const echatsViewsdf = computed({
   get() {
     return props.echatsViews;
   },
-  set(newVal: any) {},
+  set(_newVal: any) {},
 });
 const emits = defineEmits<{
   (e: "selectionChange", row: any): void;
@@ -178,13 +193,16 @@ const openTaskDrawer = ref(false); //新增数据
 
 //导出窗口的父元素
 const dynamicVNode = ref<VNode | null>(null); //组件的父组件
-
+interface TableItem {
+  id: string | number;
+  // 其他可能的属性
+}
 const state = reactive({
   loading: false,
   currentPage: 1,
   pageSize: props.config?.pageSize || 2,
   total: 0,
-  selectionChecked: [],
+  selectionChecked: [] as TableItem[],
   dict: {}, // 接口返回的
   searchFormDown: false,
   treeValue: {}, // 侧栏树选中的值
@@ -197,7 +215,7 @@ const state = reactive({
 @ 时间: 2024-03-28 16:03:12
 @ 功能: 判断类型
 */
-const unitIsShow = (val: tableButton, unitName: string) => {
+const unitIsShow = (val: attrButton, unitName: string) => {
   // val.pattern
   switch (val.fieldClass) {
     case "id": //自定义表单保留字
@@ -258,7 +276,7 @@ const unitIsShow = (val: tableButton, unitName: string) => {
 @ 功能: 重置表单
 */
 const ruleSearchForm = ref();
-const resetFields = (formEl: FormInstance | undefined) => {
+const resetFields = (_formEl: FormInstance | undefined) => {
   // formEl.resetFields()
   // console.log("formEl",formEl,formEl.resetFields())
   // if (!formEl) return
@@ -272,8 +290,16 @@ const resetFields = (formEl: FormInstance | undefined) => {
 
 //20250117 李文轩 二维码表格
 const qrCodesPrintDialogFlag = ref(false);
-let tableRefs = reactive({});
-const tablesData = ref({});
+let tableRefs = reactive<Record<string, HTMLElement>>({});
+interface TableData {
+  dataTitle: any;
+  appName: string;
+  formName: string;
+  bufferedImage: string;
+  fieldsMap: Array<{ key: string; value: string }>;
+}
+
+const tablesData = ref<Record<string, TableData>>({});
 function getDetailQrCodes(val: any) {
   return request({
     url: "/javasys/lowCode/QrCode/getDetailQrCodes",
@@ -286,18 +312,42 @@ function getDetailQrCodes(val: any) {
   });
 }
 
+// function modifyFieldsMap4(fieldsMap: any): Array<{ key: string; value: string }> {
+//   let result: Array<{ key: string; value: string }> = [];
+//   // 使用 Object.entries 获取键值对数组，保留原始顺序
+//   for (const [key, value] of Object.entries(fieldsMap)) {
+//     let parts = value.split("!@#@!");
+//     if (parts.length === 2) {
+//       result.push({ key: parts[0], value: parts[1] });
+//     } else {
+//       // 如果格式不符合，可进行错误处理，这里暂时不做处理，直接使用原属性名和属性值
+//       result.push({ key, value });
+//     }
+//   }
+//   return result;
+// }
 function modifyFieldsMap4(fieldsMap: any): Array<{ key: string; value: string }> {
   let result: Array<{ key: string; value: string }> = [];
-  // 使用 Object.entries 获取键值对数组，保留原始顺序
+  
+  if (!fieldsMap || typeof fieldsMap !== 'object') {
+    console.warn('Invalid fieldsMap provided:', fieldsMap);
+    return result;
+  }
+  
   for (const [key, value] of Object.entries(fieldsMap)) {
-    let parts = value.split("!@#@!");
-    if (parts.length === 2) {
-      result.push({ key: parts[0], value: parts[1] });
-    } else {
-      // 如果格式不符合，可进行错误处理，这里暂时不做处理，直接使用原属性名和属性值
-      result.push({ key, value });
+    try {
+      let parts = String(value).split("!@#@!");
+      if (parts.length === 2) {
+        result.push({ key: parts[0], value: parts[1] });
+      } else {
+        result.push({ key, value: String(value) });
+      }
+    } catch (error) {
+      console.error('Error processing field:', key, error);
+      result.push({ key, value: String(value) });
     }
   }
+  
   return result;
 }
 
@@ -305,61 +355,169 @@ function modifyFieldsMap4(fieldsMap: any): Array<{ key: string; value: string }>
 const isButton1Disabled = ref(false);
 const isButton2Disabled = ref(false);
 
+// async function downloadTables() {
+//   isButton1Disabled.value = true;
+//   isButton2Disabled.value = true;
+//   const loadingInstance = ElLoading.service({
+//     fullscreen: true,
+//     text: "正在生成图片，请稍候...", // 添加的文字内容，可根据需要修改
+//   });
+//   //ElMessage('This is a message.')
+//   const zip = new JSZip();
+//   //console.log(tableRefs)
+//   // for (const [tableKey, element] of Object.entries(tableRefs)) {
+//   //   try {
+//   //     const canvas = await html2canvas(element);
+//   //     const dataUrl = canvas.toDataURL("image/png");
+//   //     const byteString = atob(dataUrl.split(",")[1]);
+//   //     const mimeString = dataUrl.split(",")[0].split(":")[1].split(";")[0];
+//   //     const ab = new ArrayBuffer(byteString.length);
+//   //     const ia = new Uint8Array(ab);
+
+//   //     for (let i = 0; i < byteString.length; i++) {
+//   //       ia[i] = byteString.charCodeAt(i);
+//   //     }
+
+//   //     const blob = new Blob([ab], { type: mimeString });
+//   //     zip.file(`${props.formBasicConfig.formName}-${tableKey}.png`, blob);
+//   //   } catch (error) {
+//   //     console.error(`Error converting ${tableKey} to image:`, error);
+//   //   }
+//   // }
+//   const tableEntries = Object.entries(tableRefs);
+  
+//   // 并发处理表格转换
+//   await Promise.all(tableEntries.map(async ([tableKey, element]) => {
+//     try {
+//       const canvas = await html2canvas(element);
+//       const dataUrl = canvas.toDataURL("image/png");
+//       const byteString = atob(dataUrl.split(",")[1]);
+//       const mimeString = dataUrl.split(",")[0].split(":")[1].split(";")[0];
+//       const ab = new ArrayBuffer(byteString.length);
+//       const ia = new Uint8Array(ab);
+
+//       for (let i = 0; i < byteString.length; i++) {
+//         ia[i] = byteString.charCodeAt(i);
+//       }
+
+//       const blob = new Blob([ab], { type: mimeString });
+//       zip.file(`${props.formBasicConfig.formName}-${tableKey}.png`, blob);
+//     } catch (error) {
+//       console.error(`Error converting ${tableKey} to image:`, error);
+//     }
+//   }));
+
+//   zip.generateAsync({ type: "blob" }).then(function (content) {
+//     const now = new Date();
+//     const formattedDate = `${now.getFullYear()}${String(now.getMonth() + 1).padStart(
+//       2,
+//       "0"
+//     )}${String(now.getDate()).padStart(2, "0")}_${String(now.getHours()).padStart(
+//       2,
+//       "0"
+//     )}${String(now.getMinutes()).padStart(2, "0")}${String(now.getSeconds()).padStart(
+//       2,
+//       "0"
+//     )}`;
+//     const fileName = `${props.formBasicConfig.formName}-${formattedDate}.zip`;
+
+//     const link = document.createElement("a");
+//     link.href = URL.createObjectURL(content);
+//     link.download = fileName;
+//     loadingInstance.close();
+//     link.click();
+//     tableRefs = {};
+//     // 不管成功与否，最后都要恢复按钮的状态
+//     isButton1Disabled.value = false;
+//     isButton2Disabled.value = false;
+//   });
+// }
 async function downloadTables() {
+  // 1. 初始化状态
   isButton1Disabled.value = true;
   isButton2Disabled.value = true;
   const loadingInstance = ElLoading.service({
     fullscreen: true,
-    text: "正在生成图片，请稍候...", // 添加的文字内容，可根据需要修改
+    text: "正在生成图片，请稍候...",
   });
-  //ElMessage('This is a message.')
-  const zip = new JSZip();
-  //console.log(tableRefs)
-  for (const [tableKey, element] of Object.entries(tableRefs)) {
-    try {
-      const canvas = await html2canvas(element);
-      const dataUrl = canvas.toDataURL("image/png");
-      const byteString = atob(dataUrl.split(",")[1]);
-      const mimeString = dataUrl.split(",")[0].split(":")[1].split(";")[0];
-      const ab = new ArrayBuffer(byteString.length);
-      const ia = new Uint8Array(ab);
-
-      for (let i = 0; i < byteString.length; i++) {
-        ia[i] = byteString.charCodeAt(i);
-      }
-
-      const blob = new Blob([ab], { type: mimeString });
-      zip.file(`${props.formBasicConfig.formName}-${tableKey}.png`, blob);
-    } catch (error) {
-      console.error(`Error converting ${tableKey} to image:`, error);
+  
+  try {
+    const zip = new JSZip();
+    const tableEntries = Object.entries(tableRefs);
+    const errors: string[] = [];
+    
+    // 2. 并发控制：限制同时处理的表格数量
+    const concurrencyLimit = 3;
+    const batches = [];
+    
+    for (let i = 0; i < tableEntries.length; i += concurrencyLimit) {
+      batches.push(tableEntries.slice(i, i + concurrencyLimit));
     }
-  }
-
-  zip.generateAsync({ type: "blob" }).then(function (content) {
+    
+    // 3. 分批处理表格
+    for (const batch of batches) {
+      await Promise.all(batch.map(async ([tableKey, element]) => {
+        try {
+          // 4. 添加完整的 html2canvas 配置
+          const canvas = await html2canvas(element, {
+            scale: 2,
+            useCORS: true,
+            logging: false,
+            backgroundColor: "#ffffff",
+            removeContainer: true
+          });
+          
+          // 5. 图片处理逻辑
+          const dataUrl = canvas.toDataURL("image/png");
+          const byteString = atob(dataUrl.split(",")[1]);
+          const mimeString = dataUrl.split(",")[0].split(":")[1].split(";")[0];
+          const ab = new ArrayBuffer(byteString.length);
+          const ia = new Uint8Array(ab);
+          
+          for (let i = 0; i < byteString.length; i++) {
+            ia[i] = byteString.charCodeAt(i);
+          }
+          
+          const blob = new Blob([ab], { type: mimeString });
+          zip.file(`${props.formBasicConfig.formName}-${tableKey}.png`, blob);
+        } catch (error) {
+          console.error(`Error converting ${tableKey} to image:`, error);
+          errors.push(tableKey);
+        }
+      }));
+    }
+    
+    // 6. 生成并下载 ZIP 文件
+    const content = await zip.generateAsync({ type: "blob" });
     const now = new Date();
-    const formattedDate = `${now.getFullYear()}${String(now.getMonth() + 1).padStart(
-      2,
-      "0"
-    )}${String(now.getDate()).padStart(2, "0")}_${String(now.getHours()).padStart(
-      2,
-      "0"
-    )}${String(now.getMinutes()).padStart(2, "0")}${String(now.getSeconds()).padStart(
-      2,
-      "0"
-    )}`;
+    const formattedDate = `${now.getFullYear()}${String(now.getMonth() + 1).padStart(2, "0")}${String(now.getDate()).padStart(2, "0")}_${String(now.getHours()).padStart(2, "0")}${String(now.getMinutes()).padStart(2, "0")}${String(now.getSeconds()).padStart(2, "0")}`;
     const fileName = `${props.formBasicConfig.formName}-${formattedDate}.zip`;
-
+    
     const link = document.createElement("a");
     link.href = URL.createObjectURL(content);
     link.download = fileName;
-    loadingInstance.close();
+    document.body.appendChild(link);
     link.click();
-    tableRefs = {};
-    // 不管成功与否，最后都要恢复按钮的状态
+    document.body.removeChild(link);
+    
+    // 7. 显示错误信息（如果有）
+    if (errors.length > 0) {
+      ElMessage.warning(`以下表格转换失败：${errors.join(", ")}`);
+    }
+  } catch (error) {
+    console.error("Error in downloadTables:", error);
+    ElMessage.error("生成图片时发生错误，请重试");
+  } finally {
+    // 8. 恢复状态
+    loadingInstance.close();
     isButton1Disabled.value = false;
     isButton2Disabled.value = false;
-  });
+  }
 }
+
+
+
+
 function closeQrDownload() {
   qrCodesPrintDialogFlag.value = false;
   tableRefs = {};
@@ -376,7 +534,7 @@ let dofs: any[] = []; //deptOrgAndOrgCententAndFounderArr
 let rangedDatePickerInTables: any[] = [];
 
 function getAllRangedDatePickerInTables(){
-  let dataList = ref({});
+  let dataList = ref<any[]>([]);
   dataList.value = props.fieldsDetailList;
   if (dataList && Array.isArray(dataList.value) && dataList.value.length > 0) {
     for (let i = 0; i < dataList.value.length; i++) {
@@ -398,7 +556,7 @@ function getAllRangedDatePickerInTables(){
 
 function getAsfs() {
   //setTimeout(() => {
-  let dataList = ref({});
+  let dataList = ref<any[]>([]);
   dataList.value = props.fieldsDetailList;
   if (dataList && Array.isArray(dataList.value) && dataList.value.length > 0) {
     for (let i = 0; i < dataList.value.length; i++) {
@@ -590,7 +748,7 @@ function getLabelById(id: string): string | undefined {
 @ 时间: 2024-04-01 11:36:07
 @ 功能: 功能按钮动作
 */
-const setUpClick = (val: string, id: string) => {
+const setUpClick = (val: any, _id?: string) => {
   //alert(val.key)
   // console.log("功能按钮动作",val,"----id----->",props.versionid,"-----formId---->",props.versiontitle)
   if (val.key == "newAdd") {
@@ -603,7 +761,8 @@ const setUpClick = (val: string, id: string) => {
   } else if (val.key == "showQrCode") {
     //liwenxuan 20250114 二维码打印弹窗 start
     //在此组装参数,以生成二维码图片
-    let idArray = state.selectionChecked.map((item) => item.id);
+    // let idArray = state.selectionChecked.map((item) => item.id);
+    let idArray = Array.isArray(state.selectionChecked) ? state.selectionChecked.map((item) => item?.id).filter(Boolean) : [];
     if (idArray.length > 0) {
       //console.log(props.formBasicConfig)
       if (props.formBasicConfig.qrCodeFlag == true) {
@@ -964,7 +1123,7 @@ watch(
 );
 watch(
   () => props.formId,
-  (val: any) => {
+  (_val: any) => {
     getPageData();
   },
   {
@@ -972,9 +1131,9 @@ watch(
   }
 );
 
-const timeAxisRef = ref(null);
-const calendarPageRef = ref(null);
-const cardPageRef = ref(null);
+const timeAxisRef = ref();
+const calendarPageRef = ref();
+const cardPageRef = ref();
 const searchSend = reactive({
   formId: props.formId,
   page: state.currentPage,
@@ -1092,9 +1251,14 @@ function doExportTableData() {
           let maxline = 0;
           //写主表列
           for (let val of fields) {
-            if (typeof val === "string")
-              line.push((item[val.field] as string).replaceAll(",", "，"));
-            else line.push(item[val.field]);
+            const fieldValue = item[val.field];
+           if (fieldValue == null) {
+              line.push(""); // 空值处理
+            } else if (typeof fieldValue === "string") {
+              line.push((fieldValue as string).replaceAll(",", "，"));
+            } else {
+              line.push(fieldValue);
+            }
           }
 
           //写子表列
@@ -1168,8 +1332,8 @@ function doExportTableData() {
   }
 
   dynamicVNode.value = h(exportPanel, {
-    fields: columnsFilter.value.filter((item) => item.pattern !== "table"),
-    subtabs: columnsFilter.value.filter((item) => item.pattern === "table"),
+    fields: columnsFilter.value.filter((item:any) => item.pattern !== "table"),
+    subtabs: columnsFilter.value.filter((item:any) => item.pattern === "table"),
     subFields: subTableFieldsFilter.value.fields,
     commitFunc: exportFunc,
     closeFunc: () => (dynamicVNode.value = null),
@@ -1278,7 +1442,7 @@ async function doGainFormPageListCont(sendData: any) {
   }
 
   //console.log(data.data.list)
-  transferDetails.forEach((element) => {
+  transferDetails.forEach((element:any) => {
     //console.log(element)
     data.data.list.forEach((obj: any) => {
       //console.log(obj)
@@ -1525,10 +1689,9 @@ const judjeRadio = (val: any, options: any[]) => {
 @ 功能: 获取级联选择值
 */
 const judjeCascader = (val: any[], options: any[]) => {
-  if (val.length < 0) return "";
-  let valAry = stringToObj(val);
-  // console.log("获取级联选择值", stringToObj(val), val.length, options);
-  if (!Array.isArray(valAry)) return "";
+  if (!Array.isArray(val) || val.length === 0) return "";
+  let valAry = val;
+  // console.log("获取级联选择值", val, val.length, options);
   let title = "";
   valAry.forEach((item: any) => {
     // console.log("item", item);
@@ -1603,7 +1766,7 @@ const confirmEvent = (val: any) => {
     getPageData();
   });
 };
-const cancelEvent = (val: any) => {
+const cancelEvent = (_val: any) => {
   //   console.log('cancel!',val)
 };
 const container = ref(); //实例化内容容器
@@ -1619,7 +1782,16 @@ const asflookPageInfoIsShow = ref(false);
 const pageInfoCont = ref<any>();
 
 const lookPageInfo = (val: any) => {
-  tablePageClass.value = 4;
+   console.log("查看详细内容--------------------------->");
+  console.log(val);
+   console.log("查看详细内容--------------------------->");
+  tablePageClass.value = 3;
+  if(val.mastersKeyStr && val.mastersKeyStr != ""){
+
+    val.masters_key = val.mastersKeyStr
+
+  }
+  
   pageInfoCont.value = val;
   drawerWith.value = container.value?.clientWidth;
   lookPageInfoIsShow.value = true;
@@ -1635,6 +1807,11 @@ const editInfo = (val: any) => {
   // console.log('修改数据!',val)
   operState.value = 5;
   tablePageClass.value = 2;
+  if(val.mastersKeyStr && val.mastersKeyStr != ""){
+
+    val.masters_key = val.mastersKeyStr
+
+  }
   pageInfoCont.value = val;
   drawerWith.value = container.value?.clientWidth;
   lookPageInfoIsShow.value = true;
@@ -1647,6 +1824,11 @@ const editInfo = (val: any) => {
 const submitApproval = (val: any) => {
   operState.value = 4;
   tablePageClass.value = 2;
+  if(val.mastersKeyStr && val.mastersKeyStr != ""){
+
+    val.masters_key = val.mastersKeyStr
+
+  }
   pageInfoCont.value = val;
   drawerWith.value = container.value?.clientWidth;
   lookPageInfoIsShow.value = true;
@@ -1662,7 +1844,7 @@ const withdrawApplication = (val: any) => {
     // id: val.masters_key,
     id: val.runFlowId,
   };
-  retractRunWorkFlow(sendInfo).then((data) => {
+  retractRunWorkFlow(sendInfo).then((_data) => {
     ElMessage({
       message: "撤回成功！",
       type: "success",
@@ -1679,7 +1861,7 @@ const recallSendMsg = (val: any) => {
   let sendInfo = {
     id: val.masters_key.toString(),
   };
-  recalSendMsg(sendInfo).then((data) => {
+  recalSendMsg(sendInfo).then((_data) => {
     ElMessage({
       message: "撤回成功！",
       type: "success",
@@ -1695,6 +1877,11 @@ const recallSendMsg = (val: any) => {
 const afreshSendFlow = (val: any) => {
   operState.value = 2;
   tablePageClass.value = 2;
+  if(val.mastersKeyStr && val.mastersKeyStr != ""){
+
+    val.masters_key = val.mastersKeyStr
+
+  }
   pageInfoCont.value = val;
   drawerWith.value = container.value?.clientWidth;
   lookPageInfoIsShow.value = true;
@@ -1707,81 +1894,62 @@ const afreshSendFlow = (val: any) => {
 const editFormSendFlow = (val: any) => {
   operState.value = 3;
   tablePageClass.value = 2;
+  if(val.mastersKeyStr && val.mastersKeyStr != ""){
+
+    val.masters_key = val.mastersKeyStr
+
+  }
   pageInfoCont.value = val;
   drawerWith.value = container.value?.clientWidth;
   lookPageInfoIsShow.value = true;
 };
 const viewType = ref(1);
 const viewLayout = ref<any>();
+const resetViewClickStates = (excludeView?: string) => {
+    if (!props.viewPage || typeof props.viewPage !== 'object') return;
+    const views = ['list', 'date', 'time', 'gantt', 'map', 'card', 'chart'];
+    views.forEach(view => {
+        const viewObj = props.viewPage[view];
+        if (view !== excludeView && viewObj && typeof viewObj === 'object') {
+            viewObj.isClick = false;
+        }
+    });
+};
+  
 /**
 @ 作者: 秦东
 @ 时间: 2024-07-08 09:39:52
 @ 功能: 切换视图展示方式
 */
 const tabsView = (val: any, types: number) => {
-  viewType.value = types;
+  viewType.value = types;                                                             
   val.isClick = true;
   viewLayout.value = val;
   // console.log("切换视图展示方式",val)
   switch (types) {
     case 2:
-      props.viewPage.list.isClick = false;
-      props.viewPage.time.isClick = false;
-      props.viewPage.gantt.isClick = false;
-      props.viewPage.map.isClick = false;
-      props.viewPage.card.isClick = false;
-      props.viewPage.chart.isClick = false;
+      resetViewClickStates('date');
       break;
     case 3:
-      props.viewPage.list.isClick = false;
-      props.viewPage.date.isClick = false;
-      props.viewPage.gantt.isClick = false;
-      props.viewPage.map.isClick = false;
-      props.viewPage.card.isClick = false;
-      props.viewPage.chart.isClick = false;
+      resetViewClickStates('time');
       getPageData();
       break;
     case 4:
-      props.viewPage.list.isClick = false;
-      props.viewPage.date.isClick = false;
-      props.viewPage.time.isClick = false;
-      props.viewPage.map.isClick = false;
-      props.viewPage.card.isClick = false;
-      props.viewPage.chart.isClick = false;
+      resetViewClickStates('gantt');
       break;
     case 5:
-      props.viewPage.list.isClick = false;
-      props.viewPage.date.isClick = false;
-      props.viewPage.time.isClick = false;
-      props.viewPage.gantt.isClick = false;
-      props.viewPage.card.isClick = false;
-      props.viewPage.chart.isClick = false;
+     resetViewClickStates('map');
       break;
     case 6:
-      props.viewPage.list.isClick = false;
-      props.viewPage.date.isClick = false;
-      props.viewPage.time.isClick = false;
-      props.viewPage.gantt.isClick = false;
-      props.viewPage.map.isClick = false;
-      props.viewPage.chart.isClick = false;
+      resetViewClickStates('card');
       break;
     case 7:
-      props.viewPage.card.isClick = false;
-      props.viewPage.list.isClick = false;
-      props.viewPage.date.isClick = false;
-      props.viewPage.time.isClick = false;
-      props.viewPage.gantt.isClick = false;
-      props.viewPage.map.isClick = false;
+      resetViewClickStates('chart');
       break;
     default:
-      props.viewPage.date.isClick = false;
-      props.viewPage.card.isClick = false;
-      props.viewPage.time.isClick = false;
-      props.viewPage.gantt.isClick = false;
-      props.viewPage.map.isClick = false;
-      props.viewPage.chart.isClick = false;
+      resetViewClickStates('list');
       break;
-  }
+    }
 };
 /**
 @ 作者: 秦东
@@ -1794,7 +1962,7 @@ const writeListTitle = (val: any, viewConfig: any) => {
   var titleAry: any[] = [];
   if (viewConfig.form && viewConfig.form.title) {
     if (viewConfig.form.title.length > 0) {
-      viewConfig.form.title.forEach((item: string|number, index: any) => {
+      viewConfig.form.title.forEach((item: string|number, _index: any) => {
         // console.log("判断是否有标题--"+index+"-->",val[item])
         if (val[item]) {
           titleAry.push(val[item]);
@@ -1845,7 +2013,7 @@ const judgeListTitle = (val: any, viewConfig: any) => {
   return false;
 };
 // 选择数据转换，默认尝试转数字
-const transformOption = (val: string | number, type?: string) => {
+const transformOption = (val: string | number, _type?: string) => {
   return formatNumber(val);
 };
 
@@ -1891,7 +2059,7 @@ const tableChildren = (field:string,dataList:any) => {
   let jieguo = ""
   if(Array.isArray(dataList)){
     
-    dataList.forEach((item:any,key:string) => {
+    dataList.forEach((item:any,_index:number) => {
       // console.log("表头label长度-item--->",field, item);
       if(isObject(item)){
        
@@ -1916,6 +2084,15 @@ jieguo = jieguo+"<div style='width: 100%;height: 1px;border-bottom: 1px solid #E
 const isObject = (obj: any) => {
     return typeof obj === "object";
 }
+/**
+@ 作者: 秦东
+@ 时间: 2026-01-28 13:17:48
+@ 功能: 取菲值
+*/
+const getNonValue = () => {
+    // eslint-disable-next-line vue/no-mutating-props
+    props.config.searchIsShow = !props.config.searchIsShow
+}
 </script>
 <template>
   <div ref="container" v-loading="state.loading" class="table-list-comm">
@@ -1936,7 +2113,6 @@ const isObject = (obj: any) => {
                   v-model="item.value"
                   type="datetime"
                   :placeholder="'请选择' + item.label"
-                  :shortcuts="shortcuts"
                 />
                 <SearchSelect
                   v-if="unitIsShow(item, 'radio')"
@@ -2045,7 +2221,7 @@ const isObject = (obj: any) => {
                 <el-button
                   size="small"
                   class="fa fa-search"
-                  @click="config.searchIsShow = !config.searchIsShow"
+                  @click="getNonValue()"
                 />
               </el-tooltip>
               <el-tooltip
@@ -2201,15 +2377,15 @@ const isObject = (obj: any) => {
               header-align="center"
               align="center"
             >
-              <template #default="scope">
-              
-                <template v-for="sunItem in item.children" v-if="item.pattern == 'table'"> 
-                  <el-table-column  v-if="sunItem.fieldClass == ''" :prop="sunItem.field" :label="sunItem.label"  header-align="center"  align="center" :min-width="readerColumnSun(sunItem)">
-                    <template #default="scopeChilder">
-                     
-                      <div v-html="tableChildren(sunItem.field,scopeChilder.row[item.field])"></div>
-                    </template>
-                  </el-table-column>
+              <template #default>
+                <template v-for="sunItem in item.children" :key="sunItem.field">
+                  <template  v-if="item.pattern == 'table'" > 
+                    <el-table-column  v-if="sunItem.fieldClass == ''" :prop="sunItem.field" :label="sunItem.label"  header-align="center"  align="center" :min-width="readerColumnSun(sunItem)">
+                      <template #default="scopeChilder">
+                        <div v-html="tableChildren(sunItem.field,scopeChilder.row[item.field])"></div>
+                      </template>
+                    </el-table-column>
+                  </template>
                 </template>
               </template>
             </el-table-column>
@@ -2379,32 +2555,33 @@ const isObject = (obj: any) => {
                 {{ scope.column.label }}
                 <tooltip :content="item.help" />
               </template>
-              <template v-if="item.fieldClass == 'deptOrg'" #default="scope">
-                <!-- {{scope.row[scope.column.property]}}{{item}} -->
-                {{ scope.row[scope.column.property] }}
-              </template>
-              <template v-if="item.fieldClass == 'cascader'" #default="scope">
-                {{ judjeCascader(scope.row[scope.column.property], item.options) }}
-              </template>
-              <template v-if="item.fieldClass == 'radio'" #default="scope">
-                <!-- {{scope.row[scope.column.property]}}{{item}} -->
-                {{ judjeRadio(scope.row[scope.column.property], item.options) }}
-              </template>
-              <template v-if="item.fieldClass == 'upload'" #default="scope">
-                <div class="demo-image__error">
-                  <el-image
-                    style="width: 50px; height: 50px"
-                    :src="scope.row[scope.column.property]"
-                  >
-                    <template #error>
-                      <div class="image-slot">
-                        <el-icon><Picture /></el-icon>
-                      </div>
-                    </template>
-                  </el-image>
+              <template #default="scope">
+                <div v-if="item.fieldClass == 'deptOrg'">
+                  <!-- {{scope.row[scope.column.property]}}{{item}} -->
+                  {{ scope.row[scope.column.property] }}
                 </div>
-              </template>
-              <template v-if="item.fieldClass == 'switch'" #default="scope">
+                <div v-else-if="item.fieldClass == 'cascader'">
+                  {{ judjeCascader(scope.row[scope.column.property], item.options) }}
+                </div>
+                <div v-else-if="item.fieldClass == 'radio'">
+                  <!-- {{scope.row[scope.column.property]}}{{item}} -->
+                  {{ judjeRadio(scope.row[scope.column.property], item.options) }}
+                </div>
+                <div v-else-if="item.fieldClass == 'upload'">
+                  <div class="demo-image__error">
+                    <el-image
+                      style="width: 50px; height: 50px"
+                      :src="scope.row[scope.column.property]"
+                    >
+                      <template #error>
+                        <div class="image-slot">
+                          <el-icon><Picture /></el-icon>
+                        </div>
+                      </template>
+                    </el-image>
+                  </div>
+                </div>
+                <div v-else-if="item.fieldClass == 'switch'">
                 <el-tag
                   v-if="judjeSwitch(scope.row[scope.column.property], item.activeValue)"
                   type="success"
@@ -2413,18 +2590,19 @@ const isObject = (obj: any) => {
                   启用
                 </el-tag>
                 <el-tag v-else type="danger" effect="light"> 禁用 </el-tag>
-              </template>
-              <template v-if="item.fieldClass == 'baidumap'" #default="scope">
-                {{ scope.row[scope.column.property] }}
-              </template>
-              <template v-if="item.fieldClass == 'associatedForms'" #default="scope">
-                <el-link
-                  key="primary"
-                  type="primary"
-                  @click="showAsfDetailDialog(item, scope, asfQueryParams)"
-                >
-                  {{ scope.row[scope.column.property] }}==
-                </el-link>
+                </div>
+                <div v-else-if="item.fieldClass == 'baidumap'">
+                  {{ scope.row[scope.column.property] }}
+                </div>
+                <div v-else-if="item.fieldClass == 'associatedForms'">
+                  <el-link
+                    key="primary"
+                    type="primary"
+                    @click="showAsfDetailDialog(item, scope, asfQueryParams)"
+                  >
+                    {{ scope.row[scope.column.property] }}==
+                  </el-link>
+                </div>
               </template>
             </el-table-column>
           </template>
@@ -2493,7 +2671,7 @@ const isObject = (obj: any) => {
         
 
         <SeeContChart
-          :echats-views="echatsViewsdf"
+          :echats-views="[echatsViewsdf]"
           :table-key="formBasicConfig.name"
           :types="1"
         />
@@ -2543,15 +2721,27 @@ const isObject = (obj: any) => {
         </el-button-group>
       </el-col>
     </el-row>
-    <FormPageCont
+
+    <NewFormPageCont
       v-model:is-show="lookPageInfoIsShow"
       :drawer-with="drawerWith"
       :page-info="pageInfoCont"
       :table-page-class="tablePageClass"
       :oper-state="operState"
       :dprt="rangedDatePickerInTables1"
+      :versiontitle="props.versiontitle"
       @get-page-data="getPageData"
     />
+
+    <!-- <FormPageCont
+      v-model:is-show="lookPageInfoIsShow"
+      :drawer-with="drawerWith"
+      :page-info="pageInfoCont"
+      :table-page-class="tablePageClass"
+      :oper-state="operState"
+      :dprt="rangedDatePickerInTables1"
+      @get-page-data="getPageData"
+    /> -->
     <FormPageCont
       v-model:is-show="asflookPageInfoIsShow"
       :drawer-with="drawerWith"
@@ -2561,22 +2751,23 @@ const isObject = (obj: any) => {
       :dprt="rangedDatePickerInTables1"
       @get-page-data="getPageData"
     />
-    <TableFlow
+    <!-- <TableFlow
       v-model:isopen="openTaskDrawer"
       :versionid="props.versionid"
       :versiontitle="props.versiontitle"
       :drawerwith="drawerWith"
       :pick-app-menu="pickAppMenu"
       @searchquery="getListData"
-    />
-    <!-- <NewTableFlow 
+    /> -->
+  
+    <NewTableFlow 
       v-model:show="openTaskDrawer"
       :versionid="props.versionid"
       :versiontitle="props.versiontitle"
       :drawerwith="drawerWith"
       :pick-app-menu="pickAppMenu"
       @searchquery="getListData" 
-    /> -->
+    />
   </div>
 
   <div v-if="dynamicVNode">
diff --git a/src/components/DesignForm/app/index_20260129.vue b/src/components/DesignForm/app/index_20260129.vue
new file mode 100644
index 0000000..bce9adb
--- /dev/null
+++ b/src/components/DesignForm/app/index_20260129.vue
@@ -0,0 +1,1387 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2026-01-28 09:13:22
+@ 备注: 
+-->
+<script lang='ts' setup>
+import { checkboxUnit, choiceUnit, inputUnit, orgDeptUnit, orgUnit, switchUnit, timeUnit } from '@/api/DesignForm/fieldUnit';
+import { attrButton, FormPageConfig, FormPageList, tableButton, viewPageType } from '@/api/DesignForm/tableButton';
+import { echatsViewStruct } from '@/api/DesignForm/types';
+import { formatNumber } from '@/api/DesignForm/utils';
+import { useDesignFormStore } from '@/store/DesignForm/designForm';
+import { json2string } from '@/utils/DesignForm/form';
+import { FormInstance } from 'element-plus';
+import { useRoute } from 'vue-router';
+import { formHasPower } from '@/directive/permission/button';
+import { gainFormPageListCont } from '@/api/DesignForm/requestapi';
+import request from '@/utils/request';
+
+//引入组件
+import SearchSelect from "@/components/DesignForm/app/calendar/selectSearch.vue";
+import exportPanel from "@/components/DesignForm/exportPanel.vue";
+
+//引入页面
+import TablesList from "@/components/DesignForm/app\pageViews\tableList.vue"
+
+
+const props = withDefaults(
+    defineProps<{
+        data: FormPageList | any;
+        searchData?: attrButton[] | any;
+        config?: FormPageConfig;
+        appKey?: string;
+        formId?: string;
+        signCode?: string;
+        beforeRequest?: (params: any, rout: any) => any;
+        afterResponse?: (result: any) => any | string;
+        beforeDelete?: (params: any, route: any) => any;
+        showPage?: boolean;
+        requestUrl?: string; // 请求的api
+        deleteUrl?: string; // 删除的api
+        dict?: { [key: string | number]: string | number };
+        fixedBottomScroll?: boolean;
+        query?: { [key: string]: any }; // 一些附加的请求参数
+        autoLoad?: boolean; // 初始时自动请求加载数据
+        delKey?: string; // 删除标识
+        lookPageIsShow?: boolean;
+        versionid?: string;
+        pickAppMenu?: any;
+        versiontitle?: string;
+        viewPage?: viewPageType | any;
+        formBasicConfig?: any;
+        fieldsDetailList?: any;
+        orgAndManTree?: any;
+        echatsViews: echatsViewStruct;
+    }>(),
+    {
+        showPage: true,
+        data: () => {
+            return { columns: [], controlBtn: [], operateBtn: [], config: {} };
+        },
+        searchData: () => {
+            return [];
+        },
+        config: ():FormPageConfig => {
+            return {
+                pageSize: 0,
+                searchIsShow: false,
+                searchFormIsShow: false,
+                openPageMode: ''
+            };
+        },
+        dict: () => {
+            return {};
+        },
+        appKey: () => {
+            return "";
+        },
+        requestUrl: () => {
+            return "";
+        },
+        deleteUrl: () => {
+            return "";
+        },
+        formId: () => {
+            return "";
+        },
+        signCode: () => {
+            return "";
+        },
+        versionid: () => {
+            return "";
+        },
+        versiontitle: () => {
+        return "";
+        },
+        fixedBottomScroll: true,
+        autoLoad: true,
+        delKey: "id",
+        query: () => {
+            return {};
+        },
+        lookPageIsShow: () => {
+            return false;
+        },
+        viewPage: ():viewPageType => {
+            return {
+                card: undefined,
+                list: {
+                    status: false,
+                    isClick: false,
+                    form: {
+                        sortWord: '',
+                        sortClass: 0
+                    }
+                },
+                date: {
+                    status: false,
+                    isClick: false,
+                    form: {
+                        startTime: '',
+                        endTime: '',
+                        dayType: 0
+                    }
+                },
+                time: {
+                    status: false,
+                    isClick: false,
+                    form: {
+                        sortWord: '',
+                        sort: 0
+                    }
+                },
+                gantt: {
+                    status: false,
+                    isClick: false,
+                    form: {
+                        startTime: '',
+                        endTime: '',
+                        dayType: 0,
+                        sortWord: '',
+                        sort: 0
+                    }
+                },
+                map: {
+                    status: false,
+                    isClick: false,
+                    form: {
+                        mapWord: '',
+                        sortWord: '',
+                        sort: 0
+                    }
+                },
+                chart: {
+                    status: false,
+                    isClick: false,
+                    form: {
+                        mapWord: '',
+                        sortWord: '',
+                        sort: 0
+                    }
+                }
+            };
+        },
+        formBasicConfig: () => {
+            return {};
+        },
+        fieldsDetailList: () => {
+            return {};
+        },
+        orgAndManTree: () => {
+            return {};
+        },
+        pickAppMenu: () => {
+            return {};
+        },
+        beforeRequest: (params: any, rout: any):any => {
+            return
+        },
+        afterResponse: (result: any):any | string => {
+            return
+        },
+        beforeDelete: (params: any, rout: any):any => {
+            return
+        }
+    }
+)
+
+const emits = defineEmits(["selectionChange", "btnClick"]);
+const tableDataList = ref([]); // 表格行数据
+const calendarPageRef = ref(null);      //数据页面
+const route = useRoute();
+const designStore = useDesignFormStore();
+//基础设定
+const state = reactive({
+    loading: false,
+    currentPage: 1,
+    pageSize: props.config?.pageSize || 2,
+    total: 0,
+    selectionChecked: [],
+    dict: {}, // 接口返回的
+    searchFormDown: false,
+    treeValue: {}, // 侧栏树选中的值
+    tableScrollMargin: 0,
+    columnsCheck: designStore.getColumnsCheck(route.path),
+    currentNodeKey: "",
+});
+const viewType = ref(1);        //试图类型 (1：列表视图；2：日历视图；3：时间轴；4：甘特图；5：地图视图；6：卡片视图；7：BI报表)
+const viewLayout = ref<any>();  //当前视图框架
+const ruleSearchForm = ref();   //搜索表单
+const drawerWith = ref(); //编辑表单时抽屉宽度
+const container = ref(); //实例化内容容器
+const openTaskDrawer = ref(false); //新增数据
+const idList = ref<string[]>([]);
+//导出窗口的父元素
+const dynamicVNode = ref<VNode | null>(null); //组件的父组件
+const operState = ref<number>(1); //操作状态	1：新增；2：重新发起；3：申请修改；4：提交审批;5:普通表单修改
+const tablePageClass = ref(1);
+const pageInfoCont = ref<any>();
+const lookPageInfoIsShow = ref(false);
+// 重置所有视图的 isClick 状态
+const resetViewClickStates = (excludeView?: string) => {
+    if (!props.viewPage || typeof props.viewPage !== 'object') return;
+    const views = ['list', 'date', 'time', 'gantt', 'map', 'card', 'chart'];
+    views.forEach(view => {
+        const viewObj = props.viewPage[view];
+        if (view !== excludeView && viewObj && typeof viewObj === 'object') {
+            viewObj.isClick = false;
+        }
+    });
+};
+/**
+@ 作者: 秦东
+@ 时间: 2026-01-28 10:43:43
+@ 功能: 获取数据
+*/
+const getPageData = () => {
+    let sendData = {
+        formId: props.formId,
+        page: state.currentPage,
+        pagesize: state.pageSize,
+        searchData: json2string(props.searchData),
+    };
+
+    console.error("返回值事什么-->",viewType.value)
+    //根据页面类型获取数据
+    switch (viewType.value) {
+        case 2:
+            nextTick(() => {
+                // calendarPageRef.value.calendarSearchData(sendData);
+            })
+            break;
+        case 3:
+        
+            break;
+        case 4:
+            
+            break;
+        case 5:
+            
+            break;
+        case 6:
+            
+            break;
+        case 7:
+            
+            break;
+        default:
+            state.loading = true;
+            doGainFormPageListCont(sendData)
+                .then((datas) => {
+                    console.error("返回值事什么-->",datas)
+                    tableDataList.value = datas.list;
+                    state.total = datas.total;                    
+                })
+                .finally(() => {
+                    state.loading = false;
+                    asfs = [];
+                    radios = [];
+                    checkboxs = [];
+                    switchs = [];
+                    selects = [];
+                    tables = [];
+                    dofs = [];
+                    getAsfs();
+                })
+            break;
+    }
+}
+/**
+@ 作者: 秦东
+@ 时间: 2026-01-28 14:52:46
+@ 功能: 
+*/
+const getAsfs = () => {
+    let dataList = ref({});
+    dataList.value = props.fieldsDetailList;
+    if (dataList && Array.isArray(dataList.value) && dataList.value.length > 0) {
+        for (let i = 0; i < dataList.value.length; i++) {
+            if (dataList.value[i].type == "associatedForms") {
+                asfs.push(dataList.value[i]);
+            } else if (dataList.value[i].type == "radio") {
+                radios.push(dataList.value[i]);
+            } else if (dataList.value[i].type == "checkbox") {
+                checkboxs.push(dataList.value[i]);
+            } else if (dataList.value[i].type == "switch") {
+                switchs.push(dataList.value[i]);
+            } else if (dataList.value[i].type == "select") {
+                selects.push(dataList.value[i]);
+            } else if (
+                dataList.value[i].type == "deptOrg" ||
+                dataList.value[i].type == "orgCentent" ||
+                dataList.value[i].type == "founder"
+            ) {
+                //||dataList.value[i].type == "owner"拥有者,"expand-user"选择用户
+                dofs.push(dataList.value[i]);
+            } else if (
+                dataList.value[i].type == "card" ||
+                dataList.value[i].type == "flex" ||
+                dataList.value[i].type == "div" ||
+                dataList.value[i].type == "table"
+            ) {
+                if (dataList.value[i].type == "table") {
+                    tables.push(dataList.value[i]);
+                }
+
+                dataList.value[i].list.forEach((element: any) => {
+                    if (element.type == "associatedForms") {
+                        asfs.push(element);
+                    } else if (element.type == "radio") {
+                        radios.push(element);
+                    } else if (element.type == "checkbox") {
+                        checkboxs.push(element);
+                    } else if (element.type == "switch") {
+                        switchs.push(element);
+                    } else if (element.type == "select") {
+                        selects.push(element);
+                    } else if (
+                        element.type == "deptOrg" ||
+                        element.type == "orgCentent" ||
+                        element.type == "founder"
+                    ) {
+                        dofs.push(element);
+                    }
+                });
+            } else if (dataList.value[i].type == "grid") {
+                let columns = JSON.parse(JSON.stringify(dataList.value[i].columns));
+                if (columns.length > 0) {
+                    for (let z = 0; z < columns.length; z++) {
+                        for (let x = 0; x < columns[z].list.length; x++) {
+                            let a = JSON.parse(JSON.stringify(columns[z].list[x]));
+                            if (a.type == "associatedForms") {
+                                asfs.push(a);
+                            } else if (a.type == "radio") {
+                                radios.push(a);                                                                                                                                                         
+                            } else if (a.type == "checkbox") {
+                                checkboxs.push(a);
+                            } else if (a.type == "switch") {
+                                switchs.push(a);
+                            } else if (a.type == "select") {
+                                selects.push(a);
+                            } else if (
+                                a.type == "deptOrg" ||
+                                a.type == "orgCentent" ||
+                                a.type == "founder"
+                            ) {
+                                dofs.push(a);
+                            }
+                        }
+                    }
+                }
+            } else if (dataList.value[i].type == "tabs") {
+                //tabs标签页有可能再嵌套一层flex或者table
+                let columns = JSON.parse(JSON.stringify(dataList.value[i].columns));
+                if (columns.length > 0) {
+                    for (let z = 0; z < columns.length; z++) {
+                        for (let x = 0; x < columns[z].list.length; x++) {
+                            let a = JSON.parse(JSON.stringify(columns[z].list[x]));
+
+                            if (a.type == "associatedForms") {
+                                asfs.push(a);
+                            } else if (a.type == "radio") {
+                                radios.push(a);
+                            } else if (a.type == "checkbox") {
+                                checkboxs.push(a);
+                            } else if (a.type == "switch") {
+                                switchs.push(a);
+                            } else if (a.type == "select") {
+                                selects.push(a);
+                            } else if (
+                                a.type == "deptOrg" ||
+                                a.type == "orgCentent" ||
+                                a.type == "founder"
+                            ) {
+                                dofs.push(a);
+                            } else if (a.type == "flex" || a.type == "table") {
+                                if (a.type == "table") {
+                                    tables.push(dataList.value[i]);
+                                }
+
+                                if (a.list.length > 0) {
+                                    for (let m = 0; m < a.list.length; m++) {
+                                        let q = JSON.parse(JSON.stringify(a.list[m]));
+                                        if (q.type == "associatedForms") {
+                                            asfs.push(q);
+                                        } else if (q.type == "radio") {
+                                            radios.push(q);
+                                        } else if (q.type == "checkbox") {
+                                            checkboxs.push(q);
+                                        } else if (q.type == "switch") {
+                                            switchs.push(q);
+                                        } else if (q.type == "select") {
+                                            selects.push(q);
+                                        } else if (
+                                            q.type == "deptOrg" ||
+                                            q.type == "orgCentent" ||
+                                            q.type == "founder"
+                                        ) {
+                                            dofs.push(q);
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+/**
+@ 作者: 秦东
+@ 时间: 2026-01-28 10:17:24
+@ 功能: 切换视图展示方式
+*/
+const tabsView = (val: any, types: number) => {
+    viewType.value = types;
+    val.isClick = true;
+    viewLayout.value = val;
+    switch (types) {
+    case 2:
+      resetViewClickStates('date');
+      break;
+    case 3:
+      resetViewClickStates('time');
+      getPageData();
+      break;
+    case 4:
+      resetViewClickStates('gantt');
+      break;
+    case 5:
+     resetViewClickStates('map');
+      break;
+    case 6:
+      resetViewClickStates('card');
+      break;
+    case 7:
+      resetViewClickStates('chart');
+      break;
+    default:
+      resetViewClickStates('list');
+      break;
+    }
+}
+/**
+@ 作者: 秦东
+@ 时间: 2026-01-28 10:58:02
+@ 功能: 重置搜索表单
+*/
+const resetFields = (formEl: FormInstance | undefined) => {
+    if (props.searchData && props.searchData.length > 0) {
+        props.searchData.forEach((item: any) => {
+            item.value = "";
+        });
+    }
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-03-28 16:03:12
+@ 功能: 判断搜索组件类型
+*/
+const unitIsShow = (val: attrButton, unitName: string):boolean => {
+    switch (val.fieldClass) {
+        case "id": //自定义表单保留字
+            return inputUnit.includes(unitName);
+            break;
+        case "masters_key": //自定义表单保留字
+            return inputUnit.includes(unitName);
+            break;
+        case "creater": //自定义表单保留字
+            return inputUnit.includes(unitName);
+            break;
+        case "creater_time": //自定义表单保留字
+            return timeUnit.includes(unitName);
+            break;
+        case "edit_time": //自定义表单保留字
+            return timeUnit.includes(unitName);
+            break;
+        case "flow_id": //自定义表单保留字
+            return inputUnit.includes(unitName);
+            break;
+        case "baidumap": //自定义表单保留字
+            return inputUnit.includes(unitName);
+            break;
+        case "input": //自定义表单保留字
+            return inputUnit.includes(unitName);
+            break;
+        case "radio": //自定义表单保留字
+            return choiceUnit.includes(unitName);
+            break;
+        case "switch": //自定义表单保留字
+            return switchUnit.includes(unitName);
+            break;
+        case "orgCentent": //自定义表单保留字
+            return orgUnit.includes(unitName);
+            break;
+        case "varchar": //自定义表单保留字
+            return inputUnit.includes(unitName);
+            break;
+        case "checkbox":
+            return checkboxUnit.includes(unitName);
+            break;
+        case "deptOrg":
+            return orgDeptUnit.includes(unitName);
+            break;
+        default:
+            if (val.fieldClass != "datePicker" && val.fieldClass != "timePicker") {
+                return inputUnit.includes(unitName);
+            }
+        break;
+    }
+    return false;
+}
+// 选择数据转换，默认尝试转数字
+const transformOption = (val: string | number, type?: string) => {
+    return formatNumber(val);
+};
+/**
+@ 作者: 秦东
+@ 时间: 2026-01-28 13:04:09
+@ 功能: 计算所有子列表的最大行数
+*/
+const subTableFieldsFilter = computed(() => {
+    const arr: { table: string; field: string; label: string }[] = [];
+    const names: string[] = [];
+    props.fieldsDetailList.forEach((item: any) => {
+        if (item.type === "table") {
+            names.push(item.name);
+            item.list.forEach((sub: any) => {
+                arr.push({ table: item.name, field: sub.name, label: sub.item.label });
+            });
+        }
+    });
+    return { tables: names, fields: arr };
+});
+// 工具函数：处理 CSV 字段值
+const processCsvField = (value: any): string => {
+    if (value === undefined || value === null) {
+        return "";
+    }
+    const stringValue = String(value);
+    return stringValue.replaceAll(",", "，");
+};
+/**
+@ 作者: 秦东
+@ 时间: 2026-01-28 11:26:49
+@ 功能: 表格导出
+*/
+const doExportTableData = () => {
+    //fields表示主表单的导出字段，subs表示主表单包含的子表格的导出字段
+    function exportFunc(
+        fields: { field: string; label: string }[],
+        subs: { table: string; field: string; label: string }[]
+    ){
+        let sendData = {
+            formId: props.formId,
+            page: 1,
+            pagesize: 10000,
+            searchData: json2string(props.searchData),
+        };
+        doGainFormPageListCont(sendData)
+            .then((datas) => {
+                const array: string[] = [];
+                //写入表头行
+                const title: string[] = [];
+                for (let val of fields) {
+                    title.push(val.label);
+                }
+                for (let val of subs) {
+                    title.push(val.label);
+                }
+                array.push(title.join(","));
+                //写入数据行
+                datas.list.forEach((item: { [x: string]: { [x: string]: any; }[]; }) => {
+                    const line = [];
+                    let maxline = 0;
+                    //写主表列
+                    for (let val of fields) {
+                        // if (typeof val === "string")
+                        // line.push((item[val.field] as unknown as string).replaceAll(",", "，"));
+                        // else line.push(item[val.field]);
+                        if (val && val.field) {
+                            line.push(processCsvField(item[val.field]));
+                        } else {
+                            line.push("");
+                        }
+                    }
+
+                    //写子表列
+                    if (subs.length > 0) {
+                        //计算所有子列表的最大行数
+                        for (let tab of subTableFieldsFilter.value.tables) {
+                            if (item[tab] && item[tab].length > maxline) maxline = item[tab].length;
+                        }
+                        //全都是空的
+                        if (maxline === 0) {
+                            array.push(line.join(",") + "," + Array(subs.length).fill(""));
+                            return;
+                        }
+
+                        //除第一行数据包含子表数据外，其他行都省略主表字段数据，用spaceprefix填充，避免重复
+                        const spacePrefix = Array(line.length).fill("");
+
+                        for (let i = 0; i < maxline; i++) {
+                            const row: any[] = [];
+                            subTableFieldsFilter.value.tables.forEach((name) => {
+                                if (item[name] && item[name].length - 1 >= i) {
+                                    //添加实际数据
+                                    subs
+                                        .filter((v) => v.table === name)
+                                        .forEach((f) => {
+                                            row.push(item[name][i][f.field]);
+                                        });
+                                } else {
+                                    //添加字段长度的N个空列
+                                    row.push(
+                                        ...Array(subs.filter((v) => v.table === name).length).fill("")
+                                    );
+                                }
+                            });
+
+                            //写入总csv数组
+                            if (i === 0) {
+                                array.push(line.join(",") + "," + row.join(","));
+                            } else {
+                                array.push(spacePrefix + "," + row.join(","));
+                            }
+                        }
+
+                        return;
+                    }
+                    //没有子表
+                    array.push(line.join(","));
+                });
+                //去掉标题行的统计
+                if (array.length - 1 !== datas.total){
+                    alert(`导出记录数：${datas.total}, 共计：${array.length - 1} 行`);
+                }
+                const filename = props.pickAppMenu.label + ".csv";
+                const csvString = array.join("\n");
+                const blob = new Blob([csvString], { type: "text/csv;charset=utf-8;" });
+                const link = document.createElement("a");
+                if (link.download !== undefined) {
+                    // feature detection
+                    // Browsers that support HTML5 download attribute
+                    const url = URL.createObjectURL(blob);
+                    link.setAttribute("href", url);
+                    link.setAttribute("download", filename);
+                    link.style.visibility = "hidden";
+                    document.body.appendChild(link);
+                    link.click();
+                    document.body.removeChild(link);
+                }
+            })
+            .finally(() => (dynamicVNode.value = null));
+    }
+    dynamicVNode.value = h(exportPanel, {
+        fields: columnsFilter.value.filter((item: { pattern: string; }) => item.pattern !== "table"),
+        subtabs: columnsFilter.value.filter((item: { pattern: string; }) => item.pattern === "table"),
+        subFields: subTableFieldsFilter.value.fields,
+        commitFunc: exportFunc,
+        closeFunc: () => (dynamicVNode.value = null),
+    });
+}
+/**
+@ 作者: 秦东
+@ 时间: 2026-01-28 13:10:40
+@ 功能: 获取表格头内容
+*/
+const columnsFilter = computed(() => {
+    // console.log("props.data判断是否有标题", props.data);
+    if (!state.columnsCheck?.length) {
+        // console.log("props.data判断是否有标题",props.data)
+        return props.data.columns;
+    } else {
+        // console.log("props.data.columns判断是否有标题",props.data)
+        return props.data.columns.filter((item: any) => {
+            return state.columnsCheck.includes(item.prop || item.type);
+        });
+    }
+    // console.log("获取表格头内容", props.data.columns);
+});
+let asfs: any[] = [];
+let radios: any[] = [];
+let checkboxs: any[] = [];
+let switchs: any[] = [];
+let selects: any[] = [];
+let tables: any[] = [];
+let dofs: any[] = []; //deptOrgAndOrgCententAndFounderArr
+let asfDetails = [];
+let transferDetails = [];
+let asfQueryParams: any[] = [];
+let rangedDatePickerInTables: any[] = [];
+const rangedDatePickerInTables1: any = []
+
+const dateStringToTimestampLocal = (dateStr: string) => {
+    const isoStr = dateStr.replace(' ', 'T');
+    const timestamp = new Date(isoStr).getTime();
+    if (isNaN(timestamp)) {
+        //throw new Error('Invalid date string');
+        return ''
+    }
+    return String(timestamp);
+}
+//liwenxuan 关联表单数据获取 start
+const getAsfDataTitlesByIds = (asfQueryParams: any[]) => {
+    return request({
+        url: "/javasys/lowCode/AssociatedForms/getAsfDataTitlesByIds",
+        method: "post",
+        data: asfQueryParams,
+    });
+}
+
+async function doGainFormPageListCont(sendData: any) {
+    const data = await gainFormPageListCont(sendData);
+    console.log("获取列表详细信息----------1111------->",data)
+    rangedDatePickerInTables.forEach(element => {
+        let x = element.split('^^^*^^^')
+        rangedDatePickerInTables1.push(x)
+        data.data.list.forEach((item: any) => {
+            let tableValues = item[x[0]]
+            tableValues.forEach((element1: any) => {
+                let start = dateStringToTimestampLocal(element1[x[1]])
+                let end = element1[x[1]+"_end"]
+                let arr = [start,end]
+                //console.log(arr)
+                element1[x[1]] = arr
+            });
+        });
+    });
+    asfDetails = props.data.columns.filter((item: any) => {
+        return item.fieldClass == "associatedForms";
+    });
+    transferDetails = props.data.columns.filter((item: any) => {
+        return item.fieldClass == "lowcodeTransfer";
+    });
+    if (asfDetails.length > 0 && data.data.list != null) {
+        //console.log(data.data.list)
+        //拼装参数,asf值对象数组
+        asfQueryParams = [];
+        for (let j = 0; j < asfDetails.length; j++) {
+            let asfQueryParamsItem: any = {};
+            //console.log(asfDetails[j])
+            asfQueryParamsItem.formId = asfDetails[j].control.formid;
+            asfQueryParamsItem.field = asfDetails[j].field;
+
+            let asfToSelectIds = [];
+            // console.log(data.data.list)
+            for (let i = 0; i < data.data.list.length; i++) {
+                let asfMasterAndAsfId: any = {};
+                asfMasterAndAsfId.asfId = data.data.list[i][asfDetails[j].field];
+                asfMasterAndAsfId.asfMasterId = data.data.list[i].id;
+
+                asfToSelectIds.push(asfMasterAndAsfId);
+            }
+            asfQueryParamsItem.asfToSelectIds = asfToSelectIds;
+            asfQueryParams.push(asfQueryParamsItem);
+        }
+        let queryCount = 0;
+        for (let i = 0; i < asfQueryParams[0].asfToSelectIds.length; i++) {
+            if (asfQueryParams[0].asfToSelectIds[i].asfId != "") {
+                queryCount++;
+            }
+        }
+        //console.log(asfQueryParams)
+        if (queryCount > 0) {
+            //liwenxuan 关联表单数据获取 start
+            let dataList = data;
+            //-------------------直接return 异步结果----------------------
+            return await getAsfDataTitlesByIds(asfQueryParams).then(({ data }) => {
+                //console.log(data)
+                for (let i = 0; i < dataList.data.list.length; i++) {
+                //console.log(dataList.data.list[i])
+                    for (let j = 0; j < data.length; j++) {
+                        //console.log(data[j])
+                        for (let n = 0; n < data[j].list.length; n++) {
+                            if (dataList.data.list[i].id == data[j].list[n].asfMasterId) {
+                                dataList.data.list[i][data[j].field] = data[j].list[n].label;
+                            }
+                            //console.log(data[j].list[n])
+                        }
+                    }
+                }
+                
+                return dataList.data;
+            });
+        }
+        console.error("获取列表详细信息------饭hi之----------->",data)
+        return data.data;
+    }else{
+        return data.data;
+    }
+
+
+
+
+}
+
+
+/**
+@ 作者: 秦东
+@ 时间: 2026-01-28 11:23:27
+@ 功能: 功能按钮动作
+*/
+const setUpClick = (val: any, id?: string) => {
+    switch(val.key){
+        case "newAdd":
+            drawerWith.value = container.value?.clientWidth;
+            openTaskDrawer.value = true;
+            break;
+        case "export":
+            doExportTableData();
+            break;
+        case "import":
+            break;
+        case "showQrCode":
+            break;
+        default:
+    }
+}
+/**
+@ 作者: 秦东
+@ 时间: 2026-01-28 13:17:48
+@ 功能: 取菲值
+*/
+const getNonValue = () => {
+    // eslint-disable-next-line vue/no-mutating-props
+    props.config.searchIsShow = !props.config.searchIsShow
+}
+/**
+@ 作者: 秦东
+@ 时间: 2026-01-28 14:41:24
+@ 功能: 表格选择操作
+*/
+const selectionChange = (row: any) => {
+    state.selectionChecked = row;
+    emits("selectionChange", row);
+    idList.value.length = 0;
+    if (row && row.length > 0) {
+    row.forEach((item: any) => {
+        // console.log('item', item.masters_key)
+        idList.value.push(item.masters_key.toString());
+    });
+  }
+}
+/**
+@ 作者: 秦东
+@ 时间: 2026-01-28 15:59:23
+@ 功能: 判断是否有标题
+*/
+const writeListTitle = (val: any, viewConfig: any) => {
+    var titleAry: any[] = [];
+    if (viewConfig.form && viewConfig.form.title) {
+        if (viewConfig.form.title.length > 0) {
+            viewConfig.form.title.forEach((item: string|number, index: any) => {
+                if (val[item]) {
+                    titleAry.push(val[item]);
+                }
+            })
+        }
+    }
+    if (titleAry.length > 0) {
+        return titleAry.join();
+    }  else {
+        let firstWord = "";
+        let powerAry = [
+            "id",
+            "creater_time",
+            "edit_time",
+            "masters_key",
+            "states",
+            "flow_id",
+        ];
+        for (let key in val) {
+            if (val.hasOwnProperty(key)) {
+                if (!powerAry.includes(key)) {
+                    if (val[key] != "" && val[key] != null) {
+                        firstWord = val[key];
+                    }
+                }
+            }
+        }
+        return firstWord;
+    }
+}
+/**
+@ 作者: 秦东
+@ 时间: 2026-01-28 16:08:28
+@ 功能: 表格宽度
+*/
+const readerColumnSun = (column: any) => {
+    // console.log("表头label长度-11->", column);
+    let labelLong = 0; // 表头label长度
+    if (column.label.length) {
+        labelLong = column.label.length;
+    }
+    if (labelLong > 0) {
+        if(labelLong > 6 ){
+            return labelLong * 15;
+        }else{
+            return labelLong * 30;
+        }
+        
+    }else{
+        return 100;
+    }
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-04-10 15:32:55
+@ 功能: 提交审批
+*/
+const submitApproval = (val: any) => {
+    operState.value = 4;
+    tablePageClass.value = 2;
+    pageInfoCont.value = val;
+    drawerWith.value = container.value?.clientWidth;
+    lookPageInfoIsShow.value = true;
+};
+/**
+@ 作者: 秦东
+@ 时间: 2026-01-28 15:01:16
+@ 功能: 页面渲染完毕后加载
+*/
+onMounted(() => {
+    getPageData();
+    nextTick(() => {
+        drawerWith.value = container.value?.clientWidth;
+    });
+})
+
+</script>
+<template>
+    <div ref="container" v-loading="state.loading" class="table-list-comm">
+        <el-row class="rowBox">
+            <el-col :span="24">
+                <el-form v-if="config.searchIsShow" ref="ruleSearchForm" class="seacherForm">
+                    <div v-for="(item, index) in searchData" :key="index"  class="group group-input">
+                        <el-form-item :label="item.label" class="form_cont">
+                            <el-input
+                                v-if="unitIsShow(item, 'input')"
+                                v-model="item.value"
+                                :placeholder="'请输入' + item.label"
+                                clearable
+                            />
+                            <el-date-picker
+                                v-if="unitIsShow(item, 'time')"
+                                v-model="item.value"
+                                type="datetime"
+                                :placeholder="'请选择' + item.label"
+                                
+                            />
+                            <SearchSelect
+                                v-if="unitIsShow(item, 'radio')"
+                                v-model:model-value="item.value"
+                                :data="item"
+                                :disabled="false"
+                                :transform-option="transformOption"
+                            />
+                            <el-select
+                                v-if="unitIsShow(item, 'switch')"
+                                v-model="item.value"
+                                clearable
+                                :placeholder="'请选择' + item.label"
+                            >
+                            <el-option
+                                :key="item.activeValue"
+                                label="是"
+                                :value="item.activeValue"
+                            />
+                            <el-option
+                                :key="item.inactiveValue"
+                                label="否"
+                                :value="item.inactiveValue"
+                            />
+                            </el-select>
+                            <SearchSelect
+                                v-if="unitIsShow(item, 'checkbox')"
+                                v-model:model-value="item.value"
+                                :data="item"
+                                :disabled="false"
+                                :is-checkbox="true"
+                                :transform-option="transformOption"
+                            />
+                            <el-date-picker
+                                v-if="item.fieldClass == 'datePicker'"
+                                v-model="item.value"
+                                :type="item.auxiliary"
+                                :placeholder="'请选择' + item.label"
+                                value-format="x"
+                            />
+                            <el-time-picker
+                                v-if="item.fieldClass == 'timePicker'"
+                                v-model="item.value"
+                                arrow-control
+                                :placeholder="'请选择' + item.label"
+                                value-format="x"
+                            />
+                            <DeptOrgSearch
+                                v-if="unitIsShow(item, 'org')"
+                                v-model="item.value"
+                                clearable
+                                :placeholder="'请选择' + item.label"
+                            >
+                            </DeptOrgSearch>
+                            <DeptOrgSearch
+                                v-if="unitIsShow(item, 'deptOrg')"
+                                v-model:model-value="item.value"
+                            />
+                        </el-form-item>
+                    </div>
+
+                    <div v-if="searchData.length" class="group group-btn">
+                        <el-button type="primary" @click="getPageData"><el-icon><Search /></el-icon>查询</el-button>
+                        <el-button @click="resetFields(ruleSearchForm)"><el-icon><Refresh /></el-icon>重置</el-button>
+                    </div>
+                </el-form>
+            </el-col>
+            <el-col :span="24">
+                <div class="operateButArea">
+                    <div class="operatLeft">
+                        <el-text v-if="data.controlBtn.length === 0" class="mx-1 tipBox" type="info">操作按钮区域</el-text>
+                        <template v-for="item in data.controlBtn" :key="item.type">
+                            <el-button
+                                v-if="formHasPower(props.pickAppMenu.appkey,props.signCode,item.key,0)"
+                                v-bind="item"
+                                @click="setUpClick(item)"
+                            >
+                                {{ item.label }}
+                            </el-button>
+                        </template>
+                    </div>
+                    <div>
+                        <el-button-group class="ml-4">
+                            <el-tooltip
+                                class="box-item"
+                                effect="dark"
+                                content="折叠查询表单"
+                                placement="bottom"
+                            >
+                                <el-button
+                                    size="small"
+                                    class="fa fa-search"
+                                    @click="getNonValue()"
+                                />
+                            </el-tooltip>
+                            <el-tooltip
+                                v-if="viewPage.list.status"
+                                class="box-item"
+                                effect="dark"
+                                content="列表视图"
+                                placement="top"
+                            >
+                                <el-button
+                                    size="small"
+                                    class="fa fa-table"
+                                    :color="viewPage.list.isClick ? '#a0cfff' : ''"
+                                    @click="tabsView(viewPage.list, 1)"
+                                />
+                            </el-tooltip>
+                            <el-tooltip
+                                v-if="props.viewPage.card && props.viewPage.card.status"
+                                class="box-item"
+                                effect="dark"
+                                content="卡片视图"
+                                placement="top"
+                            >
+                                <el-button
+                                    size="small"
+                                    class="fa fa-id-card-o"
+                                    :color="
+                                        props.viewPage.card && props.viewPage.card.isClick ? '#a0cfff' : ''
+                                    "
+                                    @click="tabsView(props.viewPage.card, 6)"
+                                />
+                            </el-tooltip>
+                            <el-tooltip
+                                v-if="viewPage.date.status"
+                                class="box-item"
+                                effect="dark"
+                                content="日历视图"
+                                placement="top"
+                            >
+                                <el-button
+                                    size="small"
+                                    class="fa fa-calendar"
+                                    :color="viewPage.date.isClick ? '#a0cfff' : ''"
+                                    @click="tabsView(viewPage.date, 2)"
+                                />
+                            </el-tooltip>
+                            <el-tooltip
+                                v-if="viewPage.time.status"
+                                class="box-item"
+                                effect="dark"
+                                content="时间轴"
+                                placement="top"
+                            >
+                                <el-button
+                                    size="small"
+                                    class="fa fa-clock-o"
+                                    :color="viewPage.time.isClick ? '#a0cfff' : ''"
+                                    @click="tabsView(viewPage.time, 3)"
+                                />
+                            </el-tooltip>
+                            <el-tooltip
+                                v-if="viewPage.gantt.status"
+                                class="box-item"
+                                effect="dark"
+                                content="甘特图"
+                                placement="top"
+                            >
+                                <el-button
+                                    size="small"
+                                    class="fa fa-bar-chart"
+                                    :color="viewPage.gantt.isClick ? '#a0cfff' : ''"
+                                    @click="tabsView(viewPage.gantt, 4)"
+                                />
+                            </el-tooltip>
+                            <el-tooltip
+                                v-if="viewPage.map.status"
+                                class="box-item"
+                                effect="dark"
+                                content="地图视图"
+                                placement="top"
+                            >
+                                <el-button
+                                    size="small"
+                                    class="fa fa-map-signs"
+                                    :color="viewPage.map.isClick ? '#a0cfff' : ''"
+                                    @click="tabsView(viewPage.map, 5)"
+                                />
+                            </el-tooltip>
+                            <el-tooltip
+                                v-if="viewPage.chart&&viewPage.chart.status"
+                                class="box-item"
+                                effect="dark"
+                                content="BI报表"
+                                placement="top"
+                            >
+                                <el-button
+                                    size="small"
+                                    class="fa fa-line-chart"
+                                    :color="viewPage.chart.isClick ? '#a0cfff' : ''"
+                                    @click="tabsView(viewPage.chart, 7)"
+                                />
+                            </el-tooltip>
+                        </el-button-group>
+                    </div>
+                </div>
+            </el-col>
+            <!--列表视图-->
+            <el-col v-if="viewType == 1" :span="24" class="tableTdClass">   
+                
+                <el-table
+                    v-bind="data.tableProps"
+                    ref="table"
+                    v-loading="state.loading"
+                    :data="tableDataList"
+                    table-layout="fixed"
+                    border
+                    @selection-change="selectionChange"
+                >
+                    <template v-for="item in columnsFilter" :key="item.id || item.label">
+                        <el-table-column
+                            v-if="['-'].includes(item.fieldClass)"
+                            :type="item.type"
+                            :prop="item.field"
+                            :label="item.label"
+                            config=""
+                            width="60"
+                            fixed
+                            header-align="center"
+                            align="center"
+                        >
+                            <template v-if="item.help" #header="scope">
+                                {{ scope.column.label }}
+                                <tooltip :content="item.help" />
+                            </template>
+                        </el-table-column>
+                        <el-table-column
+                            v-else-if="item.fieldClass == '_lableTitle'"
+                            label="标题"
+                            config=""
+                            min-width="20"
+                            header-align="center"
+                            align="center"
+                        >
+                            <template #default="scope">
+                                {{ writeListTitle(scope.row, viewPage.list) }}
+                            </template>
+                        </el-table-column>
+                        <el-table-column
+                            v-else-if="item.fieldClass == ''"
+                            :prop="item.field"
+                            :label="item.label"
+                            :min-width="readerColumnSun(item)"
+                            header-align="center"
+                            align="center"
+                        >
+                            <template #default>
+                                <template v-if="item.pattern == 'table'">
+                                    <template v-for="sunItem in item.children"> 
+                                        {{ sunItem }}
+                                        <!-- <el-table-column>
+                                            <template #default="scopeChilder">
+                                                <div v-html="tableChildren(sunItem.field,scopeChilder.row[item.field])"></div>
+                                            </template>
+                                        </el-table-column> -->
+                                    </template>
+                                </template>
+                            </template>
+                        </el-table-column>
+                        <el-table-column
+                            v-else-if="item.fieldClass == '__control'"
+                            :prop="item.field"
+                            :label="item.label"
+                            config=""
+                            min-width="220"
+                            header-align="center"
+                            align="center"
+                            fixed="right"
+                        >
+                            <template #default="scope">
+                                <el-button-group>
+                                    <el-tooltip
+                                        v-if="scope.row.flowIsOpens == 1 && scope.row.taskStatus == 1"
+                                        class="box-item"
+                                        effect="dark"
+                                        content="提交审批"
+                                        placement="top-end"
+                                    >
+                                        <el-button
+                                        type="success"
+                                        size="small"
+                                        class="fa fa-send-o"
+                                        @click="submitApproval(scope.row)"
+                                        />
+                                    </el-tooltip>
+                                </el-button-group>
+                            </template>
+                        </el-table-column>
+                    </template>
+                </el-table>
+            </el-col>
+            <el-col v-if="viewType == 1 && state.total > 0" :span="24" >   
+
+            </el-col>
+            <!--日历视图-->
+            <el-col v-if="viewType == 2" :span="24" >   
+
+            </el-col>
+            <!--时间轴-->
+            <el-col v-if="viewType == 3" :span="24" >   
+
+            </el-col>
+            <!--甘特图-->
+            <el-col v-if="viewType == 4" :span="24" >   
+
+            </el-col>
+            <!--地图视图-->
+            <el-col v-if="viewType == 5" :span="24" >   
+
+            </el-col>
+            <!--卡片视图-->
+            <el-col v-if="viewType == 6" :span="24" >   
+
+            </el-col>
+            <!--BI报表-->
+            <el-col v-if="viewType == 7" :span="24" >   
+
+            </el-col>
+        </el-row>
+    </div>
+</template>
+<style  lang='scss' scoped>
+.table-list-comm {
+  padding: 0px 5px 5px 5px;
+}
+.rowBox {
+  width: 100%;
+}
+.seacherForm {
+  min-height: auto;
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: flex-start;
+}
+.pageBox {
+  width: 100%;
+  margin-top: 20px;
+  text-align: center;
+  display: flex;
+  justify-content: center;
+}
+.operateButArea {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-top: 15px;
+  margin-bottom: 15px;
+  .operatLeft {
+    padding-bottom: 2px;
+  }
+  
+}
+.group {
+  width: auto;
+  margin-right: 10px;
+}
+.demo-image__error .block {
+  padding: 0px 0;
+  text-align: center;
+  border-right: solid 1px var(--el-border-color);
+  display: inline-block;
+  width: 100%;
+  box-sizing: border-box;
+  vertical-align: top;
+}
+.demo-image__error .demonstration {
+  display: block;
+  color: var(--el-text-color-secondary);
+  font-size: 14px;
+  margin-bottom: 20px;
+}
+.demo-image__error .el-image {
+  padding: 0 5px;
+  max-width: 300px;
+  max-height: 200px;
+  width: 100%;
+  height: 200px;
+}
+
+.demo-image__error .image-slot {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 100%;
+  height: 100%;
+  background: var(--el-fill-color-light);
+  color: var(--el-text-color-secondary);
+  font-size: 30px;
+}
+.demo-image__error .image-slot .el-icon {
+  font-size: 30px;
+}
+table {
+  border-collapse: collapse;
+  width: 100%;
+  font-size: 13px;
+  text-align: center;
+}
+
+td,
+th {
+  border: 1px solid black;
+  padding: 8px;
+  vertical-align: middle; /* 设置文字上下居中 */
+}
+.tableTdClass{
+  :deep .cell{
+    padding: 0;
+  }
+  :deep .el-table--default .cell{
+    padding: 0;
+  }
+}
+</style>
diff --git a/src/components/DesignForm/app/pageViews/tableList.vue b/src/components/DesignForm/app/pageViews/tableList.vue
new file mode 100644
index 0000000..ee1cd71
--- /dev/null
+++ b/src/components/DesignForm/app/pageViews/tableList.vue
@@ -0,0 +1,38 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2026-01-28 14:29:57
+@ 备注: 列表视图
+-->
+<script lang='ts' setup>
+import { attrButton, FormPageList } from '@/api/DesignForm/tableButton';
+
+
+const props = withDefaults(
+    defineProps<{
+        data: FormPageList | any;
+        searchData?: attrButton[] | any;
+    }>(),
+    {
+        showPage: true,
+        data: () => {
+            return { columns: [], controlBtn: [], operateBtn: [], config: {} };
+        },
+        searchData: () => {
+            return [];
+        },
+    }
+)
+
+const tableDataList = ref([]); // 表格行数据
+
+</script>
+<template>
+  <div class="app-content">
+    
+  </div>
+</template>
+<style  lang='scss' scoped>
+.app-content {
+  
+}
+</style>
diff --git a/src/components/DesignForm/public/expand/lowcodeImage.vue b/src/components/DesignForm/public/expand/lowcodeImage.vue
index 4470330..6428421 100644
--- a/src/components/DesignForm/public/expand/lowcodeImage.vue
+++ b/src/components/DesignForm/public/expand/lowcodeImage.vue
@@ -7,7 +7,7 @@
 import {
   AnalysisCss,
   AnalysisInputCss,
-} from "@/components/DesignForm/public/form/calculate/cssInfo.ts";
+} from "@/components/DesignForm/public/form/calculate/cssInfo";
 import errimg from "@/assets/404_images/imgNotFound.png";
 import { uploadUrl, getRequest } from "@/api/DesignForm";
 import { ref,useAttrs } from 'vue'
@@ -16,6 +16,8 @@ import { Plus } from '@element-plus/icons-vue'
 import type { UploadProps, UploadUserFile } from 'element-plus'
 import { useRoute } from 'vue-router';
 
+import NoImgPage from '@/assets/image/1.png'
+
 import { getCurrentInstance } from 'vue';
 
 const getAncestorComponentNames = () => {
@@ -310,7 +312,7 @@ const fit = computed(()=>{
 </script>
 <template>
   <el-image
-        v-if="(!hasELCard(ancestors))&&props.data.control.useDefaultImg&&props.type==5"
+        v-if="(!hasELCard(ancestors))&&props.data.control&&props.type==5"
         :src="value"
         class="avatar"
         :style="getFormItemInputStyle(configStyle, 2)"
@@ -351,6 +353,23 @@ const fit = computed(()=>{
         :style="getFormItemInputStyle(configStyle, 2)"
         :fit="fit"
       />
+  </el-upload>
+  <el-upload
+    v-if="props.type==1"
+    v-bind="$props"
+    class="upload-demo"
+    :action="uploadUrl"
+    :show-file-list="false"
+    :on-success="handleAvatarSuccess"
+    :before-upload="beforeAvatarUpload"
+    v-loading="imgLoading"
+  >
+    <el-image
+        :src="props.modelValue?props.modelValue:NoImgPage"
+        class="avatar"
+        :style="getFormItemInputStyle(configStyle, 2)"
+        :fit="fit"
+      />
   </el-upload>
     <!-- <img referrerpolicy="no-referrer" :src="url" :style="styleObject" :fit="fit" :class="[boderAndShadowClassIsActive ? boderAndShadowClass : '', radiusClassIsActive ? radiusClass : '',mp, floatFlag ? floatStyle : '']"  /> -->
     <!-- <div></div> -->
diff --git a/src/components/DesignForm/public/form/form.vue b/src/components/DesignForm/public/form/form.vue
index c0ae24b..fbbdd74 100644
--- a/src/components/DesignForm/public/form/form.vue
+++ b/src/components/DesignForm/public/form/form.vue
@@ -613,7 +613,8 @@ provide(constControlChange, ({ key, value, data, tProp, type, attribute }: any)
         let formatRes: any = data.data;
         // 比较适用通用表单，保存在服务端
         const afterResponse = props.formData.events?.afterResponse;
-
+        // 构建结果树 - 修复重复问题
+        let result = {};
         if (typeof afterResponse === "string" && afterResponse) {
           formatRes = formatResult(result, afterResponse);
         } else if (typeof afterResponse === "function") {
@@ -3143,7 +3144,7 @@ const submitEditButton = (params = {}) => {
       if (submitParams === false) {
         return;
       }
-      // console.log("提交修改数据",apiUrl,submitParams,formatParams)
+      console.log("提交修改数据",apiUrl,submitParams,formatParams)
       // 提交保存表单
       currencyFormApiSubmit(apiUrl, submitParams ?? formatParams)
         .then((res: any) => {
@@ -3247,6 +3248,7 @@ const webPage = computed({
     class="pcBox"  
     :class="{ boxAI: type != 5 && currentAgent.length > 0 }"
   >
+ 
     <Aiassist
       ref="aiassistRef"
       v-if="type != 5 && currentAgent.length > 0"
diff --git a/src/components/DesignForm/public/form/formGroup.vue b/src/components/DesignForm/public/form/formGroup.vue
index 8dc151e..f6d9590 100644
--- a/src/components/DesignForm/public/form/formGroup.vue
+++ b/src/components/DesignForm/public/form/formGroup.vue
@@ -18,6 +18,8 @@ import { jsonParseStringify } from "@/utils/DesignForm";
 import request from "@/utils/request";
 import { AnalysisCss } from "@/components/DesignForm/public/form/calculate/cssInfo";
 import { nodePoweInfo,powerAryInfo } from "@/api/taskapi/types";
+import SvgIcon from "@/components/SvgIcon/index.vue";
+import { cs } from "element-plus/es/locale";
 
 const props = withDefaults(
   defineProps<{
@@ -355,7 +357,7 @@ const linksIf = (obj: FormList) => {
 //按钮点击事件
 const injectBtnEvent: any = inject(constFormBtnEvent);
 const clickBtn = (control: any) => {
-  // console.log(control)
+  console.log(type.value,"------->",control)
   // 0: '提交表单',
   // 1: '重置表单',
   // 2: '取消返回',
@@ -798,6 +800,39 @@ const judgeIsShow = (key: string) => {
   }
 }
 
+/**
+@ 作者: 秦东
+@ 时间: 2026-01-29 11:31:35
+@ 功能: 输出按钮样式
+*/
+const judgaButClass = (btnClass:string):string => {
+  switch(btnClass){
+    case "submit":
+      return "btn-primary"
+      break;
+    case "draftSubmit":
+      return "btn-primary"
+      break;
+    case "saveDraft":
+      return "btn-secondary"
+      break;
+    case "saveEditDraft":
+      return "btn-success"
+      break;
+    case "submitEdit":
+      return "btn-success"
+      break;
+    case "afreshSubmit":
+      return "btn-warning"
+      break;
+    case "dangerErr":
+      return "btn-danger"
+      break;
+    default:
+      return "btn-primary"
+  }
+  return ""
+}
 </script>
 <template>
   <draggable
@@ -814,7 +849,9 @@ const judgeIsShow = (key: string) => {
     }"
     @add="draggableAdd"
   >
+  
     <template #item="{ element, index }">
+      
       <div
         class="group"
         :class="{
@@ -944,6 +981,24 @@ const judgeIsShow = (key: string) => {
             <form-group :data="element.list" data-type="not-nested"  :org-and-man-tree="orgAndManTree" />
           </div>
         </template>
+        <template v-else-if="element.type === 'btndiv' && judgeIsShow(element.name)">
+          <div class="form-buttons">
+          <!-- <form-group :data="element.list" data-type="not-nested"  :org-and-man-tree="orgAndManTree" /> -->
+           <template v-for="(item,index) in element.list" :key="index">
+ 
+              <button  v-bind="item.control"   @click="clickBtn(item.control)" type="submit" :class="['btn',judgaButClass(item.control?.key)]">
+                  <SvgIcon v-if="item.control?.key=='submit'" icon-class="fbsk"  />
+                  <SvgIcon v-if="item.control?.key=='saveDraft'" icon-class="caogaoxiang"  />
+                  <SvgIcon v-if="item.control?.key=='draftSubmit'" icon-class="fbsk"  />
+                  <SvgIcon v-if="item.control?.key=='saveEditDraft'" icon-class="caogaoxiang"  />
+                  <SvgIcon v-if="item.control?.key=='submitEdit'" icon-class="cssq"  />
+                  <SvgIcon v-if="item.control?.key=='afreshSubmit'" icon-class="gdqr"  />
+                  <SvgIcon v-if="item.control?.key=='dangerErr'" icon-class="gb2"  />
+                  {{ item.control?.label }}
+              </button>
+            </template>
+          </div>
+        </template>
         <!--弹性布局-->
         <template v-else-if="element.type === 'flex' && judgeIsShow(element.name)" >
 
@@ -965,13 +1020,14 @@ const judgeIsShow = (key: string) => {
         <!--按钮-->
         <template v-else-if="element.type === 'button'">
           <div
-            :class="[element.config?.className]"
+            :class="['form-buttons',element.config?.className]"
             :style="{ 'text-align': element.config?.textAlign }"
           >
             <el-button
               v-bind="element.control"
               @click="clickBtn(element.control)"
               color="#626aef"
+
             >
               <td :style="getFormItemLableStyle(element.styles)">
                 {{ element.control?.label }}
@@ -1045,4 +1101,60 @@ const judgeIsShow = (key: string) => {
     </template>
   </draggable>
 </template>
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.form-buttons {
+    // display: flex;
+    gap: 15px;
+    margin-top: 30px;
+    width: 100%;
+    text-align: center;
+    svg{
+      margin-right: 5px;
+    }
+}
+        
+.btn {
+    padding: 10px 28px;
+    border-radius: 10px;
+    font-weight: 600;
+    font-size: 1.3rem;
+    cursor: pointer;
+    transition: all 0.3s;
+    border: none;
+    margin: 0 5px;
+}
+        
+.btn-primary {
+    background: linear-gradient(135deg, #0020C2, #4d6cff);
+    color: white;
+    // flex: 1;
+}
+        
+.btn-secondary {
+    background: #f0f4ff;
+    color: #0020C2;
+    border: 1px solid rgba(0, 32, 194, 0.3);
+    // flex: 1;
+}
+.btn-success {
+    background: #67C23A;
+    color: #FFFFFF;
+    // flex: 2;
+}
+.btn-warning {
+    background: #E6A23C;
+    color: #FFFFFF;
+    // flex: 1;
+}
+.btn-danger {
+    background: #F56C6C;
+    color: #FFFFFF;
+    // flex: 1;
+}
+        
+.btn:hover {
+    transform: translateY(-2px);
+    box-shadow: 0 5px 15px rgba(0, 32, 194, 0.15);
+}
+        
+</style>
diff --git a/src/components/DesignForm/public/form/formItem.vue b/src/components/DesignForm/public/form/formItem.vue
index 40fb82c..86229eb 100644
--- a/src/components/DesignForm/public/form/formItem.vue
+++ b/src/components/DesignForm/public/form/formItem.vue
@@ -1114,6 +1114,7 @@ const diGuiJilian = (val: any, options: any[]) => {
 
 </script>
 <template>
+
   <BaiduMap
     v-if="judgeIsShow(data.name) && data.type === 'baidumap' && type != 4"
     :data="data"
@@ -1226,7 +1227,7 @@ const diGuiJilian = (val: any, options: any[]) => {
     </template>
     <template #label v-else>
       <span :style="getFormItemLableStyle(configStyle)">{{ getLabel(data.item) }}</span>
-      {{ editDisabled }}
+      
     </template>
     <template class="form-value" v-if="type === 4">
       <div
@@ -1342,6 +1343,7 @@ const diGuiJilian = (val: any, options: any[]) => {
         :form-table-set-up="props.alldata"
         v-model="value"
       />
+
       <div class="form-value" v-else v-html="value"></div>
     </template>
     <template v-else>
diff --git a/src/components/DesignForm/public/form/newForm.vue b/src/components/DesignForm/public/form/newForm.vue
new file mode 100644
index 0000000..ee8badb
--- /dev/null
+++ b/src/components/DesignForm/public/form/newForm.vue
@@ -0,0 +1,3466 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2026-01-29 09:00:52
+@ 备注: 表单渲染
+-->
+<script lang="ts" setup>
+import "@/assets/scss/element-var.scss";
+import "@/assets/scss/index.scss";
+// import FormGroup from './formGroup.vue'
+import FormGroup from "@/components/DesignForm/public/form/formGroup.vue";
+import WebFormGroup from "@/components/DesignForm/public/form/webformGroup.vue";
+
+import { FormData, FormList } from "@/api/DesignForm/types";
+import request from "@/utils/request";
+import { useRoute, useRouter } from "vue-router";
+import {
+  constGetControlByName,
+  constSetFormOptions,
+  constFormBtnEvent,
+  constControlChange,
+  constFormProps,
+  appendOrRemoveStyle,
+} from "@/api/DesignForm/utils";
+import formatResult from "@/utils/DesignForm/formatResult";
+import formChangeValue from "@/utils/DesignForm/formChangeValue";
+import { jsonParseStringify } from "@/utils/DesignForm";
+//通用提交
+import { currencyFormApiSubmit,gainEditDataLog } from "@/api/taskapi/management";
+
+const props = withDefaults(
+  defineProps<{
+    drawTitle: string;
+    formData: FormData | any;
+    masters_key?: string;
+    type?: number; // 1新增；2修改；3查看（表单模式） ；4查看； 5设计
+    numrun?: number; //1：获取；非1：不变
+    disabled?: boolean; // 禁用表单提交
+    requestUrl?: string; // 编辑数据请求url
+    beforeRequest?: Function; // 请求编辑数据前参数处理方法，可对请求参数处理
+    afterResponse?: Function | string; // 请求数据加载完成后数据处理方法，可对返回数据处理
+    addUrl?: string; // 表单数据新增提交保存url
+    editUrl?: string; // 表单数据修改保存提交url
+    beforeSubmit?: Function | string; // 表单提交前数据处理，可对提交数据处理，新增和保存都会触发
+    afterSubmit?: Function; // 表单提交后，默认提示提交结果，可return false阻止提示
+    closeAppSubmit?: Function; //关闭拉窗
+    changeKeyVal?: Function; //监听表单值该表
+    anewSubmit?: Function; //重新提交表单
+    saveDraftPage?: Function; //保存草稿
+    saveEditFormInfo?: Function; //保存草稿  只改表单不操作流程
+    sendDraftSubmit?: Function; //草稿提交审批
+    submitEdit?: Function; //提交修改数据申请
+    value?: { [key: string]: any }; // 表单初始值，同setValue
+    options?: { [key: string]: any }; // 表单组件选项，同setOptions
+    dict?: object; // 固定匹配的字典
+    isSearch?: boolean; // 列表里作为筛选使用
+    isWorkFlow?: number; //
+    flowkey?: string; //
+    groupid?: string; //
+    signCode?: string; //
+    versionId?: string; //
+    mastesformjson?: string; //
+    isWeb: boolean; //
+    nodeKey?: string;
+    purview?: any[];
+  }>(),
+  {
+    drawTitle:"",
+    type: 1, // 1新增；2修改；3查看（表单模式） ；4查看； 5设计
+    numrun: 2,
+    formData: () => {
+      return {
+        list: [],
+        form: {},
+        config: {
+          style: "",
+        },
+        styles: {
+          divStyle: {},
+          labelStyle: {},
+          inputStyle: {},
+        },
+        aiConfig: [],
+      };
+    },
+    dict: () => {
+      return {};
+    },
+    isSearch: false,
+    issave: {
+      type: Boolean,
+      default: true,
+    },
+    key: 1,
+    isWorkFlow: 2,
+    flowkey: "",
+    groupid: "",
+    signCode: "",
+    mastesformjson: "",
+    masters_key: "",
+  }
+);
+const emits = defineEmits<{
+  (e: "btnClick", type: string): void;
+  (e: "change", val: any): void; // 表单组件值发生变化时
+  (e: "update:issave", type: boolean): void;
+  (e: "refresh"): void;
+  (e: "optionsValue3Get3", val: any, fieldName: string): void;
+}>();
+const route = useRoute();
+const router = useRouter();
+const loading = ref(false);
+const pageLog = ref<any[]>([]);
+let timer = 0;
+let eventName = "";
+let getValueEvent = "";
+// 注册window事件
+const setWindowEvent = (bool?: boolean) => {
+  // console.log("注册window事件",props,props.formData)
+  if (props.formData.list.length > 0) {
+    const formName = props.formData.form?.name;
+    if (!formName) {
+      // 导出.vue时，name可以没有
+      return;
+    }
+    eventName = `get${formName}ControlByName`;
+    getValueEvent = `get${formName}ValueByName`;
+    if (formName && (!window[eventName as any] || !bool)) {
+      // 根据name获取当前数据项
+      // @ts-ignore
+      window[eventName] = (name: string) => {
+        return getNameForEach(props.formData.list, name);
+      };
+      // 根据name获取当前项的值
+      // @ts-ignore
+      window[getValueEvent] = (name: string) => {
+        return model.value[name];
+      };
+    }
+  }
+};
+watch(
+  () => props.formData,
+  () => {
+    emits("update:issave", false);
+  },
+  { deep: true }
+);
+watch(
+  () => props.formData.config,
+  () => {
+    if (timer < 2) {
+      setWindowEvent(); // 简单判断下，这里不是每次都更新
+    }
+    timer++;
+    appendRemoveStyle(true); // 更新样式
+  },
+  { deep: true }
+);
+setWindowEvent();
+// 设置全局事件结束
+const resultDict = ref({});
+// 处理表单值开始
+const model = ref<any>({});
+// 获取表单初始model值
+const getInitModel = () => {
+//   if (props.formData.aiConfig?.length > 0) {
+//     props.formData.aiConfig?.forEach((item) => {
+//       currentAgent.value.push({
+//         name: "test",
+//         model: false,
+//         rowdex:0,
+//         uuid: item.library,
+//         fields: item.title,
+//         trigger: item.trigger,
+//         params: {},
+//         subparams:[]
+//       });
+//     });
+//   }
+  
+  const obj = {};
+  forEachGetFormModel(props.formData.list, obj);
+
+  gainEditDataLog({ id: props.masters_key.toString() }).then((data:any) => {
+    console.log("obj==11111111111111111=>",data)
+    pageLog.value = data.data;
+  })
+  
+  // console.log("obj===>",props.formData.list)
+  model.value = obj;
+};
+watch(
+  () => props.formData.list,
+  () => {
+    // formData从接口获取时
+    getInitModel();
+  }
+);
+// 从表单数据里提取表单所需的model
+const forEachGetFormModel = (list: FormList[], obj: any) => {
+  list.forEach((item: any) => {
+    if (["table", "flex"].includes(item.type)) {
+      obj[item.name] = jsonParseStringify(item.tableData);
+    } else if (["grid", "tabs"].includes(item.type)) {
+      item.columns.forEach((col: any) => {
+        forEachGetFormModel(col.list, obj);
+      });
+    } else if (["card", "div"].includes(item.type)) {
+      forEachGetFormModel(item.list, obj);
+    } else {
+      const excludeType = ["title", "divider", "txt", "button"];
+      if (excludeType.indexOf(item.type) === -1) {
+        obj[item.name] = jsonParseStringify(item.control.modelValue);
+        if (["switch"].includes(item.type)) {
+          model.value[item.name] = jsonParseStringify(item.control.inactiveValue);
+          // console.log(model.value)
+        }
+      }
+    }
+  });
+  showOrHide("onMounted");
+};
+
+function arrayEqual(a: string[], b: any[]) {
+  //alert("开始比较")
+  //先将数组排序
+  let a_ = JSON.parse(JSON.stringify(a));
+  for (let i = 0; i < a_.length; i++) {
+    a_[i] = a_[i] + "";
+  }
+  //console.log(a_)
+  //console.log(b)
+  a_ = a_.sort();
+  b = b.sort();
+  //判断数组长度是否相等，若不相等返回false
+  if (a_.length != b.length) return false;
+  //逐个比较数组元素
+  for (var i = 0; i < a_.length; ++i) {
+    if (a_[i] !== b[i]) return false;
+  }
+  return true;
+}
+
+interface hideFieldConditionArritem {
+  toShow: string;
+  conditions: any[];
+}
+
+const recursionToGetFinallyHideFields = (
+  hideFieldArr: any[],
+  radioSelectArr3: string | any[],
+  defaultHideFields: any[]
+) => {
+  nextTick(() => {
+    //console.log(model.value)
+    /* console.log("以showFields的处理过冒号的每个元素为key,其对应的optionValue为value,新建的数组radioselectArr3  --- 内容为完整显示隐藏条件")
+		console.log(radioSelectArr3)
+		console.log("当前表单的值-------------------")
+		console.log(model.value)
+		console.log("默认隐藏的字段-----------------")
+		console.log(defaultHideFields) */
+    let modelKeyArr = []; //所有字段
+    for (let i = 0; i < props.formData.list.length; i++) {
+      modelKeyArr.push(props.formData.list[i].name + "");
+    }
+    modelKeyArr = newModelKeyArr;
+
+    //console.log(modelKeyArr)
+    /* console.log("所有字段modelKeyArr^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^")
+		console.log(modelKeyArr) */
+
+    //console.log("当前表单的值-------------------")
+    //console.log(model.value)
+
+    //当前处于显示状态的默认隐藏的字段
+    let nowShowingDefaultHideFieldArr = defaultHideFields.filter(
+      (a) => !hideFieldArr.includes(a)
+    );
+    //当前所有处于显示状态的字段
+    let nowShowingFieldArr = modelKeyArr.filter((a) => !hideFieldArr.includes(a));
+
+    //以被默认隐藏的每个字段为key,显示该字段的所有条件的数组作为value,来作为该数组的每一项。
+    const hideFieldConditionArr: hideFieldConditionArritem[] = [];
+    //保存应多选条件造成的应隐藏的字段
+    let hideFieldsFromCheckbox: string[] = [];
+    for (let i = 0; i < hideFieldArr.length; i++) {
+      hideFieldConditionArr.push({
+        toShow: hideFieldArr[i],
+        conditions: [],
+      });
+    }
+    //console.log(hideFieldConditionArr)
+    //遍历所有配置条件数组radioSelectArr3，当radioSelectArr3 [ i ] . toshowFieldKey 【i】==hideFieldArr【i】时
+    for (let i = 0; i < radioSelectArr3.length; i++) {
+      for (let j = 0; j < radioSelectArr3[i].toShowFieldKey.length; j++) {
+        for (let n = 0; n < hideFieldConditionArr.length; n++) {
+          /* console.log(i)
+				console.log(j)
+				console.log(n) */
+          if (radioSelectArr3[i].toShowFieldKey[j] == hideFieldConditionArr[n].toShow) {
+            if (Array.isArray(radioSelectArr3[i].conditionFieldValue)) {
+              let valStr = "";
+              for (let x = 0; x < radioSelectArr3[i].conditionFieldValue.length; x++) {
+                valStr = valStr + radioSelectArr3[i].conditionFieldValue[x] + ",";
+              }
+              hideFieldConditionArr[n].conditions.push({
+                conditionFrom: "radioOrSelect", //本条件来自于单选或者下拉
+                condition: [
+                  {
+                    //条件详细信息//当表单字段conditionField的值为conditionFieldValue时,显示hideFieldConditionArr[n]
+                    conditionField: radioSelectArr3[i].conditionFieldKey,
+                    conditionFieldValue: valStr,
+                  },
+                ],
+              });
+            } else {
+              hideFieldConditionArr[n].conditions.push({
+                conditionFrom: "radioOrSelect", //本条件来自于单选或者下拉
+                condition: [
+                  {
+                    //条件详细信息//当表单字段conditionField的值为conditionFieldValue时,显示hideFieldConditionArr[n]
+                    conditionField: radioSelectArr3[i].conditionFieldKey,
+                    conditionFieldValue: radioSelectArr3[i].conditionFieldValue, //
+                  },
+                ],
+              });
+            }
+          }
+        }
+      }
+    }
+    //console.log(hideFieldConditionArr);
+    //要显示的和其满足显示条件的个数.
+    //let showfieldsCountX = [];
+    for (let i = 0; i < hideFieldConditionArr.length; i++) {
+      let x = 0; //满足显示条件的次数
+      let toshow = hideFieldConditionArr[i].toShow;
+      let conditions = hideFieldConditionArr[i].conditions;
+      //console.log(conditions)
+      for (let j = 0; j < conditions.length; j++) {
+        let conditionField = conditions[j].condition[0].conditionField;
+        let conditionFieldValue = conditions[j].condition[0].conditionFieldValue;
+        //console.log(conditionField)
+        if (conditionFieldValue.includes(",")) {
+          //来自多选
+          let conditionFieldValueArr = conditionFieldValue.split(",");
+          conditionFieldValueArr = conditionFieldValueArr.slice(0, -1);
+          /* console.log(conditionFieldValueArr)
+					console.log(conditionFieldValue) */
+          for (let n = 0; n < modelKeyArr.length; n++) {
+            if (modelKeyArr[n] == conditionField) {
+              //let count_1 = 0;
+              let trueValue = model.value[modelKeyArr[n]];
+              if (trueValue.length > 0 && arrayEqual(trueValue, conditionFieldValueArr)) {
+                //此时满足了条件,但是必须看一下conditionField有没有被隐藏.如果被隐藏了,则x不能增加.
+                //alert("多选条件成功触发")
+                /* console.log(conditionField)
+								console.log(toshow) */
+                let flag = false; //其依赖的选项的父字段是否被隐藏.默认没被隐藏,
+                //如果此时的conditionField有可能被隐藏且已被隐藏,x不能++
+                /* for(let a = 0;a<hideFieldConditionArr.length;a++){
+									if(hideFieldConditionArr[a].toShow==conditionField){//当conditions.length>1说明时多选,=1说明是单选.
+										for(let b = 0;b<hideFieldConditionArr[a].conditions.length;b++){
+											for(let c = 0;c<hideFieldConditionArr[a].conditions[b].condition.length;c++){
+												if(hideFieldConditionArr[a].conditions[b].condition[c]==conditionField){
+													//暂时写到这里,先去组装多选条件数组.
+													//console.log(1)
+												}
+											}
+										}
+									}
+								} */
+                if (flag == false) {
+                  x++;
+                  hideFieldsFromCheckbox.push(toshow);
+                  //console.log(hideFieldArr)
+                  /* for(let i = 0;i<hideFieldsFromCheckbox.length;i++){
+										hideFieldArr = hideFieldArr.filter((item: string) => item!=hideFieldsFromCheckbox[i])
+										//emits('refresh')
+									} */
+                }
+              }
+            }
+          }
+        } else {
+          //来自单选下拉
+          //console.log(modelKeyArr)
+          for (let n = 0; n < modelKeyArr.length; n++) {
+            if (modelKeyArr[n] == conditionField) {
+              //let count_1 = 0;
+              let trueValue = model.value[modelKeyArr[n]];
+              //console.log(modelKeyArr[n])
+              /* console.log("conditionField====="+conditionField)
+							console.log("trueValue====="+trueValue)
+							console.log("conditionFieldValue-----"+conditionFieldValue) */
+
+              if (trueValue == conditionFieldValue) {
+                //此时满足了条件,但是必须看一下conditionField有没有被隐藏.如果被隐藏了,则x不能增加.
+                let flag = false; //其依赖的选项的父字段是否被隐藏.默认没被隐藏,
+                //如果此时的conditionField有可能被隐藏且已被隐藏,x不能++
+                /* for(let a = 0;a<hideFieldConditionArr.length;a++){
+									if(hideFieldConditionArr[a].toShow==conditionField){//当conditions.length>1说明时多选,=1说明是单选.
+										for(let b = 0;b<hideFieldConditionArr[a].conditions.length;b++){
+											for(let c = 0;c<hideFieldConditionArr[a].conditions[b].condition.length;c++){
+												if(hideFieldConditionArr[a].conditions[b].condition[c]==conditionField){
+													//暂时写到这里,先去组装多选条件数组.
+													console.log(1)
+												}
+											}
+										}
+									}
+								} */
+                if (flag == false) {
+                  x++;
+                }
+              }
+            }
+          }
+        }
+      }
+      //console.log(x,hideFieldArr,toshow)
+      if (x > 0) {
+        hideFieldArr = hideFieldArr.filter((item: string) => item != toshow);
+      }
+      //console.log(x,hideFieldArr)
+    }
+    //将隐藏的字段值重置
+    for (let i = 0; i < hideFieldArr.length; i++) {
+      //console.log(i+"dsfafdasdfasfsda===="+hideFieldArr[i]+"=====jiuopfdsahokjuhuiofadshuiofadsjbknfdjisahuifhjken wij================"+model.value[hideFieldArr[i]])
+      if (
+        typeof model.value[hideFieldArr[i]] === "string" ||
+        typeof model.value[hideFieldArr[i]] === "number"
+      ) {
+        model.value[hideFieldArr[i]] = "";
+      } else if (model.value[hideFieldArr[i]] instanceof Array) {
+        model.value[hideFieldArr[i]] = [];
+      } else if (typeof model.value[hideFieldArr[i]] == "boolean") {
+        model.value[hideFieldArr[i]] = false;
+      }
+    }
+    //默认隐藏的字段中目前被显示出来的
+    nowShowingDefaultHideFieldArr = defaultHideFields.filter(
+      (a) => !hideFieldArr.includes(a)
+    );
+    /* console.log("(((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((())))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))")
+	console.log(nowShowingDefaultHideFieldArr) */
+    /* for(let i = 0;i< nowShowingDefaultHideFieldArr.length; i++){
+		//当被显示出来的字段涉及到的conditionfield已经被隐藏了时,其x应-1,如果x-1后造成该field被隐藏,应递归重新敲定hideFieldArr
+		if()
+	} */
+
+    //console.log("条件筛选过后最终要隐藏的字段-----"+hideFieldArr)
+
+    //编辑表单页不隐藏任何字段。
+    if (formProps.value.type != 5) {
+      //console.log(hideFieldArr)
+      props.formData.config.hideField?.push(...hideFieldArr); //实际造成隐藏效果
+    }
+  });
+
+  return hideFieldArr;
+};
+let asfRangeDoubleCondiChangeObj = ref();
+provide("asfRangeDoubleCondiChangeObj", asfRangeDoubleCondiChangeObj);
+
+let oldModelStr = "";
+watch(
+  () => model.value,
+  (newVal) => {
+    let currentChangeKey = "";
+    const newModelStr = JSON.stringify(newVal);
+    let oldModelStr1 = oldModelStr;
+    if (newModelStr !== oldModelStr1 && oldModelStr1 != "") {
+      let oldVal = JSON.parse(oldModelStr1);
+      for (const key in newVal) {
+        if (JSON.stringify(newVal[key]) !== JSON.stringify(oldVal[key])) {
+          currentChangeKey = key;
+        }
+      }
+    }
+    let rangeFormulaArr = [];
+    if (asfs.length > 0) {
+      asfs.forEach((element: any) => {
+        let asfName = element.name;
+
+        if (
+          element.control.dataRangeGongShi &&
+          element.control.dataRangeGongShi.mathsFormula &&
+          element.control.dataRangeGongShi.mathsFormula.length > 0
+        ) {
+          let asfRangeDoubleCondi = element.control.dataRangeGongShi.mathsFormula;
+
+          if (currentChangeKey != "") {
+            let a = asfRangeDoubleCondi.split(":");
+            let field = a[a.length - 1];
+            if (currentChangeKey == field) {
+              let toShowDoubleCondiValVal = model.value[currentChangeKey];
+              //console.log("关联表单"+asfName+"应该更新其选项,只显示doubleCondiVal为"+toShowDoubleCondiValVal+"的选项")
+              let obj = {
+                asfName: asfName,
+                toShowDoubleCondiValVal: toShowDoubleCondiValVal,
+              };
+              asfRangeDoubleCondiChangeObj.value = obj;
+            }
+          }
+        }
+      });
+    }
+    oldModelStr = newModelStr;
+  },
+  { deep: true }
+);
+
+
+
+//------------------------------------------------------------
+
+// 表单组件值改变事件 tProp为子表格相关
+provide(constControlChange, ({ key, value, data, tProp, type, attribute }: any) => {
+  // console.log("表单组件值改变事件----------1--------->", key);
+  // console.log("表单组件值改变事件----------2--------->", value);
+  // console.log("表单组件值改变事件----------3--------->", data);
+  // console.log("表单组件值改变事件----------4--------->", tProp);
+  // console.log("表单组件值改变事件----------5--------->", type);
+  // console.log("表单组件值改变事件----------6--------->", attribute);
+  // console.log("表单组件值改变事件----------11--------->", model.value);
+
+    let fieldVal: Record<string, string> = Object.entries(model.value).reduce((acc, [currentKey, currentValue]) => {
+        if (currentKey === key) {
+            acc[currentKey] = typeof value === "number" ? value.toString() : String(value);
+        } else {
+            acc[currentKey] = typeof currentValue === "number" ? currentValue.toString() : String(currentValue);
+        }
+        return acc;
+    }, {} as Record<string, string>);
+  // console.log("监听表单--fieldVal----------2--------->",fieldVal)
+  // let fieldVal =  {}
+  // validate((valid: boolean, fields: any) => {
+  // 	console.log("监听表单--constControlChange----------1--------->",fields)
+  // 	for(let i in fields){
+  // 		fieldVal[i]=fields[i].toString()
+
+  // 		console.log("监听表单--constControlChange----------2--------->",fields)
+  // 	}
+  // 	//判断是否进行计算
+  if (type == "digitpage") {
+    let oldFormConfig = props.formData.config;
+    let newFormConfig = props.formData.config.groupKey;
+    let odlHideField = props.formData.config.hideField;
+    delete props.formData.config.groupKey;
+    delete props.formData.config.hideField;
+    let sendInfo = {
+      fieldKey: key,
+      mathsFornula: props.formData.config,
+      keyVal: fieldVal,
+    };
+    // console.log("sendInfoe-2->",props.formData,props.formData)
+    currencyFormApiSubmit("/systemapi/maths/mathematicalCalculations", sendInfo)
+      .then((data: any) => {
+        // console.log("结果-->",data)
+        let formatRes: any = data.data;
+        // 比较适用通用表单，保存在服务端
+        const afterResponse = props.formData.events?.afterResponse;
+        let result = {};
+        if (typeof afterResponse === "string" && afterResponse) {
+          formatRes = formatResult(result, afterResponse);
+        } else if (typeof afterResponse === "function") {
+          formatRes = afterResponse(result) ?? result;
+        }
+        // 比较适用于导出vue文件
+        if (typeof props.afterResponse === "string" && props.afterResponse) {
+          formatRes = formatResult(result, props.afterResponse);
+        } else if (typeof props.afterResponse === "function") {
+          formatRes = props.afterResponse(result) ?? result;
+        }
+        if (formatRes === false) {
+          return;
+        }
+        // console.log("停止数据请求--->",formatRes)
+        setValue(formatRes.result || formatRes);
+        nextTick(() => {
+          // 将dict保存，可用于从接口中设置表单组件options。
+          if (formatRes.dict && Object.keys(formatRes.dict).length) {
+            resultDict.value = formatRes.dict;
+          }
+          props.formData.config.groupKey = newFormConfig;
+          props.formData.config.hideField = odlHideField;
+        });
+      })
+      .finally(() => {
+        props.formData.config.groupKey = newFormConfig;
+        props.formData.config.hideField = odlHideField;
+      });
+  }
+  // })
+
+  showOrHide(data,value);
+
+  if (typeof props.changeKeyVal === "function") {
+    props.changeKeyVal(key, value, type, attribute);
+  }
+  if (key) {
+    if (!tProp) {
+      // 表格和弹性布局不是这里更新，只触change
+      model.value[key] = value;
+    }
+    // 支持在线方式数据处理，如A组件值改变时，可自动修改B组件的值，可参考请假流程自动时长计算
+    if (props.formData.events?.change) {
+      model.value = props.formData.events.change(key, model.value);
+    }
+    const onFormChange = props.formData.events?.change;
+    if (onFormChange) {
+      if (typeof onFormChange === "function") {
+        model.value = onFormChange(key, model.value);
+      } else {
+        model.value = formChangeValue(key, model.value, onFormChange);
+      }
+    }
+    // 当表格和弹性内的字段和外面字段冲突时，可通过tProps区分
+    emits("change", { key, value, model: model.value, data, tProp });
+  }
+
+  /* 
+		
+	*/
+});
+let mustBeHidden: any = [];
+
+let newModelKeyArr: string[] = [];
+
+// 判断对象是否是“内容为空的纯对象”
+function isEmptyPlainObject(obj: {}) {
+  // 先确认是对象类型，再检查属性数量为0
+  return Object.prototype.toString.call(obj) === '[object Object]' 
+    && Object.keys(obj).length === 0;
+}
+
+
+function showOrHide(data: any,currentDataNameValue?:any) {
+  
+  let dataObjFlag = false//data是否是对象
+  if(data=="onMounted"||data=="kong"){
+    
+  }else{
+    //console.log(data)
+    dataObjFlag = true
+    //console.log(data.name)
+  }
+  if(dataObjFlag){
+    if(data.type=="select"||data.type=="radio"||data.type=="checkbox"||data.type=="switch"){
+
+    }else{
+      return
+    }
+    
+  }
+  
+
+  /* 
+		企管部有当前用户,
+		当前用户是什么权限角色.
+		某表单某字段值大于等于小于不等于某个值
+
+		所需接口
+		接口1:当前用户是不是指定的权限角色
+		接口2:当前用户是否在指定的机构下或机构的祖先机构下
+		接口3:本表单(关联关联表单的表单)的某字段的当前值大于等于小于不等于指定的值???也许不需要接口呢?
+
+	*/
+
+  //关联表单隐藏条件判定 start
+  for (let i = 0; i < props.formData.list.length; i++) {
+    if (props.formData.list[i].type == "associatedForms" && formProps.value.type != 5) {
+      //console.log(props.formData.list[i].name)
+      let asfHideCondition = props.formData.list[i].control.hideGongShi.mathsFormula;
+      const leftOperatorsAndRight = splitString(asfHideCondition);
+
+      if (leftOperatorsAndRight) {
+        let leftArr = leftOperatorsAndRight.left.split(":");
+        //console.log(leftArr)
+        if (data == "onMounted" || (leftArr[0] == "formField" && leftArr.length == 3)) {
+          if (data == "onMounted" || (data != "kong" && data.name == leftArr[2])) {
+            //关联表单隐藏相关的值发生了变化
+
+            if (leftOperatorsAndRight.operator == "包含") {
+              if (leftOperatorsAndRight.right == "当前用户") {
+                if (leftOperatorsAndRight.left.startsWith("orgOrPerson")) {
+                  //接口2
+
+                  queryIfOrgOrPerson(leftOperatorsAndRight).then(({ data }) => {
+                    if (data == true) {
+                      props.formData.config.hideField = addStringIfNotExists(
+                        props.formData.config.hideField,
+                        props.formData.list[i].name
+                      );
+                      mustBeHidden.push(props.formData.list[i].name);
+                    }
+                  });
+                } else if (leftOperatorsAndRight.left.startsWith("roleid")) {
+                  //接口1
+                  queryHideRoleCondition(leftOperatorsAndRight).then(({ data }) => {
+                    if (data == true) {
+                      //alert(data)
+                      props.formData.config.hideField = addStringIfNotExists(
+                        props.formData.config.hideField,
+                        props.formData.list[i].name
+                      );
+                      mustBeHidden.push(props.formData.list[i].name);
+                    }
+                  });
+                }
+              }
+            } else if (leftOperatorsAndRight.operator == "不包含") {
+              if (leftOperatorsAndRight.right == "当前用户") {
+                if (leftOperatorsAndRight.left.startsWith("orgOrPerson")) {
+                  //接口2
+                  queryIfOrgOrPerson(leftOperatorsAndRight).then(({ data }) => {
+                    if (data == false) {
+                      props.formData.config.hideField = addStringIfNotExists(
+                        props.formData.config.hideField,
+                        props.formData.list[i].name
+                      );
+                      mustBeHidden.push(props.formData.list[i].name);
+                    }
+                  });
+                } else if (leftOperatorsAndRight.left.startsWith("roleid")) {
+                  //接口1
+                  queryHideRoleCondition(leftOperatorsAndRight).then(({ data }) => {
+                    if (data == false) {
+                      //alert(data)
+                      props.formData.config.hideField = addStringIfNotExists(
+                        props.formData.config.hideField,
+                        props.formData.list[i].name
+                      );
+                      mustBeHidden.push(props.formData.list[i].name);
+                    }
+                  });
+                }
+              }
+            } else {
+              //console.log(leftOperatorsAndRight)
+              if (leftOperatorsAndRight.right == "当前用户") {
+                if (leftOperatorsAndRight.operator == "==") {
+                  //接口2
+                  queryIfOrgOrPerson(leftOperatorsAndRight).then(({ data }) => {
+                    if (data == true) {
+                      props.formData.config.hideField = addStringIfNotExists(
+                        props.formData.config.hideField,
+                        props.formData.list[i].name
+                      );
+                      mustBeHidden.push(props.formData.list[i].name);
+                    }
+                  });
+                } else if (leftOperatorsAndRight.operator == "!=") {
+                  //接口2
+                  queryIfOrgOrPerson(leftOperatorsAndRight).then(({ data }) => {
+                    if (data == true) {
+                      props.formData.config.hideField = addStringIfNotExists(
+                        props.formData.config.hideField,
+                        props.formData.list[i].name
+                      );
+                      mustBeHidden.push(props.formData.list[i].name);
+                    }
+                  });
+                }
+              } else {
+                //接口3
+                //console.log(leftOperatorsAndRight)
+                //console.log(data)
+                if (data.name == leftArr[2]) {
+                  nextTick(() => {
+                    console.log(model.value[leftArr[2]]);
+                    if (leftOperatorsAndRight.operator == "==") {
+                      if (model.value[leftArr[2]] == leftOperatorsAndRight.right) {
+                        props.formData.config.hideField = addStringIfNotExists(
+                          props.formData.config.hideField,
+                          props.formData.list[i].name
+                        );
+                      } else {
+                        props.formData.config.hideField = removeStringIfExists(
+                          props.formData.config.hideField,
+                          props.formData.list[i].name
+                        );
+                      }
+                    } else if (leftOperatorsAndRight.operator == "!=") {
+                      if (model.value[leftArr[2]] != leftOperatorsAndRight.right) {
+                        props.formData.config.hideField = addStringIfNotExists(
+                          props.formData.config.hideField,
+                          props.formData.list[i].name
+                        );
+                      } else {
+                        props.formData.config.hideField = removeStringIfExists(
+                          props.formData.config.hideField,
+                          props.formData.list[i].name
+                        );
+                      }
+                    } else if (leftOperatorsAndRight.operator == ">=") {
+                      if (model.value[leftArr[2]] >= leftOperatorsAndRight.right) {
+                        props.formData.config.hideField = addStringIfNotExists(
+                          props.formData.config.hideField,
+                          props.formData.list[i].name
+                        );
+                      } else {
+                        props.formData.config.hideField = removeStringIfExists(
+                          props.formData.config.hideField,
+                          props.formData.list[i].name
+                        );
+                      }
+                    } else if (leftOperatorsAndRight.operator == ">") {
+                      if (model.value[leftArr[2]] > leftOperatorsAndRight.right) {
+                        props.formData.config.hideField = addStringIfNotExists(
+                          props.formData.config.hideField,
+                          props.formData.list[i].name
+                        );
+                      } else {
+                        props.formData.config.hideField = removeStringIfExists(
+                          props.formData.config.hideField,
+                          props.formData.list[i].name
+                        );
+                      }
+                    } else if (leftOperatorsAndRight.operator == "<") {
+                      if (model.value[leftArr[2]] < leftOperatorsAndRight.right) {
+                        props.formData.config.hideField = addStringIfNotExists(
+                          props.formData.config.hideField,
+                          props.formData.list[i].name
+                        );
+                      } else {
+                        props.formData.config.hideField = removeStringIfExists(
+                          props.formData.config.hideField,
+                          props.formData.list[i].name
+                        );
+                      }
+                    } else if (leftOperatorsAndRight.operator == "<=") {
+                      if (model.value[leftArr[2]] <= leftOperatorsAndRight.right) {
+                        props.formData.config.hideField = addStringIfNotExists(
+                          props.formData.config.hideField,
+                          props.formData.list[i].name
+                        );
+                      } else {
+                        props.formData.config.hideField = removeStringIfExists(
+                          props.formData.config.hideField,
+                          props.formData.list[i].name
+                        );
+                      }
+                    }
+                  });
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+
+  //关联表单隐藏条件判定 end
+
+  //liwenxuan 关联选项设置效果实现 start
+  /* console.log("监听表单-1-constControlChange-->",props.formData)
+	 console.log("监听表单-2-constControlChange-->",key)
+	 console.log("监听表单-3-constControlChange-->", value)
+	 console.log("监听表单-4-constControlChange-->",data)
+	 console.log("监听表单-5-constControlChange-->",type)
+	 console.log("监听表单-6-constControlChange-->",attribute) */
+
+  //得到当前表单各选项的值
+  //props.formData.config.hideField.push("nin2yuan4yi4wei4wo3menda3fen1ma101939")
+
+  //得到所有配置对象，包括radio,checkbox,select,switch
+  const radioSelectShowConfigArr = [];
+  const checkboxShowConfigArr = [];
+  const switchShowConfigArr = [];
+  //以showFields的处理过冒号的每个元素为key,其对应的optionValue为value,新建一个数组radioselectArr2。----用于获取所有出现在配置中的字段。
+  const radioSelectArr2: any[] = [];
+
+
+  const radioSelectZdtcszConfigArr: any[] = [];
+
+  //20240815 关联选项设置的隐藏效果嵌套在内时不生效的问题修复 liwenxuan start
+  //console.log(props.formData.list)			newModelKeyArr
+  for (let i = 0; i < props.formData.list.length; i++) {
+    if (
+      props.formData.list[i].type == "radio" ||
+      props.formData.list[i].type == "select" ||
+      props.formData.list[i].type == "checkbox" ||
+      props.formData.list[i].type == "switch"
+    ) {
+      props.formData.config.hideField = [];
+      if (
+        props.formData.list[i].type == "radio" ||
+        props.formData.list[i].type == "select"
+      ) {
+        if (!props.formData.list[i].control.multiple) {
+          radioSelectShowConfigArr.push(props.formData.list[i].control.glxxsz);
+          if(props.formData.list[i].control.zdtcsz&&!isEmptyPlainObject(props.formData.list[i].control.zdtcsz.tableData)){
+            props.formData.list[i].control.zdtcsz.name = props.formData.list[i].name
+            radioSelectZdtcszConfigArr.push(props.formData.list[i].control.zdtcsz)
+          }
+        } else {
+          checkboxShowConfigArr.push(props.formData.list[i].control.glxxsz);
+          if(props.formData.list[i].control.zdtcsz&&!isEmptyPlainObject(props.formData.list[i].control.zdtcsz.tableData)){
+            props.formData.list[i].control.zdtcsz.name = props.formData.list[i].name
+            radioSelectZdtcszConfigArr.push(props.formData.list[i].control.zdtcsz)
+          }
+        }
+      } else if (props.formData.list[i].type == "checkbox") {
+        checkboxShowConfigArr.push(props.formData.list[i].control.glxxszForCheckBox);
+      } else if (props.formData.list[i].type == "switch") {
+        switchShowConfigArr.push(props.formData.list[i].control.glxxszSwitch);
+      }
+    } else if (
+      props.formData.list[i].type == "card" ||
+      props.formData.list[i].type == "flex" ||
+      props.formData.list[i].type == "div" ||
+      props.formData.list[i].type == "table"
+    ) {
+      props.formData.config.hideField = [];
+      let a = JSON.parse(JSON.stringify(props.formData.list[i].list));
+      for (let w = 0; w < a.length; w++) {
+        if (a[w].type == "radio" || a[w].type == "select") {
+          //console.log(a[w])
+          if (!a[w].control.multiple) {
+            radioSelectShowConfigArr.push(a[w].control.glxxsz);
+          } else {
+            checkboxShowConfigArr.push(a[w].control.glxxsz);
+          }
+          if(a[w].control.zdtcsz&&!isEmptyPlainObject(a[w].control.zdtcsz.tableData)){
+            a[w].control.zdtcsz.name = a[w].name
+            radioSelectZdtcszConfigArr.push(a[w].control.zdtcsz)
+          }
+          //radioSelectShowConfigArr.push(a[w].control.glxxsz);
+        } else if (a[w].type == "checkbox") {
+          checkboxShowConfigArr.push(a[w].control.glxxszForCheckBox);
+        } else if (a[w].type == "switch") {
+          switchShowConfigArr.push(a[w].control.glxxszSwitch);
+        }
+        newModelKeyArr.push(a[w].name);
+      }
+    } else if (props.formData.list[i].type == "grid") {
+      props.formData.config.hideField = [];
+      let columns = JSON.parse(JSON.stringify(props.formData.list[i].columns));
+      if (columns.length > 0) {
+        for (let z = 0; z < columns.length; z++) {
+          for (let x = 0; x < columns[z].list.length; x++) {
+            let a = JSON.parse(JSON.stringify(columns[z].list[x]));
+            if (a.type == "radio" || a.type == "select") {
+              if (!a.control.multiple) {
+                radioSelectShowConfigArr.push(a.control.glxxsz);
+              } else {
+                checkboxShowConfigArr.push(a.control.glxxsz);
+              }
+              if(a.control.zdtcsz&&!isEmptyPlainObject(a.control.zdtcsz.tableData)){
+                a.control.zdtcsz.name = a.name
+                radioSelectZdtcszConfigArr.push(a.control.zdtcsz)
+              }
+
+              //radioSelectShowConfigArr.push(a.control.glxxsz);
+            } else if (a.type == "checkbox") {
+              checkboxShowConfigArr.push(a.control.glxxszForCheckBox);
+            } else if (a.type == "switch") {
+              switchShowConfigArr.push(a.control.glxxszSwitch);
+            }
+            newModelKeyArr.push(a.name);
+          }
+        }
+      }
+    } else if (props.formData.list[i].type == "tabs") {
+      //tabs标签页有可能再嵌套一层flex或者table
+      props.formData.config.hideField = [];
+      let columns = JSON.parse(JSON.stringify(props.formData.list[i].columns));
+      if (columns.length > 0) {
+        for (let z = 0; z < columns.length; z++) {
+          for (let x = 0; x < columns[z].list.length; x++) {
+            let a = JSON.parse(JSON.stringify(columns[z].list[x]));
+            if (a.type == "radio" || a.type == "select") {
+              if (!a.control.multiple) {
+                radioSelectShowConfigArr.push(a.control.glxxsz);
+              } else {
+                checkboxShowConfigArr.push(a.control.glxxsz);
+              }
+              if(a.control.zdtcsz&&!isEmptyPlainObject(a.control.zdtcsz.tableData)){
+                a.control.zdtcsz.name = a.name
+                radioSelectZdtcszConfigArr.push(a.control.zdtcsz)
+              }
+              //radioSelectShowConfigArr.push(a.control.glxxsz);
+            } else if (a.type == "checkbox") {
+              checkboxShowConfigArr.push(a.control.glxxszForCheckBox);
+            } else if (a.type == "switch") {
+              switchShowConfigArr.push(a.control.glxxszSwitch);
+            } else if (a.type == "flex" || a.type == "table") {
+              if (a.list.length > 0) {
+                for (let m = 0; m < a.list.length; m++) {
+                  let q = JSON.parse(JSON.stringify(a.list[m]));
+                  if (q.type == "radio" || q.type == "select") {
+                    if (!q.control.multiple) {
+                      radioSelectShowConfigArr.push(q.control.glxxsz);
+                    } else {
+                      checkboxShowConfigArr.push(q.control.glxxsz);
+                    }
+                    if(q.control.zdtcsz&&!isEmptyPlainObject(q.control.zdtcsz.tableData)){
+                      q.control.zdtcsz.name = q.name
+                      radioSelectZdtcszConfigArr.push(q.control.zdtcsz)
+                    }
+                    //radioSelectShowConfigArr.push(q.control.glxxsz);
+                  } else if (q.type == "checkbox") {
+                    checkboxShowConfigArr.push(q.control.glxxszForCheckBox);
+                  } else if (q.type == "switch") {
+                    switchShowConfigArr.push(q.control.glxxszSwitch);
+                  }
+                  newModelKeyArr.push(q.name);
+                }
+              }
+            }
+            newModelKeyArr.push(a.name);
+          }
+        }
+      }
+    }
+    newModelKeyArr.push(props.formData.list[i].name);
+  }
+  newModelKeyArr = Array.from(new Set(newModelKeyArr));
+  //20240815 关联选项设置的隐藏效果嵌套在内时不生效的问题修复 liwenxuan end
+  //console.log(radioSelectShowConfigArr)
+  //console.log(radioSelectZdtcszConfigArr)
+  //数组深拷贝
+  const radioSelectShowConfigArr2 = JSON.parse(JSON.stringify(radioSelectShowConfigArr));
+  const checkboxShowConfigArr2 = JSON.parse(JSON.stringify(checkboxShowConfigArr));
+  const switchShowConfigArr2 = JSON.parse(JSON.stringify(switchShowConfigArr));
+  /* console.log(radioSelectShowConfigArr2)
+	console.log(checkboxShowConfigArr2) */
+  //console.log("fodijafkjlsdhoidnfoidshojhfeknsidjfoiewhofnosdifhjeonoidufeinkdsaofhe")
+  //console.log(switchShowConfigArr2)
+
+  if (radioSelectShowConfigArr2.length > 0) {
+    for (let i = 0; i < radioSelectShowConfigArr2.length; i++) {
+      if (radioSelectShowConfigArr2[i].length > 0) {
+        for (let j = 0; j < radioSelectShowConfigArr2[i].length; j++) {
+          //数组深拷贝
+          const jArr = JSON.parse(JSON.stringify(radioSelectShowConfigArr2[i][j]));
+          const optionValueJArr = jArr.optionValue;
+          if (jArr.showFields != undefined && jArr.showFields.length > 0) {
+            for (let n = 0; n < jArr.showFields.length; n++) {
+              let fieldKeyArr = jArr.showFields[n].split(":");
+              let fieldKeyStr = fieldKeyArr[fieldKeyArr.length - 1];
+              radioSelectArr2.push({
+                //conditionFieldKey:jArr.conditionField,
+                //conditionFieldValue:optionValueJArr,
+                toShowFieldKey: fieldKeyStr,
+              });
+            }
+          }
+        }
+      }
+    }
+  }
+
+  //将出现在多选配置中的字段放入radioSelectArr2,radioSelectArr2是未去重的所有可能被隐藏的字段
+  if (checkboxShowConfigArr2.length > 0) {
+    for (let i = 0; i < checkboxShowConfigArr2.length; i++) {
+      //console.log(i)
+      if (checkboxShowConfigArr2[i].length > 0) {
+        for (let j = 0; j < checkboxShowConfigArr2[i].length; j++) {
+          //console.log(j)
+          //console.log(checkboxShowConfigArr2[i][j].showFields)
+          if (
+            checkboxShowConfigArr2[i][j].showFields &&
+            checkboxShowConfigArr2[i][j].showFields.length > 0
+          ) {
+            for (let n = 0; n < checkboxShowConfigArr2[i][j].showFields.length; n++) {
+              let fieldKeyArr = checkboxShowConfigArr2[i][j].showFields[n].split(":");
+              let fieldKeyStr = fieldKeyArr[fieldKeyArr.length - 1];
+              //console.log(fieldKeyStr)
+              radioSelectArr2.push({
+                toShowFieldKey: fieldKeyStr,
+              });
+            }
+          }
+        }
+      }
+    }
+  }
+
+  //将出现在开关配置中的字段放入radioSelectArr2,radioSelectArr2是未去重的所有可能被隐藏的字段
+  if (switchShowConfigArr2.length > 0) {
+    for (let i = 0; i < switchShowConfigArr2.length; i++) {
+      if (switchShowConfigArr2[i].length > 0) {
+        for (let j = 0; j < switchShowConfigArr2[i].length; j++) {
+          if (switchShowConfigArr2[i][j].showFields.length > 0) {
+            for (let n = 0; n < switchShowConfigArr2[i][j].showFields.length; n++) {
+              //console.log("99999999999999999999------"+switchShowConfigArr2[i][j].showFields[n])
+              let fieldKeyArr = switchShowConfigArr2[i][j].showFields[n].split(":");
+              let fieldKeyStr = fieldKeyArr[fieldKeyArr.length - 1];
+              //console.log(fieldKeyStr)
+              radioSelectArr2.push({
+                toShowFieldKey: fieldKeyStr,
+              });
+            }
+          }
+        }
+      }
+    }
+  }
+  //console.log("radioSelectArr2radioSelectArr2radioSelectArr2radioSelectArr2radioSelectArr2=======")
+  //console.log(radioSelectArr2)
+  //以showFields的处理过冒号的每个元素为key,其对应的optionValue为value,新建一个数组radioselectArr3  ---用于组装完整显示隐藏条件、
+  const radioSelectArr3: any[] = [];
+
+  if (radioSelectShowConfigArr2.length > 0) {
+    for (let i = 0; i < radioSelectShowConfigArr2.length; i++) {
+      if (radioSelectShowConfigArr2[i].length > 0) {
+        for (let j = 0; j < radioSelectShowConfigArr2[i].length; j++) {
+          //数组深拷贝
+          const jArr = JSON.parse(JSON.stringify(radioSelectShowConfigArr2[i][j]));
+          const optionValueJArr = jArr.optionValue;
+          if (jArr.showFields != undefined && jArr.showFields.length > 0) {
+            if (jArr.showFields.length > 1) {
+              let arr1 = [];
+              for (let n = 0; n < jArr.showFields.length; n++) {
+                let fieldKeyArr = jArr.showFields[n].split(":");
+                let fieldKeyStr = fieldKeyArr[fieldKeyArr.length - 1];
+                arr1.push(fieldKeyStr);
+              }
+              radioSelectArr3.push({
+                conditionFieldKey: jArr.conditionField,
+                conditionFieldValue: optionValueJArr,
+                toShowFieldKey: arr1,
+              });
+            } else {
+              //等于1
+              for (let n = 0; n < jArr.showFields.length; n++) {
+                let fieldKeyArr = jArr.showFields[n].split(":");
+                let fieldKeyStr = fieldKeyArr[fieldKeyArr.length - 1];
+                radioSelectArr3.push({
+                  conditionFieldKey: jArr.conditionField,
+                  conditionFieldValue: optionValueJArr,
+                  toShowFieldKey: [fieldKeyStr],
+                });
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  //console.log(radioSelectArr3)
+  //将多选配置也放入radioSelectArr3
+  if (checkboxShowConfigArr2.length > 0) {
+    for (let i = 0; i < checkboxShowConfigArr2.length; i++) {
+      if (checkboxShowConfigArr2[i].length > 0) {
+        for (let j = 0; j < checkboxShowConfigArr2[i].length; j++) {
+          //数组深拷贝
+          const jArr = JSON.parse(JSON.stringify(checkboxShowConfigArr2[i][j]));
+          const optionValueJArr = jArr.selectedOptions;
+          if (jArr.showFields != undefined && jArr.showFields.length > 0) {
+            if (jArr.showFields.length > 1) {
+              let arr1 = [];
+              for (let n = 0; n < jArr.showFields.length; n++) {
+                let fieldKeyArr = jArr.showFields[n].split(":");
+                let fieldKeyStr = fieldKeyArr[fieldKeyArr.length - 1];
+                arr1.push(fieldKeyStr);
+              }
+              radioSelectArr3.push({
+                conditionFieldKey: jArr.conditionField,
+                conditionFieldValue: optionValueJArr,
+                toShowFieldKey: arr1,
+              });
+            } else {
+              //等于1
+              for (let n = 0; n < jArr.showFields.length; n++) {
+                let fieldKeyArr = jArr.showFields[n].split(":");
+                let fieldKeyStr = fieldKeyArr[fieldKeyArr.length - 1];
+                radioSelectArr3.push({
+                  conditionFieldKey: jArr.conditionField,
+                  conditionFieldValue: optionValueJArr,
+                  toShowFieldKey: [fieldKeyStr],
+                });
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+
+  //将开关配置也放入radioSelectArr3
+  if (switchShowConfigArr2.length > 0) {
+    for (let i = 0; i < switchShowConfigArr2.length; i++) {
+      if (switchShowConfigArr2[i].length > 0) {
+        for (let j = 0; j < switchShowConfigArr2[i].length; j++) {
+          //数组深拷贝
+          const jArr = JSON.parse(JSON.stringify(switchShowConfigArr2[i][j]));
+          //console.log("111111111111111111111-----------"+JSON.stringify(switchShowConfigArr2[i][j]))
+          if (jArr.showFields != undefined && jArr.showFields.length > 0) {
+            const optionValueJArr =
+              typeof jArr.openValue == "undefined" ? jArr.offValue : jArr.openValue;
+            let arr1 = [];
+            for (let n = 0; n < jArr.showFields.length; n++) {
+              let fieldKeyArr = jArr.showFields[n].split(":");
+              let fieldKeyStr = fieldKeyArr[fieldKeyArr.length - 1];
+              //console.log(fieldKeyStr)
+              arr1.push(fieldKeyStr);
+            }
+            radioSelectArr3.push({
+              conditionFieldKey: jArr.conditionField,
+              conditionFieldValue: optionValueJArr,
+              toShowFieldKey: arr1,
+            });
+          }
+        }
+      }
+    }
+  }
+  //console.log(radioSelectArr3)
+  //暂时使用的隐藏数组，数据敲定后赋给props.formData.config.hideField
+  let hideFieldArr: any[] = [];
+
+  //但凡配置条件的字段先放入隐藏数组中
+  for (let i = 0; i < radioSelectArr2.length; i++) {
+    hideFieldArr.push(radioSelectArr2[i].toShowFieldKey);
+  }
+  hideFieldArr = Array.from(new Set(hideFieldArr));
+  const defaultHideFields: any[] = JSON.parse(JSON.stringify(hideFieldArr));
+
+  for (let i = 0; i < defaultHideFields.length; i++) {
+    hideFieldArr = recursionToGetFinallyHideFields(
+      hideFieldArr,
+      radioSelectArr3,
+      defaultHideFields
+    );
+  }
+  hideFieldArr = recursionToGetFinallyHideFields(
+    hideFieldArr,
+    radioSelectArr3,
+    defaultHideFields
+  );
+
+  props.formData.config.hideField?.push(...mustBeHidden);
+
+  //console.log(props.formData.config.hideField)
+
+  //props.formData.config?.hideField?.push("nin2yuan4yi4wei4wo3menda3fen1ma101939")
+  //console.log("监听表单--constControlChange-->",key, value, data, tProp,type,attribute)//liwenxuan
+
+
+
+//console.log(radioSelectZdtcszConfigArr)
+nextTick(()=>{
+  //console.log(model.value)//
+  radioSelectZdtcszConfigArr.forEach(element => {
+    let tbx=getLastColonAfterString(element.tbx)
+    let tby=getLastColonAfterString(element.tby)
+    /* console.log(tbx)
+    console.log(tby) */
+
+    //console.log(element.name)
+    let rowValue = model.value[tbx]
+    
+    let columnValue = model.value[tby]
+    
+
+    
+    if(rowValue==""){
+      rowValue="notChosen"
+    }
+
+    if(columnValue==""){
+      columnValue="notChosen"
+    }
+    /* console.log(rowValue)
+    console.log(columnValue) */
+    /* if(dataObjFlag && element.name==data.name && currentDataNameValue!=""){//允许直接选择被矩阵填充的字段
+      console.log(data.name)
+      console.log("直接选择被矩阵填充的字段,允许")
+      model.value[element.name] = currentDataNameValue
+      return
+    }else{ */
+      if(tbx!=""&&tby!=""){
+      
+        let cellValue = getTableCellValue(element.tableData, rowValue, columnValue)
+        model.value[element.name] = cellValue*1
+      }else if(tbx!=""&&tby==""){
+        //console.log("仅设置了标题行")
+        let cellValue = getTableCellValue(element.tableData, rowValue, 'default')
+        //console.log(cellValue)
+        model.value[element.name] = cellValue*1
+      }else if(tbx==""&&tby!=""){
+        //console.log("仅设置了索引列")
+        let cellValue = getTableCellValue(element.tableData, 'any', columnValue)
+        //console.log(cellValue)
+        model.value[element.name] = cellValue*1
+      }
+
+    //}
+
+    
+    
+    
+
+    //console.log(getTableCellValueV2(element.tableData, 3, 2));
+  });
+
+
+})
+
+}
+
+/**
+ * 获取字符串最后一个英文冒号（:）后的字符
+ * @param {string} str - 待处理的原始字符串
+ * @returns {string} 最后一个冒号后的子串；无冒号/冒号在末尾时返回空字符串
+ */
+function getLastColonAfterString(str: string | string[]) {
+  // 1. 输入校验：确保输入是字符串类型（处理非字符串入参）
+  if (typeof str !== 'string') {
+    //console.warn('输入必须为字符串类型');
+    return '';
+  }
+
+  // 2. 找到最后一个英文冒号的索引位置
+  const lastColonIndex = str.lastIndexOf(':');
+
+  // 3. 边界判断：无冒号 或 冒号在最后一位 → 返回空字符串
+  if (lastColonIndex === -1 || lastColonIndex === str.length - 1) {
+    return '';
+  }
+
+  // 4. 截取最后一个冒号后的所有字符并返回
+  return str.slice(lastColonIndex + 1);
+}
+
+
+
+/**
+ * 获取表格单元格值，兼容多种tableData结构
+ * 支持三种结构：
+ * 1. 标准行列结构：{列号: {行号: 值, ...}, ...}
+ * 2. 仅一行结构：{default: {列号: 值, ...}}
+ * 3. 仅一列结构：{列号: {default: 值}, ...}
+ * 
+ * @param {Object} tableData - 表格数据
+ * @param {String|Number} rowValue - 行标识
+ * @param {String|Number} columnValue - 列标识
+ * @returns {String|undefined} - 返回对应的单元格值，如果未找到则返回undefined
+ */
+function getTableCellValueV3(tableData: { [x: string]: any; default: { [x: string]: any; }; }, rowValue: null, columnValue: null) {
+  try {
+    // 检查输入参数
+    if (!tableData || typeof tableData !== 'object' || Array.isArray(tableData)) {
+      return undefined;
+    }
+    
+    // 处理null或undefined值
+    if (rowValue == null || columnValue == null) {
+      return undefined;
+    }
+    
+    // 转换为字符串
+    const rowStr = String(rowValue);
+    const columnStr = String(columnValue);
+    
+    // 1. 首先尝试检测是否为仅一行结构（有default行）
+    if (tableData.default && typeof tableData.default === 'object') {
+      // 这是仅一行结构：{default: {列号: 值, ...}}
+      // 忽略行值，直接使用列值
+      return tableData.default?.[columnStr];
+    }
+    
+    // 2. 尝试标准结构或仅一列结构
+    const columnObj = tableData[columnStr];
+    if (columnObj && typeof columnObj === 'object') {
+      // 2.1 尝试从列对象中获取行值
+      const cellValue = columnObj[rowStr];
+      if (cellValue !== undefined) {
+        return cellValue; // 找到标准结构的值
+      }
+      
+      // 2.2 如果没找到标准结构的行值，检查是否是仅一列结构（有default值）
+      if (columnObj.default !== undefined) {
+        // 这是仅一列结构：{列号: {default: 值}, ...}
+        // 忽略行值，返回该列的default值
+        return columnObj.default;
+      }
+    }
+    
+    // 3. 如果没有匹配任何结构，尝试其他可能的查找方式
+    
+    // 3.1 如果列不存在，检查所有列是否有default值（用于仅一列结构）
+    if (!columnObj) {
+      // 遍历所有列，看是否有匹配的列号
+      for (const colKey in tableData) {
+        if (String(colKey) === columnStr) {
+          const colData = tableData[colKey];
+          if (colData && typeof colData === 'object' && colData.default !== undefined) {
+            return colData.default;
+          }
+        }
+      }
+    }
+    
+    // 3.2 检查是否有default行（可能列名不是字符串"default"）
+    for (const key in tableData) {
+      const data = tableData[key];
+      if (data && typeof data === 'object') {
+        // 检查这个对象是否是一个行数据（包含列号作为键）
+        if (data[columnStr] !== undefined) {
+          // 这可能是行数据，返回对应的列值
+          return data[columnStr];
+        }
+      }
+    }
+    
+    // 4. 所有尝试都失败，返回undefined
+    return undefined;
+  } catch (error) {
+    // 如果发生任何错误，返回undefined
+    console.error('获取表格单元格值时发生错误:', error);
+    return undefined;
+  }
+}
+
+/**
+ * 增强版：自动检测tableData结构并获取值
+ * 支持动态结构检测
+ */
+function getTableCellValueEnhanced(tableData: { [x: string]: { [x: string]: any; }; }, rowValue: any, columnValue: any) {
+  try {
+    if (!tableData || typeof tableData !== 'object') {
+      return undefined;
+    }
+    
+    if (rowValue == null || columnValue == null) {
+      return undefined;
+    }
+    
+    const rowStr = String(rowValue);
+    const columnStr = String(columnValue);
+    
+    // 先尝试直接获取（标准结构）
+    const directValue = tableData?.[columnStr]?.[rowStr];
+    if (directValue !== undefined) {
+      return directValue;
+    }
+    
+    // 检测表格结构
+    const tableStructure = detectTableStructure(tableData);
+    
+    switch (tableStructure) {
+      case 'standard':
+        // 标准结构，已经尝试过直接获取
+        break;
+        
+      case 'singleRow':
+        // 仅一行结构
+        return getFromSingleRowStructure(tableData, columnStr);
+        
+      case 'singleColumn':
+        // 仅一列结构
+        return getFromSingleColumnStructure(tableData, columnStr);
+        
+      case 'mixed':
+        // 混合结构，尝试多种方式
+        return getFromMixedStructure(tableData, rowStr, columnStr);
+        
+      default:
+        // 未知结构，返回undefined
+        return undefined;
+    }
+    
+    return undefined;
+  } catch (error) {
+    console.error('获取表格单元格值时发生错误:', error);
+    return undefined;
+  }
+}
+
+/**
+ * 检测tableData的结构
+ * @returns {string} - 结构类型：'standard', 'singleRow', 'singleColumn', 'mixed', 'unknown'
+ */
+function detectTableStructure(tableData: { [x: string]: any; default?: any; }) {
+  if (!tableData || typeof tableData !== 'object') {
+    return 'unknown';
+  }
+  
+  const keys = Object.keys(tableData);
+  if (keys.length === 0) {
+    return 'empty';
+  }
+  
+  // 检查是否为仅一行结构（有default键）
+  if (keys.length === 1 && keys[0] === 'default') {
+    const defaultData = tableData.default;
+    if (defaultData && typeof defaultData === 'object') {
+      // 检查default对象的值是否都是简单值（不是对象）
+      const hasNestedObjects = Object.values(defaultData).some(
+        value => value && typeof value === 'object'
+      );
+      if (!hasNestedObjects) {
+        return 'singleRow';
+      }
+    }
+  }
+  
+  // 检查是否为仅一列结构
+  let isSingleColumn = true;
+  for (const key of keys) {
+    const colData = tableData[key];
+    if (!colData || typeof colData !== 'object') {
+      isSingleColumn = false;
+      break;
+    }
+    
+    // 检查是否只有default键或只有一个键
+    const colKeys = Object.keys(colData);
+    if (colKeys.length !== 1 || (colKeys.length === 1 && colKeys[0] !== 'default')) {
+      // 如果有多个键，或者唯一的键不是default，则不是仅一列结构
+      if (colKeys.length > 1 || (colKeys.length === 1 && !colKeys[0].match(/^\d+$/))) {
+        isSingleColumn = false;
+        break;
+      }
+    }
+  }
+  
+  if (isSingleColumn) {
+    return 'singleColumn';
+  }
+  
+  // 检查是否为标准结构（所有值都是对象，且对象键是行号）
+  let isStandard = true;
+  for (const key of keys) {
+    const colData = tableData[key];
+    if (!colData || typeof colData !== 'object') {
+      isStandard = false;
+      break;
+    }
+    
+    // 检查对象键是否都是数字字符串（表示行号）
+    const colKeys = Object.keys(colData);
+    if (colKeys.length === 0) {
+      isStandard = false;
+      break;
+    }
+    
+    // 允许有default键和其他键混合
+    const hasNonNumericKeys = colKeys.some(k => k !== 'default' && !k.match(/^\d+$/));
+    if (hasNonNumericKeys) {
+      isStandard = false;
+      break;
+    }
+  }
+  
+  if (isStandard) {
+    return 'standard';
+  }
+  
+  // 混合结构
+  return 'mixed';
+}
+
+/**
+ * 从仅一行结构中获取值
+ */
+function getFromSingleRowStructure(tableData: any, columnStr: string) {
+  return tableData.default?.[columnStr];
+}
+
+/**
+ * 从仅一列结构中获取值
+ */
+function getFromSingleColumnStructure(tableData: { [x: string]: any; }, columnStr: string) {
+  const colData = tableData[columnStr];
+  if (colData && typeof colData === 'object') {
+    // 优先返回default值，如果没有则返回第一个值
+    return colData.default !== undefined ? colData.default : Object.values(colData)[0];
+  }
+  return undefined;
+}
+
+/**
+ * 从混合结构中获取值
+ */
+function getFromMixedStructure(tableData: any, rowStr: string, columnStr: string) {
+  // 尝试多种方式
+  
+  // 1. 尝试标准方式
+  const standardValue = tableData?.[columnStr]?.[rowStr];
+  if (standardValue !== undefined) {
+    return standardValue;
+  }
+  
+  // 2. 检查该列是否有default值
+  const columnData = tableData[columnStr];
+  if (columnData && typeof columnData === 'object') {
+    if (columnData.default !== undefined) {
+      return columnData.default;
+    }
+  }
+  
+  // 3. 检查是否有default行
+  if (tableData.default && typeof tableData.default === 'object') {
+    return tableData.default[columnStr];
+  }
+  
+  // 4. 遍历查找
+  for (const key in tableData) {
+    const data = tableData[key];
+    if (data && typeof data === 'object') {
+      // 如果这个对象有我们要找的列键
+      if (data[columnStr] !== undefined) {
+        return data[columnStr];
+      }
+      // 如果键名匹配列，并且有我们要找的行键
+      if (key === columnStr && data[rowStr] !== undefined) {
+        return data[rowStr];
+      }
+    }
+  }
+  
+  return undefined;
+}
+
+/**
+ * 统一方法，推荐使用这个
+ */
+function getTableCellValue(tableData: any, rowValue: string, columnValue: string) {
+  return getTableCellValueEnhanced(tableData, rowValue, columnValue);
+}
+
+
+
+
+
+
+
+function addStringIfNotExists(arr: string[], str: string) {
+  if (!arr.includes(str)) {
+    arr.push(str);
+  }
+  return arr;
+}
+
+function removeStringIfExists(arr: string[], str: string) {
+  let newArr = [];
+  for (let item of arr) {
+    if (item !== str) {
+      newArr.push(item);
+    }
+  }
+  return newArr;
+}
+
+function queryIfOrgOrPerson(obj: { left: string; operator: string; right: string }) {
+  return request({
+    url: "/javasys/lowCode/AssociatedForms/queryIfOrgOrPerson",
+    method: "post",
+    data: obj,
+  });
+}
+
+function queryHideRoleCondition(obj: { left: string; operator: string; right: string }) {
+  return request({
+    url: "/javasys/lowCode/AssociatedForms/queryHideRoleCondition",
+    method: "post",
+    data: obj,
+  });
+}
+
+function splitString(str: string) {
+  const operators = ["==", ">", ">=", "<", "<=", "!=", "不包含", "包含"];
+  for (let operator of operators) {
+    if (str.includes(operator)) {
+      let index = str.indexOf(operator);
+      let left = str.slice(0, index).trim();
+      let right = str.slice(index + operator.length).trim();
+      return { left, operator, right };
+    }
+  }
+}
+
+const dictForm = computed(() => {
+  const storage = window.localStorage.getItem("akFormDict");
+  let storageDict = {};
+  if (storage) {
+    storageDict = JSON.parse(storage);
+  }
+  // 全局的、当前表单配置的以及接口返回的
+  return Object.assign({}, storageDict, props.dict, resultDict.value);
+});
+// 表单参数
+const formProps = computed(() => {
+  return {
+    model: model.value,
+    type: props.type,
+    hideField: props.formData.config?.hideField as [],
+    showColon: props.formData.form.showColon,
+    dict: dictForm.value,
+  };
+});
+
+provide(constFormProps, formProps);
+
+// 提供一个方法，用于根据name从formData.list里查找数据
+const getNameForEach = (data: any, name: string) => {
+  let temp = {};
+  for (const key in data) {
+    const dataKey = data[key];
+    if (dataKey.name === name) {
+      return dataKey;
+    }
+    if (["grid", "tabs"].includes(dataKey.type)) {
+      dataKey.columns.forEach((co: any) => {
+        temp = getNameForEach(co.list, name);
+      });
+    }
+    if (["card", "div"].includes(dataKey.type)) {
+      temp = getNameForEach(dataKey.list, name);
+    }
+  }
+  return temp;
+};
+const getControlByName = (name: string) => {
+  return getNameForEach(props.formData.list, name);
+};
+provide(constGetControlByName, getControlByName);
+// 表单检验方法
+const ruleForm = ref();
+const validate = (callback: any) => {
+  ruleForm.value.validate((valid: boolean, fields: any) => {
+    // console.log("ruleForm.value--->filter-->",ruleForm.value)
+    // console.log("getValue--->fields-->",fields)
+    // console.log("getValue--->valid-->",valid)
+
+    let fieldValue = fields;
+    if (valid) {
+      // 校验通过，返回当前表单的值
+      fieldValue = getValue();
+    }
+    callback(valid, fieldValue);
+  });
+};
+// 提供一个取值的方法
+const getValue = (filter?: boolean) => {
+  // console.log("getValue--->filter-->",filter)
+  // console.log("getValue--->model-->",model)
+  if (filter) {
+    const obj: any = {};
+    for (const key in model.value) {
+      // eslint-disable-next-line no-prototype-builtins
+      if (model.value.hasOwnProperty(key)) {
+        const val = (model.value as any)[key];
+        if (!/^\s*$/.test(val)) {
+          obj[key] = val;
+        }
+      }
+    }
+    return obj;
+  } else {
+    // console.log("getValue--->model-value->",model.value)
+    return model.value;
+  }
+};
+// 对表单设置初始值
+const setValue = (obj: { [key: string]: any }, filter?: boolean) => {
+  // 分两种，false时将obj所有值合并到model，当obj有某些值不存于表单中，也会合并到model，当提交表单也会提交此值
+  // true则过滤没用的值，即存在当前表单的才合并
+  if (filter) {
+    for (const key in obj) {
+      if (model.value[key] !== undefined) {
+        model.value[key] = obj[key];
+      }
+    }
+  } else {
+    model.value = Object.assign({}, model.value, jsonParseStringify(obj)); // 防止列表直接使用set方法对弹窗表单编辑，当重置表单时当前行数据被清空
+  }
+};
+// 对表单选择项快速设置
+const setFormOptions = ref({});
+provide(constSetFormOptions, setFormOptions);
+const setOptions = (obj: { [key: string]: string[] }) => {
+  setFormOptions.value = obj;
+};
+// 追加移除style样式
+const appendRemoveStyle = (type?: boolean) => {
+  try {
+    const {
+      config: { style },
+    } = props.formData;
+    appendOrRemoveStyle("formStyle", style || "", type);
+  } catch (e) {
+    /* empty */
+  }
+};
+
+// 按钮组件事件
+provide(constFormBtnEvent, (obj: any) => {
+  console.log("点击的哪个按钮----》", obj.key);
+  emits("btnClick", obj.key);
+  if ([3, 4, 5].includes(props.type)) {
+    return ElMessage.error("当前模式不能提交表单");
+  }
+  switch (obj.key) {
+    case "submit":
+      submit(); // 提交
+      break;
+    case "reset":
+      resetFields(); // 重置
+      break;
+    case "cancel": // 取消返回，
+      // router.go(-1) //这个刷新后可能会失败
+      let notReturn;
+      if (typeof props.closeAppSubmit === "function") {
+        notReturn = props.closeAppSubmit();
+      }
+      break;
+    case "saveDraft": //保存草稿
+      saveDraft(); // 保存草稿
+      // console.log("保存草稿--------->saveDraft")
+      break;
+    case "saveEditDraft": //保存草稿		只保存表单不操作流程
+      saveEditDraft();
+      // console.log("保存草稿--------->saveEditDraft")
+      break;
+    case "afreshSubmit": //重新提交流程
+      afreshSubmit(); // 提交
+      break;
+    case "draftSubmit": //草稿提交审批
+      draftSubmit();
+      break;
+    case "submitEdit": //申请修改
+      submitEditButton();
+      break;
+    default:
+      break;
+  }
+});
+//修改流程表单数据回显
+const getEditData = (params = {}) => {
+  let requestUrl = "/systemapi/task_flow/gainEditFormFlowInfo";
+  loading.value = true;
+  const newParams: any = params;
+  // 同时可使用props或是events里的事件，根据使用使用其中一种即可
+  let newParams2;
+  const beforeRequest = props.formData.events?.beforeRequest;
+  if (typeof beforeRequest === "function") {
+    newParams2 = beforeRequest(newParams, route);
+  }
+  if (typeof props.beforeRequest === "function") {
+    newParams2 = props.beforeRequest(newParams, route);
+  }
+  if (newParams2 === false) {
+    // 停止数据请求
+    return;
+  }
+  currencyFormApiSubmit(requestUrl, newParams2 ?? newParams)
+    .then((res: any) => {
+      loading.value = false;
+      const result = res.data.masterDataInfo;
+      result.formKey = newParams.id;
+      result.formId = newParams.version;
+
+      if (result) {
+        let formatRes: any = result;
+        // 比较适用通用表单，保存在服务端
+        const afterResponse = props.formData.events?.afterResponse;
+
+        if (typeof afterResponse === "string" && afterResponse) {
+          formatRes = formatResult(result, afterResponse);
+        } else if (typeof afterResponse === "function") {
+          formatRes = afterResponse(result) ?? result;
+        }
+        // 比较适用于导出vue文件
+        if (typeof props.afterResponse === "string" && props.afterResponse) {
+          formatRes = formatResult(result, props.afterResponse);
+        } else if (typeof props.afterResponse === "function") {
+          formatRes = props.afterResponse(result) ?? result;
+        }
+        if (formatRes === false) {
+          return;
+        }
+        // console.log("停止数据请求--->",formatRes)
+        setValue(formatRes.result || formatRes);
+        nextTick(() => {
+          // 将dict保存，可用于从接口中设置表单组件options。
+          if (formatRes.dict && Object.keys(formatRes.dict).length) {
+            resultDict.value = formatRes.dict;
+          }
+        });
+      }
+      return res.data;
+    })
+    .catch((res) => {
+      loading.value = false;
+      return ElMessage.error(res.message);
+    });
+};
+
+// 获取表单数据，编辑时，外部调用
+const getData = (params = {}) => {
+  let requestUrl = props.formData.config?.requestUrl || props.requestUrl;
+  if (props.type === 5 || !requestUrl || props.isSearch) {
+    console.error("执行了获取数据方法，但配置有误！");
+    return;
+  }
+  switch (requestUrl) {
+    case "getFormContent":
+      requestUrl = "/systemapi/task_management/look_customer_formdata";
+      break;
+    case "saveFormContent":
+      // requestUrl ="/systemapi/task_management/customer_form_adddata"
+      requestUrl = "/systemapi/task_management/add_form_data";
+      break;
+    case "editFormContent":
+      // requestUrl ="/systemapi/task_management/newcust_form_editdata"
+      requestUrl = "/systemapi/task_management/add_customer_form";
+      break;
+    default:
+  }
+
+  loading.value = true;
+  const newParams: any = params;
+  // 同时可使用props或是events里的事件，根据使用使用其中一种即可
+  let newParams2;
+  const beforeRequest = props.formData.events?.beforeRequest;
+  if (typeof beforeRequest === "function") {
+    newParams2 = beforeRequest(newParams, route);
+  }
+  if (typeof props.beforeRequest === "function") {
+    newParams2 = props.beforeRequest(newParams, route);
+  }
+  if (newParams2 === false) {
+    // 停止数据请求
+    return;
+  }
+  currencyFormApiSubmit(requestUrl, newParams2 ?? newParams)
+    .then((res: any) => {
+      loading.value = false;
+      const result = res.data;
+      result.formKey = newParams.id;
+      result.formId = newParams.version;
+      // console.log("停止数据请求--->",newParams)
+      if (result) {
+        let formatRes: any = result;
+        // 比较适用通用表单，保存在服务端
+        const afterResponse = props.formData.events?.afterResponse;
+        if (typeof afterResponse === "string" && afterResponse) {
+          formatRes = formatResult(result, afterResponse);
+        } else if (typeof afterResponse === "function") {
+          formatRes = afterResponse(result) ?? result;
+        }
+        // 比较适用于导出vue文件
+        if (typeof props.afterResponse === "string" && props.afterResponse) {
+          formatRes = formatResult(result, props.afterResponse);
+        } else if (typeof props.afterResponse === "function") {
+          formatRes = props.afterResponse(result) ?? result;
+        }
+        if (formatRes === false) {
+          return;
+        }
+        setValue(formatRes.result || formatRes);
+        nextTick(() => {
+          // 将dict保存，可用于从接口中设置表单组件options。
+          if (formatRes.dict && Object.keys(formatRes.dict).length) {
+            resultDict.value = formatRes.dict;
+          }
+        });
+      }
+    })
+    .catch((res) => {
+      loading.value = false;
+      return ElMessage.error(res.message);
+    });
+  // console.log("res------执行了获取数据方法，但配置有误----->", requestUrl,newParams2,newParams)
+};
+//新增、查看、保存数据
+const submit = (params = {}) => {
+  let addUrl = props.formData.config?.addUrl || props.addUrl;
+  let editUrl = props.formData.config?.editUrl || props.editUrl;
+  let apiUrl = props.type === 1 ? addUrl : editUrl;
+
+  console.log("新增、查看、保存数据", apiUrl, props.type, props.addUrl, props.editUrl);
+  if (props.isSearch || !apiUrl || loading.value) {
+    if (!props.isSearch && !apiUrl) {
+      console.error(new Error("请在表单设计处配置接口事件url或选择数据源或设置props"));
+    }
+    // 列表里作为筛选时，不提交表单
+    return;
+  }
+  switch (apiUrl) {
+    case "getFormContent":
+      apiUrl = "/systemapi/task_management/look_customer_formdata";
+      break;
+    case "saveFormContent":
+      //  apiUrl ="/systemapi/task_management/customer_form_adddata"
+      // apiUrl ="/systemapi/task_management/add_form_data"
+      // apiUrl ="/systemapi/task_management/add_form_newdata"
+      apiUrl = "/systemapi/task_management/add_customer_form";
+      break;
+    case "editFormContent":
+      apiUrl = "/systemapi/task_management/editCustomerTable";
+      break;
+    case "addData":
+      apiUrl = "/systemapi/task_management/createAppTask";
+      break;
+    default:
+  }
+  validate((valid: boolean, fields: any) => {
+    if (valid) {
+      const formatParams = Object.assign({}, fields, params);
+      // console.log("params--->",params)
+      // console.log("fields--->",fields)
+      // console.log("formatParams-Object-->",formatParams)
+
+      let submitParams;
+      const beforeSubmit = props.formData.events?.beforeSubmit;
+      if (beforeSubmit) {
+        if (typeof beforeSubmit === "function") {
+          submitParams = beforeSubmit(formatParams, route);
+        } else {
+          submitParams = formatResult(formatParams, beforeSubmit);
+        }
+      }
+      if (props.beforeSubmit && typeof props.beforeSubmit === "string") {
+        submitParams = formatResult(formatParams, props.beforeSubmit);
+      } else if (typeof props.beforeSubmit === "function") {
+        submitParams = props.beforeSubmit(formatParams, route);
+      }
+      if (submitParams === false) {
+        return;
+      }
+      // console.log("beforeSubmit--->",beforeSubmit)
+      // console.log("props.beforeSubmit--->",props.beforeSubmit)
+      // console.log("props.beforeSubmit--->",props.beforeSubmit)
+      formatParams.versionId = props.versionId;
+      formatParams.appKey = props.groupid;
+      formatParams.status = 2;
+      // loading.value = true
+      console.log("apiUrl--->", apiUrl);
+      console.log("submitParams--->", submitParams);
+      console.log("formatParams--->", formatParams);
+
+      // debugger
+      // 提交保存表单
+      currencyFormApiSubmit(apiUrl, submitParams ?? formatParams)
+        .then((res: any) => {
+          // console.log("formatParams--111->",res)
+          afterSubmit("success", res);
+        })
+        .catch((res) => {
+          afterSubmit("fail", res);
+        });
+      // getRequest(apiUrl, submitParams ?? formatParams)
+      // 	.then((res: any) => {
+      // 		afterSubmit('success', res)
+      // 	})
+      // 	.catch(res => {
+      // 		afterSubmit('fail', res)
+      // 	})
+    } else {
+      // 没通过校验
+      // afterSubmit("validate", fields);
+    }
+  });
+};
+// 不管成功失败，有事件时都需要执行回调
+const afterSubmit = (type: string, res: any) => {
+  const afterSubmit = props.formData.events?.afterSubmit;
+  let notReturn;
+  if (typeof afterSubmit === "function") {
+    notReturn = afterSubmit(type, res);
+  } else if (typeof props.afterSubmit === "function") {
+    notReturn = props.afterSubmit(type, res);
+    //   console.log("notReturn--123456->",props.afterSubmit)
+  }
+  // console.log("notReturn--->",notReturn)
+  // console.log("afterSubmit--->",afterSubmit)
+  // console.log("typeof afterSubmit--->",typeof afterSubmit)
+  // console.log("type--->",type)
+  // console.log("res--->",res)
+  // console.log("props.formData.events--->",props.formData.events)
+  // console.log("props.formData.events?.afterSubmit--->",props.formData.events?.afterSubmit)
+
+  loading.value = false;
+  // 不管结果，重置表单，防再次打开时保留上一次的值
+  // resetFields()
+  if (notReturn === false) {
+    // 有返回false时则不提示
+    return;
+  }
+  if (type === "success") {
+    ElMessage.success(res.msg || "保存成功！");
+  } else if (type === "fail") {
+    ElMessage.error(res.message || "保存失败！");
+  }
+};
+// 表单初始值
+watch(
+  () => props.value,
+  (v: any) => {
+    v && setValue(v);
+  },
+  {
+    immediate: true,
+  }
+);
+// 表单options
+watch(
+  () => props.options,
+  (v: any) => {
+    v && setOptions(v);
+  }
+);
+// ------------------------数据处理结束------------------------
+
+
+const rangedUserTrees1= ref([]);
+const treeUrl = '/javasys/lowCode/transfer/getOrgAndManTree'
+const orgAndManTree = ref()
+function getOrgAndManTree() {
+    return request({
+        url: treeUrl,
+        method: 'post',
+    });
+}
+function getTree1() {
+    getOrgAndManTree().then(({ data }) => {
+        orgAndManTree.value = data
+
+    }).finally(()=>{
+		//console.log(rangedUsers)
+
+		// 使用示例
+		const configArray = rangedUsers;
+		const groupedNames = groupExpandUserConfigs(configArray);
+		//console.log(groupedNames);
+		groupedNames.forEach((element:any) => {
+			let keys = element.keys
+			let arr = []
+			arr.push(modifyTreeData(orgAndManTree.value,keys))
+			element.tree = arr
+      //console.log(arr)
+
+			rangedUsers.forEach((item:any) => {
+				let i = 0
+				element.groupArray.forEach((el:any) => {
+					if(item.name==el){
+						i++
+					}
+				});
+				if(i>0){
+					item.tree = element.tree
+				}
+			});
+		});
+    rangedUserTrees1.value = JSON.parse(JSON.stringify(rangedUsers))
+    rangedUsers.forEach((item:any) => {
+      // 判断对象自身是否存在 tree 属性（不检查原型链）
+      if (item.hasOwnProperty('tree')) {
+        // 删除 tree 属性
+        delete item.tree;
+      }
+    })
+
+		
+	})
+}
+
+//实现选择用户选择时,自动填充选择组织  liwenxuan 2025-11-11 start 
+
+const location = ref('North Pole')
+
+function updateLocation(currentValue: any,currentComp:any) {
+  let userPath = ""
+  rangedUsersPath.forEach((element: any) => {
+    if(element.obj==currentComp){
+      userPath = element.path
+    }
+  });
+  location.value = currentValue+currentComp
+  let deepCopyedCurrentValue:string = JSON.stringify(toRaw(currentValue))
+  let workNumber = getParenthesesContent(deepCopyedCurrentValue)
+  //console.log(workNumber)
+  let mainOrg = 309
+  getMainOrgByWorkNumber({workNumber:workNumber}).then(({ data }) => {
+    //console.log(data)
+    mainOrg = data*1
+    
+  }).finally(()=>{
+    
+    //找到关联此 user 组件的所有 org 组件
+    let connectOrgs: any[] = []
+    selectOrgs.forEach((element:any) => {
+      if(element.control.connectUserComponent){
+        let realCurrentCompName = getAfterLastColon(element.control.connectUserComponent)
+        if(currentComp == realCurrentCompName){
+          connectOrgs.push(element)
+        }
+      }
+    });
+    let deepCopyedConnectOrgs = JSON.parse(JSON.stringify(connectOrgs))
+    //console.log(connectOrgs)
+    //console.log(selectOrgsPath)
+    
+    deepCopyedConnectOrgs.forEach((element:any) => {
+      selectOrgsPath.forEach((item: any) => {
+        if(item.obj==element.name){
+          if(item.path==undefined || item.path=="" || item.path=="undefined"){
+            element.path = ""
+          }else{
+            element.path = item.path
+          }
+          
+        }
+      });
+      //console.log(element)
+      if(element.path==""){
+        /* console.log(currentValue)
+        console.log(currentComp)
+        console.log(workNumber) */
+        if(workNumber==""){
+          model.value[element.name] = undefined
+        }else{
+          model.value[element.name] = mainOrg
+        }
+        
+      }else{
+        //console.log(model.value[element.path])
+
+        
+        model.value[element.path].forEach((x:any) => {
+          /* console.log(currentValue)
+          console.log(currentComp)
+          console.log(x) */
+
+
+          if(userPath!=""){
+            if(x[currentComp] == currentValue){
+              if(workNumber==""){
+                x[element.name] = undefined
+              }else{
+                x[element.name] = mainOrg
+              }
+            }
+
+          }else{
+            if(workNumber==""){
+              x[element.name] = undefined
+            }else{
+              x[element.name] = mainOrg
+            }
+          }
+
+
+          
+
+          
+
+          
+          
+
+          
+        });
+        
+      }
+      
+    });
+    //console.log(deepCopyedConnectOrgs)
+    //console.log(model.value)
+
+    });
+  
+  
+}
+
+function getMainOrgByWorkNumber(obj: { workNumber: string}) {
+  return request({
+    url: "/javasys/lowCode/manCont/getMainOrgByWorkNumber",
+    method: "post",
+    data: obj,
+  });
+}
+
+function getParenthesesContent(str:string) {
+  //console.log(str)
+  const match = str.match(/\((.*?)\)/);
+  return match ? match[1] : '';
+}
+
+provide('location', {
+  location,
+  updateLocation
+})
+
+/**
+ * 提取字符串中最后一个英文冒号后的内容，无冒号则返回原字符串
+ * @param {string} str - 输入的字符串
+ * @returns {string} 最后一个冒号后的内容或原字符串
+ */
+function getAfterLastColon(str:string) {
+    // 首先验证入参类型，确保是字符串（避免非字符串类型导致方法出错）
+    if (typeof str !== 'string') {
+        //console.warn('入参必须是字符串类型，当前已自动转为字符串');
+        str = String(str); // 非字符串类型自动转为字符串
+    }
+
+    // 查找最后一个英文冒号的索引位置
+    const lastColonIndex = str.lastIndexOf(':');
+
+    // 若未找到冒号（索引为 -1），或冒号在字符串最后一位（后面无内容），返回原字符串
+    if (lastColonIndex === -1 || lastColonIndex === str.length - 1) {
+        return str;
+    }
+
+    // 截取最后一个冒号后面的字符（索引+1 开始到字符串结尾）
+    return str.slice(lastColonIndex + 1);
+}
+
+
+
+//实现选择用户选择时,自动填充选择组织  liwenxuan 2025-11-11 end
+
+
+
+
+
+function modifyTreeData(treeData: any, idList: any) {
+    //console.log("modifyTreeDataMinimal 执行了");
+    let gkFlag = true
+    const idArray = Array.isArray(idList) ? idList : [idList];
+    
+    // 当 gkFlag 为 true 且 idList 为空时，查找特定节点作为新的 treeData
+    if (gkFlag && idArray.length === 0) {
+        const targetNode = findTargetNode(treeData);
+        if (targetNode) {
+            // 使用找到的节点作为新的 treeData
+            treeData = targetNode;
+        }
+    }
+    
+    // 当 idList 为空时，使用相同的处理逻辑，但保持所有节点
+    if (idArray.length === 0) {
+        return processTreeWithAllNodes(treeData);
+    }
+    
+    if (!treeData) {
+        return Array.isArray(treeData) ? [] : null;
+    }
+    
+    const roots = Array.isArray(treeData) ? treeData : [treeData];
+    
+    // 创建节点映射和父节点映射
+    const nodeMap = new Map();
+    const parentMap = new Map();
+    
+    // 使用迭代而非递归构建映射，避免栈溢出
+    const stack = [...roots];
+    
+    while (stack.length > 0) {
+        const node = stack.pop();
+        if (!node?.id) continue;
+        
+        // 如果节点ID已存在，跳过重复节点
+        if (!nodeMap.has(node.id)) {
+            nodeMap.set(node.id, node);
+            
+            if (node.children) {
+                for (const child of node.children) {
+                    if (child?.id) {
+                        parentMap.set(child.id, node.id);
+                        stack.push(child);
+                    }
+                }
+            }
+        }
+    }
+    
+    // 找到需要保留的节点（目标节点及其祖先）
+    const keepIds = new Set();
+    for (const id of idArray) {
+        let currentId = id;
+        while (currentId && nodeMap.has(currentId)) {
+            keepIds.add(currentId);
+            currentId = parentMap.get(currentId);
+        }
+    }
+    
+    // 构建结果树 - 修复重复问题
+    const result = [];
+    const processedIds = new Set(); // 跟踪已处理的节点ID，防止重复
+    
+    // 只处理根节点中需要保留的节点
+    for (const root of roots) {
+        if (!root?.id || !keepIds.has(root.id) || processedIds.has(root.id)) {
+            continue;
+        }
+        
+        processedIds.add(root.id);
+        result.push(buildNodeTree(root, keepIds, idArray, processedIds));
+    }
+    
+    // 清理临时数据
+    nodeMap.clear();
+    parentMap.clear();
+    keepIds.clear();
+    processedIds.clear();
+    
+    return Array.isArray(treeData) ? result : result[0] || null;
+}
+
+// 辅助函数：查找特定条件的节点
+function findTargetNode(treeData: any) {
+    if (!treeData) return null;
+    
+    const stack = Array.isArray(treeData) ? [...treeData] : [treeData];
+    
+    while (stack.length > 0) {
+        const node = stack.pop();
+        
+        // 检查节点是否符合条件
+        if (node.id === "309" && node.label === "山东恒信高科能源有限公司") {
+            return node;
+        }
+        
+        // 继续遍历子节点
+        if (node.children && node.children.length > 0) {
+            stack.push(...node.children);
+        }
+    }
+    
+    return null;
+}
+
+// 辅助函数：递归构建节点树
+function buildNodeTree(node: any | any[], keepIds: Set<unknown>, idArray: string | any[], processedIds: Set<unknown>) {
+    const newNode = { 
+        id: node.id,
+        label: node.label,
+        value: node.value,
+        number:node.number,
+        children: node
+    };
+    
+    // 修改目标节点的标签
+    if (idArray.includes(node.id)) {
+        newNode.label = `${node.label}(${node.value || ''})`;
+        newNode.number = newNode.label;
+    }
+    
+    // 处理子节点
+    if (node.children && node.children.length > 0) {
+        const children = [];
+        const childProcessedIds = new Set(); // 用于子节点的去重
+        
+        for (const child of node.children) {
+            if (child?.id && keepIds.has(child.id) && !childProcessedIds.has(child.id)) {
+                childProcessedIds.add(child.id);
+                children.push(buildNodeTree(child, keepIds, idArray, processedIds));
+            }
+        }
+        if (children.length > 0) {
+            newNode.children = children;
+        }
+    }
+    
+    return newNode;
+}
+
+// 当 idList 为空时处理树数据，使用与不为空时相同的格式化逻辑
+function processTreeWithAllNodes(treeData: any) {
+    if (!treeData) {
+        return Array.isArray(treeData) ? [] : null;
+    }
+    
+    const roots = Array.isArray(treeData) ? treeData : [treeData];
+    
+    // 构建结果树 - 使用与不为空时相同的逻辑，但应用到所有节点
+    const result = [];
+    const processedIds = new Set();
+    
+    // 处理所有根节点
+    for (const root of roots) {
+        if (!root?.id || processedIds.has(root.id)) {
+            continue;
+        }
+        
+        processedIds.add(root.id);
+        // 使用相同的格式化逻辑，但应用到所有节点，并过滤没有用户的组织节点
+        const formattedNode = formatAllNodes(root, processedIds);
+        if (formattedNode) {
+            result.push(formattedNode);
+        }
+    }
+    
+    // 清理临时数据
+    processedIds.clear();
+    
+    return Array.isArray(treeData) ? result : result[0] || null;
+}
+
+// 递归格式化所有节点，保持与非空时相同的格式，并过滤没有用户的组织节点
+function formatAllNodes(node:  any | any[], processedIds: Set<unknown>) {
+    // 判断是否为组织节点（ID长度小于5）
+    const isOrganization = node.id && node.id.length < 5;
+    
+    // 处理子节点
+    let children = [];
+    const childProcessedIds = new Set();
+    
+    if (node.children && node.children.length > 0) {
+        for (const child of node.children) {
+            if (child?.id && !childProcessedIds.has(child.id)) {
+                childProcessedIds.add(child.id);
+                const formattedChild = formatAllNodes(child, processedIds);
+                if (formattedChild) {
+                    children.push(formattedChild);
+                }
+            }
+        }
+    }
+    
+    // 如果是组织节点且没有用户子节点，则过滤掉
+    if (isOrganization && children.length === 0) {
+        return null;
+    }
+    
+    // 对所有节点应用相同的格式化逻辑
+    const newNode = { 
+        id: node.id,
+        label: node.label,
+        value: node.value,
+        number:node.number,
+        children:node
+    };
+    
+    // 对所有节点应用相同的标签格式化
+    if (node.value !== null && node.value !== undefined) {
+        newNode.label = `${node.label}(${node.value})`;
+        newNode.number = newNode.label;
+    }
+    
+    // 如果有子节点，添加子节点
+    if (children.length > 0) {
+        newNode.children = children;
+    }
+    
+    return newNode;
+}
+
+function groupExpandUserConfigs(configs: any[]) {
+    // 用于存储分组结果的Map
+    // key是排序后的范围数组字符串，value是包含names和原始keys的对象
+    const groupMap = new Map();
+    
+    configs.forEach((config: { control: { queryBy: string; orgRange: any; roleRange: any; }; name: any; }) => {
+        // 根据queryBy确定使用哪个范围数组
+        let range, rangeType;
+        if (config.control.queryBy === 'org') {
+            range = config.control.orgRange;
+            rangeType = 'orgRange';
+        } else {
+            range = config.control.roleRange;
+            rangeType = 'roleRange';
+        }
+        
+        // 对范围数组进行排序并转换为字符串作为分组key
+        const sortedRange = [...range].sort().join(',');
+        
+        // 如果该分组key不存在，创建新的分组
+        if (!groupMap.has(sortedRange)) {
+            groupMap.set(sortedRange, {
+                names: [],
+                keys: range, // 存储原始keys，不排序
+                rangeType: rangeType
+            });
+        }
+        
+        // 将当前配置的name添加到对应分组
+        groupMap.get(sortedRange).names.push(config.name);
+    });
+    
+    // 将Map转换为要求的输出格式
+    const result = [];
+    for (const groupInfo of groupMap.values()) {
+        result.push({
+            groupArray: groupInfo.names,
+            keys: groupInfo.keys,
+            rangeType: groupInfo.rangeType // 可选：添加范围类型信息
+        });
+    }
+    
+    return result;
+}
+
+
+
+
+
+
+
+
+const asfs: any[] = [];
+const rangedUsers :any= [];
+const selectOrgs :any = [];
+const rangedUsersPath :any= [];
+const selectOrgsPath :any = [];
+
+const tables: any[] = [];
+
+const getAsfsRunedFlag = ref(false)
+
+function getAsfs() {
+  /* setTimeout(() => { */
+  if(props.formData.list&&props.formData.list.length>0){
+    //alert(1)
+    let dataList = ref({});
+    dataList.value = props.formData.list;
+
+    if (dataList && Array.isArray(dataList.value) && dataList.value.length > 0) {
+      
+      for (let i = 0; i < dataList.value.length; i++) {
+        let for1Name = dataList.value[i].name
+        
+        if (dataList.value[i].type == "associatedForms") {
+          asfs.push(dataList.value[i]);
+        } else if(dataList.value[i].type == "expand-user"){
+          let pathObj = {path:"",obj: dataList.value[i].name}
+          rangedUsersPath.push(pathObj)
+          rangedUsers.push(dataList.value[i]);
+        } else if(dataList.value[i].type == "orgCentent"){
+          let pathObj = {path:"",obj: dataList.value[i].name}
+          selectOrgsPath.push(pathObj)
+          selectOrgs.push(dataList.value[i]);
+        }else if (
+          dataList.value[i].type == "card" ||
+          dataList.value[i].type == "flex" ||
+          dataList.value[i].type == "div" ||
+          dataList.value[i].type == "table"
+        ) {
+          
+          if (dataList.value[i].type == "table") {
+            tables.push(dataList.value[i]);
+          }
+
+          dataList.value[i].list.forEach((element: any) => {
+            
+            if (element.type == "associatedForms") {
+              asfs.push(element);
+            }else if(element.type  == "expand-user"){
+              let pathObj = {path:""+for1Name,obj:element.name}
+              rangedUsersPath.push(pathObj)
+              rangedUsers.push(element);
+            }else if(element.type  == "orgCentent"){
+              let pathObj = {path:""+for1Name,obj:element.name}
+              selectOrgsPath.push(pathObj)
+              selectOrgs.push(element);
+            }
+          });
+        } else if (dataList.value[i].type == "grid") {
+          let columns = JSON.parse(JSON.stringify(dataList.value[i].columns));
+
+          if (columns.length > 0) {
+            for (let z = 0; z < columns.length; z++) {
+              for (let x = 0; x < columns[z].list.length; x++) {
+                let a = JSON.parse(JSON.stringify(columns[z].list[x]));
+
+                if (a.type == "associatedForms") {
+                  asfs.push(a);
+                }else if(a.type == "expand-user"){
+                  let pathObj = {path:""+for1Name,obj:a.name}
+                  rangedUsersPath.push(pathObj)
+                  rangedUsers.push(a);
+                }else if(a.type == "orgCentent"){
+                  let pathObj = {path:""+for1Name,obj:a.name}
+                  selectOrgsPath.push(pathObj)
+                  selectOrgs.push(a);
+                }
+              }
+            }
+          }
+        } else if (dataList.value[i].type == "tabs") {
+          //tabs标签页有可能再嵌套一层flex或者table
+          let columns = JSON.parse(JSON.stringify(dataList.value[i].columns));
+          if (columns.length > 0) {
+            for (let z = 0; z < columns.length; z++) {
+              for (let x = 0; x < columns[z].list.length; x++) {
+                let a = JSON.parse(JSON.stringify(columns[z].list[x]));
+
+                if (a.type == "associatedForms") {
+                  asfs.push(a);
+                } else if(a.type == "expand-user"){
+                  let pathObj = {path:""+for1Name,obj:a.name}
+                  rangedUsersPath.push(pathObj)
+                  rangedUsers.push(a);
+                } else if(a.type == "orgCentent"){
+                  let pathObj = {path:""+for1Name,obj:a.name}
+                  selectOrgsPath.push(pathObj)
+                  selectOrgs.push(a);
+                }else if (a.type == "flex" || a.type == "table") {
+                  let for2Name = a.name
+                  if (a.type == "table") {
+                    tables.push(dataList.value[i]);
+                  }
+
+                  if (a.list.length > 0) {
+                    for (let m = 0; m < a.list.length; m++) {
+                      let q = JSON.parse(JSON.stringify(a.list[m]));
+
+                      if (q.type == "associatedForms") {
+                        asfs.push(q);
+                      }else if(q.type == "expand-user"){
+                        let pathObj = {path:""+for2Name,obj:q.name}
+                        rangedUsersPath.push(pathObj)
+                        rangedUsers.push(q);
+                      }else if(q.type == "orgCentent"){
+                        let pathObj = {path:""+for2Name,obj:q.name}
+                        selectOrgsPath.push(pathObj)
+                        selectOrgs.push(q);
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+      checkAndGetTree()
+    }
+    getAsfsRunedFlag.value = true
+  }else{
+		setTimeout(()=>{
+			getAsfs()
+		},100)
+	}
+  /* }, 500); */
+}
+
+// 重置表单方法
+const resetFields = () => {
+  ruleForm.value.resetFields();
+  // setValue(Object.assign(model.value, obj || {})) // 这才能清空组件显示的值
+};
+
+
+function checkAndGetTree(){
+  //console.log("checkAndGetTree")
+  if(rangedUsers.length>0){
+    getTree1();
+  }else{
+    if(getAsfsRunedFlag){
+
+    }else{
+      setTimeout(()=>{
+        checkAndGetTree()
+      },100)
+    }
+    
+  }
+
+
+}
+
+
+
+onMounted(() => {
+  //alert(1)
+  getAsfs();
+  // console.log("数据处理结束--->",props.formData)
+  getInitModel();
+  nextTick(() => {
+    appendRemoveStyle(true);
+  });
+  showOrHide("kong");
+  
+  
+});
+onUnmounted(() => {
+  if (eventName) {
+    // @ts-ignore
+    window[eventName] = "";
+  }
+  appendRemoveStyle();
+});
+
+//重洗提交表单流程
+const afreshSubmit = (params = {}) => {
+  // let apiUrl = "/systemapi/task_management/newcust_form_editdata"
+  let apiUrl = "/systemapi/task_management/editCustomerTable";
+  if (props.isSearch || !apiUrl || loading.value) {
+    if (!props.isSearch && !apiUrl) {
+      console.error(new Error("请在表单设计处配置接口事件url或选择数据源或设置props"));
+    }
+    // 列表里作为筛选时，不提交表单
+    return;
+  }
+  validate((valid: boolean, fields: any) => {
+    if (valid) {
+      const formatParams = Object.assign({}, fields, params);
+      let submitParams;
+      const beforeSubmit = props.formData.events?.beforeSubmit;
+      if (beforeSubmit) {
+        if (typeof beforeSubmit === "function") {
+          submitParams = beforeSubmit(formatParams, route);
+        } else {
+          submitParams = formatResult(formatParams, beforeSubmit);
+        }
+      }
+      if (props.beforeSubmit && typeof props.beforeSubmit === "string") {
+        submitParams = formatResult(formatParams, props.beforeSubmit);
+      } else if (typeof props.beforeSubmit === "function") {
+        submitParams = props.beforeSubmit(formatParams, route);
+      }
+      if (submitParams === false) {
+        return;
+      }
+      // 提交保存表单
+      currencyFormApiSubmit(apiUrl, submitParams ?? formatParams)
+        .then((res: any) => {
+          anewSubmit("success", res);
+        })
+        .catch((res) => {
+          anewSubmit("fail", res);
+        });
+    } else {
+      // 没通过校验
+      anewSubmit("validate", fields);
+    }
+  });
+};
+
+const anewSubmit = (type: string, res: any) => {
+  const anewSubmit = props.formData.events?.anewSubmit;
+  let notReturn;
+  if (typeof anewSubmit === "function") {
+    notReturn = anewSubmit(type, res);
+    //   console.log("notReturn-1-123456->",props.anewSubmit)
+  } else if (typeof props.anewSubmit === "function") {
+    notReturn = props.anewSubmit(type, res);
+    //   console.log("notReturn--123456->",props.anewSubmit)
+  }
+  loading.value = false;
+  if (notReturn === false) {
+    // 有返回false时则不提示
+    return;
+  }
+  if (type === "success") {
+    ElMessage.success(res.msg || "保存成功！");
+  } else if (type === "fail") {
+    ElMessage.error(res.message || "保存失败！");
+  }
+};
+
+//保存草稿
+const saveDraft = (params = {}) => {
+  // let apiUrl ="/systemapi/task_management/add_form_newdata"
+  let apiUrl = "/systemapi/task_management/add_customer_form";
+  if (props.isSearch || !apiUrl || loading.value) {
+    if (!props.isSearch && !apiUrl) {
+      console.error(new Error("请在表单设计处配置接口事件url或选择数据源或设置props"));
+    }
+    // 列表里作为筛选时，不提交表单
+    return;
+  }
+  validate((valid: boolean, fields: any) => {
+    if (valid) {
+      const formatParams = Object.assign({}, fields, params);
+      let submitParams;
+      const beforeSubmit = props.formData.events?.beforeSubmit;
+      if (beforeSubmit) {
+        if (typeof beforeSubmit === "function") {
+          submitParams = beforeSubmit(formatParams, route);
+        } else {
+          submitParams = formatResult(formatParams, beforeSubmit);
+        }
+      }
+      if (props.beforeSubmit && typeof props.beforeSubmit === "string") {
+        submitParams = formatResult(formatParams, props.beforeSubmit);
+      } else if (typeof props.beforeSubmit === "function") {
+        submitParams = props.beforeSubmit(formatParams, route);
+      }
+      if (submitParams === false) {
+        return;
+      }
+      formatParams.versionId = props.versionId;
+      formatParams.appKey = props.groupid;
+      formatParams.status = 1;
+      if (formatParams.formId) {
+        if (formatParams.formId == "") {
+          formatParams.formId = props.versionId;
+        }
+      } else {
+        formatParams.formId = props.versionId;
+      }
+      console.log("提交保存草稿！", params);
+      // 提交保存表单
+      currencyFormApiSubmit(apiUrl, submitParams ?? formatParams)
+        .then((res: any) => {
+          saveDraftPage("success", res);
+        })
+        .catch((res) => {
+          saveDraftPage("fail", res);
+        });
+    } else {
+      // 没通过校验
+      saveDraftPage("validate", fields);
+    }
+  });
+};
+const saveDraftPage = (type: string, res: any) => {
+  const saveDraftPage = props.formData.events?.saveDraftPage;
+  let notReturn;
+  if (typeof saveDraftPage === "function") {
+    notReturn = saveDraftPage(type, res);
+    //   console.log("notReturn-1-123456->",props.anewSubmit)
+  } else if (typeof props.saveDraftPage === "function") {
+    notReturn = props.saveDraftPage(type, res);
+    //   console.log("notReturn--123456->",props.anewSubmit)
+  }
+  loading.value = false;
+  if (notReturn === false) {
+    // 有返回false时则不提示
+    return;
+  }
+  if (type === "success") {
+    ElMessage.success(res.msg || "保存成功！");
+  } else if (type === "fail") {
+    ElMessage.error(res.message || "保存失败！");
+  }
+};
+//保存草稿  只保存表单，不操作流程
+const saveEditDraft = (params = {}) => {
+  // let apiUrl = "/systemapi/task_management/newcust_form_editdata"
+  // let apiUrl ="/systemapi/task_management/add_customer_form"
+  let apiUrl = "/systemapi/task_management/editCustomerTable";
+  if (props.isSearch || !apiUrl || loading.value) {
+    if (!props.isSearch && !apiUrl) {
+      console.error(new Error("请在表单设计处配置接口事件url或选择数据源或设置props"));
+    }
+    // 列表里作为筛选时，不提交表单
+    return;
+  }
+  validate((valid: boolean, fields: any) => {
+    if (valid) {
+      const formatParams = Object.assign({}, fields, params);
+      let submitParams;
+      const beforeSubmit = props.formData.events?.beforeSubmit;
+      if (beforeSubmit) {
+        if (typeof beforeSubmit === "function") {
+          submitParams = beforeSubmit(formatParams, route);
+        } else {
+          submitParams = formatResult(formatParams, beforeSubmit);
+        }
+      }
+      if (props.beforeSubmit && typeof props.beforeSubmit === "string") {
+        submitParams = formatResult(formatParams, props.beforeSubmit);
+      } else if (typeof props.beforeSubmit === "function") {
+        submitParams = props.beforeSubmit(formatParams, route);
+      }
+      if (submitParams === false) {
+        return;
+      }
+      // 提交保存表单
+      currencyFormApiSubmit(apiUrl, submitParams ?? formatParams)
+        .then((res: any) => {
+          saveEditFormInfo("success", res);
+        })
+        .catch((res) => {
+          saveEditFormInfo("fail", res);
+        });
+    } else {
+      // 没通过校验
+      saveEditFormInfo("validate", fields);
+    }
+  });
+};
+const saveEditFormInfo = (type: string, res: any) => {
+  const saveEditFormInfo = props.formData.events?.saveEditFormInfo;
+  let notReturn;
+  if (typeof saveEditFormInfo === "function") {
+    notReturn = saveEditFormInfo(type, res);
+    //   console.log("notReturn-1-123456->",props.saveEditFormInfo)
+  } else if (typeof props.saveEditFormInfo === "function") {
+    notReturn = props.saveEditFormInfo(type, res);
+    //   console.log("notReturn--123456->",props.anewSubmit)
+  }
+  loading.value = false;
+  if (notReturn === false) {
+    // 有返回false时则不提示
+    return;
+  }
+  if (type === "success") {
+    ElMessage.success(res.msg || "保存成功！");
+  } else if (type === "fail") {
+    ElMessage.error(res.message || "保存失败！");
+  }
+};
+/**
+ * 草稿提交审批
+ */
+const draftSubmit = (params = {}) => {
+  // let apiUrl = "/systemapi/task_management/newcust_form_editdata"
+  let apiUrl = "/systemapi/task_management/editCustomerTable";
+  if (props.isSearch || !apiUrl || loading.value) {
+    if (!props.isSearch && !apiUrl) {
+      console.error(new Error("请在表单设计处配置接口事件url或选择数据源或设置props"));
+    }
+    // 列表里作为筛选时，不提交表单
+    return;
+  }
+ 
+  validate((valid: boolean, fields: any) => {
+    if (valid) {
+      const formatParams = Object.assign({}, fields, params);
+      let submitParams;
+      const beforeSubmit = props.formData.events?.beforeSubmit;
+      if (beforeSubmit) {
+        if (typeof beforeSubmit === "function") {
+          submitParams = beforeSubmit(formatParams, route);
+        } else {
+          submitParams = formatResult(formatParams, beforeSubmit);
+        }
+      }
+      if (props.beforeSubmit && typeof props.beforeSubmit === "string") {
+        submitParams = formatResult(formatParams, props.beforeSubmit);
+      } else if (typeof props.beforeSubmit === "function") {
+        submitParams = props.beforeSubmit(formatParams, route);
+      }
+      if (submitParams === false) {
+        return;
+      }
+      // 提交保存表单
+      currencyFormApiSubmit(apiUrl, submitParams ?? formatParams)
+        .then((res: any) => {
+          sendDraftSubmit("success", res);
+        })
+        .catch((res) => {
+          sendDraftSubmit("fail", res);
+        });
+    } else {
+      // 没通过校验
+      sendDraftSubmit("validate", fields);
+    }
+  });
+};
+
+const sendDraftSubmit = (type: string, res: any) => {
+
+   
+  const sendDraftSubmit = props.formData.events?.sendDraftSubmit;
+  let notReturn;
+  if (typeof sendDraftSubmit === "function") {
+    notReturn = sendDraftSubmit(type, res);
+    //   console.log("notReturn-1-123456->",props.sendDraftSubmit)
+  } else if (typeof props.sendDraftSubmit === "function") {
+    notReturn = props.sendDraftSubmit(type, res);
+    //   console.log("notReturn--123456->",props.anewSubmit)
+  }
+  loading.value = false;
+  if (notReturn === false) {
+    // 有返回false时则不提示
+    return;
+  }
+  if (type === "success") {
+    ElMessage.success(res.msg || "提交成功111111111111111111！");
+  } else if (type === "fail") {
+    ElMessage.error(res.message || "提交失败！");
+  }
+};
+/**
+ * 申请修改
+ */
+const submitEditButton = (params = {}) => {
+  // let apiUrl = "/systemapi/task_flow/editFormLogData"
+  let apiUrl = "/systemapi/task_management/applyForTableFormData";
+  if (props.isSearch || !apiUrl || loading.value) {
+    if (!props.isSearch && !apiUrl) {
+      console.error(new Error("请在表单设计处配置接口事件url或选择数据源或设置props"));
+    }
+    // 列表里作为筛选时，不提交表单
+    return;
+  }
+  validate((valid: boolean, fields: any) => {
+    if (valid) {
+      const formatParams = Object.assign({}, fields, params);
+      let submitParams;
+      const beforeSubmit = props.formData.events?.beforeSubmit;
+      if (beforeSubmit) {
+        if (typeof beforeSubmit === "function") {
+          submitParams = beforeSubmit(formatParams, route);
+        } else {
+          submitParams = formatResult(formatParams, beforeSubmit);
+        }
+      }
+      if (props.beforeSubmit && typeof props.beforeSubmit === "string") {
+        submitParams = formatResult(formatParams, props.beforeSubmit);
+      } else if (typeof props.beforeSubmit === "function") {
+        submitParams = props.beforeSubmit(formatParams, route);
+      }
+      if (submitParams === false) {
+        return;
+      }
+      // console.log("提交修改数据",apiUrl,submitParams,formatParams)
+      // 提交保存表单
+      currencyFormApiSubmit(apiUrl, submitParams ?? formatParams)
+        .then((res: any) => {
+          submitEdit("success", res);
+        })
+        .catch((res) => {
+          submitEdit("fail", res);
+        });
+    } else {
+      // 没通过校验
+      submitEdit("validate", fields);
+    }
+  });
+};
+//提交修改数据
+const submitEdit = (type: string, res: any) => {
+  const submitEdit = props.formData.events?.submitEdit;
+  let notReturn;
+  if (typeof submitEdit === "function") {
+    notReturn = submitEdit(type, res);
+    //   console.log("notReturn-1-123456->",props.submitEdit)
+  } else if (typeof props.submitEdit === "function") {
+    notReturn = props.submitEdit(type, res);
+    //   console.log("notReturn--123456->",props.anewSubmit)
+  }
+  loading.value = false;
+  if (notReturn === false) {
+    // 有返回false时则不提示
+    return;
+  }
+  if (type === "success") {
+    ElMessage.success(res.msg || "提交成功！");
+  } else if (type === "fail") {
+    ElMessage.error(res.message || "提交失败！");
+  }
+};
+
+function optionsValue3Get2(data: any, fieldName: string) {
+  //console.log("form.vue","optionsValue3Get2")
+  emits("optionsValue3Get3", data, fieldName);
+}
+
+defineExpose({
+  setOptions,
+  setValue,
+  getValue,
+  validate,
+  resetFields,
+  getData,
+  submit,
+  anewSubmit,
+  saveDraftPage,
+  saveEditFormInfo,
+  getEditData,
+  submitEdit,
+});
+
+const webPage = computed({
+  get: () => {
+    // console.log("value-get",props.modelValue)
+    // userlist.value = props.modelValue
+    return props.isWeb;
+    // return false
+  },
+  set: (newVal: any) => {
+    return newVal;
+  },
+});
+//
+</script>
+<template>
+    <div v-if="webPage" class="webBox">
+        <el-form
+            v-bind="formData.form"
+            ref="ruleForm"
+            :model="model as any"
+            :disabled="disabled || type === 3"
+            class="add-form"
+            :class="{
+                'design-form': type === 5,
+                'detail-form': type === 3 || type === 4 || type === 1,
+            }"
+        >
+            <WebFormGroup
+                :tableinfo="formData.form"
+                :is-web="webPage"
+                :numrun="numrun"
+                :data="formData.list"
+                :alldata="formData"
+                @optionsValue3Get2="optionsValue3Get2"
+            />
+
+            <slot></slot>
+        </el-form>
+    </div>
+    <el-card v-else v-loading="loading" shadow="always">
+        <template #header>
+          <div class="card-header">
+            <div class="svgBox"><SvgIcon icon-class="edit" size="25" /></div>
+            {{ drawTitle }}
+          </div>
+        </template>
+        <el-scrollbar class="scroBox">
+            <el-form
+                v-bind="formData.form"
+                ref="ruleForm"
+                :model="model as any"
+                :disabled="disabled || type === 3"
+                class="add-form"
+                :class="{
+                    'design-form': type === 5,
+                    'detail-form': type === 3 || type === 4 || type === 1,
+                }"
+            >
+                <FormGroup
+                    :tableinfo="formData.form"
+                    :numrun="numrun"
+                    :data="formData.list"
+                    :alldata="formData"
+                    :node-key="nodeKey"
+                    :purview="purview"
+                    @optionsValue3Get2="optionsValue3Get2"
+                    :org-and-man-tree="rangedUserTrees1" 
+                />
+            </el-form>
+
+            <el-divider v-if="pageLog && pageLog.length > 0" content-position="left">历史记录</el-divider>
+            <el-timeline style="width: 90%; margin: 0 auto">
+            <el-timeline-item
+              v-for="(item, index) in pageLog"
+              :key="index"
+              :timestamp="item.time + ' 操作人：' + item.creater"
+              placement="top"
+            >
+              <el-card>
+                <el-descriptions border>
+                  <el-descriptions-item
+                    v-for="(mastItem, mastIndex) in item.masterdata"
+                    :key="mastItem.label"
+                    :label="mastItem.label"
+                  >
+                    {{ mastItem.label }}
+                  </el-descriptions-item>
+                </el-descriptions>
+                <el-tabs v-if="item.sunList" type="border-card" style="margin-top: 20px">
+                  <el-tab-pane
+                    v-for="(sonItem, sonIndex) in item.sunList"
+                    :key="sonIndex"
+                    :label="sonIndex.toString()"
+                  >
+                    <el-descriptions
+                      v-for="(sonVal, sonIndex) in sonItem"
+                      :key="sonIndex"
+                      border
+                    >
+                      <el-descriptions-item
+                        v-for="(sonCentor, sonKey) in sonVal"
+                        :key="sonKey"
+                        :label="sonKey.toString()"
+                      >
+                        {{ sonCentor }}
+                      </el-descriptions-item>
+                    </el-descriptions>
+                  </el-tab-pane>
+                </el-tabs>
+                <table style="margin: 20px">
+                  <tr>
+                    <td class="biankuang" width="100">修改说明：</td>
+                    <td class="biankuang">{{ item.explicate }}</td>
+                  </tr>
+                </table>
+              </el-card>
+            </el-timeline-item>
+          </el-timeline>
+
+        </el-scrollbar>
+
+
+
+    </el-card>
+</template>
+<style  lang='scss' scoped>
+.webBox {
+  background: #ffffff;
+  margin: 0px auto 0 auto;
+  max-width: 380px;
+  border: 1px dashed #999;
+  height: calc(100vh - 105px);
+  overflow-y: auto;
+  overflow-x: hidden;
+  position: relative;
+}
+.pcBox {
+  background: #ffffff;
+  border: 1px dashed #999;
+  height: calc(100vh - 105px);
+  overflow-y: auto;
+  overflow-x: hidden;
+  position: relative; 
+}
+.drawerClass{
+  :deep .el-drawer__header{
+    border-bottom: 1px solid #ECECEC;
+  }
+}
+.drawHeader {
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.drawBody{
+  width: 100%;
+  height: 100%;
+  padding: 10px 10px;
+  :deep .el-card{
+    border-radius: 15px;
+  }
+  :deep .el-card__header{
+    padding: 15px 15px;
+  }
+  :deep .el-card__body{
+    padding: 0;
+  }
+  :deep .el-card__footer{
+    padding: 10px 10px;
+  }
+}
+.twoPage{
+    display: grid;
+    grid-template-columns:  1fr minmax(150px, 250px); /* 左右最小150px，最大250px，中间自适应 */
+    grid-template-rows: auto;
+    gap: 10px;
+    max-width: 100%;
+    margin: 0 auto;
+}
+.treePage{
+    display: grid;
+    grid-template-columns: minmax(150px, 250px) 1fr minmax(150px, 250px); /* 左右最小150px，最大250px，中间自适应 */
+    grid-template-rows: auto;
+    gap: 10px;
+    max-width: 100%;
+    margin: 0 auto;
+}
+.svgBox{
+    background: linear-gradient(135deg, #0020C2, #4d6cff);
+    color: white;
+    width: 40px;
+    height: 40px;
+    border-radius: 50%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 1.2rem;
+}
+.card-header{
+  font-size: 1.4rem;
+  font-weight: 700;
+  color: #0020C2;
+  display: flex;
+  align-items: center;
+  gap: 10px;
+}
+.scroBox{
+    padding: 10px 0 0 0;
+  height: calc(100vh - 155px);
+}
+.formBody{
+  width: 100%;
+  overflow-x: auto;
+}
+.flowBody{
+  padding: 10px 15px;
+  height: calc(100vh - 260px);
+}
+
+.bootemWorkFlow{
+  width: 100%;
+  text-align: center;
+  .bootemWorkFlowBut{
+    width: 100%;
+    padding: 10px 0;
+    text-align: center;
+  }
+}
+
+.btn {
+  padding: 14px 16px;
+  border-radius: 10px;
+  font-weight: 600;
+  font-size: 1rem;
+  cursor: pointer;
+  transition: all 0.3s;
+  border: none;
+}
+.btn:hover {
+  transform: translateY(-2px);
+  box-shadow: 0 5px 15px rgba(0, 32, 194, 0.15);
+}
+.approve-btn {
+  background: linear-gradient(135deg, #00cc66, #33dd88);
+  color: white;
+}
+.reject-btn {
+  background: linear-gradient(135deg, #ff3366, #ff5588);
+  color: white;
+}
+
+.bootemAi{
+  display: grid;
+  grid-template-columns:  1fr 50px; /* 左右最小150px，最大250px，中间自适应 */
+  grid-template-rows: auto;
+  gap: 10px;
+  max-width: 100%;
+  margin: 0 auto;
+  :deep .el-input__wrapper{
+    border-radius: 10px;
+  }
+}
+
+.ai-send-btn {
+    background: linear-gradient(135deg, #0020C2, #4d6cff);
+    color: white;
+    border: none;
+    width: 46px;
+    border-radius: 10px;
+    cursor: pointer;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    transition: all 0.3s;
+}
+        
+.ai-send-btn:hover {
+  background: linear-gradient(135deg, #0019a0, #3a5aff);
+  transform: translateY(-2px);
+}
+.ai-conversation {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  gap: 15px;
+  margin-bottom: 20px;
+}
+.message {
+  padding: 12px 16px;
+  border-radius: 12px;
+  max-width: 90%;
+  line-height: 1.5;
+}
+        
+.user-message {
+  background: #eef2ff;
+  align-self: flex-end;
+  border-top-right-radius: 4px;
+  border: 1px solid rgba(0, 32, 194, 0.2);
+}
+        
+.ai-message {
+  background: linear-gradient(to right, #f0f5ff, #ffffff);
+  align-self: flex-start;
+  border-top-left-radius: 4px;
+  border: 1px solid rgba(0, 32, 194, 0.1);
+}
+</style>
diff --git a/src/components/DesignForm/tableListPage/formPageCont.vue b/src/components/DesignForm/tableListPage/formPageCont.vue
index 9ceeffa..ff5831f 100644
--- a/src/components/DesignForm/tableListPage/formPageCont.vue
+++ b/src/components/DesignForm/tableListPage/formPageCont.vue
@@ -74,7 +74,7 @@ const emits = defineEmits(["update:isShow", "getPageData", "optionsValue4Get4"])
 const formLoading = ref(false);
 const flowAry = ref<any[]>(); //流程列表
 const currentProgress = ref<number>(1); //当前步进值
-const runstep = ref(null);
+const runstep = ref();
 
 const nodeKey = ref<string>("");
 const currterNodePower = ref<nodePoweInfo[]>([])
@@ -148,9 +148,11 @@ watch(
 
               if (props.tablePageClass != 4) {
                 judgeSubmitCancel({ name: stringObjMastesform }).then((data: any) => {
+                  console.log("添加按钮处理--->",data,data.data.buttonIsTrue )
                   if (data.code == 0) {
-                    if (data.data == 3 || data.data == 4) {
+                    if (data.data.buttonIsTrue == 3 || data.data.buttonIsTrue == 4) {
                       // formState.formData.list.push(submitButtonEs)
+                      console.log("添加按钮处理--111111->",data,props.operState)
                       if (props.operState == 2) {
                         formState.formData.list.push(afreshSubmitButton);
                       } else if (props.operState == 3) {
@@ -158,10 +160,12 @@ watch(
                       } else if (props.operState == 4) {
                         formState.formData.list.push(draftSubmitButton);
                       } else if (props.operState == 5) {
+                        console.log("添加按钮处理--2222->",data,props.operState)
                         formState.formData.list.push(submitButtonEs);
                       }
                     }
                   }
+                  console.log("添加按钮处理-wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww-->",formState.formData.list,submitButtonEs)
                 });
               }
               nextTick(() => {
@@ -176,7 +180,7 @@ watch(
               });
               formLoading.value = false;
               //alert(props.pageInfo.masters_key)
-              gainEditDataLog({ id: props.pageInfo.masters_key }).then(({ data }) => {
+              gainEditDataLog({ id: props.pageInfo.masters_key.toString() }).then(({ data }) => {
                 //console.log(formState.formData.list)
 
                 //console.log("获取修改记录-1111-->",data)
diff --git a/src/components/DesignForm/tableListPage/formPageContApp.vue b/src/components/DesignForm/tableListPage/formPageContApp.vue
index c68482c..9ac5ced 100644
--- a/src/components/DesignForm/tableListPage/formPageContApp.vue
+++ b/src/components/DesignForm/tableListPage/formPageContApp.vue
@@ -128,7 +128,7 @@ const getCustomrrFormInfo = () => {
 		})
 		.finally(()=>{
 			formLoading.value = false;
-			gainEditDataLog({id:props.pageInfo.mastersKeyStr})
+			gainEditDataLog({id:props.pageInfo.mastersKeyStr.toString()})
 			.then(({data})=>{
 				// console.log("获取修改记录-1111-->",data)
 				pageLog.value = data
diff --git a/src/components/DesignForm/tableListPage/newFormPageCont.vue b/src/components/DesignForm/tableListPage/newFormPageCont.vue
new file mode 100644
index 0000000..a6f8d83
--- /dev/null
+++ b/src/components/DesignForm/tableListPage/newFormPageCont.vue
@@ -0,0 +1,634 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2026-01-30 16:42:49
+@ 备注: 112312
+-->
+<script lang='ts' setup>
+import { afreshRunWorkflow, draftsInitiateApproval, gainEditDataLog, gainTaskFormInfo } from '@/api/taskapi/management';
+import { string2json, stringToObj } from '@/utils/DesignForm/form';
+import { constAiEffect } from "@/api/DesignForm/utils";
+import { customerFormVersionCont, nodePoweInfo } from "@/api/taskapi/types";
+
+import RunFlowStep from "@/views/taskplatform/taskmanagement/runNewFlowStep.vue";
+import AiPage from "@/views/sysworkflow/lowcodepage/pageFlow/aiPage.vue";
+import { getFieldRecord, judgeSubmitCancel } from '@/api/DesignForm/requestapi';
+import { afreshSubmitButton, draftSubmitButton, editFormCont } from '@/utils/workflow/const';
+import { submitButtonEs } from '@/api/DesignForm/tableButton'; 
+
+
+const props = defineProps({
+    isShow: {
+        type: Boolean,
+        default: false
+    },
+    drawerWith: {
+        type: Number,
+        default: 0,
+    },
+    pageInfo: {
+        type: Object,
+        default() {
+        return {};
+        },
+    },
+    tablePageClass: {
+        type: Number,
+        default: 1,
+    },
+    operState: {
+        type: Number,
+        default: 1,
+    },
+    dprt: {
+        type: Object,
+        default() {
+        return {};
+        },
+    },
+    versiontitle: {
+        type: String,
+        default: "",
+    }
+})
+const drawTitle = computed(() => props.versiontitle)
+const drawBodyWidth = ref(props.drawerWith)
+const emits = defineEmits(["update:isShow", "getPageData", "optionsValue4Get4"]);
+const drawLoading = ref(false)
+const aiConfigArea =ref(false)      //是否有AI
+const isFlowTable = ref(false); //判断是不是流程表单
+let gainTaskFormInfoPromise: any[] = [];
+const runstep = ref();
+const flowAry = ref<any[]>(); //流程列表
+const currentProgress = ref<number>(1); //当前步进值
+//表单相关内容
+const formState = reactive<any>({
+    formData: {
+        list: [],
+        form: {},
+        config: {},
+        powerstr: {},
+        aiConfig:[]
+    },
+    dict: {},
+    formId: props.pageInfo.id,
+    id: 1,
+    loading: true,
+    type: props.tablePageClass,
+});
+let gainTaskFormInfoData: customerFormVersionCont;
+const currterNodePower = ref<nodePoweInfo[]>([])
+const openOrClose =  computed({
+    get: () => {
+      return props.isShow
+    },
+    set: (val) => {
+      emits("update:isShow", val);
+      drawBodyWidth.value = 0;
+    },
+});
+const nodeKey = ref<string>("");
+//-----------------------AI setting--------------------------
+//当前AI智能体，根据form表单的配置来初始化
+//params 主表字段参数   subparams子表字段参数，子表触发时需要清空  ; rowdex:表示子表的第几条数据，没有的话说明不是子表数据
+const currentAgent = ref<
+  {
+    model: boolean;
+    name: string;
+    rowdex:number,
+    uuid: string[];
+    fields: string[];
+    trigger: number;
+    params: { [key: string]: any };
+    subparams:{[key: string]: any}[];
+  }[]
+>([]);
+const aiassistRef = ref();
+//触发AI查询事件
+provide(constAiEffect, ({ key, value, field,rowdex}: any) => {
+  //新建ai_envents 是为了解决前端并发问题
+  const ai_events: Array<{ uuids: string[]; params: { [key: string]: any } }> = [];
+  currentAgent.value.forEach(ag=>{
+    if(ag.fields.includes(key)){ //trigger: 1:任一  2：半数 3：全部
+      if (rowdex!=null){//子表操作
+        ag.rowdex=rowdex //更新智能体的rowdex
+        if(rowdex>=ag.subparams.length){
+          ag.subparams.push({[field]:value})
+        }else{
+          ag.subparams[rowdex][field]=value
+        }
+      }else{ //主表操作, 直接加入params种
+        ag.params[field]=value;  //这个地方把key换成fieldName
+      }
+      let mergedObj;
+      if(ag.subparams.length>0){        
+         mergedObj = Object.assign({}, ag.params, ag.subparams[ag.rowdex]); //合并子表和主表
+      }else{
+        mergedObj = ag.params
+      }
+      switch(ag.trigger){
+        case 2:
+          if(Object.keys(mergedObj).length>=ag.fields.length/2){
+            ai_events.push({uuids:ag.uuid,params:mergedObj })
+          }
+          break;
+        case 3:
+          if(Object.keys(mergedObj).length==ag.fields.length){
+            ai_events.push({uuids:ag.uuid,params:mergedObj})
+          }
+          break;
+        default:
+          ai_events.push({uuids:ag.uuid,params:mergedObj})
+      }
+    }
+  }) 
+  if(ai_events.length>0){
+    aiassistRef.value.onSendParamToAI(ai_events)
+  }  
+})
+
+/**
+@ 作者: 秦东
+@ 时间: 2024-04-03 14:33:15
+@ 功能: 获取自定义表单内容
+*/
+const getCustomrrFormInfo = () => {
+    gainTaskFormInfoPromise.push(
+        gainTaskFormInfo({ id: props.pageInfo.masters_key,runFlowId: props.pageInfo.runFlowId })
+        .then(({ data }) => {
+            let extraW=0; 
+            console.log("获取自定义表单内容--->",data)
+            formState.formData = stringToObj(data.structure.mastesform);
+            console.log("获取自定义表单内容--state.formData->1", formState.formData);
+            if(isFlowTable.value){
+                extraW = 320
+            }
+            if(formState.formData&&formState.formData.aiConfig&&formState.formData.aiConfig.length>0){
+                aiConfigArea.value=true
+                formState.formData.aiConfig?.forEach((item: { library: any; title: any; trigger: any; }) => {
+                currentAgent.value.push({
+                    name: "test",
+                    model: false,
+                    rowdex:0,
+                    uuid: item.library,
+                    fields: item.title,
+                    trigger: item.trigger,
+                    params: {},
+                    subparams:[]
+                });
+                });
+            }
+            if(aiConfigArea.value){
+                extraW = extraW + 320
+            }
+            console.log("获取自定义表单内容--drawBodyWidth.value->2", drawBodyWidth.value);
+            if (aiConfigArea.value && isFlowTable.value){
+                drawBodyWidth.value = drawBodyWidth.value + extraW - 160
+            }else if ((!aiConfigArea.value && isFlowTable.value) || (aiConfigArea.value && !isFlowTable.value)){
+                drawBodyWidth.value = drawBodyWidth.value + extraW
+            }else{
+                drawBodyWidth.value = drawBodyWidth.value
+            }
+            props.dprt.forEach((element: any[]) => {
+                let tableName = element[0]
+                let datePickerName = element[1]
+                data.tableData[tableName].forEach((item: any) => {
+                    let arr = []
+                    arr.push(item[datePickerName])
+                    arr.push(item[datePickerName+"_end"])
+                    item[datePickerName] = arr
+                })
+            })
+            gainTaskFormInfoData = data;
+            nodeKey.value = data.nodeKey?data.nodeKey:"";
+            if(data.structure.powerAry && Array.isArray(data.structure.powerAry) && data.structure.powerAry.length > 0){
+                currterNodePower.value = data.structure.powerAry
+            }
+
+             console.log("获取自定义表单内容--props.tablePageClass->2", props.tablePageClass);
+            if(props.tablePageClass != 4){
+              judgeSubmitCancel({"name":data.structure.mastesformjson})
+                .then((data:any) =>{
+                   console.log("获取自定义表单内容--props.tablePageClass->data", data);
+                  if(data.code == 0){
+                    if (data.data.buttonIsTrue == 3 || data.data.buttonIsTrue == 4){
+                      // formState.formData.list.push(submitButtonEs)
+                      if(props.operState == 2){
+                          formState.formData.list.push(afreshSubmitButton)
+                      }else if(props.operState == 3){
+                          formState.formData.list.push(editFormCont)
+                      }else if(props.operState == 4){
+                          formState.formData.list.push(draftSubmitButton)
+                      }else if(props.operState == 5){
+                        formState.formData.list.push(submitButtonEs)
+                      }
+                    }
+                  }
+                })
+            }
+            nextTick(()=>{
+              console.log("获取自定义表单内容-1111-->",data.tableData)
+              formEl.value.setValue(data.tableData)
+            })
+
+        })
+        .finally(() => {
+           
+        })
+    )
+}
+
+
+
+const formLoading = ref(false);
+// 监听props.drawerWith的变化，更新drawBodyWidth
+watch(() => props.drawerWith, (newVal) => {
+  drawBodyWidth.value = newVal;
+});
+let objMastesform: any;
+let getFieldRecordPromises: any[] = [];
+let transferDetails: any = [];
+const formEl = ref<any>();
+// 监听props.isShow的变化，当isShow为true时，更新drawBodyWidth
+watch(() => props.isShow, (newVal) => {
+  if (newVal) {
+    if(props.pageInfo.flowIsOpens == 1){
+        isFlowTable.value = true
+    }else{
+        isFlowTable.value = false
+    }
+    drawBodyWidth.value = props.drawerWith;
+    getCustomrrFormInfo();
+    
+  }
+});
+interface TreeNode {
+  id: string;
+  label: string;
+  disabled: boolean;
+  children: TreeNode[];
+}
+const pageLog = ref<any[]>([]);
+function mapIdsToLabels(treeNodes: TreeNode[], ids1: string): string[] {
+  /* console.log(treeNodes)
+    console.log(ids1) */
+  const ids: string[] = JSON.parse(ids1);
+  // 创建id到label的映射字典
+  const idToLabelMap: Record<string, string> = {};
+
+  // 递归遍历树节点并填充映射字典
+  function traverse(node: TreeNode) {
+    idToLabelMap[node.id] = node.label; // 存储当前节点的映射
+    node.children.forEach((child) => traverse(child)); // 递归处理子节点
+  }
+
+  // 遍历根节点列表
+  treeNodes.forEach((root) => traverse(root));
+  //console.log(ids)
+  // 将id数组转换为label数组
+  return ids.map((id) => idToLabelMap[id]);
+}
+//流程执行
+const drawerBeforeClose = () => {
+  // console.log("监听打开关闭",false)
+  // emits("getmytodolist")
+  // emits("update:isshow", false);
+};
+/**
+@ 作者: 秦东
+@ 时间: 2024-04-09 16:49:09
+@ 功能: 表单前置数据
+*/
+const beforeSubmit = (params: any) => {
+//   params.formId = props.versionid;
+//   params.id = "";
+  // emits("update:isopen", false);
+  return params;
+};
+/**
+@ 作者: 秦东
+@ 时间: 2024-04-07 10:55:34
+@ 功能: 表单动作回调
+*/
+const afterSubmit = (type: string) => {
+  // console.log("表单提交成功")
+  if (type === "success") {
+    // router.go(-1)
+    // console.log("表单提交成功")
+    emits("getPageData");
+    closeAppSubmit();
+  }
+};
+//组件解析
+const changeKeyVal = (key: any, val: any, type: any, attribute: any) => {
+
+}
+//重新提交审核
+const anewSubmit = (type: string, val?: any) => {
+  // console.log("重新提交数据-11--<",type,val)
+  if (type == "success") {
+    afreshRunWorkflow({ id: val.data.runFlowId })
+      .then((data: any) => {
+        // console.log("重新提交数据---<",data,runstep.value)
+        runstep.value.gainRunFlowTask();
+      })
+      .finally(() => {
+        emits("getPageData");
+        closeAppSubmit();
+      });
+  }
+};
+//保存草稿箱(带流程)
+const saveEditFormInfo = (type: string, val?: any) => {
+  // console.log("草稿提交审批--1-<",type,val)
+  if (type == "success") {
+    runstep.value.gainRunFlowTask();
+    emits("getPageData");
+    closeAppSubmit();
+  }
+};
+/**
+@ 作者: 秦东
+@ 时间: 2024-04-09 16:50:01
+@ 功能: 关闭操作
+*/
+const closeAppSubmit = () => {
+  emits("update:isShow", false)
+};
+//提交审批
+const sendDraftSubmit = (type: string, val?: any) => {
+  console.log("提交审批",type,val)
+ console.log(new Error("请在表单设计处配置接口事件url或选择数据源或设置props11111"));
+  // emits("getmytodolist")
+  if (type === "success") {
+    console.log("草稿提交审批--2-<",props.pageInfo )
+    if (props.pageInfo.flowIsOpens == 1) {
+      let sendInfo = {
+        id: val.data.runFlowId,
+        flowList: flowAry.value,
+        state: 3,
+      };
+      console.log("草稿提交审批--1-<",sendInfo)
+      draftsInitiateApproval(sendInfo).then((data: any) => {
+        console.log("草稿提交审批---<",sendInfo,data)
+        
+        if (data.code == 0) {
+          ElMessage.success(data.msg || "提交成功！");
+          if (runstep.value) {
+            runstep.value.gainRunFlowTask();
+          }
+
+           
+          emits("getPageData");
+          closeAppSubmit();
+        }
+      });
+    }
+  }
+};
+function optionsValue3Get3(data: any, fieldName: any) {
+  //console.log("formPageCont","optionsValue3Get3")
+  emits("optionsValue4Get4", data, fieldName);
+}
+//修改完毕
+const submitEdit = (type: string, val?: any) => {
+  // console("修改完毕----->",type,val)
+  if (type == "success") {
+    runstep.value.gainRunFlowTask();
+    emits("getPageData");
+    closeAppSubmit();
+  }
+};
+// onMounted(() => {
+//   getCustomrrFormInfo();
+// })
+</script>
+<template>
+    <div v-if="openOrClose" class="drawerClass">
+        <el-drawer
+            v-model="openOrClose"
+            :title="drawTitle"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+            :destroy-on-close="true"
+            :size="drawBodyWidth"
+            :close="closeAppSubmit"
+        >
+            <template #header>
+                <div class="drawHeader">
+                    <el-text size="large">{{ drawTitle }}</el-text>
+                </div>
+            </template>
+            <div v-loading="drawLoading" :class="aiConfigArea&&isFlowTable?'drawBody treePage':(aiConfigArea&&!isFlowTable)?'drawBody twoPageAi':(!aiConfigArea&&isFlowTable)?'drawBody twoPageFlow':'drawBody'">
+                <!-- {{ formState.formData }} -->
+                <AiPage 
+                    v-if="formState.type != 5 && aiConfigArea" 
+                    ref="aiassistRef"
+                    :agent="currentAgent"
+                /> 
+                <AppForm
+                    ref="formEl"
+                    :draw-title="drawTitle"
+                    :form-data="formState.formData"
+                    :masters_key="props.pageInfo.masters_key"
+                    :type="props.tablePageClass"
+                    :dict="formState.dict"
+                    request-url="getFormContent"
+                    add-url="saveFormContent"
+                    edit-url="editFormContent"
+                    :before-submit="beforeSubmit"
+                    :after-submit="afterSubmit"
+                    :close-app-submit="closeAppSubmit"
+                    :change-key-val="changeKeyVal"
+                    :anew-submit="anewSubmit"
+                    :save-edit-form-info="saveEditFormInfo"
+                    :send-draft-submit="sendDraftSubmit"
+                    :submit-edit="submitEdit"
+                    @options-value3-get3="optionsValue3Get3"
+                />
+                <RunFlowStep
+                    v-if="isFlowTable" 
+                    ref="runstep"
+                    v-model:flowary="flowAry"
+                    :flow-key="props.pageInfo.runFlowId"
+                    :current-progress="currentProgress"
+                    @updatelist="drawerBeforeClose"
+                />
+            </div>
+        
+        </el-drawer>
+    </div>
+</template>
+<style  lang='scss' scoped>
+.drawerClass{
+  :deep .el-drawer__header{
+    border-bottom: 1px solid #ECECEC;
+  }
+}
+.drawHeader {
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.drawBody{
+  width: 100%;
+  height: 100%;
+  padding: 10px 10px;
+  :deep .el-card{
+    border-radius: 15px;
+  }
+  :deep .el-card__header{
+    padding: 15px 15px;
+  }
+  :deep .el-card__body{
+    padding: 0;
+  }
+  :deep .el-card__footer{
+    padding: 10px 10px;
+  }
+}
+.twoPageAi{
+  display: grid;
+  grid-template-columns: minmax(150px, 250px) 1fr; /* 左右最小150px，最大250px，中间自适应 */
+  grid-template-rows: auto;
+  gap: 10px;
+  max-width: 100%;
+  margin: 0 auto;
+}
+.twoPageFlow{
+  display: grid;
+  grid-template-columns:  1fr minmax(150px, 250px); /* 左右最小150px，最大250px，中间自适应 */
+  grid-template-rows: auto;
+  gap: 10px;
+  max-width: 100%;
+  margin: 0 auto;
+}
+.treePage{
+  display: grid;
+  grid-template-columns: minmax(150px, 250px) 1fr minmax(150px, 250px); /* 左右最小150px，最大250px，中间自适应 */
+  grid-template-rows: auto;
+  gap: 10px;
+  max-width: 100%;
+  margin: 0 auto;
+}
+.svgBox{
+  background: linear-gradient(135deg, #0020C2, #4d6cff);
+  color: white;
+  width: 40px;
+  height: 40px;
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 1.2rem;
+}
+.card-header{
+  font-size: 1.4rem;
+  font-weight: 700;
+  color: #0020C2;
+  display: flex;
+  align-items: center;
+  gap: 10px;
+}
+.scroBox{
+  padding: 10px 15px;
+  height: calc(100vh - 200px);
+}
+.formBody{
+  width: 100%;
+  overflow-x: auto;
+}
+.flowBody{
+  padding: 10px 15px;
+  height: calc(100vh - 260px);
+}
+
+.bootemWorkFlow{
+  width: 100%;
+  text-align: center;
+  .bootemWorkFlowBut{
+    width: 100%;
+    padding: 10px 0;
+    text-align: center;
+  }
+}
+
+.btn {
+  padding: 14px 16px;
+  border-radius: 10px;
+  font-weight: 600;
+  font-size: 1rem;
+  cursor: pointer;
+  transition: all 0.3s;
+  border: none;
+}
+.btn:hover {
+  transform: translateY(-2px);
+  box-shadow: 0 5px 15px rgba(0, 32, 194, 0.15);
+}
+.approve-btn {
+  background: linear-gradient(135deg, #00cc66, #33dd88);
+  color: white;
+}
+.reject-btn {
+  background: linear-gradient(135deg, #ff3366, #ff5588);
+  color: white;
+}
+
+.bootemAi{
+  display: grid;
+  grid-template-columns:  1fr 50px; /* 左右最小150px，最大250px，中间自适应 */
+  grid-template-rows: auto;
+  gap: 10px;
+  max-width: 100%;
+  margin: 0 auto;
+  :deep .el-input__wrapper{
+    border-radius: 10px;
+  }
+}
+
+.ai-send-btn {
+    background: linear-gradient(135deg, #0020C2, #4d6cff);
+    color: white;
+    border: none;
+    width: 46px;
+    border-radius: 10px;
+    cursor: pointer;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    transition: all 0.3s;
+}
+        
+.ai-send-btn:hover {
+  background: linear-gradient(135deg, #0019a0, #3a5aff);
+  transform: translateY(-2px);
+}
+.ai-conversation {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  gap: 15px;
+  margin-bottom: 20px;
+}
+.message {
+  padding: 12px 16px;
+  border-radius: 12px;
+  max-width: 90%;
+  line-height: 1.5;
+}
+        
+.user-message {
+  background: #eef2ff;
+  align-self: flex-end;
+  border-top-right-radius: 4px;
+  border: 1px solid rgba(0, 32, 194, 0.2);
+}
+        
+.ai-message {
+  background: linear-gradient(to right, #f0f5ff, #ffffff);
+  align-self: flex-start;
+  border-top-left-radius: 4px;
+  border: 1px solid rgba(0, 32, 194, 0.1);
+}
+</style>
diff --git a/src/main.ts b/src/main.ts
index 82e463f..aceffd7 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -31,14 +31,14 @@ import * as pinia  from './store/index'
 import SketchRule from 'vue3-sketch-ruler'
 import 'vue3-sketch-ruler/lib/style.css'
 import '@/styles/tree-select-global.css'
-
+import * as ElementPlusIconsVue from '@element-plus/icons-vue'
 
 const app = createApp(App);
 // 全局注册 自定义指令(directive)
 setupDirective(app);
 // 全局注册 状态管理(store)
 setupStore(app);
-import * as ElementPlusIconsVue from '@element-plus/icons-vue'
+
 for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
 	app.component(key, component)
 }
diff --git a/src/utils/encryptionAndDecryption/sm4Utils.ts b/src/utils/encryptionAndDecryption/sm4Utils.ts
index 4a764e6..6349f30 100644
--- a/src/utils/encryptionAndDecryption/sm4Utils.ts
+++ b/src/utils/encryptionAndDecryption/sm4Utils.ts
@@ -59,10 +59,10 @@ const sm4DecryptMethod = (data: string, customKey: string): string => {
         }
     }
     // console.log('SM4解密方法----解密结构---data--->', data)
-    console.log('SM4解密方法----解密结构----customKey-->', customKey)
-    console.log('SM4解密方法----解密结构--ivSetup---->', ivSetup)
-    console.log('SM4解密方法----解密结构---sm4TokenKey--->', sm4TokenKey)
-    console.log('SM4解密方法----解密结构---appSystemKey--->', appSystemKey)
+    // console.log('SM4解密方法----解密结构----customKey-->', customKey)
+    // console.log('SM4解密方法----解密结构--ivSetup---->', ivSetup)
+    // console.log('SM4解密方法----解密结构---sm4TokenKey--->', sm4TokenKey)
+    // console.log('SM4解密方法----解密结构---appSystemKey--->', appSystemKey)
     return sm4.decrypt(data, appSystemKey, {
         iv: ivSetup,
         mode: sm4.constants.CBC,
diff --git a/src/utils/request.ts b/src/utils/request.ts
index d86493d..ae4496c 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -43,7 +43,7 @@ service.interceptors.request.use(
         
         
 
-        //form 云盘请求不加密, 但是Auth-key还是要传输，接口返回的数据可能需要加密 :by han2015
+        //form 云盘请求不加密, 但是Auth-key还是要传输，接口返回的数据可能需要加密 
         if (config.headers['Content-Type'] == 'application/x-www-form-urlencoded'||config.headers['Content-Type'] == 'multipart/form-data' ){
             return config
         }
@@ -58,10 +58,12 @@ service.interceptors.request.use(
                     data: sm4EncryptMethod(JSON.stringify(data), randomString)
                 }
             }
-            console.log('请求拦截---------->', randomString)
-            console.log('请求拦截----headers------>', headers)
-            console.log('请求拦截----data------>', config.data)
-            console.log('请求拦截----config------>', config)
+            // console.error('请求拦截---------->', randomString)
+            // console.error('请求拦截----headers------>', headers)
+            console.log('请求拦截----config---url--->', config.url)
+            console.log('请求拦截----data------>', data)
+            // console.error('请求拦截----config------>', config)
+            
         // console.log('请求拦截----content-type------>', config.headers['Content-Type'])
         // console.log('请求拦截----config------>', config.headers)
         return config
@@ -80,7 +82,7 @@ service.interceptors.response.use(
        
         let { data, headers } = response
         let authKey = headers['auth-key']
-        // console.log('行营结果----authKey------>', authKey)
+        // console.log('行营结果----data------>', data)
         // 解密响应数据
         if (authKey) {
             let jsonData = sm4DecryptMethod(data.data, authKey)
@@ -97,7 +99,7 @@ service.interceptors.response.use(
 				type: "warning",
 			}).then(() => {
 				localStorage.clear();
-				window.location.href = "/login";
+				window.location.href = "#/login";
             // routerPinia.push({path:"/login"})
 			});
 			return response.data;
@@ -139,7 +141,7 @@ service.interceptors.response.use(
                 type: 'warning'
                 }).then(() => {
                 localStorage.clear();
-                window.location.href = '/login';
+                window.location.href = '#/login';
                 // router.push({path:"/login"})
                 });
             }else if(code === 7 || code === 300 || code === 301 || code === 302){
@@ -148,7 +150,7 @@ service.interceptors.response.use(
                     type: "warning",
                 }).then(() => {
                     localStorage.clear();
-                    window.location.href = "/login";
+                    window.location.href = "#/login";
                 // routerPinia.push({path:"/login"})
                 });
             }else if (code === 10001 || code === 10002 || code === 10003) {
diff --git a/src/utils/workflow/const.ts b/src/utils/workflow/const.ts
index 9f5d74e..1fff71b 100644
--- a/src/utils/workflow/const.ts
+++ b/src/utils/workflow/const.ts
@@ -94,7 +94,7 @@ export let timeEquation = [
 
 //新增表单数据按钮
 export let submitButton = {
-    type: "div",
+    type: "btndiv",
     control:
     {},
     config:
@@ -104,22 +104,6 @@ export let submitButton = {
     },
     list: [
 		{
-			type: "grid",
-			iconFont: "fa-th-large",
-			columns: [
-				{
-				attr:{
-					span: 7
-				},
-				list: [],
-				type: "gridChild"
-				},
-				{
-				attr:{
-						span: 5
-				},
-				list: [
-						{
 							type: "button",
 							iconFont: "fa-square-o",
 							control:{
@@ -130,12 +114,7 @@ export let submitButton = {
 							config:{
 								textAlign: "center"
 							}
-						}
-					],
-				type: "gridChild"
-				},
-				{
-				list: [
+						},
 						{
 							type: "button",
 							iconFont: "fa-square-o",
@@ -148,28 +127,73 @@ export let submitButton = {
 								textAlign: "center"
 							}
 						}
-					],
-					attr:{
-						span: 5
-					},
-					type: "gridChild"
-				},
-				{
-					list: [],
-					attr:{
-						span: 7
-					},
-					type: "gridChild"
-				}
-			],
-			control:{},
-			config:{}
-		}
+		// {
+		// 	type: "grid",
+		// 	iconFont: "fa-th-large",
+		// 	columns: [
+		// 		{
+		// 		attr:{
+		// 			span: 7
+		// 		},
+		// 		list: [],
+		// 		type: "gridChild"
+		// 		},
+		// 		{
+		// 		attr:{
+		// 				span: 5
+		// 		},
+		// 		list: [
+		// 				{
+		// 					type: "button",
+		// 					iconFont: "fa-square-o",
+		// 					control:{
+		// 						label: "确认提交",
+		// 						type: "primary",
+		// 						key: "submit"
+		// 					},
+		// 					config:{
+		// 						textAlign: "center"
+		// 					}
+		// 				}
+		// 			],
+		// 		type: "gridChild"
+		// 		},
+		// 		{
+		// 		list: [
+		// 				{
+		// 					type: "button",
+		// 					iconFont: "fa-square-o",
+		// 					control:{
+		// 						label: "保存草稿",
+		// 						type: "warning",
+		// 						key: "saveDraft"
+		// 					},
+		// 					config:{
+		// 						textAlign: "center"
+		// 					}
+		// 				}
+		// 			],
+		// 			attr:{
+		// 				span: 5
+		// 			},
+		// 			type: "gridChild"
+		// 		},
+		// 		{
+		// 			list: [],
+		// 			attr:{
+		// 				span: 7
+		// 			},
+		// 			type: "gridChild"
+		// 		}
+		// 	],
+		// 	control:{},
+		// 	config:{}
+		// }
 	]
 }
 //重新提交表单数据按钮
 export let  afreshSubmitButton = {
-    type: "div",
+    type: "btndiv",
     control:
     {},
     config:
@@ -179,67 +203,91 @@ export let  afreshSubmitButton = {
     },
     list: [
 		{
-			type: "grid",
-			iconFont: "fa-th-large",
-			columns: [
-				{
-				attr:{
-					span: 7
-				},
-				list: [],
-				type: "gridChild"
-				},
-				{
-				attr:{
-						span: 5
-				},
-				list: [
-						{
-							type: "button", 
-							iconFont: "fa-square-o",
-							control:{
-								label: "确认提交",
-								type: "primary",
-								key: "afreshSubmit"
-							},
-							config:{
-								textAlign: "center"
-							}
-						}
-					],
-				type: "gridChild"
-				},
-				{
-				list: [
-						{
-							type: "button",
-							iconFont: "fa-square-o",
-							control:{
-								label: "保存草稿",
-								type: "warning",
-								key: "saveEditDraft"
-							},
-							config:{
-								textAlign: "center"
-							}
-						}
-					],
-					attr:{
-						span: 5
-					},
-					type: "gridChild"
-				},
-				{
-					list: [],
-					attr:{
-						span: 7
-					},
-					type: "gridChild"
-				}
-			],
-			control:{},
-			config:{}
+			type: "button", 
+			iconFont: "fa-square-o",
+			control:{
+				label: "确认提交",
+				type: "primary",
+				key: "afreshSubmit"
+			},
+			config:{
+				textAlign: "center"
+			}
+		},
+		{
+			type: "button",
+			iconFont: "fa-square-o",
+			control:{
+				label: "保存草稿",
+				type: "warning",
+				key: "saveEditDraft"
+			},
+			config:{
+				textAlign: "center"
+			}
 		}
+		// {
+		// 	type: "grid",
+		// 	iconFont: "fa-th-large",
+		// 	columns: [
+		// 		{
+		// 		attr:{
+		// 			span: 7
+		// 		},
+		// 		list: [],
+		// 		type: "gridChild"
+		// 		},
+		// 		{
+		// 		attr:{
+		// 				span: 5
+		// 		},
+		// 		list: [
+		// 				{
+		// 					type: "button", 
+		// 					iconFont: "fa-square-o",
+		// 					control:{
+		// 						label: "确认提交",
+		// 						type: "primary",
+		// 						key: "afreshSubmit"
+		// 					},
+		// 					config:{
+		// 						textAlign: "center"
+		// 					}
+		// 				}
+		// 			],
+		// 		type: "gridChild"
+		// 		},
+		// 		{
+		// 		list: [
+		// 				{
+		// 					type: "button",
+		// 					iconFont: "fa-square-o",
+		// 					control:{
+		// 						label: "保存草稿",
+		// 						type: "warning",
+		// 						key: "saveEditDraft"
+		// 					},
+		// 					config:{
+		// 						textAlign: "center"
+		// 					}
+		// 				}
+		// 			],
+		// 			attr:{
+		// 				span: 5
+		// 			},
+		// 			type: "gridChild"
+		// 		},
+		// 		{
+		// 			list: [],
+		// 			attr:{
+		// 				span: 7
+		// 			},
+		// 			type: "gridChild"
+		// 		}
+		// 	],
+		// 	control:{},
+		// 	config:{}
+		// }
 	]
 }
 
diff --git a/src/views/public/orguser/orgalluser.vue b/src/views/public/orguser/orgalluser.vue
index 298d502..66aea9c 100644
--- a/src/views/public/orguser/orgalluser.vue
+++ b/src/views/public/orguser/orgalluser.vue
@@ -34,7 +34,7 @@ const defaultProps ={
 const orgLoading = ref(false)
 const userLoading = ref(false)
 // 侧栏处理
-const treeEl = ref(null)
+const treeEl = ref()
 const treeData = ref<orgform[]>([])
 const department = ref<any>()
 const userName = ref<any>()
@@ -101,31 +101,31 @@ onMounted(() => {
     })
 })
 //已选择内容
-const checkDataList = reactive<criteriaForPeopleList[]>([]);
+const checkDataList = ref<criteriaForPeopleList[]>([]);
 const tableRowClick = (row: any) => {
-   if(checkDataList.length > 0){
+   if(checkDataList.value.length > 0){
 	   let isIn = true
-	   checkDataList.forEach(item =>{
+	   checkDataList.value.forEach(item =>{
 		   if(item.id == row.id){
 			   isIn = false
 		   }
 	   })
 	   if(isIn){
-		   checkDataList.push(row)
+		   checkDataList.value.push(row)
 	   }
    }else{
-	   checkDataList.push(row)
+	   checkDataList.value.push(row)
    }
    // console.log("checkDataList",checkDataList,row)
 }
 //删除单一选择
 const delRowClick = (row: criteriaForPeopleList) => {
 	// console.log("checkDataList",row)
-	if(checkDataList &&checkDataList.length > 0) {
-		checkDataList.forEach((item:criteriaForPeopleList,index:number) => {
+	if(checkDataList &&checkDataList.value.length > 0) {
+		checkDataList.value.forEach((item:criteriaForPeopleList,index:number) => {
 			if(item.id == row.id){
 				if(!item.noedit){
-					checkDataList.splice(index,1)
+					checkDataList.value.splice(index,1)
 				}
 			}
 		})
@@ -134,11 +134,22 @@ const delRowClick = (row: criteriaForPeopleList) => {
 //清除所有的选择
 const delAllClick = () => {
 	// checkDataList.splice(0,checkDataList.length)
-	checkDataList.forEach((item:criteriaForPeopleList,index:number) => {
-		if(!item.noedit){
-			checkDataList.splice(index,1)
+	console.log("清除所有的选择--1--->",checkDataList)
+	let delIndex: criteriaForPeopleList[] = []
+	checkDataList.value.forEach((item:criteriaForPeopleList,index:number) => {
+		console.log("清除所有的选择",item)
+		if(item.noedit){
+			// checkDataList.splice(index,1)
+			delIndex.push(item)
 		}	
 	})
+	// if(delIndex.length > 0){
+	// 	delIndex.forEach((item:number) => {
+	// 		checkDataList.splice(item,1)
+	// 	})
+	// }
+	checkDataList.value = delIndex
+	console.log("清除所有的选择---2-->",delIndex)
 }
 
 //关闭弹窗
@@ -154,9 +165,9 @@ const confirmChoices = () => {
 //回填已经选中得内容
 const backfillData = () => {
 	if(props.selectedPeople && props.selectedPeople.length > 0){
-		checkDataList.splice(0,checkDataList.length)
+		checkDataList.value.splice(0,checkDataList.value.length)
 		props.selectedPeople.forEach((item:any)=>{
-			checkDataList.push(item)
+			checkDataList.value.push(item)
 		})
 	}
 	// console.log("props.selectedPeople",props.selectedPeople,checkDataList)
@@ -168,11 +179,93 @@ const backfillData = () => {
 		title="选择人员"
 		:append-to-body="true"
 		:props="defaultProps "
-		width="80%"
+		width="90%"
 		top="2vh"
 		draggable
 	>
-		<el-row :gutter="20">
+		<div class="diaBody">
+			<div class="sidebar_tree">
+				<el-text class="orgTitle" size="large">行政组织</el-text>
+				<el-tree
+					v-loading="orgLoading"
+					element-loading-text="Loading..."
+					ref="treeEl"
+					:data="treeData"
+					node-key="id"
+					@node-click="handleNodeClick"
+					:props="defaultProps "
+					highlight-current
+				/>
+			</div>
+			<div>
+				<div class="search">
+					<el-input placeholder="请输入用户名" v-model="userName" />
+					<el-button type="primary" @click="getUserList">查询</el-button>
+					<el-button @click="resetClick">重置</el-button>
+				</div>
+				<div class="list">
+					<el-table v-loading="userLoading" border element-loading-text="Loading..." :data="tableData" style="width: 100%; height:660px">
+						<el-table-column fixed  prop="userName" label="照片" width="60px" align="center">
+							<template #default="scope">
+								<el-avatar v-if="scope.row.icon != ''" shape="square" :size="30" :src="scope.row.icon" />
+								<el-avatar v-else shape="square" :size="30" :src="UserRole" />
+							</template>
+						</el-table-column>
+						<el-table-column fixed  prop="name" label="姓名"  width="150px"  align="left">
+							<template #default="scope">
+								{{ scope.row.name }}({{ scope.row.number }})
+							</template>
+						</el-table-column>
+						<el-table-column prop="tel" label="联系方式"   width="120px"  align="left" />
+						<el-table-column prop="nickName" label="归属行政组织" width="500px" align="left">
+							<template #default="{ row }">
+								{{ row.companyName }}<span v-if="row.departmentname!=''"> / {{ row.departmentname }}</span><span v-if="row.postname!=''"> / {{ row.postname }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column fixed="right" label="操作" width="60px">
+							<template #default="{ row }">
+								<el-button circle size="small" @click="tableRowClick(row)"><el-icon><ArrowRight /></el-icon></el-button>
+							</template>
+						</el-table-column>
+					</el-table>
+					<div class="page">
+						<el-pagination
+							size="small"
+							layout="prev, pager, next"
+							:total="page.total"
+							class="mt-4"
+							@current-change="currentChange"
+						/>
+						
+					</div>
+				</div>
+			</div>
+			<div class="has_select">
+				<div class="total">
+					<div>已选择：{{ checkDataList.length }}</div>
+					<el-button type="danger" @click="delAllClick" size="small">全部移除</el-button>
+				</div>
+				<el-table :data="checkDataList" border style="height:680px">
+					<el-table-column prop="userName" label="照片" width="60px" align="center">
+						<template #default="scope">
+							<el-avatar v-if="scope.row.icon != ''" shape="square" :size="30" :src="scope.row.icon" />
+							<el-avatar v-else shape="square" :size="30" :src="UserRole" />
+						</template>
+					</el-table-column>
+					<el-table-column prop="name" label="姓名"  align="left">
+						<template #default="scope">
+							{{ scope.row.name }}({{ scope.row.number }})
+						</template>
+					</el-table-column>
+					<el-table-column label="操作" width="60px">
+						<template #default="{ row }">
+							<el-button v-if="!row.noedit" size="small" type="danger" @click="delRowClick(row)">移除</el-button>
+						</template>
+					</el-table-column>
+				</el-table>
+			</div>
+		</div>
+		<!-- <el-row :gutter="20">
 			<el-col :span="6" style="padding:0">
 				<div class="sidebar_tree">
 					<el-text class="orgTitle" size="large">行政组织</el-text>
@@ -261,7 +354,7 @@ const backfillData = () => {
 				</div>
 			</el-col>
 
-		</el-row>
+		</el-row> -->
 		<template #footer>
 			<div>
 				<el-button @click="clostBox">取消</el-button>
@@ -271,6 +364,17 @@ const backfillData = () => {
 	</el-dialog>
 </template>
 <style  lang='scss' scoped>
+.diaBody{
+	width: 100%;
+	display: grid;
+	grid-template-columns: 300px 1fr 250px; /* 左右最小150px，最大250px，中间自适应 */
+	grid-template-rows: auto;
+	gap: 10px;
+	max-width: 100%;
+	margin: 0 auto;
+}
+
+
 .orgTitle{
 	padding: 0  0 0 5px;
 }
@@ -285,7 +389,7 @@ const backfillData = () => {
 }
 .has_select {
 	width: 100%;
-
+	
 	.total {
 		display: flex;
 		justify-content: space-between;
@@ -301,10 +405,15 @@ const backfillData = () => {
 		margin-right: 10px;
 	}
 }
+.list{
+	width: 100%;
+	display: inline-grid;
+}
 .page {
-	padding-top: 20px;
+	padding-top: 0px;
+	width: 100%;
 	display: flex;
-	justify-content:space-between;
+	justify-content: center;
 }
 .expand-user-dialog {
     display: flex;
diff --git a/src/views/public/orguser/orguser.vue b/src/views/public/orguser/orguser.vue
index dc0852d..594bcad 100644
--- a/src/views/public/orguser/orguser.vue
+++ b/src/views/public/orguser/orguser.vue
@@ -113,7 +113,7 @@ const saveFlowUser = () => {
 		title="选择人员"
 		width="800"
 		draggable
-		:before-close="handleClose"
+		:before-close="closeBox"
 	>
 		<el-row :gutter="20">
 			<el-col :span="12" >
diff --git a/src/views/sysworkflow/codepage/index.ts b/src/views/sysworkflow/codepage/index.ts
index 74ff9b7..ba12a7d 100644
--- a/src/views/sysworkflow/codepage/index.ts
+++ b/src/views/sysworkflow/codepage/index.ts
@@ -7,6 +7,8 @@ import AppPageList from '@/components/DesignForm/app/index.vue'
 import AppFormPage from '@/components/DesignForm/app/formPage.vue'
 import DataSourcePage from '@/components/dataSource/index.vue'
 
+import newFormDesign from '@/components/DesignForm/public/form/newForm.vue'
+
 export default (app: any) => {
   app.component('AkForm', formDesign)
   app.component('AkList', tableList)
@@ -16,4 +18,5 @@ export default (app: any) => {
 	app.component('AppPageList', AppPageList)
 	app.component('AppFormPage', AppFormPage)
 	app.component('DataSourcePage', DataSourcePage)
+  app.component('AppForm', newFormDesign)
 }
diff --git a/src/views/sysworkflow/lowcodepage/pageFlow/aiPage.vue b/src/views/sysworkflow/lowcodepage/pageFlow/aiPage.vue
new file mode 100644
index 0000000..30774ab
--- /dev/null
+++ b/src/views/sysworkflow/lowcodepage/pageFlow/aiPage.vue
@@ -0,0 +1,281 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2026-01-28 08:25:29
+@ 备注: 
+-->
+<script lang='ts' setup>
+import SvgIcon from "@/components/SvgIcon/index.vue";
+import { doAiChat,aiChatData} from "@/api/doc/space"
+import { useUserStore } from "@/store/modules/user";
+import { VueMarkdown } from '@crazydos/vue-markdown'
+import rehypeRaw from 'rehype-raw'
+
+//选中的咨询模式
+const userStore = useUserStore();
+const userid="p0"+userStore.userInfoCont.userId;
+const regulaKey=import.meta.env.VITE_REGUL_AI_AGENT;
+const baseURL=import.meta.env.VITE_APP_BASE_API
+const regulaURL =`${baseURL}/aibot/agents/${regulaKey}/chat`
+const conversation=ref("") //当前会话的uuid
+const controller = ref<AbortController | null>(null) 
+
+const interact_msg=ref<{ask:boolean,think:string,content:string}[]>([{ask:false,think:"是",content:`你好！我是你的AI助手，
+  你可以直接向我提问，或者编辑表单，我会自动为你提供相关信息。`}])
+
+// 输入框内容
+const inputText = ref('');
+const respMsg=ref("") //markdown 内容，问答智能体的动态回复内容
+
+//消息体
+interface message{
+  ask:boolean,
+  think:string,
+  content:string
+}
+//会话记录
+interface chatRecord{
+  uuid:string,
+  agentuuid:string,
+  brief:string,
+  messages:message[]
+}
+
+
+defineExpose({onSendParamToAI})
+
+async function onSendParamToAI(arr:Array<{ uuids: string[]; params: { [key: string]: any } }>){
+  //interact_msg.value=[]
+  for (let ele of arr){
+    //interact_msg.value.unshift({ask:true,think:"", content:"AI正在分析。。。"})
+    for (let uid of ele.uuids){
+      let para={
+        inputs: {
+          "checkType":"travel",
+          "checkInfo":JSON.stringify(ele.params)
+        },
+        response_mode:"streaming",
+        user:userid,//这里已经base64解析了
+      }
+      //添加问题记录
+      interact_msg.value.push({ask:true,think:"", content:JSON.stringify(para)})
+      
+      await doRequest(`${baseURL}/aibot/assisted/${uid}/workflow`,para)
+    }
+  }
+}
+
+async function doRequest(furl:string,param:any){
+  let mRespMsg=""
+  controller.value = new AbortController();
+  try{
+    const res= await doAiChat(
+      furl,
+      param,
+      controller.value.signal
+    )
+    
+    if (!res.ok) {
+       throw new Error(`HTTP ${res.status} ${res.statusText}`);
+    }
+
+    const reader = res.body!.getReader();
+    const decoder = new TextDecoder('utf-8');
+
+    let chunk = '';           // 行缓存
+    while (true) {
+      const {done, value} = await reader.read()
+      if (done) break;
+      
+      // 服务器可能一次返回多行，需要手动按行拆分
+      chunk += decoder.decode(value, {stream: true});
+      const lines = chunk.split(/\n/);
+      chunk = lines.pop() || ''
+      for (const line of lines) {
+        if (!line.trim()) continue;          // 跳过空行
+        if (line.startsWith('data: ')) {
+          const data = line.slice(6);
+          const json = JSON.parse(data);
+          if(json.event==="text_chunk"){
+            //conversation.value=json.conversation_id
+            mRespMsg+=json.data.text
+          }else if(json.event==="message"){
+            respMsg.value+=json.answer
+            mRespMsg+=json.answer
+          }
+        } 
+      }
+    }
+  }catch (e: any) {
+    if (e.name === 'AbortError') {
+      console.log('用户手动中断')
+    }
+  }
+  respMsg.value=""
+  const arr=mRespMsg.split("</think>")
+  if(arr.length===1){
+    interact_msg.value.push({ask:false,think:"",content:arr[0]})
+  }else{
+    //思考模式
+    let st = arr[1].trim().match(/({.*})/s)
+    if (st){
+      let res= JSON.parse(st[1])
+      interact_msg.value.push({ask:false,think:res.success,content:res.reason})
+    }else{
+      interact_msg.value.push({ask:false,think:arr[0],content:arr[1]})
+    }
+  }
+  scrollToBottom()
+}
+
+function resetContext(){
+  interact_msg.value=[]
+  conversation.value=""
+  //props.closefunc()
+}
+
+// 发送消息
+const sendMessage = () => {
+  const content = inputText.value.trim();
+  if (!content) return;
+
+  // 添加用户消息
+  interact_msg.value.push({ ask: true,think:"", content });
+  
+  const params={
+    inputs: {"onlineSearch":"否",
+          "useDataset":"是",
+          "queryUrl":""},
+    query:content,
+    response_mode:"streaming",
+    conversation_id:conversation.value,
+    user:userid
+  }
+  
+  doRequest(regulaURL,params)
+
+  // 清空输入框
+  inputText.value = '';
+};
+const scrollbarRef = ref()
+const scrollToBottom = () => {
+  const wrap = scrollbarRef.value?.wrapRef // ⚠️ 关键：获取内部滚动容器
+  if (wrap) {
+    console.log(wrap.scrollHeight , wrap.clientHeight)
+    wrap.scrollTop = wrap.scrollHeight - wrap.clientHeight
+  }
+}
+
+</script>
+<template>
+    <el-card  shadow="always">
+            <template #header>
+              <div class="card-header">
+                <div class="svgBox"><SvgIcon icon-class="aiRoboot" size="25" /></div>
+                AI智能问答助手
+              </div>
+            </template>
+            <el-scrollbar ref="scrollbarRef" class="scroBox ">
+                
+                <div v-for="(msg, index) in interact_msg" :key="index" class="ai-conversation">
+                    <div v-if="msg.ask" class="message user-message">
+                        <strong>用户：</strong>{{ msg.content }}
+                    </div>
+                    <div v-else class="message ai-message">
+                        <strong>AI助手：</strong> <VueMarkdown :markdown="msg.content" :rehype-plugins="[rehypeRaw]" ></VueMarkdown>
+                    </div>
+                </div>
+                <div class="ai-conversation">
+                    <div v-show="respMsg" class="message user-message">
+                        <strong>AI助手：</strong><VueMarkdown :markdown="respMsg" :rehype-plugins="[rehypeRaw]" class="t_resp"></VueMarkdown>
+                    </div>
+                </div>
+            </el-scrollbar>
+            <template #footer>
+              <div class="bootemAi">
+                <el-input v-model="inputText" placeholder="请输入您的问题..." />
+                
+                <el-button :disabled="!inputText.trim()" class="ai-send-btn"  @click="sendMessage"><SvgIcon icon-class="fbsk" size="" /></el-button>
+              </div>
+            </template>
+     </el-card>
+</template>
+<style  lang='scss' scoped>
+.card-header{
+    font-size: 1.4rem;
+    font-weight: 700;
+    color: #0020C2;
+    display: flex;
+    align-items: center;
+    gap: 10px;
+}
+.svgBox{
+    background: linear-gradient(135deg, #0020C2, #4d6cff);
+    color: white;
+    width: 40px;
+    height: 40px;
+    border-radius: 50%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 1.2rem;
+}
+.scroBox{
+    padding: 10px 15px;
+    height: calc(100vh - 200px);
+}
+.ai-conversation {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    gap: 15px;
+    margin-bottom: 20px;
+}
+.message {
+    padding: 12px 16px;
+    border-radius: 12px;
+    max-width: 90%;
+    line-height: 1.5;
+}
+        
+.user-message {
+    background: #eef2ff;
+    align-self: flex-end;
+    border-top-right-radius: 4px;
+    border: 1px solid rgba(0, 32, 194, 0.2);
+}
+        
+.ai-message {
+    background: linear-gradient(to right, #f0f5ff, #ffffff);
+    align-self: flex-start;
+    border-top-left-radius: 4px;
+    border: 1px solid rgba(0, 32, 194, 0.1);
+}
+.ai-send-btn {
+    background: linear-gradient(135deg, #0020C2, #4d6cff);
+    color: white;
+    border: none;
+    width: 46px;
+    border-radius: 10px;
+    cursor: pointer;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    transition: all 0.3s;
+}
+        
+.ai-send-btn:hover {
+    background: linear-gradient(135deg, #0019a0, #3a5aff);
+    transform: translateY(-2px);
+}
+.bootemAi{
+    display: grid;
+    grid-template-columns:  1fr 50px; /* 左右最小150px，最大250px，中间自适应 */
+    grid-template-rows: auto;
+    gap: 10px;
+    max-width: 100%;
+    margin: 0 auto;
+    :deep .el-input__wrapper{
+        border-radius: 10px;
+    }
+}
+</style>
diff --git a/src/views/sysworkflow/lowcodepage/pageFlow/flowStep.vue b/src/views/sysworkflow/lowcodepage/pageFlow/flowStep.vue
new file mode 100644
index 0000000..a5b38b8
--- /dev/null
+++ b/src/views/sysworkflow/lowcodepage/pageFlow/flowStep.vue
@@ -0,0 +1,427 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2026-01-27 16:11:23
+@ 备注: 
+-->
+<script lang='ts' setup>
+import SvgIcon from "@/components/SvgIcon/index.vue";
+import OrgUserPage from "@/views/public/orguser/orguser.vue"
+import OrgAllUserPage from "@/views/public/orguser/orgalluser.vue"
+import squareUrlOne from "@/assets/images/1.png"
+import squareUrlTwo from "@/assets/images/2.png"
+
+const activeStep = ref(1)
+const state = reactive({
+	circleUrl:squareUrlTwo,
+  	squareUrl: squareUrlOne,
+  	sizeList: ['small', '', 'large'] as const,
+})
+const { circleUrl, squareUrl, sizeList } = toRefs(state)
+const openOrClose = ref(false)
+const openclosebox = ref(false)
+const ifSendFlow = ref(false)
+const props = defineProps({
+	flowMap: {
+		type: Array,
+		default: () => []
+	},
+	nodeKey:{
+		type:String,
+		default:""
+	},
+	currentProgress:{
+		type:Number,
+		default:0
+	}
+	,
+	nextStep:{
+		type:Number,
+		default:0
+	}
+})
+const presetPersonnel = ref<any>([]);    //预设选择人
+const selectedPeople = ref<any>([]);    //已选择人
+const flowMaps = ref<any[]>();
+const emits = defineEmits(["update:flowMap"]);
+const flowList =   computed<any>({
+	get: () => props.flowMap,
+	set: (val) => {
+		emits("update:flowMap", val);
+	},
+});
+watch(()=>props.flowMap,(val:any)=>{
+	
+	emits("update:flowMap", val);
+})
+onMounted(()=>{
+
+})
+//判断是否有增加人员按钮
+const judgeAddUser = (val:any):boolean =>{
+	console.log("val----->",val)
+	if(val.customNode == "beginnode"){
+		val.runscope = val.runscope!=0?val.runscope:1
+		return true
+	}
+	switch(val.runtype){
+		case 1:
+			val.runscope = val.runscope!=0?val.runscope:1
+			return true
+			break;
+		case 3:
+			if(val.customNode == props.nodeKey){
+				val.runscope = val.runscope!=0?val.runscope:1
+				return true
+			}
+			break;
+		case 4:
+			if(val.runscope==1){
+				val.runscope = val.runscope!=0?val.runscope:1
+				return true
+			}
+			break;
+		default:
+			// if(!val.operator){
+			// 	val.runscope = val.runscope!=0?val.runscope:1
+			// 	return true
+			// }else if(val.operator.length < 1){
+			// 	val.runscope = val.runscope!=0?val.runscope:1
+			// 	return true
+			// }
+			if(val.runscope != 0){
+				return true
+			}
+			return false
+	}
+	
+	return false
+}
+let zhiXingStep = 1;
+//添加操作人
+const addPeople = (val:any) =>{
+	zhiXingStep = val.step
+	presetPersonnel.value = val.pendpers
+	selectedPeople.value = val.operator
+	if(val.runscope == 1){
+		openclosebox.value = true
+	}else{
+		openOrClose.value = true
+	}
+	
+	// console.log("PresetPersonnel.value--------1-------->",val)
+	// console.log("PresetPersonnel.value--------2-------->",val.pendpers)
+	// console.log("PresetPersonnel.value--------3-------->",val.operator)
+	// console.log("PresetPersonnel.value--------4-------->",selectedPeople.value)
+}
+//更新节点操作人
+const updateNode = (val:any) =>{
+	// console.log("P更新节点操作人",zhiXingStep,val)
+	flowList.value.forEach((item:any) =>{
+		if(item.step == zhiXingStep){
+			// console.log("P更新节点操作人---1-->",item.step , zhiXingStep)
+			item.operator = val
+		}
+	})
+	// console.log("P更新节点操作人--2--->",flowList)
+}
+
+/**
+@ 作者: 秦东
+@ 时间: 2026-01-29 16:37:56
+@ 功能: 判断审批节点样式
+*/
+const judgeNodeClass = (val:number,stepVal:number):string => {
+    console.log("判断审批节点样式",val,stepVal)
+    switch(val){
+        case 1:
+            if(props.currentProgress == stepVal){
+                return "in-progress"
+            }else{
+                return 'completed'
+            }
+        case 2:
+            return 'pending'
+        case 3:
+            // return 'in-progress'
+            if(props.currentProgress == stepVal){
+                return "in-progress"
+            }else{
+                return 'in-executor'
+            }
+        default:
+            if(props.currentProgress == stepVal){
+                return "in-progress"
+            }else{
+                return 'completed'
+            }
+            
+    }
+    return 'completed'
+}
+
+
+</script>
+<template >
+    <el-card  shadow="always">
+        <template #header>
+          <div class="card-header">
+            <div class="svgBox"><SvgIcon icon-class="liuChengBiaoDan" size="25" /></div>
+            审批流程
+          </div>
+        </template>
+        <el-scrollbar  :class="ifSendFlow?'flowBody':'flowBodyNofoot'">
+
+            <div class="approval-steps">
+                <div v-for="item in flowList" :key="item.step" :class="['step', judgeNodeClass(item.type,item.step)]">
+                    <div class="step-icon">
+                        <SvgIcon v-if="item.type==0" icon-class="faqiren" size="25" />
+                        <SvgIcon v-if="item.type==1" icon-class="spr" size="25" />
+                        <SvgIcon v-if="item.type==2" icon-class="csr" size="25" />
+                        <SvgIcon v-if="item.type==3" icon-class="zxr" size="25" />
+                        <!--SvgIcon v-else icon-class="shenpi" size="25" /-->
+                    </div>
+                    <div class="step-content">
+                        <h3 class="step-title">{{item.nodeName}}</h3>
+                        <div v-for="items in item.operator" :key="items.id" class="flowLogBox">
+
+                            <div >
+                                <el-avatar  v-if="items.icon!=''" shape="square" fit="cover" :src="items.icon" style="width: 40px;"  class="avatarBox" />
+								<el-avatar v-else-if="items.iconbase64!=''" shape="square" fit="cover" :src="items.iconbase64" style="width: 40px;" class="avatarBox" />
+								<el-avatar v-else shape="square" fit="cover" :src="squareUrl" style="width: 40px;" class="avatarBox" />
+                            </div>
+                            <div>
+                                <div>
+                                    <el-text size="small">{{ items.departmentname }}</el-text>
+										<el-text size="small"><span v-if="items.departmentname"> - </span>{{ items.postname }}</el-text>
+										<el-text size="small"><span v-if="items.departmentname||items.postname"> - </span>{{ items.name }}</el-text>
+                                </div>
+                                <div v-for="(logItem,logIndex) in items.log" :key="logIndex" >
+                                    <div v-if="logItem.state==2" class="step-info">
+                                        <el-text v-if="logItem.cause" type="success" size="small">{{logItem.cause}}</el-text>
+                                        <el-text v-else type="success" size="small" >已同意</el-text>
+                                    </div>
+                                    <div v-if="logItem.state==3" class="step-info">
+                                        <el-text v-if="logItem.cause" type="danger" size="small">{{logItem.cause}}</el-text>
+                                        <el-text v-else type="danger" size="small" >已驳回</el-text>
+                                    </div>
+                                    <div v-else class="step-info">
+                                        <el-text v-if="logItem.cause"  size="small">{{logItem.cause}}</el-text>
+                                        <el-text v-else  size="small" >未操作</el-text>
+                                    </div>
+                                    <div  class="step-time">{{ logItem.time }}</div>
+                                </div>
+
+                            </div>
+
+                        </div>
+                        
+                        <div v-if="judgeAddUser(item)" class="addUser" @click="addPeople(item)">
+							<svg-icon icon-class="addxuxian" size="50" />
+						</div>
+
+                    </div>
+                </div>
+               
+            </div>
+
+        </el-scrollbar>
+        <!-- <template #footer>
+          <div class="bootemWorkFlow">
+            <el-input type="textarea" :rows="2" style="width: 100%" placeholder="请输入审批意见"></el-input>
+            <div class="bootemWorkFlowBut">
+              <el-button class="btn approve-btn"><SvgIcon icon-class="kxdg" size="" style="margin-right: 5px" />通过审批</el-button>
+              <el-button class="btn reject-btn"><SvgIcon icon-class="cwkx" size="" style="margin-right: 5px"  />驳回申请</el-button>
+            </div>
+          </div>
+        </template> -->
+    </el-card>
+
+    <OrgUserPage v-if="openOrClose" v-model:openclose="openOrClose" :preset-personnel="presetPersonnel" :selected-people="selectedPeople" @update-node="updateNode" />
+	<OrgAllUserPage v-if="openclosebox" v-model:openclosebox="openclosebox" :selected-people="selectedPeople"  @update-node="updateNode" />
+
+</template>
+<style  lang='scss' scoped>
+.card-header{
+  font-size: 1.4rem;
+  font-weight: 700;
+  color: #0020C2;
+  display: flex;
+  align-items: center;
+  gap: 10px;
+}
+.flowBody{
+  padding: 10px 15px;
+  height: calc(100vh - 260px);
+}
+.flowBodyNofoot{
+  padding: 10px 15px;
+  height: calc(100vh - 140px);
+}
+.svgBox{
+  background: linear-gradient(135deg, #0020C2, #4d6cff);
+  color: white;
+  width: 40px;
+  height: 40px;
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 1.2rem;
+}
+.bootemWorkFlow{
+  width: 100%;
+  text-align: center;
+  .bootemWorkFlowBut{
+    width: 100%;
+    padding: 10px 0;
+    text-align: center;
+  }
+}
+
+.btn {
+  padding: 14px 16px;
+  border-radius: 10px;
+  font-weight: 600;
+  font-size: 1rem;
+  cursor: pointer;
+  transition: all 0.3s;
+  border: none;
+}
+.btn:hover {
+  transform: translateY(-2px);
+  box-shadow: 0 5px 15px rgba(0, 32, 194, 0.15);
+}
+.approve-btn {
+  background: linear-gradient(135deg, #00cc66, #33dd88);
+  color: white;
+}
+.reject-btn {
+  background: linear-gradient(135deg, #ff3366, #ff5588);
+  color: white;
+}
+.approval-steps {
+    flex: 1;
+}
+
+
+
+
+        .step {
+            display: flex;
+            margin-bottom: 25px;
+            position: relative;
+            margin-left: 7px;
+            margin-top: 7px;
+        }
+        
+        .step:not(:last-child)::after {
+            content: '';
+            position: absolute;
+            left: 20px;
+            top: 40px;
+            width: 2px;
+            height: calc(100% + 5px);
+            background: linear-gradient(to bottom, rgba(0, 32, 194, 0.2), rgba(0, 32, 194, 0.05));
+        }
+        
+        .step-icon {
+            width: 40px;
+            height: 40px;
+            border-radius: 50%;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            margin-right: 5px;
+            z-index: 1;
+            flex-shrink: 0;
+            
+        }
+        
+        .step.completed .step-icon {
+            background: linear-gradient(135deg, #0020C2, #4d6cff);
+            color: white;
+        }
+        
+        .step.in-progress .step-icon {
+            background: linear-gradient(135deg, #ffcc00, #ffdd55);
+            color: #333;
+            animation: pulse 2s infinite;
+        }
+
+        .step.in-executor .step-icon {
+            background: linear-gradient(135deg, #67C23A, #95f764);
+            color: #fff;
+        }
+        
+        .step.pending .step-icon {
+            background: #f0f4ff;
+            color: #a0a6c9;
+        }
+        
+        .step-content {
+            flex: 1;
+        }
+        
+        .step-title {
+            font-weight: 600;
+            margin-bottom: 5px;
+            color: #0020C2;
+        }
+        
+        .step.completed .step-title {
+            color: #4d6cff;
+        }
+        
+        .step.in-progress .step-title {
+            color: #ff9900;
+        }
+        .step.in-executor .step-title {
+            color: #67C23A;
+        }
+        
+        .step.pending .step-title {
+            color: #a0a6c9;
+        }
+        
+        .step-info {
+            font-size: 0.9rem;
+            color: #666;
+            margin-top: 0px;
+        }
+        
+        .step-time {
+            font-size: 0.8rem;
+            color: #888;
+            margin-bottom: 4px;
+        }
+         /* 响应式设计 */
+        @media (max-width: 1200px) {
+            .container {
+                grid-template-columns: 1fr;
+                grid-template-rows: auto auto auto;
+                height: auto;
+                gap: 15px;
+            }
+            
+            .card {
+                min-height: 400px;
+            }
+        }
+        
+        @keyframes pulse {
+            0% { box-shadow: 0 0 0 0 rgba(255, 204, 0, 0.7); }
+            70% { box-shadow: 0 0 0 10px rgba(255, 204, 0, 0); }
+            100% { box-shadow: 0 0 0 0 rgba(255, 204, 0, 0); }
+        }
+.flowLogBox{
+    display: grid;
+    grid-template-columns: 45px 1fr;
+}
+.addUser{
+	display:block;
+	cursor:pointer;
+}
+.avatarBox{
+    border: 1px solid rgba(255, 255, 255, 0.5);
+}
+</style>
diff --git a/src/views/sysworkflow/lowcodepage/pageFlow/newTableFlow.vue b/src/views/sysworkflow/lowcodepage/pageFlow/newTableFlow.vue
index e0e167e..f0742bb 100644
--- a/src/views/sysworkflow/lowcodepage/pageFlow/newTableFlow.vue
+++ b/src/views/sysworkflow/lowcodepage/pageFlow/newTableFlow.vue
@@ -19,9 +19,12 @@ import {
   submitButton,
   afreshSubmitButton,
 } from "@/utils/workflow/const";
-import { nodePoweInfo } from "@/api/taskapi/types";
+import { nodelPeoples, nodePoweInfo } from "@/api/taskapi/types";
 import request from "@/utils/request";
 import SvgIcon from "@/components/SvgIcon/index.vue";
+import FlowStep from "@/views/sysworkflow/lowcodepage/pageFlow/flowStep.vue";
+import AiPage from "@/views/sysworkflow/lowcodepage/pageFlow/aiPage.vue";
+import { constAiEffect } from "@/api/DesignForm/utils";
 
 const props = defineProps({
     show:{
@@ -47,6 +50,7 @@ const props = defineProps({
       },
     },
 })
+const formType = ref(1)
 const formBodyRef = ref()
 const drawBodyWidth = ref(props.drawerwith)
 const emits = defineEmits(["update:show", "searchquery"]);
@@ -56,6 +60,8 @@ const flowMap = ref<any[]>(); //工作流
 const flowFactor = reactive<conditionInfo[]>([]); //表单组件
 const pageType = ref<number>(1)
 const aiConfigArea =ref(false)
+const formLoading = ref(false); //loading
+const flowLoading = ref(false); //loading
 const drawLoading = ref(false)
 const isFlowTable = ref(false); //判断是不是流程表单
 const openOrClose =  computed({
@@ -68,38 +74,13 @@ const openOrClose =  computed({
       drawBodyWidth.value = 0;
     },
 });
-
+const nextStep = ref<number>(0);
+const currentProgress = ref<number>(1);
 const pageBody = ref("")
 const drawTitle = computed(() => props.versiontitle)
-const drawbox = computed({
-    get: () => {
-      let pageContWidth = props.drawerwith
-      let extraW=0; 
-      if (aiConfigArea.value){
-        extraW=300  //ai 问答区域的宽度
-      }
-      if (isFlowTable.value) {
-        extraW = 300+extraW;
-      }
-      if (aiConfigArea.value && isFlowTable.value){
-        pageType.value  = 3
-        pageBody.value = "treePage"
-        pageContWidth = pageContWidth - (extraW/2)
-      }else if ((!aiConfigArea.value && isFlowTable.value) || (aiConfigArea.value && !isFlowTable.value)){
-        pageType.value  = 2
-        pageBody.value = "twoPage"
-         pageContWidth = pageContWidth - (extraW/2)
-      }else{
-        pageType.value  = 1
-        pageBody.value = ""
-      }
-      console.error("1---------------->",pageContWidth)
-      return pageContWidth+extraW;
-    },
-    set: (val: number) => {
-      return val;
-    },
-});
+
+
+
 let qrCodeImgInside = "";
 const appInitData = ref<appPageDataInit>();
 const mastesformjson = ref(""); //
@@ -108,10 +89,13 @@ const versionTitle = ref<string>(""); //表单名称
 const changeFlowPick = ref<string[]>([])
 const purviewAry = ref<any[]>([]);
 const qrCodeInsideDialogFlag = ref(false);
-
+const nodelUserList = reactive<nodelPeoples[]>([]);
 //获取工作流条件
 const gainFlowChart = reactive<nodeFlow>({
   id: "0",
+  conditionList: flowFactor,
+  nodelPeople: nodelUserList,
+  oldFlow: flowMap.value,
 });
 
 const state = reactive<any>({
@@ -162,12 +146,20 @@ const getTaskFormData = () => {
       let extraW=0; 
       if (data.tableFormPage.flowIsOpen == 1 && data.tableFormPage.flowkeystr != "0") {
         isFlowTable.value = true;
-        extraW = 300
         // drawbox.value = 800 + 350;
+        console.error("存在流程----》",extraW)
       } else {
         isFlowTable.value = false;
         // drawbox.value = 800;
+        console.error("不存在流程----》",extraW)
+      }
+
+      if(isFlowTable.value){
+        extraW = 320
       }
+
+
+
       if(data.tableFormPage.powerAry && Array.isArray(data.tableFormPage.powerAry) && data.tableFormPage.powerAry.length > 0){
         currterNodePower.value = data.tableFormPage.powerAry
       }
@@ -184,26 +176,47 @@ const getTaskFormData = () => {
       state.formData.powerstr = string2json(data.tableFormPage.powerstr);
       judgeSubmitCancel({ name: data.tableFormPage.mastesformjson }).then(
         (datajud: any) => {
+          console.error("不存在流程--1-datajud-》",datajud)
           if (datajud.code == 0) {
-            if (datajud.data == 3 || datajud.data == 4) {
+            if (datajud.data.buttonIsTrue == 3 || datajud.data.buttonIsTrue == 4) {
               state.formData.list.push(submitButton);
             }
           }
         }
       );
+        console.log("表单数据--state.formData->1", state.formData);
+      console.error("不存在流程--1--》",state.formData.aiConfig)
+
       if(state.formData.aiConfig.length>0){
         aiConfigArea.value=true
-        extraW = extraW + 300
+        state.formData.aiConfig?.forEach((item: { library: any; title: any; trigger: any; }) => {
+          currentAgent.value.push({
+            name: "test",
+            model: false,
+            rowdex:0,
+            uuid: item.library,
+            fields: item.title,
+            trigger: item.trigger,
+            params: {},
+            subparams:[]
+          });
+        });
       }
 
+
+
+      if(aiConfigArea.value){
+        extraW = extraW + 320
+      }
+ console.error("不存在流程--extraW--》",extraW)
       if (aiConfigArea.value && isFlowTable.value){
         pageType.value  = 3
         pageBody.value = "treePage"
-        drawBodyWidth.value = drawBodyWidth.value + extraW - (extraW/2)
+        drawBodyWidth.value = drawBodyWidth.value + extraW - 160
       }else if ((!aiConfigArea.value && isFlowTable.value) || (aiConfigArea.value && !isFlowTable.value)){
         pageType.value  = 2
         pageBody.value = "twoPage"
-         drawBodyWidth.value = drawBodyWidth.value + extraW- (extraW/2)
+        drawBodyWidth.value = drawBodyWidth.value + extraW
       }else{
         pageType.value  = 1
         pageBody.value = ""
@@ -212,7 +225,7 @@ const getTaskFormData = () => {
 
       drawLoading.value = false
       
-       console.error("2---------------->",formBodyRef.value?.clientWidth)
+      //  console.error("2---------------->",formBodyRef.value?.clientWidth)
   })
   .finally(()=>{})
 }
@@ -303,16 +316,21 @@ const initLoadData = () => {
               stateForm.formData.powerstr = string2json(
                 gainAppPageInfoData.data.appForm.powerstr
               );
-              // console.log("data.data.mastesform", stateForm.formData)
+              console.log("data.data.mastesform", stateForm.formData)
 
               judgeSubmitCancel({
                 name: gainAppPageInfoData.data.appForm.mastesformjson,
               }).then((datajud: any) => {
+
+                 console.log("datajud---------------->", datajud,datajud.data.buttonIsTrue)
+
                 if (datajud.code == 0) {
-                  if (datajud.data == 3 || datajud.data == 4) {
+                  if (datajud.data.buttonIsTrue == 3 || datajud.data.buttonIsTrue == 4) {
                     stateForm.formData.list.push(submitButton);
                   }
                 }
+
+                console.log("datajud------stateForm.formData.list---------->", stateForm.formData.list)
               });
             }
           });
@@ -331,7 +349,7 @@ const initLoadData = () => {
 watch(() => openOrClose,(val) => {
   if(val){
     getTaskFormData()
-    initLoadData()
+    // initLoadData()
   }else{
     initData()
   }
@@ -347,70 +365,343 @@ const showFillFormQrCode = () => {
   //查看二维码展示弹窗图片,图片带有分组,app,表单名称,和二维码图片
   //在此获取必要的参数并请求后台,获取二维码图片,当图片返回成功时,显示弹窗
   //必要的参数为cfid
-  if (
-    state.formData.form.qrCodeFlag == true &&
-    state.formData.form.qrCodeInside == true
-  ) {
-    getQrCodeImgInside().then(({ data }) => {
-      qrCodeImgInside = data;
-      if (qrCodeInsideDialogFlag.value == false) {
-        //console.log(qrCodeImgInside)
-        qrCodeInsideDialogFlag.value = true;
-      }
-    });
-  } else {
-    alert("请先开启表单二维码功能");
-  }
-}
-const  getQrCodeImgInside = () => {
-  return request({
-    url: "/javasys/lowCode/QrCode/getQrCodeImgInside",
-    method: "post",
-    data: {
-      cfid: state.formId,
-    },
-  });
+  
 }
 
+/**
+@ 作者: 秦东
+@ 时间: 2024-04-09 16:49:09
+@ 功能: 表单前置数据
+*/
+const beforeSubmit = (params: any) => {
+  params.formId = props.versionid;
+  params.id = "";
+  // emits("update:isopen", false);
+  return params;
+};
+/**
+@ 作者: 秦东
+@ 时间: 2024-04-09 16:41:20
+@ 功能: 提交成功回调 
+*/
+const afterSubmit = (type: string, val?: any) => {
+  // console.log("表单提交成功------------------>",type,val)
+  // console.log("流程------------------>",flowMap)
+  if (type === "success") {
+    emits("searchquery");
+    if (isFlowTable.value) {
+      if (val.code == 0) {
+        if (val.data) {
+          let sendInfo = {
+            id: val.data.uuid,
+            flowList: flowMap.value,
+            state: 3,
+          };
+          startRunFlow(sendInfo).then((data: any) => {
+            console.log("流程提交成功--------1---------->",data)
+          });
+        }
+      }
+    }
+  }
+  closeAppSubmit();
+};
+/**
+@ 作者: 秦东
+@ 时间: 2024-04-09 16:50:37
+@ 功能: 保存草稿
+*/
+const saveDraftPage = (type: string, val?: any) => {
+  if (type === "success") {
+    emits("searchquery");
+    if (isFlowTable.value) {
+      if (val.code == 0) {
+        let sendInfo = {
+          id: val.data.uuid,
+          flowList: flowMap.value,
+          state: 1,
+        };
+        startRunFlow(sendInfo).then((data: any) => {
+          // console.log("流程提交成功--------1---------->",data)
+        });
+      }
+    }
+  }
+  closeAppSubmit();
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-04-09 16:50:01
 @ 功能: 关闭操作
 */
 const closeAppSubmit = () => {
+  emits("update:show", false);
   flowMap.value = [];
   emits("searchquery");
-  emits("update:show", false);
+  
 };
-/**
-@ 作者: 秦东
-@ 时间: 2026-01-19 16:36:28
-@ 功能: 判断怎么分屏
-*/
-// const pageBody = ():string => {
-//   let pageClass = ""
-//   switch(pageType.value){
-//     case 2:
-//       pageClass = "twoPage";
-//       break;
-//     case 3:
-//       pageClass = "treePage";
-//       break;
-//     default:
-//       pageClass = ""
-//       break;
-//   }
-//   console.log("判断怎么分屏------------->",pageClass)
-//   console.log("判断怎么分屏------1------->",pageType.value)
-//   console.log("判断怎么分屏------2------->",pageType.value)
-//   return pageClass;
-// }
-
-provide('flowNodePower', currterNodePower)
-provide('currentNodeKey', nodeKey)
+//组件解析
+const changeKeyVal = (key: any, val: any, type: any, attribute: any) => {
+  // console.log("改变表单值--key--->",key)
+  // console.log("改变表单值--val--->",val,Array.isArray(val))
+  // console.log("改变表单值--type--->",type)
+  // console.log("改变表单值--attribute--->",attribute)
+
+  let isUpdateFlowChart = false;
+  console.log("改变表单值--notAsA_BasisForJudgment--->",notAsA_BasisForJudgment.indexOf(type))
+  if (notAsA_BasisForJudgment.indexOf(type) === -1) {
+    //不是判断字段,则更新流程图表
+    let isWrite = true;
+    //遍历表单组件
+    flowFactor.forEach((item: any) => {
+      if (item.factorid == key) {
+        isWrite = false;
+
+        item.type = 3;
+        if (type == "checkbox") {
+          item.isCheckbox = true;
+          item.answers = val.map(String);
+        } else {
+          item.isCheckbox = false;
+          item.oneanswer = val.toString();
+        }
+        if (notAsA_BasisForJudgment.indexOf(type) === -1) {
+          isUpdateFlowChart = true;
+        }
+      }
+    });
+    if (isWrite) {
+      if (type == "checkbox") {
+        flowFactor.push({
+          factorid: key,
+          type: 3,
+          isCheckbox: true,
+          answers: val.map(String),
+        });
+      } else {
+        flowFactor.push({
+          factorid: key,
+          type: 3,
+          isCheckbox: false,
+          oneanswer: val.toString(),
+        });
+      }
+      isUpdateFlowChart = true;
+    }
+  }
+  //时间类空间附加判断条件
+   if (
+    timeControl.indexOf(type) > -1 ||
+    fixedValueControl.indexOf(type) > -1 ||
+    type == "input"
+  ) {
+    let addNewTime = true; //判断是否新增
+    flowFactor.forEach((item: any) => { 
+      if (item.type == 2) {
+        addNewTime = false;
+         if (item.customFields && item.customFields.length > 0) {
+          let sunNewAdd = true;
+          item.customFields.forEach((sunItem: any) => {
+            // console.log("改变表单值--flowFactor-4->",sunItem.wordfield , key,sunItem.wordfield == key)
+            if (sunItem.wordfield == key) {
+              sunNewAdd = false;
+              isUpdateFlowChart = true;
+              if (timeEquation.indexOf(attribute) === -1) {
+                //非区间性时间
+                sunItem.leftval = val.toString();
+              } else {
+                //区间性时间
+                if (Array.isArray(val)) {
+                  if (val.length >= 2) {
+                    sunItem.leftval = val[0].toString();
+                    sunItem.rightval = val[val.length - 1].toString();
+                  }
+                }
+              }
+            }
+          });
+          if (sunNewAdd) {
+            isUpdateFlowChart = true;
+            if (timeEquation.indexOf(attribute) === -1) {
+              //非区间性时间
+              let customFieldInfo = {
+                wordfield: key,
+                optType: "1",
+                leftval: val.toString(),
+              };
+              item.customFields.push(customFieldInfo);
+            } else {
+              //区间性时间
+              if (Array.isArray(val)) {
+                if (val.length >= 2) {
+                  let customFieldInfo = {
+                    wordfield: key,
+                    optType: "6",
+                    leftval: val[0].toString(),
+                    leftoptType: "3",
+                    rightoptType: "3",
+                    rightval: val[val.length - 1].toString(),
+                  };
+                  item.customFields.push(customFieldInfo);
+                }
+              }
+            }
+          }
+         }
+      }
+      
+    });
+    if (addNewTime) {
+      //新增自定义类数据判断
+      isUpdateFlowChart = true;
+      if (timeEquation.indexOf(attribute) === -1) {
+        //非区间性时间
+        let customFieldInfo = {
+          wordfield: key,
+          optType: "1",
+          leftval: val.toString(),
+        };
+        let condInfo = {
+          factorid: "customFields",
+          type: 2,
+          isCheckbox: false,
+          customFields: [customFieldInfo],
+        };
+        flowFactor.push(condInfo);
+      } else {
+        //区间性时间
+        if (Array.isArray(val)) {
+          if (val.length >= 2) {
+            let customFieldInfo = {
+              wordfield: key,
+              optType: "6",
+              leftval: val[0].toString(),
+              leftoptType: "3",
+              rightoptType: "3",
+              rightval: val[val.length - 1].toString(),
+            };
+            let condInfo = {
+              factorid: "customFields",
+              type: 2,
+              isCheckbox: false,
+              customFields: [customFieldInfo],
+            };
+            flowFactor.push(condInfo);
+          }
+        }
+      }
+    }
+  }
+  //操作人
+  if (asAnApprovalActionControl.indexOf(type) > -1) {
+    isUpdateFlowChart = true;
+    let isWriteUs = true;
+    nodelUserList.forEach((item: any) => {
+      if (item.factorid == key) {
+        isWriteUs = false;
+        item.userList = val;
+      }
+    });
+    if (isWriteUs) {
+      nodelUserList.push({
+        factorid: key,
+        userList: val,
+      });
+    }
+  }
+  let isTrue = false
+  if(changeFlowPick.value && Array.isArray(changeFlowPick.value) && changeFlowPick.value.includes(key)){
+    isTrue = true
+  }
+  //更新工作流图
+  if (isUpdateFlowChart && isTrue) {
+    flowLoading.value = true;
+    //获取工作流不进图
+    gainFlowChart.conditionList = flowFactor;
+    gainFlowChart.nodelPeople = nodelUserList;
+    gainFlowChart.oldFlow = flowMap;
+    // console.log("获取工作流不进图--gainFlowChart--->",gainFlowChart)
+    realTimeUpdateFlow(gainFlowChart).then((data: any) => {
+      // console.log("获取工作流不进图-new-->",data)
+      flowMap.value = data.data.flowList;
+      nextStep.value = data.data.nextStep;
+      currentProgress.value = data.data.Step;
+      nodeKey.value = data.data.nodeKey;
+      // // console.log("获取工作流不进图-1-->",flowMap.value)
+      flowLoading.value = false;
+    });
+  }
+
+}
+
+
+const appTableForm = ref({
+  name:""
+})
+
+
+//-----------------------AI setting--------------------------
+//当前AI智能体，根据form表单的配置来初始化
+//params 主表字段参数   subparams子表字段参数，子表触发时需要清空  ; rowdex:表示子表的第几条数据，没有的话说明不是子表数据
+const currentAgent = ref<
+  {
+    model: boolean;
+    name: string;
+    rowdex:number,
+    uuid: string[];
+    fields: string[];
+    trigger: number;
+    params: { [key: string]: any };
+    subparams:{[key: string]: any}[];
+  }[]
+>([]);
+const aiassistRef = ref();
+//触发AI查询事件
+provide(constAiEffect, ({ key, value, field,rowdex}: any) => {
+  //新建ai_envents 是为了解决前端并发问题
+  const ai_events: Array<{ uuids: string[]; params: { [key: string]: any } }> = [];
+  currentAgent.value.forEach(ag=>{
+    if(ag.fields.includes(key)){ //trigger: 1:任一  2：半数 3：全部
+      if (rowdex!=null){//子表操作
+        ag.rowdex=rowdex //更新智能体的rowdex
+        if(rowdex>=ag.subparams.length){
+          ag.subparams.push({[field]:value})
+        }else{
+          ag.subparams[rowdex][field]=value
+        }
+      }else{ //主表操作, 直接加入params种
+        ag.params[field]=value;  //这个地方把key换成fieldName
+      }
+      let mergedObj;
+      if(ag.subparams.length>0){        
+         mergedObj = Object.assign({}, ag.params, ag.subparams[ag.rowdex]); //合并子表和主表
+      }else{
+        mergedObj = ag.params
+      }
+      switch(ag.trigger){
+        case 2:
+          if(Object.keys(mergedObj).length>=ag.fields.length/2){
+            ai_events.push({uuids:ag.uuid,params:mergedObj })
+          }
+          break;
+        case 3:
+          if(Object.keys(mergedObj).length==ag.fields.length){
+            ai_events.push({uuids:ag.uuid,params:mergedObj})
+          }
+          break;
+        default:
+          ai_events.push({uuids:ag.uuid,params:mergedObj})
+      }
+    }
+  }) 
+  if(ai_events.length>0){
+    aiassistRef.value.onSendParamToAI(ai_events)
+  }  
+})
+
 </script>
 <template>
-  <div class="drawerClass">
+  <div v-if="openOrClose" class="drawerClass">
   <el-drawer
     v-model="openOrClose"
     :title="drawTitle"
@@ -418,7 +709,7 @@ provide('currentNodeKey', nodeKey)
     :close-on-press-escape="false"
     :destroy-on-close="true"
     :size="drawBodyWidth"
-    
+    :close="closeAppSubmit"
   >
       <template #header>
         <div class="drawHeader">
@@ -426,67 +717,39 @@ provide('currentNodeKey', nodeKey)
           <el-button v-if="stateForm.formData.form.qrCodeFlag == true &&  stateForm.formData.form.qrCodeInside == true" size="small"  @click="showFillFormQrCode">扫码填单</el-button>
         </div>
       </template>
-      <div v-loading="drawLoading" :class="aiConfigArea&&isFlowTable?'drawBody treePage':((!aiConfigArea&&isFlowTable)||(aiConfigArea&&!isFlowTable))?'drawBody twoPage':'drawBody'">
-          <el-card v-if="aiConfigArea" shadow="always">
-            <template #header>
-              <div class="card-header">
-                <div class="svgBox"><SvgIcon icon-class="aiRoboot" size="25" /></div>
-                AI智能问答助手
-              </div>
-            </template>
-            <el-scrollbar class="scroBox ">
-
-              <div class="ai-conversation">
-                <div class="message ai-message">
-                    <strong>AI助手：</strong>您好！我是您的智能助手。我可以帮您解答关于表单填写和流程审批的问题。请问有什么可以帮您的？
-                </div>
-                
-                <div class="message user-message">
-                    <strong>用户：</strong>如何填写项目申请表中的预算部分？
-                </div>
-              </div>
+      <div v-loading="drawLoading" :class="aiConfigArea&&isFlowTable?'drawBody treePage':(aiConfigArea&&!isFlowTable)?'drawBody twoPageAi':(!aiConfigArea&&isFlowTable)?'drawBody twoPageFlow':'drawBody'">
+          <AiPage 
+            v-if="state.type != 5 && aiConfigArea" 
+            ref="aiassistRef"
+            :agent="currentAgent"
+          />  
 
-        
-            </el-scrollbar>
-            <template #footer>
-              <div class="bootemAi">
-                <el-input  placeholder="请输入您的问题..." />
-                
-                <el-button class="ai-send-btn"><SvgIcon icon-class="fbsk" size="" /></el-button>
-              </div>
-            </template>
-          </el-card>
-          <el-card shadow="always">
-            <template #header>
-              <div class="card-header">
-                <div class="svgBox"><SvgIcon icon-class="edit" size="25" /></div>
-                项目申请表
-              </div>
-            </template>
-            <el-scrollbar  class="formBody">
-              <p v-for="o in 400" :key="o" class="text item">{{ 'List item ' + o }}</p>
-            </el-scrollbar>
-          </el-card>
-          <el-card  v-if="isFlowTable"  shadow="always">
-            <template #header>
-              <div class="card-header">
-                <div class="svgBox"><SvgIcon icon-class="liuChengBiaoDan" size="25" /></div>
-                审批流程
-              </div>
-            </template>
-            <el-scrollbar  class="flowBody">
-              <p v-for="o in 400" :key="o" class="text item">{{ 'List item ' + o }}</p>
-            </el-scrollbar>
-            <template #footer>
-              <div class="bootemWorkFlow">
-                <el-input type="textarea" :rows="2" style="width: 100%" placeholder="请输入审批意见"></el-input>
-                <div class="bootemWorkFlowBut">
-                  <el-button class="btn approve-btn"><SvgIcon icon-class="kxdg" size="" style="margin-right: 5px" />通过审批</el-button>
-                  <el-button class="btn reject-btn"><SvgIcon icon-class="cwkx" size="" style="margin-right: 5px"  />驳回申请</el-button>
-                </div>
-              </div>
-            </template>
-          </el-card>
+          <AppForm
+              ref="formEl"
+              :drawTitle="drawTitle"
+              :numrun="formType"
+              :form-data="state.formData"
+              :type="formType"
+              :dict="state.dict"
+              request-url="getFormContent"
+              add-url="saveFormContent"
+              edit-url="editFormContent"
+              :before-submit="beforeSubmit"
+              :after-submit="afterSubmit"
+              :close-app-submit="closeAppSubmit"
+              :change-key-val="changeKeyVal"
+              :save-draft-page="saveDraftPage"
+              :node-key="nodeKey"
+              :purview="purviewAry"
+          />
+          
+          <FlowStep 
+            v-if="isFlowTable" 
+            v-model:flow-map="flowMap"
+            :next-step="nextStep"
+            :current-progress="currentProgress"
+            :node-key="nodeKey"
+          />
       </div>
   </el-drawer>
   </div>
@@ -520,7 +783,15 @@ provide('currentNodeKey', nodeKey)
     padding: 10px 10px;
   }
 }
-.twoPage{
+.twoPageAi{
+  display: grid;
+  grid-template-columns: minmax(150px, 250px) 1fr; /* 左右最小150px，最大250px，中间自适应 */
+  grid-template-rows: auto;
+  gap: 10px;
+  max-width: 100%;
+  margin: 0 auto;
+}
+.twoPageFlow{
   display: grid;
   grid-template-columns:  1fr minmax(150px, 250px); /* 左右最小150px，最大250px，中间自适应 */
   grid-template-rows: auto;
@@ -560,8 +831,8 @@ provide('currentNodeKey', nodeKey)
   height: calc(100vh - 200px);
 }
 .formBody{
-  padding: 10px 15px;
-  height: calc(100vh - 145px);
+  width: 100%;
+  overflow-x: auto;
 }
 .flowBody{
   padding: 10px 15px;
diff --git a/src/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue b/src/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue
index f74fa14..a6b4265 100644
--- a/src/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue
+++ b/src/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue
@@ -558,7 +558,7 @@ provide('currentNodeKey', nodeKey)
         {{ versiontitle }}
         <div class="flex-grow"></div>
         <el-button size="small" style="margin-right: 15px" @click="showFillFormQrCode"
-          >扫码填单123</el-button
+          >扫码填单</el-button
         >
       </div>
     </template>
diff --git a/src/views/sysworkflow/lowcodepage/runApp/regularPage/completedMattersPage.vue b/src/views/sysworkflow/lowcodepage/runApp/regularPage/completedMattersPage.vue
index 15271bb..dcd87d4 100644
--- a/src/views/sysworkflow/lowcodepage/runApp/regularPage/completedMattersPage.vue
+++ b/src/views/sysworkflow/lowcodepage/runApp/regularPage/completedMattersPage.vue
@@ -6,6 +6,7 @@
 <script lang='ts' setup>
 import { gainAppTaskList } from "@/api/DesignForm/requestapi"
 import LookAndOperateLogInfo from '@/views/taskplatform/taskmanagement/lookFlowInfoApp.vue'
+import LookAndOperateNewLogInfo from '@/views/taskplatform/taskmanagement/lookFlowInfoNewApp.vue'
 const props = defineProps({
 	pickAppMenu:{
 		type:Object,
@@ -54,7 +55,10 @@ const getToDoList = () =>{
 			taskFlowAry.value = data.data.list
 		})
 }
+const drawerWithNew =ref(props.drawerWith)
+const myappbox = ref()
 onMounted(() =>{
+	drawerWithNew.value = myappbox.value?.clientWidth;
 	getToDoList()
 })
 const flowLogInfo = ref<any>()
@@ -72,7 +76,12 @@ const searchQuery = () =>{}
 </script>
 <template>
 	<div ref="myappbox" class="app_box">
-		<LookAndOperateLogInfo v-if="darwOpenOrClose" v-model:isshow="darwOpenOrClose" :flow-log-info="flowLogInfo" :drawer-with="drawerMyWith" @getmytodolist="getToDoListTd" />
+		<!-- <LookAndOperateLogInfo v-if="darwOpenOrClose" v-model:isshow="darwOpenOrClose" :flow-log-info="flowLogInfo" :drawer-with="drawerMyWith" @getmytodolist="getToDoListTd" /> -->
+
+		<LookAndOperateNewLogInfo  v-if="darwOpenOrClose" v-model:isshow="darwOpenOrClose" :flow-log-info="flowLogInfo" :drawer-with="drawerWithNew" @getmytodolist="getToDoListTd"  />
+
+
+
 		<div class="app-container">
 			<div class="search">
 				<div class="titleBox">
diff --git a/src/views/sysworkflow/lowcodepage/runApp/regularPage/myCreate.vue b/src/views/sysworkflow/lowcodepage/runApp/regularPage/myCreate.vue
index aeb0306..ede46c8 100644
--- a/src/views/sysworkflow/lowcodepage/runApp/regularPage/myCreate.vue
+++ b/src/views/sysworkflow/lowcodepage/runApp/regularPage/myCreate.vue
@@ -14,6 +14,7 @@ import {
 import { gainAppAllTaskList } from "@/api/DesignForm/requestapi";
 
 //引入组件
+import NewFormPageCont from "@/components/DesignForm/tableListPage/newFormPageCont.vue";
 import FormPageCont from "@/components/DesignForm/tableListPage/formPageContApp.vue";
 import TableFlow from "@/views/sysworkflow/lowcodepage/pageFlow/appTableFlow.vue";
 
@@ -69,9 +70,9 @@ const getToDoList = () => {
 onMounted(() => {
   getToDoList();
 });
-
+const rangedDatePickerInTables1: any = []
 const container = ref(); //实例化内容容器
-const drawerWith = ref(); //编辑表单时抽屉宽度
+const drawerWithing = ref(); //编辑表单时抽屉宽度
 const openTaskDrawer = ref(false); //新增数据
 /**
 @ 作者: 秦东
@@ -82,9 +83,22 @@ const tablePageClass = ref(1);
 const lookPageInfoIsShow = ref(false);
 const pageInfoCont = ref<any>();
 const lookPageInfo = (val: any) => {
-  tablePageClass.value = 4;
+  tablePageClass.value = 3;
+  if(val.mastersKeyStr && val.mastersKeyStr != ""){
+
+    val.masters_key = val.mastersKeyStr
+
+  }
+  if(val.runFlowIdStr && val.runFlowIdStr != ""){
+
+    val.runFlowId = val.runFlowIdStr
+
+  }
+  console.log("查看详细内容--------------------------->");
+  console.log(val);
+  console.log("查看详细内容--------------------------->");
   pageInfoCont.value = val;
-  drawerWith.value = container.value?.clientWidth;
+  drawerWithing.value = container.value?.clientWidth;
   lookPageInfoIsShow.value = true;
 };
 /**
@@ -97,8 +111,18 @@ const editInfo = (val: any) => {
   // console.log('修改数据!',val)
   operState.value = 5;
   tablePageClass.value = 2;
+  if(val.mastersKeyStr && val.mastersKeyStr != ""){
+
+    val.masters_key = val.mastersKeyStr
+
+  }
+  if(val.runFlowIdStr && val.runFlowIdStr != ""){
+
+    val.runFlowId = val.runFlowIdStr
+
+  }
   pageInfoCont.value = val;
-  drawerWith.value = container.value?.clientWidth;
+  drawerWithing.value = container.value?.clientWidth;
   lookPageInfoIsShow.value = true;
 };
 /**
@@ -109,8 +133,18 @@ const editInfo = (val: any) => {
 const submitApproval = (val: any) => {
   operState.value = 4;
   tablePageClass.value = 2;
+  if(val.mastersKeyStr && val.mastersKeyStr != ""){
+
+    val.masters_key = val.mastersKeyStr
+
+  }
+  if(val.runFlowIdStr && val.runFlowIdStr != ""){
+
+    val.runFlowId = val.runFlowIdStr
+
+  }
   pageInfoCont.value = val;
-  drawerWith.value = container.value?.clientWidth;
+  drawerWithing.value = container.value?.clientWidth;
   lookPageInfoIsShow.value = true;
 };
 /**
@@ -156,8 +190,18 @@ const recallSendMsg = (val: any) => {
 const afreshSendFlow = (val: any) => {
   operState.value = 2;
   tablePageClass.value = 2;
+  if(val.mastersKeyStr && val.mastersKeyStr != ""){
+
+    val.masters_key = val.mastersKeyStr
+
+  }
+  if(val.runFlowIdStr && val.runFlowIdStr != ""){
+
+    val.runFlowId = val.runFlowIdStr
+
+  }
   pageInfoCont.value = val;
-  drawerWith.value = container.value?.clientWidth;
+  drawerWithing.value = container.value?.clientWidth;
   lookPageInfoIsShow.value = true;
 };
 /**
@@ -168,8 +212,18 @@ const afreshSendFlow = (val: any) => {
 const editFormSendFlow = (val: any) => {
   operState.value = 3;
   tablePageClass.value = 2;
+  if(val.mastersKeyStr && val.mastersKeyStr != ""){
+
+    val.masters_key = val.mastersKeyStr
+
+  }
+  if(val.runFlowIdStr && val.runFlowIdStr != ""){
+
+    val.runFlowId = val.runFlowIdStr
+
+  }
   pageInfoCont.value = val;
-  drawerWith.value = container.value?.clientWidth;
+  drawerWithing.value = container.value?.clientWidth;
   lookPageInfoIsShow.value = true;
 };
 const cancelEvent = (val: any) => {
@@ -432,15 +486,28 @@ const searchQuery = () => {};
         />
       </el-card>
 
-      <FormPageCont
+      
+
+      <NewFormPageCont
         v-model:is-show="lookPageInfoIsShow"
-        :drawer-with="props.drawerWith"
+        :drawer-with="drawerWithing"
         :page-info="pageInfoCont"
         :table-page-class="tablePageClass"
         :oper-state="operState"
+       :dprt="rangedDatePickerInTables1"
         @get-page-data="getToDoList"
       />
 
+
+      <!-- <FormPageCont
+        v-model:is-show="lookPageInfoIsShow"
+        :drawer-with="props.drawerWith"
+        :page-info="pageInfoCont"
+        :table-page-class="tablePageClass"
+        :oper-state="operState"
+        @get-page-data="getToDoList"
+      /> -->
+
       <TableFlow
         v-model:isopen="openTaskDrawer"
         :versionid="props.versionid"
diff --git a/src/views/sysworkflow/lowcodepage/runApp/regularPage/myToDoPage.vue b/src/views/sysworkflow/lowcodepage/runApp/regularPage/myToDoPage.vue
index 74e7ae8..ffe20f2 100644
--- a/src/views/sysworkflow/lowcodepage/runApp/regularPage/myToDoPage.vue
+++ b/src/views/sysworkflow/lowcodepage/runApp/regularPage/myToDoPage.vue
@@ -8,6 +8,7 @@ import { gainAppTaskList } from "@/api/DesignForm/requestapi";
 import { taskflowquery } from "@/api/DesignForm/type";
 
 import LookAndOperateLogInfo from "@/views/taskplatform/taskmanagement/lookFlowInfoApp.vue";
+import lookFlowInfoNewApp from "@/views/taskplatform/taskmanagement/lookFlowInfoNewApp.vue";
 
 const props = defineProps({
   pickAppMenu: {
@@ -58,7 +59,10 @@ const getToDoList = () => {
     taskFlowAryTd.value = data.data.list;
   });
 };
+const drawerWithNew =ref(props.drawerWith)
+const myappbox = ref()
 onMounted(() => {
+  drawerWithNew.value = myappbox.value?.clientWidth;
   getToDoList();
 });
 /**
@@ -86,12 +90,19 @@ const searchQuery = () => {};
 </script>
 <template>
   <div ref="myappbox" class="app_box">
-    <LookAndOperateLogInfo
+    <!-- <LookAndOperateLogInfo
       v-if="darwOpenOrClose"
       v-model:isshow="darwOpenOrClose"
       :flow-log-info="flowLogInfo"
       :drawer-with="props.drawerWith"
       @getmytodolist="getToDoListTd"
+    /> -->
+    <lookFlowInfoNewApp
+      v-if="darwOpenOrClose"
+      v-model:isshow="darwOpenOrClose"
+      :flow-log-info="flowLogInfo"
+      :drawer-with="drawerWithNew"
+      @getmytodolist="getToDoListTd"
     />
     <div class="app-container">
       <div class="search">
diff --git a/src/views/sysworkflow/lowcodepage/runApp/regularPage/sendCopy.vue b/src/views/sysworkflow/lowcodepage/runApp/regularPage/sendCopy.vue
index f8a683e..954665c 100644
--- a/src/views/sysworkflow/lowcodepage/runApp/regularPage/sendCopy.vue
+++ b/src/views/sysworkflow/lowcodepage/runApp/regularPage/sendCopy.vue
@@ -6,6 +6,7 @@
 <script lang='ts' setup>
 import { gainAppTaskList } from "@/api/DesignForm/requestapi"
 import LookAndOperateLogInfo from '@/views/taskplatform/taskmanagement/lookFlowInfoApp.vue'
+import LookAndOperateLogNewInfo from '@/views/taskplatform/taskmanagement/lookFlowInfoNewApp.vue'
 const props = defineProps({
 	pickAppMenu:{
 		type:Object,
@@ -49,7 +50,10 @@ const getToDoList = () =>{
 			taskFlowAry.value = data.data.list
 		})
 }
+const drawerWithNew =ref(props.drawerWith)
+const myappbox = ref()
 onMounted(() =>{
+	drawerWithNew.value = myappbox.value?.clientWidth;
 	getToDoList()
 })
 
@@ -68,7 +72,8 @@ const searchQuery = () =>{}
 </script>
 <template>
 	<div ref="myappbox" class="app_box">
-		<LookAndOperateLogInfo v-if="darwOpenOrClose" v-model:isshow="darwOpenOrClose" :flow-log-info="flowLogInfo" :drawer-with="drawerMyWith" @getmytodolist="getToDoListTd" />
+		<!-- <LookAndOperateLogInfo v-if="darwOpenOrClose" v-model:isshow="darwOpenOrClose" :flow-log-info="flowLogInfo" :drawer-with="drawerMyWith" @getmytodolist="getToDoListTd" /> -->
+		<LookAndOperateLogNewInfo v-if="darwOpenOrClose" v-model:isshow="darwOpenOrClose" :flow-log-info="flowLogInfo" :drawer-with="drawerWithNew" @getmytodolist="getToDoListTd" />
 		<div class="app-container">
 			<div class="search">
 				<div class="titleBox">
diff --git a/src/views/taskplatform/taskmanagement/flowStep.vue b/src/views/taskplatform/taskmanagement/flowStep.vue
index 6dcac8a..6933946 100644
--- a/src/views/taskplatform/taskmanagement/flowStep.vue
+++ b/src/views/taskplatform/taskmanagement/flowStep.vue
@@ -157,6 +157,11 @@ const updateNode = (val:any) =>{
 										</el-col>
 										<el-col :span="24">
 											<ul>
+												<li>
+													<el-text type="success">
+														<span>已同意</span>
+													</el-text> · 2025/10/24 16:23:12
+												</li>
 												<li v-for="(logItem,logIndex) in items.log" :key="logIndex" class="logLi">
 													<el-text v-if="logItem.state==2" type="success">
 														<span v-if="logItem.cause">{{logItem.cause}}</span><span v-else>已同意</span>
diff --git a/src/views/taskplatform/taskmanagement/lookFlowInfoApp.vue b/src/views/taskplatform/taskmanagement/lookFlowInfoApp.vue
index 7543c0f..d32c9ab 100644
--- a/src/views/taskplatform/taskmanagement/lookFlowInfoApp.vue
+++ b/src/views/taskplatform/taskmanagement/lookFlowInfoApp.vue
@@ -133,7 +133,7 @@ const gainFormData = () => {
     })
     .finally(() => {
       formLoading.value = false;
-      gainEditDataLog({ id: props.flowLogInfo.mastersKeyStr }).then(({ data }) => {
+      gainEditDataLog({ id: props.flowLogInfo.mastersKeyStr.toString() }).then(({ data }) => {
         // console.log("获取修改记录-1111-->",data)
         pageLog.value = data;
       });
diff --git a/src/views/taskplatform/taskmanagement/lookFlowInfoNewApp.vue b/src/views/taskplatform/taskmanagement/lookFlowInfoNewApp.vue
new file mode 100644
index 0000000..d4a397d
--- /dev/null
+++ b/src/views/taskplatform/taskmanagement/lookFlowInfoNewApp.vue
@@ -0,0 +1,523 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2026-02-05 13:51:29
+@ 备注: 代办事宜
+-->
+<script lang='ts' setup>
+import {
+  submitButton,
+  afreshSubmitButton,
+  editFormCont,
+  draftSubmitButton,
+  editLookFormCont,
+} from "@/utils/workflow/const";
+import {
+  json2string,
+  objToStringify,
+  string2json,
+  stringToObj,
+} from "@/utils/DesignForm/form";
+
+import {
+  haveCustomerFormVersion,
+  generateFlow,
+  gainTaskFormInfo,
+  gainEditDataLog,
+} from "@/api/taskapi/management";
+
+import RunFlowStepApp from "@/views/taskplatform/taskmanagement/runFlowStepApp.vue";
+
+import {
+  judgeSubmitCancel,
+  startRunFlow,
+  afreshRunFlow,
+  onlyPublishFlow,
+  gainEditFormFlowInfo,
+} from "@/api/DesignForm/requestapi";
+
+import FlowStep from "@/views/taskplatform/taskmanagement/flowStep.vue";
+import { constAiEffect } from "@/api/DesignForm/utils";
+
+import RunFlowStep from "@/views/taskplatform/taskmanagement/runNewFlowStep.vue";
+import AiPage from "@/views/sysworkflow/lowcodepage/pageFlow/aiPage.vue";
+
+const props = defineProps({
+  isshow: {
+    type: Boolean,
+    default: true,
+  },
+  drawerWith: {
+    type: Number,
+    default: 0,
+  },
+  flowLogInfo: {
+    type: Object,
+    default() {
+      return {};
+    },
+  },
+  operState: {
+    type: Number,
+    default: 1,
+  },
+});
+const flowAry = ref<any[]>();
+const emits = defineEmits(["update:isshow", "getmytodolist"]);
+const isOpen = computed({
+  get: () => props.isshow,
+  set: (val) => {
+    emits("update:isshow", val);
+  },
+});
+const drawBodyWidth = ref(props.drawerWith)
+const aiConfigArea =ref(false)      //是否有AI
+const isFlowTable = ref(true); //判断是不是流程表单
+const formType = ref<number>(3);
+const logistrue = ref(false);
+const formLoading = ref(false);
+const loadingData = ref(false); //加载表单数据
+const flowLoading = ref(false); //加载流程数据
+const versiontitle = ref<any>("");
+const flowMap = ref<any>();
+const nextStep = ref(0);
+const nodeKey = ref<string>("");
+const purviewAry = ref<any[]>([]);
+const currentProgress = ref<number>(1);
+const newLogAry = ref<any>("");
+const oldLogAry = ref<any>("");
+const newDataLen = ref<number>(0);
+//表单相关内容
+const formState = reactive({
+  formData: {
+    list: [] as any[],
+    form: {},
+    config: {},
+    powerstr: {},
+    aiConfig:[]
+  },
+  dict: {},
+  formId: 25,
+  id: 1,
+  loading: true,
+});
+const formEl = ref<any>();
+const drawerBeforeClose = () => {
+  // console.log("监听打开关闭",false)
+  emits("getmytodolist");
+  emits("update:isshow", false);
+  drawBodyWidth.value = 0;
+};
+
+onMounted(() => {
+  versiontitle.value = props.flowLogInfo.title;
+  flowMap.value = JSON.parse(props.flowLogInfo.flowcont);
+  // console.log("监听打开关闭",props.flowLogInfo)
+  gainFormData();
+});
+const pageLog = ref<any[]>([]);
+//获取表单内容
+const gainFormData = () => {
+  formLoading.value = true;
+  console.log("获取表单内容--->", props.flowLogInfo);
+  nextStep.value = props.flowLogInfo.nextStep;
+  nodeKey.value = props.flowLogInfo.currentNodeKey;
+  purviewAry.value = props.flowLogInfo.powerAry;
+  currentProgress.value = props.flowLogInfo.currentStep;
+  // console.log("props.flowLogInfo--5-------->",props.flowLogInfo.mastesform)
+  formState.formData = stringToObj(props.flowLogInfo.mastesform);
+  gainTaskFormInfo({ id: props.flowLogInfo.mastersKeyStr.toString(),runFlowId: props.flowLogInfo.runFlowIdStr.toString()  })
+    .then((data: any) => {
+        let extraW=0; 
+        if(isFlowTable.value){
+            extraW = 320
+        }
+        if (data.data.logistrue) {
+            formState.formData.list.push(editLookFormCont);
+        }
+        // console.log("res----获得数据回显------->",data)
+        formEl.value.setValue(data.data.masterDataInfo);
+        newLogAry.value = data.data.newData;
+        oldLogAry.value = data.data.oldData;
+        logistrue.value = data.data.logistrue;
+        newDataLen.value = data.data.newDataLen;
+        formLoading.value = false;
+
+        if(formState.formData&&formState.formData.aiConfig&&formState.formData.aiConfig.length>0){
+            aiConfigArea.value=true
+            formState.formData.aiConfig?.forEach((item: { library: any; title: any; trigger: any; }) => {
+            currentAgent.value.push({
+                name: "test",
+                model: false,
+                rowdex:0,
+                uuid: item.library,
+                fields: item.title,
+                trigger: item.trigger,
+                params: {},
+                subparams:[]
+            });
+            });
+        }
+        if(aiConfigArea.value){
+            extraW = extraW + 320
+        }
+
+        if (aiConfigArea.value && isFlowTable.value){
+            drawBodyWidth.value = drawBodyWidth.value + extraW - 160
+        }else if ((!aiConfigArea.value && isFlowTable.value) || (aiConfigArea.value && !isFlowTable.value)){
+            drawBodyWidth.value = drawBodyWidth.value + extraW
+        }else{
+            drawBodyWidth.value = drawBodyWidth.value
+        }
+
+
+
+        nextTick(() => {
+            // console.log("获取自定义表单内容-1111-->",data.data.tableData)
+            formEl.value.setValue(data.data.tableData);
+        });
+    })
+    .finally(() => {
+      formLoading.value = false;
+      gainEditDataLog({ id: props.flowLogInfo.mastersKeyStr.toString() }).then((data:any) => {
+        // console.log("获取修改记录-1111-->",data)
+        pageLog.value = data.data;
+      });
+    });
+  // haveCustomerFormVersion({id:props.flowLogInfo.version_id.toString()})
+  // 		.then(({ data }) =>{
+
+  // 			formState.dict = string2json(data.dict)
+  // 			judgeSubmitCancel({"name":data.mastesformjson})
+  // 				.then((dataBut:any) =>{
+  // 					if(dataBut.code == 0){
+  // 						formState.formData.list.push(afreshSubmitButton)
+  // 							// console.log("res----判断按钮------->",dataBut,props.operState)
+  // 							// if (dataBut.data == 3 || dataBut.data == 4){
+  // 							// 	formInfo.formData.list.push(editFormCont)
+  // 							// }
+  // 					}
+  // 				})
+  // 		})
+  // 		.finally(() => {
+  // 			formLoading.value = false;
+
+  // formEl
+  // 	})
+};
+//-----------------------AI setting--------------------------
+//当前AI智能体，根据form表单的配置来初始化
+//params 主表字段参数   subparams子表字段参数，子表触发时需要清空  ; rowdex:表示子表的第几条数据，没有的话说明不是子表数据
+const currentAgent = ref<
+  {
+    model: boolean;
+    name: string;
+    rowdex:number,
+    uuid: string[];
+    fields: string[];
+    trigger: number;
+    params: { [key: string]: any };
+    subparams:{[key: string]: any}[];
+  }[]
+>([]);
+const aiassistRef = ref();
+//触发AI查询事件
+provide(constAiEffect, ({ key, value, field,rowdex}: any) => {
+  //新建ai_envents 是为了解决前端并发问题
+  const ai_events: Array<{ uuids: string[]; params: { [key: string]: any } }> = [];
+  currentAgent.value.forEach(ag=>{
+    if(ag.fields.includes(key)){ //trigger: 1:任一  2：半数 3：全部
+      if (rowdex!=null){//子表操作
+        ag.rowdex=rowdex //更新智能体的rowdex
+        if(rowdex>=ag.subparams.length){
+          ag.subparams.push({[field]:value})
+        }else{
+          ag.subparams[rowdex][field]=value
+        }
+      }else{ //主表操作, 直接加入params种
+        ag.params[field]=value;  //这个地方把key换成fieldName
+      }
+      let mergedObj;
+      if(ag.subparams.length>0){        
+         mergedObj = Object.assign({}, ag.params, ag.subparams[ag.rowdex]); //合并子表和主表
+      }else{
+        mergedObj = ag.params
+      }
+      switch(ag.trigger){
+        case 2:
+          if(Object.keys(mergedObj).length>=ag.fields.length/2){
+            ai_events.push({uuids:ag.uuid,params:mergedObj })
+          }
+          break;
+        case 3:
+          if(Object.keys(mergedObj).length==ag.fields.length){
+            ai_events.push({uuids:ag.uuid,params:mergedObj})
+          }
+          break;
+        default:
+          ai_events.push({uuids:ag.uuid,params:mergedObj})
+      }
+    }
+  }) 
+  if(ai_events.length>0){
+    aiassistRef.value.onSendParamToAI(ai_events)
+  }  
+})
+const beforeSubmit = () => {
+  
+}
+const afterSubmit = () => {
+  
+}
+const closeAppSubmit = () => {
+  
+}
+const changeKeyVal = () => {
+  
+}
+const anewSubmit = () => {
+  
+}
+const saveEditFormInfo = () => {
+  
+}
+const sendDraftSubmit = () => {
+  
+}
+const optionsValue3Get3 = () => {
+  
+}
+const submitEdit = () => {
+  
+}
+</script>
+<template>
+  <div v-if="isOpen" class="drawerClass">
+        <el-drawer
+            v-model="isOpen"
+            :title="versiontitle"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+            :destroy-on-close="true"
+            :size="drawBodyWidth"
+            :close="drawerBeforeClose"
+        >
+            <template #header>
+                <div class="drawHeader">
+                    <el-text size="large">{{ versiontitle }}</el-text>
+                </div>
+            </template>
+            <div v-loading="loadingData" :class="aiConfigArea&&isFlowTable?'drawBody treePage':(aiConfigArea&&!isFlowTable)?'drawBody twoPageAi':(!aiConfigArea&&isFlowTable)?'drawBody twoPageFlow':'drawBody'">
+                <!-- {{ formState.formData }} -->
+                <AiPage 
+                    v-if="formType != 5 && aiConfigArea" 
+                    ref="aiassistRef"
+                    :agent="currentAgent"
+                /> 
+                <AppForm
+                    ref="formEl"
+                    :draw-title="versiontitle"
+                    :form-data="formState.formData"
+                    
+                    :type="formType"
+                    :dict="formState.dict"
+                    request-url="getFormContent"
+                    add-url="saveFormContent"
+                    edit-url="editFormContent"
+                    :before-submit="beforeSubmit"
+                    :after-submit="afterSubmit"
+                    :close-app-submit="closeAppSubmit"
+                    :change-key-val="changeKeyVal"
+                    :anew-submit="anewSubmit"
+                    :save-edit-form-info="saveEditFormInfo"
+                    :send-draft-submit="sendDraftSubmit"
+                    :submit-edit="submitEdit"
+                    @options-value3-get3="optionsValue3Get3"
+                />
+                
+                <RunFlowStep
+                    v-if="isFlowTable" 
+                    ref="runstep"
+                    v-model:flowary="flowAry"
+                    :flow-key="props.flowLogInfo.idStr"
+                    :current-progress="currentProgress"
+                    @updatelist="drawerBeforeClose"
+                />
+            </div>
+        
+        </el-drawer>
+    </div>
+</template>
+<style  lang='scss' scoped>
+.drawerClass{
+  :deep .el-drawer__header{
+    border-bottom: 1px solid #ECECEC;
+  }
+}
+.drawHeader {
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.drawBody{
+  width: 100%;
+  height: 100%;
+  padding: 10px 10px;
+  :deep .el-card{
+    border-radius: 15px;
+  }
+  :deep .el-card__header{
+    padding: 15px 15px;
+  }
+  :deep .el-card__body{
+    padding: 0;
+  }
+  :deep .el-card__footer{
+    padding: 10px 10px;
+  }
+}
+.twoPageAi{
+  display: grid;
+  grid-template-columns: minmax(150px, 250px) 1fr; /* 左右最小150px，最大250px，中间自适应 */
+  grid-template-rows: auto;
+  gap: 10px;
+  max-width: 100%;
+  margin: 0 auto;
+}
+.twoPageFlow{
+  display: grid;
+  grid-template-columns:  1fr minmax(150px, 250px); /* 左右最小150px，最大250px，中间自适应 */
+  grid-template-rows: auto;
+  gap: 10px;
+  max-width: 100%;
+  margin: 0 auto;
+}
+.treePage{
+  display: grid;
+  grid-template-columns: minmax(150px, 250px) 1fr minmax(150px, 250px); /* 左右最小150px，最大250px，中间自适应 */
+  grid-template-rows: auto;
+  gap: 10px;
+  max-width: 100%;
+  margin: 0 auto;
+}
+.svgBox{
+  background: linear-gradient(135deg, #0020C2, #4d6cff);
+  color: white;
+  width: 40px;
+  height: 40px;
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 1.2rem;
+}
+.card-header{
+  font-size: 1.4rem;
+  font-weight: 700;
+  color: #0020C2;
+  display: flex;
+  align-items: center;
+  gap: 10px;
+}
+.scroBox{
+  padding: 10px 15px;
+  height: calc(100vh - 200px);
+}
+.formBody{
+  width: 100%;
+  overflow-x: auto;
+}
+.flowBody{
+  padding: 10px 15px;
+  height: calc(100vh - 260px);
+}
+
+.bootemWorkFlow{
+  width: 100%;
+  text-align: center;
+  .bootemWorkFlowBut{
+    width: 100%;
+    padding: 10px 0;
+    text-align: center;
+  }
+}
+
+.btn {
+  padding: 14px 16px;
+  border-radius: 10px;
+  font-weight: 600;
+  font-size: 1rem;
+  cursor: pointer;
+  transition: all 0.3s;
+  border: none;
+}
+.btn:hover {
+  transform: translateY(-2px);
+  box-shadow: 0 5px 15px rgba(0, 32, 194, 0.15);
+}
+.approve-btn {
+  background: linear-gradient(135deg, #00cc66, #33dd88);
+  color: white;
+}
+.reject-btn {
+  background: linear-gradient(135deg, #ff3366, #ff5588);
+  color: white;
+}
+
+.bootemAi{
+  display: grid;
+  grid-template-columns:  1fr 50px; /* 左右最小150px，最大250px，中间自适应 */
+  grid-template-rows: auto;
+  gap: 10px;
+  max-width: 100%;
+  margin: 0 auto;
+  :deep .el-input__wrapper{
+    border-radius: 10px;
+  }
+}
+
+.ai-send-btn {
+    background: linear-gradient(135deg, #0020C2, #4d6cff);
+    color: white;
+    border: none;
+    width: 46px;
+    border-radius: 10px;
+    cursor: pointer;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    transition: all 0.3s;
+}
+        
+.ai-send-btn:hover {
+  background: linear-gradient(135deg, #0019a0, #3a5aff);
+  transform: translateY(-2px);
+}
+.ai-conversation {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  gap: 15px;
+  margin-bottom: 20px;
+}
+.message {
+  padding: 12px 16px;
+  border-radius: 12px;
+  max-width: 90%;
+  line-height: 1.5;
+}
+        
+.user-message {
+  background: #eef2ff;
+  align-self: flex-end;
+  border-top-right-radius: 4px;
+  border: 1px solid rgba(0, 32, 194, 0.2);
+}
+        
+.ai-message {
+  background: linear-gradient(to right, #f0f5ff, #ffffff);
+  align-self: flex-start;
+  border-top-left-radius: 4px;
+  border: 1px solid rgba(0, 32, 194, 0.1);
+}
+</style>
diff --git a/src/views/taskplatform/taskmanagement/runNewFlowStep.vue b/src/views/taskplatform/taskmanagement/runNewFlowStep.vue
new file mode 100644
index 0000000..7c1fa84
--- /dev/null
+++ b/src/views/taskplatform/taskmanagement/runNewFlowStep.vue
@@ -0,0 +1,465 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2026-02-02 14:00:47
+@ 备注: 新流程
+-->
+<script lang='ts' setup>
+import { gainRunTaskFlow } from "@/api/DesignForm/requestapi";
+import SvgIcon from "@/components/SvgIcon/index.vue";
+
+//引入图标
+import squareUrlOne from "@/assets/images/1.png"
+import squareUrlTwo from "@/assets/images/2.png"
+import { afreshRunWorkflow, authorizeWorkflow } from "@/api/taskapi/management";
+
+const state = reactive({
+	circleUrl:squareUrlTwo,
+  	squareUrl: squareUrlOne,
+  	sizeList: ['small', '', 'large'] as const,
+})
+const { circleUrl, squareUrl, sizeList } = toRefs(state)
+
+const props = defineProps({
+	flowKey:{
+		type:String,
+		default:""
+	},
+	currentProgress:{
+		type:Number,
+		default:0
+	}
+})
+
+const emits = defineEmits(["update:flowary","updatelist"]);
+const ifSendFlow = ref(false)//是否可以写评论
+const flowLoading = ref(false)
+const flowMaps = ref<any[]>();
+// const flowOpinion = ref(false) //是否可以写评论
+const currentStep = ref<number>(props.currentProgress)
+const nextStep = ref<number>(0)
+
+//获取任务流程
+const gainRunFlowTask = () =>{
+	flowLoading.value = true
+	let sendInfo = {
+		id:props.flowKey
+	}
+	gainRunTaskFlow(sendInfo)
+		.then((data:any) =>{
+			console.log("获取流程--werwerwerwer--->",data)
+			flowMaps.value = data.data.flowList
+			ifSendFlow.value = data.data.operational
+			currentStep.value = data.data.current_step
+			nextStep.value = data.data.next_step
+			emits("update:flowary", data.data.flowList);
+		})
+		.finally(()=>{
+			flowLoading.value = false
+		})
+}
+/**
+@ 作者: 秦东
+@ 时间: 2026-01-29 16:37:56
+@ 功能: 判断审批节点样式
+*/
+const judgeNodeClass = (val:number,stepVal:number):string => {
+    console.log("判断审批节点样式",val,stepVal)
+    switch(val){
+        case 1:
+            if(ifSendFlow.value){
+                 if(currentStep.value == stepVal){
+                    return "in-progress"
+                }else{
+                    return 'completed'
+                }
+            }else{
+                if(nextStep.value == stepVal){
+                    return "in-progress"
+                }else{
+                    return 'completed'
+                }
+            }
+           
+        case 2:
+            return 'pending'
+        case 3:
+            // return 'in-progress'
+            if(ifSendFlow.value){
+                if(currentStep.value == stepVal){
+                    return "in-progress"
+                }else{
+                    return 'in-executor'
+                }
+            }else{
+                if(nextStep.value == stepVal){
+                    return "in-progress"
+                }else{
+                    return 'completed'
+                }
+            }
+        default:
+            if(ifSendFlow.value){
+                if(currentStep.value == stepVal){
+                    return "in-progress"
+                }else{
+                    return 'completed'
+                }
+            }else{
+                if(nextStep.value == stepVal){
+                    return "in-progress"
+                }else{
+                    return 'completed'
+                }
+            }
+            
+    }
+    return 'completed'
+}
+
+//组件渲染之前
+onBeforeMount(()=>{
+	gainRunFlowTask();
+})
+//判断是否可以添加人员
+const judgeAddUser =  (val:any):boolean =>{
+	// console.log("获取流程----1111->",val.judgelist)
+	if(val.judgelist){
+		return true
+	}
+	return false
+}
+let zhiXingStep = 1;
+const presetPersonnel = ref<any>([]);    //预设选择人
+const selectedPeople = ref<any>([]);    //已选择人
+const openclosebox = ref(false)
+const openOrClose = ref(false)
+const sendFlowInfo = ref<string>() //审批意见
+//添加操作人
+const addPeople = (val:any) =>{
+	zhiXingStep = val.step
+	presetPersonnel.value = val.pendpers
+	selectedPeople.value = val.operator
+	if(val.runscope == 1){
+		openclosebox.value = true
+	}else{
+		openOrClose.value = true
+	}
+	
+	// console.log("PresetPersonnel.value--------1-------->",val)
+	// console.log("PresetPersonnel.value--------2-------->",val.pendpers)
+	// console.log("PresetPersonnel.value--------3-------->",val.operator)
+	// console.log("PresetPersonnel.value--------4-------->",selectedPeople.value)
+}
+//更新节点操作人
+const updateNode = (val:any) =>{
+
+	if(flowMaps.value&& flowMaps.value.length > 0){
+
+		flowMaps.value.forEach((item:any) =>{
+			if(item.step == zhiXingStep){
+				item.operator = val
+			}
+		})
+	}
+}
+//提交审批
+const yesOrNo = (val:string,agreeOrRefuse:number) =>{
+	// console.log("提交审批----1111->",val,agreeOrRefuse,sendFlowInfo.value)
+	let sendInfo = {
+		id:props.flowKey,
+		agreeOrRefuse:agreeOrRefuse,
+		suggest:sendFlowInfo.value,
+		flowlist:flowMaps.value
+	}
+	authorizeWorkflow(sendInfo)
+		.then((data:any)=>{
+
+			// console.log("提交审批----22222->",data)
+			ElMessage({
+				message: '处理完成！',
+				type: 'success'
+			})
+
+		})
+		.finally(()=>{
+			gainRunFlowTask();
+			emits("updatelist");
+		})
+		
+}
+//重新提交审核
+const anewSubmit = (type: string,val?:any) => {
+	
+		afreshRunWorkflow({id:props.flowKey})
+			.then((data:any) => {
+				
+			})
+			.finally(() => {
+				gainRunFlowTask()
+			})
+
+}
+defineExpose({gainRunFlowTask,anewSubmit})
+</script>
+<template>
+  <el-card  shadow="always">
+    <template #header>
+        <div class="card-header">
+            <div class="svgBox"><SvgIcon icon-class="liuChengBiaoDan" size="25" /></div>
+            审批流程
+        </div>
+    </template>
+    <el-scrollbar v-loading="flowLoading" element-loading-text="Loading..." :class="ifSendFlow?'flowBody':'flowBodyNofoot'">
+        <div class="approval-steps">
+                <div v-for="item in flowMaps" :key="item.step" :class="['step', judgeNodeClass(item.type,item.step)]">
+                    <div class="step-icon">
+                        <SvgIcon v-if="item.type==0" icon-class="faqiren" size="25" />
+                        <SvgIcon v-if="item.type==1" icon-class="spr" size="25" />
+                        <SvgIcon v-if="item.type==2" icon-class="csr" size="25" />
+                        <SvgIcon v-if="item.type==3" icon-class="zxr" size="25" />
+                        <!--SvgIcon v-else icon-class="shenpi" size="25" /-->
+                    </div>
+                    <div class="step-content">
+                        <h3 class="step-title">{{item.nodeName}}</h3>
+                        <div v-for="items in item.operator" :key="items.id" class="flowLogBox">
+
+                            <div >
+                                <el-avatar  v-if="items.icon!=''" shape="square" fit="cover" :src="items.icon" style="width: 40px;"  class="avatarBox" />
+								<el-avatar v-else-if="items.iconbase64!=''" shape="square" fit="cover" :src="items.iconbase64" style="width: 40px;" class="avatarBox" />
+								<el-avatar v-else shape="square" fit="cover" :src="squareUrl" style="width: 40px;" class="avatarBox" />
+                            </div>
+                            <div>
+                                <div>
+                                    <el-text size="small">{{ items.departmentname }}</el-text>
+									<el-text size="small"><span v-if="items.departmentname"> - </span>{{ items.postname }}</el-text>
+									<el-text size="small"><span v-if="items.departmentname||items.postname"> - </span>{{ items.name }}</el-text>
+                                </div>
+                                <div v-for="(logItem,logIndex) in items.log" :key="logIndex" >
+                                    <div v-if="logItem.state==2" class="step-info">
+                                        <el-text v-if="logItem.cause" type="success" size="small">{{logItem.cause}}</el-text>
+                                        <el-text v-else type="success" size="small" >已同意</el-text>
+                                    </div>
+                                    <div v-if="logItem.state==3" class="step-info">
+                                        <el-text v-if="logItem.cause" type="danger" size="small">{{logItem.cause}}</el-text>
+                                        <el-text v-else type="danger" size="small" >已驳回</el-text>
+                                    </div>
+                                    <div v-else class="step-info">
+                                        <el-text v-if="logItem.cause"  size="small">{{logItem.cause}}</el-text>
+                                        <el-text v-else  size="small" >未操作</el-text>
+                                    </div>
+                                    <div  class="step-time">{{ logItem.time }}</div>
+                                </div>
+
+                            </div>
+
+                        </div>
+                        
+                        <div v-if="judgeAddUser(item)" class="addUser" @click="addPeople(item)">
+							<svg-icon icon-class="addxuxian" size="50" />
+						</div>
+
+                    </div>
+                </div>
+               
+            </div>
+    </el-scrollbar>
+    <template v-if="ifSendFlow" #footer>
+          <div class="bootemWorkFlow">
+            <el-input v-model="sendFlowInfo" type="textarea" :rows="2" style="width: 100%" placeholder="请输入审批意见"></el-input>
+            <div class="bootemWorkFlowBut">
+              <el-button class="btn approve-btn" @click="yesOrNo(props.flowKey,1)"><SvgIcon icon-class="kxdg" size="" style="margin-right: 5px"  />通过审批</el-button>
+              <el-button class="btn reject-btn"  @click="yesOrNo(props.flowKey,2)" ><SvgIcon icon-class="cwkx" size="" style="margin-right: 5px" />驳回申请</el-button>
+            </div>
+          </div>
+    </template>
+
+  </el-card>
+
+    <OrgUserPage v-if="openOrClose" v-model:openclose="openOrClose" :preset-personnel="presetPersonnel" :selected-people="selectedPeople" @update-node="updateNode" />
+    <OrgAllUserPage v-if="openclosebox" v-model:openclosebox="openclosebox" :selected-people="selectedPeople"  @update-node="updateNode" />
+</template>
+<style  lang='scss' scoped>
+.card-header{
+  font-size: 1.4rem;
+  font-weight: 700;
+  color: #0020C2;
+  display: flex;
+  align-items: center;
+  gap: 10px;
+}
+.flowBody{
+  padding: 10px 15px;
+  height: calc(100vh - 260px);
+}
+.flowBodyNofoot{
+  padding: 10px 15px;
+  height: calc(100vh - 140px);
+}
+.svgBox{
+  background: linear-gradient(135deg, #0020C2, #4d6cff);
+  color: white;
+  width: 40px;
+  height: 40px;
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 1.2rem;
+}
+.bootemWorkFlow{
+  width: 100%;
+  text-align: center;
+  .bootemWorkFlowBut{
+    width: 100%;
+    padding: 10px 0;
+    text-align: center;
+  }
+}
+
+.btn {
+  padding: 14px 16px;
+  border-radius: 10px;
+  font-weight: 600;
+  font-size: 1rem;
+  cursor: pointer;
+  transition: all 0.3s;
+  border: none;
+}
+.btn:hover {
+  transform: translateY(-2px);
+  box-shadow: 0 5px 15px rgba(0, 32, 194, 0.15);
+}
+.approve-btn {
+  background: linear-gradient(135deg, #00cc66, #33dd88);
+  color: white;
+}
+.reject-btn {
+  background: linear-gradient(135deg, #ff3366, #ff5588);
+  color: white;
+}
+.approval-steps {
+    flex: 1;
+}
+
+
+
+
+        .step {
+            display: flex;
+            margin-bottom: 25px;
+            position: relative;
+            margin-left: 7px;
+            margin-top: 7px;
+        }
+        
+        .step:not(:last-child)::after {
+            content: '';
+            position: absolute;
+            left: 20px;
+            top: 40px;
+            width: 2px;
+            height: calc(100% + 5px);
+            background: linear-gradient(to bottom, rgba(0, 32, 194, 0.2), rgba(0, 32, 194, 0.05));
+        }
+        
+        .step-icon {
+            width: 40px;
+            height: 40px;
+            border-radius: 50%;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            margin-right: 5px;
+            z-index: 1;
+            flex-shrink: 0;
+            
+        }
+        
+        .step.completed .step-icon {
+            background: linear-gradient(135deg, #0020C2, #4d6cff);
+            color: white;
+        }
+        
+        .step.in-progress .step-icon {
+            background: linear-gradient(135deg, #ffcc00, #ffdd55);
+            color: #333;
+            animation: pulse 2s infinite;
+        }
+
+        .step.in-executor .step-icon {
+            background: linear-gradient(135deg, #67C23A, #95f764);
+            color: #fff;
+        }
+        
+        .step.pending .step-icon {
+            background: #f0f4ff;
+            color: #a0a6c9;
+        }
+        
+        .step-content {
+            flex: 1;
+        }
+        
+        .step-title {
+            font-weight: 600;
+            margin-bottom: 5px;
+            color: #0020C2;
+        }
+        
+        .step.completed .step-title {
+            color: #4d6cff;
+        }
+        
+        .step.in-progress .step-title {
+            color: #ff9900;
+        }
+        .step.in-executor .step-title {
+            color: #67C23A;
+        }
+        
+        .step.pending .step-title {
+            color: #a0a6c9;
+        }
+        
+        .step-info {
+            font-size: 0.9rem;
+            color: #666;
+            margin-top: 0px;
+        }
+        
+        .step-time {
+            font-size: 0.8rem;
+            color: #888;
+            margin-bottom: 4px;
+        }
+         /* 响应式设计 */
+        @media (max-width: 1200px) {
+            .container {
+                grid-template-columns: 1fr;
+                grid-template-rows: auto auto auto;
+                height: auto;
+                gap: 15px;
+            }
+            
+            .card {
+                min-height: 400px;
+            }
+        }
+        
+        @keyframes pulse {
+            0% { box-shadow: 0 0 0 0 rgba(255, 204, 0, 0.7); }
+            70% { box-shadow: 0 0 0 10px rgba(255, 204, 0, 0); }
+            100% { box-shadow: 0 0 0 0 rgba(255, 204, 0, 0); }
+        }
+.flowLogBox{
+    display: grid;
+    grid-template-columns: 45px 1fr;
+}
+.addUser{
+	display:block;
+	cursor:pointer;
+}
+.avatarBox{
+    border: 1px solid rgba(255, 255, 255, 0.5);
+}
+</style>
diff --git a/yarn.lock b/yarn.lock
index e53fcf6..7f59358 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -283,19 +283,19 @@
   resolved "https://registry.npmmirror.com/@ctrl/tinycolor/-/tinycolor-3.6.1.tgz"
   integrity sha512-SITSV6aIXsuVNV3f3O0f2n/cgyEDWoSqtZMYiAmcsYHydcKrOz3gUxB/iXd/Qf08+IZX4KpgNbvUdMBmWz+kcA==
 
-"@dnd-kit/accessibility@^3.1.1":
-  version "3.1.1"
-  resolved "https://registry.npmmirror.com/@dnd-kit/accessibility/-/accessibility-3.1.1.tgz"
-  integrity sha512-2P+YgaXF+gRsIihwwY1gCsQSYnu9Zyj2py8kY5fFvUM1qm2WA2u639R6YNVfU4GWr+ZM5mqEsfHZZLoRONbemw==
+"@dnd-kit/accessibility@^3.1.0":
+  version "3.1.0"
+  resolved "https://registry.npmmirror.com/@dnd-kit/accessibility/-/accessibility-3.1.0.tgz"
+  integrity sha512-ea7IkhKvlJUv9iSHJOnxinBcoOI3ppGnnL+VDJ75O45Nss6HtZd8IdN8touXPDtASfeI2T2LImb8VOZcL47wjQ==
   dependencies:
     tslib "^2.0.0"
 
 "@dnd-kit/core@^6.1.0":
-  version "6.3.1"
-  resolved "https://registry.npmmirror.com/@dnd-kit/core/-/core-6.3.1.tgz"
-  integrity sha512-xkGBRQQab4RLwgXxoqETICr6S5JlogafbhNsidmrkVv2YRs5MLwpjoF2qpiGjQt8S9AoxtIV603s0GIUpY5eYQ==
+  version "6.1.0"
+  resolved "https://registry.npmmirror.com/@dnd-kit/core/-/core-6.1.0.tgz"
+  integrity sha512-J3cQBClB4TVxwGo3KEjssGEXNJqGVWx17aRTZ1ob0FliR5IjYgTxl5YJbKTzA6IzrtelotH19v6y7uoIRUZPSg==
   dependencies:
-    "@dnd-kit/accessibility" "^3.1.1"
+    "@dnd-kit/accessibility" "^3.1.0"
     "@dnd-kit/utilities" "^3.2.2"
     tslib "^2.0.0"
 
@@ -306,10 +306,10 @@
   dependencies:
     tslib "^2.0.0"
 
-"@element-plus/icons-vue@^2.3.1":
-  version "2.3.1"
-  resolved "https://registry.npmmirror.com/@element-plus/icons-vue/-/icons-vue-2.3.1.tgz"
-  integrity sha512-XxVUZv48RZAd87ucGS48jPf6pKu0yV5UCg9f4FFwtrYxXOwWuVJo6wOvSLKEoMQKjv8GsX/mhP6UsC1lRwbUWg==
+"@element-plus/icons-vue@^2.3.1", "@element-plus/icons-vue@^2.3.2":
+  version "2.3.2"
+  resolved "https://registry.npmmirror.com/@element-plus/icons-vue/-/icons-vue-2.3.2.tgz"
+  integrity sha512-OzIuTaIfC8QXEPmJvB4Y4kw34rSXdCJzxcD1kFStBvr8bK6X1zQAYDo0CNMjojnfTqRQCJ0I7prlErcoRiET2A==
 
 "@esbuild/win32-x64@0.18.20":
   version "0.18.20"
@@ -2044,12 +2044,12 @@ available-typed-arrays@^1.0.7:
     possible-typed-array-names "^1.0.0"
 
 axios@^1.10.0:
-  version "1.11.0"
-  resolved "https://registry.npmmirror.com/axios/-/axios-1.11.0.tgz"
-  integrity sha512-1Lx3WLFQWm3ooKDYZD1eXmoGO9fxYQjrycfHFC8P0sCfQVXyROp0p9PFWBehewBOdCwHc+f/b8I0fMto5eSfwA==
+  version "1.10.0"
+  resolved "https://registry.npmmirror.com/axios/-/axios-1.10.0.tgz"
+  integrity sha512-/1xYAC4MP/HEG+3duIhFr4ZQXR4sQXOIe+o6sdqzeykGLx6Upp/1p8MHqhINOvGeP7xyNHe7tsiJByc4SSVUxw==
   dependencies:
     follow-redirects "^1.15.6"
-    form-data "^4.0.4"
+    form-data "^4.0.0"
     proxy-from-env "^1.1.0"
 
 babel-code-frame@^6.16.0, babel-code-frame@^6.22.0:
@@ -2864,9 +2864,9 @@ buffer@^5.5.0, buffer@^5.7.0:
     ieee754 "^1.1.13"
 
 bufferutil@^4.0.1:
-  version "4.0.9"
-  resolved "https://registry.npmmirror.com/bufferutil/-/bufferutil-4.0.9.tgz"
-  integrity sha512-WDtdLmJvAuNNPzByAYpRo2rF1Mmradw6gvWsQKf63476DDXmomT9zUiGypLcG4ibIM67vhAj8jJRdbmEws2Aqw==
+  version "4.0.8"
+  resolved "https://registry.npmmirror.com/bufferutil/-/bufferutil-4.0.8.tgz"
+  integrity sha512-4T53u4PdgsXqKaIctwF8ifXlRTTmEPJ8iEPWFdGZvcf7sbwYo6FKFEX9eNNAnzFZ7EzJAQ3CJeOtCRA4rDp7Pw==
   dependencies:
     node-gyp-build "^4.3.0"
 
@@ -2927,14 +2927,6 @@ cachedir@2.3.0:
   resolved "https://registry.npmmirror.com/cachedir/-/cachedir-2.3.0.tgz"
   integrity sha512-A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw==
 
-call-bind-apply-helpers@^1.0.1, call-bind-apply-helpers@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.npmmirror.com/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz"
-  integrity sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==
-  dependencies:
-    es-errors "^1.3.0"
-    function-bind "^1.1.2"
-
 call-bind@^1.0.2, call-bind@^1.0.5, call-bind@^1.0.6, call-bind@^1.0.7:
   version "1.0.7"
   resolved "https://registry.npmmirror.com/call-bind/-/call-bind-1.0.7.tgz"
@@ -4202,15 +4194,6 @@ dot-prop@^5.1.0:
   dependencies:
     is-obj "^2.0.0"
 
-dunder-proto@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.npmmirror.com/dunder-proto/-/dunder-proto-1.0.1.tgz"
-  integrity sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==
-  dependencies:
-    call-bind-apply-helpers "^1.0.1"
-    es-errors "^1.3.0"
-    gopd "^1.2.0"
-
 duplexer@^0.1.2:
   version "0.1.2"
   resolved "https://registry.npmmirror.com/duplexer/-/duplexer-0.1.2.tgz"
@@ -4245,9 +4228,9 @@ electron-to-chromium@^1.2.7:
   integrity sha1-uM5ck7MI2w6S9tBDXEbd7I9jY6s=
 
 electron-to-chromium@^1.4.820:
-  version "1.4.832"
-  resolved "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.832.tgz"
-  integrity sha512-cTen3SB0H2SGU7x467NRe1eVcQgcuS6jckKfWJHia2eo0cHIGOqHoAxevIYZD4eRHcWjkvFzo93bi3vJ9W+1lA==
+  version "1.4.830"
+  resolved "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.830.tgz"
+  integrity sha512-TrPKKH20HeN0J1LHzsYLs2qwXrp8TF4nHdu4sq61ozGbzMpWhI7iIOPYPPkxeq1azMT9PZ8enPFcftbs/Npcjg==
 
 element-plus@^2.3.4:
   version "2.7.7"
@@ -4468,32 +4451,33 @@ es-abstract@^1.7.0:
     is-callable "^1.1.3"
     is-regex "^1.0.3"
 
-es-define-property@^1.0.0, es-define-property@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.npmmirror.com/es-define-property/-/es-define-property-1.0.1.tgz"
-  integrity sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==
+es-define-property@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmmirror.com/es-define-property/-/es-define-property-1.0.0.tgz"
+  integrity sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==
+  dependencies:
+    get-intrinsic "^1.2.4"
 
 es-errors@^1.2.1, es-errors@^1.3.0:
   version "1.3.0"
   resolved "https://registry.npmmirror.com/es-errors/-/es-errors-1.3.0.tgz"
   integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==
 
-es-object-atoms@^1.0.0, es-object-atoms@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.npmmirror.com/es-object-atoms/-/es-object-atoms-1.1.1.tgz"
-  integrity sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==
+es-object-atoms@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmmirror.com/es-object-atoms/-/es-object-atoms-1.0.0.tgz"
+  integrity sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==
   dependencies:
     es-errors "^1.3.0"
 
-es-set-tostringtag@^2.0.3, es-set-tostringtag@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.npmmirror.com/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz"
-  integrity sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==
+es-set-tostringtag@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.npmmirror.com/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz"
+  integrity sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==
   dependencies:
-    es-errors "^1.3.0"
-    get-intrinsic "^1.2.6"
+    get-intrinsic "^1.2.4"
     has-tostringtag "^1.0.2"
-    hasown "^2.0.2"
+    hasown "^2.0.1"
 
 es-to-primitive@^1.1.1:
   version "1.1.1"
@@ -5445,15 +5429,13 @@ foreground-child@^3.1.0:
     cross-spawn "^7.0.0"
     signal-exit "^4.0.1"
 
-form-data@^4.0.4:
-  version "4.0.4"
-  resolved "https://registry.npmmirror.com/form-data/-/form-data-4.0.4.tgz"
-  integrity sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==
+form-data@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npmmirror.com/form-data/-/form-data-4.0.0.tgz"
+  integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==
   dependencies:
     asynckit "^0.4.0"
     combined-stream "^1.0.8"
-    es-set-tostringtag "^2.1.0"
-    hasown "^2.0.2"
     mime-types "^2.1.12"
 
 fraction.js@^4.3.7:
@@ -5560,29 +5542,16 @@ get-caller-file@^2.0.1, get-caller-file@^2.0.5:
   resolved "https://registry.npmmirror.com/get-caller-file/-/get-caller-file-2.0.5.tgz"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
-get-intrinsic@^1.2.1, get-intrinsic@^1.2.3, get-intrinsic@^1.2.4, get-intrinsic@^1.2.6:
-  version "1.3.0"
-  resolved "https://registry.npmmirror.com/get-intrinsic/-/get-intrinsic-1.3.0.tgz"
-  integrity sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==
+get-intrinsic@^1.1.3, get-intrinsic@^1.2.1, get-intrinsic@^1.2.3, get-intrinsic@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.npmmirror.com/get-intrinsic/-/get-intrinsic-1.2.4.tgz"
+  integrity sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==
   dependencies:
-    call-bind-apply-helpers "^1.0.2"
-    es-define-property "^1.0.1"
     es-errors "^1.3.0"
-    es-object-atoms "^1.1.1"
     function-bind "^1.1.2"
-    get-proto "^1.0.1"
-    gopd "^1.2.0"
-    has-symbols "^1.1.0"
-    hasown "^2.0.2"
-    math-intrinsics "^1.1.0"
-
-get-proto@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.npmmirror.com/get-proto/-/get-proto-1.0.1.tgz"
-  integrity sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==
-  dependencies:
-    dunder-proto "^1.0.1"
-    es-object-atoms "^1.0.0"
+    has-proto "^1.0.1"
+    has-symbols "^1.0.3"
+    hasown "^2.0.0"
 
 get-stream@^6.0.0, get-stream@^6.0.1:
   version "6.0.1"
@@ -5803,10 +5772,12 @@ good-listener@^1.2.2:
   dependencies:
     delegate "^3.1.2"
 
-gopd@^1.0.1, gopd@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.npmmirror.com/gopd/-/gopd-1.2.0.tgz"
-  integrity sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==
+gopd@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npmmirror.com/gopd/-/gopd-1.0.1.tgz"
+  integrity sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==
+  dependencies:
+    get-intrinsic "^1.1.3"
 
 graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0:
   version "4.2.11"
@@ -5879,15 +5850,15 @@ has-property-descriptors@^1.0.0, has-property-descriptors@^1.0.2:
   dependencies:
     es-define-property "^1.0.0"
 
-has-proto@^1.0.3:
+has-proto@^1.0.1, has-proto@^1.0.3:
   version "1.0.3"
   resolved "https://registry.npmmirror.com/has-proto/-/has-proto-1.0.3.tgz"
   integrity sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==
 
-has-symbols@^1.0.2, has-symbols@^1.0.3, has-symbols@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.npmmirror.com/has-symbols/-/has-symbols-1.1.0.tgz"
-  integrity sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==
+has-symbols@^1.0.2, has-symbols@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.npmmirror.com/has-symbols/-/has-symbols-1.0.3.tgz"
+  integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==
 
 has-tostringtag@^1.0.0, has-tostringtag@^1.0.2:
   version "1.0.2"
@@ -5941,7 +5912,7 @@ hash.js@^1.0.0, hash.js@^1.0.3:
   dependencies:
     inherits "^2.0.1"
 
-hasown@^2.0.0, hasown@^2.0.2:
+hasown@^2.0.0, hasown@^2.0.1, hasown@^2.0.2:
   version "2.0.2"
   resolved "https://registry.npmmirror.com/hasown/-/hasown-2.0.2.tgz"
   integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==
@@ -6953,16 +6924,16 @@ js-md5@^0.7.3:
   resolved "https://registry.npmmirror.com/js-md5/-/js-md5-0.7.3.tgz"
   integrity sha512-ZC41vPSTLKGwIRjqDh8DfXoCrdQIyBgspJVPXHBGu4nZlAEvG3nf+jO9avM9RmLiGakg7vz974ms99nEV0tmTQ==
 
+"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npmmirror.com/js-tokens/-/js-tokens-4.0.0.tgz"
+  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
+
 js-tokens@^3.0.0:
   version "3.0.1"
   resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.1.tgz"
   integrity sha1-COnxMkhKLEWjCQfp3E1VZ7fxFNc=
 
-js-tokens@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.npmmirror.com/js-tokens/-/js-tokens-4.0.0.tgz"
-  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
-
 js-tokens@^9.0.0:
   version "9.0.0"
   resolved "https://registry.npmmirror.com/js-tokens/-/js-tokens-9.0.0.tgz"
@@ -7601,6 +7572,13 @@ loose-envify@^1.0.0:
   dependencies:
     js-tokens "^3.0.0"
 
+loose-envify@^1.1.0:
+  version "1.4.0"
+  resolved "https://registry.npmmirror.com/loose-envify/-/loose-envify-1.4.0.tgz"
+  integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
+  dependencies:
+    js-tokens "^3.0.0 || ^4.0.0"
+
 lru-cache@^10.2.0:
   version "10.4.3"
   resolved "https://registry.npmmirror.com/lru-cache/-/lru-cache-10.4.3.tgz"
@@ -7687,11 +7665,6 @@ markdown-table@^3.0.0:
   resolved "https://registry.npmmirror.com/markdown-table/-/markdown-table-3.0.4.tgz"
   integrity sha512-wiYz4+JrLyb/DqW2hkFJxP7Vd7JuTDm77fvbM8VfEQdmSMqcImWeeRbHwZjBjIFki/VaMK2BhFi7oUUZeM5bqw==
 
-math-intrinsics@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.npmmirror.com/math-intrinsics/-/math-intrinsics-1.1.0.tgz"
-  integrity sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==
-
 mathml-tag-names@^2.1.3:
   version "2.1.3"
   resolved "https://registry.npmmirror.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz"
@@ -8585,9 +8558,9 @@ node-fetch-native@^1.6.3:
   integrity sha512-IhOigYzAKHd244OC0JIMIUrjzctirCmPkaIfhDeGcEETWof5zKYUW7e7MYvChGWh/4CJeXEgsRyGzuF334rOOQ==
 
 node-gyp-build@^4.3.0:
-  version "4.8.4"
-  resolved "https://registry.npmmirror.com/node-gyp-build/-/node-gyp-build-4.8.4.tgz"
-  integrity sha512-LA4ZjwlnUblHVgq0oBF3Jl/6h/Nvs5fzBLwdEF4nuxnFdsfajde4WfxtJr3CaiH+F6ewcIB/q4jQ4UzPyid+CQ==
+  version "4.8.1"
+  resolved "https://registry.npmmirror.com/node-gyp-build/-/node-gyp-build-4.8.1.tgz"
+  integrity sha512-OSs33Z9yWr148JZcbZd5WiAXhh/n9z8TxQcdMhIOlpN9AhWpLfvVFO73+m77bBABQMaY9XSvIa+qk0jlI7Gcaw==
 
 node-gyp@^12.1.0:
   version "12.1.0"
@@ -9886,16 +9859,19 @@ react-dnd-html5-backend@^16.0.1:
     dnd-core "^16.0.1"
 
 react-dom@>=16.8.0:
-  version "19.0.0"
-  resolved "https://registry.npmmirror.com/react-dom/-/react-dom-19.0.0.tgz"
-  integrity sha512-4GV5sHFG0e/0AD4X+ySy6UJd3jVl1iNsNHdpad0qhABJ11twS3TTBnseqsKurKcsNqCEFeGL3uLpVChpIO3QfQ==
+  version "18.3.1"
+  resolved "https://registry.npmmirror.com/react-dom/-/react-dom-18.3.1.tgz"
+  integrity sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==
   dependencies:
-    scheduler "^0.25.0"
+    loose-envify "^1.1.0"
+    scheduler "^0.23.2"
 
-react@^19.0.0, react@>=16.8.0:
-  version "19.0.0"
-  resolved "https://registry.npmmirror.com/react/-/react-19.0.0.tgz"
-  integrity sha512-V8AVnmPIICiWpGfm6GLzCR/W5FXLchHop40W4nXBmdlEceh16rCN8O8LNWm5bh5XUX91fh7KpA+W0TgMKmgTpQ==
+react@^18.3.1, react@>=16.8.0:
+  version "18.3.1"
+  resolved "https://registry.npmmirror.com/react/-/react-18.3.1.tgz"
+  integrity sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==
+  dependencies:
+    loose-envify "^1.1.0"
 
 read-cmd-shim@^6.0.0:
   version "6.0.0"
@@ -10481,10 +10457,12 @@ sax@^1.2.4:
   resolved "https://registry.npmmirror.com/sax/-/sax-1.4.1.tgz"
   integrity sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==
 
-scheduler@^0.25.0:
-  version "0.25.0"
-  resolved "https://registry.npmmirror.com/scheduler/-/scheduler-0.25.0.tgz"
-  integrity sha512-xFVuu11jh+xcO7JOAGJNOXld8/TcEHK/4CituBUeUb5hqxJLj9YuemAEuvm9gQ/+pgXYfbQuqAkiYu+u7YEsNA==
+scheduler@^0.23.2:
+  version "0.23.2"
+  resolved "https://registry.npmmirror.com/scheduler/-/scheduler-0.23.2.tgz"
+  integrity sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==
+  dependencies:
+    loose-envify "^1.1.0"
 
 screenfull@^6.0.0:
   version "6.0.2"
@@ -11429,9 +11407,9 @@ tar@^7.4.3, tar@^7.5.1, tar@^7.5.2:
     yallist "^5.0.0"
 
 terser@^5.0.0, terser@^5.4.0:
-  version "5.44.1"
-  resolved "https://registry.npmmirror.com/terser/-/terser-5.44.1.tgz"
-  integrity sha512-t/R3R/n0MSwnnazuPpPNVO60LX0SKL45pyl9YlvxIdkH0Of7D5qM2EVe+yASRIlY5pZ73nclYJfNANGWPwFDZw==
+  version "5.44.0"
+  resolved "https://registry.npmmirror.com/terser/-/terser-5.44.0.tgz"
+  integrity sha512-nIVck8DK+GM/0Frwd+nIhZ84pR/BX7rmXMfYwyg+Sri5oGVE99/E3KvXqpC2xHFxyqXyGHTKBSioxxplrO4I4w==
   dependencies:
     "@jridgewell/source-map" "^0.3.3"
     acorn "^8.15.0"