Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
Elements-SY
d75a54fd 1 parent e6b4b84d

修改用户角色提示语&样式

Inline Side-by-side
Showing 5 changed files with 18 additions and 14 deletions
...@@ -43,7 +43,7 @@ let ductLabels = { ...@@ -43,7 +43,7 @@ let ductLabels = {
43 "user": {//用户设置 43 "user": {//用户设置
44 "isValid": { 44 "isValid": {
45 "1": "启用", 45 "1": "启用",
46 - "2": "关闭", 46 + "2": "停用",
47 }, 47 },
48 }, 48 },
49 "FlightInformation": {//航班信息维护 49 "FlightInformation": {//航班信息维护
......
...@@ -29,7 +29,7 @@ export default { ...@@ -29,7 +29,7 @@ export default {
29 }, 29 },
30 title: { 30 title: {
31 type: String, 31 type: String,
32 - default: "标题", 32 + default: "标 题",
33 }, 33 },
34 center: { 34 center: {
35 type: String, 35 type: String,
......
...@@ -7,7 +7,7 @@ export const formConfig = [ ...@@ -7,7 +7,7 @@ export const formConfig = [
7 placeholder: "0", 7 placeholder: "0",
8 rules: { 8 rules: {
9 required: true, 9 required: true,
10 - message: "最大重量不得小于0KG", 10 + message: "最小重量不得小于0KG",
11 trigger: ["change", "blur"], 11 trigger: ["change", "blur"],
12 }, 12 },
13 trigger: "blur", // 事件名 13 trigger: "blur", // 事件名
...@@ -33,7 +33,7 @@ export const formConfig = [ ...@@ -33,7 +33,7 @@ export const formConfig = [
33 placeholder: "0", 33 placeholder: "0",
34 rules: { 34 rules: {
35 required: true, 35 required: true,
36 - message: "最大重量不得小于0KG", 36 + message: "最小件数不得小于0",
37 trigger: ["change", "blur"], 37 trigger: ["change", "blur"],
38 }, 38 },
39 trigger: "blur", // 事件名 39 trigger: "blur", // 事件名
...@@ -46,7 +46,7 @@ export const formConfig = [ ...@@ -46,7 +46,7 @@ export const formConfig = [
46 placeholder: "34", 46 placeholder: "34",
47 rules: { 47 rules: {
48 required: true, 48 required: true,
49 - message: "最大重量不得大于34KG", 49 + message: "最大件数不得小于最小件数",
50 trigger: ["change", "blur"], 50 trigger: ["change", "blur"],
51 }, 51 },
52 trigger: "blur", // 事件名 52 trigger: "blur", // 事件名
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
8 <!-- ET86配舱航班顺位 --> 8 <!-- ET86配舱航班顺位 -->
9 <el-row :gutter="24" justify="center"> 9 <el-row :gutter="24" justify="center">
10 <el-col :span="18"> 10 <el-col :span="18">
11 - <el-row style="margin-bottom: 15px" v-if="getRouter"> 11 + <el-row style="margin-bottom: 15px" v-show="getRouter">
12 <el-col> 12 <el-col>
13 <el-button 13 <el-button
14 type="primary" 14 type="primary"
...@@ -392,7 +392,7 @@ ...@@ -392,7 +392,7 @@
392 </el-form-item> 392 </el-form-item>
393 </el-col> 393 </el-col>
394 </el-col> 394 </el-col>
395 - <el-col :span="24" v-if="getRouter"> 395 + <el-col :span="24" v-show="getRouter">
396 <el-form-item label=""> 396 <el-form-item label="">
397 <el-button type="primary" @click="submitForm('ruleForm')">{{ 397 <el-button type="primary" @click="submitForm('ruleForm')">{{
398 getRouter 398 getRouter
......
...@@ -71,15 +71,13 @@ ...@@ -71,15 +71,13 @@
71 </el-col> 71 </el-col>
72 <el-col :span="24"> 72 <el-col :span="24">
73 <el-form-item label="所属角色:" prop="roleIds"> 73 <el-form-item label="所属角色:" prop="roleIds">
74 - <el-checkbox-group v-model="roleid" :disabled="userFormDisabled" @change="change"> 74 + <el-checkbox-group v-model="roleid" :disabled="userFormDisabled" @change="change" style="padding-top: 6px;box-sizing: border-box;">
75 - <el-row> 75 + <span v-for="(item,i) in roleList" :key="item.id" style="vertical-align:middle;" :style="{ marginLeft: i !=0 ? '15px' : 0 }">
76 - <el-col :span="4" v-for="item in roleList" :key="item.id">
77 <el-checkbox :label="item.id"> 76 <el-checkbox :label="item.id">
78 {{ item.name }} 77 {{ item.name }}
79 <Tooltips :content="item.englishName" :refName="item.code"></Tooltips> 78 <Tooltips :content="item.englishName" :refName="item.code"></Tooltips>
80 </el-checkbox> 79 </el-checkbox>
81 - </el-col> 80 + </span>
82 - </el-row>
83 </el-checkbox-group> 81 </el-checkbox-group>
84 </el-form-item> 82 </el-form-item>
85 </el-col> 83 </el-col>
...@@ -275,6 +273,12 @@ export default { ...@@ -275,6 +273,12 @@ export default {
275 }; 273 };
276 </script> 274 </script>
277 275
278 -<style> 276 +<style lang="scss" scoped>
279 - 277 + .el-checkbox-group .el-checkbox {
278 + width: auto !important;
279 + margin-left: 15px !important;
280 +}
281 +.el-checkbox:first-child{
282 + margin-left: 0px !important;
283 +}
280 </style> 284 </style>
......