chenfang 11 months ago
parent
commit
ebe458f59e
  1. 55
      src/api/wms/containerInitRecordDetail/index.ts
  2. 68
      src/api/wms/containerInitRecordMain/index.ts
  3. 4
      src/api/wms/countRequestMain/index.ts
  4. 1
      src/components/BasicForm/src/BasicForm.vue
  5. 6
      src/components/Detail/src/Detail.vue
  6. 4
      src/components/TableFormCountPlan/src/TableFormCountPlan.vue
  7. 3
      src/utils/dict.ts
  8. 12
      src/utils/disposition/defaultButtons.ts
  9. 126
      src/views/Home/components/material.vue
  10. 67
      src/views/Home/components/produce.vue
  11. 123
      src/views/Home/components/product.vue
  12. 14
      src/views/Home/echarts-data.ts
  13. 17
      src/views/wms/countManage/count/countRequestMain/index.vue
  14. 1
      src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
  15. 1
      src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue
  16. 219
      src/views/wms/inventoryManage/containerinit/containerinitadd/containerMain.data.ts
  17. 247
      src/views/wms/inventoryManage/containerinit/containerinitadd/index.vue
  18. 149
      src/views/wms/inventoryManage/containerinit/containerinitrecord/containerInitRecordMain.data.ts
  19. 286
      src/views/wms/inventoryManage/containerinit/containerinitrecord/index.vue
  20. 8
      src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
  21. 2
      src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/index.vue
  22. 55
      src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
  23. 235
      src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts
  24. 1
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
  25. 9
      src/views/wms/reportList/index.vue
  26. 100
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts

55
src/api/wms/containerInitRecordDetail/index.ts

@ -0,0 +1,55 @@
import request from '@/config/axios'
export interface ContainerInitRecordDetailVO {
id: number
containerNumber: string
type: string
capacity: number
status: string
ownerCode: string
masterId: number
number: string
siteId: string
remark: string
}
// 查询器具初始化记录子列表
export const getContainerInitRecordDetailPage = async (params) => {
if (params.isSearch) {
delete params.isSearch
const data = {...params}
return await request.post({ url: '/wms/container-init-record-detail/senior', data })
} else {
return await request.get({ url: `/wms/container-init-record-detail/page`, params })
}
}
// 查询器具初始化记录子详情
export const getContainerInitRecordDetail = async (id: number) => {
return await request.get({ url: `/wms/container-init-record-detail/get?id=` + id })
}
// 新增器具初始化记录子
export const createContainerInitRecordDetail = async (data: ContainerInitRecordDetailVO) => {
return await request.post({ url: `/wms/container-init-record-detail/create`, data })
}
// 修改器具初始化记录子
export const updateContainerInitRecordDetail = async (data: ContainerInitRecordDetailVO) => {
return await request.put({ url: `/wms/container-init-record-detail/update`, data })
}
// 删除器具初始化记录子
export const deleteContainerInitRecordDetail = async (id: number) => {
return await request.delete({ url: `/wms/container-init-record-detail/delete?id=` + id })
}
// 导出器具初始化记录子 Excel
export const exportContainerInitRecordDetail = async (params) => {
return await request.download({ url: `/wms/container-init-record-detail/export-excel`, params })
}
// 下载用户导入模板
export const importTemplate = () => {
return request.download({ url: '/wms/container-init-record-detail/get-import-template' })
}

68
src/api/wms/containerInitRecordMain/index.ts

@ -0,0 +1,68 @@
import request from '@/config/axios'
export interface ContainerInitRecordMainVO {
id: number
number: string
fromWarehouseCode: string
toWarehouseCode: string
outTransactionType: string
inTransactionType: string
executeTime: Date
activeDate: Date
available: string
requestTime: Date
dueTime: Date
departmentCode: string
userGroupCode: string
interfaceType: string
businessType: string
remark: string
extraProperties: string
siteId: string
code: string
fromLocationTypes: string
toLocationTypes: string
fromAreaCodes: string
toAreaCodes: string
}
// 查询器具初始化记录主列表
export const getContainerInitRecordMainPage = async (params) => {
if (params.isSearch) {
delete params.isSearch
const data = {...params}
return await request.post({ url: '/wms/container-init-record-main/senior', data })
} else {
return await request.get({ url: `/wms/container-init-record-main/page`, params })
}
}
// 查询器具初始化记录主详情
export const getContainerInitRecordMain = async (id: number) => {
return await request.get({ url: `/wms/container-init-record-main/get?id=` + id })
}
// 新增器具初始化记录主
export const createContainerInitRecordMain = async (data: ContainerInitRecordMainVO) => {
return await request.post({ url: `/wms/container-init-record-main/create`, data })
}
// 修改器具初始化记录主
export const updateContainerInitRecordMain = async (data: ContainerInitRecordMainVO) => {
return await request.put({ url: `/wms/container-init-record-main/update`, data })
}
// 删除器具初始化记录主
export const deleteContainerInitRecordMain = async (id: number) => {
return await request.delete({ url: `/wms/container-init-record-main/delete?id=` + id })
}
// 导出器具初始化记录主 Excel
export const exportContainerInitRecordMain = async (params) => {
return await request.download({ url: `/wms/container-init-record-main/export-excel`, params })
}
// 下载用户导入模板
export const importTemplate = () => {
return request.download({ url: '/wms/container-init-record-main/get-import-template' })
}

4
src/api/wms/countRequestMain/index.ts

@ -106,3 +106,7 @@ export const superviseCount = async (data) => {
export const generateCountadjustRequest = async (id) => { export const generateCountadjustRequest = async (id) => {
return await request.put({ url: `/wms/count-request-main/generateCountadjustRequest?id=` + id }) return await request.put({ url: `/wms/count-request-main/generateCountadjustRequest?id=` + id })
} }
//解冻
export const thaw = async (id) => {
return await request.put({ url: `/wms/count-request-main/thaw?id=` + id })
}

1
src/components/BasicForm/src/BasicForm.vue

@ -90,6 +90,7 @@
ref="tableFormRef" ref="tableFormRef"
@tableFormChange="tableFormChange" @tableFormChange="tableFormChange"
@handleAddTable="handleAddTable" @handleAddTable="handleAddTable"
@handleDeleteTable="handleDeleteTable"
/> />
</div> </div>
<template #footer> <template #footer>

6
src/components/Detail/src/Detail.vue

@ -405,6 +405,12 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName:
defaultButtons.defaultFilterBtn(null) // defaultButtons.defaultFilterBtn(null) //
] ]
} }
//
if (props.fromeWhere == 'countadjustRequest') {
HeadButttondata.value = [
defaultButtons.defaultFilterBtn(null) //
]
}
} }
// //

4
src/components/TableFormCountPlan/src/TableFormCountPlan.vue

