diff --git a/public/conditions.json b/public/conditions.json
index 82eb19d..b7629ed 100644
--- a/public/conditions.json
+++ b/public/conditions.json
@@ -2,29 +2,29 @@
   "code": "200",
   "msg": "操作成功",
   "data": [
-    {
-      "columnId": "1090",
-      "showType": "1",
-      "showName": "预计采购总费用",
-      "columnName": "planProcurementTotalMoney",
-      "columnType": "Double",
-      "fixedDownBoxValue": ""
-    },
-    {
-      "columnId": "1092",
-      "showType": "3",
-      "showName": "采购类型",
-      "columnName": "procurementType",
-      "columnType": "String",
-      "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
-    },
-    {
-      "columnId": "1093",
-      "showType": "1",
-      "showName": "园区面积",
-      "columnName": "parkArea",
-      "columnType": "Double",
-      "fixedDownBoxValue": ""
-    }
+    // {
+    //   "columnId": "1090",
+    //   "showType": "1",
+    //   "showName": "预计采购总费用",
+    //   "columnName": "planProcurementTotalMoney",
+    //   "columnType": "Double",
+    //   "fixedDownBoxValue": ""
+    // },
+    // {
+    //   "columnId": "1092",
+    //   "showType": "3",
+    //   "showName": "采购类型",
+    //   "columnName": "procurementType",
+    //   "columnType": "String",
+    //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
+    // },
+    // {
+    //   "columnId": "1093",
+    //   "showType": "1",
+    //   "showName": "园区面积",
+    //   "columnName": "parkArea",
+    //   "columnType": "Double",
+    //   "fixedDownBoxValue": ""
+    // }
   ]
-}
\ No newline at end of file
+}

diff --git a/public/conditions.json b/public/conditions.json
index 82eb19d..b7629ed 100644
--- a/public/conditions.json
+++ b/public/conditions.json
@@ -2,29 +2,29 @@
   "code": "200",
   "msg": "操作成功",
   "data": [
-    {
-      "columnId": "1090",
-      "showType": "1",
-      "showName": "预计采购总费用",
-      "columnName": "planProcurementTotalMoney",
-      "columnType": "Double",
-      "fixedDownBoxValue": ""
-    },
-    {
-      "columnId": "1092",
-      "showType": "3",
-      "showName": "采购类型",
-      "columnName": "procurementType",
-      "columnType": "String",
-      "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
-    },
-    {
-      "columnId": "1093",
-      "showType": "1",
-      "showName": "园区面积",
-      "columnName": "parkArea",
-      "columnType": "Double",
-      "fixedDownBoxValue": ""
-    }
+    // {
+    //   "columnId": "1090",
+    //   "showType": "1",
+    //   "showName": "预计采购总费用",
+    //   "columnName": "planProcurementTotalMoney",
+    //   "columnType": "Double",
+    //   "fixedDownBoxValue": ""
+    // },
+    // {
+    //   "columnId": "1092",
+    //   "showType": "3",
+    //   "showName": "采购类型",
+    //   "columnName": "procurementType",
+    //   "columnType": "String",
+    //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
+    // },
+    // {
+    //   "columnId": "1093",
+    //   "showType": "1",
+    //   "showName": "园区面积",
+    //   "columnName": "parkArea",
+    //   "columnType": "Double",
+    //   "fixedDownBoxValue": ""
+    // }
   ]
-}
\ No newline at end of file
+}
diff --git a/src/assets/images/check_box.png b/src/assets/images/check_box.png
new file mode 100644
index 0000000..fb89fe2
--- /dev/null
+++ b/src/assets/images/check_box.png
Binary files differ

diff --git a/public/conditions.json b/public/conditions.json
index 82eb19d..b7629ed 100644
--- a/public/conditions.json
+++ b/public/conditions.json
@@ -2,29 +2,29 @@
   "code": "200",
   "msg": "操作成功",
   "data": [
-    {
-      "columnId": "1090",
-      "showType": "1",
-      "showName": "预计采购总费用",
-      "columnName": "planProcurementTotalMoney",
-      "columnType": "Double",
-      "fixedDownBoxValue": ""
-    },
-    {
-      "columnId": "1092",
-      "showType": "3",
-      "showName": "采购类型",
-      "columnName": "procurementType",
-      "columnType": "String",
-      "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
-    },
-    {
-      "columnId": "1093",
-      "showType": "1",
-      "showName": "园区面积",
-      "columnName": "parkArea",
-      "columnType": "Double",
-      "fixedDownBoxValue": ""
-    }
+    // {
+    //   "columnId": "1090",
+    //   "showType": "1",
+    //   "showName": "预计采购总费用",
+    //   "columnName": "planProcurementTotalMoney",
+    //   "columnType": "Double",
+    //   "fixedDownBoxValue": ""
+    // },
+    // {
+    //   "columnId": "1092",
+    //   "showType": "3",
+    //   "showName": "采购类型",
+    //   "columnName": "procurementType",
+    //   "columnType": "String",
+    //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
+    // },
+    // {
+    //   "columnId": "1093",
+    //   "showType": "1",
+    //   "showName": "园区面积",
+    //   "columnName": "parkArea",
+    //   "columnType": "Double",
+    //   "fixedDownBoxValue": ""
+    // }
   ]
-}
\ No newline at end of file
+}
diff --git a/src/assets/images/check_box.png b/src/assets/images/check_box.png
new file mode 100644
index 0000000..fb89fe2
--- /dev/null
+++ b/src/assets/images/check_box.png
Binary files differ
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index d76462c..38881f4 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -14,6 +14,11 @@
     type: Array,
     default: () => [],
   },
+  // 是否允许多选
+  isMulti: {
+    type: Boolean,
+    default: true,
+  },
 })
 
 const emits = defineEmits(['update:visible', 'change'])
@@ -101,6 +106,16 @@
 function search() {
   fetchRoleData()
 }
+// 多选框单选功能
+const selectClick = (selection: any, row: any) => {
+  if (!props.isMulti) {
+    console.log('selectClick')
+    if (selection.length > 1) {
+      const del_row = selection.shift()
+      table.value?.toggleRowSelection(del_row, false) // 用于多选表格，切换某一行的选中状态，如果使用了第二个参数，则是设置这一行选中与否（selected 为 true 则选中）
+    }
+  }
+}
 onMounted(() => {
   search()
 })
@@ -115,7 +130,18 @@
             <el-input v-model="listQuery.keyword" placeholder="角色名称" />
           </search-item>
         </search-area>
-        <el-table ref="table" v-loading="loading" show-overflow-tooltip :data="roleList" row-key="id" :border="false" style="width: 100%;" :tree-props="{ children: 'children' }" @selection-change="handleSelectionChange">
+        <el-table
+          ref="table"
+          v-loading="loading"
+          show-overflow-tooltip
+          :data="roleList"
+          row-key="id"
+          :border="false"
+          style="width: 100%;"
+          :tree-props="{ children: 'children' }"
+          @selection-change="handleSelectionChange"
+          @select="selectClick"
+        >
           <el-table-column type="selection" width="55" />
           <el-table-column
             v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align"

diff --git a/public/conditions.json b/public/conditions.json
index 82eb19d..b7629ed 100644
--- a/public/conditions.json
+++ b/public/conditions.json
@@ -2,29 +2,29 @@
   "code": "200",
   "msg": "操作成功",
   "data": [
-    {
-      "columnId": "1090",
-      "showType": "1",
-      "showName": "预计采购总费用",
-      "columnName": "planProcurementTotalMoney",
-      "columnType": "Double",
-      "fixedDownBoxValue": ""
-    },
-    {
-      "columnId": "1092",
-      "showType": "3",
-      "showName": "采购类型",
-      "columnName": "procurementType",
-      "columnType": "String",
-      "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
-    },
-    {
-      "columnId": "1093",
-      "showType": "1",
-      "showName": "园区面积",
-      "columnName": "parkArea",
-      "columnType": "Double",
-      "fixedDownBoxValue": ""
-    }
+    // {
+    //   "columnId": "1090",
+    //   "showType": "1",
+    //   "showName": "预计采购总费用",
+    //   "columnName": "planProcurementTotalMoney",
+    //   "columnType": "Double",
+    //   "fixedDownBoxValue": ""
+    // },
+    // {
+    //   "columnId": "1092",
+    //   "showType": "3",
+    //   "showName": "采购类型",
+    //   "columnName": "procurementType",
+    //   "columnType": "String",
+    //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
+    // },
+    // {
+    //   "columnId": "1093",
+    //   "showType": "1",
+    //   "showName": "园区面积",
+    //   "columnName": "parkArea",
+    //   "columnType": "Double",
+    //   "fixedDownBoxValue": ""
+    // }
   ]
-}
\ No newline at end of file
+}
diff --git a/src/assets/images/check_box.png b/src/assets/images/check_box.png
new file mode 100644
index 0000000..fb89fe2
--- /dev/null
+++ b/src/assets/images/check_box.png
Binary files differ
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index d76462c..38881f4 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -14,6 +14,11 @@
     type: Array,
     default: () => [],
   },
+  // 是否允许多选
+  isMulti: {
+    type: Boolean,
+    default: true,
+  },
 })
 
 const emits = defineEmits(['update:visible', 'change'])
@@ -101,6 +106,16 @@
 function search() {
   fetchRoleData()
 }
+// 多选框单选功能
+const selectClick = (selection: any, row: any) => {
+  if (!props.isMulti) {
+    console.log('selectClick')
+    if (selection.length > 1) {
+      const del_row = selection.shift()
+      table.value?.toggleRowSelection(del_row, false) // 用于多选表格，切换某一行的选中状态，如果使用了第二个参数，则是设置这一行选中与否（selected 为 true 则选中）
+    }
+  }
+}
 onMounted(() => {
   search()
 })
@@ -115,7 +130,18 @@
             <el-input v-model="listQuery.keyword" placeholder="角色名称" />
           </search-item>
         </search-area>
-        <el-table ref="table" v-loading="loading" show-overflow-tooltip :data="roleList" row-key="id" :border="false" style="width: 100%;" :tree-props="{ children: 'children' }" @selection-change="handleSelectionChange">
+        <el-table
+          ref="table"
+          v-loading="loading"
+          show-overflow-tooltip
+          :data="roleList"
+          row-key="id"
+          :border="false"
+          style="width: 100%;"
+          :tree-props="{ children: 'children' }"
+          @selection-change="handleSelectionChange"
+          @select="selectClick"
+        >
           <el-table-column type="selection" width="55" />
           <el-table-column
             v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align"
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index f9273ee..0f8d5c0 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -319,7 +319,7 @@
         <span v-for="(item, index) in approverConfig.nodeUserList" :key="index" class="people-box">
           {{ item.name }}
           <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')"> -->
-          <el-icon style="vertical-align: middle;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
+          <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
             <close />
           </el-icon>
         </span>

diff --git a/public/conditions.json b/public/conditions.json
index 82eb19d..b7629ed 100644
--- a/public/conditions.json
+++ b/public/conditions.json
@@ -2,29 +2,29 @@
   "code": "200",
   "msg": "操作成功",
   "data": [
-    {
-      "columnId": "1090",
-      "showType": "1",
-      "showName": "预计采购总费用",
-      "columnName": "planProcurementTotalMoney",
-      "columnType": "Double",
-      "fixedDownBoxValue": ""
-    },
-    {
-      "columnId": "1092",
-      "showType": "3",
-      "showName": "采购类型",
-      "columnName": "procurementType",
-      "columnType": "String",
-      "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
-    },
-    {
-      "columnId": "1093",
-      "showType": "1",
-      "showName": "园区面积",
-      "columnName": "parkArea",
-      "columnType": "Double",
-      "fixedDownBoxValue": ""
-    }
+    // {
+    //   "columnId": "1090",
+    //   "showType": "1",
+    //   "showName": "预计采购总费用",
+    //   "columnName": "planProcurementTotalMoney",
+    //   "columnType": "Double",
+    //   "fixedDownBoxValue": ""
+    // },
+    // {
+    //   "columnId": "1092",
+    //   "showType": "3",
+    //   "showName": "采购类型",
+    //   "columnName": "procurementType",
+    //   "columnType": "String",
+    //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
+    // },
+    // {
+    //   "columnId": "1093",
+    //   "showType": "1",
+    //   "showName": "园区面积",
+    //   "columnName": "parkArea",
+    //   "columnType": "Double",
+    //   "fixedDownBoxValue": ""
+    // }
   ]
-}
\ No newline at end of file
+}
diff --git a/src/assets/images/check_box.png b/src/assets/images/check_box.png
new file mode 100644
index 0000000..fb89fe2
--- /dev/null
+++ b/src/assets/images/check_box.png
Binary files differ
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index d76462c..38881f4 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -14,6 +14,11 @@
     type: Array,
     default: () => [],
   },
+  // 是否允许多选
+  isMulti: {
+    type: Boolean,
+    default: true,
+  },
 })
 
 const emits = defineEmits(['update:visible', 'change'])
@@ -101,6 +106,16 @@
 function search() {
   fetchRoleData()
 }
+// 多选框单选功能
+const selectClick = (selection: any, row: any) => {
+  if (!props.isMulti) {
+    console.log('selectClick')
+    if (selection.length > 1) {
+      const del_row = selection.shift()
+      table.value?.toggleRowSelection(del_row, false) // 用于多选表格，切换某一行的选中状态，如果使用了第二个参数，则是设置这一行选中与否（selected 为 true 则选中）
+    }
+  }
+}
 onMounted(() => {
   search()
 })
@@ -115,7 +130,18 @@
             <el-input v-model="listQuery.keyword" placeholder="角色名称" />
           </search-item>
         </search-area>
-        <el-table ref="table" v-loading="loading" show-overflow-tooltip :data="roleList" row-key="id" :border="false" style="width: 100%;" :tree-props="{ children: 'children' }" @selection-change="handleSelectionChange">
+        <el-table
+          ref="table"
+          v-loading="loading"
+          show-overflow-tooltip
+          :data="roleList"
+          row-key="id"
+          :border="false"
+          style="width: 100%;"
+          :tree-props="{ children: 'children' }"
+          @selection-change="handleSelectionChange"
+          @select="selectClick"
+        >
           <el-table-column type="selection" width="55" />
           <el-table-column
             v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align"
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index f9273ee..0f8d5c0 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -319,7 +319,7 @@
         <span v-for="(item, index) in approverConfig.nodeUserList" :key="index" class="people-box">
           {{ item.name }}
           <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')"> -->
-          <el-icon style="vertical-align: middle;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
+          <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
             <close />
           </el-icon>
         </span>
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index bc3d84e..57c3a92 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,12 +1,12 @@
 <!-- 条件设置 -->
 <script setup>
-import { computed, ref, watch } from 'vue'
+import { computed, nextTick, onMounted, ref, watch } from 'vue'
 import employeesRoleDialog from '../dialog/employeesRoleDialog.vue'
 import $func from '@/plugins/preload'
 // import { mapMutations, mapState } from '@/plugins/lib.js'
 import useWorkFlowStore from '@/store/modules/workFlow'
