Browse Source

YT-303:问题修复

intex_online20241228
ljlong_2630 2 months ago
parent
commit
070daafa6f
  1. 12
      src/api/wms/deliverRecordMain/index.ts
  2. 2
      src/components/BasicForm/src/BasicForm.vue
  3. 1
      src/utils/dict.ts
  4. 41
      src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts
  5. 37
      src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts
  6. 88
      src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
  7. 2
      src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
  8. 70
      src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts
  9. 359
      src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts
  10. 131
      src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue
  11. 28
      src/views/wms/deliversettlementManage/ssSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts
  12. 70
      src/views/wms/deliversettlementManage/tjdtSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts

12
src/api/wms/deliverRecordMain/index.ts

@ -97,6 +97,18 @@ export const inducedProductBatchUpdate = (data) => {
return request.post({ url: '/wms/leadership-incorporation-doc-request/induced-product-batch-update',data })
}
// 修改发货记录信息
export const inducedProductUpdate = () => {
return request.download({ url: '/wms/deliver-record-main/inducedProductUpdate' })
}
// 创建发货记录信息
export const inducedProductCreate = () => {
return request.download({ url: '/wms/deliver-record-main/inducedProductCreate' })
}

2
src/components/BasicForm/src/BasicForm.vue

@ -622,6 +622,7 @@ const opensearchTable = (
const _searchTableTitle = searchTitle
const _searchTableAllSchemas = searchAllSchemas
const _searchTablePage = searchPage
debugger
searchTableRef.value.open(
_searchTableTitle,
_searchTableAllSchemas,
@ -982,7 +983,6 @@ const handleDeleteTable = (row, index) => {
//
const inpuFocus = (headerItem, row, index) => {
emit('inpuFocus', headerItem, row, index)
opensearchTable(
headerItem.field,
headerItem.tableForm.searchField,

1
src/utils/dict.ts

@ -417,6 +417,7 @@ export enum DICT_TYPE {
LEADERSHIP_MATERIAL_TYPE = 'leadership_material_type',
SUPPLIER_TOOL_APPORT_STATEMENT_MAIN = 'supplier_tool_apport_statement_main', // 供应商模具费用主
SUPPLIER_TOOL_APPORT_STATEMENT_DETAIL = 'supplier_tool_apport_statement_detail', // 供应商模具费用子
PRODUCTION_LINE_ITEM = 'production_line_item', //顺引生产线项
}

41
src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts

@ -907,7 +907,15 @@ export const DeliverJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
},
isTable: false,
},
{
label: '创建者',
field: 'creator',
sort: 'custom',
table: {
width: 150
},
isTable: true,
},
{
label: '创建时间',
field: 'createTime',
@ -925,7 +933,7 @@ export const DeliverJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
componentProps: {
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
},
isSearch: true,
@ -939,15 +947,38 @@ export const DeliverJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
},
},
{
label: '创建者',
field: 'creator',
label: '最后更新者',
field: 'updater',
sort: 'custom',
table: {
width: 150
},
isTable: true,
isForm: false
},
{
label: '最后更新时间',
field: 'updateTime',
formatter: dateFormatter,
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
sort: 'custom',
table: {
width: 180
},
isTable: true,
form: {
component: 'DatePicker',
componentProps: {
style: { width: '100%' },
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x'
}
},
isForm: false
},
]))
//表单校验

37
src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts

@ -807,6 +807,15 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
},
},
{
label: '创建者',
field: 'creator',
sort: 'custom',
table: {
width: 150
},
isTable: true,
},
{
label: '创建时间',
field: 'createTime',
@ -838,13 +847,37 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
},
},
{
label: '创建者',
field: 'creator',
label: '最后更新者',
field: 'updater',
sort: 'custom',
table: {
width: 150
},
isTable: true,
isForm: false
},
{
label: '最后更新时间',
field: 'updateTime',
formatter: dateFormatter,
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
sort: 'custom',
table: {
width: 180
},
isTable: true,
form: {
component: 'DatePicker',
componentProps: {
style: { width: '100%' },
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x'
}
},
isForm: false
},
// {

88
src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts

@ -831,13 +831,13 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
searchAllSchemas: Customeritem.allSchemas,
searchPage: CustomerItemApi.getPageBusinessTypeToItemCode,
verificationPage: CustomerItemApi.getCustomerItemListByCodes, // 校验数去焦点输入是否正确的方法
verificationParams: [{
key: 'itemCode',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true,
verificationParams: [{
key: 'itemCode',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true,
}], // 失去焦点校验参数
},
form: {
@ -981,6 +981,38 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
isTableForm: false,
isForm: false,
},
{
label: '顺序号',
field: 'serialNo',
sort: 'custom',
table: {
width: 150
},
isTable: false,
isForm: false,
tableForm: {
type: 'InputNumber',
min: 0,
max:999999,
// precision: 6
}
},
{
label: '班次',
field: 'classes',
sort: 'custom',
table: {
width: 150
},
dictType: DICT_TYPE.UOM,
dictClass: 'string',
isTable: false,
isForm: false,
tableForm: {
type: 'Select',
disabled: true
},
},
{
label: '包装号',
field: 'packingNumber',
@ -1060,6 +1092,15 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
// },
// isForm: false,
// },
{
label: '创建者',
field: 'creator',
sort: 'custom',
table: {
width: 150
},
isTable: true,
},
{
label: '创建时间',
field: 'createTime',
@ -1075,10 +1116,9 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
form: {
component: 'DatePicker',
componentProps: {
style: {width:'100%'},
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
},
isSearch: true,
@ -1090,18 +1130,38 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
},
},
isTableForm: false,
isForm: false
},
{
label: '创建者',
field: 'creator',
label: '最后更新者',
field: 'updater',
sort: 'custom',
table: {
width: 150
},
isTable: true,
isTableForm: false,
isForm: false
},
{
label: '最后更新时间',
field: 'updateTime',
formatter: dateFormatter,
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
sort: 'custom',
table: {
width: 180
},
isTable: true,
form: {
component: 'DatePicker',
componentProps: {
style: { width: '100%' },
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x'
}
},
isForm: false
},

2
src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue

@ -62,7 +62,7 @@
@tableSelectionDelete="tableSelectionDelete"
@searchTableSuccess="searchTableSuccess"
@submitForm="submitForm"
:isShowButton = isShowButton
:isShowButton=isShowButton
@clearSearchInput="clearSearchInput"
/>

70
src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts

@ -160,39 +160,6 @@ export const DeliverRecordMain = useCrudSchemas(
isTable: false,
isForm: false,
},
{
label: '最后更新时间',
field: 'updateTime',
formatter: dateFormatter,
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
sort: 'custom',
table: {
width: 180
},
isTable: false,
form: {
component: 'DatePicker',
componentProps: {
style: { width: '100%' },
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x'
}
},
isForm: false
},
{
label: '最后更新者',
field: 'updater',
sort: 'custom',
table: {
width: 150
},
isTable: false,
isForm: false
},
// {
// label: '代码',
// field: 'code',
@ -533,6 +500,15 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
},
},
{
label: '创建者',
field: 'creator',
sort: 'custom',
table: {
width: 150
},
isTable: true,
},
{
label: '创建时间',
field: 'createTime',
@ -564,13 +540,37 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
},
},
{
label: '创建者',
field: 'creator',
label: '最后更新者',
field: 'updater',
sort: 'custom',
table: {
width: 150
},
isTable: true,
isForm: false
},
{
label: '最后更新时间',
field: 'updateTime',
formatter: dateFormatter,
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
sort: 'custom',
table: {
width: 180
},
isTable: true,
form: {
component: 'DatePicker',
componentProps: {
style: { width: '100%' },
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x'
}
},
isForm: false
},
// {
// label: '任务明细ID',

359
src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts

