up

src/pages/C_goodsManage/C1ledger/type.d.ts

@@ -105,5 +105,7 @@ export type C1GoodType = {
   updateTime: string
   uses: string
   // 存放位置数组
-  siteId: string
+  siteId: number
+  // 库存状态
+  statusStorage: number
 }

src/pages/D_storeManage/D1storage/type.d.ts

@@ -12,6 +12,10 @@ export type D1siteListType = {
   storageId: number
   updateTime: string
   isEmpty: null | number
+
+  storageName: string
+  num: string
+  managerUser: string
 }
 
 export type D1canType = { layer1: number; layer2: number; layer3: number }

src/pages/Y_goodsDetails/Y1cathet/Y22com.tsx

@@ -1,7 +1,8 @@
-import MyTable from '@/components/MyTable'
 import { C1GoodType } from '@/pages/C_goodsManage/C1ledger/type'
-import { Y22tableC } from '@/utils/tableData'
-import React from 'react'
+import { D1siteListType } from '@/pages/D_storeManage/D1storage/type'
+import { D1_APIgetInfo } from '@/store/action/D1storage'
+import { statusStorageObj } from '@/utils/tableData'
+import React, { useCallback, useEffect, useState } from 'react'
 
 type Props = {
   isLook?: boolean
@@ -9,21 +10,70 @@ type Props = {
 }
 
 function Y22com({ isLook, info }: Props) {
+  const [detail, setDetail] = useState({} as D1siteListType)
+
+  const getInfoFu = useCallback(async () => {
+    if (info.siteId) {
+      const res = await D1_APIgetInfo(info.siteId)
+      if (res.code === 0) setDetail(res.data)
+    }
+  }, [info.siteId])
+
+  useEffect(() => {
+    getInfoFu()
+  }, [getInfoFu])
+
   return (
     <div className='Y22com'>
       {/* 待完善 */}
-      <div className='Y22sta'>库存状态：待入库</div>
+      <div className='Y22sta'>库存状态：{statusStorageObj[info.statusStorage] || ''}</div>
 
       {/* 表格 */}
-      <MyTable
-        classKey='Y22comTable'
-        yHeight={isLook ? 640 : 666}
-        list={[{ id: 1 }]}
-        columnsTemp={Y22tableC}
-        lastBtn={[]}
-        pagingInfo={false}
-        widthSet={isLook ? undefined : { description: 600 }}
-      />
+      {!info.statusStorage || [0, 4, 6].includes(info.statusStorage) ? (
+        <div className='Y22No'>当前状态无库存信息</div>
+      ) : (
+        <div className='Y22Info'>
+          <div className='Y22row Y22row1'>
+            <div>库存信息</div>
+            <div>库存详情</div>
+          </div>
+
+          {info.id ? (
+            <>
+              <div className='Y22row'>
+                <div>仓库名称</div>
+                <div>{detail.storageName || '（空）'}</div>
+              </div>
+              <div className='Y22row'>
+                <div>仓库编码</div>
+                <div>{detail.num || '（空）'}</div>
+              </div>
+              <div className='Y22row'>
+                <div>仓库负责人</div>
+                <div>{detail.managerUser || '（空）'}</div>
+              </div>
+              <div className='Y22row'>
+                <div>区域名称</div>
+                <div>{detail.regionName || '（空）'}</div>
+              </div>
+              <div className='Y22row'>
+                <div>排架</div>
+                <div>{detail.layer1 || '（空）'}</div>
+              </div>
+              <div className='Y22row'>
+                <div>层数</div>
+                <div>{detail.layer2 || '（空）'}</div>
+              </div>
+              <div className='Y22row'>
+                <div>层格</div>
+                <div>{detail.layer3 || '（空）'}</div>
+              </div>
+            </>
+          ) : (
+            <div className='Y22rowNo'>暂无数据</div>
+          )}
+        </div>
+      )}
     </div>
   )
 }

src/pages/Y_goodsDetails/Y1cathet/Y44com.tsx

@@ -164,17 +164,6 @@ function Y44com({ isLook, sId }: Props) {
                   options={[{ value: '', label: '全部' }]}
                 />
               </div>
-
-              <div>
-                <span>申请状态：</span>
-                <Select
-                  placeholder='请选择'
-                  style={{ width: 200 }}
-                  value={formData.status}
-                  onChange={e => setFormData({ ...formData, status: e })}
-                  options={[{ value: '', label: '全部' }]}
-                />
-              </div>
             </div>
             <div className='Y44toprr'>
               <Button type='primary' onClick={clickSearch}>

src/pages/Y_goodsDetails/Y1cathet/index.module.scss

@@ -151,6 +151,40 @@
             font-size: 18px;
             margin-bottom: 20px;
           }
+          .Y22No {
+            font-size: 16px;
+            letter-spacing: 4px;
+            height: 200px;
+            display: flex;
+            align-items: center;
+          }
+          .Y22Info {
+            width: 800px;
+            border: 1px solid #ccc;
+            border-bottom: none;
+            .Y22row {
+              display: flex;
+              align-items: center;
+              & > div {
+                width: 200px;
+                text-align: center;
+                padding: 8px 4px;
+                border-bottom: 1px solid #ccc;
+                &:nth-of-type(2) {
+                  width: 600px;
+                }
+              }
+            }
+            .Y22row1 {
+              background-color: #eaeaea;
+            }
+            .Y22rowNo {
+              height: 40px;
+              line-height: 40px;
+              text-align: center;
+              border-bottom: 1px solid #ccc;
+            }
+          }
         }
 
         // ------------------------藏品附件

