|
@@ -19,7 +19,11 @@
|
|
|
</el-col>
|
|
</el-col>
|
|
|
|
|
|
|
|
|
|
|
|
|
-
|
|
|
|
|
|
|
+ <el-col :span="8">
|
|
|
|
|
+ <el-form-item label="牌号:" prop="categoryBrandNum">
|
|
|
|
|
+ <el-input disabled v-model="form.categoryBrandNum" placeholder="自动带入" />
|
|
|
|
|
+ </el-form-item>
|
|
|
|
|
+ </el-col>
|
|
|
|
|
|
|
|
<el-col :span="8">
|
|
<el-col :span="8">
|
|
|
<el-form-item label="型号:" prop="categoryModelType">
|
|
<el-form-item label="型号:" prop="categoryModelType">
|
|
@@ -36,11 +40,7 @@
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
|
|
|
|
|
|
- <el-col :span="8">
|
|
|
|
|
- <el-form-item label="牌号:" prop="categoryBrandNum">
|
|
|
|
|
- <el-input disabled v-model="form.categoryBrandNum" placeholder="自动带入" />
|
|
|
|
|
- </el-form-item>
|
|
|
|
|
- </el-col>
|
|
|
|
|
|
|
+
|
|
|
|
|
|
|
|
<el-col :span="8">
|
|
<el-col :span="8">
|
|
|
<el-form-item label="生产版本:" prop="produceVersionId">
|
|
<el-form-item label="生产版本:" prop="produceVersionId">
|
|
@@ -327,7 +327,7 @@ export default {
|
|
|
}
|
|
}
|
|
|
],
|
|
],
|
|
|
isProduct: false, // 判断是否是产品
|
|
isProduct: false, // 判断是否是产品
|
|
|
- isProductUpdate:null, // 1 新增, 2编辑
|
|
|
|
|
|
|
+ isProductUpdate: null, // 1 新增, 2编辑
|
|
|
|
|
|
|
|
};
|
|
};
|
|
|
},
|
|
},
|
|
@@ -408,15 +408,15 @@ export default {
|
|
|
if (!this.isUpdate && this.isProductUpdate == null) {
|
|
if (!this.isUpdate && this.isProductUpdate == null) {
|
|
|
delete this.form.id;
|
|
delete this.form.id;
|
|
|
}
|
|
}
|
|
|
- let saveOrUpdate = this.isUpdate
|
|
|
|
|
|
|
+ let saveOrUpdate = this.isUpdate
|
|
|
? parameter.update
|
|
? parameter.update
|
|
|
: parameter.save;
|
|
: parameter.save;
|
|
|
|
|
|
|
|
- if(this.isProductUpdate != null) {
|
|
|
|
|
- saveOrUpdate = this.isProductUpdate == 2
|
|
|
|
|
- ? parameter.update
|
|
|
|
|
- : parameter.save;
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ if (this.isProductUpdate != null) {
|
|
|
|
|
+ saveOrUpdate = this.isProductUpdate == 2
|
|
|
|
|
+ ? parameter.update
|
|
|
|
|
+ : parameter.save;
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
|
|
|
|
|
saveOrUpdate(this.form)
|
|
saveOrUpdate(this.form)
|
|
@@ -494,7 +494,7 @@ export default {
|
|
|
|
|
|
|
|
|
|
|
|
|
const res = await parameter.getCategoryParam(this.paramData.id);
|
|
const res = await parameter.getCategoryParam(this.paramData.id);
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
if (res) {
|
|
if (res) {
|
|
|
this.isProductUpdate = 2
|
|
this.isProductUpdate = 2
|
|
|
this.$util.assignObject(this.form, {
|
|
this.$util.assignObject(this.form, {
|
|
@@ -502,10 +502,10 @@ export default {
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
this.$refs.table.setData(res.produceParam)
|
|
this.$refs.table.setData(res.produceParam)
|
|
|
- this.taskParam = res.taskParam
|
|
|
|
|
|
|
+ this.taskParam = res.taskParam
|
|
|
|
|
|
|
|
} else {
|
|
} else {
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
this.$util.assignObject(this.form, {
|
|
this.$util.assignObject(this.form, {
|
|
|
...param
|
|
...param
|
|
|
});
|
|
});
|