Browse Source

Merge remote-tracking branch 'origin/master'

master
God 2 years ago
parent
commit
343bd3ed22
  1. 1
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDelivered.java
  2. 12
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  3. 18
      anrui-management/anrui-management-ui/src/components/pagination/index.vue
  4. 20
      anrui-management/anrui-management-ui/src/components/tab-search/index.vue
  5. 38
      anrui-management/anrui-management-ui/src/styles/index.scss
  6. 112
      anrui-management/anrui-management-ui/src/views/sysstaffinfo/yuangongguanli.vue
  7. 4
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java
  8. 3
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/utils/MsgWs.java
  9. 10
      anrui-scm/anrui-scm-ui/src/api/cheliang/dictcommons.js
  10. 43
      anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue
  11. 8
      anrui-system-ui/src/api/system/roleAdminister/index.js
  12. 17
      anrui-system-ui/src/views/RoleAdminister/RoleAdminister.vue
  13. 3
      anrui-system-ui/src/views/functional/functional.vue

1
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDelivered.java

@ -26,7 +26,6 @@
package com.yxt.anrui.buscenter.api.busdelivered;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;

12
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@ -1739,6 +1739,18 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
if (sysOrganizationVoResultBean.getData() != null) {
busDeliveredDto.setUseOrgName(sysOrganizationVoResultBean.getData().getName());
}
//根据应收未收表中的业务车辆sid查询车辆的sid
FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed1 = finUncollectedReceivablesDetailedService.fetchBySid(v.getReceivablesSid());
if(finUncollectedReceivablesDetailed1 != null){
String busVinSid = finUncollectedReceivablesDetailed1.getBusVinSid();
if(StringUtils.isNotBlank(busVinSid)){
//查询销售订单中的车辆列表的车辆相关的sid
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(busVinSid).getData();
if(busSalesOrderVehicle != null){
busDeliveredDto.setVinNo(busSalesOrderVehicle.getLinkNo());
}
}
}
ResultBean resultBean1 = busDeliveredFeign.save(busDeliveredDto);
}

18
anrui-management/anrui-management-ui/src/components/pagination/index.vue

