修改统计查询

src/views/activiti/applyHome.vue

@@ -215,6 +215,11 @@
   import historicDetail from '@/views/activiti/historicDetail'
   import hasPermission, { filterGlobalPermission, filterNodePermission } from '../../utils/hasPermission'
   import { getAction } from '@api/manage'
+  import { information } from '@/utils/costTime'
+
+
+
+
   export default {
     name: "applyHome",
     mixins:[activitiMixin],
@@ -358,6 +363,7 @@
       /*验证流程表单是否配置人员*/
       getNodeData(row,v,callback){
         return new Promise((resolve, reject) => {
+          // console.log("11111111111110",row,v);
           let ss = false;
           let _this = this;
           _this.postFormAction(_this.url.getProcessNodeByDepart,{
@@ -366,16 +372,16 @@
           }).then(res => {
             if (res.success) {
               // 转换null为""
-              // console.log("res.result",res.result);
+              console.log("res.result",res.result);
               let arry=[];
               for (let i = 0; i < res.result.length; i++) {
-                if (i!=0&&i!=res.result.length-1){
+                if (i != 0 && i != res.result.length - 1){
                   arry.push(res.result[i])
                 }
               }
               _this.nodeList=arry;
               if (arry.length>0){
-                // console.log(_this.nodeList[0],"用户信息！")
+                console.log(_this.nodeList[0],"用户信息！")
                 if (!_this.nodeList[0].users[0]){
                   _this.$message.warning(v.name+"审批人员未配置,请配置后在申请！！！");
                   ss= true;
@@ -388,11 +394,12 @@
 
       },
      async chooseProcess(v) {
-        console.log("人员信息===",v);
+        // console.log("人员信息===",v);
         let userInfo = sessionStorage.getItem('USER_INFORMATION');
         let res = JSON.parse(userInfo);
         // console.log("人员信息",res);
-
+        //  let bu = information();
+         // console.log("-=-=-=-=",bu);
        if(v.name == "民爆出库流程" && res.post != "系统管理员"){
          let de= {
            id: res.departIds
@@ -406,7 +413,17 @@
        }
        let re = false;
         if(v.name != "预算计划采购流程" && v.name != "权限授权流程" && res.post != "系统管理员"){
-          await this.getNodeData(res.departIds,v,(result) => {
+          let did = res.departIds;
+          let de= {
+            id: res.departIds
+          }
+          let data=await getAction(this.url.queryPageDepare,de);
+          // console.log("-=-=-=",data);
+          if(data.result.orgType == "3"){
+            //  小队申请
+           did = data.result.parentId;
+          }
+          await this.getNodeData(did,v,(result) => {
             // console.log("-===========",result);
             if(result){
               re = true;
@@ -431,7 +448,7 @@
           // this.lcModa.visible = true;
           let shujhu = encodeURIComponent(JSON.stringify(aa));
           let mingzi = ' - '+v.name;
-          console.log("发起",aa)
+          // console.log("发起",aa)
           //保存数据
           localStorage.setItem(mingzi,shujhu);
           await this.$router.push({

src/views/statisticanalysis/CostStatistic.vue

@@ -7,7 +7,7 @@
       </div>
       <div style="height: 39%;">
 <!--        项目部成本-->
-        <ItemCost/>
+        <ItemCost :material = cx />
       </div>
       <div style="height: 38%;">
 <!--       公司 成本-->
@@ -15,7 +15,7 @@
       </div>
     </div>
     <div style="height: 100%;width:65%;display: flex;justify-content: flex-end;flex-direction: column;align-items: flex-end;">
-      <a-select v-model="formData.materialType"  allowClear placeholder="请选择部门"  @change="getShuJu()"   style="width: 25%;right: 1px;">
+      <a-select v-model="formData.materialType"  allowClear placeholder="请选择部门"  @change="getShuJu()" :disabled=xingMuBu  style="width: 20%;right: 1px;">
         <a-select-option v-for="(item,index) in queryParamsUntil" :key="index" :value="item.id">{{item.departName}}</a-select-option>
       </a-select>
       <div style="height: 41%;background-color: #ffffff;border-radius: 10px;width: 100%">
@@ -40,6 +40,7 @@ import OnDayCost from '@views/statisticanalysis/costecharts/OnDayCost'
 import CostAnalysis from '@views/statisticanalysis/costecharts/CostAnalysis'
 import CaseCost from '@views/statisticanalysis/costecharts/CaseCost'
 import { getAction } from '@api/manage'
+import { information } from '@/utils/costTime'
 
 
 // // 引入基本模板
@@ -71,24 +72,36 @@ export default {
         dateItem: 4,
         materialType: undefined,
       },
+      bu:'',
       cx :{},
       xian : true,
+      xingMuBu : false,
     }
   },
   mounted() {
     // this.drawLine()
   },
   created() {
+
+    this.bu = information();
+    if(!!this.bu){
+      //项目部登陆
+      this.xingMuBu = true;
+      let sj= {
+        departId: this.bu
+      }
+      this.cx = sj;
+    }
     this.getUnit();
   },
   watch:{
-    'formData.materialType': {
-      handler (newName, oldName) {
-        // console.log("-=123",newName,oldName)
-        this.Globaler.materialTypes = this.formData.materialType;
-      },
-      deep: true
-    }
+    // 'formData.materialType': {
+    //   handler (newName, oldName) {
+    //     // console.log("-=123",newName,oldName)
+    //     this.Globaler.materialTypes = this.formData.materialType;
+    //   },
+    //   deep: true
+    // }
   },
   methods: {
     //查询数据
@@ -110,7 +123,6 @@ export default {
           }else{
             this.formData.materialType = this.bu;
           }
-
           this.getShuJu();
         }
       })

src/views/statisticanalysis/costecharts/CaseCost.vue

@@ -239,7 +239,7 @@ export default {
     material:{
       handler (newName, oldName) {
         // console.log("-=123123124123",newName,oldName);
-        this.getList();
+        this.getUnit();
       },
       deep: true
     },
@@ -271,7 +271,7 @@ export default {
       })
     },
     //加載項目部
-    getUnit: function() {
+    getUnit() {
       getAction(this.url.listByuntil).then((res) => {
         if (res.success) {
           this.queryParamsUntil = res.result.records || res.result
@@ -293,12 +293,16 @@ export default {
       let date = new Date(this.formData.dateItem);
       this.timeNum = [];
       this.timeNum = GetRecentMonth(date.getMonth() + 1,this.timeNum);
-      let sj= {
-        departId: this.formData.materialType
+      let sj= { }
+      if(!!this.material.departId){
+        sj.departId = this.material.departId
+      }else{
+        // sj.departId = this.material.materialTypes
       }
+      // console.log("=-=-=-=",sj);
       this.dataSource = [];
       getAction(this.url.getTeam,sj).then(res =>{
-        console.log("=1111==",res.result);
+        // console.log("=1111==",res.result);
         if(res.success){
           this.dataSource = res.result;
         }

src/views/statisticanalysis/costecharts/CostAnalysis.vue

@@ -4,11 +4,11 @@
 <!--    <div style="height: 9%;margin-left: 2%;width: 100%">-->
       <div style="font-size: 25px;padding-left: 2%">分析成本
 <!--        <div style="float: right;width: 38%;height: 35px;padding-top: 0px">-->
-        <div style="float: right;width: 15%;height: 35px;">
+        <div style="float: right;width: 10%;height: 35px;">
 <!--          <span style="margin-right: 2%;padding-top: 0px">-->
           <span style="padding-top: 0px">
 <!--            <a-select v-model="formData.dateItem" placeholder="请选择时间"    style="width: 45%;;padding-right: 4%" @change="getShuJu()">-->
-            <a-select v-model="formData.dateItem" placeholder="请选择时间"  style="width: 60%;"  @change="getShuJu()">
+            <a-select v-model="formData.dateItem" placeholder="请选择时间"  style="width: 95%;"  @change="getShuJu()">
             <a-select-option :value="1"> 年度</a-select-option>
             <a-select-option :value="2">半年度</a-select-option>
             <a-select-option :value="3">季度</a-select-option>

src/views/statisticanalysis/costecharts/ItemCost.vue

@@ -29,6 +29,11 @@ import { information } from '@/utils/costTime'
 // require('echarts/lib/component/title')
 export default {
   name: 'ItemCost',
+  props:{
+    material:{
+      type: Object
+    },
+  },
   data() {
     return {
       moment,
@@ -48,6 +53,15 @@ export default {
     this.getList();
 
   },
+  watch:{
+    material:{
+      handler (newName, oldName) {
+        // console.log("-=123123124123",newName,oldName);
+        this.getList(this.material);
+      },
+      deep: true
+    },
+  },
   methods:{
     getList() {
       this.timeNum = [];
@@ -56,18 +70,21 @@ export default {
         this.timeNum =   this.getRecentMonth(date.getMonth() + 1)
 
       // console.log(ss,"sdasDFsd");
-      let bu = information();
+      // let bu = information();
       // console.log(bu,"bum")
       let it ={
         time: moment(this.formData.dateItem._d).format('YYYY-MM-DD HH:mm:ss'),
         materialsType : this.formData.materialType,
-        departId : bu
+        // departId : bu
       }
-
+      if(!!this.material.departId){
+          it.departId = this.material.departId;
+      }
+      console.log("it====",it);
       // console.log("====",moment(this.formData.dateItem._d).format('YYYY-MM-DD HH:mm:ss'));
       getAction(this.url.getSection,it).then(res=>{
         this.cost = res.result;
-        // console.log("===123132",res.result);
+        console.log("===123132",res.result);
         let shuju = [];
         let dux= {}
         res.result.forEach(item =>{