-
 import { getConditions } from '@/plugins/api.js'
+
 const workFlowStore = useWorkFlowStore()
 const conditionVisible = ref(false)
 const conditionsConfig = ref({
@@ -18,6 +18,7 @@
 const conditionList = ref([])
 const checkedList = ref([])
 const conditionRoleVisible = ref(false)
+const checkedfqr = ref(true) // 条件-发起人是否选择
 
 // const { tableId, conditionsConfig1, conditionDrawer } = workFlowStore
 const { setCondition, setConditionsConfig } = workFlowStore
@@ -27,22 +28,19 @@
 }
 const visible = computed({
   get() {
-    console.log('2')
-
     return workFlowStore.conditionDrawer
   },
   set() {
     closeDrawer()
   },
 })
-watch(workFlowStore.conditionsConfig1, (val) => {
+watch(() => workFlowStore.conditionsConfig1, (val, oldVal) => {
   conditionsConfig.value = val.value
   PriorityLevel.value = val.priorityLevel
   conditionConfig.value = val.priorityLevel
     ? conditionsConfig.value.conditionNodes[val.priorityLevel - 1]
     : { nodeUserList: [], conditionList: [] }
 })
-
 const changeOptType = (item) => {
   if (item.optType === 1) {
     item.zdy1 = 2
@@ -78,7 +76,33 @@
 const addCondition = async () => {
   conditionList.value = []
   conditionVisible.value = true
-  const { data } = await getConditions({ tableId: workFlowStore.tableId })
+  // const { data } = await getConditions({ tableId: workFlowStore.tableId })
+  const data = [
+  //   // {
+  //   //   "columnId": "1090",
+  //   //   "showType": "1",
+  //   //   "showName": "预计采购总费用",
+  //   //   "columnName": "planProcurementTotalMoney",
+  //   //   "columnType": "Double",
+  //   //   "fixedDownBoxValue": ""
+  //   // },
+  //   // {
+  //   //   "columnId": "1092",
+  //   //   "showType": "3",
+  //   //   "showName": "采购类型",
+  //   //   "columnName": "procurementType",
+  //   //   "columnType": "String",
+  //   //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
+  //   // },
+  //   // {
+  //   //   "columnId": "1093",
+  //   //   "showType": "1",
+  //   //   "showName": "园区面积",
+  //   //   "columnName": "parkArea",
+  //   //   "columnType": "Double",
+  //   //   "fixedDownBoxValue": ""
+  //   // }
+  ]
   conditions.value = data
   if (conditionConfig.value.conditionList) {
     for (let i = 0; i < conditionConfig.value.conditionList.length; i++) {
@@ -93,6 +117,8 @@
   }
 }
 const sureCondition = () => {
+  console.log('*****')
+  console.log(conditionConfig.value)
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
@@ -147,6 +173,7 @@
   conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
   conditionVisible.value = false
 }
+// 抽屉点击确定
 const saveCondition = () => {
   closeDrawer()
   const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
@@ -154,23 +181,31 @@
   conditionsConfig.value.conditionNodes.map((item, index) => {
     item.priorityLevel = index + 1
   })
+  console.log('conditionsConfig.value', conditionsConfig.value)
   for (let i = 0; i < conditionsConfig.value.conditionNodes.length; i++) {
     conditionsConfig.value.conditionNodes[i].error = $func.conditionStr(conditionsConfig.value, i) === '请设置条件' && i !== conditionsConfig.value.conditionNodes.length - 1
   }
   setConditionsConfig({
     value: conditionsConfig.value,
     flag: true,
-    id: workFlowStore.conditionsConfig1.value.id,
+    id: workFlowStore.conditionsConfig1.id,
   })
 }
+// 添加
 const addConditionRole = () => {
   conditionRoleVisible.value = true
   checkedList.value = conditionConfig.value.nodeUserList
 }
+// 选好角色了
 const sureConditionRole = (data) => {
   conditionConfig.value.nodeUserList = data
   conditionRoleVisible.value = false
 }
+
+// 点击发起人
+const clickfq = (conditionList, param, columnId) => {
+  $func.toChecked(conditionList, param, columnId)
+}
 </script>
 
 <template>
@@ -190,15 +225,36 @@
         <p class="tip">
           当审批单同时满足以下条件时进入此流程
         </p>
+        <el-button
+          type="primary"
+          @click="addCondition"
+        >
+          添加条件
+        </el-button>
+
         <ul>
           <li v-for="(item, index) in conditionConfig.conditionList" :key="index">
+            <!-- <el-button type="primary" @click="addConditionRole">
+              选择成员
+            </el-button> -->
             <span class="ellipsis">{{ item.type === 1 ? '发起人' : item.showName }}：</span>
             <div v-if="item.type === 1">
-              <p :class="conditionConfig.nodeUserList.length > 0 ? 'selected_list' : ''" style="cursor: text;" @click.self="addConditionRole">
+              <!-- <p :class="conditionConfig.nodeUserList.length > 0 ? 'selected_list' : ''" style="cursor: text;" @click.self="addConditionRole">
                 <span v-for="(item1, index1) in conditionConfig.nodeUserList" :key="index1">
                   {{ item1.name }}<img src="@/assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item1, 'targetId')">
                 </span>
                 <input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole">
+              </p> -->
+              <el-input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole" />
+              <p v-if="conditionConfig && conditionConfig.nodeUserList && conditionConfig.nodeUserList.length" class="selected_list">
+                <span v-for="(item, index) in conditionConfig.nodeUserList" :key="index" class="people-box">
+                  {{ item.name }}
+                  <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')"> -->
+                  <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')">
+                    <close />
+                  </el-icon>
+                </span>
+                <a v-if="conditionConfig.nodeUserList && conditionConfig.nodeUserList.length !== 0" @click="conditionConfig.nodeUserList = []">清除</a>
               </p>
             </div>
             <div v-else-if="item.columnType === 'String' && item.showType === 3">
@@ -259,13 +315,14 @@
             <a v-if="item.type === 2" @click="$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
           </li>
         </ul>
-        <el-button type="primary" @click="addCondition">
-          添加条件
-        </el-button>
+
         <el-dialog v-model="conditionVisible" title="选择条件" width="480px" append-to-body custom-class="condition_list">
           <p>请选择用来区分审批流程的条件字段</p>
           <p class="check_box">
-            <a :class="$func.toggleClass(conditionList, { columnId: 0 }, 'columnId') && 'active'" @click="$func.toChecked(conditionList, { columnId: 0 }, 'columnId')">发起人</a>
+            <a
+              :class="$func.toggleClass(conditionList, { columnId: 0 }, 'columnId') && 'active'"
+              @click="clickfq(conditionList, { columnId: 0 }, 'columnId')"
+            >发起人</a>
             <a
               v-for="(item, index) in conditions" :key="index" :class="$func.toggleClass(conditionList, item, 'columnId') && 'active'"
               @click="$func.toChecked(conditionList, item, 'columnId')"
@@ -281,11 +338,23 @@
           </template>
         </el-dialog>
       </div>
-      <employees-role-dialog
+      <!-- <employees-role-dialog
         v-model:visible="conditionRoleVisible"
         v-model:data="checkedList"
         :is-department="true"
         @change="sureConditionRole"
+      /> -->
+      <!-- 角色弹框 -->
+      <!-- <select-role-dialog
+        v-model:visible="approverRoleVisible"
+        v-model:data="checkedRoleList"
+        @change="sureRoleApprover"
+      /> -->
+      <!-- 成员弹框 -->
+      <select-employees-dialog
+        v-model:visible="conditionRoleVisible"
+        v-model:data="checkedList"
+        @change="sureConditionRole"
       />
       <div class="demo-drawer__footer clear">
         <el-button type="primary" @click="saveCondition">
@@ -301,10 +370,19 @@
 
 <style lang="scss">
 .condition_copyer {
+  .people-box {
+    font-size: 12px;
+    margin-right: 10px;
+    padding: 3px 6px 3px 9px;
+    white-space: nowrap;
+    border-radius: 6px;
+    border: 1px solid rgb(220 220 220 / 100%);
+  }
+
   .priority_level {
     position: absolute;
-    top: 11px;
-    right: 30px;
+    top: 16px;
+    right: 70px;
     width: 100px;
     height: 32px;
     background: rgb(255 255 255 / 100%);
@@ -360,15 +438,6 @@
           margin-top: 7px;
         }
 
-        select,
-        input {
-          width: 100%;
-          height: 32px;
-          background: rgb(255 255 255 / 100%);
-          border-radius: 4px;
-          border: 1px solid rgb(217 217 217 / 100%);
-        }
-
         select + input {
           width: 260px;
         }
@@ -413,4 +482,69 @@
     }
   }
 }
+
+.radio_box a,
+.check_box a {
+  font-size: 12px;
+  position: relative;
+  padding-left: 20px;
+  margin-right: 30px;
+  cursor: pointer;
+  color: #333;
+  white-space: pre;
+}
+
+.check_box.not a:hover {
+  color: #333;
+}
+
+.check_box.not a::before,
+.check_box.not a:hover::before {
+  border: none;
+}
+
+.check_box.not.active {
+  background: #f3f3f3;
+}
+
+.radio_box a:hover::before,
+.check_box a:hover::before {
+  border: 1px solid #46a6fe;
+}
+
+.radio_box a::before,
+.check_box a::before {
+  position: absolute;
+  width: 14px;
+  height: 14px;
+  border: 1px solid #dcdfe6;
+  border-radius: 2px;
+  left: 0;
+  top: 1px;
+  content: "";
+}
+
+.radio_box a::before {
+  border-radius: 50%;
+}
+
+.check-dot.active::after,
+.radio_box a.active::after,
+.check_box a.active::after {
+  position: absolute;
+  width: 10px;
+  height: 10px;
+  border-radius: 50%;
+  top: 3px;
+  left: 3px;
+  content: "";
+}
+
+.radio_box a.active::after {
+  background: #46a6fe;
+}
+
+.check_box a.active::after {
+  background: url("@/assets/images/check_box.png") no-repeat center;
+}
 </style>

diff --git a/public/conditions.json b/public/conditions.json
index 82eb19d..b7629ed 100644
--- a/public/conditions.json
+++ b/public/conditions.json
@@ -2,29 +2,29 @@
   "code": "200",
   "msg": "操作成功",
   "data": [
-    {
-      "columnId": "1090",
-      "showType": "1",
-      "showName": "预计采购总费用",
-      "columnName": "planProcurementTotalMoney",
-      "columnType": "Double",
-      "fixedDownBoxValue": ""
-    },
-    {
-      "columnId": "1092",
-      "showType": "3",
-      "showName": "采购类型",
-      "columnName": "procurementType",
-      "columnType": "String",
-      "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
-    },
-    {
-      "columnId": "1093",
-      "showType": "1",
-      "showName": "园区面积",
-      "columnName": "parkArea",
-      "columnType": "Double",
-      "fixedDownBoxValue": ""
-    }
+    // {
+    //   "columnId": "1090",
+    //   "showType": "1",
+    //   "showName": "预计采购总费用",
+    //   "columnName": "planProcurementTotalMoney",
+    //   "columnType": "Double",
+    //   "fixedDownBoxValue": ""
+    // },
+    // {
+    //   "columnId": "1092",
+    //   "showType": "3",
+    //   "showName": "采购类型",
+    //   "columnName": "procurementType",
+    //   "columnType": "String",
+    //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
+    // },
+    // {
+    //   "columnId": "1093",
+    //   "showType": "1",
+    //   "showName": "园区面积",
+    //   "columnName": "parkArea",
+    //   "columnType": "Double",
+    //   "fixedDownBoxValue": ""
+    // }
   ]
-}
\ No newline at end of file
+}
diff --git a/src/assets/images/check_box.png b/src/assets/images/check_box.png
new file mode 100644
index 0000000..fb89fe2
--- /dev/null
+++ b/src/assets/images/check_box.png
Binary files differ
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index d76462c..38881f4 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -14,6 +14,11 @@
     type: Array,
     default: () => [],
   },
+  // 是否允许多选
+  isMulti: {
+    type: Boolean,
+    default: true,
+  },
 })
 
 const emits = defineEmits(['update:visible', 'change'])
@@ -101,6 +106,16 @@
 function search() {
   fetchRoleData()
 }
+// 多选框单选功能
+const selectClick = (selection: any, row: any) => {
+  if (!props.isMulti) {
+    console.log('selectClick')
+    if (selection.length > 1) {
+      const del_row = selection.shift()
+      table.value?.toggleRowSelection(del_row, false) // 用于多选表格，切换某一行的选中状态，如果使用了第二个参数，则是设置这一行选中与否（selected 为 true 则选中）
+    }
+  }
+}
 onMounted(() => {
   search()
 })
@@ -115,7 +130,18 @@
             <el-input v-model="listQuery.keyword" placeholder="角色名称" />
           </search-item>
         </search-area>
-        <el-table ref="table" v-loading="loading" show-overflow-tooltip :data="roleList" row-key="id" :border="false" style="width: 100%;" :tree-props="{ children: 'children' }" @selection-change="handleSelectionChange">
+        <el-table
+          ref="table"
+          v-loading="loading"
+          show-overflow-tooltip
+          :data="roleList"
+          row-key="id"
+          :border="false"
+          style="width: 100%;"
+          :tree-props="{ children: 'children' }"
+          @selection-change="handleSelectionChange"
+          @select="selectClick"
+        >
           <el-table-column type="selection" width="55" />
           <el-table-column
             v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align"
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index f9273ee..0f8d5c0 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -319,7 +319,7 @@
         <span v-for="(item, index) in approverConfig.nodeUserList" :key="index" class="people-box">
           {{ item.name }}
           <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')"> -->
-          <el-icon style="vertical-align: middle;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
+          <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
             <close />
           </el-icon>
         </span>
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index bc3d84e..57c3a92 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,12 +1,12 @@
 <!-- 条件设置 -->
 <script setup>
-import { computed, ref, watch } from 'vue'
+import { computed, nextTick, onMounted, ref, watch } from 'vue'
 import employeesRoleDialog from '../dialog/employeesRoleDialog.vue'
 import $func from '@/plugins/preload'
 // import { mapMutations, mapState } from '@/plugins/lib.js'
 import useWorkFlowStore from '@/store/modules/workFlow'
-
 import { getConditions } from '@/plugins/api.js'
+
 const workFlowStore = useWorkFlowStore()
 const conditionVisible = ref(false)
 const conditionsConfig = ref({
@@ -18,6 +18,7 @@
 const conditionList = ref([])
 const checkedList = ref([])
 const conditionRoleVisible = ref(false)
+const checkedfqr = ref(true) // 条件-发起人是否选择
 
 // const { tableId, conditionsConfig1, conditionDrawer } = workFlowStore
 const { setCondition, setConditionsConfig } = workFlowStore
@@ -27,22 +28,19 @@
 }
 const visible = computed({
   get() {
-    console.log('2')
-
     return workFlowStore.conditionDrawer
   },
   set() {
     closeDrawer()
   },
 })
-watch(workFlowStore.conditionsConfig1, (val) => {
+watch(() => workFlowStore.conditionsConfig1, (val, oldVal) => {
   conditionsConfig.value = val.value
   PriorityLevel.value = val.priorityLevel
   conditionConfig.value = val.priorityLevel
     ? conditionsConfig.value.conditionNodes[val.priorityLevel - 1]
     : { nodeUserList: [], conditionList: [] }
 })
-
 const changeOptType = (item) => {
   if (item.optType === 1) {
     item.zdy1 = 2
@@ -78,7 +76,33 @@
 const addCondition = async () => {
   conditionList.value = []
   conditionVisible.value = true
-  const { data } = await getConditions({ tableId: workFlowStore.tableId })
+  // const { data } = await getConditions({ tableId: workFlowStore.tableId })
+  const data = [
+  //   // {
+  //   //   "columnId": "1090",
+  //   //   "showType": "1",
+  //   //   "showName": "预计采购总费用",
+  //   //   "columnName": "planProcurementTotalMoney",
+  //   //   "columnType": "Double",
+  //   //   "fixedDownBoxValue": ""
+  //   // },
+  //   // {
+  //   //   "columnId": "1092",
+  //   //   "showType": "3",
+  //   //   "showName": "采购类型",
+  //   //   "columnName": "procurementType",
+  //   //   "columnType": "String",
+  //   //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
+  //   // },
+  //   // {
+  //   //   "columnId": "1093",
+  //   //   "showType": "1",
+  //   //   "showName": "园区面积",
+  //   //   "columnName": "parkArea",
+  //   //   "columnType": "Double",
+  //   //   "fixedDownBoxValue": ""
+  //   // }
+  ]
   conditions.value = data
   if (conditionConfig.value.conditionList) {
     for (let i = 0; i < conditionConfig.value.conditionList.length; i++) {
@@ -93,6 +117,8 @@
   }
 }
 const sureCondition = () => {
+  console.log('*****')
+  console.log(conditionConfig.value)
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
@@ -147,6 +173,7 @@
   conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
   conditionVisible.value = false
 }
+// 抽屉点击确定
 const saveCondition = () => {
   closeDrawer()
   const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
@@ -154,23 +181,31 @@
   conditionsConfig.value.conditionNodes.map((item, index) => {
     item.priorityLevel = index + 1
   })
+  console.log('conditionsConfig.value', conditionsConfig.value)
   for (let i = 0; i < conditionsConfig.value.conditionNodes.length; i++) {
     conditionsConfig.value.conditionNodes[i].error = $func.conditionStr(conditionsConfig.value, i) === '请设置条件' && i !== conditionsConfig.value.conditionNodes.length - 1
   }
   setConditionsConfig({
     value: conditionsConfig.value,
     flag: true,
-    id: workFlowStore.conditionsConfig1.value.id,
+    id: workFlowStore.conditionsConfig1.id,
   })
 }
+// 添加
 const addConditionRole = () => {
   conditionRoleVisible.value = true
   checkedList.value = conditionConfig.value.nodeUserList
 }
+// 选好角色了
 const sureConditionRole = (data) => {
   conditionConfig.value.nodeUserList = data
   conditionRoleVisible.value = false
 }
+
+// 点击发起人
+const clickfq = (conditionList, param, columnId) => {
+  $func.toChecked(conditionList, param, columnId)
+}
 </script>
 
 <template>
@@ -190,15 +225,36 @@
         <p class="tip">
           当审批单同时满足以下条件时进入此流程
         </p>
+        <el-button
+          type="primary"
+          @click="addCondition"
+        >
+          添加条件
+        </el-button>
+
         <ul>
           <li v-for="(item, index) in conditionConfig.conditionList" :key="index">
+            <!-- <el-button type="primary" @click="addConditionRole">
+              选择成员
+            </el-button> -->
             <span class="ellipsis">{{ item.type === 1 ? '发起人' : item.showName }}：</span>
             <div v-if="item.type === 1">
-              <p :class="conditionConfig.nodeUserList.length > 0 ? 'selected_list' : ''" style="cursor: text;" @click.self="addConditionRole">
+              <!-- <p :class="conditionConfig.nodeUserList.length > 0 ? 'selected_list' : ''" style="cursor: text;" @click.self="addConditionRole">
                 <span v-for="(item1, index1) in conditionConfig.nodeUserList" :key="index1">
                   {{ item1.name }}<img src="@/assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item1, 'targetId')">
                 </span>
                 <input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole">
+              </p> -->
+              <el-input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole" />
+              <p v-if="conditionConfig && conditionConfig.nodeUserList && conditionConfig.nodeUserList.length" class="selected_list">
+                <span v-for="(item, index) in conditionConfig.nodeUserList" :key="index" class="people-box">
+                  {{ item.name }}
+                  <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')"> -->
+                  <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')">
+                    <close />
+                  </el-icon>
+                </span>
+                <a v-if="conditionConfig.nodeUserList && conditionConfig.nodeUserList.length !== 0" @click="conditionConfig.nodeUserList = []">清除</a>
               </p>
             </div>
             <div v-else-if="item.columnType === 'String' && item.showType === 3">
@@ -259,13 +315,14 @@
             <a v-if="item.type === 2" @click="$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
           </li>
         </ul>
-        <el-button type="primary" @click="addCondition">
-          添加条件
-        </el-button>
+
         <el-dialog v-model="conditionVisible" title="选择条件" width="480px" append-to-body custom-class="condition_list">
           <p>请选择用来区分审批流程的条件字段</p>
           <p class="check_box">
-            <a :class="$func.toggleClass(conditionList, { columnId: 0 }, 'columnId') && 'active'" @click="$func.toChecked(conditionList, { columnId: 0 }, 'columnId')">发起人</a>
+            <a
+              :class="$func.toggleClass(conditionList, { columnId: 0 }, 'columnId') && 'active'"
+              @click="clickfq(conditionList, { columnId: 0 }, 'columnId')"
+            >发起人</a>
             <a
               v-for="(item, index) in conditions" :key="index" :class="$func.toggleClass(conditionList, item, 'columnId') && 'active'"
               @click="$func.toChecked(conditionList, item, 'columnId')"
@@ -281,11 +338,23 @@
           </template>
         </el-dialog>
       </div>
-      <employees-role-dialog
+      <!-- <employees-role-dialog
         v-model:visible="conditionRoleVisible"
         v-model:data="checkedList"
         :is-department="true"
         @change="sureConditionRole"
+      /> -->
+      <!-- 角色弹框 -->
+      <!-- <select-role-dialog
+        v-model:visible="approverRoleVisible"
+        v-model:data="checkedRoleList"
+        @change="sureRoleApprover"
+      /> -->
+      <!-- 成员弹框 -->
+      <select-employees-dialog
+        v-model:visible="conditionRoleVisible"
+        v-model:data="checkedList"
+        @change="sureConditionRole"
       />
       <div class="demo-drawer__footer clear">
         <el-button type="primary" @click="saveCondition">
@@ -301,10 +370,19 @@
 
 <style lang="scss">
 .condition_copyer {
+  .people-box {
+    font-size: 12px;
+    margin-right: 10px;
+    padding: 3px 6px 3px 9px;
+    white-space: nowrap;
+    border-radius: 6px;
+    border: 1px solid rgb(220 220 220 / 100%);
+  }
+
   .priority_level {
     position: absolute;
-    top: 11px;
-    right: 30px;
+    top: 16px;
+    right: 70px;
     width: 100px;
     height: 32px;
     background: rgb(255 255 255 / 100%);
@@ -360,15 +438,6 @@
           margin-top: 7px;
         }
 
-        select,
-        input {
-          width: 100%;
-          height: 32px;
-          background: rgb(255 255 255 / 100%);
-          border-radius: 4px;
-          border: 1px solid rgb(217 217 217 / 100%);
-        }
-
         select + input {
           width: 260px;
         }
@@ -413,4 +482,69 @@
     }
   }
 }
+
+.radio_box a,
+.check_box a {
+  font-size: 12px;
+  position: relative;
+  padding-left: 20px;
+  margin-right: 30px;
+  cursor: pointer;
+  color: #333;
+  white-space: pre;
+}
+
+.check_box.not a:hover {
+  color: #333;
+}
+
+.check_box.not a::before,
+.check_box.not a:hover::before {
+  border: none;
+}
+
+.check_box.not.active {
+  background: #f3f3f3;
+}
+
+.radio_box a:hover::before,
+.check_box a:hover::before {
+  border: 1px solid #46a6fe;
+}
+
+.radio_box a::before,
+.check_box a::before {
+  position: absolute;
+  width: 14px;
+  height: 14px;
+  border: 1px solid #dcdfe6;
+  border-radius: 2px;
+  left: 0;
+  top: 1px;
+  content: "";
+}
+
+.radio_box a::before {
+  border-radius: 50%;
+}
+
+.check-dot.active::after,
+.radio_box a.active::after,
+.check_box a.active::after {
+  position: absolute;
+  width: 10px;
+  height: 10px;
+  border-radius: 50%;
+  top: 3px;
+  left: 3px;
+  content: "";
+}
+
+.radio_box a.active::after {
+  background: #46a6fe;
+}
+
+.check_box a.active::after {
+  background: url("@/assets/images/check_box.png") no-repeat center;
+}
 </style>
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index 2bc0ed6..4e10eb0 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -34,7 +34,7 @@
         nodeName: '抄送人',
         type: 2,
         ccSelfSelectFlag: 1,
-        childNode: props.childNodeP,
+        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
         nodeUserList: [],
       }
     }
@@ -52,7 +52,7 @@
         priorityLevel: 1,
         conditionList: [],
         nodeUserList: [],
-        childNode: props.childNodeP,
+        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
       }, {
         nodeName: '条件2',
         type: 3,

diff --git a/public/conditions.json b/public/conditions.json
index 82eb19d..b7629ed 100644
--- a/public/conditions.json
+++ b/public/conditions.json
@@ -2,29 +2,29 @@
   "code": "200",
   "msg": "操作成功",
   "data": [
-    {
-      "columnId": "1090",
-      "showType": "1",
-      "showName": "预计采购总费用",
-      "columnName": "planProcurementTotalMoney",
-      "columnType": "Double",
-      "fixedDownBoxValue": ""
-    },
-    {
-      "columnId": "1092",
-      "showType": "3",
-      "showName": "采购类型",
-      "columnName": "procurementType",
-      "columnType": "String",
-      "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
-    },
-    {
-      "columnId": "1093",
-      "showType": "1",
-      "showName": "园区面积",
-      "columnName": "parkArea",
-      "columnType": "Double",
-      "fixedDownBoxValue": ""
-    }
+    // {
+    //   "columnId": "1090",
+    //   "showType": "1",
+    //   "showName": "预计采购总费用",
+    //   "columnName": "planProcurementTotalMoney",
+    //   "columnType": "Double",
+    //   "fixedDownBoxValue": ""
+    // },
+    // {
+    //   "columnId": "1092",
+    //   "showType": "3",
+    //   "showName": "采购类型",
+    //   "columnName": "procurementType",
+    //   "columnType": "String",
+    //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
+    // },
+    // {
+    //   "columnId": "1093",
+    //   "showType": "1",
+    //   "showName": "园区面积",
+    //   "columnName": "parkArea",
+    //   "columnType": "Double",
+    //   "fixedDownBoxValue": ""
+    // }
   ]
-}
\ No newline at end of file
+}
diff --git a/src/assets/images/check_box.png b/src/assets/images/check_box.png
new file mode 100644
index 0000000..fb89fe2
--- /dev/null
+++ b/src/assets/images/check_box.png
Binary files differ
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index d76462c..38881f4 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -14,6 +14,11 @@
     type: Array,
     default: () => [],
   },
+  // 是否允许多选
+  isMulti: {
+    type: Boolean,
+    default: true,
+  },
 })
 
 const emits = defineEmits(['update:visible', 'change'])
@@ -101,6 +106,16 @@
 function search() {
   fetchRoleData()
 }
+// 多选框单选功能
+const selectClick = (selection: any, row: any) => {
+  if (!props.isMulti) {
+    console.log('selectClick')
+    if (selection.length > 1) {
+      const del_row = selection.shift()
+      table.value?.toggleRowSelection(del_row, false) // 用于多选表格，切换某一行的选中状态，如果使用了第二个参数，则是设置这一行选中与否（selected 为 true 则选中）
+    }
+  }
+}
 onMounted(() => {
   search()
 })
@@ -115,7 +130,18 @@
             <el-input v-model="listQuery.keyword" placeholder="角色名称" />
           </search-item>
         </search-area>
-        <el-table ref="table" v-loading="loading" show-overflow-tooltip :data="roleList" row-key="id" :border="false" style="width: 100%;" :tree-props="{ children: 'children' }" @selection-change="handleSelectionChange">
+        <el-table
+          ref="table"
+          v-loading="loading"
+          show-overflow-tooltip
+          :data="roleList"
+          row-key="id"
+          :border="false"
+          style="width: 100%;"
+          :tree-props="{ children: 'children' }"
+          @selection-change="handleSelectionChange"
+          @select="selectClick"
+        >
           <el-table-column type="selection" width="55" />
           <el-table-column
             v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align"
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index f9273ee..0f8d5c0 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -319,7 +319,7 @@
         <span v-for="(item, index) in approverConfig.nodeUserList" :key="index" class="people-box">
           {{ item.name }}
           <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')"> -->
-          <el-icon style="vertical-align: middle;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
+          <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
             <close />
           </el-icon>
         </span>
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index bc3d84e..57c3a92 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,12 +1,12 @@
 <!-- 条件设置 -->
 <script setup>
-import { computed, ref, watch } from 'vue'
+import { computed, nextTick, onMounted, ref, watch } from 'vue'
 import employeesRoleDialog from '../dialog/employeesRoleDialog.vue'
 import $func from '@/plugins/preload'
 // import { mapMutations, mapState } from '@/plugins/lib.js'
 import useWorkFlowStore from '@/store/modules/workFlow'
-
 import { getConditions } from '@/plugins/api.js'
