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

shanXiPlatform/src/api/reservesManagement/fumigationManagement.js

@@ -0,0 +1,84 @@
+import request from '@/utils/request'
+
+//机械通风列表
+export function getList(data) {
+    return request({
+      url: `csc-szls-business/ventilation/processAudit/getPage`,
+      method: 'post',
+      data
+    })
+  }
+
+
+
+  //新增时初始化页面数据
+  export function getAddList(type) {
+    return request({
+      url: `csc-szls-business/ventilation/processMain/getAllProcess/${type}`,
+      method: 'get',
+    
+    })
+  }  
+
+  //流程新增接口
+  export function addList(data) {
+    return request({
+      url: `csc-szls-business/ventilation/processAudit/add`,
+      method: 'post',
+      data
+    })
+  }
+
+
+  
+
+  //流程数据
+  export function getProcessList(type,userId,depotId) {
+    return request({
+      url: `csc-szls-business/ventilation/processBasis/getBasisByType/${type}/${userId}/${depotId}`,
+      method: 'get',
+    
+    })
+  }
+
+
+
+  //删除按钮
+  export function deleteTfList(id) {
+    return request({
+      url: `/csc-szls-business/ventilation/processAudit/deleteById/${id}`,
+      method: 'get',
+    
+    })
+  }
+
+
+  //用户字典列表
+  export function userList() {
+    return request({
+      url: `/csc-szls-system-manage/user/authority/getAll`,
+      method: 'get',
+    
+    })
+  }
+
+//查看接口
+
+export function checkList(processId) {
+  return request({
+    url: `/csc-szls-business/ventilation/processAudit/getDataByProcessId/${processId}`,
+    method: 'get',
+   
+  })
+}
+
+
+//步骤修改接口
+export function updateList(data) {
+  return request({
+    url: `/csc-szls-business/ventilation/processAudit/detailsAdd`,
+    method: 'post',
+    data
+  })
+}
+

shanXiPlatform/src/router/index.js

@@ -744,6 +744,32 @@ export const constantRoutes = [
         name: 'FumigationManagement',
         meta: { title: '熏蒸管理', icon: 'dashboard', affix: false }
       } */
+
+      //  储量管理/熏蒸管理
+      {
+        path: 'fumigationManagement',
+        component: () => import('@/views/reservesManagement/fumigationManagement/index'),
+        name: 'FumigationManagement',
+        meta: { title: '熏蒸管理', icon: 'tongfeng', affix: false, relation: 'house', istable: true },
+        resourceCode: 169
+      },
+      //  储量管理/熏蒸管理/新增
+      {
+        path: '/reservesManagement/fumigationManagement/steps',
+        component: () => import('@/views/reservesManagement/fumigationManagement/steps'),
+        name: 'FumigationManagementStep',
+        hidden: true,
+        meta: { title: '熏蒸管理新增', icon: 'dashboard', affix: false, noCache: true, relation: 'house', istable: false }
+      },
+
+      //  储量管理/熏蒸管理/已完成
+      {
+        path: '/reservesManagement/fumigationManagement/completed',
+        component: () => import('@/views/reservesManagement/fumigationManagement/completed'),
+        name: 'FumigationManagementCompleted',
+        hidden: true,
+        meta: { title: '熏蒸管理已完成', icon: 'dashboard', affix: false, noCache: true, relation: 'house', istable: false }
+      },
     ]
   },
 
