熏蒸管理

shanXiPlatform/src/views/home/daiBan/daiBanTabs.vue

@@ -79,7 +79,10 @@ export default {
     if (
       this.$route.name == "IniDetails" ||
       this.$route.name == "PenDetails" ||
-      this.$route.name == "ProDetails"
+      this.$route.name == "ProDetails" ||
+      this.$route.name == "XunzengDetails" ||
+      this.$route.name == "proXunzengDetails" ||
+      this.$route.name == "IniXunzengDetails"
     ) {
       this.isShow = false
     } else {

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

@@ -14,7 +14,7 @@
         <div class="middle">
           <div class="middle_flex" v-if="item.workName.indexOf('药剂') == -1 && item.type !== 'code1'">
             <div>仓号:</div>
-            <div>{{ item.houseName }}</div>
+            <div>{{ hourseDic[item.houseId] }}</div>
           </div>
           <div class="middle_flex">
             <div>申请人:</div>
@@ -145,7 +145,7 @@ export default {
   mounted() {
    
     console.log(this.$route)
-    if (this.$route.name == "IniDetails") {
+    if (this.$route.name == "IniDetails" || this.$route.name == "IniXunzengDetails") {
       this.isShow = false
     } else {
       this.isShow = true
@@ -174,44 +174,92 @@ export default {
       //  console.log(userInfo,"/////")
       //   let homeType = userInfo.homeType
       var homeType = this.userInfo.homeType
-      if (homeType == 1) {
-        this.$router.push({
-          path: "/dashboard/daiban/initiated/iniDetails",
-          query: {
-            processId: item.processId,
-            houseName: item.houseName,
-            applyName: item.applyName,
-            departmentName: item.departmentName,
-            companyName: item.companyName,
-            workName: item.workName,
-          },
-        })
-      } else if (homeType == 2) {
-        this.$router.push({
-          path: "/dashboard/daiban/initiated/iniDetails",
-          query: {
-            processId: item.processId,
-            houseName: item.houseName,
-            applyName: item.applyName,
-            departmentName: item.departmentName,
-            companyName: item.companyName,
-            workName: item.workName,
-          },
-        })
-      } else if (homeType == 3) {
-        this.$router.push({
-          path: "/home/daiban/initiated/iniDetails",
-          query: {
-            processId: item.processId,
-            houseName: item.houseName,
-            applyName: item.applyName,
-            departmentName: item.departmentName,
-            companyName: item.companyName,
-            workName: item.workName,
-          },
-        })
+      if(item.type == 'xzjh' || item.type == 'xzsq'){
+        if (homeType == 1) {
+          this.$router.push({
+            path: "/dashboard/daiban/initiated/inixunzengDetails",
+            query: {
+              processId: item.processId,
+              houseName: item.houseName,
+              applyName: item.applyName,
+              departmentName: item.departmentName,
+              companyName: item.companyName,
+              workName: item.workName,
+              ongoingStep: item.ongoingStep,
+              type: item.type
+            },
+          })
+        } else if (homeType == 2) {
+          this.$router.push({
+            path: "/dashboard/daiban/initiated/inixunzengDetails",
+            query: {
+              processId: item.processId,
+              houseName: item.houseName,
+              applyName: item.applyName,
+              departmentName: item.departmentName,
+              companyName: item.companyName,
+              workName: item.workName,
+              ongoingStep: item.ongoingStep,
+              type: item.type
+            },
+          })
+        } else if (homeType == 3) {
+          this.$router.push({
+            path: "/home/daiban/initiated/inixunzengDetails",
+            query: {
+              processId: item.processId,
+              houseName: item.houseName,
+              applyName: item.applyName,
+              departmentName: item.departmentName,
+              companyName: item.companyName,
+              workName: item.workName,
+              ongoingStep: item.ongoingStep,
+              type: item.type
+            },
+          })
+        }
+      }else{
+        if (homeType == 1) {
+          this.$router.push({
+            path: "/dashboard/daiban/initiated/iniDetails",
+            query: {
+              processId: item.processId,
+              houseName: item.houseName,
+              applyName: item.applyName,
+              departmentName: item.departmentName,
+              companyName: item.companyName,
+              workName: item.workName,
+              ongoingStep: item.ongoingStep
+            },
+          })
+        } else if (homeType == 2) {
+          this.$router.push({
+            path: "/dashboard/daiban/initiated/iniDetails",
+            query: {
+              processId: item.processId,
+              houseName: item.houseName,
+              applyName: item.applyName,
+              departmentName: item.departmentName,
+              companyName: item.companyName,
+              workName: item.workName,
+              ongoingStep: item.ongoingStep
+            },
+          })
+        } else if (homeType == 3) {
+          this.$router.push({
+            path: "/home/daiban/initiated/iniDetails",
+            query: {
+              processId: item.processId,
+              houseName: item.houseName,
+              applyName: item.applyName,
+              departmentName: item.departmentName,
+              companyName: item.companyName,
+              workName: item.workName,
+              ongoingStep: item.ongoingStep
+            },
+          })
+        }
       }
-     
     },
     //列表数据
     getInitiated() {

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

@@ -29,6 +29,7 @@
         <div style="margin-left: 20px">
           <span v-if="type == 'tf'">1.制定通风方案:</span>
           <span v-if="type == 'xzjh'">1.制定熏蒸计划:</span>
+          <span v-if="type == 'xzsq'">1.提交散气作业申请:</span>
           <span v-if="this.subData == 1">否</span>
           <span v-if="this.subData == 0">是</span>
         </div>
@@ -179,7 +180,8 @@ export default {
       subData: null,
       //审批数据
       applyData: [],
-      type: null
+      type: null,
+      ongoingStepNext: null
     }
   },
   methods: {
@@ -222,7 +224,7 @@ export default {
         id: this.row.id,
         auditState: this.auditState,
         // 进行到哪一步的主流程id
-        ongoingStep: this.ongoingStep,
+        ongoingStep: this.ongoingStepNext,
         auditTime: getNowFormatDate(),
       }
       Approval(data)
@@ -252,7 +254,7 @@ export default {
       var data = {
         id: this.row.id,
         auditState: this.auditState,
-        ongoingStep: this.ongoingStep,
+        ongoingStep: this.ongoingStepNext,
         auditTime: getNowFormatDate(),
       }
       yjcgApproval(data)
@@ -288,7 +290,7 @@ export default {
           this.auditState = 2
 
           // this.ongoingStep = 0
-           this.ongoingStep=this.ongoingStep
+           this.ongoingStepNext=this.ongoingStep
           this.process = []
           //this.getApproval()
           if (item.type == "yjcg" || item.type == "xzjh") {
@@ -315,15 +317,15 @@ export default {
        
       
         // this.ongoingStep = 1
-        this.ongoingStep=this.ongoingStep+1
-        console.log('审批后的ongoingStep'+this.ongoingStep)
+        this.ongoingStepNext=this.ongoingStep+1
+        console.log('审批后的ongoingStep'+this.ongoingStepNext)
       } else {
         this.auditState = 1
      
 
         // this.ongoingStep = 0
-         this.ongoingStep=this.ongoingStep
-         console.log('审批前的ongoingStep'+this.ongoingStep)
+         this.ongoingStepNext=this.ongoingStep
+         console.log('审批前的ongoingStep'+this.ongoingStepNext)
       }
 
       this.process = []
@@ -418,15 +420,20 @@ export default {
     this.row = this.$route.query
     console.log(this.row, "??????")
 
-    this.getCheckList()
-
     this.houseName = this.$route.query.houseName
     this.applyName = this.$route.query.applyName
     this.departmentName = this.$route.query.departmentName
     this.companyName = this.$route.query.companyName
     this.workName = this.$route.query.workName
     this.ongoingStep=parseInt(this.$route.query.ongoingStep)
+    if(this.$route.query.type == 'xzjh'){
+      this.ongoingStep = 0
+    }else if(this.$route.query.type == 'xzsq'){
+      this.ongoingStep = 3
+    }
     this.type = this.$route.query.type
+
+    this.getCheckList()
   },
 }
 </script>

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

@@ -50,7 +50,7 @@
         <div class="middle">
           <div class="middle_flex"  v-if="item.workName.indexOf('药剂') == -1 && item.type !== 'code1'">
             <div>仓号:</div>
-            <div>{{ item.houseName }}</div>
+            <div>{{ hourseDic[item.houseId] }}</div>
           </div>
           <div class="middle_flex" v-if="item.type.indexOf('code') == -1">
             <div>申请人:</div>
@@ -188,7 +188,7 @@ export default {
   },
 
   mounted() {
-    if (this.$route.name == "PenDetails") {
+    if (this.$route.name == "PenDetails" || this.$route.name == "XunzengDetails") {
       this.isShow = false
     } else {
       this.isShow = true
@@ -221,51 +221,106 @@ export default {
 
       var homeType = this.userInfo.homeType
       if (item.type.indexOf('code') == -1) {
-        if (homeType == 1) {
-          this.$router.push({
-            path: "/dashboard/daiban/pending/penDetails",
-            query: {
-              processId: item.processId,
-              auditState: item.auditState,
-              id: item.id,
-              ongoingStep: item.ongoingStep,
-              houseName: item.houseName,
-              applyName: item.applyName,
-              departmentName: item.departmentName,
-              companyName: item.companyName,
-              workName: item.workName,
-            },
-          })
-        } else if (homeType == 2) {
-          this.$router.push({
-            path: "/dashboard/daiban/pending/penDetails",
-            query: {
-              processId: item.processId,
-              auditState: item.auditState,
-              id: item.id,
-              ongoingStep: item.ongoingStep,
-              houseName: item.houseName,
-              applyName: item.applyName,
-              departmentName: item.departmentName,
-              companyName: item.companyName,
-              workName: item.workName,
-            },
-          })
-        } else if (homeType == 3) {
-          this.$router.push({
-            path: "/home/daiban/pending/penDetails",
-            query: {
-              processId: item.processId,
-              auditState: item.auditState,
-              id: item.id,
-              ongoingStep: item.ongoingStep,
-              houseName: item.houseName,
-              applyName: item.applyName,
-              departmentName: item.departmentName,
-              companyName: item.companyName,
-              workName: item.workName,
-            },
-          })
+        if(item.type == 'xzjh' || item.type == 'xzsq'){
+          if (homeType == 1) {
+            this.$router.push({
+              name: "XunzengDetails",
+              query: {
+                processId: item.processId,
+                auditState: item.auditState,
+                id: item.id,
+                ongoingStep: item.ongoingStep,
+                houseName: item.houseName,
+                applyName: item.applyName,
+                departmentName: item.departmentName,
+                companyName: item.companyName,
+                workName: item.workName,
+                type: item.type,
+              },
+            })
+          } else if (homeType == 2) {
+            this.$router.push({
+              name: "XunzengDetails",
+              query: {
+                processId: item.processId,
+                auditState: item.auditState,
+                id: item.id,
+                ongoingStep: item.ongoingStep,
+                houseName: item.houseName,
+                applyName: item.applyName,
+                departmentName: item.departmentName,
+                companyName: item.companyName,
+                workName: item.workName,
+                type: item.type,
+              },
+            })
+          } else if (homeType == 3) {
+            this.$router.push({
+              name: "XunzengDetails",
+              query: {
+                processId: item.processId,
+                auditState: item.auditState,
+                id: item.id,
+                ongoingStep: item.ongoingStep,
+                houseName: item.houseName,
+                applyName: item.applyName,
+                departmentName: item.departmentName,
+                companyName: item.companyName,
+                workName: item.workName,
+                type: item.type,
+              },
+            })
+          }
+        }else{
+          if (homeType == 1) {
+            this.$router.push({
+              path: "/dashboard/daiban/pending/penDetails",
+              query: {
+                processId: item.processId,
+                auditState: item.auditState,
+                id: item.id,
+                ongoingStep: item.ongoingStep,
+                houseName: item.houseName,
+                applyName: item.applyName,
+                departmentName: item.departmentName,
+                companyName: item.companyName,
+                workName: item.workName,
+                type: item.type,
+              },
+            })
+          } else if (homeType == 2) {
+            this.$router.push({
+              path: "/dashboard/daiban/pending/penDetails",
+              query: {
+                processId: item.processId,
+                auditState: item.auditState,
+                id: item.id,
+                ongoingStep: item.ongoingStep,
+                houseName: item.houseName,
+                applyName: item.applyName,
+                departmentName: item.departmentName,
+                companyName: item.companyName,
+                workName: item.workName,
+                type: item.type,
+              },
+            })
+          } else if (homeType == 3) {
+            this.$router.push({
+              path: "/home/daiban/pending/penDetails",
+              query: {
+                processId: item.processId,
+                auditState: item.auditState,
+                id: item.id,
+                ongoingStep: item.ongoingStep,
+                houseName: item.houseName,
+                applyName: item.applyName,
+                departmentName: item.departmentName,
+                companyName: item.companyName,
+                workName: item.workName,
+                type: item.type,
+              },
+            })
+          }
         }
       }else if(item.type == 'code3' || item.type == 'code4'|| item.type == 'code9'|| item.type == 'code10'|| item.type == 'code11'|| item.type == 'code12') {
           this.$router.push({

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

@@ -27,7 +27,8 @@
       </div>
       <div class="table_middle">
         <div style="margin-left: 20px">
-          1.制定通风方案:
+          <span v-if="type == 'tf'">1.制定通风方案:</span>
+          <span v-if="type == 'xzjh'">1.制定熏蒸计划:</span>
           <span v-if="this.subData == 1">否</span>
           <span v-if="this.subData == 0">是</span>
         </div>
@@ -178,6 +179,7 @@ export default {
       subData: null,
       //审批数据
       applyData: [],
+      type: null
     }
   },
   methods: {
@@ -426,6 +428,7 @@ export default {
     this.companyName = this.$route.query.companyName
     this.workName = this.$route.query.workName
     this.ongoingStep=parseInt(this.$route.query.ongoingStep)
+    this.type = this.$route.query.type
   },
 }
 </script>

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

@@ -29,6 +29,7 @@
         <div style="margin-left: 20px">
           <span v-if="type == 'tf'">1.制定通风方案:</span>
           <span v-if="type == 'xzjh'">1.制定熏蒸计划:</span>
+          <span v-if="type == 'xzsq'">1.提交散气作业申请:</span>
           <span v-if="this.subData == 1">否</span>
           <span v-if="this.subData == 0">是</span>
         </div>
@@ -179,7 +180,8 @@ export default {
       subData: null,
       //审批数据
       applyData: [],
-      type: null
+      type: null,
+      ongoingStepNext: null
     }
   },
   methods: {
@@ -190,8 +192,6 @@ export default {
         .then((res) => {
           console.log(res.data, "......")
           if (res.code == 200) {
-            
-
             let ongoingStep = this.ongoingStep
             this.subData = res.data.process[ongoingStep].list[0].subData  //方案状态
             this.tableData = res.data.process[ongoingStep]
@@ -222,7 +222,7 @@ export default {
         id: this.row.id,
         auditState: this.auditState,
         // 进行到哪一步的主流程id
-        ongoingStep: this.ongoingStep,
+        ongoingStep: this.ongoingStepNext,
         auditTime: getNowFormatDate(),
       }
       Approval(data)
@@ -237,10 +237,10 @@ export default {
 
           this.getCheckList()
           this.getPending()
-          this.$router.push({
-            path: "/dashboard/daiban/pending/xunzengDetails",
-            item: this.$route.query,
-          })
+          // this.$router.push({
+          //   path: "/dashboard/daiban/pending/xunzengDetails",
+          //   item: this.$route.query,
+          // })
         })
         .catch((err) => {
           console.log(err)
@@ -252,7 +252,7 @@ export default {
       var data = {
         id: this.row.id,
         auditState: this.auditState,
-        ongoingStep: this.ongoingStep,
+        ongoingStep: this.ongoingStepNext,
         auditTime: getNowFormatDate(),
       }
       yjcgApproval(data)
@@ -286,9 +286,7 @@ export default {
       })
         .then(() => {
           this.auditState = 2
-
-          // this.ongoingStep = 0
-           this.ongoingStep=this.ongoingStep
+          this.ongoingStepNext=this.ongoingStep
           this.process = []
           //this.getApproval()
           if (item.type == "yjcg" || item.type == "xzjh") {
@@ -303,8 +301,6 @@ export default {
 
     //审批通过
     agree(item, index) {
-      console.log(item, "??????????")
-      console.log(index, "index......")
       //最后一个人通过
       if (index == this.process.length - 1) {
         if(item.type == "yjcg"){
@@ -312,18 +308,13 @@ export default {
         }else{
            this.auditState = 3
         }
-       
-      
-        // this.ongoingStep = 1
-        this.ongoingStep=this.ongoingStep+1
-        console.log('审批后的ongoingStep'+this.ongoingStep)
+        this.ongoingStepNext=this.ongoingStep+1
+        console.log('审批后的ongoingStep'+this.ongoingStepNext)
       } else {
         this.auditState = 1
-        // this.ongoingStep = 0
-         this.ongoingStep=this.ongoingStep
-         console.log('审批前的ongoingStep'+this.ongoingStep)
+         this.ongoingStepNext=this.ongoingStep
+         console.log('审批前的ongoingStep'+this.ongoingStepNext)
       }
-
       this.process = []
       this.$message(
         {
@@ -416,8 +407,6 @@ export default {
     this.row = this.$route.query
     console.log(this.row, "??????")
 
-    this.getCheckList()
-
     this.houseName = this.$route.query.houseName
     this.applyName = this.$route.query.applyName
     this.departmentName = this.$route.query.departmentName
@@ -425,6 +414,7 @@ export default {
     this.workName = this.$route.query.workName
     this.ongoingStep=parseInt(this.$route.query.ongoingStep)
     this.type = this.$route.query.type
+    this.getCheckList()
   },
 }
 </script>

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

@@ -24,7 +24,7 @@
         <div class="middle">
           <div class="middle_flex"  v-if="item.workName.indexOf('药剂') == -1 && item.type !== 'code1'">
             <div>仓号:</div>
-            <div>{{ item.houseName }}</div>
+            <div>{{ hourseDic[item.houseId] }}</div>
           </div>
           <div class="middle_flex" v-if="item.type.indexOf('code') == -1">
             <div>申请人:</div>
@@ -196,7 +196,7 @@ export default {
      this.proCount = this.$store.state.proCount;
      console.log(this.proCount,"this.proCount....")
     console.log(this.$route)
-    if (this.$route.name == "ProDetails") {
+    if (this.$route.name == "ProDetails" || this.$route.name == "proXunzengDetails") {
       this.isShow = false
     } else {
       this.isShow = true
@@ -227,43 +227,93 @@ export default {
       // let userInfo = JSON.parse(getUser())
       var homeType = this.userInfo.homeType
       if (item.type.indexOf('code') == -1) {
-        if (homeType == 1) {
-          this.$router.push({
-            path: "/dashboard/daiban/processed/proDetails",
-            query: {
-              processId: item.processId,
-              houseName: item.houseName,
-              applyName: item.applyName,
-              departmentName: item.departmentName,
-              companyName: item.companyName,
-              workName: item.workName,
-            },
-          })
-        } else if (homeType == 2) {
-          this.$router.push({
-            path: "/dashboard/daiban/processed/proDetails",
-            query: {
-              processId: item.processId,
-              houseName: item.houseName,
-              applyName: item.applyName,
-              departmentName: item.departmentName,
-              companyName: item.companyName,
-              workName: item.workName,
-            },
-          })
-        } else if (homeType == 3) {
-          this.$router.push({
-            path: "/home/daiban/processed/proDetails",
-            query: {
-              processId: item.processId,
-              houseName: item.houseName,
-              applyName: item.applyName,
-              departmentName: item.departmentName,
-              companyName: item.companyName,
-              workName: item.workName,
-            },
-          })
+        if(item.type == 'xzjh' || item.type == 'xzsq'){
+          if (homeType == 1) {
+            this.$router.push({
+              path: "/dashboard/daiban/processed/xunzengDetails",
+              query: {
+                processId: item.processId,
+                houseName: item.houseName,
+                applyName: item.applyName,
+                departmentName: item.departmentName,
+                companyName: item.companyName,
+                workName: item.workName,
+                type: item.type,
+                ongoingStep: item.ongoingStep
+              },
+            })
+          } else if (homeType == 2) {
+            this.$router.push({
+              path: "/dashboard/daiban/processed/xunzengDetails",
+              query: {
+                processId: item.processId,
+                houseName: item.houseName,
+                applyName: item.applyName,
+                departmentName: item.departmentName,
+                companyName: item.companyName,
+                workName: item.workName,
+                type: item.type,
+                ongoingStep: item.ongoingStep
+              },
+            })
+          } else if (homeType == 3) {
+            this.$router.push({
+              path: "/home/daiban/processed/xunzengDetails",
+              query: {
+                processId: item.processId,
+                houseName: item.houseName,
+                applyName: item.applyName,
+                departmentName: item.departmentName,
+                companyName: item.companyName,
+                workName: item.workName,
+                type: item.type,
+                ongoingStep: item.ongoingStep
+              },
+            })
+          }
+        }else{
+          if (homeType == 1) {
+            this.$router.push({
+              path: "/dashboard/daiban/processed/proDetails",
+              query: {
+                processId: item.processId,
+                houseName: item.houseName,
+                applyName: item.applyName,
+                departmentName: item.departmentName,
+                companyName: item.companyName,
+                workName: item.workName,
+                ongoingStep: item.ongoingStep
+              },
+            })
+          } else if (homeType == 2) {
+            this.$router.push({
+              path: "/dashboard/daiban/processed/proDetails",
+              query: {
+                processId: item.processId,
+                houseName: item.houseName,
+                applyName: item.applyName,
+                departmentName: item.departmentName,
+                companyName: item.companyName,
+                workName: item.workName,
+                ongoingStep: item.ongoingStep
+              },
+            })
+          } else if (homeType == 3) {
+            this.$router.push({
+              path: "/home/daiban/processed/proDetails",
+              query: {
+                processId: item.processId,
+                houseName: item.houseName,
+                applyName: item.applyName,
+                departmentName: item.departmentName,
+                companyName: item.companyName,
+                workName: item.workName,
+                ongoingStep: item.ongoingStep
+              },
+            })
+          }
         }
+        
       }else{
         console.log(item,"item....?????")
         this.$router.push({

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

@@ -29,6 +29,7 @@
         <div style="margin-left: 20px">
           <span v-if="type == 'tf'">1.制定通风方案:</span>
           <span v-if="type == 'xzjh'">1.制定熏蒸计划:</span>
+          <span v-if="type == 'xzsq'">1.提交散气作业申请:</span>
           <span v-if="this.subData == 1">否</span>
           <span v-if="this.subData == 0">是</span>
         </div>
@@ -179,7 +180,8 @@ export default {
       subData: null,
       //审批数据
       applyData: [],
-      type: null
+      type: null,
+      ongoingStepNext: null
     }
   },
   methods: {
@@ -220,7 +222,7 @@ export default {
         id: this.row.id,
         auditState: this.auditState,
         // 进行到哪一步的主流程id
-        ongoingStep: this.ongoingStep,
+        ongoingStep: this.ongoingStepNext,
         auditTime: getNowFormatDate(),
       }
       Approval(data)
@@ -250,7 +252,7 @@ export default {
       var data = {
         id: this.row.id,
         auditState: this.auditState,
-        ongoingStep: this.ongoingStep,
+        ongoingStep: this.ongoingStepNext,
         auditTime: getNowFormatDate(),
       }
       yjcgApproval(data)
@@ -284,9 +286,7 @@ export default {
       })
         .then(() => {
           this.auditState = 2
-
-          // this.ongoingStep = 0
-           this.ongoingStep=this.ongoingStep
+           this.ongoingStepNext=this.ongoingStep
           this.process = []
           //this.getApproval()
           if (item.type == "yjcg" || item.type == "xzjh") {
@@ -313,15 +313,15 @@ export default {
        
       
         // this.ongoingStep = 1
-        this.ongoingStep=this.ongoingStep+1
-        console.log('审批后的ongoingStep'+this.ongoingStep)
+        this.ongoingStepNext=this.ongoingStep+1
+        console.log('审批后的ongoingStep'+this.ongoingStepNext)
       } else {
         this.auditState = 1
      
 
         // this.ongoingStep = 0
-         this.ongoingStep=this.ongoingStep
-         console.log('审批前的ongoingStep'+this.ongoingStep)
+         this.ongoingStepNext=this.ongoingStep
+         console.log('审批前的ongoingStep'+this.ongoingStepNext)
       }
 
       this.process = []
@@ -416,8 +416,6 @@ export default {
     this.row = this.$route.query
     console.log(this.row, "??????")
 
-    this.getCheckList()
-
     this.houseName = this.$route.query.houseName
     this.applyName = this.$route.query.applyName
     this.departmentName = this.$route.query.departmentName
@@ -425,6 +423,13 @@ export default {
     this.workName = this.$route.query.workName
     this.ongoingStep = parseInt(this.$route.query.ongoingStep)
     this.type = this.$route.query.type
+    if(this.$route.query.type == 'xzjh'){
+      this.ongoingStep = 0
+    }else if(this.$route.query.type == 'xzsq'){
+      this.ongoingStep = 3
+    }
+
+    this.getCheckList()
   },
 }
 </script>

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

@@ -3,34 +3,19 @@
     <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 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">
@@ -56,9 +41,11 @@
                 style="height: 400px"
               >
                 <div class="tf_title">
-                  <i class="iconfont iconshu"></i>流程（机械通风审批）
+                  <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="processActive">
+                <el-steps direction="vertical" :active="scope.row.process.length">
                   <el-step
                     v-for="(item, index) in scope.row.process"
                     :key="index"
@@ -180,7 +167,9 @@ export default {
       tableData: [],
       //审批流程
       process: [],
+      processNew: [],
       disabled: true,
+      processActive:0
     }
   },
   methods: {
@@ -199,23 +188,17 @@ export default {
               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
-            }
+          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", this.process)
+          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.......")
         }
       })
@@ -227,11 +210,16 @@ export default {
           return [1, 4]
         }
       }
+      if (rowIndex === 12) {
+        if (columnIndex === 0) {
+          return [1, 4]
+        }
+      }
     },
 
     //点击返回按钮
     goBack() {
-      this.$router.push({ path: "/reservesManagement/mechanicalVentilation" })
+      this.$router.push({ path: "/reservesManagement/fumigationManagement" })
     },
   },
   mounted() {
@@ -239,7 +227,7 @@ export default {
     console.log(this.userInfo, "this.userInfo.....?????")
     this.processId = this.$route.query.processId
     console.log(this.processId, "//////")
-    this.stepActive = parseInt(this.$route.query.ongoingStep)
+    this.stepActive = parseInt(this.$route.query.ongoingStep) + 1
     this.getCheckList()
     //获取人员字典数据
     this.perList = JSON.parse(localStorage.getItem("perList"))
@@ -247,6 +235,10 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+.icon_wai{
+  width:3em;
+  height:3em;
+}
 .global {
   height: calc(100vh - 70px - 83px);
   min-height: 500px;

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

@@ -62,7 +62,7 @@
           </el-form>
           <div>
             <el-button
-              v-if="$tools.IsPermission(228)"
+              v-if="$tools.IsPermission(338)"
               type="success"
               icon="el-icon-circle-plus"
               plain
@@ -88,8 +88,10 @@
             width="50px"
           >
           </el-table-column>
-
           <el-table-column prop="type" label="类型" align="center">
+            <!-- <template slot-scope="scope"> -->
+              <span>熏蒸管理</span>
+            <!-- </template> -->
           </el-table-column>
           <el-table-column prop="applyTime" label="时间" align="center">
           </el-table-column>
@@ -111,7 +113,7 @@
           >
             <template slot-scope="scope">
               <el-button
-                v-if="$tools.IsPermission(230)"
+                v-if="$tools.IsPermission(340)"
                 size="mini"
                 type="detailbtn"
                 @click="handleCheck(3, scope.$index, scope.row)"
@@ -127,7 +129,7 @@
                   scope.row.auditState != 4 &&
                   scope.row.auditState != 1 &&
                   scope.row.auditState != 2 &&
-                  $tools.IsPermission(229)
+                  $tools.IsPermission(339)
                 "
                 >修改</el-button
               >
@@ -174,7 +176,7 @@ export default {
       //库编号
       depotId: this.$store.state.depotId,
       //类型
-      type: "tf",
+      type: "xz",
       value: "",
       query: {
         // startTime: "",
@@ -207,10 +209,7 @@ export default {
     },
     //查看
     handleCheck(type, index, row) {
-      console.log(row, "row")
-
       if (row.auditState == 4) {
-        console.log(4444444)
         this.$router.push({
           path: "/reservesManagement/fumigationManagement/completed",
           query: {
@@ -220,7 +219,6 @@ export default {
           },
         })
       } else {
-        console.log(row.auditState, "row.status....")
         this.$router.push({
           path: "/reservesManagement/fumigationManagement/steps",
           query: {

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

@@ -4,195 +4,84 @@
       <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  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"
-          >
-            <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  border  stripe  highlight-current-row  :data="tableData"  :span-method="arraySpanMethod">
+          <el-table-column  label="序号"  prop="step"  align="center"  width="100px">
+            <!-- <template slot-scope="scope">
+            {{ scope.row.index + 1 }}
+            </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  v-model="scope.row.subData"  @change="radioChange(scope.row)">
+                <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  type="cancel"  @click="goBack()"
-            >返回</el-button
-          >
-          <el-button class="saveBtn" v-show="isShow" type="savebtn"  @click="save()" :loading="loading">{{
-            this.button
-          }}</el-button>
+        <div  v-if="tableDataAudit && tableDataAudit.length"  style="height: 400px">
+          <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> 
+          </div>
+          <el-steps direction="vertical" :active="processActive">
+            <el-step  v-for="(item, index) in tableDataAudit"  :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">
+                    </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>
+      <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>
@@ -221,8 +110,6 @@ export default {
       isShow: true,
       //初始化空对象
       obj: {},
-      pageType: 0,
-
       //流程id
       processId: "",
       //当前登录人信息
@@ -270,6 +157,7 @@ export default {
       //流程选项
 
       subList: [],
+      tableDataAudit:[]
     }
   },
   methods: {
@@ -287,12 +175,8 @@ export default {
 
     // 用户字典列表
     getUserList() {
-      // var params = {
-      //   depotId: this.depotId,
-      // }
       userList().then((res) => {
         if (res.code == 200) {
-          console.log(res, "用户列表。。。。。")
           this.perList = res.data
         }
       })
@@ -300,27 +184,27 @@ export default {
 
     //获取流程数据
     processList() {
-      var type = "tf"
+      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"
+      }
       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++) {
+          for (let i = 0; i < res.data.length; 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.tableDataAudit = this.process
 
           //申请人
           this.applyPeople = this.process[0].content
@@ -345,12 +229,14 @@ export default {
         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
     },
     //radio选项改变是
     radioChange(row) {
-      console.log(getNowFormatDate())
       row.operationTime = getNowFormatDate()
       this.changeBtn(this.tableData)
     },
@@ -367,9 +253,9 @@ export default {
       }
 
       if (finish) {
-        if (this.stepActive == 0) {
+        if (this.stepActive == 0 || this.stepActive == 3) {
           this.button = "保存并提交"
-        } else if (this.stepActive != 3 || this.step != 4) {
+        } else if (this.stepActive == 1 || this.stepActive == 2) {
           this.button = "保存"
         } else {
           this.button = "完成"
@@ -386,64 +272,64 @@ export default {
     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 {
+      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
-
-        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
+        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 = "暂存"
-        this.disabled = false
       } else if (this.step == 3) {
         // this.isShow = true
         this.tableData = this.totalData[2].list
+        this.tableDataAudit = []
         this.button = "暂存"
-        this.disabled = false
       } else if (this.step == 4) {
-        // this.isShow = true
+        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
       }
@@ -457,18 +343,16 @@ export default {
     },
     //新增时初始化页面
     processFirst() {
-      var type = "tf"
+      var type = "xz"
       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.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()
@@ -482,9 +366,15 @@ 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"
+      }
       var data = {
         //流程类型
-        type: "tf",
+        type: type,
         //主流程id
         mainId: this.mainId,
         //主流程索引
@@ -492,7 +382,7 @@ export default {
 
         subList: this.subList,
         //仓房id
-        houseId: this.$store.state.houseId,
+        houseId: Number(this.$store.state.houseId),
         //库id
         depotId: this.$store.state.depotId,
         //发起人
@@ -510,20 +400,25 @@ export default {
           console.log(res.data)
           if (res.code == 200) {
             this.loading=true;
+            this.$message.success(res.msg);
             this.$router.push({
               path: "/reservesManagement/fumigationManagement",
             })
+          }else{
+            this.$message.error(res.msg);
+            this.loading=false;
           }
         })
         .catch((err) => {
+          this.$message.error(res.msg);
+          this.loading=false;
           console.log(err)
         })
     },
 
     //点击保存并提交按钮时
     save() {
-      console.log(this.tableData,"this.tableData...>>>>>")
-      if( this.totalData[0].list[0].subData == 1){
+      if( this.totalData[this.stepActive].list[0].subData == 1){
          this.$message("只有选择是才能发起申请");
         return;
       }
@@ -534,24 +429,19 @@ export default {
         obj.subId = ele.id
         obj.mainId = ele.zid
         obj.operationTime = ele.operationTime
-        console.log(obj, "obj.....")
+        obj.processId = ''
+        if(this.$route.query && this.$route.query.processId){
+          obj.processId = this.$route.query.processId
+        }
         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) {
+        if (this.totalData[this.stepActive].list[0].subData == null) {
           this.$message("请先选择选项");
-          
-         
           return;
-           
         }
-         
         //判断是否选择了审批人
         var flag = true
         this.process.forEach((item) => {
@@ -561,43 +451,24 @@ export default {
             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.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()
         }
       }
@@ -609,29 +480,30 @@ export default {
       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
+          this.totalData = res.data.process
+          let ongoingStep = this.stepActive
+          this.tableData = res.data.process[ongoingStep].list
+          if(res.data.process[ongoingStep].audit){
+            // this.tableDataAudit = res.data.process[ongoingStep].audit
+            for (let i = 0; i < res.data.process[ongoingStep].audit.length; i++) {
+              var ele = res.data.process[ongoingStep].audit[i]
+              if (ele.auditState == 0) {
+                this.processActive = i
+              }
+              // this.process.push(ele)
+              // if (this.process[0].content == 0) {
+              //   this.process[0].content = this.userInfo.uid
+              // } else {
+              //   this.process[0].content = res.data.process[ongoingStep].audit[0].content
+              // }
             }
+            this.processList()
+            this.tableShow()
           }
-          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,
-          })
+          // this.totalData[0].list.splice(1, 0, {
+          //   details: "是，否",
+          //   process: this.process,
+          // })
         }
       })
     },
@@ -639,11 +511,23 @@ 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"
+      }
+      let ongoingStepNum = null
+      if(this.stepActive < 4){
+        ongoingStepNum = this.stepActive + 1
+      }else{
+        ongoingStepNum = this.stepActive
+      }
       var data = {
         processId: this.processId,
-        type: "tf",
+        type: type,
         auditState: this.auditState,
-        ongoingStep: this.stepActive,
+        ongoingStep: ongoingStepNum,
         subList: this.subList,
       }
       updateList(data).then((res) => {
@@ -659,21 +543,9 @@ export default {
 
   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
@@ -683,27 +555,20 @@ export default {
       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) {
+    if (this.stepActive == 0 || this.stepActive == 3) {
       this.button = "保存并提交"
     } else {
       this.button = "暂存"
@@ -749,7 +614,7 @@ export default {
   }
   .btns {
     text-align: right;
-    margin: 20px 10px 0 0;
+    margin: 40px 10px 0 0;
   }
   // .saveBtn{
   //   width:120px;
@@ -771,7 +636,7 @@ export default {
     font-size: 18px;
   }
   .el-steps {
-  height: 330px !important;
+  // height: 330px !important;
 }
 
 .icon_wai{