Browse Source

制造件标签修改

intex_online20241228
叶佳兴 2 months ago
parent
commit
aef23ca43f
  1. 14
      src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue
  2. 291
      src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts
  3. 98
      src/views/wms/inventoryManage/balance/balance.data.ts
  4. 6
      src/views/wms/inventoryManage/balance/index.vue
  5. 10
      src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
  6. 101
      src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
  7. 561
      src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts

14
src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue

@ -66,7 +66,7 @@ import * as BarbasicApi from '@/api/wms/barbasic'
import * as defaultButtons from '@/utils/disposition/defaultButtons' import * as defaultButtons from '@/utils/disposition/defaultButtons'
import * as PackageApi from '@/api/wms/package' import * as PackageApi from '@/api/wms/package'
import { formatTime } from '@/utils/index' import { formatTime } from '@/utils/index'
import * as Itempackaging from '@/api/wms/itempackage' import * as itembasicApi from '@/api/wms/itembasic'
import { getJmreportBaseUrl } from '@/utils/systemParam' import { getJmreportBaseUrl } from '@/utils/systemParam'
import { formatDate } from '@/utils/formatTime' import { formatDate } from '@/utils/formatTime'
import { usePageLoading } from '@/hooks/web/usePageLoading' import { usePageLoading } from '@/hooks/web/usePageLoading'
@ -110,17 +110,21 @@ const searchTableSuccess = (formField, searchField, val, basicFormRef, type, row
setV['produceDate'] = '' setV['produceDate'] = ''
setV['expireDate'] = '' setV['expireDate'] = ''
setV['validityDays'] = val[0]['validityDays'] setV['validityDays'] = val[0]['validityDays']
await Itempackaging.getItempackagingPage({ await itembasicApi.getItembasicPage({
itemCode: val[0]['code'] code: val[0]['code']
}).then(res => { }).then(res => {
if (res) { if (res) {
if (res.list.length > 0) { if (res.list.length > 0) {
setV['packQty'] = res.list[0].packQty setV['packQty'] = res.list[0].defaultPackQty
setV['packUnit'] = res.list[0].packUnit setV['packUnit'] = res.list[0].defaultPackUnit
} }
} }
}) })
} }
if(formField == 'packUnit') {
setV['packUnit'] = val[0].packUnit
setV['packQty'] = val[0].packQty
}
basicFormRef.setValues(setV) basicFormRef.setValues(setV)
}) })
} }

291
src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts

@ -1,23 +1,27 @@
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 { Itembasic } from "@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data"; import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
import * as ItembasicApi from "@/api/wms/itembasic"; import * as ItembasicApi from '@/api/wms/itembasic'
import { Productionline } from "@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data"; import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data'
import * as ProductionlineApi from "@/api/wms/productionline"; import * as ProductionlineApi from '@/api/wms/productionline'
import { Shift } from "@/views/wms/basicDataManage/orderManage/shift/shift.data"; import { Shift } from '@/views/wms/basicDataManage/orderManage/shift/shift.data'
import * as ShiftApi from "@/api/wms/shift"; import * as ShiftApi from '@/api/wms/shift'
import { Team } from "@/views/wms/basicDataManage/orderManage/team/team.data"; import { Team } from '@/views/wms/basicDataManage/orderManage/team/team.data'
import * as TeamApi from "@/api/wms/team"; import * as TeamApi from '@/api/wms/team'
import * as ItempackagingApi from '@/api/wms/itempackage'
import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
// 表单校验 // 表单校验
export const PackageRules = reactive({ export const PackageRules = reactive({
number: [required], number: [required],
itemCode: [required], itemCode: [required],
itemName: [required], itemName: [required]
}) })
export const Package = useCrudSchemas(reactive<CrudSchema[]>([ export const Package = useCrudSchemas(
reactive<CrudSchema[]>([
{ {
label: '标签号', label: '标签号',
field: 'number', field: 'number',
@ -74,7 +78,7 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
field: 'barcodeString', field: 'barcodeString',
sort: 'custom', sort: 'custom',
table: { table: {
width: 380, width: 380
} }
}, },
// { // {
@ -135,7 +139,7 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', // 默认都是字符串类型其他暂不考虑 dictClass: 'string', // 默认都是字符串类型其他暂不考虑
search: { search: {
value: 'TRUE', value: 'TRUE'
}, },
form: { form: {
component: 'Switch', component: 'Switch',
@ -166,7 +170,7 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
style: { width: '100%' }, style: { width: '100%' },
type: 'datetime', type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss', dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x', valueFormat: 'x'
} }
} }
}, },
@ -199,7 +203,7 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
style: { width: '100%' }, style: { width: '100%' },
type: 'datetime', type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss', dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x', valueFormat: 'x'
} }
} }
}, },
@ -222,16 +226,18 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
fixed: 'right' fixed: 'right'
} }
} }
])) ])
)
export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([ export const PackageInventory = useCrudSchemas(
reactive<CrudSchema[]>([
{ {
label: '物料代码', label: '物料代码',
field: 'itemCode', field: 'itemCode',
sort: 'custom', sort: 'custom',
isSearch: true, isSearch: true,
table: { table: {
width: 150, width: 150
}, },
form: { form: {
// labelMessage: '信息提示说明!!!', // labelMessage: '信息提示说明!!!',
@ -243,23 +249,28 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
searchTitle: '物料信息', searchTitle: '物料信息',
searchAllSchemas: Itembasic.allSchemas, searchAllSchemas: Itembasic.allSchemas,
searchPage: ItembasicApi.getItembasicPage, searchPage: ItembasicApi.getItembasicPage,
searchCondition: [{ searchCondition: [
{
key: 'available', key: 'available',
value: 'TRUE', value: 'TRUE',
isMainValue: false isMainValue: false
}, { },
{
key: 'enableMake', key: 'enableMake',
value: 'TRUE', value: 'TRUE',
isMainValue: false isMainValue: false
}], }
verificationParams: [{ ],
verificationParams: [
{
key: 'code', key: 'code',
action: '==', action: '==',
value: '', value: '',
isMainValue: false, isMainValue: false,
isSearch: true, isSearch: true,
isFormModel: true, isFormModel: true
}], // 失去焦点校验参数 }
] // 失去焦点校验参数
} }
} }
}, },
@ -268,7 +279,7 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
field: 'itemName', field: 'itemName',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150, width: 150
}, },
isForm: false isForm: false
}, },
@ -277,7 +288,7 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
field: 'itemDesc1', field: 'itemDesc1',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150, width: 150
}, },
isForm: false isForm: false
}, },
@ -286,7 +297,7 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
field: 'itemDesc2', field: 'itemDesc2',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150, width: 150
}, },
isForm: false isForm: false
}, },
@ -296,8 +307,8 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom', sort: 'custom',
isSearch: true, isSearch: true,
table: { table: {
width: 150, width: 150
}, }
}, },
// { // {
// label: '替代批次', // label: '替代批次',
@ -318,7 +329,7 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
style: { width: '100%' }, style: { width: '100%' },
valueFormat: 'YYYY-MM-DD', valueFormat: 'YYYY-MM-DD',
type: 'daterange', type: 'daterange',
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')], defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
} }
}, },
form: { form: {
@ -327,12 +338,12 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
style: { width: '100%' }, style: { width: '100%' },
type: 'date', type: 'date',
dateFormat: 'YYYY-MM-DD', dateFormat: 'YYYY-MM-DD',
valueFormat: 'x', valueFormat: 'x'
} }
}, },
table: { table: {
width: 180, width: 180
}, }
}, },
{ {
label: '有效期(日)', label: '有效期(日)',
@ -348,8 +359,8 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
value: 0 value: 0
}, },
table: { table: {
width: 150, width: 150
}, }
}, },
{ {
label: '失效日期', label: '失效日期',
@ -377,8 +388,8 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
} }
}, },
table: { table: {
width: 180, width: 180
}, }
}, },
{ {
label: '计量单位', label: '计量单位',
@ -390,15 +401,15 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
component: 'Select' component: 'Select'
}, },
table: { table: {
width: 150, width: 150
}, }
}, },
{ {
label: '数量', label: '数量',
field: 'qty', field: 'qty',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150, width: 150
}, },
form: { form: {
component: 'InputNumber', component: 'InputNumber',
@ -407,7 +418,7 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
precision: 6 precision: 6
}, },
value: 0 value: 0
}, }
}, },
{ {
label: '替代计量单位', label: '替代计量单位',
@ -419,15 +430,15 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
component: 'Select' component: 'Select'
}, },
table: { table: {
width: 150, width: 150
}, }
}, },
{ {
label: '替代数量', label: '替代数量',
field: 'altQty', field: 'altQty',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150, width: 150
}, },
form: { form: {
component: 'InputNumber', component: 'InputNumber',
@ -436,49 +447,102 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
precision: 6 precision: 6
}, },
value: 0 value: 0
}, }
}, },
{ {
label: '转换率', label: '转换率',
field: 'convertRate', field: 'convertRate',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150, width: 150
}, }
}, },
{ {
label: '包装数量', label: '包装规格',
field: 'packQty', field: 'packUnit',
sort: 'custom', sort: 'custom',
isSearch: false,
table: { table: {
width: 150, width: 120
},
form: {
componentProps:{
disabled: true
}
}, },
isTable: false,
isTableForm: false,
isForm: true,
tableForm: { tableForm: {
disabled: true enterSearch: true,
} isInpuFocusShow: true,
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择包装规格', // 输入框占位文本
searchField: 'packUnit', // 查询弹窗赋值字段
searchTitle: '物料包装信息', // 查询弹窗标题
searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
searchPage: ItempackagingApi.getItempackagingPage, // 查询弹窗所需分页方法
searchCondition: [
{
key: 'available',
value: 'TRUE',
isMainValue: false
}, },
{ {
label: '包装规格', key: 'itemCode',
field: 'packUnit', value: 'itemCode',
sort: 'custom', message: '请先选择物料代码!',
// dictType: DICT_TYPE.PACK_UNIT, isMainValue: true
// dictClass: 'string', // 默认都是字符串类型其他暂不考虑 }
table: { ],
width: 150, verificationParams: [
{
key: 'packUnit',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true
}
] // 失去焦点校验参数
}, },
form: { form: {
component: 'Select', // labelMessage: '信息提示说明!!!',
componentProps: { componentProps: {
disabled: true isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择包装规格', // 输入框占位文本
searchField: 'packUnit', // 查询弹窗赋值字段
searchTitle: '物料包装信息', // 查询弹窗标题
searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
searchPage: ItempackagingApi.getItempackagingPage, // 查询弹窗所需分页方法
searchCondition: [
{
key: 'available',
value: 'TRUE',
isMainValue: false
},
{
key: 'itemCode',
value: 'itemCode',
message: '请先选择物料代码!', // 当前置条件为空时 弹出信息提示
isMainValue: true
}
],
verificationParams: [
{
key: 'packUnit',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true
}
] // 失去焦点校验参数
}
} }
}, },
tableForm: { {
disabled: true label: '包装数量',
field: 'packQty',
sort: 'custom',
table: {
width: 150
} }
}, },
// { // {
@ -518,7 +582,7 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
field: 'productionLineCodePackage', field: 'productionLineCodePackage',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150, width: 150
}, },
form: { form: {
// labelMessage: '信息提示说明!!!', // labelMessage: '信息提示说明!!!',
@ -530,19 +594,23 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
searchTitle: '生产线信息', searchTitle: '生产线信息',
searchAllSchemas: Productionline.allSchemas, searchAllSchemas: Productionline.allSchemas,
searchPage: ProductionlineApi.getProductionlinePage, searchPage: ProductionlineApi.getProductionlinePage,
searchCondition: [{ searchCondition: [
{
key: 'available', key: 'available',
value: 'TRUE', value: 'TRUE',
isMainValue: false isMainValue: false
}], }
verificationParams: [{ ],
verificationParams: [
{
key: 'code', key: 'code',
action: '==', action: '==',
value: '', value: '',
isMainValue: false, isMainValue: false,
isSearch: true, isSearch: true,
isFormModel: true, isFormModel: true
}], // 失去焦点校验参数 }
] // 失去焦点校验参数
} }
} }
}, },
@ -551,7 +619,7 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
field: 'teamCode', field: 'teamCode',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150, width: 150
}, },
form: { form: {
// labelMessage: '信息提示说明!!!', // labelMessage: '信息提示说明!!!',
@ -563,19 +631,23 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
searchTitle: '生产线信息', searchTitle: '生产线信息',
searchAllSchemas: Team.allSchemas, searchAllSchemas: Team.allSchemas,
searchPage: TeamApi.getTeamPage, searchPage: TeamApi.getTeamPage,
searchCondition: [{ searchCondition: [
{
key: 'available', key: 'available',
value: 'TRUE', value: 'TRUE',
isMainValue: false isMainValue: false
}], }
verificationParams: [{ ],
verificationParams: [
{
key: 'code', key: 'code',
action: '==', action: '==',
value: '', value: '',
isMainValue: false, isMainValue: false,
isSearch: true, isSearch: true,
isFormModel: true, isFormModel: true
}], // 失去焦点校验参数 }
] // 失去焦点校验参数
} }
} }
}, },
@ -584,7 +656,7 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
field: 'shiftCode', field: 'shiftCode',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150, width: 150
}, },
form: { form: {
// labelMessage: '信息提示说明!!!', // labelMessage: '信息提示说明!!!',
@ -596,19 +668,23 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
searchTitle: '生产线信息', searchTitle: '生产线信息',
searchAllSchemas: Shift.allSchemas, searchAllSchemas: Shift.allSchemas,
searchPage: ShiftApi.getShiftPage, searchPage: ShiftApi.getShiftPage,
searchCondition: [{ searchCondition: [
{
key: 'available', key: 'available',
value: 'TRUE', value: 'TRUE',
isMainValue: false isMainValue: false
}], }
verificationParams: [{ ],
verificationParams: [
{
key: 'code', key: 'code',
action: '==', action: '==',
value: '', value: '',
isMainValue: false, isMainValue: false,
isSearch: true, isSearch: true,
isFormModel: true, isFormModel: true
}], // 失去焦点校验参数 }
] // 失去焦点校验参数
} }
} }
}, },
@ -621,38 +697,25 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
fixed: 'right' fixed: 'right'
} }
} }
])) ])
)
//表单校验 //表单校验
export const PackageRulesInventor = reactive({ export const PackageRulesInventor = reactive({
itemCode: [ itemCode: [{ required: true, message: '请选择物料代码', trigger: 'change' }],
{ required: true, message: '请选择物料代码', trigger: 'change' } batch: [{ required: true, message: '请输入批次', trigger: 'blur' }],
], produceDate: [{ required: true, message: '请选择生产日期', trigger: 'change' }],
batch: [ validityDays: [{ required: true, message: '请输入有效期(日)', trigger: 'blur' }],
{ required: true, message: '请输入批次', trigger: 'blur' } expireDate: [{ required: true, message: '请选择失效日期', trigger: 'change' }],
], uom: [{ required: true, message: '请选择计量单位', trigger: 'change' }],
produceDate: [ qty: [{ required: true, message: '请输入数量', trigger: 'blur' }],
{ required: true, message: '请选择生产日期', trigger: 'change' } woNumber: [{ required: true, message: '请选择生产订单号', trigger: 'change' }],
], woLine: [{ required: true, message: '请选择生产订单行', trigger: 'change' }],
validityDays: [ productionLineCodePackage: [{ required: true, message: '请选择生产线代码', trigger: 'change' }],
{ required: true, message: '请输入有效期(日)', trigger: 'blur' } packUnit: [
], { required: true, message: '请选择包装规格', trigger: ['change','blur'] }
expireDate: [
{ required: true, message: '请选择失效日期', trigger: 'change' }
],
uom: [
{ required: true, message: '请选择计量单位', trigger: 'change' }
],
qty: [
{ required: true, message: '请输入数量', trigger: 'blur' }
],
woNumber: [
{ required: true, message: '请选择生产订单号', trigger: 'change' }
],
woLine: [
{ required: true, message: '请选择生产订单行', trigger: 'change' }
], ],
productionLineCodePackage: [ packQty: [
{ required: true, message: '请选择生产线代码', trigger: 'change' } { required: true, message: '请输入包装数量', trigger: ['change','blur'] }
], ],
}) })

