作业看板更新

src/HDrpManagement/dataanalysis/index.vue

@@ -9,16 +9,15 @@
           <label  class="search__label" >范围:</label>
           <el-popover
               placement="bottom"
-              width="180"
               v-model="visible"
               :stretch="true"
               trigger="click">
             <el-tabs v-model="activeName" @tab-click="handleClick">
               <el-tab-pane label="部门" name="部门">
-                <el-cascader-panel ref="selectdep" :options="deplist" :props="{label:'label',value:'departmentid',children:'subdep'}"  emitPath="true" @change="selectDep" clearable></el-cascader-panel>
+                <el-cascader-panel ref="selectdep" :options="deplist" :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  @change="selectDep"  clearable></el-cascader-panel>
               </el-tab-pane>
               <el-tab-pane label="人员" name="人员">
-                <el-cascader-panel ref="selectPerson" :options="personnelList" :props="{label:'name',value:'userid'}"  emitPath="true" @change="selectPerson" clearable></el-cascader-panel>
+                <el-cascader-panel ref="selectPerson" :options="personnelList" :props="{label:'name',value:'userid'}"   @change="selectPerson"  clearable></el-cascader-panel>
               </el-tab-pane>
             </el-tabs>
             <el-input style="width: 200px" size="small" slot="reference" v-model="range" placeholder="请选择" @input="departmentrtment"></el-input>
@@ -149,23 +148,40 @@ export default {
       let arr = []
       function convertToElementTree(node) {
         // 新节点
-        var elNode = {
-          label: node["depname"],
-          parentid:node['parentid'],
-          parentname:node['parentname'],
-          departmentid:node["departmentid"],
-          value:node["departmentid"],
-          remarks:node["remarks"],
-          isused:node["isused"],
-          changedate:node['changedate'],
-          changeby:node['changeby'],
-          createdate:node['createdate'],
-          createby:node['createby'],
-          depno:node['depno'],
-          disabled:that.pageOnlyRead,
-          children: []
+        if (node.subdep.length === 0){
+          var elNode = {
+            label: node["depname"],
+            parentid:node['parentid'],
+            parentname:node['parentname'],
+            departmentid:node["departmentid"],
+            value:node["departmentid"],
+            remarks:node["remarks"],
+            isused:node["isused"],
+            changedate:node['changedate'],
+            changeby:node['changeby'],
+            createdate:node['createdate'],
+            createby:node['createby'],
+            depno:node['depno'],
+            disabled:that.pageOnlyRead,
+          }
+        }else {
+          var elNode = {
+            label: node["depname"],
+            parentid:node['parentid'],
+            parentname:node['parentname'],
+            departmentid:node["departmentid"],
+            value:node["departmentid"],
+            remarks:node["remarks"],
+            isused:node["isused"],
+            changedate:node['changedate'],
+            changeby:node['changeby'],
+            createdate:node['createdate'],
+            createby:node['createby'],
+            depno:node['depno'],
+            disabled:that.pageOnlyRead,
+            children: []
+          }
         }
-
         if (node.subdep && node.subdep.length > 0) {
           // 如果存在子节点
           for (var index = 0; index < node.subdep.length; index++) {
@@ -180,12 +196,12 @@ export default {
       });
       return arr
     },
-    selectDep() {
+    selectDep(val) {
       let dataDep = this.$refs.selectdep.getCheckedNodes(true)[0].data
       this.range = dataDep.label
-     /* this.isDep = true
-      this.isPerson = false*/
-      this.dataid = dataDep.departmentid
+      this.isDep = true
+      this.isPerson = false
+      this.dataid = val[val.length -1]
       this.dataParam.content.type = 1
       this.dataParam.content.dataid = this.dataid
       this.tableParam.content.type = 1
@@ -197,20 +213,19 @@ export default {
       this.$refs.clue.queryAdd()
       this.$refs.clue.queryUpdate()
       this.$refs.clue.queryFollow()
-      this.$refs.selectPerson.clearCheckedNodes()
+      /*this.$refs.selectPerson.clearCheckedNodes()*/
     },
-    selectPerson(){
+    selectPerson(val){
       let dataperson = this.$refs.selectPerson.getCheckedNodes(true)[0].data
       this.range = dataperson.name
-    /*  this.isDep = false
-      this.isPerson = true*/
+      this.isDep = false
+      this.isPerson = true
 
-      this.dataid = dataperson.userid
+      this.dataid = val[val.length-1]
       this.dataParam.content.type = 0
       this.dataParam.content.dataid = this.dataid
       this.tableParam.content.type = 0
       this.tableParam.content.dataid = this.dataid
-      console.log(this.dataid)
       this.visible = false
 
       this.$refs.assignment.queryList()
@@ -219,7 +234,7 @@ export default {
       this.$refs.clue.queryAdd()
       this.$refs.clue.queryUpdate()
       this.$refs.clue.queryFollow()
-      this.$refs.selectdep.clearCheckedNodes()
+      /*this.$refs.selectdep.clearCheckedNodes()*/
     },
     handleClick(tab, event) {
       console.log(tab, event);

src/HDrpManagement/dataanalysis/modules/assignmentData.vue

@@ -146,10 +146,8 @@ export default {
      /* this.isDep ? this.param.content.type = 1: this.isPerson ? this.param.content.type = 0 : this.param.content.type = ''*/
       this.param.content.dataType = 1
       /*this.param.content.dataid = this.dataid*/
-      console.log(this.param)
       const res = await this.$api.requested(this.param)
       this.list = res.data
-      console.log(this.list,'作业数据')
     }
   },
    mounted() {

src/HDrpManagement/dataanalysis/modules/performanceData.vue

@@ -4,7 +4,7 @@
     <!--  本月    -->
       <el-col :span="8">
         <el-row :gutter="20">
-          <el-col :span="10" :offset="6">
+          <el-col :span="24" >
             <el-divider>
               <span class="title-font">本月</span>
             </el-divider>
@@ -124,7 +124,7 @@
       <!--  本季    -->
       <el-col :span="8">
         <el-row :gutter="20">
-          <el-col :span="10" :offset="6">
+          <el-col :span="24" >
             <el-divider>
               <span class="title-font">本季</span>
             </el-divider>
@@ -244,7 +244,7 @@
       <!--  本年    -->
       <el-col :span="8">
         <el-row :gutter="20">
-          <el-col :span="10" :offset="6">
+          <el-col :span="24" >
             <el-divider>
               <span class="title-font">本年</span>
             </el-divider>

src/HDrpManagement/dataanalysis/modules/salesData.vue

@@ -230,7 +230,6 @@ export default {
      /* this.param.content.dataid = this.dataid*/
       const res = await this.$api.requested(this.param)
       this.list = res.data
-      console.log(this.list,'销售数据')
     }
   }
 }