设备采购

shanXiPlatform/src/router/index.js

@@ -1032,7 +1032,7 @@ export const constantRoutes = [
               path: 'deviceManagement',
               component: () => import('@/views/facilitiesEquipment/equipmentManagement/deviceManagement/index'),
               name: 'DeviceManagement',
-
+              resourceCode: 345,
               hidden: true,
               meta: { title: '设备管理', icon: 'dashboard', affix: false,relation: 'library', istable: true }
             },
@@ -1040,7 +1040,7 @@ export const constantRoutes = [
               path: 'deviceProcurement',
               component: () => import('@/views/facilitiesEquipment/equipmentManagement/deviceProcurement/index'),
               name: 'DeviceProcurement',
-
+              resourceCode: 346,
               hidden: true,
               meta: { title: '设备采购', icon: 'dashboard', affix: false,relation: 'library', istable: true }
             },
@@ -1068,6 +1068,24 @@ export const constantRoutes = [
           meta: { title: '设备管理纪录已完成', icon: 'dashboard', affix: false, noCache: true, relation: 'library', istable: false }
         },
 
+        //  设备采购/新增
+        {
+          path: '/facilitiesEquipment/equipmentManagement/deviceProcurement/steps',
+          component: () => import('@/views/facilitiesEquipment/equipmentManagement/deviceProcurement/steps'),
+          name: 'deviceProcurementStep',
+          hidden: true,
+          meta: { title: '设备采购新增', icon: 'dashboard', affix: false, noCache: true, relation: 'library', istable: false }
+        },
+
+        //  设备采购/已完成
+        {
+          path: '/facilitiesEquipment/equipmentManagement/deviceProcurement/completed',
+          component: () => import('@/views/facilitiesEquipment/equipmentManagement/deviceProcurement/completed'),
+          name: 'deviceProcurementCompleted',
+          hidden: true,
+          meta: { title: '设备采购已完成', icon: 'dashboard', affix: false, noCache: true, relation: 'library', istable: false }
+        },
+
       ]
 
 

shanXiPlatform/src/views/facilitiesEquipment/equipmentManagement/deviceManagement/completed.vue

@@ -0,0 +1,312 @@
+<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"  id="el_step"  v-for="(item, index) in tableData"  :title="item.step.title"  :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"/>
+          </el-step>
+        </el-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"/>
+          </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>
+                    <span  v-if="scope.$index == 1">流程（熏蒸计划申请审批）</span> 
+                    <span  v-if="scope.$index == 12">流程（熏蒸散气申请审批）</span> 
+                </div>
+                <el-steps direction="vertical" :active="scope.row.process.length">
+                  <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: [],
+      processNew: [],
+      disabled: true,
+      processActive:0
+    }
+  },
+  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++
+            })
+          })
+          if (res.data.process[0].audit[0].content == 0) {
+            res.data.process[0].audit[0].content = this.userInfo.uid
+          }
+          if (res.data.process[3].audit[0].content == 0) {
+            res.data.process[3].audit[0].content = this.userInfo.uid
+          }
+          // this.totalData[1].process=this.process;
+          this.totalData.splice(1, 0, { details: "是，否" })
+          this.$set(this.totalData[1], "process", res.data.process[0].audit)
+          this.totalData.splice(12, 0, { details: "是，否" })
+          this.$set(this.totalData[12], "process", res.data.process[3].audit)
+          console.log(this.totalData, "totalData.......")
+        }
+      })
+    },
+    //合并列或行
+    arraySpanMethod({ row, column, rowIndex, columnIndex }) {
+      if (rowIndex === 1) {
+        if (columnIndex === 0) {
+          return [1, 4]
+        }
+      }
+      if (rowIndex === 12) {
+        if (columnIndex === 0) {
+          return [1, 4]
+        }
+      }
+    },
+
+    //点击返回按钮
+    goBack() {
+      this.$router.push({ path: "/reservesManagement/fumigationManagement" })
+    },
+  },
+  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) + 1
+    this.getCheckList()
+    //获取人员字典数据
+    this.perList = JSON.parse(localStorage.getItem("perList"))
+  },
+}
+</script>
+<style lang="scss" scoped>
+.icon_wai{
+  width:3em;
+  height:3em;
+}
+.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 scoped>
+/* .backBtn.is-plain {
+  color: #037d41;
+  background-color: #fff;
+  border-color: #037d41;
+} */
+.el-steps {
+  height: 350px !important;
+}
+</style>

