From 4c355ec9127e36a52e6a580c058222459b51fc76 Mon Sep 17 00:00:00 2001
From: herenshan112 <herenshan112@163.com>
Date: Fri, 9 Aug 2024 15:47:05 +0800
Subject: [PATCH] =?UTF-8?q?2024=E5=B9=B48=E6=9C=88=E7=AC=AC=E4=B8=80?=
 =?UTF-8?q?=E5=91=A8BUG=E4=BF=AE=E6=94=B9=E5=AE=8C=E6=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/date/type.ts                          |   2 +-
 src/components/DesignForm/app/index.vue       |  12 +-
 src/components/DesignForm/assembly/index.ts   |   4 +-
 .../DesignForm/formControlPropertiNew.vue     |  32 ++---
 .../DesignForm/public/form/formItem.vue       |   2 +-
 .../DesignForm/tableListPage/formPageCont.vue |  10 +-
 .../DesignForm/tableListPage/index.vue        |  29 +++-
 .../workflow/drwer/approverDrawer.vue         | 104 ++++++++++++--
 src/components/workflow/nodeWrap.vue          |   4 +-
 src/components/workflow/selectBoxs.vue        |   2 +-
 src/store/workflow/index.js                   |   2 +-
 src/utils/workflow/index.ts                   |   2 +-
 .../sysworkflow/flow/flowDrawingBoard.vue     |   2 +-
 src/views/sysworkflow/flow/flowcanvas.vue     |   2 +-
 .../sysworkflow/lowcodepage/appCardPage.vue   |  10 ++
 .../sysworkflow/lowcodepage/appFormList.vue   |   3 +-
 .../sysworkflow/lowcodepage/appListPage.vue   |  10 ++
 .../lowcodepage/appPage/appMenus.vue          |   5 +-
 .../appPageForm/appFlow/appFlowSee.vue        |   2 +-
 .../appPage/appPageForm/pageFlow.vue          |   5 +-
 .../appPage/appPageForm/pageForm.vue          |  45 +++++-
 .../appPage/appPageForm/pageList.vue          |  47 ++++++-
 src/views/sysworkflow/lowcodepage/index.vue   |   7 +-
 .../sysworkflow/lowcodepage/pageList.vue      | 132 ++++++++++++------
 .../sysworkflow/lowcodepage/workFlow.vue      |   2 +-
 src/widget/systemunit/deptOrgPage.vue         |   8 +-
 src/widget/systemunit/ownerPage.vue           |   6 +-
 27 files changed, 385 insertions(+), 106 deletions(-)

diff --git a/src/api/date/type.ts b/src/api/date/type.ts
index 83d9b91..2ac503e 100644
--- a/src/api/date/type.ts
+++ b/src/api/date/type.ts
@@ -277,7 +277,7 @@ export interface appNodeConfig{
 	sendBackNode: string;
 	settype: number;
 	type: number;
-	orgList: string;
+	orgList: number[];
 }
 //app工作流附件
 export interface appMatrix{
diff --git a/src/components/DesignForm/app/index.vue b/src/components/DesignForm/app/index.vue
index f3a013f..a9b041e 100644
--- a/src/components/DesignForm/app/index.vue
+++ b/src/components/DesignForm/app/index.vue
@@ -261,7 +261,7 @@ const selectionChange = (row: any) => {
 @ 功能: 获取表格头内容
 */
 const columnsFilter = computed(() => {
-	
+	// console.log("props.data判断是否有标题",props.data)
     if (!state.columnsCheck?.length) {
 		// console.log("props.data判断是否有标题",props.data)
       	return props.data.columns
@@ -271,7 +271,8 @@ const columnsFilter = computed(() => {
 			return state.columnsCheck.includes(item.prop || item.type)
 		})
     }
-})
+	console.log("获取表格头内容",props.data.columns)
+})	
 /**
 @ 作者: 秦东
 @ 时间: 2024-04-01 14:14:36
@@ -628,6 +629,8 @@ const judjeRadio = (val: any, options: any[]) => {
 @ 功能: 判断开关类型
 */
 const judjeSwitch = (val:any,yesVal:any) => {
+	// console.log("判断开关类型-1-->",val)
+	// console.log("判断开关类型-2-->",yesVal)
 	if(val == yesVal) return true;
 	return false;
 }
