479cb8f4 by renchao@pashanhoo.com

Merge branch 'dev'

2 parents e21ceddd 4410a436
......@@ -145,7 +145,7 @@
this.$popupCacel()
} else {
ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
}
}).catch(() => {
this.loading = false
......
......@@ -117,7 +117,7 @@
this.$message.error("请至少选择一条数据");
return;
}
this.loading = true;
this.loading = true;
startBusinessFlow({
bsmSqyw: this.sqywInfo.bsmSqyw,
bdcdysz: this.bdcdysz,
......@@ -138,7 +138,7 @@
}
this.$popupCacel()
} else {
ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
}
}).catch(() => {
this.loading = false
......
......@@ -258,7 +258,7 @@
}
this.$popupCacel()
} else {
ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
}
}).catch(() => {
this.loading = false
......@@ -279,7 +279,7 @@
store.dispatch('user/refreshPage', true);
this.$popupCacel()
} else {
ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
}
}).catch(() => {
this.loading = false
......
......@@ -120,7 +120,7 @@
}
this.$popupCacel()
} else {
ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
}
}).catch(() => {
this.loading = false
......
......@@ -121,7 +121,7 @@
}
this.$popupCacel()
} else {
ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
}
}).catch(() => {
this.loading = false
......
......@@ -85,7 +85,7 @@
columns: datas.columns(),
data: [],
},
bdcdysz: [],
bdcdysz: [],
};
},
mounted () {
......@@ -145,7 +145,7 @@
}
this.$popupCacel()
} else {
ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
}
}).catch(() => {
this.loading = false
......
......@@ -182,7 +182,7 @@
}
this.$popupCacel()
} else {
ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
}
}).catch(() => {
this.loading = false
......
......@@ -126,7 +126,7 @@
}
this.$popupCacel()
} else {
ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
}
}).catch(() => {
this.loading = false
......
......@@ -125,7 +125,7 @@
}
this.$popupCacel()
} else {
ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
}
}).catch(() => {
this.loading = false
......
......@@ -134,7 +134,7 @@
}
this.$popupCacel()
} else {
ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
}
}).catch(() => {
this.loading = false
......
......@@ -254,7 +254,7 @@
}
this.$popupCacel()
} else {
ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
}
}).catch(() => {
this.loading = false
......
......@@ -127,7 +127,7 @@
}
this.$popupCacel()
} else {
ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
}
}).catch(() => {
this.loading = false
......
......@@ -129,7 +129,7 @@
}
this.$popupCacel()
} else {
ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
}
}).catch(() => {
this.loading = false
......
......@@ -127,7 +127,7 @@
}
this.$popupCacel()
} else {
ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
}
}).catch(() => {
this.loading = false
......
......@@ -134,7 +134,7 @@
}
this.$popupCacel()
} else {
ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
}
}).catch(() => {
this.loading = false
......
......@@ -125,7 +125,7 @@
this.$popupCacel()
}
} else {
ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
}
}).catch(() => {
this.loading = false
......
......@@ -123,7 +123,7 @@
}
this.$popupCacel()
} else {
ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
}
}).catch(() => {
this.loading = false
......
......@@ -125,7 +125,7 @@
}
this.$popupCacel()
} else {
ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
}
}).catch(() => {
this.loading = false
......
......@@ -125,7 +125,7 @@
this.$popupCacel()
}
} else {
ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
}
}).catch(() => {
this.loading = false
......
......@@ -126,7 +126,7 @@
}
this.$popupCacel()
} else {
ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
}
}).catch(() => {
this.loading = false
......
......@@ -127,7 +127,7 @@
}
this.$popupCacel()
} else {
ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
}
}).catch(() => {
this.loading = false
......