feat: 优化工作流组件功能和代码结构

- 重构checkFlow.vue组件，优化流程检查逻辑和界面布局
- 更新flowLog.vue组件，修复日志显示相关问题
- 完善CommonProperty.vue属性设置组件，增强配置功能
- 统一代码格式，提升代码可读性和维护性

src/components/gFlow/checkFlow.vue

@@ -1,137 +1,115 @@
 <template>
-  <div class="check-flow-container">
-    <!--发起工作流-->
-    <el-dialog title="发起审批" v-model="startWfOpen" width="500px" append-to-body :close-on-click-modal="false" destroy-on-close>
-      <el-form ref="wfStartFormRef" :model="wfStartForm" :rules="wfStartRules" label-width="120px">
-        <el-form-item label="项目名称" prop="title">
-          <el-input v-model="startWfTitle" disabled />
-        </el-form-item>
-        <el-form-item label="选择工作流" prop="wfId">
-          <el-select v-model="wfStartForm.wfId" @change="setSelectedFlow" clearable>
-            <el-option
-                v-for="item in wfOptions"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="流程图" v-if="wfStartForm.wfId && wfStartForm.wfId!=='0'">
-          <el-link type="primary" :underline="false" @click="showFlowDesign(wfStartForm.wfId,0,'start')">点击查看 {{ selectedFlow }} 的流程图</el-link>
-        </el-form-item>
-        <el-form-item label="紧急程度" prop="newType">
-          <el-select v-model="wfStartForm.newType" >
-            <el-option
-                v-for="item in flow_level"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="审核意见" prop="checkCon">
-          <el-input v-model="wfStartForm.checkCon" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitWfStart">确 定</el-button>
-        <el-button @click="cancelWfStart">取 消</el-button>
-      </div>
-      <el-dialog title="流程图" v-model="isShowFlowDesignStart" @opened="showFlowDesignOpen" width="90%" append-to-body destroy-on-close>
-        <ShowFlowDesign ref="showFlowDesignRef" />
-      </el-dialog>
-    </el-dialog>
-    <!--流程审批-->
-    <el-dialog title="流程审批" v-model="checkWfOpen" width="900px" append-to-body :close-on-click-modal="false" destroy-on-close>
-      <el-form ref="wfCheckFormRef" :model="wfCheckForm" :rules="wfCheckRules" label-width="120px">
-        <el-form-item label="项目名称" prop="title">
-          <el-input v-model="checkWfTitle" disabled />
-        </el-form-item>
-        <el-form-item label="审批意见" prop="checkCon">
-          <el-input v-model="wfCheckForm.checkCon"  type="textarea" :rows="3"/>
-        </el-form-item>
-        <el-form-item label="流程图" >
-          <el-button @click="showFlowDesign(flowId,processId,'check')" type="success" plain>点击查看流程图</el-button>
-        </el-form-item>
-        <el-form-item label="下一步骤" prop="nextStep" v-show="nextProcess&&!backProcess">
-          <template v-if="checkFlowInfo.nodeInfo && checkFlowInfo.nodeInfo.nextNode.length>0">
-            <el-tag v-for="(item,index) in checkFlowInfo.nodeInfo.nextNode" :key="'nextStep_'+index">{{item.nodeText.value}}【{{item.todo.join('，')}}】</el-tag>
-          </template>
-          <template v-else>
-            <el-tag>审批完成</el-tag>
-          </template>
-        </el-form-item>
-        <el-form-item label="回退步骤" v-if="backProcess" prop="wfBackFlow">
-          <el-select placeholder="请选择回退步骤" v-model="wfCheckForm.wfBackFlow">
-            <template v-if="checkFlowInfo">
-              <el-option v-for="(item) of checkFlowInfo.preprocess"
-                         :key="''+item.nodeId"
-                         :label="item.nodeText.value"
-                         :value="''+item.nodeId"
-              ></el-option>
-            </template>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="附件">
-          <upload-file :action="baseURL+'api/v1/system/upload/singleFile'" v-model="upFileInfo" @upFileData="upFile" :limit="1"></upload-file>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button v-show="doCheck && !doBack" type="primary" @click="submitWfCheck('ok')">提交审批</el-button>
-        <el-button type="danger" v-if="checkFlowInfo?.nodeInfo?.rollback===1" @click="submitWfCheck('back')">回  退</el-button>
-        <el-button type="info" @click="checkLogs">审批记录</el-button>
-      </div>
-      <el-dialog title="流程图" v-model="isShowFlowDesignCheck" @opened="showFlowCheckingOpen" width="90%" append-to-body destroy-on-close>
-        <ShowFlowDesign ref="showFlowCheckRef" />
-      </el-dialog>
-    </el-dialog>
-    <el-drawer
-        v-model="showLog"
-        title="审批记录"
-        direction="rtl"
-        @opened="showLogs"
-        destroy-on-close
-    >
-      <FlowLog ref="flowLogRef" :form-id="runInfo?.formId" :form-table="runInfo?.formTable"/>
-    </el-drawer>
-  </div>
+	<div class="check-flow-container">
+		<!--发起工作流-->
+		<el-dialog title="发起审批" v-model="startWfOpen" width="500px" append-to-body :close-on-click-modal="false" destroy-on-close>
+			<el-form ref="wfStartFormRef" :model="wfStartForm" :rules="wfStartRules" label-width="120px">
+				<el-form-item label="项目名称" prop="title">
+					<el-input v-model="startWfTitle" disabled />
+				</el-form-item>
+				<el-form-item label="选择工作流" prop="wfId">
+					<el-select v-model="wfStartForm.wfId" @change="setSelectedFlow" clearable>
+						<el-option v-for="item in wfOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
+					</el-select>
+				</el-form-item>
+				<el-form-item label="流程图" v-if="wfStartForm.wfId && wfStartForm.wfId !== '0'">
+					<el-link type="primary" :underline="false" @click="showFlowDesign(wfStartForm.wfId, 0, 'start')"
+						>点击查看 {{ selectedFlow }} 的流程图</el-link
+					>
+				</el-form-item>
+				<el-form-item label="紧急程度" prop="newType">
+					<el-select v-model="wfStartForm.newType">
+						<el-option v-for="item in flow_level" :key="item.value" :label="item.label" :value="item.value"></el-option>
+					</el-select>
+				</el-form-item>
+				<el-form-item label="审核意见" prop="checkCon">
+					<el-input v-model="wfStartForm.checkCon" />
+				</el-form-item>
+			</el-form>
+			<div slot="footer" class="dialog-footer">
+				<el-button type="primary" @click="submitWfStart">确 定</el-button>
+				<el-button @click="cancelWfStart">取 消</el-button>
+			</div>
+			<el-dialog title="流程图" v-model="isShowFlowDesignStart" @opened="showFlowDesignOpen" width="90%" append-to-body destroy-on-close>
+				<ShowFlowDesign ref="showFlowDesignRef" />
+			</el-dialog>
+		</el-dialog>
+		<!--流程审批-->
+		<el-dialog title="流程审批" v-model="checkWfOpen" width="900px" append-to-body :close-on-click-modal="false" destroy-on-close>
+			<el-form ref="wfCheckFormRef" :model="wfCheckForm" :rules="wfCheckRules" label-width="120px">
+				<el-form-item label="项目名称" prop="title">
+					<el-input v-model="checkWfTitle" disabled />
+				</el-form-item>
+				<el-form-item label="审批意见" prop="checkCon">
+					<el-input v-model="wfCheckForm.checkCon" type="textarea" :rows="3" />
+				</el-form-item>
+				<el-form-item label="流程图">
+					<el-button @click="showFlowDesign(flowId, processId, 'check')" type="success" plain>点击查看流程图</el-button>
+				</el-form-item>
+				<el-form-item label="下一步骤" prop="nextStep" v-show="nextProcess && !backProcess">
+					<template v-if="checkFlowInfo.nodeInfo && checkFlowInfo.nodeInfo.nextNode.length > 0">
+						<el-tag v-for="(item, index) in checkFlowInfo.nodeInfo.nextNode" :key="'nextStep_' + index"
+							>{{ item.nodeText.value }}【{{ item.todo.join('，') }}】</el-tag
+						>
+					</template>
+					<template v-else>
+						<el-tag>审批完成</el-tag>
+					</template>
+				</el-form-item>
+				<el-form-item label="回退步骤" v-if="backProcess" prop="wfBackFlow">
+					<el-select placeholder="请选择回退步骤" v-model="wfCheckForm.wfBackFlow">
+						<template v-if="checkFlowInfo">
+							<el-option
+								v-for="item of checkFlowInfo.preprocess"
+								:key="'' + item.nodeId"
+								:label="item.nodeText.value"
+								:value="'' + item.nodeId"
+							></el-option>
+						</template>
+					</el-select>
+				</el-form-item>
+				<el-form-item label="附件">
+					<upload-file :action="baseURL + 'api/v1/system/upload/singleFile'" v-model="upFileInfo" @upFileData="upFile" :limit="1"></upload-file>
+				</el-form-item>
+			</el-form>
+			<div slot="footer" class="dialog-footer">
+				<el-button v-show="doCheck && !doBack" type="primary" @click="submitWfCheck('ok')">提交审批</el-button>
+				<el-button type="danger" v-if="checkFlowInfo?.nodeInfo?.rollback === 1" @click="submitWfCheck('back')">回 退</el-button>
+				<el-button type="info" @click="checkLogs">审批记录</el-button>
+			</div>
+			<el-dialog title="流程图" v-model="isShowFlowDesignCheck" @opened="showFlowCheckingOpen" width="90%" append-to-body destroy-on-close>
+				<ShowFlowDesign ref="showFlowCheckRef" />
+			</el-dialog>
+		</el-dialog>
+		<el-drawer v-model="showLog" title="审批记录" direction="rtl" @opened="showLogs" destroy-on-close>
+			<FlowLog ref="flowLogRef" :form-id="runInfo?.formId" :form-table="runInfo?.formTable" />
+		</el-drawer>
+	</div>
 </template>
 <script setup lang="ts">