@@ -852,9 +878,6 @@ export const constantRoutes = [
           name: 'FacilitiesManagemen',
           meta: { title: '设施管理', icon: 'dashboard', affix: false,istable: true ,relation: 'library'},
           resourceCode: 243,
-
-
-
           children: [
             {
               path: 'newFacilities',
@@ -864,9 +887,6 @@ export const constantRoutes = [
               hidden: true,
               meta: { title: '最新设施检查记录', icon: 'dashboard', affix: false,relation: 'library', istable: true}
             },
-
-
-
             {
               path: 'allFacilities',
               component: () => import('@/views/facilitiesEquipment/facilitiesManagement/allFacilities/index'),
@@ -875,24 +895,45 @@ export const constantRoutes = [
               hidden: true,
               meta: { title: '全部设施检查记录', icon: 'dashboard', affix: false ,relation: 'library', istable: true}
             },
+            // {
+            //   path: 'maintenance',
+            //   component: () => import('@/views/facilitiesEquipment/facilitiesManagement/maintenance/index'),
+            //   name: 'Maintenance',
 
+            //   hidden: true,
+            //   meta: { title: '设施维修改造', icon: 'dashboard', affix: false }
+            // },
 
+            //  设施维修改造
             {
               path: 'maintenance',
               component: () => import('@/views/facilitiesEquipment/facilitiesManagement/maintenance/index'),
               name: 'Maintenance',
-
               hidden: true,
-              meta: { title: '设施维修改造', icon: 'dashboard', affix: false }
+              meta: { title: '设施维修改造', icon: 'tongfeng', affix: false, relation: 'house', istable: true },
             },
-
-
           ]
+        },
+        //  设施维修改造/新增
+        {
+          path: '/facilitiesEquipment/facilitiesManagement/maintenance/steps',
+          component: () => import('@/views/facilitiesEquipment/facilitiesManagement/maintenance/steps'),
+          name: 'MaintenanceStep',
+          hidden: true,
+          meta: { title: '设施维修改造新增', icon: 'dashboard', affix: false, noCache: true, relation: 'house', istable: false }
+        },
 
-
+        //  设施维修改造/已完成
+        {
+          path: '/facilitiesEquipment/facilitiesManagement/maintenance/completed',
+          component: () => import('@/views/facilitiesEquipment/facilitiesManagement/maintenance/completed'),
+          name: 'MaintenanceCompleted',
+          hidden: true,
+          meta: { title: '设施维修改造已完成', icon: 'dashboard', affix: false, noCache: true, relation: 'house', istable: false }
         },
 
 
+
         //  设施设备/设施管理/新增
         {
           path: '/facilitiesManagement/addType',

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/facilitiesEquipment/facilitiesManagement/maintenance/completed.vue

@@ -0,0 +1,320 @@
+<template>
+  <div class="global">
+    <div class="mainContainer">
+      <div class="steps">
+        <el-steps :active="stepActive" align-center direction="horizontal">
+          <el-step
+          
+            style="color: black"
+            icon="iconfont iconrun-line"
+            v-for="(item, index) in tableData"
+              :title="item.step.title"
+            :key="index"
+            @click.native="stepClick(index)"
+          >
+            <template>
+              <i
+                slot="icon"
+                class="iconfont iconNotStarted"
+                v-if="stepActive < index"
+              />
+              <i
+                slot="icon"
+                class="iconfont iconcurrent"
+                v-if="stepActive == index"
+              />
+              <i
+                slot="icon"
+                class="iconfont iconfinished"
+                v-if="stepActive > index"
+              />
+            </template>
+          </el-step>
+        </el-steps>
+      </div>
+
+      <div id="step1">
+        <el-table
+          border
+          stripe
+          highlight-current-row
+          :data="totalData"
+          :span-method="arraySpanMethod"
+        >
+          <el-table-column
+            align="center"
+            label="序号"
+            width="100px"
+            type="index"
+          >
+            <template slot-scope="scope">
+              <div
+                v-if="
+                  scope.row.hasOwnProperty('process') &&
+                  scope.row.process.length != 0
+                "
+                style="height: 400px"
+              >
+                <div class="tf_title">
+                  <i class="iconfont iconshu"></i>流程（机械通风审批）
+                </div>
+                <el-steps direction="vertical" :active="processActive">
+                  <el-step
+                    v-for="(item, index) in scope.row.process"
+                    :key="index"
+                    icon="el-icon-edit"
+                  >
+                    <template>
+                      <div slot="title" class="stepTitle">
+                        <div class="stepTitleFont">
+                          {{ item.title }}
+                        </div>
+
+                        <div style="display: flex; flex-direction: column">
+                          <div
+                            :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>
+                      </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 v-else>{{ scope.row.index }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="时间"
+            prop="operationTime"
+            align="center"
+            width="300px"
+          >
+          </el-table-column>
+
+          <el-table-column prop="title" label="工作项" align="center" />
+          <el-table-column prop="option" label="选项" align="center">
+            <template slot-scope="scope">
+              <el-radio-group v-model="scope.row.subData">
+                <el-radio :label="0" :disabled="disabled">{{
+                  scope.row.details.split(",")[0]
+                }}</el-radio>
+                <el-radio :label="1" :disabled="disabled">{{
+                  scope.row.details.split(",")[1]
+                }}</el-radio>
+              </el-radio-group>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="btns">
+          <el-button class="backBtn" type="cancel" plain @click="goBack()"
+            >返回</el-button
+          >
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+//时间格式的转化
+import { getNowFormatDate } from "@/utils"
+import { checkList } from "@/api/reservesManagement/mechanicalVentilation"
+import { getUser } from "@/utils/auth"
+export default {
+  name: "AddMeVentilation",
+
+  data() {
+    return {
+      userInfo: {},
+      //人员字典数据
+      perList: {},
+      //流程id
+      processId: null,
+      //初始化点击的步骤
+      step: "",
+      //初始化步骤高亮显示到第几步
+      stepActive: null,
+      //表格数据
+      totalData: [],
+      tableData: [],
+      //审批流程
+      process: [],
+      disabled: true,
+    }
+  },
+  methods: {
+    //查看接口
+    getCheckList() {
+      var processId = this.processId
+      checkList(processId).then((res) => {
+        console.log(res, ".......")
+        if (res.code == 200) {
+          var index = 1
+          this.tableData = res.data.process
+          this.tableData.forEach((item1) => {
+            item1.list.forEach((item) => {
+              item.index = index
+              this.totalData.push(item)
+              index++
+            })
+          })
+          // console.log(this.totalData,"totalData.......")
+          for (let i = 0; i < res.data.audit.length - 1; i++) {
+            var ele = res.data.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.audit[0].content
+            }
+          }
+
+          // this.totalData[1].process=this.process;
+          this.totalData.splice(1, 0, { details: "是，否" })
+          this.$set(this.totalData[1], "process", this.process)
+          console.log(this.totalData, "totalData.......")
+        }
+      })
+    },
+    //合并列或行
+    arraySpanMethod({ row, column, rowIndex, columnIndex }) {
+      if (rowIndex === 1) {
+        if (columnIndex === 0) {
+          return [1, 4]
+        }
+      }
+    },
+
+    //点击返回按钮
+    goBack() {
+      this.$router.push({ path: "/reservesManagement/mechanicalVentilation" })
+    },
+  },
+  mounted() {
+    this.userInfo = JSON.parse(getUser())
+    console.log(this.userInfo, "this.userInfo.....?????")
+    this.processId = this.$route.query.processId
+    console.log(this.processId, "//////")
+    this.stepActive = parseInt(this.$route.query.ongoingStep)
+    this.getCheckList()
+    //获取人员字典数据
+    this.perList = JSON.parse(localStorage.getItem("perList"))
+  },
+}
+</script>
+<style lang="scss" scoped>
+.global {
+  height: calc(100vh - 70px - 83px);
+  min-height: 500px;
+  overflow-y: scroll;
+  .mainContainer {
+    background: #fff;
+    padding: 10px;
+    .steps {
+      height: 80px;
+      margin: 10px 0;
+
+      .iconfont {
+        font-size: 55px;
+      }
+    }
+    #step1,
+    #step2,
+    #step3,
+    #step4,
+    #process {
+      display: block;
+    }
+    #process {
+      margin-top: 20px;
+      padding: 20px;
+      background: rgb(235, 233, 233);
+      .process_title {
+        margin-bottom: 20px;
+      }
+      .stepTitle {
+        display: flex;
+        justify-content: space-between;
+      }
+    }
+    .stepTitle {
+      display: flex;
+      justify-content: space-between;
+    }
+    .btns {
+      text-align: right;
+      margin-top: 20px;
+    }
+    .active {
+      color: #037d41;
+    }
+    .noActive {
+      color: red;
+    }
+    .stepTitleFont {
+      color: black;
+    }
+    .tf_title {
+      margin-bottom: 20px;
+      font-weight: 500;
+      text-align: left;
+      color: #037d41;
+      font-size: 18px;
+    }
+  }
+}
+</style>
+<style>
+/* .backBtn.is-plain {
+  color: #037d41;
+  background-color: #fff;
+  border-color: #037d41;
+} */
+.el-steps {
+  height: 350px !important;
+}
+</style>

shanXiPlatform/src/views/facilitiesEquipment/facilitiesManagement/maintenance/index.vue

@@ -1,144 +1,401 @@
 <template>
-  <div class="container">
-    <div class="header">
-      <el-form :inline="true" :model="query" class="demo-form-inline">
-        <el-form-item label="维修时间:">
-          <el-date-picker
-            v-model="query.start"
-            type="date"
-            placeholder="选择日期"
-            format="yyyy 年 MM 月 dd 日"
-            value-format="yyyy-MM-dd"
-          >
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="-">
-          <el-date-picker
-            v-model="query.end"
-            type="date"
-            placeholder="选择日期"
-            format="yyyy 年 MM 月 dd 日"
-            value-format="yyyy-MM-dd"
+      <div class="container">
+        <div class="header">
+          <el-form :inline="true" :model="query" class="demo-form-inline">
+            <el-form-item label="检测时间">
+              <el-date-picker
+                v-model="query.value1"
+                type="daterange"
+                format="yyyy 年 MM 月 dd 日"
+                 value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              >
+              </el-date-picker>
+            </el-form-item>
+            <el-form-item>
+              <el-button
+                type="info"
+                plain
+                @click="clear()"
+                class="iconfont iconclear"
+              >
+                清空</el-button
+              >
+              <el-button
+                type="success"
+                icon="el-icon-search"
+                plain
+                @click="search()"
+                >查询</el-button
+              >
+            </el-form-item>
+          </el-form>
+          <div style="float:right">
+            <el-button
+              v-if="$tools.IsPermission(228)"
+              type="success"
+              icon="el-icon-circle-plus"
+              plain
+              @click="add(1)"
+              >新增</el-button
+            >
+          </div>
+        </div>
+
+        <el-table
+          border
+          stripe
+          :data="tfData"
+          highlight-current-row
+          style="width: 100%"
+          :header-cell-style="{ background: '#f8f8f8' }"
+        >
+          <el-table-column
+            :index="indexMethod"
+            type="index"
+            align="center"
+            label="序号"
+            width="50px"
           >
-          </el-date-picker>
-        </el-form-item>
+          </el-table-column>
 
-        <el-form-item>
-          <el-button type="success" plain @click="search()">查询</el-button>
-          <el-button type="success" plain @click="clear()">清空</el-button>
-        </el-form-item>
-      </el-form>
+          <el-table-column prop="type" label="类型" align="center">
+          </el-table-column>
+          <el-table-column prop="applyTime" label="时间" align="center">
+          </el-table-column>
+          <el-table-column prop="auditState" label="状态" align="center">
+            <template slot-scope="scope">
+              <div v-if="scope.row.auditState == 0">待审批</div>
+              <div v-if="scope.row.auditState == 1">待审批</div>
+              <div v-if="scope.row.auditState == 2">审批不通过</div>
+              <div v-if="scope.row.auditState == 3">进行中</div>
+              <div v-if="scope.row.auditState == 4">已完成</div>
+            </template>
+          </el-table-column>
 
-      <div>
-          <el-button type="success" plain>新增</el-button>
-      </div>
-    </div>
-
-    <el-table
-      border
-      stripe
-      :data="maintence"
-      highlight-current-row
-      @current-change="handleCurrentChange"
-      style="width: 100%"
-    >
-      <el-table-column type="index" align="center" label="序号" width="50px">
-      </el-table-column>
-
-      <el-table-column prop="name" label="名称" align="center">
-      </el-table-column>
-      <el-table-column prop="checkTime" label="检查时间" align="center">
-      </el-table-column>
-      <el-table-column prop="status" label="状态" align="center">
-      </el-table-column>
-
-      <el-table-column
-        prop="operation"
-        label="操作"
-        align="center"
-        width="300px"
-      >
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            @click="handleCheck(3, scope.$index, scope.row)"
-            >查看</el-button
+          <el-table-column
+            prop="operation"
+            label="操作"
+            align="center"
+            width="300px"
           >
+            <template slot-scope="scope">
+              <el-button
+                v-if="$tools.IsPermission(230)"
+                size="mini"
+                type="detailbtn"
+                @click="handleCheck(3, scope.$index, scope.row)"
+                >查看</el-button
+              >
 
-          <el-button size="mini" @click="handleDelete(scope.$index, scope.row)"
-            >删除</el-button
-          >
-        </template>
-      </el-table-column>
-    </el-table>
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="listQuery.page"
-      :limit.sync="listQuery.limit"
-      @pagination="getPageList(page, limit)"
-    />
-  </div>
+              <el-button
+                size="mini"
+                type="editbtn"
+                @click="handleEdit(2, scope.$index, scope.row)"
+                v-if="
+                  scope.row.auditState != 0 &&
+                  scope.row.auditState != 4 &&
+                  scope.row.auditState != 1 &&
+                  scope.row.auditState != 2 &&
+                  $tools.IsPermission(229)
+                "
+                >修改</el-button
+              >
+              <!-- <el-button
+                size="mini"
+                type="danger"
+                plain
+                @click="handleDelete(scope.$index, scope.row)"
+                >删除</el-button
+              > -->
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-pagination
+          background
+          @size-change="sizeChange"
+          @current-change="handleCurrentChange"
+          :page-count="5"
+          :page-sizes="[10, 20, 30, 40]"
+          :page-size="pagination.pageSize"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="pagination.total"
+        ></el-pagination>
+      </div>
 </template>
 <script>
+//引入分页
 import Pagination from "@/components/Pagination"
+import {
+  getList,
+  deleteTfList,
+} from "@/api/reservesManagement/fumigationManagement"
+import { getUser } from "@/utils/auth"
 export default {
   components: { Pagination },
   data() {
     return {
+      //存储用户信息
+      userInfo: {},
+      //仓房编号
+      houseId: this.$store.state.houseId,
+      //库编号
+      depotId: this.$store.state.depotId,
+      //类型
+      type: "tf",
+      value: "",
       query: {
-        start: "",
-        end: "",
+        // startTime: "",
+        // endTime: "",
+        value1:""
       },
-
       //分页
-      total: 30,
-      listLoading: true,
-      listQuery: {
-        page: 1,
-        limit: 10,
-        importance: undefined,
-        title: undefined,
-        type: undefined,
-        sort: "+id",
+
+      pagination: {
+        //当前页数
+        curPage: 1,
+        //每页显示的条数
+        pageSize: 10,
+        //总条数
+        total: 0,
       },
+      // 列表数据
+      tfData: [],
+    }
+  },
+  methods: {
+    //新增
+    add(type) {
+      this.$router.push({
+        path: "/facilitiesEquipment/facilitiesManagement/maintenance/steps",
+        query: {
+          type: type,
+        },
+      })
+    },
+    //查看
+    handleCheck(type, index, row) {
+      console.log(row, "row")
 
-      maintence: [
-        {
-          name: "设施维修改造",
-          checkTime: "2020-2-2",
+      if (row.auditState == 4) {
+        console.log(4444444)
+        this.$router.push({
+          path: "/facilitiesEquipment/facilitiesManagement/maintenance/completed",
+          query: {
+            type: type,
+            processId: row.processId,
+            ongoingStep: row.ongoingStep,
+          },
+        })
+      } else {
+        console.log(row.auditState, "row.status....")
+        this.$router.push({
+          path: "/facilitiesEquipment/facilitiesManagement/maintenance/steps",
+          query: {
+            type: type,
+            processId: row.processId,
+            ongoingStep: row.ongoingStep,
+          },
+        })
+      }
+    },
 
-          status: "已完成",
+    //修改
+    handleEdit(type, index, row) {
+      console.log(row, "修改row...")
+      this.$router.push({
+        path: "/facilitiesEquipment/facilitiesManagement/maintenance/steps",
+        query: {
+          type: type,
+          processId: row.processId,
+          ongoingStep: row.ongoingStep,
+          auditState: row.auditState,
         },
-         {
-          name: "设施维修改造",
-          checkTime: "2020-2-2",
+      })
+    },
 
-          status: "已完成",
-        },
-         {
-          name: "设施维修改造",
-          checkTime: "2020-2-2",
+    //删除接口
+    deleteList() {
+      console.log("shancuu")
+      this.$confirm("确定删除该项记录?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        console.log(11111)
 
-          status: "已完成",
-        },
-      ],
-    }
+        var id = this.id
+
+        console.log(id, "删除id")
+        deleteTfList(id)
+          .then((res) => {
+            if (res.code == 200) {
+              this.tfList()
+              this.$message({
+                type: "success",
+                message: "删除成功!",
+              })
+            }
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消删除",
+            })
+          })
+      })
+    },
+    //删除
+    handleDelete(index, row) {
+      console.log(row, "row....")
+      this.id = row.id
+      this.deleteList()
+    },
+
+    //获取列表
+    tfList() {
+      var condition = {
+        houseId: this.houseId,
+        depotId: this.depotId,
+        type: this.type,
+        startTime: this.query.value1[0],
+        endTime: this.query.value1[1],
+       
+      }
+      console.log(condition, "condition.....")
+      condition = JSON.stringify(condition)
+      var data = {
+        pageIndex: this.pagination.curPage,
+        pageSize: this.pagination.pageSize,
+        condition: condition,
+      }
+      getList(data)
+        .then((res) => {
+          if (res.code == 200) {
+            // this.tfData = res.data.list;
+            this.tfData = res.data.records
+            this.tfData.forEach((item) => {
+              if (item.type == "tf") {
+                item.type = "熏蒸管理"
+              }
+            })
+
+            this.pagination.pageSize = res.data.size
+            this.pagination.total = res.data.total
+          }
+        })
+        .catch((err) => {
+          console.log(err)
+        })
+    },
+    //清空
+    clear() {
+      this.query.value1 = []
+      this.tfList()
+    },
+
+    //查询
+    search() {
+      
+      this.tfList()
+    },
+    //当前页发生变化时
+    handleCurrentChange(val) {
+      console.log(val, "val...")
+      this.pagination.curPage = val
+      this.tfList()
+    },
+
+    //页数大小发生变化时
+    sizeChange(v) {
+      this.pagination.pageSize = v
+      this.tfList()
+    },
+
+    /* ----- 格式化表格序号 -----*/
+    indexMethod(index) {
+      return (
+        (this.pagination.curPage - 1) * this.pagination.pageSize + index + 1
+      )
+    },
   },
