Merge branch 'dev_product_supply' of…

Merge branch 'dev_product_supply' of http://47.122.114.111:9999/qinjianhui/factory_front into dev_product_supply

components.d.ts

@@ -34,7 +34,6 @@ declare module 'vue' {
     ElImage: typeof import('element-plus/es')['ElImage']
     ElInput: typeof import('element-plus/es')['ElInput']
     ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
-    ElLink: typeof import('element-plus/es')['ElLink']
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElOption: typeof import('element-plus/es')['ElOption']

package.json

@@ -4,7 +4,7 @@
   "version": "0.0.0",
   "type": "module",
   "scripts": {
-    "dev": "vite",
+    "dev": "vite --host",
     "build": "npm run lint && vue-tsc && vite build",
     "preview": "vite preview",
     "lint": "vue-tsc --noEmit && eslint"

src/api/axios.ts

@@ -4,7 +4,7 @@ import { showError } from '@/utils/ui.ts'
 
 const axios = Axios.create({
   baseURL: import.meta.env.VITE_API_BASE,
-  timeout: 300000, //凯哥让改的超时时间
+  timeout: 30 * 60 * 1000, //半小时
 })
 
 const TOKEN_KEY = 'token'

src/api/externalAuth.ts

@@ -48,3 +48,14 @@ export function addExternalAuthorisationApi(
 ) {
   return axios.post<never, BaseRespData<never>>(url, data)
 }
+export function saveInventoryLowerLimitApi(inventoryLowerLimit: number) {
+  return axios.get<never, BaseRespData<never>>(
+    'factory/baseExternalAccount/setInventoryWarningFloor',
+    { params: { inventoryWarningFloor: inventoryLowerLimit } },
+  )
+}
+export function getInventoryLowerLimitApi() {
+  return axios.get<never, BaseRespData<number>>(
+    'factory/baseExternalAccount/getInventoryWarningFloor',
+  )
+}

src/api/outOfStockStis.ts

+import axios from './axios'
+import { BasePaginationData, BaseRespData } from '@/types/api'
+import { SearchForm, OutOfStockItem } from '@/types/api/outOfStockStatistics'
+export function getOutOfStockStatisticsListApi(
+  data: SearchForm,
+  currentPage: number,
+  pageSize: number,
+) {
+  return axios.post<never, BasePaginationData<OutOfStockItem>>(
+    'stockOutStatistics/getStockOutStatistics',
+    { ...data, currentPage, pageSize },
+  )
+}
+
+export function exportOutOfStockStatisticsListApi(data: {
+  exportAll: boolean
+  indexes?: number[]
+}) {
+  return axios.post<never, BaseRespData<never>>(
+    'stockOutStatistics/exportStockOutStatistics',
+    data,
+  )
+}

src/api/podUsOrder.ts

@@ -85,6 +85,23 @@ export function getCardOrderList(
     },
   )
 }
+
+export function uploadPRNFile(
+  id: number,
+  data: FormData,
+) {
+  return axios.post<never, BaseRespData<string>>(
+    `/factory/podBatchDownload/uploadPRNFile?id=${id}`,
+    data
+  )
+}
+export function updatePRNDownloadStatus(
+  id: number
+) {
+  return axios.get<never, BaseRespData<string>>(
+    `/factory/podBatchDownload/updatePRNDownloadStatus?id=${id}`
+  )
+}
 export function confirmOrderApi(
   data: number[],
   productionClient: string,
@@ -556,10 +573,15 @@ export function changeToFinished(ids: string) {
   )
 }
 
