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

Merge branch 'intex' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into intex

intex_online20241216
宋国强 2 months ago
parent
20dbe700d2 cdedec8ef9
commit
95d6b71a33
6 changed files with 358 additions and 100 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts
  2. 160
      src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts
  3. 2
      src/views/wms/productionManage/productionplan/productionMain/index.vue
  4. 149
      src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
  5. 2
      src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
  6. 143
      src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts

2
src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts
View File

@ -245,7 +245,7 @@ export const Itembasic = useCrudSchemas(reactive<CrudSchema[]>([
},
},
{
label: '项目',
label: '车型',
field: 'project',
sort: 'custom',
table: {

160
src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts
View File

@ -307,3 +307,163 @@ export const ProductionlineitemRules = reactive({
{ required: true, message: '请选择是否可用', trigger: 'change' }
],
})
/**
* @returns {Array} 生产线物料关系加上物料基本信息
*/
export const ProductionlineitemInfo = useCrudSchemas(reactive<CrudSchema[]>([
{
label: '产线代码',
field: 'productionLineCode',
isSearch: true,
sort: 'custom',
table: {
width: 150,
fixed: 'left'
},
isForm: true,
form: {
show: true,
component: 'SelectV2',
// value:'undefined',
value: lineCodeData?.list.length > 0 ? lineCodeData.list[0].code : 'undefined',
// labelMessage: '信息提示说明！！！',
componentProps: {
// isSearchList: true,
filterable: true,
placeholder: '请选择产线代码',
searchField: 'code',
// searchTitle: '生产线信息',
// searchAllSchemas: Productionline.allSchemas,
// searchPage: ProductionLineCodeApi.getProductionlinePage
options: lineCodeData.list.map(item => ({
label: item.code,
value: item.code
}))
}
},
},
{
label: '品番',
field: 'itemCode',
isSearch: true,
sort: 'custom',
table: {
width: 150
},
form: {
// labelMessage: '信息提示说明！！！',
componentProps: {
enterSearch: true,
isSearchList: true,
searchListPlaceholder: '请选择物料代码',
searchField: 'code',
searchTitle: '物料信息',
searchAllSchemas: Itembasic.allSchemas,
searchPage: ItembasicApi.getItembasicPage,
verificationParams: [{
key: 'code',
action: '==',
value: '',
isMainValue: false,
isSearch: 'true',
isFormModel: true
}], // 失去焦点校验参数
searchCondition: [
{
key: 'enableMake',
value: 'TRUE',
action: '==',
isSearch: true,
isMainValue: false
},
{
key: 'type',
value: confgiData.itemType,
action: 'notin',
isSearch: true,
isMainValue: false
},
{
key: 'available',
value: 'TRUE',
action: '==',
isSearch: true,
isMainValue: false
}
]
}
}
},
{
label: '品名',
field: 'itemCode',
},
{
label: '背番',
field: 'backNumber',
sort: 'custom',
table: {
width: 150
},
form: {
componentProps: {
disabled: true
}
},
tableForm: {
disabled: true
}
},
{
label: '车型',
field: 'vehicleType',
sort: 'custom',
table: {
width: 150
},
form: {
componentProps: {
disabled: true
}
},
tableForm: {
disabled: true
}
},
{
label: '创建时间',
field: 'createTime',
isForm: false,
formatter: dateFormatter,
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
form: {
component: 'DatePicker',
componentProps: {
style: { width: '100%' },
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
}
}
},
{
label: '创建者',
field: 'creator',
isForm: false,
isTable: true
},
{
label: '操作',
field: 'action',
isDetail: false,
isForm: false,
table: {
width: 150,
fixed: 'right'
}
}
]))

2
src/views/wms/productionManage/productionplan/productionMain/index.vue
View File

@ -150,6 +150,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
console.log(res)
if(res?.list?.length>0){
newRow['bomVersion'] = res.list[0].version
} else {
newRow['bomVersion'] = "1"
}
})
tableData.value.push(newRow)

149
src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
View File

@ -12,7 +12,7 @@ import { Shift } from '@/views/wms/basicDataManage/orderManage/shift/shift.data'
import * as TeamApi from '@/api/wms/team'
import { Team } from '@/views/wms/basicDataManage/orderManage/team/team.data'
import * as ProductionlineitemApi from '@/api/wms/productionlineitem'
import { Productionlineitem } from '@/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data'
import { Productionlineitem, ProductionlineitemInfo } from '@/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data'
import * as BomApi from '@/api/wms/bom'
import { Bom } from '@/views/wms/basicDataManage/itemManage/bom/bom.data'
@ -43,6 +43,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
},
isForm: false,
isSearch: true,
sortSearchDefault:1,
},
{
label: '客户订单号',
@ -51,7 +52,8 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
isSearch: true,
table: {
width: 150,
}
},
sortSearchDefault: 2,
},
{
label: '计划类型',
@ -89,6 +91,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
// }
// },
isSearch: true,
sortSearchDefault: 3,
},
{
label: '顺序',
@ -177,7 +180,9 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
isFormModel: true,
}], // 失去焦点校验参数
}
}
},
isSearch:true,
sortSearchDefault: 6,
},
{
label: '班组',
@ -285,7 +290,9 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
}
},
sortTableDefault:1000,
sortTableDefault: 1000,
sortSearchDefault: 4,
isTable: false,
form: {
component: 'DatePicker',
componentProps: {
@ -307,7 +314,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
sortTableDefault:1000,
sortTableDefault: 1000,
form: {
component: 'DatePicker',
componentProps: {
@ -329,7 +336,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
sortTableDefault:1000,
sortTableDefault: 1000,
form: {
component: 'DatePicker',
componentProps: {
@ -562,6 +569,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
},
isTable: true,
sortTableDefault: 1000,
isForm: false,
},
{
@ -576,6 +584,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 180
},
isTable: true,
sortTableDefault: 1000,
form: {
component: 'DatePicker',
componentProps: {
@ -586,7 +595,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
}
},
isForm: false,
isSearch: true,
isSearch: false,
search: {
component: 'DatePicker',
componentProps: {
@ -688,7 +697,7 @@ export const ProductionMainRules = reactive({
*/
export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
{
label: '物料代码',
label: '品番',
field: 'itemCode',
sort: 'custom',
isSearch: true,
@ -699,10 +708,10 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
// labelMessage: '信息提示说明！！！',
componentProps: {
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择物料代码', // 输入框占位文本
searchListPlaceholder: '请选择品番', // 输入框占位文本
searchField: 'itemCode', // 查询弹窗赋值字段
searchTitle: '生产线物料关系信息', // 查询弹窗标题
searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
searchAllSchemas: ProductionlineitemInfo.allSchemas, // 查询弹窗所需类
searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法
searchCondition: [{
key:'productionLineCode',
@ -717,14 +726,15 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
}
},
sortSearchDefault: 5,
tableForm:{
multiple:true,
disabled:true,
// isInpuFocusShow: true,
searchListPlaceholder: '请选择物料代码', // 输入框占位文本
searchListPlaceholder: '请选择品番', // 输入框占位文本
searchField: 'itemCode', // 查询弹窗赋值字段
searchTitle: '生产线物料关系信息', // 查询弹窗标题
searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
searchAllSchemas: ProductionlineitemInfo.allSchemas, // 查询弹窗所需类
searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法
searchCondition: [{
key:'productionLineCode',
@ -750,7 +760,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
},
},
{
label: '物料名称',
label: '品名',
field: 'itemName',
sort: 'custom',
table: {
@ -765,6 +775,38 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
disabled: true
}
},
{
label: '背番',
field: 'backNumber',
sort: 'custom',
table: {
width: 150
},
form: {
componentProps: {
disabled: true
}
},
tableForm: {
disabled: true
}
},
{
label: '车型',
field: 'vehicleType',
sort: 'custom',
table: {
width: 150
},
form: {
componentProps: {
disabled: true
}
},
tableForm: {
disabled: true
}
},
{
label: 'Bom版本',
field: 'bomVersion',
@ -772,10 +814,13 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTableForm: false,
isTable: false,
form: {
// labelMessage: '信息提示说明！！！',
componentProps: {
isSearchList: true, // 开启查询弹窗
disabled:true,
isSearchList: false, // 开启查询弹窗
searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
searchField: 'version', // 查询弹窗赋值字段
searchTitle: '物料清单信息', // 查询弹窗标题
@ -793,8 +838,9 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
}]
}
},
tableForm:{
isInpuFocusShow: true,
tableForm: {
disabled: true,
isInpuFocusShow: false,
searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
searchField: 'version', // 查询弹窗赋值字段
searchTitle: '物料清单信息', // 查询弹窗标题
@ -812,40 +858,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
}]
},
},
{
label: '计划日期',
field: 'planDate',
formatter: dateFormatter2,
detail: {
dateFormat: 'YYYY-MM-DD'
},
sort: 'custom',
table: {
width: 120
},
search: {
component: 'DatePicker',
componentProps: {
valueFormat: 'YYYY-MM-DD',
type: 'daterange',
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
}
},
isSearch: true,
isTableForm: false,
isForm: false,
// hiddenInMain: true,
sortTableDefault:1000,
form: {
component: 'DatePicker',
componentProps: {
style: {width: '100%'},
type: 'date',
dateFormat: 'YYYY-MM-DD',
valueFormat: 'x',
}
},
},
{
label: '计划数量',
field: 'planQty',
@ -873,7 +886,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
field: 'uom',
dictType: DICT_TYPE.UOM,
dictClass: 'string',
isSearch: true,
isSearch: false,
isTable: true,
sort: 'custom',
table: {
@ -891,6 +904,40 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
dictClass: 'string'
}
},
{
label: '计划日期',
field: 'planDate',
formatter: dateFormatter2,
detail: {
dateFormat: 'YYYY-MM-DD'
},
sort: 'custom',
table: {
width: 120
},
search: {
component: 'DatePicker',
componentProps: {
valueFormat: 'YYYY-MM-DD',
type: 'daterange',
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
}
},
isSearch: true,
isTableForm: false,
isForm: false,
// hiddenInMain: true,
sortSearchDefault: 4,
form: {
component: 'DatePicker',
componentProps: {
style: { width: '100%' },
type: 'date',
dateFormat: 'YYYY-MM-DD',
valueFormat: 'x',
}
},
},
{
label: '合格数量',
field: 'goodQty',

2
src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
View File

@ -148,6 +148,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
console.log(res)
if(res?.list?.length>0){
newRow['bomVersion'] = res.list[0].version
} else {
newRow['bomVersion'] = "1"
}
})
tableData.value.push(newRow)

143
src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
View File

@ -12,7 +12,7 @@ import { Shift } from '@/views/wms/basicDataManage/orderManage/shift/shift.data'
import * as TeamApi from '@/api/wms/team'
import { Team } from '@/views/wms/basicDataManage/orderManage/team/team.data'
import * as ProductionlineitemApi from '@/api/wms/productionlineitem'
import { Productionlineitem } from '@/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data'
import { Productionlineitem, ProductionlineitemInfo } from '@/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data'
import * as BomApi from '@/api/wms/bom'
import { Bom } from '@/views/wms/basicDataManage/itemManage/bom/bom.data'
@ -43,6 +43,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
},
isForm: false,
isSearch: true,
sortSearchDefault: 1,
},
{
label: '客户订单号',
@ -51,7 +52,8 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
isSearch: true,
table: {
width: 150,
}
},
sortSearchDefault: 2,
},
{
label: '计划类型',
@ -89,6 +91,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
// }
// },
isSearch: true,
sortSearchDefault: 3,
},
{
label: '顺序',
@ -176,7 +179,9 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
isFormModel: true,
}], // 失去焦点校验参数
}
}
},
isSearch: true,
sortSearchDefault: 6,
},
{
label: '班组',
@ -284,7 +289,9 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
}
},
sortTableDefault:1000,
sortTableDefault: 1000,
sortSearchDefault: 4,
isTable: false,
form: {
component: 'DatePicker',
componentProps: {
@ -562,6 +569,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
},
isTable: true,
isForm: false,
sortTableDefault: 1000,
},
{
label: '创建时间',
@ -585,7 +593,8 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
}
},
isForm: false,
isSearch: true,
isSearch: false,
sortTableDefault: 1000,
search: {
component: 'DatePicker',
componentProps: {
@ -687,21 +696,22 @@ export const ProductionMainRules = reactive({
*/
export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
{
label: '物料代码',
label: '品番',
field: 'itemCode',
sort: 'custom',
isSearch: true,
table: {
width: 150
},
sortSearchDefault: 5,
form: {
// labelMessage: '信息提示说明！！！',
componentProps: {
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择物料代码', // 输入框占位文本
searchListPlaceholder: '请选择品番', // 输入框占位文本
searchField: 'itemCode', // 查询弹窗赋值字段
searchTitle: '生产线物料关系信息', // 查询弹窗标题
searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
searchAllSchemas: ProductionlineitemInfo.allSchemas, // 查询弹窗所需类
searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法
searchCondition: [{
key:'productionLineCode',
@ -720,10 +730,10 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
disabled: true,
// enterSearch:true,
// isInpuFocusShow: true,
searchListPlaceholder: '请选择物料代码', // 输入框占位文本
searchListPlaceholder: '请选择品番', // 输入框占位文本
searchField: 'itemCode', // 查询弹窗赋值字段
searchTitle: '生产线物料关系信息', // 查询弹窗标题
searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
searchAllSchemas: ProductionlineitemInfo.allSchemas, // 查询弹窗所需类
searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法
searchCondition: [{
key:'productionLineCode',
@ -749,7 +759,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
},
},
{
label: '物料名称',
label: '品名',
field: 'itemName',
sort: 'custom',
table: {
@ -764,6 +774,38 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
disabled: true
}
},
{
label: '背番',
field: 'backNumber',
sort: 'custom',
table: {
width: 150
},
form: {
componentProps: {
disabled: true
}
},
tableForm: {
disabled: true
}
},
{
label: '车型',
field: 'vehicleType',
sort: 'custom',
table: {
width: 150
},
form: {
componentProps: {
disabled: true
}
},
tableForm: {
disabled: true
}
},
{
label: 'Bom版本',
field: 'bomVersion',
@ -771,6 +813,9 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTableForm: false,
isTable: false,
form: {
// labelMessage: '信息提示说明！！！',
componentProps: {
@ -811,40 +856,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
}]
},
},
{
label: '计划日期',
field: 'planDate',
formatter: dateFormatter2,
detail: {
dateFormat: 'YYYY-MM-DD'
},
sort: 'custom',
table: {
width: 120
},
search: {
component: 'DatePicker',
componentProps: {
valueFormat: 'YYYY-MM-DD',
type: 'daterange',
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
}
},
isSearch: true,
isTableForm: false,
isForm: false,
// hiddenInMain: true,
sortTableDefault:1000,
form: {
component: 'DatePicker',
componentProps: {
style: {width: '100%'},
type: 'date',
dateFormat: 'YYYY-MM-DD',
valueFormat: 'x',
}
},
},
{
label: '计划数量',
field: 'planQty',
@ -856,14 +868,14 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
component: 'InputNumber',
componentProps: {
min: 0,
max:9999,
max: 9999,
// precision: 6
}
},
tableForm: {
type: 'InputNumber',
min: 0,
max:9999,
max: 9999,
// precision: 6
},
},
@ -872,7 +884,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
field: 'uom',
dictType: DICT_TYPE.UOM,
dictClass: 'string',
isSearch: true,
isSearch: false,
isTable: true,
sort: 'custom',
table: {
@ -887,6 +899,40 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
type: 'Select'
}
},
{
label: '计划日期',
field: 'planDate',
formatter: dateFormatter2,
detail: {
dateFormat: 'YYYY-MM-DD'
},
sort: 'custom',
table: {
width: 120
},
search: {
component: 'DatePicker',
componentProps: {
valueFormat: 'YYYY-MM-DD',
type: 'daterange',
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
}
},
isSearch: true,
isTableForm: false,
isForm: false,
// hiddenInMain: true,
sortSearchDefault: 4,
form: {
component: 'DatePicker',
componentProps: {
style: { width: '100%' },
type: 'date',
dateFormat: 'YYYY-MM-DD',
valueFormat: 'x',
}
},
},
{
label: '完工数量',
field: 'goodQty',
@ -982,6 +1028,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
},
hiddenInMain: true,
isTableForm:false,
form: {
component: 'Switch',
value: 'TRUE',

Write Preview
Loading…
Cancel
Save