-  methods: {
-    handleCurrentChange() {},
+
+  computed: {
+    HouseId() {
+      return this.$store.state.houseId
+    },
+    // DepotId() {
+    //   return this.$store.state.depotId
+    // },
+  },
+  watch: {
+    HouseId: function (val) {
+      // findbyTreeDatac(this.$store.state.depotId).then(res => {
+      //   this.treeData = res.data
+      // })
+      this.houseId = val
+      var houseData = JSON.parse(localStorage.getItem("houseData"))
+      console.log(houseData, "houseData...")
+
+      this.depotId = houseData.parentCode
+      console.log(this.depotId, "库id")
+      this.tfList()
+    },
+  },
+  mounted() {
+    console.log(this.$store.state.houseId, ">>>>>>>???????")
+
+    //获取当前缓存的用户信息
+    // 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.tfList()
+
+    // this.bus.$on("tfList", function() {
+    //     this.tfList();
+    //   });
   },
 }
 </script>
-<style lang="scss">
-.container {
-  padding: 10px;
-  .header {
+<style lang="scss" scoped>
+.contentContainer {
+  background: #fff;
+  .top {
+    padding-left: 10px;
     height: 40px;
     line-height: 40px;
-    display: flex;
-    justify-content: space-between;
-    margin-bottom: 20px;
+    border-bottom: 1px solid #ccc;
+    font-weight: 400;
+    font-size: 16px;
+  }
+  .container {
+    padding: 10px;
+    .header {
+      height: 40px;
+      line-height: 40px;
+      display: flex;
+      justify-content: space-between;
+      margin-bottom: 20px;
+    }
+    .el-pagination {
+      text-align: right;
+      margin-top: 20px;
+    }
+  }
+  .checkBtn.is-plain {
+    color: #037d41;
+    background-color: #fff;
+    border-color: #037d41;
+  }
+  .checkBtn.is-plain:hover {
+    color: #fff !important;
+    background-color: #13ce66 !important;
+    border: 1px solid #13ce66 !important;
   }
 }
 </style>
+<style>
+</style>

shanXiPlatform/src/views/facilitiesEquipment/facilitiesManagement/maintenance/steps.vue

@@ -0,0 +1,805 @@
+<template>
+  <div class="global">
+    <div class="mainContainer">
+      <div class="div_parent">
+      <div class="steps">
+        <el-steps :active="stepActive" align-center direction="horizontal">
+          <el-step
+            id="el_step"
+            :title="item.step.title"
+            v-for="(item, index) in totalData"
+            :key="index"
+            @click.native="stepClick(index)"
+          >
+            <svg-icon
+            class='icon_wai'
+              slot="icon"
+              icon-class="NotStarted"
+              v-if="stepActive < index"
+            />
+            <svg-icon
+             class='icon_wai'
+              slot="icon"
+              icon-class="current"
+              v-if="stepActive == index"
+            />
+            <svg-icon
+             class='icon_wai'
+              slot="icon"
+              icon-class="finished"
+              v-if="stepActive > index"
+            />
+
+            <!-- <template>
+              <i
+                slot="icon"
+                class="iconfont iconNotStarted"
+                v-if="stepActive < index"
+              />
+              <i
+                slot="icon"
+                class="iconfont iconcurrent"
+                v-if="stepActive == index"
+              />
+              <i
+                slot="icon"
+                class="iconfont iconfinished"
+                v-if="stepActive > index"
+              />
+            </template> -->
+          </el-step>
+        </el-steps>
+      </div>
+
+      <div id="step1">
+        <el-table
+          border
+          stripe
+          highlight-current-row
+          :data="tableData"
+          :span-method="arraySpanMethod"
+        >
+          <el-table-column
+            label="序号"
+            prop="step"
+            align="center"
+            width="100px"
+          >
+            <template slot-scope="scope">
+              <div
+                v-if="
+                  scope.row.hasOwnProperty('process') &&
+                  scope.row.process.length != 0
+                "
+                style="height: 400px"
+              >
+                <div class="tf_title">
+                  <i class="iconfont iconshu"></i>流程（熏蒸管理审批）
+                </div>
+                <el-steps direction="vertical" :active="1">
+                  <el-step
+                    v-for="(item, index) in scope.row.process"
+                    :key="index"
+                    icon="el-icon-edit"
+                  >
+                    <template>
+                      <div
+                        slot="title"
+                        class="stepTitle"
+                        style="display: flex; justify-content: space-between"
+                      >
+                        <div class="stepTitleFont">
+                          {{ item.title }}
+                        </div>
+
+                        <div style="width: 200px">
+                          <div
+                            :class="{
+                              active:
+                                (item.auditState == null &&
+                                  processActive >= index) ||
+                                item.auditState == 1,
+                              noActive: item.auditState == 2,
+                            }"
+                          >
+                            {{ perList[item.content] }}
+                          </div>
+                          <div v-if="item.auditState == 0">待审批</div>
+                          <div v-if="item.auditState == 1">审批通过</div>
+                          <div v-if="item.auditState == 2">审批不通过</div>
+                          <div class="stepTitleFont">{{ item.auditTime }}</div>
+
+                          <div style="width: 200px; display: flex">
+                            <!-- <el-button
+                              type="danger"
+                              size="mini"
+                              v-if="
+                                item.content == userInfo.uid &&
+                                item.auditState == 0
+                              "
+                              @click="noAgree(item)"
+                              >审批不通过</el-button
+                            >
+                            <el-button
+                              type="success"
+                              size="mini"
+                              v-if="
+                                item.content == userInfo.uid &&
+                                item.auditState == 0
+                              "
+                              @click="agree(item)"
+                              >审批通过</el-button
+                            > -->
+                          </div>
+                        </div>
+                      </div>
+                    </template>
+                    <template>
+                      <i
+                        slot="icon"
+                        class="iconfont iconstep_current"
+                        v-if="item.auditState != 2 && processActive <= index"
+                      >
+                      </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="
+                          (processActive == index && item.auditState == 4) ||
+                          processActive > index
+                        "
+                      ></i>
+                    </template>
+                  </el-step>
+                </el-steps>
+              </div>
+              <div v-else>{{ scope.row.step }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="operationTime" label="时间" align="center">
+          </el-table-column>
+
+          <el-table-column prop="title" label="工作项" align="center" />
+          <el-table-column prop="details" label="选项" align="center">
+            <template slot-scope="scope">
+              <el-radio-group
+                v-model="scope.row.subData"
+                @change="radioChange(scope.row)"
+              >
+                <el-radio :label="0" :disabled="pageType == 3 || disabled">{{
+                  scope.row.details.split(",")[0]
+                }}</el-radio>
+                <el-radio :label="1" :disabled="pageType == 3 || disabled">{{
+                  scope.row.details.split(",")[1]
+                }}</el-radio>
+              </el-radio-group>
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <div class="btns">
+          <el-button  type="cancel"  @click="goBack()"
+            >返回</el-button
+          >
+          <el-button class="saveBtn" v-show="isShow" type="savebtn"  @click="save()" :loading="loading">{{
+            this.button
+          }}</el-button>
+        </div>
+      </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+//时间格式的转化
+import { getNowFormatDate } from "@/utils"
+import { getUser } from "@/utils/auth"
+import {
+  addList,
+  getAddList,
+  getProcessList,
+  userList,
+  checkList,
+  updateList,
+} from "@/api/reservesManagement/mechanicalVentilation"
+
+import { pSelect } from "@/api/system/userManagement/approver"
+export default {
+  name: "AddMeVentilation",
+
+  data() {
+    return {
+      //进度条
+      loading:false,
+      isShow: true,
+      //初始化空对象
+      obj: {},
+      pageType: 0,
+
+      //流程id
+      processId: "",
+      //当前登录人信息
+      userInfo: {},
+      //仓房id
+      houseId: null,
+      //仓库id
+      depotId: null,
+      perList: {},
+      //人员列表
+      approverSelect: [],
+      //初始化当前登录人
+      loginPeople: "",
+      index: null,
+      //状态  3=进行中
+      auditState: 3,
+      //当前流程索引值
+      ongongstep: null,
+      //申请人
+      applyPeople: null,
+
+      //审批人id
+      //toPeople:null,
+      //提交人
+      fromPeople: null,
+      //主流程id
+      mainId: null,
+      //初始化流程高亮显示
+      processActive: 0,
+      //初始化radio是否禁用
+      disabled: false,
+      //初始化按钮的内容为空
+      button: "",
+      //初始化表格数据
+      tableData: [],
+      //初始化点击的步骤
+      step: 0,
+      //初始化步骤高亮显示到第几步
+      stepActive: 0,
+      //步骤1
+      totalData: [],
+
+      //审批流程
+      process: [],
+      //流程选项
+
+      subList: [],
+    }
+  },
+  methods: {
+    //合并列或行
+    arraySpanMethod({ row, column, rowIndex, columnIndex }) {
+      if (this.step != 1) {
+        return
+      }
+      if (rowIndex === 1) {
+        if (columnIndex === 0) {
+          return [1, 4]
+        }
+      }
+    },
+
+    // 用户字典列表
+    getUserList() {
+      // var params = {
+      //   depotId: this.depotId,
+      // }
+      userList().then((res) => {
+        if (res.code == 200) {
+          console.log(res, "用户列表。。。。。")
+          this.perList = res.data
+        }
+      })
+    },
+
+    //获取流程数据
+    processList() {
+      var type = "tf"
+      var userId = this.userInfo.uid
+      var depotId = this.userInfo.depotId
+      getProcessList(type, userId, depotId).then((res) => {
+        if (res.code == 200) {
+          for (let i = 0; i < res.data.length - 1; i++) {
+            var ele = res.data[i]
+            if (ele.auditState != null) {
+              this.processActive = i
+            }
+            console.log(ele, "ele.....")
+
+            this.process.push(ele)
+          }
+          // this.process[0].uName = this.userInfo.uname;
+          console.log(this.process, "this.process...")
+
+          if (this.process[0].content == 0) {
+            this.process[0].content = this.userInfo.uid
+            console.log(this.process[0].content, "this.process[0].content....")
+          }
+
+          //申请人
+          this.applyPeople = this.process[0].content
+          //审批人
+          // this.toPeople=this.process[1].content;
+          //提交人
+          this.fromPeople = this.process[0].content
+        }
+      })
+    },
+
+    //初始化应该显示第几步的表格、
+    tableShow() {
+      if (this.stepActive == 0) {
+        this.tableData = this.totalData[0].list
+        // this.subList = this.tableData
+        //主流程ID
+        this.mainId = this.totalData[0].step.id
+      } else if (this.stepActive == 1) {
+        this.tableData = this.totalData[1].list
+      } else if (this.stepActive == 2) {
+        this.tableData = this.totalData[2].list
+      } else if (this.stepActive == 3) {
+        this.tableData = this.totalData[3].list
+      }
+      // this.tableData = this.totalData[this.stepActive].list
+    },
+    //radio选项改变是
+    radioChange(row) {
+      console.log(getNowFormatDate())
+      row.operationTime = getNowFormatDate()
+      this.changeBtn(this.tableData)
+    },
+
+    changeBtn(arr) {
+      console.log(arr, "arrr")
+      //完成标记
+      var finish = true
+      for (var i = 0; i < arr.length; i++) {
+        if (arr[i].process == null && arr[i].subData == null) {
+          finish = false
+          break
+        }
+      }
+
+      if (finish) {
+        if (this.stepActive == 0) {
+          this.button = "保存并提交"
+        } else if (this.stepActive != 3 || this.step != 4) {
+          this.button = "保存"
+        } else {
+          this.button = "完成"
+        }
+      } else {
+        if (this.step == 1) {
+          this.button = "保存并提交"
+        } else {
+          this.button = "暂存"
+        }
+      }
+    },
+    //点击每步时
+    stepClick(index) {
+      //this.step = index + 1
+      console.log(this.step, this.stepActive + 1)
+      if (index > this.stepActive) {
+        return
+      }
+      this.step = index + 1
+
+      if (this.pageType == 2) {
+        this.isShow = true
+      } else {
+        this.isShow = false
+      }
+
+      console.log("step:" + this.step);
+
+      if (this.step == 1) {
+        this.tableData = this.totalData[0].list
+
+        this.button = "保存并提交"
+        //2修改  3查看
+
+        // if (this.pageType == 2||this.pageType ==3) {
+        //   //保存按钮隐藏
+        //   this.isShow = false
+        //   //  this.disabled=true
+        //  console.log(this.disabled,"this.disabled...")
+
+        // }else{
+        //    this.isShow = true
+        // }
+
+        // if(this.pageType !=3){
+        //   this.disabled=false
+        // }else{
+        //   this.disabled = true
+        // }
+        if (this.pageType == 1) {
+          this.disabled = false
+          this.isShow = true
+        } else if (this.pageType == 2) {
+          this.disabled = true;
+          this.isShow = false
+        } else {
+          this.disabled = true
+          this.isShow = false
+        }
+      } else if (this.step == 2) {
+        // this.isShow = true
+        this.tableData = this.totalData[1].list
+        console.log(this.tableData, "第二步")
+        this.button = "暂存"
+        this.disabled = false
+      } else if (this.step == 3) {
+        // this.isShow = true
+        this.tableData = this.totalData[2].list
+        this.button = "暂存"
+        this.disabled = false
+      } else if (this.step == 4) {
+        // this.isShow = true
+        this.tableData = this.totalData[3].list
+        this.button = "暂存"
+        this.disabled = false
+      }
+      console.log(this.tableData, "???")
+      this.changeBtn(this.tableData)
+    },
+
+    //点击返回按钮
+    goBack() {
+      this.$router.push({ path: "/reservesManagement/mechanicalVentilation" })
+    },
+    //新增时初始化页面
+    processFirst() {
+      var type = "tf"
+      getAddList(type)
+        .then((res) => {
+          if (res.code == 200) {
+            this.totalData = res.data
+
+            this.totalData[0].list.splice(1, 0, {
+              details: "是，否",
+              process: this.process,
+            })
+
+            // this.$set(this.totalData[0].list, "process", this.process)
+            this.main_id = this.totalData[0].step.id
+            console.log(this.totalData, "this.totalData..")
+            this.tableShow()
+          }
+        })
+        .catch((err) => {
+          console.log(err)
+        })
+    },
+
+    //流程新增
+    tfAdd() {
+      this.loading=true;
+      var data = {
+        //流程类型
+        type: "tf",
+        //主流程id
+        mainId: this.mainId,
+        //主流程索引
+        ongoingStep: this.stepActive,
+
+        subList: this.subList,
+        //仓房id
+        houseId: this.$store.state.houseId,
+        //库id
+        depotId: this.$store.state.depotId,
+        //发起人
+        fromPeople: this.fromPeople,
+        //申请人
+        applyPeople: this.applyPeople,
+        //审批人
+        toPeople: this.toPeople,
+        //申请时间
+        applyTime: getNowFormatDate(),
+      }
+      console.log(data, "新增数据。。。")
+      addList(data)
+        .then((res) => {
+          console.log(res.data)
+          if (res.code == 200) {
+            this.loading=true;
+            this.$router.push({
+              path: "/reservesManagement/mechanicalVentilation",
+            })
+          }
+        })
+        .catch((err) => {
+          console.log(err)
+        })
+    },
+
+    //点击保存并提交按钮时
+    save() {
+      console.log(this.tableData,"this.tableData...>>>>>")
+      if( this.totalData[0].list[0].subData == 1){
+         this.$message("只有选择是才能发起申请");
+        return;
+      }
+      this.tableData.forEach((ele) => {
+        var obj = {}
+        console.log(ele)
+        obj.subData = ele.subData
+        obj.subId = ele.id
+        obj.mainId = ele.zid
+        obj.operationTime = ele.operationTime
+        console.log(obj, "obj.....")
+        if (obj.subData != null) {
+          this.subList.push(obj)
+        }
+      })
+      console.log(this.subList, "??????")
+
+      if (this.button == "保存并提交") {
+        console.log(this.totalData, "......")
+        console.log(this.process, "process....s")
+        if (this.totalData[0].list[0].subData == null) {
+          this.$message("请先选择选项");
+          
+         
+          return;
+           
+        }
+         
+        //判断是否选择了审批人
+        var flag = true
+        this.process.forEach((item) => {
+          if (item.content == null) {
+            this.$message("请先选择审批人")
+            flag = false
+            return
+          }
+        })
+
+        if (flag) {
+          // if(this.totalData[0].list[0].subData == 1){
+            
+          //    this.$message("只有选择是才能发起申请");
+            
+          //    return;
+          // }
+          this.tfAdd()
+         
+        
+        }
+      } else {
+        //this.getUpdateList()
+        if (this.button == "暂存") {
+          this.auditState = 3
+          this.ongoingStep = this.stepActive
+          this.getUpdateList()
+        } else if (this.button == "保存" || this.button == "完成") {
+          console.log("保存。。")
+          if (this.stepActive + 1 == this.step) {
+            this.stepActive = this.stepActive + 1
+          }
+          if (this.button == "保存") {
+            this.auditState = 3
+          } else {
+            this.auditState = 4
+          }
+
+          // if (this.stepActive < this.tableData.length - 1) {
+          //   this.auditState = 3
+          //   this.stepActive = this.stepActive + 1
+          // } else {
+          //   this.auditState = 4
+          //   this.stepActive = this.stepActive + 1
+          // }
+
+          this.getUpdateList()
+        }
+      }
+    },
+
+    //查看接口
+    getCheckList() {
+      var processId = this.processId
+      checkList(processId).then((res) => {
+        console.log(res.data, "查看数据")
+        if (res.code == 200) {
+          this.tableData = res.data.process
+          this.totalData = this.tableData
+
+          for (let i = 0; i < res.data.audit.length - 1; i++) {
+            var ele = res.data.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.audit[0].content
+            }
+          }
+          console.log(this.process, " this.process.....")
+          console.log(this.stepActive, "this.stepActive...")
+          this.tableData = res.data.process[this.stepActive].list
+          console.log(this.tableData, "tableData.......??????")
+          this.totalData[0].list.splice(1, 0, {
+            details: "是，否",
+            process: this.process,
+          })
+        }
+      })
+    },
+
+    //每步新增/修改
+    getUpdateList() {
+      this.loading=true;
+      var data = {
+        processId: this.processId,
+        type: "tf",
+        auditState: this.auditState,
+        ongoingStep: this.stepActive,
+        subList: this.subList,
+      }
+      updateList(data).then((res) => {
+        if (res.code == 200) {
+          this.loading=false;
+          this.$router.push({
+            path: "/reservesManagement/mechanicalVentilation",
+          })
+        }
+      })
+    },
+  },
+
+  mounted() {
+    //获取当前缓存的用户信息
+    // this.userInfo = JSON.parse(localStorage.getItem("userInfo"))
+    // console.log(this.userInfo, "this.userInfo.....")
+    this.userInfo = JSON.parse(getUser())
+    console.log(this.userInfo, "this.userInfo.....?????")
+
+    console.log(this.$route.query, "route...")
+    this.pageType = this.$route.query.type
+    console.log(this.pageType, "pageType......")
+    this.step = this.stepActive + 1
+    console.log(this.stepActive, "stepActive.....")
+
+    this.getUserList()
+    // this.userInfo = JSON.parse(localStorage.getItem("userInfo"))
+    // console.log(this.userInfo, "this.userInfo.....")
+
+    if (this.$route.query.type == 1) {
+      this.isShow = true
+      this.disabled = false
+      this.processFirst()
+      this.processList()
+    } else if (this.$route.query.type == 2) {
+      this.isShow = true
+      this.disabled = false
+      this.stepActive = parseInt(this.$route.query.ongoingStep)
+      console.log(this.stepActive, "修改this.stepActive....")
+      this.processId = this.$route.query.processId
+      // this.pageType = this.$route.query.type
+      this.step = this.stepActive + 1
+
+      this.getCheckList()
+    } else if (this.$route.query.type == 3) {
+      this.isShow = false
+      this.disabled = true
+      console.log(this.$route.query.processId, "this.$route.query....")
+      //返回按钮
+      // this.pageType = this.$route.query.type
+      this.processId = this.$route.query.processId
+      //高亮显示
+      this.stepActive = parseInt(this.$route.query.ongoingStep)
+      this.step = this.stepActive + 1
+      console.log(this.processId, "this.processId...")
+      this.getCheckList()
+    }
+
+    if (this.stepActive == 0) {
+      this.button = "保存并提交"
+    } else {
+      this.button = "暂存"
+    }
+  },
+} 
+</script>
+<style lang="scss" scoped>
+.mainContainer {
+  background: #fff;
+  padding: 10px;
+   height: calc(100% - 40px);
+ 
+  .div_parent{
+  height:100%;
+  overflow-y:auto ;
+  .steps {
+    height: 80px;
+    margin: 10px 0;
+    // line-height:80px;
+    .iconfont {
+      font-size: 55px;
+    }
+  }
+  #step1,
+  #step2,
+  #step3,
+  #step4,
+  #process {
+    display: block;
+  }
+  #process {
+    margin-top: 20px;
+    padding: 20px;
+    background: rgb(235, 233, 233);
+    .process_title {
+      margin-bottom: 20px;
+    }
+    .stepTitle {
+      display: flex;
+      justify-content: space-between;
+    }
+  }
+  .btns {
+    text-align: right;
+    margin: 20px 10px 0 0;
+  }
+  // .saveBtn{
+  //   width:120px;
+  // }
+  .active {
+    color: #037d41;
+  }
+  .noActive {
+    color: red;
+  }
+  .stepTitleFont {
+    color: black;
+  }
+  .tf_title {
+    margin-bottom: 20px;
+    font-weight: 500;
+    text-align: left;
+    color: #037d41;
+    font-size: 18px;
+  }
+  .el-steps {
+  height: 330px !important;
+}
+
+.icon_wai{
+  width:3em;
+  height:3em;
+}
+
+}
+
+}
+</style>
+<style>
+.backBtn.is-plain {
+  color: #037d41;
+  background-color: #fff;
+  border-color: #037d41;
+}
+.el-step__icon.is-text{
+  width:50px;
+  height:50px;
+}
+
+.el-step.is-horizontal .el-step__line{
+  top:21px !important;
+}
+.el-step__icon.is-text{
+  border:none !important;
+}
+
+
+</style>

shanXiPlatform/src/views/reservesManagement/fumigationManagement/completed.vue

@@ -0,0 +1,320 @@
+<template>
+  <div class="global">
+    <div class="mainContainer">
+      <div class="steps">
+        <el-steps :active="stepActive" align-center direction="horizontal">
+          <el-step
+          
+            style="color: black"
+            icon="iconfont iconrun-line"
+            v-for="(item, index) in tableData"
+              :title="item.step.title"
+            :key="index"
+            @click.native="stepClick(index)"
+          >
+            <template>
+              <i
+                slot="icon"
+                class="iconfont iconNotStarted"
+                v-if="stepActive < index"
+              />
+              <i
+                slot="icon"
+                class="iconfont iconcurrent"
+                v-if="stepActive == index"
+              />
+              <i
+                slot="icon"
+                class="iconfont iconfinished"
+                v-if="stepActive > index"
+              />
+            </template>
+          </el-step>
+        </el-steps>
+      </div>
+
+      <div id="step1">
+        <el-table
+          border
+          stripe
+          highlight-current-row
+          :data="totalData"
+          :span-method="arraySpanMethod"
+        >
+          <el-table-column
+            align="center"
+            label="序号"
+            width="100px"
+            type="index"
+          >
+            <template slot-scope="scope">
+              <div
+                v-if="
+                  scope.row.hasOwnProperty('process') &&
+                  scope.row.process.length != 0
+                "
+                style="height: 400px"
+              >
+                <div class="tf_title">
+                  <i class="iconfont iconshu"></i>流程（机械通风审批）
+                </div>
+                <el-steps direction="vertical" :active="processActive">
+                  <el-step
+                    v-for="(item, index) in scope.row.process"
+                    :key="index"
+                    icon="el-icon-edit"
+                  >
+                    <template>
+                      <div slot="title" class="stepTitle">
+                        <div class="stepTitleFont">
+                          {{ item.title }}
+                        </div>
+
+                        <div style="display: flex; flex-direction: column">
+                          <div
+                            :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>
+                      </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 v-else>{{ scope.row.index }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="时间"
+            prop="operationTime"
+            align="center"
+            width="300px"
+          >
+          </el-table-column>
+
+          <el-table-column prop="title" label="工作项" align="center" />
+          <el-table-column prop="option" label="选项" align="center">
+            <template slot-scope="scope">
+              <el-radio-group v-model="scope.row.subData">
+                <el-radio :label="0" :disabled="disabled">{{
+                  scope.row.details.split(",")[0]
+                }}</el-radio>
+                <el-radio :label="1" :disabled="disabled">{{
+                  scope.row.details.split(",")[1]
+                }}</el-radio>
+              </el-radio-group>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="btns">
+          <el-button class="backBtn" type="cancel" plain @click="goBack()"
+            >返回</el-button
+          >
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+//时间格式的转化
+import { getNowFormatDate } from "@/utils"
+import { checkList } from "@/api/reservesManagement/mechanicalVentilation"
+import { getUser } from "@/utils/auth"
+export default {
+  name: "AddMeVentilation",
+
+  data() {
+    return {
+      userInfo: {},
+      //人员字典数据
+      perList: {},
+      //流程id
+      processId: null,
+      //初始化点击的步骤
+      step: "",
+      //初始化步骤高亮显示到第几步
+      stepActive: null,
+      //表格数据
+      totalData: [],
+      tableData: [],
+      //审批流程
+      process: [],
+      disabled: true,
+    }
+  },
+  methods: {
+    //查看接口
+    getCheckList() {
+      var processId = this.processId
+      checkList(processId).then((res) => {
+        console.log(res, ".......")
+        if (res.code == 200) {
+          var index = 1
+          this.tableData = res.data.process
+          this.tableData.forEach((item1) => {
+            item1.list.forEach((item) => {
+              item.index = index
+              this.totalData.push(item)
+              index++
+            })
+          })
+          // console.log(this.totalData,"totalData.......")
+          for (let i = 0; i < res.data.audit.length - 1; i++) {
+            var ele = res.data.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.audit[0].content
+            }
+          }
+
+          // this.totalData[1].process=this.process;
+          this.totalData.splice(1, 0, { details: "是，否" })
+          this.$set(this.totalData[1], "process", this.process)
+          console.log(this.totalData, "totalData.......")
+        }
+      })
+    },
+    //合并列或行
+    arraySpanMethod({ row, column, rowIndex, columnIndex }) {
+      if (rowIndex === 1) {
+        if (columnIndex === 0) {
+          return [1, 4]
+        }
+      }
+    },
+
+    //点击返回按钮
+    goBack() {
+      this.$router.push({ path: "/reservesManagement/mechanicalVentilation" })
+    },
+  },
+  mounted() {
+    this.userInfo = JSON.parse(getUser())
+    console.log(this.userInfo, "this.userInfo.....?????")
+    this.processId = this.$route.query.processId
+    console.log(this.processId, "//////")
+    this.stepActive = parseInt(this.$route.query.ongoingStep)
+    this.getCheckList()
+    //获取人员字典数据
+    this.perList = JSON.parse(localStorage.getItem("perList"))
+  },
+}
+</script>
+<style lang="scss" scoped>
+.global {
+  height: calc(100vh - 70px - 83px);
+  min-height: 500px;
+  overflow-y: scroll;
+  .mainContainer {
+    background: #fff;
+    padding: 10px;
+    .steps {
+      height: 80px;
+      margin: 10px 0;
+
+      .iconfont {
+        font-size: 55px;
+      }
+    }
+    #step1,
+    #step2,
+    #step3,
+    #step4,
+    #process {
+      display: block;
+    }
+    #process {
+      margin-top: 20px;
+      padding: 20px;
+      background: rgb(235, 233, 233);
+      .process_title {
+        margin-bottom: 20px;
+      }
+      .stepTitle {
+        display: flex;
+        justify-content: space-between;
+      }
+    }
+    .stepTitle {
+      display: flex;
+      justify-content: space-between;
+    }
+    .btns {
+      text-align: right;
+      margin-top: 20px;
+    }
+    .active {
+      color: #037d41;
+    }
+    .noActive {
+      color: red;
+    }
+    .stepTitleFont {
+      color: black;
+    }
+    .tf_title {
+      margin-bottom: 20px;
+      font-weight: 500;
+      text-align: left;
+      color: #037d41;
+      font-size: 18px;
+    }
+  }
+}
+</style>
+<style>
+/* .backBtn.is-plain {
+  color: #037d41;
+  background-color: #fff;
+  border-color: #037d41;
+} */
+.el-steps {
+  height: 350px !important;
+}
+</style>

