|
|
@@ -345,6 +345,14 @@ export default {
|
|
|
operateType,
|
|
|
paramList = [],
|
|
|
} = btn;
|
|
|
+
|
|
|
+ // 确认数据值和类型
|
|
|
+ console.log(
|
|
|
+ "即将使用的 interfaceUrl:",
|
|
|
+ JSON.stringify(interfaceUrl),
|
|
|
+ "类型:",
|
|
|
+ typeof interfaceUrl
|
|
|
+ );
|
|
|
if (ifJimu) {
|
|
|
this.handlePrintByJimu(btn);
|
|
|
} else if (this.isFullUrl(interfaceUrl) && printSoft) {
|
|
|
@@ -391,10 +399,25 @@ export default {
|
|
|
if (this.multipleSelection.length === 0) {
|
|
|
return this.$message.warning("请先选择数据!");
|
|
|
}
|
|
|
+
|
|
|
+ // 确认数据值和类型
|
|
|
+ console.log(
|
|
|
+ "handlePrintByJimu - interfaceUrl:",
|
|
|
+ JSON.stringify(params.interfaceUrl),
|
|
|
+ "类型:",
|
|
|
+ typeof params.interfaceUrl
|
|
|
+ );
|
|
|
+
|
|
|
+ // 验证interfaceUrl
|
|
|
+ const interfaceUrl = String(params.interfaceUrl || "").trim();
|
|
|
+ if (!interfaceUrl || interfaceUrl === "0") {
|
|
|
+ return this.$message.error("接口地址未配置或格式错误!");
|
|
|
+ }
|
|
|
+
|
|
|
const baseUrl = process.env.VITE_BASE_URL;
|
|
|
const token = getAccessToken();
|
|
|
const tenantId = getTenantId();
|
|
|
- const { paramList = [], interfaceUrl, reportId } = params;
|
|
|
+ const { paramList = [], reportId } = params;
|
|
|
const fieldValues = this.paramsToConver(paramList);
|
|
|
const printParams = new URLSearchParams({
|
|
|
token,
|
|
|
@@ -414,13 +437,30 @@ export default {
|
|
|
if (this.multipleSelection.length === 0) {
|
|
|
return this.$message.warning("请先选择数据!");
|
|
|
}
|
|
|
+
|
|
|
+ // 确认数据值和类型
|
|
|
+ console.log(
|
|
|
+ "handlePrintByOtherSoft - interfaceUrl:",
|
|
|
+ JSON.stringify(params.interfaceUrl),
|
|
|
+ "类型:",
|
|
|
+ typeof params.interfaceUrl
|
|
|
+ );
|
|
|
+
|
|
|
const { interfaceUrl, paramList, restMethod, templet } = params;
|
|
|
if (!templet) return this.$message.warning("未配置打印模板!");
|
|
|
+
|
|
|
+ // 确保 url 是合法字符串,而不是数字 0 或其他无效值
|
|
|
+ const url = String(interfaceUrl || "").trim();
|
|
|
+ if (!url || url === "0") {
|
|
|
+ this.$message.error("接口地址未配置或格式错误!");
|
|
|
+ return; // 确保return掉
|
|
|
+ }
|
|
|
+
|
|
|
const fieldValues = this.paramsToConver(paramList);
|
|
|
const printParams = { ...fieldValues, fileUrl: templet };
|
|
|
const config = {
|
|
|
method: restMethod,
|
|
|
- url: interfaceUrl,
|
|
|
+ url,
|
|
|
[restMethod === "get" || restMethod === "delete" ? "params" : "data"]:
|
|
|
printParams,
|
|
|
};
|
|
|
@@ -433,28 +473,103 @@ export default {
|
|
|
if (this.multipleSelection.length === 0) {
|
|
|
return this.$message.warning("请先选择数据!");
|
|
|
}
|
|
|
+
|
|
|
+ // 确认数据值和类型
|
|
|
+ console.log(
|
|
|
+ "handleDynamic - interfaceUrl:",
|
|
|
+ JSON.stringify(params.interfaceUrl),
|
|
|
+ "类型:",
|
|
|
+ typeof params.interfaceUrl
|
|
|
+ );
|
|
|
+
|
|
|
const {
|
|
|
interfaceUrl,
|
|
|
restMethod = "get",
|
|
|
paramList = [],
|
|
|
requestParameter = "0",
|
|
|
} = params;
|
|
|
+
|
|
|
+ console.log(
|
|
|
+ "handleDynamic - restMethod:",
|
|
|
+ JSON.stringify(restMethod),
|
|
|
+ "类型:",
|
|
|
+ typeof restMethod
|
|
|
+ );
|
|
|
+ console.log(
|
|
|
+ "handleDynamic - request[restMethod]存在吗:",
|
|
|
+ !!request[restMethod],
|
|
|
+ "类型:",
|
|
|
+ typeof request[restMethod]
|
|
|
+ );
|
|
|
+
|
|
|
+ // 确保 url 是合法字符串,而不是数字 0 或其他无效值
|
|
|
+ const url = String(interfaceUrl || "").trim();
|
|
|
+ if (!url || url === "0") {
|
|
|
+ this.$message.error("接口地址未配置或格式错误!");
|
|
|
+ return; // 确保return掉
|
|
|
+ }
|
|
|
+
|
|
|
const fieldValues = this.paramsToConver(paramList);
|
|
|
- const config = { method: restMethod, url: interfaceUrl };
|
|
|
- this.handleGetDelete(config, fieldValues, requestParameter);
|
|
|
- await request[restMethod]?.(config);
|
|
|
+ const config = { method: restMethod, url };
|
|
|
+ console.log(
|
|
|
+ "handleDynamic - 调用handleGetDelete前config:",
|
|
|
+ JSON.stringify(config),
|
|
|
+ "类型:",
|
|
|
+ typeof config.url
|
|
|
+ );
|
|
|
+ this.handleGetDelete(config, fieldValues, String(requestParameter));
|
|
|
+ console.log(
|
|
|
+ "handleDynamic - 调用handleGetDelete后config:",
|
|
|
+ JSON.stringify(config),
|
|
|
+ "类型:",
|
|
|
+ typeof config.url
|
|
|
+ );
|
|
|
+
|
|
|
+ console.log(
|
|
|
+ "handleDynamic - 发起请求前完整config:",
|
|
|
+ JSON.stringify(config)
|
|
|
+ );
|
|
|
+ console.log(
|
|
|
+ "handleDynamic - 发起请求前config.url:",
|
|
|
+ JSON.stringify(config.url),
|
|
|
+ "类型:",
|
|
|
+ typeof config.url
|
|
|
+ );
|
|
|
+
|
|
|
+ console.log("handleDynamic - 准备调用request:", {
|
|
|
+ method: config.method,
|
|
|
+ url: config.url,
|
|
|
+ });
|
|
|
+
|
|
|
+ // 直接使用request(config)而不是request[restMethod]?.(config),确保method被正确处理
|
|
|
+ await request(config);
|
|
|
+
|
|
|
this.$message.success("操作成功");
|
|
|
this.getList();
|
|
|
},
|
|
|
|
|
|
handleGetDelete(config, fieldValues, requestParameter) {
|
|
|
+ console.log("handleGetDelete - 入参:", {
|
|
|
+ config,
|
|
|
+ fieldValues,
|
|
|
+ requestParameter,
|
|
|
+ });
|
|
|
switch (requestParameter) {
|
|
|
case "1":
|
|
|
config.params = fieldValues;
|
|
|
break;
|
|
|
case "3":
|
|
|
- config.url = new URLSearchParams(fieldValues).toString()
|
|
|
- ? `${config.url}?${new URLSearchParams(fieldValues).toString()}`
|
|
|
+ console.log(
|
|
|
+ "handleGetDelete - URLSearchParams(fieldValues):",
|
|
|
+ new URLSearchParams(fieldValues)
|
|
|
+ );
|
|
|
+ console.log(
|
|
|
+ "handleGetDelete - URLSearchParams(fieldValues).toString():",
|
|
|
+ new URLSearchParams(fieldValues).toString()
|
|
|
+ );
|
|
|
+ const queryString = new URLSearchParams(fieldValues).toString();
|
|
|
+ config.url = queryString
|
|
|
+ ? `${config.url}?${queryString}`
|
|
|
: config.url;
|
|
|
break;
|
|
|
case "4":
|
|
|
@@ -463,6 +578,12 @@ export default {
|
|
|
default:
|
|
|
config.data = fieldValues;
|
|
|
}
|
|
|
+ console.log(
|
|
|
+ "handleGetDelete - 处理后config.url:",
|
|
|
+ JSON.stringify(config.url),
|
|
|
+ "类型:",
|
|
|
+ typeof config.url
|
|
|
+ );
|
|
|
},
|
|
|
|
|
|
paramsToConver(paramList) {
|
|
|
@@ -832,7 +953,7 @@ export default {
|
|
|
|
|
|
/* ---------- 原来的表格样式 ---------- */
|
|
|
:deep(.el-table__row) {
|
|
|
- height: 15px !important;
|
|
|
+ height: 10px !important;
|
|
|
}
|
|
|
.el-table--medium .el-table__cell,
|
|
|
.el-table--small .el-table__cell {
|