From ed080fcbb1fe76222a6b12da27ea1508baadb67c Mon Sep 17 00:00:00 2001
From: herenshan112 <hreenshan112@163.com>
Date: Mon, 22 Dec 2025 16:56:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=98=BE=E7=A4=BA=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/lowCode/form/type.ts                 |   3 +-
 src/utils/pinia/stores/modules/userOrders.ts |  16 +-
 src/views/common/header/formTable/header.vue |  12 +-
 src/views/formTable/page/cardPage.vue        |   9 +-
 src/views/formTable/page/cardPageNew.vue     |  10 +-
 src/views/formTable/taskList.vue             | 297 +++++++++++--------
 src/views/formTable/taskListPage.vue         |   8 +-
 src/views/login/index.vue                    |  19 +-
 8 files changed, 223 insertions(+), 151 deletions(-)

diff --git a/src/api/lowCode/form/type.ts b/src/api/lowCode/form/type.ts
index 8503d13..1bd983f 100644
--- a/src/api/lowCode/form/type.ts
+++ b/src/api/lowCode/form/type.ts
@@ -42,7 +42,8 @@ export interface tableFormStruct {
       columns: any[];
       config: Object;
 	  controlBtn:any[];
-	  operateBtn:any[]
+	  operateBtn:any[];
+	  columnsCheck?:any;
     },
     searchData: any[];
     loading: boolean;
