diff --git a/src/assets/css/global_button.css b/src/assets/css/global_button.css index b239519..a5cc799 100644 --- a/src/assets/css/global_button.css +++ b/src/assets/css/global_button.css @@ -1,3 +1,27 @@ +.el-button { + background: #FFF; + border: 1px solid #0B663D; /*原始 默认值 1px solid #DCDFE6; */ + color: #0B663D !important; /*原始 默认值 #606266 */ + font-weight: 700; /*原始 默认值 500 */ + font-family: 'Microsoft YaHei'; /*原始 默认值 Arial */ + padding: 10px 5px; /*原始 默认值 12px 20px */ + min-width: 60px; + /* + display: inline-block; + line-height: 1; + white-space: nowrap; + cursor: pointer; + -webkit-appearance: none; + text-align: center; + box-sizing: border-box; + outline: 0; + margin: 0; + transition: .1s; + font-size: 14px; + border-radius: 4px; + */ +} + .commonbutton { width: 100px; height: 32px; @@ -41,4 +65,5 @@ color: #396FFA; background-color: #f4f4f4; border-color: #396FFA; -} \ No newline at end of file +} + diff --git a/src/assets/css/global_table.css b/src/assets/css/global_table.css index 23a2747..59a9ea1 100644 --- a/src/assets/css/global_table.css +++ b/src/assets/css/global_table.css @@ -76,4 +76,9 @@ font-size: 14px; font-weight: 400; font-family: "NotoSansSC-Regular"; +} + +/* 表格列排序 */ +.el-table .caret-wrapper { + width: 16px; /* 默认值 24px */ } \ No newline at end of file diff --git a/src/components/customerOrg/ContactPerson.vue b/src/components/customerOrg/ContactPerson.vue index 3db9201..ce5a3f4 100644 --- a/src/components/customerOrg/ContactPerson.vue +++ b/src/components/customerOrg/ContactPerson.vue @@ -54,14 +54,14 @@
-
- 新增 +
+ 新增联系人
-
- 编辑 +
+ 编辑联系人
-
- 删除 +
+ 删除联系人
@@ -142,12 +142,16 @@ import moment from "moment"; import { mapState } from "vuex"; import { getapi, postapi, putapi, deletapi } from "@/api/api"; -import { objCopy, deepCopy, arrayExistObj } from "../../utlis/proFunc"; +import { getPagePriv,checkPagePriv,objCopy, deepCopy, arrayExistObj } from "../../utlis/proFunc"; export default { components: {}, props:["customerOrgId"], data() { return { + pagePriv:{ + routeUrlorPageName:'customerOrg', //当前页面归属路由或归属页面权限名称 + privs:[] // 页面权限 + }, personId: "", form: {}, //联系人表单信息 contactMethodListEdit:[], //联系方式(可修改) @@ -168,7 +172,11 @@ export default { }; }, - created() { }, + created() { + //获取用户当前页面的权限 + let userPriv = window.sessionStorage.getItem('userPriv') + if(userPriv) this.pagePriv.privs = deepCopy(getPagePriv(this.pagePriv.routeUrlorPageName)) + }, //挂载完成 mounted() { }, @@ -178,7 +186,7 @@ export default { }, methods: { - moment, + moment,checkPagePriv, //获取联系人列表 getContactPersonList(customerOrgId) { getapi( diff --git a/src/components/customerOrg/customerOrgEdit.vue b/src/components/customerOrg/customerOrgEdit.vue index 1f199bd..89d1b29 100644 --- a/src/components/customerOrg/customerOrgEdit.vue +++ b/src/components/customerOrg/customerOrgEdit.vue @@ -182,22 +182,22 @@
-
+
新增单位
-
+
新增子单位
-
+
保存
-
+
删除 @@ -208,7 +208,7 @@ - diff --git a/src/views/customerOrg/patientRegisterImport.vue b/src/views/customerOrg/patientRegisterImport.vue index fec1182..02f8e23 100644 --- a/src/views/customerOrg/patientRegisterImport.vue +++ b/src/views/customerOrg/patientRegisterImport.vue @@ -6,13 +6,13 @@
- 导入 + 导入
- 导入后结果状态导出 + 导入后结果状态导出
diff --git a/src/views/login/Login.vue b/src/views/login/Login.vue index a071345..a7f08a6 100644 --- a/src/views/login/Login.vue +++ b/src/views/login/Login.vue @@ -112,10 +112,14 @@ export default { this.$router.push({ path: "/home" }); this.$store.state.changepassword = this.form.Password; - + return getapi('/api/app/menuinfo/getmymenuinfolist') } else { this.$message.warning(res.message); } + }).then(res => { + if(res && res.code != -1){ + window.sessionStorage.setItem("userPriv", JSON.stringify(res.data)); + } }).catch(err =>{ this.$message.error(err); })