c-zhangr1/zhgh_hrbnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug整改

Browse Source
This commit is contained in:
Paidax
2025-02-10 15:10:38 +08:00
parent 73a42d3f1c
commit f7d05c43a0
10 changed files with 547 additions and 509 deletions
Download Patch File Download Diff File Expand all files Collapse all files
20241205091835.nb3
BIN
View File
Binary file not shown.
src/main/java/io/v/nutz/zhgh/zgfw/model/difficult/Zgfw_knbf.java
+1 -1
View File
@@ -103,7 +103,7 @@ public class Zgfw_knbf implements Serializable {
@Column
@Comment("出生日期")
@ColDefine(type = ColType.DATE)
@ColDefine(type = ColType.DATETIME)
private Date birthday;
@Column
src/main/resources/static/assets/mobile/css/theme.css
+2 -2
View File
@@ -77,7 +77,7 @@
box-shadow: 0 2px 12px 0 rgb(0 0 0 / 10%);
}
.van-empty {
/*.van-empty {
background-color: #FFFFFF;
position: absolute;
left: 50%;
@@ -86,7 +86,7 @@
width: 100%;
height: 100%;
z-index: 0;
}
}*/
.van-dropdown-item__content {
border-bottom-right-radius: 15px;
src/main/resources/views/layouts/platform.html
+2
View File
@@ -123,6 +123,8 @@
var loginPjax = "${@shiro.getPrincipalProperty('loginPjax')}"
const LOGO_URL = "${config.logoUrl!}"
window.sessionStorage.setItem("user", JSON.stringify(${json(@shiro.getPrincipal())}))
ELEMENT.locale(ELEMENT.lang["${lang,escape}"])
Vue.component("vuedraggable", window.vuedraggable)
src/main/resources/views/mobile/condolence/apply.html
+232 -173
View File
@@ -3,149 +3,208 @@ layout("/mobile/platform.html"){
#-->
<div id="app" v-cloak>
<van-nav-bar title="填写慰问申请" left-arrow placeholder fixed
@click-left="history.back()"></van-nav-bar>
<van-nav-bar title="填写慰问申请" left-arrow placeholder fixed @click-left="pjaxReplace('/mobile/index')"></van-nav-bar>
<van-form ref="addForm" :show-error-message="false" input-align="right" style="margin-bottom: 60px">
<van-cell-group inset class="mt10">
<van-field readonly value="${@shiro.getPrincipalProperty('username')}" name="manager_name"
label="经办人姓名"></van-field>
<van-field readonly value="${@shiro.getPrincipalProperty('loginname')}" name="manager_name"
label="经办人工号"></van-field>
<van-field @input="userRemoteMethod" name="be_user_name"
required
v-model="formData.be_user_name" label="慰问对象" placeholder="请输入慰问对象"
:rules="[{ required: true, message: '请填写慰问对象' }]"></van-field>
<van-action-sheet v-model="sheetShow"
:actions="userList"
cancel-text="重新输入姓名或工号查询"
@cancel="userList = []; formData.be_user_name = ''"
:close-on-click-overlay="false"
@select="onUserSelect">
</van-action-sheet>
<van-field readonly :value="formData.apply_time" name="apply_time"
label="申请时间"
<van-field readonly value="${@shiro.getPrincipalProperty('username')}" name="manager_name" label="经办人姓名"></van-field>
<van-field readonly value="${@shiro.getPrincipalProperty('loginname')}" name="manager_name" label="经办人工号"></van-field>
<van-field
@input="userRemoteMethod"
name="be_user_name"
required
v-model="formData.be_user_name"
label="慰问对象"
placeholder="请输入慰问对象"
:rules="[{ required: true, message: '请填写慰问对象' }]"
></van-field>
<van-action-sheet
v-model="sheetShow"
:actions="userList"
cancel-text="重新输入姓名或工号查询"
@cancel="userList = []; formData.be_user_name = ''"
:close-on-click-overlay="false"
@select="onUserSelect"
></van-action-sheet>
<van-field readonly :value="formData.apply_time" name="apply_time" label="申请时间"></van-field>
<van-field @input="payeeUserRemoteMethod" name="payee_name"
required :rules="[{ required: true, message: '请选择收款人' }]"
v-model="formData.payee_name" label="收款人" placeholder="请输入收款人"></van-field>
<van-action-sheet v-model="payeeSheetShow"
:actions="payeeUserList"
cancel-text="重新输入姓名或工号查询"
@cancel="payeeUserList = []; formData.payee_name = ''"
:close-on-click-overlay="false"
@select="payeeOnUserSelect">
</van-action-sheet>
<van-field
@input="payeeUserRemoteMethod"
name="payee_name"
required
:rules="[{ required: true, message: '请选择收款人' }]"
v-model="formData.payee_name"
label="收款人"
placeholder="请输入收款人"
></van-field>
<van-action-sheet
v-model="payeeSheetShow"
:actions="payeeUserList"
cancel-text="重新输入姓名或工号查询"
@cancel="payeeUserList = []; formData.payee_name = ''"
:close-on-click-overlay="false"
@select="payeeOnUserSelect"
></van-action-sheet>
<!--<van-field v-model="formData.payee_bank_number" name="payee_bank_number" type="number"
label="收款人银行卡" placeholder="请输入收款人银行卡"></van-field>
<van-field v-model="formData.payee_bank_name" name="payee_bank_name"
label="收款人开户行" placeholder="请输入收款人开户行"></van-field>-->
<van-field readonly clickable name="type" :value="formData.typeName"
required
label="慰问类型"
@click="showTypePicker = true" placeholder="点击选择慰问类型"
:rules="[{ required:true, message: '请选择慰问类型'}]"></van-field>
<van-field
readonly
clickable
name="type"
:value="formData.typeName"
required
label="慰问类型"
@click="showTypePicker = true"
placeholder="点击选择慰问类型"
:rules="[{ required:true, message: '请选择慰问类型'}]"
></van-field>
<van-popup v-model:show="showTypePicker" position="bottom" round>
<van-picker show-toolbar :columns="typeColumns" @confirm="onTypeConfirm"
@cancel="showTypePicker = false">
</van-picker>
</van-popup>
<van-field readonly clickable name="way" :value="formData.wayName"
label="慰问方式"
required
placeholder="点击选择慰问方式"
:rules="[{ required:true, message: '请选择慰问方式'}]"></van-field>
<van-popup v-model:show="showWayPicker" position="bottom" round>
<van-picker show-toolbar :columns="wayColumns" @confirm="onWayConfirm"
@cancel="showWayPicker = false">
</van-picker>
</van-popup>
<van-field v-model="formData.money" name="money" type="number" label="慰问金额"
placeholder="请填写慰问金额"
:rules="[{ required:true, message: '请填写慰问金额' }]"></van-field>
<!-- 孩次 -->
<van-field readonly clickable name="type" v-model="formData.birth_child_num"
required v-if="formData.type==='2'"
label="孩次"
@click="showChildPicker = true" placeholder="点击选择孩次"
:rules="[{ required:true, message: '请选择孩次'}]"></van-field>
<van-popup v-model:show="showChildPicker" position="bottom" round>
<van-picker show-toolbar :columns="childColumns" @confirm="onChildConfirm"
@cancel="showChildPicker = false">
</van-picker>
<van-picker show-toolbar :columns="typeColumns" @confirm="onTypeConfirm" @cancel="showTypePicker = false"></van-picker>
</van-popup>
<van-field
required
:rules="[{ required:true, message: '请填写慰问时间' }]"
readonly
clickable
name="occur_time"
:value="formData.occur_time"
label="慰问时间"
placeholder="点击选择慰问时间"
@click="showOccurTime = true"
readonly
clickable
name="way"
:value="formData.wayName"
label="慰问方式"
required
placeholder="点击选择慰问方式"
:rules="[{ required:true, message: '请选择慰问方式'}]"
></van-field>
<van-calendar v-model="showOccurTime"
@confirm="onOccurTimeConfirm"
:min-date="minDate"
:max-date="maxDate"
:color="themeColor"></van-calendar>
<van-popup v-model:show="showWayPicker" position="bottom" round>
<van-picker show-toolbar :columns="wayColumns" @confirm="onWayConfirm" @cancel="showWayPicker = false"></van-picker>
</van-popup>
<van-field
v-model="formData.money"
name="money"
type="number"
label="慰问金额"
placeholder="请填写慰问金额"
:rules="[{ required:true, message: '请填写慰问金额' }]"
></van-field>
<!-- 孩次 -->
<van-field
readonly
clickable
name="type"
v-model="formData.birth_child_num"
required
v-if="formData.type==='2'"
label="孩次"
@click="showChildPicker = true"
placeholder="点击选择孩次"
:rules="[{ required:true, message: '请选择孩次'}]"
></van-field>
<van-popup v-model:show="showChildPicker" position="bottom" round>
<van-picker show-toolbar :columns="childColumns" @confirm="onChildConfirm" @cancel="showChildPicker = false"></van-picker>
</van-popup>
<van-field
required
:rules="[{ required:true, message: '请填写慰问时间' }]"
readonly
clickable
name="occur_time"
:value="formData.occur_time"
label="慰问时间"
placeholder="点击选择慰问时间"
@click="showOccurTime = true"
></van-field>
<van-calendar
v-model="showOccurTime"
@confirm="onOccurTimeConfirm"
:min-date="minDate"
:max-date="maxDate"
:color="themeColor"
></van-calendar>
<template v-if="['3','4'].includes(formData.type)">
<van-field v-model="formData.the_hospital" name="the_hospital" label="治疗医院"
placeholder="请填写治疗医院" required
:rules="[{ required:true, message: '请填写治疗医院' }]"></van-field>
<van-field v-model="formData.the_hospital_house_num" name="the_hospital_house_num" label="病房号"
placeholder="请填写病房号" required
:rules="[{ required:true, message: '请填写病房号' }]"></van-field>
<van-field v-model="formData.the_hospital_house_bed_num" name="the_hospital_house_bed_num" label="床号"
placeholder="请填写床号" required
:rules="[{ required:true, message: '请填写床号' }]"></van-field>
<van-field
v-model="formData.the_hospital"
name="the_hospital"
label="治疗医院"
placeholder="请填写治疗医院"
required
:rules="[{ required:true, message: '请填写治疗医院' }]"
></van-field>
<van-field
v-model="formData.the_hospital_house_num"
name="the_hospital_house_num"
label="病房号"
placeholder="请填写病房号"
required
:rules="[{ required:true, message: '请填写病房号' }]"
></van-field>
<van-field
v-model="formData.the_hospital_house_bed_num"
name="the_hospital_house_bed_num"
label="床号"
placeholder="请填写床号"
required
:rules="[{ required:true, message: '请填写床号' }]"
></van-field>
</template>
<template v-if="['4'].includes(formData.type)">
<van-field v-model="formData.hospital_by" name="hospital_by" label="患病病种"
placeholder="请填写患病病种" required
:rules="[{ required:true, message: '请填写患病病种' }]"></van-field>
<van-field
v-model="formData.hospital_by"
name="hospital_by"
label="患病病种"
placeholder="请填写患病病种"
required
:rules="[{ required:true, message: '请填写患病病种' }]"
></van-field>
</template>
<template v-if="['6'].includes(formData.type)">
<van-field v-model="formData.deadImmediateFamily" name="deadImmediateFamily" label="直系亲属"
placeholder="配偶、父亲、母亲、子女" required
:rules="[{ required:true, message: '必填' }]"></van-field>
<van-field
v-model="formData.deadImmediateFamily"
name="deadImmediateFamily"
label="直系亲属"
placeholder="配偶、父亲、母亲、子女"
required
:rules="[{ required:true, message: '必填' }]"
></van-field>
</template>
<!-- <template-->
<!-- v-if="['c7175af55693441e8233be4552cef9d5','0872ea0b95aa463fb8d98c46bdf72537'].includes(formData.type)">-->
<!-- <van-field :value="formData.hospital_stay"-->
<!-- readonly clickable required-->
<!-- @click="hospital_stay = true"-->
<!-- name="hospital_stay" label="住院时间"-->
<!-- placeholder="请选择住院时间"-->
<!-- :rules="[{ required:true, message: '请选择住院时间' }]"></van-field>-->
<!-- <van-calendar v-model="hospital_stay" type="range" @confirm="onConfirm"-->
<!-- :min-date="new Date('1999-01-01')"-->
<!-- :color="themeColor"></van-calendar>-->
<!-- <template-->
<!-- v-if="['c7175af55693441e8233be4552cef9d5','0872ea0b95aa463fb8d98c46bdf72537'].includes(formData.type)">-->
<!-- <van-field :value="formData.hospital_stay"-->
<!-- readonly clickable required-->
<!-- @click="hospital_stay = true"-->
<!-- name="hospital_stay" label="住院时间"-->
<!-- placeholder="请选择住院时间"-->
<!-- :rules="[{ required:true, message: '请选择住院时间' }]"></van-field>-->
<!-- <van-calendar v-model="hospital_stay" type="range" @confirm="onConfirm"-->
<!-- :min-date="new Date('1999-01-01')"-->
<!-- :color="themeColor"></van-calendar>-->
<!-- <van-field v-model="formData.the_hospital" name="the_hospital" name="type" label="所在医院"-->
<!-- placeholder="请填写所在医院" required-->
<!-- :rules="[{ required:true, message: '请填写所在医院' }]"></van-field>-->
<!-- </template>-->
<!-- <van-field v-model="formData.the_hospital" name="the_hospital" name="type" label="所在医院"-->
<!-- placeholder="请填写所在医院" required-->
<!-- :rules="[{ required:true, message: '请填写所在医院' }]"></van-field>-->
<!-- </template>-->
<van-field v-model="formData.remark" name="remark" label="申请事由" style="flex-flow: column"
required
:rules="[{ required:true, message: '请填写申请事由' }]"
placeholder="请填写申请事由"
input-align="left"
rows="3" maxlength="200" type="textarea" show-word-limit autosize>
<van-field
v-model="formData.remark"
name="remark"
label="申请事由"
style="flex-flow: column"
required
:rules="[{ required:true, message: '请填写申请事由' }]"
placeholder="请填写申请事由"
input-align="left"
rows="3"
maxlength="200"
type="textarea"
show-word-limit
autosize
>
<template #label>
<div class="mb10">申请事由</div>
</template>
@@ -153,8 +212,7 @@ layout("/mobile/platform.html"){
</van-cell-group>
<van-cell-group inset class="mt10" v-if="isUploadFile === true">
<van-field name="files" label="附&emsp;&emsp;件" required
style="flex-flow: column" input-align="left">
<van-field name="files" label="附&emsp;&emsp;件" required style="flex-flow: column" input-align="left">
<template #label>
<div class="mb10">附&emsp;&emsp;件</div>
</template>
@@ -162,8 +220,8 @@ layout("/mobile/platform.html"){
<vant-file-upload :files.sync="formData.files"></vant-file-upload>
</template>
</van-field>
<div style="margin: 0 0 7px 15px;" v-if="isUploadFile && uploadFileDesc">
<span style="color:red;">上传附件说明：{{ uploadFileDesc }}</span>
<div style="margin: 0 0 7px 15px" v-if="isUploadFile && uploadFileDesc">
<span style="color: red">上传附件说明：{{ uploadFileDesc }}</span>
</div>
</van-cell-group>
@@ -179,26 +237,21 @@ layout("/mobile/platform.html"){
</van-cell-group>
<div style="margin: 20px 20px 10px 20px">
<van-button @click="onSubmit()" style="border-radius: 10px" block type="info" :color="themeColor">
提 交
</van-button>
<van-button @click="onSubmit()" style="border-radius: 10px" block type="info" :color="themeColor">提 交</van-button>
</div>
</van-form>
<div>
<van-tabbar v-model="tarBarActive" style="z-index: 99">
<van-tabbar-item icon="home-o" replace url="/mobile/condolence/apply/for">慰问申请
</van-tabbar-item>
<van-tabbar-item icon="manager-o" replace url="/mobile/condolence/apply">慰问记录
</van-tabbar-item>
<van-tabbar-item icon="home-o" replace url="/mobile/condolence/apply/for">慰问申请</van-tabbar-item>
<van-tabbar-item icon="manager-o" replace url="/mobile/condolence/apply">慰问记录</van-tabbar-item>
</van-tabbar>
</div>
</div>
<script>
const vue = new Vue({
el: '#app',
el: "#app",
mixins: [mobileMixins],
data() {
return {
@@ -222,34 +275,38 @@ layout("/mobile/platform.html"){
money: 0,
isUploadFile: true,
uploadFileDesc: null,
showChildPicker:false,
childColumns:[{value:'一孩',text:'一孩'},{value:'二孩',text:'二孩'},{value:'三孩',text:'三孩'}],
showChildPicker: false,
childColumns: [
{ value: "一孩", text: "一孩" },
{ value: "二孩", text: "二孩" },
{ value: "三孩", text: "三孩" }
]
}
},
watch: {
"formData.money"(val) {
if (val > this.money) {
this.$notify({
title: '警告',
message: '金额超过规定金额' + this.money + "（元）",
type: 'warning'
});
title: "警告",
message: "金额超过规定金额" + this.money + "（元）",
type: "warning"
})
this.$set(this.formData, "money", this.money)
}
}
},
components: {
'mobile-sign': httpVueLoader('/components/sign/mobileSign.vue?v='+new Date().getTime()),
"mobile-sign": httpVueLoader("/components/sign/mobileSign.vue?v=" + new Date().getTime())
},
methods: {
onChildConfirm(data){
onChildConfirm(data) {
console.log(data)
this.formData.birth_child_num = data.value
this.showChildPicker = false
},
priceInput() {
let num = 0
this.goods.forEach(v => {
this.goods.forEach((v) => {
num += parseFloat(v.price)
})
this.$set(this.formData, "money", num)
@@ -259,18 +316,19 @@ layout("/mobile/platform.html"){
this.showOccurTime = false
},
onConfirm(date) {
const [start, end] = date;
this.hospital_stay = false;
this.formData.hospital_stay = moment(start).format('YYYY-MM-DD') + "-" + moment(end).format('YYYY-MM-DD');
this.$set(this.formData, "hospital_stay_1", moment(start).format('YYYY-MM-DD'))
this.$set(this.formData, "hospital_stay_2", moment(end).format('YYYY-MM-DD'))
const [start, end] = date
this.hospital_stay = false
this.formData.hospital_stay = moment(start).format("YYYY-MM-DD") + "-" + moment(end).format("YYYY-MM-DD")
this.$set(this.formData, "hospital_stay_1", moment(start).format("YYYY-MM-DD"))
this.$set(this.formData, "hospital_stay_2", moment(end).format("YYYY-MM-DD"))
},
async userRemoteMethod(event) {
if (event) {
const arr = await this.queryUser(event)
this.userList = arr.map(v => {
this.userList = arr.map((v) => {
return {
name: v.username + "(" + v.loginname + ")", id: v.id
name: v.username + "(" + v.loginname + ")",
id: v.id
}
})
this.sheetShow = true
@@ -279,32 +337,33 @@ layout("/mobile/platform.html"){
async payeeUserRemoteMethod(event) {
if (event) {
const arr = await this.queryUser(event)
this.payeeUserList = arr.map(v => {
this.payeeUserList = arr.map((v) => {
return {
name: v.username + "(" + v.loginname + ")", id: v.id
name: v.username + "(" + v.loginname + ")",
id: v.id
}
})
this.payeeSheetShow = true
}
},
async queryUser(query) {
const {data} = await $.get("/platform/fw/condolence/apply/queryUser", {query})
const { data } = await $.get("/platform/fw/condolence/apply/queryUser", { query })
return data
},
onUserSelect(u) {
this.$set(this.formData, 'be_user', u.id)
this.$set(this.formData, 'be_user_name', u.name)
this.$set(this.formData, "be_user", u.id)
this.$set(this.formData, "be_user_name", u.name)
this.sheetShow = false
},
payeeOnUserSelect(u) {
this.$set(this.formData, 'payee', u.id)
this.$set(this.formData, 'payee_name', u.name)
this.$set(this.formData, "payee", u.id)
this.$set(this.formData, "payee_name", u.name)
this.payeeSheetShow = false
},
async onTypeConfirm(val) {
this.$set(this.formData, "typeName", val.text)
this.$set(this.formData, "type", val.value)
const {data, code, msg} = await $.get("/platform/condolence/type/findOne", {id: val.value})
const { data, code, msg } = await $.get("/platform/condolence/type/findOne", { id: val.value })
console.log(data)
this.isUploadFile = data.isUploadFile
@@ -312,15 +371,15 @@ layout("/mobile/platform.html"){
this.$set(this, "money", data.money)
await this.moneyChange(val.value)
this.showTypePicker = false;
this.showTypePicker = false
},
onWayConfirm(val) {
this.$set(this.formData, "wayName", val.text)
this.$set(this.formData, "way", val.value)
this.showWayPicker = false;
this.showWayPicker = false
},
async moneyChange(id) {
const {data, code, msg} = await $.get("/platform/condolence/type/findOne", {id})
const { data, code, msg } = await $.get("/platform/condolence/type/findOne", { id })
if (data) {
this.$set(this.formData, "money", data.money)
this.$set(this.formData, "wayName", data.way)
@@ -329,34 +388,34 @@ layout("/mobile/platform.html"){
},
async onSubmit() {
if (!this.formData.files) {
vant.Toast('请上传附件材料!')
vant.Toast("请上传附件材料!")
return
}
this.$refs.signature.submitSign()
if (this.$refs.signature.checkNull()) {
this.$toast('请签名!')
this.$toast("请签名!")
return
}
await this.$refs.signature.updateSign()
const formData = clone(this.formData)
formData.mobile = "${@shiro.getPrincipalProperty('mobile')}"
formData.files = JSON.stringify(formData.files)
this.$refs['addForm'].validate().then(async () => {
this.$toast.loading('提交中...')
const res = await $.post('/platform/fw/condolence/apply/doAdd', {
this.$refs["addForm"].validate().then(async () => {
this.$toast.loading("提交中...")
const res = await $.post("/platform/fw/condolence/apply/doAdd", {
data: JSON.stringify(formData),
sign: formData.sign
})
if (res.code === 0) {
this.$toast.success('申请成功');
this.$toast.success("申请成功")
setTimeout(() => {
location.replace('/mobile/condolence/apply')
location.replace("/mobile/condolence/apply")
}, 1000)
} else {
this.$toast.fail('申请失败');
this.$toast.fail("申请失败")
}
})
},
}
},
mounted() {
this.$nextTick(() => {
@@ -366,21 +425,20 @@ layout("/mobile/platform.html"){
})
},
async created() {
this.formData.apply_time = moment().format('YYYY-MM-DD')
this.formData.apply_time = moment().format("YYYY-MM-DD")
this.formData.be_user = "${@shiro.getPrincipalProperty('id')}"
//this.formData.be_user_name = "${@shiro.getPrincipalProperty('username')}" + "(" + "${@shiro.getPrincipalProperty('loginname')}" + ")"
const {code, data} = await $.get("/platform/condolence/type/getAll")
data.forEach(v => {
this.typeColumns.push({value: v.id, text: v.name + "(" + v.code + ")"})
const { code, data } = await $.get("/platform/condolence/type/getAll")
data.forEach((v) => {
this.typeColumns.push({ value: v.id, text: v.name + "(" + v.code + ")" })
})
for (let i in condolence.way) {
this.wayColumns.push({value: condolence.way[i], text: condolence.way[i]})
this.wayColumns.push({ value: condolence.way[i], text: condolence.way[i] })
}
}
})
</script>
<style>
.up_down > .van-cell {
flex-flow: column;
}
@@ -389,14 +447,15 @@ layout("/mobile/platform.html"){
width: 100%;
}
.van-cell, .van-picker button, .submit .van-button--normal {
.van-cell,
.van-picker button,
.submit .van-button--normal {
font-size: 16px;
}
.van-divider {
margin: 10px 0;
}
</style>
<!--#
}
src/main/resources/views/mobile/condolence/apply_list.html
+41 -52
View File
@@ -3,8 +3,10 @@ layout("/mobile/platform.html"){
#-->
<style>
.apply_btn {
animation: come .5s;
position: fixed;top: 20%;right: 0
animation: come 0.5s;
position: fixed;
top: 20%;
right: 0;
}
@keyframes come {
@@ -15,12 +17,11 @@ layout("/mobile/platform.html"){
right: 0px;
}
}
</style>
<div id="app" v-cloak>
<m-page-loading v-if="mLoading"></m-page-loading>
<van-nav-bar title="慰问申请列表" left-arrow placeholder fixed @click-left="history.back()"></van-nav-bar>
<van-nav-bar title="慰问申请列表" left-arrow placeholder fixed @click-left="pjaxReplace('/mobile/index')"></van-nav-bar>
<div class="search-fixed">
<van-dropdown-menu active-color="#1989fa">
@@ -29,14 +30,11 @@ layout("/mobile/platform.html"){
</van-dropdown-menu>
</div>
<div style="margin: 60px auto 0 auto">
<van-list v-model="loading" :finished="finished" :finished-text="tableData.length>0?'没有更多了':''"
@load="pageData">
<van-list v-model="loading" :finished="finished" :finished-text="tableData.length>0?'没有更多了':''" @load="pageData">
<div v-for="o in tableData" class="list-card" @click="openInfo(o.id)">
<van-cell-group inset>
<van-cell :border="false" title="被慰问人">
<span class="van-ellipsis" style="font-size: 16px;" :style="{color:themeColor}">
{{o.be_username}}
</span>
<span class="van-ellipsis" style="font-size: 16px" :style="{color:themeColor}">{{o.be_username}}</span>
</van-cell>
<van-cell :border="false" title="申请时间">{{o.apply_time}}</van-cell>
<van-cell :border="false" title="慰问类型">{{o.type_name}}</van-cell>
@@ -49,69 +47,61 @@ layout("/mobile/platform.html"){
</div>
</van-list>
<!-- <van-button v-show="visible" class="apply_btn" @click.stop="openApply" plain hairline>-->
<!-- <template #icon>-->
<!-- <svg t="1634200664904" class="icon" viewBox="0 0 1024 1024" version="1.1"-->
<!-- xmlns="http://www.w3.org/2000/svg" p-id="3163" width="32" height="32">-->
<!-- <path d="M837.632 160.768c64 0 117.248 53.248 117.248 117.248v470.528c0 64-53.248 117.248-117.248 117.248H187.904c-64 2.048-117.248-50.688-117.248-114.688V278.016c0-64 53.248-117.248 117.248-117.248h649.728z m66.048 590.848V274.944c0-32.768-28.16-60.416-60.416-60.416H184.832c-32.768 0-60.416 28.16-60.416 60.416v479.232c0 32.768 28.16 60.416 60.416 60.416h657.92c32.768-2.56 60.928-28.16 60.928-62.976zM387.072 317.44"-->
<!-- fill="#2E77ED" p-id="3164"></path>-->
<!-- <path d="M326.144 709.632c-14.848 0-26.624-12.288-26.624-27.136V455.68c0-14.848 12.288-27.136 27.136-27.136S353.28 440.832 353.28 455.68v226.816c-0.512 15.36-12.288 27.136-27.136 27.136z"-->
<!-- fill="#FFBB12" p-id="3165"></path>-->
<!-- <path d="M569.856 442.368c0-14.848 12.288-26.624 27.136-26.624H757.76c14.848 0 27.136 12.288 27.136 27.136s-12.288 26.624-27.136 26.624h-160.768c-15.36 0-27.136-12.288-27.136-27.136zM569.856 682.496c0-14.848 12.288-26.624 27.136-26.624H757.76c14.848 0 27.136 12.288 27.136 27.136s-12.288 26.624-27.136 26.624h-160.768c-15.36 0-27.136-12.288-27.136-27.136zM569.856 553.472c0-14.848 12.288-26.624 27.136-26.624H757.76c14.848 0 27.136 12.288 27.136 27.136s-12.288 26.624-27.136 26.624h-160.768c-15.36 0-27.136-12.288-27.136-27.136z"-->
<!-- fill="#2E77ED" p-id="3166"></path>-->
<!-- <path d="M228.352 509.44c-10.24-10.752-10.24-27.648 0-37.888l78.336-78.336c10.752-10.752 27.648-10.752 37.888 0s10.24 27.648 0 37.888L266.24 509.44c-10.24 10.752-27.136 10.752-37.888 0z"-->
<!-- fill="#FFBB12" p-id="3167"></path>-->
<!-- <path d="M306.688 393.216c10.752-10.24 27.648-10.24 37.888 0l78.336 78.336c10.752 10.752 10.752 27.648 0 37.888s-27.648 10.24-37.888 0L306.688 431.104c-10.24-10.752-10.24-27.648 0-37.888z"-->
<!-- fill="#FFBB12" p-id="3168"></path>-->
<!-- </svg>-->
<!-- </template>-->
<!-- 申请-->
<!-- </van-button>-->
<!-- <van-button v-show="visible" class="apply_btn" @click.stop="openApply" plain hairline>-->
<!-- <template #icon>-->
<!-- <svg t="1634200664904" class="icon" viewBox="0 0 1024 1024" version="1.1"-->
<!-- xmlns="http://www.w3.org/2000/svg" p-id="3163" width="32" height="32">-->
<!-- <path d="M837.632 160.768c64 0 117.248 53.248 117.248 117.248v470.528c0 64-53.248 117.248-117.248 117.248H187.904c-64 2.048-117.248-50.688-117.248-114.688V278.016c0-64 53.248-117.248 117.248-117.248h649.728z m66.048 590.848V274.944c0-32.768-28.16-60.416-60.416-60.416H184.832c-32.768 0-60.416 28.16-60.416 60.416v479.232c0 32.768 28.16 60.416 60.416 60.416h657.92c32.768-2.56 60.928-28.16 60.928-62.976zM387.072 317.44"-->
<!-- fill="#2E77ED" p-id="3164"></path>-->
<!-- <path d="M326.144 709.632c-14.848 0-26.624-12.288-26.624-27.136V455.68c0-14.848 12.288-27.136 27.136-27.136S353.28 440.832 353.28 455.68v226.816c-0.512 15.36-12.288 27.136-27.136 27.136z"-->
<!-- fill="#FFBB12" p-id="3165"></path>-->
<!-- <path d="M569.856 442.368c0-14.848 12.288-26.624 27.136-26.624H757.76c14.848 0 27.136 12.288 27.136 27.136s-12.288 26.624-27.136 26.624h-160.768c-15.36 0-27.136-12.288-27.136-27.136zM569.856 682.496c0-14.848 12.288-26.624 27.136-26.624H757.76c14.848 0 27.136 12.288 27.136 27.136s-12.288 26.624-27.136 26.624h-160.768c-15.36 0-27.136-12.288-27.136-27.136zM569.856 553.472c0-14.848 12.288-26.624 27.136-26.624H757.76c14.848 0 27.136 12.288 27.136 27.136s-12.288 26.624-27.136 26.624h-160.768c-15.36 0-27.136-12.288-27.136-27.136z"-->
<!-- fill="#2E77ED" p-id="3166"></path>-->
<!-- <path d="M228.352 509.44c-10.24-10.752-10.24-27.648 0-37.888l78.336-78.336c10.752-10.752 27.648-10.752 37.888 0s10.24 27.648 0 37.888L266.24 509.44c-10.24 10.752-27.136 10.752-37.888 0z"-->
<!-- fill="#FFBB12" p-id="3167"></path>-->
<!-- <path d="M306.688 393.216c10.752-10.24 27.648-10.24 37.888 0l78.336 78.336c10.752 10.752 10.752 27.648 0 37.888s-27.648 10.24-37.888 0L306.688 431.104c-10.24-10.752-10.24-27.648 0-37.888z"-->
<!-- fill="#FFBB12" p-id="3168"></path>-->
<!-- </svg>-->
<!-- </template>-->
<!-- 申请-->
<!-- </van-button>-->
</div>
<van-empty v-if="mLoading==false&&tableData.length==0" class="custom-image"
image="/none.svg"
description="暂无数据">
</van-empty>
<van-empty v-if="mLoading==false&&tableData.length==0" class="custom-image" image="/none.svg" description="暂无数据"></van-empty>
<div>
<van-tabbar v-model="tarBarActive">
<van-tabbar-item icon="home-o" replace url="/mobile/condolence/apply/for">慰问申请
</van-tabbar-item>
<van-tabbar-item icon="manager-o" replace url="/mobile/condolence/apply">慰问记录
</van-tabbar-item>
<van-tabbar-item icon="home-o" replace url="/mobile/condolence/apply/for">慰问申请</van-tabbar-item>
<van-tabbar-item icon="manager-o" replace url="/mobile/condolence/apply">慰问记录</van-tabbar-item>
</van-tabbar>
</div>
</div>
<script>
const vue = new Vue({
el: '#app',
el: "#app",
mixins: [mobileMixins],
data() {
return {
tarBarActive: 1,
visible: true,
typeOption: [
{value: null, text: '全部'}
],
typeOption: [{ value: null, text: "全部" }],
yearOption: [],
pageForm: {
year: '',
type: ''
year: "",
type: ""
}
}
},
components: {
'mobile-sign': httpVueLoader('/components/sign/mobileSign.vue'),
"mobile-sign": httpVueLoader("/components/sign/mobileSign.vue")
},
methods: {
openApply() {
window.location.href = '/mobile/condolence/apply/for'
window.location.href = "/mobile/condolence/apply/for"
},
openInfo(id) {
window.location.href = '/mobile/condolence/apply/info?id=' + id
window.location.href = "/mobile/condolence/apply/info?id=" + id
},
yearChange(val) {
this.pageForm.year = val
@@ -124,13 +114,12 @@ layout("/mobile/platform.html"){
listenTouch() {
this.$nextTick(() => {
const app = document.querySelector("#app")
app.addEventListener('touchstart', () => {
app.addEventListener("touchstart", () => {
this.visible = false
})
app.addEventListener('touchend', () => {
app.addEventListener("touchend", () => {
this.visible = true
})
})
}
},
@@ -140,11 +129,11 @@ layout("/mobile/platform.html"){
async created() {
this.mLoading = true
for (let i = new Date().getFullYear() - 10; i <= new Date().getFullYear(); i++) {
this.yearOption.unshift({value: i, text: i + '年'},)
this.yearOption.unshift({ value: i, text: i + "年" })
}
const {code, data} = await $.get("/platform/condolence/type/getAll")
data.forEach(v => {
this.typeOption.push({value: v.id, text: v.name + v.code})
const { code, data } = await $.get("/platform/condolence/type/getAll")
data.forEach((v) => {
this.typeOption.push({ value: v.id, text: v.name + v.code })
})
this.$set(this.pageForm, "year", this.yearOption[0].value)
this.$set(this.pageForm, "type", this.typeOption[0].value)
src/main/resources/views/mobile/platform.html
+7 -3
View File
@@ -6,14 +6,14 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, viewport-fit=cover" />
<van-number-keyboard safe-area-inset-bottom />
<title></title>
<!-- <link rel="stylesheet" href="https://cdn.staticfile.org/vant/2.12.25/index.min.css" />-->
<!-- <link rel="stylesheet" href="https://cdn.staticfile.org/vant/2.12.25/index.min.css" />-->
<link rel="stylesheet" href="${base!}/assets/mobile/css/theme.css" />
<link rel="stylesheet" href="${base!}/assets/mobile/css/main.css" />
<link rel="stylesheet" href="${base!}/assets/platform/plugins/vant/vant.css?v=1.0.0">
<link rel="stylesheet" href="${base!}/assets/platform/plugins/vant/vant.css?v=1.0.0" />
<script src="${base!}/assets/platform/plugins/vue/vue.min.js"></script>
<!-- <script src="https://cdn.staticfile.org/vant/2.12.25/vant.min.js"></script>-->
<!-- <script src="https://cdn.staticfile.org/vant/2.12.25/vant.min.js"></script>-->
<script src="${base!}/assets/platform/plugins/vant/vant.js"></script>
<script src="${base!}/assets/platform/plugins/vue-loader/httpVueLoader.js"></script>
<script src="${base!}/assets/mobile/js/basic.js"></script>
@@ -49,6 +49,10 @@
<script src="${base!}/components/plugins/sysDict/DictData.js"></script>
<script>
Vue.component("mobile-sign", httpVueLoader("/components/sign/mobileSign.vue?v=" + new Date().getTime()))
</script>
<script>
window.sessionStorage.setItem("user", JSON.stringify(${json(@shiro.getPrincipal())}))
src/main/resources/views/platform/zgfw/difficulty/apply.html
+191 -189
View File
@@ -2,8 +2,7 @@
layout("/layouts/platform.html"){
#-->
<style>
</style>
<style></style>
<div id="app" v-cloak>
<guava>
@@ -15,8 +14,7 @@ layout("/layouts/platform.html"){
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="申请人姓名" prop="proxyUserName">
<el-input disabled v-model="formData.proxyUserName">
</el-input>
<el-input disabled v-model="formData.proxyUserName"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
@@ -26,10 +24,7 @@ layout("/layouts/platform.html"){
</el-col>
<el-col :span="8">
<el-form-item label="申请模式" prop="mode">
<el-radio-group :disabled="formData.id" @change="modeChange"
style="width: 100%"
v-model="formData.mode"
>
<el-radio-group :disabled="formData.id" @change="modeChange" style="width: 100%" v-model="formData.mode">
<el-radio-button border label="1">本人申请</el-radio-button>
<el-radio-button border label="2">替他人申请</el-radio-button>
</el-radio-group>
@@ -37,76 +32,72 @@ layout("/layouts/platform.html"){
</el-col>
<el-col :span="8">
<el-form-item label="受补助人" prop="userId">
<el-select :remote-method="querySqr" @change="userChange" clearable
filterable
placeholder="输入工号或者姓名查找" remote
style="width: 100%"
v-if="!formData.id"
v-model="formData.userId">
<el-option :key="o.id"
:label="o.username+'('+o.loginname+')'"
:value="o.id"
v-for="o in subsidizedList"></el-option>
<el-select
:remote-method="querySqr"
@change="userChange"
clearable
filterable
placeholder="输入工号或者姓名查找"
remote
style="width: 100%"
v-if="!formData.id"
v-model="formData.userId"
>
<el-option :key="o.id" :label="o.username+'('+o.loginname+')'" :value="o.id" v-for="o in subsidizedList"></el-option>
</el-select>
<el-input disabled maxlength="100" type="text" v-else
v-model="formData.userName"></el-input>
<el-input disabled maxlength="100" type="text" v-else v-model="formData.userName"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="性别" prop="sex">
<el-select clearable placeholder="请选择性别" style="width: 100%"
v-model="formData.sex">
<el-option :key="item" :label="item" :value="item"
v-for="item in ['男','女']">
</el-option>
<el-select clearable placeholder="请选择性别" style="width: 100%" v-model="formData.sex">
<el-option :key="item" :label="item" :value="item" v-for="item in ['男','女']"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="所在单位" prop="unitName">
<el-input clearable maxlength="50" placeholder="所在单位"
v-model="formData.unitName"></el-input>
<el-input clearable maxlength="50" placeholder="所在单位" v-model="formData.unitName"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="所在分工会" prop="unionName">
<el-input clearable maxlength="50" placeholder="所在分工会"
v-model="formData.unionName"></el-input>
<el-input clearable maxlength="50" placeholder="所在分工会" v-model="formData.unionName"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="本人月收入" prop="monthlyIncome">
<el-input-number :max="9999999"
:min="0"
clearable
controls-position="right"
placeholder="请填写本人月收入"
style="width: 100%" v-model="formData.monthlyIncome">
</el-input-number>
<el-input-number
:max="9999999"
:min="0"
clearable
controls-position="right"
placeholder="请填写本人月收入"
style="width: 100%"
v-model="formData.monthlyIncome"
></el-input-number>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="出生年月" prop="birthday">
<el-date-picker
clearable
placeholder="选择出生年月"
style="width: 100%"
type="date"
v-model="formData.birthday"
value-format="yyyy-MM-dd">
</el-date-picker>
clearable
placeholder="选择出生年月"
style="width: 100%"
type="date"
v-model="formData.birthday"
value-format="yyyy-MM-dd"
></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="手机号码" prop="mobile">
<el-input clearable maxlength="20" placeholder="请填写手机号码"
v-model="formData.mobile"></el-input>
<el-input clearable maxlength="20" placeholder="请填写手机号码" v-model="formData.mobile"></el-input>
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item label="家庭地址" prop="homeAddress">
<el-input clearable maxlength="200" placeholder="请填写家庭地址"
v-model="formData.homeAddress"></el-input>
<el-input clearable maxlength="200" placeholder="请填写家庭地址" v-model="formData.homeAddress"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -114,90 +105,103 @@ layout("/layouts/platform.html"){
<el-col :span="24">
<el-form-item label="款项" prop="subsidyStandards">
<el-select style="width: 100%" v-model="formData.subsidyStandards">
<el-option :key="index" :label="item"
:value="item"
v-for="(item,index) in subsidyStandards">
</el-option>
<el-option :key="index" :label="item" :value="item" v-for="(item,index) in subsidyStandards"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="申请原因" prop="reason">
<el-input :autosize="{ minRows: 5, maxRows: 10}" clearable
maxlength="500"
placeholder="请简述申请原因"
type="textarea"
v-model="formData.reason"></el-input>
<el-input
:autosize="{ minRows: 5, maxRows: 10}"
clearable
maxlength="500"
placeholder="请简述申请原因"
type="textarea"
v-model="formData.reason"
></el-input>
</el-form-item>
<el-form-item label="备注" prop="remarks">
<el-input :autosize="{ minRows: 5, maxRows: 10}" clearable
maxlength="500"
placeholder="请简述备注"
type="textarea"
v-model="formData.remarks"></el-input>
<el-input
:autosize="{ minRows: 5, maxRows: 10}"
clearable
maxlength="500"
placeholder="请简述备注"
type="textarea"
v-model="formData.remarks"
></el-input>
</el-form-item>
<el-form-item label="家庭成员经济收入" prop="familyList">
<el-table :data="formData.familyList" border max-height="500" size="mini"
style="width: 100%">
<el-table-column align="center" label="序号" type="index"
width="50"></el-table-column>
<el-table :data="formData.familyList" border max-height="500" size="mini" style="width: 100%">
<el-table-column align="center" label="序号" type="index" width="50"></el-table-column>
<el-table-column label="姓名" prop="name">
<template slot-scope="{row,$index}">
<el-form-item :prop="'familyList.'+$index+'.name'"
:rules="[{required:true,message:'必填',trigger:['change','blur']}]"
label-width="0">
<el-input clearable placeholder="请输入姓名"
v-model="row.name"></el-input>
<el-form-item
:prop="'familyList.'+$index+'.name'"
:rules="[{required:true,message:'必填',trigger:['change','blur']}]"
label-width="0"
>
<el-input clearable placeholder="请输入姓名" v-model="row.name"></el-input>
</el-form-item>
</template>
</el-table-column>
<el-table-column label="年龄(岁)" prop="relation">
<template slot-scope="{row,$index}">
<el-form-item :prop="'familyList.'+$index+'.age'"
:rules="[{required:true,message:'必填',trigger:['change','blur']}]"
label-width="0">
<el-input-number :max="100" :min="1" :step="1"
clearable placeholder="请输入年龄"
v-model="row.age"></el-input-number>
<el-form-item
:prop="'familyList.'+$index+'.age'"
:rules="[{required:true,message:'必填',trigger:['change','blur']}]"
label-width="0"
>
<el-input-number
:max="100"
:min="1"
:step="1"
clearable
placeholder="请输入年龄"
v-model="row.age"
></el-input-number>
</el-form-item>
</template>
</el-table-column>
<el-table-column label="关系" prop="relation">
<template slot-scope="{row,$index}">
<el-form-item :prop="'familyList.'+$index+'.relation'"
:rules="[{required:true,message:'必填',trigger:['change','blur']}]"
label-width="0">
<el-input clearable placeholder="请输入关系"
v-model="row.relation"></el-input>
<el-form-item
:prop="'familyList.'+$index+'.relation'"
:rules="[{required:true,message:'必填',trigger:['change','blur']}]"
label-width="0"
>
<el-input clearable placeholder="请输入关系" v-model="row.relation"></el-input>
</el-form-item>
</template>
</el-table-column>
<el-table-column label="月收入(元)" prop="monthlyIncome">
<template slot-scope="{row,$index}">
<el-form-item :prop="'familyList.'+$index+'.monthlyIncome'"
:rules="[{required:true,message:'必填',trigger:['change','blur']}]"
label-width="0">
<el-input-number :min="0"
:step="1"
clearable placeholder="请输入月收入"
v-model="row.monthlyIncome"></el-input-number>
<el-form-item
:prop="'familyList.'+$index+'.monthlyIncome'"
:rules="[{required:true,message:'必填',trigger:['change','blur']}]"
label-width="0"
>
<el-input-number
:min="0"
:step="1"
clearable
placeholder="请输入月收入"
v-model="row.monthlyIncome"
></el-input-number>
</el-form-item>
</template>
</el-table-column>
<el-table-column align="center" header-align="center" label="操作"
width="150px">
<el-table-column align="center" header-align="center" label="操作" width="150px">
<template slot="header" slot-scope="scope">
<el-button @click="formData.familyList.push({})" icon="el-icon-plus"
size="mini"
type="primary">添加
</el-button>
<el-button @click="formData.familyList.push({})" icon="el-icon-plus" size="mini" type="primary">添加</el-button>
</template>
<template slot-scope="scope">
<el-button :disabled="formData.familyList.length==1"
@click="formData.familyList.splice(scope.$index,1)"
icon="el-icon-delete"
size="mini"
type="danger"></el-button>
<el-button
:disabled="formData.familyList.length==1"
@click="formData.familyList.splice(scope.$index,1)"
icon="el-icon-delete"
size="mini"
type="danger"
></el-button>
</template>
</el-table-column>
</el-table>
@@ -206,8 +210,7 @@ layout("/layouts/platform.html"){
<file-upload :files.sync="formData.files" card></file-upload>
</el-form-item>
<el-form-item label="签字" prop="signature">
<sign :is_value_base64="false" :qz.sync="formData.signature"
prefix="difficult"></sign>
<sign :is_value_base64="false" :qz.sync="formData.signature" prefix="difficult"></sign>
</el-form-item>
</el-form>
<el-row justify="end" type="flex">
@@ -219,119 +222,120 @@ layout("/layouts/platform.html"){
<script>
const vue = new Vue({
el: '#app',
el: "#app",
mixins: [initTableMixins],
data() {
return {
id: GetQueryString("id"),
formData: {
mode: "1",
mode: "1"
},
subsidyStandards: [
'本人患重症处于康复期、新患重症以外的疾病且自理医疗费在5万元以上、直系亲属患重症:1000-1500元。',
'突发事件造成家庭损失较重致生活困难:2000-2500元。',
'本人新患重症、长病假人员生活困难、家庭人均收入接近无锡市最低生活保障线:3000元。'
"本人患重症处于康复期、新患重症以外的疾病且自理医疗费在5万元以上、直系亲属患重症:1000-1500元。",
"突发事件造成家庭损失较重致生活困难:2000-2500元。",
"本人新患重症、长病假人员生活困难、家庭人均收入接近无锡市最低生活保障线:3000元。"
],
formRules: {
userName: [{required: true, message: '必填', trigger: ['blur', 'change']}],
loginName: [{required: true, message: '必填', trigger: ['blur', 'change']}],
sex: [{required: true, message: '必填', trigger: ['blur', 'change']}],
unitName: [{required: true, message: '必填', trigger: ['blur', 'change']}],
unionName: [{required: true, message: '必填', trigger: ['blur', 'change']}],
monthlyIncome: [{required: true, message: '必填', trigger: ['blur', 'change']}],
birthday: [{required: true, message: '必填', trigger: ['blur', 'change']}],
mobile: [{required: true, message: '必填', trigger: ['blur', 'change']}],
homeAddress: [{required: true, message: '必填', trigger: ['blur', 'change']}],
subsidyStandards: [{
required: true,
message: '必填',
trigger: ['blur', 'change']
}],
reason: [{required: true, message: '必填', trigger: ['blur', 'change']}],
remarks: [{required: false, message: '必填', trigger: ['blur', 'change']}],
familyList: [{required: true, message: '必填', trigger: ['blur', 'change']}],
signature: [{required: true, message: '必填', trigger: ['blur', 'change']}]
userName: [{ required: true, message: "必填", trigger: ["blur", "change"] }],
loginName: [{ required: true, message: "必填", trigger: ["blur", "change"] }],
sex: [{ required: true, message: "必填", trigger: ["blur", "change"] }],
unitName: [{ required: true, message: "必填", trigger: ["blur", "change"] }],
unionName: [{ required: true, message: "必填", trigger: ["blur", "change"] }],
monthlyIncome: [{ required: true, message: "必填", trigger: ["blur", "change"] }],
birthday: [{ required: true, message: "必填", trigger: ["blur", "change"] }],
mobile: [{ required: true, message: "必填", trigger: ["blur", "change"] }],
homeAddress: [{ required: true, message: "必填", trigger: ["blur", "change"] }],
subsidyStandards: [
{
required: true,
message: "必填",
trigger: ["blur", "change"]
}
],
reason: [{ required: true, message: "必填", trigger: ["blur", "change"] }],
remarks: [{ required: false, message: "必填", trigger: ["blur", "change"] }],
familyList: [{ required: true, message: "必填", trigger: ["blur", "change"] }],
signature: [{ required: true, message: "必填", trigger: ["blur", "change"] }]
},
subsidizedList: []
}
},
methods: {
querySqr(key) {
$.post('/platform/difficulty/apply/querySqr', {key: key}).then(res => {
this.subsidizedList = res.data;
});
$.post("/platform/difficulty/apply/querySqr", { key: key }).then((res) => {
this.subsidizedList = res.data
})
},
async userChange() {
const user = this.subsidizedList.find(item => item.id === this.formData.userId)
const user = this.subsidizedList.find((item) => item.id === this.formData.userId)
if (user) {
this.$set(this.formData, 'userId', user.id)
this.$set(this.formData, 'userName', user.username)
this.$set(this.formData, 'loginName', user.loginname)
this.$set(this.formData, 'sex', user.sex)
this.$set(this.formData, 'unitId', user.unitid)
this.$set(this.formData, 'unitName', user.unitname)
this.$set(this.formData, 'unionId', user.unionid)
this.$set(this.formData, 'unionName', user.unionname)
this.$set(this.formData, 'birthday', user.birthday)
this.$set(this.formData, 'mobile', user.mobile)
this.$set(this.formData, "userId", user.id)
this.$set(this.formData, "userName", user.username)
this.$set(this.formData, "loginName", user.loginname)
this.$set(this.formData, "sex", user.sex)
this.$set(this.formData, "unitId", user.unitid)
this.$set(this.formData, "unitName", user.unitname)
this.$set(this.formData, "unionId", user.unionid)
this.$set(this.formData, "unionName", user.unionname)
this.$set(this.formData, "birthday", user.birthday)
this.$set(this.formData, "mobile", user.mobile)
} else {
this.$set(this.formData, 'userId', null)
this.$set(this.formData, 'userName', null)
this.$set(this.formData, 'loginName', null)
this.$set(this.formData, 'sex', null)
this.$set(this.formData, 'unitId', null)
this.$set(this.formData, 'unitName', null)
this.$set(this.formData, 'unionId', null)
this.$set(this.formData, 'unionName', null)
this.$set(this.formData, 'birthday', null)
this.$set(this.formData, 'mobile', null)
this.$set(this.formData, "userId", null)
this.$set(this.formData, "userName", null)
this.$set(this.formData, "loginName", null)
this.$set(this.formData, "sex", null)
this.$set(this.formData, "unitId", null)
this.$set(this.formData, "unitName", null)
this.$set(this.formData, "unionId", null)
this.$set(this.formData, "unionName", null)
this.$set(this.formData, "birthday", null)
this.$set(this.formData, "mobile", null)
}
},
modeChange(val) {
const user = JSON.parse(window.sessionStorage.getItem('user'))
const user = JSON.parse(window.sessionStorage.getItem("user"))
if (val === "1") {
this.$set(this.formData, 'userId', user.id)
this.$set(this.formData, 'userName', user.username)
this.$set(this.formData, 'loginName', user.loginname)
this.$set(this.formData, 'proxyUserId', user.id)
this.$set(this.formData, 'proxyUserName', user.username)
this.$set(this.formData, 'proxyLoginName', user.loginname)
this.$set(this.formData, 'mode', "1")
this.$set(this.formData, 'sex', user.sex)
this.$set(this.formData, 'unitId', user.unit.id)
this.$set(this.formData, 'unitName', user.unit.name)
this.$set(this.formData, 'unionId', user.union.id)
this.$set(this.formData, 'unionName', user.union.unionname)
this.$set(this.formData, 'monthlyIncome', null)
this.$set(this.formData, 'birthday', user.birthday)
this.$set(this.formData, 'mobile', user.mobile)
this.$set(this.formData, 'homeAddress', user.homeAddress)
this.$set(this.formData, 'subsidyStandards', null)
this.$set(this.formData, 'reason', null)
this.$set(this.formData, 'remarks', null)
this.$set(this.formData, 'familyList', [])
this.$set(this.formData, 'files', [])
this.$set(this.formData, "userId", user.id)
this.$set(this.formData, "userName", user.username)
this.$set(this.formData, "loginName", user.loginname)
this.$set(this.formData, "proxyUserId", user.id)
this.$set(this.formData, "proxyUserName", user.username)
this.$set(this.formData, "proxyLoginName", user.loginname)
this.$set(this.formData, "mode", "1")
this.$set(this.formData, "sex", user.sex)
this.$set(this.formData, "unitId", user.unit.id)
this.$set(this.formData, "unitName", user.unit.name)
this.$set(this.formData, "unionId", user.union.id)
this.$set(this.formData, "unionName", user.union.unionname)
this.$set(this.formData, "monthlyIncome", null)
this.$set(this.formData, "birthday", user.birthday)
this.$set(this.formData, "mobile", user.mobile)
this.$set(this.formData, "homeAddress", user.homeAddress)
this.$set(this.formData, "subsidyStandards", null)
this.$set(this.formData, "reason", null)
this.$set(this.formData, "remarks", null)
this.$set(this.formData, "familyList", [])
this.$set(this.formData, "files", [])
this.querySqr(user.loginname)
} else {
this.formData = {}
this.$set(this.formData, 'proxyUserId', user.id)
this.$set(this.formData, 'proxyUserName', user.username)
this.$set(this.formData, 'proxyLoginName', user.loginname)
this.$set(this.formData, 'mode', "2")
this.$set(this.formData, 'familyList', [])
this.$set(this.formData, 'files', [])
this.$set(this.formData, "proxyUserId", user.id)
this.$set(this.formData, "proxyUserName", user.username)
this.$set(this.formData, "proxyLoginName", user.loginname)
this.$set(this.formData, "mode", "2")
this.$set(this.formData, "familyList", [])
this.$set(this.formData, "files", [])
}
},
doAdd() {
this.$refs.formRef.validate(valid => {
this.$refs.formRef.validate((valid) => {
if (valid) {
$.post('/platform/difficulty/apply/doAdd', {
$.post("/platform/difficulty/apply/doAdd", {
data: JSON.stringify(this.formData)
}).then(res => {
}).then((res) => {
if (res.code === 0) {
this.$message.success(res.msg)
sublime.jumpPagePjax('/platform/difficulty/applylist')
sublime.jumpPagePjax("/platform/difficulty/applylist")
} else {
this.$message.error(res.msg)
}
@@ -340,31 +344,30 @@ layout("/layouts/platform.html"){
})
},
doEdit() {
this.$refs.formRef.validate(valid => {
this.$refs.formRef.validate((valid) => {
if (valid) {
$.post('/platform/difficulty/apply/doEdit', {
$.post("/platform/difficulty/apply/doEdit", {
data: JSON.stringify(this.formData)
}).then(res => {
}).then((res) => {
if (res.code === 0) {
this.$message.success(res.msg)
sublime.jumpPagePjax('/platform/difficulty/applylist')
sublime.jumpPagePjax("/platform/difficulty/applylist")
} else {
this.$message.error(res.msg)
}
})
}
})
},
}
},
async created() {
if (this.id) {
$.get('/platform/difficulty/apply/findOne', {id: this.id}).then(res => {
$.get("/platform/difficulty/apply/findOne", { id: this.id }).then((res) => {
if (res.code === 0) {
this.formData = res.data
this.querySqr(res.data.loginName)
}
})
} else {
this.modeChange("1")
}
@@ -372,7 +375,6 @@ layout("/layouts/platform.html"){
})
</script>
<!--#
}
#-->
src/main/resources/views/platform/zgfw/difficulty/common/info.js
+12 -15
View File
@@ -1,6 +1,6 @@
const info = {
template:/*language=HTML*/
`
/*language=HTML*/
template: `
<div class="applyInfo">
<el-tabs tab-position="top" v-model="activeName">
<el-tab-pane label="申请信息" name="1">
@@ -9,9 +9,9 @@
<el-descriptions-item label="申请人姓名">{{ viewData.proxyUserName }}</el-descriptions-item>
<el-descriptions-item label="申请人工号">{{ viewData.proxyLoginName }}</el-descriptions-item>
</template>
<el-descriptions-item label="姓名">{{ viewData.userName }}</el-descriptions-item>
<el-descriptions-item label="工号">{{ viewData.loginName }}</el-descriptions-item>
<el-descriptions-item label="性别">{{ viewData.sex }}</el-descriptions-item>
<el-descriptions-item label="受补助人姓名">{{ viewData.userName }}</el-descriptions-item>
<el-descriptions-item label="受补助人工号">{{ viewData.loginName }}</el-descriptions-item>
<el-descriptions-item label="受补助人性别">{{ viewData.sex }}</el-descriptions-item>
<el-descriptions-item label="单位">{{ viewData.unitName }}</el-descriptions-item>
<el-descriptions-item label="分工会">{{ viewData.unionName }}</el-descriptions-item>
<el-descriptions-item label="月收入">{{ viewData.monthlyIncome }}</el-descriptions-item>
@@ -82,7 +82,7 @@
</el-descriptions>
</el-tab-pane>
<el-tab-pane label="批准部门意见" name="批准部门意见" v-if="viewData.schoolUnionFinalAudit">
<el-tab-pane label="工会常委会审核信息" name="工会常委会审核信息" v-if="viewData.schoolUnionFinalAudit">
<el-descriptions :column="2" border>
<el-descriptions-item label="审核人">{{ viewData.schoolUnionFinalAudit.username }}</el-descriptions-item>
<el-descriptions-item label="审核时间">{{ viewData.schoolUnionFinalAudit.auditTime }}</el-descriptions-item>
@@ -105,19 +105,18 @@
data() {
return {
viewData: {},
activeName: '1'
activeName: "1"
}
},
methods: {
onOpen(id, activeName = '1') {
onOpen(id, activeName = "1") {
this.activeName = activeName
$.get('/platform/difficulty/common/findOne', {id}).then(res => {
$.get("/platform/difficulty/common/findOne", { id }).then((res) => {
if (res.code === 0) {
try {
res.data.familyList = JSON.parse(res.data.familyList)
res.data.files = JSON.parse(res.data.files)
} catch (e) {
}
} catch (e) {}
this.viewData = res.data
console.log(this.viewData)
}
@@ -125,12 +124,10 @@
}
},
style:
/*language=CSS*/
`
/*language=CSS*/
`
.applyInfo .el-descriptions__table{
table-layout: fixed;
}
`
}
src/main/resources/views/platform/zgfw/difficulty/reading.html
+59 -74
View File
@@ -6,46 +6,44 @@ layout("/layouts/platform.html"){
<guava ref="guava">
<template>
<el-card shadow="never">
<div class="btn-group tool-button">
<div class="block">
<el-date-picker clearable end-placeholder="结束日期"
range-separator="-"
start-placeholder="开始日期"
type="daterange"
v-model="pageForm._dateRange"
value-format="yyyy-MM-dd">
</el-date-picker>
<el-date-picker
clearable
end-placeholder="结束日期"
range-separator="-"
start-placeholder="开始日期"
type="daterange"
v-model="pageForm._dateRange"
value-format="yyyy-MM-dd"
></el-date-picker>
</div>
</div>
<div class="btn-group tool-button">
<el-select @change="flushUnits" @clear="flushUnits" clearable="true"
filterable="true"
placeholder="所属工会" style="width: 100%;"
v-if="${@shiro.hasRole('sysadmin')||@shiro.hasRole('A06')||@shiro.hasRole('wyh02')||@shiro.hasRole('wyh03')||@shiro.hasRole('H03')}"
v-model="pageForm.unionId">
<el-option :label="item.unionname" :value="item.id"
v-for="item in unions"></el-option>
<el-select
@change="flushUnits"
@clear="flushUnits"
clearable="true"
filterable="true"
placeholder="所属工会"
style="width: 100%"
v-if="${@shiro.hasRole('sysadmin')||@shiro.hasRole('A06')||@shiro.hasRole('wyh02')||@shiro.hasRole('wyh03')||@shiro.hasRole('H03')}"
v-model="pageForm.unionId"
>
<el-option :label="item.unionname" :value="item.id" v-for="item in unions"></el-option>
</el-select>
</div>
<div class="btn-group tool-button">
<el-select clearable="true" filterable="true" placeholder="所属单位"
style="width: 100%;"
v-model="pageForm.unitId">
<el-option :label="item.name" :value="item.id"
v-for="item in units"></el-option>
<el-select clearable="true" filterable="true" placeholder="所属单位" style="width: 100%" v-model="pageForm.unitId">
<el-option :label="item.name" :value="item.id" v-for="item in units"></el-option>
</el-select>
</div>
<div class="btn-group tool-button">
<div>
<el-input placeholder="请输入内容" v-model="pageForm.searchKeyword">
<el-select placeholder="查询类型" slot="prepend"
style="width: 100px;"
v-model="pageForm.searchName">
<el-select placeholder="查询类型" slot="prepend" style="width: 100px" v-model="pageForm.searchName">
<el-option label="工号" value="info.loginName"></el-option>
<el-option label="姓名" value="info.userName"></el-option>
</el-select>
@@ -56,40 +54,31 @@ layout("/layouts/platform.html"){
<el-button @click="doSearch" icon="el-icon-search" type="primary"></el-button>
</div>
<div class="pull-right offscreen-right">
<el-button @click="doExcel" type="primary"><i class="el-icon-download"></i> 导出
<el-button @click="doExcel" type="primary">
<i class="el-icon-download"></i>
导出
</el-button>
</div>
</el-card>
<el-card class="mt20" shadow="never">
<el-table
:data="tableData"
@sort-change="pageOrder"
style="width: 100%"
>
<el-table :data="tableData" @sort-change="pageOrder" style="width: 100%">
<el-table-column align="center" header-align="center" label="序号" type="index">
<template scope="scope">
<span>{{scope.$index+(pageForm.pageNumber - 1) * pageForm.pageSize + 1}} </span>
<span>{{scope.$index+(pageForm.pageNumber - 1) * pageForm.pageSize + 1}}</span>
</template>
</el-table-column>
<el-table-column align="center" header-align="center" label="姓名"
prop="userName"></el-table-column>
<el-table-column align="center" header-align="center" label="工号"
prop="loginName"></el-table-column>
<el-table-column align="center" header-align="center" label="单位"
prop="unitName"></el-table-column>
<el-table-column align="center" header-align="center" label="工会"
prop="unionName"></el-table-column>
<el-table-column align="center" header-align="center" label="申请时间"
prop="applyTime"></el-table-column>
<el-table-column align="center" header-align="center" label="联系方式"
prop="mobile"></el-table-column>
<el-table-column align="center" header-align="center" label="申请状态"
prop="state_name"></el-table-column>
<el-table-column align="center" fixed="right" header-align="center" label="操作"
width="120px">
<el-table-column align="center" header-align="center" label="姓名" prop="userName"></el-table-column>
<el-table-column align="center" header-align="center" label="工号" prop="loginName"></el-table-column>
<el-table-column align="center" header-align="center" label="单位" prop="unitName"></el-table-column>
<el-table-column align="center" header-align="center" label="工会" prop="unionName"></el-table-column>
<el-table-column align="center" header-align="center" label="申请时间" prop="applyTime"></el-table-column>
<el-table-column align="center" header-align="center" label="联系方式" prop="mobile"></el-table-column>
<el-table-column align="center" header-align="center" label="申请状态" prop="state_name"></el-table-column>
<el-table-column align="center" fixed="right" header-align="center" label="操作" width="120px">
<template slot-scope="{row}">
<el-dropdown @command="dropdownCommand">
<el-button size="mini" @click="openView(row)">查看</el-button>
<!--<el-dropdown @command="dropdownCommand">
<el-button plain size="mini">
<i class="ti-settings"></i>
<span class="ti-angle-down"></span>
@@ -98,10 +87,10 @@ layout("/layouts/platform.html"){
<el-dropdown-item :command="{type:'view',data:row}">
查看
</el-dropdown-item>
<!-- <el-dropdown-item
&lt;!&ndash; <el-dropdown-item
:command="{type:'downloadAnnex',data:row}">
下载
</el-dropdown-item>-->
</el-dropdown-item>&ndash;&gt;
<el-dropdown-item :command="{type:'export',data:row}"
:disabled="row.stateId!==3090">
导出申请表
@@ -111,20 +100,17 @@ layout("/layouts/platform.html"){
导出领取通知单
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</el-dropdown>-->
</template>
</el-table-column>
</el-table>
<!--#include("/layouts/pagination.html"){}#-->
</el-card>
</template>
<template #view>
<info ref="viewInfoRef"></info>
</template>
</guava>
</div>
@@ -132,7 +118,7 @@ layout("/layouts/platform.html"){
<!--#include('./common/info.js'){}#-->
const vue = new Vue({
el: '#app',
el: "#app",
mixins: [initTableMixins],
components: {
info
@@ -142,13 +128,13 @@ layout("/layouts/platform.html"){
unions: [],
units: [],
pageForm: {
unitId: '',
unionId: '',
unitId: "",
unionId: "",
unit: "",
year: "",
searchName: "info.loginName"
},
unitOptions: [],
unitOptions: []
}
},
methods: {
@@ -165,14 +151,14 @@ layout("/layouts/platform.html"){
this.pageData()
},
dropdownCommand(command) {
const {type, data} = command
if (type == 'view') {
const { type, data } = command
if (type == "view") {
this.openView(data)
} else if (type == 'downloadAnnex') {
} else if (type == "downloadAnnex") {
window.location.href = "/platform/difficulty/reading/downloadAnnex?id=" + data.id
} else if (type == 'doExport') {
} else if (type == "doExport") {
window.location.href = "/platform/difficulty/reading/doExport?id=" + data.id
} else if (type == 'export') {
} else if (type == "export") {
window.location.href = "/platform/difficulty/reading/export?id=" + data.id
}
},
@@ -181,34 +167,33 @@ layout("/layouts/platform.html"){
this.$refs.viewInfoRef.onOpen(row.id)
},
doExcel() {
const {unionId, unitId, _dateRange} = this.pageForm
window.open("/platform/difficulty/reading/doExcel?dateRange=" + JSON.stringify(_dateRange)
+ "&unionId=" + unionId + "&unitId=" + unitId)
const { unionId, unitId, _dateRange } = this.pageForm
window.open(
"/platform/difficulty/reading/doExcel?dateRange=" + JSON.stringify(_dateRange) + "&unionId=" + unionId + "&unitId=" + unitId
)
},
doWholeExcel() {
window.open("/platform/difficulty/reading/doWholeExcel?dateRange=" + JSON.stringify(_dateRange)
+ "&unionId=" + unionId
+ "&unitId=" + unitId)
window.open(
"/platform/difficulty/reading/doWholeExcel?dateRange=" + JSON.stringify(_dateRange) + "&unionId=" + unionId + "&unitId=" + unitId
)
},
async flushUnits() {
this.$set(this.pageForm, "unitId", "")
if ("${@shiro.hasRole('sysadmin')||@shiro.hasRole('A06')||@shiro.hasRole('H03')}" === 'true') {
if ("${@shiro.hasRole('sysadmin')||@shiro.hasRole('A06')||@shiro.hasRole('H03')}" === "true") {
this.units = await getUnits(this.pageForm.unionId)
} else {
this.units = await getUnits("${@shiro.getPrincipalProperty('unit').getUnionid()}")
}
},
}
},
async created() {
this.pageData()
this.unions = await getUnions()
this.flushUnits()
}
})
</script>
<!--#
}
#-->