feat(screen): 隐藏隐患排查治理标题并调整子标题

- 在 companyScreen.vue 中隐藏“隐患排查治理”标题 - 在 HiddenDangerPanel.vue 中将“分类风险”更改为“隐患等级” - 在 mainScreenV1.vue 中同步修改标题和子标题显示逻辑 - 在 parkScreen.vue 中隐藏“隐患排查治理”标题
Merge branch 'dev' of http://120.46.213.136:9528/isoftstone/lc_frontend into dev
2025-10-31 14:58:49 +08:00 · 2025-10-30 17:12:03 +08:00 · 2025-10-30 17:11:59 +08:00 · 2025-10-30 15:22:30 +08:00 · 2025-10-27 11:42:55 +08:00
11 changed files with 163 additions and 32 deletions
--- a/src/components/BpmTaskAssign/TaskSelectAssigneeForm.vue
+++ b/src/components/BpmTaskAssign/TaskSelectAssigneeForm.vue
@@ -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>
--- a/src/components/LowDesign/src/LowTable/index.vue
+++ b/src/components/LowDesign/src/LowTable/index.vue
@@ -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('下发成功')
--- a/src/components/LowDesign/src/shareControl/UserSelect.vue
+++ b/src/components/LowDesign/src/shareControl/UserSelect.vue
@@ -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'> //扩展显示列
--- a/src/components/LowDesign/src/utils/controlOption.ts
+++ b/src/components/LowDesign/src/utils/controlOption.ts
@@ -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: [
--- a/src/components/LowDesign/src/utils/formUtil.ts
+++ b/src/components/LowDesign/src/utils/formUtil.ts
@@ -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')
          }
        }
      }
--- a/src/views/bpm/processInstance/detail/index.vue
+++ b/src/views/bpm/processInstance/detail/index.vue
@@ -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,
--- a/src/views/bpm/taskAssignRule/index.vue
+++ b/src/views/bpm/taskAssignRule/index.vue
@@ -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)
  })
 }
--- a/src/views/screen/companyScreen.vue
+++ b/src/views/screen/companyScreen.vue
@@ -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">
--- a/src/views/screen/components/HiddenDangerPanel.vue
+++ b/src/views/screen/components/HiddenDangerPanel.vue
@@ -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">
--- a/src/views/screen/mainScreenV1.vue
+++ b/src/views/screen/mainScreenV1.vue
@@ -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">
--- a/src/views/screen/parkScreen.vue
+++ b/src/views/screen/parkScreen.vue
@@ -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">
Author	SHA1	Message	Date
yang chen	20680032bc	feat(screen): 隐藏隐患排查治理标题并调整子标题 - 在 companyScreen.vue 中隐藏“隐患排查治理”标题 - 在 HiddenDangerPanel.vue 中将“分类风险”更改为“隐患等级” - 在 mainScreenV1.vue 中同步修改标题和子标题显示逻辑 - 在 parkScreen.vue 中隐藏“隐患排查治理”标题	2025-10-31 14:58:49 +08:00
李奋勇	aa5f1f5b9b	Merge branch 'dev' of http://120.46.213.136:9528/isoftstone/lc_frontend into dev	2025-10-30 17:12:03 +08:00
李奋勇	6f4be5956e	部门选择外协单位选项优化	2025-10-30 17:11:59 +08:00
yang chen	5d07ca6d0e	feat(bpm): 新增任务分配规则支持自定义用户选择 - 在任务分配规则中增加 userSelects 类型支持 - 新增 TaskSelectAssigneeForm 组件用于选择任务候选人 - 更新 UserSelect 组件导出 Column 接口- 调整任务分配表单逻辑以适配新的用户选择类型- 优化任务分配规则获取与展示逻辑	2025-10-30 15:22:30 +08:00
yang chen	5a1567dc34	feat(bpm): 隐藏流程实例详情中的转办和加签按钮 - 注释掉了任务转办功能按钮 - 注释掉了任务加签功能按钮 -保留了其他操作按钮的功能逻辑	2025-10-27 11:42:55 +08:00