diff --git a/src/api/mes/index.ts b/src/api/mes/index.ts
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/api/mes/workstation/index.ts b/src/api/mes/workstation/index.ts
new file mode 100644
index 000000000..f12b0a5c4
--- /dev/null
+++ b/src/api/mes/workstation/index.ts
@@ -0,0 +1,49 @@
+import request from '@/config/axios'
+
+export interface WorkstationVO {
+ code: string
+ activeTime: Date
+ expireTime: Date
+ name: string
+}
+
+// 查询工位列表
+export const getWorkstationPage = async (params) => {
+ if (params.isSearch) {
+ delete params.isSearch
+ const data = {...params}
+ return await request.post({ url: '/mes/workstation/senior', data })
+ } else {
+ return await request.get({ url: `/mes/workstation/page`, params })
+ }
+}
+
+// 查询工位详情
+export const getWorkstation = async (id: number) => {
+ return await request.get({ url: `/mes/workstation/get?id=` + id })
+}
+
+// 新增工位
+export const createWorkstation = async (data: WorkstationVO) => {
+ return await request.post({ url: `/mes/workstation/create`, data })
+}
+
+// 修改工位
+export const updateWorkstation = async (data: WorkstationVO) => {
+ return await request.put({ url: `/mes/workstation/update`, data })
+}
+
+// 删除工位
+export const deleteWorkstation = async (id: number) => {
+ return await request.delete({ url: `/mes/workstation/delete?id=` + id })
+}
+
+// 导出工位 Excel
+export const exportWorkstation = async (params) => {
+ return await request.download({ url: `/mes/workstation/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+ return request.download({ url: '/mes/workstation/get-import-template' })
+}
diff --git a/src/api/wms/itembasic/index.ts b/src/api/wms/itembasic/index.ts
index baa9cb66b..52a8dec1b 100644
--- a/src/api/wms/itembasic/index.ts
+++ b/src/api/wms/itembasic/index.ts
@@ -32,6 +32,7 @@ export interface ItembasicVO {
// 查询物料基本信息列表
export const getItembasicPage = async (params) => {
if (params.isSearch) {
+ delete params.isSearch
const data = {...params}
return request.post({ url: '/wms/itembasic/senior', data })
} else {
diff --git a/src/api/wms/purchasereceiptRecordDetail/index.ts b/src/api/wms/purchasereceiptRecordDetail/index.ts
index cfba67183..2afacb3e1 100644
--- a/src/api/wms/purchasereceiptRecordDetail/index.ts
+++ b/src/api/wms/purchasereceiptRecordDetail/index.ts
@@ -45,7 +45,9 @@ export interface PurchasereceiptRecordDetailVO {
interfaceType: string
fromOwnerCode: string
toOwnerCode: string
- toBatch: string
+ toBatch: string,
+ parentPackingNumber:string
+ packingNumber:string
}
// 查询采购收货记录子列表
@@ -117,4 +119,9 @@ export const getScarceGoodsDetailPage = async (params) => {
// 查询采购收货记录子包装数据
export const queryPurchaseceiptChildPackingNumber = async (params) => {
return await request.get({ url: `/wms/purchasereceipt-record-detail/pageChildPackingNumber`, params })
+}
+
+// 查询采购收货缺货记录子包装数据
+export const queryPurchaseshortageChildPackingNumber = async (params) => {
+ return await request.get({ url: `/wms/purchaseshortage-detail/pageChildPackingNumber`, params })
}
\ No newline at end of file
diff --git a/src/api/wms/putawayJobDetail/index.ts b/src/api/wms/putawayJobDetail/index.ts
index af3a1738a..2916d8d08 100644
--- a/src/api/wms/putawayJobDetail/index.ts
+++ b/src/api/wms/putawayJobDetail/index.ts
@@ -63,4 +63,9 @@ export const exportPutawayJobDetail = async (params) => {
// 下载用户导入模板
export const importTemplate = () => {
return request.download({ url: '/wms/putaway-job-detail/get-import-template' })
+}
+
+// 查询上架任务子列表--自包装数量
+export const getPutawayJobDetailPageChildPackingNumber = async (params) => {
+ return await request.get({ url: `/wms/putaway-job-detail/pageChildPackingNumber`, params })
}
\ No newline at end of file
diff --git a/src/api/wms/putawayRecordDetail/index.ts b/src/api/wms/putawayRecordDetail/index.ts
index af8a43321..2d98839a1 100644
--- a/src/api/wms/putawayRecordDetail/index.ts
+++ b/src/api/wms/putawayRecordDetail/index.ts
@@ -73,4 +73,9 @@ export const exportPutawayRecordDetail = async (params) => {
// 下载用户导入模板
export const importTemplate = () => {
return request.download({ url: '/wms/putaway-record-detail/get-import-template' })
+}
+
+// 查询上架记录子列表--子包装数据
+export const getPutawayJobDetailPageChildPackingNumber = async (params) => {
+ return await request.get({ url: `/wms/putaway-record-detail/pageChildPackingNumber`, params })
}
\ No newline at end of file
diff --git a/src/api/wms/putawayRequestDetail/index.ts b/src/api/wms/putawayRequestDetail/index.ts
index 3d2f27adf..a96a2d14d 100644
--- a/src/api/wms/putawayRequestDetail/index.ts
+++ b/src/api/wms/putawayRequestDetail/index.ts
@@ -64,4 +64,9 @@ export const exportPutawayRequestDetail = async (params) => {
// 下载用户导入模板
export const importTemplate = () => {
return request.download({ url: '/wms/putaway-request-detail/get-import-template' })
+}
+
+// 查询上架申请子列表--子包装数据
+export const getPutawayRequestDetailPageChildPackingNumber = async (params) => {
+ return await request.get({ url: `/wms/putaway-request-detail/pageChildPackingNumber`, params })
}
\ No newline at end of file
diff --git a/src/api/wms/stockupMainJob/index.ts b/src/api/wms/stockupMainJob/index.ts
index 2f802672a..182e49185 100644
--- a/src/api/wms/stockupMainJob/index.ts
+++ b/src/api/wms/stockupMainJob/index.ts
@@ -87,4 +87,24 @@ export const exportStockupMainJob = async (params) => {
// 下载用户导入模板
export const importTemplate = () => {
return request.download({ url: '/wms/stockup-main-job/get-import-template' })
+}
+
+// 承接发货任务 Excel
+export const acceptStockupMainJob = async (id) => {
+ return await request.put({ url: `/wms/stockup-main-job/accept?id=` + id })
+}
+
+// 取消承接发货任务 Excel
+export const abandonStockupMainJob = async (id) => {
+ return await request.put({ url: `/wms/stockup-main-job/abandon?id=` + id })
+}
+
+// 关闭发货任务主 Excel
+export const closeStockupMainJob = async (id) => {
+ return await request.put({ url: `/wms/stockup-main-job/close?id=` + id })
+}
+
+// 执行发货任务主
+export const executeStockupMainJob = async (data: StockupMainJobVO) => {
+ return await request.put({ url: `/wms/stockup-main-job/execute`, data })
}
\ No newline at end of file
diff --git a/src/utils/disposition/defaultButtons.ts b/src/utils/disposition/defaultButtons.ts
index f25895502..b7f8ca791 100644
--- a/src/utils/disposition/defaultButtons.ts
+++ b/src/utils/disposition/defaultButtons.ts
@@ -735,6 +735,18 @@ export function mainThawRequesttBtn(option:any) {
hasPermi: ''
})
}
+// 主列表-绑定
+export function mainListBindBtn(option:any) {
+ return __defaultBtnOption(option,{
+ label: '绑定',
+ name: 'bind',
+ hide: false,
+ type: 'primary',
+ color: '',
+ link: true, // 文本展现按钮
+ hasPermi: ''
+ })
+}
// 默认按钮规则
function __defaultBtnOption(option:any,specific:any){
return {
diff --git a/src/views/mes/workstation/index.vue b/src/views/mes/workstation/index.vue
new file mode 100644
index 000000000..c72da2656
--- /dev/null
+++ b/src/views/mes/workstation/index.vue
@@ -0,0 +1,248 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ row.code }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/mes/workstation/workstation.data.ts b/src/views/mes/workstation/workstation.data.ts
new file mode 100644
index 000000000..b74f05a6d
--- /dev/null
+++ b/src/views/mes/workstation/workstation.data.ts
@@ -0,0 +1,78 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+// 表单校验
+export const WorkstationRules = reactive({
+ code: [required],
+ name: [required]
+})
+
+export const Workstation = useCrudSchemas(reactive([
+ {
+ label: '代码',
+ field: 'code',
+ sort: 'custom',
+ isSearch: true
+ },
+ {
+ label: '名称',
+ field: 'name',
+ sort: 'custom',
+ isSearch: true
+ },
+ {
+ label: '车间代码',
+ field: 'workshopCode',
+ sort: 'custom',
+ isSearch: true,
+ isForm: false
+ },
+ {
+ label: '生产线代码',
+ field: 'productionLineCode',
+ sort: 'custom',
+ isSearch: true,
+ isForm: false
+ },
+ {
+ label: '班组代码',
+ field: 'teamCode',
+ sort: 'custom',
+ isSearch: true,
+ isForm: false
+ },
+ {
+ label: '生效时间',
+ field: 'activeTime',
+ sort: 'custom',
+ formatter: dateFormatter,
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ valueFormat: 'x'
+ }
+ }
+ },
+ {
+ label: '失效时间',
+ field: 'expireTime',
+ sort: 'custom',
+ formatter: dateFormatter,
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ valueFormat: 'x'
+ }
+ }
+ },
+ {
+ label: '操作',
+ field: 'action',
+ isForm: false,
+ table: {
+ width: 150,
+ fixed: 'right'
+ }
+ }
+]))
diff --git a/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts b/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts
index 6ba60cf79..bf6753484 100644
--- a/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts
@@ -14,6 +14,8 @@ import { Workshop } from '@/views/wms/basicDataManage/factoryModeling/workshop/w
import * as WorkstationApi from '@/api/wms/workstation'
import { validateYS } from '@/utils/validator'
+import {Team} from "@/views/wms/basicDataManage/orderManage/team/team.data";
+import * as TeamApi from "@/api/wms/team";
const { t } = useI18n() // 国际化
@@ -106,6 +108,7 @@ export const Workstation = useCrudSchemas(reactive([
}
}
},
+
{
label: '原料库位',
field: 'rawLocationCode',
@@ -288,4 +291,4 @@ export const WorkstationRules = reactive({
fgLocationCode: [
{ required: true, message: '请选择成品库位', trigger: 'change' }
],
-})
\ No newline at end of file
+})
diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue
index 4ff27d7ea..1369f6e85 100644
--- a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue
@@ -28,58 +28,71 @@
v-model:sort="tableObject.sort"
>
-
+
{{ row.itemCode }}
-
+
-
+ :detailButtonIsShowAdd="true"
+ :detailButtonIsShowDelete="true"
+ @detailOpenForm="detailOpenForm"
+ />
-
+
-
diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts b/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
index c693b29fe..ecb3e4260 100644
--- a/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
@@ -1,9 +1,18 @@
import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter } from '@/utils/formatTime'
+
import * as ItembasicApi from '@/api/wms/itembasic'
import { Itembasic } from '../itembasic/itembasic.data'
+
import * as AreaApi from '@/api/wms/areabasic'
import { Area } from '../../factoryModeling/areabasic/areabasic.data'
+
+import * as LocationgroupApi from '@/api/wms/locationgroup'
+import { Locationgroup } from '../../factoryModeling/locationgroup/locationgroup.data'
+
+import * as LocationApi from '@/api/wms/location'
+import { Location } from '../../factoryModeling/location/location.data'
+
import * as PackageunitApi from '@/api/wms/packageunit'
import { Packageunit } from '../packageunit/packageunit.data'
@@ -29,8 +38,6 @@ export const Itemarea = useCrudSchemas(reactive([
searchCondition: [{
key: 'available',
value: 'TRUE',
- action: '==',
- isSearch: true,
isMainValue: false
}]
}
@@ -56,8 +63,6 @@ export const Itemarea = useCrudSchemas(reactive([
searchCondition: [{
key: 'available',
value: 'TRUE',
- action: '==',
- isSearch: true,
isMainValue: false
}]
}
@@ -83,8 +88,6 @@ export const Itemarea = useCrudSchemas(reactive([
searchCondition: [{
key: 'available',
value: 'TRUE',
- action: '==',
- isSearch: true,
isMainValue: false
}]
}
@@ -110,8 +113,6 @@ export const Itemarea = useCrudSchemas(reactive([
searchCondition: [{
key: 'available',
value: 'TRUE',
- action: '==',
- isSearch: true,
isMainValue: false
}]
}
@@ -202,8 +203,6 @@ export const Itemarea = useCrudSchemas(reactive([
searchCondition: [{
key: 'available',
value: 'TRUE',
- action: '==',
- isSearch: true,
isMainValue: false
}]
}
@@ -322,13 +321,31 @@ export const Itemarea = useCrudSchemas(reactive([
label: '出库后剩余库存自动转换为出库包装规格',
field: 'surplusToOutpackunit',
sort: 'custom',
- isSearch: false,
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ form: {
+ component: 'Switch',
+ value: 'FALSE',
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE'
+ }
+ },
},
{
label: '超过高储是否允许叫料',
field: 'allowIssueRequest',
sort: 'custom',
- isSearch: false,
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ form: {
+ component: 'Switch',
+ value: 'FALSE',
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE'
+ }
+ },
},
{
label: '优先空库位',
@@ -618,61 +635,62 @@ export const ItemareaRules = reactive({
*/
export const ItemareaDetail = useCrudSchemas(reactive([
{
- label: 'id',
- field: 'id',
+ label: '库位组',
+ field: 'locationGroupCode',
sort: 'custom',
isForm: false,
+ isTableForm: false,
},
+
{
- label: '主表ID',
- field: 'masterId',
+ label: '库位代码',
+ field: 'locationCode',
sort: 'custom',
- form: {
- component: 'InputNumber',
- value: 0
+ tableForm:{
+ isInpuFocusShow: true, // 开启查询弹窗
+ searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+ searchField: 'code', // 查询弹窗赋值字段
+ searchTitle: '库位基础信息', // 查询弹窗标题
+ searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+ searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+ searchCondition: [{
+ key: 'available',
+ value: 'TRUE',
+ isMainValue: false
+ },{
+ key: 'areaCode',
+ value: 'areaCode',
+ message: '请选择区域代码!',
+ isMainValue: true
+ }]
},
+ form: {
+ // labelMessage: '信息提示说明!!!',
+ componentProps: {
+ isSearchList: true, // 开启查询弹窗
+ searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+ searchField: 'code', // 查询弹窗赋值字段
+ searchTitle: '库位基础信息', // 查询弹窗标题
+ searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+ searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+ searchCondition: [{
+ key: 'available',
+ value: 'TRUE',
+ isMainValue: false
+ },{
+ key: 'areaCode',
+ value: 'areaCode',
+ message: '请选择区域代码!',
+ isMainValue: true
+ }]
+ }
+ }
},
{
label: '备注',
field: 'remark',
sort: 'custom',
},
- {
- label: '创建时间',
- field: 'createTime',
- sort: 'custom',
- formatter: dateFormatter,
- isForm: false,
- },
- {
- label: '创建者Id',
- field: 'creator',
- sort: 'custom',
- isForm: false,
- },
- {
- label: '最后更新时间',
- field: 'updateTime',
- sort: 'custom',
- formatter: dateFormatter,
- isForm: false,
- },
- {
- label: '最后更新者Id',
- field: 'updater',
- sort: 'custom',
- isForm: false,
- },
- {
- label: '库位组',
- field: 'locationGroup',
- sort: 'custom',
- },
- {
- label: '库位代码',
- field: 'locationCode',
- sort: 'custom',
- },
{
label: '操作',
field: 'action',
@@ -683,3 +701,8 @@ export const ItemareaDetail = useCrudSchemas(reactive([
}
}
]))
+
+// 表单校验
+export const ItemareaDetailRules = reactive({
+
+})
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts b/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts
index c81fe91d2..6e3fd6394 100644
--- a/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts
@@ -294,15 +294,11 @@ export const Packageunit = useCrudSchemas(reactive([
searchField: 'code',
searchTitle: '包装规格信息',
searchAllSchemas: PackageunitCopy.allSchemas,
- searchPage: PackageunitApi.getCustomeritemPage,
+ searchPage: PackageunitApi.getPackageunitPage,
searchCondition: [{
key: 'available',
value: 'TRUE',
isMainValue: false
- },{
- key: 'customerCode',
- value: 'customerCode',
- isMainValue: true
}]
}
}
diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue
index 579622002..a43277b5e 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue
@@ -27,43 +27,53 @@
v-model:currentPage="tableObject.currentPage"
v-model:sort="tableObject.sort"
>
-
-
- {{ row.code }}
+
+
+ {{ row.number }}
-
+
-
-
+
diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts
index a503624dc..feaa984b8 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts
@@ -5,73 +5,81 @@ import { dateFormatter } from '@/utils/formatTime'
export const StockupMainRecordRules = reactive({
})
+//主表
export const StockupMainRecord = useCrudSchemas(reactive([
{
- label: 'id',
- field: 'id',
+ label: '单据号',
+ field: 'number',
sort: 'custom',
- isForm: false,
+ isSearch: true,
+ table: {
+ width: 180
+ },
},
{
label: '申请单号',
field: 'requestNumber',
sort: 'custom',
isSearch: true,
+ table: {
+ width: 180
+ },
},
{
label: '任务单号',
field: 'jobNumber',
sort: 'custom',
isSearch: true,
+ table: {
+ width: 180
+ },
},
{
label: '发货计划单号',
field: 'deliverPlanNumber',
sort: 'custom',
isSearch: true,
+ table: {
+ width: 180
+ },
},
{
label: '从仓库代码',
field: 'fromWarehouseCode',
sort: 'custom',
- isSearch: true,
+ table: {
+ width: 150
+ },
},
{
label: '到仓库代码',
field: 'toWarehouseCode',
sort: 'custom',
- isSearch: true,
- },
- {
- label: '明细',
- field: 'details',
- sort: 'custom',
- isSearch: true,
+ table: {
+ width: 150
+ },
},
{
label: '出库事务类型',
field: 'outTransactionType',
sort: 'custom',
- isSearch: true,
- form: {
- component: 'SelectV2'
- },
+ table: {
+ width: 150
+ },
},
{
label: '入库事务类型',
field: 'inTransactionType',
sort: 'custom',
- isSearch: true,
- form: {
- component: 'SelectV2'
- },
+ table: {
+ width: 150
+ },
},
{
label: '执行时间',
field: 'executeTime',
sort: 'custom',
formatter: dateFormatter,
- isSearch: true,
search: {
component: 'DatePicker',
componentProps: {
@@ -80,6 +88,9 @@ export const StockupMainRecord = useCrudSchemas(reactive([
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
}
},
+ table: {
+ width: 180
+ },
form: {
component: 'DatePicker',
componentProps: {
@@ -93,46 +104,33 @@ export const StockupMainRecord = useCrudSchemas(reactive([
field: 'activeDate',
sort: 'custom',
formatter: dateFormatter,
- isSearch: true,
- 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')]
- }
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ table: {
+ width: 180
},
form: {
component: 'DatePicker',
componentProps: {
type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x'
}
},
},
- {
- label: '是否可用',
- field: 'available',
- sort: 'custom',
- isSearch: true,
- },
{
label: '申请时间',
field: 'requestTime',
sort: 'custom',
formatter: dateFormatter,
- isSearch: true,
- 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')]
- }
+ table: {
+ width: 180
},
form: {
component: 'DatePicker',
componentProps: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
type: 'datetime',
valueFormat: 'x'
}
@@ -143,7 +141,6 @@ export const StockupMainRecord = useCrudSchemas(reactive([
field: 'dueTime',
sort: 'custom',
formatter: dateFormatter,
- isSearch: true,
search: {
component: 'DatePicker',
componentProps: {
@@ -152,6 +149,9 @@ export const StockupMainRecord = useCrudSchemas(reactive([
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
}
},
+ table: {
+ width: 180
+ },
form: {
component: 'DatePicker',
componentProps: {
@@ -161,46 +161,280 @@ export const StockupMainRecord = useCrudSchemas(reactive([
},
},
{
- label: '部门',
- field: 'departmentCode',
+ label: '是否可用',
+ field: 'available',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: true,
sort: 'custom',
- isSearch: true,
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: 'TRUE',
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE'
+ }
+ }
},
{
- label: '用户组',
- field: 'userGroupCode',
+ label: '部门',
+ field: 'departmentCode',
sort: 'custom',
- isSearch: true,
+ table: {
+ width: 150
+ },
},
{
label: '接口类型',
field: 'interfaceType',
+ dictType: DICT_TYPE.INTERFACE_TYPE,
+ dictClass: 'string',
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '业务类型',
+ field: 'businessType',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '备注',
+ field: 'remark',
+ sort: 'custom',
+ table: {
+ width: 100
+ },
+ },
+ {
+ label: '创建时间',
+ field: 'createTime',
+ sort: 'custom',
+ formatter: dateFormatter,
+ 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')]
+ }
+ },
+ table: {
+ width: 180
+ },
+ isForm: false,
+ },
+ {
+ label: '从库区类型范围',
+ field: 'fromAreaTypes',
+ dictType: DICT_TYPE.LOCATION_TYPE,
+ dictClass: 'string',
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ },
+ {
+ label: '从库区代码范围',
+ field: 'fromAreaCodes',
sort: 'custom',
isSearch: true,
- form: {
- component: 'SelectV2'
- },
},
+ {
+ label: '到库区类型范围',
+ field: 'toAreaTypes',
+ dictType: DICT_TYPE.LOCATION_TYPE,
+ dictClass: 'string',
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ },
+ {
+ label: '到库区代码范围',
+ field: 'toAreaCodes',
+ sort: 'custom',
+ },
+ {
+ label: '操作',
+ field: 'action',
+ isForm: false,
+ table: {
+ width: 150,
+ fixed: 'right'
+ }
+ }
+]))
+//子表
+// 表单校验
+export const StockupDetailRecordRules = reactive({
+})
+
+export const StockupDetailRecord = useCrudSchemas(reactive([
{
label: '单据号',
field: 'number',
sort: 'custom',
isSearch: true,
+ table: {
+ width: 180
+ },
},
{
- label: '业务类型',
- field: 'businessType',
+ label: '包装号',
+ field: 'packingNumber',
+ sort: 'custom',
+ isSearch: true,
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '批次',
+ field: 'batch',
+ sort: 'custom',
+ isSearch: true,
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '库存状态',
+ field: 'inventoryStatus',
+ dictType: DICT_TYPE.INVENTORY_STATUS,
+ dictClass: 'string',
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '从货主代码',
+ field: 'fromOwnerCode',
+ sort: 'custom',
+ isSearch: true,
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '从器具号',
+ field: 'fromContainerNumber',
+ sort: 'custom',
+ isSearch: true,
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '从库位代码',
+ field: 'fromLocationCode',
+ sort: 'custom',
+ isSearch: true,
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '从库位组代码',
+ field: 'fromLocationGroupCode',
sort: 'custom',
isSearch: true,
- form: {
- component: 'SelectV2'
- },
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '从库区代码',
+ field: 'fromAreaCode',
+ sort: 'custom',
+ isSearch: true,
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '到货主代码',
+ field: 'toOwnerCode',
+ sort: 'custom',
+ isSearch: true,
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '到器具号',
+ field: 'toContainerNumber',
+ sort: 'custom',
+ isSearch: true,
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '到库位代码',
+ field: 'toLocationCode',
+ sort: 'custom',
+ isSearch: true,
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '到库位组代码',
+ field: 'toLocationGroupCode',
+ sort: 'custom',
+ isSearch: true,
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '到库区代码',
+ field: 'toAreaCode',
+ sort: 'custom',
+ isSearch: true,
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '单价',
+ field: 'singlePrice',
+ sort: 'custom',
+ isSearch: true,
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '金额',
+ field: 'amount',
+ sort: 'custom',
+ isSearch: true,
+ table: {
+ width: 150
+ },
},
{
label: '备注',
field: 'remark',
sort: 'custom',
isSearch: true,
+ table: {
+ width: 150
+ },
},
{
label: '创建时间',
@@ -208,6 +442,9 @@ export const StockupMainRecord = useCrudSchemas(reactive([
sort: 'custom',
formatter: dateFormatter,
isSearch: true,
+ table: {
+ width: 180
+ },
search: {
component: 'DatePicker',
componentProps: {
@@ -219,46 +456,100 @@ export const StockupMainRecord = useCrudSchemas(reactive([
isForm: false,
},
{
- label: '扩展属性',
- field: 'extraProperties',
+ label: '物品代码',
+ field: 'itemCode',
sort: 'custom',
isSearch: true,
+ table: {
+ width: 150
+ },
},
{
- label: '地点ID',
- field: 'siteId',
+ label: '物品名称',
+ field: 'itemName',
sort: 'custom',
isSearch: true,
+ table: {
+ width: 150
+ },
},
{
- label: '代码',
- field: 'code',
+ label: '物品描述1',
+ field: 'itemDesc1',
sort: 'custom',
isSearch: true,
+ table: {
+ width: 150
+ },
},
{
- label: '从库区类型范围',
- field: 'fromAreaTypes',
+ label: '物品描述2',
+ field: 'itemDesc2',
sort: 'custom',
isSearch: true,
+ table: {
+ width: 150
+ },
},
{
- label: '从库区代码范围',
- field: 'fromAreaCodes',
+ label: '项目代码',
+ field: 'projectCode',
sort: 'custom',
isSearch: true,
+ table: {
+ width: 150
+ },
},
{
- label: '到库区类型范围',
- field: 'toAreaTypes',
+ label: '数量',
+ field: 'qty',
sort: 'custom',
isSearch: true,
+ table: {
+ width: 150
+ },
},
{
- label: '到库区代码范围',
- field: 'toAreaCodes',
+ label: '计量单位',
+ field: 'uom',
+ dictType: DICT_TYPE.UOM,
+ dictClass: 'string',
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '接口类型',
+ field: 'interfaceType',
+ dictType: DICT_TYPE.INTERFACE_TYPE,
+ dictClass: 'string',
+ isTable: true,
sort: 'custom',
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '是否可用',
+ field: 'available',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
isSearch: true,
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: 'TRUE',
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE'
+ }
+ }
},
{
label: '操作',
diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue
index 3b61b0bac..7a77e7e45 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue
@@ -324,19 +324,19 @@ const openForm = (type: string, row?: number) => {
}
// 获取部门 用于详情 部门回显
-// const { wsCache } = useCache()
-// /** 详情操作 */
-// const detailRef = ref()
-// const openDetail = (row: any, titleName: any, titleValue: any) => {
-// if(row.deliverPlanNumber != null){
-// trueFalse.value = false
-// }else {
-// trueFalse.value = true
-// }
-// const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
-// if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
-// detailRef.value.openDetail(row, titleName, titleValue,'requestDeliverMain')
-// }
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+ if(row.deliverPlanNumber != null){
+ trueFalse.value = false
+ }else {
+ trueFalse.value = true
+ }
+ const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+ if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+ detailRef.value.openDetail(row, titleName, titleValue,'stockupMainRequest')
+}
/** 删除按钮操作 */
const handleDelete = async (id: number) => {
diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
index 90a3c8f1e..beb6c11e2 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
@@ -434,7 +434,7 @@ export const StockupMainRequest = useCrudSchemas(reactive([
field: 'action',
isForm: false,
table: {
- width: 150,
+ width: 300,
fixed: 'right'
}
}
@@ -464,6 +464,17 @@ export const StockupDetailRequestRules = reactive({
// //子表
export const StockupDetailRequest = useCrudSchemas(reactive([
+ {
+ label: '单据号',
+ field: 'number',
+ sort: 'custom',
+ isSearch: true,
+ isForm: false,
+ isTableForm: false,
+ table: {
+ width: 100
+ },
+ },
{
label: '包装号',
field: 'packingNumber',
@@ -511,6 +522,9 @@ export const StockupDetailRequest = useCrudSchemas(reactive([
label: '器具号',
field: 'containerNumber',
sort: 'custom',
+ table: {
+ width: 100
+ },
isSearch: true,
},
{
@@ -535,7 +549,7 @@ export const StockupDetailRequest = useCrudSchemas(reactive([
isTable: true,
sort: 'custom',
table: {
- width: 150
+ width: 120
},
tableForm: {
disabled: true,
@@ -547,82 +561,14 @@ export const StockupDetailRequest = useCrudSchemas(reactive([
}
}
},
- {
- label: '到货主代码',
- field: 'toOwnerCode',
- sort: 'custom',
- isSearch: true,
- isTableForm: false,
- },
- {
- label: '到库位代码',
- field: 'toLocationCode',
- sort: 'custom',
- isSearch: true,
- tableForm:{
- isInpuFocusShow: true, // 开启查询弹窗
- searchListPlaceholder: '请选择库位代码',
- searchField: 'location',
- searchTitle: '库位基础信息',
- searchAllSchemas: Location.allSchemas,
- searchPage: locationApi.getLocationPage,
- searchCondition: [{
- key: 'available',
- value: 'TRUE',
- isMainValue: false
- }]
- },
- form: {
- componentProps: {
- isSearchList: true,
- searchListPlaceholder: '请选择库位代码',
- searchField: 'location',
- searchTitle: '库位基础信息',
- searchAllSchemas: Location.allSchemas,
- searchPage: locationApi.getLocationPage,
- searchCondition: [{
- key: 'available',
- value: 'TRUE',
- isMainValue: false
- }]
- }
- }
- },
- {
- label: '主表ID',
- field: 'masterId',
- sort: 'custom',
- isSearch: true,
- isTableForm: false,
- },
- {
- label: '单据号',
- field: 'number',
- sort: 'custom',
- isSearch: true,
- isTableForm: false,
- },
- {
- label: '创建时间',
- field: 'createTime',
- sort: 'custom',
- formatter: dateFormatter,
- isSearch: true,
- 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')]
- }
- },
- isTableForm: false,
- },
{
label: '物品代码',
field: 'itemCode',
sort: 'custom',
isSearch: true,
+ table: {
+ width: 120
+ },
tableForm: {
disabled: true
},
@@ -638,6 +584,9 @@ export const StockupDetailRequest = useCrudSchemas(reactive([
sort: 'custom',
isSearch: true,
isTableForm: false,
+ table: {
+ width: 120
+ },
},
{
label: '物品描述1',
@@ -645,6 +594,9 @@ export const StockupDetailRequest = useCrudSchemas(reactive([
sort: 'custom',
isSearch: true,
isTableForm: false,
+ table: {
+ width: 120
+ },
},
{
label: '物品描述2',
@@ -652,6 +604,9 @@ export const StockupDetailRequest = useCrudSchemas(reactive([
sort: 'custom',
isSearch: true,
isTableForm: false,
+ table: {
+ width: 120
+ },
},
{
label: '项目代码',
@@ -659,6 +614,9 @@ export const StockupDetailRequest = useCrudSchemas(reactive([
sort: 'custom',
isSearch: true,
isTableForm: false,
+ table: {
+ width: 120
+ },
},
{
label: '数量',
@@ -685,6 +643,43 @@ export const StockupDetailRequest = useCrudSchemas(reactive([
}
}
},
+ {
+ label: '到库位代码',
+ field: 'toLocationCode',
+ sort: 'custom',
+ isSearch: true,
+ table: {
+ width: 120
+ },
+ tableForm:{
+ isInpuFocusShow: true, // 开启查询弹窗
+ searchListPlaceholder: '请选择库位代码',
+ searchField: 'location',
+ searchTitle: '库位基础信息',
+ searchAllSchemas: Location.allSchemas,
+ searchPage: locationApi.getLocationPage,
+ searchCondition: [{
+ key: 'available',
+ value: 'TRUE',
+ isMainValue: false
+ }]
+ },
+ form: {
+ componentProps: {
+ isSearchList: true,
+ searchListPlaceholder: '请选择库位代码',
+ searchField: 'location',
+ searchTitle: '库位基础信息',
+ searchAllSchemas: Location.allSchemas,
+ searchPage: locationApi.getLocationPage,
+ searchCondition: [{
+ key: 'available',
+ value: 'TRUE',
+ isMainValue: false
+ }]
+ }
+ }
+ },
{
label: '备注',
field: 'remark',
@@ -692,11 +687,34 @@ export const StockupDetailRequest = useCrudSchemas(reactive([
isSearch: true,
},
{
- label: '从货主代码',
- field: 'fromOwnerCode',
+ label: '创建时间',
+ field: 'createTime',
sort: 'custom',
+ formatter: dateFormatter,
isSearch: true,
+ table: {
+ width: 120
+ },
+ 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')]
+ }
+ },
isTableForm: false,
+ },
+ {
+ label: '操作',
+ field: 'action',
+ isDetail: false,
+ isForm: false ,
+ table: {
+ width: 150,
+ fixed: 'right'
+ },
+ isTableForm:false,
}
]))
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
index 2154d60a3..2eb30d6e5 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
@@ -62,6 +62,8 @@
:detailAllSchemasRules="PurchasereceiptJobDetailRules"
:searchTableParams="searchTableParams"
:apiPage="PurchasereceiptJobDetailApi.getPurchasereceiptJobDetailPage"
+ :detailButtonIsShowEdit="false"
+ :detailButtonIsShowDelete="false"
:buttondataTable="buttondataTable"
@tableFormButton="tableFormButton"
/>
@@ -195,10 +197,19 @@ const isShowMainButton = (row,val) => {
const butttondata = (row) => {
return [
// defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
- defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-job-main:close'}), // 关闭
+ // defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-job-main:close'}), // 关闭
// defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
// defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
- ]
+ {
+ label: '拒收',
+ name: 'mainJobClo',
+ hide: isShowMainButton(row, ['1']),
+ type: 'primary',
+ icon: '',
+ color: '',
+ hasPermi: 'wms:purchasereceipt-job-main:close',
+ link: true // 文本展现按钮
+ }]
}
// 列表-操作按钮事件
@@ -207,7 +218,7 @@ const buttonTableClick = async (val, row) => {
console.log('列表-操作按钮事件-执行')
} else if (val == 'mainJobAba') { // 放弃
console.log('列表-操作按钮事件-放弃')
- } else if (val == 'mainJobClo') { // 关闭
+ } else if (val == 'mainJobClo') { // 拒收
handleClose(row.id)
} else if (val == 'mainJobAcc') { // 承接
console.log('列表-操作按钮事件-承接')
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
index dc55a4063..dfd32837e 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
@@ -63,7 +63,7 @@
@tableFormButton="tableFormButton"
/>
-
+
+
+
+