|
|
@@ -218,7 +218,7 @@
|
|
|
v-if="codeShow"
|
|
|
@close="codeShow = false"
|
|
|
@chooseCode="chooseCode"
|
|
|
- ></CodeDialog>
|
|
|
+ />
|
|
|
<!-- 分类选择弹窗 -->
|
|
|
<CategoryDialog ref="categoryRefs" @chooseCategory="confirmCategory" />
|
|
|
<!-- 仓储配置 -->
|
|
|
@@ -230,6 +230,8 @@
|
|
|
:packageDispositionVOList="packageDispositionVOList"
|
|
|
@change="changePackagingSpecification"
|
|
|
/>
|
|
|
+ <!-- 采购信息 -->
|
|
|
+ <PurchasingInfo ref="PurchasingInfoRefs" :form="categoryPurchase" />
|
|
|
<!-- 生产信息 -->
|
|
|
<ProductionInfo ref="productionRefs" :form="categoryMes" />
|
|
|
<!-- 计划 -->
|
|
|
@@ -255,6 +257,7 @@
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
+ import PurchasingInfo from './components/PurchasingInfo.vue';
|
|
|
import GroupDialog from './components/GroupDialog.vue';
|
|
|
import CodeDialog from './components/codeDialog.vue';
|
|
|
import CategoryDialog from './components/CategoryDialog.vue';
|
|
|
@@ -282,6 +285,7 @@
|
|
|
export default {
|
|
|
name: 'product',
|
|
|
components: {
|
|
|
+ PurchasingInfo,
|
|
|
linkMsg,
|
|
|
GroupDialog,
|
|
|
deptSelect,
|
|
|
@@ -335,6 +339,7 @@
|
|
|
remarkform: {
|
|
|
remarkAttach: []
|
|
|
},
|
|
|
+ categoryPurchase: {},
|
|
|
categoryAps: {},
|
|
|
categoryMes: {},
|
|
|
categoryMold: {},
|
|
|
@@ -403,7 +408,7 @@
|
|
|
packingUnit: '',
|
|
|
extField: {}
|
|
|
};
|
|
|
-
|
|
|
+ this.purchaseInfo = {};
|
|
|
this.remarkform = {
|
|
|
remarkAttach: []
|
|
|
};
|
|
|
@@ -536,6 +541,11 @@
|
|
|
} else {
|
|
|
this.categoryPallet = info.categoryPallet;
|
|
|
}
|
|
|
+ if (typeof info.categoryPurchase == 'string') {
|
|
|
+ this.categoryPurchase = {};
|
|
|
+ } else {
|
|
|
+ this.categoryPurchase = info.categoryPurchase;
|
|
|
+ }
|
|
|
if (typeof info.categoryQms == 'string') {
|
|
|
this.categoryQms = {};
|
|
|
} else {
|
|
|
@@ -574,7 +584,6 @@
|
|
|
|
|
|
// 确定分类
|
|
|
async confirmCategory(node, title, PathInfo, ruleCode) {
|
|
|
-
|
|
|
if (this.status != 0) {
|
|
|
this.$set(this.form, 'code', null);
|
|
|
}
|
|
|
@@ -735,6 +744,7 @@
|
|
|
// : '';
|
|
|
|
|
|
const data = {
|
|
|
+ categoryPurchase: this.categoryPurchase,
|
|
|
categoryWms: this.categoryWms,
|
|
|
categoryAps: this.categoryAps,
|
|
|
categoryMes: this.categoryMes,
|
|
|
@@ -751,6 +761,7 @@
|
|
|
};
|
|
|
|
|
|
if (this.$route.query.status == 1) {
|
|
|
+ data.categoryPurchase.id = null;
|
|
|
data.category.id = null;
|
|
|
data.categoryWms.id = null;
|
|
|
data.categoryAps.id = null;
|
|
|
@@ -768,7 +779,7 @@
|
|
|
}
|
|
|
);
|
|
|
}
|
|
|
- console.log('保存', this.$route.query.rootTreeId);
|
|
|
+ console.log('保存', data);
|
|
|
addMaterial(data)
|
|
|
.then((msg) => {
|
|
|
this.loading = false;
|