Merge branch 'master' of http://47.99.244.21:9999/qinjianhui/factory_front

# Conflicts:
#	src/views/order/pod/index.vue

src/api/podOrder.ts

@@ -220,3 +220,13 @@ export function getWaitShipmentCount(
     },
     },
   )
   )
 }
 }
+// 完成发货
+export function completeDeliveryApi(
+  productIdList: number[],
+  data: ShipmentForm,
+) {
+  return axios.post<never, BaseRespData<never>>(
+    'factory/podJomallOrder/completeDelivery ',
+    { productIdList, ...data },
+  )
+}

src/types/api/order.ts

@@ -108,6 +108,7 @@ export interface ProductList {
   factorySubOrderNumber?: string
   factorySubOrderNumber?: string
   podOrderId?: number | string
   podOrderId?: number | string
   isProduction?: boolean
   isProduction?: boolean
+  imageAry?: string
 }
 }
 
 
 export interface MemoList {
 export interface MemoList {

src/views/order/Shipment.vue

@@ -180,9 +180,18 @@
       </div>
       </div>
     </div>
     </div>
     <div v-if="currentRow" class="shipment-order-detail_info">
     <div v-if="currentRow" class="shipment-order-detail_info">
-      <div class="shipment-order-detail_info_image">
+      <div v-if="!currentRow.imageAry" class="shipment-order-detail_info_image">
         <img :src="currentRow.variantImage" style="width: 100%" />
         <img :src="currentRow.variantImage" style="width: 100%" />
       </div>
       </div>
+      <div v-else class="shipment-order-detail_info_image-list">
+        <div
+          v-for="item in JSON.parse(currentRow.imageAry)"
+          :key="item"
+          class="shipment-order-detail_info_image-list-item"
+        >
+          <img :src="item.url" style="width: 100%" />
+        </div>
+      </div>
       <div class="shipment-order-detail_info_other">
       <div class="shipment-order-detail_info_other">
         <div class="order-norm">
         <div class="order-norm">
           <span class="order-norm-label" style="margin-right: 6px">
           <span class="order-norm-label" style="margin-right: 6px">
@@ -446,4 +455,12 @@ const calculateTotals = (ee: OrderData) => {
     font-weight: bold;
     font-weight: bold;
   }
   }
 }
 }
+.shipment-order-detail_info_image-list {
+  height: 100%;
+  overflow: auto;
+  border: 1px solid #eee;
+  .shipment-order-detail_info_image-list-item:not(:last-child) {
+    border-bottom: 1px solid #eee;
+  }
+}
 </style>
 </style>

src/views/order/pod/index.vue

@@ -50,7 +50,6 @@
             style="width: 130px"
             style="width: 130px"
           ></ElInput>
           ></ElInput>
         </ElFormItem>
         </ElFormItem>
-
         <!-- <ElFormItem label="发货单号">
         <!-- <ElFormItem label="发货单号">
           <ElInput
           <ElInput
             v-model="searchForm.shipmentNumber"
             v-model="searchForm.shipmentNumber"
@@ -144,6 +143,7 @@
         </span>
         </span>
         <span
         <span
           v-if="
           v-if="
+            status === 'TO_BE_CONFIRMED' ||
             status === 'IN_PRODUCTION' ||
             status === 'IN_PRODUCTION' ||
             status === 'PART_SHIPPING'
             status === 'PART_SHIPPING'
           "
           "
@@ -989,7 +989,6 @@ const countVisible = ref(false)
 const keyCode = ref('')
 const keyCode = ref('')
 const cardItem = ref<PodProductList | CardOrderData>()
 const cardItem = ref<PodProductList | CardOrderData>()
 const rightMenuRef = ref()
 const rightMenuRef = ref()
-const userMarkList = ref<string[]>([])
 const count = ref<number>(0)
 const count = ref<number>(0)
 const rightClick = (e: MouseEvent, item: PodProductList | CardOrderData) => {
 const rightClick = (e: MouseEvent, item: PodProductList | CardOrderData) => {
   cardItem.value = item
   cardItem.value = item