@ -110,20 +110,26 @@ export default {
.pagination-container.hidden {
display: none;
}
.el-pagination {
white-space: nowrap;
color: #303133;
font-weight: bold;
height: 28px;
}
.el-pagination.is-background .btn-next, .el-pagination.is-background .btn-prev{
padding: 0 20px;
border: 1px solid #ccc;
border-radius: 2px;
background-color: #FFFFFF;
}
.e-pagination{
.e-pagination {
.el-icon-arrow-left:before,
.el-icon-arrow-right:before{
content: '下一页';
color: #727272;
.el-icon-arrow-right:before {
content: '下一页';
color: #727272;
}
.el-icon-arrow-left:before{
content: '上一页';
.el-icon-arrow-left:before {
content: '上一页';
}
}

20
anrui-management/anrui-management-ui/src/components/tab-search/index.vue

@ -37,10 +37,10 @@
@import "~@/styles/variables.scss";
.tab-header {
background-color: $search-bg;
padding: 8px 20px;
margin-bottom: 15px;
padding: 5px 20px;
//margin-bottom: 15px;
.tab-search{
padding: 8px 0px;
padding: 9px 0px;
}
.tab-btn{
.search-from{
@ -60,19 +60,19 @@
}
.el-input__inner,
.el-form-item__label{
height: 32px;
line-height: 32px;
height: 36px;
line-height: 36px;
color: $text-color;
}
.el-select .el-input.is-focus .el-input__inner{
border-color: $border-color;
}
}
.el-button{
padding: 8px 20px;
// background-color: $color-primary;
// color: $text-color-inverse;
}
//.el-button{
// padding: 8px 20px;
// background-color: $color-primary;
// color: $text-color-inverse;
//}
.el-select{
width: 150px;
}

38
anrui-management/anrui-management-ui/src/styles/index.scss

@ -105,6 +105,7 @@ div:focus {
.app-container {margin: 5px;
background-color: #fff;
}
.main-content{ overflow-x: hidden;overflow-y: auto;height: calc(100vh - 200px);padding: 0 20px;}
.listcon{height: calc(100vh - 425px);overflow-y: auto;overflow-x: hidden;}
.listconadd{height: calc(100vh - 200px);overflow-y: auto;overflow-x: hidden;}
.listconsub{height: calc(100vh - 310px);overflow-y: auto;overflow-x: hidden;}
@ -128,11 +129,22 @@ div:focus {
flex-direction: row;
justify-content: space-between;
align-items: center;
padding: 0px 0px 10px 15px;
padding: 0 0 0 15px;
margin-top: 0;
border: 1px solid #dfe4ed;
height: 42px;
line-height: 42px;
}
.listtop .tit {
font-weight: bold;
font-size: 16px
}
.listtop .pagination {
margin: 0;
padding: 0;
}
.listtop .tit{font-weight: bold;}
.listtop .pagination{margin: 0;padding: 0;}
.pages {
display: flex;
flex-direction: row;
@ -222,10 +234,24 @@ div:focus {
}
.titcon .baocun{text-align: right;flex: 2;padding: 5px 20px;}
.addinputwda{width: 600px;}
.searchcon{margin: 0px 0 10px 0;}
.searchcon .searchbtn{margin: 10px 0;}
//.searchcon{margin: 0px 0 10px 0;}
//.searchcon .searchbtn{margin: 10px 0;}
.main-content {
.searchcon {
.searchbtn {
margin: 5px 0;
border: #2cab69 1px solid;
color: #2cab69;
}
}
}
.search .btn {
padding: 5px 0;
border: 1px solid #e0e3eb;
text-align: center;
margin-bottom: 5px;
}
// 弹出窗口按钮
.btnCancel{

112
anrui-management/anrui-management-ui/src/views/sysstaffinfo/yuangongguanli.vue

@ -2,11 +2,11 @@
<div class="app-container">
<div v-show="viewState == 1">
<button-bar ref="btnbar" view-title="员工管理" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="isSearchShow = !isSearchShow">{{ isSearchShow ? "隐藏查询条件" : "显示藏查询条件" }}</el-button>
<div v-show="isSearchShow" class="search">
<el-form :inline="true" class="tab-header">
<el-row>
<div class="main-content">
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="isSearchShow = !isSearchShow">{{ isSearchShow ? "隐藏查询条件" : "显示藏查询条件" }}</el-button>
<div v-show="isSearchShow" class="search">
<el-form :inline="true" label-width="100px" :model="queryParams" class="tab-header">
<el-form-item label="员工姓名">
<el-input v-model="queryParams.params.name" placeholder="请输入员工姓名" clearable class="addinputw"/>
</el-form-item>
@ -26,53 +26,45 @@
<el-option v-for="(item) in postSid_list" :key="item.sid" :label="item.name" :value="item.sid"/>
</el-select>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="入职日期">
<!-- <el-date-picker v-model="queryParams.params.joinCompnyDateStart" type="date" class="addinputw" placeholder="选择日期" value-format="yyyy-MM-dd"/>-->
<div class="block" style="float: left;">
<el-date-picker v-model="queryParams.params.joinCompnyDateStart" type="date" value-format="yyyy-MM-dd" placeholder="开始日期">
</el-date-picker>
</div>
<div style="float: left;margin: 0 5px"></div>
<div class="block" style="float: left;">
<el-date-picker v-model="queryParams.params.joinCompnyDateEnd" type="date" value-format="yyyy-MM-dd" placeholder="结束日期">
</el-date-picker>
</div>
<el-date-picker v-model="queryParams.params.joinCompnyDateStart" type="date" value-format="yyyy-MM-dd" placeholder="开始日期">
</el-date-picker>
<span style="padding: 0 8px"></span>
<el-date-picker v-model="queryParams.params.joinCompnyDateEnd" type="date" value-format="yyyy-MM-dd" placeholder="结束日期">
</el-date-picker>
</el-form-item>
</el-row>
<el-divider/>
<div style="text-align: center; position: relative; margin-left: -75px">
<el-button type="primary" @click="dosearch">查询</el-button>
<el-button type="primary" @click="resetQuery">重置</el-button>
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" icon="el-icon-search" size="small" @click="dosearch">查询</el-button>
<el-button type="primary" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
</div>
</el-form>
</div>
</div>
<div class="listtop">
<div class="tit">员工信息列表</div>
<pageye v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="loadList"/>
</div>
<div class="">
<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column width="50px" type="selection" align="center"/>
<el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column width="120px" prop="jobNumber" label="员工编号" align="center">
<template slot-scope="scope">
<span class="tablerow-click" @click="toInfo(scope.row)">{{ scope.row.jobNumber }}</span>
</template>
</el-table-column>
<el-table-column width="140px" prop="name" label="员工姓名" align="center"/>
<el-table-column width="85px" prop="personType" label="员工类型" align="center"/>
<el-table-column width="150px" prop="mobile" label="手机号" align="center"/>
<el-table-column prop="orgName" label="所在部门" header-align="center" align="left"/>
<el-table-column width="200px" prop="postName" label="岗位" align="center"/>
<el-table-column width="140px" prop="joinCompnyDate" label="入职日期" align="center"/>
</el-table>
</div>
<div class="pages">
<div class="tit"/>
<pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="loadList"/>
</div>
</div>
<div class="listtop">
<div class="tit">员工信息列表</div>
<pageye v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="loadList"/>
</div>
<div class="listcon">
<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column width="50px" type="selection" align="center"/>
<el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column width="120px" prop="jobNumber" label="员工编号" align="center">
<template slot-scope="scope">
<span class="tablerow-click" @click="toInfo(scope.row)">{{ scope.row.jobNumber }}</span>
</template>
</el-table-column>
<el-table-column width="140px" prop="name" label="员工姓名" align="center"/>
<el-table-column width="85px" prop="personType" label="员工类型" align="center"/>
<el-table-column width="150px" prop="mobile" label="手机号" align="center"/>
<el-table-column prop="orgName" label="所在部门" header-align="center" align="left"/>
<el-table-column width="200px" prop="postName" label="岗位" align="center"/>
<el-table-column width="140px" prop="joinCompnyDate" label="入职日期" align="center"/>
</el-table>
</div>
<div class="pages">
<div class="tit"/>
<pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="loadList"/>
</div>
</div>
<!--End 查询和其列表部分-->
@ -205,7 +197,7 @@ export default {
this.getBuMen()
},
mounted() {
this.$refs["btnbar"].setButtonList(this.btnList)
this.$refs['btnbar'].setButtonList(this.btnList)
},
methods: {
@ -491,26 +483,4 @@ export default {
</script>
<style scoped>
/deep/ .el-collapse {
border-top: 0px solid #e6ebf5;
border-bottom: 0px solid #e6ebf5;
}
/deep/ .el-collapse-item__content {
margin: 0;
padding: 0;
}
/deep/ .el-collapse-item__wrap {
border-bottom: 0 solid #ebeef5;
}
/deep/ .el-collapse-item__header {
border-bottom: 0 solid #e6ebf5;
}
.searchbtn {
border: #2cab69 1px solid;
color: #2cab69;
}
</style>

4
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java

@ -41,7 +41,6 @@ import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Result;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
@ -73,7 +72,8 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
/**
* 设置redis的过期时间为4小时
*/
public static final long USERS_REDIS_SESSION_TL_PC = 4 * 3600;
// public static final long USERS_REDIS_SESSION_TL_PC = 4 * 3600;
public static final long USERS_REDIS_SESSION_TL_PC = 60;
public static final long USERS_REDIS_SESSION_TL_App = 24 * 15 * 3600;
/**
* 验证码长度

3
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/utils/MsgWs.java

@ -40,7 +40,8 @@ public class MsgWs {
javax.xml.rpc.ParameterMode.IN);
// String[] fn01 = {"YXT010045", "yuxintonghygl", mobile, msgtitle+msg+msgSign, "", ""};
String[] fn01 = {"YXT010045", "yuxintonghygl", mobile, msg+ SmsFeign.msgSign, "", ""};
String val = (String) call.invoke(fn01);
// String val = (String) call.invoke(fn01);
String val = "-1";//用于先去掉短信功能,不发短信
return val;
} catch (Exception e) {

10
anrui-scm/anrui-scm-ui/src/api/cheliang/dictcommons.js

@ -244,3 +244,13 @@ export function selectModelName(data) {
params: data
})
}
// 根据当前登录用户的角色获取菜单分页列表页面右上角按钮的隐藏
export function getButtonPermissions(data) {
return request({
url: '/portal/v1/sysfunction/getButtonPermissions',
method: 'post',
data: data,
headers: { 'Content-Type': 'application/json' }
})
}

43
anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue

@ -444,7 +444,7 @@
<script>
import { basefinbankExportExcel, deleteBySids, pagerList, selectCarTransferListAll, updateVehRemarks } from '@/api/cheliang/basevehicle'
import { typeValues, brandDown, getOrgSidByPath, fetchByUseOrgSid } from '@/api/cheliang/dictcommons'
import { typeValues, brandDown, getOrgSidByPath, fetchByUseOrgSid, getButtonPermissions } from '@/api/cheliang/dictcommons'
import cheliangtaizhangAdd from './cheliangtaizhangAdd'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
@ -482,13 +482,13 @@ export default {
btndisabled: false,
// ---------
btnList: [
// {
// type: 'primary',
// size: 'small',
// icon: 'plus',
// btnKey: 'toAdd',
// btnLabel: ''
// },
{
type: 'primary',
size: 'small',
icon: 'plus',
btnKey: 'toAdd',
btnLabel: '新增'
},
{
type: 'primary',
size: 'small',
@ -496,13 +496,13 @@ export default {
btnKey: 'toEdit',
btnLabel: '编辑'
},
// {
// type: 'danger',
// size: 'small',
// icon: 'del',
// btnKey: 'doDel',
// btnLabel: ''
// },
{
type: 'danger',
size: 'small',
icon: 'del',
btnKey: 'doDel',
btnLabel: '删除'
},
{
type: 'primary',
size: 'small',
@ -677,7 +677,18 @@ export default {
this.getPathSid()
},
mounted() {
this.$refs['btnbar'].setButtonList(this.btnList)
getButtonPermissions({ userSid: window.sessionStorage.getItem('userSid'), url: this.$route.path, type: 0 }).then((res) => {
if (res.success) {
for (var i = 0; i < res.data.length; i++) {
for (var k = 0; k < this.btnList.length; k++) {
if (res.data[i].buttonId === this.btnList[k].btnKey) {
this.btnList.splice(k, 1)
}
}
}
this.$refs['btnbar'].setButtonList(this.btnList)
}
})
},
methods: {
//

8
anrui-system-ui/src/api/system/roleAdminister/index.js

@ -161,12 +161,8 @@ export function saveSource(data) {
// 功能授权
export function funMenuTree(data) {
return request({
url: `/portal/v1/sysfunction/listAllByRoleSid`,
method: 'POST',
data: data,
headers: {'Content-Type': 'application/json',
'token':tokens
}
url: `/portal/v1/sysfunction/getFunctionAuthorization/` + data.roleSid,
method: 'get'
})
}
// 功能授权保存

17
anrui-system-ui/src/views/RoleAdminister/RoleAdminister.vue

@ -780,9 +780,22 @@ export default {
},
//
funSave() {
let funMenus = this.$refs.funTree.getCheckedKeys()
let funMenus = []
funMenus = this.$refs.funTree.getCheckedNodes(false, true)
// funMenus = this.$refs.Tree.getCheckedKeys()
console.log('已选节点、半选节点node', funMenus)
const funMenus_sid = []
for (var i = 0; i < funMenus.length; i++) {
funMenus_sid.push(funMenus[i].sid)
}
console.log('已选节点、半选节点sid', funMenus_sid)
// let funMenus = this.$refs.funTree.getCheckedKeys()
// let params = {
// functionSid: funMenus.toString(),
// roleSid: this.Thisrow.sid
// }
let params = {
functionSid: funMenus.toString(),
functionSid: funMenus_sid.toString(),
roleSid: this.Thisrow.sid
}
savefunMenu(params).then(res => {

3
anrui-system-ui/src/views/functional/functional.vue

@ -252,12 +252,13 @@ export default {
this.dialogTitle = '编辑'
this.editDialog = true
this.roleForm = Object.assign({}, row)
console.log(this.roleForm)
getSingleData({ id: row.sid }).then((res) => {
if (res.success) {
this.roleForm = res.data
}
})
getMenusForFunction(this.roleForm.sourceSid).then((resp) => {
getMenusForFunction({ sourceSid: this.roleForm.sourceSid }).then((resp) => {
if (resp.success) {
this.actionUrl_list = resp.data
}

Loading…
Cancel
Save