basicData

pages/basicData/department/index.vue

@@ -353,12 +353,38 @@ export default {
             });
             list.forEach((e) => {
                 //给导出数据增加数据字典对应的name
-                tempCol.forEach((ele) => {
-                    e[ele.key] = this.$u.dirName(
-                        this.$store.getters.dictionaryByKey(ele.code),
-                        e[ele.key]
-                    );
+                tempCol.forEach((elem) => {
+                    if (
+                        e[elem.key] &&
+                        e[elem.key] != "" &&
+                        e[elem.key] != null
+                    ) {
+                        //如果数据字典项对应的DirName字段存在，通过name查询到对应的code，然后赋值。
+                        let codeArr = []
+                        let keyValue = e[elem.key]
+                        if (keyValue.length > 0 && (keyValue.indexOf(',') > -1 || keyValue.indexOf('，') > -1)) { //如果对应的数据包含多个数据字典项，比如包含“，”或“,”
+                            if (keyValue.indexOf(',') > -1) {
+                                codeArr = keyValue.split(',')
+                            }
+                            if (keyValue.indexOf > -1) {
+                                codeArr = keyValue.split('，')
+                            }
+                        }
+                        if (codeArr.length <= 1) { //对应的数据包含一个数据字典项
+                            e[elem.key] = this.$u.dirName(
+                                this.$store.getters.dictionaryByKey(elem.code),
+                                e[elem.key]
+                            );
+                        } else { //对应的数据包含多个数据字典项
+                            let codeInfo = ''
+                            codeArr.forEach(el => {
+                                codeInfo = codeInfo + this.$u.dirName(this.$store.getters.dictionaryByKey(elem.code), el) + ",";
+                            })
+                            e[elem.key] = codeInfo.substr(0, codeInfo.length - 1)
+                        }
+                    }
                 });
+
                 tempCol1.forEach((ele1) => {
                     e[ele1.key] = this.getCityName(e[ele1.key]);
                 });