Merge branch 'dev' into 'master'

Dev

See merge request !40

src/types/api/podUsOrder.ts

@@ -22,6 +22,7 @@ export interface SearchForm {
   productionClient: string
   warehouseId: string | number
   thirdSkuCode: string
+  supplierProductNo:string
 }
 export interface PodUsOrderListData {
   id: number

src/views/order/podUs/index.vue

@@ -41,6 +41,14 @@
             <ElOption label="多面" value="multiple" />
           </ElSelect>
         </ElFormItem>
+        <ElFormItem label="供应货号">
+          <ElInput
+            v-model="searchForm.supplierProductNo"
+            placeholder="生产单号"
+            clearable
+            style="width: 150px"
+          />
+        </ElFormItem>
         <ElFormItem label="生产单号">
           <ElInput
             v-model="searchForm.factorySubOrderNumber"
@@ -1627,6 +1635,7 @@ const [searchForm] = useValue<SearchForm>({
   productionClient: '',
   warehouseId: '',
   thirdSkuCode: '',
+  supplierProductNo:''
 })
 const exceptionStatus = ref(1)
 const userMarkList = ref<string[]>([])
@@ -1834,6 +1843,7 @@ const changeTab = (item: Tab) => {
   status.value = item.status || ''
   selection.value = []
   cardSelection.value = []
+  stockOutSuccessIds.value = []
   search(true)
 }
 const onCellStyle = ({ column }: { column: Column }) => {
@@ -1961,7 +1971,22 @@ async function confirmProduct() {
     const { code, data } = await confirmProductApi([...ids])
     if (code === 200) {
       resultInfo.value = data || []
-      resultRefs.value?.showDialog()
+      resultInfo.value =
+        (data as {
+          id: string | number
+          status: boolean
+          factoryOrderNumber?: string
+          message: string
+        }[]) || []
+      if (
+        Array.isArray(data) &&
+        (data as { status: boolean }[]).some((item) => !item.status)
+      ) {
+        resultRefs.value?.showDialog()
+      } else {
+        search()
+        loadTabData()
+      }
     }
     ElMessage.success('操作成功')
 
@@ -1989,7 +2014,22 @@ async function confirmProductToRiin() {
     const { code, data } = await confirmProductToRiinApi([...ids])
     if (code === 200) {
       resultInfo.value = data || []
-      resultRefs.value?.showDialog()
+      resultInfo.value =
+        (data as {
+          id: string | number
+          status: boolean
+          factoryOrderNumber?: string
+          message: string
+        }[]) || []
+      if (
+        Array.isArray(data) &&
+        (data as { status: boolean }[]).some((item) => !item.status)
+      ) {
+        resultRefs.value?.showDialog()
+      } else {
+        search()
+        loadTabData()
+      }
     }
     ElMessage.success('操作成功')
 
@@ -2075,7 +2115,7 @@ const downloadTif = async () => {
     const res = await composingDesignImages(
       cardSelection.value.map((el) => el.id),
     )
-    window.open('http://ps.jomalls.com/tiff' + res.message, '_blank')
+    window.open('http://ps.jomalls.com/tiff/' + res.message, '_blank')
     downloadLoading.value = false
   } catch (e) {
     downloadLoading.value = false
@@ -2569,7 +2609,14 @@ const getOrderByIdApi = async (type: string) => {
       if (res.code === 200) {
         if (isArray(res.data)) {
           resultInfo.value = res.data || []
-          resultRefs.value?.showDialog(type)
+          resultInfo.value =
+            (res.data as {
+              id: string | number
+              status: boolean
+              factoryOrderNumber?: string
+              message: string
+            }[]) || []
+           resultRefs.value?.showDialog()
         } else if (isString(res.data)) {
           window.open(filePath + res.data)
         }
@@ -2586,7 +2633,14 @@ const getOrderByIdApi = async (type: string) => {
   }
 }
 //展示返回结果
-const resultInfo = ref([])
+const resultInfo = ref<
+  {
+    id: string | number
+    status: boolean
+    factoryOrderNumber?: string
+    message: string
+  }[]
+>([])
 const resultConfim = () => {
   search()
   loadTabData()
@@ -2793,8 +2847,22 @@ const logisticsToPicking = async () => {
       ids: selection.value.map((item) => item.id).join(','),
     })
     if (res.code !== 200) return
-    resultInfo.value = res.data || []
-    resultRefs.value?.showDialog()
+    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()
+      loadTabData()
+    }
     ElMessage.success('操作成功')
     // search()
     // loadTabData()