设备维修

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

@@ -1,12 +1,65 @@
 <template>
   <div class="global">
     <div class="mainContainer">
+      <div class="top">
+        <div class="top_left">
+          <span style="margin-right: 40px"
+            >设备类型:{{ this.$route.query.equipmentCategory }}</span
+          >
+          <span style="margin-right: 40px"
+            >设备名称:{{ this.$route.query.equipmentName }}</span
+          >
+          <span style="margin-right: 40px"
+            >设备编号:{{ this.$route.query.equipmentNumber }}</span
+          >
+        </div>
+        <div class="top_right">
+          <span style="margin-right: 10px">设备管理类型:</span>
+          <el-select
+            v-model="value"
+            @change="valueChange($event)"
+            :disabled="disabledSelect"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </div>
+      </div>
+
       <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
+            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">
@@ -42,10 +95,23 @@
               >
                 <div class="tf_title">
                   <i class="iconfont iconshu"></i>
-                   <span  v-if="scope.$index == 2&& value=='sbwx'">流程（设施维修审批）</span> 
-                     <span  v-if="scope.$index == 2&& value=='sbbf'">流程（设施报废审批）</span>
+                  <span v-if="scope.$index == 2 && value == 'sbwx'"
+                    >流程（设施维修审批）</span
+                  >
+                  <span v-if="scope.$index == 2 && value == 'sbbf'"
+                    >流程（设施报废审批）</span
+                  >
+                  <span v-if="scope.$index == 1 && value == 'sbgh'"
+                    >流程（设施领用审批）</span
+                  >
+                  <span v-if="scope.$index == 3 && value == 'sbgh'"
+                    >流程（设施报废审批）</span
+                  >
                 </div>
-                <el-steps direction="vertical" :active="scope.row.process.length">
+                <el-steps
+                  direction="vertical"
+                  :active="scope.row.process.length"
+                >
                   <el-step
                     v-for="(item, index) in scope.row.process"
                     :key="index"
@@ -169,8 +235,31 @@ export default {
       process: [],
       processNew: [],
       disabled: true,
-      processActive:0,
-      value:"",
+      processActive: 0,
+      value: "",
+      disabledSelect: true,
+      options: [
+        {
+          value: "sbwx",
+          label: "设备维修",
+        },
+        {
+          value: "sbdwgl",
+          label: "设备定位管理",
+        },
+        {
+          value: "sbgh",
+          label: "设备领用归还",
+        },
+        {
+          value: "sbbf",
+          label: "设备报废",
+        },
+        {
+          value: "sbtz",
+          label: "设备台账",
+        },
+      ],
     }
   },
   methods: {
@@ -188,22 +277,35 @@ export default {
               index++
             })
           })
