diff --git a/src/layout/components_new/Sidebar/newsSiderApp.vue b/src/layout/components_new/Sidebar/newsSiderApp.vue
index 66f744e..d360366 100644
--- a/src/layout/components_new/Sidebar/newsSiderApp.vue
+++ b/src/layout/components_new/Sidebar/newsSiderApp.vue
@@ -14,7 +14,7 @@
-
+
{{ item.meta.title }}
diff --git a/src/views/systemMaintenance/buttonManagement/configData.js b/src/views/systemMaintenance/buttonManagement/configData.js
index 8a52254..32ac59d 100644
--- a/src/views/systemMaintenance/buttonManagement/configData.js
+++ b/src/views/systemMaintenance/buttonManagement/configData.js
@@ -1,157 +1,174 @@
// 表头配置
const tableColumnJson = [
- {
- label: '按钮编号',
- prop: 'code',
- tooltip: true,
- },
- {
- label: '按钮中文编码',
- prop: 'nameEN',
- tooltip: true,
- },
- {
- label: '按钮英文编码',
- prop: 'nameEN',
- tooltip: true,
- },
- {
- label: '按钮格式',
- prop: 'style',
- tooltip: true,
- },
- {
- label: '按钮图标',
- prop: 'icoName',
- tooltip: true
- },
- {
- label: '按钮方法',
- prop: 'btnFunction',
- tooltip: true
- },
- {
- label: '按钮顺序',
- prop: 'sort',
- tooltip: true,
- },
- {
- label: '备注',
- prop: 'remark',
- tooltip: true
- },
- {
- label: '创建时间',
- prop: 'createTime',
- tooltip: true
- },
- // {
- // label: '删除标识',
- // prop: 'IsDelete',
- // tooltip: true
- // },
+ {
+ label: '按钮编号',
+ prop: 'code',
+ tooltip: true,
+ },
+ {
+ label: '按钮中文编码',
+ prop: 'nameCh',
+ tooltip: true,
+ },
+ {
+ label: '按钮英文编码',
+ prop: 'nameEn',
+ tooltip: true,
+ },
+ {
+ label: '按钮格式',
+ prop: 'styles',
+ tooltip: true,
+ },
+ {
+ label: '按钮图标',
+ prop: 'iconName',
+ tooltip: true
+ },
+ {
+ label: '按钮方法',
+ prop: 'btnFunction',
+ tooltip: true
+ },
+ {
+ label: '按钮顺序',
+ prop: 'sorts',
+ tooltip: true,
+ },
+ {
+ label: '备注',
+ prop: 'remark',
+ tooltip: true
+ },
+ {
+ label: '创建时间',
+ prop: 'createTime',
+ tooltip: true
+ },
+ // {
+ // label: '删除标识',
+ // prop: 'IsDelete',
+ // tooltip: true
+ // },
]
// 详情页面结构JSON
-const formRow = [{
- elCol: [{
- label: '按钮编号',
- prop: 'Code',
- tag: 'elInput',
- },
- {
- label: '中文名称',
- prop: 'nameCN',
- tag: 'elInput',
- },
- ]
- },
- {
- elCol: [{
- label: '英文名称',
- prop: 'nameEN',
- tag: 'elInput'
- },
- {
- label: '调用方法',
- prop: 'btnFunction',
- tag: 'elInput',
- },
- ]
- },
- {
- elCol: [{
- label: '样式',
- prop: 'style',
- tag: 'elInput',
- },
- {
- label: '图标',
- prop: 'icoName',
- tag: 'elInput',
- },
- ]
- },
- {
- elCol: [{
- label: '顺序',
- prop: 'sort',
- tag: 'elInput',
- }
- ]
- },
- {
- elCol: [{
- label: '备注',
- prop: 'remark',
- tag: 'elInput',
- span:24,
- type:'textarea'
- }
- ]
- },
-]
-const roleOptions = [{
- label: '超级管理员',
- value: 1
- },
- {
- label: '业务员',
- value: 2
- },
- {
- label: '管理员',
- value: 3
- },
- {
- label: '开发成员',
- value: 4
- },
- {
- label: '项目经理',
- value: 5
- },
- {
- label: '实施人员',
- value: 6
- },
- {
- label: '财务',
- value: 7
- },
- {
- label: '总经理',
- value: 8
- },
- {
- label: '副总',
- value: 9
- }
-]
-const rules = {
-};
+const formRow = [
+ {
+ elCol: [
+ {
+ label: "按钮编号",
+ prop: "code",
+ tag: "elInput",
+ },
+ {
+ label: "中文名称",
+ prop: "nameCh",
+ tag: "elInput",
+ },
+ ],
+ },
+ {
+ elCol: [
+ {
+ label: "英文名称",
+ prop: "nameEn",
+ tag: "elInput",
+ },
+ {
+ label: "调用方法",
+ prop: "btnFunction",
+ tag: "elInput",
+ },
+ ],
+ },
+ {
+ elCol: [
+ {
+ label: "样式",
+ prop: "styles",
+ tag: "elInput",
+ },
+ {
+ label: "图标",
+ prop: "iconName",
+ tag: "elInput",
+ },
+ ],
+ },
+ {
+ elCol: [
+ {
+ label: "顺序",
+ prop: "sorts",
+ tag: "elInput",
+ },
+ ],
+ },
+ // {
+ // elCol: [
+ // {
+ // label: "接口名称",
+ // prop: "actionName",
+ // tag: "elInput",
+ // span: 24,
+ // type: "textarea",
+ // },
+ // ],
+ // },
+ {
+ elCol: [
+ {
+ label: "备注",
+ prop: "remark",
+ tag: "elInput",
+ span: 24,
+ type: "textarea",
+ },
+ ],
+ },
+];
+const roleOptions = [
+ {
+ label: "超级管理员",
+ value: 1,
+ },
+ {
+ label: "业务员",
+ value: 2,
+ },
+ {
+ label: "管理员",
+ value: 3,
+ },
+ {
+ label: "开发成员",
+ value: 4,
+ },
+ {
+ label: "项目经理",
+ value: 5,
+ },
+ {
+ label: "实施人员",
+ value: 6,
+ },
+ {
+ label: "财务",
+ value: 7,
+ },
+ {
+ label: "总经理",
+ value: 8,
+ },
+ {
+ label: "副总",
+ value: 9,
+ },
+];
+const rules = {};
export default {
- formRow,
- rules,
- tableColumnJson
-}
+ formRow,
+ rules,
+ tableColumnJson,
+};
diff --git a/src/views/systemMaintenance/buttonManagement/index.vue b/src/views/systemMaintenance/buttonManagement/index.vue
index 00b22fa..b051ef6 100644
--- a/src/views/systemMaintenance/buttonManagement/index.vue
+++ b/src/views/systemMaintenance/buttonManagement/index.vue
@@ -1,263 +1,277 @@
-
diff --git a/src/views/systemMaintenance/menuManagement/configData.js b/src/views/systemMaintenance/menuManagement/configData.js
index 9bdd43e..eb26168 100644
--- a/src/views/systemMaintenance/menuManagement/configData.js
+++ b/src/views/systemMaintenance/menuManagement/configData.js
@@ -1,156 +1,173 @@
// 详情页面结构JSON
const formRow = [{
- elCol: [{
- label: '父节点',
- prop: 'upIds',
- tag: 'elTreeSelect',
- options:[],
- },
- {
- label: '等级',
- prop: 'lvl',
- disabled:true,
- tag: 'elInputNumber',
- },
- ]
- },
- {
- elCol: [{
- label: '菜单名称',
- prop: 'title',
- tag: 'elInput',
- },
- {
- label: '菜单英文名称',
- prop: 'name',
- tag: 'elInput',
- },
- ]
- },
- {
- elCol: [{
- label: '文件路径',
- prop: 'component',
- tag: 'elInput',
- },
- {
- label: '菜单图标',
- prop: 'icon',
- tag: 'elInput',
- },
- ]
- },
- {
- elCol: [{
- label: '页面路径',
- prop: 'path',
- tag: 'elInput',
- },
- {label: '菜单编码',
- prop: 'code',
- tag: 'elInput',
- },
- ]
- },
- {
- elCol: [
- {
- label: '打开方式',
- prop: 'openType',
- tag: 'elRadio',
- options: [{
- label: '菜单',
- value: '1'
- },{
- label: '弹窗',
- value: '2'
- }
- ]
- },
- {
- label: '菜单顺序',
- prop: 'sorts',
- tag: 'elInputNumber',
- },
- ]
- },
- {
- elCol: [{
- label: '操作级别',
- prop: 'level',
- tag: 'elRadio',
- options: [{
- label: 'SuperAdmin',
- value: '1'
- },{
- label: 'admin',
- value: '2'
- },{
- label: 'user',
- value: '3'
- }
- ]
- },
- {
- label: '显示',
- prop: 'hidden',
- tag: 'elRadio',
- options: [{
- label: '是',
- value: 'false'
- },{
- label: '否',
- value: 'true'
- }
- ]
- },
-
- // {
- // label: '操作权限',
- // prop: 'telphone',
- // tag: 'elRadio',
- // options: [{
- // label: '是',
- // value: '1'
- // },{
- // label: '否',
- // value: '2'
- // }
- // ]
- // },
- ]
- },
+ elCol: [{
+ label: '父节点',
+ prop: 'parentMenuName',
+ tag: 'elDialog',
+ span:24,
+ },
+ // {
+ // label: '菜单顺序',
+ // prop: 'mc_Sort',
+ // tag: 'elInput',
+ // rules:true
+ // // type:'number'
+ // },
+ ]
+},
+ {
+ elCol: [{
+ label: '菜单名称',
+ prop: 'menuName',
+ tag: 'elInput',
+ },
+ {
+ label: '菜单英文名称',
+ prop: 'menuEnglishName',
+ tag: 'elInput',
+ },
+ ]
+ },
+ {
+ elCol: [{
+ label: '菜单路径',
+ prop: 'route',
+ tag: 'elInput',
+ },
+ {
+ label: '菜单图标',
+ prop: 'menuIcon',
+ tag: 'elInput',
+ },
+ ]
+ },
+ {
+ elCol: [{
+ label: '页面路径',
+ prop: 'menuPage',
+ tag: 'elInput',
+ },
+ ]
+ },
+ {
+ elCol: [
+ {
+ label: '打开方式',
+ prop: 'showType',
+ tag: 'elRadio',
+ options: [{
+ label: '菜单',
+ value: "1"
+ },{
+ label: '弹窗',
+ value: "2"
+ }
+ ]
+ },
+ {
+ label: '显示',
+ prop: 'visibles',
+ tag: 'elRadio',
+ options: [{
+ label: '是',
+ value: "1"
+ },{
+ label: '否',
+ value: "0",
+ }
+ ]
+ },
+ ]
+ },
+ // {
+ // elCol: [{
+ // label: '功能权限',
+ // prop: 'birthday',
+ // tag: 'elRadio',
+ // options: [{
+ // label: '是',
+ // value: '1'
+ // },{
+ // label: '否',
+ // value: '2'
+ // }
+ // ]
+ // },
+ // {
+ // label: '操作权限',
+ // prop: 'telphone',
+ // tag: 'elRadio',
+ // options: [{
+ // label: '是',
+ // value: '1'
+ // },{
+ // label: '否',
+ // value: '2'
+ // }
+ // ]
+ // },
+ // ]
+ // },
+]
+const roleOptions = [{
+ label: '超级管理员',
+ value: 1
+},
+ {
+ label: '业务员',
+ value: 2
+ },
+ {
+ label: '管理员',
+ value: 3
+ },
+ {
+ label: '开发成员',
+ value: 4
+ },
+ {
+ label: '项目经理',
+ value: 5
+ },
+ {
+ label: '实施人员',
+ value: 6
+ },
+ {
+ label: '财务',
+ value: 7
+ },
+ {
+ label: '总经理',
+ value: 8
+ },
+ {
+ label: '副总',
+ value: 9
+ }
]
const rules = {
- title: [{
- required: true,
- message: '请输入名称',
- trigger: 'change'
- }],
- component: [{
- required: true,
- message: '请输入文件路径',
- trigger: 'change'
- }],
- path: [{
- required: true,
- message: '请输入路由路径',
- trigger: 'change'
- }],
- code: [{
- required: true,
- message: '请输入编码',
- trigger: 'change'
- }],
- openType: [{
- required: true,
- message: '请选择打开方式',
- trigger: 'change'
- }],
+ villageId: [{
+ required: true,
+ message: '请选择村/社区名称',
+ trigger: 'change'
+ }],
+ registerTime: [{
+ required: true,
+ message: '请选择登记时间',
+ trigger: 'change'
+ }],
};
+// 详情显示图片配置
+const showImgJson = {
+ span: 24,
+ text: '现场照片',
+ field: 'photoUrls',
+};
export default {
- formRow,
- rules
-}
+ showImgJson,
+ formRow,
+ rules
+}
diff --git a/src/views/systemMaintenance/menuManagement/index.vue b/src/views/systemMaintenance/menuManagement/index.vue
index b54e976..9781cd5 100644
--- a/src/views/systemMaintenance/menuManagement/index.vue
+++ b/src/views/systemMaintenance/menuManagement/index.vue
@@ -3,81 +3,49 @@
* @date: 2022-09-09
-->
-
-
+
+
+
+
+
+
- >
-
-
-
-
-
\ No newline at end of file
+
+// 表头配置
+const tableColumnJson = [
+{
+label: '用户账号',
+prop: 'u_LoginCode',
+tooltip: true,
+},
+{
+label: '用户姓名',
+prop: 'p_PersonName',
+tooltip: true,
+},
+{
+label: '所属部门',
+prop: 'o_OrganName',
+tooltip: true,
+},
+{
+label: '手机号',
+prop: 'p_Telphone',
+tooltip: true
+},
+{
+label: '状态',
+prop: 'stateNote',
+tooltip: true
+},
+
+]
+
+export default {
+tableColumnJson,
+}
diff --git a/src/views/systemSettings/jurisdictionManage/userJurisdiction/configData.js b/src/views/systemSettings/jurisdictionManage/userJurisdiction/configData.js
index 7dd458a..c51b2e9 100644
--- a/src/views/systemSettings/jurisdictionManage/userJurisdiction/configData.js
+++ b/src/views/systemSettings/jurisdictionManage/userJurisdiction/configData.js
@@ -1,34 +1,34 @@
// 表头配置
const tableColumnJson = [
- {
- label: '用户账号',
- prop: 'u_LoginCode',
- tooltip: true,
- },
- {
- label: '用户姓名',
- prop: 'p_PersonName',
- tooltip: true,
- },
- {
- label: '所属部门',
- prop: 'o_OrganName',
- tooltip: true,
- },
- {
- label: '手机号',
- prop: 'p_Telphone',
- tooltip: true
- },
- {
- label: '状态',
- prop: 'stateNote',
- tooltip: true
- },
+ {
+ label: '用户账号',
+ prop: 'loginCode',
+ tooltip: true,
+ },
+ {
+ label: '用户姓名',
+ prop: 'personName',
+ tooltip: true,
+ },
+ {
+ label: '所属部门',
+ prop: 'organName',
+ tooltip: true,
+ },
+ {
+ label: '手机号',
+ prop: 'mobilePhone',
+ tooltip: true
+ },
+ {
+ label: '状态',
+ prop: 'state',
+ tooltip: true
+ },
]
export default {
- tableColumnJson,
+ tableColumnJson,
}
diff --git a/src/views/systemSettings/jurisdictionManage/userJurisdiction/dataPermissions.vue b/src/views/systemSettings/jurisdictionManage/userJurisdiction/dataPermissions.vue
new file mode 100644
index 0000000..4e208d8
--- /dev/null
+++ b/src/views/systemSettings/jurisdictionManage/userJurisdiction/dataPermissions.vue
@@ -0,0 +1,126 @@
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
diff --git a/src/views/systemSettings/jurisdictionManage/userJurisdiction/dataSetting.vue b/src/views/systemSettings/jurisdictionManage/userJurisdiction/dataSetting.vue
index ddadc2f..9131b67 100644
--- a/src/views/systemSettings/jurisdictionManage/userJurisdiction/dataSetting.vue
+++ b/src/views/systemSettings/jurisdictionManage/userJurisdiction/dataSetting.vue
@@ -1,114 +1,114 @@
-
+
+.dataSetting {
+ color: #000;
+ .recordText {
+ border: 1px solid #fff;
+ width: 80px;
+ padding: 8px 0;
+ text-align: center;
+ font-size: 12px;
+ cursor: pointer;
+ background: #f2f2f2;
+ color: #e0e0e0;
+ margin:3px;
+ }
+
+ .recordText.active {
+ background: $activeColor;
+ color: #fff;
+ }
+}
+
diff --git a/src/views/systemSettings/jurisdictionManage/userJurisdiction/index.vue b/src/views/systemSettings/jurisdictionManage/userJurisdiction/index.vue
index 86e6faf..b585919 100644
--- a/src/views/systemSettings/jurisdictionManage/userJurisdiction/index.vue
+++ b/src/views/systemSettings/jurisdictionManage/userJurisdiction/index.vue
@@ -1,460 +1,525 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
diff --git a/src/views/systemSettings/jurisdictionManage/userJurisdiction/menuSetting.vue b/src/views/systemSettings/jurisdictionManage/userJurisdiction/menuSetting.vue
index c822f0c..e01f43f 100644
--- a/src/views/systemSettings/jurisdictionManage/userJurisdiction/menuSetting.vue
+++ b/src/views/systemSettings/jurisdictionManage/userJurisdiction/menuSetting.vue
@@ -1,131 +1,131 @@
-
+}
+
diff --git a/src/views/systemSettings/jurisdictionManage/userJurisdiction/newSetting.vue b/src/views/systemSettings/jurisdictionManage/userJurisdiction/newSetting.vue
index e944bc1..66d1946 100644
--- a/src/views/systemSettings/jurisdictionManage/userJurisdiction/newSetting.vue
+++ b/src/views/systemSettings/jurisdictionManage/userJurisdiction/newSetting.vue
@@ -1,410 +1,410 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.nameCh }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ row.row.state == 0 ? '启动' : '停用' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
{{ item.billName }}
-
-
-
+
+
{{ item.billName }}
+
+
+