@ -168,6 +168,10 @@ const tableFormChange = (field, val, row) => {
const handleAddTable = () => { const handleAddTable = () => {
emit('handleAddTable') emit('handleAddTable')
} }
//
const handleDeleteTable = (row, index) => {
emit('handleDeleteTable', row, index)
}
// setup // setup
defineExpose({ defineExpose({
TableBaseComponents_Ref, TableBaseComponents_Ref,

3
src/utils/dict.ts

@ -270,5 +270,6 @@ export enum DICT_TYPE {
TRANSFER_MODE = 'transfer_mode', // 运输方式 TRANSFER_MODE = 'transfer_mode', // 运输方式
LABEL_TYPE = 'label_type', // 标签类型 LABEL_TYPE = 'label_type', // 标签类型
LABEL_STATUS = 'label_status', // 标签状态 LABEL_STATUS = 'label_status', // 标签状态
BIND_TYPE = 'bind_type' // 器具绑定类型 BIND_TYPE = 'bind_type', // 器具绑定类型
CONTAINER_STATUS = 'container_status', // 容器状态
} }

12
src/utils/disposition/defaultButtons.ts

@ -723,6 +723,18 @@ export function mainSuperviseCountBtn(option:any) {
hasPermi: '' hasPermi: ''
}) })
} }
// 主列表-解冻
export function mainThawRequesttBtn(option:any) {
return __defaultBtnOption(option,{
label: '解冻',
name: 'mainThaw',
hide: false,
type: 'primary',
color: '',
link: true, // 文本展现按钮
hasPermi: ''
})
}
// 默认按钮规则 // 默认按钮规则
function __defaultBtnOption(option:any,specific:any){ function __defaultBtnOption(option:any,specific:any){
return { return {

126
src/views/Home/components/material.vue

@ -148,19 +148,63 @@
<div class="two-row mt-14px"> <div class="two-row mt-14px">
<div class="data1 w-[47.3%]"> <div class="data1 w-[47.3%]">
<div class="title">高低储预警</div> <div class="title">高低储预警</div>
<el-table :data="tableData" style="width: 100%" stripe height="240px"> <el-table
<el-table-column prop="title" label="标题" /> :data="materialData?.warningBalanceList"
<el-table-column prop="name" label="发布人" /> style="width: 100%"
<el-table-column prop="date" label="发布日期" /> stripe
height="240px"
>
<el-table-column prop="itemCode" label="物料代码" width="180px" />
<el-table-column prop="batch" label="批次" width="180px" />
<el-table-column prop="packingNumber" label="包装号" width="180px" />
<el-table-column prop="containerNumber" label="器具代码" width="180px" />
<el-table-column prop="qty" label="数量" width="180px" />
<el-table-column prop="uom" label="计量单位" width="180px">
<template #default="scope">
{{ formatter(scope.row.uom, DICT_TYPE.UOM) }}
</template>
</el-table-column>
<el-table-column prop="locationCode" label="库位代码" width="180px" />
<el-table-column prop="warehouseCode" label="仓库代码" width="180px" />
<el-table-column prop="inventoryStatus" label="库存状态" width="180px">
<template #default="scope">
{{ formatter(scope.row.inventoryStatus, DICT_TYPE.INVENTORY_STATUS) }}
</template>
</el-table-column>
<el-table-column prop="locationGroupCode" label="库位组代码" width="180px" />
<el-table-column prop="areaCode" label="库区代码" width="180px" />
<el-table-column prop="erpLocationCode" label="ERP库位代码" width="180px" />
<el-table-column prop="altBatch" label="替代批次" width="180px" />
<el-table-column prop="arriveDate" label="到货日期" width="180px">
<template #default="scope">
<span>{{ formatDate(scope.row.planDate) }}</span>
</template>
</el-table-column>
<el-table-column prop="produceDate" label="生产日期" width="180px">
<template #default="scope">
<span>{{ formatDate(scope.row.planDate) }}</span>
</template>
</el-table-column>
<el-table-column prop="expireDate" label="失效日期" width="180px">
<template #default="scope">
<span>{{ formatDate(scope.row.planDate) }}</span>
</template>
</el-table-column>
<el-table-column prop="ownerCode" label="货主代码" width="180px" />
<el-table-column prop="lockedQty" label="锁定数量" width="180px" />
<el-table-column prop="usableQty" label="可用数量" width="180px" />
<el-table-column prop="singlePrice" label="单价" width="180px" />
<el-table-column prop="amount" label="金额" width="180px" />
<el-table-column prop="putInTime" label="入库时间" width="180px">
<template #default="scope">
<span>{{ formatDate(scope.row.planDate) }}</span>
</template>
</el-table-column>
</el-table> </el-table>
</div> </div>
<div class="data1 w-[47.3%]"> <div class="data1 w-[47.3%]">
<div class="title">待处理任务</div> <div class="title">待处理任务</div>
<el-table :data="tableData" style="width: 100%" stripe height="240px"> <Echart :options="barOptions" :height="280" :key="lineIndex" />
<el-table-column prop="title" label="标题" />
<el-table-column prop="name" label="发布人" />
<el-table-column prop="date" label="发布日期" />
</el-table>
</div> </div>
</div> </div>
</div> </div>
@ -169,55 +213,41 @@
import * as IndexApi from '@/api/home' import * as IndexApi from '@/api/home'
import { formatDate } from '@/utils/formatTime' import { formatDate } from '@/utils/formatTime'
import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
const tableData = [ import { set } from 'lodash-es'
{ import { EChartsOption } from 'echarts'
date: '2016-05-03', import { barOptions } from '../echarts-data'
name: 'Tom', const lineIndex = ref(0)
title: 'Tom',
text: 'No. 189, Grove St, Los Angeles'
},
{
date: '2016-05-02',
title: 'Tom',
name: 'Tom',
text: 'No. 189, Grove St, Los Angeles'
},
{
date: '2016-05-04',
title: 'Tom',
name: 'Tom',
text: 'No. 189, Grove St, Los Angeles'
},
{
date: '2016-05-01',
title: 'Tom',
name: 'Tom',
text: 'No. 189, Grove St, Los Angeles'
},
{
date: '2016-05-01',
title: 'Tom',
name: 'Tom',
text: 'No. 189, Grove St, Los Angeles'
},
{
date: '2016-05-01',
title: 'Tom',
name: 'Tom',
text: 'No. 189, Grove St, Los Angeles'
}
]
const materialData = ref() const materialData = ref()
// //
const getMaterialData = async () => { const getMaterialData = async () => {
IndexApi.getMaterialData().then((res) => { await IndexApi.getMaterialData().then((res) => {
materialData.value = res materialData.value = res
getJobCharts()
}) })
} }
const formatter = (type, dict) => { const formatter = (type, dict) => {
let str = getStrDictOptions(dict).filter((item) => type == item.value)[0].label let str = getStrDictOptions(dict).filter((item) => type == item.value)[0].label
return str return str
} }
const barOptionsData = reactive<EChartsOption>(barOptions) as EChartsOption
const getJobCharts = async () => {
set(
barOptionsData,
'xAxis.data',
Object.keys( materialData.value.jobCount)
)
set(barOptionsData, 'legend.data', ['待处理任务'])
set(barOptionsData, 'series', [
{
name:'待处理任务',
data: Object.values( materialData.value.jobCount),
type: 'bar',
barMaxWidth:30
}
])
lineIndex.value++
}
onMounted(async () => { onMounted(async () => {
await getMaterialData() await getMaterialData()
}) })

67
src/views/Home/components/produce.vue

@ -156,11 +156,7 @@
</div> </div>
<div class="data1 w-[47.3%]"> <div class="data1 w-[47.3%]">
<div class="title">待处理任务</div> <div class="title">待处理任务</div>
<el-table :data="tableData" style="width: 100%" stripe height="240px"> <Echart :options="barOptions" :height="280" :key="lineIndex" />
<el-table-column prop="title" label="标题" />
<el-table-column prop="name" label="发布人" />
<el-table-column prop="date" label="发布日期" />
</el-table>
</div> </div>
</div> </div>
</div> </div>
@ -169,55 +165,40 @@
import * as IndexApi from '@/api/home' import * as IndexApi from '@/api/home'
import { formatDate } from '@/utils/formatTime' import { formatDate } from '@/utils/formatTime'
import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
const tableData = [ import { set } from 'lodash-es'
{ import { EChartsOption } from 'echarts'
date: '2016-05-03', import { barOptions } from '../echarts-data'
name: 'Tom', const lineIndex = ref(0)
title: 'Tom',
text: 'No. 189, Grove St, Los Angeles'
},
{
date: '2016-05-02',
title: 'Tom',
name: 'Tom',
text: 'No. 189, Grove St, Los Angeles'
},
{
date: '2016-05-04',
title: 'Tom',
name: 'Tom',
text: 'No. 189, Grove St, Los Angeles'
},
{
date: '2016-05-01',
title: 'Tom',
name: 'Tom',
text: 'No. 189, Grove St, Los Angeles'
},
{
date: '2016-05-01',
title: 'Tom',
name: 'Tom',
text: 'No. 189, Grove St, Los Angeles'
},
{
date: '2016-05-01',
title: 'Tom',
name: 'Tom',
text: 'No. 189, Grove St, Los Angeles'
}
]
const produceData = ref() const produceData = ref()
// //
const getProduceData = async () => { const getProduceData = async () => {
IndexApi.getProduceData().then((res) => { IndexApi.getProduceData().then((res) => {
produceData.value = res produceData.value = res
getJobCharts()
}) })
} }
const formatter = (type, dict) => { const formatter = (type, dict) => {
let str = getStrDictOptions(dict).filter((item) => type == item.value)[0].label let str = getStrDictOptions(dict).filter((item) => type == item.value)[0].label
return str return str
} }
const barOptionsData = reactive<EChartsOption>(barOptions) as EChartsOption
const getJobCharts = async () => {
set(
barOptionsData,
'xAxis.data',
Object.keys( produceData.value.jobCount)
)
set(barOptionsData, 'legend.data', ['待处理任务'])
set(barOptionsData, 'series', [
{
name:'待处理任务',
data: Object.values( produceData.value.jobCount),
type: 'bar',
barMaxWidth:30
}
])
lineIndex.value++
}
onMounted(async () => { onMounted(async () => {
await getProduceData() await getProduceData()
}) })

123
src/views/Home/components/product.vue

@ -127,19 +127,63 @@
<div class="two-row mt-14px"> <div class="two-row mt-14px">
<div class="data1 w-[47.3%]"> <div class="data1 w-[47.3%]">
<div class="title">高低储预警</div> <div class="title">高低储预警</div>
<el-table :data="tableData" style="width: 100%" stripe height="240px"> <el-table
<el-table-column prop="title" label="标题" /> :data="productData?.warningBalanceList"
<el-table-column prop="name" label="发布人" /> style="width: 100%"
<el-table-column prop="date" label="发布日期" /> stripe
height="240px"
>
<el-table-column prop="itemCode" label="物料代码" width="180px" />
<el-table-column prop="batch" label="批次" width="180px" />
<el-table-column prop="packingNumber" label="包装号" width="180px" />
<el-table-column prop="containerNumber" label="器具代码" width="180px" />
<el-table-column prop="qty" label="数量" width="180px" />
<el-table-column prop="uom" label="计量单位" width="180px">
<template #default="scope">
{{ formatter(scope.row.uom, DICT_TYPE.UOM) }}
</template>
</el-table-column>
<el-table-column prop="locationCode" label="库位代码" width="180px" />
<el-table-column prop="warehouseCode" label="仓库代码" width="180px" />
<el-table-column prop="inventoryStatus" label="库存状态" width="180px">
<template #default="scope">
{{ formatter(scope.row.inventoryStatus, DICT_TYPE.INVENTORY_STATUS) }}
</template>
</el-table-column>
<el-table-column prop="locationGroupCode" label="库位组代码" width="180px" />
<el-table-column prop="areaCode" label="库区代码" width="180px" />
<el-table-column prop="erpLocationCode" label="ERP库位代码" width="180px" />
<el-table-column prop="altBatch" label="替代批次" width="180px" />
<el-table-column prop="arriveDate" label="到货日期" width="180px">
<template #default="scope">
<span>{{ formatDate(scope.row.planDate) }}</span>
</template>
</el-table-column>
<el-table-column prop="produceDate" label="生产日期" width="180px">
<template #default="scope">
<span>{{ formatDate(scope.row.planDate) }}</span>
</template>
</el-table-column>
<el-table-column prop="expireDate" label="失效日期" width="180px">
<template #default="scope">
<span>{{ formatDate(scope.row.planDate) }}</span>
</template>
</el-table-column>
<el-table-column prop="ownerCode" label="货主代码" width="180px" />
<el-table-column prop="lockedQty" label="锁定数量" width="180px" />
<el-table-column prop="usableQty" label="可用数量" width="180px" />
<el-table-column prop="singlePrice" label="单价" width="180px" />
<el-table-column prop="amount" label="金额" width="180px" />
<el-table-column prop="putInTime" label="入库时间" width="180px">
<template #default="scope">
<span>{{ formatDate(scope.row.planDate) }}</span>
</template>
</el-table-column>
</el-table> </el-table>
</div> </div>
<div class="data1 w-[47.3%]"> <div class="data1 w-[47.3%]">
<div class="title">待处理任务</div> <div class="title">待处理任务</div>
<el-table :data="tableData" style="width: 100%" stripe height="240px"> <Echart :options="barOptions" :height="280" :key="lineIndex" />
<el-table-column prop="title" label="标题" />
<el-table-column prop="name" label="发布人" />
<el-table-column prop="date" label="发布日期" />
</el-table>
</div> </div>
</div> </div>
</div> </div>
@ -148,55 +192,40 @@
import * as IndexApi from '@/api/home' import * as IndexApi from '@/api/home'
import { formatDate } from '@/utils/formatTime' import { formatDate } from '@/utils/formatTime'
import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
const tableData = [ import { set } from 'lodash-es'
{ import { EChartsOption } from 'echarts'
date: '2016-05-03', import { barOptions } from '../echarts-data'
name: 'Tom', const lineIndex = ref(0)
title: 'Tom',
text: 'No. 189, Grove St, Los Angeles'
},
{
date: '2016-05-02',
title: 'Tom',
name: 'Tom',
text: 'No. 189, Grove St, Los Angeles'
},
{
date: '2016-05-04',
title: 'Tom',
name: 'Tom',
text: 'No. 189, Grove St, Los Angeles'
},
{
date: '2016-05-01',
title: 'Tom',
name: 'Tom',
text: 'No. 189, Grove St, Los Angeles'
},
{
date: '2016-05-01',
title: 'Tom',
name: 'Tom',
text: 'No. 189, Grove St, Los Angeles'
},
{
date: '2016-05-01',
title: 'Tom',
name: 'Tom',
text: 'No. 189, Grove St, Los Angeles'
}
]
// //
const productData = ref() const productData = ref()
const getProductData = async () => { const getProductData = async () => {
IndexApi.getProductData().then((res) => { IndexApi.getProductData().then((res) => {
productData.value = res productData.value = res
getJobCharts()
}) })
} }
const formatter = (type, dict) => { const formatter = (type, dict) => {
let str = getStrDictOptions(dict).filter((item) => type == item.value)[0].label let str = getStrDictOptions(dict).filter((item) => type == item.value)[0].label
return str return str
} }
const barOptionsData = reactive<EChartsOption>(barOptions) as EChartsOption
const getJobCharts = async () => {
set(
barOptionsData,
'xAxis.data',
Object.keys( productData.value.jobCount)
)
set(barOptionsData, 'legend.data', ['待处理任务'])
set(barOptionsData, 'series', [
{
name:'待处理任务',
data: Object.values( productData.value.jobCount),
type: 'bar',
barMaxWidth:30
}
])
lineIndex.value++
}
onMounted(async () => { onMounted(async () => {
await getProductData() await getProductData()
}) })

14
src/views/Home/echarts-data.ts

@ -96,7 +96,7 @@ export const pieOptions: EChartsOption = {
export const barOptions: EChartsOption = { export const barOptions: EChartsOption = {
title: { title: {
text: t('analysis.weeklyUserActivity'), text: '',
left: 'center' left: 'center'
}, },
tooltip: { tooltip: {
@ -112,15 +112,7 @@ export const barOptions: EChartsOption = {
}, },
xAxis: { xAxis: {
type: 'category', type: 'category',
data: [ data: [],
t('analysis.monday'),
t('analysis.tuesday'),
t('analysis.wednesday'),
t('analysis.thursday'),
t('analysis.friday'),
t('analysis.saturday'),
t('analysis.sunday')
],
axisTick: { axisTick: {
alignWithLabel: true alignWithLabel: true
} }
@ -131,7 +123,7 @@ export const barOptions: EChartsOption = {
series: [ series: [
{ {
name: t('analysis.activeQuantity'), name: t('analysis.activeQuantity'),
data: [13253, 34235, 26321, 12340, 24643, 1322, 1324], data: [],
type: 'bar' type: 'bar'
} }
] ]

17
src/views/wms/countManage/count/countRequestMain/index.vue

@ -312,7 +312,11 @@ const butttondata = (row) => {
defaultButtons.mainCountAdjustRequesttBtn({ defaultButtons.mainCountAdjustRequesttBtn({
hide: isShowGenerateMainButton(row, ['2']), hide: isShowGenerateMainButton(row, ['2']),
hasPermi: 'wms:count-request-main:generate' hasPermi: 'wms:count-request-main:generate'
}) // }), //
defaultButtons.mainThawRequesttBtn({
hide: isShowGenerateMainButton(row, ['3']),
hasPermi: 'wms:count-request-main:thaw'
}) //
] ]
} }
@ -419,6 +423,17 @@ const buttonTableClick = async (val, row) => {
.catch((err) => { .catch((err) => {
console.log(err) console.log(err)
}) })
} else if (val == 'mainThaw') {
//
await message.confirm('确认要解冻吗?')
CountRequestMainApi.thaw(row.id)
.then(() => {
message.success(t('解冻成功'))
getList()
})
.catch((err) => {
console.log(err)
})
} else if (val == 'edit') { } else if (val == 'edit') {
// //
openForm('update', row) openForm('update', row)

1
src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts

@ -658,6 +658,7 @@ export const CountadjustRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
field: 'action', field: 'action',
isDetail: false, isDetail: false,
isForm: false , isForm: false ,
isTable:false,
table: { table: {
width: 150, width: 150,
fixed: 'right' fixed: 'right'

1
src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue

@ -67,6 +67,7 @@
:apiUpdate="CountadjustRequestDetailApi.updateCountadjustRequestDetail" :apiUpdate="CountadjustRequestDetailApi.updateCountadjustRequestDetail"
:apiPage="CountadjustRequestDetailApi.getCountadjustRequestDetailPage" :apiPage="CountadjustRequestDetailApi.getCountadjustRequestDetailPage"
:apiDelete="CountadjustRequestDetailApi.deleteCountadjustRequestDetail" :apiDelete="CountadjustRequestDetailApi.deleteCountadjustRequestDetail"
fromeWhere="countadjustRequest"
:Echo="Echo" :Echo="Echo"
@searchTableSuccessDetail="searchTableSuccessDetail" @searchTableSuccessDetail="searchTableSuccessDetail"
/> />

219
src/views/wms/inventoryManage/containerinit/containerinitadd/containerMain.data.ts

@ -0,0 +1,219 @@
import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import {Owner} from "@/views/wms/basicDataManage/orderManage/owner/owner.data";
import * as OwnerApi from "@/api/wms/owner";
import {Warehouse} from "@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data";
import * as WarehouseApi from "@/api/wms/warehouse";
// 表单校验
export const ContainerMainRules = reactive({
number: [
{ required: true, message: '请输入号码', trigger: 'blur' }
],
type: [
{ required: true, message: '请选择类型', trigger: 'change' }
],
status: [
{ required: true, message: '请选择状态', trigger: 'change' }
],
ownerCode: [
{ required: true, message: '请选择货主代码', trigger: 'change' }
],
})
export const ContainerMain = useCrudSchemas(reactive<CrudSchema[]>([
{
label: '号码',
field: 'number',
sort: 'custom',
isSearch: true,
},
{
label: '类型',
field: 'type',
dictType: DICT_TYPE.CONTAINER_TYPE,
dictClass: 'string',
isTable: true,
isForm: true,
sort: 'custom',
isSearch: true,
},
{
label: '总容量',
field: 'capacity',
sort: 'custom',
form: {
component: 'InputNumber',
},
isSearch: true,
},
{
label: '状态',
field: 'status',
dictType: DICT_TYPE.CONTAINER_STATUS,
dictClass: 'string',
isTable: true,
isForm: true,
sort: 'custom',
isSearch: true,
},
{
label: '货主代码',
field: 'ownerCode',
sort: 'custom',
table: {
width: 150
},
tableForm:{
isInpuFocusShow: true, // 开启查询弹窗
searchListPlaceholder: '请选择货主代码',
searchField: 'code',
searchTitle: '货主信息',
searchAllSchemas: Owner.allSchemas,
searchPage: OwnerApi.getOwnerPage,
searchCondition: [{
key: 'available',
value: 'TRUE',
isMainValue: false
}]
},
form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择货主代码',
searchField: 'code',
searchTitle: '货主信息',
searchAllSchemas: Owner.allSchemas,
searchPage: OwnerApi.getOwnerPage,
searchCondition: [{
key: 'available',
value: 'TRUE',
isMainValue: false
}]
}
}
},
{
label: '仓库代码',
field: 'warehouseCode',
sort: 'custom',
table: {
width: 150
},
isSearch: true,
tableForm:{
isInpuFocusShow: true, // 开启查询弹窗
searchListPlaceholder: '请选择仓库代码',
searchField: 'code',
searchTitle: '仓库信息',
searchAllSchemas: Warehouse.allSchemas,
searchPage: WarehouseApi.getWarehousePage,
searchCondition: [{
key: 'available',
value: 'TRUE',
isMainValue: false
}]
},
form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '仓库信息', // 查询弹窗标题
searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
searchCondition: [{
key: 'available',
value: 'TRUE',
isMainValue: false
}]
}
}
},
]))
/**
* @returns {Array}
*/
export const ContainerDetail = useCrudSchemas(reactive<CrudSchema[]>([
{
label: '内容物类型',
field: 'containerContentType',
dictType: DICT_TYPE.CONTAINER_CONTENT_TYPE,
dictClass: 'string',
isTable: true,
isForm: true,
sort: 'custom',
table: {
width: 150
},
},
{
label: '内容物号',
field: 'contentNumber',
sort: 'custom',
table: {
width: 150
},
},
{
label: '物料代码',
field: 'itemCode',
sort: 'custom',
table: {
width: 150
},
},
{
label: '批次',
field: 'batch',
sort: 'custom',
table: {
width: 150
},
},
{
label: '库存状态',
field: 'inventoryStatus',
dictType: DICT_TYPE.INVENTORY_STATUS,
dictClass: 'string',
isTable: true,
isForm: true,
sort: 'custom',
table: {
width: 150
},
},
{
label: '数量',
field: 'qty',
sort: 'custom',
table: {
width: 150
},
form: {
component: 'InputNumber',
}
},
{
label: '计量单位',
field: 'uom',
dictType: DICT_TYPE.UOM,
dictClass: 'string',
isTable: true,
isForm: true,
sort: 'custom',
table: {
width: 150
},
},
]))
// 表单校验
export const ContainerDetailRules = reactive({
containerContentType: [
{ required: true, message: '请选择内容物类型', trigger: 'change' }
],
})

247
src/views/wms/inventoryManage/containerinit/containerinitadd/index.vue

@ -0,0 +1,247 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="ContainerMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap>
<!-- 列表头部 -->
<TableHead
:HeadButttondata="HeadButttondata"
@button-base-click="buttonBaseClick"
:routeName="routeName"
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="ContainerMain.allSchemas"
/>
<!-- 列表 -->
<ContentWrap>
<Table
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"
:pagination="{
total: tableObject.total
}"
v-model:pageSize="tableObject.pageSize"
v-model:currentPage="tableObject.currentPage"
v-model:sort="tableObject.sort"
>
<template #number="{row}">
<el-button type="primary" link @click="openDetail(row, '号码', row.number)">
<span>{{ row.number }}</span>
</el-button>
</template>
<template #action="{ row }">
<ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
</template>
</Table>
</ContentWrap>
<!-- 表单弹窗添加/修改 -->
<BasicForm
ref="basicFormRef"
@success="formsSuccess"
:rules="ContainerMainRules"
:formAllSchemas="ContainerMain.allSchemas"
:apiUpdate="ContainerMainApi.updateContainerMain"
:apiCreate="ContainerMainApi.createContainerMain"
@searchTableSuccess="searchTableSuccess"
:isBusiness="false"
/>
<!-- 详情 -->
<Detail
ref="detailRef"
:isBasic="false"
:allSchemas="ContainerMain.allSchemas"
:detailAllSchemas="ContainerDetail.allSchemas"
:detailAllSchemasRules="ContainerDetailRules"
:apiPage="ContainerDetailApi.getContainerDetailPage"
/>
</template>
<script setup lang="ts">
import download from '@/utils/download'
import { ContainerMain,ContainerMainRules,ContainerDetail,ContainerDetailRules } from './containerMain.data'
import * as ContainerMainApi from '@/api/wms/containerMain'
import * as ContainerDetailApi from '@/api/wms/containerDetail'
import * as defaultButtons from '@/utils/disposition/defaultButtons'
import TableHead from '@/components/TableHead/src/TableHead.vue'
import Detail from '@/components/Detail/src/Detail.vue'
defineOptions({ name: 'ContainerMain' })
const message = useMessage() //
const { t } = useI18n() //
const route = useRoute() //
const routeName = ref()
routeName.value = route.name
const tableColumns = ref(ContainerMain.allSchemas.tableColumns)
//
const updataTableColumns = (val) => {
tableColumns.value = val
}
//
const searchTableParams = ref([
//{
// formField: 'productItemCode',
// searchTableTitle: '',
// searchTableAllSchemas: Itembasic.allSchemas,
// searchTablePage: ItembasicApi.getItembasicPage
//}
])
const { tableObject, tableMethods } = useTable({
getListApi: ContainerMainApi.getContainerMainPage //
})
//
const { getList, setSearchParams } = tableMethods
//
const HeadButttondata = [
defaultButtons.defaultAddBtn({hasPermi:'wms:container-main:create'}), //
defaultButtons.defaultImportBtn({hasPermi:'wms:container-main:import'}), //
defaultButtons.defaultExportBtn({hasPermi:'wms:container-main:export'}), //
defaultButtons.defaultFreshBtn(null), //
defaultButtons.defaultFilterBtn(null), //
defaultButtons.defaultSetBtn(null), //
// {
// label: '',
// name: 'zdy',
// hide: false,
// type: 'primary',
// icon: 'Select',
// color: ''
// },
]
//
const buttonBaseClick = (val, item) => {
if (val == 'add') { //
openForm('create')
} else if (val == 'import') { //
handleImport()
} else if (val == 'export') { //
handleExport()
} else if (val == 'refresh') { //
getList()
} else if (val == 'filtrate') { //
} else { //
console.log('其他按钮', item)
}
}
// -
const butttondata = [
defaultButtons.mainListEditBtn({hasPermi:'wms:containerMain:update'}), //
defaultButtons.mainListDeleteBtn({hasPermi:'wms:containerMain:delete'}), //
]
// -
const buttonTableClick = async (val, row) => {
if (val == 'edit') { //
openForm('update', row)
} else if (val == 'delete') { //
handleDelete(row.id)
}
}
/** 添加/修改操作 */
const basicFormRef = ref()
const openForm = (type: string, row?: any) => {
basicFormRef.value.open(type, row)
}
//
const searchTableSuccess = (formField, searchField, val, formRef) => {
nextTick(() => {
const setV = {}
setV[formField] = val[0][searchField]
formRef.setValues(setV)
})
}
/** 详情操作 */
const detailRef = ref()
const openDetail = (row: any, titleName: any, titleValue: any) => {
detailRef.value.openDetail(row, titleName, titleValue)
}
/** 删除按钮操作 */
const handleDelete = async (id: number) => {
try {
//
await message.delConfirm()
//
await ContainerMainApi.deleteContainerMain(id)
message.success(t('common.delSuccess'))
//
await getList()
} catch {}
}
/** 导出按钮操作 */
const exportLoading = ref(false) //
const handleExport = async () => {
try {
//
await message.exportConfirm()
//
exportLoading.value = true
const data = await ContainerMainApi.exportContainerMain(setSearchParams)
download.excel(data, '器具主.xls')
} catch {
} finally {
exportLoading.value = false
}
}
/** 导入 */
const importFormRef = ref()
const handleImport = () => {
importFormRef.value.open()
}
//
const importTemplateData = reactive({
templateUrl: '',
templateTitle: '器具主导入模版.xls'
})
//
const importSuccess = () => {
getList()
}
//
const searchFormClick = (searchData) => {
tableObject.params = {
isSearch: true,
filters: searchData.filters
}
getList() //
}
// form
const formsSuccess = async (formType,data) => {
if (formType === 'create') {
await ContainerMainApi.createContainerMain(data)
message.success(t('common.createSuccess'))
} else {
await ContainerMainApi.updateContainerMain(data)
message.success(t('common.updateSuccess'))
}
basicFormRef.value.dialogVisible = false
getList()
}
/** 初始化 **/
onMounted(async () => {
getList()
})
</script>

149
src/views/wms/inventoryManage/containerinit/containerinitrecord/containerInitRecordMain.data.ts

@ -0,0 +1,149 @@
import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter } from '@/utils/formatTime'
// 表单校验
export const ContainerInitRecordMainRules = reactive({
})
export const ContainerInitRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
{
label: '单据号',
field: 'number',
sort: 'custom',
isSearch: true,
},
{
label: '仓库代码',
field: 'fromWarehouseCode',
sort: 'custom',
isSearch: true,
},
{
label: '部门',
field: 'departmentCode',
sort: 'custom',
},
{
label: '创建时间',
field: 'createTime',
sort: 'custom',
formatter: dateFormatter,
isSearch: false,
search: {
component: 'DatePicker',
componentProps: {
valueFormat: 'YYYY-MM-DD HH:mm:ss',
type: 'daterange',
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
}
},
isForm: false,
},
{
label: '备注',
field: 'remark',
sort: 'custom',
table:{
show:false
}
},
]))
export const ContainerInitRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
{
label: '器具号',
field: 'containerNumber',
sort: 'custom',
table: {
width: 150
},
},
{
label: '类型',
field: 'type',
dictType: DICT_TYPE.CONTAINER_TYPE,
dictClass: 'string',
sort: 'custom',
form: {
component: 'SelectV2'
},
table: {
width: 150
},
},
{
label: '总容量',
field: 'capacity',
sort: 'custom',
table: {
width: 150
},
},
{
label: '状态',
field: 'status',
dictType: DICT_TYPE.CONTAINER_STATUS,
dictClass: 'string',
sort: 'custom',
form: {
component: 'Radio'
},
table: {
width: 150
},
},
{
label: '货主代码',
field: 'ownerCode',
sort: 'custom',
table: {
width: 150
},
},
{
label: '单据号',
field: 'number',
sort: 'custom',
table: {
width: 150
},
},
{
label: '创建时间',
field: 'createTime',
sort: 'custom',
formatter: dateFormatter,
table: {
width: 150
},
search: {
component: 'DatePicker',
componentProps: {
valueFormat: 'YYYY-MM-DD HH:mm:ss',
type: 'daterange',
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
}
},
isForm: false,
},
{
label: '备注',
field: 'remark',
sort: 'custom',
},
{
label: '操作',
field: 'action',
isForm: false,
table: {
width: 150,
fixed: 'right'
}
}
]))
// 表单校验
export const ContainerInitRecordDetailRules = reactive({
})

286
src/views/wms/inventoryManage/containerinit/containerinitrecord/index.vue

@ -0,0 +1,286 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="ContainerInitRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap>
<!-- 列表头部 -->
<TableHead
:HeadButttondata="HeadButttondata"
@button-base-click="buttonBaseClick"
:routeName="routeName"
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="ContainerInitRecordMain.allSchemas"
/>
<!-- 列表 -->
<ContentWrap>
<Table
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"
:pagination="{
total: tableObject.total
}"
v-model:pageSize="tableObject.pageSize"
v-model:currentPage="tableObject.currentPage"
v-model:sort="tableObject.sort"
>
<template #number="{row}">
<el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
<span>{{ row.number }}</span>
</el-button>
</template>
<template #action="{ row }">
<ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
</template>
</Table>
</ContentWrap>
<!-- 表单弹窗添加/修改 -->
<BasicForm
ref="basicFormRef"
@success="getList"
:rules="ContainerInitRecordMainRules"
:formAllSchemas="ContainerInitRecordMain.allSchemas"
:searchTableParams="searchTableParams"
:tableAllSchemas="ContainerInitRecordDetail.allSchemas"
:tableFormRules="ContainerInitRecordDetailRules"
:tableData="tableData"
:apiUpdate="ContainerInitRecordMainApi.updateContainerInitRecordMain"
:apiCreate="ContainerInitRecordMainApi.createContainerInitRecordMain"
@searchTableSuccess="searchTableSuccess"
:isBusiness="true"
@handleAddTable="handleAddTable"
@handleDeleteTable="handleDeleteTable"
@submitForm="submitForm"
/>
<!-- 详情 -->
<Detail
ref="detailRef"
:isBasic="false"
:allSchemas="ContainerInitRecordMain.allSchemas"
:detailAllSchemas="ContainerInitRecordDetail.allSchemas"
:detail-all-schemas-rules="ContainerInitRecordDetailRules"
:searchTableParams="searchTableParams"
:apiCreate="ContainerInitRecordDetailApi.createContainerInitRecordDetail"
:apiUpdate="ContainerInitRecordDetailApi.updateContainerInitRecordDetail"
:apiPage="ContainerInitRecordDetailApi.getContainerInitRecordDetailPage"
:apiDelete="ContainerInitRecordDetailApi.deleteContainerInitRecordDetail"
:Echo="Echo"
/>
<!-- 导入 -->
<ImportForm ref="importFormRef" url="/wms/container-init-record-main/import" :importTemplateData="importTemplateData" @success="importSuccess" />
</template>
<script setup lang="ts">
import download from '@/utils/download'
import { ContainerInitRecordMain,ContainerInitRecordMainRules,ContainerInitRecordDetail,ContainerInitRecordDetailRules } from './containerInitRecordMain.data'
import * as ContainerInitRecordMainApi from '@/api/wms/containerInitRecordMain'
import * as ContainerInitRecordDetailApi from '@/api/wms/containerInitRecordDetail'
import * as defaultButtons from '@/utils/disposition/defaultButtons'
import TableHead from '@/components/TableHead/src/TableHead.vue'
import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
import Detail from '@/components/Detail/src/Detail.vue'
defineOptions({ name: 'ContainerInitRecordMain' })
const message = useMessage() //
const { t } = useI18n() //
const route = useRoute() //
const routeName = ref()
routeName.value = route.name
const tableColumns = ref(ContainerInitRecordMain.allSchemas.tableColumns)
//
const updataTableColumns = (val) => {
tableColumns.value = val
}
//
const searchTableParams = ref([
//{
// formField: 'productItemCode',
// searchTableTitle: '',
// searchTableAllSchemas: Itembasic.allSchemas,
// searchTablePage: ItembasicApi.getItembasicPage
//}
])
const { tableObject, tableMethods } = useTable({
getListApi: ContainerInitRecordMainApi.getContainerInitRecordMainPage //
})
//
const { getList, setSearchParams } = tableMethods
//
const HeadButttondata = [
// defaultButtons.defaultAddBtn({hasPermi:'wms:container-init-record-main:create'}), //
defaultButtons.defaultImportBtn({hasPermi:'wms:container-init-record-main:import'}), //
defaultButtons.defaultExportBtn({hasPermi:'wms:container-init-record-main:export'}), //
defaultButtons.defaultFreshBtn(null), //
defaultButtons.defaultFilterBtn(null), //
defaultButtons.defaultSetBtn(null), //
// {
// label: '',
// name: 'zdy',
// hide: false,
// type: 'primary',
// icon: 'Select',
// color: ''
// },
]
//
const buttonBaseClick = (val, item) => {
if (val == 'add') { //
openForm('create')
} else if (val == 'import') { //
handleImport()
} else if (val == 'export') { //
handleExport()
} else if (val == 'refresh') { //
getList()
} else if (val == 'filtrate') { //
} else { //
console.log('其他按钮', item)
}
}
// -
const butttondata = [
defaultButtons.mainListEditBtn({hasPermi:'wms:container-init-record-main:update'}), //
defaultButtons.mainListDeleteBtn({hasPermi:'wms:container-init-record-main:delete'}), //
]
// -
const buttonTableClick = async (val, row) => {
if (val == 'edit') { //
openForm('update', row)
} else if (val == 'delete') { //
handleDelete(row.id)
}
}
/** 添加/修改操作 */
const basicFormRef = ref()
const openForm = (type: string, row?: any) => {
basicFormRef.value.open(type, row)
}
//
const searchTableSuccess = (formField, searchField, val, formRef) => {
nextTick(() => {
const setV = {}
setV[formField] = val[0][searchField]
formRef.setValues(setV)
})
}
/** 详情操作 */
const detailRef = ref()
const openDetail = (row: any, titleName: any, titleValue: any) => {
detailRef.value.openDetail(row, titleName, titleValue, 'basicContainerInitRecordMain')
}
/** 删除按钮操作 */
const handleDelete = async (id: number) => {
try {
//
await message.delConfirm()
//
await ContainerInitRecordMainApi.deleteContainerInitRecordMain(id)
message.success(t('common.delSuccess'))
//
await getList()
} catch {}
}
/** 导出按钮操作 */
const exportLoading = ref(false) //
const handleExport = async () => {
try {
//
await message.exportConfirm()
//
exportLoading.value = true
const data = await ContainerInitRecordMainApi.exportContainerInitRecordMain(setSearchParams)
download.excel(data, '器具初始化记录主.xls')
} catch {
} finally {
exportLoading.value = false
}
}
//
const submitForm = async (formType, data) => {
data.subList = tableData.value //
try {
if (formType === 'create') {
await ContainerInitRecordMainApi.createContainerInitRecordMain(data)
message.success(t('common.createSuccess'))
} else {
await ContainerInitRecordMainApi.updateContainerInitRecordMain(data)
message.success(t('common.updateSuccess'))
}
basicFormRef.value.dialogVisible = false
//
getList()
} finally {
basicFormRef.value.formLoading = false
}
}
const tableData = ref([])
const tableFormKeys = {}
ContainerInitRecordDetail.allSchemas.tableFormColumns.forEach(item => {
tableFormKeys[item.field] = item.default ? item.default : ''
})
//
const handleAddTable = () => {
tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
}
//
const handleDeleteTable = (item, index) => {
tableData.value.splice(index, 1)
}
/** 导入 */
const importFormRef = ref()
const handleImport = () => {
importFormRef.value.open()
}
//
const importTemplateData = reactive({
templateUrl: '',
templateTitle: '器具初始化记录主导入模版.xls'
})
//
const importSuccess = () => {
getList()
}
//
const searchFormClick = (searchData) => {
tableObject.params = {
isSearch: true,
filters: searchData.filters
}
getList() //
}
/** 初始化 **/
onMounted(async () => {
getList()
importTemplateData.templateUrl = await ContainerInitRecordMainApi.importTemplate()
})
</script>

