fix: 修改库存SKU、货号

components.d.ts

@@ -7,10 +7,10 @@ export {}
 
 declare module 'vue' {
   export interface GlobalComponents {
-    AmountInput: typeof import('./src/components/Form.vue/AmountInput.vue')['default']
+    AmountInput: typeof import('./src/components/Form/AmountInput.vue')['default']
     CommonCard: typeof import('./src/components/CommonCard.vue')['default']
-    DatePicker: typeof import('./src/components/Form.vue/DatePicker.vue')['default']
-    DateRangePicker: typeof import('./src/components/Form.vue/DateRangePicker.vue')['default']
+    DatePicker: typeof import('./src/components/Form/DatePicker.vue')['default']
+    DateRangePicker: typeof import('./src/components/Form/DateRangePicker.vue')['default']
     ElButton: typeof import('element-plus/es')['ElButton']
     ElCard: typeof import('element-plus/es')['ElCard']
     ElCarousel: typeof import('element-plus/es')['ElCarousel']
@@ -32,7 +32,6 @@ declare module 'vue' {
     ElImage: typeof import('element-plus/es')['ElImage']
     ElInput: typeof import('element-plus/es')['ElInput']
     ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
-    ElLink: typeof import('element-plus/es')['ElLink']
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElOption: typeof import('element-plus/es')['ElOption']
@@ -58,13 +57,13 @@ declare module 'vue' {
     LogList: typeof import('./src/components/LogList.vue')['default']
     NavMenu: typeof import('./src/components/NavMenu.vue')['default']
     RenderColumn: typeof import('./src/components/RenderColumn.vue')['default']
+    RightClickMenu: typeof import('./src/components/RightClickMenu.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
-    Select: typeof import('./src/components/Form.vue/Select.vue')['default']
+    Select: typeof import('./src/components/Form/Select.vue')['default']
     ShipmentOrderDetail: typeof import('./src/components/ShipmentOrderDetail.vue')['default']
     SplitDiv: typeof import('./src/components/splitDiv/splitDiv.vue')['default']
-    'Switch ': typeof import('./src/components/Form.vue/Switch .vue')['default']
-    TableRightMenu: typeof import('./src/components/TableRightMenu.vue')['default']
+    'Switch ': typeof import('./src/components/Form/Switch .vue')['default']
     TableView: typeof import('./src/components/TableView.vue')['default']
     UploadExcel: typeof import('./src/components/UploadExcel.vue')['default']
     UploadImage: typeof import('./src/components/UploadImage.vue')['default']

src/api/podUsOrder.ts

@@ -7,29 +7,11 @@ import {
   LogListData,
   ProductionClient,
   WarehouseListData,
+  LogisticsData,
 } from '@/types/api/podUsOrder'
 import axios from './axios'
 import { PodMakeOrderData } from '@/types/api/podMakeOrder'
-export interface LogisticsData {
-  logisticsWayName: string // 物流名称
-  warehouseName: string // 发货仓库
-  status: boolean
-  logisticsWayCode: string // 物流编码
-  partition: string // 所在分区
-  logisticsWayId?: number | null
-}
-export interface AddressInfo {
-  id?:string
-  receiverName: string,
-  receiverPhone: string,
-  receiverCountry: string,
-  receiverProvince: string,
-  receiverCity: string,
-  receiverDistrict: string,
-  receiverAddress1: string,
-  receiverAddress2: string,
-  receiverPostCode: string,
-}
+
 // 同步收货地址
 export function syncReceiverAddress(data: number[]) {
   return axios.post<never, BaseRespData<never>>(

src/types/api/podUsOrder.ts

@@ -102,6 +102,10 @@ export interface ProductList {
   lanshouAddress?: string | null
   shopNumber?: string | null
   factoryOrderNumber?: string | null
+  replenishmentNum?: number | null
+  isReplenishment?: boolean
+  thirdSkuCode?: string | null
+  supplierProductNo?: string | null
 }
 export interface cardImages {
   title: string
@@ -146,3 +150,23 @@ export interface WarehouseListData {
   remarks?: string
   sort?: number
 }
+export interface LogisticsData {
+  logisticsWayName: string // 物流名称
+  warehouseName: string // 发货仓库
+  status: boolean
+  logisticsWayCode: string // 物流编码
+  partition: string // 所在分区
+  logisticsWayId?: number | null
+}
+export interface AddressInfo {
+  id?: string
+  receiverName: string
+  receiverPhone: string
+  receiverCountry: string
+  receiverProvince: string
+  receiverCity: string
+  receiverDistrict: string
+  receiverAddress1: string
+  receiverAddress2: string
+  receiverPostCode: string
+}

src/views/order/podUs/index.vue

@@ -247,7 +247,7 @@
         <span v-if="status === 'PICKING'" class="item">
           <ElButton
             :loading="downloadLoading"
-            type="primary"
+            type="warning"
             @click="downloadTif"
           >
             排版
@@ -263,7 +263,7 @@
           v-if="status === 'EXCEPTION_ORDER' && exceptionStatus === 3"
           class="item"
         >
-          <ElButton type="success" @click="asyncOrderAddress">
+          <ElButton type="warning" @click="asyncOrderAddress">
             同步收货地址
           </ElButton>
         </span>
@@ -395,6 +395,7 @@
           :selectionable="true"
           :paginated-data="tableData"
           :cell-style="onCellStyle"
+          :cell-class-name="onCellClassName"
           @selection-change="handleSelectionChange"
         >
           <template #goods="{ row }">
@@ -437,6 +438,18 @@
                       </el-icon>
                     </div>
                     <div class="goods-item-info-item">
+                      <span class="goods-item-info-item-label">库存SKU:</span>
+                      <span class="goods-item-info-item-value">
+                        {{ item.thirdSkuCode }}
+                      </span>
+                      <el-icon
+                        class="icon"
+                        @click="copy(item.thirdSkuCode || '')"
+                      >
+                        <DocumentCopy />
+                      </el-icon>
+                    </div>
+                    <div class="goods-item-info-item">
                       <span class="goods-item-info-item-label">工艺:</span>
                       <span class="goods-item-info-item-value">
                         {{ item.craftName }}
@@ -500,9 +513,9 @@
                       </span>
                     </div>
                     <div class="goods-item-info-item">
-                      <span class="goods-item-info-item-label">货号:</span>
+                      <span class="goods-item-info-item-label">供应货号:</span>
                       <span class="goods-item-info-item-value">
-                        {{ item.thirdSkuCode }}
+                        {{ item.supplierProductNo }}
                       </span>
                     </div>
                   </div>
@@ -779,7 +792,7 @@
             </div> -->
           </template>
           <template #exceptionReason="{ row }">
-            <div v-html="row.exceptionReason"></div>
+            <div style="white-space: pre-line">{{ row.exceptionReason }}</div>
           </template>
           <template #innerLabel="{ row }">
             <div v-if="row.internalMemoList" class="inner-label-box">
@@ -936,10 +949,17 @@
                     </span>
                   </div>
                   <div class="grid-item">
-                    <span title="Variant SKU" class="grid-item-value">
-                      {{ cardItem?.variantSku }}
+                    <span title="库存SKU" class="grid-item-value">
+                      {{ cardItem?.thirdSkuCode }}
+                    </span>
+                  </div>
+                  <div class="grid-item">
+                    <span class="grid-item-label">供应货号：</span>
+                    <span title="供应货号" class="grid-item-value">
+                      {{ cardItem?.supplierProductNo }}
                     </span>
                   </div>
+                  
                   <div class="grid-item" title="店铺单号">
                     <span class="grid-item-value">
                       {{ cardItem?.shopNumber }}
@@ -1295,7 +1315,6 @@ import {
   loadWarehouseListApi,
   getLogisticsCalculation,
   refreshMaterialApi,
-  LogisticsData,
   getTrackingNumberApi,
   getfaceSimplexFileApi,
   cancelLogisticsOrderApi,
@@ -1306,7 +1325,6 @@ import {
   createLogisticsOrdersApi,
   syncReceiverAddress,
   refreshAddressApi,
-  AddressInfo,
   // handleExceptionOrderApi,
 } from '@/api/podUsOrder'
 import UpdateAddress from './components/updateAddress.vue'
@@ -1322,6 +1340,8 @@ import {
   Tab,
   WarehouseListData,
   cardImages,
+  AddressInfo,
+  LogisticsData,
 } from '@/types/api/podUsOrder'
 import usePageList from '@/utils/hooks/usePageList'
 import { useValue } from '@/utils/hooks/useValue'
@@ -1521,17 +1541,18 @@ const tableColumns = computed(() => [
     prop: 'time',
     align: 'left',
   },
-  {
-    label: '内部便签',
-    slot: 'innerLabel',
-    width: 300,
-    prop: 'innerLabel',
-  },
+  // {
+  //   label: '内部便签',
+  //   slot: 'innerLabel',
+  //   width: 300,
+  //   prop: 'innerLabel',
+  // },
   {
     label: '异常原因',
     width: 300,
     prop: 'exceptionReason',
     slot: 'exceptionReason',
+    align: 'left',
   },
   {
     label: '操作',
@@ -1608,11 +1629,17 @@ const onCellStyle = ({ column }: { column: Column }) => {
     column.property === 'time' ||
     column.property === 'innerLabel' ||
     column.property === 'goods' ||
-    column.property === 'operate'
+    column.property === 'operate' ||
+    column.property === 'exceptionReason'
   ) {
     return { verticalAlign: 'top' }
   }
 }
+const onCellClassName = ({ column }: { column: Column }) => {
+  if (column.property === 'exceptionReason') {
+    return 'exception-reason'
+  }
+}
 const loadTabData = async () => {
   try {
     const res = await getOrderTabData()
@@ -2781,7 +2808,13 @@ const handleExceptionCommand = (command: number) => {
     font-weight: 600;
   }
 }
-
+.table-wrapper {
+  :deep(.exception-reason) {
+    .cell {
+      white-space: wrap;
+    }
+  }
+}
 .goods-item {
   display: grid;
   grid-template-columns: 100px 1fr minmax(180px, 1fr) 140px;

src/views/podBillOrder/index.vue

@@ -319,10 +319,10 @@
                       style="width: 130px"
                     />
                   </el-form-item>
-                  <el-form-item label="供应商货号">
+                  <el-form-item label="供应货号">
                     <el-input
                       v-model="detailForm.supplierItemNo"
-                      placeholder="请输入供应商货号"
+                      placeholder="请输入供应货号"
                       clearable
                       style="width: 130px"
                     />
@@ -501,7 +501,7 @@
                       show-overflow-tooltip
                     ></el-table-column>
                     <el-table-column
-                      label="供应商货号"
+                      label="供应货号"
                       prop="supplier_item_no"
                       header-align="center"
                       align="center"

src/views/podBillOrder/pendingReconciliation.vue

@@ -272,7 +272,7 @@ const priceModification = (type: 1 | 3 | 4) => {
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            label="供应商货号"
+            label="供应货号"
             prop="supplier_item_no"
             header-align="center"
             align="center"

src/views/warehouse/issueDoc.vue

@@ -71,11 +71,11 @@
                     style="width: 160px"
                   />
                 </ElFormItem>
-                <ElFormItem style="margin-right: 10px" label="SKU">
+                <ElFormItem style="margin-right: 10px" label="库存SKU">
                   <ElInput
                     v-model.trim="searchForm.warehouseSku"
                     clearable
-                    placeholder="请输入SKU"
+                    placeholder="请输入库存SKU"
                     style="width: 160px"
                   />
                 </ElFormItem>
@@ -119,7 +119,7 @@
               </el-button>
               <el-button type="success" @click="handleExport"> 导出 </el-button>
               <el-button type="primary" @click="printProductTag">
-                打印商品SKU标签
+                打印库存SKU标签
               </el-button>
               <el-button
                 v-if="nodeCode === 'PENDING_AUDIT'"
@@ -308,20 +308,20 @@
                     <ElTableColumn
                       show-overflow-tooltip
                       align="center"
-                      label="商品SKU"
+                      label="库存SKU"
                       prop="warehouseSku"
                     />
 
                     <ElTableColumn
                       show-overflow-tooltip
                       align="center"
-                      label="SKU名称"
+                      label="库存SKU"
                       prop="skuName"
                     />
                     <ElTableColumn
                       show-overflow-tooltip
                       align="center"
-                      label="货号"
+                      label="供应货号"
                       prop="productNo"
                     />
                     <ElTableColumn
@@ -487,20 +487,20 @@
         <ElTableColumn
           show-overflow-tooltip
           align="center"
-          label="商品SKU"
+          label="库存SKU"
           prop="warehouseSku"
         />
 
         <ElTableColumn
           show-overflow-tooltip
           align="center"
-          label="SKU名称"
+          label="商品名称"
           prop="skuName"
         />
         <ElTableColumn
           show-overflow-tooltip
           align="center"
-          label="货号"
+          label="供应货号"
           prop="productNo"
         />
         <ElTableColumn
@@ -572,7 +572,7 @@
         <div>
           <el-input
             v-model.trim="selectSku"
-            placeholder="商品SKU"
+            placeholder="库存SKU"
             style="width: 200px; margin: 0 10px"
             clearable
             size="small"
@@ -601,7 +601,7 @@
                 <ElTableColumn
                   show-overflow-tooltip
                   align="center"
-                  label="商品SKU"
+                  label="库存SKU"
                   width="200"
                   prop="skuName"
                 />
@@ -610,13 +610,13 @@
                   show-overflow-tooltip
                   align="center"
                   width="200"
-                  label="SKU名称"
+                  label="库存SKU"
                   prop="warehouseSku"
                 />
                 <ElTableColumn
                   show-overflow-tooltip
                   align="center"
-                  label="货号"
+                  label="供应货号"
                   prop="productNo"
                 />
                 <ElTableColumn
@@ -738,7 +738,7 @@
       <el-table-column
         align="center"
         prop="warehouseSku"
-        label="商品SKU"
+        label="库存SKU"
       ></el-table-column>
       <el-table-column
         align="center"
@@ -748,7 +748,7 @@
       <el-table-column
         align="center"
         prop="supplierItemNo"
-        label="货号"
+        label="供应货号"
       ></el-table-column>
       <el-table-column align="center" prop="number" label="打印数量">
         <template #default="{ row }">
@@ -1119,7 +1119,7 @@ interface InterImportData {
 // 前端导入Excel
 const excelFieldMap: Record<string, keyof InterImportData> = {
   // SKU图片: 'skuImage',
-  商品SKU: 'warehouseSku',
+  库存SKU: 'warehouseSku',
   // SKU名称: 'skuName',
   // 出库数量: 'outCount',
   // 可用库存数量: 'usableInventory',
@@ -1133,7 +1133,7 @@ const handleLocalImport = async ({
   data,
 }: {
   path: string
-  data: Record<string, any>[]
+  data: Record<string, unknown>[]
 }) => {
   // 1. 将原始导入数据映射到 InterImportData[]
   const importedData: InterImportData[] = data
@@ -1171,9 +1171,9 @@ const handleLocalImport = async ({
     .filter((item) => item.warehouseSku)
 
   if (importedData.length === 0) {
-    ElMessage.warning('导入数据中没有有效的商品SKU')
-    importDialogVisible.value = false
-    return
+      ElMessage.warning('导入数据中没有有效的库存SKU');
+      importDialogVisible.value = false;
+      return;
   }
 
   // 2. 提取导入的 SKU 列表
@@ -1183,10 +1183,10 @@ const handleLocalImport = async ({
   const filteredSkusList = await batchAddCommodity(importedSkus)
 
   if (filteredSkusList.length === 0) {
-    ElMessage.warning('导入的商品SKU已存在或无效')
-    importedFileUrl.value = path
-    importDialogVisible.value = false
-    return
+       ElMessage.warning('导入的库存SKU已存在或无效');
+       importedFileUrl.value = path;
+       importDialogVisible.value = false;
+       return;
   }
 
   // 4. 将备注信息合并到获取到的商品列表中

src/views/warehouse/receiptDoc.vue

@@ -71,11 +71,11 @@
                     style="width: 160px"
                   />
                 </ElFormItem>
-                <ElFormItem style="margin-right: 10px" label="SKU">
+                <ElFormItem style="margin-right: 10px" label="库存SKU">
                   <ElInput
                     v-model="searchForm.warehouseSku"
                     clearable
-                    placeholder="请输入SKU"
+                    placeholder="请输入库存SKU"
                     style="width: 160px"
                   />
                 </ElFormItem>
@@ -119,7 +119,7 @@
               </el-button>
               <el-button type="success" @click="handleExport"> 导出</el-button>
               <el-button type="primary" @click="printProductTag">
-                打印商品SKU标签
+                打印库存SKU标签
               </el-button>
               <el-button
                 v-if="nodeCode === 'PENDING_AUDIT'"
@@ -316,20 +316,20 @@
                     <ElTableColumn
                       show-overflow-tooltip
                       align="center"
-                      label="商品SKU"
+                      label="库存SKU"
                       prop="warehouseSku"
                     />
 
                     <ElTableColumn
                       show-overflow-tooltip
                       align="center"
-                      label="SKU名称"
+                      label="商品名称"
                       prop="skuName"
                     />
                     <ElTableColumn
                       show-overflow-tooltip
                       align="center"
-                      label="货号"
+                      label="供应货号"
                       prop="productNo"
                     />
                     <ElTableColumn
@@ -519,20 +519,20 @@
         <ElTableColumn
           show-overflow-tooltip
           align="center"
-          label="商品SKU"
+          label="库存SKU"
           prop="warehouseSku"
         />
 
         <ElTableColumn
           show-overflow-tooltip
           align="center"
-          label="SKU名称"
+          label="商品名称"
           prop="skuName"
         />
         <ElTableColumn
           show-overflow-tooltip
           align="center"
-          label="货号"
+          label="供应货号"
           prop="productNo"
         />
         <ElTableColumn align="center" label="入库数量" prop="buyStored">
@@ -602,7 +602,7 @@
         <div>
           <el-input
             v-model.trim="selectSku"
-            placeholder="商品SKU"
+            placeholder="库存SKU"
             style="width: 200px; margin: 0 10px"
             clearable
             size="small"
@@ -631,7 +631,7 @@
                 <ElTableColumn
                   show-overflow-tooltip
                   align="center"
-                  label="商品SKU"
+                  label="库存SKU"
                   width="200"
                   prop="skuName"
                 />
@@ -640,13 +640,13 @@
                   show-overflow-tooltip
                   align="center"
                   width="200"
-                  label="SKU名称"
+                  label="库存SKU"
                   prop="sku"
                 />
                 <ElTableColumn
                   show-overflow-tooltip
                   align="center"
-                  label="货号"
+                  label="供应货号"
                   prop="productNo"
                 />
                 <ElTableColumn
@@ -770,7 +770,7 @@
       <el-table-column
         align="center"
         prop="warehouseSku"
-        label="商品SKU"
+        label="库存SKU"
       ></el-table-column>
       <el-table-column
         align="center"
@@ -780,7 +780,7 @@
       <el-table-column
         align="center"
         prop="supplierItemNo"
-        label="货号"
+        label="供应货号"
       ></el-table-column>
       <el-table-column align="center" prop="number" label="打印数量">
         <template #default="{ row }">
@@ -1153,7 +1153,7 @@ interface InterImportData {
 // 前端导入Excel
 const excelFieldMap: Record<string, keyof InterProductList> = {
   // SKU图片: 'skuImage',
-  商品SKU: 'warehouseSku',
+  库存SKU: 'warehouseSku',
   // SKU名称: 'skuName',
   入库数量: 'buyStored',
   // '成本价(￥)': 'costPrice',

src/views/warehouse/warning.vue

@@ -194,7 +194,7 @@ getWarehouse()
           <el-table-column
             align="center"
             prop="warehouseSku"
-            label="商品SKU"
+            label="库存SKU"
           ></el-table-column>
           <el-table-column
             align="center"
@@ -204,7 +204,7 @@ getWarehouse()
           <el-table-column
             align="center"
             prop="productNo"
-            label="货号 "
+            label="供应货号 "
           ></el-table-column>
           <el-table-column align="center" prop="number" label="打印数量">
             <template #default="{ row }">
@@ -242,11 +242,11 @@ getWarehouse()
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="商品SKU">
+          <el-form-item label="库存SKU">
             <el-input
               v-model="searchForm.warehouseSku"
               style="width: 140px"
-              placeholder="请输入商品SKU"
+              placeholder="请输入库存SKU"
               clearable
             ></el-input>
           </el-form-item>
@@ -258,7 +258,7 @@ getWarehouse()
               clearable
             ></el-input>
           </el-form-item>
-          <el-form-item label="货号">
+          <el-form-item label="供应货号">
             <el-input
               v-model="searchForm.productNo"
               style="width: 140px"
@@ -316,7 +316,7 @@ getWarehouse()
           </el-form-item>
           <el-form-item style="margin-top: 5px">
             <el-button type="primary" @click="printProductTag"
-              >打印商品SKU标签</el-button
+              >打印库存SKU标签</el-button
             >
           </el-form-item>
           <el-form-item style="margin-top: 5px">
@@ -382,7 +382,7 @@ getWarehouse()
                   <el-table-column
                     align="center"
                     prop="warehouseSku"
-                    label="商品SKU"
+                    label="库存SKU"
                     width="180"
                   ></el-table-column>
                   <el-table-column
@@ -394,7 +394,7 @@ getWarehouse()
                   <el-table-column
                     align="center"
                     prop="productNo"
-                    label="货号"
+                    label="供应货号"
                     width="150"
                   ></el-table-column>
                   <el-table-column