style：设备台账-新增/编辑-供应商、所属车间、组织字段改为输入框，责任人多选

4 weeks ago · 6c589adb1d
parent d9728769f1
commit 6c589adb1d
2 changed files with 51 additions and 105 deletions
--- a/src/views/mes/deviceledger/DeviceLedgerForm.vue
+++ b/src/views/mes/deviceledger/DeviceLedgerForm.vue
@ -59,13 +59,18 @@

        <el-col :span="12">
          <el-form-item label="供应商" prop="supplier">
+            <el-input v-model="formData.supplier" placeholder="请输入供应商" />
+            <!--
            <el-select v-model="formData.supplier" placeholder="请选择供应商" clearable filterable class="!w-full">
              <el-option v-for="item in supplierOptions" :key="item" :label="item" :value="item" />
            </el-select>
+            -->
          </el-form-item>
        </el-col>
        <el-col :span="12">
          <el-form-item label="所属车间" prop="workshop">
+            <el-input v-model="formData.workshop" placeholder="请输入所属车间" />
+            <!--
            <el-tree-select
              v-model="formData.workshop"
              :data="deptTree"
@ -76,6 +81,7 @@
              placeholder="请选择所属车间"
              class="!w-full"
            />
+            -->
          </el-form-item>
        </el-col>

@ -98,7 +104,9 @@
        </el-col>

        <el-col :span="24">
-          <el-form-item label="部门" prop="systemOrg">
+          <el-form-item label="所属系统组织" prop="systemOrg">
+            <el-input v-model="formData.systemOrg" placeholder="请输入所属系统组织" />
+            <!--
            <el-tree-select
              v-model="formData.systemOrg"
              :data="deptTree"
@ -109,15 +117,24 @@
              placeholder="请选择部门"
              class="!w-full"
            />
+            -->
          </el-form-item>
        </el-col>

        <el-col :span="24">
-          <el-form-item label="责任人" prop="deviceManager">
-            <div class="device-ledger-manager">
-              <el-input v-model="formData.deviceManager" placeholder="请选择数据" readonly />
-              <el-button type="primary" plain @click="openUserPicker">选择</el-button>
-            </div>
+          <el-form-item label="责任人" prop="deviceManagerIds">
+            <el-select
+              v-model="formData.deviceManagerIds"
+              multiple
+              filterable
+              clearable
+              collapse-tags
+              collapse-tags-tooltip
+              placeholder="请选择责任人"
+              class="!w-full"
+            >
+              <el-option v-for="item in users" :key="item.id" :label="item.nickname" :value="item.id" />
+            </el-select>
          </el-form-item>
        </el-col>

@ -134,27 +151,11 @@
    </template>
  </Dialog>

-  <Dialog title="选择责任人" v-model="userPickerVisible" width="720px">
-    <el-input v-model="userKeyword" placeholder="搜索用户" clearable class="mb-12px" />
-    <el-table :data="filteredUsers" height="420">
-      <el-table-column label="账号" prop="username" />
-      <el-table-column label="姓名" prop="nickname" />
-      <el-table-column label="操作" width="120">
-        <template #default="scope">
-          <el-button link type="primary" @click="selectUser(scope.row)">选择</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-  </Dialog>
 </template>
 <script setup lang="ts">
-import { computed } from 'vue'
 import { DeviceLedgerApi, DeviceLedgerVO } from '@/api/mes/deviceledger'
 import { DeviceTypeApi, DeviceTypeTreeVO } from '@/api/mes/devicetype'
-import { SupplierApi } from '@/api/erp/purchase/supplier'
-import { getSimpleDeptList } from '@/api/system/dept'
 import { getSimpleUserList, UserVO } from '@/api/system/user'
-import { handleTree } from '@/utils/tree'
 import type { FormRules } from 'element-plus'

 /** 设备类型 表单 */
