Merge branch 'master' of http://101.36.160.140:21044/csc/csc-szls-vue

shanXiPlatform/src/api/branchoff/index.js

@@ -56,3 +56,19 @@ export function  getjfqk( depotId , homeType) {
     method: 'get'
   })
 }
+
+export function  getmorehyd( data  ) {
+  return request({              
+    url: `/csc-szls-business/sysUserActivity/getByPage`,
+    method: 'post',
+    data : data
+  })
+}
+export function  gethyd( depotId , homeType) {
+  return request({
+    url: `/csc-szls-business/sysUserActivity/getGroupByDepotId?depotId=${depotId}&homeType=${homeType} `,
+    method: 'get'
+  })
+}
+
+

shanXiPlatform/src/router/index.js

@@ -232,6 +232,14 @@ export const constantRoutes = [
                   hidden: true,
                   meta: { title: '详情', icon: 'dashboard', affix: false }
                 },
+                { // 针对熏蒸
+                  path: 'inixunzengDetails',
+                  component: () => import('@/views/home/daiBan/initiated/xunzengDetails'),
+                  name: 'IniXunzengDetails',
+
+                  hidden: true,
+                  meta: { title: '详情', icon: 'dashboard', affix: false }
+                },
               ]
 
           },
@@ -254,6 +262,14 @@ export const constantRoutes = [
                   hidden: true,
                   meta: { title: '详情', icon: 'dashboard', affix: false }
                 },
+                { // 针对熏蒸
+                  path: 'xunzengDetails',
+                  component: () => import('@/views/home/daiBan/pending/xunzengDetails'),
+                  name: 'XunzengDetails',
+
+                  hidden: true,
+                  meta: { title: '详情', icon: 'dashboard', affix: false }
+                },
               ]
           },
           {
@@ -275,6 +291,14 @@ export const constantRoutes = [
                   hidden: true,
                   meta: { title: '详情', icon: 'dashboard', affix: false }
                 },
+                { // 针对熏蒸
+                  path: 'xunzengDetails',
+                  component: () => import('@/views/home/daiBan/processed/xunzengDetails'),
+                  name: 'proXunzengDetails',
+
+                  hidden: true,
+                  meta: { title: '详情', icon: 'dashboard', affix: false }
+                },
               ]
           },
 
@@ -361,6 +385,20 @@ export const constantRoutes = [
         hidden: true,
         meta: { title: '工作完成情况', icon: 'dashboard',isshowLibrary:true, affix: true },
       },
+      {
+        path: 'hydtable',
+        component: () => import('@/views/home/hydtable'),
+        name: 'hydtable',
+        hidden: true,
+        meta: { title: '在线活跃度详情', icon: 'dashboard',isshowLibrary:true, affix: true },
+      },
+      {
+        path: 'hydmoretable',
+        component: () => import('@/views/home/hydmoretable'),
+        name: 'hydmoretable',
+        hidden: true,
+        meta: { title: '在线活跃度', icon: 'dashboard',isshowLibrary:true, affix: true },
+      },
     ]
 
   },
@@ -465,6 +503,14 @@ export const constantRoutes = [
                   hidden: true,
                   meta: { title: '详情', icon: 'dashboard', affix: false, navigation: true }
                 },
+                { // 针对熏蒸
+                  path: 'inixunzengDetails',
+                  component: () => import('@/views/home/daiBan/initiated/xunzengDetails'),
+                  name: 'IniXunzengDetails',
+
+                  hidden: true,
+                  meta: { title: '详情', icon: 'dashboard', affix: false }
+                },
               ]
 
           },
@@ -489,6 +535,14 @@ export const constantRoutes = [
                   hidden: true,
                   meta: { title: '详情', icon: 'dashboard', affix: false, navigation: true }
                 },
+                { // 针对熏蒸
+                  path: 'xunzengDetails',
+                  component: () => import('@/views/home/daiBan/pending/xunzengDetails'),
+                  name: 'XunzengDetails',
+
+                  hidden: true,
+                  meta: { title: '详情', icon: 'dashboard', affix: false }
+                },
               ]
           },
           {
@@ -510,6 +564,14 @@ export const constantRoutes = [
                   hidden: true,
                   meta: { title: '详情', icon: 'dashboard', affix: false, navigation: true }
                 },
+                { // 针对熏蒸
+                  path: 'xunzengDetails',
+                  component: () => import('@/views/home/daiBan/processed/xunzengDetails'),
+                  name: 'proXunzengDetails',
+
+                  hidden: true,
+                  meta: { title: '详情', icon: 'dashboard', affix: false }
+                },
               ]
           },
 
@@ -707,7 +769,7 @@ export const constantRoutes = [
             name: 'AllGrain',
 
             hidden: true,
-            meta: { title: '最新粮情检查记录', icon: 'dashboard', affix: false, relation: 'house', istable: true },
+            meta: { title: '全部粮情检查记录', icon: 'dashboard', affix: false, relation: 'house', istable: true },
           },
 
 