shanXiPlatform/src/views/reservesManagement/fumigationManagement/index.vue

@@ -0,0 +1,431 @@
+<template>
+  <div class="global">
+    <div class="contentContainer">
+      <div class="top">熏蒸管理</div>
+      <div class="container">
+        <div class="header">
+          <el-form :inline="true" :model="query" class="demo-form-inline">
+            <!-- <el-form-item label="检测时间">
+              <el-date-picker
+                v-model="query.startTime"
+                type="date"
+                placeholder="选择日期"
+                format="yyyy 年 MM 月 dd 日"
+                value-format="yyyy-MM-dd"
+              >
+              </el-date-picker>
+            </el-form-item>
+            <el-form-item>
+              <div style="display:inline-block;width:8px;border-top:1px solid #ccc"></div>
+            </el-form-item>
+          
+            <el-form-item label="">
+              <el-date-picker
+                v-model="query.endTime"
+                type="date"
+                placeholder="选择日期"
+                format="yyyy 年 MM 月 dd 日"
+                value-format="yyyy-MM-dd"
+              >
+              </el-date-picker>
+            </el-form-item> -->
+            <el-form-item label="检测时间">
+              <el-date-picker
+                v-model="query.value1"
+                type="daterange"
+                format="yyyy 年 MM 月 dd 日"
+                 value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              >
+              </el-date-picker>
+            </el-form-item>
+            <el-form-item>
+              <el-button
+                type="info"
+                plain
+                @click="clear()"
+                class="iconfont iconclear"
+              >
+                清空</el-button
+              >
+
+              <el-button
+                type="success"
+                icon="el-icon-search"
+                plain
+                @click="search()"
+                >查询</el-button
+              >
+            </el-form-item>
+          </el-form>
+          <div>
+            <el-button
+              v-if="$tools.IsPermission(228)"
+              type="success"
+              icon="el-icon-circle-plus"
+              plain
+              @click="add(1)"
+              >新增</el-button
+            >
+          </div>
+        </div>
+
+        <el-table
+          border
+          stripe
+          :data="tfData"
+          highlight-current-row
+          style="width: 100%"
+          :header-cell-style="{ background: '#f8f8f8' }"
+        >
+          <el-table-column
+            :index="indexMethod"
+            type="index"
+            align="center"
+            label="序号"
+            width="50px"
+          >
+          </el-table-column>
+
+          <el-table-column prop="type" label="类型" align="center">
+          </el-table-column>
+          <el-table-column prop="applyTime" label="时间" align="center">
+          </el-table-column>
+          <el-table-column prop="auditState" label="状态" align="center">
+            <template slot-scope="scope">
+              <div v-if="scope.row.auditState == 0">待审批</div>
+              <div v-if="scope.row.auditState == 1">待审批</div>
+              <div v-if="scope.row.auditState == 2">审批不通过</div>
+              <div v-if="scope.row.auditState == 3">进行中</div>
+              <div v-if="scope.row.auditState == 4">已完成</div>
+            </template>
+          </el-table-column>
+
+          <el-table-column
+            prop="operation"
+            label="操作"
+            align="center"
+            width="300px"
+          >
+            <template slot-scope="scope">
+              <el-button
+                v-if="$tools.IsPermission(230)"
+                size="mini"
+                type="detailbtn"
+                @click="handleCheck(3, scope.$index, scope.row)"
+                >查看</el-button
+              >
+
+              <el-button
+                size="mini"
+                type="editbtn"
+                @click="handleEdit(2, scope.$index, scope.row)"
+                v-if="
+                  scope.row.auditState != 0 &&
+                  scope.row.auditState != 4 &&
+                  scope.row.auditState != 1 &&
+                  scope.row.auditState != 2 &&
+                  $tools.IsPermission(229)
+                "
+                >修改</el-button
+              >
+              <!-- <el-button
+                size="mini"
+                type="danger"
+                plain
+                @click="handleDelete(scope.$index, scope.row)"
+                >删除</el-button
+              > -->
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-pagination
+          background
+          @size-change="sizeChange"
+          @current-change="handleCurrentChange"
+          :page-count="5"
+          :page-sizes="[10, 20, 30, 40]"
+          :page-size="pagination.pageSize"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="pagination.total"
+        ></el-pagination>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+//引入分页
+import Pagination from "@/components/Pagination"
+import {
+  getList,
+  deleteTfList,
+} from "@/api/reservesManagement/fumigationManagement"
+import { getUser } from "@/utils/auth"
+export default {
+  components: { Pagination },
+  data() {
+    return {
+      //存储用户信息
+      userInfo: {},
+      //仓房编号
+      houseId: this.$store.state.houseId,
+      //库编号
+      depotId: this.$store.state.depotId,
+      //类型
+      type: "tf",
+      value: "",
+      query: {
+        // startTime: "",
+        // endTime: "",
+        value1:""
+      },
+      //分页
+
+      pagination: {
+        //当前页数
+        curPage: 1,
+        //每页显示的条数
+        pageSize: 10,
+        //总条数
+        total: 0,
+      },
+      // 列表数据
+      tfData: [],
+    }
+  },
+  methods: {
+    //新增
+    add(type) {
+      this.$router.push({
+        path: "/reservesManagement/fumigationManagement/steps",
+        query: {
+          type: type,
+        },
+      })
+    },
+    //查看
+    handleCheck(type, index, row) {
+      console.log(row, "row")
+
+      if (row.auditState == 4) {
+        console.log(4444444)
+        this.$router.push({
+          path: "/reservesManagement/fumigationManagement/completed",
+          query: {
+            type: type,
+            processId: row.processId,
+            ongoingStep: row.ongoingStep,
+          },
+        })
+      } else {
+        console.log(row.auditState, "row.status....")
+        this.$router.push({
+          path: "/reservesManagement/fumigationManagement/steps",
+          query: {
+            type: type,
+            processId: row.processId,
+            ongoingStep: row.ongoingStep,
+          },
+        })
+      }
+    },
+
+    //修改
+    handleEdit(type, index, row) {
+      console.log(row, "修改row...")
+      this.$router.push({
+        path: "/reservesManagement/fumigationManagement/steps",
+        query: {
+          type: type,
+          processId: row.processId,
+          ongoingStep: row.ongoingStep,
+          auditState: row.auditState,
+        },
+      })
+    },
+
+    //删除接口
+    deleteList() {
+      console.log("shancuu")
+      this.$confirm("确定删除该项记录?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        console.log(11111)
+
+        var id = this.id
+
+        console.log(id, "删除id")
+        deleteTfList(id)
+          .then((res) => {
+            if (res.code == 200) {
+              this.tfList()
+              this.$message({
+                type: "success",
+                message: "删除成功!",
+              })
+            }
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消删除",
+            })
+          })
+      })
+    },
+    //删除
+    handleDelete(index, row) {
+      console.log(row, "row....")
+      this.id = row.id
+      this.deleteList()
+    },
+
+    //获取列表
+    tfList() {
+      var condition = {
+        houseId: this.houseId,
+        depotId: this.depotId,
+        type: this.type,
+        startTime: this.query.value1[0],
+        endTime: this.query.value1[1],
+       
+      }
+      console.log(condition, "condition.....")
+      condition = JSON.stringify(condition)
+      var data = {
+        pageIndex: this.pagination.curPage,
+        pageSize: this.pagination.pageSize,
+        condition: condition,
+      }
+      getList(data)
+        .then((res) => {
+          if (res.code == 200) {
+            // this.tfData = res.data.list;
+            this.tfData = res.data.records
+            this.tfData.forEach((item) => {
+              if (item.type == "tf") {
+                item.type = "熏蒸管理"
+              }
+            })
+
+            this.pagination.pageSize = res.data.size
+            this.pagination.total = res.data.total
+          }
+        })
+        .catch((err) => {
+          console.log(err)
+        })
+    },
+    //清空
+    clear() {
+      this.query.value1 = []
+      this.tfList()
+    },
+
+    //查询
+    search() {
+      
+      this.tfList()
+    },
+    //当前页发生变化时
+    handleCurrentChange(val) {
+      console.log(val, "val...")
+      this.pagination.curPage = val
+      this.tfList()
+    },
+
+    //页数大小发生变化时
+    sizeChange(v) {
+      this.pagination.pageSize = v
+      this.tfList()
+    },
+
+    /* ----- 格式化表格序号 -----*/
+    indexMethod(index) {
+      return (
+        (this.pagination.curPage - 1) * this.pagination.pageSize + index + 1
+      )
+    },
+  },
+
+  computed: {
+    HouseId() {
+      return this.$store.state.houseId
+    },
+    // DepotId() {
+    //   return this.$store.state.depotId
+    // },
+  },
+  watch: {
+    HouseId: function (val) {
+      // findbyTreeDatac(this.$store.state.depotId).then(res => {
+      //   this.treeData = res.data
+      // })
+      this.houseId = val
+      var houseData = JSON.parse(localStorage.getItem("houseData"))
+      console.log(houseData, "houseData...")
+
+      this.depotId = houseData.parentCode
+      console.log(this.depotId, "库id")
+      this.tfList()
+    },
+  },
+  mounted() {
+    console.log(this.$store.state.houseId, ">>>>>>>???????")
+
+    //获取当前缓存的用户信息
+    // 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.tfList()
+
+    // this.bus.$on("tfList", function() {
+    //     this.tfList();
+    //   });
+  },
+}
+</script>
+<style lang="scss" scoped>
+.contentContainer {
+  background: #fff;
+  .top {
+    padding-left: 10px;
+    height: 40px;
+    line-height: 40px;
+    border-bottom: 1px solid #ccc;
+    font-weight: 400;
+    font-size: 16px;
+  }
+  .container {
+    padding: 10px;
+    .header {
+      height: 40px;
+      line-height: 40px;
+      display: flex;
+      justify-content: space-between;
+      margin-bottom: 20px;
+    }
+    .el-pagination {
+      text-align: right;
+      margin-top: 20px;
+    }
+  }
+  .checkBtn.is-plain {
+    color: #037d41;
+    background-color: #fff;
+    border-color: #037d41;
+  }
+  .checkBtn.is-plain:hover {
+    color: #fff !important;
+    background-color: #13ce66 !important;
+    border: 1px solid #13ce66 !important;
+  }
+}
+</style>
+<style>
+</style>

