Skip to content

P
precision-effect
Commit d6b388ba authored by 吴卿华's avatar 吴卿华
Browse files
Options

Merge branch 'master' of D:\项目\泽宏精效管理项目\precision-effect with conflicts.

parent 065aa0a1
Hide whitespace changes
Inline Side-by-side
Showing with 74 additions and 49 deletions
precision-effect-admin/src/main/java/com/zehong/web/controller/system/SysNoticeController.java
View file @ d6b388ba
......@@ -25,7 +25,7 @@ import java.util.Map;
/**
* 公告 信息操作处理
*
*
* @author zehong
*/
@RestController
......@@ -41,6 +41,8 @@ public class SysNoticeController extends BaseController
@Autowired
private ISysUserService sysUserService;
@Autowired
private TokenService tokenService;
/**
* 获取通知公告列表
*/
......@@ -48,6 +50,9 @@ public class SysNoticeController extends BaseController
@GetMapping("/list")
public TableDataInfo list(SysNotice notice)
{
// 获取当前用户
SysUser user = tokenService.getLoginUser(ServletUtils.getRequest()).getUser();
notice.setUserId(user.getUserId());
startPage();
List<SysNotice> list = noticeService.selectNoticeList(notice);
return getDataTable(list);
......
precision-effect-admin/src/main/java/com/zehong/web/controller/transaction/TBorrowingApplyForController.java
View file @ d6b388ba
......@@ -113,10 +113,10 @@ public class TBorrowingApplyForController extends BaseController
* @param tBorrowingApplyFor
* @return
*/
@GetMapping("/departmentBalance")
public int departmentBalance(TBorrowingApplyFor tBorrowingApplyFor){
@PostMapping("departmentBalance")
public int departmentBalance(@RequestBody TBorrowingApplyFor tBorrowingApplyFor){
SysUser user = tokenService.getLoginUser(ServletUtils.getRequest()).getUser();
tBorrowingApplyFor.setApprovedUserId(user.getUserId());
tBorrowingApplyFor.setBorrowingDeptId(user.getDeptId());
/**查询部门余额是否足够*/
int isSufficient = tBorrowingApplyForService.selectTacc(tBorrowingApplyFor);
//0部门余额不足 1余额足够
......
precision-effect-admin/src/main/resources/application-dev.yml
View file @ d6b388ba
......@@ -9,13 +9,17 @@ spring:
url: jdbc:mysql://36.148.23.59:33060/precision_effect_db?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: zehong_/sjz!D
# master:
# url: jdbc:mysql://36.139.131.221:3808/precision_effect?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# username: precision_effect
# password: zehong_/sjz!D
# 从库数据源
slave:
# 从数据源开关/默认关闭
enabled: false
url:
username:
password:
url:
username:
password:
# 初始连接数
initialSize: 5
# 最小连接池数量
......@@ -35,7 +39,7 @@ spring:
testWhileIdle: true
testOnBorrow: false
testOnReturn: false
webStatFilter:
webStatFilter:
enabled: true
statViewServlet:
enabled: true
......@@ -58,13 +62,13 @@ spring:
# redis 配置
redis:
# 地址
host: 36.148.23.59
host: 36.139.131.221
# 端口，默认为6379
port: 6379
port: 1203
# 数据库索引
database: 4
# 密码
password: 1qaz2wsx3edc
password: kHy3CCY84jUsKTJC
# 连接超时时间
timeout: 10s
lettuce:
......@@ -90,8 +94,8 @@ zehong:
# 实例演示开关
demoEnabled: true
# 文件路径 示例（ Windows配置D:/zehong/uploadPath，Linux配置 /home/zehong/uploadPath）
profile: D:/zehong/uploadPath
profile: /home/zehong/uploadPath
# 获取ip地址开关
addressEnabled: false
# 验证码类型 math 数组计算 char 字符验证
captchaType: math
\ No newline at end of file
captchaType: math
precision-effect-admin/src/main/resources/application-test.yml
View file @ d6b388ba
......@@ -13,9 +13,9 @@ spring:
slave:
# 从数据源开关/默认关闭
enabled: false
url:
username:
password:
url:
username:
password:
# 初始连接数
initialSize: 5
# 最小连接池数量
......@@ -35,7 +35,7 @@ spring:
testWhileIdle: true
testOnBorrow: false
testOnReturn: false
webStatFilter:
webStatFilter:
enabled: true
statViewServlet:
enabled: true
......@@ -90,8 +90,8 @@ zehong:
# 实例演示开关
demoEnabled: true
# 文件路径 示例（ Windows配置D:/zehong/uploadPath，Linux配置 /home/zehong/uploadPath）
profile: D:/zehong/uploadPath
profile: /home/zehong/uploadPath
# 获取ip地址开关
addressEnabled: false
# 验证码类型 math 数组计算 char 字符验证
captchaType: math
\ No newline at end of file
captchaType: math
precision-effect-web/src/api/system/for.js
View file @ d6b388ba
......@@ -13,7 +13,7 @@ export function listFor(query) {
export function getDepartmentBalance(data) {
return request({
url: '/system/for/departmentBalance',
method: 'get',
method: 'post',
data: data
})
}
......
precision-effect-web/src/views/for/index.vue
View file @ d6b388ba
......@@ -107,6 +107,12 @@
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-edit"-->
<!-- @click="details(scope.row)"-->
<!-- >修改</el-button>-->
<el-button
size="mini"
type="text"
......@@ -795,6 +801,9 @@ export default {
});
} else {
this.form.approvalStatus=row;
console.log( this.form)
this.form.approvalStatus='1'
getDepartmentBalance(this.form).then(response => {
if (response==2){
this.$message.error('部门余额不足');
......
precision-effect-web/src/views/system/notice/index.vue
View file @ d6b388ba
......@@ -10,15 +10,15 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="操作人员" prop="createBy">
<el-input
v-model="queryParams.createBy"
placeholder="请输入操作人员"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="操作人员" prop="createBy">-->
<!-- <el-input-->
<!-- v-model="queryParams.createBy"-->
<!-- placeholder="请输入操作人员"-->
<!-- clearable-->
<!-- size="small"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="类型" prop="noticeType">
<el-select v-model="queryParams.noticeType" placeholder="公告类型" clearable size="small">
<el-option
......@@ -80,6 +80,12 @@
prop="noticeTitle"
:show-overflow-tooltip="true"
/>
<el-table-column
label="公告内容"
align="center"
prop="noticeContent"
:show-overflow-tooltip="true"
/>
<el-table-column
label="公告类型"
align="center"
......@@ -94,30 +100,30 @@
:formatter="statusFormat"
width="100"
/>
<el-table-column label="创建者" align="center" prop="createBy" width="100" />
<!-- <el-table-column label="创建者" align="center" prop="createBy" width="100" />-->
<el-table-column label="创建时间" align="center" prop="createTime" width="100">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:notice:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:notice:remove']"
>删除</el-button>
</template>
</el-table-column>
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-edit"-->
<!-- @click="handleUpdate(scope.row)"-->
<!-- v-hasPermi="['system:notice:edit']"-->
<!-- >修改</el-button>-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-delete"-->
<!-- @click="handleDelete(scope.row)"-->
<!-- v-hasPermi="['system:notice:remove']"-->
<!-- >删除</el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
<pagination
......@@ -340,4 +346,4 @@ export default {
}
}
};
</script>
\ No newline at end of file
</script>
precision-effect-web/vue.config.js
View file @ d6b388ba
......@@ -35,6 +35,7 @@ module.exports = {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
target: `http://localhost:8668/precisionEffect`,
//target: `http://36.139.131.221:8904/precisionEffect`,
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment