diff --git a/.drone.yml b/.drone.yml index 4b349dac..24b6ae47 100644 --- a/.drone.yml +++ b/.drone.yml @@ -8,6 +8,11 @@ platform: os: linux steps: + - name: code-analysis + image: aosapps/drone-sonar-plugin + settings: + sonar_host: http://dev.ccwin-in.com:3005 + sonar_token: sqa_a1da3cf5984f39d9a256493acbae857c6624e954 - name: build image: mcr.microsoft.com/dotnet/sdk:6.0 privileged: true diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js index d188f133..34c3eb65 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js @@ -777,7 +777,7 @@ export default { }); } //添加子表filter查询 - if (route.meta.businessType) { + if (route.meta.businessType && route.meta.path !== "/jis-bbac/settlement/bbac_can_sa_service") { postData.filters.push({ logic: "and", column: "businessType", diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/_check.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/_check.js index d1374fd9..96e66f93 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/_check.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/_check.js @@ -9,6 +9,7 @@ import { getUrl } from "../../request/index.js"; import businessTypes from "../../models/_options.js"; import { required, trim } from "../../utils/validation.js"; import { delay } from "../../utils/index.js"; +import { ElMessage, ElMessageBox } from "element-plus"; export default { components: { AppForm, AppTable }, @@ -440,11 +441,25 @@ export default { service = "pub_ba_service"; } const directReopen = async () => { - const url = `settleaccount/${service}/back-reissue-invoice`; - const result = await request(url, props.data.invbillNum, { method: "POST" }); - if (result.errors) { - if (result.data?.code === 400 && result.data.fileName) { - window.open(getUrl(`settleaccount/getblobfile/download/${result.data.fileName}`)); + try { + await ElMessageBox.confirm("确认报废重开吗?", { type: "warning" }); + const url = `settleaccount/${service}/back-reissue-invoice`; + const result = await request(url, props.data.invbillNum, { method: "POST" }); + if (!result.errors) { + if (result.data?.code === 200 && result.data?.message) { + ElMessage.success(result.data?.message); + } + } else { + if (result.data?.code === 400 && result.data.fileName) { + window.open(getUrl(`settleaccount/getblobfile/download/${result.data.fileName}`)); + } + } + } catch (error) { + if (error === "cancel") { + ElMessage({ + type: "info", + message: i18n.t("cancel"), + }); } } };