|
@@ -306,7 +306,7 @@
|
|
>
|
|
>
|
|
<el-form ref="form" :model="diaLogForm" label-width="80px">
|
|
<el-form ref="form" :model="diaLogForm" label-width="80px">
|
|
<el-row :gutter="20">
|
|
<el-row :gutter="20">
|
|
- <el-col :span="12" :offset="0">
|
|
|
|
|
|
+ <el-col :span="24" :offset="0">
|
|
<el-form-item label="产品名称">
|
|
<el-form-item label="产品名称">
|
|
<el-select
|
|
<el-select
|
|
placeholder="选择名称"
|
|
placeholder="选择名称"
|
|
@@ -331,9 +331,11 @@
|
|
<el-input v-model="diaLogForm.productVolume"></el-input>
|
|
<el-input v-model="diaLogForm.productVolume"></el-input>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
- <el-col :span="12" :offset="0">
|
|
|
|
- <el-row>
|
|
|
|
- <el-col :span="22" type="flex">
|
|
|
|
|
|
+ </el-row>
|
|
|
|
+ <el-row :gutter="20">
|
|
|
|
+ <el-col :span="24" :offset="0">
|
|
|
|
+ <el-row type="flex" justify="space-between">
|
|
|
|
+ <el-col :span="20" type="flex">
|
|
<el-form-item label="类型">
|
|
<el-form-item label="类型">
|
|
<el-select
|
|
<el-select
|
|
v-model="diaLogForm.type"
|
|
v-model="diaLogForm.type"
|
|
@@ -349,14 +351,22 @@
|
|
</el-option>
|
|
</el-option>
|
|
</el-select> </el-form-item
|
|
</el-select> </el-form-item
|
|
></el-col>
|
|
></el-col>
|
|
- <el-col :span="2">
|
|
|
|
|
|
+ <el-col :span="3" style="text-align: right">
|
|
<el-button type="primary" @click="hanleAddData"
|
|
<el-button type="primary" @click="hanleAddData"
|
|
>+</el-button
|
|
>+</el-button
|
|
></el-col
|
|
></el-col
|
|
>
|
|
>
|
|
</el-row>
|
|
</el-row>
|
|
-
|
|
|
|
- <div v-for="(item, index) in diaLogForm.items" :key="index">
|
|
|
|
|
|
+ </el-col>
|
|
|
|
+ </el-row>
|
|
|
|
+ <el-row :gutter="20">
|
|
|
|
+ <el-col
|
|
|
|
+ :span="12"
|
|
|
|
+ :offset="0"
|
|
|
|
+ v-for="(item, index) in diaLogForm.items"
|
|
|
|
+ :key="index"
|
|
|
|
+ >
|
|
|
|
+ <div>
|
|
<el-form-item label="编码">
|
|
<el-form-item label="编码">
|
|
<el-select
|
|
<el-select
|
|
v-model="item.number"
|
|
v-model="item.number"
|
|
@@ -380,9 +390,8 @@
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="体积">
|
|
<el-form-item label="体积">
|
|
<el-input v-model="item.volume" placeholder=""></el-input>
|
|
<el-input v-model="item.volume" placeholder=""></el-input>
|
|
- </el-form-item>
|
|
|
|
- </div>
|
|
|
|
- </el-col>
|
|
|
|
|
|
+ </el-form-item></div
|
|
|
|
+ ></el-col>
|
|
</el-row>
|
|
</el-row>
|
|
</el-form>
|
|
</el-form>
|
|
<div slot="footer" class="dialog-footer">
|
|
<div slot="footer" class="dialog-footer">
|
|
@@ -655,11 +664,11 @@ export default {
|
|
});
|
|
});
|
|
},
|
|
},
|
|
editFn(id, row, index) {
|
|
editFn(id, row, index) {
|
|
- console.log(row,'45465');
|
|
|
|
|
|
+ console.log(row, "45465");
|
|
let dateils = null;
|
|
let dateils = null;
|
|
- this.diaLogForm= {
|
|
|
|
|
|
+ this.diaLogForm = {
|
|
...row,
|
|
...row,
|
|
- items:[
|
|
|
|
|
|
+ items: [
|
|
{
|
|
{
|
|
id: "",
|
|
id: "",
|
|
machineConfigureId: row.id,
|
|
machineConfigureId: row.id,
|
|
@@ -670,23 +679,22 @@ export default {
|
|
number: row.number || "",
|
|
number: row.number || "",
|
|
type: row.type,
|
|
type: row.type,
|
|
volume: row.volume,
|
|
volume: row.volume,
|
|
- }
|
|
|
|
- ]
|
|
|
|
- }
|
|
|
|
|
|
+ },
|
|
|
|
+ ],
|
|
|
|
+ };
|
|
getProductDetail({ id: id }).then((res) => {
|
|
getProductDetail({ id: id }).then((res) => {
|
|
dateils = res.data;
|
|
dateils = res.data;
|
|
console.log(dateils);
|
|
console.log(dateils);
|
|
this.diaLogForm.materialId = dateils.materialId;
|
|
this.diaLogForm.materialId = dateils.materialId;
|
|
this.materialLis.find((k) => {
|
|
this.materialLis.find((k) => {
|
|
if (k.id == dateils.materialId) {
|
|
if (k.id == dateils.materialId) {
|
|
- console.log(k,'5555');
|
|
|
|
|
|
+ console.log(k, "5555");
|
|
this.diaLogForm.productModel = k.specification;
|
|
this.diaLogForm.productModel = k.specification;
|
|
this.diaLogForm.productNumber = k.number;
|
|
this.diaLogForm.productNumber = k.number;
|
|
this.diaLogForm.productVolume = k.volume;
|
|
this.diaLogForm.productVolume = k.volume;
|
|
}
|
|
}
|
|
});
|
|
});
|
|
|
|
|
|
-
|
|
|
|
getDistList({ sysDictEnum: "MACHINE_CONFIGURE" }).then((disType) => {
|
|
getDistList({ sysDictEnum: "MACHINE_CONFIGURE" }).then((disType) => {
|
|
// disType.data.find((q) => {
|
|
// disType.data.find((q) => {
|
|
// if (q.dictCode == dateils.items[0].type) {
|
|
// if (q.dictCode == dateils.items[0].type) {
|