@ -167,7 +168,17 @@ const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
-const formData = ref({
+
+const parseIdsValue = (value: any): number[] => {
+  if (!value) return []
+  if (Array.isArray(value)) return value.map((v) => Number(v)).filter((v) => !Number.isNaN(v))
+  return String(value)
+    .split(',')
+    .map((v) => Number(v.trim()))
+    .filter((v) => !Number.isNaN(v))
+}
+
+const initFormData = () => ({
  id: undefined,
  deviceCode: undefined,
  deviceName: undefined,
@ -180,12 +191,16 @@ const formData = ref({
  workshop: undefined,
  deviceLocation: undefined,
  systemOrg: undefined,
-  deviceManager: undefined,
+  deviceManagerIds: [] as number[],
  productionDate: undefined,
  factoryEntryDate: undefined,
  remark: undefined,
  sort: undefined
 })
+
+const formData = ref({
+  ...initFormData()
+})
 const formRules = reactive<FormRules>({
  deviceCode: [{ required: true, message: '编码不能为空', trigger: 'blur' }],
  deviceName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
@ -197,66 +212,14 @@ const formRef = ref() // 表单 Ref

 const treeSelectProps = { label: 'name', children: 'children' }
 const deviceTypeTree = ref<DeviceTypeTreeVO[]>([])
-const deptTree = ref<any[]>([])
-const supplierOptions = ref<string[]>([])
-const deptNameMap = ref<Record<number, string>>({})
-const deptIdMap = ref<Record<string, number>>({})
-
-const userPickerVisible = ref(false)
-const userKeyword = ref('')
 const users = ref<UserVO[]>([])
-const filteredUsers = computed(() => {
-  const keyword = userKeyword.value?.trim().toLowerCase()
-  if (!keyword) return users.value
-  return users.value.filter((u) =>
-    [u.username, u.nickname].some((v) => (v ?? '').toString().toLowerCase().includes(keyword))
-  )
-})
-
-const openUserPicker = () => {
-  userPickerVisible.value = true
-}
-
-const selectUser = (user: UserVO) => {
-  formData.value.deviceManager = user.nickname
-  userPickerVisible.value = false
-}
-
-const buildDeptNameMap = (nodes: any[]) => {
-  const map: Record<number, string> = {}
-  const reverseMap: Record<string, number> = {}
-  const stack = [...nodes]
-  while (stack.length) {
-    const node = stack.pop()!
-    if (typeof node.id === 'number') {
-      map[node.id] = node.name
-      if (node.name) reverseMap[String(node.name)] = node.id
-    }
-    if (Array.isArray(node.children) && node.children.length) stack.push(...node.children)
-  }
-  deptNameMap.value = map
-  deptIdMap.value = reverseMap
-}
-
-const normalizeDeptValue = (value: any) => {
-  if (value === undefined || value === null || value === '') return undefined
-  if (typeof value === 'number') return value
-  const byName = deptIdMap.value[String(value)]
-  return byName === undefined ? undefined : byName
-}

 const ensureOptionsLoaded = async () => {
-  const [deviceTypeRes, supplierRes, deptRes, userRes] = await Promise.all([
+  const [deviceTypeRes, userRes] = await Promise.all([
    DeviceTypeApi.getDeviceTypeTree({ pageNo: 1, pageSize: 10 }),
-    SupplierApi.getSupplierSimpleList(),
-    getSimpleDeptList(),
    getSimpleUserList()
  ])
  deviceTypeTree.value = deviceTypeRes
-  supplierOptions.value = (supplierRes ?? []).map((item: any) => item.name).filter((v: any) => typeof v === 'string')
-  const tree = handleTree(deptRes, 'id', 'parentId')
-  deptTree.value = tree
-  buildDeptNameMap(tree)
  users.value = userRes ?? []
 }

@ -275,9 +238,12 @@ const open = async (type: string, id?: number, defaultDeviceTypeId?: number) =>
  if (id) {
    formLoading.value = true
    try {
-      formData.value = await DeviceLedgerApi.getDeviceLedger(id)
-      formData.value.workshop = normalizeDeptValue((formData.value as any).workshop)
-      formData.value.systemOrg = normalizeDeptValue((formData.value as any).systemOrg)
+      const detail = await DeviceLedgerApi.getDeviceLedger(id)
+      formData.value = {
+        ...initFormData(),
+        ...(detail as any),
+        deviceManagerIds: parseIdsValue((detail as any)?.deviceManager)
+      }
    } finally {
      formLoading.value = false
    }
@ -293,13 +259,11 @@ const submitForm = async () => {
  // 提交请求
  formLoading.value = true
  try {
-    const workshopId = formData.value.workshop
-    const systemOrgId = formData.value.systemOrg
    const data = {
      ...(formData.value as any),
-      workshop: typeof workshopId === 'number' ? deptNameMap.value[workshopId] : undefined,
-      systemOrg: typeof systemOrgId === 'number' ? deptNameMap.value[systemOrgId] : undefined
+      deviceManager: formData.value.deviceManagerIds?.length ? formData.value.deviceManagerIds.join(',') : undefined
    } as unknown as DeviceLedgerVO
+    delete (data as any).deviceManagerIds
    if (formType.value === 'create') {
      await DeviceLedgerApi.createDeviceLedger(data)
      message.success(t('common.createSuccess'))
@ -317,25 +281,7 @@ const submitForm = async () => {

 /** 重置表单 */
 const resetForm = () => {
-  formData.value = {
-    id: undefined,
-    deviceCode: undefined,
-    deviceName: undefined,
-    deviceStatus: undefined,
-    deviceBrand: undefined,
-    deviceModel: undefined,
-    deviceSpec: undefined,
-    deviceType: undefined,
-    supplier: undefined,
-    workshop: undefined,
-    deviceLocation: undefined,
-    systemOrg: undefined,
-    deviceManager: undefined,
-    productionDate: undefined,
-    factoryEntryDate: undefined,
-    remark: undefined,
-    sort: undefined
-  }
+  formData.value = initFormData()
  formRef.value?.resetFields()
 }
 </script>
--- a/src/views/mes/deviceledger/index.vue
+++ b/src/views/mes/deviceledger/index.vue
@ -119,9 +119,9 @@
          <el-table-column label="所属车间" align="center" prop="workshop" width="110px"/>
          <el-table-column label="位置" align="center" prop="deviceLocation" />
          <el-table-column label="使用部门" align="center" prop="systemOrg" width="110px"/>
-          <el-table-column label="责任人" align="center" prop="deviceManager" width="110px"/>
+          <el-table-column label="责任人" align="center" prop="deviceManagerName" width="110px"/>
          <el-table-column label="备注" align="center" prop="remark" />
-          <el-table-column label="创建人" align="center" prop="creator" />
+          <el-table-column label="创建人" align="center" prop="creatorName" width="120px"/>
          <el-table-column label="创建时间" align="center" prop="createTime" :formatter="dateFormatter" width="180px" />
          <el-table-column label="更新时间" align="center" prop="updateTime" :formatter="dateFormatter" width="180px" />
          <el-table-column label="操作" align="center" min-width="160px" fixed="right">