commit

src/main/resources/views/platform/zhghh5/staffbenefit/condolence/apply/index.html

@@ -217,30 +217,6 @@ layout("/layouts/platform_h5.html"){
                 name="bankOfDeposit"
             ></van-field>
 
-
-<!--            <van-field
-                v-if="['2'].includes(formData.typeCode)"
-                v-model="formData.child"
-                name="child"
-                label="孩次"
-                required
-                :rules="[{ required: true }]"
-                placeholder="请点击选择孩次"
-                clickable
-                is-link
-                readonly
-                @click="showChildPicker = true"
-            ></van-field>
-            <van-popup position="bottom" round v-model:show="showChildPicker">
-                <van-picker
-                    title="请选择孩次"
-                    show-toolbar
-                    :columns="['一孩', '二孩', '三孩']"
-                    @confirm="(val) => {formData.child = val; showChildPicker = false}"
-                    @cancel="showChildPicker = false"
-                ></van-picker>
-            </van-popup>-->
-
             <template v-if="['2'].includes(formData.typeCode)">
                 <van-field
                     v-model="formData.hospitalizationTime"
@@ -265,6 +241,29 @@ layout("/layouts/platform_h5.html"){
                         @cancel="showHospitalizationTimePicker = false"
                     ></van-datetime-picker>
                 </van-popup>
+                <van-field
+                    v-model="formData.leaveHospitalTime"
+                    name="leaveHospitalTime"
+                    label="出院时间"
+                    required
+                    :rules="[{ required: true }]"
+                    placeholder="请点击选择出院时间"
+                    clickable
+                    is-link
+                    readonly
+                    @click="showLeaveHospitalTimePicker = true"
+                ></van-field>
+                <van-popup position="bottom" round v-model:show="showLeaveHospitalTimePicker">
+                    <van-datetime-picker
+                        v-model="formData.hospitalizationTime"
+                        type="date"
+                        :min-date="minDate"
+                        :max-date="maxDate"
+                        title="请选择出院时间"
+                        @confirm="(val) => {formData.leaveHospitalTime = $moment(val).format('YYYY-MM-DD'); showLeaveHospitalTimePicker = false}"
+                        @cancel="showLeaveHospitalTimePicker = false"
+                    ></van-datetime-picker>
+                </van-popup>
             </template>
 
             <van-field
@@ -346,6 +345,7 @@ layout("/layouts/platform_h5.html"){
                 handlerUserSelectShow:false,
 
                 showHospitalizationTimePicker:false,
+                showLeaveHospitalTimePicker:false,
                 minDate: new Date(2024, 0, 1),
                 maxDate: new Date(),
 

target/classes/META-INF/nutz/org.nutz.boot.config.ConfigureLoader

@@ -1 +0,0 @@
-org.nutz.boot.config.impl.YamlConfigureLoader

target/classes/application-dev.yaml

@@ -1,177 +0,0 @@
-nutz:
-  application:
-    name: zhgh_whcp
-  mvc:
-    ignore: ^(.+[.])(jsp|png|gif|jpg|js|css|jspx|jpeg|html|mp3|mp4|ico|svg|vue)$
-    exclusions: /favicon/*,/assets/*,/druid/*,/upload/*,/components/*
-server:
-  port: 8080
-  host: 0.0.0.0
-
-jetty:
-  contextPath: /
-  threadpool:
-    idleTimeout: 60000
-    minThreads: 10
-    maxThreads: 500
-  page:
-    403: /error/403.html
-    404: /error/404.html
-    500: /error/500.html
-    #结合ftp使用,或用nginx代理ftp路径
-  #staticPath: /Users/wizzer/temp/files
-  #开发模式静态资源
-  staticPathLocal: E:/projects/zhgh_whcp_new/src/main/resources/static
-
-security:
-  tokenName: saToken
-  timeout: 36000
-  # 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录)
-  # 允许同一账号并发登录，则系统参数 SessionOnlyOne 有效，亦可踢人下线并多了弹框提示功能
-  isConcurrent: true
-  # 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token)
-  isShare: false
-
-wxwork:
-  enable: true
-  corpId: wwaca81b3016b9a58c
-  corpSecret: Auc7919Su1Uds5ZErfZybBrt-8FkP5NA-dldZyQuOrM
-  agentId: 1000131
-  redirectUri: /platform/wxwork/oauth2/callback
-
-wx:
-  enable: false
-  appID: wx4f65ff5f1b72e99d
-  appSecret: a65cec4fb69980bd88258fc8433a3eef
-  redirectUri: /platform/wx/oauth2/callback
-
-cas:
-  enable: false
-  server-url-prefix: https://i.njupt.edu.cn/cas
-  server-login-url: https://i.njupt.edu.cn/cas/login
-  qi-wx-server-login-url: httos:/cas.whcp.eou.cn/lyuapServer/wechatauz/wxAuthRedirect
-  client-host-url: https://zhgh.njupt.edu.cn
-  client-call-back-url: /platform/sso/login
-  validation-type: cas
-
-redis:
-  host: 127.0.0.1
-  port: 6379
-  timeout: 2000
-  max_redir: 10
-  database: 1
-  maxTotal: 500
-  pool:
-    maxTotal: 500
-    maxIdle: 50
-    minIdle: 10
-  #password: test123
-  mode: normal
-  #cluster
-  #nodes=192.168.6.31:6377,192.168.6.31:6378,192.168.6.28:6377,192.168.6.28:6378,192.168.6.34:6377,192.168.6.34:6378
-
-jdbc:
-  url: jdbc:mysql://192.168.21.203:3306/zhgh_whcp?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
-  username: root
-  password: root
-  validationQuery: select 1
-  maxActive: 1000
-  testWhileIdle: true
-  connectionProperties: druid.stat.slowSqlMillis=2000
-  defaultAutoCommit: true
-
-xsssql:
-  ignore:
-    urls: /platform/cms/content/article/addDo,/platform/sys/app/conf/addDo,/platform/sys/app/conf/editDo
-
-beetl:
-  RESOURCE:
-    #本地路径,开发时设置本地路径,便于调试
-    rootLocal: E:/projects/zhgh_whcp_new/src/main/resources/views/
-    root: views/
-  DELIMITER_STATEMENT_START: "<!--#"
-  DELIMITER_STATEMENT_END: "#-->"
-  FT:
-    #用法: ${"wizzer",escape}
-    escape: com.budwk.app.web.commons.ext.beetl.HtmlEscapeFormat
-    #用法: ${10241024,filesize}
-    filesize: com.budwk.app.web.commons.ext.beetl.FileSizeFormat
-    #用法: ${"",html2txt="100"} 截取100字符
-    html2txt: com.budwk.app.web.commons.ext.beetl.Html2TxtFormat
-    #用法: ${"",strlen="100"} 截取100字符
-    strlen: com.budwk.app.web.commons.ext.beetl.StrlenFormat
-
-#==============================================================
-#Configure Main Scheduler Properties
-#==============================================================
-#quartz延迟启动秒数
-quartz:
-  startupDelay: 10
-  scheduler:
-    instanceName: defaultScheduler
-    instanceId: AUTO
-    #==============================================================
-    #Skip Check Update
-    #update:true
-    #not update:false
-    #==============================================================
-    skipUpdateCheck: true
-    #==============================================================
-    #Configure JobStore     isClustered=启用集群模式
-    #==============================================================
-  jobStore:
-    class: org.quartz.impl.jdbcjobstore.JobStoreTX
-    driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate
-    #driverDelegateClass: org.quartz.impl.jdbcjobstore.PostgreSQLDelegate
-    #driverDelegateClass: org.quartz.impl.jdbcjobstore.oracle.OracleDelegate
-    #Other delegates can see: http://www.quartz-scheduler.org/documentation/quartz-2.x/tutorials/tutorial-lesson-09.html
-    dataSource: myDS
-    tablePrefix: SYS_QRTZ_
-    isClustered: false
-    clusterCheckinInterval: 20000
-    maxMisfiresToHandleAtATime: 120
-    misfireThreshold: 120000
-    txIsolationLevelSerializable: false
-
-    #==============================================================
-    #Configure ThreadPool
-    #==============================================================
-  threadPool:
-    class: org.quartz.simpl.SimpleThreadPool
-    threadCount: 2
-    threadPriority: 5
-    threadsInheritContextClassLoaderOfInitializingThread: true
-
-    #============================================================================
-    # Configure Plugins
-    #============================================================================
-  plugin:
-    triggHistory:
-      class: org.quartz.plugins.history.LoggingJobHistoryPlugin
-    shutdownhook:
-      class: org.quartz.plugins.management.ShutdownHookPlugin
-      cleanShutdown: true
-    #============================================================================
-    # NutDao dataSource
-    #============================================================================
-  dataSource:
-    myDS:
-      connectionProvider:
-        class: com.budwk.app.task.conn.NutConnectionProvider
-
-minio:
-  accessKey: minioadmin
-  secretKey: minioadmin
-  endPoint: http://192.168.21.214:9000
-  bucket: njupt
-
-data-center:
-  grant_type: password
-  scope: read
-  username: 3848A3C738EFBB2C2E76E0D59B419DACA16A80F3AB0354CD
-  password: 3848A3C738EFBB2C2E76E0D59B419DACA16A80F3AB0354CD
-  token-url: https://bd.whcp.edu.cn/sjjkfwpt/api/bd-api/oauth/token
-  urls:
-    teacher: https://bd.whcp.edu.cn/sjjkfwpt/api/bd-api/get/JZGJCSJZLB
-    unit: https://bd.whcp.edu.cn/sjjkfwpt/api/bd-api/get/YXSDWJBSJZLB
-

target/classes/banner.txt

@@ -1,7 +0,0 @@
-______           _ _    _ _           _   _ _____  ___  ____       _
-| ___ \         | | |  | | |         | | | |  ___| |  \/  (_)     (_)
-| |_/ /_   _  __| | |  | | | ________| | | |___ \  | .  . |_ _ __  _
-| ___ \ | | |/ _` | |/\| | |/ /______| | | |   \ \ | |\/| | | '_ \| |
-| |_/ / |_| | (_| \  /\  /   <       \ \_/ /\__/ / | |  | | | | | | |
-\____/ \__,_|\__,_|\/  \/|_|\_\       \___/\____/  \_|  |_/_|_| |_|_|
-

target/classes/chain/mvc-chain.json

@@ -1,19 +0,0 @@
-var chain={
-	"default" : {
-		"ps" : [
-			  "com.budwk.app.web.commons.proc.LogTimeProcessor",
-			  "com.budwk.app.web.commons.proc.GlobalsSettingProcessor",
-			  "com.budwk.app.web.commons.proc.CspProcessor",
-			  "org.nutz.mvc.impl.processor.UpdateRequestAttributesProcessor",
-		      "org.nutz.mvc.impl.processor.EncodingProcessor",
-		      "org.nutz.mvc.impl.processor.ModuleProcessor",
-              "com.budwk.app.web.commons.proc.XssSqlFilterProcessor",
-		      "org.nutz.mvc.impl.processor.ActionFiltersProcessor",
-		      "org.nutz.mvc.impl.processor.AdaptorProcessor",
-			  "com.budwk.app.web.commons.proc.ParamValidationProcessor",
-		      "org.nutz.mvc.impl.processor.MethodInvokeProcessor",
-			  "org.nutz.mvc.impl.processor.ViewProcessor"
-		],
-		"error" : 'com.budwk.app.web.commons.proc.WkFailProcessor'
-	}
-};