+
 const workFlowStore = useWorkFlowStore()
 const conditionVisible = ref(false)
 const conditionsConfig = ref({
@@ -18,6 +18,7 @@
 const conditionList = ref([])
 const checkedList = ref([])
 const conditionRoleVisible = ref(false)
+const checkedfqr = ref(true) // 条件-发起人是否选择
 
 // const { tableId, conditionsConfig1, conditionDrawer } = workFlowStore
 const { setCondition, setConditionsConfig } = workFlowStore
@@ -27,22 +28,19 @@
 }
 const visible = computed({
   get() {
-    console.log('2')
-
     return workFlowStore.conditionDrawer
   },
   set() {
     closeDrawer()
   },
 })
-watch(workFlowStore.conditionsConfig1, (val) => {
+watch(() => workFlowStore.conditionsConfig1, (val, oldVal) => {
   conditionsConfig.value = val.value
   PriorityLevel.value = val.priorityLevel
   conditionConfig.value = val.priorityLevel
     ? conditionsConfig.value.conditionNodes[val.priorityLevel - 1]
     : { nodeUserList: [], conditionList: [] }
 })
-
 const changeOptType = (item) => {
   if (item.optType === 1) {
     item.zdy1 = 2
@@ -78,7 +76,33 @@
 const addCondition = async () => {
   conditionList.value = []
   conditionVisible.value = true
-  const { data } = await getConditions({ tableId: workFlowStore.tableId })
+  // const { data } = await getConditions({ tableId: workFlowStore.tableId })
+  const data = [
+  //   // {
+  //   //   "columnId": "1090",
+  //   //   "showType": "1",
+  //   //   "showName": "预计采购总费用",
+  //   //   "columnName": "planProcurementTotalMoney",
+  //   //   "columnType": "Double",
+  //   //   "fixedDownBoxValue": ""
+  //   // },
+  //   // {
+  //   //   "columnId": "1092",
+  //   //   "showType": "3",
+  //   //   "showName": "采购类型",
+  //   //   "columnName": "procurementType",
+  //   //   "columnType": "String",
+  //   //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
+  //   // },
+  //   // {
+  //   //   "columnId": "1093",
+  //   //   "showType": "1",
+  //   //   "showName": "园区面积",
+  //   //   "columnName": "parkArea",
+  //   //   "columnType": "Double",
+  //   //   "fixedDownBoxValue": ""
+  //   // }
+  ]
   conditions.value = data
   if (conditionConfig.value.conditionList) {
     for (let i = 0; i < conditionConfig.value.conditionList.length; i++) {
@@ -93,6 +117,8 @@
   }
 }
 const sureCondition = () => {
+  console.log('*****')
+  console.log(conditionConfig.value)
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
@@ -147,6 +173,7 @@
   conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
   conditionVisible.value = false
 }
+// 抽屉点击确定
 const saveCondition = () => {
   closeDrawer()
   const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
@@ -154,23 +181,31 @@
   conditionsConfig.value.conditionNodes.map((item, index) => {
     item.priorityLevel = index + 1
   })
+  console.log('conditionsConfig.value', conditionsConfig.value)
   for (let i = 0; i < conditionsConfig.value.conditionNodes.length; i++) {
     conditionsConfig.value.conditionNodes[i].error = $func.conditionStr(conditionsConfig.value, i) === '请设置条件' && i !== conditionsConfig.value.conditionNodes.length - 1
   }
   setConditionsConfig({
     value: conditionsConfig.value,
     flag: true,
-    id: workFlowStore.conditionsConfig1.value.id,
+    id: workFlowStore.conditionsConfig1.id,
   })
 }
+// 添加
 const addConditionRole = () => {
   conditionRoleVisible.value = true
   checkedList.value = conditionConfig.value.nodeUserList
 }
+// 选好角色了
 const sureConditionRole = (data) => {
   conditionConfig.value.nodeUserList = data
   conditionRoleVisible.value = false
 }
+
+// 点击发起人
+const clickfq = (conditionList, param, columnId) => {
+  $func.toChecked(conditionList, param, columnId)
+}
 </script>
 
 <template>
@@ -190,15 +225,36 @@
         <p class="tip">
           当审批单同时满足以下条件时进入此流程
         </p>
+        <el-button
+          type="primary"
+          @click="addCondition"
+        >
+          添加条件
+        </el-button>
+
         <ul>
           <li v-for="(item, index) in conditionConfig.conditionList" :key="index">
+            <!-- <el-button type="primary" @click="addConditionRole">
+              选择成员
+            </el-button> -->
             <span class="ellipsis">{{ item.type === 1 ? '发起人' : item.showName }}：</span>
             <div v-if="item.type === 1">
-              <p :class="conditionConfig.nodeUserList.length > 0 ? 'selected_list' : ''" style="cursor: text;" @click.self="addConditionRole">
+              <!-- <p :class="conditionConfig.nodeUserList.length > 0 ? 'selected_list' : ''" style="cursor: text;" @click.self="addConditionRole">
                 <span v-for="(item1, index1) in conditionConfig.nodeUserList" :key="index1">
                   {{ item1.name }}<img src="@/assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item1, 'targetId')">
                 </span>
                 <input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole">
+              </p> -->
+              <el-input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole" />
+              <p v-if="conditionConfig && conditionConfig.nodeUserList && conditionConfig.nodeUserList.length" class="selected_list">
+                <span v-for="(item, index) in conditionConfig.nodeUserList" :key="index" class="people-box">
+                  {{ item.name }}
+                  <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')"> -->
+                  <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')">
+                    <close />
+                  </el-icon>
+                </span>
+                <a v-if="conditionConfig.nodeUserList && conditionConfig.nodeUserList.length !== 0" @click="conditionConfig.nodeUserList = []">清除</a>
               </p>
             </div>
             <div v-else-if="item.columnType === 'String' && item.showType === 3">
@@ -259,13 +315,14 @@
             <a v-if="item.type === 2" @click="$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
           </li>
         </ul>
-        <el-button type="primary" @click="addCondition">
-          添加条件
-        </el-button>
+
         <el-dialog v-model="conditionVisible" title="选择条件" width="480px" append-to-body custom-class="condition_list">
           <p>请选择用来区分审批流程的条件字段</p>
           <p class="check_box">
-            <a :class="$func.toggleClass(conditionList, { columnId: 0 }, 'columnId') && 'active'" @click="$func.toChecked(conditionList, { columnId: 0 }, 'columnId')">发起人</a>
+            <a
+              :class="$func.toggleClass(conditionList, { columnId: 0 }, 'columnId') && 'active'"
+              @click="clickfq(conditionList, { columnId: 0 }, 'columnId')"
+            >发起人</a>
             <a
               v-for="(item, index) in conditions" :key="index" :class="$func.toggleClass(conditionList, item, 'columnId') && 'active'"
               @click="$func.toChecked(conditionList, item, 'columnId')"
@@ -281,11 +338,23 @@
           </template>
         </el-dialog>
       </div>
-      <employees-role-dialog
+      <!-- <employees-role-dialog
         v-model:visible="conditionRoleVisible"
         v-model:data="checkedList"
         :is-department="true"
         @change="sureConditionRole"
+      /> -->
+      <!-- 角色弹框 -->
+      <!-- <select-role-dialog
+        v-model:visible="approverRoleVisible"
+        v-model:data="checkedRoleList"
+        @change="sureRoleApprover"
+      /> -->
+      <!-- 成员弹框 -->
+      <select-employees-dialog
+        v-model:visible="conditionRoleVisible"
+        v-model:data="checkedList"
+        @change="sureConditionRole"
       />
       <div class="demo-drawer__footer clear">
         <el-button type="primary" @click="saveCondition">
@@ -301,10 +370,19 @@
 
 <style lang="scss">
 .condition_copyer {
+  .people-box {
+    font-size: 12px;
+    margin-right: 10px;
+    padding: 3px 6px 3px 9px;
+    white-space: nowrap;
+    border-radius: 6px;
+    border: 1px solid rgb(220 220 220 / 100%);
+  }
+
   .priority_level {
     position: absolute;
-    top: 11px;
-    right: 30px;
+    top: 16px;
+    right: 70px;
     width: 100px;
     height: 32px;
     background: rgb(255 255 255 / 100%);
@@ -360,15 +438,6 @@
           margin-top: 7px;
         }
 
-        select,
-        input {
-          width: 100%;
-          height: 32px;
-          background: rgb(255 255 255 / 100%);
-          border-radius: 4px;
-          border: 1px solid rgb(217 217 217 / 100%);
-        }
-
         select + input {
           width: 260px;
         }
@@ -413,4 +482,69 @@
     }
   }
 }
+
+.radio_box a,
+.check_box a {
+  font-size: 12px;
+  position: relative;
+  padding-left: 20px;
+  margin-right: 30px;
+  cursor: pointer;
+  color: #333;
+  white-space: pre;
+}
+
+.check_box.not a:hover {
+  color: #333;
+}
+
+.check_box.not a::before,
+.check_box.not a:hover::before {
+  border: none;
+}
+
+.check_box.not.active {
+  background: #f3f3f3;
+}
+
+.radio_box a:hover::before,
+.check_box a:hover::before {
+  border: 1px solid #46a6fe;
+}
+
+.radio_box a::before,
+.check_box a::before {
+  position: absolute;
+  width: 14px;
+  height: 14px;
+  border: 1px solid #dcdfe6;
+  border-radius: 2px;
+  left: 0;
+  top: 1px;
+  content: "";
+}
+
+.radio_box a::before {
+  border-radius: 50%;
+}
+
+.check-dot.active::after,
+.radio_box a.active::after,
+.check_box a.active::after {
+  position: absolute;
+  width: 10px;
+  height: 10px;
+  border-radius: 50%;
+  top: 3px;
+  left: 3px;
+  content: "";
+}
+
+.radio_box a.active::after {
+  background: #46a6fe;
+}
+
+.check_box a.active::after {
+  background: url("@/assets/images/check_box.png") no-repeat center;
+}
 </style>
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index 2bc0ed6..4e10eb0 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -34,7 +34,7 @@
         nodeName: '抄送人',
         type: 2,
         ccSelfSelectFlag: 1,
-        childNode: props.childNodeP,
+        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
         nodeUserList: [],
       }
     }
@@ -52,7 +52,7 @@
         priorityLevel: 1,
         conditionList: [],
         nodeUserList: [],
-        childNode: props.childNodeP,
+        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
       }, {
         nodeName: '条件2',
         type: 3,
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index 3e571a5..a97f752 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -79,17 +79,14 @@
 })
 // 条件
 watch(() => workFlowStore.conditionsConfig1, (val) => {
+  console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
 watch(() => workFlowStore.copyerConfig1, (val) => {
-  console.log(val.flag)
-  console.log(val.id === _uid, val.id, _uid)
   if (val.flag && val.id === _uid) {
-    console.log('监听抄送人')
-
     emits('update:nodeConfig', val.value)
   }
 })
@@ -193,7 +190,7 @@
     //   id: _uid,
     // })
   }
-  else if (type == 1) {
+  else if (type == 1) { // 审批
     const { approverConfig1, approverDrawer } = workFlowStore
     console.log('0000000000000', approverDrawer)
     setApprover(true)
@@ -206,7 +203,7 @@
       id: _uid,
     })
   }
-  else if (type == 2) {
+  else if (type == 2) { // 抄送
     setCopyer(true)
     setCopyerConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
@@ -214,7 +211,7 @@
       id: _uid,
     })
   }
-  else {
+  else { // 条件
     setCondition(true)
     setConditionsConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),

diff --git a/public/conditions.json b/public/conditions.json
index 82eb19d..b7629ed 100644
--- a/public/conditions.json
+++ b/public/conditions.json
@@ -2,29 +2,29 @@
   "code": "200",
   "msg": "操作成功",
   "data": [
-    {
-      "columnId": "1090",
-      "showType": "1",
-      "showName": "预计采购总费用",
-      "columnName": "planProcurementTotalMoney",
-      "columnType": "Double",
-      "fixedDownBoxValue": ""
-    },
-    {
-      "columnId": "1092",
-      "showType": "3",
-      "showName": "采购类型",
-      "columnName": "procurementType",
-      "columnType": "String",
-      "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
-    },
-    {
-      "columnId": "1093",
-      "showType": "1",
-      "showName": "园区面积",
-      "columnName": "parkArea",
-      "columnType": "Double",
-      "fixedDownBoxValue": ""
-    }
+    // {
+    //   "columnId": "1090",
+    //   "showType": "1",
+    //   "showName": "预计采购总费用",
+    //   "columnName": "planProcurementTotalMoney",
+    //   "columnType": "Double",
+    //   "fixedDownBoxValue": ""
+    // },
+    // {
+    //   "columnId": "1092",
+    //   "showType": "3",
+    //   "showName": "采购类型",
+    //   "columnName": "procurementType",
+    //   "columnType": "String",
+    //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
+    // },
+    // {
+    //   "columnId": "1093",
+    //   "showType": "1",
+    //   "showName": "园区面积",
+    //   "columnName": "parkArea",
+    //   "columnType": "Double",
+    //   "fixedDownBoxValue": ""
+    // }
   ]
-}
\ No newline at end of file
+}
diff --git a/src/assets/images/check_box.png b/src/assets/images/check_box.png
new file mode 100644
index 0000000..fb89fe2
--- /dev/null
+++ b/src/assets/images/check_box.png
Binary files differ
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index d76462c..38881f4 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -14,6 +14,11 @@
     type: Array,
     default: () => [],
   },
+  // 是否允许多选
+  isMulti: {
+    type: Boolean,
+    default: true,
+  },
 })
 
 const emits = defineEmits(['update:visible', 'change'])
@@ -101,6 +106,16 @@
 function search() {
   fetchRoleData()
 }
+// 多选框单选功能
+const selectClick = (selection: any, row: any) => {
+  if (!props.isMulti) {
+    console.log('selectClick')
+    if (selection.length > 1) {
+      const del_row = selection.shift()
+      table.value?.toggleRowSelection(del_row, false) // 用于多选表格，切换某一行的选中状态，如果使用了第二个参数，则是设置这一行选中与否（selected 为 true 则选中）
+    }
+  }
+}
 onMounted(() => {
   search()
 })
@@ -115,7 +130,18 @@
             <el-input v-model="listQuery.keyword" placeholder="角色名称" />
           </search-item>
         </search-area>
-        <el-table ref="table" v-loading="loading" show-overflow-tooltip :data="roleList" row-key="id" :border="false" style="width: 100%;" :tree-props="{ children: 'children' }" @selection-change="handleSelectionChange">
+        <el-table
+          ref="table"
+          v-loading="loading"
+          show-overflow-tooltip
+          :data="roleList"
+          row-key="id"
+          :border="false"
+          style="width: 100%;"
+          :tree-props="{ children: 'children' }"
+          @selection-change="handleSelectionChange"
+          @select="selectClick"
+        >
           <el-table-column type="selection" width="55" />
           <el-table-column
             v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align"
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index f9273ee..0f8d5c0 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -319,7 +319,7 @@
         <span v-for="(item, index) in approverConfig.nodeUserList" :key="index" class="people-box">
           {{ item.name }}
           <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')"> -->
-          <el-icon style="vertical-align: middle;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
+          <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
             <close />
           </el-icon>
         </span>
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index bc3d84e..57c3a92 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,12 +1,12 @@
 <!-- 条件设置 -->
 <script setup>
-import { computed, ref, watch } from 'vue'
+import { computed, nextTick, onMounted, ref, watch } from 'vue'
 import employeesRoleDialog from '../dialog/employeesRoleDialog.vue'
 import $func from '@/plugins/preload'
 // import { mapMutations, mapState } from '@/plugins/lib.js'
 import useWorkFlowStore from '@/store/modules/workFlow'
-
 import { getConditions } from '@/plugins/api.js'
