logzhan
/
Finance
forked from knyin/finance
1
0
Fork 0
Code Pull Requests Activity

表单对齐

master
yin-kangning 2023-11-14 11:38:55 +08:00
parent 5a6d28fd88
commit 4ca32123cb
8 changed files with 111 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
eladmin-system/src/main/resources/config/application-prod.yml
View File

@ -4,9 +4,9 @@ spring:
druid:
db-type: com.alibaba.druid.pool.DruidDataSource
driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:eladmin}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
url: jdbc:log4jdbc:mysql://${DB_HOST:182.254.242.199}:${DB_PORT:3306}/${DB_NAME:admin}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
username: ${DB_USER:root}
password: ${DB_PWD:123456}
password: ${DB_PWD:ykn123456}
# 初始连接数
initial-size: 5
# 最小连接数

4
eladmin-web/.env.production
View File

@ -2,6 +2,6 @@ ENV = 'production'
# 如果使用 Nginx 代理后端接口，那么此处需要改为 '/'，文件查看 Docker 部署篇，Nginx 配置
# 接口地址，注意协议，如果你没有配置 ssl，需要将 https 改为 http
VUE_APP_BASE_API = 'https://eladmin.vip'
VUE_APP_BASE_API = 'http://182.254.242.199'
# 如果接口是 http 形式， wss 需要改为 ws
VUE_APP_WS_API = 'wss://eladmin.vip'
VUE_APP_WS_API = 'ws://182.254.242.199'

BIN
eladmin-web/src/assets/images/kashi2.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 MiB

2
eladmin-web/src/settings.js
View File

