Merge branch 'dev' of http://git.echepei.com/tubao/Smart_platform_ui into dev

src/views/iosBasicData/humanResources/employees/detailsPage.vue

@@ -98,7 +98,7 @@ export default {
                         dicUrl: "/api/blade-system/dict-biz/dictionary?code=position_type",
                         props: {
                             label: 'dictValue',
-                            value: 'dictValue',
+                            value: 'dictKey',
                         },
                         disabled: false,
                         rules: [{
@@ -189,7 +189,7 @@ export default {
                         dicUrl: "/api/blade-system/dict-biz/dictionary?code=position",
                         props: {
                             label: 'dictValue',
-                            value: 'dictValue',
+                            value: 'dictKey',
                         },
                         disabled: false,
                     },
@@ -217,7 +217,7 @@ export default {
                         dicUrl: "/api/blade-system/dict-biz/dictionary?code=Office_location",
                         props: {
                             label: 'dictValue',
-                            value: 'dictValue',
+                            value: 'dictKey',
                         },
                         disabled: false,
                     },
@@ -229,7 +229,7 @@ export default {
                         dicUrl: "/api/blade-system/dict-biz/dictionary?code=educational_background",
                         props: {
                             label: 'dictValue',
-                            value: 'dictValue',
+                            value: 'dictKey',
                         },
                         disabled: false,
                     },
@@ -241,7 +241,7 @@ export default {
                         dicUrl: "/api/blade-system/dict-biz/dictionary?code=major",
                         props: {
                             label: 'dictValue',
-                            value: 'dictValue',
+                            value: 'dictKey',
                         },
                         disabled: false,
                     },
@@ -274,7 +274,7 @@ export default {
                         dicUrl: "/api/blade-system/dict-biz/dictionary?code=languages",
                         props: {
                             label: 'dictValue',
-                            value: 'dictValue',
+                            value: 'dictKey',
                         },
                         disabled: false,
                     },
@@ -286,7 +286,7 @@ export default {
                         dicUrl: "/api/blade-system/dict-biz/dictionary?code=Language_level",
                         props: {
                             label: 'dictValue',
-                            value: 'dictValue',
+                            value: 'dictKey',
                         },
                         disabled: false,
                     }
@@ -370,7 +370,7 @@ export default {
                         dicUrl: "/api/blade-system/dict-biz/dictionary?code=socialSecurityBaseLevel",
                         props: {
                             label: 'dictValue',
-                            value: 'dictValue',
+                            value: 'dictKey',
                         },
                         disabled: false,
                     },
@@ -382,7 +382,7 @@ export default {
                         dicUrl: "/api/blade-system/dict-biz/dictionary?code=socialSecurityBaseLevel",
                         props: {
                             label: 'dictValue',
-                            value: 'dictValue',
+                            value: 'dictKey',
                         },
                         disabled: false,
                     },
@@ -466,7 +466,7 @@ export default {
                         dicUrl: "/api/blade-system/dict-biz/dictionary?code=nationality",
                         props: {
                             label: 'dictValue',
-                            value: 'dictValue',
+                            value: 'dictKey',
                         },
                         disabled: false,
                         rules: [{
@@ -483,7 +483,7 @@ export default {
                         dicUrl: "/api/blade-system/dict-biz/dictionary?code=politicalStatus",
                         props: {
                             label: 'dictValue',
-                            value: 'dictValue',
+                            value: 'dictKey',
                         },
                         disabled: false,
                     },
@@ -521,7 +521,7 @@ export default {
                         dicUrl: "/api/blade-system/dict-biz/dictionary?code=healthStatus",
                         props: {
                             label: 'dictValue',
-                            value: 'dictValue',
+                            value: 'dictKey',
                         },
                         disabled: false,
                     },

src/views/iosBasicData/humanResources/resignations/detailsPage.vue

@@ -96,7 +96,7 @@ export default {
                         dicUrl: "/api/blade-system/dict-biz/dictionary?code=position_type",
                         props: {
                             label: 'dictValue',
-                            value: 'dictValue',
+                            value: 'dictKey',
                         },
                         disabled: false,
                         rules: [{
@@ -187,7 +187,7 @@ export default {
                         dicUrl: "/api/blade-system/dict-biz/dictionary?code=position",
                         props: {
                             label: 'dictValue',
-                            value: 'dictValue',
+                            value: 'dictKey',
                         },
                         disabled: false,
                     },
@@ -215,7 +215,7 @@ export default {
                         dicUrl: "/api/blade-system/dict-biz/dictionary?code=Office_location",
                         props: {
                             label: 'dictValue',
-                            value: 'dictValue',
+                            value: 'dictKey',
                         },
                         disabled: false,
                     },
@@ -227,7 +227,7 @@ export default {
                         dicUrl: "/api/blade-system/dict-biz/dictionary?code=educational_background",
                         props: {
                             label: 'dictValue',
-                            value: 'dictValue',
+                            value: 'dictKey',
                         },
                         disabled: false,
                     },
@@ -239,7 +239,7 @@ export default {
                         dicUrl: "/api/blade-system/dict-biz/dictionary?code=major",
                         props: {
                             label: 'dictValue',
-                            value: 'dictValue',
+                            value: 'dictKey',
                         },
                         disabled: false,
                     },
@@ -272,7 +272,7 @@ export default {
                         dicUrl: "/api/blade-system/dict-biz/dictionary?code=languages",
                         props: {
                             label: 'dictValue',
-                            value: 'dictValue',
+                            value: 'dictKey',
                         },
                         disabled: false,
                     },
@@ -284,7 +284,7 @@ export default {
                         dicUrl: "/api/blade-system/dict-biz/dictionary?code=Language_level",
                         props: {
                             label: 'dictValue',
-                            value: 'dictValue',
+                            value: 'dictKey',
                         },
                         disabled: false,
                     }
@@ -368,7 +368,7 @@ export default {
                         dicUrl: "/api/blade-system/dict-biz/dictionary?code=socialSecurityBaseLevel",
                         props: {
                             label: 'dictValue',
-                            value: 'dictValue',
+                            value: 'dictKey',
                         },
                         disabled: false,
                     },
@@ -380,7 +380,7 @@ export default {
                         dicUrl: "/api/blade-system/dict-biz/dictionary?code=socialSecurityBaseLevel",
                         props: {
                             label: 'dictValue',
-                            value: 'dictValue',
+                            value: 'dictKey',
                         },
                         disabled: false,
                     },
@@ -464,7 +464,7 @@ export default {
                         dicUrl: "/api/blade-system/dict-biz/dictionary?code=nationality",
                         props: {
                             label: 'dictValue',
-                            value: 'dictValue',
+                            value: 'dictKey',
                         },
                         disabled: false,
                         rules: [{
@@ -481,7 +481,7 @@ export default {
                         dicUrl: "/api/blade-system/dict-biz/dictionary?code=politicalStatus",
                         props: {
                             label: 'dictValue',
-                            value: 'dictValue',
+                            value: 'dictKey',
                         },
                         disabled: false,
                     },
@@ -519,7 +519,7 @@ export default {
                         dicUrl: "/api/blade-system/dict-biz/dictionary?code=healthStatus",
                         props: {
                             label: 'dictValue',
-                            value: 'dictValue',
+                            value: 'dictKey',
                         },
                         disabled: false,
                     },