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

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 }
+                },
               ]
           },
 
@@ -487,6 +511,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 }
+                },
               ]
 
           },
@@ -511,6 +543,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 }
+                },
               ]
           },
           {
@@ -532,6 +572,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 }
+                },
               ]
           },
 
@@ -787,7 +835,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
       },
       //  储量管理/熏蒸管理/新增
       {
@@ -1558,7 +1606,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/facilitiesEquipment/facilitiesManagement/facilitiesTabs.vue

@@ -10,7 +10,7 @@
           label="全部设施检查记录"
           name="AllFacilities"
         ></el-tab-pane>
-        <el-tab-pane label="设施维修改造" name="Maintenance"></el-tab-pane>
+        <!-- <el-tab-pane label="设施维修改造" name="Maintenance"></el-tab-pane> -->
       </el-tabs>
         <div id="main">
 

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/reservesManagement/grainCheck/allGrain/index.vue

@@ -121,8 +121,15 @@
           width="100px"
         >
           <template slot-scope="scope">
-            <div class="yellow" v-if="scope.row.anomalousStatus === 1"></div>
-            <div class="green" v-if="scope.row.anomalousStatus !== 1"></div>
+
+            <div disable-transitions v-if="scope.row.anomalousStatus != '1'">
+              <!-- 无 -->
+              <span class="colorspano"></span>
+            </div>
+            <div disable-transitions v-if="scope.row.anomalousStatus == '1'">
+              <!-- 有 -->
+              <span class="colorspant"></span>
+            </div>
           </template>
         </el-table-column>
         <el-table-column prop="recordStatus" label="状态" align="center">
@@ -516,23 +523,31 @@ export default {
   font-size: 15px;
   font-family: "Gill Sans", "Gill Sans MT", Calibri, "Trebuchet MS", sans-serif;
 }
-.yellow {
-  // width: 100px;
-  display: block;
-  height: 25px;
-  background-color: #e3a512;
-  color: azure;
+.colorspano {
+  width: 100px;
+  height: 30px;
+  background-color: #199856;
+  display: inline-block;
   border-radius: 5px;
-  // text-align: center;
-  font-size: 13px;
+  color: #fff;
+  line-height: 30px;
 }
-.green {
-  display: block;
-  // width: 80%;
-  height: 25px;
-  background-color: #037d41;
+.colorspant {
+  width: 100px;
+  height: 30px;
+  background-color: #ffff00;
+  display: inline-block;
+  border-radius: 5px;
   color: #fff;
+  line-height: 30px;
+}
+.colorspanr {
+  width: 100px;
+  height: 30px;
+  background-color: #ff9933;
+  display: inline-block;
   border-radius: 5px;
-  font-size: 13px;
 }
+
+
 </style>

shanXiPlatform/src/views/reservesManagement/grainCheck/newGrain/index.vue

@@ -291,7 +291,7 @@ export default {
     // console.log(this.$route.query,'this.$route.query........')
     this.userInfo = JSON.parse(localStorage.getItem("userInfo"))
 
-    console.log(this.userInfo.roleName, "this.userInfo.roleName00000000")
+    // console.log(this.userInfo.roleName, "this.userInfo.roleName00000000")
     this.data5.grainConditionRecord.checkPerson = this.userInfo.uid
     this.uid = this.userInfo.uid
     // 此处是从待办跳转到本页面时传递过来的参数，用data2收集保存
@@ -337,7 +337,7 @@ export default {
       const parentId = 18 //粮情检查类型parentId
       getGrainItems(parentId)
         .then(res => {
-          console.log(res, "res字典粮情检查类型")
+          // console.log(res, "res字典粮情检查类型")
           this.grainKind = res.data
         })
         .catch(err => {
@@ -347,9 +347,9 @@ export default {
        getGrainItems(19)
           .then(res => {
             if (res.code == 200) {
-              console.log(res, "保管员检查项字典")
+              // console.log(res, "保管员检查项字典")
               this.checkItems = res.data
-              console.log(this.checkItems, "checkItems.......")
+              // console.log(this.checkItems, "checkItems.......")
             }
           })
           .catch(err => {
@@ -381,10 +381,10 @@ export default {
             ? this.houseId
             : 94
       }
-      console.log(data, "data")
+      // console.log(data, "data")
       getNewGrainInfo(data)
         .then(res => {
-          console.log(res.data, "res000")
+          // console.log(res.data, "res000")
           this.data = res.data
           this.sort()
         })
@@ -398,28 +398,28 @@ export default {
       // 如果sortData是空的，使用splice进行排序，不准确
       // this.sortData = [0, 0, 0, 0]
 
-      console.log(this.sortData,'sortData.......')
+      // console.log(this.sortData,'sortData.......')
       if (sortdata.length !== 0) {
         for (let i = 0; i < sortdata.length; i++) {
           if (sortdata[i].enumId == 22) {
-            console.log(sortdata[i], "总经理 ")
+            // console.log(sortdata[i], "总经理 ")
             this.sortData.splice(0, 1, sortdata[i])
           }
           if (sortdata[i].enumId == 21) {
-            console.log(this.data[i], "分管副总")
+            // console.log(this.data[i], "分管副总")
             this.sortData.splice(1, 1, sortdata[i])
           }
           if (sortdata[i].enumId === 20) {
-            console.log(this.data[i], "主管科长")
+            // console.log(this.data[i], "主管科长")
             this.sortData.splice(2, 1, sortdata[i])
           }
           if (sortdata[i].enumId == 19) {
-            console.log(this.data[i], "保管员")
+            // console.log(this.data[i], "保管员")
             this.sortData.splice(3, 1, sortdata[i])
           }
         }
       }
-      console.log(this.sortData, "this.sortData.....")
+      // console.log(this.sortData, "this.sortData.....")
     },
     // 状态改成图标
     formatterColumn(row, column) {
@@ -435,16 +435,16 @@ export default {
     // 除保管员外弹窗
     open(val,index) {
       // console.log(this.$route.query, "保管员外的角色")
-      console.log(val, "val...")
-      console.log(index,'index')
+      // console.log(val, "val...")
+      // console.log(index,'index')
       this.data5.grainConditionRecord.depotId = this.depotId
       this.data5.grainConditionRecord.houseId = this.houseId
       this.data5.grainConditionRecord.enumId = val.enumId
-      console.log(val.enumId, "当前角色信息id")
-      console.log(this.grainKind, "角色类别字典")
+      // console.log(val.enumId, "当前角色信息id")
+      // console.log(this.grainKind, "角色类别字典")
       var item = this.grainKind.find(item => item.enumId == val.enumId)
-      console.log(item.enumName, "item")
-      console.log(item,'item数据')
+      // console.log(item.enumName, "item")
+      // console.log(item,'item数据')
 
       // console.log(this.data2,'this.data2..........')
       const h = this.$createElement
@@ -490,14 +490,14 @@ export default {
         console.log(this.data5, "this.data5...")
         addInfo(this.data5)
           .then(res => {
-            console.log(res, "res增")
+            // console.log(res, "res增")
             if (res.code == 200) {
               // this.sortData.operationTime = this.data5.grainConditionRecord.operationTime
 
-              console.log(this.houseId, "this.houseId")
-              console.log(this.data2.houseId, "this.data2.houseId")
+              // console.log(this.houseId, "this.houseId")
+              // console.log(this.data2.houseId, "this.data2.houseId")
               let auditState = 4 //4 是已完成
-              console.log(this.data2.houseId, "this.data2.houseId")
+              // console.log(this.data2.houseId, "this.data2.houseId")
               //判断是否切换仓房，或者仓房发生改变
               if (this.data2.houseId == this.houseId) {
                 haveDone(this.data2.id, auditState)
@@ -557,7 +557,7 @@ export default {
             query: { type: type, pid: row.id, data: row }
           })
         } else {
-          console.log(row, "科长，副总，总经理")
+          // console.log(row, "科长，副总，总经理")
           this.open(row,index)
         }
       } else if (Object.keys(this.data2).length !== 0) {