Merge branch 'dev' into 'master'

Dev

See merge request !245

components.d.ts

@@ -23,7 +23,6 @@ declare module 'vue' {
     ElDescriptions: typeof import('element-plus/es')['ElDescriptions']
     ElDescriptionsItem: typeof import('element-plus/es')['ElDescriptionsItem']
     ElDialog: typeof import('element-plus/es')['ElDialog']
-    ElDivider: typeof import('element-plus/es')['ElDivider']
     ElDrawer: typeof import('element-plus/es')['ElDrawer']
     ElDropdown: typeof import('element-plus/es')['ElDropdown']
     ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem']
@@ -36,8 +35,6 @@ declare module 'vue' {
     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']
     ElPagination: typeof import('element-plus/es')['ElPagination']
     ElPopover: typeof import('element-plus/es')['ElPopover']
@@ -46,7 +43,6 @@ declare module 'vue' {
     ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
     ElRow: typeof import('element-plus/es')['ElRow']
     ElSelect: typeof import('element-plus/es')['ElSelect']
-    ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
     ElSwitch: typeof import('element-plus/es')['ElSwitch']
     ElTable: typeof import('element-plus/es')['ElTable']
     ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
@@ -55,10 +51,8 @@ declare module 'vue' {
     ElTag: typeof import('element-plus/es')['ElTag']
     ElTimeline: typeof import('element-plus/es')['ElTimeline']
     ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
-    ElTimePicker: typeof import('element-plus/es')['ElTimePicker']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
     ElTree: typeof import('element-plus/es')['ElTree']
-    ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect']
     ElUpload: typeof import('element-plus/es')['ElUpload']
     Icon: typeof import('./src/components/Icon.vue')['default']
     ImageView: typeof import('./src/components/ImageView.vue')['default']

src/api/podUsOrder.ts

@@ -9,6 +9,7 @@ import {
   LogisticsData,
   ExportParams,
   InterceptStateGroupData,
+  DataItem,
 } from '@/types/api/podUsOrder'
 import axios from './axios'
 import { PodMakeOrderData } from '@/types/api/podMakeOrder'
@@ -116,6 +117,11 @@ export function updatePRNDownloadStatus(id: number) {
     `/factory/podBatchDownload/updatePRNDownloadStatus?id=${id}`,
   )
 }
+export function tiktokPrintOrderApi(shopNumber: string | number) {
+  return axios.get<never, BaseRespData<DataItem[]>>(
+    `/factory/podJomallOrderUs/tiktok-print-order?shopNumber=${shopNumber}`,
+  )
+}
 export function confirmOrderApi(
   data: number[],
   productionClient: string,
@@ -166,6 +172,17 @@ export function cancelOrderApi(ids: number[], value: string) {
     },
   )
 }
+
+export function pendingOrderTobeWeighedApi(
+  orderId:number,
+) {
+  return axios.post<never, BaseRespData<never>>(
+    `factory/podJomallOrderUs/podPrintOrderComplete`,
+    {
+      orderId: orderId,
+    },
+  )
+}
 export function getOperationLogApi(id: number) {
   return axios.get<never, BaseRespData<LogListData[]>>(
     `factory/podJomallOrderUsLog/getPodJomallOrderUsLog?id=${id}`,

src/router/menu.ts

@@ -240,6 +240,7 @@ const menu: MenuItem[] = [
         label: '系统管理',
         children: [
           { index: '/system/user', id: 811, label: '用户管理' },
+          { index: '/system/customers', id: 812, label: '客户管理' },
           // { index: '/system/role-manage', id: 812, label: '功能角色管理' },
         ],
       },

src/types/api/podMakeOrder.ts

@@ -11,8 +11,8 @@ export interface PodMakeOrderData {
 
 export interface OrderData {
   shipmentsNote?: string
-  filePath?: string
-  fileData?: string
+  filePath?: string | null
+  fileData?: string | null
   logisticsWayName?: string | null
   company?: string | null
   orderStatus?: number
@@ -29,7 +29,7 @@ export interface OrderData {
   trackingNumber?: string
   productList?: ProductList[]
   purchaseNumber?: number
-  pickingNumber?: number
+  pickingNumber?: number | null
   printResult?: string
   remark?: string
   version?: number

src/types/api/podUsOrder.ts

@@ -241,3 +241,52 @@ export interface IAllList {
   name: string
   warehouseName?: string
 }
+export interface DataItem {
+  printOrder: PrintOrderItem
+  pickingVerify: PickingVerifyItem
+}
+// 打印订单信息
+interface PrintOrderItem {
+  filePath: string
+  shopNumber: string
+  id: number
+  trackingNumber: string
+  platform: string
+  fileData: string
+}
+
+// 产品项
+export interface ProductItem {
+  id: number
+  productName: string
+  variantSku: string
+  variantImage: string
+  baseSku: string
+  thirdSkuCode: string
+  purchaseNumber: number
+  podJomallUsNo: string
+  numberMap: null
+  count: number | null
+  imageAry: string
+  passNum: number
+  productMark: string
+  putPackingTime: null
+  subShopNumber: string
+  power: boolean
+  pickingNumber: number | null
+}
+
+// 拣货验证信息
+export interface PickingVerifyItem {
+  id: number
+  shopNumber: string
+  factoryOrderNumber: string
+  podOrderUsStatus: string
+  trackingNumber: string
+  pickingNumber: null
+  purchaseNumber: number
+  filePath: null
+  fileData: null
+  version: number
+  productList: ProductItem[]
+}
\ No newline at end of file

src/views/order/podUs/index.vue

@@ -982,7 +982,10 @@
           </span>
         </ElFormItem>
         <ElFormItem
-          v-if="['WAIT_TRACK'].includes(status) && [1,2,5].includes(waitTrackStatus)"
+          v-if="
+            ['WAIT_TRACK'].includes(status) &&
+            [1, 2, 5].includes(waitTrackStatus)
+          "
         >
           <span class="item">
             <ElButton type="success" @click="reissueOrder">补发</ElButton>
@@ -995,6 +998,13 @@
             >
           </span>
         </ElFormItem>
+        <ElFormItem v-if="status === 'WAIT_SHIPMENT'">
+          <span class="item">
+            <ElButton type="success" @click="distributionBillBtn"
+              >TIKTOK配货打单</ElButton
+            >
+          </span>
+        </ElFormItem>
       </ElForm>
     </div>
     <div class="header-filter-tab">
@@ -2782,6 +2792,14 @@
     @set-warehouse-id="handleWarehouseIdChange"
     @refresh="onFastRefresh"
   />
+  <DistributionBillOrder
+    v-model="distributionBillVisible"
+    :print-order="printOrder"
+    :warehouse-list="warehouseList"
+    @set-printer="handlePrinterChange"
+    @set-warehouse-id="handleWarehouseIdChange"
+    @refresh="onFastRefresh"
+  />
   <InspPackagOrder
     ref="InspPackagOrderRef"
     @refresh="onFastRefresh"
@@ -3282,6 +3300,7 @@ import { computed, onMounted, ref, nextTick, reactive, h } from 'vue'
 import FastProduction from './FastProduction.vue'
 import { filePath } from '@/api/axios'
 import PodMakeOrder from './PodMakeOrder.vue'
+import DistributionBillOrder from './DistributionBillOrder.vue'
 import InspPackagOrder from './InspPackagOrder.vue'
 import { OrderData } from '@/types/api/podMakeOrder'
 import useLodop, { LODOPObject } from '@/utils/hooks/useLodop'
@@ -3759,7 +3778,6 @@ const handleBatchDelete = async (type: string, id?: string) => {
     loading.close()
   }
 }
-
 const shipmentList = ref(['自有物流', '九猫统筹物流'])
 
 // 批量下载 重新排版
@@ -4041,7 +4059,6 @@ const rightClick = (e: MouseEvent) => {
     y: e.clientY,
   })
 }
-
 const handleSelectionChange = (val: PodUsOrderListData[]) => {
   selection.value = val
   // 当清空选择时，清除补货校验成功的状态
@@ -5509,7 +5526,14 @@ const printPodOrder = async () => {
   sheetPrinter.value = lodop.GET_PRINTER_NAME(0)
   podOrderVisible.value = true
 }
+const distributionBillVisible = ref(false)
+const distributionBillBtn = async () => {
+  const lodop = getCLodop(null, null)
+  if (!lodop) return
 
+  sheetPrinter.value = lodop.GET_PRINTER_NAME(0)
+  distributionBillVisible.value = true
+}
 const InspPackagOrderRef = ref()
 
 // const inspPackagOrder = async () => {