shanXiPlatform/src/views/facilitiesEquipment/equipmentManagement/deviceProcurement/index.vue

@@ -1,6 +1,6 @@
 <template>
-    <div class="contentContainer">
-      <div class="container">
+    <div>
+      <div>
         <div class="header">
           <el-form :inline="true" :model="query" class="demo-form-inline">
             <el-form-item label="检测时间">
@@ -33,17 +33,17 @@
                 >查询</el-button
               >
             </el-form-item>
-          </el-form>
-          <div>
-            <el-button
-              v-if="$tools.IsPermission(338)"
+            <el-form-item style="float:right">
+              <el-button
+              v-if="$tools.IsPermission(347)"
               type="success"
               icon="el-icon-circle-plus"
               plain
               @click="add(1)"
-              >新增</el-button
+              >新增采购</el-button
             >
-          </div>
+            </el-form-item>
+          </el-form>
         </div>
 
         <el-table
@@ -62,13 +62,14 @@
             width="50px"
           >
           </el-table-column>
-          <el-table-column prop="type" label="类型" align="center">
+          <el-table-column prop="applyTime" label="记录时间" align="center">
+          </el-table-column>
+          <el-table-column prop="type" label="记录结果" align="center">
             <!-- <template slot-scope="scope"> -->
-              <span>熏蒸管理</span>
+              <span>设备采购</span>
             <!-- </template> -->
           </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>
@@ -87,14 +88,14 @@
           >
             <template slot-scope="scope">
               <el-button
-                v-if="$tools.IsPermission(340)"
+                v-if="$tools.IsPermission(348)"
                 size="mini"
                 type="detailbtn"
                 @click="handleCheck(3, scope.$index, scope.row)"
                 >查看</el-button
               >
 
-              <el-button
+              <!-- <el-button
                 size="mini"
                 type="editbtn"
                 @click="handleEdit(2, scope.$index, scope.row)"
@@ -106,14 +107,15 @@
                   $tools.IsPermission(339)
                 "
                 >修改</el-button
-              >
-              <!-- <el-button
+              > -->
+              <el-button
+                v-if="$tools.IsPermission(349)"
                 size="mini"
-                type="danger"
+                type="dangerbtn"
                 plain
                 @click="handleDelete(scope.$index, scope.row)"
                 >删除</el-button
-              > -->
+              >
             </template>
           </el-table-column>
         </el-table>
@@ -126,6 +128,7 @@
           :page-size="pagination.pageSize"
           layout="total, sizes, prev, pager, next, jumper"
           :total="pagination.total"
+          style="float:right;margin:15px 15px 0 0"
         ></el-pagination>
       </div>
     </div>