-
-import {getCurrentInstance, ref} from "vue";
-import {
-  checkFlowInfoData,
-  FlowRunInfo,
-  WfCheckFormData,
-  WfOptionsData,
-  wfStartFormData
-} from "/@/components/gFlow/model";
-import {FlowDemoTableColumns} from "/@/views/flow/flowDemo/list/component/model";
-import {ElMessage, FormInstance} from "element-plus";
-import {getCheckData, saveCheckWf, saveStartWf, wfStart} from "/@/api/flow/flowModel";
-import ShowFlowDesign from "/@/components/gFlow/showDesign.vue"
-import UploadFile from "/@/components/upload/uploadFile.vue";
-import FlowLog from "/@/components/gFlow/flowLog.vue";
+import { getCurrentInstance, ref } from 'vue'
+import { checkFlowInfoData, FlowRunInfo, WfCheckFormData, WfOptionsData, wfStartFormData } from '/@/components/gFlow/model'
+import { FlowDemoTableColumns } from '/@/views/flow/flowDemo/list/component/model'
+import { ElMessage, FormInstance } from 'element-plus'
+import { getCheckData, saveCheckWf, saveStartWf, wfStart } from '/@/api/flow/flowModel'
+import ShowFlowDesign from '/@/components/gFlow/showDesign.vue'
+import UploadFile from '/@/components/upload/uploadFile.vue'
+import FlowLog from '/@/components/gFlow/flowLog.vue'
 const props = defineProps({
-  saveCheckWfAttr:{
-    type:Function,
-    default:saveCheckWf
-  }
+	saveCheckWfAttr: {
+		type: Function,
+		default: saveCheckWf,
+	},
 })
 
