发货新优化

src/api/podOrder.ts

@@ -74,10 +74,10 @@ export function getCardOrderList(
 export function getOrderBySubOrderNumber(orderNumber: string) {
   return axios.get<never, BaseRespData<OrderData>>(
     // 'factory/podJomallOrder/getOrderBySubOrderNumber',
-    'factory/podJomallOrder/getOrderProductBySubOrderNumber',
+    'factory/podJomallOrder/getOrderProductByThirdSubOrderNumber',
     {
       params: {
-        factorySubOrderNumber: orderNumber,
+        thirdSubOrderNumber: orderNumber,
       },
     },
   )

src/views/order/Shipment.vue

@@ -75,14 +75,28 @@
               <span class="label">SKU:</span>
               <span class="value">{{ item.baseSku || '--' }}</span>
             </div>
-            <div class="shipment-info-item-content-item--info">
+            <div v-if="!isPod" class="shipment-info-item-content-item--info">
               <span class="label">生产单号:</span>
-              <span class="value">{{
-                isPod
-                  ? item.factorySubOrderNumber || '--'
-                  : item.subOrderNumber || '--'
-              }}</span>
+              <span class="value">{{ item.subOrderNumber || '--' }}</span>
+            </div>
+            <div v-if="isPod" class="shipment-info-item-content-item--info2">
+              <div>
+                <span class="label">工厂单号:</span>
+                <span class="value">{{
+                  item.factorySubOrderNumber || '--'
+                }}</span>
+              </div>
+              <div>
+                <span class="label">生产单号:</span>
+                <span class="value">{{
+                  item.thirdSubOrderNumber || '--'
+                }}</span>
+              </div>
             </div>
+            <!-- <div v-if="isPod" class="shipment-info-item-content-item--info">
+              <span class="label">生产单号:</span>
+              <span class="value">{{ item.thirdSubOrderNumber || '--' }}</span>
+            </div> -->
             <div
               class="shipment-info-item-content-item--info"
               style="width: 90px; flex: none"
@@ -239,7 +253,7 @@ const onShipment = async (item: ProductList) => {
 }
 
 .shipment-info {
-  width: 50%;
+  width: 54%;
   border: 1px solid #eee;
   overflow: auto;
   font-size: 13px;
@@ -312,6 +326,21 @@ const onShipment = async (item: ProductList) => {
     margin-right: 6px;
   }
 }
+.shipment-info-item-content-item--info2 {
+  padding-left: 5px;
+  border-right: 1px solid #eee;
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  align-items: flex-start;
+  div {
+    margin-bottom: 5px;
+  }
+  .label {
+    margin-right: 6px;
+  }
+}
 
 .shipment-info-item-content-item--info:last-child {
   border-right: 0;

src/views/order/hook/podUseShipMent.ts

@@ -45,7 +45,8 @@ export default function useShipment(callback?: () => void) {
     let rowData
     const code1 = code?.split('_')[0]
     for (const item of orderList.value) {
-      rowData = item.productList?.find((jj) => jj.factorySubOrderNumber === code1)
+      // rowData = item.productList?.find((jj) => jj.factorySubOrderNumber === code1)
+      rowData = item.productList?.find((jj) => `${item.userMark}-${jj.thirdSubOrderNumber}` === code1)
       if (rowData) {
         rowData.factoryOrderNumber = item.factoryOrderNumber
         break
@@ -122,7 +123,8 @@ export default function useShipment(callback?: () => void) {
     const code1 = code?.split('_')[0]
     for (const item of data.productList || []) {
       item.count = 0
-      if (item.factorySubOrderNumber === code1) {
+      // if (item.factorySubOrderNumber === code1) {
+        if (`${data.userMark}-${item.thirdSubOrderNumber}` === code1) {
         item.count = 1
         currentRow.value = item
         if (currentRow.value) {

src/views/order/pod/index.vue

@@ -183,13 +183,16 @@
           >
         </span>
       </div>
-      <template v-if="[
+      <template
+        v-if="
+          [
             'IN_PRODUCTION',
             'WAIT_SHIPMENT',
             'TO_BE_REPLENISHMENT',
             'INVALID',
           ].includes(status)
-        ">
+        "
+      >
         <div
           v-if="CardOrderList.length"
           v-loading="loading"
@@ -310,11 +313,17 @@
                         </el-tooltip>
                       </el-col>
                       <el-col :span="10" :offset="0" style="text-align: right">
+                        <span v-if="status === 'INVALID'">
+                          数量：{{ cardItem?.num }}
+                        </span>
                         <el-tooltip
+                          v-else
                           class="item"
                           effect="dark"
                           :content="
-                            status === 'IN_PRODUCTION'
+                            ['TO_BE_REPLENISHMENT', 'IN_PRODUCTION'].includes(
+                              status,
+                            )
                               ? '未生产数量'
                               : '已生产数量'
                           "
@@ -322,7 +331,9 @@
                         >
                           <span
                             >数量：{{
-                              status === 'IN_PRODUCTION'
+                              ['TO_BE_REPLENISHMENT', 'IN_PRODUCTION'].includes(
+                                status,
+                              )
                                 ? cardItem?.notPassNum
                                 : cardItem?.passNum
                             }}</span
@@ -351,22 +362,26 @@
                         >
                           {{ cardItem?.variantSku }}
                         </span>
-                      </el-tooltip>
-                    </el-col>
-                    <el-col :span="10" :offset="0" style="text-align: right">
-                      <span v-if="status === 'INVALID'">
-                        数量：{{ cardItem?.num }}
-                      </span>
-                      <el-tooltip
-                        v-else
-                        class="item"
-                        effect="dark"
-                        :content="
-                          ['TO_BE_REPLENISHMENT', 'IN_PRODUCTION'].includes(
-                            status,
-                          )
-                            ? '未生产数量'
-                            : '已生产数量'
+                      </el-col>
+                      <el-col :span="10" :offset="0" style="text-align: right">
+                        <el-tooltip
+                          class="item"
+                          effect="dark"
+                          :content="'货号'"
+                          placement="bottom"
+                        >
+                          <span>货号：{{ cardItem?.supplierItemNo }}</span>
+                        </el-tooltip>
+                      </el-col>
+                    </el-row>
+                    <el-row style="margin-top: 5px">
+                      <el-col
+                        :span="12"
+                        :offset="0"
+                        style="
+                          white-space: nowrap;
+                          display: flex;
+                          align-items: center;
                         "
                       >
                         <span>工艺：</span>
@@ -661,7 +676,7 @@
     v-model="shipmentVisible"
     title="发货"
     :close-on-click-modal="false"
-    width="1600px"
+    width="1600PX"
     top="6vh"
     @opened="onShipmentDialogOpened"
   >
@@ -1205,7 +1220,6 @@ const {
   onPageSizeChange: handleSizeChange,
 } = usePageList<OrderData | CardOrderData>({
   query: async (page, pageSize) => {
-    console.log(111111)
     const commonParams = {
       ...searchForm.value,
       status: status.value,