Browse Source

HL-6112隔离收货申请,创建标签时2个包装规格选择相同的规格,生成2个任务,应生成一个任务

hella_online_20240927
yufei_wang 2 months ago
parent
commit
2c2a6f0a68
  1. 4
      src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
  2. 26
      src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts

4
src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue

@ -165,6 +165,7 @@ const { loadStart, loadDone } = usePageLoading()
// //
defineOptions({ name: 'ProductreceiptRequestMain' }) defineOptions({ name: 'ProductreceiptRequestMain' })
const message = useMessage() // const message = useMessage() //
const { t } = useI18n() // const { t } = useI18n() //
@ -703,12 +704,13 @@ const submitFormLabel = async (formType, submitData) => {
} }
let messageList = [] let messageList = []
detatableData.tableList.forEach(item=>{ detatableData.tableList.forEach(item=>{
if(item['packUnit'] == item['secondPackUnit']){ if(item['secondPackUnit']&&item['packUnit'] == item['secondPackUnit']){
messageList.push(item['itemCode']) messageList.push(item['itemCode'])
} }
}) })
if(messageList.length>0){ if(messageList.length>0){
message.error(`物料${messageList.join(',')}包装规格1和包装规格2不能相同`) message.error(`物料${messageList.join(',')}包装规格1和包装规格2不能相同`)
return
} }
try { try {
detatableData.tableList.forEach(async (item) => { detatableData.tableList.forEach(async (item) => {

26
src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts

@ -1981,8 +1981,27 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
width: 180 width: 180
}, },
tableForm: { tableForm: {
disabled: true enterSearch:true,
}, disabled: true,
isInpuFocusShow: true,
searchListPlaceholder: '请选择包装',
searchField: 'packUnit',
searchTitle: '物品包装信息',
searchAllSchemas: Itempackaging.allSchemas,
searchPage: ItemPackageApi.getItempackagingPageByProductreceipt,
searchCondition: [
{
key: 'itemCode',
value: 'itemCode',
message: '请选择订单行',
isMainValue: true
},
{
key: 'available',
value: 'TRUE',
isMainValue: false
}]
}
}, },
{ {
label: '包装数量1', label: '包装数量1',
@ -2074,9 +2093,6 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
//表单校验 //表单校验
export const ProductreceiptRequestLabelRules = reactive({ export const ProductreceiptRequestLabelRules = reactive({
secondPackUnit: [
{ required: true, message: '请选择包装规格2', trigger: 'change' }
],
supplierItemCode: [ supplierItemCode: [
{ required: true, message: '请选择供应商', trigger: 'change' } { required: true, message: '请选择供应商', trigger: 'change' }
], ],

Loading…
Cancel
Save