shanXiPlatform/src/views/reservesManagement/fumigationManagement/steps.vue

@@ -0,0 +1,805 @@
+<template>
+  <div class="global">
+    <div class="mainContainer">
+      <div class="div_parent">
+      <div class="steps">
+        <el-steps :active="stepActive" align-center direction="horizontal">
+          <el-step
+            id="el_step"
+            :title="item.step.title"
+            v-for="(item, index) in totalData"
+            :key="index"
+            @click.native="stepClick(index)"
+          >
+            <svg-icon
+            class='icon_wai'
+              slot="icon"
+              icon-class="NotStarted"
+              v-if="stepActive < index"
+            />
+            <svg-icon
+             class='icon_wai'
+              slot="icon"
+              icon-class="current"
+              v-if="stepActive == index"
+            />
+            <svg-icon
+             class='icon_wai'
+              slot="icon"
+              icon-class="finished"
+              v-if="stepActive > index"
+            />
+
+            <!-- <template>
+              <i
+                slot="icon"
+                class="iconfont iconNotStarted"
+                v-if="stepActive < index"
+              />
+              <i
+                slot="icon"
+                class="iconfont iconcurrent"
+                v-if="stepActive == index"
+              />
+              <i
+                slot="icon"
+                class="iconfont iconfinished"
+                v-if="stepActive > index"
+              />
+            </template> -->
+          </el-step>
+        </el-steps>
+      </div>
+
+      <div id="step1">
+        <el-table
+          border
+          stripe
+          highlight-current-row
+          :data="tableData"
+          :span-method="arraySpanMethod"
+        >
+          <el-table-column
+            label="序号"
+            prop="step"
+            align="center"
+            width="100px"
+          >
+            <template slot-scope="scope">
+              <div
+                v-if="
+                  scope.row.hasOwnProperty('process') &&
+                  scope.row.process.length != 0
+                "
+                style="height: 400px"
+              >
+                <div class="tf_title">
+                  <i class="iconfont iconshu"></i>流程（熏蒸管理审批）
+                </div>
+                <el-steps direction="vertical" :active="1">
+                  <el-step
+                    v-for="(item, index) in scope.row.process"
+                    :key="index"
+                    icon="el-icon-edit"
+                  >
+                    <template>
+                      <div
+                        slot="title"
+                        class="stepTitle"
+                        style="display: flex; justify-content: space-between"
+                      >
+                        <div class="stepTitleFont">
+                          {{ item.title }}
+                        </div>
+
+                        <div style="width: 200px">
+                          <div
+                            :class="{
+                              active:
+                                (item.auditState == null &&
+                                  processActive >= index) ||
+                                item.auditState == 1,
+                              noActive: item.auditState == 2,
+                            }"
+                          >
+                            {{ perList[item.content] }}
+                          </div>
+                          <div v-if="item.auditState == 0">待审批</div>
+                          <div v-if="item.auditState == 1">审批通过</div>
+                          <div v-if="item.auditState == 2">审批不通过</div>
+                          <div class="stepTitleFont">{{ item.auditTime }}</div>
+
+                          <div style="width: 200px; display: flex">
+                            <!-- <el-button
+                              type="danger"
+                              size="mini"
+                              v-if="
+                                item.content == userInfo.uid &&
+                                item.auditState == 0
+                              "
+                              @click="noAgree(item)"
+                              >审批不通过</el-button
+                            >
+                            <el-button
+                              type="success"
+                              size="mini"
+                              v-if="
+                                item.content == userInfo.uid &&
+                                item.auditState == 0
+                              "
+                              @click="agree(item)"
+                              >审批通过</el-button
+                            > -->
+                          </div>
+                        </div>
+                      </div>
+                    </template>
+                    <template>
+                      <i
+                        slot="icon"
+                        class="iconfont iconstep_current"
+                        v-if="item.auditState != 2 && processActive <= index"
+                      >
+                      </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="
+                          (processActive == index && item.auditState == 4) ||
+                          processActive > index
+                        "
+                      ></i>
+                    </template>
+                  </el-step>
+                </el-steps>
+              </div>
+              <div v-else>{{ scope.row.step }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="operationTime" label="时间" align="center">
+          </el-table-column>
+
+          <el-table-column prop="title" label="工作项" align="center" />
+          <el-table-column prop="details" label="选项" align="center">
+            <template slot-scope="scope">
+              <el-radio-group
+                v-model="scope.row.subData"
+                @change="radioChange(scope.row)"
+              >
+                <el-radio :label="0" :disabled="pageType == 3 || disabled">{{
+                  scope.row.details.split(",")[0]
+                }}</el-radio>
+                <el-radio :label="1" :disabled="pageType == 3 || disabled">{{
+                  scope.row.details.split(",")[1]
+                }}</el-radio>
+              </el-radio-group>
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <div class="btns">
+          <el-button  type="cancel"  @click="goBack()"
+            >返回</el-button
+          >
+          <el-button class="saveBtn" v-show="isShow" type="savebtn"  @click="save()" :loading="loading">{{
+            this.button
+          }}</el-button>
+        </div>
+      </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+//时间格式的转化
+import { getNowFormatDate } from "@/utils"
+import { getUser } from "@/utils/auth"
+import {
+  addList,
+  getAddList,
+  getProcessList,
+  userList,
+  checkList,
+  updateList,
+} from "@/api/reservesManagement/fumigationManagement"
+
+import { pSelect } from "@/api/system/userManagement/approver"
+export default {
+  name: "AddMeVentilation",
+
+  data() {
+    return {
+      //进度条
+      loading:false,
+      isShow: true,
+      //初始化空对象
+      obj: {},
+      pageType: 0,
+
+      //流程id
+      processId: "",
+      //当前登录人信息
+      userInfo: {},
+      //仓房id
+      houseId: null,
+      //仓库id
+      depotId: null,
+      perList: {},
+      //人员列表
+      approverSelect: [],
+      //初始化当前登录人
+      loginPeople: "",
+      index: null,
+      //状态  3=进行中
+      auditState: 3,
+      //当前流程索引值
+      ongongstep: null,
+      //申请人
+      applyPeople: null,
+
+      //审批人id
+      //toPeople:null,
+      //提交人
+      fromPeople: null,
+      //主流程id
+      mainId: null,
+      //初始化流程高亮显示
+      processActive: 0,
+      //初始化radio是否禁用
+      disabled: false,
+      //初始化按钮的内容为空
+      button: "",
+      //初始化表格数据
+      tableData: [],
+      //初始化点击的步骤
+      step: 0,
+      //初始化步骤高亮显示到第几步
+      stepActive: 0,
+      //步骤1
+      totalData: [],
+
+      //审批流程
+      process: [],
+      //流程选项
+
+      subList: [],
+    }
+  },
+  methods: {
+    //合并列或行
+    arraySpanMethod({ row, column, rowIndex, columnIndex }) {
+      if (this.step != 1) {
+        return
+      }
+      if (rowIndex === 1) {
+        if (columnIndex === 0) {
+          return [1, 4]
+        }
+      }
+    },
+
+    // 用户字典列表
+    getUserList() {
+      // var params = {
+      //   depotId: this.depotId,
+      // }
+      userList().then((res) => {
+        if (res.code == 200) {
+          console.log(res, "用户列表。。。。。")
+          this.perList = res.data
+        }
+      })
+    },
+
+    //获取流程数据
+    processList() {
+      var type = "tf"
+      var userId = this.userInfo.uid
+      var depotId = this.userInfo.depotId
+      getProcessList(type, userId, depotId).then((res) => {
+        if (res.code == 200) {
+          for (let i = 0; i < res.data.length - 1; i++) {
+            var ele = res.data[i]
+            if (ele.auditState != null) {
+              this.processActive = i
+            }
+            console.log(ele, "ele.....")
+
+            this.process.push(ele)
+          }
+          // this.process[0].uName = this.userInfo.uname;
+          console.log(this.process, "this.process...")
+
+          if (this.process[0].content == 0) {
+            this.process[0].content = this.userInfo.uid
+            console.log(this.process[0].content, "this.process[0].content....")
+          }
+
+          //申请人
+          this.applyPeople = this.process[0].content
+          //审批人
+          // this.toPeople=this.process[1].content;
+          //提交人
+          this.fromPeople = this.process[0].content
+        }
+      })
+    },
+
+    //初始化应该显示第几步的表格、
+    tableShow() {
+      if (this.stepActive == 0) {
+        this.tableData = this.totalData[0].list
+        // this.subList = this.tableData
+        //主流程ID
+        this.mainId = this.totalData[0].step.id
+      } else if (this.stepActive == 1) {
+        this.tableData = this.totalData[1].list
+      } else if (this.stepActive == 2) {
+        this.tableData = this.totalData[2].list
+      } else if (this.stepActive == 3) {
+        this.tableData = this.totalData[3].list
+      }
+      // this.tableData = this.totalData[this.stepActive].list
+    },
+    //radio选项改变是
+    radioChange(row) {
+      console.log(getNowFormatDate())
+      row.operationTime = getNowFormatDate()
+      this.changeBtn(this.tableData)
+    },
+
+    changeBtn(arr) {
+      console.log(arr, "arrr")
+      //完成标记
+      var finish = true
+      for (var i = 0; i < arr.length; i++) {
+        if (arr[i].process == null && arr[i].subData == null) {
+          finish = false
+          break
+        }
+      }
+
+      if (finish) {
+        if (this.stepActive == 0) {
+          this.button = "保存并提交"
+        } else if (this.stepActive != 3 || this.step != 4) {
+          this.button = "保存"
+        } else {
+          this.button = "完成"
+        }
+      } else {
+        if (this.step == 1) {
+          this.button = "保存并提交"
+        } else {
+          this.button = "暂存"
+        }
+      }
+    },
+    //点击每步时
+    stepClick(index) {
+      //this.step = index + 1
+      console.log(this.step, this.stepActive + 1)
+      if (index > this.stepActive) {
+        return
+      }
+      this.step = index + 1
+
+      if (this.pageType == 2) {
+        this.isShow = true
+      } else {
+        this.isShow = false
+      }
+
+      console.log("step:" + this.step);
+
+      if (this.step == 1) {
+        this.tableData = this.totalData[0].list
+
+        this.button = "保存并提交"
+        //2修改  3查看
+
+        // if (this.pageType == 2||this.pageType ==3) {
+        //   //保存按钮隐藏
+        //   this.isShow = false
+        //   //  this.disabled=true
+        //  console.log(this.disabled,"this.disabled...")
+
+        // }else{
+        //    this.isShow = true
+        // }
+
+        // if(this.pageType !=3){
+        //   this.disabled=false
+        // }else{
+        //   this.disabled = true
+        // }
+        if (this.pageType == 1) {
+          this.disabled = false
+          this.isShow = true
+        } else if (this.pageType == 2) {
+          this.disabled = true;
+          this.isShow = false
+        } else {
+          this.disabled = true
+          this.isShow = false
+        }
+      } else if (this.step == 2) {
+        // this.isShow = true
+        this.tableData = this.totalData[1].list
+        console.log(this.tableData, "第二步")
+        this.button = "暂存"
+        this.disabled = false
+      } else if (this.step == 3) {
+        // this.isShow = true
+        this.tableData = this.totalData[2].list
+        this.button = "暂存"
+        this.disabled = false
+      } else if (this.step == 4) {
+        // this.isShow = true
+        this.tableData = this.totalData[3].list
+        this.button = "暂存"
+        this.disabled = false
+      }
+      console.log(this.tableData, "???")
+      this.changeBtn(this.tableData)
+    },
+
+    //点击返回按钮
+    goBack() {
+      this.$router.push({ path: "/reservesManagement/fumigationManagement" })
+    },
+    //新增时初始化页面
+    processFirst() {
+      var type = "tf"
+      getAddList(type)
+        .then((res) => {
+          if (res.code == 200) {
+            this.totalData = res.data
+
+            this.totalData[0].list.splice(1, 0, {
+              details: "是，否",
+              process: this.process,
+            })
+
+            // this.$set(this.totalData[0].list, "process", this.process)
+            this.main_id = this.totalData[0].step.id
+            console.log(this.totalData, "this.totalData..")
+            this.tableShow()
+          }
+        })
+        .catch((err) => {
+          console.log(err)
+        })
+    },
+
+    //流程新增
+    tfAdd() {
+      this.loading=true;
+      var data = {
+        //流程类型
+        type: "tf",
+        //主流程id
+        mainId: this.mainId,
+        //主流程索引
+        ongoingStep: this.stepActive,
+
+        subList: this.subList,
+        //仓房id
+        houseId: this.$store.state.houseId,
+        //库id
+        depotId: this.$store.state.depotId,
+        //发起人
+        fromPeople: this.fromPeople,
+        //申请人
+        applyPeople: this.applyPeople,
+        //审批人
+        toPeople: this.toPeople,
+        //申请时间
+        applyTime: getNowFormatDate(),
+      }
+      console.log(data, "新增数据。。。")
+      addList(data)
+        .then((res) => {
+          console.log(res.data)
+          if (res.code == 200) {
+            this.loading=true;
+            this.$router.push({
+              path: "/reservesManagement/fumigationManagement",
+            })
+          }
+        })
+        .catch((err) => {
+          console.log(err)
+        })
+    },
+
+    //点击保存并提交按钮时
+    save() {
+      console.log(this.tableData,"this.tableData...>>>>>")
+      if( this.totalData[0].list[0].subData == 1){
+         this.$message("只有选择是才能发起申请");
+        return;
+      }
+      this.tableData.forEach((ele) => {
+        var obj = {}
+        console.log(ele)
+        obj.subData = ele.subData
+        obj.subId = ele.id
+        obj.mainId = ele.zid
+        obj.operationTime = ele.operationTime
+        console.log(obj, "obj.....")
+        if (obj.subData != null) {
+          this.subList.push(obj)
+        }
+      })
+      console.log(this.subList, "??????")
+
+      if (this.button == "保存并提交") {
+        console.log(this.totalData, "......")
+        console.log(this.process, "process....s")
+        if (this.totalData[0].list[0].subData == null) {
+          this.$message("请先选择选项");
+          
+         
+          return;
+           
+        }
+         
+        //判断是否选择了审批人
+        var flag = true
+        this.process.forEach((item) => {
+          if (item.content == null) {
+            this.$message("请先选择审批人")
+            flag = false
+            return
+          }
+        })
+
+        if (flag) {
+          // if(this.totalData[0].list[0].subData == 1){
+            
+          //    this.$message("只有选择是才能发起申请");
+            
+          //    return;
+          // }
+          this.tfAdd()
+         
+        
+        }
+      } else {
+        //this.getUpdateList()
+        if (this.button == "暂存") {
+          this.auditState = 3
+          this.ongoingStep = this.stepActive
+          this.getUpdateList()
+        } else if (this.button == "保存" || this.button == "完成") {
+          console.log("保存。。")
+          if (this.stepActive + 1 == this.step) {
+            this.stepActive = this.stepActive + 1
+          }
+          if (this.button == "保存") {
+            this.auditState = 3
+          } else {
+            this.auditState = 4
+          }
+
+          // if (this.stepActive < this.tableData.length - 1) {
+          //   this.auditState = 3
+          //   this.stepActive = this.stepActive + 1
+          // } else {
+          //   this.auditState = 4
+          //   this.stepActive = this.stepActive + 1
+          // }
+
+          this.getUpdateList()
+        }
+      }
+    },
+
+    //查看接口
+    getCheckList() {
+      var processId = this.processId
+      checkList(processId).then((res) => {
+        console.log(res.data, "查看数据")
+        if (res.code == 200) {
+          this.tableData = res.data.process
+          this.totalData = this.tableData
+
+          for (let i = 0; i < res.data.audit.length - 1; i++) {
+            var ele = res.data.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.audit[0].content
+            }
+          }
+          console.log(this.process, " this.process.....")
+          console.log(this.stepActive, "this.stepActive...")
+          this.tableData = res.data.process[this.stepActive].list
+          console.log(this.tableData, "tableData.......??????")
+          this.totalData[0].list.splice(1, 0, {
+            details: "是，否",
+            process: this.process,
+          })
+        }
+      })
+    },
+
+    //每步新增/修改
+    getUpdateList() {
+      this.loading=true;
+      var data = {
+        processId: this.processId,
+        type: "tf",
+        auditState: this.auditState,
+        ongoingStep: this.stepActive,
+        subList: this.subList,
+      }
+      updateList(data).then((res) => {
+        if (res.code == 200) {
+          this.loading=false;
+          this.$router.push({
+            path: "/reservesManagement/fumigationManagement",
+          })
+        }
+      })
+    },
+  },
+
+  mounted() {
+    //获取当前缓存的用户信息
+    // this.userInfo = JSON.parse(localStorage.getItem("userInfo"))
+    // console.log(this.userInfo, "this.userInfo.....")
+    this.userInfo = JSON.parse(getUser())
+    console.log(this.userInfo, "this.userInfo.....?????")
+
+    console.log(this.$route.query, "route...")
+    this.pageType = this.$route.query.type
+    console.log(this.pageType, "pageType......")
+    this.step = this.stepActive + 1
+    console.log(this.stepActive, "stepActive.....")
+
+    this.getUserList()
+    // this.userInfo = JSON.parse(localStorage.getItem("userInfo"))
+    // console.log(this.userInfo, "this.userInfo.....")
+
+    if (this.$route.query.type == 1) {
+      this.isShow = true
+      this.disabled = false
+      this.processFirst()
+      this.processList()
+    } else if (this.$route.query.type == 2) {
+      this.isShow = true
+      this.disabled = false
+      this.stepActive = parseInt(this.$route.query.ongoingStep)
+      console.log(this.stepActive, "修改this.stepActive....")
+      this.processId = this.$route.query.processId
+      // this.pageType = this.$route.query.type
+      this.step = this.stepActive + 1
+
+      this.getCheckList()
+    } else if (this.$route.query.type == 3) {
+      this.isShow = false
+      this.disabled = true
+      console.log(this.$route.query.processId, "this.$route.query....")
+      //返回按钮
+      // this.pageType = this.$route.query.type
+      this.processId = this.$route.query.processId
+      //高亮显示
+      this.stepActive = parseInt(this.$route.query.ongoingStep)
+      this.step = this.stepActive + 1
+      console.log(this.processId, "this.processId...")
+      this.getCheckList()
+    }
+
+    if (this.stepActive == 0) {
+      this.button = "保存并提交"
+    } else {
+      this.button = "暂存"
+    }
+  },
+} 
+</script>
+<style lang="scss" scoped>
+.mainContainer {
+  background: #fff;
+  padding: 10px;
+   height: calc(100% - 40px);
+ 
+  .div_parent{
+  height:100%;
+  overflow-y:auto ;
+  .steps {
+    height: 80px;
+    margin: 10px 0;
+    // line-height:80px;
+    .iconfont {
+      font-size: 55px;
+    }
+  }
+  #step1,
+  #step2,
+  #step3,
+  #step4,
+  #process {
+    display: block;
+  }
+  #process {
+    margin-top: 20px;
+    padding: 20px;
+    background: rgb(235, 233, 233);
+    .process_title {
+      margin-bottom: 20px;
+    }
+    .stepTitle {
+      display: flex;
+      justify-content: space-between;
+    }
+  }
+  .btns {
+    text-align: right;
+    margin: 20px 10px 0 0;
+  }
+  // .saveBtn{
+  //   width:120px;
+  // }
+  .active {
+    color: #037d41;
+  }
+  .noActive {
+    color: red;
+  }
+  .stepTitleFont {
+    color: black;
+  }
+  .tf_title {
+    margin-bottom: 20px;
+    font-weight: 500;
+    text-align: left;
+    color: #037d41;
+    font-size: 18px;
+  }
+  .el-steps {
+  height: 330px !important;
+}
+
+.icon_wai{
+  width:3em;
+  height:3em;
+}
+
+}
+
+}
+</style>
+<style>
+.backBtn.is-plain {
+  color: #037d41;
+  background-color: #fff;
+  border-color: #037d41;
+}
+.el-step__icon.is-text{
+  width:50px;
+  height:50px;
+}
+
+.el-step.is-horizontal .el-step__line{
+  top:21px !important;
+}
+.el-step__icon.is-text{
+  border:none !important;
+}
+
+
+</style>