8
src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue

@ -324,12 +324,12 @@ const buttonTableClick = async (val, row) => {
if(itemColumns.field == 'productionLineCodePackage') { if(itemColumns.field == 'productionLineCodePackage') {
// itemColumns.tableForm.isInpuFocusShow = false // itemColumns.tableForm.isInpuFocusShow = false
// itemColumns.tableForm.disabled = true // itemColumns.tableForm.disabled = true
ProductionreturnRequestDetailLabelRules.productionLineCodePackage[0].required = false ProductionreturnRequestDetailNoLabelRules.productionLineCodePackage[0].required = false
} }
if(itemColumns.field == 'supplierItemCode') { if(itemColumns.field == 'supplierItemCode') {
itemColumns.tableForm.isInpuFocusShow = true itemColumns.tableForm.isInpuFocusShow = true
itemColumns.tableForm.disabled = false itemColumns.tableForm.disabled = false
ProductionreturnRequestDetailLabelRules.supplierItemCode[0].required = true ProductionreturnRequestDetailNoLabelRules.supplierItemCode[0].required = true
} }
}) })
} else { } else {
@ -338,13 +338,13 @@ const buttonTableClick = async (val, row) => {
if(itemColumns.field == 'supplierItemCode') { if(itemColumns.field == 'supplierItemCode') {
itemColumns.tableForm.isInpuFocusShow = false itemColumns.tableForm.isInpuFocusShow = false
itemColumns.tableForm.disabled = true itemColumns.tableForm.disabled = true
ProductionreturnRequestDetailLabelRules.supplierItemCode[0].required = false ProductionreturnRequestDetailNoLabelRules.supplierItemCode[0].required = false
} }
if(itemColumns.field == 'productionLineCodePackage') { if(itemColumns.field == 'productionLineCodePackage') {
item.productionLineCodePackage = item.productionLineCode item.productionLineCodePackage = item.productionLineCode
// itemColumns.tableForm.isInpuFocusShow = true // itemColumns.tableForm.isInpuFocusShow = true
// itemColumns.tableForm.disabled = false // itemColumns.tableForm.disabled = false
ProductionreturnRequestDetailLabelRules.productionLineCodePackage[0].required = true ProductionreturnRequestDetailNoLabelRules.productionLineCodePackage[0].required = true
} }
}) })
} }