@@ -765,7 +827,7 @@ export const constantRoutes = [
         component: () => import('@/views/reservesManagement/fumigationManagement/index'),
         name: 'FumigationManagement',
         meta: { title: '熏蒸管理', icon: 'tongfeng', affix: false, relation: 'house', istable: true },
-        resourceCode: 169
+        resourceCode: 337
       },
       //  储量管理/熏蒸管理/新增
       {
@@ -1536,7 +1598,7 @@ export const constantRoutes = [
         path: 'treeStructure',
         component: () => import('@/views/systemManagement/tree/treeStructure'),
         name: 'TreeStructure',
-        hidden: true,
+        // hidden: true,
         meta: { title: '组织树', icon: 'zuzhishu', affix: false, noCache: true, navigation: true },
         resourceCode:5,
         children: []

shanXiPlatform/src/views/home/branchOffice.vue

@@ -229,7 +229,7 @@
                                 <p class="lsp">
                                     <img src="../../assets/images/rightarrow.png" alt />
                                     上月在线活跃度排名
-                                    <span v-if="crumbs.length != 2" class="echartSpan" @click="yclq()">更多>></span>
+                                    <span v-if="crumbs.length != 2" class="echartSpan" @click="hyd()">更多>></span>
                                 </p>
                                 <div id="myChartrt" class="rtoprto"></div>
                                 <!-- <img src="../../assets/images/huoyue.png" alt /> -->
@@ -270,7 +270,9 @@ import {
     getpointll,
     getzxt,
     getmorejfqk,
-    getjfqk
+    getjfqk,
+    // ,
+    gethyd
 } from "@/api/branchoff/index.js"
 import { getUser } from "@/utils/auth"
 export default {
@@ -996,171 +998,208 @@ export default {
             this.$router.push({ path: "/countQuality/warehouseInformation" })
         },
         drawtrt() {
-            var chartData = [6, 7, 8, 9, 10, 10, 9, 8, 7, 6] // 数据
-            var chartDataone = [10, 10, 10, 10, 10, 10, 10, 10, 10, 10] // 数据
-            var chartName = [
-                "中央储备大同直属库有限公司",
-                "中央储备太原直属库有限公司",
-                "中央储备太原直属库有限公司",
-                "中央储备太原直属库有限公司",
-                "中央储备太原直属库有限公司",
-                "中央储备太原直属库有限公司",
-                "中央储备太原直属库有限公司",
-                "中央储备太原直属库有限公司",
-                "中央储备太原直属库有限公司",
-                "中央储备长治直属库有限公司"
-            ]
-            const myChartrt = this.$echarts.init(
-                document.getElementById("myChartrt")
-            )
-            // 绘制图表
-            myChartrt.setOption({
-                grid: {
-                    top: "3%",
-                    left: "3%",
-                    bottom: "3%",
-                    right: "3%",
-                    containLabel: true
-                },
-                xAxis: {
-                    type: "value",
-                    axisLine: {
-                        lineStyle: {
-                            color: "#ccc"
-                        }
+            gethyd(this.midprovinceid, this.homeType).then(res => {
+                var chartDataone = [
+                    100,
+                    100,
+                    100,
+                    100,
+                    100,
+                    100,
+                    100,
+                    100,
+                    100,
+                    100,
+                    100,
+                    100,
+                    100,
+                    100,
+                    100,
+                    100,
+                    100,
+                    100,
+                    100,
+                    100,
+                    100,
+                    100,
+                    100,
+                    100,
+                    100,
+                    100,
+                    100,
+                    100,
+                    100,
+                    100,
+                    100,
+                    100,
+                    100,
+                    100,
+                    100,
+                    100,
+                    100,
+                    100,
+                    100,
+                    100,
+                    100,
+                    100,
+                    100,
+                    100,
+                    100,
+                    100
+                ] // 数据
+                var chartName = res.data.depotName
+                var chartData = res.data.series
+                const myChartrt = this.$echarts.init(
+                    document.getElementById("myChartrt")
+                )
+                // 绘制图表
+                myChartrt.setOption({
+                    grid: {
+                        top: "3%",
+                        left: "3%",
+                        bottom: "3%",
+                        right: "3%",
+                        containLabel: true
                     },
-                    show: false,
-                    splitLine: {
-                        show: false
-                    }
-                },
-                yAxis: [
-                    {
-                        type: "category",
-                        data: chartName,
-                        splitLine: {
-                            show: false
-                        },
-                        show: false,
+                    xAxis: {
+                        type: "value",
                         axisLine: {
                             lineStyle: {
                                 color: "#ccc"
                             }
-                        }
-                    },
-                    {
-                        // 第二个y轴 为了让数据在右侧末尾显示
-                        show: true,
-                        inverse: true,
-                        data: chartData,
-                        nameTextStyle: {}, // 坐标轴名称的文字样式。 官网上是这样的解释, 但是 我试了这个并不能改变坐标轴的文字样式
-                        axisLabel: {
-                            textStyle: {
-                                fontSize: 12, // 坐标轴名称的大小
-                                color: "#333", // 坐标轴名称的颜色
-                                fontWeight: 700
-                            }
-                        },
-                        axisLine: {
-                            show: false,
-                            lineStyle: {
-                                color: "#8CC4A1"
-                            }
                         },
+                        show: false,
                         splitLine: {
-                            show: true
-                        },
-                        axisTick: {
-                            show: true
-                        },
-                        data: chartData
-                    }
-                ],
-                series: [
-                    {
-                        name: "我是打底",
-                        type: "pictorialBar",
-                        symbol: "rect", // 类型
-                        yAxisIndex: 0,
-                        barWidth: 10,
-                        itemStyle: {
-                            normal: {
-                                // barBorderRadius: 5,
-                                color: "#ccc"
-                            }
-                        },
-                        label: {
-                            normal: {
-                                position: "right"
-                            }
-                        },
-                        symbolRepeat: true,
-                        // symbolRotate: '45',
-                        symbolSize: [10, 16],
-                        // symbolMargin: 2,
-                        data: chartDataone
-                    },
-                    {
-                        name: "我是上层方块",
-                        type: "pictorialBar",
-                        symbol: "rect",
-                        itemStyle: {
-                            normal: {
-                                color: "green"
-                            }
-                        },
-                        label: {
-                            normal: {
-                                // show: true, // 数据大小的显示, 100 200 300
-                                textStyle: {
-                                    color: "#000000" // 颜色
-                                },
-                                position: "right"
-                            }
-                        },
-                        barWidth: 10,
-                        symbolRepeat: true,
-                        // symbolRotate: '45',
-                        symbolSize: [10, 16],
-                        // symbolMargin: 2,
-                        data: chartData
+                            show: false
+                        }
                     },
-                    // 数据条--------------------我是分割线君------------------------------//
-                    {
-                        show: true,
-                        type: "bar",
-                        // xAxisIndex: 1, //代表使用第二个X轴刻度
-                        barGap: "-150%",
-                        barWidth: "25%",
-                        itemStyle: {
-                            normal: {
-                                barBorderRadius: 50,
-                                // color: 'yellow',
-                                color: "transparent" // rgba(22,203,115,0.05) 数据条柱状图的填充颜色,, 一开始我的有一点点背景颜色
+                    yAxis: [
+                        {
+                            type: "category",
+                            data: chartName,
+                            splitLine: {
+                                show: false
+                            },
+                            show: false,
+                            axisLine: {
+                                lineStyle: {
+                                    color: "#ccc"
+                                }
                             }
                         },
-                        label: {
-                            normal: {
-                                show: true,
-                                position: [-160, 0],
+                        {
+                            // 第二个y轴 为了让数据在右侧末尾显示
+                            show: true,
+                            inverse: true,
+                            data: chartData,
+                            nameTextStyle: {}, // 坐标轴名称的文字样式。 官网上是这样的解释, 但是 我试了这个并不能改变坐标轴的文字样式
+                            axisLabel: {
                                 textStyle: {
-                                    fontSize: 12,
-                                    color: "#666",
+                                    fontSize: 12, // 坐标轴名称的大小
+                                    color: "#333", // 坐标轴名称的颜色
                                     fontWeight: 700
-                                },
-                                formatter: function(data) {
-                                    return chartName[data.dataIndex]
                                 }
-                            }
+                            },
+                            axisLine: {
+                                show: false,
+                                lineStyle: {
+                                    color: "#8CC4A1"
+                                }
+                            },
+                            splitLine: {
+                                show: true
+                            },
+                            axisTick: {
+                                show: true
+                            },
+                            data: chartData
+                        }
+                    ],
+                    series: [
+                        {
+                            name: "我是打底",
+                            type: "pictorialBar",
+                            symbol: "rect", // 类型
+                            yAxisIndex: 0,
+                            barWidth: 10,
+                            itemStyle: {
+                                normal: {
+                                    // barBorderRadius: 5,
+                                    color: "#ccc"
+                                }
+                            },
+                            label: {
+                                normal: {
+                                    position: "right"
+                                }
+                            },
+                            symbolRepeat: true,
+                            // symbolRotate: '45',
+                            symbolSize: [10, 16],
+                            // symbolMargin: 2,
+                            data: chartDataone
                         },
-                        data: chartDataone
-                    }
-                ]
+                        {
+                            name: "我是上层方块",
+                            type: "pictorialBar",
+                            symbol: "rect",
+                            itemStyle: {
+                                normal: {
+                                    color: "green"
+                                }
+                            },
+                            label: {
+                                normal: {
+                                    // show: true, // 数据大小的显示, 100 200 300
+                                    textStyle: {
+                                        color: "#000000" // 颜色
+                                    },
+                                    position: "right"
+                                }
+                            },
+                            barWidth: 10,
+                            symbolRepeat: true,
+                            // symbolRotate: '45',
+                            symbolSize: [10, 16],
+                            // symbolMargin: 2,
+                            data: chartData
+                        },
+                        // 数据条--------------------我是分割线君------------------------------//
+                        {
+                            show: true,
+                            type: "bar",
+                            // xAxisIndex: 1, //代表使用第二个X轴刻度
+                            barGap: "-150%",
+                            barWidth: "25%",
+                            itemStyle: {
+                                normal: {
+                                    barBorderRadius: 50,
+                                    // color: 'yellow',
+                                    color: "transparent" // rgba(22,203,115,0.05) 数据条柱状图的填充颜色,, 一开始我的有一点点背景颜色
+                                }
+                            },
+                            label: {
+                                normal: {
+                                    show: true,
+                                    position: [-240, 0],
+                                    textStyle: {
+                                        fontSize: 12,
+                                        color: "#666",
+                                        fontWeight: 700
+                                    },
+                                    formatter: function(data) {
+                                        return chartName[data.dataIndex]
+                                    }
+                                }
+                            },
+                            data: chartDataone
+                        }
+                    ]
+                })
             })
         },
         drawtrb() {
-            getjfqk(this.midprovinceid , this.homeType ).then(res => {
-                console.log( res.data , '777777777777777777777777777777777777777777777777777777777777777777777777' )
+            getjfqk(this.midprovinceid, this.homeType).then(res => {
                 const myChartrb = this.$echarts.init(
                     document.getElementById("myChartrb")
                 )
@@ -1260,7 +1299,8 @@ export default {
                 name: "yclqTable",
                 query: {
                     depotId: this.midprovinceid,
-                    midprovinceName: this.midprovinceName
+                    midprovinceName: this.midprovinceName,
+                    isshow: this.isxian
                 }
             })
         },
@@ -1273,6 +1313,15 @@ export default {
                 }
             })
         },
+        hyd() {
+            this.$router.push({
+                name: "hydtable",
+                query: {
+                    depotId: this.midprovinceid,
+                    midprovinceName: this.midprovinceName
+                }
+            })
+        },
     }
 }
 </script>

shanXiPlatform/src/views/home/daiBan/initiated/xunzengDetails.vue

@@ -0,0 +1,519 @@
+<template>
+  <div id="penmainDetail">
+    <div class="pencontainDetail">
+      <div class="lc_top">
+        <div class="header" style="font-weight: 500">
+          <i class="iconfont iconshu"></i>
+          {{workName }}
+        </div>
+        <div class="middle">
+          <div class="middle_flex"  v-if="workName.indexOf('药剂') == -1">
+            <div>仓号:</div>
+            <div>{{houseName }}</div>
+          </div>
+          <div class="middle_flex">
+            <div>申请人:</div>
+            <div>{{applyName }}</div>
+          </div>
+          <div class="middle_flex">
+            <div>申请部门:</div>
+            <div>{{departmentName }}</div>
+          </div>
+          <div class="middle_flex">
+            <div>公司:</div>
+            <div>{{companyName }}</div>
+          </div>
+        </div>
+      </div>
+      <div class="table_middle">
+        <div style="margin-left: 20px">
+          <span v-if="type == 'tf'">1.制定通风方案:</span>
+          <span v-if="type == 'xzjh'">1.制定熏蒸计划:</span>
+          <span v-if="this.subData == 1">否</span>
+          <span v-if="this.subData == 0">是</span>
+        </div>
+      </div>
+      <div id="process">
+        <div class="process_title" style="font-weight: 500">
+          <i class="iconfont iconshu"></i>
+          流程（{{workName}}审批）
+        </div>
+        <div class="process_step" style="margin-left: 20px">
+          <el-steps direction="vertical" :active="processActive">
+            <el-step
+              v-for="(item, index) in process"
+              :key="index"
+              icon="el-icon-edit"
+            >
+              <template>
+                <div slot="title" class="stepTitle">
+                  <div class="stepTitleFont">
+                    {{ item.title }}
+                  </div>
+
+                  <div style="width: 200px">
+                    <div
+                      style="font-weight: 500"
+                      :class="{
+                        active:
+                          index == 0 ||
+                          (item.auditState != null && item.auditState == 1),
+                        noActive: item.auditState == 2,
+                      }"
+                    >
+                      {{ perList[item.content] }}
+                    </div>
+                    <div v-if="item.auditState == 0">待审批</div>
+                    <div v-if="item.auditState == 1" class="stepTitleFont">
+                      审批通过
+                    </div>
+                    <div v-if="item.auditState == 2">审批不通过</div>
+                    <div class="stepTitleFont">{{ item.auditTime }}</div>
+
+                    <div style="width: 200px; display: flex">
+                      <!-- 状态为0且为当前登录人时按钮显示 -->
+                      <el-button
+                        type="danger"
+                        size="mini"
+                        v-if="
+                          item.content == userInfo.uid && item.auditState == 0
+                        "
+                        @click="noAgree(item, index)"
+                        >审批不通过</el-button
+                      >
+                      <el-button
+                        type="success"
+                        size="mini"
+                        v-if="
+                          item.content == userInfo.uid && item.auditState == 0
+                        "
+                        @click="agree(item, index)"
+                        >审批通过</el-button
+                      >
+                    </div>
+                  </div>
+                </div>
+              </template>
+            
+              <template>
+                <i
+                  slot="icon"
+                  class="iconfont iconstep_current"
+                  v-if="
+                    index != 0 &&
+                    (item.auditState == null || item.auditState == 0)
+                  "
+                >
+                </i>
+                <i
+                  slot="icon"
+                  style="color: red"
+                  class="iconfont iconstep_err"
+                  v-if="item.auditState == 2"
+                ></i>
+                <i
+                  slot="icon"
+                  style="color: green"
+                  class="iconfont iconstep_complete"
+                  v-if="item.auditState == 1 || index == 0"
+                ></i>
+              </template>
+            </el-step>
+          </el-steps>
+        </div>
+      </div>
+      <div class="btns">
+        <el-button class="backBtn" type="success" plain @click="goBack()"
+          >返回</el-button
+        >
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import { checkList } from "@/api/reservesManagement/mechanicalVentilation"
+import { Approval, yjcgApproval } from "@/api/daiBan/index"
+import { getNowFormatDate } from "@/utils"
+import { getUser } from "@/utils/auth"
+import { pending } from "@/api/daiBan/index"
+import { processed } from "@/api/daiBan/index"
+export default {
+  name: "Details",
+  data() {
+    return {
+      //类型
+      workName: "",
+      //仓房编码
+      houseName: null,
+      //申请人
+      applyName: null,
+      //部门
+      departmentName: null,
+      //公司
+      companyName: null,
+      //库字典数据
+      deportDic: {},
+      //仓房字典数据
+      hourseDic: {},
+      //部门字典数据
+      departDic: {},
+      //每条数据
+      row: {},
+
+      //当前登录人信息
+      userInfo: {},
+
+      //审批状态
+      auditState: null,
+      //审批流程高亮显示
+      processActive: 0,
+      //审批流程
+      process: [],
+      //用户字典列表
+      perList: {},
+      //
+      tableData: [],
+      //头部数据
+      headData: [],
+      //方案状态
+      subData: null,
+      //审批数据
+      applyData: [],
+      type: null
+    }
+  },
+  methods: {
+    //流程查看
+    getCheckList() {
+      var processId = this.row.processId
+      checkList(processId)
+        .then((res) => {
+          console.log(res.data, "......")
+          if (res.code == 200) {
+            
+
+            let ongoingStep = this.ongoingStep
+            this.subData = res.data.process[ongoingStep].list[0].subData  //方案状态
+            this.tableData = res.data.process[ongoingStep]
+
+            for (let i = 0; i < res.data.process[ongoingStep].audit.length; i++) {
+              var ele = res.data.process[ongoingStep].audit[i]
+              if (ele.auditState != null) {
+                this.processActive = i
+              }
+              this.process.push(ele)
+              if (this.process[0].content == 0) {
+                this.process[0].content = this.userInfo.uid
+              } else {
+                this.process[0].content = res.data.process[ongoingStep].audit[0].content
+              }
+            }
+            this.getProcessed()
+          }
+        })
+        .catch((err) => {
+          console.log(err)
+        })
+    },
+
+    //机械通风审批通过接口
+    getApproval() {
+      var data = {
+        id: this.row.id,
+        auditState: this.auditState,
+        // 进行到哪一步的主流程id
+        ongoingStep: this.ongoingStep,
+        auditTime: getNowFormatDate(),
+      }
+      Approval(data)
+        .then((res) => {
+          sessionStorage.setItem("store", JSON.stringify(this.$store.state))
+          // location.reload();
+
+          this.$store.commit({
+            type: "changependingCount",
+            pendingCount: this.$store.state.pendingCount,
+          })
+
+          this.getCheckList()
+          this.getPending()
+          this.$router.push({
+            path: "/dashboard/daiban/initiated/xunzengDetails",
+            item: this.$route.query,
+          })
+        })
+        .catch((err) => {
+          console.log(err)
+        })
+    },
+
+    //药剂采购审批通过接口
+    getyjcgApproval() {
+      var data = {
+        id: this.row.id,
+        auditState: this.auditState,
+        ongoingStep: this.ongoingStep,
+        auditTime: getNowFormatDate(),
+      }
+      yjcgApproval(data)
+        .then((res) => {
+          sessionStorage.setItem("store", JSON.stringify(this.$store.state))
+          // location.reload();
+
+          this.$store.commit({
+            type: "changependingCount",
+            pendingCount: this.$store.state.pendingCount,
+          })
+
+          this.getCheckList()
+          this.getPending()
+          this.$router.push({
+            path: "/dashboard/daiban/initiated/xunzengDetails",
+            item: this.$route.query,
+          })
+        }) 
+        .catch((err) => {
+          console.log(err)
+        })
+    },
+    //审批不通过
+
+    noAgree(item, index) {
+      this.$confirm("确定审批不通过?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "返回",
+        type: "warning",
+      })
+        .then(() => {
+          this.auditState = 2
+
+          // this.ongoingStep = 0
+           this.ongoingStep=this.ongoingStep
+          this.process = []
+          //this.getApproval()
+          if (item.type == "yjcg" || item.type == "xzjh") {
+            this.getyjcgApproval()
+          } else {
+            this.getApproval()
+          }
+          item.auditState = 2
+        })
+        .catch(() => {})
+    },
+
+    //审批通过
+    agree(item, index) {
+      console.log(item, "??????????")
+      console.log(index, "index......")
+      //最后一个人通过
+      if (index == this.process.length - 1) {
+        if(item.type == "yjcg"){
+          this.auditState = 4
+        }else{
+           this.auditState = 3
+        }
+       
+      
+        // this.ongoingStep = 1
+        this.ongoingStep=this.ongoingStep+1
+        console.log('审批后的ongoingStep'+this.ongoingStep)
+      } else {
+        this.auditState = 1
+     
+
+        // this.ongoingStep = 0
+         this.ongoingStep=this.ongoingStep
+         console.log('审批前的ongoingStep'+this.ongoingStep)
+      }
+
+      this.process = []
+      this.$message(
+        {
+          message:"审批通过",
+          type: 'success'
+        })
+      if (item.type == "yjcg" || item.type == "xzjh") {
+        this.getyjcgApproval()
+      } else {
+        this.getApproval()
+      }
+    },
+    //点击返回按钮
+    goBack() {
+      this.$router.push({ path: "/home/daiban/initiated" })
+    },
+
+    //已处理列表数据
+    getProcessed() {
+      var condition = {
+        userId: this.userInfo.uid,
+      }
+      // console.log(condition, "condition.....")
+      condition = JSON.stringify(condition)
+      var data = {
+        pageIndex: 1,
+        pageSize: 10,
+        condition: condition,
+      }
+      processed(data).then((res) => {
+        if (res.code == 200) {
+          console.log(res)
+          this.processedList = res.data.records
+
+          this.$store.commit({
+            type: "changeproCount",
+            proCount: res.data.total,
+          })
+          console.log(this.$store.state.proCount, "aaaaaa.")
+          console.log(res.data.total, "res.data.total....")
+          // sessionStorage.setItem("store", JSON.stringify(this.$store.state))
+          // this.pagination.total = res.data.total
+        }
+      })
+    },
+
+    //待处理列表数据
+    getPending() {
+      var condition = {
+        userId: JSON.parse(getUser()).uid,
+      }
+      condition = JSON.stringify(condition)
+      var data = {
+        pageIndex: 1,
+        pageSize: 10,
+        condition: condition,
+      }
+
+      pending(data).then((res) => {
+        if (res.code == 200) {
+          this.$store.commit({
+            type: "changependingCount",
+            pendingCount: res.data.total,
+          })
+        }
+      })
+    },
+  },
+  mounted() {
+    //库字典数据
+    this.deportDic = JSON.parse(localStorage.getItem("deportDic"))
+    console.log(this.deportDic, " this.deportDic...")
+
+    //部门字典数据
+    this.departDic = JSON.parse(localStorage.getItem("departDic"))
+    console.log(this.departDic, " this.departDic...")
+
+    //仓房字典数据
+    this.hourseDic = JSON.parse(localStorage.getItem("hourseDic"))
+    console.log(this.hourseDic, " this.hourseDic...")
+    //获取当前缓存的用户信息
+    // this.userInfo = JSON.parse(localStorage.getItem("userInfo"))
+    // console.log(this.userInfo, "this.userInfo.....")
+    this.userInfo = JSON.parse(getUser())
+    console.log(this.userInfo, "this.userInfo.....?????")
+    //用户字典
+    this.perList = JSON.parse(localStorage.getItem("perList"))
+    console.log(this.perList, "this.perList...")
+    //流程id
+    this.row = this.$route.query
+    console.log(this.row, "??????")
+
+    this.getCheckList()
+
+    this.houseName = this.$route.query.houseName
+    this.applyName = this.$route.query.applyName
+    this.departmentName = this.$route.query.departmentName
+    this.companyName = this.$route.query.companyName
+    this.workName = this.$route.query.workName
+    this.ongoingStep=parseInt(this.$route.query.ongoingStep)
+    this.type = this.$route.query.type
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.global {
+  padding-top: 0;
+}
+#penmainDetail {
+  height: 100%;
+  .pencontainDetail {
+    .lc_top {
+      height: 100px;
+      background: #fff;
+      border-radius: 6px;
+      padding: 10px;
+      .header {
+        font-size: 18px;
+        font-weight: 500;
+        height: 20%;
+        margin-bottom: 20px;
+        color: #037d41;
+      }
+      .middle {
+        margin-bottom: 20px;
+        width: 80%;
+        display: flex;
+        justify-content: space-between;
+        margin-left: 20px;
+        .middle_flex {
+          display: flex;
+          margin-bottom: 10px;
+        }
+      }
+    }
+
+    #process {
+      background: #fff;
+      border-radius: 6px;
+      margin-top: 10px;
+      padding: 10px;
+
+      border-radius: 4px;
+      .process_title {
+        color: #037d41;
+        font-size: 18px;
+        margin-bottom: 10px;
+      }
+      .process_step {
+        height: 400px;
+      }
+      .stepTitle {
+        display: flex;
+        justify-content: space-between;
+      }
+    }
+    .table_middle {
+      height: 70px;
+      line-height: 70px;
+      padding-left: 10px;
+      background: #fff;
+      border-radius: 6px;
+      margin-top: 10px;
+    }
+
+    .active {
+      color: #037d41;
+      // width: 500px;
+      // height: 40px;
+      // margin-top: 10px;
+    }
+    .noActive {
+      color: red;
+      // width: 500px;
+      // height: 40px;
+      // margin-top: 10px;
+    }
+  }
+
+  .stepTitle {
+    .stepTitleFont {
+      color: black;
+    }
+  }
+  .btns {
+    text-align: right;
+    margin-top: 20px;
+  }
+}
+</style>

shanXiPlatform/src/views/home/daiBan/pending/xunzengDetails.vue

@@ -0,0 +1,517 @@
+<template>
+  <div id="penmainDetail">
+    <div class="pencontainDetail">
+      <div class="lc_top">
+        <div class="header" style="font-weight: 500">
+          <i class="iconfont iconshu"></i>
+          {{workName }}
+        </div>
+        <div class="middle">
+          <div class="middle_flex"  v-if="workName.indexOf('药剂') == -1">
+            <div>仓号:</div>
+            <div>{{houseName }}</div>
+          </div>
+          <div class="middle_flex">
+            <div>申请人:</div>
+            <div>{{applyName }}</div>
+          </div>
+          <div class="middle_flex">
+            <div>申请部门:</div>
+            <div>{{departmentName }}</div>
+          </div>
+          <div class="middle_flex">
+            <div>公司:</div>
+            <div>{{companyName }}</div>
+          </div>
+        </div>
+      </div>
+      <div class="table_middle">
+        <div style="margin-left: 20px">
+          <span v-if="type == 'tf'">1.制定通风方案:</span>
+          <span v-if="type == 'xzjh'">1.制定熏蒸计划:</span>
+          <span v-if="this.subData == 1">否</span>
+          <span v-if="this.subData == 0">是</span>
+        </div>
+      </div>
+      <div id="process">
+        <div class="process_title" style="font-weight: 500">
+          <i class="iconfont iconshu"></i>
+          流程（{{workName}}审批）
+        </div>
+        <div class="process_step" style="margin-left: 20px">
+          <el-steps direction="vertical" :active="processActive">
+            <el-step
+              v-for="(item, index) in process"
+              :key="index"
+              icon="el-icon-edit"
+            >
+              <template>
+                <div slot="title" class="stepTitle">
+                  <div class="stepTitleFont">
+                    {{ item.title }}
+                  </div>
+
+                  <div style="width: 200px">
+                    <div
+                      style="font-weight: 500"
+                      :class="{
+                        active:
+                          index == 0 ||
+                          (item.auditState != null && item.auditState == 1),
+                        noActive: item.auditState == 2,
+                      }"
+                    >
+                      {{ perList[item.content] }}
+                    </div>
+                    <div v-if="item.auditState == 0">待审批</div>
+                    <div v-if="item.auditState == 1" class="stepTitleFont">
+                      审批通过
+                    </div>
+                    <div v-if="item.auditState == 2">审批不通过</div>
+                    <div class="stepTitleFont">{{ item.auditTime }}</div>
+
+                    <div style="width: 200px; display: flex">
+                      <!-- 状态为0且为当前登录人时按钮显示 -->
+                      <el-button
+                        type="danger"
+                        size="mini"
+                        v-if="
+                          item.content == userInfo.uid && item.auditState == 0
+                        "
+                        @click="noAgree(item, index)"
+                        >审批不通过</el-button
+                      >
+                      <el-button
+                        type="success"
+                        size="mini"
+                        v-if="
+                          item.content == userInfo.uid && item.auditState == 0
+                        "
+                        @click="agree(item, index)"
+                        >审批通过</el-button
+                      >
+                    </div>
+                  </div>
+                </div>
+              </template>
+            
+              <template>
+                <i
+                  slot="icon"
+                  class="iconfont iconstep_current"
+                  v-if="
+                    index != 0 &&
+                    (item.auditState == null || item.auditState == 0)
+                  "
+                >
+                </i>
+                <i
+                  slot="icon"
+                  style="color: red"
+                  class="iconfont iconstep_err"
+                  v-if="item.auditState == 2"
+                ></i>
+                <i
+                  slot="icon"
+                  style="color: green"
+                  class="iconfont iconstep_complete"
+                  v-if="item.auditState == 1 || index == 0"
+                ></i>
+              </template>
+            </el-step>
+          </el-steps>
+        </div>
+      </div>
+      <div class="btns">
+        <el-button class="backBtn" type="success" plain @click="goBack()"
+          >返回</el-button
+        >
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import { checkList } from "@/api/reservesManagement/mechanicalVentilation"
+import { Approval, yjcgApproval } from "@/api/daiBan/index"
+import { getNowFormatDate } from "@/utils"
+import { getUser } from "@/utils/auth"
+import { pending } from "@/api/daiBan/index"
+import { processed } from "@/api/daiBan/index"
+export default {
+  name: "Details",
+  data() {
+    return {
+      //类型
+      workName: "",
+      //仓房编码
+      houseName: null,
+      //申请人
+      applyName: null,
+      //部门
+      departmentName: null,
+      //公司
+      companyName: null,
+      //库字典数据
+      deportDic: {},
+      //仓房字典数据
+      hourseDic: {},
+      //部门字典数据
+      departDic: {},
+      //每条数据
+      row: {},
+
+      //当前登录人信息
+      userInfo: {},
+
+      //审批状态
+      auditState: null,
+      //审批流程高亮显示
+      processActive: 0,
+      //审批流程
+      process: [],
+      //用户字典列表
+      perList: {},
+      //
+      tableData: [],
+      //头部数据
+      headData: [],
+      //方案状态
+      subData: null,
+      //审批数据
+      applyData: [],
+      type: null
+    }
+  },
+  methods: {
+    //流程查看
+    getCheckList() {
+      var processId = this.row.processId
+      checkList(processId)
+        .then((res) => {
+          console.log(res.data, "......")
+          if (res.code == 200) {
+            
+
+            let ongoingStep = this.ongoingStep
+            this.subData = res.data.process[ongoingStep].list[0].subData  //方案状态
+            this.tableData = res.data.process[ongoingStep]
+
+            for (let i = 0; i < res.data.process[ongoingStep].audit.length; i++) {
+              var ele = res.data.process[ongoingStep].audit[i]
+              if (ele.auditState != null) {
+                this.processActive = i
+              }
+              this.process.push(ele)
+              if (this.process[0].content == 0) {
+                this.process[0].content = this.userInfo.uid
+              } else {
+                this.process[0].content = res.data.process[ongoingStep].audit[0].content
+              }
+            }
+            this.getProcessed()
+          }
+        })
+        .catch((err) => {
+          console.log(err)
+        })
+    },
+
+    //机械通风审批通过接口
+    getApproval() {
+      var data = {
+        id: this.row.id,
+        auditState: this.auditState,
+        // 进行到哪一步的主流程id
+        ongoingStep: this.ongoingStep,
+        auditTime: getNowFormatDate(),
+      }
+      Approval(data)
+        .then((res) => {
+          sessionStorage.setItem("store", JSON.stringify(this.$store.state))
+          // location.reload();
+
+          this.$store.commit({
+            type: "changependingCount",
+            pendingCount: this.$store.state.pendingCount,
+          })
+
+          this.getCheckList()
+          this.getPending()
+          this.$router.push({
+            path: "/dashboard/daiban/pending/xunzengDetails",
+            item: this.$route.query,
+          })
+        })
+        .catch((err) => {
+          console.log(err)
+        })
+    },
+
+    //药剂采购审批通过接口
+    getyjcgApproval() {
+      var data = {
+        id: this.row.id,
+        auditState: this.auditState,
+        ongoingStep: this.ongoingStep,
+        auditTime: getNowFormatDate(),
+      }
+      yjcgApproval(data)
+        .then((res) => {
+          sessionStorage.setItem("store", JSON.stringify(this.$store.state))
+          // location.reload();
+
+          this.$store.commit({
+            type: "changependingCount",
+            pendingCount: this.$store.state.pendingCount,
+          })
+
+          this.getCheckList()
+          this.getPending()
+          this.$router.push({
+            path: "/dashboard/daiban/pending/xunzengDetails",
+            item: this.$route.query,
+          })
+        }) 
+        .catch((err) => {
+          console.log(err)
+        })
+    },
+    //审批不通过
+
+    noAgree(item, index) {
+      this.$confirm("确定审批不通过?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "返回",
+        type: "warning",
+      })
+        .then(() => {
+          this.auditState = 2
+
+          // this.ongoingStep = 0
+           this.ongoingStep=this.ongoingStep
+          this.process = []
+          //this.getApproval()
+          if (item.type == "yjcg" || item.type == "xzjh") {
+            this.getyjcgApproval()
+          } else {
+            this.getApproval()
+          }
+          item.auditState = 2
+        })
+        .catch(() => {})
+    },
+
+    //审批通过
+    agree(item, index) {
+      console.log(item, "??????????")
+      console.log(index, "index......")
+      //最后一个人通过
+      if (index == this.process.length - 1) {
+        if(item.type == "yjcg"){
+          this.auditState = 4
+        }else{
+           this.auditState = 3
+        }
+       
+      
+        // this.ongoingStep = 1
+        this.ongoingStep=this.ongoingStep+1
+        console.log('审批后的ongoingStep'+this.ongoingStep)
+      } else {
+        this.auditState = 1
+        // this.ongoingStep = 0
+         this.ongoingStep=this.ongoingStep
+         console.log('审批前的ongoingStep'+this.ongoingStep)
+      }
+
+      this.process = []
+      this.$message(
+        {
+          message:"审批通过",
+          type: 'success'
+        })
+      if (item.type == "yjcg" || item.type == "xzjh") {
+        this.getyjcgApproval()
+      } else {
+        this.getApproval()
+      }
+    },
+    //点击返回按钮
+    goBack() {
+      this.$router.push({ path: "/home/daiban/pending" })
+    },
+
+    //已处理列表数据
+    getProcessed() {
+      var condition = {
+        userId: this.userInfo.uid,
+      }
+      // console.log(condition, "condition.....")
+      condition = JSON.stringify(condition)
+      var data = {
+        pageIndex: 1,
+        pageSize: 10,
+        condition: condition,
+      }
+      processed(data).then((res) => {
+        if (res.code == 200) {
+          console.log(res)
+          this.processedList = res.data.records
+
+          this.$store.commit({
+            type: "changeproCount",
+            proCount: res.data.total,
+          })
+          console.log(this.$store.state.proCount, "aaaaaa.")
+          console.log(res.data.total, "res.data.total....")
+          // sessionStorage.setItem("store", JSON.stringify(this.$store.state))
+          // this.pagination.total = res.data.total
+        }
+      })
+    },
+
+    //待处理列表数据
+    getPending() {
+      var condition = {
+        userId: JSON.parse(getUser()).uid,
+      }
+      condition = JSON.stringify(condition)
+      var data = {
+        pageIndex: 1,
+        pageSize: 10,
+        condition: condition,
+      }
+
+      pending(data).then((res) => {
+        if (res.code == 200) {
+          this.$store.commit({
+            type: "changependingCount",
+            pendingCount: res.data.total,
+          })
+        }
+      })
+    },
+  },
+  mounted() {
+    //库字典数据
+    this.deportDic = JSON.parse(localStorage.getItem("deportDic"))
+    console.log(this.deportDic, " this.deportDic...")
+
+    //部门字典数据
+    this.departDic = JSON.parse(localStorage.getItem("departDic"))
+    console.log(this.departDic, " this.departDic...")
+
+    //仓房字典数据
+    this.hourseDic = JSON.parse(localStorage.getItem("hourseDic"))
+    console.log(this.hourseDic, " this.hourseDic...")
+    //获取当前缓存的用户信息
+    // this.userInfo = JSON.parse(localStorage.getItem("userInfo"))
+    // console.log(this.userInfo, "this.userInfo.....")
+    this.userInfo = JSON.parse(getUser())
+    console.log(this.userInfo, "this.userInfo.....?????")
+    //用户字典
+    this.perList = JSON.parse(localStorage.getItem("perList"))
+    console.log(this.perList, "this.perList...")
+    //流程id
+    this.row = this.$route.query
+    console.log(this.row, "??????")
+
+    this.getCheckList()
+
+    this.houseName = this.$route.query.houseName
+    this.applyName = this.$route.query.applyName
+    this.departmentName = this.$route.query.departmentName
+    this.companyName = this.$route.query.companyName
+    this.workName = this.$route.query.workName
+    this.ongoingStep=parseInt(this.$route.query.ongoingStep)
+    this.type = this.$route.query.type
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.global {
+  padding-top: 0;
+}
+#penmainDetail {
+  height: 100%;
+  .pencontainDetail {
+    .lc_top {
+      height: 100px;
+      background: #fff;
+      border-radius: 6px;
+      padding: 10px;
+      .header {
+        font-size: 18px;
+        font-weight: 500;
+        height: 20%;
+        margin-bottom: 20px;
+        color: #037d41;
+      }
+      .middle {
+        margin-bottom: 20px;
+        width: 80%;
+        display: flex;
+        justify-content: space-between;
+        margin-left: 20px;
+        .middle_flex {
+          display: flex;
+          margin-bottom: 10px;
+        }
+      }
+    }
+
+    #process {
+      background: #fff;
+      border-radius: 6px;
+      margin-top: 10px;
+      padding: 10px;
+
+      border-radius: 4px;
+      .process_title {
+        color: #037d41;
+        font-size: 18px;
+        margin-bottom: 10px;
+      }
+      .process_step {
+        height: 400px;
+      }
+      .stepTitle {
+        display: flex;
+        justify-content: space-between;
+      }
+    }
+    .table_middle {
+      height: 70px;
+      line-height: 70px;
+      padding-left: 10px;
+      background: #fff;
+      border-radius: 6px;
+      margin-top: 10px;
+    }
+
+    .active {
+      color: #037d41;
+      // width: 500px;
+      // height: 40px;
+      // margin-top: 10px;
+    }
+    .noActive {
+      color: red;
+      // width: 500px;
+      // height: 40px;
+      // margin-top: 10px;
+    }
+  }
+
+  .stepTitle {
+    .stepTitleFont {
+      color: black;
+    }
+  }
+  .btns {
+    text-align: right;
+    margin-top: 20px;
+  }
+}
+</style>

shanXiPlatform/src/views/home/daiBan/processed/xunzengDetails.vue

@@ -0,0 +1,517 @@
+<template>
+  <div id="penmainDetail">
+    <div class="pencontainDetail">
+      <div class="lc_top">
+        <div class="header" style="font-weight: 500">
+          <i class="iconfont iconshu"></i>
+          {{workName }}
+        </div>
+        <div class="middle">
+          <div class="middle_flex"  v-if="workName.indexOf('药剂') == -1">
+            <div>仓号:</div>
+            <div>{{houseName }}</div>
+          </div>
+          <div class="middle_flex">
+            <div>申请人:</div>
+            <div>{{applyName }}</div>
+          </div>
+          <div class="middle_flex">
+            <div>申请部门:</div>
+            <div>{{departmentName }}</div>
+          </div>
+          <div class="middle_flex">
+            <div>公司:</div>
+            <div>{{companyName }}</div>
+          </div>
+        </div>
+      </div>
+      <div class="table_middle">
+        <div style="margin-left: 20px">
+          <span v-if="type == 'tf'">1.制定通风方案:</span>
+          <span v-if="type == 'xzjh'">1.制定熏蒸计划:</span>
+          <span v-if="this.subData == 1">否</span>
+          <span v-if="this.subData == 0">是</span>
+        </div>
+      </div>
+      <div id="process">
+        <div class="process_title" style="font-weight: 500">
+          <i class="iconfont iconshu"></i>
+          流程（{{workName}}审批）
+        </div>
+        <div class="process_step" style="margin-left: 20px">
+          <el-steps direction="vertical" :active="processActive">
+            <el-step
+              v-for="(item, index) in process"
+              :key="index"
+              icon="el-icon-edit"
+            >
+              <template>
+                <div slot="title" class="stepTitle">
+                  <div class="stepTitleFont">
+                    {{ item.title }}
+                  </div>
+
+                  <div style="width: 200px">
+                    <div
+                      style="font-weight: 500"
+                      :class="{
+                        active:
+                          index == 0 ||
+                          (item.auditState != null && item.auditState == 1),
+                        noActive: item.auditState == 2,
+                      }"
+                    >
+                      {{ perList[item.content] }}
+                    </div>
+                    <div v-if="item.auditState == 0">待审批</div>
+                    <div v-if="item.auditState == 1" class="stepTitleFont">
+                      审批通过
+                    </div>
+                    <div v-if="item.auditState == 2">审批不通过</div>
+                    <div class="stepTitleFont">{{ item.auditTime }}</div>
+
+                    <div style="width: 200px; display: flex">
+                      <!-- 状态为0且为当前登录人时按钮显示 -->
+                      <el-button
+                        type="danger"
+                        size="mini"
+                        v-if="
+                          item.content == userInfo.uid && item.auditState == 0
+                        "
+                        @click="noAgree(item, index)"
+                        >审批不通过</el-button
+                      >
+                      <el-button
+                        type="success"
+                        size="mini"
+                        v-if="
+                          item.content == userInfo.uid && item.auditState == 0
+                        "
+                        @click="agree(item, index)"
+                        >审批通过</el-button
+                      >
+                    </div>
+                  </div>
+                </div>
+              </template>
+            
+              <template>
+                <i
+                  slot="icon"
+                  class="iconfont iconstep_current"
+                  v-if="
+                    index != 0 &&
+                    (item.auditState == null || item.auditState == 0)
+                  "
+                >
+                </i>
+                <i
+                  slot="icon"
+                  style="color: red"
+                  class="iconfont iconstep_err"
+                  v-if="item.auditState == 2"
+                ></i>
+                <i
+                  slot="icon"
+                  style="color: green"
+                  class="iconfont iconstep_complete"
+                  v-if="item.auditState == 1 || index == 0"
+                ></i>
+              </template>
+            </el-step>
+          </el-steps>
+        </div>
+      </div>
+      <div class="btns">
+        <el-button class="backBtn" type="success" plain @click="goBack()"
+          >返回</el-button
+        >
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import { checkList } from "@/api/reservesManagement/mechanicalVentilation"
+import { Approval, yjcgApproval } from "@/api/daiBan/index"
+import { getNowFormatDate } from "@/utils"
+import { getUser } from "@/utils/auth"
+import { pending } from "@/api/daiBan/index"
+import { processed } from "@/api/daiBan/index"
+export default {
+  name: "Details",
+  data() {
+    return {
+      //类型
+      workName: "",
+      //仓房编码
+      houseName: null,
+      //申请人
+      applyName: null,
+      //部门
+      departmentName: null,
+      //公司
+      companyName: null,
+      //库字典数据
+      deportDic: {},
+      //仓房字典数据
+      hourseDic: {},
+      //部门字典数据
+      departDic: {},
+      //每条数据
+      row: {},
+
+      //当前登录人信息
+      userInfo: {},
+
+      //审批状态
+      auditState: null,
+      //审批流程高亮显示
+      processActive: 0,
+      //审批流程
+      process: [],
+      //用户字典列表
+      perList: {},
+      //
+      tableData: [],
+      //头部数据
+      headData: [],
+      //方案状态
+      subData: null,
+      //审批数据
+      applyData: [],
+      type: null
+    }
+  },
+  methods: {
+    //流程查看
+    getCheckList() {
+      var processId = this.row.processId
+      checkList(processId)
+        .then((res) => {
+          console.log(res.data, "......")
+          if (res.code == 200) {
+            let ongoingStep = this.ongoingStep
+            this.subData = res.data.process[ongoingStep].list[0].subData  //方案状态
+            this.tableData = res.data.process[ongoingStep]
+
+            for (let i = 0; i < res.data.process[ongoingStep].audit.length; i++) {
+              var ele = res.data.process[ongoingStep].audit[i]
+              if (ele.auditState != null) {
+                this.processActive = i
+              }
+              this.process.push(ele)
+              if (this.process[0].content == 0) {
+                this.process[0].content = this.userInfo.uid
+              } else {
+                this.process[0].content = res.data.process[ongoingStep].audit[0].content
+              }
+            }
+            this.getProcessed()
+          }
+        })
+        .catch((err) => {
+          console.log(err)
+        })
+    },
+
+    //机械通风审批通过接口
+    getApproval() {
+      var data = {
+        id: this.row.id,
+        auditState: this.auditState,
+        // 进行到哪一步的主流程id
+        ongoingStep: this.ongoingStep,
+        auditTime: getNowFormatDate(),
+      }
+      Approval(data)
+        .then((res) => {
+          sessionStorage.setItem("store", JSON.stringify(this.$store.state))
+          // location.reload();
+
+          this.$store.commit({
+            type: "changependingCount",
+            pendingCount: this.$store.state.pendingCount,
+          })
+
+          this.getCheckList()
+          this.getPending()
+          this.$router.push({
+            path: "/dashboard/daiban/processed/xunzengDetails",
+            item: this.$route.query,
+          })
+        })
+        .catch((err) => {
+          console.log(err)
+        })
+    },
+
+    //药剂采购审批通过接口
+    getyjcgApproval() {
+      var data = {
+        id: this.row.id,
+        auditState: this.auditState,
+        ongoingStep: this.ongoingStep,
+        auditTime: getNowFormatDate(),
+      }
+      yjcgApproval(data)
+        .then((res) => {
+          sessionStorage.setItem("store", JSON.stringify(this.$store.state))
+          // location.reload();
+
+          this.$store.commit({
+            type: "changependingCount",
+            pendingCount: this.$store.state.pendingCount,
+          })
+
+          this.getCheckList()
+          this.getPending()
+          this.$router.push({
+            path: "/dashboard/daiban/processed/xunzengDetails",
+            item: this.$route.query,
+          })
+        }) 
+        .catch((err) => {
+          console.log(err)
+        })
+    },
+    //审批不通过
+
+    noAgree(item, index) {
+      this.$confirm("确定审批不通过?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "返回",
+        type: "warning",
+      })
+        .then(() => {
+          this.auditState = 2
+
+          // this.ongoingStep = 0
+           this.ongoingStep=this.ongoingStep
+          this.process = []
+          //this.getApproval()
+          if (item.type == "yjcg" || item.type == "xzjh") {
+            this.getyjcgApproval()
+          } else {
+            this.getApproval()
+          }
+          item.auditState = 2
+        })
+        .catch(() => {})
+    },
+
+    //审批通过
+    agree(item, index) {
+      console.log(item, "??????????")
+      console.log(index, "index......")
+      //最后一个人通过
+      if (index == this.process.length - 1) {
+        if(item.type == "yjcg"){
+          this.auditState = 4
+        }else{
+           this.auditState = 3
+        }
+       
+      
+        // this.ongoingStep = 1
+        this.ongoingStep=this.ongoingStep+1
+        console.log('审批后的ongoingStep'+this.ongoingStep)
+      } else {
+        this.auditState = 1
+     
+
+        // this.ongoingStep = 0
+         this.ongoingStep=this.ongoingStep
+         console.log('审批前的ongoingStep'+this.ongoingStep)
+      }
+
+      this.process = []
+      this.$message(
+        {
+          message:"审批通过",
+          type: 'success'
+        })
+      if (item.type == "yjcg" || item.type == "xzjh") {
+        this.getyjcgApproval()
+      } else {
+        this.getApproval()
+      }
+    },
+    //点击返回按钮
+    goBack() {
+      this.$router.push({ path: "/home/daiban/processed" })
+    },
+
+    //已处理列表数据
+    getProcessed() {
+      var condition = {
+        userId: this.userInfo.uid,
+      }
+      // console.log(condition, "condition.....")
+      condition = JSON.stringify(condition)
+      var data = {
+        pageIndex: 1,
+        pageSize: 10,
+        condition: condition,
+      }
+      processed(data).then((res) => {
+        if (res.code == 200) {
+          console.log(res)
+          this.processedList = res.data.records
+
+          this.$store.commit({
+            type: "changeproCount",
+            proCount: res.data.total,
+          })
+          console.log(this.$store.state.proCount, "aaaaaa.")
+          console.log(res.data.total, "res.data.total....")
+          // sessionStorage.setItem("store", JSON.stringify(this.$store.state))
+          // this.pagination.total = res.data.total
+        }
+      })
+    },
+
+    //待处理列表数据
+    getPending() {
+      var condition = {
+        userId: JSON.parse(getUser()).uid,
+      }
+      condition = JSON.stringify(condition)
+      var data = {
+        pageIndex: 1,
+        pageSize: 10,
+        condition: condition,
+      }
+
+      pending(data).then((res) => {
+        if (res.code == 200) {
+          this.$store.commit({
+            type: "changependingCount",
+            pendingCount: res.data.total,
+          })
+        }
+      })
+    },
+  },
+  mounted() {
+    //库字典数据
+    this.deportDic = JSON.parse(localStorage.getItem("deportDic"))
+    console.log(this.deportDic, " this.deportDic...")
+
+    //部门字典数据
+    this.departDic = JSON.parse(localStorage.getItem("departDic"))
+    console.log(this.departDic, " this.departDic...")
+
+    //仓房字典数据
+    this.hourseDic = JSON.parse(localStorage.getItem("hourseDic"))
+    console.log(this.hourseDic, " this.hourseDic...")
+    //获取当前缓存的用户信息
+    // this.userInfo = JSON.parse(localStorage.getItem("userInfo"))
+    // console.log(this.userInfo, "this.userInfo.....")
+    this.userInfo = JSON.parse(getUser())
+    console.log(this.userInfo, "this.userInfo.....?????")
+    //用户字典
+    this.perList = JSON.parse(localStorage.getItem("perList"))
+    console.log(this.perList, "this.perList...")
+    //流程id
+    this.row = this.$route.query
+    console.log(this.row, "??????")
+
+    this.getCheckList()
+
+    this.houseName = this.$route.query.houseName
+    this.applyName = this.$route.query.applyName
+    this.departmentName = this.$route.query.departmentName
+    this.companyName = this.$route.query.companyName
+    this.workName = this.$route.query.workName
+    this.ongoingStep = parseInt(this.$route.query.ongoingStep)
+    this.type = this.$route.query.type
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.global {
+  padding-top: 0;
+}
+#penmainDetail {
+  height: 100%;
+  .pencontainDetail {
+    .lc_top {
+      height: 100px;
+      background: #fff;
+      border-radius: 6px;
+      padding: 10px;
+      .header {
+        font-size: 18px;
+        font-weight: 500;
+        height: 20%;
+        margin-bottom: 20px;
+        color: #037d41;
+      }
+      .middle {
+        margin-bottom: 20px;
+        width: 80%;
+        display: flex;
+        justify-content: space-between;
+        margin-left: 20px;
+        .middle_flex {
+          display: flex;
+          margin-bottom: 10px;
+        }
+      }
+    }
+
+    #process {
+      background: #fff;
+      border-radius: 6px;
+      margin-top: 10px;
+      padding: 10px;
+
+      border-radius: 4px;
+      .process_title {
+        color: #037d41;
+        font-size: 18px;
+        margin-bottom: 10px;
+      }
+      .process_step {
+        height: 400px;
+      }
+      .stepTitle {
+        display: flex;
+        justify-content: space-between;
+      }
+    }
+    .table_middle {
+      height: 70px;
+      line-height: 70px;
+      padding-left: 10px;
+      background: #fff;
+      border-radius: 6px;
+      margin-top: 10px;
+    }
+
+    .active {
+      color: #037d41;
+      // width: 500px;
+      // height: 40px;
+      // margin-top: 10px;
+    }
+    .noActive {
+      color: red;
+      // width: 500px;
+      // height: 40px;
+      // margin-top: 10px;
+    }
+  }
+
+  .stepTitle {
+    .stepTitleFont {
+      color: black;
+    }
+  }
+  .btns {
+    text-align: right;
+    margin-top: 20px;
+  }
+}
+</style>

shanXiPlatform/src/views/home/gzjftable.vue

@@ -76,7 +76,8 @@ export default {
             var condition = {
                 // depotId: this.$store.state.depotId,
                 depotId: this.$route.query.depotId,
-                sTime: this.checkYear
+                sTime: this.checkYear,
+                type:''
             }
             condition = JSON.stringify(condition)
             let data = {

shanXiPlatform/src/views/home/hydmoretable.vue

@@ -0,0 +1,122 @@
+<template>
+    <div class="global">
+        <div class="contentContainerGg">
+            <div class="container">
+                <el-form :inline="true">
+                    <el-form-item label="时间:">
+                        <el-date-picker @change="timechange" id="getWeek" v-model="datetime" type="month" format="yyyy-MM" placeholder="选择月">
+                        </el-date-picker>
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button icon="el-icon-search" type="success" plain @click="getList()">
+                            查询</el-button>
+                    </el-form-item>
+                </el-form>
+                <el-table border :data="tableList" highlight-current-row style="width:100%" :header-cell-style="{background:'#f8f8f8'}">
+                    <el-table-column property="sTime" label="时间" align="center" >
+                        <template slot-scope="scope">
+                            {{ scope.row.actTime.slice(0,7) }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="personnelName" label="人员" align="center" />
+                    <el-table-column prop="sposition" label="职位" align="center" />
+                    <el-table-column prop="depotName" label="所属粮库" align="center" />
+                    <el-table-column prop="depotRanking" label="活跃度所在粮库排名" align="center" />
+                    <el-table-column prop="provinceRanking" label="活跃度全省排名" align="center" />
+                    <el-table-column prop="usActivity" label="得分" align="center" />
+                </el-table>
+                <div class="pagination-container">
+                    <el-pagination class="right" background :current-page.sync="listQuery.page" :page-size="listQuery.limit" :page-sizes="[10,20,30,40]" :total="total" @size-change="sizeChange" @current-change="pageChange" layout="total, sizes, prev, pager, next, jumper"></el-pagination>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+import { getcf } from "@/api/organizationalStructureManagement/index.js"
+import { getmorehyd } from "@/api/branchoff/index.js"
+export default {
+    data() {
+        return {
+            datetime: "",
+            // 列表数据
+            tableList: [],
+            // 分页
+            total: 0,
+            listLoading: true,
+            listQuery: {
+                page: 1,
+                limit: 10
+            },
+            roleList: [],
+            depotDic: []
+        }
+    },
+    created() {
+        this.getList()
+        this.depotDic = JSON.parse(localStorage.getItem("deportDic"))
+    },
+    methods: {
+        timechange() {
+            this.$nextTick(() => {
+                let week = document.querySelector("#getWeek").value
+                this.checkYear = week
+            })
+        },
+        getList() {
+            var condition = {
+                // depotId: this.$store.state.depotId,
+                depotId: this.$route.query.depotId,
+                sTime: this.checkYear,
+                type:'1'
+            }
+            condition = JSON.stringify(condition)
+            let data = {
+                condition: condition,
+                pageIndex: this.listQuery.page,
+                pageSize: this.listQuery.limit
+            }
+            getmorehyd(data)
+                .then(res => {
+                    if (res.code == 200) {
+                        this.tableList = res.data.records
+                        this.listQuery.limit = res.data.size
+                        this.total = res.data.total
+                    } else {
+                        this.$message({
+                            type: "error",
+                            message: res.msg
+                        })
+                    }
+                })
+                .catch(err => {
+                    console.log(err)
+                })
+        },
+        sizeChange(v) {
+            this.listQuery.limit = v
+            this.getList()
+        },
+        pageChange(v) {
+            this.listQuery.page = v
+            this.getList()
+        },
+     
+    }
+}
+</script>
+<style lang="scss" scoped>
+.top {
+    height: 40px;
+    line-height: 40px;
+    border-bottom: 1px solid #ccc;
+}
+.container {
+    padding: 10px;
+}
+.pagination-container {
+    margin-top: 10px;
+    margin-right: 20px;
+    text-align: right;
+}
+</style>

shanXiPlatform/src/views/home/hydtable.vue

@@ -0,0 +1,132 @@
+<template>
+    <div class="global">
+        <div class="contentContainerGg">
+            <div class="container">
+                <el-form :inline="true">
+                    <el-form-item label="时间:">
+                        <el-date-picker @change="timechange" id="getWeek" v-model="datetime" type="month" format="yyyy-MM" placeholder="选择月">
+                        </el-date-picker>
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button icon="el-icon-search" type="success" plain @click="getList()">
+                            查询</el-button>
+                    </el-form-item>
+                </el-form>
+                <el-table border :data="tableList" highlight-current-row style="width:100%" :header-cell-style="{background:'#f8f8f8'}">
+                    <el-table-column property="sTime" label="时间" align="center">
+                        <template slot-scope="scope">
+                            {{ scope.row.actTime.slice(0,7) }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="depotName" label="公司" align="center" />
+                    <el-table-column prop="provinceRanking" label="活跃度全省排名" align="center" />
+                    <el-table-column prop="usActivity" label="得分" align="center" />
+                     <el-table-column property="operation" label="操作" align="center">
+                        <template slot-scope="scope">
+                            <el-button size="mini" type="detailbtn" @click="detailbtn(scope.$index, scope.row)">查看库内活跃排名</el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+                <div class="pagination-container">
+                    <el-pagination class="right" background :current-page.sync="listQuery.page" :page-size="listQuery.limit" :page-sizes="[10,20,30,40]" :total="total" @size-change="sizeChange" @current-change="pageChange" layout="total, sizes, prev, pager, next, jumper"></el-pagination>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+import { getcf } from "@/api/organizationalStructureManagement/index.js"
+import { getmorehyd } from "@/api/branchoff/index.js"
+export default {
+    data() {
+        return {
+            datetime: "",
+            // 列表数据
+            tableList: [],
+            // 分页
+            total: 0,
+            listLoading: true,
+            listQuery: {
+                page: 1,
+                limit: 10
+            },
+            roleList: [],
+            depotDic: []
+        }
+    },
+    created() {
+        this.getList()
+        this.depotDic = JSON.parse(localStorage.getItem("deportDic"))
+    },
+    methods: {
+        timechange() {
+            this.$nextTick(() => {
+                let week = document.querySelector("#getWeek").value
+                this.checkYear = week
+            })
+        },
+        getList() {
+            var condition = {
+                // depotId: this.$store.state.depotId,
+                depotId: this.$route.query.depotId,
+                sTime: this.checkYear,
+                type: ""
+            }
+            condition = JSON.stringify(condition)
+            let data = {
+                condition: condition,
+                pageIndex: this.listQuery.page,
+                pageSize: this.listQuery.limit
+            }
+            getmorehyd(data)
+                .then(res => {
+                    if (res.code == 200) {
+                        this.tableList = res.data.records
+                        this.listQuery.limit = res.data.size
+                        this.total = res.data.total
+                    } else {
+                        this.$message({
+                            type: "error",
+                            message: res.msg
+                        })
+                    }
+                })
+                .catch(err => {
+                    console.log(err)
+                })
+        },
+        sizeChange(v) {
+            this.listQuery.limit = v
+            this.getList()
+        },
+        pageChange(v) {
+            this.listQuery.page = v
+            this.getList()
+        },
+         detailbtn( index, row  ) {
+              this.$router.push({
+                name: "hydmoretable",
+                query: {
+                    depotId: row.depotId,
+                    midprovinceName: this.$route.query.midprovinceName
+                }
+            })
+        }
+    }
+}
+</script>
+<style lang="scss" scoped>
+.top {
+    height: 40px;
+    line-height: 40px;
+    border-bottom: 1px solid #ccc;
+}
+.container {
+    padding: 10px;
+}
+.pagination-container {
+    margin-top: 10px;
+    margin-right: 20px;
+    text-align: right;
+}
+</style>

shanXiPlatform/src/views/home/kngzjftable.vue

@@ -70,7 +70,8 @@ export default {
             var condition = {
                 // depotId: this.$store.state.depotId,
                 depotId: this.$route.query.depotId,
-                sTime: this.checkYear
+                sTime: this.checkYear,
+                type:'1'
             }
             condition = JSON.stringify(condition)
             let data = {

shanXiPlatform/src/views/home/yclqtable.vue

@@ -2,7 +2,7 @@
     <div class="global">
         <div class="contentContainerGg">
             <div class="container">
-                <el-form  :inline="true">
+                <el-form :inline="true">
                     <el-form-item label="时间:">
                         <el-date-picker @change="timechange" id="getWeek" v-model="datetime" type="week" format="yyyy年WW周" placeholder="选择周">
                         </el-date-picker>
@@ -13,15 +13,32 @@
                     </el-form-item>
                 </el-form>
                 <el-table border :data="tableList" highlight-current-row style="width:100%" :header-cell-style="{background:'#f8f8f8'}">
-                    <el-table-column prop="operationTime" label="时间" align="center" />
-                      <el-table-column property="depotName" label="公司" align="center">
+                    <!-- <el-table-column prop="operationTime" label="时间" align="center" /> -->
+                    <el-table-column property="depotName" label="时间" align="center">
                         <template slot-scope="scope">
-                             {{ depotDic[scope.row.depotId] }}
+                            {{ scope.row.checkYear }}年 {{ scope.row.checkYearWeek}}周
                         </template>
                     </el-table-column>
-                    <!-- <el-table-column prop="storageStatus" label="所属市" align="center" /> -->
-                    <el-table-column prop="grainVarieties" label="仓房数量(个)" align="center" />
-                    <el-table-column prop="warehouseStatus" label="粮情异常仓房数量(个)" align="center" />
+                    <el-table-column v-if="this.$route.query.isshow" property="depotName" label="仓房" align="center">
+                        <template slot-scope="scope">
+                            <span style="color:green;" > {{ scope.row.depotId }}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column  property="depotName" label="公司" align="center">
+                        <template slot-scope="scope" >
+                             {{ depotDic[scope.row.depotId] }} 
+                        </template>
+                    </el-table-column>
+                    <el-table-column v-if="this.$route.query.isshow" label="粮情异常情况" align="center">
+                        <template slot-scope="scope">
+                            <p style="height:45px;line-height:45px;margin:0;padding-top:7px;">
+                                <span class='colorspano' v-if="scope.row.grainError == '191'"></span>
+                                <span class='colorspant' v-if="scope.row.grainError != '191'"></span>
+                            </p>
+                        </template>
+                    </el-table-column>
+                    <el-table-column v-if="!this.$route.query.isshow" prop="grainVarieties" label="仓房数量(个)" align="center" />
+                    <el-table-column v-if="!this.$route.query.isshow" prop="warehouseStatus" label="粮情异常仓房数量(个)" align="center" />
                     <el-table-column property="operation" label="操作" align="center">
                         <template slot-scope="scope">
                             <el-button size="mini" type="detailbtn" @click="detailbtn(scope.$index, scope.row)">详情</el-button>
@@ -37,7 +54,7 @@
 </template>
 <script>
 import { getcf } from "@/api/organizationalStructureManagement/index.js"
-import {  getyclq } from "@/api/branchoff/index.js"
+import { getyclq } from "@/api/branchoff/index.js"
 export default {
     data() {
         return {
@@ -52,7 +69,7 @@ export default {
                 limit: 10
             },
             roleList: [],
-            depotDic: [],
+            depotDic: []
         }
     },
     created() {
@@ -105,7 +122,15 @@ export default {
             this.listQuery.page = v
             this.getList()
         },
-        detailbtn() {}
+        detailbtn(index, row) {
+            this.$router.push({
+                name: "AllGrain",
+                query: {
+                    // depotId: row.depotId,
+                    // midprovinceName: this.$route.query.midprovinceName
+                }
+            })
+        }
     }
 }
 </script>
@@ -123,4 +148,18 @@ export default {
     margin-right: 20px;
     text-align: right;
 }
+.colorspano {
+    width: 140px;
+    height: 30px;
+    background-color: #199856;
+    display: inline-block;
+    border-radius: 5px;
+}
+.colorspant {
+    width: 140px;
+    height: 30px;
+    background-color: #ffff00;
+    display: inline-block;
+    border-radius: 5px;
+}
 </style>

shanXiPlatform/src/views/systemManagement/userManagement/approverManagement/index.vue

@@ -59,9 +59,9 @@ export default {
             //库id
             depotId: 1,
             roleArr: [],
-            //33--主管科长   35---分管副总经理   34---总经理  54--分公司主管
+            //33--主管科长   35---分管副总经理   34---总经理  37--分公司主管
             //角色id
-            rolesId: "33,34,35,54",
+            rolesId: "33,34,35,37",
             //初始化审批人下拉选
             approverSelect: [],
             // 表格数据初始化
@@ -539,7 +539,7 @@ export default {
                             } else if (
                                 item.title.indexOf("分公司主管处室") != -1
                             ) {
-                                this.$set(item, "approverSelect", res.data[54])
+                                this.$set(item, "approverSelect", res.data[37])
                             }
                         })
                     }
@@ -553,9 +553,9 @@ export default {
             if (this.type == "tf") {
                 this.tableData = this.meVentilation
             } else if (this.type == "xzjh") {
-                this.tableData = this.fumigation
+                // this.tableData = this.fumigation
             } else if (this.type == "xzsq") {
-                this.tableData = this.fumigation1
+                // this.tableData = this.fumigation1
             } else if (this.type == "yjcg") {
                 this.tableData = this.drugPurchase
             } else if (this.type == "yjly") {