-          console.log( this.totalData," this.totalData")
+          console.log(this.totalData, " this.totalData")
           if (res.data.process[0].audit[0].content == 0) {
             res.data.process[0].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.splice(2, 0, { details: "是，否" })
-          if(res.data.process[0].step.isAudit == 1){
-            this.$set(this.totalData[2], "process", res.data.process[0].audit)
-            console.log(";;;;;;;;")
-          }else{
-            this.$set(this.totalData[2], "process", res.data.process[0].audit.slice(0,3))
-          }
 
+          if (this.$route.query.value != "sbgh") {
+            this.totalData.splice(2, 0, { details: "是，否" })
+          } else {
+            if (res.data.process[1].audit[0].content == 0) {
+              res.data.process[1].audit[0].content = this.userInfo.uid
+            }
+            this.totalData.splice(1, 0, { details: "是，否" })
+            this.totalData.splice(3, 0, { details: "是，否" })
+          }
+          if (res.data.process[0].step.isAudit == 1) {
+            if (this.$route.query.value == "sbgh") {
+              this.$set(this.totalData[1], "process", res.data.process[0].audit)
+              this.$set(this.totalData[3], "process", res.data.process[1].audit)
+            } else {
+              this.$set(this.totalData[2], "process", res.data.process[0].audit)
+              console.log(";;;;;;;;")
+            }
+          } 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){
@@ -217,14 +319,28 @@ export default {
     },
     //合并列或行
     arraySpanMethod({ row, column, rowIndex, columnIndex }) {
-   
-      if (rowIndex === 2) {
-        if (columnIndex === 0) {
-          return [1, 4]
+      if (this.$route.query.value != "sbgh") {
+        if (rowIndex === 2) {
+          if (columnIndex === 0) {
+            return [1, 4]
+          }
+        }
+      } else {
+        if (rowIndex === 1 || rowIndex === 3) {
+          if (columnIndex === 0) {
+            return [1, 4]
+          }
         }
       }
- 
-      
+
+      //  if (this.$route.query.value == "sbgh") {
+      //   if (rowIndex === 1 || rowIndex === 3) {
+      //     if (columnIndex === 0) {
+      //       return [1, 4]
+      //     }
+      //   }
+      // }
+
       // if (rowIndex === 4) {
       //   if (columnIndex === 0) {
       //     return [1, 4]
@@ -234,24 +350,22 @@ export default {
 
     //点击返回按钮
     goBack() {
-      this.$router.push(
-        {
-           path: "/facilitiesEquipment/equipmentManagement/deviceManagement/detailList" ,
-           query:{
-              equipmentId: this.$route.query.equipmentId,
-           equipmentName: this.$route.query.equipmentName,
+      this.$router.push({
+        path:
+          "/facilitiesEquipment/equipmentManagement/deviceManagement/detailList",
+        query: {
+          equipmentId: this.$route.query.equipmentId,
+          equipmentName: this.$route.query.equipmentName,
           assetNumber: this.$route.query.assetNumber,
           equipmentCategory: this.$route.query.equipmentCategory,
 
           equipmentNumber: this.$route.query.equipmentNumber,
-           }
-        }
-
-        )
+        },
+      })
     },
   },
   mounted() {
-    this.value=this.$route.query.value;
+    this.value = this.$route.query.value
     console.log(this.value)
     this.userInfo = JSON.parse(getUser())
     console.log(this.userInfo, "this.userInfo.....?????")
@@ -265,9 +379,9 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.icon_wai{
-  width:3em;
-  height:3em;
+.icon_wai {
+  width: 3em;
+  height: 3em;
 }
 .global {
   height: calc(100vh - 70px - 83px);
@@ -276,6 +390,15 @@ export default {
   .mainContainer {
     background: #fff;
     padding: 10px;
+    .top {
+      padding: 0 20px;
+      height: 40px;
+      line-height: 40px;
+      font-size: 16px;
+      display: flex;
+      justify-content: space-between;
+      margin-bottom: 20px;
+    }
     .steps {
       height: 80px;
       margin: 10px 0;

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

@@ -4,9 +4,9 @@
      
          <div class="top">
           <div class="top_left">
-            <span style="margin-right: 40px">设备类型:afsggh</span>
-            <span style="margin-right: 40px">设备名称::扦样机</span>
-            <span style="margin-right: 40px">设备编号:sbbh001</span>
+            <span style="margin-right: 40px">设备类型:{{this.$route.query.equipmentCategory}}</span>
+            <span style="margin-right: 40px">设备名称:{{this.$route.query.equipmentName}}</span>
+            <span style="margin-right: 40px">设备编号:{{ this.$route.query.equipmentNumber}}</span>
           </div>
           <div class="top_right">
             <span style="margin-right: 10px">设备管理类型:</span>

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

@@ -263,12 +263,13 @@ export default {
             type: type,
             processId: row.processId,
             ongoingStep: row.ongoingStep,
-          workName: row.workName,
+             workName: row.workName,
+             sbType:row.type,
           equipmentId: this.$route.query.equipmentId,
            equipmentName: this.$route.query.equipmentName,
           assetNumber: this.$route.query.assetNumber,
           equipmentCategory: this.$route.query.equipmentCategory,
-
+          
           equipmentNumber: this.$route.query.equipmentNumber,
        
           },
@@ -287,6 +288,7 @@ export default {
           ongoingStep: row.ongoingStep,
           auditState: row.auditState,
            workName: row.workName,
+             sbType:row.type,
           equipmentId: this.$route.query.equipmentId,
            equipmentName: this.$route.query.equipmentName,
           assetNumber: this.$route.query.assetNumber,

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

@@ -230,6 +230,7 @@ export default {
     getBarnAll().then((res) => {
       if (res.code == 200) {
         this.roleListo = res.data.parentMap[123]
+        console.log(this.roleListo,"this.roleListo")
       }
     })
     this.getDeviceList()
@@ -256,7 +257,26 @@ export default {
       getList(data)
         .then((res) => {
           if (res.code == 200) {
-            this.tableList = res.data.records
+            this.tableList = res.data.records;
+
+            // this.tableList.forEach(item=>{
+            //   this.roleListo.forEach(item1=>{
+            //     if(item.equipmentCategory==item1.enumId){
+            //       item.enumName=item1.enumName
+            //     }
+            //   })
+            // })
+            for (let i =0;  i< this.tableList.length;i++) {
+              const ele1 = this.tableList[i];
+                 for (let j =0;  j< this.roleListo.length;j++) {
+                  const ele2= this.roleListo[j];
+                  if(ele1.equipmentCategory==ele2.enumId){
+                    ele1.equipmentCategory=ele2.enumName;
+                  }
+            }
+            }
+          console.log( this.tableList," this.tableList.....")
+
             this.listQuery.limit = res.data.size
             this.total = res.data.total
            

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

@@ -4,13 +4,23 @@
       <div class="div_parent">
         <div class="top">
           <div class="top_left">
-            <span style="margin-right: 40px">设备类型:afsggh</span>
-            <span style="margin-right: 40px">设备名称::扦样机</span>
-            <span style="margin-right: 40px">设备编号:sbbh001</span>
+            <span style="margin-right: 40px"
+              >设备类型:{{ this.$route.query.equipmentCategory }}</span
+            >
+            <span style="margin-right: 40px"
+              >设备名称:{{ this.$route.query.equipmentName }}</span
+            >
+            <span style="margin-right: 40px"
+              >设备编号:{{ this.$route.query.equipmentNumber }}</span
+            >
           </div>
           <div class="top_right">
             <span style="margin-right: 10px">设备管理类型:</span>
-            <el-select v-model="value" @change="valueChange($event)">
+            <el-select
+              v-model="value"
+              @change="valueChange($event)"
+              :disabled="disabledSelect"
+            >
               <el-option
                 v-for="item in options"
                 :key="item.value"
@@ -95,23 +105,33 @@
               tableDataAudit.length &&
               value != 'sbtz' &&
               value != 'sbdwgl' &&
-             ((step == 1&&value == 'sbwx') ||((step == 1&&value == 'sbbf'))) 
-             
+              ((step == 1 && value == 'sbwx') ||
+                (step == 1 && value == 'sbbf') ||
+                (step == 1 && value == 'sbly') ||
+                (step == 1 && value == 'sbgh') ||
+                (step == 2 && value == 'sbgh') ||
+                (step == 2 && value == 'sbly'))
             "
             style="height: 400px; margin-top: 10px"
           >
             <div class="tf_title">
               <i class="iconfont iconshu"></i>
-              <span v-if="(stepActive == 0 || step == 1)&&value=='sbwx'"
+              <span v-if="(stepActive == 0 || step == 1) && value == 'sbwx'"
                 >流程（设施维修审批）</span
               >
-              <span v-if="(stepActive == 0 || step == 1)&&value=='sbbf'"
+              <span v-if="(stepActive == 0 || step == 1) && value == 'sbbf'"
                 >流程（设施报废审批）</span
               >
-              <!-- <span v-if="stepActive == 1 || step == 2">流程（设施维修预算审批）</span>  -->
+              <span v-if="(stepActive == 0 || step == 1) && value == 'sbly'"
+                >流程（设施领用审批）</span
+              >
+
+              <span v-if="(stepActive == 1 || step == 2) && value == 'sbly'"
+                >流程（设施归还审批）</span
+              >
             </div>
-            <div class="tf_title_right" v-if="value=='sbwx'">
-              <span style="margin-right: 10px" >提交给总经理和分公司审批</span>
+            <div class="tf_title_right" v-if="value == 'sbwx'">
+              <span style="margin-right: 10px">提交给总经理和分公司审批</span>
               <el-switch
                 v-model="isAudit"
                 :disabled="disabled"
@@ -277,6 +297,7 @@ export default {
       isAudit: 1,
       tableDataAuditCopy: [],
       value: "sbwx",
+      disabledSelect: true,
       options: [
         {
           value: "sbwx",
@@ -300,7 +321,7 @@ export default {
         },
       ],
       // 操作类型
-      workName:"",
+      workName: "",
     }
   },
   methods: {
@@ -333,14 +354,19 @@ export default {
         type = this.value
       }
 
-      // else if(this.stepActive == 1){
-      //   type = "sswxys"
-      // }
+      if (this.stepActive == 0 && this.value == "sbly") {
+        type = "sbly"
+      } else if (
+        (this.stepActive == 1 && this.value == "sbgh") ||
+        (this.stepActive == 2 && this.value == "sbgh")
+      ) {
+        type = "sbgh"
+      }
+
       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; i++) {
             var ele = res.data[i]
             if (ele.auditState != null) {
@@ -348,7 +374,7 @@ export default {
             }
             this.process.push(ele)
           }
-         
+
           if (this.process[0].content == 0) {
             this.process[0].content = this.userInfo.uid
           }
@@ -370,9 +396,15 @@ export default {
       if (this.stepActive == 0) {
         type = this.value
       }
-      // else if(this.stepActive == 1){
-      //   type = "sswxys"
-      // }
+      console.log(this.value, "type....")
+      if (this.stepActive == 0 && this.value == "sbly") {
+        type = "sbly"
+      } else if (
+        (this.stepActive == 1 && this.value == "sbly") ||
+        (this.stepActive == 2 && this.value == "sbgh")
+      ) {
+        type = "sbgh"
+      }
       var userId = this.userInfo.uid
       var depotId = this.userInfo.depotId
       let process = []
@@ -385,7 +417,7 @@ export default {
             }
             process.push(ele)
           }
-           console.log(this.process,"this.process")
+          console.log(process, "this.process???")
           if (process[0].content == 0) {
             process[0].content = this.userInfo.uid
           }
@@ -438,22 +470,21 @@ export default {
       }
 
       if (finish) {
-        console.log("/////",this.stepActive)
-       
+        console.log("/////", this.stepActive)
+
         // if (this.stepActive == 0 || this.stepActive == 1) {
-        if (this.stepActive == 0) {
-          
-           this.button = "保存并提交"
+        if (
+          this.stepActive == 0 ||
+          (this.stepActive == 1 && this.value == "sbly")
+        ) {
+          this.button = "保存并提交"
         } else {
           this.button = "完成"
         }
-        if(this.value=="sbtz" ||this.value=="sbdwgl"){
-          this.button="保存";
-          this.auditState=4;
-
+        if (this.value == "sbtz" || this.value == "sbdwgl") {
+          this.button = "保存"
+          this.auditState = 4
         }
-
-
       } else {
         if (this.step == 1) {
           if (this.value == "sbtz" || this.value == "sbdwgl") {
@@ -469,6 +500,7 @@ export default {
     //点击每步时
     stepClick(index) {
       //this.step = index + 1
+      console.log(index, this.stepActive, "?????")
       console.log(this.step, this.stepActive + 1)
 
       if (index > this.stepActive) {
@@ -512,29 +544,35 @@ export default {
         console.log(this.totalData, "???????????")
         this.tableData = this.totalData[1].list
         console.log(this.tableData)
+        if (
+          this.$route.query.workName == "设备资产转移申请" ||
+          this.$route.query.workName == "设备领用申请"
+        ) {
+          this.tableDataAudit = JSON.parse(
+            JSON.stringify(this.totalData[1].audit)
+          )
 
-        // 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 = "保存并提交"
+          console.log(this.tableDataAudit, "this.totalData[1].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 = "保存并提交"
+
+          if (this.$route.query.sbType == "sbly") {
+            this.isShow = false
+            this.disabled = true
+          }
+        }
+        if (this.$route.query.type == 3) {
+          this.disabled = true
+          this.isShow = false
+        }
       } else if (this.step == 3) {
         // this.isShow = true
         this.tableData = this.totalData[2].list
@@ -616,9 +654,14 @@ export default {
         // type = "sbwx"
         type = this.value
       }
-      // else if(this.stepActive == 1){
-      //   type = "sswxys"
-      // }
+      if (this.stepActive == 0 && this.value == "sbly") {
+        type = "sbly"
+      } else if (
+        (this.stepActive == 1 && this.value == "sbly") ||
+        (this.stepActive == 2 && this.value == "sbgh")
+      ) {
+        type = "sbgh"
+      }
       var data = {
         //流程类型
         type: type,
@@ -696,7 +739,8 @@ 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) {
+           if (element.subData == 1 && (this.step == 1||this.step==2)) {
             this.$message("只有选择是才能发起申请")
 
             status = 1
@@ -776,6 +820,10 @@ export default {
               //  this.getUpdateList()
             } else {
               this.auditState = 4
+              if (this.workName == "设备资产转移申请") {
+                this.value = "sbgh"
+              }
+
               this.getUpdateList()
             }
             //this.getUpdateList()
@@ -788,17 +836,24 @@ export default {
     getCheckList() {
       var processId = this.processId
       checkList(processId).then((res) => {
-        console.log(res.data, "查看数据");
+        console.log(res.data, "查看数据")
         console.log(this.stepActive)
         if (res.code == 200) {
-          this.totalData = res.data.process
+          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"){
-             this.tableData = res.data.process[0].list
-          }else{ 
+          if (this.value == "sbtz" || this.value == "sbdwgl") {
+            this.tableData = res.data.process[0].list
+          } else {
             this.tableData = res.data.process[ongoingStep].list
-            }
-         
+          }
+
           this.isAudit = res.data.process[ongoingStep].step.isAudit
           if (!this.isAudit && this.isAudit != 0) {
             this.isAudit = 1
@@ -816,7 +871,7 @@ export default {
               }
               this.process.push(ele)
             }
-            console.log(this.process,"process")
+            console.log(this.process, "process")
             if (this.process[0].content == 0) {
               this.process[0].content = this.userInfo.uid
             } else {
@@ -836,10 +891,7 @@ export default {
             this.detailProcessList()
             this.tableShow()
           }
-          // this.totalData[0].list.splice(1, 0, {
-          //   details: "是，否",
-          //   process: this.process,
-          // })
+         
         }
       })
     },
@@ -918,10 +970,10 @@ export default {
 
     //下拉框的值改变时
     valueChange(event) {
-        console.log(this.$route.query.equipmentNameCode,"equipmentNameCode")
+      console.log(this.$route.query.equipmentNameCode, "equipmentNameCode")
       this.step = this.stepActive + 1
-      this.value = event;
-      this.process=[];
+      this.value = event
+      this.process = []
       console.log(this.value)
       if (event == "sbtz" || event == "sbdwgl") {
         this.processFirst()
@@ -944,7 +996,7 @@ export default {
         auditState: this.auditState,
         processId: this.processId,
         equipmentId: this.$route.query.equipmentId,
-      equipmentNameCode: localStorage.getItem("equipmentNameCode"),
+        equipmentNameCode: localStorage.getItem("equipmentNameCode"),
         subList: this.subList,
       }
       yjbgAdd(data).then((res) => {
@@ -968,49 +1020,71 @@ export default {
   },
 
   mounted() {
-  this.workName=this.$route.query.workName;
-  if(this.workName=="设备维修"){
-    this.value="sbwx"
-  }else if(this.workName=="设备定位管理"){
-    this.value="sbdwgl"
-  }else if(this.workName=="设备领用归还"){
-     this.value="sblygh"
-  }else if(this.workName=="设备报废"){
-    this.value="sbbf"
-  }else if(this.workName=="设备台账"){
-    this.value="sbtz"
-  }
+    this.workName = this.$route.query.workName
+    if (this.workName == "设备维修") {
+      this.value = "sbwx"
+    } else if (this.workName == "设备定位管理") {
+      this.value = "sbdwgl"
+    } else if (
+      this.workName == "设备领用申请" ||
+      this.workName == "设备资产转移申请"
+    ) {
+      this.value = "sbly"
+    } else if (this.workName == "设备报废") {
+      this.value = "sbbf"
+    } else if (this.workName == "设备台账") {
+      this.value = "sbtz"
+    }
     //获取当前缓存的用户信息
     this.userInfo = JSON.parse(getUser())
     this.step = this.stepActive + 1
     this.getUserList()
+
+    if (this.stepActive == 0) {
+      this.button = "保存并提交"
+    } else {
+      this.button = "暂存"
+    }
+    if (this.stepActive == 1 && this.$route.query.sbType == "sbly") {
+      this.button = "保存并提交"
+    }
+    //   if (this.stepActive == 2 && this.$route.query.sbType == "sbgh") {
+    //   this.button = "暂存"
+    // }
+   
     if (this.$route.query.type == 1) {
       this.isShow = true
       this.disabled = false
+      this.disabledSelect = false
       this.processFirst()
       this.processList()
     } else if (this.$route.query.type == 2) {
-      this.isShow = true
-      this.disabled = false
+      //  this.value=this.$route.query.sbType
       this.stepActive = parseInt(this.$route.query.ongoingStep)
       this.processId = this.$route.query.processId
+      if (this.stepActive == 1 && this.$route.query.sbType == "sbly") {
+        this.isShow = false
+        this.disabled = true
+        this.disabledSelect = false
+      } else {
+        this.isShow = true
+        this.disabled = false
+        this.disabledSelect = false
+      }
       this.step = this.stepActive + 1
       this.getCheckList()
     } else if (this.$route.query.type == 3) {
+      // this.value=this.$route.query.sbType
+
       this.isShow = false
       this.disabled = true
+      this.disabledSelect = true
       this.processId = this.$route.query.processId
       //高亮显示
       this.stepActive = parseInt(this.$route.query.ongoingStep)
       this.step = this.stepActive + 1
       this.getCheckList()
     }
-
-    if (this.stepActive == 0 || this.stepActive == 3) {
-      this.button = "保存并提交"
-    } else {
-      this.button = "暂存"
-    }
   },
 }
 </script>

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' || item.type == 'sbcg'|| item.type == 'sbwx'||item.type == 'sbbf'){
+      if(item.type == 'xzjh' || item.type == 'xzsq' || item.type == 'sswxjh' || item.type == 'sswxys' || item.type == 'sbcg'|| item.type == 'sbwx'||item.type == 'sbbf'||item.type == 'sbly'||item.type == 'sbgh'){
         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' || type == 'sbcg'||type=='sbwx'||type=='sbbf'">
+        <div style="margin-left: 20px" v-if="type == 'sswxjh' || type == 'sswxys' || type == 'sbcg'||type=='sbwx'||type=='sbbf' ||type == 'sbly'||type == 'sbgh'">
           <div v-for="(item,index) in tableData.list" :key="index">
             <span>{{index+1}}.{{item.title}}:</span>
             <span v-if="item.subData == 1">否</span>
@@ -457,6 +457,10 @@ export default {
       this.ongoingStep = 0
     }else if(this.$route.query.type == 'sbwx'){
       this.ongoingStep = 0
+    }else if(this.$route.query.type == 'sbly'){
+      this.ongoingStep = 0
+    }else if(this.$route.query.type == 'sbgh'){
+      this.ongoingStep = 1
     }
     this.type = this.$route.query.type
 

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' || item.type == 'sbcg'||item.type == 'sbwx'||item.type == 'sbbf'){
+        if(item.type == 'xzjh' || item.type == 'xzsq' || item.type == 'sswxjh' || item.type == 'sswxys' || item.type == 'sbcg'||item.type == 'sbwx'||item.type == 'sbbf'||item.type == 'sbly'||item.type == 'sbgh'){
           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' || type == 'sbcg'||type == 'sbbf'||type == 'sbwx'">
+        <div style="margin-left: 20px" v-if="type == 'sswxjh' || type == 'sswxys' || type == 'sbcg'||type == 'sbbf'||type == 'sbwx'||type == 'sbly'||type == 'sbgh'">
           <div v-for="(item,index) in tableData.list" :key="index">
             <span>{{index+1}}.{{item.title}}:</span>
             <span v-if="item.subData == 1">否</span>

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' || item.type == 'sbcg'||item.type == 'sbwx' ||item.type == 'sbbf'){
+        if(item.type == 'xzjh' || item.type == 'xzsq' || item.type == 'sswxjh' || item.type == 'sswxys' || item.type == 'sbcg'||item.type == 'sbwx' ||item.type == 'sbbf'||item.type == 'sbly' ||item.type == 'sbgh'){
           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' || type == 'sbcg' ||type == 'sbwx'||type=='sbbf'">
+        <div style="margin-left: 20px" v-if="type == 'sswxjh' || type == 'sswxys' || type == 'sbcg' ||type == 'sbwx'||type=='sbbf'||type=='sbly'||type=='sbgh'">
           <div v-for="(item,index) in tableData.list" :key="index">
             <span>{{index+1}}.{{item.title}}:</span>
             <span v-if="item.subData == 1">否</span>
@@ -461,6 +461,10 @@ export default {
       this.ongoingStep = 0
     }else if(this.$route.query.type == 'sbwx'){
       this.ongoingStep = 0
+    }else if(this.$route.query.type == 'sbly'){
+      this.ongoingStep = 0
+    }else if(this.$route.query.type == 'sbgh'){
+      this.ongoingStep = 1
     }
 
     this.getCheckList()

shanXiPlatform/src/views/systemManagement/equipmentWarehouse/detail.vue

@@ -128,7 +128,8 @@ export default {
                 management: "",
                 enterpriseName: "",
                 egistrant: "",
-                depotId:''
+                depotId:'',
+                state:0
             }
         }
     },