diff --git a/ABAP_AS_WITH_POOL.jcoDestination b/ABAP_AS_WITH_POOL.jcoDestination
deleted file mode 100644
index 308af89..0000000
--- a/ABAP_AS_WITH_POOL.jcoDestination
+++ /dev/null
@@ -1,11 +0,0 @@
-#for tests only !
-#Thu Jun 13 17:04:23 CST 2024
-jco.destination.pool_capacity=10
-jco.client.lang=ZH
-jco.client.ashost=172.19.0.120
-jco.client.saprouter=
-jco.client.user=RFC
-jco.client.sysnr=00
-jco.destination.peak_limit=10
-jco.client.passwd=654321
-jco.client.client=300
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index af03b69..91d30d0 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -125,3 +125,7 @@ spring:
remove-abandoned-timeout: 20
#关闭abanded连接时输出错误日志
log-abandoned: false
+ #默认为false。因此,如果想让数据库和网络故障恢复之后,pool能继续请求正常资源必须把此项配置设为false)
+ break-after-acquire-failure: false
+ fail-fast: true
+ time-between-connect-error-millis: 10000
diff --git a/ruoyi-ui/src/views/components/Tools/CustomerSelect/index.vue b/ruoyi-ui/src/views/components/Tools/CustomerSelect/index.vue
index d7f810f..059d791 100644
--- a/ruoyi-ui/src/views/components/Tools/CustomerSelect/index.vue
+++ b/ruoyi-ui/src/views/components/Tools/CustomerSelect/index.vue
@@ -106,6 +106,8 @@
this.total = response.data.length;
this.currentPage = 1;
this.loading = false;
+ },response => {
+ this.loading = false;
});
},
/** 搜索按钮操作 */
diff --git a/ruoyi-ui/src/views/customer/customer/index.vue b/ruoyi-ui/src/views/customer/customer/index.vue
index 841a309..4777663 100644
--- a/ruoyi-ui/src/views/customer/customer/index.vue
+++ b/ruoyi-ui/src/views/customer/customer/index.vue
@@ -1179,6 +1179,8 @@ export default {
//this.qccTotal = response.total;
//this.qccCurrentPage = 1;
this.qccLoading = false;
+ },response => {
+ this.qccLoading = false;
});
});
},
@@ -1250,6 +1252,8 @@ export default {
this.bankCodeTotal = response.total;
this.bankCodeCurrentPage = 1;
this.bankCodeLoading = false;
+ },response => {
+ this.bankCodeLoading = false;
});
},
diff --git a/ruoyi-ui/src/views/quot/quot/index.vue b/ruoyi-ui/src/views/quot/quot/index.vue
index dcf9b9f..37c86f9 100644
--- a/ruoyi-ui/src/views/quot/quot/index.vue
+++ b/ruoyi-ui/src/views/quot/quot/index.vue
@@ -152,7 +152,6 @@
-
+
{{ parseTime(scope.row.quotInquiryDate) }}
@@ -1467,11 +1467,11 @@ export default {
return;
}
- const quotFkFileNum = this.quotFkFileList.length;
+ /*const quotFkFileNum = this.quotFkFileList.length;
if(quotFkFileNum==0){
this.$modal.msgError("反馈附件必须上传");
return;
- }
+ }*/
feedbackQuot(this.form).then(response => {
this.$modal.msgSuccess("提交反馈成功");
this.open = false;