-const baseURL:string|undefined|boolean = import.meta.env.VITE_API_URL
+const baseURL: string | undefined | boolean = import.meta.env.VITE_API_URL
 const startWfOpen = ref(false)
-const startWfTitle =ref('')
+const startWfTitle = ref('')
 const wfStartForm = ref<wfStartFormData>({} as wfStartFormData)
 const showFlowDesignRef = ref()
 const showFlowCheckRef = ref()
 const wfStartRules = ref({
-  wfId: [
-    { required: true, message: "请选择工作流", trigger: "change" }
-  ],
-  newType: [
-    { required: true, message: "请选择紧急程度", trigger: "change" }
-  ]
+	wfId: [{ required: true, message: '请选择工作流', trigger: 'change' }],
+	newType: [{ required: true, message: '请选择紧急程度', trigger: 'change' }],
 })
 const wfStartFormRef = ref<FormInstance>()
 const wfOptions = ref<Array<WfOptionsData>>([])
@@ -140,17 +118,13 @@ const isShowFlowDesignCheck = ref(false)
 const wfCheckForm = ref<WfCheckFormData>({} as WfCheckFormData)
 const checkWfOpen = ref(false)
 const wfCheckRules = ref({
-  checkCon: [
-    { required: true, message: "请填写审批意见", trigger: "input" }
-  ],
-  wfBackFlow: [
-    { required: true, message: "请选择回退步骤", trigger: "change" }
-  ],
+	checkCon: [{ required: true, message: '请填写审批意见', trigger: 'input' }],
+	wfBackFlow: [{ required: true, message: '请选择回退步骤', trigger: 'change' }],
 })
 const wfCheckFormRef = ref()
 const designInfo = ref({})
 const selectedFlow = ref('')