@ -2,6 +2,8 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'
import * as CustomerApi from '@/api/wms/customer'
import { Customer } from '../../../basicDataManage/customerManage/customer/customer.data'
import * as CustomerItemApi from '@/api/wms/customeritem'
import { Customeritem } from '@/views/wms/basicDataManage/customerManage/customeritem/customeritem.data'
/**
* @returns {Array}
@ -16,48 +18,8 @@ export const DeliverRecordMain = useCrudSchemas(
width: 180,
fixed: 'left'
},
isSearch: true
},
{
label: '申请单号',
field: 'requestNumber',
sort: 'custom',
table: {
width: 180
},
isTable: false,
isSearch: false
},
{
label: '任务单号',
field: 'jobNumber',
sort: 'custom',
table: {
width: 180
},
isTable: false,
},
{
label: '发货记录单号',
field: 'deliverRecordNumber',
sort: 'custom',
table: {
width: 150
},
isSearch: false,
isTable: false,
isSearch: true,
isForm: false,
isDetail: false
},
{
label: '发货计划单号',
field: 'deliverPlanNumber',
sort: 'custom',
table: {
width: 180
},
isTable: false,
isDetail: true
},
{
label: '发货类型',
@ -69,16 +31,15 @@ export const DeliverRecordMain = useCrudSchemas(
dictClass: 'string',
table: {
width: 150
},
form: {
component: 'Select',
componentProps: {
disabled: true,
defaultValue: 'InducedProduct'
}
}
},
// {
// label: '客户发货单号',
// field: 'customerDeliverNumber',
// sort: 'custom',
// table: {
// width: 150
// },
// },
{
label: '客户订单号',
field: 'customerOrderNumber',
@ -87,7 +48,7 @@ export const DeliverRecordMain = useCrudSchemas(
width: 180
},
isTable: true,
isForm: true,
isForm: false,
isSearch: true,
search: {
component: 'Input',
@ -95,26 +56,6 @@ export const DeliverRecordMain = useCrudSchemas(
}
},
form: {
component: 'Input',
componentProps: {
}
}
},
{
label: '状态',
field: 'status',
dictType: DICT_TYPE.REQUEST_STATUS,
dictClass: 'string',
isSearch: false,
isTable: false,
isForm: false,
isDetail: false,
sort: 'custom',
table: {
width: 150
}
},
{
label: '客户代码',
@ -123,9 +64,42 @@ export const DeliverRecordMain = useCrudSchemas(
table: {
width: 150
},
form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
enterSearch: true,
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择客户代码', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '客户信息', // 查询弹窗标题
searchAllSchemas: Customer.allSchemas, // 查询弹窗所需类
searchPage: CustomerApi.getCustomerPage, // 查询弹窗所需分页方法
searchCondition: [
{
key: 'available',
value: 'TRUE',
isMainValue: false
},
{
key: 'type',
value: 'DEFAULT',
isMainValue: false
}
],
verificationParams: [
{
key: 'code',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true
}
] // 失去焦点校验参数
}
},
isSearch: true
},
{
label: '客户月台代码',
field: 'customerDockCode',
@ -133,7 +107,8 @@ export const DeliverRecordMain = useCrudSchemas(
table: {
width: 150
},
isTable: false
isTable: false,
isForm: false,
},
{
label: '承运商',
@ -142,7 +117,8 @@ export const DeliverRecordMain = useCrudSchemas(
table: {
width: 150
},
isTable: false
isTable: false,
isForm: false,
},
{
label: '运输方式',
@ -152,7 +128,8 @@ export const DeliverRecordMain = useCrudSchemas(
table: {
width: 150
},
isTable: false
isTable: false,
isForm: false,
},
{
label: '车牌号',
@ -161,7 +138,8 @@ export const DeliverRecordMain = useCrudSchemas(
table: {
width: 150
},
isTable: false
isTable: false,
isForm: false,
},
{
label: '申请时间',
@ -175,6 +153,7 @@ export const DeliverRecordMain = useCrudSchemas(
width: 180
},
isTable: false,
isForm: false,
form: {
component: 'DatePicker',
componentProps: {
@ -185,7 +164,7 @@ export const DeliverRecordMain = useCrudSchemas(
}
},
{
label: '截止时间',
label: '发运时间',
field: 'dueTime',
formatter: dateFormatter,
detail: {
@ -195,7 +174,7 @@ export const DeliverRecordMain = useCrudSchemas(
table: {
width: 180
},
isTable: false,
isTable: true,
form: {
component: 'DatePicker',
componentProps: {
@ -205,6 +184,38 @@ export const DeliverRecordMain = useCrudSchemas(
}
}
},
{
label: '生产线项',
field: 'productionLine',
sort: 'custom',
table: {
width: 150
},
dictType: DICT_TYPE.PRODUCTION_LINE_ITEM,
dictClass: 'string',
form: {
component: 'Select',
componentProps: {
}
},
isSearch: true
},
{
label: '顺引单据号',
field: 'billNo',
sort: 'custom',
table: {
width: 150
},
form: {
component: 'Input',
componentProps: {
}
},
isSearch: false
},
{
label: '执行时间',
field: 'executeTime',
@ -217,6 +228,7 @@ export const DeliverRecordMain = useCrudSchemas(
width: 180
},
isTable: false,
isForm: false,
form: {
component: 'DatePicker',
componentProps: {
@ -238,6 +250,7 @@ export const DeliverRecordMain = useCrudSchemas(
width: 180
},
isTable: false,
isForm: false,
form: {
component: 'DatePicker',
componentProps: {
@ -255,7 +268,8 @@ export const DeliverRecordMain = useCrudSchemas(
table: {
width: 150
},
isTable: false
isTable: false,
isForm: false,
},
{
label: '到仓库代码',
@ -264,7 +278,8 @@ export const DeliverRecordMain = useCrudSchemas(
table: {
width: 150
},
isTable: false
isTable: false,
isForm: false,
},
{
label: '从库区类型范围',
@ -275,7 +290,8 @@ export const DeliverRecordMain = useCrudSchemas(
sort: 'custom',
table: {
width: 150
}
},
isForm: false,
},
{
label: '到库区类型范围',
@ -286,7 +302,8 @@ export const DeliverRecordMain = useCrudSchemas(
sort: 'custom',
table: {
width: 150
}
},
isForm: false,
},
{
label: '从库区代码范围',
@ -295,7 +312,8 @@ export const DeliverRecordMain = useCrudSchemas(
table: {
width: 150
},
isTable: false
isTable: false,
isForm: false,
},
{
label: '到库区代码范围',
@ -304,7 +322,8 @@ export const DeliverRecordMain = useCrudSchemas(
table: {
width: 150
},
isTable: false
isTable: false,
isForm: false,
},
{
label: '从月台代码',
@ -313,7 +332,8 @@ export const DeliverRecordMain = useCrudSchemas(
table: {
width: 150
},
isTable: false
isTable: false,
isForm: false,
},
{
label: '出库事务类型',
@ -322,7 +342,8 @@ export const DeliverRecordMain = useCrudSchemas(
table: {
width: 150
},
isTable: false
isTable: false,
isForm: false,
},
{
label: '入库事务类型',
@ -331,16 +352,8 @@ export const DeliverRecordMain = useCrudSchemas(
table: {
width: 150
},
isTable: false
},
{
label: '发货类型',
field: 'businessType',
sort: 'custom',
table: {
width: 150
},
isTable: false
isTable: false,
isForm: false,
},
{
label: '部门',
@ -349,7 +362,8 @@ export const DeliverRecordMain = useCrudSchemas(
table: {
width: 150
},
isTable: false
isTable: false,
isForm: false,
},
{
label: '接口类型',
@ -360,7 +374,8 @@ export const DeliverRecordMain = useCrudSchemas(
sort: 'custom',
table: {
width: 150
}
},
isForm: false,
},
{
label: '备注',
@ -392,6 +407,7 @@ export const DeliverRecordMain = useCrudSchemas(
}
},
isSearch: false,
isForm: false,
search: {
component: 'DatePicker',
componentProps: {
@ -408,37 +424,8 @@ export const DeliverRecordMain = useCrudSchemas(
table: {
width: 150
},
isTable: false
},
{
label: '最后更新时间',
field: 'updateTime',
formatter: dateFormatter,
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
sort: 'custom',
table: {
width: 180
},
isTable: false,
form: {
component: 'DatePicker',
componentProps: {
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x'
}
}
},
{
label: '最后更新者',
field: 'updater',
sort: 'custom',
table: {
width: 150
},
isTable: false,
isForm: false,
},
// {
// label: '代码',
@ -455,6 +442,7 @@ export const DeliverRecordMain = useCrudSchemas(
dictClass: 'string',
isSearch: false,
isTable: false,
isForm: false,
sort: 'custom',
table: {
width: 150
@ -546,24 +534,9 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
isTable: false
isTable: false,
isTableForm: false,
},
// {
// label: '销售订单号',
// field: 'soNumber',
// sort: 'custom',
// table: {
// width: 150
// },
// },
// {
// label: '销售订单行',
// field: 'soLine',
// sort: 'custom',
// table: {
// width: 150
// },
// },
{
label: '物料代码',
field: 'itemCode',
@ -571,7 +544,26 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isSearch: true
isSearch: true,
tableForm:{
multiple:true,
isInpuFocusShow: true, // 开启查询弹窗
isShowTableFormSearch: true,
searchListPlaceholder: '请选择物料代码',
searchField: 'itemCode',
searchTitle: '客户物料基础信息',
searchAllSchemas: Customeritem.allSchemas,
searchPage: CustomerItemApi.getPageBusinessTypeToItemCode,
verificationPage: CustomerItemApi.getCustomerItemListByCodes, // 校验数去焦点输入是否正确的方法
verificationParams: [{
key: 'itemCode',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true,
}], // 失去焦点校验参数
},
},
{
label: '物料名称',
@ -580,6 +572,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTableForm: false,
},
{
label: '物料描述1',
@ -588,7 +581,8 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
hiddenInMain: true
hiddenInMain: true,
isTableForm: false,
},
{
label: '物料描述2',
@ -597,7 +591,8 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
hiddenInMain: true
hiddenInMain: true,
isTableForm: false,
},
{
label: '批次',
@ -606,6 +601,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTableForm: false,
},
{
label: '包装号',
@ -614,6 +610,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTableForm: false,
},
{
label: '父包装号',
@ -623,6 +620,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
},
isTable: false,
isTableForm: false,
},
{
label: '包装规格',
@ -635,6 +633,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTableForm: false,
},
{
label: '数量',
@ -645,6 +644,12 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
},
form: {
component: 'InputNumber',
},
tableForm: {
type: 'InputNumber',
min: 0,
max:999999,
// precision: 6
}
},
{
@ -657,6 +662,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTableForm: false,
},
{
label: '单价',
@ -668,7 +674,8 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
hiddenInMain: true,
form: {
component: 'InputNumber',
}
},
isTableForm: false,
},
{
label: '金额',
@ -680,7 +687,8 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
hiddenInMain: true,
form: {
component: 'InputNumber',
}
},
isTableForm: false,
},
{
label: '在途库库位',
@ -690,6 +698,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
},
isTable: false,
isTableForm: false,
},
{
label: '从库位',
@ -698,6 +707,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTableForm: false,
},
{
label: '到库位',
@ -706,6 +716,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTableForm: false,
},
{
label: '从库位组',
@ -715,6 +726,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
},
hiddenInMain: true,
isTableForm: false,
},
{
label: '到库位组',
@ -724,6 +736,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
},
hiddenInMain: true,
isTableForm: false,
},
{
label: '从库区',
@ -733,6 +746,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
},
hiddenInMain: true,
isTableForm: false,
},
{
label: '到库区',
@ -742,6 +756,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
},
hiddenInMain: true,
isTableForm: false,
},
// {
// label: '从器具号',
@ -771,6 +786,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTableForm: false,
},
{
label: '从货主代码',
@ -780,6 +796,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
},
isTable: false,
isTableForm: false,
},
{
label: '到货主代码',
@ -789,6 +806,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
},
isTable: false,
isTableForm: false,
},
{
label: '项目代码',
@ -798,6 +816,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
},
isTable: false,
isTableForm: false,
},
{
label: '备注',
@ -818,7 +837,19 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTableForm: false,
},
{
label: '创建者',
field: 'creator',
sort: 'custom',
table: {
width: 150
},
isTable: true,
isTableForm: false,
},
{
label: '创建时间',
field: 'createTime',
@ -831,6 +862,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
width: 180
},
isTable: true,
isTableForm: false,
form: {
component: 'DatePicker',
componentProps: {
@ -850,15 +882,36 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
},
},
{
label: '创建者',
field: 'creator',
label: '最后更新者',
field: 'updater',
sort: 'custom',
table: {
width: 150
},
isTable: true,
},
{
label: '最后更新时间',
field: 'updateTime',
formatter: dateFormatter,
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
sort: 'custom',
table: {
width: 180
},
isTable: true,
isTableForm: false,
form: {
component: 'DatePicker',
componentProps: {
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x'
}
}
},
// {
// label: '任务明细ID',
// field: 'jobDetailId',
@ -1144,4 +1197,4 @@ export const ImportLeadershipDocErrorData = useCrudSchemas(reactive<CrudSchema[]
field: 'difference',
sort: 'custom',
}
]))
]))

131
src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue

@ -42,12 +42,26 @@
<!-- 表单弹窗添加/修改 -->
<BasicForm
ref="formRef"
:isOpenSearchTable="true"
fieldTableColumn="itemCode"
@success="getList"
:rules="DeliverRecordMainRules"
:formAllSchemas="DeliverRecordMain.allSchemas"
:tableAllSchemas="DeliverRecordDetail.allSchemas"
:tableFormRules="DeliverRecordDetailRules"
:isBusiness="true"
:apiUpdate="DeliverRecordMainApi.inducedProductUpdate"
:apiCreate="DeliverRecordMainApi.inducedProductCreate"
fromeWhere="InducedProduct"
:tableData="tableData"
:handleAddTable="handleAddTable"
@handleDeleteTable="handleDeleteTable"
:isShowReduceButtonSelection="true"
@tableSelectionDelete="tableSelectionDelete"
@searchTableSuccess="searchTableAddSuccess"
@submitForm="submitForm"
:isShowButton=isShowButton
@clearSearchInput="clearSearchInput"
/>
<!-- 详情 -->
@ -73,7 +87,7 @@
:isShowDownloadBtn="false"
:confirmFormSuccess="confirmFormSuccess"
@searchTableSuccess="searchTableSuccess"
sourcePage="inducedProduct"
sourcePage="InducedProduct"
/>
</template>
<script setup lang="ts">
@ -99,6 +113,8 @@ const routeName = ref()
routeName.value = route.name
const businessType = ref()
const importFileName = ref()
const tableData = ref([])
const formRef = ref()
console.log(99 , routeName.value)
const tableColumns = ref([...DeliverRecordMain.allSchemas.tableColumns,...DeliverRecordDetail.allSchemas.tableMainColumns])
@ -110,18 +126,10 @@ const { tableObject, tableMethods } = useTable({
/**
* OktoholdRequestMain 合格转隔离
*/
if ( routeName.value == 'DeliverRecordMain') {
tableObject.params = {
businessType: 'Deliver'
}
businessType.value = 'Deliver'
importFileName.value = '成品发货记录'
} else if ( routeName.value == 'ZZBJDeliverRecordMain') {
tableObject.params = {
businessType: 'ZZBJDeliver'
}
businessType.value = 'ZZBJDeliver'
importFileName.value = '自制备件发货记录'
if ( routeName.value == 'InducedProduct') {
tableObject.params.businessType = 'InducedProduct'
businessType.value = 'InducedProduct'
importFileName.value = '顺引品发货记录'
}
//
@ -129,11 +137,39 @@ const updataTableColumns = (val) => {
tableColumns.value = val
}
// tableform
DeliverRecordDetail.allSchemas.tableFormColumns.map(item => {
if(item.field == 'itemCode') {
item.tableForm.searchCondition = [
{
key: 'businessType',
value: 'Deliver' ,
isMainValue: false
},
{
key: 'customerCode',
value: 'customerCode' ,
isMainValue: true
}]
item.form.componentProps.searchCondition = [
{
key: 'businessType',
value: businessType.value,
isMainValue: false
},{
key: 'customerCode',
value: 'customerCode' ,
isMainValue: true
}]
}
})
//
const { getList, setSearchParams } = tableMethods
//
const HeadButttondata = [
defaultButtons.defaultAddBtn({hasPermi:`wms:${routeName.value}:create`}), //
defaultButtons.defaultReceiptOfInclusionBtn({hasPermi:`wms:${routeName.value}:import`}), //
defaultButtons.defaultExportBtn({hasPermi:`wms:${routeName.value}:export`}), //
defaultButtons.defaultFreshBtn(null), //
@ -151,7 +187,9 @@ const HeadButttondata = [
//
const buttonBaseClick = (val, item) => {
if (val == 'export') { //
if (val == 'add') { //
handleCreate('create')
} else if (val == 'export') { //
handleExport()
} else if (val == 'refresh') { //
if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
@ -169,6 +207,8 @@ const buttonBaseClick = (val, item) => {
}
}
// -
const butttondata = (row,$index) => {
const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
@ -195,6 +235,19 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
detailRef.value.openDetail(row, titleName, titleValue,'recordDeliverMain')
}
/** 导出按钮操作 */
const handleCreate = async (type : string, row?: object) => {
DeliverRecordMain.allSchemas.formSchema.forEach(item => {
if (item.field == 'businessType') {
item.value = 'InducedProduct'
}
})
formRef.value.open(type,row)
}
/** 导出按钮操作 */
const handleExport = async () => {
try {
@ -273,6 +326,56 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
setV[formField] = val[0][searchField]
formRef.setValues(setV)
}
}
const searchTableAddSuccess = (formField, searchField, val, formRef, type, row) => {
if (type == 'tableForm') {
if(formField == 'itemCode') {
const tableFormKeys = {}
DeliverRecordDetail.allSchemas.tableFormColumns.forEach(item => {
tableFormKeys[item.field] = item.default ? item.default : ''
})
let itemCodes = val.filter(item=>tableData.value.find(item1=>item1['itemCode']==item['itemCode']))
if(itemCodes.length>0){
itemCodes = itemCodes.map(item=>(item['itemCode']))
message.warning(`物料${itemCodes.join(',')}已经存在`)
}
val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['itemCode']))
if(val.length==0) return
val.forEach(item=>{
const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
newRow['uom'] = item['customerUom']
newRow['id'] = item['id']
tableData.value.push(newRow)
})
}else{
row[formField] = val[0][searchField]
}
}
}
/**
* tableForm方法
*/
const tableFormKeys = {}
DeliverRecordDetail.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) => {
let itemIndex = tableData.value.indexOf(item)
if(itemIndex>-1){
tableData.value.splice(itemIndex, 1)
}
}
const tableSelectionDelete = (selection) => {
tableData.value = tableData.value.filter(item => !selection.includes(item))
}
/** 初始化 **/

28
src/views/wms/deliversettlementManage/ssSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts

@ -615,13 +615,37 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
},
},
{
label: '创建者',
field: 'creator',
label: '最后更新者',
field: 'updater',
sort: 'custom',
table: {
width: 150
},
isTable: true,
isForm: false
},
{
label: '最后更新时间',
field: 'updateTime',
formatter: dateFormatter,
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
sort: 'custom',
table: {
width: 180
},
isTable: true,
form: {
component: 'DatePicker',
componentProps: {
style: { width: '100%' },
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x'
}
},
isForm: false
},
// {
// label: '任务明细ID',

