|
@@ -885,7 +885,7 @@ export default {
|
|
|
this.$message.warning("请先勾选要审批的数据");
|
|
this.$message.warning("请先勾选要审批的数据");
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+ let totalCount = this.multipleSelection1.length;
|
|
|
// 原有逻辑:开启按钮加载状态
|
|
// 原有逻辑:开启按钮加载状态
|
|
|
this.buttonLoading1 = true;
|
|
this.buttonLoading1 = true;
|
|
|
|
|
|
|
@@ -903,13 +903,21 @@ export default {
|
|
|
// 关键改造3:替换可选链?. 为 && 层层判断(Vue2兼容写法,避免报错)
|
|
// 关键改造3:替换可选链?. 为 && 层层判断(Vue2兼容写法,避免报错)
|
|
|
const successCount = (result.data && result.data.successCount) || 0;
|
|
const successCount = (result.data && result.data.successCount) || 0;
|
|
|
const failCount = (result.data && result.data.failCount) || 0;
|
|
const failCount = (result.data && result.data.failCount) || 0;
|
|
|
-
|
|
|
|
|
- if (successCount > 0 && failCount > 0) {
|
|
|
|
|
- this.$message.warning(`审批部分成功:成功${successCount}条,失败${failCount}条,请查看详情`);
|
|
|
|
|
- } else {
|
|
|
|
|
- // 全成功场景,原有成功提示
|
|
|
|
|
- this.$message.success("审批成功");
|
|
|
|
|
|
|
+ const processDetailList = (result.data && result.data.processDetailList) || [];
|
|
|
|
|
+ const failMsgList = processDetailList
|
|
|
|
|
+ .filter(item => item.processStatus !== 'SUCCESS' && item.errorMsg) // 仅保留失败且有错误信息的
|
|
|
|
|
+ .map(item => item.errorMsg || "无具体原因")
|
|
|
|
|
+ .filter((msg, index, arr) => arr.indexOf(msg) === index); // 去重
|
|
|
|
|
+ const failMsg = failMsgList.length > 0 ? failMsgList.join(";") : "无";
|
|
|
|
|
+ let msg = `总共提交了${totalCount}条数据,成功${successCount}条,失败${failCount}条`
|
|
|
|
|
+ if(failCount != 0) {
|
|
|
|
|
+ msg = msg + ",失败原因:" + failMsg;
|
|
|
|
|
+ this.$message.warning(msg);
|
|
|
|
|
+ }else{
|
|
|
|
|
+ this.$message.success(msg);
|
|
|
}
|
|
}
|
|
|
|
|
+ // 拼接失败详情(无失败时显示“无”)
|
|
|
|
|
+
|
|
|
} else {
|
|
} else {
|
|
|
// 关键改造4:优化失败信息提取,补充默认值
|
|
// 关键改造4:优化失败信息提取,补充默认值
|
|
|
const errorMsg = result.message || result.resultMessage || "审批失败,请重试";
|
|
const errorMsg = result.message || result.resultMessage || "审批失败,请重试";
|
|
@@ -949,14 +957,20 @@ export default {
|
|
|
if (result.status === 'succeed' && result.succeed) {
|
|
if (result.status === 'succeed' && result.succeed) {
|
|
|
// ========== 关键改造3:处理部分成功场景(Vue2兼容写法,无可选链) ==========
|
|
// ========== 关键改造3:处理部分成功场景(Vue2兼容写法,无可选链) ==========
|
|
|
const successCount = (result.data && result.data.successCount) || 0;
|
|
const successCount = (result.data && result.data.successCount) || 0;
|
|
|
- const failCount = (result.data && result.data.failCount) || 0;
|
|
|
|
|
-
|
|
|
|
|
- if (successCount > 0 && failCount > 0) {
|
|
|
|
|
- this.$message.warning(`电文部分发送成功:成功${successCount}条,失败${failCount}条,请查看详情`);
|
|
|
|
|
- } else {
|
|
|
|
|
- // ========== 关键改造4:修改提示文案,贴合“发送电文”业务(而非“审批成功”) ==========
|
|
|
|
|
- this.$message.success("电文发送成功");
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ const failCount = (result.data && result.data.failCount) || 0;
|
|
|
|
|
+ const processDetailList = (result.data && result.data.processDetailList) || [];
|
|
|
|
|
+ const failMsgList = processDetailList
|
|
|
|
|
+ .filter(item => item.processStatus !== 'SUCCESS' && item.errorMsg) // 仅保留失败且有错误信息的
|
|
|
|
|
+ .map(item => item.errorMsg || "无具体原因")
|
|
|
|
|
+ .filter((msg, index, arr) => arr.indexOf(msg) === index); // 去重
|
|
|
|
|
+ const failMsg = failMsgList.length > 0 ? failMsgList.join(";") : "无";
|
|
|
|
|
+ let msg = `总共提交了${totalCount}条数据,成功${successCount}条,失败${failCount}条`
|
|
|
|
|
+ if(failCount != 0) {
|
|
|
|
|
+ msg = msg + ",失败原因:" + failMsg;
|
|
|
|
|
+ this.$message.warning(msg);
|
|
|
|
|
+ }else{
|
|
|
|
|
+ this.$message.success(msg);
|
|
|
|
|
+ }
|
|
|
} else {
|
|
} else {
|
|
|
// ========== 关键改造5:优化失败信息提取,补充默认值,贴合发送场景 ==========
|
|
// ========== 关键改造5:优化失败信息提取,补充默认值,贴合发送场景 ==========
|
|
|
const errorMsg = result.message || result.resultMessage || "电文发送失败,请重试";
|
|
const errorMsg = result.message || result.resultMessage || "电文发送失败,请重试";
|