组织关联设备台账

src/api/mes/deviceledger/index.ts

@@ -33,6 +33,7 @@ export interface DeviceLedgerVO {
   inspectionList?: any[]
   maintainList?: any[]
   creator?: string // 创建人
+  creatorName?: string
   createTime?: string | number | Date
   updateTime?: string | number | Date
   sort: number // 排序
@@ -45,8 +46,12 @@ export const DeviceLedgerApi = {
     return await request.get({ url: `/mes/device-ledger/page`, params })
   },
 
-  getDeviceLedgerList: async (params: any) => {
-    return await request.get({ url: `/mes/device-ledger/list`, params })
+  getDeviceLedgerList: async () => {
+    return await request.get({ url: `/mes/device-ledger/list` })
+  },
+
+  getDeviceLedgerListByNoUsed: async () => {
+    return await request.get({ url: `/mes/device-ledger/noUsedlist` })
   },
 
   // 查询设备类型详情

src/api/mes/machine/index.ts

@@ -58,7 +58,7 @@ export const MachineComponentApi = {
   },
 
   // 查询产线和机台列表
-  getPipelineAndMachineList: async (params) => {
-    return await request.get({ url: `/mes/machine-component/listPipelineAndMachine`, params })
+  getPipelineAndMachineList: async () => {
+    return await request.get({ url: `/mes/machine-component/listPipelineAndMachine` })
   },
 }

src/api/mes/organization/index.ts

@@ -40,8 +40,8 @@ export type DeviceParameterAnalysisNodeVO = {
 // 产线工位 API
 export const OrganizationApi = {
   // 查询产线工位列表
-  getOrganizationList: async (params) => {
-    return await request.get({ url: `/mes/organization/list`, params })
+  getOrganizationList: async () => {
+    return await request.get({ url: `/mes/organization/list` })
   },
   getListOrgWorker: async (params) => {
     return await request.get({ url: `/mes/organization/listOrgWorker`, params })

src/locales/en.ts

@@ -552,7 +552,9 @@ export default {
       moldName: 'Name',
       moldRemark: 'Remark',
       fileUrl: 'File',
-      serialNumber: 'No.'
+      serialNumber: 'No.',
+      dvName: 'Device Name',
+      dvId: 'Please select device'
     },
     // Critical Component
     EquipmentKeyItems: {

src/locales/zh-CN.ts

@@ -548,7 +548,9 @@ export default {
       moldName: '名称',
       moldRemark: '备注',
       fileUrl: '资料',
-      serialNumber: '序号'
+      serialNumber: '序号',
+      dvName: '关联采集设备',
+      dvId: '请选择设备'
     },
     // 设备关键件
     EquipmentKeyItems: {

src/views/mes/deviceledger/DeviceLedgerForm.vue

@@ -137,11 +137,17 @@
         </el-col>
 
         <el-col :span="24">
-          <el-form-item :label="t('EquipmentManagement.EquipmentLedger.remark')" prop="remark">
-            <el-input v-model="formData.remark" :placeholder="t('EquipmentManagement.EquipmentLedger.placeholderRemark')" type="textarea" />
-          </el-form-item>
+          <el-form-item :label="t('EquipmentManagement.EquipmentLedger.dvName')" prop="dvId">
+        <el-select v-model="formData.dvId" filterable :placeholder="t('EquipmentManagement.EquipmentLedger.dvId')">
+          <el-option
+            v-for="item in deviceList"
+            :key="item.id"
+            :label="item.deviceName"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
         </el-col>
-
         <el-col :span="24">
           <el-form-item :label="t('EquipmentManagement.EquipmentLedger.criticalComponent')" prop="componentIds">
             <el-select
@@ -187,6 +193,11 @@
             <UploadFile :is-show-tip="false" v-model="formData.fileUrl" :limit="1" />
           </el-form-item>
         </el-col>
+        <el-col :span="24">
+          <el-form-item :label="t('EquipmentManagement.EquipmentLedger.remark')" prop="remark">
+            <el-input v-model="formData.remark" :placeholder="t('EquipmentManagement.EquipmentLedger.placeholderRemark')" type="textarea" />
+          </el-form-item>
+        </el-col>
       </el-row>
     </el-form>
     <template #footer>
@@ -204,6 +215,7 @@ import { getSimpleUserList, UserVO } from '@/api/system/user'
 import { formatDate } from '@/utils/formatTime'
 import type { FormRules } from 'element-plus'
 import { ProductApi } from '@/api/erp/product/product'
+import { DeviceApi,DeviceVO } from '@/api/iot/device'
 
 /** 设备类型 表单 */
 defineOptions({ name: 'DeviceLedgerForm' })
@@ -215,6 +227,7 @@ const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const deviceList = ref<DeviceVO[]>([]) // 列表
 
 const parseIdsValue = (value: any): number[] => {
   if (!value) return []
@@ -260,7 +273,8 @@ const initFormData = () => ({
   componentIds: [] as number[],
   beijianIds: [] as number[],
   fileUrl: undefined,
-  sort: undefined
+  sort: undefined,
+  dvId: undefined
 })
 
 const formData = ref({
@@ -311,7 +325,7 @@ const open = async (type: string, id?: number, defaultDeviceTypeId?: number) =>
   formType.value = type
   resetForm()
   await ensureOptionsLoaded()
-
+  deviceList.value = await DeviceApi.getDeviceList()
   if (type === 'create' && defaultDeviceTypeId) {
     formData.value.deviceType = defaultDeviceTypeId
   }

src/views/mes/deviceledger/index.vue

@@ -86,13 +86,14 @@ ref="tableRef" v-loading="loading" :data="list" :stripe="true" :show-overflow-to
             width="140px" />
           <!-- <el-table-column :label="t('EquipmentManagement.EquipmentLedger.supplier')" align="center" prop="supplier" width="110px" /> -->
           <!-- <el-table-column :label="t('EquipmentManagement.EquipmentLedger.workshop')" align="center" prop="workshop" width="110px" /> -->
+          <el-table-column :label="t('EquipmentManagement.EquipmentLedger.workshop')" align="center" prop="workshopName" min-width="150px" />
           <el-table-column :label="t('EquipmentManagement.EquipmentLedger.deviceLocation')" align="center" prop="deviceLocation" min-width="150px" />
           <!-- <el-table-column :label="t('EquipmentManagement.EquipmentLedger.systemOrg')" align="center" prop="systemOrg" width="110px" /> -->
           <el-table-column :label="t('EquipmentManagement.EquipmentLedger.deviceManagerName')" align="center" prop="deviceManagerName" width="150px" />
           <el-table-column :label="t('EquipmentManagement.EquipmentLedger.remark')" align="center" prop="remark" />
-          <el-table-column :label="t('EquipmentManagement.EquipmentLedger.creatorName')" align="center" prop="creatorName" width="150px" />
-          <el-table-column :label="t('EquipmentManagement.EquipmentLedger.createTime')" align="center" prop="createTime" :formatter="dateFormatter" width="180px" />
-          <el-table-column :label="t('EquipmentManagement.EquipmentLedger.updateTime')" align="center" prop="updateTime" :formatter="dateFormatter" width="180px" />
+          <!-- <el-table-column :label="t('EquipmentManagement.EquipmentLedger.creatorName')" align="center" prop="creatorName" width="150px" />
+          <el-table-column :label="t('EquipmentManagement.EquipmentLedger.createTime')" align="center" prop="createTime" :formatter="dateFormatter" width="180px" /> -->
+          <!-- <el-table-column :label="t('EquipmentManagement.EquipmentLedger.updateTime')" align="center" prop="updateTime" :formatter="dateFormatter" width="180px" /> -->
           <el-table-column :label="t('EquipmentManagement.EquipmentLedger.operate')" align="center" min-width="160px" fixed="right">
             <template #default="scope">
               <el-button link @click="handleDetail(scope.row.id)">{{ t('EquipmentManagement.EquipmentLedger.detail') }}</el-button>
@@ -135,7 +136,7 @@ link type="danger" @click="handleDelete(scope.row.id)"
             }}</el-tag>
           </el-descriptions-item>
           <!-- <el-descriptions-item :label="t('EquipmentManagement.EquipmentLedger.supplier')">{{ detailData?.supplier ?? '' }}</el-descriptions-item> -->
-          <el-descriptions-item :label="t('EquipmentManagement.EquipmentLedger.workshop')">{{ detailData?.workshop ?? '' }}</el-descriptions-item>
+          <!-- <el-descriptions-item :label="t('EquipmentManagement.EquipmentLedger.workshop')">{{ detailData?.workshop ?? '' }}</el-descriptions-item> -->
           <!-- <el-descriptions-item :label="t('EquipmentManagement.EquipmentLedger.systemOrg')">{{ detailData?.systemOrg ?? '' }}</el-descriptions-item> -->
           <el-descriptions-item :label="t('EquipmentManagement.EquipmentLedger.deviceLocation')">{{ detailData?.deviceLocation ?? '' }}</el-descriptions-item>
           <el-descriptions-item :label="t('EquipmentManagement.EquipmentLedger.deviceManagerName')">{{ detailData?.deviceManagerName ?? '' }}</el-descriptions-item>
@@ -144,8 +145,19 @@ link type="danger" @click="handleDelete(scope.row.id)"
           }}</el-descriptions-item>
           <el-descriptions-item :label="t('EquipmentManagement.EquipmentLedger.remark')">{{ detailData?.remark ?? detailData?.deviceRemark ?? ''
           }}</el-descriptions-item>
-        </el-descriptions>
+          <el-descriptions-item :label="t('EquipmentManagement.EquipmentLedger.creatorName')">{{ detailData?.creatorName ?? '' }}</el-descriptions-item>
+          <el-descriptions-item :label="t('EquipmentManagement.EquipmentLedger.createTime')">{{ formatDetailDate(detailData?.createTime) }}</el-descriptions-item>
+          <el-descriptions-item :label="t('EquipmentManagement.EquipmentLedger.updateTime')">{{ formatDetailDate(detailData?.updateTime) }}</el-descriptions-item>
+
+
+ <!-- <el-table-column :label="t('EquipmentManagement.EquipmentLedger.creatorName')" align="center" prop="creatorName" width="150px" />
+          <el-table-column :label="t('EquipmentManagement.EquipmentLedger.createTime')" align="center" prop="createTime" :formatter="dateFormatter" width="180px" /> -->
+          <!-- <el-table-column :label="t('EquipmentManagement.EquipmentLedger.updateTime')" align="center" prop="updateTime" :formatter="dateFormatter" width="180px" /> -->
+
 
+
+
+        </el-descriptions>
         <el-tabs v-model="detailActiveTab" class="mt-12px">
           <el-tab-pane :label="t('EquipmentManagement.EquipmentLedger.checkHistory')" name="check">
             <div style="margin-bottom: 16px;">

src/views/mes/organization/OrganizationForm.vue

@@ -79,7 +79,7 @@
               </el-tooltip>
             </span>
         </template>
-        <el-select v-model="formData.orgType" @change="handleOrgTypeChange" placeholder="请选择类型">
+        <el-select v-model="formData.orgType" placeholder="请选择类型">
           <el-option
             v-for="dict in getStrDictOptions(DICT_TYPE.MES_ORG_TYPE)"
             :key="dict.value"
@@ -97,7 +97,7 @@
           default-expand-all
           placeholder="请选择机台"
         /> -->
-        <el-select v-model="formData.machineId" placeholder="请选择设备">
+        <el-select v-model="formData.machineId" filterable placeholder="请选择设备">
           <el-option
             v-for="item in deviceList"
             :key="item.id"
@@ -125,14 +125,11 @@
   </Dialog>
 </template>
 <script setup lang="ts">
-import { getIntDictOptions, getBoolDictOptions, DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
 import { OrganizationApi, OrganizationVO } from '@/api/mes/organization'
 import { defaultProps, handleTree } from '@/utils/tree'
-import * as UserApi from "@/api/system/user";
-import {WorkTeamApi} from "@/api/mes/workteam";
 import {MachineComponentApi} from "@/api/mes/machine";
-import {DeviceApi, DeviceVO} from "@/api/iot/device";
-import {ZjTypeApi, ZjTypeVO} from "@/api/mes/zjtype";
+import {DeviceLedgerApi, DeviceLedgerVO} from "@/api/mes/deviceledger";
 
 /** 产线工位 表单 */
 defineOptions({ name: 'OrganizationForm' })
@@ -141,7 +138,7 @@ const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 
 // const deviceList = ref<DeviceVO[]>([]) // 列表
-const deviceList = ref<ZjTypeVO[]>([]) // 列表
+const deviceList = ref<DeviceLedgerVO[]>([]) // 列表
 const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
@@ -258,6 +255,6 @@ const getMachineComponentTree = async () => {
 /** 初始化 **/
 onMounted(async () => {
   //console.log("ssss")
-  deviceList.value = await DeviceApi.getDeviceList()
+  deviceList.value = await DeviceLedgerApi.getDeviceLedgerList()
 })
 </script>

src/views/system/user/UserForm.vue

@@ -128,7 +128,11 @@ const formData = ref({
   roleIds: []
 })
 const formRules = reactive<FormRules>({
-  username: [{ required: true, message: '用户名称不能为空', trigger: 'blur' }],
+  username: [{ required: true, message: '用户名称不能为空', trigger: 'blur' },{
+    pattern: /^[a-zA-Z0-9_\-@.]+$/,
+    message: '用户名只能包含英文、数字、下划线、连字符、@和点',
+    trigger: 'blur'
+  }],
   nickname: [{ required: true, message: '工号不能为空', trigger: 'blur' }],
   password: [{ required: true, message: '用户密码不能为空', trigger: 'blur' }],
   deptId: [{ required: true, message: '部门不能为空', trigger: 'blur' }],