Compare commits
	
		
			8 Commits
		
	
	
		
			7328df959d
			...
			dev
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 20680032bc | |||
| aa5f1f5b9b | |||
| 6f4be5956e | |||
| 5d07ca6d0e | |||
| 5a1567dc34 | |||
| bc9fd221a5 | |||
| 256edf264e | |||
| d01ce5d4a4 | 
							
								
								
									
										105
									
								
								src/components/BpmTaskAssign/TaskSelectAssigneeForm.vue
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										105
									
								
								src/components/BpmTaskAssign/TaskSelectAssigneeForm.vue
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,105 @@ | ||||
| <template> | ||||
|   <ContentWrap> | ||||
|     <el-form ref="formRef" :model="formData" :rules="formRules" label-width="80px"> | ||||
|       <div v-for="taskAssignRule in props?.taskAssignRules" :key="taskAssignRule.taskDefinitionKey"> | ||||
|         <el-divider content-position="left">{{ taskAssignRule?.taskDefinitionName }}</el-divider> | ||||
|         <el-form-item :label="taskAssignRule.taskDefinitionName+'候选人'" | ||||
|                       :prop="taskAssignRule.taskDefinitionKey" | ||||
|                       label-width="200"> | ||||
|           <UserSelect | ||||
|             v-model="formData[taskAssignRule.taskDefinitionKey]" | ||||
|             :column="userSelectColumn" | ||||
|             :prop="taskAssignRule.taskDefinitionKey" | ||||
|             type="edit" | ||||
|             :func="(value)=>{console.log(JSON.stringify(value))}" | ||||
|           > | ||||
|           </UserSelect> | ||||
|         </el-form-item> | ||||
|       </div> | ||||
|     </el-form> | ||||
|   </ContentWrap> | ||||
| </template> | ||||
| <script lang="ts" setup> | ||||
| // 从 UserSelect 组件导入 Column 类型 | ||||
| import type {Column} from '@/components/LowDesign/src/shareControl/UserSelect.vue' | ||||
|  | ||||
| // 定义组件选项 | ||||
| defineOptions({ | ||||
|   name: "BpmTaskSelectAssigneeForm" | ||||
| }) | ||||
|  | ||||
| interface TaskAssignRule { | ||||
|   id: number | ||||
|   modelId: string | ||||
|   processDefinitionId: string | ||||
|   taskDefinitionKey: string | ||||
|   taskDefinitionName: string | ||||
|   type: number | ||||
|   options: number[] | ||||
| } | ||||
|  | ||||
| const props = defineProps<{ | ||||
|   taskAssignRules: TaskAssignRule[] | ||||
|   modelValue: {} | ||||
| }>() | ||||
|  | ||||
| const formRef = ref() | ||||
| const formData = ref(props.modelValue) | ||||
| const formRules = ref({}) | ||||
| const userSelectColumn: Column = { | ||||
|   label: '候选人', | ||||
|   findType: 'all', | ||||
|   multiple: false, | ||||
|   columnKey: ['sex', 'post', 'deptName'] | ||||
| } | ||||
|  | ||||
| const emit = defineEmits(['updateModelValue']) | ||||
|  | ||||
| watch( | ||||
|   () => props.modelValue, | ||||
|   (val: {}) => { | ||||
|     formData.value = val | ||||
|   }, | ||||
|   { | ||||
|     deep: true, | ||||
|     immediate: true, | ||||
|   } | ||||
| ) | ||||
|  | ||||
| watch( | ||||
|   () => formData.value, | ||||
|   (val: {}) => { | ||||
|     emit('updateModelValue', val) | ||||
|   }, | ||||
|   { | ||||
|     deep: true, | ||||
|     immediate: true, | ||||
|   } | ||||
| ) | ||||
|  | ||||
| const validateAssignee = (successCallBack: () => void, failCallback: () => void) => { | ||||
|   formRef.value.validate((valid: boolean) => { | ||||
|     if (valid) successCallBack() | ||||
|     else failCallback() | ||||
|   }) | ||||
| } | ||||
|  | ||||
| defineExpose({validateAssignee}) | ||||
|  | ||||
| // 初始化 formData | ||||
| onMounted(() => { | ||||
|   if (props.taskAssignRules) { | ||||
|     props.taskAssignRules.forEach(rule => { | ||||
|       formData.value[rule.taskDefinitionKey] = '' | ||||
|       formRules.value[rule.taskDefinitionKey] = [ | ||||
|         { | ||||
|           required: true, | ||||
|           message: '请选择候选人', | ||||
|           trigger: 'blur' | ||||
|         } | ||||
|       ] | ||||
|     }) | ||||
|   } | ||||
| }) | ||||
|  | ||||
| </script> | ||||
| @@ -483,10 +483,10 @@ const props = withDefaults(defineProps<Props>(), { | ||||
|   } | ||||
| }) | ||||
| const handleSetFormData = (key, val) => { | ||||
|   console.log(key); | ||||
|   console.log(val); | ||||
|   const cleaned = val.split('|').map(s => s.trim()).join(','); // "1975577437793124352 | 1965778349088899074" | ||||
|   console.log(cleaned); | ||||
|   // 在这里添加其他处理逻辑 | ||||
|   useFun.requestApi('get', '/jeelowcode/outsidePerson/importOutside?tableId='+props.tableId+'&ids=' + val, { | ||||
|   useFun.requestApi('get', '/jeelowcode/outsidePerson/importOutside?tableId='+props.tableId+'&ids=' + cleaned, { | ||||
|   }).then(res => { | ||||
|     if (res.length > 0) { | ||||
|         message.success('下发成功') | ||||
| @@ -548,6 +548,17 @@ const userVBind = { | ||||
|     }else if(props.tableId=='1968562717683908610'){ // 考试计划 | ||||
|         useFun.requestApi('get', '/jeelowcode/examIssus/addRecord?tableId='+props.tableId+'&ids=' + ids+'&userIds='+resultValue, { | ||||
|            | ||||
|         }).then(res => { | ||||
|           if (res.length > 0) { | ||||
|              message.success('下发成功') | ||||
|              useFun.refreshChange() | ||||
|           } else { | ||||
|             message.error(res.message) | ||||
|           } | ||||
|         }) | ||||
|     }else if(props.tableId=='1983351353033953281'){ // 工作事项 | ||||
|         useFun.requestApi('get', '/jeelowcode/itemIssus/addResult?tableId='+props.tableId+'&ids=' + ids+'&userIds='+resultValue, { | ||||
|            | ||||
|         }).then(res => { | ||||
|           if (res.length > 0) { | ||||
|              message.success('下发成功') | ||||
|   | ||||
| @@ -217,7 +217,7 @@ defineOptions({ name: 'UserSelect' }) | ||||
|  * all_sub 所有下级 | ||||
|  */ | ||||
|  | ||||
| interface Column { | ||||
| export interface Column { | ||||
|   label: string | ||||
|   findType: 'all' | 'now' | 'sub' | 'all_sub' | 'direct_sub' //查询类型 | ||||
|   columnKey: Array<'mobile' | 'email' | 'sex' | 'post' | 'deptName'> //扩展显示列 | ||||
|   | ||||
| @@ -34,7 +34,7 @@ const dicObj = { | ||||
|     { label: '邮箱', value: 'email' }, { label: '性别', value: 'sex' }, { label: '岗位', value: 'post' }, { label: '部门', value: 'deptName' } | ||||
|   ], | ||||
|   userFindType: [{ label: '全部用户', value: 'all' }, { label: '本级用户', value: 'now' }, { label: '本级及下级用户', value: 'sub' }], | ||||
|   deptFindType: [{ label: '全部部门', value: 'all' }, { label: '本级部门', value: 'now' }, { label: '本级及下级部门', value: 'sub' }], | ||||
|   deptFindType: [{ label: '全部部门', value: 'all' }, { label: '本级部门', value: 'now' }, { label: '本级及下级部门', value: 'sub' }, { label: '外协单位', value: 'out' }], | ||||
|   customControlType: [{ label: '未全局注册', value: false }, { label: '已全局注册', value: true }], | ||||
|   regionType: [{ label: '全球-国家', value: 'gj' }, { label: '中国-省市区', value: 'ssq' }, { label: '中国-省市', value: 'ss' }, { label: '中国-省', value: 's' }], | ||||
|   dictTextFormatter: [ | ||||
|   | ||||
| @@ -546,13 +546,15 @@ export const formDataFormatting = (formOption, formData, formType) => { | ||||
|           echoObj[dicKey].push(...data[key].split(',')) | ||||
|         } | ||||
|       } else echoObj[type].push(...data[key].split(',')) | ||||
|     } else if (column[key]?.controlType == 'date') { | ||||
|     } else if (column[key]?.controlType == 'date'||key=='create_time') { | ||||
|        | ||||
|       if (data[key]) { | ||||
|         if (typeof data[key] == 'number' || typeof data[key] == 'string') { | ||||
|           data[key] = data[key] + '' | ||||
|           if (!(/[-|\/]/g.test(data[key]))) { | ||||
|             //如果是时间戳强制转换 | ||||
|             data[key] = formatDate(new Date(data[key]), column[key].valueFormat || 'YYYY-MM-DD HH:mm:ss') | ||||
|             const timestamp = parseInt(data[key], 10) | ||||
|             data[key] = formatDate(new Date(timestamp), column[key].valueFormat || 'YYYY-MM-DD HH:mm:ss') | ||||
|           } | ||||
|         } | ||||
|       } | ||||
|   | ||||
| @@ -14,7 +14,7 @@ | ||||
|         <el-input v-model="formData.processInstanceKey" disabled placeholder="请输入流程标识" /> | ||||
|       </el-form-item> | ||||
|       <el-form-item label="规则类型" prop="type"> | ||||
|         <el-select v-model="formData.type" clearable style="width: 100%"> | ||||
|         <el-select v-model="formData.type" clearable style="width: 100%" disabled> | ||||
|           <el-option | ||||
|             v-for="dict in getIntDictOptions(DICT_TYPE.BPM_TASK_ASSIGN_RULE_TYPE)" | ||||
|             :key="dict.value" | ||||
| @@ -165,7 +165,7 @@ const open = async (row) => { | ||||
|   resetForm() | ||||
|   // 2. 再设置表单 | ||||
|   if (row != null) { | ||||
|     formData.value.type = undefined as unknown as number | ||||
|     formData.value.type = 30 | ||||
|     formData.value.taskName = row.name | ||||
|     formData.value.taskId = row.id | ||||
|     formData.value.processInstanceName = row.processInstance.name | ||||
|   | ||||
| @@ -41,6 +41,7 @@ | ||||
|             <Icon icon="ep:close" /> | ||||
|             不通过 | ||||
|           </el-button> | ||||
|           <!-- | ||||
|           <el-button type="primary" @click="openTaskUpdateAssigneeForm(item.id)"> | ||||
|             <Icon icon="ep:edit" /> | ||||
|             转办 | ||||
| @@ -53,6 +54,7 @@ | ||||
|             <Icon icon="ep:plus" /> | ||||
|             加签 | ||||
|           </el-button> | ||||
|           --> | ||||
|           <el-button type="warning" @click="handleBack(item)"> | ||||
|             <Icon icon="ep:back" /> | ||||
|             回退 | ||||
| @@ -233,6 +235,10 @@ const getProcessInstance = async () => { | ||||
|     if (processDefinition.formType === 10) { | ||||
|       detailForm.value.formId = processDefinition.formId | ||||
|       detailForm.value.optionsData = JSON.parse(processDefinition.formConf) | ||||
|       if (data.formVariables.jeelowcode_subtable_data) { | ||||
|         data.formVariables = { ...data.formVariables, ...data.formVariables.jeelowcode_subtable_data } | ||||
|         delete data.formVariables.jeelowcode_subtable_data | ||||
|       } | ||||
|       detailForm.value.defaultData = data.formVariables | ||||
|       // setConfAndFields2( | ||||
|       //   detailForm, | ||||
|   | ||||
| @@ -16,7 +16,7 @@ | ||||
|       @current-change="currentChange" | ||||
|     > | ||||
|       <template #category="{ row }"> | ||||
|         <dict-tag :type="DICT_TYPE.BPM_MODEL_CATEGORY" :value="row.category || ''" /> | ||||
|         <dict-tag :type="DICT_TYPE.BPM_MODEL_CATEGORY" :value="row.category || ''"/> | ||||
|       </template> | ||||
|       <template #status="scope"> | ||||
|         <dict-tag | ||||
| @@ -39,7 +39,8 @@ | ||||
|       </template> | ||||
|       <template #menu-left> | ||||
|         <el-button type="primary" v-hasPermi="['bpm:process-instance:query']" @click="handleCreate"> | ||||
|           <Icon icon="ep:plus" class="mr-5px" /> 发起流程 | ||||
|           <Icon icon="ep:plus" class="mr-5px"/> | ||||
|           发起流程 | ||||
|         </el-button> | ||||
|       </template> | ||||
|       <!-- 自定义操作栏 --> | ||||
| @@ -52,7 +53,7 @@ | ||||
|         > | ||||
|           详情 | ||||
|         </el-button> | ||||
|         <!-- <el-button | ||||
|         <el-button | ||||
|           link | ||||
|           type="danger" | ||||
|           v-if="row.result === 1" | ||||
| @@ -60,21 +61,21 @@ | ||||
|           @click="handleCancel(row)" | ||||
|         > | ||||
|           取消 | ||||
|         </el-button> --> | ||||
|         </el-button> | ||||
|       </template> | ||||
|     </avue-crud> | ||||
|   </ContentWrap> | ||||
| </template> | ||||
| <script lang="ts" setup> | ||||
| import { DICT_TYPE, getIntDictOptions } from '@/utils/dict' | ||||
| import { dateFormatter, getSearchDate } from '@/utils/formatTime' | ||||
| import {DICT_TYPE, getIntDictOptions} from '@/utils/dict' | ||||
| import {dateFormatter, getSearchDate} from '@/utils/formatTime' | ||||
| import * as ProcessInstanceApi from '@/api/bpm/processInstance' | ||||
|  | ||||
| defineOptions({ name: 'BpmCCProcessInstance' }) | ||||
| defineOptions({name: 'BpmCCProcessInstance'}) | ||||
| const router = useRouter() // 路由 | ||||
| const message = useMessage() // 消息弹窗 | ||||
| const { t } = useI18n() // 国际化 | ||||
| const { getCurrPermi } = useCrudPermi() | ||||
| const {t} = useI18n() // 国际化 | ||||
| const {getCurrPermi} = useCrudPermi() | ||||
|  | ||||
| const loading = ref(true) // 列表的加载中 | ||||
| const tableOption = reactive({ | ||||
| @@ -104,7 +105,7 @@ const tableOption = reactive({ | ||||
|       type: 'select', | ||||
|       span: 12, | ||||
|       dicData: getIntDictOptions(DICT_TYPE.BPM_MODEL_CATEGORY), | ||||
|       rules: [{ required: true, message: '流程分类不能为空', trigger: 'blur' }] | ||||
|       rules: [{required: true, message: '流程分类不能为空', trigger: 'blur'}] | ||||
|     }, | ||||
|     tasks: { | ||||
|       label: '当前审批任务' | ||||
| @@ -115,7 +116,7 @@ const tableOption = reactive({ | ||||
|       type: 'select', | ||||
|       span: 12, | ||||
|       dicData: getIntDictOptions(DICT_TYPE.BPM_PROCESS_INSTANCE_STATUS), | ||||
|       rules: [{ required: true, message: '状态不能为空', trigger: 'blur' }] | ||||
|       rules: [{required: true, message: '状态不能为空', trigger: 'blur'}] | ||||
|     }, | ||||
|     result: { | ||||
|       label: '结果', | ||||
| @@ -123,7 +124,7 @@ const tableOption = reactive({ | ||||
|       type: 'select', | ||||
|       span: 12, | ||||
|       dicData: getIntDictOptions(DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT), | ||||
|       rules: [{ required: true, message: '结果不能为空', trigger: 'blur' }] | ||||
|       rules: [{required: true, message: '结果不能为空', trigger: 'blur'}] | ||||
|     }, | ||||
|     createTime: { | ||||
|       label: '提交时间', | ||||
| @@ -203,7 +204,8 @@ const searchChange = (params, done) => { | ||||
|  | ||||
| /** 清空按钮操作 */ | ||||
| const resetChange = () => { | ||||
|   searchChange({}, () => {}) | ||||
|   searchChange({}, () => { | ||||
|   }) | ||||
| } | ||||
|  | ||||
| const sizeChange = (pageSize) => { | ||||
| @@ -218,7 +220,7 @@ const currentChange = (currentPage) => { | ||||
| /** 取消按钮操作 */ | ||||
| const handleCancel = async (row) => { | ||||
|   // 二次确认 | ||||
|   const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', { | ||||
|   const {value} = await ElMessageBox.prompt('请输入取消原因', '取消流程', { | ||||
|     confirmButtonText: t('common.ok'), | ||||
|     cancelButtonText: t('common.cancel'), | ||||
|     inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空,且非空格 | ||||
|   | ||||
							
								
								
									
										175
									
								
								src/views/bpm/task/copy/index.vue
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										175
									
								
								src/views/bpm/task/copy/index.vue
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,175 @@ | ||||
| <!-- 工作流,抄送我的流程 --> | ||||
| <template> | ||||
|   <ContentWrap> | ||||
|     <avue-crud | ||||
|       ref="crudRef" | ||||
|       v-model="tableForm" | ||||
|       v-model:page="tablePage" | ||||
|       v-model:search="tableSearch" | ||||
|       :data="tableData" | ||||
|       :option="tableOption" | ||||
|       :permission="permission" | ||||
|       @search-change="searchChange" | ||||
|       @search-reset="resetChange" | ||||
|       @refresh-change="getTableData" | ||||
|       @size-change="sizeChange" | ||||
|       @current-change="currentChange" | ||||
|     > | ||||
|       <template #menu="{ row }"> | ||||
|         <el-button link type="primary" @click="handleAudit(row)">流程</el-button> | ||||
|       </template> | ||||
|     </avue-crud> | ||||
|   </ContentWrap> | ||||
| </template> | ||||
| <script lang="ts" setup> | ||||
| import {dateFormatter} from '@/utils/formatTime' | ||||
| import * as ProcessInstanceApi from '@/api/bpm/processInstance' | ||||
|  | ||||
| defineOptions({ | ||||
|   name: 'BpmCopyTask' | ||||
| }) | ||||
|  | ||||
| // 路由 | ||||
| const {push} = useRouter() | ||||
| // 列表的加载中 | ||||
| const loading = ref(true) | ||||
|  | ||||
| const {getCurrPermi} = useCrudPermi() | ||||
|  | ||||
| // 表格的配置 | ||||
| const tableOption = reactive({ | ||||
|   addBtn: false, | ||||
|   editBtn: false, | ||||
|   delBtn: false, | ||||
|   viewBtn: true, | ||||
|   viewBtnText: '详情', | ||||
|   viewBtnIcon: 'none', | ||||
|   align: 'center', | ||||
|   headerAlign: 'center', | ||||
|   searchMenuSpan: 6, | ||||
|   searchMenuPosition: 'left', | ||||
|   labelSuffix: ' ', | ||||
|   span: 24, | ||||
|   dialogWidth: '50%', | ||||
|   column: { | ||||
|     taskId: { | ||||
|       label: '任务编号' | ||||
|     }, | ||||
|     taskName: { | ||||
|       label: '任务名称' | ||||
|     }, | ||||
|     processInstanceId: { | ||||
|       label: '流程编号', | ||||
|       search: true, | ||||
|     }, | ||||
|     processInstanceName: { | ||||
|       label: '所属流程', | ||||
|       search: true, | ||||
|     }, | ||||
|     startUserNickname: { | ||||
|       label: '流程发起人', | ||||
|     }, | ||||
|     reason: { | ||||
|       label: '抄送原因' | ||||
|     }, | ||||
|     creatorNickname: { | ||||
|       label: '抄送人' | ||||
|     }, | ||||
|     createTime: { | ||||
|       label: '抄送时间', | ||||
|       type: 'datetime', | ||||
|       width: 180, | ||||
|       formatter: (row: any, value: any, rowv: any, column: any) => { | ||||
|         return dateFormatter(row, column, value) | ||||
|       } | ||||
|     }, | ||||
|     searchCreateTime: { | ||||
|       label: '抄送时间', | ||||
|       display: false, | ||||
|       hide: true, | ||||
|       search: true, | ||||
|       searchType: 'datetimerange', | ||||
|       valueFormat: 'YYYY-MM-DD HH:mm:ss', | ||||
|       startPlaceholder: '开始时间', | ||||
|       endPlaceholder: '结束时间', | ||||
|       searchRange: true, | ||||
|     } | ||||
|   } | ||||
| }) | ||||
|  | ||||
| const tableForm = ref<any>({}) | ||||
| const tableData = ref([]) | ||||
| const tableSearch = ref<any>({}) | ||||
| const tablePage = ref({ | ||||
|   currentPage: 1, | ||||
|   pageSize: 10, | ||||
|   total: 0 | ||||
| }) | ||||
|  | ||||
| const permission = getCurrPermi(['bpm:task']) | ||||
|  | ||||
| const crudRef = ref() | ||||
| useCrudHeight(crudRef) | ||||
|  | ||||
| const getTableData = async () => { | ||||
|   // 列表的加载中... | ||||
|   loading.value = true | ||||
|   // 拼接查询参数 | ||||
|   let searchObj = { | ||||
|     ...tableSearch.value, | ||||
|     pageNo: tablePage.value.currentPage, | ||||
|     pageSize: tablePage.value.pageSize | ||||
|   } | ||||
|   // 处理时间参数,如果为空则去掉这个属性 | ||||
|   if (!searchObj.createTime?.length) delete searchObj.createTime | ||||
|   // 去掉空字符串属性 | ||||
|   for (let key in searchObj) if (searchObj[key] === '') delete searchObj[key] | ||||
|  | ||||
|   // 请求我的待阅数据 | ||||
|   try { | ||||
|     const data = await ProcessInstanceApi.getProcessInstanceCCPage(searchObj) | ||||
|     tableData.value = data.list | ||||
|     tablePage.value.total = data.total | ||||
|   } finally { | ||||
|     // 无论请求成功或者失败,这里都需要将加载中关闭 | ||||
|     loading.value = false | ||||
|   } | ||||
|  | ||||
| } | ||||
|  | ||||
| const searchChange = (params: any, done: any) => { | ||||
|   tablePage.value.currentPage = 1 | ||||
|   // 获取数据 | ||||
|   getTableData().finally(() => done()) | ||||
| } | ||||
|  | ||||
| const resetChange = () => { | ||||
|   searchChange({}, () => { | ||||
|   }) | ||||
| } | ||||
|  | ||||
| const sizeChange = (pageSize) => { | ||||
|   tablePage.value.pageSize = pageSize | ||||
|   resetChange() | ||||
| } | ||||
|  | ||||
| const currentChange = (currentPage) => { | ||||
|   tablePage.value.currentPage = currentPage | ||||
|   getTableData() | ||||
| } | ||||
|  | ||||
| const handleAudit = (row: any) => { | ||||
|   push({ | ||||
|     name: 'BpmProcessInstanceDetail', | ||||
|     query: { | ||||
|       id: row.processInstanceId | ||||
|     } | ||||
|   }) | ||||
| } | ||||
|  | ||||
| /** 初始化 **/ | ||||
| onMounted(async () => { | ||||
|   await getTableData() | ||||
| }) | ||||
|  | ||||
| </script> | ||||
| @@ -26,7 +26,7 @@ | ||||
|       </template> | ||||
|       <template #menu="{ row }"> | ||||
|         <el-button link type="primary" @click="handleAudit(row)">审批</el-button> | ||||
| <!--        <el-button link type="primary" @click="handleCC(row)">抄送</el-button>--> | ||||
|         <el-button link type="primary" @click="handleCC(row)">抄送</el-button> | ||||
|       </template> | ||||
|     </avue-crud> | ||||
|     <TaskCCDialogForm ref="taskCCDialogForm" /> | ||||
|   | ||||
| @@ -32,22 +32,22 @@ | ||||
|   </ContentWrap> | ||||
| </template> | ||||
| <script lang="ts" setup> | ||||
| import { DICT_TYPE, getIntDictOptions } from '@/utils/dict' | ||||
| import {DICT_TYPE, getIntDictOptions} from '@/utils/dict' | ||||
| import * as TaskAssignRuleApi from '@/api/bpm/taskAssignRule' | ||||
| import * as RoleApi from '@/api/system/role' | ||||
| import * as PostApi from '@/api/system/post' | ||||
| import * as UserGroupApi from '@/api/bpm/userGroup' | ||||
| import { setUserAndDeptName } from '@/components/LowDesign/src/utils/getName' | ||||
| import { useLowStoreWithOut } from '@/store/modules/low' | ||||
| import {setUserAndDeptName} from '@/components/LowDesign/src/utils/getName' | ||||
| import {useLowStoreWithOut} from '@/store/modules/low' | ||||
|  | ||||
| const message = useMessage() // 消息弹窗 | ||||
| const { t } = useI18n() // 国际化 | ||||
| const { getCurrPermi } = useCrudPermi() | ||||
| const {t} = useI18n() // 国际化 | ||||
| const {getCurrPermi} = useCrudPermi() | ||||
| const lowStore = useLowStoreWithOut() | ||||
|  | ||||
| defineOptions({ name: 'BpmTaskAssignRule' }) | ||||
| defineOptions({name: 'BpmTaskAssignRule'}) | ||||
|  | ||||
| const { query } = useRoute() // 查询参数 | ||||
| const {query} = useRoute() // 查询参数 | ||||
|  | ||||
| const loading = ref(true) | ||||
| const getRules = (label) => { | ||||
| @@ -65,6 +65,7 @@ const getUserKey = (val) => { | ||||
|   else if ([20, 21].includes(val)) key = 'deptIds' | ||||
|   else if (val == 22) key = 'postIds' | ||||
|   else if ([30, 31, 32].includes(val)) key = 'userIds' | ||||
|   else if (val == 35) key = 'userSelects' | ||||
|   else if (val == 40) key = 'userGroupIds' | ||||
|   else if (val == 50) key = 'scripts' | ||||
|   return key | ||||
| @@ -81,8 +82,8 @@ const tableOption = reactive({ | ||||
|   delBtn: false, | ||||
|   calcHeight: 20, | ||||
|   column: { | ||||
|     taskDefinitionName: { label: '任务名', disabled: true }, | ||||
|     taskDefinitionKey: { label: '任务标识', disabled: true }, | ||||
|     taskDefinitionName: {label: '任务名', disabled: true}, | ||||
|     taskDefinitionKey: {label: '任务标识', disabled: true}, | ||||
|     type: { | ||||
|       label: '规则类型', | ||||
|       type: 'select', | ||||
| @@ -90,12 +91,13 @@ const tableOption = reactive({ | ||||
|       rules: getRules('规则类型'), | ||||
|       control: (val) => { | ||||
|         const columnObj = { | ||||
|           roleIds: { display: false }, | ||||
|           deptIds: { display: false }, | ||||
|           postIds: { display: false }, | ||||
|           userIds: { display: false }, | ||||
|           userGroupIds: { display: false }, | ||||
|           scripts: { display: false } | ||||
|           roleIds: {display: false}, | ||||
|           deptIds: {display: false}, | ||||
|           postIds: {display: false}, | ||||
|           userIds: {display: false}, | ||||
|           userGroupIds: {display: false}, | ||||
|           scripts: {display: false}, | ||||
|           userSelects: {display: false}, | ||||
|         } | ||||
|         const key = getUserKey(val) | ||||
|         if (key) columnObj[key].display = true | ||||
| @@ -112,6 +114,7 @@ const tableOption = reactive({ | ||||
|         let arr = row.options.map((id) => { | ||||
|           if (key == 'deptIds') return lowStore.dicObj.deptSelect?.[id] || id | ||||
|           else if (key == 'userIds') return lowStore.dicObj.userSelect?.[id] || id | ||||
|           else if (key == 'userSelects') return '' | ||||
|           else return dicObj.value[key][id] | ||||
|         }) | ||||
|  | ||||
| @@ -198,7 +201,7 @@ const rowUpdate = async (form, index, done, loading) => { | ||||
|   const delKey = ['roleIds', 'deptIds', 'postIds', 'userIds', 'userGroupIds', 'scripts'] | ||||
|   if (key) { | ||||
|     if (typeof form[key] == 'number') form[key] = form[key] + '' | ||||
|     const value = form[key] | ||||
|     const value = key === 'userSelects' ? '' : form[key] | ||||
|     form.options = typeof value == 'string' ? value.split(',') : value | ||||
|   } | ||||
|   delKey.forEach((prop) => delete form[prop]) | ||||
| @@ -228,14 +231,14 @@ const getDicData = () => { | ||||
|         const id = item.id + '' | ||||
|         const name = item.name | ||||
|         dicObj.value[key][id] = name | ||||
|         return { label: name, value: id } | ||||
|         return {label: name, value: id} | ||||
|       }) | ||||
|     }) | ||||
|     dicObj.value.scripts = {} | ||||
|     tableOption.column.scripts.dicData = getIntDictOptions(DICT_TYPE.BPM_TASK_ASSIGN_SCRIPT).map( | ||||
|       (item) => { | ||||
|         dicObj.value.scripts[item.value] = item.label | ||||
|         return { value: item.value + '', label: item.label } | ||||
|         return {value: item.value + '', label: item.label} | ||||
|       } | ||||
|     ) as never[] | ||||
|     dicObj.value.type = {} | ||||
| @@ -262,7 +265,7 @@ const formattingTableData = (data): Promise<any[]> => { | ||||
|       } | ||||
|       return item | ||||
|     }) | ||||
|     await setUserAndDeptName({ userIdList, deptIdList }) | ||||
|     await setUserAndDeptName({userIdList, deptIdList}) | ||||
|     resolve(data) | ||||
|   }) | ||||
| } | ||||
|   | ||||
| @@ -70,7 +70,8 @@ | ||||
|           </div> | ||||
|           <div class="bottom-card"> | ||||
|             <div class="bottom-card-title"> | ||||
|               <span>隐患排查治理</span> | ||||
|               <!-- 隐患排查治理 标题需要隐藏 2025-10-31 --> | ||||
|               <span></span> | ||||
|               <img width="50%" style="margin: 8px 0" src="@/assets/images/line_1.png" /> | ||||
|             </div> | ||||
|             <div class="type-wrapper"> | ||||
|   | ||||
| @@ -1,9 +1,10 @@ | ||||
| <template> | ||||
|   <div class="center-container"> | ||||
|     <div class="center-content"> | ||||
|       <span class="title">隐患排查治理</span> | ||||
|       <!-- 隐患排查治理 这个标题需要隐藏 2025-10-31 --> | ||||
|       <span class="title"></span> | ||||
|       <img class="bottom-border-line" src="@/assets/images/title_border_line_1.png" /> | ||||
|       <span class="sub-title">分类风险</span> | ||||
|       <span class="sub-title">隐患等级</span> | ||||
|       <img width="50%" src="@/assets/images/line_1.png" /> | ||||
|  | ||||
|       <div class="type-wrapper"> | ||||
|   | ||||
| @@ -33,9 +33,10 @@ | ||||
|  | ||||
|       <div class="center-container"> | ||||
|         <div class="center-content"> | ||||
|           <span class="title">隐患排查治理</span> | ||||
|           <!-- 隐患排查治理 --> | ||||
|           <span class="title"></span> | ||||
|           <img class="bottom-border-line" src="@/assets/images/title_border_line_1.png" /> | ||||
|           <span class="sub-title">分类风险</span> | ||||
|           <span class="sub-title">隐患等级</span> | ||||
|           <img width="50%" src="@/assets/images/line_1.png" /> | ||||
|           <div class="type-wrapper"> | ||||
|             <div class="type-item"> | ||||
|   | ||||
| @@ -60,7 +60,8 @@ | ||||
|           </div> | ||||
|           <div class="bottom-card"> | ||||
|             <div class="bottom-card-title"> | ||||
|               <span>隐患排查治理</span> | ||||
|               <!--隐患排查治理--> | ||||
|               <span></span> | ||||
|               <img width="50%" style="margin: 8px 0" src="@/assets/images/line_1.png" /> | ||||
|             </div> | ||||
|             <div class="type-wrapper"> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user