Merge remote-tracking branch 'origin/fix_漏洞修复'
This commit is contained in:
@@ -16,16 +16,20 @@ sm4cbc:
|
||||
keyHex: 00112233445566778899aabbccddeeff
|
||||
ivHex: 0102030405060708090a0b0c0d0e0f10
|
||||
|
||||
jetty:
|
||||
contextPath: /
|
||||
threadpool:
|
||||
idleTimeout: 60000
|
||||
minThreads: 10
|
||||
tomcat:
|
||||
contextPath: ""
|
||||
# 容器错误响应不披露版本；Session Cookie 保持 HttpOnly。
|
||||
session:
|
||||
cookie:
|
||||
httponly: true
|
||||
executor:
|
||||
maxIdleTime: 60000
|
||||
minSpareThreads: 10
|
||||
maxThreads: 500
|
||||
page:
|
||||
403: /error/403.html
|
||||
404: /error/404.html
|
||||
500: /error/500.html
|
||||
403: /__container_error
|
||||
404: /__container_error
|
||||
500: /__container_error
|
||||
#结合ftp使用,或用nginx代理ftp路径
|
||||
#staticPath: /Users/wizzer/temp/files
|
||||
#开发模式静态资源
|
||||
|
||||
@@ -14,7 +14,7 @@ var ioc={
|
||||
// 单个文件最大尺寸(大约的值，单位为字节，即 2097152 为 2M)
|
||||
maxFileSize : 2097152,
|
||||
// 正则表达式匹配可以支持的文件名
|
||||
nameFilter : '^(.+[.])(gif|jpg|png|svg)$'
|
||||
nameFilter : '(?i)^(.+[.])(gif|jpg|jpeg|png)$'
|
||||
}
|
||||
},
|
||||
imageUpload : {
|
||||
@@ -32,7 +32,7 @@ var ioc={
|
||||
// 单个文件最大尺寸(大约的值，单位为字节，即 209715200 为 200M)
|
||||
maxFileSize : 209715200,
|
||||
// 正则表达式匹配可以支持的文件名
|
||||
nameFilter : '^(.+[.])(gif||svg|jpg|png|jpeg|doc|docx|xls|xlsx|rar|zip|7z|txt|pdf|pptx|ppt|mp4)$'
|
||||
nameFilter : '(?i)^(.+[.])(gif|jpg|png|jpeg|doc|docx|xls|xlsx|rar|zip|7z|txt|pdf|pptx|ppt|mp4)$'
|
||||
}
|
||||
},
|
||||
fileUpload : {
|
||||
|
||||
+1
-33
@@ -187,31 +187,6 @@ layout("/layouts/platform.html"){
|
||||
</el-form-item>
|
||||
</el-descriptions-item>
|
||||
|
||||
<el-descriptions-item label="生日"
|
||||
v-if="formData.reimburseProject === 'UNION_REIMBURSE_PROJECT_1'">
|
||||
<el-form-item prop="condolenceBirthday" label="生日">
|
||||
<el-input
|
||||
:value="formData.condolenceBirthday && $moment(formData.condolenceBirthday).isValid() ?$moment(formData.condolenceBirthday).format('YYYY-MM-DD') : ''"
|
||||
show-word-limit placeholder="请输入生日" disabled></el-input>
|
||||
</el-form-item>
|
||||
</el-descriptions-item>
|
||||
|
||||
<el-descriptions-item label="身份证号"
|
||||
v-if="formData.reimburseProject === 'UNION_REIMBURSE_PROJECT_1'">
|
||||
<el-form-item prop="condolenceIdCard" label="身份证号">
|
||||
<el-input v-model="formData.condolenceIdCard" show-word-limit
|
||||
placeholder="请输入身份证号" disabled></el-input>
|
||||
</el-form-item>
|
||||
</el-descriptions-item>
|
||||
|
||||
<el-descriptions-item label="联系方式"
|
||||
v-if="formData.reimburseProject === 'UNION_REIMBURSE_PROJECT_1'">
|
||||
<el-form-item prop="condolenceMobile" label="联系方式">
|
||||
<el-input v-model="formData.condolenceMobile" show-word-limit
|
||||
placeholder="请输入联系方式" disabled></el-input>
|
||||
</el-form-item>
|
||||
</el-descriptions-item>
|
||||
|
||||
<el-descriptions-item label="慰问类型"
|
||||
v-if="formData.reimburseProject === 'UNION_REIMBURSE_PROJECT_1'">
|
||||
<el-form-item label="慰问类型" prop="condolenceTypeId">
|
||||
@@ -816,7 +791,6 @@ layout("/layouts/platform.html"){
|
||||
trigger: ["change", "blur"]
|
||||
}, {pattern: /^([1-9]{1})(\d{15}|\d{18})$/, message: "请输入正确的银行卡号", trigger: "blur"}],
|
||||
bankOfDeposit: [{required: true, message: "请填写开户行", trigger: ["change", "blur"]}],
|
||||
condolenceMobile: [{pattern: /^1[3-9]\d{9}$/, message: "请输入正确的手机号码", trigger: "blur"}],
|
||||
condolenceTime: [{required: true, message: "请选择慰问时间", trigger: ["change", "blur"]}],
|
||||
// invoiceNumber: [{required: true, message: "请填写发票张数", trigger: ["change", "blur"]}],
|
||||
// invoice: [{required: true, message: "请填写发票号码", trigger: ["change", "blur"]}],
|
||||
@@ -1187,10 +1161,7 @@ layout("/layouts/platform.html"){
|
||||
unionId,
|
||||
unionName,
|
||||
unionCode,
|
||||
sex,
|
||||
birthday,
|
||||
idCard,
|
||||
mobile
|
||||
sex
|
||||
} = user
|
||||
this.$set(this.formData, "condolenceUserName", userName)
|
||||
this.$set(this.formData, "condolenceLoginName", loginName)
|
||||
@@ -1200,9 +1171,6 @@ layout("/layouts/platform.html"){
|
||||
this.$set(this.formData, "condolenceUnionName", unionName)
|
||||
this.$set(this.formData, "condolenceUnionCode", unionCode)
|
||||
this.$set(this.formData, "condolenceSex", sex)
|
||||
this.$set(this.formData, "condolenceBirthday", birthday)
|
||||
this.$set(this.formData, "condolenceIdCard", idCard)
|
||||
this.$set(this.formData, "condolenceMobile", mobile)
|
||||
}
|
||||
},
|
||||
typeChange(val) {
|
||||
|
||||
@@ -86,18 +86,6 @@ const unionReimburseInfo = {
|
||||
<span>{{ viewData.condolenceSex }}</span>
|
||||
</el-descriptions-item>
|
||||
|
||||
<el-descriptions-item label="生日" v-if="viewData.reimburseProject === 'UNION_REIMBURSE_PROJECT_1'">
|
||||
<span>{{ viewData.condolenceBirthday && $moment(viewData.condolenceBirthday).isValid() ? $moment(viewData.condolenceBirthday).format('YYYY-MM-DD') : '' }}</span>
|
||||
</el-descriptions-item>
|
||||
|
||||
<el-descriptions-item label="身份证号" v-if="viewData.reimburseProject === 'UNION_REIMBURSE_PROJECT_1'">
|
||||
<span>{{ viewData.condolenceIdCard }}</span>
|
||||
</el-descriptions-item>
|
||||
|
||||
<el-descriptions-item label="联系方式" v-if="viewData.reimburseProject === 'UNION_REIMBURSE_PROJECT_1'">
|
||||
<span>{{ viewData.condolenceMobile }}</span>
|
||||
</el-descriptions-item>
|
||||
|
||||
<el-descriptions-item label="慰问类型" v-if="viewData.reimburseProject === 'UNION_REIMBURSE_PROJECT_1'">
|
||||
<span>{{ viewData.typeName }}</span>
|
||||
</el-descriptions-item>
|
||||
|
||||
+1
-8
@@ -579,9 +579,6 @@ layout("/layouts/platform_h5.html"){
|
||||
</van-action-sheet>
|
||||
|
||||
<van-field label="性别" v-model="formData.condolenceSex" readonly placeholder="自动带出"></van-field>
|
||||
<van-field label="生日" :value="formatDateText(formData.condolenceBirthday)" readonly placeholder="自动带出"></van-field>
|
||||
<van-field label="身份证号" v-model="formData.condolenceIdCard" readonly placeholder="自动带出"></van-field>
|
||||
<van-field label="联系方式" v-model="formData.condolenceMobile" readonly placeholder="自动带出"></van-field>
|
||||
|
||||
<van-field
|
||||
v-model="formData.typeName"
|
||||
@@ -1412,7 +1409,7 @@ layout("/layouts/platform_h5.html"){
|
||||
},
|
||||
normalizeContactFields() {
|
||||
// 提交前裁剪联系方式空格，避免系统手机号带空格时后端格式校验失败。
|
||||
const fields = ["mobile", "condolenceMobile"]
|
||||
const fields = ["mobile"]
|
||||
fields.forEach((fieldName) => {
|
||||
if (this.formData[fieldName]) {
|
||||
this.$set(this.formData, fieldName, String(this.formData[fieldName]).trim())
|
||||
@@ -2209,7 +2206,6 @@ layout("/layouts/platform_h5.html"){
|
||||
const selectedUser = this.condolenceOptions.find(user => user.id === o.value)
|
||||
if (selectedUser) {
|
||||
this.fillCondolenceUser(selectedUser)
|
||||
this.$set(this.formData, "condolenceMobile", selectedUser.mobile)
|
||||
}
|
||||
},
|
||||
onCondolenceTypeConfirm(o) {
|
||||
@@ -2341,9 +2337,6 @@ layout("/layouts/platform_h5.html"){
|
||||
this.$set(this.formData, "condolenceUnionName", user.unionName)
|
||||
this.$set(this.formData, "condolenceUnionCode", user.unionCode)
|
||||
this.$set(this.formData, "condolenceSex", user.sex)
|
||||
this.$set(this.formData, "condolenceBirthday", user.birthday)
|
||||
this.$set(this.formData, "condolenceIdCard", user.idCard)
|
||||
this.$set(this.formData, "condolenceMobile", user.mobile)
|
||||
},
|
||||
// 查询慰问类型
|
||||
queryCondolenceType() {
|
||||
|
||||
@@ -100,18 +100,6 @@ const UNION_REIMBURSE_INFO = {
|
||||
<div class="union-info-label">性别</div>
|
||||
<div class="union-info-value">{{ viewData.condolenceSex }}</div>
|
||||
</div>
|
||||
<div class="union-info-row">
|
||||
<div class="union-info-label">生日</div>
|
||||
<div class="union-info-value">{{ formatDateText(viewData.condolenceBirthday) }}</div>
|
||||
</div>
|
||||
<div class="union-info-row">
|
||||
<div class="union-info-label">身份证号</div>
|
||||
<div class="union-info-value">{{ viewData.condolenceIdCard }}</div>
|
||||
</div>
|
||||
<div class="union-info-row">
|
||||
<div class="union-info-label">联系方式</div>
|
||||
<div class="union-info-value">{{ viewData.condolenceMobile }}</div>
|
||||
</div>
|
||||
<div class="union-info-row">
|
||||
<div class="union-info-label">慰问类型</div>
|
||||
<div class="union-info-value">{{ viewData.typeName || viewData.condolenceTypeName }}</div>
|
||||
|
||||
Reference in New Issue
Block a user