LK/income_payments_client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

系统管理修改

Browse Source
This commit is contained in:
fengachen
2021-09-27 19:20:17 +08:00
parent c22c21ff92
commit 7ccf5325d4
7 changed files with 56 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/system/ConfusionList.vue
+2 -2
View File
@@ -24,7 +24,7 @@
<a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons"> <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button> <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button> <a-button class="reset-button" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
</span> </span>
</a-col> </a-col>
</a-row> </a-row>
@@ -199,6 +199,6 @@ export default {
} }
} }
</script> </script>
<style scoped> <style scoped lang="less">
@import '~@assets/less/common.less'; @import '~@assets/less/common.less';
</style> </style>
src/views/system/DepartList.vue
+25 -24
View File
@@ -103,28 +103,28 @@
@change="event => event.target.value = event.target.value.trim()" :maxLength="50" @change="event => event.target.value = event.target.value.trim()" :maxLength="50"
v-decorator="['orgCode', validatorRules.orgCode ]"/> v-decorator="['orgCode', validatorRules.orgCode ]"/>
</a-form-item> </a-form-item>
<a-form-item <!-- <a-form-item-->
:labelCol="labelCol" <!-- :labelCol="labelCol"-->
:wrapperCol="wrapperCol" <!-- :wrapperCol="wrapperCol"-->
label="机构类型"> <!-- label="机构类型">-->
<template v-if="orgCategoryDisabled"> <!-- <template v-if="orgCategoryDisabled">-->
<a-radio-group v-decorator="['orgCategory',validatorRules.orgCategory]" placeholder="请选择机构类型"> <!-- <a-radio-group v-decorator="['orgCategory',validatorRules.orgCategory]" placeholder="请选择机构类型">-->
<a-radio value="1"> <!-- <a-radio value="1">-->
公司 <!-- 公司-->
</a-radio> <!-- </a-radio>-->
</a-radio-group> <!-- </a-radio-group>-->
</template> <!-- </template>-->
<template v-else> <!-- <template v-else>-->
<a-radio-group v-decorator="['orgCategory',validatorRules.orgCategory]" placeholder="请选择机构类型"> <!-- <a-radio-group v-decorator="['orgCategory',validatorRules.orgCategory]" placeholder="请选择机构类型">-->
<a-radio value="2"> <!-- <a-radio value="2">-->
部门 <!-- 部门-->
</a-radio> <!-- </a-radio>-->
<a-radio value="3"> <!-- <a-radio value="3">-->
岗位 <!-- 岗位-->
</a-radio> <!-- </a-radio>-->
</a-radio-group> <!-- </a-radio-group>-->
</template> <!-- </template>-->
</a-form-item> <!-- </a-form-item>-->
<a-form-item <a-form-item
:labelCol="labelCol" :labelCol="labelCol"
:wrapperCol="wrapperCol" :wrapperCol="wrapperCol"
@@ -154,7 +154,7 @@
</a-form-item> </a-form-item>
</a-form> </a-form>
<div class="anty-form-btn"> <div class="anty-form-btn">
<a-button @click="emptyCurrForm" type="default" htmlType="button" icon="sync">重置</a-button> <a-button @click="emptyCurrForm" class="reset-button" htmlType="button" icon="sync">重置</a-button>
<a-button @click="submitCurrForm" :disabled="disabledStatus" type="primary" htmlType="button" <a-button @click="submitCurrForm" :disabled="disabledStatus" type="primary" htmlType="button"
icon="form">保存 icon="form">保存
</a-button> </a-button>
@@ -653,7 +653,8 @@ export default {
} }
</script> </script>
<style scoped> <style scoped lang="less">
@import '~@assets/less/common.less';
.ant-card-body .table-operator { .ant-card-body .table-operator {
margin: 15px; margin: 15px;
} }
src/views/system/DictItemList.vue
+2 -1
View File
@@ -37,7 +37,7 @@
<a-col :md="7" :sm="24"> <a-col :md="7" :sm="24">
<span style="float: left;" class="table-page-search-submitButtons"> <span style="float: left;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery">搜索</a-button> <a-button type="primary" @click="searchQuery">搜索</a-button>
<a-button type="primary" @click="searchReset" style="margin-left: 8px">重置</a-button> <a-button class="reset-button" @click="searchReset" style="margin-left: 8px">重置</a-button>
</span> </span>
</a-col> </a-col>
</a-row> </a-row>
@@ -223,6 +223,7 @@
} }
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
@import '~@assets/less/common.less';
//update--begin--autor:wangshuai-----date:20191204------for：系统管理 数据字典禁用和正常区别开，添加背景颜色 teambition JT-22------ //update--begin--autor:wangshuai-----date:20191204------for：系统管理 数据字典禁用和正常区别开，添加背景颜色 teambition JT-22------
/deep/ .data-rule-invalid{ /deep/ .data-rule-invalid{
background: #f4f4f4; background: #f4f4f4;
src/views/system/DictList.vue
+2 -2
View File
@@ -20,7 +20,7 @@
<a-col :md="7" :sm="8"> <a-col :md="7" :sm="8">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons"> <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search" v-has="'sys:dict:search'">查询</a-button> <a-button type="primary" @click="searchQuery" icon="search" v-has="'sys:dict:search'">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button> <a-button class="reset-button" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
</span> </span>
</a-col> </a-col>
</a-row> </a-row>
@@ -220,6 +220,6 @@ export default {
} }
} }
</script> </script>
<style scoped> <style scoped lang="less">
@import '~@assets/less/common.less'; @import '~@assets/less/common.less';
</style> </style>
src/views/system/QuartzJobList.vue
+2 -2
View File
@@ -26,7 +26,7 @@
<a-col :md="6" :sm="10"> <a-col :md="6" :sm="10">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons"> <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button> <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button> <a-button class="reset-button" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button >
</span> </span>
</a-col> </a-col>
@@ -294,6 +294,6 @@ export default {
} }
} }
</script> </script>
<style scoped> <style scoped lang="less">
@import '~@assets/less/common.less'; @import '~@assets/less/common.less';
</style> </style>
src/views/system/modules/DepartModal.vue
+22 -22
View File
@@ -30,28 +30,28 @@
:disabled="condition"> :disabled="condition">
</a-tree-select> </a-tree-select>
</a-form-item> </a-form-item>
<a-form-item <!-- <a-form-item-->
:labelCol="labelCol" <!-- :labelCol="labelCol"-->
:wrapperCol="wrapperCol" <!-- :wrapperCol="wrapperCol"-->
label="机构类型"> <!-- label="机构类型">-->
<template v-if="seen"> <!-- <template v-if="seen">-->
<a-radio-group v-decorator="['orgCategory',validatorRules.orgCategory]" placeholder="请选择机构类型"> <!-- <a-radio-group v-decorator="['orgCategory',validatorRules.orgCategory]" placeholder="请选择机构类型">-->
<a-radio value="1"> <!-- <a-radio value="1">-->
公司 <!-- 公司-->
</a-radio> <!-- </a-radio>-->
</a-radio-group> <!-- </a-radio-group>-->
</template> <!-- </template>-->
<template v-else> <!-- <template v-else>-->
<a-radio-group v-decorator="['orgCategory',validatorRules.orgCategory]" placeholder="请选择机构类型"> <!-- <a-radio-group v-decorator="['orgCategory',validatorRules.orgCategory]" placeholder="请选择机构类型">-->
<a-radio value="2"> <!-- <a-radio value="2">-->
部门 <!-- 部门-->
</a-radio> <!-- </a-radio>-->
<a-radio value="3"> <!-- <a-radio value="3">-->
岗位 <!-- 岗位-->
</a-radio> <!-- </a-radio>-->
</a-radio-group> <!-- </a-radio-group>-->
</template> <!-- </template>-->
</a-form-item> <!-- </a-form-item>-->
<a-form-item <a-form-item
:labelCol="labelCol" :labelCol="labelCol"
:wrapperCol="wrapperCol" :wrapperCol="wrapperCol"
src/views/system/modules/UserModal.vue
+1 -1
View File
@@ -390,7 +390,7 @@ export default {
} }
that.$nextTick(() => { that.$nextTick(() => {
that.form.setFieldsValue(pick(this.model, 'username', 'realname', 'email', 'phone', 'post','selecteddeparts')) that.form.setFieldsValue(pick(this.model, 'username', 'realname', 'email', 'phone', 'post','selecteddeparts','emailPassword'))
}) })
//身份为上级显示负责部门，否则不显示 //身份为上级显示负责部门，否则不显示
if (this.model.userIdentity == '2') { if (this.model.userIdentity == '2') {