@@ -149,7 +152,7 @@ export default {
       //库编号
       depotId: this.$store.state.depotId,
       //类型
-      type: "xz",
+      type: "sbcg",
       value: "",
       query: {
         // startTime: "",
@@ -174,7 +177,7 @@ export default {
     //新增
     add(type) {
       this.$router.push({
-        path: "/facilitiesEquipment/facilitiesManagement/maintenance/steps",
+        path: "/facilitiesEquipment/equipmentManagement/deviceProcurement/steps",
         query: {
           type: type,
         },
@@ -182,32 +185,21 @@ export default {
     },
     //查看
     handleCheck(type, index, row) {
-      if (row.auditState == 4) {
-        this.$router.push({
-          path: "/facilitiesEquipment/facilitiesManagement/maintenance/completed",
-          query: {
-            type: type,
-            processId: row.processId,
-            ongoingStep: row.ongoingStep,
-          },
-        })
-      } else {
-        this.$router.push({
-          path: "/facilitiesEquipment/facilitiesManagement/maintenance/steps",
+      this.$router.push({
+          path: "/facilitiesEquipment/equipmentManagement/deviceProcurement/steps",
           query: {
             type: type,
             processId: row.processId,
             ongoingStep: row.ongoingStep,
           },
         })
-      }
     },
 
     //修改
     handleEdit(type, index, row) {
       console.log(row, "修改row...")
       this.$router.push({
-        path: "/facilitiesEquipment/facilitiesManagement/maintenance/steps",
+        path: "/facilitiesEquipment/equipmentManagement/deviceProcurement/steps",
         query: {
           type: type,
           processId: row.processId,
@@ -258,7 +250,7 @@ export default {
     //获取列表
     tfList() {
       var condition = {
-        houseId: this.houseId,
+        // houseId: this.houseId,
         depotId: this.depotId,
         type: this.type,
         startTime: this.query.value1[0],
@@ -277,12 +269,6 @@ export default {
           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
           }

shanXiPlatform/src/views/facilitiesEquipment/equipmentManagement/deviceProcurement/steps.vue

@@ -2,15 +2,6 @@
   <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"/>
-          </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">
@@ -30,11 +21,10 @@
             </template>
           </el-table-column>
         </el-table>
-        <div  v-if="tableDataAudit && tableDataAudit.length"  style="height: 400px">
+        <div  v-if="tableDataAudit && tableDataAudit.length"  style="height: 400px;margin-top:15px">
           <div class="tf_title">
             <i class="iconfont iconshu"></i>
-            <span v-if="stepActive == 0 || step == 1">流程（熏蒸计划审批）</span>
-            <span v-if="stepActive == 3 || step == 4">流程（熏蒸散气申请审批）</span> 
+            <span>流程（设备采购审批）</span>
           </div>
           <el-steps direction="vertical" :active="processActive">
             <el-step  v-for="(item, index) in tableDataAudit"  :key="index"  icon="el-icon-edit">
@@ -163,14 +153,14 @@ export default {
   methods: {
     //合并列或行
     arraySpanMethod({ row, column, rowIndex, columnIndex }) {
-      if (this.step != 1) {
-        return
-      }
-      if (rowIndex === 1) {
-        if (columnIndex === 0) {
-          return [1, 4]
-        }
-      }
+      // if (this.step != 1) {
+      //   return
+      // }
+      // if (rowIndex === 1) {
+      //   if (columnIndex === 0) {
+      //     return [1, 4]
+      //   }
+      // }
     },
 
     // 用户字典列表
@@ -185,10 +175,8 @@ export default {
     //获取流程数据
     processList() {
       var type =  null;
-      if(this.stepActive == 0 || this.stepActive == 1 || this.stepActive == 2){
-        type = "xzjh"
-      }else if(this.stepActive == 3 || this.stepActive == 4){
-        type = "xzsq"
+      if(this.stepActive == 0){
+        type = "sbcg"
       }
       var userId = this.userInfo.uid
       var depotId = this.userInfo.depotId
@@ -217,10 +205,8 @@ export default {
     },
     detailProcessList() {
       var type =  null;
-      if(this.stepActive == 0 || this.stepActive == 1 || this.stepActive == 2){
-        type = "xzjh"
-      }else if(this.stepActive == 3 || this.stepActive == 4){
-        type = "xzsq"
+      if(this.stepActive == 0){
+        type = "sbcg"
       }
       var userId = this.userInfo.uid
       var depotId = this.userInfo.depotId
@@ -251,22 +237,7 @@ export default {
 
     //初始化应该显示第几步的表格、
     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.mainId = this.totalData[3].step.id
-      } else if (this.stepActive == 4) {
-        this.tableData = this.totalData[4].list
-      }
-      // this.tableData = this.totalData[this.stepActive].list
+      this.tableData = this.totalData[0].list
     },
     //radio选项改变是
     radioChange(row) {
@@ -286,12 +257,8 @@ export default {
       }
 
       if (finish) {
-        if (this.stepActive == 0 || this.stepActive == 3) {
+        if (this.stepActive == 0) {
           this.button = "保存并提交"
-        } else if (this.stepActive == 1 || this.stepActive == 2) {
-          this.button = "保存"
-        } else {
-          this.button = "完成"
         }
       } else {
         if (this.step == 1) {
@@ -301,93 +268,18 @@ export default {
         }
       }
     },
-    //点击每步时
-    stepClick(index) {
-      //this.step = index + 1
-      console.log(this.step, this.stepActive + 1)
-
-      if (index > this.stepActive) {
-        return
-      }
-      if(index != this.stepActive){
-        this.disabled = true
-        this.isShow = false
-      }else if(index == this.stepActive){
-        this.disabled = false
-        this.isShow = true
-      }
-      this.step = index + 1
-
-      console.log("step:" + this.step);
-
-      if (this.step == 1) {
-        console.log(this.totalData)
-        this.tableData = this.totalData[0].list
-        console.log(this.tableData)
-        this.tableDataAudit = this.totalData[0].audit
-        for (let i = 0; i < this.tableDataAudit.length; i++) {
-          var ele = this.tableDataAudit[i]
-          if (ele.auditState == 0) {
-            this.processActive = i
-          }else{
-            this.processActive = this.tableDataAudit.length
-          }
-        }
-        this.button = "保存并提交"
-      } else if (this.step == 2) {
-        // this.isShow = true
-        this.tableData = this.totalData[1].list
-        this.tableDataAudit = []
-        console.log(this.tableData, "第二步")
-        this.button = "暂存"
-      } else if (this.step == 3) {
-        // this.isShow = true
-        this.tableData = this.totalData[2].list
-        this.tableDataAudit = []
-        this.button = "暂存"
-      } else if (this.step == 4) {
-        console.log(this.totalData)
-        this.tableData = this.totalData[3].list
-        console.log(this.tableData)
-        this.tableDataAudit = this.totalData[3].audit
-        for (let i = 0; i < this.tableDataAudit.length; i++) {
-          var ele = this.tableDataAudit[i]
-          if (ele.auditState == 0) {
-            this.processActive = i
-          }else{
-            this.processActive = this.tableDataAudit.length
-          }
-        }
-        this.button = "保存并提交"
-      } else if (this.step == 5) {
-        // this.isShow = true
-        this.tableData = this.totalData[4].list
-        this.tableDataAudit = []
-        this.button = "暂存"
-        this.disabled = false
-      }
-      console.log(this.tableData, "???")
-      this.changeBtn(this.tableData)
-    },
 
     //点击返回按钮
     goBack() {
-      this.$router.push({ path: "/reservesManagement/fumigationManagement" })
+      this.$router.push({ path: "/facilitiesEquipment/equipmentManagement/deviceProcurement" })
     },
     //新增时初始化页面
     processFirst() {
-      var type = "xz"
+      var type = "sbcg"
       getAddList(type)
         .then((res) => {
           if (res.code == 200) {
             this.totalData = res.data
-
-            // this.totalData[0].list.splice(1, 0, {
-            //   details: "是，否",
-            //   process: this.process,
-            // })
-            this.main_id = this.totalData[0].step.id
-            console.log(this.totalData, "this.totalData..")
             this.tableShow()
           }
         })
@@ -400,22 +292,20 @@ export default {
     tfAdd() {
       this.loading=true;
       let type = null;
-      if(this.stepActive == 0 || this.stepActive == 1 || this.stepActive == 2){
-        type = "xzjh"
-      }else if(this.stepActive == 3 || this.stepActive == 4){
-        type = "xzsq"
+      if(this.stepActive == 0){
+        type = "sbcg"
       }
       var data = {
         //流程类型
         type: type,
         //主流程id
-        mainId: this.mainId,
+        // mainId: this.mainId,
         //主流程索引
         ongoingStep: this.stepActive,
 
         subList: this.subList,
         //仓房id
-        houseId: Number(this.$store.state.houseId),
+        // houseId: Number(this.$store.state.houseId),
         //库id
         depotId: this.$store.state.depotId,
         //发起人
@@ -435,7 +325,7 @@ export default {
             this.loading=true;
             this.$message.success(res.msg);
             this.$router.push({
-              path: "/reservesManagement/fumigationManagement",
+              path: "/facilitiesEquipment/equipmentManagement/deviceProcurement",
             })
           }else{
             this.$message.error(res.msg);
@@ -451,16 +341,23 @@ export default {
 
     //点击保存并提交按钮时
     save() {
-      if( this.totalData[this.stepActive].list[0].subData == 1){
-         this.$message("只有选择是才能发起申请");
-        return;
+      let status = 0
+      if(this.stepActive == 0){
+        this.totalData[this.stepActive].list.forEach(item => {
+          if( item.subData == 1){
+            this.$message("只有选择是才能发起申请");
+            status = 1
+            throw new Error("EndIterative");
+          }
+        })
       }
+      if(status == 0){
       this.tableData.forEach((ele) => {
         var obj = {}
         console.log(ele)
         obj.subData = ele.subData
         obj.subId = ele.id
-        obj.mainId = ele.zid
+        // obj.mainId = ele.zid
         obj.operationTime = ele.operationTime
         obj.processId = ''
         if(this.$route.query && this.$route.query.processId){
@@ -505,6 +402,7 @@ export default {
           this.getUpdateList()
         }
       }
+      }
     },
 
     //查看接口
@@ -546,10 +444,8 @@ export default {
     getUpdateList() {
       this.loading=true;
       let type = null;
-      if(this.stepActive == 0 || this.stepActive == 1 || this.stepActive == 2){
-        type = "xzjh"
-      }else if(this.stepActive == 3 || this.stepActive == 4){
-        type = "xzsq"
+      if(this.stepActive == 0){
+        type = "sbcg"
       }
       let ongoingStepNum = null
       if(this.stepActive < 4 && this.button !== "暂存"){
@@ -578,11 +474,11 @@ export default {
             this.getCheckList()
           }else{
             this.$router.push({
-              path: "/reservesManagement/fumigationManagement",
+              path: "/facilitiesEquipment/equipmentManagement/deviceProcurement",
             })
           }
           // this.$router.push({
-          //     path: "/reservesManagement/fumigationManagement",
+          //     path: "/facilitiesEquipment/equipmentManagement/deviceProcurement",
           //   })
         }
       })
@@ -602,7 +498,7 @@ export default {
     } else if (this.$route.query.type == 2) {
       this.isShow = true
       this.disabled = false
-      this.stepActive = parseInt(this.$route.query.ongoingStep)
+      this.stepActive = 0
       this.processId = this.$route.query.processId
       this.step = this.stepActive + 1
       this.getCheckList()
@@ -611,9 +507,12 @@ export default {
       this.disabled = true
       this.processId = this.$route.query.processId
       //高亮显示
-      this.stepActive = parseInt(this.$route.query.ongoingStep)
+      this.stepActive = 0
       this.step = this.stepActive + 1
       this.getCheckList()
+      if(parseInt(this.$route.query.ongoingStep) == 1){
+        this.processActive = 5
+      }
     }
 
     if (this.stepActive == 0 || this.stepActive == 3) {

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

@@ -174,7 +174,7 @@ export default {
       //  console.log(userInfo,"/////")
       //   let homeType = userInfo.homeType
       var homeType = this.userInfo.homeType
-      if(item.type == 'xzjh' || item.type == 'xzsq' || item.type == 'sswxjh' || item.type == 'sswxys'){
+      if(item.type == 'xzjh' || item.type == 'xzsq' || item.type == 'sswxjh' || item.type == 'sswxys' || item.type == 'sbcg'){
         if (homeType == 1) {
           this.$router.push({
             path: "/dashboard/daiban/initiated/inixunzengDetails",

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

@@ -33,7 +33,7 @@
           <span v-if="this.subData == 1">否</span>
           <span v-if="this.subData == 0">是</span>
         </div>
-        <div style="margin-left: 20px" v-if="type == 'sswxjh' || type == 'sswxys'">
+        <div style="margin-left: 20px" v-if="type == 'sswxjh' || type == 'sswxys' || type == 'sbcg'">
           <div v-for="(item,index) in tableData.list" :key="index">
             <span>{{index+1}}.{{item.title}}:</span>
             <span v-if="item.subData == 1">否</span>
@@ -203,7 +203,11 @@ export default {
             let ongoingStep = this.ongoingStep
             this.subData = res.data.process[ongoingStep].list[0].subData  //方案状态
             this.tableData = res.data.process[ongoingStep]
-            this.isAudit = res.data.process[ongoingStep].step.isAudit
+            if(res.data.process[ongoingStep].step){
+              this.isAudit = res.data.process[ongoingStep].step.isAudit
+            }else{
+              this.isAudit = null
+            }
             if(!this.isAudit && this.isAudit != 0){
               this.isAudit = 1
             }
@@ -308,7 +312,7 @@ export default {
            this.ongoingStepNext=this.ongoingStep
           this.process = []
           //this.getApproval()
-          if (item.type == "yjcg" || item.type == "xzjh"  || ((item.type == "sswxjh" || item.type == "sswxys") && this.isAudit == 1)) {
+          if (item.type == "yjcg" || item.type == "xzjh"  || ((item.type == "sswxjh" || item.type == "sswxys") && this.isAudit == 1) || item.type == "sbcg") {
             this.getyjcgApproval()
           } else {
             this.getApproval()
@@ -324,7 +328,7 @@ export default {
       console.log(index, "index......")
       //最后一个人通过
       if (index == this.process.length - 1) {
-        if(item.type == "yjcg"){
+        if(item.type == "yjcg" || item.type == "sbcg"){
           this.auditState = 4
         }else{
            this.auditState = 3
@@ -349,7 +353,7 @@ export default {
           message:"审批通过",
           type: 'success'
         })
-      if (item.type == "yjcg" || item.type == "xzjh"  || ((item.type == "sswxjh" || item.type == "sswxys") && this.isAudit == 1)) {
+      if (item.type == "yjcg" || item.type == "xzjh"  || ((item.type == "sswxjh" || item.type == "sswxys") && this.isAudit == 1) || item.type == "sbcg") {
         this.getyjcgApproval()
       } else {
         this.getApproval()
@@ -510,7 +514,7 @@ export default {
       }
     }
     .table_middle {
-      height: 70px;
+      // height: 70px;
       line-height: 70px;
       padding-left: 10px;
       background: #fff;

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

@@ -221,7 +221,7 @@ export default {
 
       var homeType = this.userInfo.homeType
       if (item.type.indexOf('code') == -1) {
-        if(item.type == 'xzjh' || item.type == 'xzsq' || item.type == 'sswxjh' || item.type == 'sswxys'){
+        if(item.type == 'xzjh' || item.type == 'xzsq' || item.type == 'sswxjh' || item.type == 'sswxys' || item.type == 'sbcg'){
           if (homeType == 1) {
             this.$router.push({
               name: "XunzengDetails",

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

@@ -33,7 +33,7 @@
           <span v-if="this.subData == 1">否</span>
           <span v-if="this.subData == 0">是</span>
         </div>
-        <div style="margin-left: 20px" v-if="type == 'sswxjh' || type == 'sswxys'">
+        <div style="margin-left: 20px" v-if="type == 'sswxjh' || type == 'sswxys' || type == 'sbcg'">
           <div v-for="(item,index) in tableData.list" :key="index">
             <span>{{index+1}}.{{item.title}}:</span>
             <span v-if="item.subData == 1">否</span>
@@ -203,7 +203,11 @@ export default {
             let ongoingStep = this.ongoingStep
             this.subData = res.data.process[ongoingStep].list[0].subData  //方案状态
             this.tableData = res.data.process[ongoingStep]
-            this.isAudit = res.data.process[ongoingStep].step.isAudit
+            if(res.data.process[ongoingStep].step){
+              this.isAudit = res.data.process[ongoingStep].step.isAudit
+            }else{
+              this.isAudit = null
+            }
             if(!this.isAudit && this.isAudit != 0){
               this.isAudit = 1
             }
@@ -311,7 +315,7 @@ export default {
           this.ongoingStepNext=this.ongoingStep
           this.process = []
           //this.getApproval()
-          if (item.type == "yjcg" || item.type == "xzjh"  || ((item.type == "sswxjh" || item.type == "sswxys") && this.isAudit == 1)) {
+          if (item.type == "yjcg" || item.type == "xzjh"  || ((item.type == "sswxjh" || item.type == "sswxys") && this.isAudit == 1) || item.type == "sbcg") {
             this.getyjcgApproval()
           } else {
             this.getApproval()
@@ -325,7 +329,7 @@ export default {
     agree(item, index) {
       //最后一个人通过
       if (index == this.process.length - 1) {
-        if(item.type == "yjcg"){
+        if(item.type == "yjcg" || item.type == "sbcg"){
           this.auditState = 4
         }else{
            this.auditState = 3
@@ -343,7 +347,7 @@ export default {
           message:"审批通过",
           type: 'success'
         })
-      if (item.type == "yjcg" || item.type == "xzjh"  || ((item.type == "sswxjh" || item.type == "sswxys") && this.isAudit == 1)) {
+      if (item.type == "yjcg" || item.type == "xzjh"  || ((item.type == "sswxjh" || item.type == "sswxys") && this.isAudit == 1) || item.type == "sbcg") {
         this.getyjcgApproval()
       } else {
         this.getApproval()

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

@@ -227,7 +227,7 @@ export default {
       // let userInfo = JSON.parse(getUser())
       var homeType = this.userInfo.homeType
       if (item.type.indexOf('code') == -1) {
-        if(item.type == 'xzjh' || item.type == 'xzsq' || item.type == 'sswxjh' || item.type == 'sswxys'){
+        if(item.type == 'xzjh' || item.type == 'xzsq' || item.type == 'sswxjh' || item.type == 'sswxys' || item.type == 'sbcg'){
           if (homeType == 1) {
             this.$router.push({
               path: "/dashboard/daiban/processed/xunzengDetails",

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

@@ -33,7 +33,7 @@
           <span v-if="this.subData == 1">否</span>
           <span v-if="this.subData == 0">是</span>
         </div>
-        <div style="margin-left: 20px" v-if="type == 'sswxjh' || type == 'sswxys'">
+        <div style="margin-left: 20px" v-if="type == 'sswxjh' || type == 'sswxys' || type == 'sbcg'">
           <div v-for="(item,index) in tableData.list" :key="index">
             <span>{{index+1}}.{{item.title}}:</span>
             <span v-if="item.subData == 1">否</span>
@@ -203,7 +203,11 @@ export default {
             let ongoingStep = this.ongoingStep
             this.subData = res.data.process[ongoingStep].list[0].subData  //方案状态
             this.tableData = res.data.process[ongoingStep]
-            this.isAudit = res.data.process[ongoingStep].step.isAudit
+            if(res.data.process[ongoingStep].step){
+              this.isAudit = res.data.process[ongoingStep].step.isAudit
+            }else{
+              this.isAudit = null
+            }
             if(!this.isAudit && this.isAudit != 0){
               this.isAudit = 1
             }
@@ -306,7 +310,7 @@ export default {
            this.ongoingStepNext=this.ongoingStep
           this.process = []
           //this.getApproval()
-          if (item.type == "yjcg" || item.type == "xzjh"  || ((item.type == "sswxjh" || item.type == "sswxys") && this.isAudit == 1)) {
+          if (item.type == "yjcg" || item.type == "xzjh"  || ((item.type == "sswxjh" || item.type == "sswxys") && this.isAudit == 1) || item.type == "sbcg") {
             this.getyjcgApproval()
           } else {
             this.getApproval()
@@ -322,7 +326,7 @@ export default {
       console.log(index, "index......")
       //最后一个人通过
       if (index == this.process.length - 1) {
-        if(item.type == "yjcg"){
+        if(item.type == "yjcg" || item.type == "sbcg"){
           this.auditState = 4
         }else{
            this.auditState = 3
@@ -347,7 +351,7 @@ export default {
           message:"审批通过",
           type: 'success'
         })
-      if (item.type == "yjcg" || item.type == "xzjh"  || ((item.type == "sswxjh" || item.type == "sswxys") && this.isAudit == 1)) {
+      if (item.type == "yjcg" || item.type == "xzjh"  || ((item.type == "sswxjh" || item.type == "sswxys") && this.isAudit == 1) || item.type == "sbcg") {
         this.getyjcgApproval()
       } else {
         this.getApproval()
@@ -449,6 +453,8 @@ export default {
       this.ongoingStep = 0
     }else if(this.$route.query.type == 'sswxys'){
       this.ongoingStep = 1
+    }else if(this.$route.query.type == 'sbcg'){
+      this.ongoingStep = 0
     }
 
     this.getCheckList()
@@ -509,7 +515,7 @@ export default {
       }
     }
     .table_middle {
-      height: 70px;
+      // height: 70px;
       line-height: 70px;
       padding-left: 10px;
       background: #fff;

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

@@ -91,10 +91,10 @@ export default {
                     label: "药剂领用",
                     type: "yjly"
                 },
-                // {
-                //   label: "设备采购",
-                //   type: "sbcg",
-                // },
+                {
+                  label: "设备采购",
+                  type: "sbcg",
+                },
                 // {
                 //   label: "设备领用归还",
                 //   type: "sblygh",
@@ -549,7 +549,7 @@ export default {
                 .catch(err => {
                     console.log(err)
                 })
-            if(this.type == 'xzjh' || this.type == 'yjcg' || this.type == 'sswxjh' || this.type == 'sswxys'){
+            if(this.type == 'xzjh' || this.type == 'yjcg' || this.type == 'sswxjh' || this.type == 'sswxys' || this.type == 'sbcg'){
                 let paramsNew = {
                     depotId: 1,
                     roleIds: 37
@@ -560,7 +560,7 @@ export default {
                             this.tableData.forEach(item => {
                                 if ( (this.type == 'xzjh' || this.type == 'yjcg') && item.title.indexOf("分公司主管处室") != -1 ) {
                                     this.$set(item, "approverSelect", res.data[37])
-                                }else if((this.type == 'sswxjh' || this.type == 'sswxys') && item.title.indexOf("分公司") != -1){
+                                }else if((this.type == 'sswxjh' || this.type == 'sswxys' || this.type == 'sbcg') && item.title.indexOf("分公司") != -1){
                                     this.$set(item, "approverSelect", res.data[37])
                                 }
                             })