Browse Source

Merge branch 'http_mock' into http_test

洪海涛 4 years ago
parent
commit
7edc35b14a

+ 7 - 1
src/views/dataBigManage/index.vue

@@ -361,7 +361,7 @@ export default {
           const newDepartmentList = this.resetDepartmentList([res.data])
           this.department = newDepartmentList
           getStaffByUsername(localStorage.getItem('username')).then(async res1 => {
-            if (res1.code === 200 && res1.data && res1.data.deptPath) {
+            if (res1.data && res1.data.deptPath) {
               // 获取id
               const deptId = res.data.deptCode
               // idlist
@@ -383,6 +383,12 @@ export default {
                 deptCodes: nowdepyList
               }
               this.changeArchitecture(nowdepyList)
+            } else {
+              this.params = {
+                ...this.params,
+                deptCodes: []
+              }
+              this.changeArchitecture([])
             }
           })
         } else {

+ 0 - 2
src/views/monthlyReport/childrenPage/setReport/components/nodeTreeSet.vue

@@ -153,7 +153,6 @@ export default {
       const teamLi = [{ id: setTeam.value, value: setTeam.label }]
       list.push({ deptId: setTeam.value, deptName: setTeam.label })
       // find()
-      console.log(val, this.typeVal, list, '牛大商场')
       const obj = { ...this.nodeData, depts: list, odinNsName: this.typeVal.ns }
       const res = await createOdinDeptRel(obj)
       if (res.code === 200) {
@@ -190,7 +189,6 @@ export default {
       return data.name.indexOf(value) !== -1
     },
     append(val) { // 设置
-      console.log(val, '设置')
       this.setTeam = {}
       setTimeout(() => {
         this.$refs.Cascader.selectValue = ''