+
 const workFlowStore = useWorkFlowStore()
 const conditionVisible = ref(false)
 const conditionsConfig = ref({
@@ -18,6 +18,7 @@
 const conditionList = ref([])
 const checkedList = ref([])
 const conditionRoleVisible = ref(false)
+const checkedfqr = ref(true) // 条件-发起人是否选择
 
 // const { tableId, conditionsConfig1, conditionDrawer } = workFlowStore
 const { setCondition, setConditionsConfig } = workFlowStore
@@ -27,22 +28,19 @@
 }
 const visible = computed({
   get() {
-    console.log('2')
-
     return workFlowStore.conditionDrawer
   },
   set() {
     closeDrawer()
   },
 })
-watch(workFlowStore.conditionsConfig1, (val) => {
+watch(() => workFlowStore.conditionsConfig1, (val, oldVal) => {
   conditionsConfig.value = val.value
   PriorityLevel.value = val.priorityLevel
   conditionConfig.value = val.priorityLevel
     ? conditionsConfig.value.conditionNodes[val.priorityLevel - 1]
     : { nodeUserList: [], conditionList: [] }
 })
-
 const changeOptType = (item) => {
   if (item.optType === 1) {
     item.zdy1 = 2
@@ -78,7 +76,33 @@
 const addCondition = async () => {
   conditionList.value = []
   conditionVisible.value = true
-  const { data } = await getConditions({ tableId: workFlowStore.tableId })
+  // const { data } = await getConditions({ tableId: workFlowStore.tableId })
+  const data = [
+  //   // {
+  //   //   "columnId": "1090",
+  //   //   "showType": "1",
+  //   //   "showName": "预计采购总费用",
+  //   //   "columnName": "planProcurementTotalMoney",
+  //   //   "columnType": "Double",
+  //   //   "fixedDownBoxValue": ""
+  //   // },
+  //   // {
+  //   //   "columnId": "1092",
+  //   //   "showType": "3",
+  //   //   "showName": "采购类型",
+  //   //   "columnName": "procurementType",
+  //   //   "columnType": "String",
+  //   //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
+  //   // },
+  //   // {
+  //   //   "columnId": "1093",
+  //   //   "showType": "1",
+  //   //   "showName": "园区面积",
+  //   //   "columnName": "parkArea",
+  //   //   "columnType": "Double",
+  //   //   "fixedDownBoxValue": ""
+  //   // }
+  ]
   conditions.value = data
   if (conditionConfig.value.conditionList) {
     for (let i = 0; i < conditionConfig.value.conditionList.length; i++) {
@@ -93,6 +117,8 @@
   }
 }
 const sureCondition = () => {
+  console.log('*****')
+  console.log(conditionConfig.value)
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
@@ -147,6 +173,7 @@
   conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
   conditionVisible.value = false
 }
+// 抽屉点击确定
 const saveCondition = () => {
   closeDrawer()
   const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
@@ -154,23 +181,31 @@
   conditionsConfig.value.conditionNodes.map((item, index) => {
     item.priorityLevel = index + 1
   })
+  console.log('conditionsConfig.value', conditionsConfig.value)
   for (let i = 0; i < conditionsConfig.value.conditionNodes.length; i++) {
     conditionsConfig.value.conditionNodes[i].error = $func.conditionStr(conditionsConfig.value, i) === '请设置条件' && i !== conditionsConfig.value.conditionNodes.length - 1
   }
   setConditionsConfig({
     value: conditionsConfig.value,
     flag: true,
-    id: workFlowStore.conditionsConfig1.value.id,
+    id: workFlowStore.conditionsConfig1.id,
   })
 }
+// 添加
 const addConditionRole = () => {
   conditionRoleVisible.value = true
   checkedList.value = conditionConfig.value.nodeUserList
 }
+// 选好角色了
 const sureConditionRole = (data) => {
   conditionConfig.value.nodeUserList = data
   conditionRoleVisible.value = false
 }
+
+// 点击发起人
+const clickfq = (conditionList, param, columnId) => {
+  $func.toChecked(conditionList, param, columnId)
+}
 </script>
 
 <template>
@@ -190,15 +225,36 @@
         <p class="tip">
           当审批单同时满足以下条件时进入此流程
         </p>
+        <el-button
+          type="primary"
+          @click="addCondition"
+        >
+          添加条件
+        </el-button>
+
         <ul>
           <li v-for="(item, index) in conditionConfig.conditionList" :key="index">
+            <!-- <el-button type="primary" @click="addConditionRole">
+              选择成员
+            </el-button> -->
             <span class="ellipsis">{{ item.type === 1 ? '发起人' : item.showName }}：</span>
             <div v-if="item.type === 1">
-              <p :class="conditionConfig.nodeUserList.length > 0 ? 'selected_list' : ''" style="cursor: text;" @click.self="addConditionRole">
+              <!-- <p :class="conditionConfig.nodeUserList.length > 0 ? 'selected_list' : ''" style="cursor: text;" @click.self="addConditionRole">
                 <span v-for="(item1, index1) in conditionConfig.nodeUserList" :key="index1">
                   {{ item1.name }}<img src="@/assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item1, 'targetId')">
                 </span>
                 <input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole">
+              </p> -->
+              <el-input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole" />
+              <p v-if="conditionConfig && conditionConfig.nodeUserList && conditionConfig.nodeUserList.length" class="selected_list">
+                <span v-for="(item, index) in conditionConfig.nodeUserList" :key="index" class="people-box">
+                  {{ item.name }}
+                  <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')"> -->
+                  <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')">
+                    <close />
+                  </el-icon>
+                </span>
+                <a v-if="conditionConfig.nodeUserList && conditionConfig.nodeUserList.length !== 0" @click="conditionConfig.nodeUserList = []">清除</a>
               </p>
             </div>
             <div v-else-if="item.columnType === 'String' && item.showType === 3">
@@ -259,13 +315,14 @@
             <a v-if="item.type === 2" @click="$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
           </li>
         </ul>
-        <el-button type="primary" @click="addCondition">
-          添加条件
-        </el-button>
+
         <el-dialog v-model="conditionVisible" title="选择条件" width="480px" append-to-body custom-class="condition_list">
           <p>请选择用来区分审批流程的条件字段</p>
           <p class="check_box">
-            <a :class="$func.toggleClass(conditionList, { columnId: 0 }, 'columnId') && 'active'" @click="$func.toChecked(conditionList, { columnId: 0 }, 'columnId')">发起人</a>
+            <a
+              :class="$func.toggleClass(conditionList, { columnId: 0 }, 'columnId') && 'active'"
+              @click="clickfq(conditionList, { columnId: 0 }, 'columnId')"
+            >发起人</a>
             <a
               v-for="(item, index) in conditions" :key="index" :class="$func.toggleClass(conditionList, item, 'columnId') && 'active'"
               @click="$func.toChecked(conditionList, item, 'columnId')"
@@ -281,11 +338,23 @@
           </template>
         </el-dialog>
       </div>
-      <employees-role-dialog
+      <!-- <employees-role-dialog
         v-model:visible="conditionRoleVisible"
         v-model:data="checkedList"
         :is-department="true"
         @change="sureConditionRole"
+      /> -->
+      <!-- 角色弹框 -->
+      <!-- <select-role-dialog
+        v-model:visible="approverRoleVisible"
+        v-model:data="checkedRoleList"
+        @change="sureRoleApprover"
+      /> -->
+      <!-- 成员弹框 -->
+      <select-employees-dialog
+        v-model:visible="conditionRoleVisible"
+        v-model:data="checkedList"
+        @change="sureConditionRole"
       />
       <div class="demo-drawer__footer clear">
         <el-button type="primary" @click="saveCondition">
@@ -301,10 +370,19 @@
 
 <style lang="scss">
 .condition_copyer {
+  .people-box {
+    font-size: 12px;
+    margin-right: 10px;
+    padding: 3px 6px 3px 9px;
+    white-space: nowrap;
+    border-radius: 6px;
+    border: 1px solid rgb(220 220 220 / 100%);
+  }
+
   .priority_level {
     position: absolute;
-    top: 11px;
-    right: 30px;
+    top: 16px;
+    right: 70px;
     width: 100px;
     height: 32px;
     background: rgb(255 255 255 / 100%);
@@ -360,15 +438,6 @@
           margin-top: 7px;
         }
 
-        select,
-        input {
-          width: 100%;
-          height: 32px;
-          background: rgb(255 255 255 / 100%);
-          border-radius: 4px;
-          border: 1px solid rgb(217 217 217 / 100%);
-        }
-
         select + input {
           width: 260px;
         }
@@ -413,4 +482,69 @@
     }
   }
 }
+
+.radio_box a,
+.check_box a {
+  font-size: 12px;
+  position: relative;
+  padding-left: 20px;
+  margin-right: 30px;
+  cursor: pointer;
+  color: #333;
+  white-space: pre;
+}
+
+.check_box.not a:hover {
+  color: #333;
+}
+
+.check_box.not a::before,
+.check_box.not a:hover::before {
+  border: none;
+}
+
+.check_box.not.active {
+  background: #f3f3f3;
+}
+
+.radio_box a:hover::before,
+.check_box a:hover::before {
+  border: 1px solid #46a6fe;
+}
+
+.radio_box a::before,
+.check_box a::before {
+  position: absolute;
+  width: 14px;
+  height: 14px;
+  border: 1px solid #dcdfe6;
+  border-radius: 2px;
+  left: 0;
+  top: 1px;
+  content: "";
+}
+
+.radio_box a::before {
+  border-radius: 50%;
+}
+
+.check-dot.active::after,
+.radio_box a.active::after,
+.check_box a.active::after {
+  position: absolute;
+  width: 10px;
+  height: 10px;
+  border-radius: 50%;
+  top: 3px;
+  left: 3px;
+  content: "";
+}
+
+.radio_box a.active::after {
+  background: #46a6fe;
+}
+
+.check_box a.active::after {
+  background: url("@/assets/images/check_box.png") no-repeat center;
+}
 </style>
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index 2bc0ed6..4e10eb0 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -34,7 +34,7 @@
         nodeName: '抄送人',
         type: 2,
         ccSelfSelectFlag: 1,
-        childNode: props.childNodeP,
+        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
         nodeUserList: [],
       }
     }
@@ -52,7 +52,7 @@
         priorityLevel: 1,
         conditionList: [],
         nodeUserList: [],
-        childNode: props.childNodeP,
+        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
       }, {
         nodeName: '条件2',
         type: 3,
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index 3e571a5..a97f752 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -79,17 +79,14 @@
 })
 // 条件
 watch(() => workFlowStore.conditionsConfig1, (val) => {
+  console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
 watch(() => workFlowStore.copyerConfig1, (val) => {
-  console.log(val.flag)
-  console.log(val.id === _uid, val.id, _uid)
   if (val.flag && val.id === _uid) {
-    console.log('监听抄送人')
-
     emits('update:nodeConfig', val.value)
   }
 })
@@ -193,7 +190,7 @@
     //   id: _uid,
     // })
   }
-  else if (type == 1) {
+  else if (type == 1) { // 审批
     const { approverConfig1, approverDrawer } = workFlowStore
     console.log('0000000000000', approverDrawer)
     setApprover(true)
@@ -206,7 +203,7 @@
       id: _uid,
     })
   }
-  else if (type == 2) {
+  else if (type == 2) { // 抄送
     setCopyer(true)
     setCopyerConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
@@ -214,7 +211,7 @@
       id: _uid,
     })
   }
-  else {
+  else { // 条件
     setCondition(true)
     setConditionsConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
diff --git a/src/plugins/preload.js b/src/plugins/preload.js
index 09288a9..10a66e2 100644
--- a/src/plugins/preload.js
+++ b/src/plugins/preload.js
@@ -37,7 +37,7 @@
       document.cookie = `${name[i]}=''; path=/; expires=${myDate.toGMTString()}`
     }
   },
-  // 讲负责人的姓名挑出来做成字符串
+  // 将负责人的姓名挑出来做成字符串
   arrToStr(arr) {
     if (arr) {
       return arr.map((item) => { return item.name }).toString()
@@ -47,6 +47,7 @@
     return arr.some((item) => { return item[key] == elem[key] })
   },
   toChecked(arr, elem, key = 'id') {
+    console.log('toChecked')
     var isIncludes = this.toggleClass(arr, elem, key)
     !isIncludes ? arr.push(elem) : this.removeEle(arr, elem, key)
   },
@@ -85,52 +86,6 @@
       }
       return strPeople
     }
-    // if (nodeConfig.settype == 1) {
-    //   if (nodeConfig.nodeUserList.length == 1) {
-    //     return nodeConfig.nodeUserList[0].name
-    //   }
-    //   else if (nodeConfig.nodeUserList.length > 1) {
-    //     if (nodeConfig.examineMode == 1) {
-    //       return this.arrToStr(nodeConfig.nodeUserList)
-    //     }
-    //     else if (nodeConfig.examineMode == 2) {
-    //       return `${nodeConfig.nodeUserList.length}人会签`
-    //     }
-    //   }
-    // }
-    // else if (nodeConfig.settype == 2) {
-    //   const level = nodeConfig.directorLevel == 1 ? '直接主管' : `第${nodeConfig.directorLevel}级主管`
-    //   if (nodeConfig.examineMode == 1) {
-    //     return level
-    //   }
-    //   else if (nodeConfig.examineMode == 2) {
-    //     return `${level}会签`
-    //   }
-    // }
-    // else if (nodeConfig.settype == 4) {
-    //   if (nodeConfig.selectRange == 1) {
-    //     return '发起人自选'
-    //   }
-    //   else {
-    //     if (nodeConfig.nodeUserList.length > 0) {
-    //       if (nodeConfig.selectRange == 2) {
-    //         return '发起人自选'
-    //       }
-    //       else {
-    //         return `发起人从${nodeConfig.nodeUserList[0].name}中自选`
-    //       }
-    //     }
-    //     else {
-    //       return ''
-    //     }
-    //   }
-    // }
-    // else if (nodeConfig.settype == 5) {
-    //   return '发起人自己'
-    // }
-    // else if (nodeConfig.settype == 7) {
-    //   return `从直接主管到通讯录中级别最高的第${nodeConfig.examineEndDirectorLevel}个层级主管`
-    // }
   },
   dealStr(str, obj) {
     const arr = []
@@ -144,6 +99,7 @@
     }
     return arr.join('或')
   },