2
src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/index.vue

@ -139,7 +139,7 @@ const { getList, setSearchParams } = tableMethods
// //
const HeadButttondata = [ const HeadButttondata = [
defaultButtons.defaultExportBtn({hasPermi:'wms:inventorychange-record-main:export'}), // defaultButtons.defaultExportBtn({hasPermi:'wms:inventorychange-record-main:export'}), //
defaultButtons.defaultFreshBtn({hasPermi:'wms:inventorychange-record-main:page'}), // defaultButtons.defaultFreshBtn(null), //
defaultButtons.defaultFilterBtn(null), // defaultButtons.defaultFilterBtn(null), //
defaultButtons.defaultSetBtn(null), // defaultButtons.defaultSetBtn(null), //
// { // {

55
src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue

@ -108,15 +108,56 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
// //
row[formField] = val[0][searchField] row[formField] = val[0][searchField]
row['fromPackingNumber'] = val[0]['packingNumber'] row['fromPackingNumber'] = val[0]['packingNumber']
row['itemCode'] = val[0]['itemCode'] row['toPackingNumber'] = val[0]['packingNumber']
row['fromBatch'] = val[0]['batch'] row['fromBatch'] = val[0]['batch']
row['locationCode'] = val[0]['locationCode'] row['toBatch'] = val[0]['batch']
row['fromInventoryStatus'] = val[0]['inventoryStatus'] row['fromInventoryStatus'] = val[0]['inventoryStatus']
row['toInventoryStatus'] = val[0]['inventoryStatus']
row['fromContainerNumber'] = val[0]['containerNumber']
row['toContainerNumber'] = val[0]['containerNumber']
row['fromQty'] = val[0]['qty']
row['toQty'] = val[0]['qty']
row['fromOwnerCode'] = val[0]['ownerCode']
row['toOwnerCode'] = val[0]['ownerCode']
row['fromAltBatch'] = val[0]['altBatch']
row['toAltBatch'] = val[0]['altBatch']
row['fromArriveDate'] = val[0]['arriveDate']
row['toArriveDate'] = val[0]['arriveDate']
row['fromProduceDate'] = val[0]['produceDate']
row['toProduceDate'] = val[0]['produceDate']
row['fromExpireDate'] = val[0]['expireDate']
row['toExpireDate'] = val[0]['expireDate']
row['itemCode'] = val[0]['itemCode']
row['locationCode'] = val[0]['locationCode']
row['uom'] = val[0]['uom']
} else {
const setV = {}
setV[formField] = val[0][searchField]
setV['fromPackingNumber'] = val[0]['packingNumber']
setV['toPackingNumber'] = val[0]['packingNumber']
setV['fromBatch'] = val[0]['batch']
setV['toBatch'] = val[0]['batch']
setV['fromInventoryStatus'] = val[0]['inventoryStatus']
setV['toInventoryStatus'] = val[0]['inventoryStatus']
setV['fromContainerNumber'] = val[0]['containerNumber']
setV['toContainerNumber'] = val[0]['containerNumber']
setV['fromQty'] = val[0]['qty']
setV['toQty'] = val[0]['qty']
setV['fromOwnerCode'] = val[0]['ownerCode']
setV['toOwnerCode'] = val[0]['ownerCode']
setV['fromAltBatch'] = val[0]['altBatch']
setV['toAltBatch'] = val[0]['altBatch']
setV['fromArriveDate'] = val[0]['arriveDate']
setV['toArriveDate'] = val[0]['arriveDate']
setV['fromProduceDate'] = val[0]['produceDate']
setV['toProduceDate'] = val[0]['produceDate']
setV['fromExpireDate'] = val[0]['expireDate']
setV['toExpireDate'] = val[0]['expireDate']
setV['itemCode'] = val[0]['itemCode']
setV['locationCode'] = val[0]['locationCode']
setV['uom'] = val[0]['uom']
formRef.setValues(setV)
} }
console.log(116, row)
const setV = {}
setV[formField] = val[0][searchField]
formRef.setValues(setV)
}) })
} }
// //
@ -182,7 +223,7 @@ const isShowMainButton = (row,val) => {
// - // -
const butttondata = (row) => { const butttondata = (row) => {
return [ return [
defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:inventorychange-request-main:close'}), // defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:inventorychange-request-main:close'}), //
defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:inventorychange-request-main:reAdd'}), // defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:inventorychange-request-main:reAdd'}), //
defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:inventorychange-request-main:submit'}), // defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:inventorychange-request-main:submit'}), //
defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:inventorychange-request-main:refused'}), // defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:inventorychange-request-main:refused'}), //

