sfms3.0
/
sfms3.0-ui
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

品番拉动修改

intex_online_yejiaxing
叶佳兴 2 weeks ago
parent
371fb0f779
commit
b8cdaa0022
3 changed files with 388 additions and 299 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 39
      src/views/wms/basicDataManage/itemPull/itemPull.data.ts
  2. 23
      src/views/wms/basicDataManage/supplierManage/modelDeliTime/index.vue
  3. 623
      src/views/wms/basicDataManage/supplierManage/modelDeliTime/modelDeliTime.data.ts

39
src/views/wms/basicDataManage/itemPull/itemPull.data.ts
View File

@ -4,16 +4,50 @@ import * as SupplierApi from '@/api/wms/supplier'
import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data' import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.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 AreaApi from '@/api/wms/areabasic'
import { Area } from '@/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data'
// 表单校验 // 表单校验
export const ItemPullRules = reactive({ export const ItemPullRules = reactive({
itemCode: [required], defaultErpLocationCode: [required],
replenishType: [required], replenishType: [required],
pullType: [required] pullType: [required]
}) })
export const ItemPull = useCrudSchemas( export const ItemPull = useCrudSchemas(
reactive<CrudSchema[]>([ reactive<CrudSchema[]>([
{
label: 'ERP默认收货库位',
field: 'defaultErpLocationCode',
sort: 'custom',
table: {
width: 150,
fixed: 'left'
},
form: {
// labelMessage: '信息提示说明！！！',
componentProps: {
multiple: true,
enterSearch: true,
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择ERP默认收货库位', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '库区信息', // 查询弹窗标题
searchAllSchemas: Area.allSchemas, // 查询弹窗所需类
searchPage: AreaApi.getAreaPage, // 查询弹窗所需分页方法
verificationParams: [
{
key: 'code',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true
}
] // 失去焦点校验参数
}
}
},
{ {
label: '品番', label: '品番',
field: 'itemCode', field: 'itemCode',
@ -21,7 +55,7 @@ export const ItemPull = useCrudSchemas(
isSearch: true, isSearch: true,
table: { table: {
width: 180, width: 180,
fixed: 'left'
}, },
form: { form: {
// labelMessage: '信息提示说明！！！', // labelMessage: '信息提示说明！！！',
@ -104,7 +138,6 @@ export const ItemPull = useCrudSchemas(
isSearch: true, isSearch: true,
table: { table: {
width: 150, width: 150,
fixed: 'left'
}, },
form: { form: {
// labelMessage: '信息提示说明！！！', // labelMessage: '信息提示说明！！！',

23
src/views/wms/basicDataManage/supplierManage/modelDeliTime/index.vue
View File

@ -142,7 +142,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
let tfk = JSON.parse(JSON.stringify(tableFormKeys)) let tfk = JSON.parse(JSON.stringify(tableFormKeys))
tfk['code'] = item['code'] tfk['code'] = item['code']
tfk['shift'] = item['shift'] tfk['shift'] = item['shift']
tfk['beginTime'] = item['begeinTime'] tfk['beginTime'] = item['beginTime']
tableData.value.push(tfk) tableData.value.push(tfk)
}) })
} }
@ -389,17 +389,34 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
detailRef.value.openDetail(row, titleName, titleValue, 'basicSupplierAddrDeliTimeDetail') detailRef.value.openDetail(row, titleName, titleValue, 'basicSupplierAddrDeliTimeDetail')
} }
/** 删除按钮操作 */
// const handleDelete = async (id: number) => {
// try {
// // 删除的二次确认
// await message.delConfirm()
// // 发起删除
// await ModelDeliTimeDetailApi.deleteSupplierAddrDeliTimeDetail(id)
// message.success(t('common.delSuccess'))
// // 刷新列表
// await getList()
// } catch {}
// }
/** 删除按钮操作 */ /** 删除按钮操作 */
const handleDelete = async (id: number) => { const handleDelete = async (id: number) => {
try { try {
// 删除的二次确认 // 删除的二次确认
await message.delConfirm() await message.delConfirm()
tableObject.loading = true
// 发起删除 // 发起删除
await ModelDeliTimeDetailApi.deleteSupplierAddrDeliTimeDetail(id) await ModelDeliTimeDetailApi.deleteSupplierAddrDeliTimeDetail(id)
message.success(t('common.delSuccess')) message.success(t('common.delSuccess'))
// 刷新列表 tableObject.loading = false
// 刷新列表
await getList() await getList()
} catch {} } catch {}finally{
tableObject.loading = false
}
} }
/** 导出按钮操作 */ /** 导出按钮操作 */

623
src/views/wms/basicDataManage/supplierManage/modelDeliTime/modelDeliTime.data.ts
View File

@ -1,5 +1,4 @@
import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter } from '@/utils/formatTime'
import * as SupplierApi from '@/api/wms/supplier' import * as SupplierApi from '@/api/wms/supplier'
// import {Supplier} from '@/basicDataManage/supplierManage/supplier/supplier.data' // import {Supplier} from '@/basicDataManage/supplierManage/supplier/supplier.data'
import { Supplier } from '../supplier/supplier.data' import { Supplier } from '../supplier/supplier.data'
@ -7,312 +6,289 @@ import { DeliTimeWms } from '../DeliTimeWms/deliTimeWms.data'
import * as DeliTimeWmsApi from '@/api/wms/deliTimeWms' import * as DeliTimeWmsApi from '@/api/wms/deliTimeWms'
import { fa } from 'element-plus/es/locale' import { fa } from 'element-plus/es/locale'
import * as modelDeliTimeApi from '@/api/wms/modelDeliTime' import * as modelDeliTimeApi from '@/api/wms/modelDeliTime'
import { dateFormatter, dateFormatterHHMMSS } from '@/utils/formatTime'
// 表单校验 // 表单校验
export const ModelDeliTimeDetailRules = reactive({ export const ModelDeliTimeDetailRules = reactive({
modelShow: [required], modelShow: [required],
yearAndMonthShow: [required], yearAndMonthShow: [required],
delayDeli: [required], delayDeli: [required]
}) })
function getMonthArr() { function getMonthArr() {
let dateArr = []; let dateArr = []
let year = new Date().getFullYear(); let year = new Date().getFullYear()
let month = new Date().getMonth(); let month = new Date().getMonth()
const n = 12 const n = 12
if (n < month) { if (n < month) {
//1.n<month的情况 //1.n<month的情况
for (let i = month - n + 1; i <= month; i++) { for (let i = month - n + 1; i <= month; i++) {
let m1 = i < 10 ? "0" + i : i; let m1 = i < 10 ? '0' + i : i
dateArr.push({ dateArr.push({
label: year + '-' + m1, label: year + '-' + m1,
value: year + '-' + m1 value: year + '-' + m1
}); })
} }
} else { } else {
//2.n>month的情况 //2.n>month的情况
for (let i = (12 - (n - month) + 1); i <= 12; i++) { for (let i = 12 - (n - month) + 1; i <= 12; i++) {
let m1 = i < 10 ? "0" + i : i; let m1 = i < 10 ? '0' + i : i
dateArr.push({ dateArr.push({
label: year + '-' + m1, label: year + '-' + m1,
value: year + '-' + m1 value: year + '-' + m1
}); })
} }
for (let i = 1; i <= month; i++) { for (let i = 1; i <= month; i++) {
let m1 = i < 10 ? "0" + i : i; let m1 = i < 10 ? '0' + i : i
dateArr.push({ dateArr.push({
label: (parseFloat(year) + 1) + '-' + m1, label: parseFloat(year) + 1 + '-' + m1,
value: (parseFloat(year) + 1) + '-' + m1, value: parseFloat(year) + 1 + '-' + m1
}); })
} }
} }
return dateArr; return dateArr
} }
export const ModelList = useCrudSchemas(reactive<CrudSchema[]>([ export const ModelList = useCrudSchemas(
{ reactive<CrudSchema[]>([
label: '受入号', {
field: 'model', label: '受入号',
sort: 'custom', field: 'model',
isSearch: true, sort: 'custom',
}, isSearch: true
])) }
])
)
export const ModelDeliTime = useCrudSchemas(reactive<CrudSchema[]>([ export const ModelDeliTime = useCrudSchemas(
// { reactive<CrudSchema[]>([
// label: '供应商代码', // {
// field: 'supplierCode', // label: '供应商代码',
// sort: 'custom', // field: 'supplierCode',
// isSearch: true, // sort: 'custom',
// form: { // isSearch: true,
// // labelMessage: '信息提示说明！！！', // form: {
// componentProps: { // // labelMessage: '信息提示说明！！！',
// isSearchList: true, // 开启查询弹窗 // componentProps: {
// enterSearch: true, // isSearchList: true, // 开启查询弹窗
// searchListPlaceholder: '请选择供应商代码', // 输入框占位文本 // enterSearch: true,
// searchField: 'number', // 查询弹窗赋值字段 // searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
// searchTitle: '供应商', // 查询弹窗标题 // searchField: 'number', // 查询弹窗赋值字段
// searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类 // searchTitle: '供应商', // 查询弹窗标题
// searchPage: SupplierApi.getSupplierPageSCP, // 查询弹窗所需分页方法 // searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
// searchCondition: [ // searchPage: SupplierApi.getSupplierPageSCP, // 查询弹窗所需分页方法
// { // searchCondition: [
// key: 'available', // {
// value: "TRUE", // key: 'available',
// isMainValue: false // value: "TRUE",
// } // isMainValue: false
// ], // }
// // 失去焦点校验参数 // ],
// verificationParams: [{ // // 失去焦点校验参数
// key: 'code', // verificationParams: [{
// action: '==', // key: 'code',
// value: '', // action: '==',
// isMainValue: false, // value: '',
// isSearch: 'true', // isMainValue: false,
// isFormModel: true, // isSearch: 'true',
// }] // isFormModel: true,
// } // }]
// }
// },
// {
// label: '供应商名称',
// field: 'supplierName',
// sort: 'custom',
// form :{
// componentProps:{
// disabled:true
// }
// },
// },
{
label: '受入号',
field: 'model',
sort: 'custom',
isSearch: true,
isTable: true,
isDetail: true,
// form: {
// component: 'Select',
// componentProps: {
// multiple: true,
// collapseTags: true,
// collapseTagsTooltip: true,
// maxCollapseTags: "2",
// optionsAlias: {
// labelField: 'label',
// valueField: 'value'
// } // }
// } // }
// } // },
form: { // {
// labelMessage: '信息提示说明！！！', // label: '供应商名称',
componentProps: { // field: 'supplierName',
multiple:true, // sort: 'custom',
disabled:true, // form :{
enterSearch: false, // componentProps:{
isSearchList: true, // 开启查询弹窗 // disabled:true
searchListPlaceholder: '请选择受入号', // 输入框占位文本 // }
searchField: 'model', // 查询弹窗赋值字段 // },
searchTitle: '受入号', // 查询弹窗标题 // },
searchAllSchemas: ModelList.allSchemas, // 查询弹窗所需类 {
searchPage: modelDeliTimeApi.getSupplierAddrList, // 查询弹窗所需分页方法 label: '受入号',
searchCondition: [ field: 'model',
{ sort: 'custom',
key: 'available', isSearch: true,
value: 'TRUE', isTable: true,
isMainValue: false isDetail: true,
}, // form: {
], // component: 'Select',
verificationParams: [ // componentProps: {
{ // multiple: true,
key: 'itemCode', // collapseTags: true,
action: '==', // collapseTagsTooltip: true,
value: '', // maxCollapseTags: "2",
isMainValue: false, // optionsAlias: {
isSearch: true, // labelField: 'label',
isFormModel: true // valueField: 'value'
} // }
] // 失去焦点校验参数 // }
} // }
} form: {
}, // labelMessage: '信息提示说明！！！',
// { componentProps: {
// label: '受入号', multiple: true,
// field: 'model', disabled: true,
// sort: 'custom', enterSearch: false,
// isTable: true, isSearchList: true, // 开启查询弹窗
// isDetail: true, searchListPlaceholder: '请选择受入号', // 输入框占位文本
// isForm: false, searchField: 'model', // 查询弹窗赋值字段
// }, searchTitle: '受入号', // 查询弹窗标题
{ searchAllSchemas: ModelList.allSchemas, // 查询弹窗所需类
label: '年月', searchPage: modelDeliTimeApi.getSupplierAddrList, // 查询弹窗所需分页方法
field: 'yearAndMonthShow', searchCondition: [
sort: 'custom', {
isTable: false, key: 'available',
isDetail: false, value: 'TRUE',
form: { isMainValue: false
component: 'Select', }
api: () => getMonthArr(), ],
value:[], verificationParams: [
componentProps: { {
multiple: true, key: 'itemCode',
collapseTags: true, action: '==',
collapseTagsTooltip: true, value: '',
maxCollapseTags:"2", isMainValue: false,
optionsAlias: { isSearch: true,
labelField: 'label', isFormModel: true
valueField: 'value' }
] // 失去焦点校验参数
} }
} }
} },
}, // {
{ // label: '受入号',
label: '年月', // field: 'model',
field: 'yearAndMonth', // sort: 'custom',
sort: 'custom', // isTable: true,
isTable: true, // isDetail: true,
isDetail: true, // isForm: false,
isForm: false, // },
isSearch: true, {
search: { label: '年月',
component: 'DatePicker', field: 'yearAndMonthShow',
componentProps: { sort: 'custom',
type: 'month', isTable: false,
valueFormat: 'YYYY-MM', isDetail: false,
form: {
component: 'Select',
api: () => getMonthArr(),
value: [],
componentProps: {
multiple: true,
collapseTags: true,
collapseTagsTooltip: true,
maxCollapseTags: '2',
optionsAlias: {
labelField: 'label',
valueField: 'value'
}
}
} }
}, },
}, {
{ label: '年月',
label: '延迟便次', field: 'yearAndMonth',
field: 'delayDeli', sort: 'custom',
sort: 'custom', isTable: true,
form: { isDetail: true,
component: 'InputNumber', isForm: false,
value: 0, isSearch: true,
componentProps: { search: {
min:0, component: 'DatePicker',
precision:0 componentProps: {
type: 'month',
valueFormat: 'YYYY-MM'
}
} }
}, },
}, {
{ label: '延迟便次',
label: '班次', field: 'delayDeli',
field: 'shift', sort: 'custom',
sort: 'custom', form: {
isForm: false, component: 'InputNumber',
dictType: DICT_TYPE.DELISHIF, value: 0,
dictClass: 'string', componentProps: {
}, min: 0,
{ precision: 0
label: '编号', }
field: 'code',
sort: 'custom',
isForm: false,
},
{
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')]
} }
}, },
isForm: false, {
detail: { label: '班次',
dateFormat: 'YYYY-MM-DD HH:mm:ss' field: 'shift',
sort: 'custom',
isForm: false,
dictType: DICT_TYPE.DELISHIF,
dictClass: 'string'
}, },
}, {
{ label: '编号',
label: '操作', field: 'code',
field: 'action', sort: 'custom',
isForm: false, isForm: false
isDetail:false, },
table: { {
width: 150, label: '创建时间',
fixed: 'right' field: 'createTime',
} sort: 'custom',
} formatter: dateFormatter,
])) search: {
component: 'DatePicker',
componentProps: {
valueFormat: 'YYYY-MM-DD HH:mm:ss',
export const ModelDeliTimeDetail = useCrudSchemas(reactive<CrudSchema[]>([ type: 'daterange',
{ defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
label: '编号', }
field: 'code',
sort: 'custom',
isForm: false,
tableForm:{
multiple: true,//多选
isInpuFocusShow: false, // 开启查询弹窗
disabled:true,
searchListPlaceholder: '请选择便次时间配置',// 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '便次时间配置', // 查询弹窗标题
searchAllSchemas: DeliTimeWms.allSchemas, // 查询弹窗所需类
searchPage: DeliTimeWmsApi.getDeliTimePage, // 查询弹窗所需分页方法
searchCondition: [{
key: 'available',
value: 'TRUE',
action: '==',
isSearch: true,
isMainValue: false
}, },
], isForm: false,
verificationPage: DeliTimeWmsApi.getDeliTimePage, // tableForm下方输入框校验失去焦点之后是否正确的方法 detail: {
// isShowTableFormSearch: true, //tableForm下方是否出现输入框 dateFormat: 'YYYY-MM-DD HH:mm:ss'
verificationParams: [{ }
key: 'itemCode',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true,
}], // 失去焦点校验参数
}, },
form: { {
// labelMessage: '信息提示说明！！！', label: '操作',
componentProps: { field: 'action',
disabled:true, isForm: false,
enterSearch: true, isDetail: false,
isSearchList: true, // 开启查询弹窗 table: {
searchListPlaceholder: '请选择品番', // 输入框占位文本 width: 150,
searchField: 'itemCode', // 查询弹窗赋值字段 fixed: 'right'
searchTitle: '供应商物料信息', // 查询弹窗标题 }
}
])
)
export const ModelDeliTimeDetail = useCrudSchemas(
reactive<CrudSchema[]>([
{
label: '编号',
field: 'code',
sort: 'custom',
isForm: false,
tableForm: {
multiple: true, //多选
isInpuFocusShow: false, // 开启查询弹窗
disabled: true,
searchListPlaceholder: '请选择便次时间配置', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '便次时间配置', // 查询弹窗标题
searchAllSchemas: DeliTimeWms.allSchemas, // 查询弹窗所需类 searchAllSchemas: DeliTimeWms.allSchemas, // 查询弹窗所需类
searchPage: DeliTimeWmsApi.getDeliTimePage, // 查询弹窗所需分页方法 searchPage: DeliTimeWmsApi.getDeliTimePage, // 查询弹窗所需分页方法
searchCondition: [ searchCondition: [
{ {
key: 'available', key: 'available',
value: 'TRUE', value: 'TRUE',
action: '==',
isSearch: true,
isMainValue: false isMainValue: false
}, }
], ],
verificationPage: DeliTimeWmsApi.getDeliTimePage, // tableForm下方输入框校验失去焦点之后是否正确的方法
// isShowTableFormSearch: true, //tableForm下方是否出现输入框
verificationParams: [ verificationParams: [
{ {
key: 'itemCode', key: 'itemCode',
@ -323,40 +299,103 @@ export const ModelDeliTimeDetail = useCrudSchemas(reactive<CrudSchema[]>([
isFormModel: true isFormModel: true
} }
] // 失去焦点校验参数 ] // 失去焦点校验参数
},
form: {
// labelMessage: '信息提示说明！！！',
componentProps: {
disabled: true,
enterSearch: true,
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择品番', // 输入框占位文本
searchField: 'itemCode', // 查询弹窗赋值字段
searchTitle: '供应商物料信息', // 查询弹窗标题
searchAllSchemas: DeliTimeWms.allSchemas, // 查询弹窗所需类
searchPage: DeliTimeWmsApi.getDeliTimePage, // 查询弹窗所需分页方法
searchCondition: [
{
key: 'available',
value: 'TRUE',
isMainValue: false
}
],
verificationParams: [
{
key: 'itemCode',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true
}
] // 失去焦点校验参数
}
}
},
{
label: '班次',
field: 'shift',
sort: 'custom',
isForm: false,
dictType: DICT_TYPE.DELISHIF,
dictClass: 'string',
tableForm: {
disabled: true,
type: 'Select'
}
},
{
label: '开始时间',
field: 'beginTime',
sort: 'custom',
formatter: dateFormatterHHMMSS,
isSearch: true,
search: {
component: 'TimePicker',
componentProps: {
type: 'time',
dateFormat: 'HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss'
}
},
form: {
component: 'TimePicker',
componentProps: {
disabled: true,
type: 'time',
dateFormat: 'HH:mm:ss',
valueFormat: 'x'
}
},
tableForm: {
disabled: true,
type:'FormDateTime',
format:'HH:mm:ss',
valueFormat: 'x'
},
detail: {
dateFormat: 'HH:mm:ss'
}
},
{
label: '操作',
field: 'action',
isForm: false,
isTableForm: false,
table: {
width: 150,
fixed: 'right'
} }
} }
}, // {
{ // label: '开始时间',
label: '班次', // field: 'beginTime',
field: 'shift', // sort: 'custom',
sort: 'custom', // isForm: false,
isForm: false, // formatter: dateFormatter,
dictType: DICT_TYPE.DELISHIF, // tableForm:{
dictClass: 'string', // disabled:true,
tableForm:{ // formatter: dateFormatter,
disabled:true, // }
type:'Select' // },
} ])
}, )
{
label: '操作',
field: 'action',
isForm: false,
isTableForm:false,
table: {
width: 150,
fixed: 'right'
}
}
// {
// label: '开始时间',
// field: 'beginTime',
// sort: 'custom',
// isForm: false,
// formatter: dateFormatter,
// tableForm:{
// disabled:true,
// formatter: dateFormatter,
// }
// },
]))

Write Preview
Loading…
Cancel
Save