@ -38,7 +38,7 @@ module.exports = {
/**
* 底部文字，支持html语法
*/
footerTxt: '© 2018-2022 Zheng Jie <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License 2.0</a>',
// footerTxt: '© 2018-2022 Zheng Jie <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License 2.0</a>',
/**
* 备案号
*/

2
eladmin-web/src/views/login.vue
View File

@ -47,7 +47,7 @@ import Config from '@/settings'
import { getCodeImg } from '@/api/login'
import Cookies from 'js-cookie'
import qs from 'qs'
import Background from '@/assets/images/background.webp'
import Background from '@/assets/images/kashi2.jpg'
export default {
name: 'Login',
data() {

60
eladmin-web/src/views/system/purchase/index.vue
View File

@ -2,45 +2,46 @@
<div class="app-container">
<!--工具栏-->
<div class="head-container">
<!-- <div v-if="crud.props.searchToggle">-->
<!-- &lt;!&ndash; 搜索 &ndash;&gt;-->
<!-- <label class="el-form-item-label">申请类型</label>-->
<!-- <el-input v-model="query.purchaseType" clearable placeholder="申请类型" style="width: 185px;" class="filter-item" @keyup.enter.native="crud.toQuery" />-->
<!-- <rrOperation :crud="crud" />-->
<!-- </div>-->
<!-- <div v-if="crud.props.searchToggle">-->
<!-- &lt;!&ndash; 搜索 &ndash;&gt;-->
<!-- <label class="el-form-item-label">申请类型</label>-->
<!-- <el-input v-model="query.purchaseType" clearable placeholder="申请类型" style="width: 185px;" class="filter-item" @keyup.enter.native="crud.toQuery" />-->
<!-- <rrOperation :crud="crud" />-->
<!-- </div>-->
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission" />
<!--表单组件-->
<el-dialog append-to-body :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="800px">
<el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="150px">
<el-form-item label="申请人" prop="user.id" hidden="hidden" v-show="false">
<el-input v-model="form.user.id" />
<el-form-item v-show="false" label="申请人" prop="user.id" hidden="hidden">
<el-input v-model="form.user.id" />
</el-form-item>
<el-form-item label="申请人" prop="user.nickName">
<el-input v-model="form.user.nickName" disabled />
<el-input v-model="form.user.nickName" disabled />
</el-form-item>
<el-form-item label="手机" prop="user.phone">
<el-input v-model="form.user.phone" disabled />
<el-input v-model="form.user.phone" disabled />
</el-form-item>
<el-form-item label="部门" prop="user.dept.name">
<el-input v-model="form.user.dept.name" disabled />
<el-input v-model="form.user.dept.name" disabled />
</el-form-item>
<el-form-item label="申请金额">
<el-input v-model="form.fee" style="" />
</el-form-item>
<el-form-item label="申请事由">
<el-input v-model="form.reason" />
<el-input v-model="form.reason" />
</el-form-item>
<el-form-item label="货物/服务名称">
<el-input v-model="form.productName" style="" />
</el-form-item>
<el-form-item label="申请类型">
<el-select v-model="form.purchaseType" filterable placeholder="请选择" style="">
<el-select v-model="form.purchaseType" filterable placeholder="请选择" style="width:185px">
<el-option
v-for="item in dict.purchase_type"
:key="item.id"
:label="item.label"
:value="item.value" />
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="品牌/规格/参数">
@ -56,22 +57,23 @@
<el-input v-model="form.totalFee" style="" />
</el-form-item>
<el-form-item label="资金来源">
<el-select v-model="form.feeSource" filterable placeholder="请选择" style="">
<el-select v-model="form.feeSource" filterable placeholder="请选择" style="width:185px">
<el-option
v-for="item in dict.fee_source"
:key="item.id"
:label="item.label"
:value="item.value" />
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="项目名称">
<el-input v-model="form.projectName" style="" disabled/>
<el-input v-model="form.projectName" style="" />
</el-form-item>
<el-form-item label="项目编号">
<el-input v-model="form.projectNo" style="" disabled />
<el-input v-model="form.projectNo" style="" />
</el-form-item>
<el-form-item label="预计采购时间">
<el-date-picker v-model="form.purchaseTime" type="datetime" style="" />
<el-date-picker v-model="form.purchaseTime" type="datetime" style="width:185px" />
</el-form-item>
<el-form-item label="备注">
<el-input v-model="form.remark" style="width: 535px;" />
@ -94,7 +96,7 @@
{{ dict.label.purchase_type[scope.row.purchaseType] }}
</template>
</el-table-column>
<!-- <el-table-column prop="productInfo" label="品牌/规格/参数" />-->
<!-- <el-table-column prop="productInfo" label="品牌/规格/参数" />-->
<el-table-column prop="productCount" label="数量" />
<el-table-column prop="productPrice" label="预算单价" />
<el-table-column prop="totalFee" label="预算总价" />
@ -103,8 +105,8 @@
{{ dict.label.fee_source[scope.row.feeSource] }}
</template>
</el-table-column>
<!-- <el-table-column prop="projectName" label="项目名称" />-->
<!-- <el-table-column prop="projectNo" label="项目编号" />-->
<!-- <el-table-column prop="projectName" label="项目名称" />-->
<!-- <el-table-column prop="projectNo" label="项目编号" />-->
<el-table-column prop="purchaseTime" label="预计采购时间" />
<el-table-column prop="applyTime" label="申请时间" />
<el-table-column prop="remark" label="备注" />
@ -130,18 +132,18 @@ import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import user from "@/views/system/user/index.vue";
import {mapGetters} from "vuex";
import store from "@/store";
import user from '@/views/system/user/index.vue'
import { mapGetters } from 'vuex'
import store from '@/store'
const defaultForm = {user:{dept:{}}, purchaseId: null, userId: null, reason: null, fee: null, productName: null, purchaseType: null, productInfo: null, productCount: null, productPrice: null, totalFee: null, feeSource: null, projectName: null, projectNo: null, purchaseTime: null, applyTime: null, remark: null, createBy: null, updateBy: null, createTime: null, updateTime: null }
const defaultForm = { user: { dept: {}}, purchaseId: null, userId: null, reason: null, fee: null, productName: null, purchaseType: null, productInfo: null, productCount: null, productPrice: null, totalFee: null, feeSource: null, projectName: null, projectNo: null, purchaseTime: null, applyTime: null, remark: null, createBy: null, updateBy: null, createTime: null, updateTime: null }
export default {
name: 'Purchase',
components: { pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
dicts: ['purchase_type', 'fee_source'],
cruds() {
return CRUD({ title: '经费支出', url: 'api/purchase', idField: 'purchaseId', sort: 'purchaseId,desc', crudMethod: { ...crudPurchase }})
return CRUD({ title: '经费支出申请', url: 'api/purchase', idField: 'purchaseId', sort: 'purchaseId,desc', crudMethod: { ...crudPurchase }})
},
data() {
return {
@ -159,7 +161,7 @@ export default {
},
computed: {
...mapGetters([
'user',
'user'
])
},
methods: {
@ -169,7 +171,7 @@ export default {
},
[CRUD.HOOK.beforeToAdd]() {
this.form.user = this.user
},
}
}
}
</script>

78
eladmin-web/src/views/system/reimburse/index.vue
View File

@ -2,34 +2,28 @@
<div class="app-container">
<!--工具栏-->
<div class="head-container">
<!-- <div v-if="crud.props.searchToggle">-->
<!-- &lt;!&ndash; 搜索 &ndash;&gt;-->
<!-- <label class="el-form-item-label">报销类型</label>-->
<!-- <el-input v-model="query.reimburseType" clearable placeholder="报销类型" style="width: 185px;" class="filter-item" @keyup.enter.native="crud.toQuery" />-->
<!-- <rrOperation :crud="crud" />-->
<!-- </div>-->
<!-- <div v-if="crud.props.searchToggle">-->
<!-- &lt;!&ndash; 搜索 &ndash;&gt;-->
<!-- <label class="el-form-item-label">报销类型</label>-->
<!-- <el-input v-model="query.reimburseType" clearable placeholder="报销类型" style="width: 185px;" class="filter-item" @keyup.enter.native="crud.toQuery" />-->
<!-- <rrOperation :crud="crud" />-->
<!-- </div>-->
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission" />
<!--表单组件-->
<el-dialog append-to-body :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="800px">
<el-form ref="form" inline :model="form" :rules="rules" size="small" label-width="150px" >
<el-form-item label="报销人" prop="user.id" hidden="hidden" v-show="false">
<el-input v-model="form.user.id" />
<el-form ref="form" inline :model="form" :rules="rules" size="small" label-width="150px">
<el-form-item v-show="false" label="报销人" prop="user.id" hidden="hidden">
<el-input v-model="form.user.id" />
</el-form-item>
<el-form-item label="报销人" prop="user.nickName">
<el-input v-model="form.user.nickName" disabled />
<el-input v-model="form.user.nickName" disabled />
</el-form-item>
<el-form-item label="手机" prop="user.phone">
<el-input v-model="form.user.phone" disabled />
<el-input v-model="form.user.phone" disabled />
</el-form-item>
<el-form-item label="部门" prop="user.dept.name">
<el-input v-model="form.user.dept.name" disabled />
</el-form-item>
<el-form-item label="开户行" prop="user.dept.name">
<el-input v-model="form.user.userBanks[0].bankName" disabled />
</el-form-item>
<el-form-item label="银行卡号" prop="user.dept.name">
<el-input v-model="form.user.userBanks[0].bankNo" disabled />
<el-input v-model="form.user.dept.name" disabled />
</el-form-item>
<el-form-item label="申请事由" prop="reason">
<el-input v-model="form.reason" style="" />
@ -38,34 +32,42 @@
<el-input v-model="form.fee" style="" />
</el-form-item>
<el-form-item label="报销类型" prop="reimburseType">
<el-select v-model="form.reimburseType" filterable placeholder="请选择">
<el-select v-model="form.reimburseType" filterable placeholder="请选择" style="width:185px">
<el-option
v-for="item in dict.purchase_type"
:key="item.id"
:label="item.label"
:value="item.value" />
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="业务费类型" prop="businessFeeType" v-if="businessFeeShow">
<el-form-item v-if="businessFeeShow" label="业务费类型" prop="businessFeeType">
<el-select v-model="form.businessFeeType" filterable placeholder="请选择">
<el-option
v-for="item in dict.business_fee_type"
:key="item.id"
:label="item.label"
:value="item.value" />
v-for="item in dict.business_fee_type"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="资金来源">
<el-select v-model="form.feeSource" filterable placeholder="请选择" >
<el-select v-model="form.feeSource" style="width:185px" filterable placeholder="请选择">
<el-option
v-for="item in dict.fee_source"
:key="item.id"
:label="item.label"
:value="item.value" />
v-for="item in dict.fee_source"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="项目名称">
<!-- <el-form-item label="项目名称" prop="projectName" >-->
<!-- <el-input v-model="form.projectName" style="" />-->
<!-- </el-form-item>-->
<el-form-item label="项目名称" prop="projectName">
<el-input v-model="form.projectName" style="" />
<!-- <project-select v-model="form.projectName" ></project-select>-->
</el-form-item>
<el-form-item label="项目编号">
<el-input v-model="form.projectNo" style="" />
@ -74,7 +76,7 @@
<el-input v-model="form.projectFee" style="" />
</el-form-item>
<el-form-item label="花费产生时间" prop="reimburseTime">
<el-date-picker v-model="form.reimburseTime" type="datetime" style="" />
<el-date-picker v-model="form.reimburseTime" type="datetime" style="width:185px" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" style="" />
@ -129,20 +131,20 @@ import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import {mapGetters} from "vuex";
import { mapGetters } from 'vuex'
const defaultForm = { user:{dept:{},userBanks:[{}]},userId: null, reason: null, fee: null, reimburseType: null, feeSource: null, projectName: null, projectNo: null, projectFee: null, reimburseTime: null, remark: null, createBy: null, updateBy: null, createTime: null, updateTime: null, reimburseId: null }
const defaultForm = { user: { dept: {}}, userId: null, reason: null, fee: null, reimburseType: null, feeSource: null, projectName: null, projectNo: null, projectFee: null, reimburseTime: null, remark: null, createBy: null, updateBy: null, createTime: null, updateTime: null, reimburseId: null }
export default {
name: 'Reimburse',
components: { pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
dicts: ['purchase_type','fee_source','business_fee_type'],
dicts: ['purchase_type', 'fee_source', 'business_fee_type'],
cruds() {
return CRUD({ title: '报销单', url: 'api/reimburse', idField: 'reimburseId', sort: 'reimburseId,desc', crudMethod: { ...crudReimburse }})
},
data() {
return {
businessFeeShow:false,
businessFeeShow: false,
permission: {
add: ['admin', 'reimburse:add'],
edit: ['admin', 'reimburse:edit'],
@ -172,7 +174,7 @@ export default {
},
computed: {
...mapGetters([
'user',
'user'
])
},
watch: {
@ -190,7 +192,7 @@ export default {
},
[CRUD.HOOK.beforeToAdd]() {
this.form.user = this.user
},
}
}
}
</script>

66
eladmin-web/src/views/system/service_fee/index.vue
View File

@ -7,54 +7,55 @@
<!--表单组件-->
<el-dialog append-to-body :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="800px">
<el-form ref="form" inline :model="form" :rules="rules" size="small" label-width="150px">
<!-- <el-form-item label="劳务人" v-show="false">-->
<!-- <el-input v-model="form.user.id" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="劳务人">-->
<!-- <el-input v-model="form.user.id" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="劳务人" v-show="false">-->
<!-- <el-input v-model="form.user.id" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="劳务人">-->
<!-- <el-input v-model="form.user.id" />-->
<!-- </el-form-item>-->
<el-form-item label="劳务人">
<user-select v-model="form.user.id" @userInfo="fillUser" ></user-select>
<user-select v-model="form.user.id" style="width:185px" @userInfo="fillUser" />
</el-form-item>
<el-form-item label="性别">
<el-input v-model="form.user.gender" disabled />
<el-input v-model="form.user.gender" disabled />
</el-form-item>
<el-form-item label="手机" >
<el-input v-model="form.user.phone" disabled />
<el-form-item label="手机">
<el-input v-model="form.user.phone" disabled />
</el-form-item>
<el-form-item label="开户行" >
<el-input v-model="form.user.userBanks[0].bankName" disabled />
<el-form-item label="开户行">
<el-input v-model="form.user.userBanks[0].bankName" disabled />
</el-form-item>
<el-form-item label="银行卡号" >
<el-input v-model="form.user.userBanks[0].bankNo" disabled />
<el-form-item label="银行卡号">
<el-input v-model="form.user.userBanks[0].bankNo" disabled />
</el-form-item>
<el-form-item label="应发金额">
<el-input v-model="form.payableFee" />
<el-input v-model="form.payableFee" />
</el-form-item>
<el-form-item label="个人所得税">
<el-input v-model="form.tax" />
<el-input v-model="form.tax" />
</el-form-item>
<el-form-item label="实发金额">
<el-input v-model="form.paidFee" />
<el-input v-model="form.paidFee" />
</el-form-item>
<el-form-item label="资金来源">
<el-select v-model="form.feeSource" filterable placeholder="请选择">
<el-select v-model="form.feeSource" filterable placeholder="请选择" style="width:185px">
<el-option
v-for="item in dict.fee_source"
:key="item.id"
:label="item.label"
:value="item.value" />
:value="item.value"
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="审批人">-->
<!-- <el-input v-model="form.approveUserId" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="审批人">-->
<!-- <el-input v-model="form.approveUserId" />-->
<!-- </el-form-item>-->
<el-form-item label="劳务时间">
<el-date-picker v-model="form.serviceTime" type="datetime" style="" />
<el-input v-model="form.serviceTime" style="" />
</el-form-item>
<el-form-item label="备注">
<el-input v-model="form.remark" />
<el-input v-model="form.remark" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@ -74,9 +75,9 @@
{{ dict.label.fee_source[scope.row.feeSource] }}
</template>
</el-table-column>
<!-- <el-table-column prop="approveUserId" label="审批人" />-->
<!-- <el-table-column prop="approveUserId" label="审批人" />-->
<el-table-column prop="serviceTime" label="劳务时间" />
<!-- <el-table-column prop="applyTime" label="申请时间" />-->
<!-- <el-table-column prop="applyTime" label="申请时间" />-->
<el-table-column prop="remark" label="备注" />
<el-table-column v-if="checkPer(['admin','serviceFee:edit','serviceFee:del'])" label="操作" width="150px" align="center">
<template slot-scope="scope">
@ -100,12 +101,12 @@ import rrOperation from '@crud/RR.operation.vue'
import crudOperation from '@crud/CRUD.operation.vue'
import udOperation from '@crud/UD.operation.vue'
import pagination from '@crud/Pagination.vue'
import UserSelect from "@/views/system/user/user-select.vue";
import UserSelect from '@/views/system/user/user-select.vue'
const defaultForm = { user:{userBanks:[{}]},approveUser:{}, serviceFeeId: null, userId: null, payableFee: null, tax: null, paidFee: null, feeSource: null, approveUserId: null, serviceTime: null, applyTime: null, remark: null, createBy: null, updateBy: null, createTime: null, updateTime: null }
const defaultForm = { user: { userBanks: [{}] }, approveUser: {}, serviceFeeId: null, userId: null, payableFee: null, tax: null, paidFee: null, feeSource: null, approveUserId: null, serviceTime: null, applyTime: null, remark: null, createBy: null, updateBy: null, createTime: null, updateTime: null }
export default {
name: 'ServiceFee',
components: {UserSelect, pagination, crudOperation, rrOperation, udOperation },
components: { UserSelect, pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
dicts: ['fee_source'],
cruds() {
@ -119,15 +120,16 @@ export default {
del: ['admin', 'serviceFee:del']
},
rules: {
} }
}
}
},
methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
return true
},
fillUser(user){
this.form.user = {userBanks:[{}]}
fillUser(user) {
this.form.user = { userBanks: [{}] }
console.log(user)
this.form.user = Object.assign({}, this.form.user, user)
}