Merge branch 'dev'

src/api/podOrder.ts

@@ -37,13 +37,12 @@ export function getSubOrderBySubOrderNumber(thirdSubOrderNumber: string) {
   )
   )
 }
 }
 
 
-export function getSubOrderBySubOrder(factorySubOrderNumber: string, orderFrom: string) {
+export function getSubOrderBySubOrder(factorySubOrderNumber: string) {
   return axios.get<never, BaseRespData<PodProductList>>(
   return axios.get<never, BaseRespData<PodProductList>>(
     'factory/podJomallOrderProductCnUs/getSubOrderBySubOrderNumber',
     'factory/podJomallOrderProductCnUs/getSubOrderBySubOrderNumber',
     {
     {
       params: {
       params: {
-        factorySubOrderNumber,
-        orderFrom,
+        factorySubOrderNumber
       },
       },
     },
     },
   )
   )

src/components/searchProdOrder.vue

@@ -84,20 +84,19 @@ const trackcodeInput = async () => {
   }
   }
   const user = JSON.parse(localStorage.getItem('user') || '{}')
   const user = JSON.parse(localStorage.getItem('user') || '{}')
 
 
-  let orderNumber: string
+  // let orderNumber: string
 
 
-  const underscoreCount = (TrackingNumber.value.match(/_/g) || []).length
+  // const underscoreCount = (TrackingNumber.value.match(/_/g) || []).length
 
 
-  if (underscoreCount >= 3) {
-    orderNumber = TrackingNumber.value.split('_')[3]
-  } else {
-    orderNumber = TrackingNumber.value
-  }
+  // if (underscoreCount >= 3) {
+  //   orderNumber = TrackingNumber.value.split('_')[3]
+  // } else {
+  //   orderNumber = TrackingNumber.value
+  // }
 
 
   try {
   try {
     const res = await getSubOrderBySubOrder(
     const res = await getSubOrderBySubOrder(
-      orderNumber,
-      user.factory?.countryCode.toLowerCase(),
+      TrackingNumber.value
     )
     )
     if (!res.data) {
     if (!res.data) {
       return ElMessage.error('生产单不存在')
       return ElMessage.error('生产单不存在')

src/views/order/podCN/PodMakeOrder.vue

@@ -143,12 +143,27 @@
               {{ boxIndex }}
               {{ boxIndex }}
             </span>
             </span>
             <span class="box-top-item-box-index-text">号箱</span>
             <span class="box-top-item-box-index-text">号箱</span>
-
+            <template v-if="pickFlag">
+              <strong
+                style="
+                  font-size: 60px;
+                  color: #00ff00;
+                  display: inline-block;
+                  text-align: center;
+                  width: 90px;
+                "
+              >
+                {{ podOrderDetailsData?.purchaseNumber }}
+              </strong>
+              <span style="font-size: 30px">{{ '件已配齐' }}</span>
+            </template>
+            <template v-else>
               <span style="font-size: 30px">放入第</span>
               <span style="font-size: 30px">放入第</span>
               <div class="box-top-item-box-index-number">
               <div class="box-top-item-box-index-number">
                 {{ podOrderDetailsData?.pickingNumber }}
                 {{ podOrderDetailsData?.pickingNumber }}
               </div>
               </div>
               <span style="font-size: 30px">件商品</span>
               <span style="font-size: 30px">件商品</span>
+            </template>
           </div>
           </div>
           <div class="box-top-item-status">
           <div class="box-top-item-status">
             <span
             <span
@@ -410,7 +425,12 @@ watch(
 )
 )
 
 
 const podBoxIndex = computed(() => orderStore.podBoxIndex)
 const podBoxIndex = computed(() => orderStore.podBoxIndex)
-
+const pickFlag = computed(() => {
+  if (podOrderDetailsData.value?.productList) {
+    return podOrderDetailsData.value?.productList.every((item) => item.power)
+  }
+  return false
+})
 let renderLock = false
 let renderLock = false
 
 
 const renderItemBox = (bool: boolean) => {
 const renderItemBox = (bool: boolean) => {

src/views/podUsBillOrder/index.vue

@@ -210,15 +210,6 @@
                     <template #default> US账户 </template>
                     <template #default> US账户 </template>
                   </el-table-column>
                   </el-table-column>
                   <el-table-column
                   <el-table-column
-                    label="应付金额($)"
-                    header-align="center"
-                    prop="totalAmount"
-                    width="130"
-                    align="center"
-                    show-overflow-tooltip
-                  >
-                  </el-table-column>
-                  <el-table-column
                     label="实付金额($)"
                     label="实付金额($)"
                     header-align="center"
                     header-align="center"
                     prop="actual_amount"
                     prop="actual_amount"
@@ -601,17 +592,23 @@
                     />
                     />
                     <el-table-column
                     <el-table-column
                       label="订单号"
                       label="订单号"
-                      prop="order.order_number"
+                      prop="erp_order_number"
                       header-align="center"
                       header-align="center"
                       align="center"
                       align="center"
                       min-width="220"
                       min-width="220"
                       show-overflow-tooltip
                       show-overflow-tooltip
                     >
                     >
-                      <template #default="{ row }">
-                        <span>{{
-                          row.erp_order_number || row.factory_order_number
-                        }}</span>
-                      </template>
+
+                    </el-table-column>
+                    <el-table-column
+                      label="工厂订单号"
+                      prop="order.factory_order_number"
+                      header-align="center"
+                      align="center"
+                      min-width="220"
+                      show-overflow-tooltip
+                    >
+
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
                       label="店铺单号"
                       label="店铺单号"
@@ -945,7 +942,6 @@
       <el-col :span="6">
       <el-col :span="6">
         物流总价($)： {{ currentRow?.carriage_total_amount }}
         物流总价($)： {{ currentRow?.carriage_total_amount }}
       </el-col>
       </el-col>
-      <el-col :span="6"> 应付金额($)：{{ currentRow?.total_amount }}</el-col>
       <el-col :span="6"> 实付金额($)：{{ currentRow?.actual_amount }}</el-col>
       <el-col :span="6"> 实付金额($)：{{ currentRow?.actual_amount }}</el-col>
     </el-row>
     </el-row>
     <el-row style="margin: 10px 0">
     <el-row style="margin: 10px 0">