|
@@ -63,11 +63,7 @@
|
|
|
min-width="100"
|
|
|
show-overflow-tooltip
|
|
|
/>
|
|
|
- <el-table-column
|
|
|
- prop="brand_name"
|
|
|
- label="品牌"
|
|
|
- show-overflow-tooltip
|
|
|
- />
|
|
|
+ <el-table-column prop="brand_name" label="品牌" show-overflow-tooltip />
|
|
|
<el-table-column
|
|
|
prop="good_type"
|
|
|
label="定制"
|
|
@@ -79,8 +75,8 @@
|
|
|
:size="'mini'"
|
|
|
:type="scope.row.good_type == '1' ? '' : 'warning'"
|
|
|
v-text="
|
|
|
- (options1.find((item) => item.id == scope.row.status) || {})
|
|
|
- .name || '--'
|
|
|
+ (options1.find((item) => item.id == scope.row.status) || {}).name ||
|
|
|
+ '--'
|
|
|
"
|
|
|
></el-tag>
|
|
|
</template>
|
|
@@ -294,9 +290,7 @@ export default {
|
|
|
const { speclist } = v;
|
|
|
let str = "<span>";
|
|
|
speclist.forEach((a, ai) => {
|
|
|
- str += `${ai !== 0 ? "--" : ""}${a.spec_name}[${
|
|
|
- a.spec_value
|
|
|
- }]`;
|
|
|
+ str += `${ai !== 0 ? "--" : ""}${a.spec_name}[${a.spec_value}]`;
|
|
|
});
|
|
|
htmlList += str + "</span>" + `</li>`;
|
|
|
});
|
|
@@ -306,6 +300,29 @@ export default {
|
|
|
dangerouslyUseHTMLString: true,
|
|
|
message: htmlList,
|
|
|
});
|
|
|
+ } else if (code === 1010) {
|
|
|
+ let resList = JSON.parse(JSON.stringify(data));
|
|
|
+
|
|
|
+ let htmlList = "<ul>";
|
|
|
+ resList.forEach((v) => {
|
|
|
+ htmlList += `<li>
|
|
|
+ <img src='${v.good_img}' style='width: 20px; height: 20px'
|
|
|
+ class='hover'
|
|
|
+ v-viewer/>
|
|
|
+ <span>${v.good_name}__</span>`;
|
|
|
+ const { speclist } = v;
|
|
|
+ let str = "<span>";
|
|
|
+ speclist.forEach((a, ai) => {
|
|
|
+ str += `${ai !== 0 ? "--" : ""}${a.spec_name}[${a.spec_value}]`;
|
|
|
+ });
|
|
|
+ htmlList += str + "</span>" + `</li>`;
|
|
|
+ });
|
|
|
+ htmlList += "</ul>";
|
|
|
+ this.$notify({
|
|
|
+ title: "该平台要求商品必须要有一件的成本!",
|
|
|
+ dangerouslyUseHTMLString: true,
|
|
|
+ message: htmlList,
|
|
|
+ });
|
|
|
} else {
|
|
|
this.$message.warning(res.message);
|
|
|
}
|
|
@@ -320,7 +337,7 @@ export default {
|
|
|
};
|
|
|
</script>
|
|
|
|
|
|
- <style lang="scss" scoped>
|
|
|
+<style lang="scss" scoped>
|
|
|
.brand {
|
|
|
}
|
|
|
</style>
|