diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/message/strategy/impl/SmsMessageSendStrategy.java b/src/main/java/com/budwk/app/zhgh/dayofficework/message/strategy/impl/SmsMessageSendStrategy.java
index dee3355..de4c2d4 100644
--- a/src/main/java/com/budwk/app/zhgh/dayofficework/message/strategy/impl/SmsMessageSendStrategy.java
+++ b/src/main/java/com/budwk/app/zhgh/dayofficework/message/strategy/impl/SmsMessageSendStrategy.java
@@ -10,6 +10,8 @@ import org.nutz.dao.Cnd;
import org.nutz.dao.Dao;
import org.nutz.ioc.loader.annotation.Inject;
import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.ioc.impl.PropertiesProxy;
+import org.nutz.lang.Strings;
import java.util.List;
@@ -24,6 +26,8 @@ public class SmsMessageSendStrategy implements GlobalMessageSendStrategy {
private Dao dao;
@Inject
private SmsService smsService;
+ @Inject
+ private PropertiesProxy conf;
@Override
public GlobalMessageChannel getChannel() {
@@ -118,7 +122,9 @@ public class SmsMessageSendStrategy implements GlobalMessageSendStrategy {
// 限制短信长度(一般短信限制70个字符)
String smsContent = sb.toString();
- if (smsContent.length() > 67) {
+ boolean intelligenceMode = Strings.isNotBlank(conf.get("custom.msg.platform.app-id"))
+ && conf.getBoolean("msg.platform.IntelligenceMode", false);
+ if (!intelligenceMode && smsContent.length() > 67) {
smsContent = smsContent.substring(0, 67) + "...";
}
diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/message/strategy/impl/WechatMessageSendStrategy.java b/src/main/java/com/budwk/app/zhgh/dayofficework/message/strategy/impl/WechatMessageSendStrategy.java
index a4b0e19..b905ce0 100644
--- a/src/main/java/com/budwk/app/zhgh/dayofficework/message/strategy/impl/WechatMessageSendStrategy.java
+++ b/src/main/java/com/budwk/app/zhgh/dayofficework/message/strategy/impl/WechatMessageSendStrategy.java
@@ -10,6 +10,8 @@ import org.nutz.dao.Cnd;
import org.nutz.dao.Dao;
import org.nutz.ioc.loader.annotation.Inject;
import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.ioc.impl.PropertiesProxy;
+import org.nutz.lang.Strings;
import java.util.List;
@@ -24,12 +26,20 @@ public class WechatMessageSendStrategy implements GlobalMessageSendStrategy {
private Dao dao;
@Inject
private SmsService smsService;
+ @Inject
+ private PropertiesProxy conf;
@Override
public GlobalMessageChannel getChannel() {
return GlobalMessageChannel.WECHAT;
}
+ @Override
+ public boolean isEnabled() {
+ return !(Strings.isNotBlank(conf.get("custom.msg.platform.app-id"))
+ && conf.getBoolean("msg.platform.IntelligenceMode", false));
+ }
+
@Override
public boolean supportAsync() {
return true;
diff --git a/src/main/resources/application-dev.yaml b/src/main/resources/application-dev.yaml
index ea7aa76..90f083c 100644
--- a/src/main/resources/application-dev.yaml
+++ b/src/main/resources/application-dev.yaml
@@ -34,7 +34,7 @@ sdk:
appSecret: a65cec4fb69980bd88258fc8433a3eef
redirectUri: /platform/wx/oauth2/callback
cas:
- enable: true
+ enable: false
server-url-prefix: https://authserver.zjnu.edu.cn/authserver
server-login-url: https://authserver.zjnu.edu.cn/authserver/login
qi-wx-server-login-url: https://authserver.zjnu.edu.cn/authserver/login
diff --git a/src/main/resources/application-prd.yaml b/src/main/resources/application-prd.yaml
index db1d9b4..60875f8 100644
--- a/src/main/resources/application-prd.yaml
+++ b/src/main/resources/application-prd.yaml
@@ -68,7 +68,7 @@ custom:
msg:
platform:
enabled: true
- IntelligenceMode: false
+ IntelligenceMode: true
app-id: 'MSG45363193'
app-password: 'OGQxNzVmOTJkZjM5NzJhZDg1MDNiZGM0MDQ5ZTJlNDY'
base-url: http://xxt.zjnu.edu.cn
diff --git a/src/main/resources/static/assets/staffbenefit/therapyRecuperation/component.js b/src/main/resources/static/assets/staffbenefit/therapyRecuperation/component.js
index 617e55a..e1dfa83 100644
--- a/src/main/resources/static/assets/staffbenefit/therapyRecuperation/component.js
+++ b/src/main/resources/static/assets/staffbenefit/therapyRecuperation/component.js
@@ -46,7 +46,7 @@ Vue.component('more', {
}
})
-Vue.component('table-tool', {
+Vue.component('therapy-table-tool', {
props: {
label: {type: String},
app: {}
@@ -127,3 +127,4 @@ Vue.component('table-tool', {
`,
})
+Vue.component('table-tool', Vue.options.components['therapy-table-tool'])
diff --git a/src/main/resources/static/components/staffbenefit/therapyRecuperation/Enrollinfo.vue b/src/main/resources/static/components/staffbenefit/therapyRecuperation/Enrollinfo.vue
index 8176192..cd5c2ac 100644
--- a/src/main/resources/static/components/staffbenefit/therapyRecuperation/Enrollinfo.vue
+++ b/src/main/resources/static/components/staffbenefit/therapyRecuperation/Enrollinfo.vue
@@ -71,7 +71,7 @@
家属 {{ index + 1 }} · {{ item.userName }}
-
+
{{ item.userName }}
{{ item.sex }}
{{ item.relation }}
diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/process/TheRapyQuery.html b/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/process/TheRapyQuery.html
index fcfd9b2..cff2d76 100644
--- a/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/process/TheRapyQuery.html
+++ b/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/process/TheRapyQuery.html
@@ -115,11 +115,79 @@ layout("/platform/zhgh/staffbenefit/therapyRecuperation/layouts/platform.html"){
padding-right: 0;
}
}
- .therapy-query-view-dialog .el-dialog__body,
- .therapy-query-edit-dialog .el-dialog__body {
- padding: 16px 24px;
+ .therapy-query-view-dialog,
+ .therapy-query-edit-dialog {
+ display: flex;
+ flex-direction: column;
+ max-width: 1440px;
+ max-height: calc(100vh - 100px);
+ margin-top: 50px !important;
}
+ .therapy-query-view-dialog > .el-dialog__header,
+ .therapy-query-view-dialog > .el-dialog__footer,
+ .therapy-query-edit-dialog > .el-dialog__header,
+ .therapy-query-edit-dialog > .el-dialog__footer {
+ flex-shrink: 0;
+ }
+
+ .therapy-query-view-dialog > .el-dialog__body,
+ .therapy-query-edit-dialog > .el-dialog__body {
+ min-height: 0;
+ padding: 20px 24px;
+ overflow: auto;
+ }
+
+ .therapy-query-view-dialog .panel {
+ margin: 0 0 20px;
+ overflow: hidden;
+ border-radius: 4px;
+ }
+
+ .therapy-query-view-dialog .panel-heading {
+ padding: 12px 16px;
+ }
+
+ .therapy-query-view-dialog .panel-title {
+ margin: 0;
+ color: #303133;
+ font-size: 15px;
+ font-weight: 600;
+ line-height: 24px;
+ }
+
+ .therapy-query-view-dialog .panel-body {
+ padding: 16px;
+ }
+
+ .therapy-query-view-dialog .el-descriptions-item__label,
+ .therapy-query-edit-dialog .el-descriptions-item__label {
+ color: #606266;
+ font-weight: 400;
+ line-height: 24px;
+ }
+
+ .therapy-query-view-dialog .el-descriptions-item__content,
+ .therapy-query-edit-dialog .el-descriptions-item__content {
+ padding: 12px 16px;
+ line-height: 24px;
+ }
+
+ .therapy-query-edit-dialog .el-form-item__label {
+ color: #606266;
+ font-weight: 400;
+ }
+
+ .therapy-query-edit-dialog .therapy-edit-family > .el-form-item__label {
+ display: block;
+ float: none;
+ width: auto !important;
+ margin-bottom: 12px;
+ text-align: left;
+ line-height: 24px;
+ }
+
+
.therapy-query-view-dialog .viewTable .el-descriptions__table {
table-layout: fixed;
}
@@ -135,6 +203,7 @@ layout("/platform/zhgh/staffbenefit/therapyRecuperation/layouts/platform.html"){
}
.therapy-query-edit-dialog .therapy-edit-family > .el-form-item__content {
+ margin-left: 0 !important;
line-height: normal;
}
@@ -172,24 +241,32 @@ layout("/platform/zhgh/staffbenefit/therapyRecuperation/layouts/platform.html"){
white-space: nowrap;
}
- @media (max-width: 767px) {
+ @media (max-width: 1000px) {
.therapy-query-view-dialog,
.therapy-query-edit-dialog {
- width: 96% !important;
+ width: 94% !important;
}
.therapy-query-edit-dialog .el-form > .el-row > .el-col {
width: 100%;
}
- .therapy-query-view-dialog .therapy-family-list,
- .therapy-query-edit-dialog .therapy-family-list {
- overflow-x: auto;
+ .therapy-query-view-dialog .el-descriptions__row,
+ .therapy-query-edit-dialog .therapy-family-details .el-descriptions__row {
+ display: grid;
+ grid-template-columns: 120px minmax(0, 1fr);
}
- .therapy-query-view-dialog .therapy-family-card,
- .therapy-query-edit-dialog .therapy-family-card {
- min-width: 660px;
+ .therapy-query-view-dialog .viewTable .el-descriptions-item__label,
+ .therapy-query-view-dialog .therapy-family-details .el-descriptions-item__label,
+ .therapy-query-edit-dialog .therapy-family-details .el-descriptions-item__label {
+ width: auto;
+ white-space: normal;
+ }
+
+ .therapy-query-view-dialog .el-descriptions-item__content,
+ .therapy-query-edit-dialog .el-descriptions-item__content {
+ min-width: 0;
}
}
@@ -959,40 +1036,40 @@ layout("/platform/zhgh/staffbenefit/therapyRecuperation/layouts/platform.html"){
:visible.sync="editVisible"
:close-on-click-modal="false"
width="80%" top="50px">
-
-
-
+
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
@@ -1004,7 +1081,7 @@ layout("/platform/zhgh/staffbenefit/therapyRecuperation/layouts/platform.html"){
家属 {{ index + 1 }} · {{ item.userName }}
-
+
{{ item.userName }}
{{ item.sex }}
{{ item.relation }}
@@ -1171,7 +1248,7 @@ layout("/platform/zhgh/staffbenefit/therapyRecuperation/layouts/platform.html"){
}
},
components: {
- 'enroll-info': httpVueLoader('/components/staffbenefit/therapyRecuperation/Enrollinfo.vue?v=1.0.2'),
+ 'enroll-info': httpVueLoader('/components/staffbenefit/therapyRecuperation/Enrollinfo.vue?v=1.0.3'),
'line-info': httpVueLoader('/components/staffbenefit/therapyRecuperation/LineInfo.vue')
},
methods: {
diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/statistics/lineStatistics.html b/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/statistics/lineStatistics.html
index f4c3fd7..15a7711 100644
--- a/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/statistics/lineStatistics.html
+++ b/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/statistics/lineStatistics.html
@@ -27,6 +27,58 @@ layout("/platform/zhgh/staffbenefit/therapyRecuperation/layouts/platform.html"){
}
+ .therapy-statistics-time-dialog {
+ width: calc(100% - 32px) !important;
+ max-width: 960px;
+ border-radius: 8px;
+ overflow: hidden;
+ }
+
+ .therapy-statistics-time-dialog .el-dialog__header {
+ padding: 20px 24px;
+ border-bottom: 1px solid #ebeef5;
+ }
+
+ .therapy-statistics-time-dialog .el-dialog__body {
+ padding: 24px;
+ max-height: calc(84vh - 150px);
+ overflow-y: auto;
+ }
+
+ .therapy-statistics-time-dialog .statistics-time-fields {
+ display: grid;
+ grid-template-columns: repeat(2, minmax(0, 1fr));
+ gap: 0 24px;
+ padding: 20px 20px 0;
+ margin-bottom: 16px;
+ border: 1px solid #ebeef5;
+ border-radius: 6px;
+ background: #fafbfc;
+ }
+
+ .therapy-statistics-time-dialog .el-form-item { min-width: 0; margin-bottom: 22px; }
+ .therapy-statistics-time-dialog .el-form-item__label {
+ float: none;
+ display: block;
+ width: auto !important;
+ padding: 0 0 8px;
+ line-height: 22px;
+ text-align: left;
+ }
+
+ .therapy-statistics-time-dialog .el-form-item__content { margin-left: 0 !important; }
+ .therapy-statistics-time-dialog .el-date-editor { width: 100% !important; }
+ .therapy-statistics-time-dialog .el-dialog__footer {
+ padding: 16px 24px;
+ border-top: 1px solid #ebeef5;
+ background: #fff;
+ }
+
+ @media (max-width: 767px) {
+ .therapy-statistics-time-dialog .statistics-time-fields { grid-template-columns: minmax(0, 1fr); padding: 16px 16px 0; }
+ .therapy-statistics-time-dialog .el-dialog__body { padding: 16px; }
+ }
+
@@ -164,7 +216,7 @@ layout("/platform/zhgh/staffbenefit/therapyRecuperation/layouts/platform.html"){
-
+
导出成团线路人员
-->
-
+
+ width="80%" custom-class="therapy-statistics-time-dialog" top="8vh">
-
-
-
出行时间段
-
-
-
-
-
+
+
-
-
-
+
-
-
-
+
-
-
-
+
-
-
-
+
-
-
-
+
-
-
-
+
-
-
-
-
+
+