xiaobei
/
xmf_saas_web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

3.14bug

Browse Source
main
luochenyi 3 years ago
parent ed41c9a689
commit a711dccad7
10 changed files with 142 additions and 55 deletions
Show Stats Download Patch File Download Diff File

4
src/components/searchForm/index.vue
Unescape View File

@ -21,7 +21,7 @@
>{{ option.name }}</a-select-option
>
</a-select>
<a-range-picker v-else-if="item.type === 'time'" value-format="YYYY/MM/DD HH:mm:ss" @change="changeTime($event,item.start,item.end)" />
<a-range-picker v-else-if="item.type === 'time'" v-model="form[item.prop]" value-format="YYYY/MM/DD HH:mm:ss" @change="changeTime($event,item.start,item.end)" />
</a-form-model-item>
</a-form-model>
<div class="btn-box"><a-button type="primary" @click="getSearch"> 查询 </a-button>
@ -42,7 +42,7 @@ export default {
this.itemList = val
let obj = {}
for(let k of val){
if(k.type==='time'){
if(k.type === 'time'){
obj[k.start] = undefined
obj[k.end] = undefined
}else{

6
src/views/Basic/Authority/depend/permissions.vue
Unescape View File

@ -129,8 +129,10 @@ export default {
},
defaultCheck(arr) {
for (let item of arr) {
if (item.isShow === true && item.childrenList !== null) {
this.checkedKeys.push(item.id);
if (item.childrenList !== null) {
if(item.isShow === true){
this.checkedKeys.push(item.id);
}
this.defaultCheck(item.childrenList);
} else if (item.isShow === true) {
this.checkedKeys.push(item.id);

7
src/views/Basic/Authority/index.vue
Unescape View File

@ -1,6 +1,6 @@
<template>
<div>
<a-tabs default-active-key="1">
<a-tabs default-active-key="1" @change="change">
<a-tab-pane key="1" tab="人员角色分配">
<a-row>
<!-- 角色列表 -->
@ -91,7 +91,7 @@
</a-row>
</a-tab-pane>
<a-tab-pane key="2" tab="角色权限设置" force-render>
<role-permissions></role-permissions>
<role-permissions ref="permissions"></role-permissions>
</a-tab-pane>
</a-tabs>
<!-- <a-modal title="分配角色" :visible="send.show" @ok="sendSubmit" @cancel="sendClose">
@ -211,6 +211,9 @@ export default {
this.afterroleList = JSON.parse(JSON.stringify(this.roleList));
});
},
change(){
this.$refs.permissions.getData()
},
getPeople() {
listByRole({
pageNum: this.pagination.current,

144
src/views/Basic/Employee/depend/config.js
Unescape View File

@ -30,13 +30,13 @@ export const columns = [
customRender: function (status) {
switch (status) {
case 1:
return '正常'
return "正常";
case 2:
return '停用'
return "停用";
default:
break;
}
}
},
},
{
title: "备注",
@ -51,13 +51,13 @@ export const columns = [
fixed: "right",
scopedSlots: { customRender: "action" },
},
]
];
// 搜索项
export const searchForm = {
keyword: "",
departmentId: null,
positionId: null,
}
};
// 分页
export const pagination = {
current: 1,
@ -66,12 +66,12 @@ export const pagination = {
showTotal: (total) => `共 ${total} 条`,
showSizeChanger: true,
showQuickJumper: true,
}
};
export const form = {
cascVal:[],
id:null,
cascVal: [],
id: null,
actualName: "",
sex: null,
sex: undefined,
idCard: "",
tel: "",
birthday: "",
@ -88,44 +88,112 @@ export const form = {
emergencyContact: "",
emergencyContactNumber: "",
emergencyContactAddress: "",
maritalStatus: "",
maritalStatus:undefined,
nation: "",
politicalOutlook: "",
accountType: "",
politicalOutlook:undefined,
accountType:undefined,
remake: "",
}
};
export const rules = {
actualName: [
{ required: true, message: "请输入真实姓名", trigger: "blur" },
],
actualName: [{ required: true, message: "请输入真实姓名", trigger: "blur" }],
sex: [{ required: true, message: "请选择性别", trigger: "change" }],
idCard: [
{ required: true, message: "请输入身份证号", trigger: "blur" },
],
idCard: [{ required: true, message: "请输入身份证号", trigger: "blur" }],
tel: [
{ required: true, message: "请输入手机号", trigger: "blur" },
{ min: 11, max: 11, message: "手机号只能为11位", trigger: "blur" },
],
cascVal:[{ type: 'array',required: true, message: "请选择岗位", trigger: "change" },],
entryDate: [
{ required: true, message: "请选择入职时间", trigger: "change" },
cascVal: [
{ type: "array", required: true, message: "请选择岗位", trigger: "change" },
],
}
export const sexOption = [
{
id: 1,
name: "男",
},
{
id: 2,
name: "女",
},
{
id: 3,
name: "保密",
},
]
entryDate: [{ required: true, message: "请选择入职时间", trigger: "change" }],
};
export const options = {
sex: [
{
id: 1,
name: "男",
},
{
id: 2,
name: "女",
},
{
id: 3,
name: "保密",
},
],
maritalStatus:[
{
id: 1,
name: "未婚",
},
{
id: 2,
name: "已婚",
},
],
politicalOutlook:[
{
id: 1,
name: "群众",
},
{
id: 2,
name: "中共党员",
},
{
id: 3,
name: "共青团",
},
{
id: 4,
name: "民革党员",
},
{
id: 5,
name: "民盟盟员",
},
{
id: 6,
name: "民建会员",
},
{
id: 7,
name: "民进会员",
},
{
id: 8,
name: "农工党党员",
},
{
id: 9,
name: "致公党党员",
},
{
id: 10,
name: "九三学社社员",
},
{
id: 11,
name: "台盟盟员",
},
{
id: 12,
name: "无党派人士",
},
],
accountType: [
{
id: 1,
name: "农村",
},
{
id: 2,
name: "城市",
},
]
};
import store from "@/store";
export const uploadHeaders = {
"manage-login-token": store.getters.getToken,
}
};

24
src/views/Basic/Employee/depend/form.vue
Unescape View File

@ -20,7 +20,7 @@
<a-col :span="12">
<a-form-model-item label="性别" prop="sex">
<a-select v-model="form.sex" placeholder="请选择性别">
<a-select-option v-for="item in sexOption" :key="item.id">{{
<a-select-option v-for="item in options.sex" :key="item.id">{{
item.name
}}</a-select-option>
</a-select>
@ -178,12 +178,15 @@
<a-select
placeholder="请选择婚姻状态"
v-model="form.maritalStatus"
/>
>
<a-select-option v-for="item in options.maritalStatus" :key="item.id">{{
item.name
}}</a-select-option></a-select>
</a-form-model-item>
</a-col>
<a-col :span="12">
<a-form-model-item label="民族" prop="nation">
<a-select placeholder="请输入民族" v-model="form.nation" />
<a-input placeholder="请输入民族" v-model="form.nation"></a-input>
</a-form-model-item>
</a-col>
<a-col :span="12">
@ -191,12 +194,19 @@
<a-select
placeholder="请选择政治面貌"
v-model="form.politicalOutlook"
/>
>
<a-select-option v-for="item in options.politicalOutlook" :key="item.id">{{
item.name
}}</a-select-option></a-select>
</a-form-model-item>
</a-col>
<a-col :span="12">
<a-form-model-item label="户口类型" prop="accountType">
<a-select placeholder="请选择类型" v-model="form.accountType" />
<a-select placeholder="请选择类型" v-model="form.accountType">
<a-select-option v-for="item in options.accountType" :key="item.id">{{
item.name
}}</a-select-option>
</a-select>
</a-form-model-item>
</a-col>
<a-col :span="24">
@ -213,7 +223,7 @@
</template>
<script>
import { form, rules, sexOption, uploadHeaders } from "./config"
import { form, rules, options, uploadHeaders } from "./config"
import { insertManageUser, departmentList, manageUserInfo, EditManageUser } from "@/api/basic/department";
function getBase64(file) {
return new Promise((resolve, reject) => {
@ -236,7 +246,7 @@ export default {
return {
form,
rules,
sexOption,
options,
uploadHeaders,
previewVisible: false,
previewImage: "",

2
src/views/Basic/Employee/index.vue
Unescape View File

@ -49,7 +49,7 @@
<a-col :span="19">
<div class="search-box">
<a-space size="large">
<a-input v-model="searchForm.keyword" placeholder="请输入申请人/公司名" />
<a-input v-model="searchForm.keyword" placeholder="请输入申请人" />
<a-button type="primary" @click='getData'>查 询</a-button>
<a-button @click='reset'>重 置</a-button>
</a-space>

1
src/views/Basic/EstateInfo/_houseHoldAudit/index.vue
Unescape View File

@ -171,6 +171,7 @@ export default {
const res = await reviewList({
pageNum: this.pagination.current,
size: this.pagination.pageSize,
status:this.activeName,
...this.searchForm
});
this.tableData = res.data.rows;

2
src/views/Basic/EstateInfo/_houseHoldInfo/index.vue
Unescape View File

@ -153,7 +153,7 @@
"单元/" +
row.floorLocation +
"层-" +
row.name +
row.manageEstateName +
"室"
}}
</span>

1
src/views/Basic/EstateInfo/_houseManage/index.vue
Unescape View File

@ -294,6 +294,7 @@ export default {
let res = await estateTypeDel({manageEstateTypeIds:[id]})
if(res.code=== 200){
this.$message.success(res.msg);
this.getType()
}else{
this.$message.error(res.msg);
}

6
src/views/Operation/Activity/_activityManage/depend/config.js
Unescape View File

@ -9,13 +9,15 @@ export const formItem = [
},
{
type: 'time',
label:'报名时间',
label: '报名时间',
prop:'registration',
start: 'registrationStartTime',
end:'registrationEndTime',
},
{
type: 'time',
label:'活动时间',
label: '活动时间',
prop:'activity',
start: 'activityStartTime',
end:'activityEndTime',
},

Write Preview
Loading…
Cancel
Save