diff --git a/src/api/system/roleapi/power.ts b/src/api/system/roleapi/power.ts
index 39bbd92..129445a 100644
--- a/src/api/system/roleapi/power.ts
+++ b/src/api/system/roleapi/power.ts
@@ -47,3 +47,15 @@ export function addNewPeople(data?: getSystemPower){
       data:data
     });
 }
+/**
+@ 作者: 秦东
+@ 时间: 2025-11-28 10:24:09
+@ 功能: 编辑自己登陆密码
+*/
+export function editMyPwd(data?: getSystemPower){
+    return request({
+      url: '/systemapi/hr/editMyPwd',
+      method: 'post',
+      data:data
+    });
+}
diff --git a/src/layout/components/myconst/editmypassword.vue b/src/layout/components/myconst/editmypassword.vue
index feb7171..81272d5 100644
--- a/src/layout/components/myconst/editmypassword.vue
+++ b/src/layout/components/myconst/editmypassword.vue
@@ -4,14 +4,64 @@
 @ 备注: 修改密码
 -->
 <script lang='ts' setup>
+import { editMyPwd } from '@/api/system/roleapi/power'
+import { checkPwdRule,level } from '@/utils/CheckPassword'
 const props = defineProps({
 	editPasswordIsShow:{
 		type:Boolean,
 		default:false
 	}
 });
+const rulePowwerFormRef = ref()
 const emits = defineEmits(["update:editPasswordIsShow"]);	//父级元素
 const addLoading = ref(false)
+const saveData = ref({
+	oldPassword:"",
+	newPassword:"",
+	confirmPassword:""
+})
+const rules = ref<any>({
+    oldPassword: [{ required: true, message: '请输入旧密码', trigger: 'blur' }],
+	newPassword: [{required: true,
+        validator: (rule: any, value: any, callback: any) => {
+			
+			if (!value) {
+                callback(new Error('请确认密码'));
+                return;
+            }
+			const result: string = checkPwdRule(value);
+			if(result !== "校验通过"){
+                callback(new Error(result));
+                return;
+            }
+			 callback();
+			// const res: string = level(value);
+			// callback('success');
+			// console.log("新密码",rule)
+        },
+        trigger: ['blur']
+    }],
+    confirmPassword: [{required: true,
+        validator: (rule: any, value: any, callback: any) => {
+			if (!value) {
+                callback(new Error('请确认密码'));
+                return;
+            }
+			const result: string = checkPwdRule(value);
+			if(result !== "校验通过"){
+                callback(new Error(result));
+                return;
+            }
+            if (value !== saveData.value.newPassword) {
+                callback(new Error('两次输入密码不一致!'));
+            } else {
+                callback();
+            }
+        },
+        trigger: ['blur']
+    }],
+    
+});
 /**
  * 弹窗显示控制
  */