-const {proxy} = <any>getCurrentInstance()
+const { proxy } = <any>getCurrentInstance()
 const checkWfTitle = ref('')
 const checkFlowInfo = ref<checkFlowInfoData>({} as checkFlowInfoData)
 const flowId = ref(0)
@@ -164,184 +138,189 @@ const runInfo = ref<FlowRunInfo>()
 const showLog = ref(false)
 const flowLogRef = ref()
 // 字典选项数据
-const {
-  flow_level
-} = proxy.useDict(
-    'flow_level',
-)
+const { flow_level } = proxy.useDict('flow_level')
 const emit = defineEmits(['getList'])
-const showFlowDesignOpen = ()=>{
-  showFlowDesignRef.value.showDesign(designInfo.value)
+const showFlowDesignOpen = () => {
+	showFlowDesignRef.value.showDesign(designInfo.value)
 }
-const showFlowCheckingOpen = ()=>{
-  showFlowCheckRef.value.showDesign(designInfo.value)
+const showFlowCheckingOpen = () => {
+	showFlowCheckRef.value.showDesign(designInfo.value)
 }
-const setSelectedFlow = ()=>{
-  wfOptions.value.some(item => {
-    if (item.id === parseInt(wfStartForm.value.wfId as string)) {
-      selectedFlow.value = item.name
-      return false
-    }
-  })
+const setSelectedFlow = () => {
+	wfOptions.value.some((item) => {
+		if (item.id === parseInt(wfStartForm.value.wfId as string)) {
+			selectedFlow.value = item.name
+			return false
+		}
+	})
 }
-const showFlowDesign =  (flowId:string|number, processId = 0,tp='') => {
-  if(tp=='start'){
-    isShowFlowDesignStart.value = true
-  }else{
-    isShowFlowDesignCheck.value = true
-  }
-  designInfo.value = {flowId:flowId,processId:processId,runId: wfCheckForm.value.runId};
+const showFlowDesign = (flowId: string | number, processId = 0, tp = '') => {
+	if (tp == 'start') {
+		isShowFlowDesignStart.value = true
+	} else {
+		isShowFlowDesignCheck.value = true
+	}
+	designInfo.value = { flowId: flowId, processId: processId, runId: wfCheckForm.value.runId }
 }
-const submitWfStart = ()=>{
-  wfStartFormRef.value?.validate((valid: boolean) => {
-    if (valid) {
-      console.log(wfStartForm.value)
-      saveStartWf(wfStartForm.value).then((res:any)=>{
-        ElMessage.success("发起成功")
-        startWfOpen.value = false
-        emit("getList")
-      })
-    }
-  })
+const submitWfStart = () => {
+	wfStartFormRef.value?.validate((valid: boolean) => {
+		if (valid) {
+			console.log(wfStartForm.value)
+			saveStartWf(wfStartForm.value).then((res: any) => {
+				ElMessage.success('发起成功')
+				startWfOpen.value = false
+				emit('getList')
+			})
+		}
+	})
 }
-const cancelWfStart = ()=>{
-  startWfOpen.value = false
+const cancelWfStart = () => {
+	startWfOpen.value = false
 }
-const handleStartFlow = (row: FlowDemoTableColumns|null)=>{
-  const btn = row?.actionBtn
-  if(btn.title.indexOf('无审批权限')>-1){
-    ElMessage.error("您没有审批权限")
-    return
-  }
-  switch(btn.type){
-    case 'link':
-      if(btn.api=='wfStart'){
-        resetWfForm()
-        //获取流程数据
-        wfStart({wfType:btn.wfType,wfModelType:btn.wfModelType,wfTitle:btn.wfTitle,wfStatusField:btn.wfStatusField,wfFid:btn.wfFid}).then((response:any)=>{
-          wfOptions.value =response.data.flow?response.data.flow:[]
-          startWfTitle.value = row?(row as any)[btn.wfTitle]:''
-          wfStartForm.value.wfType = response.data.info.wfType
-          wfStartForm.value.wfTitle = response.data.info.wfTitle
-          wfStartForm.value.wfStatusField = response.data.info.wfStatusField
-          wfStartForm.value.wfFid = response.data.info.wfFid
-        })
-        startWfOpen.value = true
-      }else if(btn.api=='wfCheck'){
-        resetCheckForm()
-        getCheckData({wfType:btn.wfType,wfModelType:btn.wfModelType,wfTitle:btn.wfTitle,wfStatusField:btn.wfStatusField,wfFid:btn.wfFid,isProxy:btn?.isProxy}).then((response:any)=>{
-          checkWfTitle.value = response.data.runInfo.runName
-          flowId.value = response.data.runInfo.flowId
-          processId.value = response.data.nodeInfo.nodeId
-          wfCheckForm.value.runId = response.data.runInfo.id
-          wfCheckForm.value.nodeId = response.data.nodeInfo.nodeId
-          checkFlowInfo.value.nodeInfo = response.data.nodeInfo
-          checkFlowInfo.value.preprocess = response.data.preProcess
-          runInfo.value = response.data.runInfo
-          wfCheckForm.value.isProxy = btn?.isProxy
-        })
-        checkWfOpen.value = true
-      }
-      break;
-  }
+const handleStartFlow = (row: FlowDemoTableColumns | null) => {
+	const btn = row?.actionBtn
+	if (btn.title.indexOf('无审批权限') > -1) {
+		ElMessage.error('您没有审批权限')
+		return
+	}
+	switch (btn.type) {
+		case 'link':
+			if (btn.api == 'wfStart') {
+				resetWfForm()
+				//获取流程数据
+				wfStart({ wfType: btn.wfType, wfModelType: btn.wfModelType, wfTitle: btn.wfTitle, wfStatusField: btn.wfStatusField, wfFid: btn.wfFid }).then(
+					(response: any) => {
+						wfOptions.value = response.flow ? response.flow : []
+						startWfTitle.value = row ? (row as any)[btn.wfTitle] : ''
+						wfStartForm.value.wfType = response.info.wfType
+						wfStartForm.value.wfTitle = response.info.wfTitle
+						wfStartForm.value.wfStatusField = response.info.wfStatusField
+						wfStartForm.value.wfFid = response.info.wfFid
+					}
+				)
+				startWfOpen.value = true
+			} else if (btn.api == 'wfCheck') {
+				resetCheckForm()
+				getCheckData({
+					wfType: btn.wfType,
+					wfModelType: btn.wfModelType,
+					wfTitle: btn.wfTitle,
+					wfStatusField: btn.wfStatusField,
+					wfFid: btn.wfFid,
+					isProxy: btn?.isProxy,
+				}).then(({ data: response }: any) => {
+					checkWfTitle.value = response.runInfo.runName
+					flowId.value = response.runInfo.flowId
+					processId.value = response.nodeInfo.nodeId
+					wfCheckForm.value.runId = response.runInfo.id
+					wfCheckForm.value.nodeId = response.nodeInfo.nodeId
+					checkFlowInfo.value.nodeInfo = response.nodeInfo
+					checkFlowInfo.value.preprocess = response.preProcess
+					runInfo.value = response.runInfo
+					wfCheckForm.value.isProxy = btn?.isProxy
+				})
+				checkWfOpen.value = true
+			}
+			break
+	}
 }
-const resetWfForm = ()=>{
-  wfOptions.value = []
-  startWfTitle.value = ''
-  wfStartForm.value = {
-    wfType:'',
-    wfTitle:'',
-    wfStatusField:'',
-    wfFid:'',
-    wfId:undefined,
-    newType:undefined,
-    checkCon:'',
-  };
-  wfStartFormRef.value?.resetFields()
+const resetWfForm = () => {
+	wfOptions.value = []
+	startWfTitle.value = ''
+	wfStartForm.value = {
+		wfType: '',
+		wfTitle: '',
+		wfStatusField: '',
+		wfFid: '',
+		wfId: undefined,
+		newType: undefined,
+		checkCon: '',
+	}
+	wfStartFormRef.value?.resetFields()
 }
-const resetCheckForm = ()=>{
-  checkWfTitle.value = ""
-  checkFlowInfo.value = {
-    nodeInfo:{
-      nextNode:[],
-      nodeId:'',
-      nodeText:'',
-      todo:[],
-      rollback:0
-    },
-    preprocess:[],
-  }
-  wfCheckForm.value = {
-    art:null,
-    checkCon:'',
-    flowId:'',
-    flowProcess:'',
-    nodeId:'',
-    npid:'',
-    runId:'',
-    runProcess:'',
-    submitToSave:'',
-    sup:'',
-    wfBackFlow:'',
-    wfFid:'',
-    wfMode:'',
-    wfStatusField:'',
-    wfTitle:'',
-    wfType:'',
-    isProxy:false
-  }
-  doBack.value =false
-  backProcess.value = false
-  wfCheckFormRef.value?.resetFields()
+const resetCheckForm = () => {
+	checkWfTitle.value = ''
+	checkFlowInfo.value = {
+		nodeInfo: {
+			nextNode: [],
+			nodeId: '',
+			nodeText: '',
+			todo: [],
+			rollback: 0,
+		},
+		preprocess: [],
+	}
+	wfCheckForm.value = {
+		art: null,
+		checkCon: '',
+		flowId: '',
+		flowProcess: '',
+		nodeId: '',
+		npid: '',
+		runId: '',
+		runProcess: '',
+		submitToSave: '',
+		sup: '',
+		wfBackFlow: '',
+		wfFid: '',
+		wfMode: '',
+		wfStatusField: '',
+		wfTitle: '',
+		wfType: '',
+		isProxy: false,
+	}
+	doBack.value = false
+	backProcess.value = false
+	wfCheckFormRef.value?.resetFields()
 }
-const upFile = (data:any)=>{
-  if(data&&data.length>0) {
-    wfCheckForm.value.art = JSON.stringify(data)
-    upFileInfo.value = data
-  }else{
-    wfCheckForm.value.art = ""
-  }
+const upFile = (data: any) => {
+	if (data && data.length > 0) {
+		wfCheckForm.value.art = JSON.stringify(data)
+		upFileInfo.value = data
+	} else {
+		wfCheckForm.value.art = ''
+	}
 }
-const submitWfCheck = (type:string)=>{
-  wfCheckForm.value.submitToSave = type
-  switch(type){
-    case 'ok':
-      props.saveCheckWfAttr(wfCheckForm.value).then((response:any)=>{
-        if (response.code === 0) {
-          ElMessage.success("审批成功")
-          checkWfOpen.value = false
-          emit("getList")
-        }
-      })
-      break
-    case 'back':
-      doBack.value = true
-      backProcess.value=true
-      if(!wfCheckForm.value.wfBackFlow){
-        ElMessage.error('请选择回退步骤')
-        return
-      }
-      props.saveCheckWfAttr(wfCheckForm.value).then((response:any)=>{
-        if (response.code === 0) {
-          ElMessage.success("回退成功")
-          checkWfOpen.value = false
-          emit("getList")
-        }
-      })
-      break
-  }
+const submitWfCheck = (type: string) => {
+	wfCheckForm.value.submitToSave = type
+	switch (type) {
+		case 'ok':
+			props.saveCheckWfAttr(wfCheckForm.value).then((response: any) => {
+				if (response.code === 0) {
+					ElMessage.success('审批成功')
+					checkWfOpen.value = false
+					emit('getList')
+				}
+			})
+			break
+		case 'back':
+			doBack.value = true
+			backProcess.value = true
+			if (!wfCheckForm.value.wfBackFlow) {
+				ElMessage.error('请选择回退步骤')
+				return
+			}
+			props.saveCheckWfAttr(wfCheckForm.value).then((response: any) => {
+				if (response.code === 0) {
+					ElMessage.success('回退成功')
+					checkWfOpen.value = false
+					emit('getList')
+				}
+			})
+			break
+	}
 }
-const checkLogs = ()=>{
-  showLog.value = true
+const checkLogs = () => {
+	showLog.value = true
 }
-const showLogs = ()=>{
-  flowLogRef.value.getLogList()
+const showLogs = () => {
+	flowLogRef.value.getLogList()
 }
-defineExpose({handleStartFlow})
+defineExpose({ handleStartFlow })
 </script>
 <style scoped lang="scss">
-.dialog-footer{
-  display: flex;
-  justify-content: flex-end;
+.dialog-footer {
+	display: flex;
+	justify-content: flex-end;
 }
 </style>

src/components/gFlow/flowLog.vue

@@ -74,8 +74,8 @@
 
   const getLogList = ()=>{
     checkLog(tableData.value.param).then((response:any)=>{
-      activities.value = response.data.list
-      tableData.value.total = response.data.total
+      activities.value = response.list
+      tableData.value.total = response.total
     })
   }
   defineExpose({getLogList})

src/components/gFlow/propertySetting/CommonProperty.vue

@@ -79,15 +79,15 @@
 			</el-form-item>
 			<el-form-item label="发送通知">
 				<el-checkbox-group v-model="formData.notice" :disabled="readonly">
-					<el-checkbox value="sms">短信</el-checkbox>
-					<el-checkbox value="email">邮件</el-checkbox>
-					<el-checkbox value="innerNotice">站内通知</el-checkbox>
+					<el-checkbox label="sms">短信</el-checkbox>
+					<el-checkbox label="email">邮件</el-checkbox>
+					<el-checkbox label="innerNotice">站内通知</el-checkbox>
 				</el-checkbox-group>
 			</el-form-item>
 			<el-form-item label="允许退回" v-show="nodeType !== NodeTypeStart">
 				<el-radio-group v-model="formData.rollback" :disabled="readonly">
-					<el-radio :value="1">是</el-radio>
-					<el-radio :value="0">否</el-radio>
+					<el-radio label="1">是</el-radio>
+					<el-radio label="0">否</el-radio>
 				</el-radio-group>
 			</el-form-item>
 			<el-form-item label="分支条件" v-show="nodeType === NodeTypeCondition">
@@ -108,7 +108,7 @@ interface PostInfo {
 }
 
 const getDeptTree = ()=> systemApi.dept.getList({ status: -1 })
-const getParams = ()=> systemApi.post.getList({ status: -1 })
+const getParams = ()=> systemApi.user.params()
 
 import selectUser from '/@/components/selectUser/index.vue'
 import LogicFlow from '@logicflow/core'
@@ -261,19 +261,25 @@ onMounted(() => {
 })
 const getSelector = () => {
 	//获取角色岗位选项
-	getParams().then((res) => {
-		const roles = res.roleList ?? []
-		const roleAccess = res.roleAccess ?? []
-		roles.map((item: any) => {
-			if (!roleAccess.includes(item.id)) {
-				item.disabled = true
+	//TODO 可能需要加新的api
+	getParams().then((res: any) => {
+		const roles = res.roleList?.map((item: any)=>{
+			if (item.parentId === -1) {
+				item.parentId = 0
 			}
-		})
-		state.roleList = proxy.handleTree(roles ?? [], 'id', 'pid', 'children', true)
+			return item
+		}) ?? []
+		// const roleAccess = res.roleAccess ?? []
+		// roles.map((item: any) => {
+		// 	if (!roleAccess.includes(item.id)) {
+		// 		item.disabled = true
+		// 	}
+		// })
+		state.roleList = proxy.handleTree(roles ?? [], 'id', 'parentId', 'children')
 		state.postList = res.posts ?? []
 	})
 	getDeptTree().then((res) => {
-		state.deptData = res.deps
+		state.deptData = res
 	})
 }
 const onSubmit = () => {