设备维修

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

@@ -102,10 +102,10 @@
                     >流程（设施报废审批）</span
                   >
                   <span v-if="scope.$index == 1 && value == 'sbgh'"
-                    >流程（设施领用审批）</span
+                    >流程（设备领用审批）</span
                   >
                   <span v-if="scope.$index == 3 && value == 'sbgh'"
-                    >流程（设施报废审批）</span
+                    >流程（设备归还审批）</span
                   >
                 </div>
                 <el-steps

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

@@ -364,6 +364,9 @@ export default {
               if (item.type == "tf") {
                 item.type = "熏蒸管理"
               }
+              if(item.type == "sbly"||item.type == "sbgh"){
+                item.workName="设备领用归还"
+              }
 
               if (item.equipmentName == undefined) {
                 item.equipmentName = this.$route.query.equipmentName

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

@@ -233,7 +233,10 @@ export default {
         console.log(this.roleListo,"this.roleListo")
       }
     })
-    this.getDeviceList()
+     this.$nextTick(function () {
+        this.getDeviceList()
+  })
+
   },
   methods: {
     getDeviceList() {

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

@@ -122,12 +122,22 @@
               <span v-if="(stepActive == 0 || step == 1) && value == 'sbbf'"
                 >流程（设施报废审批）</span
               >
-              <span v-if="(stepActive == 0 || step == 1) && value == 'sbly'"
-                >流程（设施领用审批）</span
+              <span
+                v-if="
+                  (stepActive == 0 || step == 1) &&
+                  (value == 'sbly' || this.$route.query.sbType == 'sbgh')
+                "
+                >流程（设备领用审批）</span
               >
 
-              <span v-if="(stepActive == 1 || step == 2) && value == 'sbly'"
-                >流程（设施归还审批）</span
+              <span
+                id="sbTitle"
+                v-if="
+                  (stepActive == 1 || step == 2) &&
+                  (this.$route.query.workName == '设备资产转移申请' ||
+                    this.$route.query.workName == '设备领用归还')
+                "
+                >流程（设备资产转移审批）</span
               >
             </div>
             <div class="tf_title_right" v-if="value == 'sbwx'">
@@ -494,12 +504,22 @@ export default {
           }
         } else {
           this.button = "暂存"
+          if(this.step==2&&this.$route.query.sbType=='sbly'){
+             this.button = "保存并提交"
+          }
         }
       }
     },
     //点击每步时
     stepClick(index) {
       //this.step = index + 1
+      console.log(index, "index..")
+      if(index==0&&this.$route.query.ongoingStep!=2&&(this.$route.query.sbType=="sbgh"||this.$route.query.sbType=="sbly")){
+        document.getElementById("sbTitle").innerHTML="";
+      }else if(index==1&&this.$route.query.ongoingStep!=2&&(this.$route.query.sbType=="sbgh"||this.$route.query.sbType=="sbly")){
+        document.getElementById("sbTitle").innerHTML="流程（设备资产转移审批）";
+      }
+
       console.log(index, this.stepActive, "?????")
       console.log(this.step, this.stepActive + 1)
 
@@ -546,7 +566,7 @@ export default {
         console.log(this.tableData)
         if (
           this.$route.query.workName == "设备资产转移申请" ||
-          this.$route.query.workName == "设备领用申请"
+          this.$route.query.workName == "设备领用归还"
         ) {
           this.tableDataAudit = JSON.parse(
             JSON.stringify(this.totalData[1].audit)
@@ -564,11 +584,22 @@ export default {
           }
           this.button = "保存并提交"
 
-          if (this.$route.query.sbType == "sbly") {
+          if (
+            this.$route.query.sbType == "sbly" &&
+            this.$route.query.type == 3
+          ) {
             this.isShow = false
             this.disabled = true
           }
         }
+
+        if (
+          this.$route.query.workName == "设备领用归还" &&
+          this.$route.query.sbType == "sbly" &&
+          this.$route.query.type == 2
+        ) {
+          this.button = "保存并提交"
+        }
         if (this.$route.query.type == 3) {
           this.disabled = true
           this.isShow = false
@@ -579,6 +610,15 @@ export default {
         this.isAudit = this.totalData[2].step.isAudit
         this.tableDataAudit = []
         this.button = "暂存"
+        if (
+          this.$route.query.workName == "设备领用归还" &&
+          this.$route.query.sbType == "sbgh" &&
+          this.$route.query.type == 3
+        ) {
+          console.log("aaaa")
+          this.isShow = false
+          this.disabled = true
+        }
       } else if (this.step == 4) {
         console.log(this.totalData)
         this.tableData = this.totalData[3].list
@@ -739,8 +779,16 @@ export default {
           index++
         ) {
           const element = this.totalData[this.stepActive].list[index]
-            //  if (element.subData == 1 && this.step == 1) {
-           if (element.subData == 1 && (  (this.step == 1||this.step==2)  &&  (this.$route.query.sbType=="sbly"||this.$route.query.sbType=="sbgh") )) {
+          //  if (element.subData == 1 && this.step == 1) {
+          if (
+            element.subData == 1 &&
+            ((this.step == 1 &&
+              (this.value == "sbbf" ||
+                this.value == "sbwx" ||
+                this.value == "sbly")) ||
+              (this.$route.query.sbType == "sbly" && this.step == 2) ||
+              (this.$route.query.sbType == "sbgh" && this.step == 2))
+          ) {
             this.$message("只有选择是才能发起申请")
 
             status = 1
@@ -806,9 +854,7 @@ export default {
             // 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.value == "sbtz" || this.value == "sbdwgl") {
                 this.yjbgAddList()
@@ -819,8 +865,9 @@ export default {
               // this.auditState = 3
               //  this.getUpdateList()
             } else {
+             
               this.auditState = 4
-              if (this.workName == "设备资产转移申请") {
+              if (this.$route.query.workName == "设备领用归还") {
                 this.value = "sbgh"
               }
 
@@ -839,13 +886,16 @@ export default {
         console.log(res.data, "查看数据")
         console.log(this.stepActive)
         if (res.code == 200) {
-          this.totalData = res.data.process;
-          if(this.$route.query.sbType=="sbly"&&this.$route.query.type==2){
-           let subData2=this.totalData[1].list[0].subData;
-           if(subData2==null){
-             this.disabled=false;
-             this.isShow=true
-           }
+          this.totalData = res.data.process
+          if (
+            this.$route.query.sbType == "sbly" &&
+            this.$route.query.type == 2
+          ) {
+            let subData2 = this.totalData[1].list[0].subData
+            if (subData2 == null) {
+              this.disabled = false
+              this.isShow = true
+            }
           }
           let ongoingStep = this.stepActive
           if (this.value == "sbtz" || this.value == "sbdwgl") {
@@ -891,7 +941,6 @@ export default {
             this.detailProcessList()
             this.tableShow()
           }
-         
         }
       })
     },
@@ -908,6 +957,7 @@ export default {
       //   type = "sswxys"
       // }
       type = this.value
+      console.log(type,"type..")
       let ongoingStepNum = null
       if (this.stepActive < 4 && this.button !== "暂存") {
         ongoingStepNum = this.stepActive + 1
@@ -1026,7 +1076,7 @@ export default {
     } else if (this.workName == "设备定位管理") {
       this.value = "sbdwgl"
     } else if (
-      this.workName == "设备领用申请" ||
+      this.workName == "设备领用归还" ||
       this.workName == "设备资产转移申请"
     ) {
       this.value = "sbly"
@@ -1051,7 +1101,7 @@ export default {
     //   if (this.stepActive == 2 && this.$route.query.sbType == "sbgh") {
     //   this.button = "暂存"
     // }
-   
+
     if (this.$route.query.type == 1) {
       this.isShow = true
       this.disabled = false
@@ -1060,8 +1110,14 @@ export default {
       this.processList()
     } else if (this.$route.query.type == 2) {
       //  this.value=this.$route.query.sbType
-      if(this.$route.query.sbType=="sbgh" ||this.$route.query.sbType=="sbbf"||this.$route.query.sbType=="sbwx"){
-        this.button="暂存"
+      if (
+        this.$route.query.sbType == "sbgh" ||
+        this.$route.query.sbType == "sbbf" ||
+        this.$route.query.sbType == "sbwx" ||
+        this.$route.query.sbType == "sbdwgl" ||
+        this.$route.query.sbType == "sbtz"
+      ) {
+        this.button = "暂存"
       }
       this.stepActive = parseInt(this.$route.query.ongoingStep)
       this.processId = this.$route.query.processId