70
src/views/wms/deliversettlementManage/tjdtSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts

@ -160,39 +160,6 @@ export const DeliverRecordMain = useCrudSchemas(
isTable: false,
isForm: false,
},
{
label: '最后更新时间',
field: 'updateTime',
formatter: dateFormatter,
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
sort: 'custom',
table: {
width: 180
},
isTable: false,
form: {
component: 'DatePicker',
componentProps: {
style: { width: '100%' },
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x'
}
},
isForm: false
},
{
label: '最后更新者',
field: 'updater',
sort: 'custom',
table: {
width: 150
},
isTable: false,
isForm: false
},
// {
// label: '代码',
// field: 'code',
@ -530,6 +497,15 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
},
},
{
label: '创建者',
field: 'creator',
sort: 'custom',
table: {
width: 150
},
isTable: true,
},
{
label: '创建时间',
field: 'createTime',
@ -561,13 +537,37 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
},
},
{
label: '创建者',
field: 'creator',
label: '最后更新者',
field: 'updater',
sort: 'custom',
table: {
width: 150
},
isTable: true,
isForm: false
},
{
label: '最后更新时间',
field: 'updateTime',
formatter: dateFormatter,
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
sort: 'custom',
table: {
width: 180
},
isTable: true,
form: {
component: 'DatePicker',
componentProps: {
style: { width: '100%' },
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x'
}
},
isForm: false
},
// {
// label: '任务明细ID',

Loading…
Cancel
Save