Merge branch 'main' of http://192.168.9.101:4000/liufumingren/WEB
This commit is contained in:
commit
b1b1f55e42
4
env.d.ts
vendored
4
env.d.ts
vendored
@ -4,3 +4,7 @@ declare module '@/utils/auth' {
|
|||||||
export function setToken(token: string): void
|
export function setToken(token: string): void
|
||||||
export function removeToken(): void
|
export function removeToken(): void
|
||||||
}
|
}
|
||||||
|
|
||||||
|
declare module 'vue-virtual-scroller' {
|
||||||
|
export const RecycleScroller: any
|
||||||
|
}
|
||||||
|
|||||||
@ -64,7 +64,7 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { ref } from 'vue'
|
import { ref } from 'vue'
|
||||||
import { ElMessage } from 'element-plus'
|
import { ElMessage } from 'element-plus'
|
||||||
import { orderPendingOrder } from '@/api/order.pendingorder/orderpendingOrder'
|
import { orderPendingOrder } from '@/api/order.pendingOrder/orderpendingOrder'
|
||||||
|
|
||||||
const visible = defineModel<boolean>({ default: false })
|
const visible = defineModel<boolean>({ default: false })
|
||||||
|
|
||||||
|
|||||||
@ -318,8 +318,8 @@ import { ElMessage } from 'element-plus'
|
|||||||
import type { FormInstance, FormRules } from 'element-plus'
|
import type { FormInstance, FormRules } from 'element-plus'
|
||||||
import * as indexApi from '@/api/index/index'
|
import * as indexApi from '@/api/index/index'
|
||||||
import { stockWarehouse } from '@/api/stock/stock'
|
import { stockWarehouse } from '@/api/stock/stock'
|
||||||
import { orderPendingOrder } from '@/api/order.pendingorder/orderpendingOrder'
|
import { orderPendingOrder } from '@/api/order.pendingOrder/orderpendingOrder'
|
||||||
import type { PendingOrderCreateOrderParams } from '@/api/order.pendingorder/orderpendingOrder'
|
import type { PendingOrderCreateOrderParams } from '@/api/order.pendingOrder/orderpendingOrder'
|
||||||
import pcasCodeData from 'china-division/dist/pcas-code.json'
|
import pcasCodeData from 'china-division/dist/pcas-code.json'
|
||||||
|
|
||||||
const visible = defineModel<boolean>({ default: false })
|
const visible = defineModel<boolean>({ default: false })
|
||||||
|
|||||||
@ -20,7 +20,7 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { ref, watch } from 'vue'
|
import { ref, watch } from 'vue'
|
||||||
import { ElMessage } from 'element-plus'
|
import { ElMessage } from 'element-plus'
|
||||||
import { orderPendingOrder } from '@/api/order.pendingorder/orderpendingOrder'
|
import { orderPendingOrder } from '@/api/order.pendingOrder/orderpendingOrder'
|
||||||
|
|
||||||
const props = defineProps<{
|
const props = defineProps<{
|
||||||
row: Record<string, any> | null
|
row: Record<string, any> | null
|
||||||
|
|||||||
@ -41,7 +41,7 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { reactive, ref } from 'vue'
|
import { reactive, ref } from 'vue'
|
||||||
import { ElMessage } from 'element-plus'
|
import { ElMessage } from 'element-plus'
|
||||||
import { orderOutboundOrder } from '@/api/order.outboundorder/orderoutboundOrder'
|
import { orderOutboundOrder } from '@/api/order.outboundOrder/orderoutboundOrder'
|
||||||
|
|
||||||
const emit = defineEmits<{
|
const emit = defineEmits<{
|
||||||
(e: 'success', data: any): void
|
(e: 'success', data: any): void
|
||||||
|
|||||||
@ -80,7 +80,7 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { ref, watch } from 'vue'
|
import { ref, watch } from 'vue'
|
||||||
import { ElMessage } from 'element-plus'
|
import { ElMessage } from 'element-plus'
|
||||||
import { orderPendingOrder } from '@/api/order.pendingorder/orderpendingOrder'
|
import { orderPendingOrder } from '@/api/order.pendingOrder/orderpendingOrder'
|
||||||
import { getTagType, translateOrderField } from '../config/order-common-config'
|
import { getTagType, translateOrderField } from '../config/order-common-config'
|
||||||
|
|
||||||
const props = defineProps<{
|
const props = defineProps<{
|
||||||
|
|||||||
@ -158,7 +158,7 @@ import { ElMessage } from 'element-plus'
|
|||||||
import ScanBox from '@/components/ScanBox/index.vue'
|
import ScanBox from '@/components/ScanBox/index.vue'
|
||||||
import UpperTable from '@/components/UpperTable/index.vue'
|
import UpperTable from '@/components/UpperTable/index.vue'
|
||||||
import * as indexApi from '@/api/index/index'
|
import * as indexApi from '@/api/index/index'
|
||||||
import { orderDeliveryOrder } from '@/api/order.deliveryorder/orderdeliveryOrder'
|
import { orderDeliveryOrder } from '@/api/order.deliveryOrder/orderdeliveryOrder'
|
||||||
|
|
||||||
import {
|
import {
|
||||||
deliveryAvailableFields,
|
deliveryAvailableFields,
|
||||||
|
|||||||
@ -401,7 +401,7 @@ import UpperTable from '@/components/UpperTable/index.vue'
|
|||||||
import * as indexApi from '@/api/index/index'
|
import * as indexApi from '@/api/index/index'
|
||||||
import { orderQueryOrderLogs } from '@/api/order.index/orderindex'
|
import { orderQueryOrderLogs } from '@/api/order.index/orderindex'
|
||||||
import { orderExpectionOrder } from '@/api/order.expectionorder/orderexpectionorder'
|
import { orderExpectionOrder } from '@/api/order.expectionorder/orderexpectionorder'
|
||||||
import { orderPendingOrder } from '@/api/order.pendingorder/orderpendingOrder'
|
import { orderPendingOrder } from '@/api/order.pendingOrder/orderpendingOrder'
|
||||||
|
|
||||||
import {
|
import {
|
||||||
expectionColumns,
|
expectionColumns,
|
||||||
|
|||||||
@ -170,7 +170,7 @@ import { ElMessage } from 'element-plus'
|
|||||||
import ScanBox from '@/components/ScanBox/index.vue'
|
import ScanBox from '@/components/ScanBox/index.vue'
|
||||||
import UpperTable from '@/components/UpperTable/index.vue'
|
import UpperTable from '@/components/UpperTable/index.vue'
|
||||||
import * as indexApi from '@/api/index/index'
|
import * as indexApi from '@/api/index/index'
|
||||||
import { orderOutboundOrder } from '@/api/order.outboundorder/orderoutboundOrder'
|
import { orderOutboundOrder } from '@/api/order.outboundOrder/orderoutboundOrder'
|
||||||
import {
|
import {
|
||||||
outboundAvailableFields,
|
outboundAvailableFields,
|
||||||
outboundColumns,
|
outboundColumns,
|
||||||
|
|||||||
@ -230,7 +230,7 @@ import { ref, reactive, onMounted, computed } from 'vue'
|
|||||||
import { ElMessage } from 'element-plus'
|
import { ElMessage } from 'element-plus'
|
||||||
import ScanBox from '@/components/ScanBox/index.vue'
|
import ScanBox from '@/components/ScanBox/index.vue'
|
||||||
import UpperTable from '@/components/UpperTable/index.vue'
|
import UpperTable from '@/components/UpperTable/index.vue'
|
||||||
import { orderPendingOrder } from '@/api/order.pendingorder/orderpendingOrder'
|
import { orderPendingOrder } from '@/api/order.pendingOrder/orderpendingOrder'
|
||||||
import * as indexApi from '@/api/index/index'
|
import * as indexApi from '@/api/index/index'
|
||||||
|
|
||||||
import {
|
import {
|
||||||
|
|||||||
@ -145,7 +145,7 @@ import { ElMessage, ElMessageBox } from 'element-plus'
|
|||||||
import ScanBox from '@/components/ScanBox/index.vue'
|
import ScanBox from '@/components/ScanBox/index.vue'
|
||||||
import UpperTable from '@/components/UpperTable/index.vue'
|
import UpperTable from '@/components/UpperTable/index.vue'
|
||||||
import * as indexApi from '@/api/index/index'
|
import * as indexApi from '@/api/index/index'
|
||||||
import { orderReviewOrder } from '@/api/order.revieworder/orderreviewOrder'
|
import { orderReviewOrder } from '@/api/order.reviewOrder/orderreviewOrder'
|
||||||
|
|
||||||
import {
|
import {
|
||||||
reviewAvailableFields,
|
reviewAvailableFields,
|
||||||
|
|||||||
@ -776,7 +776,7 @@ import { storeWarehouseList, storeWarehouseSign, storeWarehouseUnbind,
|
|||||||
storeWarehouseRename, storeWarehouseGetPolicyConfig, storeWarehouseGetPolicyConfigFields,
|
storeWarehouseRename, storeWarehouseGetPolicyConfig, storeWarehouseGetPolicyConfigFields,
|
||||||
storeWarehouseSavePolicyConfig, saveApiConfig, storeWarehouseDeleteQimenConfig,
|
storeWarehouseSavePolicyConfig, saveApiConfig, storeWarehouseDeleteQimenConfig,
|
||||||
storeWarehouseAdjustPrintQuantity, listApiConfig
|
storeWarehouseAdjustPrintQuantity, listApiConfig
|
||||||
} from '@/api/storewarehouse.store/storeWarehouse'
|
} from '@/api/storeWarehouse.store/storeWarehouse'
|
||||||
import { listInterfaceTypes, getExpressList, getPlatformList } from '@/api/index/index'
|
import { listInterfaceTypes, getExpressList, getPlatformList } from '@/api/index/index'
|
||||||
import ScanBox from '@/components/ScanBox/index.vue'
|
import ScanBox from '@/components/ScanBox/index.vue'
|
||||||
import UpperTable from '@/components/UpperTable/index.vue'
|
import UpperTable from '@/components/UpperTable/index.vue'
|
||||||
|
|||||||
@ -271,7 +271,7 @@ import {
|
|||||||
expressInterfaceList,
|
expressInterfaceList,
|
||||||
expressInterfaceListByWarehousePlatformCode,
|
expressInterfaceListByWarehousePlatformCode,
|
||||||
expressInterfaceUpdate
|
expressInterfaceUpdate
|
||||||
} from '@/api/setting.expressinterface/expressInterface'
|
} from '@/api/setting.expressInterface/expressInterface'
|
||||||
import { useUserStore } from '@/stores/modules/user'
|
import { useUserStore } from '@/stores/modules/user'
|
||||||
|
|
||||||
type ExpressOption = { code: string; name: string; label?: string }
|
type ExpressOption = { code: string; name: string; label?: string }
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user