|
|
@@ -117,7 +117,7 @@
|
|
|
<el-button
|
|
|
link
|
|
|
type="primary"
|
|
|
- @click="openSelectMaterialForm(scope.row.id)"
|
|
|
+ @click="openSelectMaterialForm(scope.row.id, scope.row.deviceCategoryId)"
|
|
|
v-hasPermi="['rq:iot-bom:update']"
|
|
|
>
|
|
|
添加物料
|
|
|
@@ -216,9 +216,11 @@ const getList = async () => {
|
|
|
|
|
|
/** 选择物料操作 */
|
|
|
const materialListRef = ref()
|
|
|
-const openSelectMaterialForm = (id?: number) => {
|
|
|
+const openSelectMaterialForm = (id?: number, deviceCategoryId?: number) => {
|
|
|
materialListRef.value.open(id)
|
|
|
currentBomNodeId.value = id
|
|
|
+ // 保存当前BOM节点的deviceCategoryId
|
|
|
+ CommonBomMaterialData.value.deviceCategoryId = deviceCategoryId
|
|
|
}
|
|
|
|
|
|
/** 查看物料详情 */
|
|
|
@@ -233,7 +235,7 @@ const handleView = async (nodeId) => {
|
|
|
const chooseMaterial = async(row) => {
|
|
|
// 将物料关联到bom节点
|
|
|
try {
|
|
|
- CommonBomMaterialData.value.deviceCategoryId = selectedId.value
|
|
|
+ // CommonBomMaterialData.value.deviceCategoryId = row.deviceCategoryId
|
|
|
CommonBomMaterialData.value.bomNodeId = currentBomNodeId.value
|
|
|
CommonBomMaterialData.value.materialId = row.id
|
|
|
CommonBomMaterialData.value.name = row.name
|
zhangcl