diff --git a/src/api/DesignForm/requestapi.ts b/src/api/DesignForm/requestapi.ts
index 1b3b2e5..b6d6814 100644
--- a/src/api/DesignForm/requestapi.ts
+++ b/src/api/DesignForm/requestapi.ts
@@ -192,7 +192,8 @@ export function gainFlowPeople(data?: string[]){
 //发起工作流
 export function startRunFlow(data?:any){
 	return request({
-		url: '/systemapi/task_management/startRunWorkFlow',
+		// url: '/systemapi/task_management/startRunWorkFlow',
+		url: '/systemapi/flow/startProcess',
 		// url: '/systemapi/task_flow/startRunFlow',
 		method: 'post',
 		data: data
diff --git a/src/api/taskapi/management.ts b/src/api/taskapi/management.ts
index e06dc87..e22b2d9 100644
--- a/src/api/taskapi/management.ts
+++ b/src/api/taskapi/management.ts
@@ -154,7 +154,8 @@ export function authorizeWorkflow(data?:any){
 
 export function runTaskFlow(data?:any){
 	return request({
-		url: '/systemapi/task_management/runTaskFlow',
+		// url: '/systemapi/task_management/runTaskFlow',
+		url: '/systemapi/flow/runTaskFlow',
 		method: 'post',
 		data: data
 	});
diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue
index f3180a3..1e3e04c 100644
--- a/src/components/DesignForm/formControlPropertiNew.vue
+++ b/src/components/DesignForm/formControlPropertiNew.vue
@@ -297,7 +297,6 @@ const attrList = computed(() => {
         value: item.label,
         path: "item.label",
         vHide: [
-          "table",
           "grid",
           "tabs",
           "title",
@@ -3577,7 +3576,7 @@ const radioChangeSet = (val: any) => {
         <el-form size="small" class="form">
           <!-- <div class=""><h3>通用属性</h3></div> -->
           <el-divider content-position="left">通用属性</el-divider>
-
+          {{ attrList }}
           <template v-for="(item, index) in attrList" :key="index">
             <el-form-item :label="item.label" class="form_cont">
               <el-select
diff --git a/src/components/workflow/drwer/approverDrawer.vue b/src/components/workflow/drwer/approverDrawer.vue
index f4dd853..d72a760 100644
--- a/src/components/workflow/drwer/approverDrawer.vue
+++ b/src/components/workflow/drwer/approverDrawer.vue
@@ -3,339 +3,346 @@
 @ 时间: 2023-10-11 09:54:58
 @ 备注: 审批人设置
 -->
-<script lang='ts' setup>
-import $func from '@/utils/workflow/index'
-import { setTypes, selectModes, selectRanges } from '@/utils/workflow/const'
-import { useStore } from '@/store/workflow/index' 
-import { getAllParentNode,judgeOptionalNode,analysisForm,setFlowFormKeyPower } from '@/api/workflowapi/index'
+<script lang="ts" setup>
+import $func from "@/utils/workflow/index";
+import { setTypes, selectModes, selectRanges } from "@/utils/workflow/const";
+import { useStore } from "@/store/workflow/index";
+import {
+  getAllParentNode,
+  judgeOptionalNode,
+  analysisForm,
+  setFlowFormKeyPower,
+} from "@/api/workflowapi/index";
 
-import { govthree } from '@/api/opk/opk/api'
+import { govthree } from "@/api/opk/opk/api";
 
-import PositionDialog from '@/components/workflow/dialog/positionDialog.vue'
-import FormWord from '@/components/workflow/dialog/formWord.vue'
-import MatrixPage from '@/components/workflow/dialog/matrix.vue'
+import PositionDialog from "@/components/workflow/dialog/positionDialog.vue";
+import FormWord from "@/components/workflow/dialog/formWord.vue";
+import MatrixPage from "@/components/workflow/dialog/matrix.vue";
 
-
-import { matrixInfo } from '@/api/matrixapi/type'
+import { matrixInfo } from "@/api/matrixapi/type";
 
 let props = defineProps({
-	nodeConfig:{
-		type: Object,
-        default: () => ({}),
-	},
-    directormaxlevel: {
-        type: Number,
-        default: 4
+  nodeConfig: {
+    type: Object,
+    default: () => ({}),
+  },
+  directormaxlevel: {
+    type: Number,
+    default: 4,
+  },
+  isFormFlow: {
+    type: Boolean,
+    default: true,
+  },
+  customerFormKey: {
+    type: String,
+    default: "",
+  },
+  formVersion: {
+    type: String,
+    default: "",
+  },
+  formData: {
+    type: Object,
+    default() {
+      return {};
     },
-	isFormFlow:{
-		type:Boolean,
-		default:true
-	},
-	customerFormKey:{
-		type:String,
-		default:""
-	},
-	formVersion:{
-		type:String,
-		default:""
-	},
-	formData:{
-		type:Object,
-		default(){
-			return {}
-		}
-	}
+  },
 });
-const flowOrgTree = ref()
-const isExecutor = ref(false)
-const nodeTitle = ref<string>("审批人设置")
-const nodeOptional = ref<any[]>() //审批线已经存在得节点
-const nodeAllVerify = ref<any[]>()
-const orgList = ref<any[]>()	//行政组织
+const flowOrgTree = ref();
+const isExecutor = ref(false);
+const nodeTitle = ref<string>("审批人设置");
+const nodeOptional = ref<any[]>(); //审批线已经存在得节点
+const nodeAllVerify = ref<any[]>();
+const orgList = ref<any[]>(); //行政组织
 const orgProps = {
-  value: 'id',
-  label: 'name',
-  children: 'child',
-}
-
-const isLookAll = ref(false)
-const isEditAll = ref(false)
+  value: "id",
+  label: "name",
+  children: "child",
+};
 
+const isLookAll = ref(false);
+const isEditAll = ref(false);
 
-let approverConfig = ref<any>({})
-let approverVisible = ref(false)
-let approverRoleVisible = ref(false)
-let appPosistonVisible = ref(false)
-let appFormTableVisible = ref(false)
-let checkedRoleList = ref<any[]>([])	//角色列表
-let checkedPostList = ref<any[]>([])		//岗位列表
-let checkedFormList = ref<any[]>([])		//字段列表
-let checkedList = ref<any[]>([])
-let store = useStore()
-let { setApproverConfig, setApprover } = store
-let approverConfig1 = computed(():any=> store.approverConfig1)
-let approverDrawer = computed(():any=> store.approverDrawer)
+let approverConfig = ref<any>({});
+let approverVisible = ref(false);
+let approverRoleVisible = ref(false);
+let appPosistonVisible = ref(false);
+let appFormTableVisible = ref(false);
+let checkedRoleList = ref<any[]>([]); //角色列表
+let checkedPostList = ref<any[]>([]); //岗位列表
+let checkedFormList = ref<any[]>([]); //字段列表
+let checkedList = ref<any[]>([]);
+let store = useStore();
+let { setApproverConfig, setApprover } = store;
+let approverConfig1 = computed((): any => store.approverConfig1);
+let approverDrawer = computed((): any => store.approverDrawer);
 
 const emits = defineEmits<{
-    (e: 'update:formData', val: any): void
-}>()
-
+  (e: "update:formData", val: any): void;
+}>();
 
 let visible = computed({
-    get(){
-        return approverDrawer.value
-    },
-    set(){
-        closeDrawer()
-    }
-}) 
+  get() {
+    return approverDrawer.value;
+  },
+  set() {
+    closeDrawer();
+  },
+});
 
-const formData =  computed({
-	get() {
-		return props.formData
-	},
-	set(val: formStruct) {
-		emits('update:formData', val)
-	}
+const formData = computed({
+  get() {
+    return props.formData;
+  },
+  set(val: formStruct) {
+    emits("update:formData", val);
+  },
 });
 
 const powerUnitAry = ref<any>({
-	nodeKey:"",
-	recUnitAry:{
-		masterUnitList:[],
-		sunUnitList:[],
-		unitAllKey:[],
-		unitAllState:[]
-	}
-})
-
-const matrixIsShow = ref(false)
+  nodeKey: "",
+  recUnitAry: {
+    masterUnitList: [],
+    sunUnitList: [],
+    unitAllKey: [],
+    unitAllState: [],
+  },
+});
 
+const matrixIsShow = ref(false);
 
-watch(approverConfig1, (val:any)=>{
-	
-	val.value.attribute = val.value.attribute*1
-	console.log("directormaxlevel",val.value,val.type)
-	matrixIsShow.value = false
-    approverConfig.value = val.value
-	if(val.type == 3){
-		if(val.value.nodeName != ""){
-			nodeTitle.value = val.value.nodeName+"设置"
-		}else{
-			nodeTitle.value = "执行人设置"
-		}
-		
-	}else{
-		if(val.value.nodeName != ""){
-			nodeTitle.value = val.value.nodeName+"设置"
-		}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
-	if(visible.value){
-		judgeOptionalNode(props.nodeConfig)
-		.then((data:any)=>{
-			if(data.code == 0){
-				let sendData = {
-					id:val.value.fromNode,
-					allcont:data.data.allcont
-				}
-				getAllParentNode(sendData)
-					.then((data:any)=>{
-						if(data.code == 0){
-							nodeOptional.value = data.data.allcont
-							if(data.data.allcont && data.data.allcont.length > 0){
-								data.data.allcont.forEach((item:any) => {
-									if(item.type  == 3){
-										isExecutor.value = true
-										return
-									}
-								});
-							}
-						}
-					})
-			}
-		})
-	}
-	if(val.value.settype == 9){
-		matrixIsShow.value = true
-		matrixFieldList.value = approverConfig.value.matrix;
-	}
-})
-let changeRange = ()=> {
-    approverConfig.value.nodeUserList = [];
-}
+watch(approverConfig1, (val: any) => {
+  val.value.attribute = val.value.attribute * 1;
+  console.log("directormaxlevel", val.value, val.type);
+  matrixIsShow.value = false;
+  approverConfig.value = val.value;
+  if (val.type == 3) {
+    if (val.value.nodeName != "") {
+      nodeTitle.value = val.value.nodeName + "设置";
+    } else {
+      nodeTitle.value = "执行人设置";
+    }
+  } else {
+    if (val.value.nodeName != "") {
+      nodeTitle.value = val.value.nodeName + "设置";
+    } 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
+  if (visible.value) {
+    judgeOptionalNode(props.nodeConfig).then((data: any) => {
+      if (data.code == 0) {
+        let sendData = {
+          id: val.value.fromNode,
+          allcont: data.data.allcont,
+        };
+        getAllParentNode(sendData).then((data: any) => {
+          if (data.code == 0) {
+            nodeOptional.value = data.data.allcont;
+            if (data.data.allcont && data.data.allcont.length > 0) {
+              data.data.allcont.forEach((item: any) => {
+                if (item.type == 3) {
+                  isExecutor.value = true;
+                  return;
+                }
+              });
+            }
+          }
+        });
+      }
+    });
+  }
+  if (val.value.settype == 9) {
+    matrixIsShow.value = true;
+    matrixFieldList.value = approverConfig.value.matrix;
+  }
+});
+let changeRange = () => {
+  approverConfig.value.nodeUserList = [];
+};
 
 //权限矩阵
-const matrixList = ref<any[]>()
-const matrixCont = ref<any>()
-const matrixFieldList = ref<matrixInfo>()
+const matrixList = ref<any[]>();
+const matrixCont = ref<any>();
+const matrixFieldList = ref<matrixInfo>();
 
-const changeType = (val:any)=> {
-	matrixIsShow.value = false
-    approverConfig.value.nodeUserList = [];
-    approverConfig.value.examineMode = 1;
-    approverConfig.value.noHanderAction = 2;
-    if (val == 2) {
-        approverConfig.value.directorLevel = 1;
-    } else if (val == 4) {
-        approverConfig.value.selectMode = 1;
-        approverConfig.value.selectRange = 1;
-    } else if (val == 7) {
-        approverConfig.value.examineEndDirectorLevel = 1
-    }else if (val == 9){
-		matrixIsShow.value = true
-		matrixFieldList.value = approverConfig.value.matrix;
-	}
-	
-}
-const addApprover = ()=> {
-    approverVisible.value = true;
-    checkedList.value = approverConfig.value.nodeUserList
-}
-const addRoleApprover = ()=> {
-    approverRoleVisible.value = true;
-    checkedRoleList.value = approverConfig.value.nodeUserList
-}
-const addApproverPost = ()=> {
-	appPosistonVisible.value = true;
-    checkedPostList.value = approverConfig.value.nodeUserList
-}
-const surePostApprover = (data:any)=> {
-	appPosistonVisible.value = false;
-    approverConfig.value.nodeUserList = data;
-}
-const sureApprover = (data:any)=> {
-    approverConfig.value.nodeUserList = data;
-    approverVisible.value = false;
-}
-const sureRoleApprover = (data:any)=> {
-    approverConfig.value.nodeUserList = data;
-    approverRoleVisible.value = false;
-}
-const saveApprover = ()=> {
-    approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
-    setApproverConfig({
-        value: approverConfig.value,
-        flag: true,
-        id: approverConfig1.value.id
-    })
-	let powerAry = [];
-	if(powerUnitAry.value.recUnitAry.masterUnitList && powerUnitAry.value.recUnitAry.masterUnitList.length > 0){
-		powerUnitAry.value.recUnitAry.masterUnitList.forEach((item:any)=>{
-			powerAry.push(item)
-		})
-	}
-	if(powerUnitAry.value.recUnitAry.sunUnitList && powerUnitAry.value.recUnitAry.sunUnitList.length > 0){
-		powerUnitAry.value.recUnitAry.sunUnitList.forEach((item:any)=>{
-			if(item.masterUnitList && item.masterUnitList.length > 0){
-				item.masterUnitList.forEach((itemSun:any) => {
-					// powerAry.push(item)
-					if(!powerAry.includes(itemSun)){
-						powerAry.push(itemSun)
-					}
-				})
-			}
-		});
-	}
-	// console.log("正确",formData.value)
-	if(formData.value.purview){
-		// console.log("正确")
-		let isNew = true
-		formData.value.purview.forEach((item:any)=>{
-			// console.log("正确---->",item.nodeKey)
-			if(item.nodeKey == approverConfig1.value.value.nodeNumber){
-				item.powerAry=powerAry
-				isNew = false
-			}
-		});
-		if(isNew){
-			formData.value.purview.push({
-			nodeKey: approverConfig1.value.value.nodeNumber,
-			powerAry:powerAry
-		})
-		}
-	}else{
-		formData.value.purview = [{
-			nodeKey: approverConfig1.value.value.nodeNumber,
-			powerAry:powerAry
-		}]
-	}
-	let sendInfo: any  = {
-		formKey:props.customerFormKey.toString(),
-		formVersion:props.formVersion.toString(),
-		formData:JSON.stringify(formData.value),
-		formPower:JSON.stringify(formData.value.purview)
-	}
-	// console.log("sendInfo",sendInfo)
-	setFlowFormKeyPower(sendInfo)
-    closeDrawer()
-}
-const closeDrawer = ()=> {
-    setApprover(false)
-	isExecutor.value = false
-}
+const changeType = (val: any) => {
+  matrixIsShow.value = false;
+  approverConfig.value.nodeUserList = [];
+  approverConfig.value.examineMode = 1;
+  approverConfig.value.noHanderAction = 2;
+  if (val == 2) {
+    approverConfig.value.directorLevel = 1;
+  } else if (val == 4) {
+    approverConfig.value.selectMode = 1;
+    approverConfig.value.selectRange = 1;
+  } else if (val == 7) {
+    approverConfig.value.examineEndDirectorLevel = 1;
+  } else if (val == 9) {
+    matrixIsShow.value = true;
+    matrixFieldList.value = approverConfig.value.matrix;
+  }
+};
+const addApprover = () => {
+  approverVisible.value = true;
+  checkedList.value = approverConfig.value.nodeUserList;
+};
+const addRoleApprover = () => {
+  approverRoleVisible.value = true;
+  checkedRoleList.value = approverConfig.value.nodeUserList;
+};
+const addApproverPost = () => {
+  appPosistonVisible.value = true;
+  checkedPostList.value = approverConfig.value.nodeUserList;
+};
+const surePostApprover = (data: any) => {
+  appPosistonVisible.value = false;
+  approverConfig.value.nodeUserList = data;
+};
+const sureApprover = (data: any) => {
+  approverConfig.value.nodeUserList = data;
+  approverVisible.value = false;
+};
+const sureRoleApprover = (data: any) => {
+  approverConfig.value.nodeUserList = data;
+  approverRoleVisible.value = false;
+};
+const saveApprover = () => {
+  approverConfig.value.error = !$func.setApproverStr(approverConfig.value);
+  setApproverConfig({
+    value: approverConfig.value,
+    flag: true,
+    id: approverConfig1.value.id,
+  });
+  let powerAry = [];
+  if (
+    powerUnitAry.value.recUnitAry.masterUnitList &&
+    powerUnitAry.value.recUnitAry.masterUnitList.length > 0
+  ) {
+    powerUnitAry.value.recUnitAry.masterUnitList.forEach((item: any) => {
+      powerAry.push(item);
+    });
+  }
+  if (
+    powerUnitAry.value.recUnitAry.sunUnitList &&
+    powerUnitAry.value.recUnitAry.sunUnitList.length > 0
+  ) {
+    powerUnitAry.value.recUnitAry.sunUnitList.forEach((item: any) => {
+      if (item.masterUnitList && item.masterUnitList.length > 0) {
+        item.masterUnitList.forEach((itemSun: any) => {
+          // powerAry.push(item)
+          if (!powerAry.includes(itemSun)) {
+            powerAry.push(itemSun);
+          }
+        });
+      }
+    });
+  }
+  // console.log("正确",formData.value)
+  if (formData.value.purview) {
+    // console.log("正确")
+    let isNew = true;
+    formData.value.purview.forEach((item: any) => {
+      // console.log("正确---->",item.nodeKey)
+      if (item.nodeKey == approverConfig1.value.value.nodeNumber) {
+        item.powerAry = powerAry;
+        isNew = false;
+      }
+    });
+    if (isNew) {
+      formData.value.purview.push({
+        nodeKey: approverConfig1.value.value.nodeNumber,
+        powerAry: powerAry,
+      });
+    }
+  } else {
+    formData.value.purview = [
+      {
+        nodeKey: approverConfig1.value.value.nodeNumber,
+        powerAry: powerAry,
+      },
+    ];
+  }
+  let sendInfo: any = {
+    formKey: props.customerFormKey.toString(),
+    formVersion: props.formVersion.toString(),
+    formData: JSON.stringify(formData.value),
+    formPower: JSON.stringify(formData.value.purview),
+  };
+  // console.log("sendInfo",sendInfo)
+  setFlowFormKeyPower(sendInfo);
+  closeDrawer();
+};
+const closeDrawer = () => {
+  setApprover(false);
+  isExecutor.value = false;
+};
 //判断审批设置是否显示
-const isShowRatify = (id:number)=>{
-	if(id == 8){
-		return props.isFormFlow
-	}else{
-		return true
-	}
-}
+const isShowRatify = (id: number) => {
+  if (id == 8) {
+    return props.isFormFlow;
+  } else {
+    return true;
+  }
+};
 
 //字段
-const formTableField = ()=> {
-	appFormTableVisible.value = true;
-    checkedFormList.value = approverConfig.value.nodeUserList
-}
-const sureFormTableApprover = (data:any)=> {
-    approverConfig.value.nodeUserList = data;
-    appFormTableVisible.value = false;
-}
+const formTableField = () => {
+  appFormTableVisible.value = true;
+  checkedFormList.value = approverConfig.value.nodeUserList;
+};
+const sureFormTableApprover = (data: any) => {
+  approverConfig.value.nodeUserList = data;
+  appFormTableVisible.value = false;
+};
 
- 
 //更新审批人设置
-const updateMatrix = (val:any) =>{
-	approverConfig.value.matrix = val;
-}
+const updateMatrix = (val: any) => {
+  approverConfig.value.matrix = val;
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-03-13 08:24:54
 @ 功能: 解析表单
 */
 const jieForm = () => {
-	// console.log("nodeKey:approverConfig1.nodeNumber",approverConfig1.value.value.nodeNumber);
-	analysisForm({nodeKey:approverConfig1.value.value.nodeNumber,nodeJson:JSON.stringify(formData.value)})
-		.then((data)=>{
-			if(data.code == 0){
-				powerUnitAry.value = data.data
-			}
-		})
-}
-
-watch(()=>visible.value,(val:boolean)=>{
-	if(val){
-		jieForm();
-	}
-})
-const nodeSetUp = ref("first")
+  // console.log("nodeKey:approverConfig1.nodeNumber",approverConfig1.value.value.nodeNumber);
+  analysisForm({
+    nodeKey: approverConfig1.value.value.nodeNumber,
+    nodeJson: JSON.stringify(formData.value),
+  }).then((data) => {
+    if (data.code == 0) {
+      powerUnitAry.value = data.data;
+    }
+  });
+};
 
+watch(
+  () => visible.value,
+  (val: boolean) => {
+    if (val) {
+      jieForm();
+    }
+  }
+);
+const nodeSetUp = ref("first");
 
 /**
 @ 作者: 秦东
@@ -343,162 +350,182 @@ const nodeSetUp = ref("first")
 @ 功能: 选择情况
 */
 const editOpenOrClose = (val: any) => {
-	if(powerUnitAry.value.recUnitAry.masterUnitList){
-		powerUnitAry.value.recUnitAry.masterUnitList.forEach((item:any)=>{
-			item.isEdit = val
-		})
-	}
-}
+  if (powerUnitAry.value.recUnitAry.masterUnitList) {
+    powerUnitAry.value.recUnitAry.masterUnitList.forEach((item: any) => {
+      item.isEdit = val;
+    });
+  }
+};
 const lookOpenOrClose = (val: boolean) => {
-	if(powerUnitAry.value.recUnitAry.masterUnitList){
-		powerUnitAry.value.recUnitAry.masterUnitList.forEach((item:any)=>{
-			item.isLook = val
-			if(!val){
-				item.isEdit = val
-				isEditAll.value = val
-			}
-		})
-	}
-	
-	
-}
+  if (powerUnitAry.value.recUnitAry.masterUnitList) {
+    powerUnitAry.value.recUnitAry.masterUnitList.forEach((item: any) => {
+      item.isLook = val;
+      if (!val) {
+        item.isEdit = val;
+        isEditAll.value = val;
+      }
+    });
+  }
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-07-25 16:09:18
 @ 功能: 操作单一可见
 */
 const oneLookSet = (val: any) => {
-	if(!val.isLook){
-		val.isEdit = val
-		isEditAll.value = val
-	}
-	if(powerUnitAry.value.recUnitAry.masterUnitList){
-		let lookAll = 0
-		powerUnitAry.value.recUnitAry.masterUnitList.forEach((item:any)=>{
-			if(item.isLook){
-				lookAll++
-			}
-		})
-		if(lookAll != powerUnitAry.value.recUnitAry.masterUnitList.length){
-			isLookAll.value = false
-		}else{
-			isLookAll.value = true
-		}
-	}
-}
+  if (!val.isLook) {
+    val.isEdit = val;
+    isEditAll.value = val;
+  }
+  if (powerUnitAry.value.recUnitAry.masterUnitList) {
+    let lookAll = 0;
+    powerUnitAry.value.recUnitAry.masterUnitList.forEach((item: any) => {
+      if (item.isLook) {
+        lookAll++;
+      }
+    });
+    if (lookAll != powerUnitAry.value.recUnitAry.masterUnitList.length) {
+      isLookAll.value = false;
+    } else {
+      isLookAll.value = true;
+    }
+  }
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-07-25 16:17:32
 @ 功能: 操作单一可编辑
 */
 const oneEditSet = (val: any) => {
-	if(powerUnitAry.value.recUnitAry.masterUnitList){
-		let lookAll = 0
-		powerUnitAry.value.recUnitAry.masterUnitList.forEach((item:any)=>{
-			if(item.isEdit){
-				lookAll++
-			}
-		})
-		if(lookAll != powerUnitAry.value.recUnitAry.masterUnitList.length){
-			isEditAll.value = false
-		}else{
-			isEditAll.value = true
-		}
-	}
-}
+  if (powerUnitAry.value.recUnitAry.masterUnitList) {
+    let lookAll = 0;
+    powerUnitAry.value.recUnitAry.masterUnitList.forEach((item: any) => {
+      if (item.isEdit) {
+        lookAll++;
+      }
+    });
+    if (lookAll != powerUnitAry.value.recUnitAry.masterUnitList.length) {
+      isEditAll.value = false;
+    } else {
+      isEditAll.value = true;
+    }
+  }
+};
 
 //监听审批人设置选项
-watch(()=>approverConfig.value.settype,(val:any)=>{
-	// console.log("监听审批人设置选项",approverConfig.value)
-	switch (val) {
-		case 10:
-			let sendOrg = {
-				id: 313,
-				idstr: "313",
-				level: 4,
-				all: 1
-			}
-			govthree(sendOrg)
-				.then(({data})=>{
-					// console.log("监听审批人设置选项",data)
-					orgList.value = data
-					nextTick(()=>{
-						setOrgTree(approverConfig.value.orgList)
-					})
-				})
-			break;
-	
-		default:
-			break;
-	}
-},{
-	deep:true
-})
+watch(
+  () => approverConfig.value.settype,
+  (val: any) => {
+    // console.log("监听审批人设置选项",approverConfig.value)
+    switch (val) {
+      case 10:
+        let sendOrg = {
+          id: 313,
+          idstr: "313",
+          level: 4,
+          all: 1,
+        };
+        govthree(sendOrg).then(({ data }) => {
+          // console.log("监听审批人设置选项",data)
+          orgList.value = data;
+          nextTick(() => {
+            setOrgTree(approverConfig.value.orgList);
+          });
+        });
+        break;
+
+      default:
+        break;
+    }
+  },
+  {
+    deep: true,
+  }
+);
 /**
 @ 作者: 秦东
 @ 时间: 2024-08-08 15:54:07
 @ 功能: 选中的哪个行政组织
 */
-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)){
+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(threePickAry.halfCheckedKeys && Array.isArray(threePickAry.halfCheckedKeys) && threePickAry.halfCheckedKeys.length > 0){
 
+  // 	}else{
 
-	// 	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)
-}
+  // 		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)
@@ -511,395 +538,626 @@ const handleNodeClickOrg = (data: any,threePickAry: any) => {
 @ 时间: 2024-08-08 16:07:49
 @ 功能: 设置选项
 */
-const setOrgTree = (val:any) => {
-	console.log("设置选项",val)
-	if(Array.isArray(val)){
-		flowOrgTree.value!.setCheckedKeys(val, true)
-	}else{
-		flowOrgTree.value!.setCheckedKeys([val], true)
-	}
-	
-}
+const setOrgTree = (val: any) => {
+  console.log("设置选项", val);
+  if (Array.isArray(val)) {
+    flowOrgTree.value!.setCheckedKeys(val, true);
+  } else {
+    flowOrgTree.value!.setCheckedKeys([val], true);
+  }
+};
 </script>
 <template>
-	
-	<el-drawer v-model="visible" :append-to-body="true" :title="nodeTitle"  class="set_promoter" :show-close="false" :size="550" :before-close="closeDrawer"> 
-
-		<div class="demo-drawer__content">
-			<!--审批人设置主体-->
-			<div class="drawer_content">
-				<el-tabs v-model="nodeSetUp" class="demo-tabs">
-					<el-tab-pane name="first">
-						<template #label>
-							<span class="wordKeyCss">属性设置</span>
-						</template>
-					
-
-
-						<!-- <el-divider content-position="left">节点属性</el-divider> -->
-						<div class="approver_content">
-							<el-radio-group v-model="approverConfig.settype" class="clear" @change="changeType">
-								<template v-for="({value, label}) in setTypes"  :key="value">
-									<el-radio v-if="isShowRatify(value)" :label="value" style="width:auto">{{label}}</el-radio>
-								</template>
-							</el-radio-group>
-						</div>
-						<!--指定成员-->
-						<el-divider v-if="approverConfig.settype==1" content-position="left">指定成员</el-divider>
-						<div v-if="approverConfig.settype==1" class="approver_manager">
-							<el-button  type="primary" @click="addApprover">添加/修改成员</el-button>
-							<p  class="selected_list">
-								<el-tag  v-for="(item,index) in approverConfig.nodeUserList" :key="index" closable type="info" effect="plain" class="tag_us" @close="$func.removeEle(approverConfig.nodeUserList,item,'targetId')">{{item.name}}</el-tag>
-								<el-tag v-if="approverConfig.nodeUserList.length!=0" type="danger" effect="dark" @click="approverConfig.nodeUserList=[]">清除</el-tag>
-							</p>
-						</div>
-						<!--主管-->
-						<el-divider v-if="approverConfig.settype==2" content-position="left">主管</el-divider>
-						<div v-if="approverConfig.settype==2" class="approver_manager">
-							<p>
-								<el-row  :gutter="10">
-									<el-col v-if="isExecutor" :span="6">
-										<select v-model="approverConfig.attribute" style="width:100%">
-											<option value="1">发起人</option>
-											<option value="2">执行人</option>
-										</select>
-									</el-col>
-									<el-col :span="18">
-										<select v-model="approverConfig.directorLevel">
-											<option v-for="item in props.directormaxlevel" :key="item" :value="item">{{item==1?'直接':'第'+item+'级'}}主管</option>
-										</select>
-									</el-col>
-								</el-row>
-								
-							</p>
-							<p class="tip">找不到主管时，由上级主管代审批</p>
-						</div>
-						<!--行政岗位-->
-						<el-divider v-if="approverConfig.settype==3" content-position="left">指定行政岗位</el-divider>
-						<div v-if="approverConfig.settype==3" class="approver_manager">
-							<el-row>
-								<el-col :span="18">
-									<el-button  type="primary" @click="addApproverPost">添加/修改行政岗位</el-button>
-								</el-col>
-								<el-col :span="6">
-									<select  v-if="isExecutor" v-model="approverConfig.attribute" style="width:100%">
-										<option value="1">发起人</option>
-										<option value="2">执行人</option>
-									</select>
-								</el-col>
-							</el-row>
-							<p  class="selected_list">
-								<el-tag  v-for="(item,index) in approverConfig.nodeUserList" :key="index" closable type="info" effect="plain" class="tag_us" @close="$func.removeEle(approverConfig.nodeUserList,item,'targetId')">{{item.name}}</el-tag>
-								<el-tag v-if="approverConfig.nodeUserList.length!=0" type="danger" effect="dark" @click="approverConfig.nodeUserList=[]">清除</el-tag>
-							</p>
-						</div>
-						<!--发起人自选-->
-						<el-divider v-if="approverConfig.settype==4" content-position="left">发起人自选</el-divider>
-						<div v-show="approverConfig.settype==4" class="approver_self_select">
-							<el-radio-group v-model="approverConfig.selectMode" style="width: 100%;">
-								<el-radio v-for="({value, label}) in selectModes" :key="value" :label="value">{{label}}</el-radio>
-							</el-radio-group>
-							<h3>选择范围</h3>
-							<el-radio-group v-model="approverConfig.selectRange" style="width: 100%;" @change="changeRange">
-								<el-radio v-for="({value, label}) in selectRanges" :key="value" :label="value" >{{label}}</el-radio>
-							</el-radio-group>
-							<template v-if="approverConfig.selectRange==2||approverConfig.selectRange==3">
-								<el-button v-if="approverConfig.selectRange==2" type="primary" @click="addApprover">添加/修改成员</el-button>
-								<el-button v-else type="primary" @click="addRoleApprover">添加/修改角色</el-button>
-								<p class="selected_list">
-									<el-tag  v-for="(item,index) in approverConfig.nodeUserList" :key="index" closable type="info" effect="plain" class="tag_us" @close="$func.removeEle(approverConfig.nodeUserList,item,'targetId')">{{item.name}}</el-tag>
-									<el-tag v-if="approverConfig.nodeUserList.length!=0&&approverConfig.selectRange!=1" type="danger" effect="dark" @click="approverConfig.nodeUserList=[]">清除</el-tag>
-								</p>
-							</template>
-						</div>
-						<!--发起人自己-->
-						<el-divider v-if="approverConfig.settype==5" content-position="left">发起人自选</el-divider>
-						<div v-if="approverConfig.settype==5" class="approver_self">
-							<p>该审批节点设置“发起人自己”后，审批人默认为发起人</p>
-						</div>
-						<!--连续多级主管-->
-						<el-divider v-if="approverConfig.settype==6" content-position="left">连续多级主管</el-divider>
-						<div v-if="approverConfig.settype==6" class="approver_manager">
-							<p style="padding-bottom:20px">
-								<el-row  :gutter="10">
-									<el-col v-if="isExecutor" :span="6">
-										<select v-model="approverConfig.attribute" style="width:100%">
-											<option value="1">发起人</option>
-											<option value="2">执行人</option>
-										</select>
-									</el-col>
-									<el-col :span="10">
-										<select v-model="approverConfig.examineEndDirectorLevel">
-											<option v-for="item in props.directormaxlevel" :key="item" :value="item">{{item==1?'直接':'第'+item+'级'}}主管</option>
-										</select>
-									</el-col>
-								</el-row>
+  <el-drawer
+    v-model="visible"
+    :append-to-body="true"
+    :title="nodeTitle"
+    class="set_promoter"
+    :show-close="false"
+    :size="550"
+    :before-close="closeDrawer"
+  >
+    <div class="demo-drawer__content">
+      <!--审批人设置主体-->
+      <div class="drawer_content">
+        <el-tabs v-model="nodeSetUp" class="demo-tabs">
+          <el-tab-pane name="first">
+            <template #label>
+              <span class="wordKeyCss">属性设置</span>
+            </template>
 
-							</p>
-						</div>
-						<!--指定审批节点为本节点设置审批人-->
-						<el-divider v-if="approverConfig.settype==7" content-position="left">可选节点列表</el-divider>
-						<div v-if="approverConfig.settype==7" class="approver_manager">
-							<p>可选节点列表</p>
-							<el-radio-group v-model="approverConfig.customNode" class="clear">
-								<el-radio label="beginnode" >发起人</el-radio>
-								<el-radio v-for="item in nodeOptional"  :key="item.nodeNumber" :label="item.nodeNumber" class="nodeGroupRadio">{{ item.nodeName }}（编号：{{ item.nodeNumber }}）</el-radio>
-								
-							</el-radio-group>
-						</div>
-						<!--根据关联表单设置指定审批字段-->
-						<el-divider v-if="approverConfig.settype==8" content-position="left">指定审批字段</el-divider>
-						<div v-if="approverConfig.settype==8" class="approver_manager">
-							<el-button  type="primary" @click="formTableField">添加/修改审批字段</el-button>
-							<p  class="selected_list">
-								<el-tag  v-for="(item,index) in approverConfig.nodeUserList" :key="index" closable type="info" effect="plain" class="tag_us" @close="$func.removeEle(approverConfig.nodeUserList,item,'targetId')">{{item.name}}</el-tag>
-								<el-tag v-if="approverConfig.nodeUserList.length!=0" type="danger" effect="dark" @click="approverConfig.nodeUserList=[]">清除</el-tag>
-							</p>
-						</div>
-						<!--权限矩阵-->
-						<div v-if="approverConfig.settype==9" class="approver_manager">
-							<select v-if="isExecutor" v-model="approverConfig.attribute"  style="width:100%">
-								<option value="1">发起人</option>
-								<option  value="2">执行人</option>
-							</select>
-						</div>
-						<el-divider v-if="approverConfig.settype==10" content-position="left">指定部门负责人</el-divider>
-						<div v-if="approverConfig.settype==10" class="approver_manager">
-							<el-button type="primary" @click="setOrgTree(102)">设置行政组织</el-button>
-							<el-tree-v2
-								ref="flowOrgTree"
-								style="border: 1px solid #ccc;"
-								:data="orgList"
-								:props="orgProps"
-								:height="300"
-								node-key="id"
-								show-checkbox
-								:check-strictly="false"
-								:highlight-current="true"
-								:expand-on-click-node="false"
-								:check-on-click-node="true"
-								@check="handleNodeClickOrg"
-							/>
-						</div>
-						<MatrixPage
-							v-if="approverConfig.settype==9" 
-							v-model:isshow="matrixIsShow"
-							:data="matrixFieldList"
-							@change="updateMatrix"
-						/>
-						<!--补充审批信息-->
-						<el-divider v-if="(approverConfig.settype==1&&approverConfig.nodeUserList.length>1)||approverConfig.settype==2||approverConfig.settype==6||(approverConfig.settype==4&&approverConfig.selectMode==2)||approverConfig.settype==8||approverConfig.settype==9||approverConfig.settype==10" content-position="left">多人审批时采用的审批方式</el-divider>
-						<div v-if="(approverConfig.settype==1&&approverConfig.nodeUserList.length>1)||approverConfig.settype==2||approverConfig.settype==6||(approverConfig.settype==4&&approverConfig.selectMode==2)||approverConfig.settype==8||approverConfig.settype==9||approverConfig.settype==10" class="approver_some">
-							<el-radio-group v-model="approverConfig.examineMode" class="clear">
-								<el-radio :label="1">依次审批</el-radio>
-								<el-radio v-if="approverConfig.settype!=2" :label="2">会签(须所有审批人同意)</el-radio>
-								<el-radio v-if="approverConfig.settype!=2" :label="3">或签(有一位审批人同意即可)</el-radio>
-							</el-radio-group>
-						</div>
-						<el-divider v-if="approverConfig.settype==2||approverConfig.settype==6||approverConfig.settype==9||approverConfig.settype==10" content-position="left">审批人为空时</el-divider>
-						<div v-if="approverConfig.settype==2||approverConfig.settype==6||approverConfig.settype==9||approverConfig.settype==10" class="approver_some">
-							<el-radio-group v-model="approverConfig.noHanderAction" class="clear">
-								<el-radio :label="1">自动审批通过/不允许发起</el-radio>
-								<br/>
-								<el-radio :label="2">转交给审核管理员</el-radio>
-							</el-radio-group>
-						</div>
-						<el-divider content-position="left">退回设置</el-divider>
-						<div class="approver_some">
-							<el-radio-group v-model="approverConfig.sendBackNode" class="clear">
-								<el-radio label="beginnode" >发起人</el-radio>
-								<el-radio v-for="item in nodeOptional" :key="item.nodeNumber" :label="item.nodeNumber" >{{ item.nodeName }}（编号：{{ item.nodeNumber }}）</el-radio>
-							</el-radio-group>
-						</div>
-					</el-tab-pane>
-    				<el-tab-pane name="second">
-						<template #label>
-							<span class="wordKeyCss">操作权限</span>
-						</template>
-						<!-- <el-divider content-position="left">操作权限</el-divider> -->
-						<div class="info_box">
-							<div class="table_name"><el-text class="mx-1" type="primary">主表</el-text></div>
-							<el-table v-if="powerUnitAry.recUnitAry.masterUnitList" :data="powerUnitAry.recUnitAry.masterUnitList" size="small" style="width: 100%; --el-table-border-color: none;" :header-cell-style="{background:'#eef1f6',color:'#606266'}" class="customer-no-border-table" >
-								<el-table-column prop="name" label="字段" />
-								<el-table-column  align="center"  width="80">
-									<template #header>
-										<el-checkbox v-model="isLookAll" label="" @change="lookOpenOrClose" />可见
-									</template>
-									<template #default="scope">
-										<el-checkbox v-model="scope.row.isLook" label=""  @change="oneLookSet(scope.row)" />
-									</template>
-								</el-table-column>
-								<el-table-column  align="center"  width="120">
-									<template #header>
-										<el-checkbox v-model="isEditAll" label="" @change="editOpenOrClose" />可编辑
-									</template>
-									<template #default="scope">
-										<el-checkbox v-model="scope.row.isEdit" label="" @change="oneEditSet(scope.row)" />
-									</template>
-								</el-table-column>
-							</el-table>
-							<el-row  v-if="powerUnitAry.recUnitAry.sunUnitList"  v-for="(item,index) in powerUnitAry.recUnitAry.sunUnitList" :key="index">
-								<el-col :span="24" class="table_name"><el-text class="mx-1" type="primary">{{item.name}}</el-text>子表</el-col>
-								<el-col :span="24">
-									<el-table v-if="item.masterUnitList" :data="item.masterUnitList" size="small"  style="width: 100%;  --el-table-border-color: none;"  :header-cell-style="{background:'#eef1f6',color:'#606266'}">
-										<el-table-column prop="name" label="字段" />
-										<el-table-column label="可见" align="center"  width="80">
-											<template #default="scope">
-												<el-checkbox v-model="scope.row.isLook" label="" />
-											</template>
-										</el-table-column>
-										<el-table-column label="可编辑" align="center"  width="80">
-											<template #default="scope">
-												<el-checkbox v-model="scope.row.isEdit" label="" />
-											</template>
-										</el-table-column>
-									</el-table>
-								</el-col>
-							</el-row>
-						</div>
-					</el-tab-pane>
-					<el-tab-pane name="helpInstructions">
-						<template #label>
-							<span class="wordKeyCss">帮助说明</span>
-						</template>
-						<div class="info_box">
-							<QuillEditor v-model="approverConfig.helpTips" height="400px" />
-						</div>
-					</el-tab-pane>
-					
-				</el-tabs>
-
-			</div>
-			<div class="demo-drawer__footer clear">
-                <el-button type="primary" @click="saveApprover">确 定</el-button>
-                <el-button @click="closeDrawer">取 消</el-button>
+            <!-- <el-divider content-position="left">节点属性</el-divider> -->
+            <div class="approver_content">
+              <el-radio-group
+                v-model="approverConfig.settype"
+                class="clear"
+                @change="changeType"
+              >
+                <template v-for="{ value, label } in setTypes" :key="value">
+                  <el-radio
+                    v-if="isShowRatify(value)"
+                    :label="value"
+                    style="width: auto"
+                    >{{ label }}</el-radio
+                  >
+                </template>
+              </el-radio-group>
             </div>
-			<!--选择成员-->
-			<employees-dialog 
-                v-model:visible="approverVisible"
-                :data="checkedList"
-                @change="sureApprover"
-            />
-			<!--选择角色-->
-			<role-dialog 
-                v-model:visible="approverRoleVisible"
-                :data="checkedRoleList"
-                @change="sureRoleApprover"
-            />
-			<!--选择岗位-->
-			<PositionDialog 
-                v-model:visible="appPosistonVisible"
-                :data="checkedPostList"
-                @change="surePostApprover"
+            <!--指定成员-->
+            <el-divider v-if="approverConfig.settype == 1" content-position="left"
+              >指定成员</el-divider
+            >
+            <div v-if="approverConfig.settype == 1" class="approver_manager">
+              <el-button type="primary" @click="addApprover">添加/修改成员</el-button>
+              <p class="selected_list">
+                <el-tag
+                  v-for="(item, index) in approverConfig.nodeUserList"
+                  :key="index"
+                  closable
+                  type="info"
+                  effect="plain"
+                  class="tag_us"
+                  @close="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')"
+                  >{{ item.name }}</el-tag
+                >
+                <el-tag
+                  v-if="approverConfig.nodeUserList.length != 0"
+                  type="danger"
+                  effect="dark"
+                  @click="approverConfig.nodeUserList = []"
+                  >清除</el-tag
+                >
+              </p>
+            </div>
+            <!--主管-->
+            <el-divider v-if="approverConfig.settype == 2" content-position="left"
+              >主管</el-divider
+            >
+            <div v-if="approverConfig.settype == 2" class="approver_manager">
+              <p>
+                <el-row :gutter="10">
+                  <el-col v-if="isExecutor" :span="6">
+                    <select v-model="approverConfig.attribute" style="width: 100%">
+                      <option value="1">发起人</option>
+                      <option value="2">执行人</option>
+                    </select>
+                  </el-col>
+                  <el-col :span="18">
+                    <select v-model="approverConfig.directorLevel">
+                      <option
+                        v-for="item in props.directormaxlevel"
+                        :key="item"
+                        :value="item"
+                      >
+                        {{ item == 1 ? "直接" : "第" + item + "级" }}主管
+                      </option>
+                    </select>
+                  </el-col>
+                </el-row>
+              </p>
+              <p class="tip">找不到主管时，由上级主管代审批</p>
+            </div>
+            <!--行政岗位-->
+            <el-divider v-if="approverConfig.settype == 3" content-position="left"
+              >指定行政岗位</el-divider
+            >
+            <div v-if="approverConfig.settype == 3" class="approver_manager">
+              <el-row>
+                <el-col :span="18">
+                  <el-button type="primary" @click="addApproverPost"
+                    >添加/修改行政岗位</el-button
+                  >
+                </el-col>
+                <el-col :span="6">
+                  <select
+                    v-if="isExecutor"
+                    v-model="approverConfig.attribute"
+                    style="width: 100%"
+                  >
+                    <option value="1">发起人</option>
+                    <option value="2">执行人</option>
+                  </select>
+                </el-col>
+              </el-row>
+              <p class="selected_list">
+                <el-tag
+                  v-for="(item, index) in approverConfig.nodeUserList"
+                  :key="index"
+                  closable
+                  type="info"
+                  effect="plain"
+                  class="tag_us"
+                  @close="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')"
+                  >{{ item.name }}</el-tag
+                >
+                <el-tag
+                  v-if="approverConfig.nodeUserList.length != 0"
+                  type="danger"
+                  effect="dark"
+                  @click="approverConfig.nodeUserList = []"
+                  >清除</el-tag
+                >
+              </p>
+            </div>
+            <!--发起人自选-->
+            <el-divider v-if="approverConfig.settype == 4" content-position="left"
+              >发起人自选</el-divider
+            >
+            <div v-show="approverConfig.settype == 4" class="approver_self_select">
+              <el-radio-group v-model="approverConfig.selectMode" style="width: 100%">
+                <el-radio
+                  v-for="{ value, label } in selectModes"
+                  :key="value"
+                  :label="value"
+                  >{{ label }}</el-radio
+                >
+              </el-radio-group>
+              <h3>选择范围</h3>
+              <el-radio-group
+                v-model="approverConfig.selectRange"
+                style="width: 100%"
+                @change="changeRange"
+              >
+                <el-radio
+                  v-for="{ value, label } in selectRanges"
+                  :key="value"
+                  :label="value"
+                  >{{ label }}</el-radio
+                >
+              </el-radio-group>
+              <template
+                v-if="approverConfig.selectRange == 2 || approverConfig.selectRange == 3"
+              >
+                <el-button
+                  v-if="approverConfig.selectRange == 2"
+                  type="primary"
+                  @click="addApprover"
+                  >添加/修改成员</el-button
+                >
+                <el-button v-else type="primary" @click="addRoleApprover"
+                  >添加/修改角色</el-button
+                >
+                <p class="selected_list">
+                  <el-tag
+                    v-for="(item, index) in approverConfig.nodeUserList"
+                    :key="index"
+                    closable
+                    type="info"
+                    effect="plain"
+                    class="tag_us"
+                    @close="
+                      $func.removeEle(approverConfig.nodeUserList, item, 'targetId')
+                    "
+                    >{{ item.name }}</el-tag
+                  >
+                  <el-tag
+                    v-if="
+                      approverConfig.nodeUserList.length != 0 &&
+                      approverConfig.selectRange != 1
+                    "
+                    type="danger"
+                    effect="dark"
+                    @click="approverConfig.nodeUserList = []"
+                    >清除</el-tag
+                  >
+                </p>
+              </template>
+            </div>
+            <!--发起人自己-->
+            <el-divider v-if="approverConfig.settype == 5" content-position="left"
+              >发起人自选</el-divider
+            >
+            <div v-if="approverConfig.settype == 5" class="approver_self">
+              <p>该审批节点设置“发起人自己”后，审批人默认为发起人</p>
+            </div>
+            <!--连续多级主管-->
+            <el-divider v-if="approverConfig.settype == 6" content-position="left"
+              >连续多级主管</el-divider
+            >
+            <div v-if="approverConfig.settype == 6" class="approver_manager">
+              <p style="padding-bottom: 20px">
+                <el-row :gutter="10">
+                  <el-col v-if="isExecutor" :span="6">
+                    <select v-model="approverConfig.attribute" style="width: 100%">
+                      <option value="1">发起人</option>
+                      <option value="2">执行人</option>
+                    </select>
+                  </el-col>
+                  <el-col :span="10">
+                    <select v-model="approverConfig.examineEndDirectorLevel">
+                      <option
+                        v-for="item in props.directormaxlevel"
+                        :key="item"
+                        :value="item"
+                      >
+                        {{ item == 1 ? "直接" : "第" + item + "级" }}主管
+                      </option>
+                    </select>
+                  </el-col>
+                </el-row>
+              </p>
+            </div>
+            <!--指定审批节点为本节点设置审批人-->
+            <el-divider v-if="approverConfig.settype == 7" content-position="left"
+              >可选节点列表</el-divider
+            >
+            <div v-if="approverConfig.settype == 7" class="approver_manager">
+              <p>可选节点列表</p>
+              <el-radio-group v-model="approverConfig.customNode" class="clear">
+                <el-radio label="beginnode">发起人</el-radio>
+                <el-radio
+                  v-for="item in nodeOptional"
+                  :key="item.nodeNumber"
+                  :label="item.nodeNumber"
+                  class="nodeGroupRadio"
+                  >{{ item.nodeName }}（编号：{{ item.nodeNumber }}）</el-radio
+                >
+              </el-radio-group>
+            </div>
+            <!--根据关联表单设置指定审批字段-->
+            <el-divider v-if="approverConfig.settype == 8" content-position="left"
+              >指定审批字段</el-divider
+            >
+            <div v-if="approverConfig.settype == 8" class="approver_manager">
+              <el-button type="primary" @click="formTableField"
+                >添加/修改审批字段</el-button
+              >
+              <p class="selected_list">
+                <el-tag
+                  v-for="(item, index) in approverConfig.nodeUserList"
+                  :key="index"
+                  closable
+                  type="info"
+                  effect="plain"
+                  class="tag_us"
+                  @close="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')"
+                  >{{ item.name }}</el-tag
+                >
+                <el-tag
+                  v-if="approverConfig.nodeUserList.length != 0"
+                  type="danger"
+                  effect="dark"
+                  @click="approverConfig.nodeUserList = []"
+                  >清除</el-tag
+                >
+              </p>
+            </div>
+            <!--权限矩阵-->
+            <div v-if="approverConfig.settype == 9" class="approver_manager">
+              <select
+                v-if="isExecutor"
+                v-model="approverConfig.attribute"
+                style="width: 100%"
+              >
+                <option value="1">发起人</option>
+                <option value="2">执行人</option>
+              </select>
+            </div>
+            <el-divider v-if="approverConfig.settype == 10" content-position="left"
+              >指定部门负责人</el-divider
+            >
+            <div v-if="approverConfig.settype == 10" class="approver_manager">
+              <el-button type="primary" @click="setOrgTree(102)">设置行政组织</el-button>
+              <el-tree-v2
+                ref="flowOrgTree"
+                style="border: 1px solid #ccc"
+                :data="orgList"
+                :props="orgProps"
+                :height="300"
+                node-key="id"
+                show-checkbox
+                :check-strictly="false"
+                :highlight-current="true"
+                :expand-on-click-node="false"
+                :check-on-click-node="true"
+                @check="handleNodeClickOrg"
+              />
+            </div>
+            <MatrixPage
+              v-if="approverConfig.settype == 9"
+              v-model:isshow="matrixIsShow"
+              :data="matrixFieldList"
+              @change="updateMatrix"
             />
-			<!--表单字段-->
-			<FormWord
-				v-model:visible="appFormTableVisible"
-                :data="checkedFormList"
-				:formid="props.customerFormKey"
-				:formtype="1"
-                @change="sureFormTableApprover"
-			/>
-
-		</div>
-	</el-drawer>
+            <!--补充审批信息-->
+            <el-divider
+              v-if="
+                (approverConfig.settype == 1 && approverConfig.nodeUserList.length > 1) ||
+                approverConfig.settype == 2 ||
+                approverConfig.settype == 6 ||
+                (approverConfig.settype == 4 && approverConfig.selectMode == 2) ||
+                approverConfig.settype == 8 ||
+                approverConfig.settype == 9 ||
+                approverConfig.settype == 10
+              "
+              content-position="left"
+              >多人审批时采用的审批方式</el-divider
+            >
+            <div
+              v-if="
+                (approverConfig.settype == 1 && approverConfig.nodeUserList.length > 1) ||
+                approverConfig.settype == 2 ||
+                approverConfig.settype == 6 ||
+                (approverConfig.settype == 4 && approverConfig.selectMode == 2) ||
+                approverConfig.settype == 8 ||
+                approverConfig.settype == 9 ||
+                approverConfig.settype == 10
+              "
+              class="approver_some"
+            >
+              <el-radio-group v-model="approverConfig.examineMode" class="clear">
+                <el-radio :label="1">依次审批</el-radio>
+                <el-radio v-if="approverConfig.settype != 2" :label="2"
+                  >会签(须所有审批人同意)</el-radio
+                >
+                <el-radio v-if="approverConfig.settype != 2" :label="3"
+                  >或签(有一位审批人同意即可)</el-radio
+                >
+              </el-radio-group>
+            </div>
+            <el-divider
+              v-if="
+                approverConfig.settype == 2 ||
+                approverConfig.settype == 6 ||
+                approverConfig.settype == 9 ||
+                approverConfig.settype == 10
+              "
+              content-position="left"
+              >审批人为空时</el-divider
+            >
+            <div
+              v-if="
+                approverConfig.settype == 2 ||
+                approverConfig.settype == 6 ||
+                approverConfig.settype == 9 ||
+                approverConfig.settype == 10
+              "
+              class="approver_some"
+            >
+              <el-radio-group v-model="approverConfig.noHanderAction" class="clear">
+                <el-radio :label="1">自动审批通过/不允许发起</el-radio>
+                <br />
+                <el-radio :label="2">转交给审核管理员</el-radio>
+              </el-radio-group>
+            </div>
+            <el-divider content-position="left">退回设置</el-divider>
+            <div class="approver_some">
+              <el-radio-group v-model="approverConfig.sendBackNode" class="clear">
+                <el-radio label="beginnode">发起人</el-radio>
+                <el-radio
+                  v-for="item in nodeOptional"
+                  :key="item.nodeNumber"
+                  :label="item.nodeNumber"
+                  >{{ item.nodeName }}（编号：{{ item.nodeNumber }}）</el-radio
+                >
+              </el-radio-group>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane name="second">
+            <template #label>
+              <span class="wordKeyCss">操作权限</span>
+            </template>
+            <!-- <el-divider content-position="left">操作权限</el-divider> -->
+            <div class="info_box">
+              <div class="table_name">
+                <el-text class="mx-1" type="primary">主表</el-text>
+              </div>
+              <el-table
+                v-if="powerUnitAry.recUnitAry.masterUnitList"
+                :data="powerUnitAry.recUnitAry.masterUnitList"
+                size="small"
+                style="width: 100%; --el-table-border-color: none"
+                :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
+                class="customer-no-border-table"
+              >
+                <el-table-column prop="name" label="字段" />
+                <el-table-column align="center" width="80">
+                  <template #header>
+                    <el-checkbox
+                      v-model="isLookAll"
+                      label=""
+                      @change="lookOpenOrClose"
+                    />可见
+                  </template>
+                  <template #default="scope">
+                    <el-checkbox
+                      v-model="scope.row.isLook"
+                      label=""
+                      @change="oneLookSet(scope.row)"
+                    />
+                  </template>
+                </el-table-column>
+                <el-table-column align="center" width="120">
+                  <template #header>
+                    <el-checkbox
+                      v-model="isEditAll"
+                      label=""
+                      @change="editOpenOrClose"
+                    />可编辑
+                  </template>
+                  <template #default="scope">
+                    <el-checkbox
+                      v-model="scope.row.isEdit"
+                      label=""
+                      @change="oneEditSet(scope.row)"
+                    />
+                  </template>
+                </el-table-column>
+              </el-table>
+              <el-row
+                v-if="powerUnitAry.recUnitAry.sunUnitList"
+                v-for="(item, index) in powerUnitAry.recUnitAry.sunUnitList"
+                :key="index"
+              >
+                <el-col :span="24" class="table_name"
+                  ><el-text class="mx-1" type="primary">{{ item.name }}</el-text
+                  >子表</el-col
+                >
+                <el-col :span="24">
+                  <el-table
+                    v-if="item.masterUnitList"
+                    :data="item.masterUnitList"
+                    size="small"
+                    style="width: 100%; --el-table-border-color: none"
+                    :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
+                  >
+                    <el-table-column prop="name" label="字段" />
+                    <el-table-column label="可见" align="center" width="80">
+                      <template #default="scope">
+                        <el-checkbox v-model="scope.row.isLook" label="" />
+                      </template>
+                    </el-table-column>
+                    <el-table-column label="可编辑" align="center" width="80">
+                      <template #default="scope">
+                        <el-checkbox v-model="scope.row.isEdit" label="" />
+                      </template>
+                    </el-table-column>
+                  </el-table>
+                </el-col>
+              </el-row>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane name="helpInstructions">
+            <template #label>
+              <span class="wordKeyCss">帮助说明</span>
+            </template>
+            <div class="info_box">
+              <QuillEditor v-model="approverConfig.helpTips" height="400px" />
+            </div>
+          </el-tab-pane>
+        </el-tabs>
+      </div>
+      <div class="demo-drawer__footer clear">
+        <el-button type="primary" @click="saveApprover">确 定</el-button>
+        <el-button @click="closeDrawer">取 消</el-button>
+      </div>
+      <!--选择成员-->
+      <employees-dialog
+        v-model:visible="approverVisible"
+        :data="checkedList"
+        @change="sureApprover"
+      />
+      <!--选择角色-->
+      <role-dialog
+        v-model:visible="approverRoleVisible"
+        :data="checkedRoleList"
+        @change="sureRoleApprover"
+      />
+      <!--选择岗位-->
+      <PositionDialog
+        v-model:visible="appPosistonVisible"
+        :data="checkedPostList"
+        @change="surePostApprover"
+      />
+      <!--表单字段-->
+      <FormWord
+        v-model:visible="appFormTableVisible"
+        :data="checkedFormList"
+        :formid="props.customerFormKey"
+        :formtype="1"
+        @change="sureFormTableApprover"
+      />
+    </div>
+  </el-drawer>
 </template>
-<style  lang='scss' scoped>
-
+<style lang="scss" scoped>
 .approver_some .el-radio-group {
   display: block;
 }
-.approver_manager .el-radio-group{
-	display: block;
+.approver_manager .el-radio-group {
+  display: block;
 }
 
 .approver_some .el-radio {
   display: block;
 }
-.set_promoter{
-    .approver_content {
-        padding-bottom: 10px;
-        border-bottom: 0px solid #f2f2f2;
-		.el-radio{
-			width:auto;
-		}
-    }
-	.approver_manager,.approver_self_select,.approver_some,.approver_self{
-		border-top: 0px solid #f2f2f2;
-	}
-    .approver_self_select,
-    .approver_content{
-        .el-button{
-            margin-bottom: 20px;
-        }
-    }
-    .approver_content,
-    .approver_some,
-    .approver_self_select{
-        .el-radio-group{
-            display: unset;
-        }
-        .el-radio{
-            width: 27%;
-            margin-bottom: 20px;
-            height: 16px;
-        }
-    }
-    .approver_manager p {
-        line-height: 32px;
-    }
-    .approver_manager select {
-        width: 420px;
-        height: 32px;
-        background: rgba(255, 255, 255, 1);
-        border-radius: 4px;
-        border: 1px solid rgba(217, 217, 217, 1);
-    }
-    .approver_manager p.tip {
-        margin: 10px 0 22px 0;
-        font-size: 12px;
-        line-height: 16px;
-        color: #f8642d;
-    }
-    .approver_self {
-        padding: 28px 20px;
+.set_promoter {
+  .approver_content {
+    padding-bottom: 10px;
+    border-bottom: 0px solid #f2f2f2;
+    .el-radio {
+      width: auto;
     }
-    .approver_self_select,
-    .approver_manager,
-    .approver_content,
-    .approver_some {
-        padding: 20px 20px 20px 20px;
+  }
+  .approver_manager,
+  .approver_self_select,
+  .approver_some,
+  .approver_self {
+    border-top: 0px solid #f2f2f2;
+  }
+  .approver_self_select,
+  .approver_content {
+    .el-button {
+      margin-bottom: 20px;
     }
-    .approver_manager p:first-of-type,
-    .approver_some p {
-        line-height: 19px;
-        font-size: 14px;
-        margin-bottom: 14px;
+  }
+  .approver_content,
+  .approver_some,
+  .approver_self_select {
+    .el-radio-group {
+      display: unset;
     }
-    .approver_self_select h3 {
-        margin: 5px 0 20px;
-        font-size: 14px;
-        font-weight: bold;
-        line-height: 19px;
+    .el-radio {
+      width: 27%;
+      margin-bottom: 20px;
+      height: 16px;
     }
+  }
+  .approver_manager p {
+    line-height: 32px;
+  }
+  .approver_manager select {
+    width: 420px;
+    height: 32px;
+    background: rgba(255, 255, 255, 1);
+    border-radius: 4px;
+    border: 1px solid rgba(217, 217, 217, 1);
+  }
+  .approver_manager p.tip {
+    margin: 10px 0 22px 0;
+    font-size: 12px;
+    line-height: 16px;
+    color: #f8642d;
+  }
+  .approver_self {
+    padding: 28px 20px;
+  }
+  .approver_self_select,
+  .approver_manager,
+  .approver_content,
+  .approver_some {
+    padding: 20px 20px 20px 20px;
+  }
+  .approver_manager p:first-of-type,
+  .approver_some p {
+    line-height: 19px;
+    font-size: 14px;
+    margin-bottom: 14px;
+  }
+  .approver_self_select h3 {
+    margin: 5px 0 20px;
+    font-size: 14px;
+    font-weight: bold;
+    line-height: 19px;
+  }
 }
-.selected_list{
-	margin: 0;
-    line-height: 0;
-	.tag_us{
-		margin-right: 10px;
-	}
-	span{
-		margin-top: 10px;
-	}
-	a{
-		margin-top: 15px;
-	}
+.selected_list {
+  margin: 0;
+  line-height: 0;
+  .tag_us {
+    margin-right: 10px;
+  }
+  span {
+    margin-top: 10px;
+  }
+  a {
+    margin-top: 15px;
+  }
 }
-.info_box{
-	padding: 0 20px;
+.info_box {
+  padding: 0 20px;
 }
-.wordKeyCss{
-	padding: 0 20px;
+.wordKeyCss {
+  padding: 0 20px;
 }
 </style>
diff --git a/src/views/hr/archives/downpage/xingGeFengXi.vue b/src/views/hr/archives/downpage/xingGeFengXi.vue
index b02adb9..15ddc66 100644
--- a/src/views/hr/archives/downpage/xingGeFengXi.vue
+++ b/src/views/hr/archives/downpage/xingGeFengXi.vue
@@ -3,84 +3,114 @@
 @ 时间: 2024-09-19 13:16:56
 @ 备注: 性格分析过度
 -->
-<script lang='ts' setup>
-const downloadUrl = import.meta.env.VITE_APP_BASE_API+"/systemapi/rongxin/downLoadNineTestPage"
-const downloadUrlStis = import.meta.env.VITE_APP_BASE_API+"/systemapi/rongxin/statisticsPersonality"
+<script lang="ts" setup>
+const downloadUrl =
+  import.meta.env.VITE_APP_BASE_API + "/systemapi/rongxin/downLoadNineTestPage";
+const downloadUrlStis =
+  import.meta.env.VITE_APP_BASE_API + "/systemapi/rongxin/statisticsPersonality";
 const props = defineProps({
-	downTableType: {
-		type: String,
-		default: "10000003",
-	},
-	downClassType: {
-		type: Number,
-		default: 1,
-	},
-	orgTree: {
-		type: Object,
-		default() {
-			return {};
-		},
-	},
+  downTableType: {
+    type: String,
+    default: "10000003",
+  },
+  downClassType: {
+    type: Number,
+    default: 1,
+  },
+  orgTree: {
+    type: Object,
+    default() {
+      return {};
+    },
+  },
 });
-const dialogVisible = ref(true)
+const dialogVisible = ref(true);
 const emits = defineEmits(["closeXigePage"]);
 const searchQuery = reactive({
-	types:1,
-	org:"",
-	keywords:"",
-	typekey:props.downTableType?props.downTableType.toString():""
-})
+  types: 1,
+  org: "",
+  keywords: "",
+  typekey: props.downTableType ? props.downTableType.toString() : "",
+});
 const handleTypeClose = () => {
-	emits("closeXigePage")
-}
-const orgTreeProps ={
-	children: 'child',
-	label: 'name',
-	value:"id"
-}	//行政组织树对照值
+  emits("closeXigePage");
+};
+const orgTreeProps = {
+  children: "child",
+  label: "name",
+  value: "id",
+}; //行政组织树对照值
 </script>
 <template>
-	<el-dialog
-		v-model="dialogVisible"
-		title="选择下载范围"
-		width="500"
-		:before-close="handleTypeClose"
-	>
-		<el-form :model="searchQuery" label-width="90px" >
-			<el-form-item v-if="props.downClassType!=1" label="统计类型" label-position="left">
-				<el-radio-group v-model="searchQuery.types">
-					<el-radio :value="1">未做</el-radio>
-					<el-radio :value="2">已做</el-radio>
-				</el-radio-group>
-			</el-form-item>
-			<el-form-item label="行政组织" label-position="left">
-				<el-tree-select
-					v-model="searchQuery.org"
-					:data="props.orgTree"
-					check-strictly
-					:render-after-expand="false"
-					:props="orgTreeProps" 
-					clearable
-				/>
-			</el-form-item>
-			<el-form-item label="工号或姓名"  label-position="left">
-				<el-input v-model="searchQuery.keywords" clearable />
-			</el-form-item>
-			<el-form-item>
-				<el-link  v-if="props.downClassType==2" type="primary"  :underline="false" :href="downloadUrlStis+'?keywords='+searchQuery.keywords+'&org='+searchQuery.org+'&typekey='+searchQuery.typekey+'&types='+searchQuery.types" target="_blank">
-					<el-button type="primary">
-						确定下载
-					</el-button>
-				</el-link>
-				<el-link v-else type="primary"  :underline="false" :href="downloadUrl+'?keywords='+searchQuery.keywords+'&adminorg='+searchQuery.org+'&typekey='+searchQuery.typekey" target="_blank">
-					<el-button type="primary">
-						确定下载
-					</el-button>
-				</el-link>
-			</el-form-item>
-		</el-form>
-	</el-dialog>
+  <el-dialog
+    v-model="dialogVisible"
+    title="选择下载范围"
+    width="500"
+    :before-close="handleTypeClose"
+  >
+    <el-form :model="searchQuery" label-width="90px">
+      <el-form-item
+        v-if="props.downClassType != 1"
+        label="统计类型"
+        label-position="left"
+      >
+        <el-radio-group v-model="searchQuery.types">
+          <el-radio :value="1">未做</el-radio>
+          <el-radio :value="2">已做</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="行政组织" label-position="left">
+        <el-tree-select
+          v-model="searchQuery.org"
+          :data="props.orgTree"
+          check-strictly
+          :render-after-expand="false"
+          :props="orgTreeProps"
+          clearable
+        />
+      </el-form-item>
+      <el-form-item label="工号或姓名" label-position="left">
+        <el-input v-model="searchQuery.keywords" clearable />
+      </el-form-item>
+      <el-form-item>
+        <el-link
+          v-if="props.downClassType == 2"
+          type="primary"
+          :underline="false"
+          :href="
+            downloadUrlStis +
+            '?keywords=' +
+            searchQuery.keywords +
+            '&org=' +
+            searchQuery.org +
+            '&typekey=' +
+            searchQuery.typekey +
+            '&types=' +
+            searchQuery.types
+          "
+          target="_blank"
+        >
+          <el-button type="primary"> 确定下载 </el-button>
+        </el-link>
+        <el-link
+          v-else
+          type="primary"
+          :underline="false"
+          :href="
+            downloadUrl +
+            '?keywords=' +
+            searchQuery.keywords +
+            '&adminorg=' +
+            searchQuery.org +
+            '&typekey=' +
+            searchQuery.typekey
+          "
+          target="_blank"
+        >
+          <el-button type="primary"> 确定下载 </el-button>
+        </el-link>
+      </el-form-item>
+    </el-form>
+  </el-dialog>
 </template>
-<style  lang='scss' scoped>
-
-</style>
+<style lang="scss" scoped></style>
diff --git a/src/views/hr/archives/index.vue b/src/views/hr/archives/index.vue
index 40987d4..62e02af 100644
--- a/src/views/hr/archives/index.vue
+++ b/src/views/hr/archives/index.vue
@@ -3,187 +3,200 @@
 @ 时间: 2023-06-03 15:12:26
 @ 备注: 人员管理
 -->
-<script lang='ts' setup>
-import { orgInfo,msgAry } from '@/api/hr/org/type'
-import { getOrgTreeList,gainUserInfoDownTemplateList,uploadUserTemplate,editUserTempr,gainUserTemplateInfo,editUserTemplateInfo,gainTempleateOrgList } from '@/api/hr/org/index'
-import { archivesCont,searchCriteriaForPeople } from '@/api/hr/people/type'
-import { emptypeOptions } from '@/api/hr/people/datacont'
-import { getArchivesListPage,analysisRedisExelect,analysisRedisOrgExelect,downLoadNineTestPage } from '@/api/hr/people/index'
-import UserRole from '@/assets/icons/user.svg'
-import { UploadFilled } from '@element-plus/icons-vue'
+<script lang="ts" setup>
+import { orgInfo, msgAry } from "@/api/hr/org/type";
+import {
+  getOrgTreeList,
+  gainUserInfoDownTemplateList,
+  uploadUserTemplate,
+  editUserTempr,
+  gainUserTemplateInfo,
+  editUserTemplateInfo,
+  gainTempleateOrgList,
+} from "@/api/hr/org/index";
+import { archivesCont, searchCriteriaForPeople } from "@/api/hr/people/type";
+import { emptypeOptions } from "@/api/hr/people/datacont";
+import {
+  getArchivesListPage,
+  analysisRedisExelect,
+  analysisRedisOrgExelect,
+  downLoadNineTestPage,
+} from "@/api/hr/people/index";
+import UserRole from "@/assets/icons/user.svg";
+import { UploadFilled } from "@element-plus/icons-vue";
 
-import { uploadUrl } from '@/api/DesignForm'
+import { uploadUrl } from "@/api/DesignForm";
 /**
  * 引入页面
  */
-import ArchivesCont from '@/views/hr/archives/archivescont.vue'
-import XingGeFengXi from '@/views/hr/archives/downpage/xingGeFengXi.vue'
+import ArchivesCont from "@/views/hr/archives/archivescont.vue";
+import XingGeFengXi from "@/views/hr/archives/downpage/xingGeFengXi.vue";
 
-import { ElScrollbar as ElScrollbarType } from 'element-plus';
+import { ElScrollbar as ElScrollbarType } from "element-plus";
 
+import { json2string } from "@/utils/DesignForm/form";
 
-import {
-    json2string
-} from '@/utils/DesignForm/form'
-
-const innerRef = ref<HTMLDivElement>()
-const scrollbarRef = ref<InstanceType<typeof ElScrollbarType>>()
+const innerRef = ref<HTMLDivElement>();
+const scrollbarRef = ref<InstanceType<typeof ElScrollbarType>>();
 
-const downloadUrl = import.meta.env.VITE_APP_BASE_API+"/systemapi/rongxin/downLoadNineTestPage"
+const downloadUrl =
+  import.meta.env.VITE_APP_BASE_API + "/systemapi/rongxin/downLoadNineTestPage";
 
 const handleClick = () => {
   nextTick(() => {
-	// console.log("滚动条长度",innerRef.value!.clientHeight)
+    // console.log("滚动条长度",innerRef.value!.clientHeight)
     if (innerRef.value!.clientHeight > 300) {
-      scrollbarRef.value!.setScrollTop(innerRef.value!.clientHeight)
+      scrollbarRef.value!.setScrollTop(innerRef.value!.clientHeight);
     }
-    
-  })
-}
+  });
+};
 
-const direction = ref("rtl")
+const direction = ref("rtl");
 // const uploadFFurl = import.meta.env.VITE_APP_BASE_API + "/hrapi/staff/uploadUserFiles"
-const uploadFFurl = import.meta.env.VITE_APP_BASE_API + "/hrapi/staff/uploadUserFilesRedis"
+const uploadFFurl =
+  import.meta.env.VITE_APP_BASE_API + "/hrapi/staff/uploadUserFilesRedis";
 
 const searchOrgFormRef = ref(ElForm);
-const orgTreeRef = ref(ElTree);	//行政组织树
-const orgTreeLoading = ref(false);	//加载行政组织树
-const orgTreeList = ref<orgInfo[]>();				//行政组织树数据
-const orgTreeProps ={
-  children: 'child',
-  label: 'name',
-}	//行政组织树对照值
-const peopleList = ref<archivesCont[]>();	//人员列表
-const peoplecont = ref<archivesCont>();	//个人信息
-const tableLoading = ref(false);	//加载数据列表
-const total = ref(0);				//总记录数
+const orgTreeRef = ref(ElTree); //行政组织树
+const orgTreeLoading = ref(false); //加载行政组织树
+const orgTreeList = ref<orgInfo[]>(); //行政组织树数据
+const orgTreeProps = {
+  children: "child",
+  label: "name",
+}; //行政组织树对照值
+const peopleList = ref<archivesCont[]>(); //人员列表
+const peoplecont = ref<archivesCont>(); //个人信息
+const tableLoading = ref(false); //加载数据列表
+const total = ref(0); //总记录数
 const searchArchiveQuery = reactive<searchCriteriaForPeople>({
-	page:1,
-	pagesize:13
-})
+  page: 1,
+  pagesize: 13,
+});
 // const progressSize = 0
-const progressSize = ref(0)
-const archivesBox= ref(false);	//详情弹窗
+const progressSize = ref(0);
+const archivesBox = ref(false); //详情弹窗
 /**用工关系（1:临时工 , 2:编外人员 ;3:实习&实习生;4：试用员工；5：待分配；6：待岗；7：临时调入；8：正式员工；9：长期病假；10：停薪留职；11：退休；12：辞职；13：辞退；14：离职）',
   `company` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT '入职公司',
  * 获取行政组织数据
  */
- function haveOrgTreeInfo(){
-	orgTreeLoading.value = true;
-	getOrgTreeList({})
-		.then(({ data })=>{
-			orgTreeList.value = data
-		}).finally(()=>{orgTreeLoading.value = false;})
+function haveOrgTreeInfo() {
+  orgTreeLoading.value = true;
+  getOrgTreeList({})
+    .then(({ data }) => {
+      orgTreeList.value = data;
+    })
+    .finally(() => {
+      orgTreeLoading.value = false;
+    });
 }
 /**
  * 选中行政组织树节点
  */
 const handleOrgTreeNodeClick = (data: orgInfo) => {
-  	// console.log(data)
-	searchArchiveQuery.adminorg = data.id
-	getArchivesPage();
-}
+  // console.log(data)
+  searchArchiveQuery.adminorg = data.id;
+  getArchivesPage();
+};
 /**
  * 重置选中行政组织
  */
 function resetChecked() {
-	orgTreeRef.value!.setCheckedKeys([], false)
-	searchArchiveQuery.adminorg = 0
+  orgTreeRef.value!.setCheckedKeys([], false);
+  searchArchiveQuery.adminorg = 0;
 }
 /**
  * 重置搜索框
  */
- function resetArcFormQuery(){
-	searchOrgFormRef.value.resetFields();
-	searchArchiveQuery.emptype=[];
-	resetChecked();
-	getArchivesPage();
+function resetArcFormQuery() {
+  searchOrgFormRef.value.resetFields();
+  searchArchiveQuery.emptype = [];
+  resetChecked();
+  getArchivesPage();
 }
 /**
  * 获取人员列表
  */
-function getArchivesPage(){
-	tableLoading.value = true;
-	getArchivesListPage(searchArchiveQuery)
-		.then(({ data })=>{
-			peopleList.value = data.list
-			total.value = data.total
-		})
-		.finally(()=>{tableLoading.value = false;})
+function getArchivesPage() {
+  tableLoading.value = true;
+  getArchivesListPage(searchArchiveQuery)
+    .then(({ data }) => {
+      peopleList.value = data.list;
+      total.value = data.total;
+    })
+    .finally(() => {
+      tableLoading.value = false;
+    });
 }
 /**
  * 新增员工
  */
-function addPeopleDialog(){
-
-}
+function addPeopleDialog() {}
 /**
  * 查看详情
  */
-function lookPeopleCont(cont:archivesCont){
-	peoplecont.value = cont
-	archivesBox.value = true
+function lookPeopleCont(cont: archivesCont) {
+  peoplecont.value = cont;
+  archivesBox.value = true;
 }
 /**
  * 更新个人信息
  */
-function updateMyCont(cont:archivesCont){
-	peoplecont.value = cont
+function updateMyCont(cont: archivesCont) {
+  peoplecont.value = cont;
 }
 //批量导入数据相关操作
-const piLiangBox = ref(false)
-const orgListTemp = ref<any>([])
+const piLiangBox = ref(false);
+const orgListTemp = ref<any>([]);
 //打开批量导入面板
-const openPiliangBox = () =>{
-	gainTempleateOrgList()
-		.then((data:any) =>{
-			console.log("打开批量导入面板",data);
-			orgListTemp.value = data.data
-		})
-	piLiangBox.value = true	
-}
+const openPiliangBox = () => {
+  gainTempleateOrgList().then((data: any) => {
+    console.log("打开批量导入面板", data);
+    orgListTemp.value = data.data;
+  });
+  piLiangBox.value = true;
+};
 let jiBuQiVal = 0;
 //关闭导入
-const handleOpenClose = () =>{
-	piLiangBox.value = false
-	peopleListAry.value = []
-	progressSize.value =  0	
-	peopleMsg.value = []
-	jiBuQiVal = 0
-}
-const excelLoading = ref(false)
-const excelJiexi = ref(false)
-const logList = ref<any>([])
+const handleOpenClose = () => {
+  piLiangBox.value = false;
+  peopleListAry.value = [];
+  progressSize.value = 0;
+  peopleMsg.value = [];
+  jiBuQiVal = 0;
+};
+const excelLoading = ref(false);
+const excelJiexi = ref(false);
+const logList = ref<any>([]);
 /**
  * Excel文件change事件
  *
  * @param file
  */
- function handleExcelChange(file: UploadFile) {
-	excelLoading.value = true
-	if (!/\.(xlsx|xls|XLSX|XLS)$/.test(file.name)) {
-		ElMessage.warning("上传Excel只能为xlsx、xls格式");
-		excelLoading.value = false;
-		return false;
-	}
+function handleExcelChange(file: UploadFile) {
+  excelLoading.value = true;
+  if (!/\.(xlsx|xls|XLSX|XLS)$/.test(file.name)) {
+    ElMessage.warning("上传Excel只能为xlsx、xls格式");
+    excelLoading.value = false;
+    return false;
+  }
 }
 
 function handleExcelChangeTemp(file: UploadFile) {
-	excelLoading.value = true
-	if(tempForm.orgId == 0 || tempForm.orgId == ""){
-		ElMessage.warning("对不起！你没有选定上传的是哪个行政组织得人员信息！");
-		excelLoading.value = false;
-		return false;
-	}
-	if (!/\.(xlsx|xls|XLSX|XLS)$/.test(file.name)) {
-		ElMessage.warning("上传Excel只能为xlsx、xls格式");
-		excelLoading.value = false;
-		return false;
-	}
+  excelLoading.value = true;
+  if (tempForm.orgId == 0 || tempForm.orgId == "") {
+    ElMessage.warning("对不起！你没有选定上传的是哪个行政组织得人员信息！");
+    excelLoading.value = false;
+    return false;
+  }
+  if (!/\.(xlsx|xls|XLSX|XLS)$/.test(file.name)) {
+    ElMessage.warning("上传Excel只能为xlsx、xls格式");
+    excelLoading.value = false;
+    return false;
+  }
 }
 
-let peopleListAry = new Array;
-const peopleMsg = ref<string[]>([])
+let peopleListAry = new Array();
+const peopleMsg = ref<string[]>([]);
 const meritsYearIng = ref<any>();
 const rewPunYearsIng = ref<any>();
 const redisListKey = ref<string>();
@@ -194,173 +207,170 @@ const totalNum = ref<number>();
 @ 功能: 上传成功
 */
 const uploadTrue = (response: any, uploadFile: UploadFile, uploadFiles: UploadFiles) => {
-	excelLoading.value = false;
-	// console.log("response",response);
-	// console.log("uploadFile",uploadFile);
-	// console.log("uploadFiles",uploadFiles);
-	peopleListAry.push("文件上传成功！开始解析数据并写入数据库！")
-	peopleMsg.value.push("文件上传成功！开始解析数据并写入数据库！")
-	// peopleListAry.value.push("文件上传成功！开始解析数据并写入数据库！")
-	// console.log("上传成功",response.code)
-	if (response.code == 0){
-		jiBuQiVal = 0
-		progressSize.value =  0
-		excelJiexi.value = true
-		meritsYearIng.value = response.data.meritsYearIng
-		rewPunYearsIng.value = response.data.rewPunYearsIng
-		redisListKey.value = response.data.redisListKey
-		totalNum.value = response.data.totalNum
-		insetPeopleCont()
-	}
-}
+  excelLoading.value = false;
+  // console.log("response",response);
+  // console.log("uploadFile",uploadFile);
+  // console.log("uploadFiles",uploadFiles);
+  peopleListAry.push("文件上传成功！开始解析数据并写入数据库！");
+  peopleMsg.value.push("文件上传成功！开始解析数据并写入数据库！");
+  // peopleListAry.value.push("文件上传成功！开始解析数据并写入数据库！")
+  // console.log("上传成功",response.code)
+  if (response.code == 0) {
+    jiBuQiVal = 0;
+    progressSize.value = 0;
+    excelJiexi.value = true;
+    meritsYearIng.value = response.data.meritsYearIng;
+    rewPunYearsIng.value = response.data.rewPunYearsIng;
+    redisListKey.value = response.data.redisListKey;
+    totalNum.value = response.data.totalNum;
+    insetPeopleCont();
+  }
+};
 const uploadError = (response: any, uploadFile: UploadFile, uploadFiles: UploadFiles) => {
-	excelLoading.value = true;
-	// console.log("1response",response);
-	// console.log("1uploadFile",uploadFile);
-	// console.log("1uploadFiles",uploadFiles);
-	let msgAry = new Array                                        
-	msgAry.push("响应时间过长，系统自动转为后台静默处理，可先关闭窗口！完成时间大约90分钟。请于90分钟后刷新信息")
-	// errorMsg = ["响应时间过长，系统自动转为后台静默处理，可先关闭窗口！完成时间大约90分钟。请于90分钟后刷新信息"]
-	peopleListAry.value = msgAry
-}
+  excelLoading.value = true;
+  // console.log("1response",response);
+  // console.log("1uploadFile",uploadFile);
+  // console.log("1uploadFiles",uploadFiles);
+  let msgAry = new Array();
+  msgAry.push(
+    "响应时间过长，系统自动转为后台静默处理，可先关闭窗口！完成时间大约90分钟。请于90分钟后刷新信息"
+  );
+  // errorMsg = ["响应时间过长，系统自动转为后台静默处理，可先关闭窗口！完成时间大约90分钟。请于90分钟后刷新信息"]
+  peopleListAry.value = msgAry;
+};
 
+const excelUpload = ref<any>();
 
-const excelUpload = ref<any>()
+const insetPeopleCont = () => {
+  // console.log("启动数据写入数据库",jiBuQiVal,totalNum.value)
+  if (jiBuQiVal < totalNum.value) {
+    let sendData = {
+      meritsYearIng: meritsYearIng.value,
+      rewPunYearsIng: rewPunYearsIng.value,
+      redisListKey: redisListKey.value,
+      number: jiBuQiVal,
+      orgId: tempForm.orgId.toString(),
+    };
+    // console.log("启动数据写入数据库",sendData)
+    analysisRedisOrgExelect(sendData).then((data: any) => {
+      // console.log("启动数据写入11111数据库",data,data.data.msgStr)
+      peopleMsg.value.push(data.data.msgStr);
+      jiBuQiVal++;
+      // if (jibuq+ 1 >= totalNum.value){
 
-const insetPeopleCont = () =>{
-	// console.log("启动数据写入数据库",jiBuQiVal,totalNum.value)
-	if (jiBuQiVal < totalNum.value){
-		let sendData = {
-			meritsYearIng:meritsYearIng.value,
-			rewPunYearsIng:rewPunYearsIng.value,
-			redisListKey:redisListKey.value,
-			number:jiBuQiVal,
-			orgId:tempForm.orgId.toString(),
-		}
-		// console.log("启动数据写入数据库",sendData)
-		analysisRedisOrgExelect(sendData)
-			.then((data:any)=>{
-				// console.log("启动数据写入11111数据库",data,data.data.msgStr)
-				peopleMsg.value.push(data.data.msgStr)
-				jiBuQiVal++
-				// if (jibuq+ 1 >= totalNum.value){
-					
-				// }
-				progressSize.value =  Math.round((jiBuQiVal/totalNum.value)*10000)/100
-				insetPeopleCont()
-				nextTick(()=>{
-					handleClick();
-				})
-			})
-	}else{
-		excelJiexi.value = false
-		progressSize.value =  100
-		excelUpload.value.clearFiles()
-	}
-}
+      // }
+      progressSize.value = Math.round((jiBuQiVal / totalNum.value) * 10000) / 100;
+      insetPeopleCont();
+      nextTick(() => {
+        handleClick();
+      });
+    });
+  } else {
+    excelJiexi.value = false;
+    progressSize.value = 100;
+    excelUpload.value.clearFiles();
+  }
+};
 
 //启动数据写入数据库
 const writeDataBase = () => {
-	let jibuq = 0
-	for(let i = 0; i < totalNum.value;i++){
-		let sendData = {
-			meritsYearIng:meritsYearIng.value,
-			rewPunYearsIng:rewPunYearsIng.value,
-			redisListKey:redisListKey.value,
-			number:i,
-		}
-		// console.log("启动数据写入数据库",sendData)
-		analysisRedisOrgExelect(sendData)
-			.then((data:any)=>{
-				// console.log("启动数据写入11111数据库",data)
-				peopleMsg.value.push(data.data.msgStr)
-				jibuq++
-				if (jibuq+ 1 >= totalNum.value){
-					excelJiexi.value = false
-				}
-				nextTick(()=>{
-					handleClick();
-				})
-			})
-	}
-	
-}
+  let jibuq = 0;
+  for (let i = 0; i < totalNum.value; i++) {
+    let sendData = {
+      meritsYearIng: meritsYearIng.value,
+      rewPunYearsIng: rewPunYearsIng.value,
+      redisListKey: redisListKey.value,
+      number: i,
+    };
+    // console.log("启动数据写入数据库",sendData)
+    analysisRedisOrgExelect(sendData).then((data: any) => {
+      // console.log("启动数据写入11111数据库",data)
+      peopleMsg.value.push(data.data.msgStr);
+      jibuq++;
+      if (jibuq + 1 >= totalNum.value) {
+        excelJiexi.value = false;
+      }
+      nextTick(() => {
+        handleClick();
+      });
+    });
+  }
+};
 //加载数据
 onMounted(() => {
-	haveOrgTreeInfo();
-	getArchivesPage();
-	scrollToBottom();
+  haveOrgTreeInfo();
+  getArchivesPage();
+  scrollToBottom();
 });
 
 const ruleForm = reactive({
-	id:"",
-	orgId:"",
-	fileName:"",
-	filePath:"",
-	fileUrl:""
-})
+  id: "",
+  orgId: "",
+  fileName: "",
+  filePath: "",
+  fileUrl: "",
+});
 const tempForm = reactive({
-	orgId:0
-})
+  orgId: 0,
+});
 /**
 @ 作者: 秦东
 @ 时间: 2024-08-24 08:51:41
 @ 功能: 打开导入模板下载页面
 */
 const search = reactive({
-	page:1,
-	pagesize:20
-})
-const downImportTemOpen = ref(false)
-const downTemplate = ref()
+  page: 1,
+  pagesize: 20,
+});
+const downImportTemOpen = ref(false);
+const downTemplate = ref();
 const openImportTemplate = () => {
-	downImportTemOpen.value = true
-	temList()
-}
-const totalVal = ref(0)
+  downImportTemOpen.value = true;
+  temList();
+};
+const totalVal = ref(0);
 /**
 @ 作者: 秦东
 @ 时间: 2024-08-24 13:33:41
 @ 功能: 获取导入模版下载列表
 */
 const temList = () => {
-	gainUserInfoDownTemplateList(search)
-		.then((data:any)=>{
-			console.log("获取导入模版下载列表---<",data)
-			downTemplate.value = data.data.list
-			totalVal.value = data.data.total
-		})
-}
+  gainUserInfoDownTemplateList(search).then((data: any) => {
+    console.log("获取导入模版下载列表---<", data);
+    downTemplate.value = data.data.list;
+    totalVal.value = data.data.total;
+  });
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-08-24 08:58:11
 @ 功能: 关闭抽屉
 */
 const handleClose = () => {
-	downImportTemOpen.value = false
-}
+  downImportTemOpen.value = false;
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-08-24 14:14:37
 @ 功能: 上传新模版
 */
-const isNewAddTem = ref(false)
+const isNewAddTem = ref(false);
 const setUpNewTemplate = () => {
-	isNewAddTem.value = true
-}
+  isNewAddTem.value = true;
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-08-24 14:22:09
 @ 功能: 关闭上传导入模版弹窗
 */
 const tempOpenClose = () => {
-	isNewAddTem.value = false
-}
-const orgTreePropsBut ={
-  children: 'child',
-  value: 'id',
-  label: 'name',
-}	//行政组织树对照值
+  isNewAddTem.value = false;
+};
+const orgTreePropsBut = {
+  children: "child",
+  value: "id",
+  label: "name",
+}; //行政组织树对照值
 
 /**
 @ 作者: 秦东
@@ -368,586 +378,682 @@ const orgTreePropsBut ={
 @ 功能: 表单验证规则
 */
 const dataFormRules = reactive({
-	orgId: [{ required: true, message: "请选择行政组织", trigger: "blur" }],
-	fileName: [{ required: true, message: "请上传模版文件", trigger: "blur" }],
-})
+  orgId: [{ required: true, message: "请选择行政组织", trigger: "blur" }],
+  fileName: [{ required: true, message: "请上传模版文件", trigger: "blur" }],
+});
 