src/pages/Y_goodsDetails/Y2look/index.module.scss

@@ -104,6 +104,7 @@
           .Y1rowZrr {
             display: flex;
             align-items: center;
+            justify-content: center;
             width: 48%;
           }
         }
@@ -135,6 +136,10 @@
                 max-height: 130px;
                 overflow-y: auto;
                 white-space: pre-wrap;
+                .media-wrap {
+                  margin: 10px 0;
+                  text-align: center;
+                }
               }
             }
             .y1z2_1row1Full {
@@ -154,6 +159,40 @@
           font-size: 18px;
           margin-bottom: 20px;
         }
+        .Y22No {
+          font-size: 16px;
+          letter-spacing: 4px;
+          height: 200px;
+          display: flex;
+          align-items: center;
+        }
+        .Y22Info {
+          width: 800px;
+          border: 1px solid #ccc;
+          border-bottom: none;
+          .Y22row {
+            display: flex;
+            align-items: center;
+            & > div {
+              width: 200px;
+              text-align: center;
+              padding: 8px 4px;
+              border-bottom: 1px solid #ccc;
+              &:nth-of-type(2) {
+                width: 600px;
+              }
+            }
+          }
+          .Y22row1 {
+            background-color: #eaeaea;
+          }
+          .Y22rowNo {
+            height: 40px;
+            line-height: 40px;
+            text-align: center;
+            border-bottom: 1px solid #ccc;
+          }
+        }
       }
 
       // ------------------------藏品附件

src/store/action/D1storage.ts

@@ -24,3 +24,10 @@ export const D1_APIgetSiteList = (id: number, isNull: boolean) => {
 export const D1_APIgetGoodsList = (data: any) => {
   return http.post('cms/site/goods/page', data)
 }
+
+/**
+ * 分库管理 - 详情 - 藏品详情页面的库存信息用到
+ */
+export const D1_APIgetInfo = (siteId: number) => {
+  return http.get(`cms/site/detail/${siteId}`)
+}

src/utils/tableData.ts

@@ -172,12 +172,6 @@ export const D4goodsTableC = [
   ['txtChange', '库存状态', 'statusStorage', statusStorageObj]
 ]
 
-// 待完善
-export const Y22tableC = [
-  ['txt', '库存信息', 'xxxx'],
-  ['txt', '库存详情', 'description']
-]
-
 export const Y33tableC = [
   ['text', '附件名称', 'fileName', 50],
   ['txt', '附件大小', 'fileSize'],