+  // 设置条件节点的文字
   conditionStr(nodeConfig, index) {
     var { conditionList, nodeUserList } = nodeConfig.conditionNodes[index]
     if (conditionList.length == 0) {
@@ -152,29 +108,16 @@
     else {
       let str = ''
       for (var i = 0; i < conditionList.length; i++) {
-        var { columnId, columnType, showType, showName, optType, zdy1, opt1, zdy2, opt2, fixedDownBoxValue } = conditionList[i]
+        var { columnId } = conditionList[i]
         if (columnId == 0) {
           if (nodeUserList.length != 0) {
             str += '发起人属于：'
-            str += `${nodeUserList.map((item) => { return item.name }).join('或')} 并且 `
-          }
-        }
-        if (columnType == 'String' && showType == '3') {
-          if (zdy1) {
-            str += `${showName}属于：${this.dealStr(zdy1, JSON.parse(fixedDownBoxValue))} 并且 `
-          }
-        }
-        if (columnType == 'Double') {
-          if (optType != 6 && zdy1) {
-            var optTypeStr = ['', '<', '>', '≤', '=', '≥'][optType]
-            str += `${showName} ${optTypeStr} ${zdy1} 并且 `
-          }
-          else if (optType == 6 && zdy1 && zdy2) {
-            str += `${zdy1} ${opt1} ${showName} ${opt2} ${zdy2} 并且 `
+            str += `${nodeUserList.map((item) => { return item.name }).join('、')} `
           }
         }
       }
-      return str ? str.substring(0, str.length - 4) : '请设置条件'
+      // return str ? str.substring(0, str.length - 4) : '请设置条件'
+      return str || '请设置条件'
     }
   },
   // 设置抄送人节点文字

diff --git a/public/conditions.json b/public/conditions.json
index 82eb19d..b7629ed 100644
--- a/public/conditions.json
+++ b/public/conditions.json
@@ -2,29 +2,29 @@
   "code": "200",
   "msg": "操作成功",
   "data": [
-    {
-      "columnId": "1090",
-      "showType": "1",
-      "showName": "预计采购总费用",
-      "columnName": "planProcurementTotalMoney",
-      "columnType": "Double",
-      "fixedDownBoxValue": ""
-    },
-    {
-      "columnId": "1092",
-      "showType": "3",
-      "showName": "采购类型",
-      "columnName": "procurementType",
-      "columnType": "String",
-      "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
-    },
-    {
-      "columnId": "1093",
-      "showType": "1",
-      "showName": "园区面积",
-      "columnName": "parkArea",
-      "columnType": "Double",
-      "fixedDownBoxValue": ""
-    }
+    // {
+    //   "columnId": "1090",
+    //   "showType": "1",
+    //   "showName": "预计采购总费用",
+    //   "columnName": "planProcurementTotalMoney",
+    //   "columnType": "Double",
+    //   "fixedDownBoxValue": ""
+    // },
+    // {
+    //   "columnId": "1092",
+    //   "showType": "3",
+    //   "showName": "采购类型",
+    //   "columnName": "procurementType",
+    //   "columnType": "String",
+    //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
+    // },
+    // {
+    //   "columnId": "1093",
+    //   "showType": "1",
+    //   "showName": "园区面积",
+    //   "columnName": "parkArea",
+    //   "columnType": "Double",
+    //   "fixedDownBoxValue": ""
+    // }
   ]
-}
\ No newline at end of file
+}
diff --git a/src/assets/images/check_box.png b/src/assets/images/check_box.png
new file mode 100644
index 0000000..fb89fe2
--- /dev/null
+++ b/src/assets/images/check_box.png
Binary files differ
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index d76462c..38881f4 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -14,6 +14,11 @@
     type: Array,
     default: () => [],
   },
+  // 是否允许多选
+  isMulti: {
+    type: Boolean,
+    default: true,
+  },
 })
 
 const emits = defineEmits(['update:visible', 'change'])
@@ -101,6 +106,16 @@
 function search() {
   fetchRoleData()
 }
+// 多选框单选功能
+const selectClick = (selection: any, row: any) => {
+  if (!props.isMulti) {
+    console.log('selectClick')
+    if (selection.length > 1) {
+      const del_row = selection.shift()
+      table.value?.toggleRowSelection(del_row, false) // 用于多选表格，切换某一行的选中状态，如果使用了第二个参数，则是设置这一行选中与否（selected 为 true 则选中）
+    }
+  }
+}
 onMounted(() => {
   search()
 })
@@ -115,7 +130,18 @@
             <el-input v-model="listQuery.keyword" placeholder="角色名称" />
           </search-item>
         </search-area>
-        <el-table ref="table" v-loading="loading" show-overflow-tooltip :data="roleList" row-key="id" :border="false" style="width: 100%;" :tree-props="{ children: 'children' }" @selection-change="handleSelectionChange">
+        <el-table
+          ref="table"
+          v-loading="loading"
+          show-overflow-tooltip
+          :data="roleList"
+          row-key="id"
+          :border="false"
+          style="width: 100%;"
+          :tree-props="{ children: 'children' }"
+          @selection-change="handleSelectionChange"
+          @select="selectClick"
+        >
           <el-table-column type="selection" width="55" />
           <el-table-column
             v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align"
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index f9273ee..0f8d5c0 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -319,7 +319,7 @@
         <span v-for="(item, index) in approverConfig.nodeUserList" :key="index" class="people-box">
           {{ item.name }}
           <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')"> -->
-          <el-icon style="vertical-align: middle;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
+          <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
             <close />
           </el-icon>
         </span>
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index bc3d84e..57c3a92 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,12 +1,12 @@
 <!-- 条件设置 -->
 <script setup>
-import { computed, ref, watch } from 'vue'
+import { computed, nextTick, onMounted, ref, watch } from 'vue'
 import employeesRoleDialog from '../dialog/employeesRoleDialog.vue'
 import $func from '@/plugins/preload'
 // import { mapMutations, mapState } from '@/plugins/lib.js'
 import useWorkFlowStore from '@/store/modules/workFlow'
-
 import { getConditions } from '@/plugins/api.js'
+
 const workFlowStore = useWorkFlowStore()
 const conditionVisible = ref(false)
 const conditionsConfig = ref({
@@ -18,6 +18,7 @@
 const conditionList = ref([])
 const checkedList = ref([])
 const conditionRoleVisible = ref(false)
+const checkedfqr = ref(true) // 条件-发起人是否选择
 
 // const { tableId, conditionsConfig1, conditionDrawer } = workFlowStore
 const { setCondition, setConditionsConfig } = workFlowStore
@@ -27,22 +28,19 @@
 }
 const visible = computed({
   get() {
-    console.log('2')
-
     return workFlowStore.conditionDrawer
   },
   set() {
     closeDrawer()
   },
 })
-watch(workFlowStore.conditionsConfig1, (val) => {
+watch(() => workFlowStore.conditionsConfig1, (val, oldVal) => {
   conditionsConfig.value = val.value
   PriorityLevel.value = val.priorityLevel
   conditionConfig.value = val.priorityLevel
     ? conditionsConfig.value.conditionNodes[val.priorityLevel - 1]
     : { nodeUserList: [], conditionList: [] }
 })
-
 const changeOptType = (item) => {
   if (item.optType === 1) {
     item.zdy1 = 2
@@ -78,7 +76,33 @@
 const addCondition = async () => {
   conditionList.value = []
   conditionVisible.value = true
-  const { data } = await getConditions({ tableId: workFlowStore.tableId })
+  // const { data } = await getConditions({ tableId: workFlowStore.tableId })
+  const data = [
+  //   // {
+  //   //   "columnId": "1090",
+  //   //   "showType": "1",
+  //   //   "showName": "预计采购总费用",
+  //   //   "columnName": "planProcurementTotalMoney",
+  //   //   "columnType": "Double",
+  //   //   "fixedDownBoxValue": ""
+  //   // },
+  //   // {
+  //   //   "columnId": "1092",
+  //   //   "showType": "3",
+  //   //   "showName": "采购类型",
+  //   //   "columnName": "procurementType",
+  //   //   "columnType": "String",
+  //   //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
+  //   // },
+  //   // {
+  //   //   "columnId": "1093",
+  //   //   "showType": "1",
+  //   //   "showName": "园区面积",
+  //   //   "columnName": "parkArea",
+  //   //   "columnType": "Double",
+  //   //   "fixedDownBoxValue": ""
+  //   // }
+  ]
   conditions.value = data
   if (conditionConfig.value.conditionList) {
     for (let i = 0; i < conditionConfig.value.conditionList.length; i++) {
@@ -93,6 +117,8 @@
   }
 }
 const sureCondition = () => {
+  console.log('*****')
+  console.log(conditionConfig.value)
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
@@ -147,6 +173,7 @@
   conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
   conditionVisible.value = false
 }
+// 抽屉点击确定
 const saveCondition = () => {
   closeDrawer()
   const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
@@ -154,23 +181,31 @@
   conditionsConfig.value.conditionNodes.map((item, index) => {
     item.priorityLevel = index + 1
   })
+  console.log('conditionsConfig.value', conditionsConfig.value)
   for (let i = 0; i < conditionsConfig.value.conditionNodes.length; i++) {
     conditionsConfig.value.conditionNodes[i].error = $func.conditionStr(conditionsConfig.value, i) === '请设置条件' && i !== conditionsConfig.value.conditionNodes.length - 1
   }
   setConditionsConfig({
     value: conditionsConfig.value,
     flag: true,
-    id: workFlowStore.conditionsConfig1.value.id,
+    id: workFlowStore.conditionsConfig1.id,
   })
 }
+// 添加
 const addConditionRole = () => {
   conditionRoleVisible.value = true
   checkedList.value = conditionConfig.value.nodeUserList
 }
+// 选好角色了
 const sureConditionRole = (data) => {
   conditionConfig.value.nodeUserList = data
   conditionRoleVisible.value = false
 }
+
+// 点击发起人
+const clickfq = (conditionList, param, columnId) => {
+  $func.toChecked(conditionList, param, columnId)
+}
 </script>
 
 <template>
@@ -190,15 +225,36 @@
         <p class="tip">
           当审批单同时满足以下条件时进入此流程
         </p>
+        <el-button
+          type="primary"
+          @click="addCondition"
+        >
+          添加条件
+        </el-button>
+
         <ul>
           <li v-for="(item, index) in conditionConfig.conditionList" :key="index">
+            <!-- <el-button type="primary" @click="addConditionRole">
+              选择成员
+            </el-button> -->
             <span class="ellipsis">{{ item.type === 1 ? '发起人' : item.showName }}：</span>
             <div v-if="item.type === 1">
-              <p :class="conditionConfig.nodeUserList.length > 0 ? 'selected_list' : ''" style="cursor: text;" @click.self="addConditionRole">
+              <!-- <p :class="conditionConfig.nodeUserList.length > 0 ? 'selected_list' : ''" style="cursor: text;" @click.self="addConditionRole">
                 <span v-for="(item1, index1) in conditionConfig.nodeUserList" :key="index1">
                   {{ item1.name }}<img src="@/assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item1, 'targetId')">
                 </span>
                 <input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole">
+              </p> -->
+              <el-input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole" />
+              <p v-if="conditionConfig && conditionConfig.nodeUserList && conditionConfig.nodeUserList.length" class="selected_list">
+                <span v-for="(item, index) in conditionConfig.nodeUserList" :key="index" class="people-box">
+                  {{ item.name }}
+                  <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')"> -->
+                  <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')">
+                    <close />
+                  </el-icon>
+                </span>
+                <a v-if="conditionConfig.nodeUserList && conditionConfig.nodeUserList.length !== 0" @click="conditionConfig.nodeUserList = []">清除</a>
               </p>
             </div>
             <div v-else-if="item.columnType === 'String' && item.showType === 3">
@@ -259,13 +315,14 @@
             <a v-if="item.type === 2" @click="$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
           </li>
         </ul>
-        <el-button type="primary" @click="addCondition">
-          添加条件
-        </el-button>
+
         <el-dialog v-model="conditionVisible" title="选择条件" width="480px" append-to-body custom-class="condition_list">
           <p>请选择用来区分审批流程的条件字段</p>
           <p class="check_box">
-            <a :class="$func.toggleClass(conditionList, { columnId: 0 }, 'columnId') && 'active'" @click="$func.toChecked(conditionList, { columnId: 0 }, 'columnId')">发起人</a>
+            <a
+              :class="$func.toggleClass(conditionList, { columnId: 0 }, 'columnId') && 'active'"
+              @click="clickfq(conditionList, { columnId: 0 }, 'columnId')"
+            >发起人</a>
             <a
               v-for="(item, index) in conditions" :key="index" :class="$func.toggleClass(conditionList, item, 'columnId') && 'active'"
               @click="$func.toChecked(conditionList, item, 'columnId')"
@@ -281,11 +338,23 @@
           </template>
         </el-dialog>
       </div>
-      <employees-role-dialog
+      <!-- <employees-role-dialog
         v-model:visible="conditionRoleVisible"
         v-model:data="checkedList"
         :is-department="true"
         @change="sureConditionRole"
+      /> -->
+      <!-- 角色弹框 -->
+      <!-- <select-role-dialog
+        v-model:visible="approverRoleVisible"
+        v-model:data="checkedRoleList"
+        @change="sureRoleApprover"
+      /> -->
+      <!-- 成员弹框 -->
+      <select-employees-dialog
+        v-model:visible="conditionRoleVisible"
+        v-model:data="checkedList"
+        @change="sureConditionRole"
       />
       <div class="demo-drawer__footer clear">
         <el-button type="primary" @click="saveCondition">
@@ -301,10 +370,19 @@
 
 <style lang="scss">
 .condition_copyer {
+  .people-box {
+    font-size: 12px;
+    margin-right: 10px;
+    padding: 3px 6px 3px 9px;
+    white-space: nowrap;
+    border-radius: 6px;
+    border: 1px solid rgb(220 220 220 / 100%);
+  }
+
   .priority_level {
     position: absolute;
-    top: 11px;
-    right: 30px;
+    top: 16px;
+    right: 70px;
     width: 100px;
     height: 32px;
     background: rgb(255 255 255 / 100%);
@@ -360,15 +438,6 @@
           margin-top: 7px;
         }
 
-        select,
-        input {
-          width: 100%;
-          height: 32px;
-          background: rgb(255 255 255 / 100%);
-          border-radius: 4px;
-          border: 1px solid rgb(217 217 217 / 100%);
-        }
-
         select + input {
           width: 260px;
         }
@@ -413,4 +482,69 @@
     }
   }
 }
+
+.radio_box a,
+.check_box a {
+  font-size: 12px;
+  position: relative;
+  padding-left: 20px;
+  margin-right: 30px;
+  cursor: pointer;
+  color: #333;
+  white-space: pre;
+}
+
+.check_box.not a:hover {
+  color: #333;
+}
+
+.check_box.not a::before,
+.check_box.not a:hover::before {
+  border: none;
+}
+
+.check_box.not.active {
+  background: #f3f3f3;
+}
+
+.radio_box a:hover::before,
+.check_box a:hover::before {
+  border: 1px solid #46a6fe;
+}
+
+.radio_box a::before,
+.check_box a::before {
+  position: absolute;
+  width: 14px;
+  height: 14px;
+  border: 1px solid #dcdfe6;
+  border-radius: 2px;
+  left: 0;
+  top: 1px;
+  content: "";
+}
+
+.radio_box a::before {
+  border-radius: 50%;
+}
+
+.check-dot.active::after,
+.radio_box a.active::after,
+.check_box a.active::after {
+  position: absolute;
+  width: 10px;
+  height: 10px;
+  border-radius: 50%;
+  top: 3px;
+  left: 3px;
+  content: "";
+}
+
+.radio_box a.active::after {
+  background: #46a6fe;
+}
+
+.check_box a.active::after {
+  background: url("@/assets/images/check_box.png") no-repeat center;
+}
 </style>
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index 2bc0ed6..4e10eb0 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -34,7 +34,7 @@
         nodeName: '抄送人',
         type: 2,
         ccSelfSelectFlag: 1,
-        childNode: props.childNodeP,
+        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
         nodeUserList: [],
       }
     }
@@ -52,7 +52,7 @@
         priorityLevel: 1,
         conditionList: [],
         nodeUserList: [],
-        childNode: props.childNodeP,
+        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
       }, {
         nodeName: '条件2',
         type: 3,
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index 3e571a5..a97f752 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -79,17 +79,14 @@
 })
 // 条件
 watch(() => workFlowStore.conditionsConfig1, (val) => {
+  console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
 watch(() => workFlowStore.copyerConfig1, (val) => {
-  console.log(val.flag)
-  console.log(val.id === _uid, val.id, _uid)
   if (val.flag && val.id === _uid) {
-    console.log('监听抄送人')
-
     emits('update:nodeConfig', val.value)
   }
 })
@@ -193,7 +190,7 @@
     //   id: _uid,
     // })
   }
-  else if (type == 1) {
+  else if (type == 1) { // 审批
     const { approverConfig1, approverDrawer } = workFlowStore
     console.log('0000000000000', approverDrawer)
     setApprover(true)
@@ -206,7 +203,7 @@
       id: _uid,
     })
   }