-export function reissueOrderApi(ids: string) {
-  return axios.get<never, BaseRespData<never>>(
+export function reissueOrderApi(data: {
+  ids:string
+  reissueType:number
+  trackingNumber?:string
+  expressSheet:string
+}) {
+  return axios.post<never, BaseRespData<never>>(
     `factory/podJomallOrderUs/reissueOrder`,
-    { params: { ids } },
+    data,
   )
 }
 export function OrderCnReceiverAddress(idList: number[]) {

src/router/index.ts

@@ -163,6 +163,13 @@ const router = createRouter({
           component: CustomersPage,
         },
         {
+          path: '/supply/out-of-stock-statistics',
+          meta: {
+            title: '缺货统计',
+          },
+          component: () => import('@/views/supply/OutOfStockStatistics.vue')
+        },
+        {
           path: '/system/delivery-note',
           meta: {
             title: '定制发货单',

src/router/menu.ts

@@ -148,19 +148,24 @@ const menu: MenuItem[] = [
       },
     ],
   },
-
   {
-    index: '12',
-    id: 4,
+    index: '14',
+    id: 14,
     label: '供应',
     children: [
       {
-        index: '/supply/supplierManagement',
+        label: '缺货统计',
+        index: '/supply/out-of-stock-statistics',
         id: 1,
+      },
+      {
+        index: '/supply/supplierManagement',
+        id: 2,
         label: '供应商管理',
       },
     ],
   },
+
   {
     index: '11',
     id: 3,

src/types/api/outOfStockStatistics.ts

+export interface OutOfStockItem {
+  id?: number
+  variantImage?: string
+  warehouseName?: string
+  locationCode?: string
+  warehouseSku?: string
+  productNo?: string
+  skuName?: string
+  currency?: string
+  costPrice?: number
+  stockOutNum?: number
+  salesNum?: number
+  warehouseSpu?: string
+  inventory?: number
+  occupyInventory?: number
+  freezeInventory?: number
+  purchaseNotInQuantity?: number
+  longestDelayDays?: number
+  sort?: number
+}
+
+export interface SearchForm {
+  warehouseId?: string | number
+  warehouseSku?: string
+  productNo?: string
+  skuName?: string
+}
\ No newline at end of file

src/types/api/podUsOrder.ts

@@ -48,8 +48,11 @@ export interface SearchForm {
 export interface PodUsOrderListData {
   id: number
   thirdOrderNumber?: string
+  prnUrl?: string
   factoryOrderNumber?: string
+  prnDownloadStatus?: boolean
   shopNumber?: string
+  isUpload?: boolean
   factoryOnlineId?: number | null
   factoryNo?: number | null
   factoryCode?: string | null

src/views/order/podUs/components/ReissueOrder.vue

+<script setup lang="ts">
+import { ref } from 'vue'
+import { Plus, Close } from '@element-plus/icons-vue'
+import { reissueOrderApi, uploadExpressSheet } from '@/api/podUsOrder.ts'
+import { PodUsOrderListData } from '@/types/api/podUsOrder.ts'
+
+const dialogShow = ref(false)
+const formRef = ref()
+const open = () => {
+  form.value = {
+    reissueType: 1,
+    trackingNumber: '',
+    expressSheet: '',
+    file: null,
+  }
+  dialogShow.value = true
+}
+const emit = defineEmits(['success'])
+const props = defineProps({
+  selection: {
+    type: Array,
+    default: () => [],
+  },
+})
+const formRules = {
+  reissueType: {
+    required: true,
+    message: '请选择补发方式',
+    trigger: 'change',
+  },
+  trackingNumber: {
+    required: true,
+    message: '请输入跟踪号',
+    trigger: 'blur',
+  },
+  file: {
+    required: true,
+    message: '请上传物流面单',
+    trigger: 'change',
+  },
+}
+
+interface Iform {
+  reissueType: number
+  trackingNumber: string
+  expressSheet: string
+  file: File | null
+}
+
+const form = ref<Iform>({
+  reissueType: 1,
+  trackingNumber: '',
+  expressSheet: '',
+  file: null,
+})
+defineExpose({ open })
+const submit = async () => {
+  await formRef.value.validate()
+  if((props.selection as PodUsOrderListData[])[0].shipmentType===0 && form.value.reissueType!==1){
+    if(!form.value.expressSheet){
+      return  ElMessage.warning('请上传物流面单')
+    }
+  }
+  await reissueOrderApi({
+    ids: (props.selection as PodUsOrderListData[]).map(e => e.id).join(),
+    reissueType: form.value.reissueType,
+    trackingNumber: form.value.trackingNumber,
+    expressSheet: form.value.expressSheet,
+  })
+
+  ElMessage.success('操作成功')
+  dialogShow.value = false
+  emit('success')
+}
+const radioChange = () => {
+  form.value.trackingNumber = ''
+  form.value.expressSheet = ''
+  form.value.file = null
+}
+
+const clearFile = () => {
+  form.value.file = null
+  form.value.expressSheet = ''
+}
+const createFormToUpload = () => {
+  const input = document.createElement('input')
+  input.type = 'file'
+  input.style.display = 'none'
+  input.accept = '.pdf'
+  input.name = 'file'
+  document.body.appendChild(input)
+  input.click()
+  input.onchange = async function() {
+    console.log(input.files)
+    if (input.files?.length !== 1) {
+      return ElMessage.warning('请上传一个面单')
+    }
+    form.value.file = input.files[0]
+    const fm = new FormData()
+    fm.append('file', input.files[0])
+    fm.append('trackingNumber', form.value.trackingNumber)
+    const res = await uploadExpressSheet(fm as never)
+    form.value.expressSheet = res.message || ''
+  }
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogShow" title="补发" :close-on-click-modal="false">
+    <el-form v-if="selection.length" ref="formRef" :rules="formRules" :model="form">
+      <el-form-item required label="补发方式" prop="reissueType">
+        <el-radio-group
+          v-model="form.reissueType"
+          style="display: flex;flex-direction: column;align-items: flex-start;"
+          @change="radioChange">
+          <el-radio :label="1">原单补发</el-radio>
+          <el-radio
+:disabled="(selection as PodUsOrderListData[])[0].shipmentType===0 && selection.length>1"
+                    :label="2">换单补发，取消原单物流
+          </el-radio>
+          <el-radio
+:disabled="(selection as PodUsOrderListData[])[0].shipmentType===0 && selection.length>1"
+                    :label="3">换单补发，不取消原单物流
+          </el-radio>
+        </el-radio-group>
+
+      </el-form-item>
+      <span v-if="(selection as PodUsOrderListData[])[0].shipmentType===0 && selection.length>1" class="tip">自有物流选择选项2和选项3请单个操作，不支持批量操作；</span>
+      <el-form-item
+v-if="(selection as PodUsOrderListData[])[0].shipmentType===0 && form.reissueType!==1" required
+                    label="物流信息" prop="trackingNumber">
+        <div class="form-content">
+          <div class="content-item">
+            <div class="label">跟踪号</div>
+            <el-input v-model="form.trackingNumber" style="height: 40px" placeholder="请输入跟踪号"></el-input>
+          </div>
+          <div v-if="form.trackingNumber" class="content-item">
+            <div class="label">物流面单</div>
+            <div class="upload" @click="createFormToUpload">
+              <el-icon>
+                <Plus></Plus>
+              </el-icon>
+            </div>
+            <div v-if="form.file" class="file">
+              <div class="name">{{ form.file.name }}</div>
+              <div class="close" @click="clearFile">
+                <el-icon>
+                  <Close></Close>
+                </el-icon>
+              </div>
+            </div>
+          </div>
+        </div>
+      </el-form-item>
+      <el-form-item v-if="(selection as PodUsOrderListData[])[0].shipmentType===0 && form.reissueType!==1">
+          <div class="tip-2">自有物流请联系客户提供新跟踪号和面单</div>
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="dialogShow=false">取消</el-button>
+      <el-button type="primary" @click="submit">确定</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style scoped lang="scss">
+.tip {
+  color: red;
+  position: relative;
+  top: -14px;
+  left: 79px;
+}
+
+.form-content, .content-item {
+  display: flex;
+  margin-right: 25px;
+
+  .upload {
+    border: 1px darkgray solid;
+    width: 50px;
+    cursor: pointer;
+    height: 50px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    border-radius: 3px;
+  }
+
+  .file {
+    display: flex;
+    margin-left: 25px;
+    align-items: center;
+    gap: 6px;
+
+    .close {
+      cursor: pointer;
+      color: red;
+    }
+  }
+
+  .label {
+    width: 70px;
+  }
+}
+.tip-2{
+  color: red;
+  margin-left: 13px;
+  position: relative;
+  top: -9px;
+}
+</style>

src/views/order/podUs/index.vue

@@ -399,33 +399,43 @@
         >
           <ElDropdown>
             <el-button type="primary">
-              DTF排版<el-icon class="el-icon--right"><ArrowDown /></el-icon>
+              DTF排版
+              <el-icon class="el-icon--right">
+                <ArrowDown />
+              </el-icon>
             </el-button>
             <template #dropdown>
               <ElDropdownMenu>
                 <ElDropdownItem
                   :loading="tifDownloadLoading"
                   @click="downloadTif('tiff', 42)"
-                  >TIF(40+2cm)</ElDropdownItem
+                >TIF(40+2cm)
+                </ElDropdownItem
                 >
                 <ElDropdownItem
                   :loading="tifDownloadLoading"
                   @click="downloadTif('tiff', 60)"
-                  >TIF(60cm)</ElDropdownItem
+                >TIF(60cm)
+                </ElDropdownItem
                 >
                 <ElDropdownItem
                   :loading="pngDownloadLoading"
                   @click="downloadTif('png', 42)"
-                  >PNG(40+2cm)</ElDropdownItem
+                >PNG(40+2cm)
+                </ElDropdownItem
                 >
                 <ElDropdownItem
                   :loading="pngDownloadLoading"
                   @click="downloadTif('png', 60)"
-                  >PNG(60cm)</ElDropdownItem
+                >PNG(60cm)
+                </ElDropdownItem
+                >
+              </ElDropdownMenu>
+            </template
+            >
+          </ElDropdown
           >
-              </ElDropdownMenu></template
-            ></ElDropdown
-          ></ElFormItem
+        </ElFormItem
         >
         <!-- <ElFormItem
           v-if="
@@ -865,39 +875,6 @@
             }}</span
           >
         </div>
-        <!-- <div
-            v-if="item.status === 'EXCEPTION_ORDER'"
-            :key="item.status"
-            class="tabs-node"
-          >
-            <el-dropdown @command="handleExceptionCommand">
-              <div>
-                <span
-                  class="tabs-node_label"
-                  style="color: #000; font-weight: 500"
-                >
-                  异常单
-                </span>
-                <span
-                  class="tabs-node_count"
-                  :class="{
-                    blue: item.quantity && item.quantity > 0,
-                    red: item.status === 'EXCEPTION_ORDER',
-                  }"
-                  >{{ item.quantity }}</span
-                >
-                <el-icon class="el-icon--right"><arrow-down /></el-icon>
-              </div>
-
-              <template #dropdown>
-                <el-dropdown-menu>
-                  <el-dropdown-item command="1">待分派</el-dropdown-item>
-                  <el-dropdown-item command="2">待处理</el-dropdown-item>
-                  <el-dropdown-item command="3">已处理</el-dropdown-item>
-                </el-dropdown-menu>
-              </template>
-            </el-dropdown>
-          </div> -->
       </div>
     </div>
     <div class="order-content flex-1 flex-column overflow-hidden mt-10">
@@ -1565,13 +1542,14 @@
               </div>
               <div class="order-detail-item">
                 <span class="order-detail-item-label">订单来源:</span>
-                <span class="order-detail-item-value">
+                <span :class="{'red-big':row.source==='factory-reissue'}" class="order-detail-item-value">
                   {{
                     row.source
                       ? {
                         'jomall-erp': 'erp推送',
                         'third-party': '第三方推送',
-                        }[row.source as 'jomall-erp' | 'third-party']
+                        'factory-reissue': '补发订单',
+                      }[row.source as 'jomall-erp' | 'third-party' | 'factory-reissue']
                       : ''
                   }}
                 </span>
@@ -1781,6 +1759,26 @@
               {{ row.automaticComposing ? '是' : '否' }}
             </div>
           </template>
+          <template #prn="{ row }">
+            <div style="display: flex">
+              <span :title="fileName(row)" class="flex-1">{{ fileName(row) }}</span>
+              <el-link :disabled="row.isUpload" underline="never" type="success" @click="uploadFile(row)">上传</el-link>
+              <el-icon v-if="row.isUpload" style="right: 0;top:5px;" class="is-loading"
+              >
+                <Loading
+                />
+              </el-icon>
+              <el-link
+:disabled="!row.prnUrl" style="margin-left: 8px" underline="never" type="primary"
+                       @click="downloadRowProFile(row)">下载
+              </el-link>
+              <el-icon v-if="row.prnDownloadStatus" style="right: -2px" class="check-icon"
+              >
+                <CircleCheckFilled
+                />
+              </el-icon>
+            </div>
+          </template>
           <template #composingParam="{ row }">
             <div style="white-space: pre-line">
               {{ row.composingParam?.split(';').join('\n') }}
@@ -1825,10 +1823,11 @@
               <span class="operate-item">
                 <ElButton
                   link
+                  title="打印拣货单"
                   type="primary"
                   @click="printPickingOrderItem(row, 1)"
                 >
-                  打印拣货单
+                  拣货单
                 </ElButton>
                 <el-icon v-if="row.printPickOrder" class="check-icon"
                 ><CircleCheckFilled
@@ -1837,10 +1836,11 @@
               <span class="operate-item">
                 <ElButton
                   link
+                  title="打印生产单"
                   type="primary"
                   @click="printPickingOrderItem(row, 2)"
                 >
-                  打印生产单
+                  生产单
                 </ElButton>
                 <el-icon v-if="row.printProductOrder" class="check-icon"
                 ><CircleCheckFilled
@@ -1850,11 +1850,12 @@
                 <ElButton
                   :disabled="row.productNum > 50"
                   link
+                  title="重新排版"
                   type="warning"
                   :loading="reComposingLoadingMap[row.id]"
                   @click="showArrange(1, row)"
                 >
-                  重新排版
+                  重排
                 </ElButton>
               </span>
               <span class="operate-item">
@@ -1994,8 +1995,8 @@
           <div
             v-for="(cardItem) in tableData as ProductList[]"
             :key="cardItem.id"
-            class="card-list-item"
             ref="cardRefs"
+            class="card-list-item"
             @click="cardClick(cardItem)"
             @mouseleave="handleChangeImages(null, cardItem)"
           >
@@ -2043,24 +2044,25 @@
                         type="primary"
                         :title="item.name || ''"
                         style="margin-bottom: 2px"
-                        >{{ item.name || '' }}</el-tag
+                      >{{ item.name || '' }}
+                      </el-tag
                       >
                     </div>
                   </template>
                   <div
-                    class="flex"
+                    v-if="cardItem.customTagList?.length"
                     ref="tagRefs"
+                    class="flex"
                     style="gap: 5px; overflow: hidden"
-                    v-if="cardItem.customTagList?.length"
                   >
                     <el-tag
-                      size="small"
-                      type="primary"
                       v-for="(item, index) in cardItem.customTagList.slice(
                         0,
                         3,
                       )"
                       :key="index"
+                      size="small"
+                      type="primary"
                     ><span
                       style="
                           width: 50px;
@@ -2075,10 +2077,11 @@
                     ></el-tag
                     >
                     <el-tag
+                      v-if="cardItem.customTagList?.slice(3)?.length"
                       size="small"
                       type="primary"
-                      v-if="cardItem.customTagList?.slice(3)?.length"
-                      >+{{ cardItem.customTagList.slice(3).length }}</el-tag
+                    >+{{ cardItem.customTagList.slice(3).length }}
+                    </el-tag
                     >
                   </div>
                 </el-tooltip>
@@ -2639,8 +2642,8 @@
     v-model:form="currentRow"
     v-model:visible="updateAddVisible"
     :country-list="countryList"
-    @success="search"
     :type="updateAddressType"
+    @success="search"
   ></UpdateAddress>
   <ElDialog
     v-model="exceptionDialogVisible"
@@ -2842,7 +2845,8 @@
             typesettingVisible = false
           }
         "
-        >取消</el-button
+      >取消
+      </el-button
       >
       <el-button type="primary" @click="submitTypesetting">确认</el-button>
     </template>
@@ -2886,6 +2890,7 @@
       <ElButton type="primary" @click="confirmReplenishment">确定</ElButton>
     </template>
   </ElDialog>
+  <ReissueOrderComponent ref="reissueOrderRef" :selection="selection" @success="handleSuccess"></ReissueOrderComponent>
 </template>
 <script setup lang="ts">
 import LogisticsWaySelect from '../../logistics/components/LogisticsWaySelect.tsx'
@@ -2903,6 +2908,7 @@ import {
 } from '@element-plus/icons-vue'
 import {
   getCardOrderList,
+  uploadPRNFile,
   getOrderList,
   getOrderTabData,
   confirmOrderApi,
@@ -2964,7 +2970,7 @@ import {
   getCustomTagListApi,
   getLogisticsWayApi,
   printNormalPickPdfApi,
-  reissueOrderApi
+   updatePRNDownloadStatus,
 } from '@/api/podUsOrder'
 import { BaseRespData } from '@/types/api'
 
@@ -2997,6 +3003,7 @@ import { showConfirm } from '@/utils/ui'
 import {
   DocumentCopy,
   EditPen,
+  Loading,
   CircleCheckFilled,
 } from '@element-plus/icons-vue'
 import { Column, ElFormItem } from 'element-plus'
@@ -3014,8 +3021,10 @@ import { isArray, isString } from '@/utils/validate'
 import platformJson from '../../../json/platform.json'
 import { getToken } from '@/api/axios'
 import usePermissionBtnStore from '@/store/permission'
+import ReissueOrderComponent from './components/ReissueOrder.vue'
 
 const permissionBtns = usePermissionBtnStore()
+
 import {
   useRouter,
   type NavigationGuardNext,
@@ -3025,7 +3034,7 @@ import {
 declare global {
   interface Window {
     ActiveXObject: {
-      new (type: string): XMLHttpRequest
+      new(type: string): XMLHttpRequest
     }
     VBS_BinaryToArray: {
       (data: unknown): { toArray(): number[] }
@@ -3045,10 +3054,14 @@ const sourceList = [
   {
     name: '第三方推送',
     id: 'third-party',
+  },{
+    name: '补发订单',
+    id: 'factory-reissue',
   },
 ]
 const sizes = ['FS', 'XS', 'S', 'M', 'L', 'XL', 'XXL', '3XL', '4XL', '5XL']
 const tabsNav = ref<Tab[]>()
+const reissueOrderRef = ref()
 const isAuto = ref(true)
 const countryList = ref([])
 const logisticsWayList = ref<{ name: string; id: number }[]>([])
@@ -3552,6 +3565,12 @@ const tableColumns = computed(() => {
         prop: 'automaticComposing',
         slot: 'automaticComposing',
         align: 'center',
+      }, {
+        label: 'PRN文件',
+        width: 300,
+        prop: 'automaticComposing',
+        slot: 'prn',
+        align: 'right',
       },
       {
         label: '排版参数',
@@ -3563,7 +3582,7 @@ const tableColumns = computed(() => {
       {
         label: '操作',
         slot: 'operate',
-        width: 350,
+        width: 300,
         align: 'center',
         fixed: 'right',
         prop: 'operate',
@@ -3967,7 +3986,10 @@ watch(
   },
   { deep: true, immediate: true }, // 添加immediate确保初始化时执行
 )
-
+const fileName = (row: PodUsOrderListData) => {
+  if (!row.prnUrl) return ''
+  return row.prnUrl.split('/')[row.prnUrl.split('/').length - 1]
+}
 const search = () => {
   selection.value = []
   cardSelection.value = []
@@ -4145,6 +4167,37 @@ const productionClientVisible = ref(false)
 //   productionClientVisible.value = true
 // }
 
+const downloadRowProFile = async (row: PodUsOrderListData) => {
+  const url =
+    `https://factory.jomalls.com/upload/factory` + row.prnUrl
+  window.open(url, '_blank')
+  await updatePRNDownloadStatus(
+    row.id,
+  )
+  search()
+}
+
+const uploadFile = (row: PodUsOrderListData) => {
+  const input = document.createElement('input')
+  input.style.display = 'none'
+  input.type = 'file'
+  input.multiple = false
+  input?.click()
+  row.isUpload = true
+  input.onchange = async function() {
+    try {
+      if (input.files && input.files.length) {
+        const fm = new FormData()
+        fm.append('file', input.files?.[0])
+        const res = await uploadPRNFile(row.id, fm)
+        row.prnUrl = res.message
+      }
+    } finally {
+      row.isUpload = false
+    }
+  }
+}
+
 const downloadTif = async (type: string, templateWidth: number) => {
   if (!cardSelection.value.length) {
     return ElMessage.warning('请选择数据')
@@ -6273,29 +6326,11 @@ const reissueOrder = async () => {
   if (selection.value.length === 0) {
     return ElMessage.warning('请选择数据')
   }
-  await ElMessageBox.confirm('是否补发?', '提示', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning',
-  })
-  const loading = ElLoading.service({
-    fullscreen: true,
-    text: '操作中...',
-    background: 'rgba(0, 0, 0, 0.3)',
-  })
-  try {
-    const res = await reissueOrderApi(
-      selection.value.map((item) => item.id).join(','),
-    )
-    if (res.code !== 200) return
-    ElMessage.success('操作成功')
-    search()
-    await loadTabData()
-  } catch (e) {
-    console.error(e)
-  } finally {
-    loading.close()
+  const isSameShipmentType = Array.from(new Set(selection.value.map(s=>s.shipmentType))).length===1
+  if(!isSameShipmentType){
+    return ElMessage.warning('请选择相同物流类型的数据')
   }
+  reissueOrderRef.value.open()
 }
 
 // 完成发货
@@ -6562,6 +6597,7 @@ const printNormal = async () => {
   background: rgb(255 243 205);
   color: rgb(91, 99, 18);
 }
+
 .empty {
   height: 100%;
   display: flex;
@@ -6765,13 +6801,16 @@ const printNormal = async () => {
   color: white;
   font-weight: bold;
 }
+
 .triangle-container-wrap {
   position: absolute;
   top: 0;
   right: 0;
 }
+
 .triangle-container {
   position: relative;
+
   .triangle-marker {
     width: 0;
     height: 0;
@@ -6779,6 +6818,7 @@ const printNormal = async () => {
     border-right: 18px solid #e74c3c;
     border-top: 18px solid #e74c3c;
   }
+
   .content {
     position: absolute;
     top: 0;
@@ -6790,13 +6830,16 @@ const printNormal = async () => {
     font-size: 12px;
   }
 }
+
 .triangle-container-wrap {
   position: absolute;
   top: 0;
   right: 0;
 }
+
 .triangle-container {
   position: relative;
+
   .triangle-marker {
     width: 0;
     height: 0;
@@ -6804,6 +6847,7 @@ const printNormal = async () => {
     border-right: 18px solid #e74c3c;
     border-top: 18px solid #e74c3c;
   }
+
   .content {
     position: absolute;
     top: 0;
@@ -6839,8 +6883,8 @@ const printNormal = async () => {
 }
 
 .el-timeline
-  > .el-timeline-item:first-child
-  .el-timeline-item__timestamp.is-top {
+> .el-timeline-item:first-child
+.el-timeline-item__timestamp.is-top {
   color: #409eff;
 }
 
@@ -6849,6 +6893,7 @@ const printNormal = async () => {
   justify-content: space-between;
   align-items: center;
 }
+
 .tabs-node-quantity {
   position: relative;
   color: red;
@@ -6856,6 +6901,7 @@ const printNormal = async () => {
   top: -10px;
   right: 0px;
 }
+
 .operate-item {
   position: relative;
 }
@@ -6867,4 +6913,16 @@ const printNormal = async () => {
   top: 30%;
   transform: translateY(-50%);
 }
+
+.flex-1 {
+  flex: 1;
+  flex-shrink: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.red-big{
+  font-size: 15px;
+  color: red;
+}
 </style>

src/views/setting/settingIndex.vue

@@ -7,23 +7,30 @@
       <span>系统配置</span>
     </div>
     <div class="cardBox">
-      <div v-for="(item, index) in formList" style="width: 600px" :key="index">
-        <el-form
-          v-if="item.type === 'RIIN'"
-          class="form"
-          ref="formRef"
-          label-width="120"
-          :model="item"
+      <div class="card-box-item-container">
+        <div
+          v-for="(item, index) in formList"
+          :key="index"
+          class="card-box-item"
         >
+          <template v-if="item.type === 'RIIN'">
             <div class="formBox">
-            <el-form-item label="转至RIIN生产">
+              <div class="form-item">
+                <span>转至RIIN生产</span>
                 <el-switch
                   v-model="item.enable"
                   class="ml-2"
                   style="--el-switch-on-color: #42b983"
                 />
-            </el-form-item>
-            <div class="formContent" v-if="item.enable">
+              </div>
+              <div v-if="item.enable" class="formContent">
+                <el-form
+                  v-if="item.type === 'RIIN'"
+                  ref="formRef"
+                  class="form"
+                  label-width="120"
+                  :model="item"
+                >
                   <el-form-item
                     label="账号"
                     prop="appKey"
@@ -48,6 +55,7 @@
                       clearable
                       style="width: 100%"
                   /></el-form-item>
+                </el-form>
               </div>
             </div>
 
@@ -57,7 +65,18 @@
               @click="saveConfiguration(item, index)"
               >保存配置</ElButton
             >
-        </el-form>
+          </template>
+          <template v-if="item.type === 'TRACK'">
+            <div class="formBox">
+              <div class="form-item">
+                <span>物流轨迹跟踪</span>
+                <el-switch
+                  v-model="item.enable"
+                  class="ml-2"
+                  style="--el-switch-on-color: #42b983"
+                />
+              </div>
+              <div v-if="item.enable" class="formContent">
                 <el-form
                   v-if="item.type === 'TRACK'"
                   class="form"
@@ -65,15 +84,6 @@
                   label-width="120"
                   :model="item"
                 >
-          <div class="formBox">
-            <el-form-item label="物流轨迹跟踪">
-              <el-switch
-                v-model="item.enable"
-                class="ml-2"
-                style="--el-switch-on-color: #42b983"
-              />
-            </el-form-item>
-            <div class="formContent" v-if="item.enable">
                   <el-form-item
                     label="17Track账号"
                     prop="appKey"
@@ -98,6 +108,7 @@
                       clearable
                       style="width: 100%"
                   /></el-form-item>
+                </el-form>
               </div>
             </div>
 
@@ -107,7 +118,25 @@
               @click="saveConfiguration(item, index)"
               >保存配置</ElButton
             >
-        </el-form>
+          </template>
+        </div>
+        <div class="card-box-item">
+          <div class="formBox">
+            <div class="form-item">
+              <span>库存预警下限:</span>
+            </div>
+            <div class="formContent">
+              <ElInput
+                v-model="inventoryLowerLimit"
+                clearable
+                placeholder="请输入库存预警下限"
+              />
+            </div>
+          </div>
+          <ElButton class="btn" color="#42b983" @click="saveInventoryLowerLimit"
+            >保存配置</ElButton
+          >
+        </div>
       </div>
     </div>
     <div class="logBox">
@@ -122,6 +151,8 @@ import {
   addExternalAuthorisationApi,
   getExternalAuthorisationListApi,
   baseExternalAccountLogsApi,
+  saveInventoryLowerLimitApi,
+  getInventoryLowerLimitApi,
 } from '@/api/externalAuth'
 import { ExternalAuthListData } from '@/types/api/externalAuth'
 
@@ -134,7 +165,7 @@ interface formType {
 }
 
 const formRef = ref()
-
+const inventoryLowerLimit = ref<number | null>(100)
 const logList = ref([])
 async function saveConfiguration(item: formType, index: number) {
   let loading
@@ -222,16 +253,49 @@ async function handleClick() {
     console.log(error)
   }
 }
+const saveInventoryLowerLimit = async () => {
+  if (!inventoryLowerLimit.value) {
+    ElMessage.error('请输入库存预警下限')
+    return
+  }
+  try {
+    const res = await saveInventoryLowerLimitApi(inventoryLowerLimit.value)
+    if (res.code !== 200) {
+      return
+    }
+    await ElMessageBox.confirm('保存配置成功！！需重新登录才能生效', '提示', {
+      confirmButtonText: '确定',
+      showCancelButton: false,
+      type: 'success',
+    })
+    getInventoryLowerLimit()
+    handleClick()
+  } catch (error) {
+    console.log(error)
+  }
+}
+const getInventoryLowerLimit = async () => {
+  try {
+    const res = await getInventoryLowerLimitApi()
+    if (res.code !== 200) {
+      return
+    }
+    inventoryLowerLimit.value = res.data
+  } catch (error) {
+    console.log(error)
+  }
+}
 
 onMounted(async () => {
   await getDetail()
+  getInventoryLowerLimit()
   handleClick()
 })
 </script>
 
 <style lang="scss" scoped>
 .card-header {
-  margin-left: 200px;
+  text-align: center;
   font-size: 30px;
   margin-bottom: 20px;
 }
@@ -240,9 +304,8 @@ onMounted(async () => {
     height: calc(100% - 60px);
   }
   .cardBox {
-    flex: 3;
+    flex: 1;
     overflow-y: scroll;
-    height: 100%;
     .el-card__footer {
       border: none !important;
     }
@@ -253,6 +316,9 @@ onMounted(async () => {
       padding: 20px;
       border: 1px solid #ebebeb;
       border-radius: 8px;
+      height: 220px;
+      display: flex;
+      flex-direction: column;
       &:last-child {
         margin-bottom: 0;
       }
@@ -260,6 +326,8 @@ onMounted(async () => {
         padding: 20px;
         background-color: #f9f9f9;
         border-radius: 5px;
+        overflow: auto;
+        flex: 1;
         .el-form-item:last-child {
           margin-bottom: 0 !important;
         }
@@ -274,8 +342,20 @@ onMounted(async () => {
     padding-top: 10px;
     height: 200px;
   }
-  .form {
-    margin-bottom: 15px;
+}
+.form-item {
+  display: flex;
+  align-items: center;
+  margin-bottom: 10px;
+  gap: 10px;
+  span {
+    color: #606266;
+    font-size: 14px;
   }
 }
+.card-box-item-container {
+  display: grid;
+  grid-template-columns: repeat(3, minmax(100px, 1fr));
+  gap: 10px;
+}
 </style>

src/views/supply/OutOfStockStatistics.vue

+<template>
+  <div
+    class="out-of-stock-statistics-page flex-column card h-100 overflow-hidden"
+  >
+    <div class="header-filter-form">
+      <ElForm v-enter-submit="search" :inline="true">
+        <ElFormItem label="缺货仓库">
+          <ElSelect
+            v-model="searchForm.warehouseId"
+            style="width: 180px"
+            placeholder="请选择仓库"
+          >
+            <ElOption
+              v-for="item in warehouseList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></ElOption>
+          </ElSelect>
+        </ElFormItem>
+        <ElFormItem label="库存SKU">
+          <ElInput
+            v-model="searchForm.warehouseSku"
+            clearable
+            style="width: 180px"
+            placeholder="请输入库存SKU"
+          ></ElInput>
+        </ElFormItem>
+        <ElFormItem label="款号">
+          <ElInput
+            v-model="searchForm.productNo"
+            clearable
+            style="width: 180px"
+            placeholder="请输入款号"
+          ></ElInput>
+        </ElFormItem>
+        <ElFormItem label="商品名称">
+          <ElInput
+            v-model="searchForm.skuName"
+            clearable
+            style="width: 180px"
+            placeholder="请输入商品名称"
+          ></ElInput>
+        </ElFormItem>
+        <ElFormItem>
+          <ElButton type="primary" @click="search"> 查询 </ElButton>
+        </ElFormItem>
+        <ElFormItem>
+          <ElButton type="success" @click="exportData"> 导出 </ElButton>
+        </ElFormItem>
+      </ElForm>
+    </div>
+    <div class="table-content flex-1 flex-column overflow-hidden">
+      <div v-loading="loading" class="table-list flex-1 overflow-hidden">
+        <TableView
+          :selectionable="true"
+          :serial-numberable="true"
+          :paginated-data="tableData"
+          :columns="tableColumns"
+          @selection-change="handleSelectionChange"
+        >
+        </TableView>
+      </div>
+      <ElPagination
+        v-model:current-page="currentPage"
+        v-model:page-size="pageSize"
+        :page-sizes="[50, 100, 200, 300, 500]"
+        background
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+        style="margin: 10px auto 0; text-align: right"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      ></ElPagination>
+    </div>
+  </div>
+  <ElDialog
+    v-model="exportVisible"
+    title="导出选项"
+    width="500px"
+    :close-on-click-modal="false"
+  >
+    <el-form :model="exportForm" label-width="80px">
+      <el-form-item label="" prop="resource">
+        <el-radio-group v-model="exportForm.resource">
+          <el-radio label="currentPage">导出本页</el-radio>
+          <el-radio label="selectedRows">导出选中</el-radio>
+          <el-radio label="all">全部</el-radio>
+        </el-radio-group>
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="exportVisible = false">取消</el-button>
+        <el-button
+          :loading="exportLoading"
+          type="primary"
+          @click="submitExportForm"
+          >确认</el-button
+        >
+      </span>
+    </template>
+  </ElDialog>
+</template>
+
+<script setup lang="tsx">
+import { computed, ref, onMounted } from 'vue'
+import TableView from '@/components/TableView.vue'
+import usePageList from '@/utils/hooks/usePageList'
+import { loadWarehouseListApi } from '@/api/podCnOrder'
+import type { WarehouseListData } from '@/types/api/podCnOrder'
+import { SearchForm, OutOfStockItem } from '@/types/api/outOfStockStatistics'
+import {
+  getOutOfStockStatisticsListApi,
+  exportOutOfStockStatisticsListApi,
+} from '@/api/outOfStockStis'
+import ImageView from '@/components/ImageView.vue'
+import { filePath } from '@/api/axios'
+
+const searchForm = ref<SearchForm>({
+  warehouseId: '',
+  warehouseSku: '',
+  productNo: '',
+  skuName: '',
+})
+
+const warehouseList = ref<WarehouseListData[]>([])
+const exportVisible = ref(false)
+const exportForm = ref({
+  resource: null,
+})
+const exportLoading = ref(false)
+// 表格列配置
+const tableColumns = computed(() => {
+  return [
+    {
+      label: '图片',
+      prop: 'variantImage',
+      width: 100,
+      align: 'center',
+      slot: 'image',
+      render: (item: OutOfStockItem) => (
+        <ImageView src={item.variantImage} width="40px" height="40px" />
+      ),
+    },
+    {
+      label: '缺货仓库',
+      prop: 'warehouseName',
+      width: 120,
+      align: 'center',
+    },
+    {
+      label: '库位',
+      prop: 'locationCode',
+      width: 120,
+      align: 'center',
+    },
+    {
+      label: '库存SKU',
+      prop: 'warehouseSku',
+      width: 150,
+      align: 'center',
+    },
+    {
+      label: '款号',
+      prop: 'productNo',
+      width: 120,
+      align: 'center',
+    },
+    {
+      label: '商品名称',
+      prop: 'skuName',
+      minWidth: 200,
+      align: 'left',
+    },
+    {
+      label: '币种',
+      prop: 'currency',
+      width: 80,
+      align: 'center',
+    },
+    {
+      label: '商品成本价',
+      prop: 'costPrice',
+      width: 120,
+      align: 'right',
+      render: (item: OutOfStockItem) => (
+        <span>{item.costPrice ? item.costPrice.toFixed(2) : ''}</span>
+      ),
+    },
+    {
+      label: '缺货数量',
+      prop: 'stockOutNum',
+      width: 100,
+      align: 'right',
+    },
+    {
+      label: '销售数量',
+      prop: 'salesNum',
+      width: 100,
+      align: 'right',
+    },
+    {
+      label: '库存SPU',
+      prop: 'warehouseSpu',
+      width: 150,
+      align: 'center',
+    },
+    {
+      label: '最长缺货天数',
+      prop: 'longestDelayDays',
+      width: 120,
+      align: 'right',
+    },
+    {
+      label: '库存数量',
+      prop: 'inventory',
+      width: 100,
+      align: 'right',
+    },
+    {
+      label: '占用数量',
+      prop: 'occupyInventory',
+      width: 100,
+      align: 'right',
+    },
+    {
+      label: '冻结数量',
+      prop: 'freezeInventory',
+      width: 100,
+      align: 'right',
+    },
+    {
+      label: '采购未入数量',
+      prop: 'purchaseNotInQuantity',
+      width: 120,
+      align: 'right',
+    },
+  ]
+})
+
+const {
+  loading,
+  currentPage,
+  pageSize,
+  total,
+  data: tableData,
+  refresh: search,
+  onCurrentPageChange: handleCurrentChange,
+  onPageSizeChange: handleSizeChange,
+} = usePageList<OutOfStockItem>({
+  query: (page, pageSize) =>
+    getOutOfStockStatisticsListApi(
+      {
+        ...searchForm.value,
+      },
+      page,
+      pageSize,
+    ).then((res) => res.data) as never,
+  initLoad: false,
+})
+
+// 加载仓库列表
+const loadWarehouseList = async () => {
+  try {
+    const res = await loadWarehouseListApi()
+    if (res.code !== 200) return
+    warehouseList.value = res.data || []
+    searchForm.value.warehouseId = warehouseList.value[0].id
+  } catch (e) {
+    console.error(e)
+  }
+}
+// 导出数据
+const exportData = async () => {
+  exportForm.value.resource = null
+  exportVisible.value = true
+}
+const submitExportForm = async () => {
+  if (!exportForm.value.resource) {
+    return ElMessage.error('请选择导出类型')
+  }
+  const params: { exportAll: boolean; indexes?: number[] } = {
+    exportAll: false,
+    indexes: [],
+  }
+  if (exportForm.value.resource === 'currentPage') {
+    params.exportAll = false
+    params.indexes = undefined
+  } else if (exportForm.value.resource === 'selectedRows') {
+    if (!selectedRows.value.length) {
+      return ElMessage.error('请选择要导出的数据')
+    }
+    params.exportAll = false
+    params.indexes = selectedRows.value.map((el: OutOfStockItem) =>
+      Number(el.sort),
+    )
+  } else if (exportForm.value.resource === 'all') {
+    params.exportAll = true
+    params.indexes = undefined
+  }
+  try {
+    const res = await exportOutOfStockStatisticsListApi({
+      ...searchForm.value,
+      ...params,
+    })
+    window.open(filePath + res.message, '_blank')
+    exportVisible.value = false
+  } catch (e) {
+    console.error(e)
+  }
+}
+
+// 处理表格选择变化
+const selectedRows = ref<OutOfStockItem[]>([])
+const handleSelectionChange = (val: OutOfStockItem[]) => {
+  selectedRows.value = val
+}
+
+onMounted(async () => {
+  await loadWarehouseList()
+  search()
+})
+</script>
+
+<style lang="scss" scoped>
+.out-of-stock-statistics-page {
+  .header-filter-form {
+    :deep(.el-form-item) {
+      margin-right: 14px;
+      margin-bottom: 10px;
+    }
+  }
+
+  .table-content {
+    .table-list {
+      border: 1px solid #ebeef5;
+      border-radius: 4px;
+    }
+  }
+}
+</style>

src/views/warehouse/warning.vue

@@ -20,6 +20,7 @@ import { ref, computed } from 'vue'
 import SplitDiv from '@/components/splitDiv/splitDiv.vue'
 import { filePath } from '@/api/axios.ts'
 import { useEnterKeyTrigger } from '@/utils/hooks/useEnterKeyTrigger.ts'
+import { getInventoryLowerLimitApi } from '@/api/externalAuth'
 
 const searchForm = ref({
   warehouseId: '',
@@ -172,7 +173,24 @@ async function getData() {
     ...pagination.value,
     ...searchForm.value,
   })
-  leftData.value = res.data.records
+  const sortedRecords = res.data.records.sort((a, b) => {
+    const aUsable =
+      Number(
+        (a as WarehouseWarning & { usableInventory?: number | string })
+          .usableInventory,
+      ) || 0
+    const bUsable =
+      Number(
+        (b as WarehouseWarning & { usableInventory?: number | string })
+          .usableInventory,
+      ) || 0
+    const aIsLow = aUsable < 100
+    const bIsLow = bUsable < 100
+    if (aIsLow && !bIsLow) return -1
+    if (!aIsLow && bIsLow) return 1
+    return 0
+  })
+  leftData.value = sortedRecords
   pagination.value.total = res.data.total
   if (leftData.value.length) {
     getDetail(leftData.value[0].id)
@@ -292,8 +310,17 @@ const getWarehouse = async () => {
   const { data } = await warehouseInfoGetAll()
   warehouseList.value = data
 }
-getData()
-getWarehouse()
+
+const getRowClassName = (row: { row: WarehouseWarning }) => {
+  const rowData = row.row as WarehouseWarning & {
+    usableInventory?: number | string
+  }
+  const usableInventory = Number(rowData.usableInventory) || 0
+  if (usableInventory < inventoryLowerLimit.value) {
+    return 'low-inventory-row'
+  }
+  return ''
+}
 
 /**
  * @description: 页面添加回车监听
@@ -310,6 +337,23 @@ useEnterKeyTrigger({
     getData()
   },
 })
+const inventoryLowerLimit = ref<number>(100)
+const getInventoryLowerLimit = async () => {
+  try {
+    const res = await getInventoryLowerLimitApi()
+    if (res.code !== 200) {
+      return
+    }
+    inventoryLowerLimit.value = res.data
+  } catch (error) {
+    console.log(error)
+  }
+}
+onMounted(async () => {
+  getData()
+  getWarehouse()
+  getInventoryLowerLimit()
+})
 </script>
 
 <template>
@@ -509,6 +553,7 @@ useEnterKeyTrigger({
                   height="100%"
                   :data="leftData"
                   border
+                  :row-class-name="getRowClassName"
                   @current-change="clickItem"
                   @selection-change="handleSelectionChange"
                 >
@@ -831,6 +876,25 @@ useEnterKeyTrigger({
   }
 }
 
+::v-deep(.el-table) {
+  .low-inventory-row {
+    &:hover {
+      background-color: #f56c6c !important;
+      color: #fff !important;
+    }
+
+    td {
+      background-color: #f56c6c !important;
+      color: #fff !important;
+    }
+
+    &:hover td {
+      background-color: #f56c6c !important;
+      color: #fff !important;
+    }
+  }
+}
+
 .bottom-table {
   height: 100%;
   background: white;