Merge remote-tracking branch 'origin/dev' into dev

src/api/podUsOrder.ts

@@ -246,12 +246,9 @@ export function loadWarehouseListApi() {
     'factoryWarehouseInfo/getAll',
     'factoryWarehouseInfo/getAll',
   )
   )
 }
 }
-export function refreshMaterialApi(data: {
-  orderIds: string | undefined
-  productIds: string | undefined
-}) {
+export function refreshMaterialApi(orderIds: string) {
   return axios.post<never, BaseRespData<never>>(
   return axios.post<never, BaseRespData<never>>(
     'factory/podJomallOrderProductUs/refreshDesignImages ',
     'factory/podJomallOrderProductUs/refreshDesignImages ',
-    data,
+    { orderIds },
   )
   )
 }
 }

src/views/order/podUs/index.vue

@@ -132,7 +132,7 @@
         <span v-if="status === 'EXCEPTION_ORDER'" class="item">
         <span v-if="status === 'EXCEPTION_ORDER'" class="item">
           <ElButton type="success" @click="updateOrder"> 更新 </ElButton>
           <ElButton type="success" @click="updateOrder"> 更新 </ElButton>
         </span>
         </span>
-        <span v-if="status === 'TO_BE_CONFIRMED'" class="item">
+        <span v-if="status === 'PICKING'" class="item">
           <ElButton type="primary" @click="printProductionOrder">
           <ElButton type="primary" @click="printProductionOrder">
             打印生产单
             打印生产单
           </ElButton>
           </ElButton>
@@ -183,7 +183,15 @@
         <span class="item">
         <span class="item">
           <ElButton type="primary" @click="downloadMaterial">下载素材</ElButton>
           <ElButton type="primary" @click="downloadMaterial">下载素材</ElButton>
         </span>
         </span>
-        <span class="item">
+        <span
+          v-if="
+            status === 'TO_BE_CONFIRMED' ||
+            status === 'PICKING' ||
+            status === 'STOCK_OUT' ||
+            status === 'EXCEPTION_ORDER'
+          "
+          class="item"
+        >
           <ElButton type="success" @click="refreshMaterial">
           <ElButton type="success" @click="refreshMaterial">
             刷新素材图
             刷新素材图
           </ElButton>
           </ElButton>
@@ -358,6 +366,15 @@
                         }}
                         }}
                       </span>
                       </span>
                     </div>
                     </div>
+                    <div class="goods-item-info-item">
+                      <span class="goods-item-info-item-label">克重:</span>
+                      <span
+                        v-if="item.weight"
+                        class="goods-item-info-item-value"
+                      >
+                        {{ item.weight }}g
+                      </span>
+                    </div>
                   </div>
                   </div>
                 </div>
                 </div>
               </div>
               </div>
@@ -401,6 +418,12 @@
                   <DocumentCopy />
                   <DocumentCopy />
                 </el-icon>
                 </el-icon>
               </div>
               </div>
+              <div class="order-detail-item">
+                <span class="order-detail-item-label">总克重:</span>
+                <span v-if="row.weight" class="order-detail-item-value">
+                  {{ row.weight }}g
+                </span>
+              </div>
               <div
               <div
                 v-if="row.status !== 'TO_BE_CONFIRMED'"
                 v-if="row.status !== 'TO_BE_CONFIRMED'"
                 class="order-detail-item"
                 class="order-detail-item"
@@ -544,7 +567,7 @@
             <div class="operate-box">
             <div class="operate-box">
               <span class="operate-item">
               <span class="operate-item">
                 <ElButton
                 <ElButton
-                  v-if="!row.expressSheet && row.status==='TO_BE_CONFIRMED'"
+                  v-if="!row.expressSheet && row.status === 'TO_BE_CONFIRMED'"
                   link
                   link
                   type="primary"
                   type="primary"
                   @click="confirm(row)"
                   @click="confirm(row)"
@@ -1443,9 +1466,11 @@ const downloadMaterial = async () => {
       .map((item: ProductList) => item.id)
       .map((item: ProductList) => item.id)
       .filter((id): id is number => id !== undefined)
       .filter((id): id is number => id !== undefined)
   } else {
   } else {
-    selectedIds = (tableData.value as PodUsOrderListData[]).map(
-      (item) => item.id,
-    )
+    selectedIds = (selection.value as PodUsOrderListData[])
+      .map((item) => item?.productList)
+      .flat()
+      .map((item) => item?.id)
+      .filter((id): id is number => id !== undefined)
   }
   }
   if (selectedIds.length === 0) {
   if (selectedIds.length === 0) {
     return ElMessage({
     return ElMessage({
@@ -1774,30 +1799,13 @@ const loadWarehouseList = async () => {
   }
   }
 }
 }
 const refreshMaterial = async () => {
 const refreshMaterial = async () => {
-  let selectedIds = []
-  const data: {
-    orderIds: string | undefined
-    productIds: string | undefined
-  } = {
-    orderIds: undefined,
-    productIds: undefined,
-  }
-  if (status.value == 'IN_PRODUCTION') {
-    selectedIds = cardSelection.value.map((item) => item.id)
-    data.orderIds = selectedIds.join(',')
-    data.productIds = undefined
-  } else {
-    selectedIds = (selection.value as PodUsOrderListData[]).map(
-      (item) => item.id,
-    )
-    data.productIds = selectedIds.join(',')
-    data.orderIds = undefined
-  }
-  if (selectedIds.length === 0) {
+  if (selection.value.length === 0) {
     return ElMessage.warning('请选择数据')
     return ElMessage.warning('请选择数据')
   }
   }
   try {
   try {
-    const res = await refreshMaterialApi(data)
+    const res = await refreshMaterialApi(
+      selection.value.map((item) => item.id).join(','),
+    )
     if (res.code !== 200) return
     if (res.code !== 200) return
     ElMessage.success('刷新成功')
     ElMessage.success('刷新成功')
     search()
     search()