-  else if (type == 2) {
+  else if (type == 2) { // 抄送
     setCopyer(true)
     setCopyerConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
@@ -214,7 +211,7 @@
       id: _uid,
     })
   }
-  else {
+  else { // 条件
     setCondition(true)
     setConditionsConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
diff --git a/src/plugins/preload.js b/src/plugins/preload.js
index 09288a9..10a66e2 100644
--- a/src/plugins/preload.js
+++ b/src/plugins/preload.js
@@ -37,7 +37,7 @@
       document.cookie = `${name[i]}=''; path=/; expires=${myDate.toGMTString()}`
     }
   },
-  // 讲负责人的姓名挑出来做成字符串
+  // 将负责人的姓名挑出来做成字符串
   arrToStr(arr) {
     if (arr) {
       return arr.map((item) => { return item.name }).toString()
@@ -47,6 +47,7 @@
     return arr.some((item) => { return item[key] == elem[key] })
   },
   toChecked(arr, elem, key = 'id') {
+    console.log('toChecked')
     var isIncludes = this.toggleClass(arr, elem, key)
     !isIncludes ? arr.push(elem) : this.removeEle(arr, elem, key)
   },
@@ -85,52 +86,6 @@
       }
       return strPeople
     }
-    // if (nodeConfig.settype == 1) {
-    //   if (nodeConfig.nodeUserList.length == 1) {
-    //     return nodeConfig.nodeUserList[0].name
-    //   }
-    //   else if (nodeConfig.nodeUserList.length > 1) {
-    //     if (nodeConfig.examineMode == 1) {
-    //       return this.arrToStr(nodeConfig.nodeUserList)
-    //     }
-    //     else if (nodeConfig.examineMode == 2) {
-    //       return `${nodeConfig.nodeUserList.length}人会签`
-    //     }
-    //   }
-    // }
-    // else if (nodeConfig.settype == 2) {
-    //   const level = nodeConfig.directorLevel == 1 ? '直接主管' : `第${nodeConfig.directorLevel}级主管`
-    //   if (nodeConfig.examineMode == 1) {
-    //     return level
-    //   }
-    //   else if (nodeConfig.examineMode == 2) {
-    //     return `${level}会签`
-    //   }
-    // }
-    // else if (nodeConfig.settype == 4) {
-    //   if (nodeConfig.selectRange == 1) {
-    //     return '发起人自选'
-    //   }
-    //   else {
-    //     if (nodeConfig.nodeUserList.length > 0) {
-    //       if (nodeConfig.selectRange == 2) {
-    //         return '发起人自选'
-    //       }
-    //       else {
-    //         return `发起人从${nodeConfig.nodeUserList[0].name}中自选`
-    //       }
-    //     }
-    //     else {
-    //       return ''
-    //     }
-    //   }
-    // }
-    // else if (nodeConfig.settype == 5) {
-    //   return '发起人自己'
-    // }
-    // else if (nodeConfig.settype == 7) {
-    //   return `从直接主管到通讯录中级别最高的第${nodeConfig.examineEndDirectorLevel}个层级主管`
-    // }
   },
   dealStr(str, obj) {
     const arr = []
@@ -144,6 +99,7 @@
     }
     return arr.join('或')
   },
+  // 设置条件节点的文字
   conditionStr(nodeConfig, index) {
     var { conditionList, nodeUserList } = nodeConfig.conditionNodes[index]
     if (conditionList.length == 0) {
@@ -152,29 +108,16 @@
     else {
       let str = ''
       for (var i = 0; i < conditionList.length; i++) {
-        var { columnId, columnType, showType, showName, optType, zdy1, opt1, zdy2, opt2, fixedDownBoxValue } = conditionList[i]
+        var { columnId } = conditionList[i]
         if (columnId == 0) {
           if (nodeUserList.length != 0) {
             str += '发起人属于：'
-            str += `${nodeUserList.map((item) => { return item.name }).join('或')} 并且 `
-          }
-        }
-        if (columnType == 'String' && showType == '3') {
-          if (zdy1) {
-            str += `${showName}属于：${this.dealStr(zdy1, JSON.parse(fixedDownBoxValue))} 并且 `
-          }
-        }
-        if (columnType == 'Double') {
-          if (optType != 6 && zdy1) {
-            var optTypeStr = ['', '<', '>', '≤', '=', '≥'][optType]
-            str += `${showName} ${optTypeStr} ${zdy1} 并且 `
-          }
-          else if (optType == 6 && zdy1 && zdy2) {
-            str += `${zdy1} ${opt1} ${showName} ${opt2} ${zdy2} 并且 `
+            str += `${nodeUserList.map((item) => { return item.name }).join('、')} `
           }
         }
       }
-      return str ? str.substring(0, str.length - 4) : '请设置条件'
+      // return str ? str.substring(0, str.length - 4) : '请设置条件'
+      return str || '请设置条件'
     }
   },
   // 设置抄送人节点文字
diff --git a/src/views/setting.vue b/src/views/setting.vue
index ae3492b..f650d08 100644
--- a/src/views/setting.vue
+++ b/src/views/setting.vue
@@ -115,12 +115,9 @@
   processConfig.value.flowPermission = flowPermission.value
 
   const res = await efitProcess(processConfig.value)
-  // if (res.code == 200) {
-  //   ElMessage.success('设置成功')
-  //   setTimeout(() => {
-  //     window.location.href = ''
-  //   }, 200)
-  // }
+  if (res.code == 200) {
+    ElMessage.success('保存成功')
+  }
 }
 defineExpose({
   saveSet, initDetail,

diff --git a/public/conditions.json b/public/conditions.json
index 82eb19d..b7629ed 100644
--- a/public/conditions.json
+++ b/public/conditions.json
@@ -2,29 +2,29 @@
   "code": "200",
   "msg": "操作成功",
   "data": [
-    {
-      "columnId": "1090",
-      "showType": "1",
-      "showName": "预计采购总费用",
-      "columnName": "planProcurementTotalMoney",
-      "columnType": "Double",
-      "fixedDownBoxValue": ""
-    },
-    {
-      "columnId": "1092",
-      "showType": "3",
-      "showName": "采购类型",
-      "columnName": "procurementType",
-      "columnType": "String",
-      "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
-    },
-    {
-      "columnId": "1093",
-      "showType": "1",
-      "showName": "园区面积",
-      "columnName": "parkArea",
-      "columnType": "Double",
-      "fixedDownBoxValue": ""
-    }
+    // {
+    //   "columnId": "1090",
+    //   "showType": "1",
+    //   "showName": "预计采购总费用",
+    //   "columnName": "planProcurementTotalMoney",
+    //   "columnType": "Double",
+    //   "fixedDownBoxValue": ""
+    // },
+    // {
+    //   "columnId": "1092",
+    //   "showType": "3",
+    //   "showName": "采购类型",
+    //   "columnName": "procurementType",
+    //   "columnType": "String",
+    //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
+    // },
+    // {
+    //   "columnId": "1093",
+    //   "showType": "1",
+    //   "showName": "园区面积",
+    //   "columnName": "parkArea",
+    //   "columnType": "Double",
+    //   "fixedDownBoxValue": ""
+    // }
   ]
-}
\ No newline at end of file
+}
diff --git a/src/assets/images/check_box.png b/src/assets/images/check_box.png
new file mode 100644
index 0000000..fb89fe2
--- /dev/null
+++ b/src/assets/images/check_box.png
Binary files differ
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index d76462c..38881f4 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -14,6 +14,11 @@
     type: Array,
     default: () => [],
   },
+  // 是否允许多选
+  isMulti: {
+    type: Boolean,
+    default: true,
+  },
 })
 
 const emits = defineEmits(['update:visible', 'change'])
@@ -101,6 +106,16 @@
 function search() {
   fetchRoleData()
 }
+// 多选框单选功能
+const selectClick = (selection: any, row: any) => {
+  if (!props.isMulti) {
+    console.log('selectClick')
+    if (selection.length > 1) {
+      const del_row = selection.shift()
+      table.value?.toggleRowSelection(del_row, false) // 用于多选表格，切换某一行的选中状态，如果使用了第二个参数，则是设置这一行选中与否（selected 为 true 则选中）
+    }
+  }
+}
 onMounted(() => {
   search()
 })
@@ -115,7 +130,18 @@
             <el-input v-model="listQuery.keyword" placeholder="角色名称" />
           </search-item>
         </search-area>
-        <el-table ref="table" v-loading="loading" show-overflow-tooltip :data="roleList" row-key="id" :border="false" style="width: 100%;" :tree-props="{ children: 'children' }" @selection-change="handleSelectionChange">
+        <el-table
+          ref="table"
+          v-loading="loading"
+          show-overflow-tooltip
+          :data="roleList"
+          row-key="id"
+          :border="false"
+          style="width: 100%;"
+          :tree-props="{ children: 'children' }"
+          @selection-change="handleSelectionChange"
+          @select="selectClick"
+        >
           <el-table-column type="selection" width="55" />
           <el-table-column
             v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align"
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index f9273ee..0f8d5c0 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -319,7 +319,7 @@
         <span v-for="(item, index) in approverConfig.nodeUserList" :key="index" class="people-box">
           {{ item.name }}
           <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')"> -->
-          <el-icon style="vertical-align: middle;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
+          <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
             <close />
           </el-icon>
         </span>
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index bc3d84e..57c3a92 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,12 +1,12 @@
 <!-- 条件设置 -->
 <script setup>
-import { computed, ref, watch } from 'vue'
+import { computed, nextTick, onMounted, ref, watch } from 'vue'
 import employeesRoleDialog from '../dialog/employeesRoleDialog.vue'
 import $func from '@/plugins/preload'
 // import { mapMutations, mapState } from '@/plugins/lib.js'
 import useWorkFlowStore from '@/store/modules/workFlow'
-
 import { getConditions } from '@/plugins/api.js'
