Merge branch 'dev' into 'master'

Dev

See merge request !137

src/api/podUsOrder.ts

@@ -263,14 +263,14 @@ export function getPodBoxListApi(
 }
 }
 
 
 export function submitInspectionApi(
 export function submitInspectionApi(
-  data: { id: number; version?: number }[],
+  orderId: number | undefined,
   boxIndex: number | null,
   boxIndex: number | null,
   warehouseId: number | string,
   warehouseId: number | string,
 ) {
 ) {
   return axios.post<never, BaseRespData<never>>(
   return axios.post<never, BaseRespData<never>>(
     `factory/podJomallOrderUs/podPrintOrderComplete?box=${boxIndex}&warehouseId=${warehouseId}`,
     `factory/podJomallOrderUs/podPrintOrderComplete?box=${boxIndex}&warehouseId=${warehouseId}`,
     {
     {
-      orderParamList: data,
+      orderId,
     },
     },
   )
   )
 }
 }

src/views/order/podUs/PodMakeOrder.vue

@@ -146,13 +146,14 @@
             <span class="box-top-item-box-index-text">号箱</span>
             <span class="box-top-item-box-index-text">号箱</span>
 
 
             <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" :style="{color:podOrderDetailsData?.pickingNumber ===
+                  podOrderDetailsData?.purchaseNumber ? 'rgb(0, 255, 0)' : ''}">
               {{ podOrderDetailsData?.pickingNumber }}
               {{ podOrderDetailsData?.pickingNumber }}
             </div>
             </div>
             <span style="font-size: 30px">件商品</span>
             <span style="font-size: 30px">件商品</span>
           </div>
           </div>
           <div v-else class="box-top-item-box-index-text">
           <div v-else class="box-top-item-box-index-text">
-            单件商品订单，不占用播种墙
+            单件商品<span style="color: rgb(0, 255, 0)">(配齐)</span>，不占用播种墙
           </div>
           </div>
           <div class="box-top-item-status">
           <div class="box-top-item-status">
             <span
             <span
@@ -180,7 +181,7 @@
             <ElButton type="success" @click="handlePrintFinish"
             <ElButton type="success" @click="handlePrintFinish"
               >打单完成</ElButton
               >打单完成</ElButton
             >
             >
-            <ElButton type="danger" @click="handleClearBox">清空箱子</ElButton>
+            <ElButton :disabled="boxIndex === 0" type="danger" @click="handleClearBox">清空箱子</ElButton>
           </div>
           </div>
           <div
           <div
             v-if="
             v-if="
@@ -705,17 +706,9 @@ const submitInspection = async (callback: () => void) => {
   if (!factoryNo) {
   if (!factoryNo) {
     return
     return
   }
   }
-  const data = podOrderDetailsData.value?.id
-    ? [
-        {
-          id: podOrderDetailsData.value.id,
-          version: podOrderDetailsData.value?.version,
-        },
-      ]
-    : []
   try {
   try {
     const res = await submitInspectionApi(
     const res = await submitInspectionApi(
-      data,
+      podOrderDetailsData.value?.id,
       boxIndex.value,
       boxIndex.value,
       warehouseId.value,
       warehouseId.value,
     )
     )
@@ -906,6 +899,10 @@ const handleBoxClick = (item: PodMakeOrderData) => {
 }
 }
 const handleClearBox = async () => {
 const handleClearBox = async () => {
   try {
   try {
+    if(!boxIndex.value){
+      ElMessage.warning('请选择箱子')
+      return
+    }
     await ElMessageBox.alert('确定清空当前箱子吗？', '提示', {
     await ElMessageBox.alert('确定清空当前箱子吗？', '提示', {
       confirmButtonText: '确定',
       confirmButtonText: '确定',
       cancelButtonText: '取消',
       cancelButtonText: '取消',
@@ -917,6 +914,7 @@ const handleClearBox = async () => {
   if (!factoryNo) {
   if (!factoryNo) {
     return
     return
   }
   }
+
   try {
   try {
     const res = await clearBoxApi(
     const res = await clearBoxApi(
       factoryNo,
       factoryNo,