优化

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

@@ -42,8 +42,8 @@
               >
                 <div class="tf_title">
                   <i class="iconfont iconshu"></i>
-                    <span  v-if="scope.$index == 1">流程（熏蒸计划申请审批）</span> 
-                    <span  v-if="scope.$index == 12">流程（熏蒸散气申请审批）</span> 
+                    <span  v-if="scope.$index == 2">流程（设施维修计划审批）</span> 
+                    <span  v-if="scope.$index == 4">流程（设施维修预算审批）</span> 
                 </div>
                 <el-steps direction="vertical" :active="scope.row.process.length">
                   <el-step
@@ -177,7 +177,6 @@ export default {
     getCheckList() {
       var processId = this.processId
       checkList(processId).then((res) => {
-        console.log(res, ".......")
         if (res.code == 200) {
           var index = 1
           this.tableData = res.data.process
@@ -191,26 +190,34 @@ export default {
           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
+          if (res.data.process[1].audit[0].content == 0) {
+            res.data.process[1].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)
+          this.totalData.splice(2, 0, { details: "是，否" })
+          if(res.data.process[0].step.isAudit == 1){
+            this.$set(this.totalData[2], "process", res.data.process[0].audit)
+          }else{
+            this.$set(this.totalData[2], "process", res.data.process[0].audit.slice(0,3))
+          }
+          this.totalData.splice(4, 0, { details: "是，否" })
+          if(res.data.process[1].step.isAudit == 1){
+            this.$set(this.totalData[4], "process", res.data.process[1].audit)
+          }else{
+            this.$set(this.totalData[4], "process", res.data.process[1].audit.slice(0,3))
+          }
           console.log(this.totalData, "totalData.......")
         }
       })
     },
     //合并列或行
     arraySpanMethod({ row, column, rowIndex, columnIndex }) {
-      if (rowIndex === 1) {
+      if (rowIndex === 2) {
         if (columnIndex === 0) {
           return [1, 4]
         }
       }
-      if (rowIndex === 12) {
+      if (rowIndex === 4) {
         if (columnIndex === 0) {
           return [1, 4]
         }
@@ -219,7 +226,7 @@ export default {
 
     //点击返回按钮
     goBack() {
-      this.$router.push({ path: "/reservesManagement/fumigationManagement" })
+      this.$router.push({ path: "/facilitiesEquipment/facilitiesManagement/maintenance" })
     },
   },
   mounted() {

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

@@ -1,23 +1,6 @@
 <template>
   <div class="global">
     <div class="mainContainer">
-       <div class="top">
-            <el-form :inline="true">
-            <el-form-item label="设备类别：">{{'粮油输送设备'}}</el-form-item>
-            <el-form-item label="设备名称：">{{'移动式水平输送机'}}</el-form-item>
-            <el-form-item label="设备编号：">{{'103007000012'}}</el-form-item>
-            <el-form-item label="设备状态：">
-                <el-select v-model="SBstatus" placeholder="请选择">
-                    <el-option
-                    v-for="item in SBstatusList"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value">
-                    </el-option>
-                </el-select>
-            </el-form-item>
-      </el-form>
-        </div>
       <div class="div_parent">
       <div class="steps">
         <el-steps :active="stepActive" align-center direction="horizontal">
@@ -47,11 +30,15 @@
             </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:10px">
           <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 v-if="stepActive == 0 || step == 1">流程（设施维修计划审批）</span>
+            <span v-if="stepActive == 1 || step == 2">流程（设施维修预算审批）</span> 
+          </div>
+          <div class="tf_title_right">
+            <span style="margin-right:10px">提交给总经理和分公司审批</span>
+            <el-switch  v-model="isAudit" :disabled="disabled"  :active-value="activevalue"  :inactive-value="inactivevalue" @change="isAuditFn"></el-switch>
           </div>
           <el-steps direction="vertical" :active="processActive">
             <el-step  v-for="(item, index) in tableDataAudit"  :key="index"  icon="el-icon-edit">
@@ -175,9 +162,10 @@ export default {
 
       subList: [],
       tableDataAudit:[],
-
-      SBstatus:'',
-      SBstatusList:[]
+      activevalue:1,
+      inactivevalue:0,
+      isAudit:1,
+      tableDataAuditCopy:[]
     }
   },
   methods: {
@@ -186,11 +174,11 @@ export default {
       if (this.step != 1) {
         return
       }
-      if (rowIndex === 1) {
-        if (columnIndex === 0) {
-          return [1, 4]
-        }
-      }
+      // if (rowIndex === 1) {
+      //   if (columnIndex === 0) {
+      //     return [1, 4]
+      //   }
+      // }
     },
 
     // 用户字典列表
@@ -205,10 +193,10 @@ 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 = "sswxjh"
+      }else if(this.stepActive == 1){
+        type = "sswxys"
       }
       var userId = this.userInfo.uid
       var depotId = this.userInfo.depotId
@@ -225,7 +213,7 @@ export default {
             this.process[0].content = this.userInfo.uid
           }
           this.tableDataAudit = this.process
-
+          this.tableDataAuditCopy = JSON.parse(JSON.stringify(this.tableDataAudit))
           //申请人
           this.applyPeople = this.process[0].content
           //审批人
@@ -237,10 +225,10 @@ 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 = "sswxjh"
+      }else if(this.stepActive == 1){
+        type = "sswxys"
       }
       var userId = this.userInfo.uid
       var depotId = this.userInfo.depotId
@@ -306,15 +294,13 @@ export default {
       }
 
       if (finish) {
-        if (this.stepActive == 0 || this.stepActive == 3) {
+        if (this.stepActive == 0 || this.stepActive == 1) {
           this.button = "保存并提交"
-        } else if (this.stepActive == 1 || this.stepActive == 2) {
-          this.button = "保存"
         } else {
           this.button = "完成"
         }
       } else {
-        if (this.step == 1) {
+        if (this.step == 1 || this.step == 2) {
           this.button = "保存并提交"
         } else {
           this.button = "暂存"
@@ -344,7 +330,12 @@ export default {
         console.log(this.totalData)
         this.tableData = this.totalData[0].list
         console.log(this.tableData)
-        this.tableDataAudit = this.totalData[0].audit
+        this.isAudit = this.totalData[0].step.isAudit
+        if(this.isAudit == 1){
+          this.tableDataAudit = JSON.parse(JSON.stringify(this.totalData[0].audit))
+        }else if(this.isAudit == 0){
+          this.tableDataAudit = JSON.parse(JSON.stringify(this.totalData[0].audit)).slice(0,3)
+        }
         for (let i = 0; i < this.tableDataAudit.length; i++) {
           var ele = this.tableDataAudit[i]
           if (ele.auditState == 0) {
@@ -355,14 +346,31 @@ export default {
         }
         this.button = "保存并提交"
       } else if (this.step == 2) {
-        // this.isShow = true
+        console.log(this.totalData)
         this.tableData = this.totalData[1].list
-        this.tableDataAudit = []
-        console.log(this.tableData, "第二步")
-        this.button = "暂存"
+        console.log(this.tableData)
+        this.isAudit = this.totalData[1].step.isAudit
+        if(!this.isAudit && this.isAudit != 0){
+          this.isAudit = 1
+        }
+        if(this.isAudit == 1){
+          this.tableDataAudit = JSON.parse(JSON.stringify(this.totalData[1].audit))
+        }else if(this.isAudit == 0){
+          this.tableDataAudit = JSON.parse(JSON.stringify(this.totalData[1].audit)).slice(0,3)
+        }
+        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 == 3) {
         // this.isShow = true
         this.tableData = this.totalData[2].list
+        this.isAudit = this.totalData[2].step.isAudit
         this.tableDataAudit = []
         this.button = "暂存"
       } else if (this.step == 4) {
@@ -392,11 +400,11 @@ export default {
 
     //点击返回按钮
     goBack() {
-      this.$router.push({ path: "/reservesManagement/fumigationManagement" })
+      this.$router.push({ path: "/facilitiesEquipment/facilitiesManagement/maintenance" })
     },
     //新增时初始化页面
     processFirst() {
-      var type = "xz"
+      var type = "sswx"
       getAddList(type)
         .then((res) => {
           if (res.code == 200) {
@@ -420,10 +428,10 @@ 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 = "sswxjh"
+      }else if(this.stepActive == 1){
+        type = "sswxys"
       }
       var data = {
         //流程类型
@@ -435,7 +443,7 @@ export default {
 
         subList: this.subList,
         //仓房id
-        houseId: Number(this.$store.state.houseId),
+        // houseId: Number(this.$store.state.houseId),
         //库id
         depotId: this.$store.state.depotId,
         //发起人
@@ -446,6 +454,7 @@ export default {
         toPeople: this.toPeople,
         //申请时间
         applyTime: getNowFormatDate(),
+        isAudit: this.isAudit
       }
       console.log(data, "新增数据。。。")
       addList(data)
@@ -455,7 +464,7 @@ export default {
             this.loading=true;
             this.$message.success(res.msg);
             this.$router.push({
-              path: "/reservesManagement/fumigationManagement",
+              path: "/facilitiesEquipment/facilitiesManagement/maintenance",
             })
           }else{
             this.$message.error(res.msg);
@@ -471,58 +480,66 @@ export default {
 
     //点击保存并提交按钮时
     save() {
-      if( this.totalData[this.stepActive].list[0].subData == 1){
-         this.$message("只有选择是才能发起申请");
-        return;
+      let status = 0
+      if(this.stepActive == 0 || this.stepActive == 1){
+        this.totalData[this.stepActive].list.forEach(item => {
+          if( item.subData == 1){
+            this.$message("只有选择是才能发起申请");
+            status = 1
+            return;
+          }
+        })
       }
-      this.tableData.forEach((ele) => {
-        var obj = {}
-        console.log(ele)
-        obj.subData = ele.subData
-        obj.subId = ele.id
-        obj.mainId = ele.zid
-        obj.operationTime = ele.operationTime
-        obj.processId = ''
-        if(this.$route.query && this.$route.query.processId){
-          obj.processId = this.$route.query.processId
-        }
-        if (obj.subData != null) {
-          this.subList.push(obj)
-        }
-      })
-      if (this.button == "保存并提交") {
-        if (this.totalData[this.stepActive].list[0].subData == null) {
-          this.$message("请先选择选项");
-          return;
-        }
-        //判断是否选择了审批人
-        var flag = true
-        this.process.forEach((item) => {
-          if (item.content == null) {
-            this.$message("请先选择审批人")
-            flag = false
-            return
+      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.operationTime = ele.operationTime
+          obj.processId = ''
+          if(this.$route.query && this.$route.query.processId){
+            obj.processId = this.$route.query.processId
+          }
+          if (obj.subData != null) {
+            this.subList.push(obj)
           }
         })
-        if (flag) {
-          this.tfAdd()
-        }
-      } else {
-        if (this.button == "暂存") {
-          this.auditState = 3
-          this.ongoingStep = this.stepActive
-          this.getUpdateList()
-        } else if (this.button == "保存" || this.button == "完成") {
-          console.log("保存。。")
-          // if (this.stepActive + 1 == this.step) {
-          //   this.stepActive = this.stepActive + 1
-          // }
-          if (this.button == "保存") {
+        if (this.button == "保存并提交") {
+          if (this.totalData[this.stepActive].list[0].subData == null) {
+            this.$message("请先选择选项");
+            return;
+          }
+          //判断是否选择了审批人
+          var flag = true
+          this.process.forEach((item) => {
+            if (item.content == null) {
+              this.$message("请先选择审批人")
+              flag = false
+              return
+            }
+          })
+          if (flag) {
+            this.tfAdd()
+          }
+        } else {
+          if (this.button == "暂存") {
             this.auditState = 3
-          } else {
-            this.auditState = 4
+            this.ongoingStep = this.stepActive
+            this.getUpdateList()
+          } else if (this.button == "保存" || this.button == "完成") {
+            console.log("保存。。")
+            // if (this.stepActive + 1 == this.step) {
+            //   this.stepActive = this.stepActive + 1
+            // }
+            if (this.button == "保存") {
+              this.auditState = 3
+            } else {
+              this.auditState = 4
+            }
+            this.getUpdateList()
           }
-          this.getUpdateList()
         }
       }
     },
@@ -536,6 +553,10 @@ export default {
           this.totalData = res.data.process
           let ongoingStep = this.stepActive
           this.tableData = res.data.process[ongoingStep].list
+          this.isAudit = res.data.process[ongoingStep].step.isAudit
+          if(!this.isAudit && this.isAudit != 0){
+            this.isAudit = 1
+          }
           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++) {
@@ -550,7 +571,12 @@ export default {
             } else {
               this.process[0].content = res.data.process[ongoingStep].audit[0].content
             }
-            this.tableDataAudit = this.process
+            this.tableDataAuditCopy = this.process
+            if(this.isAudit == 1){
+              this.tableDataAudit = JSON.parse(JSON.stringify(this.tableDataAuditCopy))
+            }else if(this.isAudit == 0){
+              this.tableDataAudit = JSON.parse(JSON.stringify(this.tableDataAuditCopy)).slice(0,3)
+            }
             this.detailProcessList()
             this.tableShow()
           }
@@ -566,10 +592,10 @@ 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 = "sswxjh"
+      }else if(this.stepActive == 1 || this.stepActive == 2){
+        type = "sswxys"
       }
       let ongoingStepNum = null
       if(this.stepActive < 4 && this.button !== "暂存"){
@@ -583,6 +609,7 @@ export default {
         auditState: this.auditState,
         ongoingStep: ongoingStepNum,
         subList: this.subList,
+        isAudit: this.isAudit
       }
       updateList(data).then((res) => {
         if (res.code == 200) {
@@ -598,15 +625,23 @@ export default {
             this.getCheckList()
           }else{
             this.$router.push({
-              path: "/reservesManagement/fumigationManagement",
+              path: "/facilitiesEquipment/facilitiesManagement/maintenance",
             })
           }
           // this.$router.push({
-          //     path: "/reservesManagement/fumigationManagement",
+          //     path: "/facilitiesEquipment/facilitiesManagement/maintenance",
           //   })
         }
       })
     },
+
+    isAuditFn() {
+      if(this.isAudit == 1){
+        this.tableDataAudit = JSON.parse(JSON.stringify(this.tableDataAuditCopy))
+      }else if(this.isAudit == 0){
+        this.tableDataAudit = JSON.parse(JSON.stringify(this.tableDataAuditCopy)).slice(0,3)
+      }
+    }
   },
 
   mounted() {
@@ -702,6 +737,11 @@ export default {
     text-align: left;
     color: #037d41;
     font-size: 18px;
+    display: inline-block;
+  }
+  .tf_title_right{
+    display: inline-block;
+    float: right;
   }
   .el-steps {
   // height: 330px !important;