+
 const workFlowStore = useWorkFlowStore()
 const conditionVisible = ref(false)
 const conditionsConfig = ref({
@@ -18,6 +18,7 @@
 const conditionList = ref([])
 const checkedList = ref([])
 const conditionRoleVisible = ref(false)
+const checkedfqr = ref(true) // 条件-发起人是否选择
 
 // const { tableId, conditionsConfig1, conditionDrawer } = workFlowStore
 const { setCondition, setConditionsConfig } = workFlowStore
@@ -27,22 +28,19 @@
 }
 const visible = computed({
   get() {
-    console.log('2')
-
     return workFlowStore.conditionDrawer
   },
   set() {
     closeDrawer()
   },
 })
-watch(workFlowStore.conditionsConfig1, (val) => {
+watch(() => workFlowStore.conditionsConfig1, (val, oldVal) => {
   conditionsConfig.value = val.value
   PriorityLevel.value = val.priorityLevel
   conditionConfig.value = val.priorityLevel
     ? conditionsConfig.value.conditionNodes[val.priorityLevel - 1]
     : { nodeUserList: [], conditionList: [] }
 })
-
 const changeOptType = (item) => {
   if (item.optType === 1) {
     item.zdy1 = 2
@@ -78,7 +76,33 @@
 const addCondition = async () => {
   conditionList.value = []
   conditionVisible.value = true
-  const { data } = await getConditions({ tableId: workFlowStore.tableId })
+  // const { data } = await getConditions({ tableId: workFlowStore.tableId })
+  const data = [
+  //   // {
+  //   //   "columnId": "1090",
+  //   //   "showType": "1",
+  //   //   "showName": "预计采购总费用",
+  //   //   "columnName": "planProcurementTotalMoney",
+  //   //   "columnType": "Double",
+  //   //   "fixedDownBoxValue": ""
+  //   // },
+  //   // {
+  //   //   "columnId": "1092",
+  //   //   "showType": "3",
+  //   //   "showName": "采购类型",
+  //   //   "columnName": "procurementType",
+  //   //   "columnType": "String",
+  //   //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
+  //   // },
+  //   // {
+  //   //   "columnId": "1093",
+  //   //   "showType": "1",
+  //   //   "showName": "园区面积",
+  //   //   "columnName": "parkArea",
+  //   //   "columnType": "Double",
+  //   //   "fixedDownBoxValue": ""
+  //   // }
+  ]
   conditions.value = data
   if (conditionConfig.value.conditionList) {
     for (let i = 0; i < conditionConfig.value.conditionList.length; i++) {
@@ -93,6 +117,8 @@
   }
 }
 const sureCondition = () => {
+  console.log('*****')
+  console.log(conditionConfig.value)
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
@@ -147,6 +173,7 @@
   conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
   conditionVisible.value = false
 }
+// 抽屉点击确定
 const saveCondition = () => {
   closeDrawer()
   const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
@@ -154,23 +181,31 @@
   conditionsConfig.value.conditionNodes.map((item, index) => {
     item.priorityLevel = index + 1
   })
+  console.log('conditionsConfig.value', conditionsConfig.value)
   for (let i = 0; i < conditionsConfig.value.conditionNodes.length; i++) {
     conditionsConfig.value.conditionNodes[i].error = $func.conditionStr(conditionsConfig.value, i) === '请设置条件' && i !== conditionsConfig.value.conditionNodes.length - 1
   }
   setConditionsConfig({
     value: conditionsConfig.value,
     flag: true,
-    id: workFlowStore.conditionsConfig1.value.id,
+    id: workFlowStore.conditionsConfig1.id,
   })
 }
+// 添加
 const addConditionRole = () => {
   conditionRoleVisible.value = true
   checkedList.value = conditionConfig.value.nodeUserList
 }
+// 选好角色了
 const sureConditionRole = (data) => {
   conditionConfig.value.nodeUserList = data
   conditionRoleVisible.value = false
 }
+
+// 点击发起人
+const clickfq = (conditionList, param, columnId) => {
+  $func.toChecked(conditionList, param, columnId)
+}
 </script>
 
 <template>
@@ -190,15 +225,36 @@
         <p class="tip">
           当审批单同时满足以下条件时进入此流程
         </p>
+        <el-button
+          type="primary"
+          @click="addCondition"
+        >
+          添加条件
+        </el-button>
+
         <ul>
           <li v-for="(item, index) in conditionConfig.conditionList" :key="index">
+            <!-- <el-button type="primary" @click="addConditionRole">
+              选择成员
+            </el-button> -->
             <span class="ellipsis">{{ item.type === 1 ? '发起人' : item.showName }}：</span>
             <div v-if="item.type === 1">
-              <p :class="conditionConfig.nodeUserList.length > 0 ? 'selected_list' : ''" style="cursor: text;" @click.self="addConditionRole">
+              <!-- <p :class="conditionConfig.nodeUserList.length > 0 ? 'selected_list' : ''" style="cursor: text;" @click.self="addConditionRole">
                 <span v-for="(item1, index1) in conditionConfig.nodeUserList" :key="index1">
                   {{ item1.name }}<img src="@/assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item1, 'targetId')">
                 </span>
                 <input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole">
+              </p> -->
+              <el-input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole" />
+              <p v-if="conditionConfig && conditionConfig.nodeUserList && conditionConfig.nodeUserList.length" class="selected_list">
+                <span v-for="(item, index) in conditionConfig.nodeUserList" :key="index" class="people-box">
+                  {{ item.name }}
+                  <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')"> -->
+                  <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')">
+                    <close />
+                  </el-icon>
+                </span>
+                <a v-if="conditionConfig.nodeUserList && conditionConfig.nodeUserList.length !== 0" @click="conditionConfig.nodeUserList = []">清除</a>
               </p>
             </div>
             <div v-else-if="item.columnType === 'String' && item.showType === 3">
@@ -259,13 +315,14 @@
             <a v-if="item.type === 2" @click="$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
           </li>
         </ul>
-        <el-button type="primary" @click="addCondition">
-          添加条件
-        </el-button>
+
         <el-dialog v-model="conditionVisible" title="选择条件" width="480px" append-to-body custom-class="condition_list">
           <p>请选择用来区分审批流程的条件字段</p>
           <p class="check_box">
-            <a :class="$func.toggleClass(conditionList, { columnId: 0 }, 'columnId') && 'active'" @click="$func.toChecked(conditionList, { columnId: 0 }, 'columnId')">发起人</a>
+            <a
+              :class="$func.toggleClass(conditionList, { columnId: 0 }, 'columnId') && 'active'"
+              @click="clickfq(conditionList, { columnId: 0 }, 'columnId')"
+            >发起人</a>
             <a
               v-for="(item, index) in conditions" :key="index" :class="$func.toggleClass(conditionList, item, 'columnId') && 'active'"
               @click="$func.toChecked(conditionList, item, 'columnId')"
@@ -281,11 +338,23 @@
           </template>
         </el-dialog>
       </div>
-      <employees-role-dialog
+      <!-- <employees-role-dialog
         v-model:visible="conditionRoleVisible"
         v-model:data="checkedList"
         :is-department="true"
         @change="sureConditionRole"
+      /> -->
+      <!-- 角色弹框 -->
+      <!-- <select-role-dialog
+        v-model:visible="approverRoleVisible"
+        v-model:data="checkedRoleList"
+        @change="sureRoleApprover"
+      /> -->
+      <!-- 成员弹框 -->
+      <select-employees-dialog
+        v-model:visible="conditionRoleVisible"
+        v-model:data="checkedList"
+        @change="sureConditionRole"
       />
       <div class="demo-drawer__footer clear">
         <el-button type="primary" @click="saveCondition">
@@ -301,10 +370,19 @@
 
 <style lang="scss">
 .condition_copyer {
+  .people-box {
+    font-size: 12px;
+    margin-right: 10px;
+    padding: 3px 6px 3px 9px;
+    white-space: nowrap;
+    border-radius: 6px;
+    border: 1px solid rgb(220 220 220 / 100%);
+  }
+
   .priority_level {
     position: absolute;
-    top: 11px;
-    right: 30px;
+    top: 16px;
+    right: 70px;
     width: 100px;
     height: 32px;
     background: rgb(255 255 255 / 100%);
@@ -360,15 +438,6 @@
           margin-top: 7px;
         }
 
-        select,
-        input {
-          width: 100%;
-          height: 32px;
-          background: rgb(255 255 255 / 100%);
-          border-radius: 4px;
-          border: 1px solid rgb(217 217 217 / 100%);
-        }
-
         select + input {
           width: 260px;
         }
@@ -413,4 +482,69 @@
     }
   }
 }
+
+.radio_box a,
+.check_box a {
+  font-size: 12px;
+  position: relative;
+  padding-left: 20px;
+  margin-right: 30px;
+  cursor: pointer;
+  color: #333;
+  white-space: pre;
+}
+
+.check_box.not a:hover {
+  color: #333;
+}
+
+.check_box.not a::before,
+.check_box.not a:hover::before {
+  border: none;
+}
+
+.check_box.not.active {
+  background: #f3f3f3;
+}
+
+.radio_box a:hover::before,
+.check_box a:hover::before {
+  border: 1px solid #46a6fe;
+}
+
+.radio_box a::before,
+.check_box a::before {
+  position: absolute;
+  width: 14px;
+  height: 14px;
+  border: 1px solid #dcdfe6;
+  border-radius: 2px;
+  left: 0;
+  top: 1px;
+  content: "";
+}
+
+.radio_box a::before {
+  border-radius: 50%;
+}
+
+.check-dot.active::after,
+.radio_box a.active::after,
+.check_box a.active::after {
+  position: absolute;
+  width: 10px;
+  height: 10px;
+  border-radius: 50%;
+  top: 3px;
+  left: 3px;
+  content: "";
+}
+
+.radio_box a.active::after {
+  background: #46a6fe;
+}
+
+.check_box a.active::after {
+  background: url("@/assets/images/check_box.png") no-repeat center;
+}
 </style>
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index 2bc0ed6..4e10eb0 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -34,7 +34,7 @@
         nodeName: '抄送人',
         type: 2,
         ccSelfSelectFlag: 1,
-        childNode: props.childNodeP,
+        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
         nodeUserList: [],
       }
     }
@@ -52,7 +52,7 @@
         priorityLevel: 1,
         conditionList: [],
         nodeUserList: [],
-        childNode: props.childNodeP,
+        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
       }, {
         nodeName: '条件2',
         type: 3,
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index 3e571a5..a97f752 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -79,17 +79,14 @@
 })
 // 条件
 watch(() => workFlowStore.conditionsConfig1, (val) => {
+  console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
 watch(() => workFlowStore.copyerConfig1, (val) => {
-  console.log(val.flag)
-  console.log(val.id === _uid, val.id, _uid)
   if (val.flag && val.id === _uid) {
-    console.log('监听抄送人')
-
     emits('update:nodeConfig', val.value)
   }
 })
@@ -193,7 +190,7 @@
     //   id: _uid,
     // })
   }
-  else if (type == 1) {
+  else if (type == 1) { // 审批
     const { approverConfig1, approverDrawer } = workFlowStore
     console.log('0000000000000', approverDrawer)
     setApprover(true)
@@ -206,7 +203,7 @@
       id: _uid,
     })
   }
-  else if (type == 2) {
+  else if (type == 2) { // 抄送
     setCopyer(true)
     setCopyerConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
@@ -214,7 +211,7 @@
       id: _uid,
     })
   }
-  else {
+  else { // 条件
     setCondition(true)
     setConditionsConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
diff --git a/src/plugins/preload.js b/src/plugins/preload.js
index 09288a9..10a66e2 100644
--- a/src/plugins/preload.js
+++ b/src/plugins/preload.js
@@ -37,7 +37,7 @@
       document.cookie = `${name[i]}=''; path=/; expires=${myDate.toGMTString()}`
     }
   },
-  // 讲负责人的姓名挑出来做成字符串
+  // 将负责人的姓名挑出来做成字符串
   arrToStr(arr) {
     if (arr) {
       return arr.map((item) => { return item.name }).toString()
@@ -47,6 +47,7 @@
     return arr.some((item) => { return item[key] == elem[key] })
   },
   toChecked(arr, elem, key = 'id') {
+    console.log('toChecked')
     var isIncludes = this.toggleClass(arr, elem, key)
     !isIncludes ? arr.push(elem) : this.removeEle(arr, elem, key)
   },
@@ -85,52 +86,6 @@
       }
       return strPeople
     }
-    // if (nodeConfig.settype == 1) {
-    //   if (nodeConfig.nodeUserList.length == 1) {
-    //     return nodeConfig.nodeUserList[0].name
-    //   }
-    //   else if (nodeConfig.nodeUserList.length > 1) {
-    //     if (nodeConfig.examineMode == 1) {
-    //       return this.arrToStr(nodeConfig.nodeUserList)
-    //     }
-    //     else if (nodeConfig.examineMode == 2) {
-    //       return `${nodeConfig.nodeUserList.length}人会签`
-    //     }
-    //   }
-    // }
-    // else if (nodeConfig.settype == 2) {
-    //   const level = nodeConfig.directorLevel == 1 ? '直接主管' : `第${nodeConfig.directorLevel}级主管`
-    //   if (nodeConfig.examineMode == 1) {
-    //     return level
-    //   }
-    //   else if (nodeConfig.examineMode == 2) {
-    //     return `${level}会签`
-    //   }
-    // }
-    // else if (nodeConfig.settype == 4) {
-    //   if (nodeConfig.selectRange == 1) {
-    //     return '发起人自选'
-    //   }
-    //   else {
-    //     if (nodeConfig.nodeUserList.length > 0) {
-    //       if (nodeConfig.selectRange == 2) {
-    //         return '发起人自选'
-    //       }
-    //       else {
-    //         return `发起人从${nodeConfig.nodeUserList[0].name}中自选`
-    //       }
-    //     }
-    //     else {
-    //       return ''
-    //     }
-    //   }
-    // }
-    // else if (nodeConfig.settype == 5) {
-    //   return '发起人自己'
-    // }
-    // else if (nodeConfig.settype == 7) {
-    //   return `从直接主管到通讯录中级别最高的第${nodeConfig.examineEndDirectorLevel}个层级主管`
-    // }
   },
   dealStr(str, obj) {
     const arr = []
@@ -144,6 +99,7 @@
     }
     return arr.join('或')
   },
+  // 设置条件节点的文字
   conditionStr(nodeConfig, index) {
     var { conditionList, nodeUserList } = nodeConfig.conditionNodes[index]
     if (conditionList.length == 0) {
@@ -152,29 +108,16 @@
     else {
       let str = ''
       for (var i = 0; i < conditionList.length; i++) {
-        var { columnId, columnType, showType, showName, optType, zdy1, opt1, zdy2, opt2, fixedDownBoxValue } = conditionList[i]
+        var { columnId } = conditionList[i]
         if (columnId == 0) {
           if (nodeUserList.length != 0) {
             str += '发起人属于：'
-            str += `${nodeUserList.map((item) => { return item.name }).join('或')} 并且 `
-          }
-        }
-        if (columnType == 'String' && showType == '3') {
-          if (zdy1) {
-            str += `${showName}属于：${this.dealStr(zdy1, JSON.parse(fixedDownBoxValue))} 并且 `
-          }
-        }
-        if (columnType == 'Double') {
-          if (optType != 6 && zdy1) {
-            var optTypeStr = ['', '<', '>', '≤', '=', '≥'][optType]
-            str += `${showName} ${optTypeStr} ${zdy1} 并且 `
-          }
-          else if (optType == 6 && zdy1 && zdy2) {
-            str += `${zdy1} ${opt1} ${showName} ${opt2} ${zdy2} 并且 `
+            str += `${nodeUserList.map((item) => { return item.name }).join('、')} `
           }
         }
       }
-      return str ? str.substring(0, str.length - 4) : '请设置条件'
+      // return str ? str.substring(0, str.length - 4) : '请设置条件'
+      return str || '请设置条件'
     }
   },
   // 设置抄送人节点文字
diff --git a/src/views/setting.vue b/src/views/setting.vue
index ae3492b..f650d08 100644
--- a/src/views/setting.vue
+++ b/src/views/setting.vue
@@ -115,12 +115,9 @@
   processConfig.value.flowPermission = flowPermission.value
 
   const res = await efitProcess(processConfig.value)
-  // if (res.code == 200) {
-  //   ElMessage.success('设置成功')
-  //   setTimeout(() => {
-  //     window.location.href = ''
-  //   }, 200)
-  // }
+  if (res.code == 200) {
+    ElMessage.success('保存成功')
+  }
 }
 defineExpose({
   saveSet, initDetail,
diff --git a/src/views/system/process/process.vue b/src/views/system/process/process.vue
index 2b8c8f8..fb742de 100644
--- a/src/views/system/process/process.vue
+++ b/src/views/system/process/process.vue
@@ -33,6 +33,23 @@
     label: '废止',
   },
 ]
+const businessDic = {
+  FILE_APPROVAL: 'jlglwjsp', // 文件审批,
+  TRAIN_APPROVAL: 'jlglpxjhsp', // 培训计划审批
+  SUPPLIER_APPROVAL: 'jlglsygfsp', // 溯源供方审批
+  STANDARD_CHANGE_APPROVAL: 'sbglbzzzghsq', // 标准装置更换申请
+  STANDARD_PAUSE_APPROVAL: 'sbglbzzzghsq', // 标准装置暂停申请
+  STANDARD_REVERT_APPROVAL: 'sbglbzzzghsq', // 标准装置撤销申请
+  STANDARD_RESUME_APPROVAL: 'sbglbzzzghsq', // 标准装置恢复申请
+  STANDARD_CHECK_APPROVAL: 'sbglbzzzfcsq', // 标准装置复查申请
+  DEVICE_UNUSED_APPROVAL: 'sbglsbxzsq', // 设备闲置申请
+  DEVICE_SEALED_APPROVAL: 'sbglsbfcsq', // 设备封存申请
+  DEVICE_UNSEALED_APPROVAL: 'sbglsbqfsq', // 设备启封申请
+  DEVICE_SCRAPPED_ROVAL: 'sbglsbbfsq', // 设备报废申请
+  DEVICE_HANDLE_APPROVAL: 'sbglsbczsq', // 设备处置申请
+  DEVICE_CONSUMING_APPROVAL: 'sbglsblysq', // 设备领用申请
+  DEVICE_BORROW_APPROVAL: 'sbglsbjysq', // 设备借用申请
+}
 const columns = ref([
   {
     text: '流程编号',
@@ -281,6 +298,14 @@
               placeholder="关联业务"
               clearable
             />
+            <!-- <el-select v-model="listQuery.business" placeholder="关联业务" clearable>
+              <el-option
+                v-for="item in searchStatus"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select> -->
           </search-item>
 
           <search-item>