功能提交

src/api/warehouse.ts

@@ -447,6 +447,21 @@ export function getBySkuApi(
     },
     },
   )
   )
 }
 }
+
+export function getBySkuAndUserMarkApi(
+  warehouseId: number | string | undefined,
+  sku: string | null,
+  userMark: string | null | undefined,
+) {
+  return axios.post<never, BaseRespData<InterskuList[]>>(
+    'factory/warehouseInRecord/getProductBySku',
+    {
+      warehouseId,
+      userMark,
+      sku,
+    },
+  )
+}
 export function getByWareHouseIdAndCodeApi(
 export function getByWareHouseIdAndCodeApi(
   wareHouseId: number | string | undefined,
   wareHouseId: number | string | undefined,
   code: string | null,
   code: string | null,
@@ -710,6 +725,14 @@ export function scanBoxCodeApi(boxCode: string) {
     },
     },
   )
   )
 }
 }
+
+// 备货计划 盘点
+export function getLocalFactoryList() {
+  return axios.get<never, BaseRespData<never>>(
+    'dbDiyUser/getLocalFactoryList',
+
+  )
+}
 // 备货计划 打印箱贴
 // 备货计划 打印箱贴
 export function printBarcodeApi(data: { id: number, dataVersion: number }[]) {
 export function printBarcodeApi(data: { id: number, dataVersion: number }[]) {
   return axios.post<never, BaseRespData<never[]>>(
   return axios.post<never, BaseRespData<never[]>>(

src/types/api/warehouse.ts

@@ -88,7 +88,7 @@ export interface InterProductList {
   remark?: string | null
   remark?: string | null
   skuImage?: string
   skuImage?: string
   skuName?: string
   skuName?: string
-  costPrice?: number | null
+  costPrice?: number | null | string
   totalPrice?: number | null
   totalPrice?: number | null
   updateTime?: string
   updateTime?: string
   warehouseSku?: string
   warehouseSku?: string
@@ -103,6 +103,9 @@ export interface InterskuList {
   productId?: number
   productId?: number
   sku?: string
   sku?: string
   skuName?: string
   skuName?: string
+  productName?: string
+  skuImage?: string
+  costPrice?: undefined | null | number
   image?: string
   image?: string
   factoryPrice?: number | null
   factoryPrice?: number | null
   productNo?: string | null //货号
   productNo?: string | null //货号

src/views/order/podCN/index.vue

@@ -1458,14 +1458,14 @@
                       </el-button>
                       </el-button>
                     </div>
                     </div>
                   </div>
                   </div>
-                  
+
 
 
                    <div class="goods-item-info">
                    <div class="goods-item-info">
                     <div class="goods-item-info-item">
                     <div class="goods-item-info-item">
                       <span class="goods-item-info-item-label"
                       <span class="goods-item-info-item-label"
                         >英文报关名称:</span
                         >英文报关名称:</span
                       >
                       >
-                      <span class="goods-item-info-item-value">
+                      <span :title="item.customsNameEnglish" class="goods-item-info-item-value">
                         {{ item.customsNameEnglish }}
                         {{ item.customsNameEnglish }}
                       </span>
                       </span>
                     </div>
                     </div>
@@ -1473,7 +1473,7 @@
                       <span class="goods-item-info-item-label"
                       <span class="goods-item-info-item-label"
                         >中文报关名称:</span
                         >中文报关名称:</span
                       >
                       >
-                      <span class="goods-item-info-item-value">
+                      <span :title="item.customsNameChinese" class="goods-item-info-item-value">
                         {{ item.customsNameChinese }}
                         {{ item.customsNameChinese }}
                       </span>
                       </span>
                     </div>
                     </div>
@@ -1481,7 +1481,7 @@
                       <span class="goods-item-info-item-label"
                       <span class="goods-item-info-item-label"
                         >申报重量(g):</span
                         >申报重量(g):</span
                       >
                       >
-                      <span class="goods-item-info-item-value">
+                      <span :title="item.customsWeight"  class="goods-item-info-item-value">
                        {{ item.customsWeight }}
                        {{ item.customsWeight }}
                       </span>
                       </span>
                     </div>
                     </div>
@@ -1489,7 +1489,7 @@
                       <span class="goods-item-info-item-label"
                       <span class="goods-item-info-item-label"
                         >申报价值($):</span
                         >申报价值($):</span
                       >
                       >
-                      <span class="goods-item-info-item-value">
+                      <span :title="item.customsValue" class="goods-item-info-item-value">
                        {{ item.customsValue }}
                        {{ item.customsValue }}
                       </span>
                       </span>
                     </div>
                     </div>
@@ -6189,7 +6189,7 @@ const onUpdateCustomsDeclarationInfo = () => {
 .goods-item {
 .goods-item {
   display: grid;
   display: grid;
   // grid-template-columns: 100px 1fr minmax(150px, 1fr) 150px;
   // grid-template-columns: 100px 1fr minmax(150px, 1fr) 150px;
-  grid-template-columns: 100px 254px 1fr minmax(150px, 1fr) 150px 200px;
+  grid-template-columns: 100px 254px 1fr minmax(150px, 1fr) 220px 200px;
   gap: 15px;
   gap: 15px;
 
 
   .goods-item-img {
   .goods-item-img {