Merge branch 'dev' into 'master'

Dev

See merge request !47

src/views/order/podUs/index.vue

@@ -679,7 +679,8 @@
                         status === 'PICKING' ||
                         status === 'PICKING' ||
                         status === 'TO_BE_CONFIRMED' ||
                         status === 'TO_BE_CONFIRMED' ||
                         status === 'STOCK_OUT' ||
                         status === 'STOCK_OUT' ||
-                          status === 'CREATE_LOGISTICS' ? '数量:'
+                        status === 'CREATE_LOGISTICS'
+                          ? '数量:'
                           : '已生产数量:'
                           : '已生产数量:'
                       }}</span>
                       }}</span>
                       <span class="goods-item-info-item-value">
                       <span class="goods-item-info-item-value">
@@ -1196,13 +1197,16 @@
         <div class="total">
         <div class="total">
           <span
           <span
             >已选择
             >已选择
-            <span style="color: red">{{ selection.length || cardSelection.length }}</span> 条数据</span
+            <span style="color: red">{{
+              selection.length || cardSelection.length
+            }}</span>
+            条数据</span
           >
           >
         </div>
         </div>
         <ElPagination
         <ElPagination
           v-model:current-page="currentPage"
           v-model:current-page="currentPage"
           v-model:page-size="pageSize"
           v-model:page-size="pageSize"
-          :page-sizes="[50,100, 200, 300, 400, 500]"
+          :page-sizes="[50, 100, 200, 300, 400, 500]"
           background
           background
           layout="total, sizes, prev, pager, next, jumper"
           layout="total, sizes, prev, pager, next, jumper"
           :total="total"
           :total="total"
@@ -1213,15 +1217,19 @@
         <div class="pageSize">
         <div class="pageSize">
           <span
           <span
             >自定义条数
             >自定义条数
-            <span><el-input
+            <span
+              ><el-input
                 v-model="pageSize"
                 v-model="pageSize"
                 type="number"
                 type="number"
-              style="width: 100px;" clearable
-              @blur="inputBlur"></el-input></span> 条/页</span
+                style="width: 100px"
+                clearable
+                @blur="inputBlur"
+              ></el-input
+            ></span>
+            条/页</span
           >
           >
         </div>
         </div>
       </div>
       </div>
-
     </div>
     </div>
   </div>
   </div>
   <RightClickMenu
   <RightClickMenu
@@ -1656,7 +1664,7 @@ import platformJson from '../../../json/platform.json'
 declare global {
 declare global {
   interface Window {
   interface Window {
     ActiveXObject: {
     ActiveXObject: {
-      new(type: string): XMLHttpRequest
+      new (type: string): XMLHttpRequest
     }
     }
     VBS_BinaryToArray: {
     VBS_BinaryToArray: {
       (data: unknown): { toArray(): number[] }
       (data: unknown): { toArray(): number[] }
@@ -2219,7 +2227,10 @@ const downloadTif = async (type: string) => {
       cardSelection.value.map((el) => el.id),
       cardSelection.value.map((el) => el.id),
       type,
       type,
     )
     )
-    const url = type === 'tiff' ? `https://ps.jomalls.com/tiff/` + res.message : filePath + res.message
+    const url =
+      type === 'tiff'
+        ? `https://ps.jomalls.com/tiff/` + res.message
+        : filePath + res.message
     window.open(url, '_blank')
     window.open(url, '_blank')
     if (type === 'tiff') {
     if (type === 'tiff') {
       tifDownloadLoading.value = false
       tifDownloadLoading.value = false
@@ -2745,7 +2756,7 @@ const getOrderByIdApi = async (type: string) => {
 
 
     return
     return
   }
   }
-
+  let loading
   const operation = operationMap[type]
   const operation = operationMap[type]
   if (operation) {
   if (operation) {
     try {
     try {
@@ -2757,7 +2768,7 @@ const getOrderByIdApi = async (type: string) => {
 
 
       const ids = selection.value.map((el) => el.id)
       const ids = selection.value.map((el) => el.id)
 
 
-      const loading = ElLoading.service({
+      loading = ElLoading.service({
         fullscreen: true,
         fullscreen: true,
         text: '操作中...',
         text: '操作中...',
         background: 'rgba(0, 0, 0, 0.3)',
         background: 'rgba(0, 0, 0, 0.3)',
@@ -2781,10 +2792,11 @@ const getOrderByIdApi = async (type: string) => {
       } else {
       } else {
         ElMessage.error(res.message)
         ElMessage.error(res.message)
       }
       }
-      loading.close()
     } catch (e) {
     } catch (e) {
       resultInfo.value = []
       resultInfo.value = []
       console.error(e)
       console.error(e)
+    } finally {
+      loading && loading.close()
     }
     }
   } else {
   } else {
     ElMessage.warning('未知操作类型')
     ElMessage.warning('未知操作类型')
@@ -2977,9 +2989,23 @@ const toBePicking = async () => {
   try {
   try {
     const res = await toBePickingApi(selection.value.map((item) => item.id))
     const res = await toBePickingApi(selection.value.map((item) => item.id))
     if (res.code !== 200) return
     if (res.code !== 200) return
-    ElMessage.success('操作成功')
+    resultInfo.value =
+      (res.data as {
+        id: string | number
+        status: boolean
+        factoryOrderNumber?: string
+        message: string
+      }[]) || []
+    if (
+      Array.isArray(res.data) &&
+      (res.data as { status: boolean }[]).some((item) => !item.status)
+    ) {
+      resultRefs.value?.showDialog()
+    } else {
       search()
       search()
       loadTabData()
       loadTabData()
+    }
+    ElMessage.success('操作成功')
   } catch (e) {
   } catch (e) {
     console.error(e)
     console.error(e)
   } finally {
   } finally {