|
|
@@ -47,7 +47,7 @@
|
|
|
</el-row>
|
|
|
<el-row class="my-row">
|
|
|
<el-form-item label="备注说明">
|
|
|
- <el-input v-model="dataForm.code" :disabled="display" placeholder="备注说明"></el-input>
|
|
|
+ <el-input v-model="dataForm.code" :disabled="display"></el-input>
|
|
|
</el-form-item>
|
|
|
</el-row>
|
|
|
<el-row class="my-row">
|
|
|
@@ -65,9 +65,9 @@
|
|
|
:limit="5"
|
|
|
:on-exceed="handleExceed"
|
|
|
:auto-upload="false">
|
|
|
- <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
|
|
|
- <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">开始上传</el-button>
|
|
|
- <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，最多5张图片，且每张图片不超过10M</div>
|
|
|
+ <el-button v-show="!display" slot="trigger" size="small" type="primary">选取文件</el-button>
|
|
|
+ <el-button v-show="!display" style="margin-left: 10px;" size="small" type="success" @click="submitUpload">开始上传</el-button>
|
|
|
+ <div v-show="!display" slot="tip" class="el-upload__tip">只能上传jpg/png文件，最多5张图片，且每张图片不超过10M</div>
|
|
|
</el-upload>
|
|
|
</el-row>
|
|
|
<div class="title"><span style="color: red">*</span> 订单产品明细</div>
|
|
|
@@ -229,16 +229,18 @@
|
|
|
id: item.url
|
|
|
})
|
|
|
})
|
|
|
- data.data.cusRCommProductVOS.forEach((item) => {
|
|
|
- this.cusRCommProductVOS.push({
|
|
|
- cnt: item.cnt,
|
|
|
- price: item.price,
|
|
|
- productId: item.productId,
|
|
|
- rate: item.rate,
|
|
|
- productName: item.productName,
|
|
|
- notes: item.notes
|
|
|
+ if (data.data.cusRCommProductVOS) {
|
|
|
+ data.data.cusRCommProductVOS.forEach((item) => {
|
|
|
+ this.cusRCommProductVOS.push({
|
|
|
+ cnt: item.cnt,
|
|
|
+ price: item.price,
|
|
|
+ productId: item.productId,
|
|
|
+ rate: item.rate,
|
|
|
+ productName: item.productName,
|
|
|
+ notes: item.notes
|
|
|
+ })
|
|
|
})
|
|
|
- })
|
|
|
+ }
|
|
|
}
|
|
|
})
|
|
|
},
|
chris