@@ -42,6 +92,35 @@ const addLoading = ref(false)
   */
  const submitEditPwdForm = ()=>{
 	addLoading.value = true
+	rulePowwerFormRef.value.validate((valid: any) => {
+		if (valid) {
+			// 验证通过，执行提交操作
+			// console.log('表单验证通过，提交数据:', saveData.value);
+			// 这里可以添加提交数据的逻辑
+			editMyPwd(saveData.value).then(( data:any ) =>{
+				// console.log('表单验证通过，提交数据:',data);
+				if(data.code == 0){
+					// 密码修改成功
+					// 关闭弹窗
+					editMyPwdBoxClose()
+					// 提示用户密码修改成功
+					ElMessage.success('密码修改成功');
+				}else{
+					// 密码修改失败
+					// 提示用户密码修改失败
+					ElMessage.error(data.msg);
+				}
+				addLoading.value = false
+			}).finally(() => {
+				addLoading.value = false
+			})
+			
+		} else {
+			// 验证不通过，提示用户输入正确信息
+			console.log('表单验证不通过');
+			addLoading.value = false
+		}
+	});
  }
  /**
   * 初始化数据
@@ -57,7 +136,25 @@ function initData(){
 		width="30%"
 		custom-class="dialog_box" 
 		:before-close="editMyPwdBoxClose"
-	>
+	>	
+		<el-form
+			ref="rulePowwerFormRef"
+			style="width: 100%"
+			:model="saveData"
+			:rules="rules"
+			label-width="auto"
+		>
+			<el-form-item label="原始密码" prop="oldPassword">
+				<el-input v-model="saveData.oldPassword" type="password" autocomplete="off" placeholder="请输入原始密码" clearable show-password />
+			</el-form-item>
+			<el-form-item label="新密码" prop="newPassword">
+				<el-input v-model="saveData.newPassword" type="password" autocomplete="off" placeholder="请输入新密码" clearable show-password />
+			</el-form-item>
+			<el-form-item label="确认密码" prop="confirmPassword">
+				<el-input v-model="saveData.confirmPassword" type="password" autocomplete="off" placeholder="请确认新密码" clearable show-password />
+			</el-form-item>
+		</el-form>
+	
 		<template #footer>
 			<div class="dialog-footer">
 			<el-button type="primary" :loading="addLoading" @click="submitEditPwdForm" >确 定</el-button>
diff --git a/src/utils/CheckPassword.ts b/src/utils/CheckPassword.ts
new file mode 100644
index 0000000..ef8cb7c
--- /dev/null
+++ b/src/utils/CheckPassword.ts
@@ -0,0 +1,307 @@
+    /**
+     * 数字
+     */
+    const REG_NUMBER:string  = ".*\\d+.*";
+    /**
+     * 小写字母
+     */
+    const REG_UPPERCASE:string = ".*[A-Z]+.*";
+    /**
+     * 大写字母
+     */
+    const REG_LOWERCASE:string = ".*[a-z]+.*";
+    /**
+     * 特殊符号(~!@#$%^&*()_+|<>,.?/:;'[]{}\)
+     */
+    const REG_SYMBOL:string = ".*[~!@#$%^&*()_+|<>,.?/:;'\\[\\]{}\"]+.*";
+    /**
+     * 键盘字符表(小写)
+     * 非shift键盘字符表
+     */
+    const CHAR_TABLE1:string[][] = [
+            ['1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '-', '=', '\0'],
+            ['q', 'w', 'e', 'r', 't', 'y', 'u', 'i', 'o', 'p', '[', ']', '\\'],
+            ['a', 's', 'd', 'f', 'g', 'h', 'j', 'k', 'l', ';', '\'', '\0', '\0'],
+            ['z', 'x', 'c', 'v', 'b', 'n', 'm', ',', '.', '/', '\0', '\0', '\0']];
+    /**
+     * shift键盘的字符表
+     */
+    const CHAR_TABLE2:string[][] = [
+            ['!', '@', '#', '$', '%', '^', '&', '*', '(', ')', '_', '+', '\0'],
+            ['q', 'w', 'e', 'r', 't', 'y', 'u', 'i', 'o', 'p', '{', '}', '|'],
+            ['a', 's', 'd', 'f', 'g', 'h', 'j', 'k', 'l', ':', '"', '\0', '\0'],
+    ['z', 'x', 'c', 'v', 'b', 'n', 'm', '<', '>', '?', '\0', '\0', '\0']];
+            
+    /**
+     * 校验密码是否符合条件
+     * @param password 密码
+     * @param username 用户名
+     */
+export const checkPasswordRule = (password:string,username:string) => { 
+    if (password === '' || password.length < 8 || password.length > 32) { 
+        // console.log("长度小于8，或大于32");
+        return "密码长度应大于8小于32";
+    } if (password.indexOf(username) !== -1) { 
+        // console.log("包含用户名");
+        return "请勿包含用户名";
+    }
+    if (isContinuousChar(password)) {
+        // console.log("包含3个及以上相同或字典连续字符");
+        return "请勿包含3个及以上相同或连续的字符";
+    }
+    if (isKeyBoardContinuousChar(password)) {
+        // console.log("包含3个及以上键盘连续字符");
+        return "请勿包含3个及以上键盘连续字符";
+    }
+    let i:number = 0;
+    if (password.match(REG_NUMBER)) i++;
+    if (password.match(REG_LOWERCASE)) i++;
+    if (password.match(REG_UPPERCASE)) i++;
+    if (password.match(REG_SYMBOL)) i++;
+    if (i < 2) {
+        // console.log(("数字、小写字母、大写字母、特殊字符，至少包含两种"));
+        return "数字、小写字母、大写字母、特殊字符，至少包含两种";
+    }
+    // console.log(i);
+    return "校验通过";
+}
+
+
+ 
+    /**
+     * 是否包含3个及以上相同或字典连续字符
+     */
+const isContinuousChar = (password:string) => { 
+    let chars: string[] = password.split('')
+    let charCode: number[] = [];
+    for (let i = 0; i < chars.length - 2; i++) {
+        charCode[i] = chars[i].charCodeAt(0)
+    }
+    for (let i = 0; i < charCode.length - 2; i++) {
+        let n1 = charCode[i];
+        let n2 = charCode[i + 1];
+        let n3 = charCode[i + 2];
+        // 判断重复字符
+        if (n1 == n2 && n1 == n3) {
+            return true;
+        }
+        // 判断连续字符： 正序 + 倒序
+        if ((n1 + 1 == n2 && n1 + 2 == n3) || (n1 - 1 == n2 && n1 - 2 == n3)) {
+            return true;
+        }
+    }
+    return false;
+}
+    /**
+     * 是否包含3个及以上键盘连续字符
+     * @param password 待匹配的字符串
+     */
+    const isKeyBoardContinuousChar = (password:string) => { 
+        if (password === '') {
+            return false;
+        }
+        //考虑大小写，都转换成小写字母
+        let lpStrChars: string[] = password.toLowerCase().split('')
+        // 获取字符串长度
+        let nStrLen: number = lpStrChars.length;
+        // 定义位置数组：row - 行，col - column 列
+        const pRowCharPos:number[] = new Array(nStrLen).fill('')
+        const pColCharPos: number[] = new Array(nStrLen).fill('')
+        for (let i = 0; i < nStrLen; i++) {
+            let chLower: string = lpStrChars[i];
+            pColCharPos[i] = -1;
+            // 检索在表1中的位置，构建位置数组
+            for (let nRowTable1Idx = 0; nRowTable1Idx < 4; nRowTable1Idx++) {
+                for (let nColTable1Idx = 0; nColTable1Idx < 13; nColTable1Idx++) {
+                    if (chLower == CHAR_TABLE1[nRowTable1Idx][nColTable1Idx]) {
+                        pRowCharPos[i] = nRowTable1Idx;
+                        pColCharPos[i] = nColTable1Idx;
+                    }
+                }
+            }
+            // 在表1中没找到，到表二中去找，找到则continue
+            if (pColCharPos[i] >= 0) {
+                continue;
+            }
+            // 检索在表2中的位置，构建位置数组
+            for (let nRowTable2Idx = 0; nRowTable2Idx < 4; nRowTable2Idx++) {
+                for (let nColTable2Idx = 0; nColTable2Idx < 13; nColTable2Idx++) {
+                    if (chLower == CHAR_TABLE2[nRowTable2Idx][nColTable2Idx]) {
+                        pRowCharPos[i] = nRowTable2Idx;
+                        pColCharPos[i] = nColTable2Idx;
+                    }
+                }
+            }
+        }
+       // 匹配坐标连线
+        for (let j = 1; j <= nStrLen - 2; j++) {
+            //同一行
+            if (pRowCharPos[j - 1] == pRowCharPos[j] && pRowCharPos[j] == pRowCharPos[j + 1]) {
+                // 键盘行正向连续（asd）或者键盘行反向连续（dsa）
+                if ((pColCharPos[j - 1] + 1 == pColCharPos[j] && pColCharPos[j] + 1 == pColCharPos[j + 1]) ||
+                        (pColCharPos[j + 1] + 1 == pColCharPos[j] && pColCharPos[j] + 1 == pColCharPos[j - 1])) {
+                    return true;
+                }
+            }
+            //同一列
+            if (pColCharPos[j - 1] == pColCharPos[j] && pColCharPos[j] == pColCharPos[j + 1]) {
+                //键盘列连续（qaz）或者键盘列反向连续（zaq）
+                if ((pRowCharPos[j - 1] + 1 == pRowCharPos[j] && pRowCharPos[j] + 1 == pRowCharPos[j + 1]) ||
+                        (pRowCharPos[j - 1] - 1 == pRowCharPos[j] && pRowCharPos[j] - 1 == pRowCharPos[j + 1])) {
+                    return true;
+                }
+            }
+        }
+        return false;
+}
+ 
+ 
+/**
+ * 密码强度校验
+ */
+/**
+ * 长度
+ * @param str 
+ */
+const length = (str:string) => { 
+    if(str.length<5){ 
+        return 5;
+    }else if(str.length<8){
+        return 10;
+    }else{
+        return 25;
+    }
+}
+/**
+ * 字母
+ * @param str 
+ */
+const letters = (str: string) => { 
+    let count1=0,count2=0;
+    for(let i=0;i<str.length;i++){
+        if(str.charAt(i)>='a'&&str.charAt(i)<='z'){
+            count1++;
+        }
+        if(str.charAt(i)>='A'&&str.charAt(i)<='Z'){
+            count2++;
+        }
+    }
+    if(count1==0 && count2==0){
+        return 0;
+    }
+    if(count1!=0 && count2!=0){
+        return 20;
+    }
+    return 10;
+}
+ 
+/**
+ * 数字
+ * @param str 
+ */
+const numbers = (str: string) => { 
+    let count=0;
+    for(let i=0;i<str.length;i++){
+        if(str.charAt(i)>='0'&&str.charAt(i)<='9'){
+            count++;
+        }
+    }
+    if(count==0){
+        return 0;
+    }
+    if(count==1){
+        return 10;
+    }
+    return 20;  
+}
+/**
+ * 符号
+ * @param str 
+ */
+const symbols = (str: string) => { 
+    let count=0;
+    for(let i=0;i<str.length;i++){
+        if(str.charCodeAt(i)>=0x21 && str.charCodeAt(i)<=0x2F ||
+                str.charCodeAt(i)>=0x3A && str.charCodeAt(i)<=0x40 ||
+                str.charCodeAt(i)>=0x5B && str.charCodeAt(i)<=0x60 ||
+                str.charCodeAt(i)>=0x7B && str.charCodeAt(i)<=0x7E ){
+            count++;
+        }
+    }
+    if(count==0){
+        return 0;
+    }
+    if(count==1){
+        return 10;
+    }
+    return 25;
+}
+/**
+ * 得分机制
+ * @param str 
+ */
+const rewards = (str: string) => {
+    let letter=letters(str);//字母
+    let number=numbers(str);//数字
+    let symbol=symbols(str);//符号
+    if(letter>0 && number>0 && symbol==0){//字母和数字
+        return 2;
+    }
+    if(letter==10 && number>0 && symbol>0){//字母、数字和符号
+        return 3;
+    }
+    if(letter==20 && number>0 && symbol>0){//大小写字母、数字和符号
+        return 5;
+    }
+    return 0;
+ }
+/**
+ * 最终评分
+ * @param str 
+ */
+export const level = (str: string) => { 
+    let lengths=length(str);//长度
+    let letter=letters(str);//字母
+    let number=numbers(str);//数字
+    let symbol=symbols(str);//符号
+    let reward=rewards(str);//奖励
+    let sum=lengths+letter+number+symbol+reward;
+    console.log(sum);
+    if(sum>=80){
+        return "非常强";//非常安全
+    }else if(sum>=60){
+        return "强";//非常强
+    }else if(sum>=40){
+        return "一般";//一般
+    }else if(sum>=25){
+        return "弱";//弱
+    }else{
+        return "非常弱";//非常弱
+    }
+}
+
+export const checkPwdRule = (password:string) => { 
+    if (password === '' || password.length < 8 || password.length > 32) { 
+        // console.log("长度小于8，或大于32");
+        return "密码长度应大于8小于32";
+    }
+    if (isContinuousChar(password)) {
+        // console.log("包含3个及以上相同或字典连续字符");
+        return "请勿包含3个及以上相同或连续的字符";
+    }
+    if (isKeyBoardContinuousChar(password)) {
+        // console.log("包含3个及以上键盘连续字符");
+        return "请勿包含3个及以上键盘连续字符";
+    }
+    let i:number = 0;
+    if (password.match(REG_NUMBER)) i++;
+    if (password.match(REG_LOWERCASE)) i++;
+    if (password.match(REG_UPPERCASE)) i++;
+    if (password.match(REG_SYMBOL)) i++;
+    if (i < 2) {
+        // console.log(("数字、小写字母、大写字母、特殊字符，至少包含两种"));
+        return "数字、小写字母、大写字母、特殊字符，至少包含两种";
+    }
+    // console.log(i);
+    return "校验通过";
+}
diff --git a/src/views/opk/yui/new/lzq.vue b/src/views/opk/yui/new/lzq.vue
index 2da16c8..4c08cd1 100644
--- a/src/views/opk/yui/new/lzq.vue
+++ b/src/views/opk/yui/new/lzq.vue
@@ -58,13 +58,13 @@
 	</el-dialog>
   </template>
   <script lang="ts" setup>
-  import { reactive } from "vue";
+  import { reactive, ref } from "vue";
   import {get_target_details} from '@/api/opk/news/api'
   import { addPostCont,getgroupuser } from '@/api/opk/api'
   import { getonedetailedtarget,getcompany,edit_detail } from '@/api/opk/opk/api'
 
 const isshow = ref(false)
-const num = (1)
+const num = ref(1)
 const props= defineProps( {
 	  title: {
 		type: String,
diff --git a/src/views/opk/yui/new/xy.vue b/src/views/opk/yui/new/xy.vue
index 4ec8841..7bac98f 100644
--- a/src/views/opk/yui/new/xy.vue
+++ b/src/views/opk/yui/new/xy.vue
@@ -68,13 +68,13 @@
 	</el-dialog>
   </template>
   <script lang="ts" setup>
-  import { reactive } from "vue";
+  import { reactive, ref } from "vue";
   import { getdetailscont,getnew_target,edit_post,get_organdpost } from '@/api/opk/opk/api'
 
 	import {getgroupuser} from '@/api/opk/api'
 
 const isshow = ref(false)
-const num = (1)
+const num = ref(1)
 const props= defineProps( {
 	  title: {
 		type: String,
diff --git a/src/views/system/monitor/online/index.vue b/src/views/system/monitor/online/index.vue
index 8ddbfdc..346c55c 100644
--- a/src/views/system/monitor/online/index.vue
+++ b/src/views/system/monitor/online/index.vue
@@ -344,6 +344,8 @@ const getAppTableList = (number:boolean) => {
 watch(()=>systemPower.value.appSystem,(val:string)=>{
     if(val=="app"){
         getAppList();
+    }else{
+        getSystemPowerSub()
     }
 	systemPower.value.isPick = false
 },{
@@ -488,6 +490,8 @@ const pickUser = (item:any) =>{
 	console.log("选择用户陪权--111111->",item)
 	item.isPick = true
 	systemPower.value.roleId = item.id.toString()
+    // systemPower.value.powerType="user"
+    console.log("选择用户陪权--2222->",userPowerList)
 	if(userPowerList.value.list && Array.isArray(userPowerList.value.list)){
 		userPowerList.value.list.forEach((items:any)=>{
 		// console.log("选择用户陪权--111111->",items.id)
@@ -496,6 +500,7 @@ const pickUser = (item:any) =>{
 			}
 		})
 	}
+    getSystemPowerSub()
 }
 /**
 @ 作者: 秦东
@@ -642,7 +647,7 @@ onMounted(()=>{
                         </template>
                     </el-tree-v2>
 				</el-tab-pane>
-				<el-tab-pane label="个人" name="person">
+				<el-tab-pane label="用户" name="person">
 					<div class="searchBox">
                         <el-input v-model="searchUserQuery.name" placeholder="请输入要查找的人" :suffix-icon="Search" @input="onQueryChangedOrgUser" clearable />                                                                         
                     </div>
@@ -768,8 +773,7 @@ onMounted(()=>{
 								<td valign="top">
                                     <el-scrollbar class="tab_pane_box">
                                         <ul class="appListBox">
-                                            <li v-for="item in appList" :key="item"  @click="pickAppList(item)" :class="{'active':item.isPick}"
-											>
+                                            <li v-for="item in appList" :key="item"  @click="pickAppList(item)" :class="{'active':item.isPick}">
 												<el-checkbox @click.stop="pickAppTableList(item)" v-model="item.pickAll"  :value="item.pickAll" :disabled="!item.isPick" ></el-checkbox>
 												{{ item.name }}
 											</li>
diff --git a/src/views/system/monitor/online/roleConfig/setRolePeople.vue b/src/views/system/monitor/online/roleConfig/setRolePeople.vue
index e1e748c..0168fd8 100644
--- a/src/views/system/monitor/online/roleConfig/setRolePeople.vue
+++ b/src/views/system/monitor/online/roleConfig/setRolePeople.vue
@@ -31,13 +31,26 @@ const props = defineProps({
 })
 const userLoading = ref(false)
 const emit = defineEmits(['update:show'])
-const isShow = computed(() => {
-    if(props.show){
-        getPowerPageUserSub()
-        getPickUser()
+// const isShowsdf = computed(() => {
+//     if(props.show){
+//         getPowerPageUserSub()
+//         // getPickUser()
+//     }
+//     return props.show
+// })
+
+const isShowsdf = computed({
+    get(){
+        console.log("------------------->",props.show)
+        
+        return props.show
+    },
+    set(val){
+        emit('update:show', val)
     }
-    return props.show
 })
+
+
 const roleInfo = computed(() => {
     return props.roleInfo
 })
@@ -81,6 +94,9 @@ const closeDialog = () => {
     userPowerList.value =
     pickUserKey.value=[]
     userPowerListPick.value=[]
+    userPage.page = 1
+    userPage.name = ''
+    userPage.orgId = ''
 }
 /**
 @ 作者: 秦东
@@ -164,13 +180,27 @@ const saveRolePeople = () => {
         }
     })
 }
+watch(() => props.show, (newVal) => {
+    if(newVal){
+        getPowerPageUserSub()
+        getPickUser()
+    }
+},{
+    immediate: true
+})
+watch(() => userPage.name, (newVal) => {
+    getPowerPageUserSub()
+},{
+    immediate: true
+})
 onMounted(() => {
+    getPowerPageUserSub()
     getPickUser()
 })
 </script>
 <template>
     <el-dialog
-        v-model="isShow"
+        v-model="isShowsdf"
         :title="`编辑<<${roleInfo.label}>>角色使用人`"
         width="800"
         destroy-on-close
diff --git a/src/views/taskplatform/taskmanagement/edittaskcustomerform.vue b/src/views/taskplatform/taskmanagement/edittaskcustomerform.vue
new file mode 100644
index 0000000..32795b4
--- /dev/null
+++ b/src/views/taskplatform/taskmanagement/edittaskcustomerform.vue
@@ -0,0 +1,248 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2023-09-26 09:12:55
+@ 备注: 编辑自定义表单数据
+-->
+<script lang='ts' setup>
+import { ref, reactive, onMounted, computed, nextTick } from 'vue'
+import {  useRouter } from 'vue-router'
+import {
+    string2json,
+    stringToObj
+} from '@/utils/DesignForm/form'
+
+import { haveCustomerFormVersion } from '@/api/taskapi/management'
+import { judgeSubmitCancel } from '@/api/DesignForm/requestapi'
+
+import '@/assets/scss/element-var.scss'
+import '@/assets/scss/index.scss'
+import '@/assets/iconfont/iconfont.css'
+import 'element-plus/dist/index.css'
+
+const props = defineProps({
+	iseditopen:{
+		type:Boolean,
+		default:true
+	},
+	versionid:{
+		type:String,
+		default:""
+	},
+	versiontitle:{
+		type:String,
+		default:""
+	},
+	masterskey:{
+		type:String,
+		default:""
+	},
+	infoid:{
+		type:String,
+		default:""
+	},
+	drawerwith:{
+		type:Number,
+		default:0
+	}
+})
+const submitButton = {
+    type: "div",
+    control:{},
+    config:{
+		textAlign: "center",
+		span: ""
+    },
+    list: [
+		{
+			type: "button",
+			control:{
+				label: "保存",
+				type: "primary",
+				key: "submit"
+			},
+		config:{
+				textAlign: "center"
+			}
+		}
+	]
+}
+const cancelButton = {
+    type: "div",
+    control:{},
+    config:{
+      textAlign: "center",
+      span: ""
+    },
+    list: [
+		{
+			type: "button",
+			control:{
+				label: "返回",
+				type: "danger",
+				key: "cancel"
+			},
+			config:{
+				textAlign: "center"
+			}
+		}
+	]
+}
+const submitAndCancelButton = {
+    type: "div",
+    control:{},
+    config:{
+      span: 24,
+      textAlign: "center"
+    },
+    list: [
+		{
+			type: "button",
+			control:{
+				label: "保存",
+				type: "primary",
+				key: "submit"
+			},
+			config:{
+				span: 0
+			}
+		},
+		{
+			type: "button",
+			control:{
+				label: "返回",
+						type: "danger",
+				key: "cancel"
+			},
+			config:{
+				span: 0
+			}
+		}
+	]
+};
+const loadingData = ref(false)
+const formEl = ref()
+const state = reactive<any>({
+	type: 1, // 1新增；2修改；3查看（表单模式） ；4查看； 5设计
+    formData: {
+      list: [],
+      form: {},
+      config: {}
+    },
+    dict: {},
+    formId: props.versionid,
+    id: props.masterskey,
+    loading: true
+})
+const formType = computed(() => {
+    // 带有参数id为编辑状态
+    if (props.infoid) {
+      return 2
+    } else {
+      return 1
+    }
+})
+const emits = defineEmits(["update:iseditopen","searchquery"]);
+const isShow =   computed({
+	get: () => props.iseditopen,
+	set: (val) => {
+		emits("update:iseditopen", val);
+	},
+});
+//获取表单数据
+const getTaskFormData = () =>{
+	loadingData.value = true;
+	haveCustomerFormVersion({id:props.versionid})
+		.then(({ data }) =>{
+			// console.log("表单数据",data)
+			state.id=props.versionid
+			state.formData = stringToObj(data.mastesform)
+      		state.dict = string2json(data.dict)
+			  
+				judgeSubmitCancel({"name":data.mastesformjson})
+					.then((data:any) =>{
+						if(data.code == 0){
+							if (data.data == 3 || data.data == 4){
+								state.formData.list.push(submitButton)
+							}
+						}
+					})
+		})
+		.finally(()=>{
+			formEl.value.getData({ formId: props.versionid, id: props.masterskey})
+			loadingData.value = false;
+		})
+}
+
+const drawerWith = ref<number>(0);
+onMounted(()=>{
+	drawerWith.value = window.innerWidth - 220
+	
+});
+window.addEventListener("resize", function(){
+	drawerWith.value = window.innerWidth -220
+})
+const beforeSubmit = (params: any) => {
+    params.formId =  props.masterskey
+    params.id = props.versionid
+	// emits("update:isopen", false);
+	// console.log(params,"===========================>")
+    return params
+}
+const afterSubmit = (type: string) => {
+	if (type === 'success') {
+		// router.go(-1)
+		// console.log("表单提交成功")
+		emits("searchquery");
+		closeAppSubmit();
+		
+	}
+}
+const closeAppSubmit = () => {
+	emits("update:iseditopen", false);
+	initData();
+}
+const initData = () => {
+	state.formData = {
+      list: [],
+      form: {},
+      config: {}
+    };
+	state.dict = {};
+	state.formId = 0;
+	state.id = 0;
+	state.loading = true;
+}
+watch(()=>props.iseditopen,()=>{
+	if(props.iseditopen){
+		getTaskFormData();
+	}else{
+		initData()
+	}
+})
+const changeKeyVal = (key:any,val:any,type:any,attribute:any) => {
+
+}
+</script>
+<template>
+	<el-drawer  v-model="isShow" v-loading="loadingData" :title="versiontitle"  :close-on-click-modal="false" :close-on-press-escape="false" :destroy-on-close="true" :size="props.drawerwith" class="drawerClass" >
+		<div class="drawerBody">
+			<ak-form
+				ref="formEl"
+				: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"
+			/>
+		</div>
+    	
+  	</el-drawer>
+</template>
+<style  lang='scss' scoped>
+
+</style>
diff --git a/src/views/taskplatform/taskmanagement/tasklist.vue b/src/views/taskplatform/taskmanagement/tasklist.vue
index 250c0fe..6b5e17a 100644
--- a/src/views/taskplatform/taskmanagement/tasklist.vue
+++ b/src/views/taskplatform/taskmanagement/tasklist.vue
@@ -10,7 +10,7 @@ import { appFormdataLog,delCustomerFormData } from '@/api/taskapi/management'
 //引入页面
 import TaskEntry from '@/views/taskplatform/taskmanagement/taskentry.vue'
 import TaskCustomerForm from '@/views/taskplatform/taskmanagement/taskcustomerformnew.vue'
-import EditTaskCustomerForm from '@/views/taskplatform/taskmanagement/edittaskcustomerform.vue'
+
 
 const loading = ref(false)
 const searckFormRef  = ref(ElForm);
@@ -180,7 +180,7 @@ const openCustomerForm = (id:string,title:string) =>{
 		</el-card>
 		<TaskEntry v-model:isshow="openTaskDialog" @opencustomerform="openCustomerForm" />
 		<TaskCustomerForm v-model:isopen="openTaskDrawer" :versionid="versionId" :versiontitle="versionTitle" :drawerwith="drawerWith" @searchquery="searchQuery" />
-		<EditTaskCustomerForm v-model:iseditopen="openEditTaskDrawer" :versionid="versionId" :versiontitle="versionTitle" :masterskey="mastersKey" infoid="2" :drawerwith="drawerWith"  @searchquery="searchQuery" />
+		<TaskCustomerForm v-model:isopen="openEditTaskDrawer" :versionid="versionId" :versiontitle="versionTitle" infoid="2" :drawerwith="drawerWith"  @searchquery="searchQuery" />
 	</div>
 </div>
 </template>