@@ -1138,6 +1141,10 @@ const transformOption = (val: string | number, type?: string) => {
 								{{ 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=='radio'" #default="scope">
 								<!-- {{scope.row[scope.column.property]}}{{item}} -->
 								{{ judjeRadio(scope.row[scope.column.property],item.options) }}
@@ -1157,7 +1164,6 @@ const transformOption = (val: string | number, type?: string) => {
 								</div>
 							</template>
 							<template v-if="item.fieldClass=='switch'" #default="scope">	
-								
 								<el-tag
 									v-if="judjeSwitch(scope.row[scope.column.property],item.activeValue)"
 									type="success"
diff --git a/src/components/DesignForm/assembly/index.ts b/src/components/DesignForm/assembly/index.ts
index e69fdd0..f1370b1 100644
--- a/src/components/DesignForm/assembly/index.ts
+++ b/src/components/DesignForm/assembly/index.ts
@@ -304,7 +304,9 @@ export default [
 							offValue: "",
 							showFields: []
 						},
-					]
+					],
+					activeValue:"1",
+					inactiveValue:"2"
 				},
 				config: {},
 				styles: {
diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue
index 4afc65c..b789c27 100644
--- a/src/components/DesignForm/formControlPropertiNew.vue
+++ b/src/components/DesignForm/formControlPropertiNew.vue
@@ -439,22 +439,22 @@ const attrList = computed(() => {
                     path: 'config.append',
                     vShow: ['input', 'password']
                 },
-                {
-                    label: '状态打开时的值',
-                    value: control.activeValue,
-                    placeholder: '状态打开时的值',
-                    path: 'control.activeValue',
-                    vShow: ['switch'],
-                    isNum: true
-                },
-                {
-                    label: '状态关闭时的值',
-                    value: control.inactiveValue,
-                    placeholder: '状态关闭时的值',
-                    path: 'control.inactiveValue',
-                    vShow: ['switch'],
-                    isNum: true
-                },
+                // {
+                //     label: '状态打开时的值',
+                //     value: control.activeValue,
+                //     placeholder: '状态打开时的值',
+                //     path: 'control.activeValue',
+                //     vShow: ['switch'],
+                //     isNum: true
+                // },
+                // {
+                //     label: '状态关闭时的值',
+                //     value: control.inactiveValue,
+                //     placeholder: '状态关闭时的值',
+                //     path: 'control.inactiveValue',
+                //     vShow: ['switch'],
+                //     isNum: true
+                // },
                 // {
                 //   label: '转换格式化值',
                 //   value: config.transform,
diff --git a/src/components/DesignForm/public/form/formItem.vue b/src/components/DesignForm/public/form/formItem.vue
index a95c212..24dd603 100644
--- a/src/components/DesignForm/public/form/formItem.vue
+++ b/src/components/DesignForm/public/form/formItem.vue
@@ -824,7 +824,7 @@ const selectValue = (val:any,list:any) => {
 @ 功能: 选择用户
 */
 const pickUserVal = (val:any) => {
-	console.log("选择用户-2->",val)
+	// console.log("选择用户-2->",val)
 	if(Array.isArray(val)){
 		return val
 	}else{
diff --git a/src/components/DesignForm/tableListPage/formPageCont.vue b/src/components/DesignForm/tableListPage/formPageCont.vue
index dec60fc..18108dd 100644
--- a/src/components/DesignForm/tableListPage/formPageCont.vue
+++ b/src/components/DesignForm/tableListPage/formPageCont.vue
@@ -352,7 +352,6 @@ const jsuanKuandu = () => {
 										</template>
 										
 										
-										
 										<div v-if="mastItem.types=='lowcodeImage'">
 											<el-image style="width: 100px; height: 100px" :src="mastItem.value" fit="cover" />
 										</div>
@@ -369,6 +368,15 @@ const jsuanKuandu = () => {
 										<div v-else-if="mastItem.types=='colorPicker'">
 											<div :style="'width: 30px; height: 30px; background-color: '+mastItem.value" ></div>
 										</div>
+										<div v-else-if="mastItem.types=='switch'">
+											<el-switch
+												v-model="mastItem.value"
+												class="ml-2"
+												:active-value="1"
+												:inactive-value="2"
+												disabled
+											/>
+										</div>
 										<div v-else-if="mastItem.types=='rate'">
 											<el-rate v-model="mastItem.value" disabled />
 										</div>
diff --git a/src/components/DesignForm/tableListPage/index.vue b/src/components/DesignForm/tableListPage/index.vue
index d79a841..e51414b 100644
--- a/src/components/DesignForm/tableListPage/index.vue
+++ b/src/components/DesignForm/tableListPage/index.vue
@@ -254,7 +254,7 @@ const selectionChange = (row: any) => {
 @ 功能: 获取表格头内容
 */
 const columnsFilter = computed(() => {
-	
+	console.log("获取表格头内容",props.data.columns)
     if (!state.columnsCheck?.length) {
       	return props.data.columns
     } else {
@@ -262,6 +262,7 @@ const columnsFilter = computed(() => {
 			return state.columnsCheck.includes(item.prop || item.type)
 		})
     }
+	
 })
 /**
 @ 作者: 秦东
@@ -1126,6 +1127,30 @@ const transformOption = (val: string | number, type?: string) => {
 								{{ scope.column.label }}
 								<tooltip :content="item.help" />
 							</template>
+							
+							<template v-if="item.fieldClass=='select'" #default="scope"> 
+								{{ scope.row[scope.column.property] }}
+							</template>
+							<template v-if="item.fieldClass==''" #default="scope">
+								<!-- {{scope.row[scope.column.property]}}{{item}} -->
+								<el-tag v-if="scope.row[scope.column.property]==1" type="success">启用</el-tag>
+								<el-tag v-if="scope.row[scope.column.property]==2" type="danger">已禁用</el-tag>
+								<el-tag v-if="scope.row[scope.column.property]==3" type="info">已删除</el-tag>
+							</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=='owner'" #default="scope"> 
+								<!-- {{scope.row[scope.column.property]}}{{item}}拥有者 -->
+								{{ scope.row[scope.column.property] }}
+							</template>
+							<template v-if="item.fieldClass=='lowcodeImage'" #default="scope"> 
+								<el-image style="width: 30px; height: 30px" :src="scope.row[scope.column.property]" :fit="fit" />
+							</template>
+							<template v-if="item.fieldClass=='expand-user'" #default="scope"> 
+								{{ scope.row[scope.column.property] }} <!--选择用户-->
+							</template>
 							<template v-if="item.fieldClass=='radio'" #default="scope">
 								<!-- {{scope.row[scope.column.property]}}{{item}} -->
 								{{ judjeRadio(scope.row[scope.column.property],item.options) }}
@@ -1133,7 +1158,7 @@ const transformOption = (val: string | number, type?: string) => {
 							<template v-if="item.fieldClass=='upload'" #default="scope" >
 							<div class="demo-image__error">
 								<el-image
-									style="width: 50px; height: 50px"
+									style="width: 30px; height: 30px"
 									:src="scope.row[scope.column.property]"
 								>
 									<template #error>
diff --git a/src/components/workflow/drwer/approverDrawer.vue b/src/components/workflow/drwer/approverDrawer.vue
index 599feea..f4dd853 100644
--- a/src/components/workflow/drwer/approverDrawer.vue
+++ b/src/components/workflow/drwer/approverDrawer.vue
@@ -115,7 +115,7 @@ const matrixIsShow = ref(false)
 watch(approverConfig1, (val:any)=>{
 	
 	val.value.attribute = val.value.attribute*1
-	// console.log("directormaxlevel",val.value)
+	console.log("directormaxlevel",val.value,val.type)
 	matrixIsShow.value = false
     approverConfig.value = val.value
 	if(val.type == 3){
@@ -131,7 +131,19 @@ watch(approverConfig1, (val:any)=>{
 		}else{
 			nodeTitle.value = "审批人设置"
 		}
-		
+		// if(val.settype == 10){
+		// let sendOrg = {
+		// 		id: 313,
+		// 		idstr: "313",
+		// 		level: 4,
+		// 		all: 1
+		// 	}
+		// 	govthree(sendOrg)
+		// 		.then(({data})=>{
+		// 			console.log("监听审批人设置选项",data)
+		// 			orgList.value = data
+		// 		})
+		// }
 	}
 	isExecutor.value = false
 	// approverConfig.attribute = approverConfig.attribute*1
@@ -397,7 +409,7 @@ const oneEditSet = (val: any) => {
 
 //监听审批人设置选项
 watch(()=>approverConfig.value.settype,(val:any)=>{
-	console.log("监听审批人设置选项",approverConfig.value)
+	// console.log("监听审批人设置选项",approverConfig.value)
 	switch (val) {
 		case 10:
 			let sendOrg = {
@@ -408,8 +420,11 @@ watch(()=>approverConfig.value.settype,(val:any)=>{
 			}
 			govthree(sendOrg)
 				.then(({data})=>{
-					console.log("监听审批人设置选项",data)
+					// console.log("监听审批人设置选项",data)
 					orgList.value = data
+					nextTick(()=>{
+						setOrgTree(approverConfig.value.orgList)
+					})
 				})
 			break;
 	
@@ -424,9 +439,73 @@ watch(()=>approverConfig.value.settype,(val:any)=>{
 @ 时间: 2024-08-08 15:54:07
 @ 功能: 选中的哪个行政组织
 */
-const handleNodeClickOrg = (val:any) => {
-	console.log(val)
+const handleNodeClickOrg = (data: any,threePickAry: any) => {
+	console.log("选中的哪个行政组织----data------->",data)
+	console.log("选中的哪个行政组织----checked------->",threePickAry)
+	console.log("选中的哪个行政组织----halfCheckedKeys------->",threePickAry.halfCheckedKeys)
+	console.log("选中的哪个行政组织----checkedKeys------->",threePickAry.checkedKeys)
+	if(threePickAry.halfCheckedKeys && Array.isArray(threePickAry.halfCheckedKeys) && threePickAry.halfCheckedKeys.length > 0){
+		if(threePickAry.checkedKeys && Array.isArray(threePickAry.checkedKeys) && threePickAry.checkedKeys.length > 0){
+			approverConfig.value.orgList=threePickAry.checkedKeys
+			console.log("选中的哪个行政组织----1------->",approverConfig.value.orgList)
+		}else{
+			approverConfig.value.orgList=[]
+			console.log("选中的哪个行政组织----2------->",approverConfig.value.orgList)
+		}
+	}else{
+		if(threePickAry.checkedKeys && Array.isArray(threePickAry.checkedKeys) && threePickAry.checkedKeys.length > 0){
+			if(data.level <=3){
+				threePickAry.checkedKeys = threePickAry.checkedKeys.filter(item => item !== data.id);
+			}
+			approverConfig.value.orgList=threePickAry.checkedKeys
+			console.log("选中的哪个行政组织----3------->",approverConfig.value.orgList)
+		}else{
+			approverConfig.value.orgList=[]
+			console.log("选中的哪个行政组织----4------->",approverConfig.value.orgList)
+		}
+	}
+	// if(approverConfig.value.orgList && Array.isArray(approverConfig.value.orgList)){
+
+	// 	if(threePickAry.halfCheckedKeys && Array.isArray(threePickAry.halfCheckedKeys) && threePickAry.halfCheckedKeys.length > 0){
+			
+	// 	}else{
+			
+	// 		if(threePickAry.checkedKeys && Array.isArray(threePickAry.checkedKeys) && threePickAry.checkedKeys.length > 0){
+	// 			threePickAry.checkedKeys = threePickAry.checkedKeys.filter(item => item !== data.id);
+	// 			approverConfig.value.orgList=threePickAry.checkedKeys
+	// 		}
+	// 	}
+
+
+	// 	if(checked){
+	// 		if(!approverConfig.value.orgList.includes(data.id)){
+	// 			approverConfig.value.orgList.push(data.id)
+	// 		}
+	// 	}else{
+	// 		console.log("选中的哪个行政组织----1------->",Array.isArray(approverConfig.value.orgList),approverConfig.value.orgList.length > 0)
+	// 		if(Array.isArray(approverConfig.value.orgList) && approverConfig.value.orgList.length > 0){
+	// 			approverConfig.value.orgList = approverConfig.value.orgList.filter(item => item !== data.id);
+	// 		}
+	// 	}
+	// }else{
+	// 	if(threePickAry.halfCheckedKeys && Array.isArray(threePickAry.halfCheckedKeys) && threePickAry.halfCheckedKeys.length > 0){
+	// 		approverConfig.value.orgList=threePickAry.checkedKeys
+	// 	}else{
+	// 		if(threePickAry.checkedKeys && Array.isArray(threePickAry.checkedKeys) && threePickAry.checkedKeys.length > 0){
+	// 			threePickAry.checkedKeys = threePickAry.checkedKeys.filter(item => item !== data.id);
+	// 			approverConfig.value.orgList=threePickAry.checkedKeys
+	// 		}
+	// 	}
+	// }
+	console.log("选中的哪个行政组织----approverConfig.value.orgList------->",approverConfig.value.orgList)
 }
+
+// watch(()=>approverConfig.value.orgList,(val:any)=>{
+// 	setOrgTree(val)
+// },{
+// 	deep:true
+// })
+
 /**
 @ 作者: 秦东
 @ 时间: 2024-08-08 16:07:49
@@ -434,7 +513,12 @@ const handleNodeClickOrg = (val:any) => {
 */
 const setOrgTree = (val:any) => {
 	console.log("设置选项",val)
-	flowOrgTree.value!.setCheckedKeys([val], true)
+	if(Array.isArray(val)){
+		flowOrgTree.value!.setCheckedKeys(val, true)
+	}else{
+		flowOrgTree.value!.setCheckedKeys([val], true)
+	}
+	
 }
 </script>
 <template>
@@ -589,12 +673,12 @@ const setOrgTree = (val:any) => {
 								:props="orgProps"
 								:height="300"
 								node-key="id"
-								:check-strictly="true"
+								show-checkbox
+								:check-strictly="false"
 								:highlight-current="true"
 								:expand-on-click-node="false"
 								:check-on-click-node="true"
-								:default-checked-keys="defaultCheckedKeys"
-								@node-click="handleNodeClickOrg"
+								@check="handleNodeClickOrg"
 							/>
 						</div>
 						<MatrixPage
diff --git a/src/components/workflow/nodeWrap.vue b/src/components/workflow/nodeWrap.vue
index 17d53e5..1e10abe 100644
--- a/src/components/workflow/nodeWrap.vue
+++ b/src/components/workflow/nodeWrap.vue
@@ -44,12 +44,12 @@ let defaultText = computed(() => {
   return placeholderList[props.nodeConfig.type];
 });
 let showText = computed(() => {
-  // console.log("props.nodeConfig.type===>",props.nodeConfig);
+  // console.log("props.nodeConfig.type===>",props.nodeConfig,props.nodeConfig.type);
   if (props.nodeConfig.type == 0)
     return $func.arrToStr(props.flowPermission) || "所有人";
   if (props.nodeConfig.type == 1) return $func.setApproverStr(props.nodeConfig);
 	if (props.nodeConfig.type == 3) return $func.setApproverStr(props.nodeConfig);
-  // console.log("props.nodeConfig.type",props.nodeConfig.type);
+  // console.log("props.nodeConfig.type",props.nodeConfig);
   return $func.copyerStr(props.nodeConfig);
 });
 let isInputList = ref([]);
diff --git a/src/components/workflow/selectBoxs.vue b/src/components/workflow/selectBoxs.vue
index a8000ba..def1f16 100644
--- a/src/components/workflow/selectBoxs.vue
+++ b/src/components/workflow/selectBoxs.vue
@@ -48,7 +48,7 @@ defineProps({
 							<span></span><img v-if="item.icon != ''" :src="item.icon">
 							<img v-if="item.icon == '' && item.iconToBase64 != ''" :src="item.iconToBase64">
 							<img v-if="item.icon == '' && item.iconToBase64 == ''" src="@/assets/images/icon_people.png">
-							{{item.employeeName}}
+							{{item.employeeName}}(No.{{item.number}} AD:{{item.departmentname}})
 						</a>
 					</div>
 				</li>
diff --git a/src/store/workflow/index.js b/src/store/workflow/index.js
index 9513f53..e6be68e 100644
--- a/src/store/workflow/index.js
+++ b/src/store/workflow/index.js
@@ -1,5 +1,5 @@
 /**
- * 缓存工作流节点内容
+ * 缓存工作流节点内容 
  */
 import { defineStore } from 'pinia';
 export const useStore = defineStore('store', {
diff --git a/src/utils/workflow/index.ts b/src/utils/workflow/index.ts
index 7b972f8..a61dfef 100644
--- a/src/utils/workflow/index.ts
+++ b/src/utils/workflow/index.ts
@@ -137,7 +137,7 @@ All.prototype = {
 				}
 			}
 			
-		}else if (nodeConfig.settype == 9){
+		}else if (nodeConfig.settype == 10){
 			return "指定部门负责人"
 		}
     },
diff --git a/src/views/sysworkflow/flow/flowDrawingBoard.vue b/src/views/sysworkflow/flow/flowDrawingBoard.vue
index 017114c..198d4c2 100644
--- a/src/views/sysworkflow/flow/flowDrawingBoard.vue
+++ b/src/views/sysworkflow/flow/flowDrawingBoard.vue
@@ -450,7 +450,7 @@ const clickOpenOrClose = () => {
 							<nodeWrap v-model:nodeConfig="nodeConfig" v-model:flowPermission="flowPermission" />
 							<div class="end-node">
 								<div class="end-node-circle"></div>
-								<div class="end-node-text">流程结束</div>
+								<div class="end-node-text">4</div>
 							</div>
 						</div>
 					</section>
diff --git a/src/views/sysworkflow/flow/flowcanvas.vue b/src/views/sysworkflow/flow/flowcanvas.vue
index 2ce5043..ae802b8 100644
--- a/src/views/sysworkflow/flow/flowcanvas.vue
+++ b/src/views/sysworkflow/flow/flowcanvas.vue
@@ -114,7 +114,7 @@ const zoomSize = (type:number) => {
 					<nodeWrap v-model:nodeConfig="nodeConfig" v-model:flowPermission="flowPermission" />
 					<div class="end-node">
 						<div class="end-node-circle"></div>
-						<div class="end-node-text">流程结束</div>
+						<div class="end-node-text">流程结束1</div>
 					</div>
 				</div>
 			</section>
diff --git a/src/views/sysworkflow/lowcodepage/appCardPage.vue b/src/views/sysworkflow/lowcodepage/appCardPage.vue
index e338cf4..80ec9b2 100644
--- a/src/views/sysworkflow/lowcodepage/appCardPage.vue
+++ b/src/views/sysworkflow/lowcodepage/appCardPage.vue
@@ -353,6 +353,16 @@ const refreshPage = (pageType:string) =>{
 	addFormIsShow.value = false;
 	getFormAppList(props.searchQuery);
 }
+/**
+@ 作者: 秦东
+@ 时间: 2024-08-09 11:28:39
+@ 功能: 翻页
+*/
+const handleCurrentChange = (val:any) =>{
+	// console.log("翻页",val)
+	props.searchQuery.page = val
+	getFormAppList(props.searchQuery);
+}
 </script>
 <template>
 	<div>
diff --git a/src/views/sysworkflow/lowcodepage/appFormList.vue b/src/views/sysworkflow/lowcodepage/appFormList.vue
index 025458f..80e7f6a 100644
--- a/src/views/sysworkflow/lowcodepage/appFormList.vue
+++ b/src/views/sysworkflow/lowcodepage/appFormList.vue
@@ -340,7 +340,8 @@ const editAppCont = (val:string) => {
 @ 时间: 2024-04-24 10:44:42
 @ 功能: 翻页
 */
-const fanyePage = (val: number) =>{
+const fanyePage = (val: any) =>{
+	console.log("翻页",val)
 	pageApp.value = val
 	getFormAppList()
 }
diff --git a/src/views/sysworkflow/lowcodepage/appListPage.vue b/src/views/sysworkflow/lowcodepage/appListPage.vue
index 1ff34b0..6727413 100644
--- a/src/views/sysworkflow/lowcodepage/appListPage.vue
+++ b/src/views/sysworkflow/lowcodepage/appListPage.vue
@@ -345,6 +345,16 @@ const setOften = (val:any) => {
 defineExpose({
 	getFormAppList
 })
+/**
+@ 作者: 秦东
+@ 时间: 2024-08-09 11:28:39
+@ 功能: 翻页
+*/
+const handleCurrentChange = (val:any) =>{
+	// console.log("翻页",val)
+	props.searchQuery.page = val
+	getFormAppList(props.searchQuery);
+}
 </script>
 <template>
 	<div class="listBody">
diff --git a/src/views/sysworkflow/lowcodepage/appPage/appMenus.vue b/src/views/sysworkflow/lowcodepage/appPage/appMenus.vue
index 91ae663..3670492 100644
--- a/src/views/sysworkflow/lowcodepage/appPage/appMenus.vue
+++ b/src/views/sysworkflow/lowcodepage/appPage/appMenus.vue
@@ -319,9 +319,10 @@ const openAppPage = (val:any) =>{
 		<div class="appMenuTitle">
 			<el-space wrap>
 				<svg-icon  prefix="icon" :icon-class="data.svg" @click="setAppMenusSvg(data)" />
-				<el-tooltip :content="node.label" placement="top" effect="dark">
+				<!-- <el-tooltip :content="node.label" placement="top" effect="dark">
 					<el-text class="w-120px mb-2" truncated @click="openAppPage(data)">{{node.label}}</el-text>
-				</el-tooltip>
+				</el-tooltip> -->
+				<el-text class="w-120px mb-2" truncated @click="openAppPage(data)">{{node.label}}</el-text>
 			</el-space>
 			<el-dropdown>
 				<svg-icon class="svgBox"  prefix="icon" icon-class="set" />
diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/appFlow/appFlowSee.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/appFlow/appFlowSee.vue
index 4660d45..7cc91d0 100644
--- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/appFlow/appFlowSee.vue
+++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/appFlow/appFlowSee.vue
@@ -43,7 +43,7 @@ const zoomSize = (type:number) => {
 						<nodeWrap v-model:nodeConfig="props.appFlowInfo.nodeConfig" v-model:flowPermission="props.appFlowInfo.flowPermission" />
 						<div class="end-node">
 							<div class="end-node-circle"></div>
-							<div class="end-node-text">流程结束</div>
+							<div class="end-node-text">流程结束3</div>
 						</div>
 					</div>
 		</section>
diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageFlow.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageFlow.vue
index d251a47..7f91ff1 100644
--- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageFlow.vue
+++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageFlow.vue
@@ -167,6 +167,7 @@ const getFlowVerList = ()=>{
 
 				}
 			}
+			// console.log("获取工作流版本列表---4-->",isRead.value);
 			// console.log("获取工作流版本列表---1-->",activeTabs.value);
 			// console.log("获取工作流版本列表---2-->",enableFlow.value);
 			// console.log("获取工作流版本列表---3-->",enableVersion.value);
@@ -226,7 +227,7 @@ const clearCanvas = (isOk?:any) =>{
 */
 const initWorkFlowData = async() => {
 	let { data } = await initializeWorkFlow({name:state.value.formData.form.formName})
-	// console.log("data-=------>",data)
+	console.log("data-=------>",data)
 	processConfig.value = data;
 	let {
 		nodeConfig:nodes,
@@ -579,7 +580,7 @@ const closwFormFlow = () => {
 						<nodeWrap v-model:nodeConfig="nodeConfig" v-model:flowPermission="flowPermission" />
 						<div class="end-node">
 							<div class="end-node-circle"></div>
-							<div class="end-node-text">流程结束</div>
+							<div class="end-node-text">流程结束5</div>
 						</div>
 					</div>
 				</section>
diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageForm.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageForm.vue
index 4993ccd..22689cc 100644
--- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageForm.vue
+++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageForm.vue
@@ -369,7 +369,7 @@ const saveAppFormData = () => {
 	createAppForm(sendData)
 		.then((data:any) => {
 			state.value.loading = false
-			console.log("写入自建应用App表单--->",data)
+			// console.log("写入自建应用App表单--->",data)
 			// appPageKey.value = data.data.customerFormCont.id
 			// appPageKey.set(data.data.customerFormCont.id.toString())
 			versionId.value = data.data.formVersion.id.toString()
@@ -543,7 +543,48 @@ function optionsValue3Get3(data: any,fieldName: string){
 	}
 }
 
-
+// 弹窗确认
+const dialogConfirm = (editVal: string) => {
+    // 生成脚本预览和导入json，都是将编辑器内容更新至state.formData
+    try {
+      	if (typeof drawer.callback === 'function') {
+			// callback
+			const newObj =
+			drawer.codeType === 'json'? string2json(editVal): stringToObj(editVal)
+			drawer.callback(newObj)
+      	} else {
+			switch (drawer.type) {
+				case 'css':
+					// 表单属性－编辑表单样式
+					if (!state.value.formData.config) {
+						state.value.formData.config = {}
+					}
+					state.value.formData.config.style = editVal
+					break
+				case 'dict':
+					state.value.formDict = string2json(editVal)
+					break
+				case 'beforeRequest':
+				case 'beforeSubmit':
+				case 'afterResponse':
+				case 'afterSubmit':
+				case 'closeSubmit':
+				case 'change':
+					if (!state.value.formData.events) {
+						state.value.formData.events = {}
+					}
+					state.value.formData.events[drawer.type] = stringToObj(editVal)
+					break
+				default:
+					state.value.formData = stringToObj(editVal)
+			}
+      	}
+      	dialogCancel()
+    } catch (res) {
+		// console.log(res.message)
+		//ElMessage.error(res.message)
+    }
+}
 </script>
 <template>
 	<el-aside class="asideBox leftBox">
diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue
index a267ae0..5267d75 100644
--- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue
+++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue
@@ -271,7 +271,7 @@ const jieForm = () => {
 	if(props.appPageKey != ""){
 		gainFormTableField({id:props.appPageKey.toString()})
 			.then((data)=>{
-				console.log('解析表单--->',data)
+				// console.log('解析表单--->',data)
 				formTableField.masterTable=data.data.masterTable
 				formTableField.sunTable=data.data.sunTable
 			})
@@ -408,7 +408,7 @@ const getListInfo = () => {
 			
 
 			zhuDaunIsTrue.value = false
-			console.log("========>",state.tableData)
+			// console.log("========>",state.tableData)
 			if(state.searchData && state.searchData.length>0) {
 				if(formTableField.masterTable && formTableField.masterTable.length > 0){
 					state.searchData.forEach((itemCol:any)=>{
@@ -600,6 +600,7 @@ const tableListFieldClick = (val:any[]) => {
 			}
 		}
 	}
+	console.log("state.tableData.columns",state.tableData.columns)
 }
 /**
 @ 作者: 秦东
@@ -782,6 +783,48 @@ const tabsView = (val:any) => {
 */
 const showCollapse = () => {
 	
+}
+// 弹窗确认
+const dialogConfirm = (editVal: string) => {
+    // 生成脚本预览和导入json，都是将编辑器内容更新至state.formData
+    try {
+      	if (typeof drawer.callback === 'function') {
+			// callback
+			const newObj =
+			drawer.codeType === 'json'? string2json(editVal): stringToObj(editVal)
+			drawer.callback(newObj)
+      	} else {
+			switch (drawer.type) {
+				case 'css':
+					// 表单属性－编辑表单样式
+					if (!state.value.formData.config) {
+						state.value.formData.config = {}
+					}
+					state.value.formData.config.style = editVal
+					break
+				case 'dict':
+					state.value.formDict = string2json(editVal)
+					break
+				case 'beforeRequest':
+				case 'beforeSubmit':
+				case 'afterResponse':
+				case 'afterSubmit':
+				case 'closeSubmit':
+				case 'change':
+					if (!state.value.formData.events) {
+						state.value.formData.events = {}
+					}
+					state.value.formData.events[drawer.type] = stringToObj(editVal)
+					break
+				default:
+					state.value.formData = stringToObj(editVal)
+			}
+      	}
+      	dialogCancel()
+    } catch (res) {
+		// console.log(res.message)
+		//ElMessage.error(res.message)
+    }
 }
 </script>
 <template>
diff --git a/src/views/sysworkflow/lowcodepage/index.vue b/src/views/sysworkflow/lowcodepage/index.vue
index 0c239ce..a077f02 100644
--- a/src/views/sysworkflow/lowcodepage/index.vue
+++ b/src/views/sysworkflow/lowcodepage/index.vue
@@ -80,7 +80,10 @@ const gainFormGroup = () => {
 						
 					})
 				}
-			}			
+			}	
+			nextTick(()=>{
+				searchSub()
+			})		
 		})
 		
 }
@@ -161,6 +164,7 @@ const handleCommand = (command: string,groupId: string) => {
 			})
 		
 	}else{
+		groupKey.value = ""
 		addFormGroupIsShow.value = true
 		drawerGroupWith.value = 400
 	}
@@ -187,6 +191,7 @@ const refreshPage = (pageType:string) =>{
 		addFormGroupIsShow.value = false;
 	}
 	gainFormGroup()
+	
 }
 
 /**
diff --git a/src/views/sysworkflow/lowcodepage/pageList.vue b/src/views/sysworkflow/lowcodepage/pageList.vue
index da410bf..b6ec4c4 100644
--- a/src/views/sysworkflow/lowcodepage/pageList.vue
+++ b/src/views/sysworkflow/lowcodepage/pageList.vue
@@ -413,60 +413,61 @@ const tableListFieldClick = (val:any[]) => {
 	// console.log("列表字段处理-->",val)
 	// zhuDaunIsTrue.value = true
 	if(zhuDaunIsTrue.value == true){
-	if(val.length > 0){
-		if(state.tableData.columns.length > 0){	//判断列表是否有数据
-			val.forEach((item:tableButton)=>{
-				let isTrue = true;
-				state.tableData.columns.forEach((itemTab:tableButton)=>{
-					if(item.id == itemTab.id){
-						// console.log("列表字段处理-111->",val)
-						isTrue = false;
+		if(val.length > 0){
+			if(state.tableData.columns.length > 0){	//判断列表是否有数据
+				val.forEach((item:tableButton)=>{
+					let isTrue = true;
+					state.tableData.columns.forEach((itemTab:tableButton)=>{
+						if(item.id == itemTab.id){
+							// console.log("列表字段处理-111->",val)
+							isTrue = false;
+						}
+					});
+					if(isTrue){
+						state.tableData.columns.push(item)
 					}
-				});
-				if(isTrue){
+				})
+			}else{ //列表无数据,直接新增
+				val.forEach((item:any)=>{
 					state.tableData.columns.push(item)
-				}
-			})
-		}else{ //列表无数据,直接新增
-			val.forEach((item:any)=>{
-				state.tableData.columns.push(item)
-			})
-		}
-		//此处往下是处理列表中有为选中的字段
-		let delField = []
-		formTableField.masterTable.forEach((item:tableButton)=>{
-			let isTrue = true;
-			val.forEach((itemVal:tableButton)=>{
-				if(item.id == itemVal.id){
-					isTrue = false
-				}
-			})
-			if(isTrue){
-				delField.push(item.id)
+				})
 			}
-		});
-		if(delField.length > 0){
-			state.tableData.columns.forEach((itemTab:tableButton,index:number)=>{
-				delField.forEach((item:string)=>{
-					if(item == itemTab.id){
-						state.tableData.columns.splice(index,1)			//删除列表中已经存在的字段
+			//此处往下是处理列表中有为选中的字段
+			let delField = []
+			formTableField.masterTable.forEach((item:tableButton)=>{
+				let isTrue = true;
+				val.forEach((itemVal:tableButton)=>{
+					if(item.id == itemVal.id){
+						isTrue = false
 					}
 				})
-				
+				if(isTrue){
+					delField.push(item.id)
+				}
 			});
-		}
-	}else{
-		if(state.tableData.columns.length > 0){
-			formTableField.masterTable.forEach((item:tableButton)=>{
+			if(delField.length > 0){
 				state.tableData.columns.forEach((itemTab:tableButton,index:number)=>{
-					if(item.id == itemTab.id){
-						state.tableData.columns.splice(index,1)			//删除列表中已经存在的字段
-					}
+					delField.forEach((item:string)=>{
+						if(item == itemTab.id){
+							state.tableData.columns.splice(index,1)			//删除列表中已经存在的字段
+						}
+					})
+					
 				});
-			});
+			}
+		}else{
+			if(state.tableData.columns.length > 0){
+				formTableField.masterTable.forEach((item:tableButton)=>{
+					state.tableData.columns.forEach((itemTab:tableButton,index:number)=>{
+						if(item.id == itemTab.id){
+							state.tableData.columns.splice(index,1)			//删除列表中已经存在的字段
+						}
+					});
+				});
+			}
 		}
 	}
-}
+	console.log("state.tableData.columns",state.tableData.columns)
 }
 
 const container = ref()
@@ -874,7 +875,48 @@ const getListInfo = () => {
 }
 
 const showCollapse = () => {}
-
+// 弹窗确认
+const dialogConfirm = (editVal: string) => {
+    // 生成脚本预览和导入json，都是将编辑器内容更新至state.formData
+    try {
+      	if (typeof drawer.callback === 'function') {
+			// callback
+			const newObj =
+			drawer.codeType === 'json'? string2json(editVal): stringToObj(editVal)
+			drawer.callback(newObj)
+      	} else {
+			switch (drawer.type) {
+				case 'css':
+					// 表单属性－编辑表单样式
+					if (!state.value.formData.config) {
+						state.value.formData.config = {}
+					}
+					state.value.formData.config.style = editVal
+					break
+				case 'dict':
+					state.value.formDict = string2json(editVal)
+					break
+				case 'beforeRequest':
+				case 'beforeSubmit':
+				case 'afterResponse':
+				case 'afterSubmit':
+				case 'closeSubmit':
+				case 'change':
+					if (!state.value.formData.events) {
+						state.value.formData.events = {}
+					}
+					state.value.formData.events[drawer.type] = stringToObj(editVal)
+					break
+				default:
+					state.value.formData = stringToObj(editVal)
+			}
+      	}
+      	dialogCancel()
+    } catch (res) {
+		// console.log(res.message)
+		//ElMessage.error(res.message)
+    }
+}
 </script>
 <template>
 	<div class="design-containers design-table" v-loading="pageLoading">
diff --git a/src/views/sysworkflow/lowcodepage/workFlow.vue b/src/views/sysworkflow/lowcodepage/workFlow.vue
index 409cd1e..2c6bf98 100644
--- a/src/views/sysworkflow/lowcodepage/workFlow.vue
+++ b/src/views/sysworkflow/lowcodepage/workFlow.vue
@@ -527,7 +527,7 @@ onMounted(()=>{
 						<nodeWrap v-model:nodeConfig="nodeConfig" v-model:flowPermission="flowPermission" />
 						<div class="end-node">
 							<div class="end-node-circle"></div>
-							<div class="end-node-text">流程结束</div>
+							<div class="end-node-text">流程结束2</div>
 						</div>
 					</div>
 				</section>
diff --git a/src/widget/systemunit/deptOrgPage.vue b/src/widget/systemunit/deptOrgPage.vue
index a578772..51e4cf4 100644
--- a/src/widget/systemunit/deptOrgPage.vue
+++ b/src/widget/systemunit/deptOrgPage.vue
@@ -215,7 +215,7 @@ onMounted(()=>{
 		<template #label v-else>
 			<span :style="getFormItemLableStyle(configStyle)" >{{ getLabel(data.item) }}</span>
 		</template>
-		<div>
+		
 			<el-tree-select
 				v-loading="orgLoading"
 				element-loading-text="Loading..."
@@ -227,10 +227,10 @@ onMounted(()=>{
 				node-key="id"
 				clearable
 				check-strictly
-				:disabled="type == 4"
-				style="width: 240px"
+				
+				disabled
 			/>
-		</div>
+		
 	</el-form-item>
 </template>
 <style  lang='scss' scoped>
diff --git a/src/widget/systemunit/ownerPage.vue b/src/widget/systemunit/ownerPage.vue
index ca60a1e..9d01857 100644
--- a/src/widget/systemunit/ownerPage.vue
+++ b/src/widget/systemunit/ownerPage.vue
@@ -217,7 +217,7 @@ const orgTreeProps ={
 		<template #label v-else>
 			<span :style="getFormItemLableStyle(configStyle)" >{{ getLabel(data.item) }}</span>
 		</template>
-		<div>
+		
 			<el-tree-select
 				v-loading="peopleLoading"
 				element-loading-text="Loading..."
@@ -229,9 +229,9 @@ const orgTreeProps ={
 				node-key="id"
 				clearable
 				:disabled="type == 4"
-				style="width: 240px"
+			
 			/>
-		</div>
+
 	</el-form-item>
 </template>
 <style  lang='scss' scoped>