diff --git a/src/utils/pinia/stores/modules/userOrders.ts b/src/utils/pinia/stores/modules/userOrders.ts
index 0b293eb..f198e97 100644
--- a/src/utils/pinia/stores/modules/userOrders.ts
+++ b/src/utils/pinia/stores/modules/userOrders.ts
@@ -28,15 +28,23 @@ export const userStror = defineStore("user",() => {
             loginApi(val)
                 .then((data:any) => {
                     console.log("登陆使用",data);
-                    userKeying.value = data.data.key;
-                    userToken.value = data.data.token;
-                    tokenIng.value = data.data.key;
+                    if(data.code != 0){
+                        ElMessage.error(data.msg ||"登录失败");
+                        reject(data);
+                        return data
+                    }else{
+                        ElMessage.success(data.msg ||"登录成功");
+                        userKeying.value = data.data.key;
+                        userToken.value = data.data.token;
+                        tokenIng.value = data.data.key;
+                    }
+                    
 
 
                     console.log("登陆使用---userKeying----->",userKeying.value,"===>", data.data.key);
                     console.log("登陆使用---userToken----->",userToken.value,"===>", data.data.token);
                     console.log("登陆使用---tokenIng----->",tokenIng.value,"===>", data.data.key);
-                    resolve();
+                    resolve(data);
                     return data
                 })
                 .catch((error:any) => {
diff --git a/src/views/common/header/formTable/header.vue b/src/views/common/header/formTable/header.vue
index 0eb8f36..bb851ee 100644
--- a/src/views/common/header/formTable/header.vue
+++ b/src/views/common/header/formTable/header.vue
@@ -4,7 +4,7 @@
 @ 备注: 自定义应用头部
 -->
 <script lang='ts' setup>
-import { useRouter } from 'vue-router'
+import { LocationQueryValueRaw, useRouter } from 'vue-router'
 import { menuTree } from '@/api/lowCode/type'
 
 const router = useRouter()
@@ -33,8 +33,9 @@ const props = defineProps({
 //操作主页面跳转
 const emits = defineEmits(["routerPage"])
 const activeIndex = ref(1)
-const menuList = ref<menuTree[]>(props.menuTree)
-const menuDrop = ref(null) //下拉菜单属性
+// const menuList = ref<menuTree[]>(props.menuTree)
+const menuListTree = computed(() => props.menuTree)
+// const menuDrop = ref(null) //下拉菜单属性
 /**
 @ 作者: 秦东
 @ 时间: 2024-10-30 15:09:45
@@ -43,6 +44,9 @@ const menuDrop = ref(null) //下拉菜单属性
 
 
 interface Tree {
+  type: number
+  isLock: number
+  isMain: LocationQueryValueRaw | LocationQueryValueRaw[]
   label: string
   children?: Tree[]
 }
@@ -50,7 +54,7 @@ interface Tree {
 const handleNodeClick = (data: Tree) => {
     console.log(data)
     if(data.type!=1){
-        menuDrop.value.handleClose()
+        // menuDrop.value.handleClose()
         if(data.isLock==1){
             router.push({ path: "/form_table/taskList",query:{id: props.appKey,class:data.isMain}});
         }
diff --git a/src/views/formTable/page/cardPage.vue b/src/views/formTable/page/cardPage.vue
index 4c6b392..f63ef8d 100644
--- a/src/views/formTable/page/cardPage.vue
+++ b/src/views/formTable/page/cardPage.vue
@@ -74,7 +74,7 @@ const appContent = reactive<any>({
 })
 const lookInfo = ref<any>({})
 const loadingList = ref(false)  //是否显示加载
-const taskScrollbar = ref(null) //滚动条
+const taskScrollbar = ref() //滚动条
 const loadText = ref("数据加载中，请稍后......")
 const _scrollTop = ref<number>(0)
 const emits = defineEmits(['update:pageIdAry'])
@@ -82,7 +82,8 @@ const pageIdAry = ref<any[]>([])
 const tableDataList = ref<any[]>([]); // 表格行数据
 const state = reactive({
     page:1,
-    pagesize: props.stateListInfo.config?.pageSize || 2
+    pagesize: props.stateListInfo.config?.pageSize || 2,
+    loading:false
 })
 const isOne = ref(props.stateListInfo.isOne)
 const pageTotal = ref<number>(0) //数据总量
@@ -275,7 +276,7 @@ const columns =  computed({
 	get() {
 		return props.stateListInfo.tableData.columns
 	},
-	set(val: formStruct) {
+	set(val: any) {
 		// emits('update:state', val)
 	}
 });
@@ -724,7 +725,7 @@ const delTask = (val:any) => {
 			id: [val.masters_key],
 			isTrue: 2,
 		};
-		softDeletion(sendData).then((data) => {
+		softDeletion(sendData).then((data:any) => {
 			ElNotification({
 				title: "系统提示！",
 				message: data.mag ? data.mag : "删除成功",
diff --git a/src/views/formTable/page/cardPageNew.vue b/src/views/formTable/page/cardPageNew.vue
index 2a81677..f7e83a6 100644
--- a/src/views/formTable/page/cardPageNew.vue
+++ b/src/views/formTable/page/cardPageNew.vue
@@ -5,14 +5,11 @@
 -->
 <script lang='ts' setup>
 import request from '@/utils/axios/index'
-import { gainAppPageInfo,judgeSubmitCancel,gainFormPageListCont,recalSendMsg,tableCusterField } from '@/api/lowCode/form/index'
-import{ json2string,string2json } from '@/utils/lowCode/form'
+import { recalSendMsg,tableCusterField } from '@/api/lowCode/form/index'
+import{ json2string } from '@/utils/lowCode/form'
 import { softDeletion,retractRunWorkFlow } from '@/api/lowCode/taskapi/management'
 
-import { Picture as IconPicture } from '@element-plus/icons-vue'
-import SearchSelect from '@/components/lowCode/selectSearch.vue'
 import AppPageInfo  from '@/views/formTable/pageInfo.vue'
-import { EpPropMergeType } from 'element-plus/es/utils/index.mjs'
 
 const props = defineProps({
 	
@@ -476,10 +473,12 @@ const delTask = (val:any) => {
             <el-card v-for="item in listPage" :key="item.id" class="taskCardBox"  shadow="always">
                 <template #header>
                     <div class="card-header contentBetween">
+                      
                         <div>
                             <el-checkbox  v-if="item.isMyMsg" label="" :value="item.masters_key"  />
                             <span class="cardInfoTitle">{{ item.title }}</span>
                         </div>
+                        
                         <div v-if="item.flowIsOpens==1" class="carHeadStaus">
                             
                             <el-tag  v-if="item.taskStatus==1" type="warning">草稿</el-tag>
@@ -487,6 +486,7 @@ const delTask = (val:any) => {
                             <el-tag  v-if="item.taskStatus==3" type="primary">审批中</el-tag>
                             <el-tag  v-if="item.taskStatus==4" type="info">归档</el-tag>
                         </div>
+                        
                     </div>
                 </template>
                 
diff --git a/src/views/formTable/taskList.vue b/src/views/formTable/taskList.vue
index 1bad77d..83c5e40 100644
--- a/src/views/formTable/taskList.vue
+++ b/src/views/formTable/taskList.vue
@@ -19,38 +19,45 @@ import Header from '@/views/common/header/formTable/header.vue'
 import SearchSelect from '@/components/lowCode/selectSearch.vue'
 
 import  CardPage  from '@/views/formTable/page/cardPage.vue'
+import { getFieldRecord } from '@/api/lowCode'
+import { tableButton } from '@/api/common/tableButton'
+import { FormInstance } from 'element-plus'
 
 
 const route = useRoute()
 const router = useRouter()
 
-const appKey = ref<number>(route.query.key)
-const appId = ref<number>(route.query.id)
-const taskTitle = ref<number>(route.query.title)
-const taskId = ref<number>(route.query.formid)
-const taskKey = ref<number>(route.query.formKey)
+const appKey = ref<string>(String(route.query.key))
+const appId = ref<string>(String(route.query.id))
+const taskTitle = ref<string>(String(route.query.title))
+const taskId = ref<string>(String(route.query.formid))
+const taskKey = ref<string>(String(route.query.formKey))
 const listLoading = ref(false)
-const appInitData = ref<appPageDataInit>("")
+const appInitData = ref<appPageDataInit>()
 const mastesformjson = ref("")	//
-const activeName = ref('1')
+const activeName = ref('1')       
+const taskScrollbar = ref() //滚动条
+const loadingList = ref(false)  //是否显示加载 
+const loadText = ref("数据加载中，请稍后......")       
+const _scrollTop = ref<number>(0)                                      
 //表单列表
 const stateList = reactive<tableFormStruct>({
     tableData: {
-      // tableProps: {}, //表格所有参数
-      columns: [],
-      config: {},
-	  controlBtn:[],
-	  operateBtn:[]
+        // tableProps: {}, //表格所有参数
+        columns: [],
+        config: {},
+        controlBtn: [],
+        operateBtn: []
     },
     searchData: [],
     loading: false,
     attrObj: {},
     config: {
-		pageSize:10,
-		searchIsShow:true,
-		searchFormIsShow:true,
-		openPageMode:"drawer"
-	},
+        pageSize: 10,
+        searchIsShow: true,
+        searchFormIsShow: true,
+        openPageMode: "drawer"
+    },
     tagList: {},
     formId: taskId || '',
     formList: [], // 所有可选表单数据源
@@ -59,88 +66,88 @@ const stateList = reactive<tableFormStruct>({
     previewVisible: false,
     tabsName: 'second',
     formFieldList: [], // 表单数据源所有可选字段
-	formApi:{
-		type:"1",
-		addApiUrl:"",
-		editApiUrl:"",
-		delApiUrl:"",
-		lookApiUrl:""
-	},
+    formApi: {
+        type: "1",
+        addApiUrl: "",
+        editApiUrl: "",
+        delApiUrl: "",
+        lookApiUrl: ""
+    },
     dict: {},
     refreshTable: true,
-	view:{
-		list:{
-			status:true,
-			isClick:false,
-			form:{
-				sortWord:"",
-				sortClass:1,
-				title:[]
-			}
-		},
-		date:{
-			status:false,
-			isClick:false,
-			form:{
-				startTime:"",
-				endTime:"",
-				dayType:1,
-				title:[]
-			}
-		}
-		,
-		time:{
-			status:false,
-			isClick:false,
-			form:{
-				sortWord:"",
-				sort:1,
-				title:[]
-			}
-		}
-		,
-		gantt:{
-			status:false,
-			isClick:false,
-			form:{
-				startTime:"",
-				endTime:"",
-				dayType:2,
-				sortWord:"",
-				sort:1,
-				title:[]
-			}
-		}
-		,
-		map:{
-			status:false,
-			isClick:false,
-			form:{
-				mapWord:"",
-				sortWord:"",
-				sort:1,
-				title:[]
-			}
-		},
-		card:{
-			status:false,
-			isClick:false,
-			form:{
-				sort:1,
-				sortWord:"",
-				imgWork:"",
-				imgWidth:50,
-				imgHeight:50,
-				imgBorderRadius:5,
-				imgPadding:2,
-				titleWork:"",
-				describe:"",
-				ranks:3,
-				title:[]
-			}
-		}
-	}
-		
+    view: {
+        list: {
+            status: true,
+            isClick: false,
+            form: {
+                sortWord: "",
+                sortClass: 1,
+                title: []
+            }
+        },
+        date: {
+            status: false,
+            isClick: false,
+            form: {
+                startTime: "",
+                endTime: "",
+                dayType: 1,
+                title: []
+            }
+        },
+
+        time: {
+            status: false,
+            isClick: false,
+            form: {
+                sortWord: "",
+                sort: 1,
+                title: []
+            }
+        },
+
+        gantt: {
+            status: false,
+            isClick: false,
+            form: {
+                startTime: "",
+                endTime: "",
+                dayType: 2,
+                sortWord: "",
+                sort: 1,
+                title: []
+            }
+        },
+
+        map: {
+            status: false,
+            isClick: false,
+            form: {
+                mapWord: "",
+                sortWord: "",
+                sort: 1,
+                title: []
+            }
+        },
+        card: {
+            status: false,
+            isClick: false,
+            form: {
+                sort: 1,
+                sortWord: "",
+                imgWork: "",
+                imgWidth: 50,
+                imgHeight: 50,
+                imgBorderRadius: 5,
+                imgPadding: 2,
+                titleWork: "",
+                describe: "",
+                ranks: 3,
+                title: []
+            }
+        }
+    },
+    isOpen: false
 })
 
 /**
@@ -317,8 +324,8 @@ const unitIsShow = (val:tableButton,unitName:string) => {
 @ 时间: 2024-11-04 13:59:42
 @ 功能: 功能按钮动作
 */
-const setUpClick = (val:string,id:string) => {
-    console.log("功能按钮动作",val,"----id----->",id,"-----formId---->")
+const setUpClick = (val:any) => {
+    console.log("功能按钮动作",val,"----id----->-----formId---->")
     if(val.key == "newAdd"){
         
     }else{
@@ -332,7 +339,7 @@ const setUpClick = (val:string,id:string) => {
                     id: pageIdAry.value,
                     isTrue: 2,
                 };
-                softDeletion(sendData).then((data) => {
+                softDeletion(sendData).then((data: { mag: any }) => {
                     // console.log('cancel!',data)
                     ElNotification({
                         title: "温馨提示！",
@@ -483,11 +490,76 @@ const getPageData = () => {
 const openLook = (val:any) => {
     console.log("查看表单详情--->",val)
 }
+const transformOption = (val:any,dataVal:any) => {}
 
+/**
+@ 作者: 秦东
+@ 时间: 2025-12-22 11:10:54
+@ 功能: 监听滚动条状态
+*/
+const onHandleAppTaskScroll = (event:any) => {
+    console.log("onHandleScroll",loadingList.value, event)
+    if (loadingList.value === true) {
+        return
+    }
+    let wrapRef = taskScrollbar.value.wrapRef
+    taskScrollbar.value.moveY = wrapRef.scrollTop * 100 / wrapRef.clientHeight
+    taskScrollbar.value.moveX = wrapRef.scrollLeft * 100 / wrapRef.clientWidth
+    let poor = wrapRef.scrollHeight - wrapRef.clientHeight
+    if (event.scrollTop + 2 >= poor) {
+        _scrollTop.value = event.scrollTop
+        
+        loadingList.value=true
+        state.currentPage++
+        // console.log("searchInfo.page",searchInfo.page++)
+        getPageData()
+    }
+}
+const requeryList = () => {
+    console.log("重置查询列表:")
+    state.currentPage = 1
+    tableDataList.value = []
+	nextTick(() => {
+        getPageData()
+    })
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-11-06 14:23:25
+@ 功能: 删除按钮
+*/
+const delTask = (val:any) => {
+    console.log("删除按钮", val,val.masters_key)
+    ElMessageBox.confirm(
+		'是否要删除此信息?已经删除将不可恢复！请慎重操作',
+		'删除提示',
+		{
+			confirmButtonText: '确定',
+			cancelButtonText: '取消',
+			type: 'warning',
+		}
+	)
+	.then(() => {
+		let sendData = {
+			id: [val.masters_key],
+            tableKey:val.tableKey,
+			isTrue: 2,
+		};
+		softDeletion(sendData).then((data: any) => {
+			ElNotification({
+				title: "系统提示！",
+				message: data.mag ? data.mag : "删除成功",
+				type: "success",
+			});
+            requeryList()
+		})
+	})
+    .catch(() => {})
+}
 </script>
 <template>
     <div>
-        <Header :header-title="taskTitle" :app-key="appKey" menu-tree="" :call-back-click="true" />
+        <Header :header-title="taskTitle" :app-key="appKey"  :call-back-click="true" />
         <div ref="container"  class="table-list-comm">
             <div class="contentBetween">
                 
@@ -502,7 +574,7 @@ const openLook = (val:any) => {
                         {{ item.label }}
                     </el-button>
                 </div>
-                <SvgIcon icon-class="search" :size="20" @click="openSearch" />
+                <SvgIcon icon-class="search" :size="'20px'" @click="openSearch" />
 
                 <el-drawer
                     v-model="drawerOpen"
@@ -523,7 +595,7 @@ const openLook = (val:any) => {
                                         v-model="item.value"
                                         type="datetime"
                                         :placeholder="'请选择'+item.label"
-                                        :shortcuts="shortcuts"
+
                                         v-if="unitIsShow(item,'time')"
                                     />
                                     <SearchSelect
@@ -648,24 +720,9 @@ const openLook = (val:any) => {
                     </table>
                 </el-card>
 
-                <el-card  class="taskCardBox" shadow="always">
-                    <table>
-                        <tbody  @click="openLook(item)">
-                            <tr>
-                                <td class="cardInfoTitle">发起人：</td>
-                                <td class="cardInfoTitle"></td>
-                            </tr> 
-                        </tbody>
-                    </table>
-                    <div class="cardFoot contentBetween">
-                        <el-checkbox label="" value="Value B" />
-                        <el-button-group>
-                            <el-button type="warning" size="small">修改</el-button>
-                            <el-button type="danger" size="small" @click="delTask(item)">删除</el-button>
-                        </el-button-group>
-                    </div>
-                </el-card>
+                                                                                                                                                                                                                       
             </el-checkbox-group>
+             <div v-if="loadingList" class="loading">{{loadText}}</div>
         </el-scrollbar>                                                                                              
     </div>
 </template> 
diff --git a/src/views/formTable/taskListPage.vue b/src/views/formTable/taskListPage.vue
index 1b8369d..f233d23 100644
--- a/src/views/formTable/taskListPage.vue
+++ b/src/views/formTable/taskListPage.vue
@@ -6,14 +6,12 @@
 <script lang='ts' setup>
 import { useRoute,useRouter } from 'vue-router'
 import request from '@/utils/axios/index'
-import { appPageDataInit } from '@/api/common/type'
 import { tableFormStruct } from '@/api/lowCode/form/type'
-import { gainAppPageInfo,judgeSubmitCancel,gainFormPageListCont } from '@/api/lowCode/form/index'
+import { gainAppPageInfo,judgeSubmitCancel } from '@/api/lowCode/form/index'
 import { inputUnit,timeUnit,choiceUnit,switchUnit,orgUnit,checkboxUnit } from '@/api/lowCode/form/fieldUnit'
-import { useDesignFormStore } from '@/utils/pinia/stores/lowCode/designForm'
-import{ json2string,string2json,stringToObj } from '@/utils/lowCode/form'
+import{ string2json,stringToObj } from '@/utils/lowCode/form'
 import{ submitButton,submitFlowButton } from '@/utils/lowCode/const'
-import { appWorkFlow,nodePoweInfo,powerAryInfo } from '@/api/workFlow/type'
+import { appWorkFlow,nodePoweInfo } from '@/api/workFlow/type'
 import { softDeletion } from '@/api/lowCode/taskapi/management'
 
 import SvgIcon from '@/components/svgIcon/index.vue'
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 4eb0520..f004edf 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -101,7 +101,8 @@ const submitLoginForm = () => {
     loginForm.value.validate((valid: any) => {
         if (valid) {
             userPinia.login(loginInfo)
-                .then(()=>{
+                .then((data:any)=>{
+                    console.log("登陆输出：",data);
                     const query: LocationQuery = route.query;
 
                     const redirect = (query.redirect as LocationQueryValue) ?? "/";
@@ -141,14 +142,16 @@ const submitLoginForm = () => {
 */
 const judgingEnvironment = () => {
     let huanjing =  window.navigator.userAgent.toLowerCase()
-    if( (huanjing.match(/MicroMessenger/i) == 'micromessenger') && (huanjing.match(/wxwork/i) == 'wxwork') ){
-        return 3;
-    }else if( huanjing.match(/MicroMessenger/i) == 'micromessenger' ){
-        return 2;
+    const isWechat = huanjing.match(/micromessenger/i) !== null
+    const isWxWork = huanjing.match(/wxwork/i) !== null
+    
+    if( isWechat && isWxWork ){
+        return 3; // 企业微信环境
+    }else if( isWechat ){
+        return 2; // 微信环境
     }else{
-        return 1;
+        return 1; // 其他环境
     }
-    return 3;
 }
 </script>
 <template>
@@ -171,7 +174,7 @@ const judgingEnvironment = () => {
                     <el-input v-model="loginInfo.username" clearable />
                 </el-form-item>
                 <el-form-item label="密码：" prop="password">
-                    <el-input v-model="loginInfo.password" type="password" autocomplete="off" clearable  />
+                    <el-input v-model="loginInfo.password" type="password" autocomplete="off" clearable show-password />
                 </el-form-item>
                 <el-form-item label="验证码：" prop="captcha">
                     <el-row>