Commit e2716eb8 authored by zhoutong's avatar zhoutong

处理预装关联订单的一些bug

parent 4a470d2f
...@@ -506,10 +506,11 @@ export function boxGoodsDetail(data) { ...@@ -506,10 +506,11 @@ export function boxGoodsDetail(data) {
* @param {*} id * @param {*} id
* @return {*} * @return {*}
*/ */
export function deleteSection(id) { export function deleteSection(params) {
return request({ return request({
url: "/ecw/box-preload-goods/deleteSection?id=" + id, url: "/ecw/box-preload-goods/deleteSection",
method: "delete", method: "delete",
params
}); });
} }
......
...@@ -537,7 +537,7 @@ export default { ...@@ -537,7 +537,7 @@ export default {
}); });
}).catch((res) => { }).catch((res) => {
if (res.code === 666) { if (res.code === 666) {
this.$confirm(res.msg+this.$t('是否需要一起移出?'), this.$t("提示"), { this.$confirm("<div style='max-height:500px;overflow:auto'>"+res.msg+this.$t('是否需要一起移出?')+"</div>", this.$t("提示"), {
dangerouslyUseHTMLString: true, dangerouslyUseHTMLString: true,
distinguishCancelAndClose: true, distinguishCancelAndClose: true,
confirmButtonText: '确定移出', confirmButtonText: '确定移出',
......
...@@ -293,6 +293,7 @@ export default { ...@@ -293,6 +293,7 @@ export default {
if (data.relationMsg) { if (data.relationMsg) {
const msg = data.relationMsg.replaceAll(",", ""); const msg = data.relationMsg.replaceAll(",", "");
this.$confirm(msg, this.$t("提示"), { this.$confirm(msg, this.$t("提示"), {
dangerouslyUseHTMLString: true,
type: "warning", type: "warning",
}) })
.then((_) => { .then((_) => {
...@@ -315,6 +316,7 @@ export default { ...@@ -315,6 +316,7 @@ export default {
if (res.code === 555) { if (res.code === 555) {
const msg = res.msg && res.msg.replaceAll(",", ""); const msg = res.msg && res.msg.replaceAll(",", "");
this.$confirm(msg, this.$t("提示"), { this.$confirm(msg, this.$t("提示"), {
dangerouslyUseHTMLString: true,
type: "warning", type: "warning",
}) })
.then((_) => { .then((_) => {
...@@ -331,6 +333,7 @@ export default { ...@@ -331,6 +333,7 @@ export default {
if (res.code === 566) { if (res.code === 566) {
this.$confirm(res.msg+this.$t('是否需要一起预装?'), this.$t("提示"), { this.$confirm(res.msg+this.$t('是否需要一起预装?'), this.$t("提示"), {
dangerouslyUseHTMLString: true,
type: "warning", type: "warning",
}) })
.then((_) => { .then((_) => {
...@@ -367,7 +370,11 @@ export default { ...@@ -367,7 +370,11 @@ export default {
} }
) )
.then((_) => { .then((_) => {
deleteSection(this.partData.id).then((res) => { let params = {
id: this.partData.id,
deleteType: 2
};
deleteSection(params).then((res) => {
serviceMsg(res, this).then(() => { serviceMsg(res, this).then(() => {
this.partData = {}; this.partData = {};
this.getSecGoods(); this.getSecGoods();
......
...@@ -631,7 +631,11 @@ export default { ...@@ -631,7 +631,11 @@ export default {
} }
) )
.then((_) => { .then((_) => {
deleteSection(part.id).then((res) => { let params = {
id: part.id,
deleteType: 2
};
deleteSection(params).then((res) => {
serviceMsg(res, this).then(() => { serviceMsg(res, this).then(() => {
this.queryAllData(); this.queryAllData();
}); });
...@@ -657,6 +661,7 @@ export default { ...@@ -657,6 +661,7 @@ export default {
if (data.relationMsg) { if (data.relationMsg) {
const msg = data.relationMsg.replaceAll(",", ""); const msg = data.relationMsg.replaceAll(",", "");
this.$confirm(msg, this.$t("提示"), { this.$confirm(msg, this.$t("提示"), {
dangerouslyUseHTMLString: true,
type: "warning", type: "warning",
}) })
.then((_) => { .then((_) => {
...@@ -679,6 +684,7 @@ export default { ...@@ -679,6 +684,7 @@ export default {
if (res.code === 555) { if (res.code === 555) {
const msg = res.msg && res.msg.replaceAll(",", ""); const msg = res.msg && res.msg.replaceAll(",", "");
this.$confirm(msg, this.$t("提示"), { this.$confirm(msg, this.$t("提示"), {
dangerouslyUseHTMLString: true,
type: "warning", type: "warning",
}) })
.then((_) => { .then((_) => {
...@@ -695,6 +701,7 @@ export default { ...@@ -695,6 +701,7 @@ export default {
if (res.code === 566) { if (res.code === 566) {
this.$confirm(res.msg+this.$t('是否需要一起预装?'), this.$t("提示"), { this.$confirm(res.msg+this.$t('是否需要一起预装?'), this.$t("提示"), {
dangerouslyUseHTMLString: true,
type: "warning", type: "warning",
}) })
.then((_) => { .then((_) => {
...@@ -746,7 +753,7 @@ export default { ...@@ -746,7 +753,7 @@ export default {
}); });
}).catch((res) => { }).catch((res) => {
if (res.code === 666) { if (res.code === 666) {
this.$confirm(res.msg+this.$t('是否需要一起移出?'), this.$t("提示"), { this.$confirm("<div style='max-height:500px;overflow:auto'>"+res.msg+this.$t('是否需要一起移出?')+"</div>", this.$t("提示"), {
dangerouslyUseHTMLString: true, dangerouslyUseHTMLString: true,
distinguishCancelAndClose: true, distinguishCancelAndClose: true,
confirmButtonText: '确定移出', confirmButtonText: '确定移出',
......
...@@ -250,7 +250,7 @@ export default { ...@@ -250,7 +250,7 @@ export default {
}); });
}).catch((res) => { }).catch((res) => {
if (res.code === 666) { if (res.code === 666) {
this.$confirm(res.msg+this.$t('是否需要一起移出?'), this.$t("提示"), { this.$confirm("<div style='max-height:500px;overflow:auto'>"+res.msg+this.$t('是否需要一起移出?')+"</div>", this.$t("提示"), {
dangerouslyUseHTMLString: true, dangerouslyUseHTMLString: true,
distinguishCancelAndClose: true, distinguishCancelAndClose: true,
confirmButtonText: '确定移出', confirmButtonText: '确定移出',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment