|
@@ -36,7 +36,7 @@
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
|
|
|
|
|
|
-
|
|
|
|
|
|
|
+<!--
|
|
|
<el-col :span="8">
|
|
<el-col :span="8">
|
|
|
<el-form-item label="分类层级" prop="categoryType">
|
|
<el-form-item label="分类层级" prop="categoryType">
|
|
|
<el-select v-model="form.categoryType" placeholder="请选择" class="w100">
|
|
<el-select v-model="form.categoryType" placeholder="请选择" class="w100">
|
|
@@ -45,7 +45,18 @@
|
|
|
</el-select>
|
|
</el-select>
|
|
|
|
|
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
|
|
+ </el-col> -->
|
|
|
|
|
+
|
|
|
|
|
+ <el-col :span="8">
|
|
|
|
|
+ <el-form-item label="生产版本:" prop="produceVersionId">
|
|
|
|
|
+ <el-select v-model="form.produceVersionId" filterable placeholder="清选择" :style="{ width: '100%' }">
|
|
|
|
|
+ <el-option v-for="item in versionList" :key="item.id" :label="item.code + '-' + item.name" :value="item.id">
|
|
|
|
|
+ </el-option>
|
|
|
|
|
+ </el-select>
|
|
|
|
|
+ </el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
<el-col :span="8">
|
|
<el-col :span="8">
|
|
|
<el-form-item label="基本数量" prop="baseCount">
|
|
<el-form-item label="基本数量" prop="baseCount">
|
|
|
<el-row>
|
|
<el-row>
|
|
@@ -111,6 +122,7 @@ import productDialog from '@/components/SelectDialog/productDialog';
|
|
|
import factorySelect from '@/components/CommomSelect/factory-select.vue';
|
|
import factorySelect from '@/components/CommomSelect/factory-select.vue';
|
|
|
import { getCode } from '@/api/codeManagement/index.js';
|
|
import { getCode } from '@/api/codeManagement/index.js';
|
|
|
import { getVersionCode, bomSave, bomUpdate, getById, detailPage } from '@/api/material/BOM';
|
|
import { getVersionCode, bomSave, bomUpdate, getById, detailPage } from '@/api/material/BOM';
|
|
|
|
|
+import { pageList } from '@/api/technology/version/version.js';
|
|
|
export default {
|
|
export default {
|
|
|
components: { materialDialog, factorySelect, productDialog },
|
|
components: { materialDialog, factorySelect, productDialog },
|
|
|
props: {
|
|
props: {
|
|
@@ -165,6 +177,7 @@ export default {
|
|
|
|
|
|
|
|
],
|
|
],
|
|
|
tableData: [],
|
|
tableData: [],
|
|
|
|
|
+ versionList: [],
|
|
|
columns: [
|
|
columns: [
|
|
|
{
|
|
{
|
|
|
type: 'index',
|
|
type: 'index',
|
|
@@ -237,6 +250,7 @@ export default {
|
|
|
async open(type, row) {
|
|
async open(type, row) {
|
|
|
this.title = type;
|
|
this.title = type;
|
|
|
this.row = row;
|
|
this.row = row;
|
|
|
|
|
+ this.getVersionList()
|
|
|
this.visible = true;
|
|
this.visible = true;
|
|
|
if (type == '新建') {
|
|
if (type == '新建') {
|
|
|
this._getCode();
|
|
this._getCode();
|
|
@@ -304,6 +318,14 @@ export default {
|
|
|
this.form.version = res
|
|
this.form.version = res
|
|
|
},
|
|
},
|
|
|
|
|
|
|
|
|
|
+ async getVersionList() {
|
|
|
|
|
+ const res = await pageList({
|
|
|
|
|
+ pageNum: 1,
|
|
|
|
|
+ size: 100
|
|
|
|
|
+ });
|
|
|
|
|
+ this.versionList = res.list
|
|
|
|
|
+ },
|
|
|
|
|
+
|
|
|
|
|
|
|
|
save() {
|
|
save() {
|
|
|
|
|
|