|
|
@@ -249,6 +249,24 @@
|
|
|
</DictSelection>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
+
|
|
|
+ <el-col :span="8">
|
|
|
+ <el-form-item label="面积" prop="area">
|
|
|
+ <el-input v-model="form.area" />
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+
|
|
|
+ <el-col :span="8">
|
|
|
+ <el-form-item label="面积单位" prop="areaUnit">
|
|
|
+ <DictSelection
|
|
|
+ dictName="计量单位"
|
|
|
+ clearable
|
|
|
+ v-model="form.areaUnit"
|
|
|
+ >
|
|
|
+ </DictSelection>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+
|
|
|
<el-col :span="8">
|
|
|
<el-form-item
|
|
|
label="图号/件号"
|
|
|
@@ -474,10 +492,7 @@
|
|
|
</el-col>
|
|
|
<el-col :span="24">
|
|
|
<el-form-item label="产品图片">
|
|
|
- <ImgUpload
|
|
|
- ref="imgUploadRef"
|
|
|
- v-model="form.imgUrl"
|
|
|
- />
|
|
|
+ <ImgUpload ref="imgUploadRef" v-model="form.imgUrl" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
@@ -728,6 +743,8 @@
|
|
|
attributeType: 1,
|
|
|
weightUnit: '',
|
|
|
packingUnit: '',
|
|
|
+ areaUnit: '',
|
|
|
+ area: '',
|
|
|
colorKey: [],
|
|
|
modelKey: [],
|
|
|
extField: {},
|
|
|
@@ -830,6 +847,8 @@
|
|
|
netWeight: '',
|
|
|
weightUnit: '',
|
|
|
packingUnit: '',
|
|
|
+ areaUnit: '',
|
|
|
+ area: '',
|
|
|
colorKey: [],
|
|
|
modelKey: [],
|
|
|
extField: {},
|
|
|
@@ -884,7 +903,7 @@
|
|
|
},
|
|
|
deep: true,
|
|
|
immediate: true
|
|
|
- },
|
|
|
+ }
|
|
|
// 同步图片id到表单模型(用于保存)
|
|
|
// productImgs: {
|
|
|
// handler(val) {
|
|
|
@@ -1011,7 +1030,7 @@
|
|
|
console.log(res.value, '77777');
|
|
|
if (res.value) {
|
|
|
console.log(res, '33333333');
|
|
|
- this.industryAttribute = res.value
|
|
|
+ this.industryAttribute = res.value;
|
|
|
}
|
|
|
});
|
|
|
|
|
|
@@ -1229,7 +1248,7 @@
|
|
|
if (info.category.modelKey) {
|
|
|
info.category.modelKey = info.category.modelKey.split(',');
|
|
|
}
|
|
|
- if(info.category.imgUrl && info.category.imgUrl.length > 0){
|
|
|
+ if (info.category.imgUrl && info.category.imgUrl.length > 0) {
|
|
|
info.category.imgUrl = info.category.imgUrl.map((item) => ({
|
|
|
...item,
|
|
|
status: 'done'
|
|
|
@@ -1240,7 +1259,7 @@
|
|
|
this.form = {
|
|
|
...info.category
|
|
|
};
|
|
|
-
|
|
|
+
|
|
|
this.remarkform.remark = info.category.remark;
|
|
|
this.remarkform.remarkAttach = info.category.remarkAttach;
|
|
|
// if (this.form.measuringUnit && this.form.packingUnit) {
|