Browse Source

BUG修改

hella_online_20240829
叶佳兴 6 months ago
parent
commit
f3472bf6ac
  1. 6
      src/views/qms/inspectionQ1/index.vue
  2. 57
      src/views/qms/inspectionQ1/inspectionQ1.data.ts
  3. 5
      src/views/qms/inspectionQ2/index.vue
  4. 58
      src/views/qms/inspectionQ2/inspectionQ2.data.ts
  5. 41
      src/views/qms/inspectionQ3/inspectionQ3.data.ts
  6. 1198
      src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts
  7. 762
      src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts
  8. 1147
      src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts

6
src/views/qms/inspectionQ1/index.vue

@ -82,9 +82,11 @@ const tableColumns = ref(Q1.allSchemas.tableColumns)
// //
const searchTableSuccess = (formField, searchField, val, formRef) => { const searchTableSuccess = (formField, searchField, val, formRef) => {
nextTick(() => { nextTick(() => {
const setV = {} const setV = {}
if(formField == 'customerCode'){
setV['itemCode'] = '';
}
if(formField == 'itemCode'){ if(formField == 'itemCode'){
console.log(val);
setV['uom'] = val[0]['customerUom'] setV['uom'] = val[0]['customerUom']
} }
setV[formField] = val[0][searchField] setV[formField] = val[0][searchField]

57
src/views/qms/inspectionQ1/inspectionQ1.data.ts

@ -282,21 +282,21 @@ export const Q1 = useCrudSchemas(
{ {
label: '索赔日期', label: '索赔日期',
field: 'claimTime', field: 'claimTime',
sort: 'custom',
formatter: dateFormatter,
isSearch: false, isSearch: false,
search: { isTable: false,
component: 'DatePicker', table: {
componentProps: { width: 180
valueFormat: 'YYYY-MM-DD HH:mm:ss', },
type: 'daterange', formatter: dateFormatter,
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] detail: {
} dateFormat: 'YYYY-MM-DD HH:mm:ss'
}, },
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
style: { width: '100%' },
type: 'datetime', type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x' valueFormat: 'x'
} }
} }
@ -304,22 +304,21 @@ export const Q1 = useCrudSchemas(
{ {
label: '处理时间', label: '处理时间',
field: 'handleTime', field: 'handleTime',
sort: 'custom',
formatter: dateFormatter,
isSearch: false, isSearch: false,
isTable: false, isTable: false,
search: { table: {
component: 'DatePicker', width: 180
componentProps: { },
valueFormat: 'YYYY-MM-DD HH:mm:ss', formatter: dateFormatter,
type: 'daterange', detail: {
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] dateFormat: 'YYYY-MM-DD HH:mm:ss'
}
}, },
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
style: { width: '100%' },
type: 'datetime', type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x' valueFormat: 'x'
} }
} }
@ -367,23 +366,29 @@ export const Q1 = useCrudSchemas(
{ {
label: '创建时间', label: '创建时间',
field: 'createTime', field: 'createTime',
sort: 'custom', isForm: false,
table: {
width: 180
},
formatter: dateFormatter, formatter: dateFormatter,
isSearch: false, detail: {
search: { dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
valueFormat: 'YYYY-MM-DD HH:mm:ss', style: { width: '100%' },
type: 'daterange', type: 'datetime',
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x'
} }
}, }
isForm: false
}, },
{ {
label: '操作', label: '操作',
field: 'action', field: 'action',
isForm: false, isForm: false,
isDetail: false,
table: { table: {
width: 150, width: 150,
fixed: 'right' fixed: 'right'

5
src/views/qms/inspectionQ2/index.vue

@ -82,7 +82,10 @@ const tableColumns = ref(Q2.allSchemas.tableColumns)
// //
const searchTableSuccess = (formField, searchField, val, formRef) => { const searchTableSuccess = (formField, searchField, val, formRef) => {
nextTick(() => { nextTick(() => {
const setV = {} const setV = {}
if(formField == 'supplierCode'){
setV['itemCode'] = '';
}
if(formField == 'itemCode'){ if(formField == 'itemCode'){
setV['uom'] = val[0]['supplierUom'] setV['uom'] = val[0]['supplierUom']
} }

58
src/views/qms/inspectionQ2/inspectionQ2.data.ts

@ -372,25 +372,23 @@ export const Q2 = useCrudSchemas(
} }
} }
}, },
{ {
label: '索赔日期', label: '索赔日期',
field: 'claimTime', field: 'claimTime',
sort: 'custom', isForm: false,
table: {
width: 180
},
formatter: dateFormatter, formatter: dateFormatter,
isSearch: false, detail: {
search: { dateFormat: 'YYYY-MM-DD HH:mm:ss'
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')]
}
}, },
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
style: { width: '100%' },
type: 'datetime', type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x' valueFormat: 'x'
} }
} }
@ -398,22 +396,20 @@ export const Q2 = useCrudSchemas(
{ {
label: '处理时间', label: '处理时间',
field: 'handleTime', field: 'handleTime',
sort: 'custom', isForm: false,
table: {
width: 180
},
formatter: dateFormatter, formatter: dateFormatter,
isSearch: false, detail: {
isTable: false, dateFormat: 'YYYY-MM-DD HH:mm:ss'
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')]
}
}, },
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
style: { width: '100%' },
type: 'datetime', type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x' valueFormat: 'x'
} }
} }
@ -445,23 +441,29 @@ export const Q2 = useCrudSchemas(
{ {
label: '创建时间', label: '创建时间',
field: 'createTime', field: 'createTime',
sort: 'custom', isForm: false,
table: {
width: 180
},
formatter: dateFormatter, formatter: dateFormatter,
isSearch: false, detail: {
search: { dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
valueFormat: 'YYYY-MM-DD HH:mm:ss', style: { width: '100%' },
type: 'daterange', type: 'datetime',
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x'
} }
}, }
isForm: false
}, },
{ {
label: '操作', label: '操作',
field: 'action', field: 'action',
isForm: false, isForm: false,
isDetail: false,
table: { table: {
width: 150, width: 150,
fixed: 'right' fixed: 'right'

41
src/views/qms/inspectionQ3/inspectionQ3.data.ts

@ -334,22 +334,21 @@ export const Q3 = useCrudSchemas(
{ {
label: '处理时间', label: '处理时间',
field: 'handleTime', field: 'handleTime',
sort: 'custom',
formatter: dateFormatter,
isSearch: false, isSearch: false,
isTable: false, isTable: false,
search: { table: {
component: 'DatePicker', width: 180
componentProps: { },
valueFormat: 'YYYY-MM-DD HH:mm:ss', formatter: dateFormatter,
type: 'daterange', detail: {
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] dateFormat: 'YYYY-MM-DD HH:mm:ss'
}
}, },
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
style: { width: '100%' },
type: 'datetime', type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x' valueFormat: 'x'
} }
} }
@ -381,23 +380,31 @@ export const Q3 = useCrudSchemas(
{ {
label: '创建时间', label: '创建时间',
field: 'createTime', field: 'createTime',
sort: 'custom',
formatter: dateFormatter,
isSearch: false, isSearch: false,
search: { isTable: false,
isForm: false,
table: {
width: 180
},
formatter: dateFormatter,
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
valueFormat: 'YYYY-MM-DD HH:mm:ss', style: { width: '100%' },
type: 'daterange', type: 'datetime',
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x'
} }
}, }
isForm: false
}, },
{ {
label: '操作', label: '操作',
field: 'action', field: 'action',
isForm: false, isForm: false,
isDetail: false,
table: { table: {
width: 150, width: 150,
fixed: 'right' fixed: 'right'

1198
src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts

File diff suppressed because it is too large

762
src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts

@ -1,382 +1,432 @@
import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'
import * as InspectionQ1Api from '@/api/qms/inspectionQ1'
import { Q1 } from '@/views/qms/inspectionQ1/inspectionQ1.data'
/** /**
* @returns {Array} 退 * @returns {Array} 退
*/ */
export const CustomerreturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([ export const CustomerreturnRecordMain = useCrudSchemas(
{ reactive<CrudSchema[]>([
label: '单据号', {
field: 'number', label: '单据号',
sort: 'custom', field: 'number',
table: { sort: 'custom',
width: 180, table: {
fixed: 'left' width: 180,
}, fixed: 'left'
isSearch: true },
}, isSearch: true
{ },
label: '状态', {
field: 'status', label: '状态',
dictType: DICT_TYPE.REQUEST_STATUS, field: 'status',
dictClass: 'string', dictType: DICT_TYPE.REQUEST_STATUS,
isSearch: false, dictClass: 'string',
isTable: false, isSearch: false,
isDetail: false, isTable: false,
isForm: false, isDetail: false,
sort: 'custom', isForm: false,
table: { sort: 'custom',
width: 150 table: {
}, width: 150
},
{
label: '申请单号',
field: 'requestNumber',
sort: 'custom',
table: {
width: 180
},
isTable: true,
isSearch: true
},
{
label: '任务单号',
field: 'jobNumber',
sort: 'custom',
table: {
width: 180
},
isTable: false,
},
{
label: '发货记录单号',
field: 'deliverRecordNumber',
sort: 'custom',
table: {
width: 180
},
},
{
label: '发货计划单号',
field: 'deliverPlanNumber',
sort: 'custom',
table: {
width: 180
},
isTable: true,
},
{
label: '客户代码',
field: 'customerCode',
sort: 'custom',
table: {
width: 150
},
isSearch: true
},
{
label: '客户月台代码',
field: 'customerDockCode',
sort: 'custom',
table: {
width: 150
},
isTable: false,
},
{
label: '承运商',
field: 'carrierCode',
sort: 'custom',
table: {
width: 150
},
isTable: false,
},
{
label: '运输方式',
field: 'transferMode',
sort: 'custom',
table: {
width: 150
},
isTable: false,
},
{
label: '车牌号',
field: 'vehiclePlateNumber',
sort: 'custom',
table: {
width: 150
},
isTable: false,
},
{
label: '申请时间',
field: 'requestTime',
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: '申请单号',
label: '截止时间', field: 'requestNumber',
field: 'dueTime', sort: 'custom',
formatter: dateFormatter, table: {
detail: { width: 180
dateFormat: 'YYYY-MM-DD HH:mm:ss' },
}, isTable: true,
sort: 'custom', isSearch: true
table: { },
width: 180 {
}, label: '任务单号',
isTable: false, field: 'jobNumber',
form: { sort: 'custom',
component: 'DatePicker', table: {
componentProps: { width: 180
type: 'datetime', },
dateFormat: 'YYYY-MM-DD HH:mm:ss', isTable: false
valueFormat: 'x', },
{
label: '发货记录单号',
field: 'deliverRecordNumber',
sort: 'custom',
table: {
width: 180
} }
}, },
}, {
{ label: '发货计划单号',
label: '执行时间', field: 'deliverPlanNumber',
field: 'executeTime', sort: 'custom',
formatter: dateFormatter, table: {
detail: { width: 180
dateFormat: 'YYYY-MM-DD HH:mm:ss' },
}, isTable: true
sort: 'custom', },
table: { {
width: 180 label: 'Q1通知单号',
}, field: 'q1Number',
isTable: false, sort: 'custom',
form: { isSearch: false,
component: 'DatePicker', isDetail: true,
componentProps: { table: {
type: 'datetime', width: 150
dateFormat: 'YYYY-MM-DD HH:mm:ss', },
valueFormat: 'x', form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
enterSearch: true,
// multiple: true,
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择Q1通知单号', // 输入框占位文本
searchField: 'number', // 查询弹窗赋值字段
searchTitle: 'Q1通知单号', // 查询弹窗标题
searchAllSchemas: Q1.allSchemas, // 查询弹窗所需类
searchPage: InspectionQ1Api.getQ1Page, // 查询弹窗所需分页方法
searchCondition: [
{
key: 'available',
value: 'TRUE',
isMainValue: false
},
{
key: 'status',
value: '0',
isMainValue: false
}
],
verificationParams: [
{
key: 'number',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true
}
] // 失去焦点校验参数
}
} }
}, },
}, {
{ label: '客户代码',
label: '生效日期', field: 'customerCode',
field: 'activeDate', sort: 'custom',
formatter: dateFormatter2, table: {
detail: { width: 150
dateFormat: 'YYYY-MM-DD' },
}, isSearch: true
sort: 'custom', },
table: { {
width: 180 label: '客户月台代码',
}, field: 'customerDockCode',
isTable: false, sort: 'custom',
form: { table: {
component: 'DatePicker', width: 150
componentProps: { },
style: {width: '100%'}, isTable: false
type: 'date', },
dateFormat: 'YYYY-MM-DD', {
valueFormat: 'x', label: '承运商',
field: 'carrierCode',
sort: 'custom',
table: {
width: 150
},
isTable: false
},
{
label: '运输方式',
field: 'transferMode',
sort: 'custom',
table: {
width: 150
},
isTable: false
},
{
label: '车牌号',
field: 'vehiclePlateNumber',
sort: 'custom',
table: {
width: 150
},
isTable: false
},
{
label: '申请时间',
field: 'requestTime',
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: '截止时间',
label: '从仓库代码', field: 'dueTime',
field: 'fromWarehouseCode', formatter: dateFormatter,
sort: 'custom', detail: {
table: { dateFormat: 'YYYY-MM-DD HH:mm:ss'
width: 150 },
}, sort: 'custom',
isTable: false, table: {
}, width: 180
{ },
label: '到仓库代码', isTable: false,
field: 'toWarehouseCode', form: {
sort: 'custom', component: 'DatePicker',
table: { componentProps: {
width: 150 type: 'datetime',
}, dateFormat: 'YYYY-MM-DD HH:mm:ss',
isTable: false, valueFormat: 'x'
}, }
{ }
label: '从库区类型范围',
field: 'fromAreaTypes',
dictType: DICT_TYPE.AREA_TYPE,
dictClass: 'string',
isTable: false,
sort: 'custom',
table: {
width: 150
},
},
{
label: '从库区代码范围',
field: 'fromAreaCodes',
sort: 'custom',
table: {
width: 150
},
isTable: false,
},
{
label: '到库区类型范围',
field: 'toAreaTypes',
dictType: DICT_TYPE.AREA_TYPE,
dictClass: 'string',
isTable: false,
sort: 'custom',
table: {
width: 150
},
},
{
label: '到库区代码范围',
field: 'toAreaCodes',
sort: 'custom',
table: {
width: 150
},
isTable: false,
},
{
label: '到月台代码',
field: 'toDockCode',
sort: 'custom',
table: {
width: 150
},
isTable: false,
},
{
label: '出库事务类型',
field: 'outTransactionType',
sort: 'custom',
table: {
width: 150
},
isTable: false,
},
{
label: '入库事务类型',
field: 'inTransactionType',
sort: 'custom',
table: {
width: 150
},
isTable: false,
},
{
label: '业务类型',
field: 'businessType',
sort: 'custom',
table: {
width: 150
},
isTable: false,
},
{
label: '部门',
field: 'departmentCode',
sort: 'custom',
table: {
width: 150
},
isTable: false,
},
{
label: '接口类型',
field: 'interfaceType',
dictType: DICT_TYPE.INTERFACE_TYPE,
dictClass: 'string',
isTable: false,
sort: 'custom',
table: {
width: 150
}, },
}, {
{ label: '执行时间',
label: '备注', field: 'executeTime',
field: 'remark', formatter: dateFormatter,
sort: 'custom', detail: {
table: { dateFormat: 'YYYY-MM-DD HH:mm:ss'
width: 150 },
sort: 'custom',
table: {
width: 180
},
isTable: false,
form: {
component: 'DatePicker',
componentProps: {
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x'
}
}
}, },
isTable: false, {
}, label: '生效日期',
{ field: 'activeDate',
label: '创建时间', formatter: dateFormatter2,
field: 'createTime', detail: {
formatter: dateFormatter, dateFormat: 'YYYY-MM-DD'
detail: { },
dateFormat: 'YYYY-MM-DD HH:mm:ss' sort: 'custom',
table: {
width: 180
},
isTable: false,
form: {
component: 'DatePicker',
componentProps: {
style: { width: '100%' },
type: 'date',
dateFormat: 'YYYY-MM-DD',
valueFormat: 'x'
}
}
}, },
sort: 'custom', {
table: { label: '从仓库代码',
width: 180 field: 'fromWarehouseCode',
sort: 'custom',
table: {
width: 150
},
isTable: false
},
{
label: '到仓库代码',
field: 'toWarehouseCode',
sort: 'custom',
table: {
width: 150
},
isTable: false
},
{
label: '从库区类型范围',
field: 'fromAreaTypes',
dictType: DICT_TYPE.AREA_TYPE,
dictClass: 'string',
isTable: false,
sort: 'custom',
table: {
width: 150
}
}, },
isTable: true, {
form: { label: '从库区代码范围',
component: 'DatePicker', field: 'fromAreaCodes',
componentProps: { sort: 'custom',
type: 'datetime', table: {
dateFormat: 'YYYY-MM-DD HH:mm:ss', width: 150
valueFormat: 'x', },
isTable: false
},
{
label: '到库区类型范围',
field: 'toAreaTypes',
dictType: DICT_TYPE.AREA_TYPE,
dictClass: 'string',
isTable: false,
sort: 'custom',
table: {
width: 150
} }
}, },
}, {
{ label: '到库区代码范围',
label: '创建者', field: 'toAreaCodes',
field: 'creator', sort: 'custom',
sort: 'custom', table: {
table: { width: 150
width: 150 },
isTable: false
},
{
label: '到月台代码',
field: 'toDockCode',
sort: 'custom',
table: {
width: 150
},
isTable: false
},
{
label: '出库事务类型',
field: 'outTransactionType',
sort: 'custom',
table: {
width: 150
},
isTable: false
},
{
label: '入库事务类型',
field: 'inTransactionType',
sort: 'custom',
table: {
width: 150
},
isTable: false
},
{
label: '业务类型',
field: 'businessType',
sort: 'custom',
table: {
width: 150
},
isTable: false
},
{
label: '部门',
field: 'departmentCode',
sort: 'custom',
table: {
width: 150
},
isTable: false
},
{
label: '接口类型',
field: 'interfaceType',
dictType: DICT_TYPE.INTERFACE_TYPE,
dictClass: 'string',
isTable: false,
sort: 'custom',
table: {
width: 150
}
}, },
isTable: true, {
}, label: '备注',
// { field: 'remark',
// label: '代码', sort: 'custom',
// field: 'code', table: {
// sort: 'custom', width: 150
// table: { },
// width: 150 isTable: false
// }, },
// }, {
{ label: '创建时间',
label: '是否可用', field: 'createTime',
field: 'available', formatter: dateFormatter,
dictType: DICT_TYPE.TRUE_FALSE, detail: {
dictClass: 'string', dateFormat: 'YYYY-MM-DD HH:mm:ss'
isSearch: false, },
isTable: false, sort: 'custom',
sort: 'custom', table: {
table: { width: 180
width: 150 },
isTable: true,
form: {
component: 'DatePicker',
componentProps: {
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x'
}
}
}, },
form: { {
component: 'Switch', label: '创建者',
value: 'TRUE', field: 'creator',
componentProps: { sort: 'custom',
inactiveValue: 'FALSE', table: {
activeValue: 'TRUE' width: 150
},
isTable: true
},
// {
// label: '代码',
// field: 'code',
// sort: 'custom',
// table: {
// width: 150
// },
// },
{
label: '是否可用',
field: 'available',
dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string',
isSearch: false,
isTable: false,
sort: 'custom',
table: {
width: 150
},
form: {
component: 'Switch',
value: 'TRUE',
componentProps: {
inactiveValue: 'FALSE',
activeValue: 'TRUE'
}
} }
} }
}, ])
])) )
//表单校验 //表单校验
export const CustomerreturnRecordMainRules = reactive({ export const CustomerreturnRecordMainRules = reactive({

1147
src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts

File diff suppressed because it is too large
Loading…
Cancel
Save