|
|
@@ -387,7 +387,7 @@
|
|
|
<script>
|
|
|
import {
|
|
|
findMaterialInfoByPlanId,
|
|
|
- findBomCategoryByCategoryId,
|
|
|
+ findBomCategoryByCategoryId
|
|
|
} from '@/api/productionPlan/index.js';
|
|
|
import factoryAdd from './factoryAdd';
|
|
|
import stockDetailDialog from './stockDetailDialog.vue';
|
|
|
@@ -713,6 +713,9 @@
|
|
|
},
|
|
|
// 查询采购价跟外协件两个类型数据
|
|
|
async dataMerging() {
|
|
|
+ if (!this.formInline.bomId) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
let params1 = {
|
|
|
planId: this.planId,
|
|
|
bomVersionId: this.formInline.bomId,
|
|
|
@@ -842,10 +845,9 @@
|
|
|
this.bomVChange(this.formInline.bomId);
|
|
|
},
|
|
|
async open(dataList, produceType) {
|
|
|
+ this.produceType = produceType;
|
|
|
this.visible = true;
|
|
|
-
|
|
|
this.$nextTick(() => {
|
|
|
- this.produceType = produceType;
|
|
|
this.$refs.table.reRenderTable();
|
|
|
});
|
|
|
// this.$refs.table.reRenderTable();
|
|
|
@@ -870,6 +872,8 @@
|
|
|
finalState: 0,
|
|
|
attributeType: 2
|
|
|
};
|
|
|
+ this.baseCount = '';
|
|
|
+ this.baseUnit = '';
|
|
|
this.bomListV = [];
|
|
|
this.bomListType = [];
|
|
|
this.datasourceList = [];
|
|
|
@@ -880,7 +884,10 @@
|
|
|
this.loading = true;
|
|
|
try {
|
|
|
this.planId = data.id;
|
|
|
- const res = await findBomCategoryByCategoryId(data.categoryId,this.produceType);
|
|
|
+ const res = await findBomCategoryByCategoryId(
|
|
|
+ data.categoryId,
|
|
|
+ this.produceType
|
|
|
+ );
|
|
|
this.loading = false;
|
|
|
if (!res || res.length == 0) {
|
|
|
this.bomListD = [];
|