新增岗位菜单给工卡调用接口

src/api/hw/hardware/workCard/index.ts

@@ -24,36 +24,35 @@ export interface PageParam {
 
 // 查询工作卡分页
 export const getWordCardList = async (params: PageParam) => {
-  return await request.get({ url: '/iscs/card/getIsJobCardPage', params })
+  return await request.get({ url: '/iscs/job-card/getJobCardPage', params })
 }
 
 // 工卡详细信息
-export const workCardInfo = async (cardId: number) => {
+export const workCardInfo = async (id: number) => {
   return await request.get({
-    url: '/iscs/card/selectIsJobCardById',
-    params: { cardId }
+    url: '/iscs/job-card/selectJobCardById',
+    params: { id }
   })
 }
 
 // 新增工卡
 export const addWorkCard = async (data: WorkCardVO) => {
-  return await request.post({ url: '/iscs/card/insertIsJobCard', data })
+  return await request.post({ url: '/iscs/job-card/insertJobCard', data })
 }
 
 // 修改工卡信息
 export const updateWorkCard = async (data: WorkCardVO) => {
-  return await request.post({ url: '/iscs/card/updateIsJobCard', data })
+  return await request.put({ url: '/iscs/job-card/updateJobCard', data })
 }
 
 // 删除工卡信息
-export const delWorkCard = async (cardId: number) => {
-  return await request.post({
-    url: '/iscs/card/deleteIsJobCardByCardIds',
-    params: { cardIds: cardId }
+export const delWorkCard = async (ids: number) => {
+  return await request.delete({
+    url: '/iscs/job-card/deleteJobCardList?ids='+ids,
   })
 }
 
 // 人员列表
 export const getUserList = async (params: PageParam) => {
-  return await request.get({ url: '/system/user/list', params })
+  return await request.get({ url: '/system/user/page', params })
 }

src/api/system/marsdept/index.ts

@@ -56,7 +56,7 @@ export const updateMarsDeptStatus = async (data: MarsDeptVO) => {
 // 删除玛氏岗位
 export const delMarsDept = async (ids: number) => {
   return await request.delete({
-    url: '/iscs/workstation/deleteWorkstationList',
-    params: { ids: ids }
+    url: '/iscs/workstation/deleteWorkstationList?ids=' + ids,
+
   })
 }

src/views/hw/workCard/WorkCardForm.vue

@@ -112,19 +112,19 @@ const autoGenFlag = ref(false) // 是否自动生成编码
 const userList = ref([]) // 用户列表
 
 const formData = ref({
-  cardId: undefined,
   userId: undefined,
-  userName: '',
+  id: undefined,
   cardCode: '',
   cardNfc: '',
   cardType: undefined,
   exStatus: '1',
-  exRemark: ''
+  exRemark: '',
+  userName: undefined,
 })
 
 const formRules = reactive({
   // cardCode: [{ required: true, message: '工卡编码不能为空', trigger: 'blur' }],
-  userId: [{ required: true, message: '用户名称不能为空', trigger: 'blur' }],
+  id: [{ required: true, message: '用户名称不能为空', trigger: 'blur' }],
   cardNfc: [{ required: true, message: '工卡NFC不能为空', trigger: 'blur' }],
   cardType: [{ required: true, message: '工卡类型不能为空', trigger: 'blur' }]
 })
@@ -136,6 +136,7 @@ const open = async (type: string, id?: number) => {
   dialogVisible.value = true
   dialogTitle.value = t('action.' + type)
   formType.value = type
+console.log(id,'id')
   resetForm()
   // 修改时，设置数据
   if (id) {
@@ -143,6 +144,9 @@ const open = async (type: string, id?: number) => {
     try {
       const data = await WorkCardApi.workCardInfo(id)
       formData.value = data
+      formData.value.userId=data.userId
+      formData.value.userName = data.userName
+      formData.value.exStatus=Number(data.exStatus)
       // 转换工卡类型
       if (data.cardType === '1') {
         formData.value.cardType = '员工卡'
@@ -191,9 +195,8 @@ const submitForm = async () => {
 /** 重置表单 */
 const resetForm = () => {
   formData.value = {
-    cardId: undefined,
     userId: undefined,
-    userName: '',
+    id: undefined,
     cardCode: '',
     cardNfc: '',
     cardType: undefined,
@@ -205,13 +208,13 @@ const resetForm = () => {
 }
 
 /** 自动生成编码 */
-const handleAutoGenChange = async (value: boolean) => {
-  if (value) {
-    formData.value.cardCode = await AutocodeApi.genCode('CARD_CODE')
-  } else {
-    formData.value.cardCode = ''
-  }
-}
+// const handleAutoGenChange = async (value: boolean) => {
+//   if (value) {
+//     formData.value.cardCode = await AutocodeApi.genCode('CARD_CODE')
+//   } else {
+//     formData.value.cardCode = ''
+//   }
+// }
 
 /** 选择用户 */
 const handleSelectUser = (value: string) => {
@@ -223,10 +226,10 @@ const handleSelectUser = (value: string) => {
 
 /** 获取用户列表 */
 const getUserList = async () => {
-  const data = await WorkCardApi.getUserList({ current: 1, size: -1 })
-  userList.value = data.rows.map(item => ({
-    value: item.userId,
-    label: item.userName
+  const data = await WorkCardApi.getUserList({ pageNo: 1,  selectAll:1 })
+  userList.value = data.list.map(item => ({
+    value: item.id,
+    label: item.nickname
   }))
 }
 

src/views/hw/workCard/index.vue

@@ -79,6 +79,7 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="工卡编号" prop="id" width="150" />
 <!--      <el-table-column label="工卡编码" prop="cardCode" width="150" />-->
       <el-table-column label="工卡类型" prop="cardType" width="180">
         <template #default="scope">
@@ -107,7 +108,7 @@
           <el-button
             link
             type="primary"
-            @click="openForm('update', scope.row.cardId)"
+            @click="openForm('update', scope.row.id)"
             v-hasPermi="['mes:hw:work:update']"
           >
             编辑
@@ -115,7 +116,7 @@
           <el-button
             link
             type="danger"
-            @click="handleDelete(scope.row.cardId)"
+            @click="handleDelete(scope.row.id)"
             v-hasPermi="['mes:hw:work:delete']"
           >
             删除
@@ -168,7 +169,7 @@ const getList = async () => {
   loading.value = true
   try {
     const data = await WorkCardApi.getWordCardList(queryParams)
-    list.value = data.records
+    list.value = data.list
     total.value = data.total
   } finally {
     loading.value = false
@@ -177,10 +178,11 @@ const getList = async () => {
 
 /** 获取用户列表 */
 const getUserList = async () => {
-  const data = await WorkCardApi.getUserList({ current: 1, size: -1 })
-  userList.value = data.rows.map(item => ({
-    value: item.userId,
-    label: item.userName
+  const data = await WorkCardApi.getUserList({ pageNo: 1, selectAll:1 })
+  console.log(data,'用户')
+  userList.value = data.list.map(item => ({
+    value: item.id,
+    label: item.nickname
   }))
 }
 
@@ -198,7 +200,7 @@ const resetQuery = () => {
 
 /** 多选框选中数据 */
 const handleSelectionChange = (selection: any[]) => {
-  selectedIds.value = selection.map(item => item.cardId)
+  selectedIds.value = selection.map(item => item.id)
 }
 
 /** 添加/修改操作 */

src/views/system/marsdept/MarsForm.vue

@@ -11,7 +11,7 @@
         <el-tree-select
           v-model="formData.parentId"
           :data="deptOptions"
-          :props="{ value: 'workstationId', label: 'workstationName', children: 'children' }"
+          :props="{ value: 'id', label: 'workstationName', children: 'children' }"
           placeholder="请选择上级岗位"
           clearable
           class="!w-full"
@@ -101,7 +101,7 @@ defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 const getDeptOptions = async () => {
   try {
     const data = await MarsApi.listMarsDept({ current: 1, size: -1 })
-    deptOptions.value = handleTree(data.data.records, 'workstationId', 'parentId')
+    deptOptions.value = handleTree(data.list)
   } catch (error) {
     console.error('获取岗位树选项失败:', error)
   }

src/views/system/marsdept/index.vue

@@ -60,7 +60,7 @@
       v-if="refreshTable"
       :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
     >
-      <el-table-column prop="workstationId" label="岗位编号" width="130" />
+      <el-table-column prop="id" label="岗位编号" width="130" />
       <el-table-column prop="workstationName" label="岗位名称" width="260" />
       <el-table-column prop="orderNum" label="排序" width="200" />
       <el-table-column prop="status" label="状态" width="150">
@@ -87,15 +87,15 @@
           <el-button
             link
             type="primary"
-            @click="openForm('update', scope.row.workstationId)"
+            @click="openForm('update', scope.row.id)"
             v-hasPermi="['iscs:workstation:update']"
           >
-            修改
+           编辑
           </el-button>
           <el-button
             link
             type="primary"
-            @click="openForm('create', undefined, scope.row.workstationId)"
+            @click="openForm('create', undefined, scope.row.id)"
             v-hasPermi="['iscs:workstation:create']"
           >
             新增
@@ -103,7 +103,7 @@
           <el-button
             link
             type="danger"
-            @click="handleDelete(scope.row.workstationId)"
+            @click="handleDelete(scope.row.id)"
             v-hasPermi="['iscs:workstation:delete']"
           >
             删除