98
src/views/wms/inventoryManage/balance/balance.data.ts

@ -7,6 +7,9 @@ import { Supplieritem } from '@/views/wms/basicDataManage/supplierManage/supplie
import * as ProductionlineitemApi from '@/api/wms/productionlineitem' import * as ProductionlineitemApi from '@/api/wms/productionlineitem'
import { Productionlineitem } from '@/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data' import { Productionlineitem } from '@/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data'
import { validatePositiveNumber } from "@/utils/validator"; import { validatePositiveNumber } from "@/utils/validator";
import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
import * as ItemPackageApi from '@/api/wms/itempackage/index'
/** /**
* @returns {Array} * @returns {Array}
*/ */
@ -902,20 +905,107 @@ export const BalancePackage = useCrudSchemas(reactive<CrudSchema[]>([
min: 0 min: 0
} }
}, },
// {
// label: '包装规格',
// field: 'packUnit',
// sort: 'custom',
// tableForm: {
// disabled: true
// }
// },
// {
// label: '标包数量',
// field: 'packQty',
// sort: 'custom',
// tableForm: {
// disabled: true
// }
// },
{ {
label: '包装规格', label: '包装规格',
field: 'packUnit', field: 'packUnit',
sort: 'custom', sort: 'custom',
isSearch: false,
table: {
width: 120
},
isTable: false,
isTableForm: true,
isForm: true,
tableForm: { tableForm: {
disabled: true enterSearch: true,
isInpuFocusShow: true,
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择包装规格', // 输入框占位文本
searchField: 'packUnit', // 查询弹窗赋值字段
searchTitle: '物料包装信息', // 查询弹窗标题
searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
searchPage: ItemPackageApi.getItempackagingPage, // 查询弹窗所需分页方法
searchCondition: [
{
key: 'available',
value: 'TRUE',
isMainValue: false
},
{
key: 'itemCode',
value: 'itemCode',
message: '请先选择物料代码!',
isMainValue: true
} }
],
verificationParams: [
{
key: 'packUnit',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true
}
] // 失去焦点校验参数
},
form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择包装规格', // 输入框占位文本
searchField: 'packUnit', // 查询弹窗赋值字段
searchTitle: '物料包装信息', // 查询弹窗标题
searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
searchPage: ItemPackageApi.getItempackagingPage, // 查询弹窗所需分页方法
searchCondition: [
{
key: 'available',
value: 'TRUE',
isMainValue: false
}, },
{ {
label: '标包数量', key: 'itemCode',
value: 'itemCode',
message: '请先选择物料代码!', // 当前置条件为空时 弹出信息提示
isMainValue: true
}
],
verificationParams: [
{
key: 'packUnit',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true
}
] // 失去焦点校验参数
}
}
},
{
label: '包装数量',
field: 'packQty', field: 'packQty',
sort: 'custom', sort: 'custom',
tableForm: { table: {
disabled: true width: 150
} }
}, },
{ {

6
src/views/wms/inventoryManage/balance/index.vue

@ -475,7 +475,11 @@ const getLabelDetailPage = async (row, useToPackingNumber) => {
const searchTableSuccessLabel = async (formField, searchField, val, formRef, type, row) => { const searchTableSuccessLabel = async (formField, searchField, val, formRef, type, row) => {
console.log('批量打印',val) console.log('批量打印',val)
if (type == 'tableForm') { if (type == 'tableForm') {
row[formField] = val[0][searchField] // row[formField] = val[0][searchField]
if (formField === 'packUnit') {
row['packUnit'] = val[0]['packUnit']
row['packQty'] = val[0]['packQty']
}
} else { } else {
const setV = {} const setV = {}
setV[formField] = val[0][searchField] setV[formField] = val[0][searchField]

10
src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts

@ -1706,7 +1706,6 @@ export const UnplannedreceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSc
table: { table: {
width: 150, width: 150,
componentProps: { componentProps: {
disabled: true,
isSearchList: true, isSearchList: true,
searchListPlaceholder: '请选择包装', searchListPlaceholder: '请选择包装',
searchField: 'packUnit', searchField: 'packUnit',
@ -1731,7 +1730,6 @@ export const UnplannedreceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSc
}, },
tableForm: { tableForm: {
enterSearch:true, enterSearch:true,
disabled: true,
isInpuFocusShow: true, isInpuFocusShow: true,
searchListPlaceholder: '请选择包装', searchListPlaceholder: '请选择包装',
searchField: 'packUnit', searchField: 'packUnit',
@ -1760,14 +1758,6 @@ export const UnplannedreceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSc
table: { table: {
width: 150 width: 150
}, },
form: {
componentProps: {
disabled: true,
}
},
tableForm: {
disabled: true,
}
}, },
{ {
label: '标签生产线代码', label: '标签生产线代码',

101
src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts

@ -1794,53 +1794,80 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
label: '包装规格', label: '包装规格',
field: 'packUnit', field: 'packUnit',
sort: 'custom', sort: 'custom',
isSearch: false,
table: { table: {
width: 150, width: 120
componentProps: {
disabled: true,
isSearchList: true,
searchListPlaceholder: '请选择包装',
searchField: 'packUnit',
searchTitle: '物品包装信息',
searchAllSchemas: Itempackaging.allSchemas,
searchPage: ItemPackageApi.getItemPackagingPageByItemCode,
searchCondition: [
{
key: 'itemCode',
value: 'itemCode',
message: '请选择订单行',
isMainValue: true
}, },
isTable: false,
isTableForm: true,
isForm: true,
tableForm: {
enterSearch: true,
isInpuFocusShow: true,
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择包装规格', // 输入框占位文本
searchField: 'packUnit', // 查询弹窗赋值字段
searchTitle: '物料包装信息', // 查询弹窗标题
searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
searchPage: ItemPackageApi.getItempackagingPage, // 查询弹窗所需分页方法
searchCondition: [
{ {
key: 'available', key: 'available',
value: 'TRUE', value: 'TRUE',
isMainValue: false isMainValue: false
}
]
}
}, },
tableForm: {
disabled: true,
isInpuFocusShow: true,
searchListPlaceholder: '请选择包装',
searchField: 'packUnit',
searchTitle: '物品包装信息',
searchAllSchemas: Itempackaging.allSchemas,
searchPage: ItemPackageApi.getItemPackagingPageByItemCode,
searchCondition: [
{ {
key: 'itemCode', key: 'itemCode',
value: 'itemCode', value: 'itemCode',
message: '请选择订单行', message: '请先选择物料代码!',
isMainValue: true isMainValue: true
}
],
verificationParams: [
{
key: 'packUnit',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true
}
] // 失去焦点校验参数
}, },
form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择包装规格', // 输入框占位文本
searchField: 'packUnit', // 查询弹窗赋值字段
searchTitle: '物料包装信息', // 查询弹窗标题
searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
searchPage: ItemPackageApi.getItempackagingPage, // 查询弹窗所需分页方法
searchCondition: [
{ {
key: 'available', key: 'available',
value: 'TRUE', value: 'TRUE',
isMainValue: false isMainValue: false
}]
}, },
{
key: 'itemCode',
value: 'itemCode',
message: '请先选择物料代码!', // 当前置条件为空时 弹出信息提示
isMainValue: true
}
],
verificationParams: [
{
key: 'packUnit',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true
}
] // 失去焦点校验参数
}
}
}, },
{ {
label: '包装数量', label: '包装数量',
@ -1848,14 +1875,6 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
},
form: {
componentProps: {
disabled: true
}
},
tableForm: {
disabled: true,
} }
}, },
{ {
@ -2159,5 +2178,11 @@ export const ProductreceiptRequestLabelRules = reactive({
batch: [ batch: [
{ required: true, message: '请选择批次', trigger: ['change','blur'] } { required: true, message: '请选择批次', trigger: ['change','blur'] }
], ],
packUnit: [
{ required: true, message: '请选择包装规格', trigger: ['change','blur'] }
],
packQty: [
{ required: true, message: '请输入包装数量', trigger: ['change','blur'] }
],
}) })

561
src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts

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