shanXiPlatform/src/views/systemManagement/earlyWarningManagement/index.vue

@@ -203,6 +203,9 @@ export default {
           case '1_week':
               return '周';
               break;
+          case '2_week':
+              return '2周';
+              break;
           case '1_month':
               return '月';
               break;
@@ -219,17 +222,23 @@ export default {
     },
     getWarningTime(row) {
       switch (row.warningTime) {
-          case '3_day':
-              return '到期前3天';
+          case '160_hour':
+              return '到期前6天16个小时';
               break;
-          case '2_day':
-              return '到期前2天';
+          case '88_hour':
+              return '到期前3天16个小时';
               break;
-          case '1_day':
-              return '到期前1天';
+          case '64_hour':
+              return '到期前2天16个小时';
               break;
+          case '16_hour':
+              return '到期前16个小时';
+              break;   
           case '10_hour':
-              return '到期前10小时';
+              return '到期前10个小时';
+              break;   
+          case '8_hour':
+              return '到期前8个小时';
               break;   
           case '1_minute':
               return '到期前1分钟';

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

@@ -75,10 +75,14 @@ export default {
                     label: "机械通风",
                     type: "tf"
                 },
-                // {
-                //   label: "熏蒸",
-                //   type: "xz",
-                // },
+                {
+                    label: "熏蒸计划",
+                    type: "xzjh",
+                },
+                {
+                    label: "熏蒸散气",
+                    type: "xzsq",
+                },
                 {
                     label: "药剂采购",
                     type: "yjcg"
@@ -178,7 +182,8 @@ export default {
                     title: "熏蒸计划报备与实施",
                     content: "保管员"
                 },
-
+            ],
+            fumigation1: [
                 {
                     step: "7",
                     type: "container",
@@ -547,8 +552,10 @@ export default {
         headChange() {
             if (this.type == "tf") {
                 this.tableData = this.meVentilation
-            } else if (this.type == "xz") {
+            } else if (this.type == "xzjh") {
                 this.tableData = this.fumigation
+            } else if (this.type == "xzsq") {
+                this.tableData = this.fumigation1
             } else if (this.type == "yjcg") {
                 this.tableData = this.drugPurchase
             } else if (this.type == "yjly") {