Skip to content

F
factory_front
Commit cd413969 by linjinhong
Options

Merge branch 'task2_lin_528' of… 

Merge branch 'task2_lin_528' of http://47.122.114.111:9999/qinjianhui/factory_front into task2_lin_528
parents 5949aa2c 94050e88
Showing with 623 additions and 157 deletions
components.d.ts
......@@ -8,6 +8,7 @@ export {}
declare module 'vue' {
export interface GlobalComponents {
AmountInput: typeof import('./src/components/Form.vue/AmountInput.vue')['default']
AmountInput: typeof import('./src/components/Form.vue/AmountInput.vue')['default']
CommonCard: typeof import('./src/components/CommonCard.vue')['default']
DatePicker: typeof import('./src/components/Form.vue/DatePicker.vue')['default']
DateRangePicker: typeof import('./src/components/Form.vue/DateRangePicker.vue')['default']
......@@ -58,13 +59,8 @@ declare module 'vue' {
RenderColumn: typeof import('./src/components/RenderColumn.vue')['default']
RouterLink: typeof import('vue-router')['RouterLink']
RouterView: typeof import('vue-router')['RouterView']
SearchForm: typeof import('./src/components/SearchForm.vue')['default']
Select: typeof import('./src/components/Form.vue/Select.vue')['default']
ShipmentOrderDetail: typeof import('./src/components/ShipmentOrderDetail.vue')['default']
SplitDiv: typeof import('./src/components/splitDiv/splitDiv.vue')['default']
'Switch ': typeof import('./src/components/Form.vue/Switch .vue')['default']
Swtich: typeof import('./src/components/Form.vue/Swtich.vue')['default']
TableList: typeof import('./src/components/TableList.vue')['default']
TableRightMenu: typeof import('./src/components/TableRightMenu.vue')['default']
TableView: typeof import('./src/components/TableView.vue')['default']
UploadExcel: typeof import('./src/components/UploadExcel.vue')['default']
......@@ -72,7 +68,4 @@ declare module 'vue' {
VxeTable: typeof import('./src/components/VxeTable.vue')['default']
WangEditor: typeof import('./src/components/WangEditor.vue')['default']
}
export interface ComponentCustomProperties {
vLoading: typeof import('element-plus/es')['ElLoadingDirective']
}
}
package-lock.json
......@@ -3273,7 +3273,8 @@
"type": "github",
"url": "https://github.com/sponsors/ai"
}
]
],
"license": "CC-BY-4.0"
},
"node_modules/cfb": {
"version": "1.2.2",
......@@ -3319,9 +3320,6 @@
},
"funding": {
"url": "https://paulmillr.com/funding/"
},
"optionalDependencies": {
"fsevents": "~2.3.2"
}
},
"node_modules/codepage": {
......@@ -3389,7 +3387,8 @@
"version": "2.0.0",
"resolved": "https://registry.npmmirror.com/convert-source-map/-/convert-source-map-2.0.0.tgz",
"integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
"dev": true
"dev": true,
"license": "MIT"
},
"node_modules/crc-32": {
"version": "1.2.2",
......@@ -5696,6 +5695,9 @@
"license": "MIT",
"funding": {
"url": "https://github.com/sponsors/antoniandre"
},
"peerDependencies": {
"vue": "^3.2.0"
}
},
"node_modules/ssf": {
......@@ -6468,8 +6470,9 @@
},
"node_modules/wildcard": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/wildcard/-/wildcard-1.1.2.tgz",
"integrity": "sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng=="
"resolved": "https://registry.npmmirror.com/wildcard/-/wildcard-1.1.2.tgz",
"integrity": "sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==",
"license": "MIT"
},
"node_modules/wmf": {
"version": "1.0.2",
......@@ -6503,7 +6506,14 @@
"version": "1.0.2",
"resolved": "https://registry.npmmirror.com/wrappy/-/wrappy-1.0.2.tgz",
"integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
"dev": true
"dev": true,
"license": "ISC"
},
"node_modules/xe-utils": {
"version": "3.7.4",
"resolved": "https://registry.npmmirror.com/xe-utils/-/xe-utils-3.7.4.tgz",
"integrity": "sha512-9yuCHLOU+og4OEkPWWtzrYk1Zt1hgN66U/NCJ0+vYJSx1MplBtoQRz8aEA+2RmCr3leLru98vQxNpw/vJsu/sg==",
"license": "MIT"
},
"node_modules/xe-utils": {
"version": "3.7.4",
......
src/api/podUsOrder.ts
......@@ -10,7 +10,13 @@ import {
} from '@/types/api/podUsOrder'
import axios from './axios'
import { PodMakeOrderData } from '@/types/api/podMakeOrder'
export interface LogisticsData {
logisticsWayName: string; // 物流名称
warehouseName: string; // 发货仓库
status: boolean;
logisticsWayCode: string; // 物流编码
partition: string; // 所在分区
}
export function getOrderTabData() {
return axios.get<never, BaseRespData<Tab[]>>(
'/factory/podJomallOrderUs/findStateGroupList',
......@@ -44,11 +50,13 @@ export function getCardOrderList(
},
)
}
export function confirmOrderApi(data: number[], productionClient: string) {
export function confirmOrderApi(data: number[], productionClient: string,type:string,logisticsTrialCalculation?:LogisticsData) {
return axios.post<never, BaseRespData<never>>(
'factory/podJomallOrderUs/confirmOrders',
{
ids: data.join(','),
type,
logisticsTrialCalculation,
productionClient,
},
)
......@@ -226,8 +234,24 @@ export function updateRemarkApi(id: number, content: string) {
{ id, content },
)
}
export function getLogisticsCalculation(id: number) {
return axios.get<never, BaseRespData<never>>(
'factory/podJomallOrderUs/getLogisticsCalculation',
{ params:{id} },
)
}
export function loadWarehouseListApi() {
return axios.get<never, BaseRespData<WarehouseListData[]>>(
'factoryWarehouseInfo/getAll',
)
}
export function refreshMaterialApi(data: {
orderIds: string | undefined
productIds: string | undefined
}) {
return axios.post<never, BaseRespData<never>>(
'factory/podJomallOrderProductUs/refreshDesignImages ',
data,
)
}
src/api/warehouse.ts
......@@ -8,12 +8,37 @@ import {
InterskuList,
InterWarehouseList,
ILocation,
AnyObject,
} from '@/types/api/warehouse'
export interface LogListData {
createTime: string
description: string
createdTime?: string | null
}
export interface Address {
id: number; // 主键，自动递增
shipperName: string; // 发货人姓名
addressLine1: string; // 地址 1
addressLine2?: string | null; // 地址 2
addressLine3?: string | null; // 地址 3
city: string; // 城市
cityCode?: string | null; // 城市编码
district?: string | null; // 区
districtCode?: string | null; // 区编码
cspAccount?: string | null; // CSP账号
stateProvince?: string | null; // 州/省
stateProvinceAbbr?: string | null; // 州/省简称
postalCode?: string | null; // 邮编
countryName: string; // 国家名称
countryCode?: string | null; // 国家代码
phoneNumber?: string | null; // 电话
rfcTaxId?: string | null; // RFC税号
swDefault?: number | null; // 是否默认 1是，0不是
createTime: string; // 创建时间
updateTime: string; // 更新时间
}
export interface PrintData {
code: string
list: {
......@@ -78,6 +103,7 @@ export interface warehouseInfo {
id?: number | string
name: string
code: string
addressId: string
sort: string
defaulted: number
factoryId?: number
......@@ -229,6 +255,12 @@ export function updateWarehouseApi(data: positionInfo | UpdateDefaulted) {
)
}
export function logisticsAddressGetAllList() {
return axios.get<never, BaseRespData<Address[]>>(
'/logisticsAddress/getAllList'
)
}
export function updatePositionApi(data: positionInfo) {
return axios.post<never, BaseRespData<never>>(
'/factoryWarehouseLocation/update',
......@@ -319,7 +351,9 @@ export function exportOrder(ids: number[], status: string | number) {
{ ids: ids, status },
)
}
export function updateInRecordApi(form: InterWarehouseDetail) {
export function updateInRecordApi(
form: InterWarehouseDetail | AnyObject | null,
) {
return axios.post<never, BaseRespData<never>>(
'factory/warehouseInRecord/update',
{
......@@ -337,7 +371,7 @@ export function getWarehouseInRecordDetailApi(id: number | undefined) {
},
)
}
export function getBySkuApi(warehouseId: number | string, sku: string | null) {
export function getBySkuApi(warehouseId: number | null | undefined, sku: string | null) {
return axios.get<never, BaseRespData<InterskuList[]>>(
'customProductItem/getBySku',
{
......@@ -349,7 +383,7 @@ export function getBySkuApi(warehouseId: number | string, sku: string | null) {
)
}
export function getByWareHouseIdAndCodeApi(
wareHouseId: number | string | undefined,
wareHouseId: number | null | undefined,
code: string | null,
) {
return axios.get<never, BaseRespData<ILocation[]>>(
......
src/router/index.ts
......@@ -27,7 +27,7 @@ import WarehouseManage from '@/views/warehouse/manage.vue'
import WarehouseWarning from '@/views/warehouse/warning.vue'
import WarehousePosition from '@/views/warehouse/position.vue'
import receiptDoc from '@/views/warehouse/receiptDoc.vue'
import issueDoc from '@/views/warehouse/issueDoc.vue'
// import issueDoc from '@/views/warehouse/issueDoc.vue'
const router = createRouter({
history: createWebHistory(),
routes: [
......@@ -176,14 +176,92 @@ const router = createRouter({
},
component: receiptDoc,
},
// {
// path: '/warehouse/issue-doc',
// meta: {
// title: '出库单',
// },
// component: issueDoc,
// },
{
path: '/warehouse/warning',
meta: {
title: '仓库预警',
},
component: WarehouseWarning,
},
{
path: '/warehouse/position',
meta: {
title: '库位管理',
},
component: WarehousePosition,
},
{
path: '/logistics/logisticsMethod',
meta: {
title: '物流方式',
},
component: () => import('@/views/logistics/logisticsMethod.vue'),
},
{
path: '/logistics/shippingAddress',
meta: {
title: '发货地址',
},
component: () => import('@/views/logistics/shippingAddress.vue'),
},
{
path: '/logistics/logisticsQuotation',
meta: {
title: '物流报价',
},
component: () => import('@/views/logistics/logisticsQuotation.vue'),
},
{
path: '/warehouse/issue-doc',
path: '/logistics/declarationRule',
meta: {
title: '出库单',
title: '申报规则',
},
component: issueDoc,
component: () => import('@/views/logistics/declarationRule.vue'),
},
{
path: '/logistics/logisticsPartition',
meta: {
title: '物流分区',
},
component: () => import('@/views/logistics/logisticsPartition.vue'),
},
{
path: '/logistics/logisticsCalculate',
meta: {
title: '运费试算',
},
component: () => import('@/views/logistics/logisticsCalculate.vue'),
},
{
path: '/warehouse/manage',
meta: {
title: '仓库管理',
},
component: WarehouseManage,
},
{
path: '/warehouse/receipt-doc',
meta: {
title: '入库单',
},
component: receiptDoc,
},
// {
// path: '/warehouse/issue-doc',
// meta: {
// title: '出库单',
// },
// component: issueDoc,
// },
{
path: '/warehouse/warning',
meta: {
title: '仓库预警',
......
src/router/menu.ts
......@@ -31,11 +31,11 @@ const menu: MenuItem[] = [
id: 123,
label: '入库单',
},
{
index: '/warehouse/issue-doc',
id: 124,
label: '出库单',
},
// {
// index: '/warehouse/issue-doc',
// id: 124,
// label: '出库单',
// },
{
index: '/warehouse/manage',
......
src/types/api/warehouse.ts
export type AnyObject = {
[propName: string]: string | number | boolean | undefined | unknown
}
export interface warehouseSearchForm {
billStatus?: string
batchNumber?: string
......@@ -5,7 +8,7 @@ export interface warehouseSearchForm {
createTimeStart?: string
orderNumber?: string
sku?: string
warehouseId?: number
warehouseId?: number | null
id?: number
}
export interface InterProductList {
......@@ -29,8 +32,8 @@ export interface InterWarehouseBase {
id?: number
factoryId?: number
factoryCode?: string
warehouseId?: number | string
warehouseName?: string
warehouseId?: number | null
warehouseName?: string | null
inNo?: string
shipmentNumber?: string
skuAmount?: number
......
src/utils/hooks/commonUtil.ts
// 允许通用对象类型
export type AnyObject = { [key: string]: unknown }
export type AnyObject = {
[propName: string]: string | number | boolean | undefined | unknown
}
type IdType = string | number
function itemIsArray(obj: AnyObject): boolean {
......@@ -16,40 +16,50 @@ function isChange(arr: AnyObject[], arr1: AnyObject[]): boolean {
if (!arr1) return true
if (arr.length !== arr1.length) return true
for (const iterator of arr) {
const item = arr1.find((item: AnyObject) => item.id === iterator.id)
const item = arr1.find((item) => item.id === iterator.id)
if (!item) return true
}
return false
}
/**
* 更新参数处理 只提交更新的
* @param {UpdateParams} newParams 新的数据
* @param {UpdateParams} oldParams 旧的数据
* @param {string} id 数组唯一值
* @param {Record<string, string>} other 其他属性
* @param {boolean} bool 是否为布尔值
*/
export function checkUpdateParams(
newParams: AnyObject,
oldParams: AnyObject,
id: string = 'id',
other: Record<string, string> = {},
bool: boolean = false
bool: boolean = false,
): AnyObject | null {
oldParams = JSON.parse(JSON.stringify(oldParams))
if (!oldParams) return newParams
if ((newParams as { id?: unknown })?.id !== (oldParams as { id?: unknown })?.id) return newParams
if (newParams[id] !== oldParams?.[id]) return newParams
const params: AnyObject = {
id: (newParams as { id?: unknown }).id
[id]: newParams[id],
}
for (const key in newParams) {
if (typeof newParams[key] === 'object') {
if (Array.isArray(newParams[key])) {
const arr: AnyObject[] = newParams[key] as AnyObject[]
const arr1: AnyObject[] = (oldParams[key] as AnyObject[]) || []
const arr = newParams[key] as AnyObject[]
const arr1 = (oldParams[key] as AnyObject[]) || []
const addList: AnyObject[] = []
const updateList: AnyObject[] = []
let removeList: IdType[] = []
const list: AnyObject[] = []
const keyname: string = other[key] || id
const keyname = other[key] || id
for (const iterator of arr) {
const obj: AnyObject = {}
const index = arr1.findIndex((item: AnyObject) => item[keyname] === iterator[keyname])
const index = arr1.findIndex(
(item: AnyObject) => item[keyname] === iterator[keyname],
)
const isArray = itemIsArray(iterator)
if (index !== -1) {
const item = arr1[index]
......@@ -57,7 +67,12 @@ export function checkUpdateParams(
for (const key1 in iterator) {
if (key1 === keyname) continue
if (Array.isArray(iterator[key1])) {
if (isChange(iterator[key1] as AnyObject[], item[key1] as AnyObject[])) {
if (
isChange(
iterator[key1] as AnyObject[],
item[key1] as AnyObject[],
)
) {
obj[key1] = iterator[key1]
}
} else if (iterator[key1] !== item[key1]) {
......@@ -69,13 +84,13 @@ export function checkUpdateParams(
list.push({
[keyname]: iterator[keyname],
...obj,
id: item.id
id: item.id,
})
} else {
updateList.push({
[keyname]: iterator[keyname],
...obj,
id: item.id
id: item.id,
})
}
}
......@@ -88,20 +103,20 @@ export function checkUpdateParams(
}
}
if (arr1.length > 0) {
removeList = arr1.map((item: AnyObject) => item['id'] as IdType)
removeList = arr1.map((item) => item['id'] as IdType)
}
const key_name = key.replace('List', 'Change')
params[key_name] = {}
if (addList.length > 0) {
(params[key_name] as AnyObject).addList = addList
;(params[key_name] as AnyObject).addList = addList
}
if (updateList.length > 0) {
(params[key_name] as AnyObject).updateList = updateList
;(params[key_name] as AnyObject).updateList = updateList
}
if (removeList.length > 0) {
(params[key_name] as AnyObject).removeList = removeList
;(params[key_name] as AnyObject).removeList = removeList
}
if (list.length > 0) {
params[key_name] = list
......@@ -112,13 +127,11 @@ export function checkUpdateParams(
}
} else {
// 基础信息
// if (newParams[key] !== oldParams[key]) {
params[key] = newParams[key]
// }
}
}
if (Object.keys(params).length === 1) {
return null
}
return params
}
\ No newline at end of file
}
src/views/order/podUs/index.vue
......@@ -179,9 +179,15 @@
转至待确认
</ElButton>
</span>
<span class="item">
<ElButton type="primary" @click="downloadMaterial">下载素材</ElButton>
</span>
<span class="item">
<ElButton type="success" @click="refreshMaterial">
刷新素材图
</ElButton>
</span>
</div>
<div
v-if="status !== 'IN_PRODUCTION'"
......@@ -197,7 +203,6 @@
:selectionable="true"
:paginated-data="tableData"
:cell-style="onCellStyle"
:row-style="getRowStyle"
@selection-change="handleSelectionChange"
>
<template #goods="{ row }">
......@@ -223,18 +228,21 @@
<span class="goods-item-info-item-value">
{{ item.baseSku }}
</span>
<el-icon class="icon" @click="copy(item.baseSku || '')"
><DocumentCopy
/></el-icon>
<el-icon class="icon" @click="copy(item.baseSku || '')">
<DocumentCopy />
</el-icon>
</div>
<div class="goods-item-info-item">
<span class="goods-item-info-item-label">变体SKU:</span>
<span class="goods-item-info-item-value">
{{ item.variantSku }}
</span>
<el-icon class="icon" @click="copy(item.variantSku || '')"
><DocumentCopy
/></el-icon>
<el-icon
class="icon"
@click="copy(item.variantSku || '')"
>
<DocumentCopy />
</el-icon>
</div>
<div class="goods-item-info-item">
<span class="goods-item-info-item-label">工艺:</span>
......@@ -255,8 +263,9 @@
class="icon"
style="color: #e6a23c"
@click="handleUpdateRemark(item)"
><EditPen
/></el-icon>
>
<EditPen />
</el-icon>
</div>
</div>
<div class="goods-item-info">
......@@ -271,8 +280,9 @@
<el-icon
class="icon"
@click="copy(item.factorySubOrderNumber || '')"
><DocumentCopy
/></el-icon>
>
<DocumentCopy />
</el-icon>
</div>
<div class="goods-item-info-item">
<span class="goods-item-info-item-label"
......@@ -287,8 +297,9 @@
<el-icon
class="icon"
@click="copy(item.thirdSubOrderNumber || '')"
><DocumentCopy
/></el-icon>
>
<DocumentCopy />
</el-icon>
</div>
<div class="goods-item-info-item">
<span class="goods-item-info-item-label">工厂:</span>
......@@ -305,7 +316,7 @@
</div>
<div class="goods-item-info">
<div class="goods-item-info-item">
<span class="goods-item-info-item-label">单价:</span>
<span class="goods-item-info-item-label">价格:</span>
<span class="goods-item-info-item-value">
{{ item.productPrice }}(￥)
</span>
......@@ -365,8 +376,9 @@
<el-icon
class="icon"
@click="copy(row.factoryOrderNumber || '')"
><DocumentCopy
/></el-icon>
>
<DocumentCopy />
</el-icon>
</div>
<div class="order-detail-item">
<span class="order-detail-item-label">第三方订单号:</span>
......@@ -376,18 +388,60 @@
>
{{ row.thirdOrderNumber }}
</span>
<el-icon class="icon" @click="copy(row.thirdOrderNumber || '')"
><DocumentCopy
/></el-icon>
<el-icon class="icon" @click="copy(row.thirdOrderNumber || '')">
<DocumentCopy />
</el-icon>
</div>
<div class="order-detail-item">
<span class="order-detail-item-label">店铺单号:</span>
<span class="order-detail-item-value" :title="row.shopNumber">
{{ row.shopNumber }}
</span>
<el-icon class="icon" @click="copy(row.shopNumber || '')"
><DocumentCopy
/></el-icon>
<el-icon class="icon" @click="copy(row.shopNumber || '')">
<DocumentCopy />
</el-icon>
</div>
<div
v-if="row.status !== 'TO_BE_CONFIRMED'"
class="order-detail-item"
>
<span class="order-detail-item-label">生产端:</span>
<span
class="order-detail-item-value"
:title="row.productionClient"
>
{{ row.productionClient }}
</span>
</div>
<div
v-if="
row.productionClient === 'JOMALL' &&
row.status !== 'TO_BE_CONFIRMED'
"
class="order-detail-item"
>
<span class="order-detail-item-label">发货仓库:</span>
<span
class="order-detail-item-value"
:title="row.warehouseName"
>
{{ row.warehouseName }}
</span>
</div>
<div
v-if="
row.productionClient === 'JOMALL' &&
row.status !== 'TO_BE_CONFIRMED'
"
class="order-detail-item"
>
<span class="order-detail-item-label">物流方式:</span>
<span
class="order-detail-item-value"
:title="row.logisticsWayName"
>
{{ row.logisticsWayName }}
</span>
</div>
<div class="order-detail-item">
<span class="order-detail-item-label">收货人:</span>
......@@ -427,11 +481,20 @@
<template #price="{ row }">
<div class="order-price-box">
<div class="order-price-item">
<span class="order-price-item-label">总价：</span>
<span class="order-price-item-label">商品总价：</span>
<span class="order-price-item-value">
{{ row.totalAmount }}(￥)
</span>
</div>
<div
v-if="row.status !== 'TO_BE_CONFIRMED'"
class="order-price-item"
>
<span class="order-price-item-label">物流运费：</span>
<span class="order-price-item-value">
{{ row.payFreight }}($)
</span>
</div>
</div>
</template>
<template #time="{ row }">
......@@ -480,6 +543,9 @@
<template #operate="{ row }">
<div class="operate-box">
<span class="operate-item">
<ElButton link type="primary" @click="confirm(row)">
确认
</ElButton>
<ElButton
link
type="primary"
......@@ -630,7 +696,84 @@
</div>
</div>
<right-menu ref="rightMenuRef" @change="rightChange" />
<el-dialog
v-model="confirmDialogShow"
:close-on-click-modal="false"
title="确认"
>
<div
class="production-client"
style="margin-bottom: 10px; display: flex; align-items: center; gap: 8px"
>
<label style="white-space: nowrap" for="">生产端：</label>
<ElSelect
v-model="productionClientValue"
clearable
placeholder="请选择生产端"
>
<ElOption
v-for="(item, index) in productionClient"
:key="index"
:value="item.code"
:label="`${item.remark}(${item.code})`"
></ElOption>
</ElSelect>
</div>
<el-table
@selection-change="selectionChange"
height="400px"
:data="confirmData"
border
>
<el-table-column
label=""
width="60"
align="center"
type="selection"
></el-table-column>
<el-table-column
label="序号"
width="60"
align="center"
type="index"
></el-table-column>
<el-table-column
label="物流名称"
align="center"
prop="logisticsWayName"
></el-table-column>
<el-table-column
label="发货仓库"
align="center"
prop="warehouseName"
></el-table-column>
<el-table-column
label="物流编码"
align="center"
prop="logisticsWayCode"
></el-table-column>
<el-table-column
label="所在分区"
align="center"
prop="partition"
></el-table-column>
<el-table-column label="状态" align="center">
<template #default="{ row }">
<b v-if="row.status" style="color: green">成功</b>
<b v-else-if="!row.status" style="color: red">失败</b>
</template>
</el-table-column>
<el-table-column label="预计运费（$）" align="center" prop="payFreight">
<!-- <template #default="{row}">-->
<!-- {{row.payFreight || '0.00'}}-->
<!-- </template>-->
</el-table-column>
</el-table>
<template #footer>
<el-button @click="confirmDialogShow = false">取消</el-button>
<el-button type="primary" @click="handleConfirm">确定</el-button>
</template>
</el-dialog>
<el-dialog
v-model="logVisible"
title="操作日志"
......@@ -660,7 +803,21 @@
width="600px"
:close-on-click-modal="false"
>
<div class="production-client">
<template #header>
<div class="dialog-header">
<span style="margin-right: 8px; font-size: 18px">确认</span>
<el-tooltip content="默认最低运费分派">
<el-icon color="red">
<WarningFilled />
</el-icon>
</el-tooltip>
</div>
</template>
<div
class="production-client"
style="display: flex; align-items: center; gap: 8px"
>
<label style="white-space: nowrap" for="">生产端：</label>
<ElSelect
v-model="productionClientValue"
clearable
......@@ -684,6 +841,7 @@
</template>
<script setup lang="ts">
import { getUserMarkList } from '@/api/common'
import { WarningFilled } from '@element-plus/icons-vue'
import {
getCardOrderList,
getOrderList,
......@@ -703,6 +861,9 @@ import {
stockOutCheckApi,
toBeConfirmedApi,
loadWarehouseListApi,
getLogisticsCalculation,
LogisticsData,
refreshMaterialApi,
} from '@/api/podUsOrder'
import TableView from '@/components/TableView.vue'
import {
......@@ -727,6 +888,7 @@ import PodMakeOrder from './PodMakeOrder.vue'
import { OrderData } from '@/types/api/podMakeOrder'
import useLodop, { LODOPObject } from '@/utils/hooks/useLodop'
import dayjs from 'dayjs'
declare global {
interface Window {
ActiveXObject: {
......@@ -736,11 +898,16 @@ declare global {
(data: unknown): { toArray(): number[] }
}
}
interface XMLHttpRequest {
responseBody?: unknown
}
}
const tabsNav = ref<Tab[]>()
const confirmDialogShow = ref(false)
const confirmData = ref([])
const confirmSelectionData = ref<LogisticsData[]>([])
const confirmRowData = ref<ProductList | null>(null)
const status = ref('TO_BE_CONFIRMED')
const detailData = ref({})
const [searchForm] = useValue<SearchForm>({
......@@ -970,6 +1137,41 @@ const {
}
},
})
const confirm = async (row: ProductList) => {
confirmDialogShow.value = true
productionClientValue.value = ''
confirmRowData.value = row
confirmData.value = []
confirmSelectionData.value = []
const { data } = await getLogisticsCalculation(row.id)
confirmData.value = data
}
const selectionChange = (data: LogisticsData[]) => {
confirmSelectionData.value = data
}
const handleConfirm = async () => {
if (!productionClientValue.value) {
return ElMessage.warning('请选择生产端')
}
if (confirmSelectionData.value.length !== 1) {
return ElMessage.warning('请选择一条物流方式')
}
if (confirmSelectionData.value.some((el) => !el.status)) {
return ElMessage.warning('请选择状态为成功的物流方式')
}
const id = confirmRowData.value?.id
const res = await confirmOrderApi(
[Number(id)],
productionClientValue.value,
'customize',
confirmSelectionData.value[0],
)
if (res.code !== 200) return
ElMessage.success('操作成功')
confirmDialogShow.value = false
search()
loadTabData()
}
const copy = (text: string) => {
navigator.clipboard.writeText(text)
ElMessage.success('复制成功')
......@@ -1028,7 +1230,11 @@ const submit = async () => {
const submitConfirm = async () => {
const ids = selection.value.map((item) => item.id)
try {
const res = await confirmOrderApi(ids, productionClientValue.value)
const res = await confirmOrderApi(
ids,
productionClientValue.value,
'minimumCost',
)
if (res.code !== 200) return
ElMessage.success('操作成功')
productionClientVisible.value = false
......@@ -1222,11 +1428,9 @@ const downloadMaterial = async () => {
.map((item: ProductList) => item.id)
.filter((id): id is number => id !== undefined)
} else {
selectedIds = selection.value
.map((item: PodUsOrderListData) => item.productList)
.flat()
.map((e) => e?.id)
.filter((id): id is number => id !== undefined)
selectedIds = (tableData.value as PodUsOrderListData[]).map(
(item) => item.id,
)
}
if (selectedIds.length === 0) {
return ElMessage({
......@@ -1532,16 +1736,16 @@ const onFastRefresh = () => {
loadTabData()
search()
}
// 修改行样式方法
const getRowStyle = ({ row }: { row: PodUsOrderListData }) => {
if (stockOutSuccessIds.value.includes(row.id)) {
return {
backgroundColor: '#f0f9eb',
color: '#67c23a',
}
}
return {}
}
// // 修改行样式方法
// const getRowStyle = ({ row }: { row: PodUsOrderListData }) => {
// if (stockOutSuccessIds.value.includes(row.id)) {
// return {
// backgroundColor: '#f0f9eb',
// color: '#67c23a',
// }
// }
// return {}
// }
// 添加表格ref
const tableRef = ref()
const warehouseList = ref<WarehouseListData[]>([])
......@@ -1554,6 +1758,38 @@ const loadWarehouseList = async () => {
console.error(e)
}
}
const refreshMaterial = async () => {
let selectedIds = []
const data: {
orderIds: string | undefined
productIds: string | undefined
} = {
orderIds: undefined,
productIds: undefined,
}
if (status.value == 'IN_PRODUCTION') {
selectedIds = cardSelection.value.map((item) => item.id)
data.orderIds = selectedIds.join(',')
data.productIds = undefined
} else {
selectedIds = (selection.value as PodUsOrderListData[]).map(
(item) => item.id,
)
data.productIds = selectedIds.join(',')
data.orderIds = undefined
}
if (selectedIds.length === 0) {
return ElMessage.warning('请选择数据')
}
try {
const res = await refreshMaterialApi(data)
if (res.code !== 200) return
ElMessage.success('刷新成功')
search()
} catch (e) {
console.error(e)
}
}
onMounted(() => {
loadTabData()
getUserMark()
......@@ -1568,6 +1804,7 @@ onMounted(() => {
margin-bottom: 10px;
}
}
.tabs {
display: flex;
align-items: center;
......@@ -1593,6 +1830,7 @@ onMounted(() => {
font-weight: 600;
}
}
.goods-item {
display: grid;
grid-template-columns: 100px 1fr minmax(180px, 1fr) 140px;
......@@ -1601,16 +1839,19 @@ onMounted(() => {
.goods-item-img {
width: 100px;
height: 100px;
img {
width: 100%;
}
}
&:not(:last-child) {
padding-bottom: 10px;
margin-bottom: 10px;
border-bottom: 1px solid #eee;
}
}
.goods-item-info-item {
display: flex;
align-items: center;
......@@ -1623,6 +1864,7 @@ onMounted(() => {
white-space: nowrap;
}
}
.order-detail-item {
display: flex;
align-items: center;
......@@ -1635,6 +1877,7 @@ onMounted(() => {
white-space: nowrap;
}
}
.card-list {
display: grid;
grid-template-columns: repeat(6, 1fr);
......@@ -1643,6 +1886,7 @@ onMounted(() => {
height: 100%;
overflow-y: auto;
}
.empty {
height: 100%;
display: flex;
......@@ -1650,17 +1894,21 @@ onMounted(() => {
justify-content: center;
color: #999;
}
.card-list-item {
cursor: pointer;
}
.images-position {
display: flex;
gap: 5px;
.item-image {
cursor: pointer;
border: 1px solid #eee;
}
}
.grid-container {
display: grid;
grid-template-columns: repeat(2, 1fr);
......@@ -1668,6 +1916,7 @@ onMounted(() => {
font-size: 12px;
margin-top: 10px;
}
.factory-sub-order-number {
font-size: 12px;
}
......
src/views/warehouse/issueDoc.vue
......@@ -125,10 +125,10 @@
>
删除
</el-button>
<el-button type="success" @click="handleExport"> 导出 </el-button>
<!-- <el-button type="success" @click="handleExport"> 导出 </el-button>
<el-button type="primary" @click="printProductTag">
打印商品SKU标签
</el-button>
</el-button> -->
<el-button
v-if="nodeCode === 'PENDING_AUDIT'"
type="warning"
......@@ -481,6 +481,7 @@
clearable
placeholder="请选择仓库"
style="width: 160px"
@change="handleWarehouseChange(editForm.warehouseId)"
>
<ElOption
v-for="item in warehouseList"
......@@ -565,8 +566,7 @@
<!-- +后有就正常展示，没有则通过搜索接口自己添加 -->
<!-- remote
:remote-method="(query) => handleLocationSearch(query, row)"
:loading="locationLoading"
@change="(val) => handleLocationChange(val, row)" -->
:loading="locationLoading"-->
<span v-if="row.loacationCode">{{ row.loacationCode }}</span>
<ElSelect
v-else
......@@ -797,7 +797,7 @@ import { CirclePlusFilled } from '@element-plus/icons-vue'
import splitDiv from '@/components/splitDiv/splitDiv.vue'
import { ElTable } from 'element-plus'
import usePageList from '@/utils/hooks/usePageList'
// import { checkUpdateParams } from '@/utils/hooks/commonUtil'
import { checkUpdateParams, AnyObject } from '@/utils/hooks/commonUtil'
import { useValue } from '@/utils/hooks/useValue'
import {
getInRecordStatusTree,
......@@ -990,6 +990,7 @@ const {
pageSize,
).then((res) => res.data) as never,
})
const setCostPrice = (item: InterProductList) => {
if (!item.costPrice) {
ElMessage.warning('商品成本价为空，请完善商品成本价')
......@@ -1015,15 +1016,15 @@ const getTreeNum = async () => {
}
}
const showPrintDialog = ref(false)
const printProductTag = async () => {
if (!selections.value.length) {
return ElMessage.warning('请选择要删除的数据')
}
showPrintDialog.value = true
// selections.value.forEach((el:InterWarehousePage) => {
// el.number = ''
// })
}
// const printProductTag = async () => {
// if (!selections.value.length) {
// return ElMessage.warning('请选择要操作的数据')
// }
// showPrintDialog.value = true
// selections.value.forEach((el:InterWarehousePage) => {
// el.number = ''
// })
// }
async function handlePrintProductTag() {
// const flag = selections.value.every((el:InterWarehousePage) => el.number && el.number != '0')
// if (!flag) {
......@@ -1088,11 +1089,9 @@ const exportForm = ref({
delivery: false,
resource: '',
})
const handleExport = () => {
exportVisible.value = true
// exportForm.value.delivery = false
// exportForm.value.resource = ''
}
// const handleExport = () => {
// exportVisible.value = true
// }
const submitExportForm = () => {
// if (exportForm.value.resource === '') {
// return ElMessage.error('请选择导出类型')
......@@ -1270,7 +1269,8 @@ const tabsClick = async () => {
}
const [editForm, resetEditForm] = useValue<InterWarehouseDetail>({
inNo: '',
warehouseId: '',
warehouseId: null,
warehouseName: '',
remark: '',
factoryCode: '',
factoryId: 0,
......@@ -1310,7 +1310,7 @@ const addDialog = async (i: number, v: InterWarehousePage | null) => {
const getProduct = async (id: number | undefined) => {
try {
const res = await getWarehouseInRecordDetailApi(id)
editForm2.value = res.data
editForm.value = JSON.parse(JSON.stringify(res.data))
otherPurchaseData.value = res.data?.productList || []
} catch (e) {
console.error(e)
......@@ -1349,7 +1349,7 @@ const auditOrder = (key: string) => {
}
const confimText =
key === 'audit'
? '确定进行审核？点“确定”将会直接更改库存数量，请在审核前确认数量是否正确。'
? '确定进行审核？点"确定"将会直接更改库存数量，请在审核前确认数量是否正确。'
: `确定对选中的信息进行${text}？`
ElMessageBox.confirm(confimText, '重要提示', {
confirmButtonText: '确定',
......@@ -1413,7 +1413,7 @@ watch(
watch(
() => editForm.value.warehouseId,
(newVal: number | string | undefined) => {
(newVal: number | null | undefined) => {
if (newVal) {
fetchLocationList('')
}
......@@ -1512,13 +1512,17 @@ const addSection = async () => {
}
const upSection = async () => {
const params = { ...editForm.value }
params.productList = otherPurchaseData.value
// const result = checkUpdateParams(params, editForm2.value, '', {
// productList: 'value',
// })
// console.log(result, params, editForm2.value)
// params.productList = otherPurchaseData.value
const result = checkUpdateParams(
{ ...params, productList: otherPurchaseData.value },
editForm.value as unknown as AnyObject,
'id',
{
productList: 'warehouseSku',
},
)
try {
await updateInRecordApi(params)
await updateInRecordApi(result)
newDialogVisible.value = false
ElMessage.success('修改成功')
search()
......@@ -1592,6 +1596,7 @@ const fetchLocationList = async (query: string) => {
// locationList.value = []
// return
// }
if (!editForm.value.warehouseId) return
locationLoading.value = true
try {
const res = await getByWareHouseIdAndCodeApi(
......@@ -1619,6 +1624,12 @@ const handleLocationChange = (val: number, row: InterProductList) => {
)
row.locationCode = found ? found.locationCode : ''
}
const handleWarehouseChange = (val: number | null | undefined) => {
const found = warehouseList.value.find(
(item: InterWarehouseList) => item.id === val,
)
editForm.value.warehouseName = found ? found.name : ''
}
onMounted(() => {
getTreeNum()
getWarehouseList()
......
src/views/warehouse/manage.vue
......@@ -4,9 +4,10 @@ import {
factoryWarehouseInfo,
warehouseInfo,
createWarehouseApi,
updateWarehouseApi, deleteWarehouseApi,
updateWarehouseApi, deleteWarehouseApi, logisticsAddressGetAllList, Address,
} from '@/api/warehouse.ts'
import { nextTick, ref } from 'vue'
// import { add } from 'lodash-es'
const selections = ref<warehouseInfo[]>([])
const formRef = ref()
......@@ -17,6 +18,7 @@ const createData = ref({
form: {
name: '',
code: '',
addressId: '',
sort: '',
defaulted: 0,
remarks: '',
......@@ -32,6 +34,9 @@ const rules = {
defaulted: [
{ required: true, message: '请选择是否默认仓库', trigger: 'change' },
],
addressId: [
{ required: true, message: '请选择地址', trigger: 'change' },
],
}
const leftData = ref<warehouseInfo[]>([])
const pagination = ref<factoryWarehouseInfo>({
......@@ -39,6 +44,7 @@ const pagination = ref<factoryWarehouseInfo>({
currentPage: 1,
total: 0,
})
const addressList = ref<Address[]>([])
async function getData() {
const res = await getFactoryWarehouseInfo({
......@@ -96,6 +102,7 @@ const createWarehouse = () => {
createData.value.form = {
name: '',
code: '',
addressId: '',
sort: '',
defaulted: 0,
remarks: '',
......@@ -120,7 +127,23 @@ const updateWarehouse = (item: warehouseInfo) => {
formRef.value?.clearValidate()
})
}
const getAddress = (id:number) => {
if(!id) return ''
const item = addressList.value.find((el) => el.id === id)
if(!item) return ''
return [item.countryName,
item.stateProvince,
item.city,
item.addressLine1,
item.addressLine2 ,
item.addressLine3 ,].filter(el => el).join(' ')
}
const getAddressList = async () => {
const data = await logisticsAddressGetAllList()
addressList.value = data.data
}
getData()
getAddressList()
</script>
<template>
......@@ -138,9 +161,14 @@ getData()
<el-table-column type="index" label="序号" width="60" />
<el-table-column label="仓库名称" prop="name" align="center" />
<el-table-column label="仓库编码" prop="code" align="center" />
<el-table-column label="仓库序号" prop="sort" align="center" />
<el-table-column show-overflow-tooltip label="地址" prop="addressId" align="center">
<template #default="{row}">
{{getAddress(row.addressId)}}
</template>
</el-table-column>
<el-table-column width="90" label="仓库序号" prop="sort" align="center" />
<el-table-column label="备注" prop="remarks" align="center" />
<el-table-column label="默认仓库" prop="defaulted" align="center">
<el-table-column width="90" label="默认仓库" prop="defaulted" align="center">
<template #default="{row}">
<el-switch
v-model="row.defaulted" :active-value="1" :inactive-value="0"
......@@ -176,6 +204,19 @@ getData()
<el-form-item label="仓库编码" prop="code">
<el-input v-model="createData.form.code" clearable placeholder="请输入仓库编码"></el-input>
</el-form-item>
<el-form-item label="地址" prop="addressId">
<el-select v-model="createData.form.addressId" clearable filterable>
<el-option
v-for="it in addressList" :key="it.id" :value="it.id" :label="[
it.countryName,
it.stateProvince,
it.city,
it.addressLine1,
it.addressLine2 ,
it.addressLine3 ,
].filter(el=>el).join(' ')"></el-option>
</el-select>
</el-form-item>
<el-form-item label="仓库序号" prop="sort">
<el-input-number v-model="createData.form.sort"></el-input-number>
</el-form-item>
......
src/views/warehouse/receiptDoc.vue
......@@ -125,10 +125,10 @@
>
删除
</el-button>
<el-button type="success" @click="handleExport"> 导出 </el-button>
<!-- <el-button type="success" @click="handleExport"> 导出 </el-button>
<el-button type="primary" @click="printProductTag">
打印商品SKU标签
</el-button>
</el-button> -->
<el-button
v-if="nodeCode === 'PENDING_AUDIT'"
type="warning"
......@@ -481,6 +481,7 @@
clearable
placeholder="请选择仓库"
style="width: 160px"
@change="handleWarehouseChange(editForm.warehouseId)"
>
<ElOption
v-for="item in warehouseList"
......@@ -565,8 +566,7 @@
<!-- +后有就正常展示，没有则通过搜索接口自己添加 -->
<!-- remote
:remote-method="(query) => handleLocationSearch(query, row)"
:loading="locationLoading"
@change="(val) => handleLocationChange(val, row)" -->
:loading="locationLoading"-->
<span v-if="row.loacationCode">{{ row.loacationCode }}</span>
<ElSelect
v-else
......@@ -797,7 +797,7 @@ import { CirclePlusFilled } from '@element-plus/icons-vue'
import splitDiv from '@/components/splitDiv/splitDiv.vue'
import { ElTable } from 'element-plus'
import usePageList from '@/utils/hooks/usePageList'
// import { checkUpdateParams } from '@/utils/hooks/commonUtil'
import { checkUpdateParams, AnyObject } from '@/utils/hooks/commonUtil'
import { useValue } from '@/utils/hooks/useValue'
import {
getInRecordStatusTree,
......@@ -990,6 +990,7 @@ const {
pageSize,
).then((res) => res.data) as never,
})
const setCostPrice = (item: InterProductList) => {
if (!item.costPrice) {
ElMessage.warning('商品成本价为空，请完善商品成本价')
......@@ -1015,15 +1016,15 @@ const getTreeNum = async () => {
}
}
const showPrintDialog = ref(false)
const printProductTag = async () => {
if (!selections.value.length) {
return ElMessage.warning('请选择要删除的数据')
}
showPrintDialog.value = true
// selections.value.forEach((el:InterWarehousePage) => {
// el.number = ''
// })
}
// const printProductTag = async () => {
// if (!selections.value.length) {
// return ElMessage.warning('请选择要操作的数据')
// }
// showPrintDialog.value = true
// selections.value.forEach((el:InterWarehousePage) => {
// el.number = ''
// })
// }
async function handlePrintProductTag() {
// const flag = selections.value.every((el:InterWarehousePage) => el.number && el.number != '0')
// if (!flag) {
......@@ -1088,11 +1089,9 @@ const exportForm = ref({
delivery: false,
resource: '',
})
const handleExport = () => {
exportVisible.value = true
// exportForm.value.delivery = false
// exportForm.value.resource = ''
}
// const handleExport = () => {
// exportVisible.value = true
// }
const submitExportForm = () => {
// if (exportForm.value.resource === '') {
// return ElMessage.error('请选择导出类型')
......@@ -1270,7 +1269,8 @@ const tabsClick = async () => {
}
const [editForm, resetEditForm] = useValue<InterWarehouseDetail>({
inNo: '',
warehouseId: '',
warehouseId: null,
warehouseName: '',
remark: '',
factoryCode: '',
factoryId: 0,
......@@ -1310,7 +1310,7 @@ const addDialog = async (i: number, v: InterWarehousePage | null) => {
const getProduct = async (id: number | undefined) => {
try {
const res = await getWarehouseInRecordDetailApi(id)
editForm2.value = res.data
editForm.value = JSON.parse(JSON.stringify(res.data))
otherPurchaseData.value = res.data?.productList || []
} catch (e) {
console.error(e)
......@@ -1349,7 +1349,7 @@ const auditOrder = (key: string) => {
}
const confimText =
key === 'audit'
? '确定进行审核？点“确定”将会直接更改库存数量，请在审核前确认数量是否正确。'
? '确定进行审核？点"确定"将会直接更改库存数量，请在审核前确认数量是否正确。'
: `确定对选中的信息进行${text}？`
ElMessageBox.confirm(confimText, '重要提示', {
confirmButtonText: '确定',
......@@ -1413,7 +1413,7 @@ watch(
watch(
() => editForm.value.warehouseId,
(newVal: number | string | undefined) => {
(newVal: number | null | undefined) => {
if (newVal) {
fetchLocationList('')
}
......@@ -1512,13 +1512,17 @@ const addSection = async () => {
}
const upSection = async () => {
const params = { ...editForm.value }
params.productList = otherPurchaseData.value
// const result = checkUpdateParams(params, editForm2.value, '', {
// productList: 'value',
// })
// console.log(result, params, editForm2.value)
// params.productList = otherPurchaseData.value
const result = checkUpdateParams(
{ ...params, productList: otherPurchaseData.value },
editForm.value as unknown as AnyObject,
'id',
{
productList: 'warehouseSku',
},
)
try {
await updateInRecordApi(params)
await updateInRecordApi(result)
newDialogVisible.value = false
ElMessage.success('修改成功')
search()
......@@ -1592,6 +1596,7 @@ const fetchLocationList = async (query: string) => {
// locationList.value = []
// return
// }
if (!editForm.value.warehouseId) return
locationLoading.value = true
try {
const res = await getByWareHouseIdAndCodeApi(
......@@ -1619,6 +1624,12 @@ const handleLocationChange = (val: number, row: InterProductList) => {
)
row.locationCode = found ? found.locationCode : ''
}
const handleWarehouseChange = (val: number | null | undefined) => {
const found = warehouseList.value.find(
(item: InterWarehouseList) => item.id === val,
)
editForm.value.warehouseName = found ? found.name : ''
}
onMounted(() => {
getTreeNum()
getWarehouseList()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment