Sfoglia il codice sorgente

物资柜中物资柜列表展示内容和查看跳转,左侧岗位检索功能修复

wyn 2 mesi fa
parent
commit
85a59abc0f

+ 1 - 0
src/utils/dict.ts

@@ -296,6 +296,7 @@ export enum DICT_TYPE {
   JOB_CARD_REASON = 'job_card_reason',
   ISONLINE_STATUS = 'isOnline_status',
   CANBINET_STATUS = 'canbinet_status',
+  CABINET_STATUS = 'cabinet_status',
   RFID_TOKEN_TYPE = 'rfid_token_type',
   RFID_TOKEN_STATUS = 'rfid_token_status',
   ISOCCUPIED_STATUS = 'isOccupied_status',

+ 12 - 8
src/views/material/lockers/index.vue

@@ -92,7 +92,7 @@
         <!-- 左侧岗位树 -->
         <el-col :span="4" :xs="24">
           <ContentWrap class="h-1/1">
-            <WorkstationTree @node-click="handleDeptNodeClick" />
+            <WorkstationTree @nodeClick="handleDeptNodeClick" />
           </ContentWrap>
         </el-col>
 
@@ -167,8 +167,7 @@
               <el-table-column
                 label="所属区域"
                 align="center"
-                key="id"
-                prop="id"
+                prop="workstationName"
                 :show-overflow-tooltip="true"
               />
               <el-table-column label="物资柜图片" prop="cabinetPicture" >
@@ -199,9 +198,8 @@
                   <dict-tag :type="DICT_TYPE.EXCEPTION_REASON" :value="scope.row.exReason" />
                 </template>
               </el-table-column>
-              <el-table-column label="操作" align="center" >
+              <el-table-column label="查看" align="center" >
                 <template #default="scope">
-                  <div class="flex items-center justify-center">
                     <el-button
                       type="primary"
                       link
@@ -209,6 +207,12 @@
                     >
                       <Icon icon="ep:view" />查看
                     </el-button>
+
+                </template>
+              </el-table-column>
+              <el-table-column label="操作" align="center" >
+                <template #default="scope">
+                  <div class="flex items-center justify-center">
                     <el-button
                       type="primary"
                       link
@@ -461,8 +465,8 @@ const calculateTimeDifference = (occurTime: string): string => {
 }
 // 岗位树节点点击事件
 const handleDeptNodeClick = (data): void => {
-  queryParams.id = data.id
-  queryParams.workstationName = data.label
+  queryParams.workstationId = data.id
+  queryParams.workstationName = data.workstationName
   getList()
 }
 // 获取其他数据
@@ -533,7 +537,7 @@ const handleCabinetClick = (cabinet: any): void => {
 // 查看详情
 const handleLook = (row: any): void => {
   router.push({
-    path: '/mes/material/lockers/DetailsIndex',
+    path: '/material/lockers/DetailsIndex',
     query: {
       cabinetId: row.cabinetId,
       cabinetName: row.cabinetName

+ 2 - 0
src/views/material/lockers/lockerTree.vue

@@ -86,6 +86,8 @@ const filterNode = (value: string, data: TreeNode): boolean => {
 
 // 岗位树点击事件
 const handleNodeClick = (data: TreeNode): void => {
+
+  // searchValue.value = data.workstationName // 点击节点时赋值 暂不需要
   emit('nodeClick', data)
 }