235
src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts

@ -8,6 +8,9 @@ import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
import * as ItembasicApi from '@/api/wms/itembasic' import * as ItembasicApi from '@/api/wms/itembasic'
import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data' import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
import * as OwnerApi from '@/api/wms/owner'
import { Owner } from '@/views/wms/basicDataManage/orderManage/owner/owner.data'
const { t } = useI18n() // 国际化 const { t } = useI18n() // 国际化
// 获取自动提交自动通过自动执行,跳过任务直接删生成记录的默认值 // 获取自动提交自动通过自动执行,跳过任务直接删生成记录的默认值
@ -341,6 +344,43 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
} }
} }
}, },
{
label: '从包装号',
field: 'fromPackingNumber',
sort: 'custom',
table: {
width: 150
},
tableForm:{
isInpuFocusShow: true, // 开启查询弹窗
searchListPlaceholder: '请选择从包装号',
searchField: 'packingNumber',
searchTitle: '库存余额信息',
searchAllSchemas: Balance.allSchemas,
searchPage: BalanceApi.getBalancePage
},
form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择从包装号',
searchField: 'packingNumber',
searchTitle: '库存余额信息',
searchAllSchemas: Balance.allSchemas,
searchPage: BalanceApi.getBalancePage
}
}
},
{
label: '到包装号',
field: 'toPackingNumber',
sort: 'custom',
table: {
width: 150
},
isTableForm: false,
isForm: false,
},
{ {
label: '物品代码', label: '物品代码',
field: 'itemCode', field: 'itemCode',
@ -350,6 +390,11 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
}, },
tableForm: { tableForm: {
disabled: true disabled: true
},
form: {
componentProps: {
disabled: true
}
} }
}, },
{ {
@ -391,54 +436,20 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
}, },
tableForm: { tableForm: {
disabled: true disabled: true
}
},
{
label: '到批次',
field: 'toBatch',
sort: 'custom',
table: {
width: 150
},
isTableForm: false,
isForm: false,
},
{
label: '从包装号',
field: 'fromPackingNumber',
sort: 'custom',
table: {
width: 150
},
tableForm:{
isInpuFocusShow: true, // 开启查询弹窗
searchListPlaceholder: '请选择从包装号',
searchField: 'packingNumber',
searchTitle: '库存余额信息',
searchAllSchemas: Balance.allSchemas,
searchPage: BalanceApi.getBalancePage
}, },
form: { form: {
// labelMessage: '信息提示说明!!!',
componentProps: { componentProps: {
isSearchList: true, // 开启查询弹窗 disabled: true
searchListPlaceholder: '请选择从包装号',
searchField: 'packingNumber',
searchTitle: '库存余额信息',
searchAllSchemas: Balance.allSchemas,
searchPage: BalanceApi.getBalancePage
} }
} }
}, },
{ {
label: '到包装号', label: '到批次',
field: 'toPackingNumber', field: 'toBatch',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
isTableForm: false,
isForm: false,
}, },
{ {
label: '从器具号', label: '从器具号',
@ -460,28 +471,6 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
isTableForm: false, isTableForm: false,
isForm: false, isForm: false,
}, },
{
label: '数量',
field: 'qty',
sort: 'custom',
table: {
width: 150
},
form: {
component: 'InputNumber',
componentProps: {
min: 1,
precision: 6
}
},
tableForm: {
type: 'InputNumber',
min: 1,
precision: 6
},
isTableForm: false,
isForm: false,
},
{ {
label: '从数量', label: '从数量',
field: 'fromQty', field: 'fromQty',
@ -492,17 +481,15 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
form: { form: {
component: 'InputNumber', component: 'InputNumber',
componentProps: { componentProps: {
min: 1, precision: 6,
precision: 6 disabled: true
} }
}, },
tableForm: { tableForm: {
type: 'InputNumber', type: 'InputNumber',
min: 1, precision: 6,
precision: 6 disabled: true
}, },
isTableForm: false,
isForm: false,
}, },
{ {
label: '到数量', label: '到数量',
@ -514,17 +501,13 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
form: { form: {
component: 'InputNumber', component: 'InputNumber',
componentProps: { componentProps: {
min: 1,
precision: 6 precision: 6
} }
}, },
tableForm: { tableForm: {
type: 'InputNumber', type: 'InputNumber',
min: 1,
precision: 6 precision: 6
}, },
isTableForm: false,
isForm: false,
}, },
{ {
label: '计量单位', label: '计量单位',
@ -537,9 +520,14 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
width: 150 width: 150
}, },
tableForm: { tableForm: {
type: 'Select' type: 'Select',
disabled: true
},
form: {
componentProps: {
disabled: true
}
}, },
isForm: false,
}, },
{ {
label: '库位代码', label: '库位代码',
@ -550,6 +538,11 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
}, },
tableForm: { tableForm: {
disabled: true disabled: true
},
form: {
componentProps: {
disabled: true
}
} }
}, },
{ {
@ -566,8 +559,11 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
type: 'Select', type: 'Select',
disabled: true disabled: true
}, },
isTableForm: false, form: {
isForm: false, componentProps: {
disabled: true
}
},
}, },
{ {
label: '到库存状态', label: '到库存状态',
@ -582,6 +578,10 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
tableForm: { tableForm: {
type: 'Select' type: 'Select'
}, },
form: {
componentProps: {
}
},
}, },
{ {
label: '库位组代码', label: '库位组代码',
@ -610,8 +610,41 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
table: { table: {
width: 150 width: 150
}, },
isTableForm: false, form: {
isForm: false, componentProps: {
disabled: true
}
},
tableForm: {
disabled: true
},
},
{
label: '到货主代码',
field: 'toOwnerCode',
sort: 'custom',
table: {
width: 150
},
tableForm:{
isInpuFocusShow: true, // 开启查询弹窗
searchListPlaceholder: '请选择货主代码',
searchField: 'code',
searchTitle: '货主信息',
searchAllSchemas: Owner.allSchemas,
searchPage: OwnerApi.getOwnerPage
},
form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择货主代码',
searchField: 'code',
searchTitle: '货主信息',
searchAllSchemas: Owner.allSchemas,
searchPage: OwnerApi.getOwnerPage
}
}
}, },
{ {
label: '从替代批次', label: '从替代批次',
@ -687,34 +720,19 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
type: 'datetime', type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss', dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x', valueFormat: 'x',
disabled: true
} }
}, },
isTableForm: false, tableForm: {
isForm: false, type: 'FormDateTime',
}, format: 'YYYY-MM-DD HH:mm:ss',
{ valueFormat: 'x',
label: '到货主代码', disabled: true
field: 'toOwnerCode',
sort: 'custom',
table: {
width: 150
},
isTableForm: false,
isForm: false,
},
{
label: '到替代批次',
field: 'toAltBatch',
sort: 'custom',
table: {
width: 150
}, },
isTableForm: false,
isForm: false,
}, },
{ {
label: '到到货日期', label: '到过期日期',
field: 'toArrivdAte', field: 'toExpireDate',
formatter: dateFormatter, formatter: dateFormatter,
detail: { detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss' dateFormat: 'YYYY-MM-DD HH:mm:ss'
@ -732,12 +750,25 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
valueFormat: 'x', valueFormat: 'x',
} }
}, },
tableForm: {
type: 'FormDateTime',
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
},
},
{
label: '到替代批次',
field: 'toAltBatch',
sort: 'custom',
table: {
width: 150
},
isTableForm: false, isTableForm: false,
isForm: false, isForm: false,
}, },
{ {
label: '到生产日期', label: '到到货日期',
field: 'toProduceDate', field: 'toArrivdAte',
formatter: dateFormatter, formatter: dateFormatter,
detail: { detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss' dateFormat: 'YYYY-MM-DD HH:mm:ss'
@ -759,8 +790,8 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
isForm: false, isForm: false,
}, },
{ {
label: '到过期日期', label: '到生产日期',
field: 'toExpireDate', field: 'toProduceDate',
formatter: dateFormatter, formatter: dateFormatter,
detail: { detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss' dateFormat: 'YYYY-MM-DD HH:mm:ss'

1
src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue

@ -104,6 +104,7 @@
// //
row[formField] = val[0][searchField] row[formField] = val[0][searchField]
if (formField == 'poNumber') { if (formField == 'poNumber') {
row['poNumber'] = val[0]['poNumber']
row['itemCode'] = val[0]['itemCode'] row['itemCode'] = val[0]['itemCode']
row['poLine'] = val[0]['poLine'] row['poLine'] = val[0]['poLine']
row['uom'] = val[0]['uom'] row['uom'] = val[0]['uom']

9
src/views/wms/reportList/index.vue

@ -1,9 +1,8 @@
<template> <template>
<ContentWrap>
<ContentWrap> <IFrame :src="url" style="width: 100%; height: calc(100vh - 180px)" />
<IFrame :src="url" style="width: 100%;height:calc(100vh - 180px);"/> <!-- <iframe :src="url" frameborder="0" style="width: 100%;height: 75vh;"></iframe> -->
<!-- <iframe :src="url" frameborder="0" style="width: 100%;height: 75vh;"></iframe> --> </ContentWrap>
</ContentWrap>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">

100
src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts

@ -1,5 +1,7 @@
import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter } from '@/utils/formatTime' import { dateFormatter } from '@/utils/formatTime'
import * as SupplierApi from '@/api/wms/supplier'
import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
const { t } = useI18n() // 国际化 const { t } = useI18n() // 国际化
const recordTypeList = [{ label:'收货单号', value:'1' },{ label:'退货单号', value:'2' },{ label:'索赔单号', value:'3' }] const recordTypeList = [{ label:'收货单号', value:'1' },{ label:'退货单号', value:'2' },{ label:'索赔单号', value:'3' }]
import * as getRequestsettingApi from '@/api/wms/requestsetting/index' import * as getRequestsettingApi from '@/api/wms/requestsetting/index'
@ -23,15 +25,26 @@ const userDept = userStore.userSelfInfo.dept
* @returns {Array} * @returns {Array}
*/ */
export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>([ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
{ {
label: '供应商代码', label: '供应商代码',
field: 'supplierCode', field: 'supplierCode',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
isSearch: true isSearch: true,
}, form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '供应商信息', // 查询弹窗标题
searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
searchPage: SupplierApi.getSupplierPage // 查询弹窗所需分页方法
}
}
},
{ {
label: '调增金额', label: '调增金额',
field: 'adjustAmount', field: 'adjustAmount',
@ -366,22 +379,11 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
label: '货主代码', label: '货主代码',
field: 'ownerCode' field: 'ownerCode'
}, },
{
label: '包装号',
field: 'packingNumber'
},
{
label: '器具号',
field: 'containerNumber'
},
{ {
label: '批次', label: '批次',
field: 'batch' field: 'batch'
}, },
{
label: '替代批次',
field: 'altBatch'
},
{ {
label: '订单号', label: '订单号',
field: 'poNumber' field: 'poNumber'
@ -390,41 +392,12 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
label: '订单行', label: '订单行',
field: 'poLine' field: 'poLine'
}, },
{
label: '标包数量', {
field: 'stdPackQty', label: '物品代码',
form: { field: 'itemCode'
component: 'InputNumber', },
}
},
{
label: '标包单位',
field: 'stdPackUnit',
dictType: DICT_TYPE.PACK_UNIT,
dictClass: 'string',
isTable: true
},
{
label: '供应商计量数量',
field: 'supplierPackQty',
form: {
component: 'InputNumber',
}
},
{
label: '供应商计量单位',
field: 'supplierPackUnit',
dictType: DICT_TYPE.UOM,
dictClass: 'string',
isTable: true
},
{
label: '转换率',
field: 'convertRate',
form: {
component: 'InputNumber',
}
},
{ {
label: '单价', label: '单价',
field: 'singlePrice', field: 'singlePrice',
@ -439,20 +412,7 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
component: 'InputNumber', component: 'InputNumber',
} }
}, },
{
label: '单据号',
field: 'number',
isTableForm: false,
form: {
componentProps: {
disabled: true
}
}
},
{
label: '物品代码',
field: 'itemCode'
},
{ {
label: '备注', label: '备注',
field: 'remark', field: 'remark',

Loading…
Cancel
Save