licq/heli-mes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

入库货区问题修改

Browse Source
This commit is contained in:
z 2025-01-10 10:17:21 +08:00
parent 43ee0ba0da
commit 626ae67f99
3 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
mes-ui/mes-ui-admin-vue3/src/views/heli/outsourcestock/edit.vue
View File

@ -156,18 +156,16 @@ ref="subOutSourceMatFormRef" :model="formData.matItemDOList" :rules="subOutSourc
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="purchaseAmount" label="采购数量" min-width="180" align="center" />
<el-table-column prop="matType" label="物料类型" min-width="120" align="center">
<template #default="scope">
<dict-tag :type="DICT_TYPE.HELI_MATERIAL_TYPE" :value="scope.row.matType" />
</template>
</el-table-column>
<el-table-column prop="matSpec" label="规格/型号" min-width="120" align="center" />
<el-table-column label="系统单位" align="center" prop="matUnit" width="100px">
<template #default="scope">
<dict-tag :type="DICT_TYPE.HELI_MATERIAL_UNIT" :value="scope.row.matUnit" min-width="100" />
</template>
</el-table-column>
<el-table-column prop="purchaseAmount" label="采购数量" min-width="180" align="center" />
<!-- <el-table-column prop="matRest" label="库存数量" min-width="180" align="center" /> -->
<el-table-column prop="currentCount" min-width="180" align="center">
<template #header><span class="hl-table_header">*</span>本次到货数量</template>
@ -223,11 +221,6 @@ v-for="dict in formData.projectPlanSubs" :key="dict.projectSubId"
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="unqualifiedContent" label="不合格内容" min-width="180" align="center">
<template #default="scope">
<el-input v-model="scope.row.unqualifiedContent" />
</template>
</el-table-column>
<el-table-column prop="repairable" min-width="260" align="center" label="修复判断">
<template #header><span class="hl-table_header">*</span>修复判断</template>
<template #default="{ row, $index }">
@ -242,6 +235,11 @@ v-for="dict in getIntDictOptions(DICT_TYPE.HELI_OUTSOURCE_STOCK_REPAIR)"
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="unqualifiedContent" label="不合格内容" min-width="180" align="center">
<template #default="scope">
<el-input v-model="scope.row.unqualifiedContent" />
</template>
</el-table-column>
<el-table-column prop="reason" min-width="180" label="原因分析" align="center">
<template #default="scope">
<el-input v-model="scope.row.reason" />
@ -252,6 +250,11 @@ v-for="dict in getIntDictOptions(DICT_TYPE.HELI_OUTSOURCE_STOCK_REPAIR)"
<el-input v-model="scope.row.remark" />
</template>
</el-table-column>
<el-table-column label="系统单位" align="center" prop="matUnit" width="100px">
<template #default="scope">
<dict-tag :type="DICT_TYPE.HELI_MATERIAL_UNIT" :value="scope.row.matUnit" min-width="100" />
</template>
</el-table-column>
</el-table>
</el-form>
</el-card>

6
mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/edit.vue
View File

@ -264,7 +264,7 @@
<el-table-column prop="matType" label="物料类型" min-width="120" align="center">
<template #default="scope">
<dict-tag :type="DICT_TYPE.HELI_MATERIAL_TYPE" :value="scope.row.matType" v-if="typeof scope.row.matType === 'number' ? true : false" />
<dict-tag :type="DICT_TYPE.HELI_MATERIAL_TYPE" :value="scope.row.matType" v-if="typeof scope.row.matUnit === 'number'"/>
</template>
</el-table-column>
<el-table-column prop="matSpec" label="规格/型号" min-width="120" align="center" />
@ -318,7 +318,7 @@
</el-table-column>
<el-table-column prop="matUnit" label="系统单位" min-width="100" align="center">
<template #default="scope">
<dict-tag :type="DICT_TYPE.HELI_MATERIAL_UNIT" :value="scope.row.matUnit" v-if="scope.row.matUnit==null ? true : false" />
<dict-tag :type="DICT_TYPE.HELI_MATERIAL_UNIT" :value="scope.row.matUnit" v-if="typeof scope.row.matUnit === 'number'"/>
</template>
</el-table-column>
<el-table-column prop="description" min-width="180" label="备注" align="center">
@ -760,6 +760,8 @@ const handleSelectedMaterialPlanMat = (arr) => {
arr.forEach((item) => {
if (!existingMatIds.has(item.matId)) {
item.description = '';
item.matType=Number(item.matType)
item.matUnit=Number(item.matUnit)
formData.value.matItemDOList.push(item);
existingMatIds.add(item.matId); // 将新添加的 matId 加入 Set
}

5
mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue
View File

@ -453,9 +453,8 @@ const getList = async (arrMat) => {
row.pnlist = pnList.value.filter((pn) => pn.rg_id == row.rgId)
if (row.pnlist.length == 1) {
row.pnId = row.pnlist[0].id
}else if (row.pnlist.length == 0) {
}else if (pnList.value.length == 0) {
flag=false
}else {
row.pnId=''
}
@ -463,10 +462,10 @@ const getList = async (arrMat) => {
formData.value.matItemDOList.push(row)
}
}
})
if (!flag){
message.error("该"+whName+"没有配置入库库位，请确认!")
}
})
}