-const excelUploadUs = ref()
+const excelUploadUs = ref();
 
 /**
 @ 作者: 秦东
 @ 时间: 2024-08-24 14:42:34
 @ 功能: 保存上传模版信息
 */
-const addTemLoading = ref(false)
-const ruleFormRef = ref<any>()
-	
-const saveTemp = () => {
-	addTemLoading.value = true
-	ruleFormRef.value.validate((valid: any) => {
-		if (valid){
-			ruleForm.orgId=ruleForm.orgId.toString()
-			console.log("上传传输信息--->",ruleForm)
-			if(ruleForm.id == 0 || ruleForm.id == ""){
-				uploadUserTemplate(ruleForm)
-					.then((data:any) =>{
-						console.log("上传传输信息-1-->",data)
-						temList()
-						tempOpenClose();
-					})
-					.finally(() =>{
-						addTemLoading.value = false
-					})
-			}else{
-				editUserTemplateInfo(ruleForm)
-					.then((data:any) =>{
-						console.log("上传传输信息-2-->",data)
-						temList()
-						tempOpenClose();
-					})
-					.finally(() =>{
-						addTemLoading.value = false
-					})
-			}
-			
-		}else{
-			
-			addTemLoading.value = false
-		}
+const addTemLoading = ref(false);
+const ruleFormRef = ref<any>();
 
-	});
-}
+const saveTemp = () => {
+  addTemLoading.value = true;
+  ruleFormRef.value.validate((valid: any) => {
+    if (valid) {
+      ruleForm.orgId = ruleForm.orgId.toString();
+      console.log("上传传输信息--->", ruleForm);
+      if (ruleForm.id == 0 || ruleForm.id == "") {
+        uploadUserTemplate(ruleForm)
+          .then((data: any) => {
+            console.log("上传传输信息-1-->", data);
+            temList();
+            tempOpenClose();
+          })
+          .finally(() => {
+            addTemLoading.value = false;
+          });
+      } else {
+        editUserTemplateInfo(ruleForm)
+          .then((data: any) => {
+            console.log("上传传输信息-2-->", data);
+            temList();
+            tempOpenClose();
+          })
+          .finally(() => {
+            addTemLoading.value = false;
+          });
+      }
+    } else {
+      addTemLoading.value = false;
+    }
+  });
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-08-24 14:46:32
 @ 功能: 文件上传成功
 */
-const uploadTrueUs = (response: any, uploadFile: UploadFile, uploadFiles: UploadFiles) => {
-	// console.log("response",response);
-	// console.log("uploadFile",uploadFile);
-	// console.log("uploadFiles",uploadFiles);
-	excelLoading.value = false
-	ruleForm.fileName = uploadFile.name
-	ruleForm.filePath = response.data.physicspath
-	ruleForm.fileUrl = response.data.url
-	
-}
+const uploadTrueUs = (
+  response: any,
+  uploadFile: UploadFile,
+  uploadFiles: UploadFiles
+) => {
+  // console.log("response",response);
+  // console.log("uploadFile",uploadFile);
+  // console.log("uploadFiles",uploadFiles);
+  excelLoading.value = false;
+  ruleForm.fileName = uploadFile.name;
+  ruleForm.filePath = response.data.physicspath;
+  ruleForm.fileUrl = response.data.url;
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-08-26 11:08:00
 @ 功能: 编辑下载模版状态
 */
-const delUserTemp = (val:any,status:number) => {
-	// console.log("编辑下载模版状态------1------->",val);
-	// console.log("编辑下载模版状态------2------->",status);
-	let sendVal = {
-		id:val.id.toString(),
-		status:status
-	}
-	editUserTempr(sendVal)
-		.then((data:any) =>{
-			ElMessage.success(data.msg);
-			temList()
-		})
-}
+const delUserTemp = (val: any, status: number) => {
+  // console.log("编辑下载模版状态------1------->",val);
+  // console.log("编辑下载模版状态------2------->",status);
+  let sendVal = {
+    id: val.id.toString(),
+    status: status,
+  };
+  editUserTempr(sendVal).then((data: any) => {
+    ElMessage.success(data.msg);
+    temList();
+  });
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-08-26 11:45:44
 @ 功能: 编辑下载文件
 */
-const editUserTemp = (val:any) => {
-	ruleForm.id = val.id.toString();
-	ruleForm.orgId = val.orgId
-	ruleForm.fileName = val.fileName
-	ruleForm.filePath = val.filePath
-	ruleForm.fileUrl = val.fileUrl
-	console.log("编辑下载文件---->",ruleForm)
-	isNewAddTem.value = true
-}
+const editUserTemp = (val: any) => {
+  ruleForm.id = val.id.toString();
+  ruleForm.orgId = val.orgId;
+  ruleForm.fileName = val.fileName;
+  ruleForm.filePath = val.filePath;
+  ruleForm.fileUrl = val.fileUrl;
+  console.log("编辑下载文件---->", ruleForm);
+  isNewAddTem.value = true;
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-08-26 13:36:12
 @ 功能: 关闭上传弹窗
 */
 const closeUploadTemp = () => {
-		tempForm.orgId=0
-		progressSize.value = 0
-		piLiangBox.value = false
-		peopleMsg.value = []
-}
-
+  tempForm.orgId = 0;
+  progressSize.value = 0;
+  piLiangBox.value = false;
+  peopleMsg.value = [];
+};
 
 const myScrollbar = ref<any>(null);
 
 //滚动面板自动滑动到底部
 const scrollToBottom = () => {
-    if (myScrollbar.value) {
-        const container = myScrollbar.value.$el.querySelector('.el-scrollbar__wrap');
-        container.style.scrollBehavior = 'smooth'; // 添加平滑滚动效果
-        container.scrollTop = container.scrollHeight;
-    }
-}
+  if (myScrollbar.value) {
+    const container = myScrollbar.value.$el.querySelector(".el-scrollbar__wrap");
+    container.style.scrollBehavior = "smooth"; // 添加平滑滚动效果
+    container.scrollTop = container.scrollHeight;
+  }
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-09-13 09:18:25
 @ 功能: 下团队角色分析表
 */
 const downLoadTeamTable = () => {
-	downLoadNineTestPage(searchArchiveQuery)
-		.then(({data}) => {
-			console.log("下团队角色分析表",data)
-		})
-}
-const openSetup = ref(false)
+  downLoadNineTestPage(searchArchiveQuery).then(({ data }) => {
+    console.log("下团队角色分析表", data);
+  });
+};
+const openSetup = ref(false);
 /**
 @ 作者: 秦东
 @ 时间: 2024-09-19 09:57:42
 @ 功能: 设置相关操作
 */
 const setupClick = () => {
-	openSetup.value = true
-	temList()
-}
+  openSetup.value = true;
+  temList();
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-09-19 10:12:29
 @ 功能: 关闭设置
 */
-const closeSetup  = () => {
-	openSetup.value = false
-}
-const setupActiveName = ref("1")
-watch(() =>setupActiveName.value, (val:any) => {
-	console.log("切换选项",val)
-})
+const closeSetup = () => {
+  openSetup.value = false;
+};
+const setupActiveName = ref("1");
+watch(
+  () => setupActiveName.value,
+  (val: any) => {
+    console.log("切换选项", val);
+  }
+);
 /**
 @ 作者: 秦东
 @ 时间: 2024-09-19 13:12:29
 @ 功能: 下载性格分析表
 */
-const openTableType = ref(false)
-const downTableType = ref("10000003")
-const downClassType = ref(1)
-const selectDownTiaojian = (val:string) => {
-	downTableType.value = val
-	openTableType.value = true
-	downClassType.value = 1
-}
+const openTableType = ref(false);
+const downTableType = ref("10000003");
+const downClassType = ref(1);
+const selectDownTiaojian = (val: string) => {
+  downTableType.value = val;
+  openTableType.value = true;
+  downClassType.value = 1;
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-09-19 13:23:09
 @ 功能: 关闭下载页面
 */
 const closeXigePage = () => {
-	openTableType.value = false
-}
+  openTableType.value = false;
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-09-19 13:55:09
 @ 功能: 性格类型
 */
 const characterList = reactive([
-	{
-		label:"性格色彩",
-		code:"10000001"
-	},
-	{
-		label:"DISC性格特质",
-		code:"10000002"
-	},
-	{
-		label:"九型人格特质",
-		code:"10000003"
-	}
-])
-const downStatistics = (val:any) => {
-	console.log("下载数据嗖嗖嗖--->",val)
-	downTableType.value = val.code
-	openTableType.value = true
-	downClassType.value = 2
-}
+  {
+    label: "性格色彩",
+    code: "10000001",
+  },
+  {
+    label: "DISC性格特质",
+    code: "10000002",
+  },
+  {
+    label: "九型人格特质",
+    code: "10000003",
+  },
+]);
+const downStatistics = (val: any) => {
+  console.log("下载数据嗖嗖嗖--->", val);
+  downTableType.value = val.code;
+  openTableType.value = true;
+  downClassType.value = 2;
+};
 </script>
 <template>
-	<div class="app-container">
-		<el-container>
-		<el-aside width="300px" style="border-right:solid 1px #f0f0f0;">
-			<el-card :body-style="{ height: '100%',padding:'0px 5px' }">
-				<el-button type="primary"  style="width: 100%; margin: 10px 0;" @click="resetChecked">查看全部</el-button>
-				<el-tree 
-					ref="orgTreeRef"
-					v-loading="orgTreeLoading" 
-					node-key="id"
-					class="orgTree"
-					:data="orgTreeList" 
-					:props="orgTreeProps" 
-					:expand-on-click-node="false"
-					:check-on-click-node="true"
-					:check-strictly="true" 
-					:default-expand-all="false"
-					@node-click="handleOrgTreeNodeClick" 
-				/>
-			</el-card>
-		</el-aside>
-		<el-main style="padding:0">
-			<div style="padding: 0; margin:0">
-				<el-row class="search">
-					<el-col :span="16">
-						<el-form ref="searchOrgFormRef" :model="searchArchiveQuery" :inline="true">
-						<el-form-item label="工号 / 姓名" prop="keywords">
-							<el-input
-								v-model="searchArchiveQuery.keywords"
-								placeholder="请输入工号 / 姓名"
-								clearable
-							/>
-						</el-form-item>
-						<el-form-item label="用工关系" prop="number">
-							<el-select
-								v-model="searchArchiveQuery.emptype"
-								multiple
-								clearable
-								collapse-tags
-								placeholder="用工关系"
-								style="width: 240px"
-							>
-								<el-option
-									v-for="item in emptypeOptions"
-									:key="item.id"
-									:label="item.name"
-									:value="item.id"
-								/>
-							</el-select>
-						</el-form-item>
-					</el-form>
-					</el-col>
-					
-					<el-col :span="8" style="text-align: right;">
-						<el-button type="primary" @click="getArchivesPage">
-							<template #icon><i-ep-search /></template>
-							搜索
-						</el-button>
-						<el-button @click="resetArcFormQuery">
-							<template #icon><i-ep-refresh /></template>
-							重置
-						</el-button>
-					</el-col>
+  <div class="app-container">
+    <el-container>
+      <el-aside width="300px" style="border-right: solid 1px #f0f0f0">
+        <el-card :body-style="{ height: '100%', padding: '0px 5px' }">
+          <el-button
+            type="primary"
+            style="width: 100%; margin: 10px 0"
+            @click="resetChecked"
+            >查看全部</el-button
+          >
+          <el-tree
+            ref="orgTreeRef"
+            v-loading="orgTreeLoading"
+            node-key="id"
+            class="orgTree"
+            :data="orgTreeList"
+            :props="orgTreeProps"
+            :expand-on-click-node="false"
+            :check-on-click-node="true"
+            :check-strictly="true"
+            :default-expand-all="false"
+            @node-click="handleOrgTreeNodeClick"
+          />
+        </el-card>
+      </el-aside>
+      <el-main style="padding: 0">
+        <div style="padding: 0; margin: 0">
+          <el-row class="search">
+            <el-col :span="16">
+              <el-form ref="searchOrgFormRef" :model="searchArchiveQuery" :inline="true">
+                <el-form-item label="工号 / 姓名" prop="keywords">
+                  <el-input
+                    v-model="searchArchiveQuery.keywords"
+                    placeholder="请输入工号 / 姓名"
+                    clearable
+                  />
+                </el-form-item>
+                <el-form-item label="用工关系" prop="number">
+                  <el-select
+                    v-model="searchArchiveQuery.emptype"
+                    multiple
+                    clearable
+                    collapse-tags
+                    placeholder="用工关系"
+                    style="width: 240px"
+                  >
+                    <el-option
+                      v-for="item in emptypeOptions"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.id"
+                    />
+                  </el-select>
+                </el-form-item>
+              </el-form>
+            </el-col>
 
-				</el-row>
-				<el-card shadow="never" style="padding: 0;">
-					<div style="margin-bottom: 15px">
-						<el-space wrap>
-						<el-button 
-					
-								v-hasPerm="['215437071358111744']"
-								type="primary" 
-								@click="addPeopleDialog()" 
-							>
-							<template #icon><i-ep-plus /></template>新增
-							</el-button>
-							<el-button 
-			
-								v-hasPerm="['215437153071542272']"
-								plain
-								type="primary" 
-								@click="openPiliangBox" 
-							>
-							<el-icon><MessageBox /></el-icon>
-							批量导入数据
-							</el-button>
-							<el-button 
-								v-if="false"
-								v-hasPerm="['287868103478489088']"
-								plain
-								type="primary" 
-								@click="openImportTemplate" 
-							>
-							<el-icon><Download /></el-icon>
-							导入模板下载
-							</el-button>
-							
-							<el-link type="primary" v-if="false" :underline="false" :href="downloadUrl+'?keywords='+searchArchiveQuery.keywords+'&adminorg='+searchArchiveQuery.adminorg+'&emptype='+json2string(searchArchiveQuery.emptype)" target="_blank"><el-button 
-			
-								v-hasPerm="['287868103478489088']"
-								plain
-								type="primary" 
-							>
-								<el-icon><Download /></el-icon>
-								下载团队角色分析表
-							</el-button></el-link>
+            <el-col :span="8" style="text-align: right">
+              <el-button type="primary" @click="getArchivesPage">
+                <template #icon><i-ep-search /></template>
+                搜索
+              </el-button>
+              <el-button @click="resetArcFormQuery">
+                <template #icon><i-ep-refresh /></template>
+                重置
+              </el-button>
+            </el-col>
+          </el-row>
+          <el-card shadow="never" style="padding: 0">
+            <div style="margin-bottom: 15px">
+              <el-space wrap>
+                <el-button
+                  v-hasPerm="['215437071358111744']"
+                  type="primary"
+                  @click="addPeopleDialog()"
+                >
+                  <template #icon><i-ep-plus /></template>新增
+                </el-button>
+                <el-button
+                  v-hasPerm="['215437153071542272']"
+                  plain
+                  type="primary"
+                  @click="openPiliangBox"
+                >
+                  <el-icon><MessageBox /></el-icon>
+                  批量导入数据
+                </el-button>
+                <el-button
+                  v-if="false"
+                  v-hasPerm="['287868103478489088']"
+                  plain
+                  type="primary"
+                  @click="openImportTemplate"
+                >
+                  <el-icon><Download /></el-icon>
+                  导入模板下载
+                </el-button>
 
-							<el-button type="warning" @click="setupClick">
-								<el-icon><Setting /></el-icon>
-								设置
-							</el-button>
+                <el-link
+                  type="primary"
+                  v-if="false"
+                  :underline="false"
+                  :href="
+                    downloadUrl +
+                    '?keywords=' +
+                    searchArchiveQuery.keywords +
+                    '&adminorg=' +
+                    searchArchiveQuery.adminorg +
+                    '&emptype=' +
+                    json2string(searchArchiveQuery.emptype)
+                  "
+                  target="_blank"
+                  ><el-button v-hasPerm="['287868103478489088']" plain type="primary">
+                    <el-icon><Download /></el-icon>
+                    下载团队角色分析表
+                  </el-button></el-link
+                >
 
-						</el-space>
-					</div>
-					<el-table
-						v-loading="tableLoading"
-						highlight-current-row
-						stripe
-						:data="peopleList" 
-						:header-cell-style="{background:'#F5F7FA'}"
-					>
-						<el-table-column fixed label="照片"  width="60" align="center">
-							<template #default="scope">
-								<el-avatar v-if="scope.row.icon != ''" shape="square" :size="30" :src="scope.row.icon" />
-								<el-avatar v-else-if="scope.row.iconphoto != ''" shape="square" :size="30" :src="scope.row.iconphoto" />
-								<el-avatar v-else shape="square" :size="30" :src="UserRole" />
-							</template>
-						</el-table-column>
-						<el-table-column fixed label="姓名" prop="name"  width="150">
-							<template #default="scope">
-								{{ scope.row.name }}
-								<el-tag v-if="scope.row.personincharge==1"  type="danger" >负责人</el-tag>
-							</template>
-						</el-table-column>
-						<el-table-column fixed label="工号" prop="number"  width="120" align="center" />
-						<el-table-column fixed label="归属行政组织">
-							<template #default="scope">
-								<el-text class="mx-1">{{ scope.row.companyname }}</el-text>
-								<el-text v-if="scope.row.maindeparmentname" class="mx-1"> <span v-if="scope.row.companyname"> / </span>{{ scope.row.maindeparmentname }}</el-text>
-								<el-text v-if="scope.row.sunmaindeparmentname" class="mx-1"> <span v-if="scope.row.maindeparmentname"> / </span>{{ scope.row.sunmaindeparmentname }}</el-text>
-							</template>
-						</el-table-column>
-						<el-table-column fixed label="岗位" prop="positionname"  width="120" align="center" />
-						<el-table-column fixed label="联系方式" prop="mobilephone"  width="120"  />
-						<el-table-column fixed label="居住地" prop="currentresidence"   />
-						<el-table-column fixed="right" align="center" label="操作" width="100">
-							<template #default="scope">
-								<el-button
-									v-hasPerm="['127710903461228544']"
-									type="primary"
-									link
-									size="small"
-									@click.stop="lookPeopleCont(scope.row)"
-								>
-									<!-- <i-ep-view /> -->
-									查看详情
-								</el-button>
-							</template>
-						</el-table-column>
-					</el-table>
-					<pagination
-						v-if="total > 0"
-						v-model:total="total"
-						v-model:page="searchArchiveQuery.page"
-						v-model:limit="searchArchiveQuery.pagesize"
-						@pagination="getArchivesPage"
-					/>
-				</el-card>
-				<ArchivesCont v-model:isShow="archivesBox" :archivesdata="peoplecont" @updatemyconting="updateMyCont" @getarchivespageclick="getArchivesPage" />
-			</div>
-		</el-main>
-		<!--上传导入数据-->
-		<el-dialog
-			v-model="piLiangBox"
-			title="批量导入人员信息"
-			width="800"
-			:before-close="closeUploadTemp"
-		>
-			<el-row v-loading="excelLoading" element-loading-text="文档上传中，请稍候...">
-				<el-col :span="24">
-					<el-form :model="tempForm" label-width="auto" style="max-width: 100%">
-						<el-form-item label="请选择上传那个公司的人员信息">
-							<el-radio-group v-model="tempForm.orgId">
-								<el-radio v-for="item in orgListTemp" :value="item.id">{{item.name}}</el-radio>
-							</el-radio-group>
-						</el-form-item>
-					</el-form>
-				</el-col>
-				<el-col :span="24"  v-loading="excelJiexi" element-loading-text="文档解析中，请稍候...">
-					<el-upload
-						ref="excelUpload"
-						class="upload-demo"
-						drag
-						:action="uploadFFurl"
-						:data="{orgId:tempForm.orgId.toString()}"
-						:before-upload="handleExcelChangeTemp"
-						:on-success="uploadTrue"
-						:on-error = "uploadError"
-						:show-file-list = "false"
-						multiple
-					>
-						<el-icon class="el-icon--upload"><upload-filled /></el-icon>
-						<div class="el-upload__text">
-							将电子表格拖到此处或 <em>单击上载</em>
-						</div>
-						
-					</el-upload>
-				</el-col>
-				
-			</el-row>
-			<el-row>
-					<el-col :span="24">
-						<el-progress :text-inside="true" :stroke-width="20" :percentage="progressSize">
-							<span>已完成：{{progressSize}}%</span>
-						</el-progress>
-					</el-col>
-			</el-row>
-			<el-scrollbar height="300px" ref="scrollbarRef" always>
-				<div ref="innerRef">
-					<p  v-for="(item,index) in peopleMsg" :key="index" class="scrollbar-demo-item">{{ item }}</p>
-				</div>
-			</el-scrollbar>
-		</el-dialog>
-
-		<!--导入模板下载-->
-		<el-drawer
-			v-model="downImportTemOpen"
-			title="各行政组织员工信息点在档案模板"
-			:direction="direction"
-			:before-close="handleClose"
-			:size="500"
-		>	
-			<el-table :data="downTemplate" border style="width: 100%">
-				<el-table-column prop="orgName" label="行政组织" width="200" />
-				<el-table-column prop="fileName" label="文件名称">
-					<template #default="scope">
-						<el-link type="success" :underline="false" :href="scope.row.fileUrl" target="_blank">{{ scope.row.fileName }}</el-link>
-					</template>
-				</el-table-column>
-				<el-table-column  v-hasPerm="['288626867236253696']" prop="address" label="操作" align="center"  width="100">
-					<template #default="scope">
-						<el-button link type="warning" size="small" @click="editUserTemp(scope.row)">编辑</el-button>
-						<el-button link type="danger" size="small" @click="delUserTemp(scope.row,3)">删除</el-button>
-					</template>
-				</el-table-column>
-			</el-table>
-			<div class="pageBox">
-				<el-pagination  layout="prev, pager, next" :total="totalVal" />
-			</div>
-			<template #footer>
-				<div  v-hasPerm="['288626950073757696']" style="flex: auto">
-					<el-button type="primary" @click="setUpNewTemplate">上传新模版</el-button>
-				</div>
-			</template>
-		</el-drawer>
-		<!--导入模版上传-->
-		<el-dialog
-			v-model="isNewAddTem"
-			title="上传导入模版"
-			width="400"
-			:before-close="tempOpenClose"
-		>
-			<el-form
-				ref="ruleFormRef"
-				style="max-width: 600px"
-				:model="ruleForm"
-				:rules="dataFormRules"
-				label-width="auto"
-				class="demo-ruleForm"
-				:size="formSize"
-				status-icon
-			>
-				<el-form-item label="归属行政组织" prop="orgId">
-					<el-tree-select
-						v-model="ruleForm.orgId"
-						:data="orgTreeList" 
-						:props="orgTreePropsBut" 
-						:render-after-expand="false"
-						:expand-on-click-node="false"
-						:check-on-click-node="true"
-						:check-strictly="true" 
-						:default-expand-all="false"
-						style="width: 240px"
-					/>
-				</el-form-item>
-				<el-form-item label="信息模版" prop="fileName">
-					<el-input v-model="ruleForm.fileName"  />
-					<el-upload
-						ref="excelUploadUs"
-						class="upload-demo"
-						drag
-						v-loading="excelLoading"
-						:action="uploadUrl"
-						:limit="1"
-						:before-upload="handleExcelChange"
-						:on-success="uploadTrueUs"
-						:on-error = "uploadError"
-						:show-file-list = "false"
-						
-					>
-						<el-icon class="el-icon--upload"><upload-filled /></el-icon>
-						<div class="el-upload__text">
-							将电子表格拖到此处或 <em>单击上载</em>
-						</div>
-						
-					</el-upload>
-				</el-form-item>
-				<el-form-item>
-					<el-button type="primary" v-loading="addTemLoading" @click="saveTemp()">
-						确定上传
-					</el-button>
-					<el-button @click="tempOpenClose()">取消</el-button>
-				</el-form-item>
-			</el-form>
-		</el-dialog>
-		<!--设置-->
-		<el-drawer
-			v-model="openSetup"
-			title="各行政组织员工信息点在档案模板"
-			:direction="direction"
-			:before-close="closeSetup"
-			:size="500"
-			class="drwBody"
-		>	
-			<el-tabs  v-model="setupActiveName" type="border-card">
-				<el-tab-pane label="员工档案导入模版" name="1">
-					<template #label>
-						<el-space wrap>
-							<span class="fa fa-upload"></span>
-							<span>员工档案导入模版</span>
-						</el-space>
-					</template>
-					
-					<div  v-hasPerm="['288626950073757696']" style="flex: auto; text-align:right; margin-bottom:10px;">
-						<el-button type="primary" @click="setUpNewTemplate">上传新模版</el-button>
-					</div>
-					<el-table :data="downTemplate" border style="width: 100%">
-						<el-table-column prop="orgName" label="行政组织" width="200" />
-						<el-table-column prop="fileName" label="文件名称">
-							<template #default="scope">
-								<el-link type="success" :underline="false" :href="scope.row.fileUrl" target="_blank">{{ scope.row.fileName }}</el-link>
-							</template>
-						</el-table-column>
-						<el-table-column  v-hasPerm="['288626867236253696']" prop="address" label="操作" align="center"  width="100">
-							<template #default="scope">
-								<el-button link type="warning" size="small" @click="editUserTemp(scope.row)">编辑</el-button>
-								<el-button link type="danger" size="small" @click="delUserTemp(scope.row,3)">删除</el-button>
-							</template>
-						</el-table-column>
-					</el-table>
-					<div class="pageBox">
-						<el-pagination  layout="prev, pager, next" :total="totalVal" />
-					</div>
-
-					
+                <el-button type="warning" @click="setupClick">
+                  <el-icon><Setting /></el-icon>
+                  设置
+                </el-button>
+              </el-space>
+            </div>
+            <el-table
+              v-loading="tableLoading"
+              highlight-current-row
+              stripe
+              :data="peopleList"
+              :header-cell-style="{ background: '#F5F7FA' }"
+            >
+              <el-table-column fixed label="照片" width="60" align="center">
+                <template #default="scope">
+                  <el-avatar
+                    v-if="scope.row.icon != ''"
+                    shape="square"
+                    :size="30"
+                    :src="scope.row.icon"
+                  />
+                  <el-avatar
+                    v-else-if="scope.row.iconphoto != ''"
+                    shape="square"
+                    :size="30"
+                    :src="scope.row.iconphoto"
+                  />
+                  <el-avatar v-else shape="square" :size="30" :src="UserRole" />
+                </template>
+              </el-table-column>
+              <el-table-column fixed label="姓名" prop="name" width="150">
+                <template #default="scope">
+                  {{ scope.row.name }}
+                  <el-tag v-if="scope.row.personincharge == 1" type="danger"
+                    >负责人</el-tag
+                  >
+                </template>
+              </el-table-column>
+              <el-table-column
+                fixed
+                label="工号"
+                prop="number"
+                width="120"
+                align="center"
+              />
+              <el-table-column fixed label="归属行政组织">
+                <template #default="scope">
+                  <el-text class="mx-1">{{ scope.row.companyname }}</el-text>
+                  <el-text v-if="scope.row.maindeparmentname" class="mx-1">
+                    <span v-if="scope.row.companyname"> / </span
+                    >{{ scope.row.maindeparmentname }}</el-text
+                  >
+                  <el-text v-if="scope.row.sunmaindeparmentname" class="mx-1">
+                    <span v-if="scope.row.maindeparmentname"> / </span
+                    >{{ scope.row.sunmaindeparmentname }}</el-text
+                  >
+                </template>
+              </el-table-column>
+              <el-table-column
+                fixed
+                label="岗位"
+                prop="positionname"
+                width="120"
+                align="center"
+              />
+              <el-table-column fixed label="联系方式" prop="mobilephone" width="120" />
+              <el-table-column fixed label="居住地" prop="currentresidence" />
+              <el-table-column fixed="right" align="center" label="操作" width="100">
+                <template #default="scope">
+                  <el-button
+                    v-hasPerm="['127710903461228544']"
+                    type="primary"
+                    link
+                    size="small"
+                    @click.stop="lookPeopleCont(scope.row)"
+                  >
+                    <!-- <i-ep-view /> -->
+                    查看详情
+                  </el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+            <pagination
+              v-if="total > 0"
+              v-model:total="total"
+              v-model:page="searchArchiveQuery.page"
+              v-model:limit="searchArchiveQuery.pagesize"
+              @pagination="getArchivesPage"
+            />
+          </el-card>
+          <ArchivesCont
+            v-model:isShow="archivesBox"
+            :archivesdata="peoplecont"
+            @updatemyconting="updateMyCont"
+            @getarchivespageclick="getArchivesPage"
+          />
+        </div>
+      </el-main>
+      <!--上传导入数据-->
+      <el-dialog
+        v-model="piLiangBox"
+        title="批量导入人员信息"
+        width="800"
+        :before-close="closeUploadTemp"
+      >
+        <el-row v-loading="excelLoading" element-loading-text="文档上传中，请稍候...">
+          <el-col :span="24">
+            <el-form :model="tempForm" label-width="auto" style="max-width: 100%">
+              <el-form-item label="请选择上传那个公司的人员信息">
+                <el-radio-group v-model="tempForm.orgId">
+                  <el-radio v-for="item in orgListTemp" :value="item.id">{{
+                    item.name
+                  }}</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-form>
+          </el-col>
+          <el-col
+            :span="24"
+            v-loading="excelJiexi"
+            element-loading-text="文档解析中，请稍候..."
+          >
+            <el-upload
+              ref="excelUpload"
+              class="upload-demo"
+              drag
+              :action="uploadFFurl"
+              :data="{ orgId: tempForm.orgId.toString() }"
+              :before-upload="handleExcelChangeTemp"
+              :on-success="uploadTrue"
+              :on-error="uploadError"
+              :show-file-list="false"
+              multiple
+            >
+              <el-icon class="el-icon--upload"><upload-filled /></el-icon>
+              <div class="el-upload__text">将电子表格拖到此处或 <em>单击上载</em></div>
+            </el-upload>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-progress
+              :text-inside="true"
+              :stroke-width="20"
+              :percentage="progressSize"
+            >
+              <span>已完成：{{ progressSize }}%</span>
+            </el-progress>
+          </el-col>
+        </el-row>
+        <el-scrollbar height="300px" ref="scrollbarRef" always>
+          <div ref="innerRef">
+            <p
+              v-for="(item, index) in peopleMsg"
+              :key="index"
+              class="scrollbar-demo-item"
+            >
+              {{ item }}
+            </p>
+          </div>
+        </el-scrollbar>
+      </el-dialog>
 
+      <!--导入模板下载-->
+      <el-drawer
+        v-model="downImportTemOpen"
+        title="各行政组织员工信息点在档案模板"
+        :direction="direction"
+        :before-close="handleClose"
+        :size="500"
+      >
+        <el-table :data="downTemplate" border style="width: 100%">
+          <el-table-column prop="orgName" label="行政组织" width="200" />
+          <el-table-column prop="fileName" label="文件名称">
+            <template #default="scope">
+              <el-link
+                type="success"
+                :underline="false"
+                :href="scope.row.fileUrl"
+                target="_blank"
+                >{{ scope.row.fileName }}</el-link
+              >
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-hasPerm="['288626867236253696']"
+            prop="address"
+            label="操作"
+            align="center"
+            width="100"
+          >
+            <template #default="scope">
+              <el-button link type="warning" size="small" @click="editUserTemp(scope.row)"
+                >编辑</el-button
+              >
+              <el-button
+                link
+                type="danger"
+                size="small"
+                @click="delUserTemp(scope.row, 3)"
+                >删除</el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="pageBox">
+          <el-pagination layout="prev, pager, next" :total="totalVal" />
+        </div>
+        <template #footer>
+          <div v-hasPerm="['288626950073757696']" style="flex: auto">
+            <el-button type="primary" @click="setUpNewTemplate">上传新模版</el-button>
+          </div>
+        </template>
+      </el-drawer>
+      <!--导入模版上传-->
+      <el-dialog
+        v-model="isNewAddTem"
+        title="上传导入模版"
+        width="400"
+        :before-close="tempOpenClose"
+      >
+        <el-form
+          ref="ruleFormRef"
+          style="max-width: 600px"
+          :model="ruleForm"
+          :rules="dataFormRules"
+          label-width="auto"
+          class="demo-ruleForm"
+          :size="formSize"
+          status-icon
+        >
+          <el-form-item label="归属行政组织" prop="orgId">
+            <el-tree-select
+              v-model="ruleForm.orgId"
+              :data="orgTreeList"
+              :props="orgTreePropsBut"
+              :render-after-expand="false"
+              :expand-on-click-node="false"
+              :check-on-click-node="true"
+              :check-strictly="true"
+              :default-expand-all="false"
+              style="width: 240px"
+            />
+          </el-form-item>
+          <el-form-item label="信息模版" prop="fileName">
+            <el-input v-model="ruleForm.fileName" />
+            <el-upload
+              ref="excelUploadUs"
+              class="upload-demo"
+              drag
+              v-loading="excelLoading"
+              :action="uploadUrl"
+              :limit="1"
+              :before-upload="handleExcelChange"
+              :on-success="uploadTrueUs"
+              :on-error="uploadError"
+              :show-file-list="false"
+            >
+              <el-icon class="el-icon--upload"><upload-filled /></el-icon>
+              <div class="el-upload__text">将电子表格拖到此处或 <em>单击上载</em></div>
+            </el-upload>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" v-loading="addTemLoading" @click="saveTemp()">
+              确定上传
+            </el-button>
+            <el-button @click="tempOpenClose()">取消</el-button>
+          </el-form-item>
+        </el-form>
+      </el-dialog>
+      <!--设置-->
+      <el-drawer
+        v-model="openSetup"
+        title="各行政组织员工信息点在档案模板"
+        :direction="direction"
+        :before-close="closeSetup"
+        :size="500"
+        class="drwBody"
+      >
+        <el-tabs v-model="setupActiveName" type="border-card">
+          <el-tab-pane label="员工档案导入模版" name="1">
+            <template #label>
+              <el-space wrap>
+                <span class="fa fa-upload"></span>
+                <span>员工档案导入模版</span>
+              </el-space>
+            </template>
 
+            <div
+              v-hasPerm="['288626950073757696']"
+              style="flex: auto; text-align: right; margin-bottom: 10px"
+            >
+              <el-button type="primary" @click="setUpNewTemplate">上传新模版</el-button>
+            </div>
+            <el-table :data="downTemplate" border style="width: 100%">
+              <el-table-column prop="orgName" label="行政组织" width="200" />
+              <el-table-column prop="fileName" label="文件名称">
+                <template #default="scope">
+                  <el-link
+                    type="success"
+                    :underline="false"
+                    :href="scope.row.fileUrl"
+                    target="_blank"
+                    >{{ scope.row.fileName }}</el-link
+                  >
+                </template>
+              </el-table-column>
+              <el-table-column
+                v-hasPerm="['288626867236253696']"
+                prop="address"
+                label="操作"
+                align="center"
+                width="100"
+              >
+                <template #default="scope">
+                  <el-button
+                    link
+                    type="warning"
+                    size="small"
+                    @click="editUserTemp(scope.row)"
+                    >编辑</el-button
+                  >
+                  <el-button
+                    link
+                    type="danger"
+                    size="small"
+                    @click="delUserTemp(scope.row, 3)"
+                    >删除</el-button
+                  >
+                </template>
+              </el-table-column>
+            </el-table>
+            <div class="pageBox">
+              <el-pagination layout="prev, pager, next" :total="totalVal" />
+            </div>
+          </el-tab-pane>
+          <el-tab-pane label="性格分析表" name="2">
+            <template #label>
+              <el-space wrap>
+                <span class="fa fa-list"></span>
+                <span>性格分析表</span>
+              </el-space>
+            </template>
+            <div class="downLink">
+              <div>团队角色九型人格测试</div>
+              <div>
+                <el-button
+                  type="danger"
+                  text
+                  v-hasPerm="['287868103478489088']"
+                  @click="selectDownTiaojian('10000003')"
+                >
+                  下载
+                </el-button>
+              </div>
+            </div>
 
-				</el-tab-pane>
-				<el-tab-pane label="性格分析表" name="2">
-					<template #label>
-						<el-space wrap>
-							<span class="fa fa-list"></span>
-							<span>性格分析表</span>
-						</el-space>
-					</template>
-					<div class="downLink">
-						<div>团队角色九型人格测试</div>
-						<div>
-							<el-button
-								type="danger"
-								text
-								v-hasPerm="['287868103478489088']"
-								@click="selectDownTiaojian('10000003')"
-							>
-								下载
-							</el-button>
-						</div>
-					</div>
-
-					<!-- <el-link type="primary"  :underline="false" :href="downloadUrl+'?keywords='+searchArchiveQuery.keywords+'&adminorg='+searchArchiveQuery.adminorg+'&emptype='+json2string(searchArchiveQuery.emptype)" target="_blank"><el-button 
+            <!-- <el-link type="primary"  :underline="false" :href="downloadUrl+'?keywords='+searchArchiveQuery.keywords+'&adminorg='+searchArchiveQuery.adminorg+'&emptype='+json2string(searchArchiveQuery.emptype)" target="_blank"><el-button 
 			
 			v-hasPerm="['287868103478489088']"
 			plain
@@ -956,78 +1062,83 @@ const downStatistics = (val:any) => {
 			<el-icon><Download /></el-icon>
 			下载团队角色分析表
 		</el-button></el-link> -->
+          </el-tab-pane>
+          <el-tab-pane label="测试统计" name="3">
+            <template #label>
+              <el-space wrap>
+                <span class="fa fa-bar-chart"></span>
+                <span>测试统计</span>
+              </el-space>
+            </template>
 
+            <el-table :data="characterList" border style="width: 100%">
+              <el-table-column prop="label" label="测试名称" />
 
-				</el-tab-pane>
-				<el-tab-pane label="测试统计" name="3">
-					<template #label>
-						<el-space wrap>
-							<span class="fa fa-bar-chart"></span>
-							<span>测试统计</span>
-						</el-space>
-					</template>
-					
-					<el-table :data="characterList" border style="width: 100%">
-						<el-table-column prop="label" label="测试名称"  />
-						
-						<el-table-column label="操作" align="center"  width="80">
-							<template #default="scope">
-								<el-button link type="danger" size="small" @click="downStatistics(scope.row)">下载</el-button>
-							</template>
-						</el-table-column>
-					</el-table>
-				</el-tab-pane>
-			</el-tabs>
-
-		</el-drawer>
-
-		<XingGeFengXi v-if="openTableType" :down-table-type="downTableType" :down-class-type="downClassType" :org-tree="orgTreeList" @close-xige-page="closeXigePage" />
+              <el-table-column label="操作" align="center" width="80">
+                <template #default="scope">
+                  <el-button
+                    link
+                    type="danger"
+                    size="small"
+                    @click="downStatistics(scope.row)"
+                    >下载</el-button
+                  >
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-tab-pane>
+        </el-tabs>
+      </el-drawer>
 
-	</el-container>
-	</div>
-	
+      <XingGeFengXi
+        v-if="openTableType"
+        :down-table-type="downTableType"
+        :down-class-type="downClassType"
+        :org-tree="orgTreeList"
+        @close-xige-page="closeXigePage"
+      />
+    </el-container>
+  </div>
 </template>
-<style  lang='scss' scoped>
-.app-container{
-	:deep .el-drawer__body{
-		padding: 0 10px;
-	}
+<style lang="scss" scoped>
+.app-container {
+  :deep .el-drawer__body {
+    padding: 0 10px;
+  }
 }
 
-.common-layout{
-	height: calc(100% - 60px);
-	background-color: aqua;
-	
+.common-layout {
+  height: calc(100% - 60px);
+  background-color: aqua;
 }
 .el-container {
-	.el-card.is-always-shadow{
-		height: 100%;
-		overflow: auto;
-	}
+  .el-card.is-always-shadow {
+    height: 100%;
+    overflow: auto;
+  }
 }
-.cardBody{
-	height: 100%;
+.cardBody {
+  height: 100%;
 }
-.orgTree{
-	padding:5px 0;
+.orgTree {
+  padding: 5px 0;
 }
-.divBoxCont{
-	width: 100%;
-	height:300px;
-	overflow: hidden;
-	overflow-y: auto;
+.divBoxCont {
+  width: 100%;
+  height: 300px;
+  overflow: hidden;
+  overflow-y: auto;
 }
-.pageBox{
-	text-align: center;
-	display:flex;
-	align-items: center;
-	width: 100%;
-	
+.pageBox {
+  text-align: center;
+  display: flex;
+  align-items: center;
+  width: 100%;
 }
-.downLink{
-	display: flex;
-	width: 100%;
-	align-items: center;
-	justify-content: space-between;
+.downLink {
+  display: flex;
+  width: 100%;
+  align-items: center;
+  justify-content: space-between;
 }
 </style>
diff --git a/vite.config.ts.timestamp-1733790315507-5dd7b47c09dce.mjs b/vite.config.ts.timestamp-1733790315507-5dd7b47c09dce.mjs
new file mode 100644
index 0000000..46e659b
--- /dev/null
+++ b/vite.config.ts.timestamp-1733790315507-5dd7b47c09dce.mjs
@@ -0,0 +1,196 @@
+// vite.config.ts
+import vue from "file:///E:/f_pang/object/my_object_html/ShutongInterconnectedChemicalCloudPlatform/node_modules/@vitejs/plugin-vue/dist/index.mjs";
+import { loadEnv, defineConfig } from "file:///E:/f_pang/object/my_object_html/ShutongInterconnectedChemicalCloudPlatform/node_modules/vite/dist/node/index.js";
+import AutoImport from "file:///E:/f_pang/object/my_object_html/ShutongInterconnectedChemicalCloudPlatform/node_modules/unplugin-auto-import/dist/vite.js";
+import Components from "file:///E:/f_pang/object/my_object_html/ShutongInterconnectedChemicalCloudPlatform/node_modules/unplugin-vue-components/dist/vite.mjs";
+import { ElementPlusResolver } from "file:///E:/f_pang/object/my_object_html/ShutongInterconnectedChemicalCloudPlatform/node_modules/unplugin-vue-components/dist/resolvers.mjs";
+import Icons from "file:///E:/f_pang/object/my_object_html/ShutongInterconnectedChemicalCloudPlatform/node_modules/unplugin-icons/dist/vite.mjs";
+import IconsResolver from "file:///E:/f_pang/object/my_object_html/ShutongInterconnectedChemicalCloudPlatform/node_modules/unplugin-icons/dist/resolver.mjs";
+import { createSvgIconsPlugin } from "file:///E:/f_pang/object/my_object_html/ShutongInterconnectedChemicalCloudPlatform/node_modules/vite-plugin-svg-icons/dist/index.mjs";
+import UnoCSS from "file:///E:/f_pang/object/my_object_html/ShutongInterconnectedChemicalCloudPlatform/node_modules/unocss/dist/vite.mjs";
+import path from "path";
+var __vite_injected_original_dirname = "E:\\f_pang\\object\\my_object_html\\ShutongInterconnectedChemicalCloudPlatform";
+var pathSrc = path.resolve(__vite_injected_original_dirname, "src");
+var vite_config_default = defineConfig(({ mode }) => {
+  const env = loadEnv(mode, process.cwd());
+  return {
+    resolve: {
+      alias: {
+        "@": pathSrc
+      }
+    },
+    css: {
+      // CSS 预处理器
+      preprocessorOptions: {
+        //define global scss variable
+        scss: {
+          javascriptEnabled: true,
+          additionalData: `
+            @use "@/styles/variables.scss" as *;
+          `
+        }
+      }
+    },
+    server: {
+      host: "0.0.0.0",
+      port: Number(env.VITE_APP_PORT),
+      open: true,
+      // 运行是否自动打开浏览器
+      proxy: {
+        // 反向代理解决跨域
+        [env.VITE_APP_BASE_API]: {
+          target: env.VITE_APP_BASE_URL,
+          // 线上接口地址
+          // target: "http://vapi.youlai.tech", // 线上接口地址
+          // target: 'http://localhost:8989',  // 本地接口地址 , 后端工程仓库地址：https://gitee.com/youlaiorg/youlai-boot
+          changeOrigin: true,
+          rewrite: (path2) => path2.replace(new RegExp("^" + env.VITE_APP_BASE_API), "")
+          // 替换 /dev-api 为 target 接口地址
+        }
+        // '/dev-api/kpiapi': {
+        //   target: 'http://127.0.0.1:6666',
+        //   changeOrigin: true,
+        //   rewrite: (path) =>
+        //     path.replace(new RegExp("^" + '/dev-api/kpiapi'), ""),
+        // },
+        // '/dev-api/systemapi': {
+        //   target: 'http://127.0.0.1:17777',
+        //   changeOrigin: true,
+        //   rewrite: (path) =>
+        //     path.replace(new RegExp("^" + '/dev-api/systemapi'), ""),
+        // },
+        // '/dev-api/hrapi': {
+        //   target: 'http://127.0.0.1:39168',
+        //   changeOrigin: true,
+        //   rewrite: (path) =>
+        //     path.replace(new RegExp("^" + '/dev-api/hrapi'), ""),
+        // },
+        // '/dev-api/api': {
+        //   target: 'http://127.0.0.1:8888',
+        //   changeOrigin: true,
+        //   rewrite: (path) =>
+        //     path.replace(new RegExp("^" + '/dev-api/api'), ""),
+        // },
+        // '/dev-api/javasys': {
+        //   target: 'http://172.20.2.87:8111',
+        //   changeOrigin: true,
+        //   rewrite: (path) =>
+        //     path.replace(new RegExp("^" + '/dev-api/javasys'), ""),
+        // },
+        // '/dev-api/javasys/lowCode ': {
+        //   target: 'http://172.20.2.87:8112',
+        //   changeOrigin: true,
+        //   rewrite: (path) =>
+        //     path.replace(new RegExp("^" + '/dev-api/javasys/lowCode '), ""),
+        // }
+      }
+    },
+    plugins: [
+      vue(),
+      UnoCSS({
+        /* options */
+      }),
+      AutoImport({
+        // 自动导入 Vue 相关函数，如：ref, reactive, toRef 等
+        imports: ["vue", "@vueuse/core"],
+        //ignore: ['h'], // 自动添加 import { h } from '/node_modules/.vite/deps/vue.js 代码问题处理
+        eslintrc: {
+          enabled: false,
+          //  Default `false`
+          filepath: "./.eslintrc-auto-import.json",
+          // Default `./.eslintrc-auto-import.json`
+          globalsPropValue: true
+          // Default `true`, (true | false | 'readonly' | 'readable' | 'writable' | 'writeable')
+        },
+        resolvers: [
+          // 自动导入 Element Plus 相关函数，如：ElMessage, ElMessageBox... (带样式)
+          ElementPlusResolver(),
+          // 自动导入图标组件
+          IconsResolver({})
+        ],
+        vueTemplate: true,
+        // 是否在 vue 模板中自动导入
+        dts: path.resolve(pathSrc, "types", "auto-imports.d.ts")
+        //  自动导入组件类型声明文件位置，默认根目录; false 关闭自动生成
+      }),
+      Components({
+        resolvers: [
+          // 自动注册图标组件
+          IconsResolver({
+            enabledCollections: ["ep"]
+            //@iconify-json/ep 是 Element Plus 的图标库
+          }),
+          // 自动导入 Element Plus 组件
+          ElementPlusResolver()
+        ],
+        dts: path.resolve(pathSrc, "types", "components.d.ts")
+        //  自动导入组件类型声明文件位置，默认根目录; false 关闭自动生成
+      }),
+      Icons({
+        // 自动安装图标库
+        autoInstall: true
+      }),
+      createSvgIconsPlugin({
+        // 指定需要缓存的图标文件夹
+        iconDirs: [path.resolve(pathSrc, "assets/icons")],
+        // 指定symbolId格式
+        symbolId: "icon-[dir]-[name]"
+      })
+    ],
+    optimizeDeps: {
+      include: [
+        "vue",
+        "vue-router",
+        "pinia",
+        "axios",
+        "element-plus/es/components/form/style/css",
+        "element-plus/es/components/form-item/style/css",
+        "element-plus/es/components/button/style/css",
+        "element-plus/es/components/input/style/css",
+        "element-plus/es/components/input-number/style/css",
+        "element-plus/es/components/switch/style/css",
+        "element-plus/es/components/upload/style/css",
+        "element-plus/es/components/menu/style/css",
+        "element-plus/es/components/col/style/css",
+        "element-plus/es/components/icon/style/css",
+        "element-plus/es/components/row/style/css",
+        "element-plus/es/components/tag/style/css",
+        "element-plus/es/components/dialog/style/css",
+        "element-plus/es/components/loading/style/css",
+        "element-plus/es/components/radio/style/css",
+        "element-plus/es/components/radio-group/style/css",
+        "element-plus/es/components/popover/style/css",
+        "element-plus/es/components/scrollbar/style/css",
+        "element-plus/es/components/tooltip/style/css",
+        "element-plus/es/components/dropdown/style/css",
+        "element-plus/es/components/dropdown-menu/style/css",
+        "element-plus/es/components/dropdown-item/style/css",
+        "element-plus/es/components/sub-menu/style/css",
+        "element-plus/es/components/menu-item/style/css",
+        "element-plus/es/components/divider/style/css",
+        "element-plus/es/components/card/style/css",
+        "element-plus/es/components/link/style/css",
+        "element-plus/es/components/breadcrumb/style/css",
+        "element-plus/es/components/breadcrumb-item/style/css",
+        "element-plus/es/components/table/style/css",
+        "element-plus/es/components/tree-select/style/css",
+        "element-plus/es/components/table-column/style/css",
+        "element-plus/es/components/select/style/css",
+        "element-plus/es/components/option/style/css",
+        "element-plus/es/components/pagination/style/css",
+        "element-plus/es/components/tree/style/css",
+        "element-plus/es/components/alert/style/css",
+        "@vueuse/core",
+        "path-to-regexp",
+        "echarts",
+        "@wangeditor/editor",
+        "@wangeditor/editor-for-vue",
+        "vue-i18n"
+      ]
+    }
+  };
+});
+export {
+  vite_config_default as default
+};
+//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["vite.config.ts"],
  "sourcesContent": ["const __vite_injected_original_dirname = \"E:\\\\f_pang\\\\object\\\\my_object_html\\\\ShutongInterconnectedChemicalCloudPlatform\";const __vite_injected_original_filename = \"E:\\\\f_pang\\\\object\\\\my_object_html\\\\ShutongInterconnectedChemicalCloudPlatform\\\\vite.config.ts\";const __vite_injected_original_import_meta_url = \"file:///E:/f_pang/object/my_object_html/ShutongInterconnectedChemicalCloudPlatform/vite.config.ts\";import vue from \"@vitejs/plugin-vue\";\n\nimport { UserConfig, ConfigEnv, loadEnv, defineConfig } from \"vite\";\n\nimport AutoImport from \"unplugin-auto-import/vite\";\nimport Components from \"unplugin-vue-components/vite\";\nimport { ElementPlusResolver } from \"unplugin-vue-components/resolvers\";\n\nimport Icons from \"unplugin-icons/vite\";\nimport IconsResolver from \"unplugin-icons/resolver\";\n\nimport { createSvgIconsPlugin } from \"vite-plugin-svg-icons\";\n\nimport UnoCSS from \"unocss/vite\";\n\nimport path from \"path\";\nconst pathSrc = path.resolve(__dirname, \"src\");\n\nexport default defineConfig(({ mode }: ConfigEnv): UserConfig => {\n  const env = loadEnv(mode, process.cwd());\n  return {\n    resolve: {\n      alias: {\n        \"@\": pathSrc,\n      },\n    },\n    css: {\n      // CSS \u9884\u5904\u7406\u5668\n      preprocessorOptions: {\n        //define global scss variable\n        scss: {\n          javascriptEnabled: true,\n          additionalData: `\n            @use \"@/styles/variables.scss\" as *;\n          `,\n        },\n      },\n    },\n    server: {\n      host: \"0.0.0.0\",\n      port: Number(env.VITE_APP_PORT),\n      open: true, // \u8FD0\u884C\u662F\u5426\u81EA\u52A8\u6253\u5F00\u6D4F\u89C8\u5668\n      proxy: {\n        // \u53CD\u5411\u4EE3\u7406\u89E3\u51B3\u8DE8\u57DF\n        [env.VITE_APP_BASE_API]: {\n          target: env.VITE_APP_BASE_URL, // \u7EBF\u4E0A\u63A5\u53E3\u5730\u5740\n          // target: \"http://vapi.youlai.tech\", // \u7EBF\u4E0A\u63A5\u53E3\u5730\u5740\n          // target: 'http://localhost:8989',  // \u672C\u5730\u63A5\u53E3\u5730\u5740 , \u540E\u7AEF\u5DE5\u7A0B\u4ED3\u5E93\u5730\u5740\uFF1Ahttps://gitee.com/youlaiorg/youlai-boot\n          changeOrigin: true,\n          rewrite: (path) =>\n            path.replace(new RegExp(\"^\" + env.VITE_APP_BASE_API), \"\"), // \u66FF\u6362 /dev-api \u4E3A target \u63A5\u53E3\u5730\u5740\n        },\n        // '/dev-api/kpiapi': {\n        //   target: 'http://127.0.0.1:6666',\n        //   changeOrigin: true,\n        //   rewrite: (path) =>\n        //     path.replace(new RegExp(\"^\" + '/dev-api/kpiapi'), \"\"),\n        // },\n\n        // '/dev-api/systemapi': {\n        //   target: 'http://127.0.0.1:17777',\n        //   changeOrigin: true,\n        //   rewrite: (path) =>\n        //     path.replace(new RegExp(\"^\" + '/dev-api/systemapi'), \"\"),\n        // },\n        // '/dev-api/hrapi': {\n        //   target: 'http://127.0.0.1:39168',\n        //   changeOrigin: true,\n        //   rewrite: (path) =>\n        //     path.replace(new RegExp(\"^\" + '/dev-api/hrapi'), \"\"),\n        // },\n        // '/dev-api/api': {\n        //   target: 'http://127.0.0.1:8888',\n        //   changeOrigin: true,\n        //   rewrite: (path) =>\n        //     path.replace(new RegExp(\"^\" + '/dev-api/api'), \"\"),\n        // },\n        // '/dev-api/javasys': {\n        //   target: 'http://172.20.2.87:8111',\n        //   changeOrigin: true,\n        //   rewrite: (path) =>\n        //     path.replace(new RegExp(\"^\" + '/dev-api/javasys'), \"\"),\n        // },\n        // '/dev-api/javasys/lowCode ': {\n        //   target: 'http://172.20.2.87:8112',\n        //   changeOrigin: true,\n        //   rewrite: (path) =>\n        //     path.replace(new RegExp(\"^\" + '/dev-api/javasys/lowCode '), \"\"),\n        // }\n      },\n    },\n\n    plugins: [\n\n      vue(),\n      UnoCSS({\n        /* options */\n      }),\n      AutoImport({\n        // \u81EA\u52A8\u5BFC\u5165 Vue \u76F8\u5173\u51FD\u6570\uFF0C\u5982\uFF1Aref, reactive, toRef \u7B49\n        imports: [\"vue\", \"@vueuse/core\"],\n        //ignore: ['h'], // \u81EA\u52A8\u6DFB\u52A0 import { h } from '/node_modules/.vite/deps/vue.js \u4EE3\u7801\u95EE\u9898\u5904\u7406\n        eslintrc: {\n          enabled: false, //  Default `false`\n          filepath: \"./.eslintrc-auto-import.json\", // Default `./.eslintrc-auto-import.json`\n          globalsPropValue: true, // Default `true`, (true | false | 'readonly' | 'readable' | 'writable' | 'writeable')\n        },\n        resolvers: [\n          // \u81EA\u52A8\u5BFC\u5165 Element Plus \u76F8\u5173\u51FD\u6570\uFF0C\u5982\uFF1AElMessage, ElMessageBox... (\u5E26\u6837\u5F0F)\n          ElementPlusResolver(),\n          // \u81EA\u52A8\u5BFC\u5165\u56FE\u6807\u7EC4\u4EF6\n          IconsResolver({}),\n        ],\n        vueTemplate: true, // \u662F\u5426\u5728 vue \u6A21\u677F\u4E2D\u81EA\u52A8\u5BFC\u5165\n        dts: path.resolve(pathSrc, \"types\", \"auto-imports.d.ts\"), //  \u81EA\u52A8\u5BFC\u5165\u7EC4\u4EF6\u7C7B\u578B\u58F0\u660E\u6587\u4EF6\u4F4D\u7F6E\uFF0C\u9ED8\u8BA4\u6839\u76EE\u5F55; false \u5173\u95ED\u81EA\u52A8\u751F\u6210\n      }),\n\n      Components({\n        resolvers: [\n          // \u81EA\u52A8\u6CE8\u518C\u56FE\u6807\u7EC4\u4EF6\n          IconsResolver({\n            enabledCollections: [\"ep\"], //@iconify-json/ep \u662F Element Plus \u7684\u56FE\u6807\u5E93\n          }),\n          // \u81EA\u52A8\u5BFC\u5165 Element Plus \u7EC4\u4EF6\n          ElementPlusResolver(),\n        ],\n        dts: path.resolve(pathSrc, \"types\", \"components.d.ts\"), //  \u81EA\u52A8\u5BFC\u5165\u7EC4\u4EF6\u7C7B\u578B\u58F0\u660E\u6587\u4EF6\u4F4D\u7F6E\uFF0C\u9ED8\u8BA4\u6839\u76EE\u5F55; false \u5173\u95ED\u81EA\u52A8\u751F\u6210\n      }),\n\n      Icons({\n        // \u81EA\u52A8\u5B89\u88C5\u56FE\u6807\u5E93\n        autoInstall: true,\n      }),\n\n      createSvgIconsPlugin({\n        // \u6307\u5B9A\u9700\u8981\u7F13\u5B58\u7684\u56FE\u6807\u6587\u4EF6\u5939\n        iconDirs: [path.resolve(pathSrc, \"assets/icons\")],\n        // \u6307\u5B9AsymbolId\u683C\u5F0F\n        symbolId: \"icon-[dir]-[name]\",\n      }),\n    ],\n\n    optimizeDeps: {\n      include: [\n        \"vue\",\n        \"vue-router\",\n        \"pinia\",\n        \"axios\",\n        \"element-plus/es/components/form/style/css\",\n        \"element-plus/es/components/form-item/style/css\",\n        \"element-plus/es/components/button/style/css\",\n        \"element-plus/es/components/input/style/css\",\n        \"element-plus/es/components/input-number/style/css\",\n        \"element-plus/es/components/switch/style/css\",\n        \"element-plus/es/components/upload/style/css\",\n        \"element-plus/es/components/menu/style/css\",\n        \"element-plus/es/components/col/style/css\",\n        \"element-plus/es/components/icon/style/css\",\n        \"element-plus/es/components/row/style/css\",\n        \"element-plus/es/components/tag/style/css\",\n        \"element-plus/es/components/dialog/style/css\",\n        \"element-plus/es/components/loading/style/css\",\n        \"element-plus/es/components/radio/style/css\",\n        \"element-plus/es/components/radio-group/style/css\",\n        \"element-plus/es/components/popover/style/css\",\n        \"element-plus/es/components/scrollbar/style/css\",\n        \"element-plus/es/components/tooltip/style/css\",\n        \"element-plus/es/components/dropdown/style/css\",\n        \"element-plus/es/components/dropdown-menu/style/css\",\n        \"element-plus/es/components/dropdown-item/style/css\",\n        \"element-plus/es/components/sub-menu/style/css\",\n        \"element-plus/es/components/menu-item/style/css\",\n        \"element-plus/es/components/divider/style/css\",\n        \"element-plus/es/components/card/style/css\",\n        \"element-plus/es/components/link/style/css\",\n        \"element-plus/es/components/breadcrumb/style/css\",\n        \"element-plus/es/components/breadcrumb-item/style/css\",\n        \"element-plus/es/components/table/style/css\",\n        \"element-plus/es/components/tree-select/style/css\",\n        \"element-plus/es/components/table-column/style/css\",\n        \"element-plus/es/components/select/style/css\",\n        \"element-plus/es/components/option/style/css\",\n        \"element-plus/es/components/pagination/style/css\",\n        \"element-plus/es/components/tree/style/css\",\n        \"element-plus/es/components/alert/style/css\",\n        \"@vueuse/core\",\n\n        \"path-to-regexp\",\n        \"echarts\",\n        \"@wangeditor/editor\",\n        \"@wangeditor/editor-for-vue\",\n        \"vue-i18n\",\n      ],\n    },\n  };\n});\n"],
  "mappings": ";AAA0Z,OAAO,SAAS;AAE1a,SAAgC,SAAS,oBAAoB;AAE7D,OAAO,gBAAgB;AACvB,OAAO,gBAAgB;AACvB,SAAS,2BAA2B;AAEpC,OAAO,WAAW;AAClB,OAAO,mBAAmB;AAE1B,SAAS,4BAA4B;AAErC,OAAO,YAAY;AAEnB,OAAO,UAAU;AAfjB,IAAM,mCAAmC;AAgBzC,IAAM,UAAU,KAAK,QAAQ,kCAAW,KAAK;AAE7C,IAAO,sBAAQ,aAAa,CAAC,EAAE,KAAK,MAA6B;AAC/D,QAAM,MAAM,QAAQ,MAAM,QAAQ,IAAI,CAAC;AACvC,SAAO;AAAA,IACL,SAAS;AAAA,MACP,OAAO;AAAA,QACL,KAAK;AAAA,MACP;AAAA,IACF;AAAA,IACA,KAAK;AAAA;AAAA,MAEH,qBAAqB;AAAA;AAAA,QAEnB,MAAM;AAAA,UACJ,mBAAmB;AAAA,UACnB,gBAAgB;AAAA;AAAA;AAAA,QAGlB;AAAA,MACF;AAAA,IACF;AAAA,IACA,QAAQ;AAAA,MACN,MAAM;AAAA,MACN,MAAM,OAAO,IAAI,aAAa;AAAA,MAC9B,MAAM;AAAA;AAAA,MACN,OAAO;AAAA;AAAA,QAEL,CAAC,IAAI,iBAAiB,GAAG;AAAA,UACvB,QAAQ,IAAI;AAAA;AAAA;AAAA;AAAA,UAGZ,cAAc;AAAA,UACd,SAAS,CAACA,UACRA,MAAK,QAAQ,IAAI,OAAO,MAAM,IAAI,iBAAiB,GAAG,EAAE;AAAA;AAAA,QAC5D;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,MAsCF;AAAA,IACF;AAAA,IAEA,SAAS;AAAA,MAEP,IAAI;AAAA,MACJ,OAAO;AAAA;AAAA,MAEP,CAAC;AAAA,MACD,WAAW;AAAA;AAAA,QAET,SAAS,CAAC,OAAO,cAAc;AAAA;AAAA,QAE/B,UAAU;AAAA,UACR,SAAS;AAAA;AAAA,UACT,UAAU;AAAA;AAAA,UACV,kBAAkB;AAAA;AAAA,QACpB;AAAA,QACA,WAAW;AAAA;AAAA,UAET,oBAAoB;AAAA;AAAA,UAEpB,cAAc,CAAC,CAAC;AAAA,QAClB;AAAA,QACA,aAAa;AAAA;AAAA,QACb,KAAK,KAAK,QAAQ,SAAS,SAAS,mBAAmB;AAAA;AAAA,MACzD,CAAC;AAAA,MAED,WAAW;AAAA,QACT,WAAW;AAAA;AAAA,UAET,cAAc;AAAA,YACZ,oBAAoB,CAAC,IAAI;AAAA;AAAA,UAC3B,CAAC;AAAA;AAAA,UAED,oBAAoB;AAAA,QACtB;AAAA,QACA,KAAK,KAAK,QAAQ,SAAS,SAAS,iBAAiB;AAAA;AAAA,MACvD,CAAC;AAAA,MAED,MAAM;AAAA;AAAA,QAEJ,aAAa;AAAA,MACf,CAAC;AAAA,MAED,qBAAqB;AAAA;AAAA,QAEnB,UAAU,CAAC,KAAK,QAAQ,SAAS,cAAc,CAAC;AAAA;AAAA,QAEhD,UAAU;AAAA,MACZ,CAAC;AAAA,IACH;AAAA,IAEA,cAAc;AAAA,MACZ,SAAS;AAAA,QACP;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QAEA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,MACF;AAAA,IACF;AAAA,EACF;AACF,CAAC;",
  "names": ["path"]
}
