设备维修

shanXiPlatform/src/api/facilitiesEquipment/deviceManagement.js

@@ -0,0 +1,11 @@
+import request from '@/utils/request'
+
+ //设备管理列表
+export function getList(data) {
+    return request({
+     
+      url: `/csc-szls-business/equipmentStroe/authority/getPage`,
+      method: 'post',
+      data
+    })
+  }

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

@@ -1,79 +1,137 @@
 <template>
-  <div  id="container">
+  <div id="container">
     <div class="header_button">
       <el-form :inline="true">
-            <el-form-item label="设备类别">
-                <el-select v-model="query.title" placeholder="请选择">
-                    <el-option
-                    v-for="item in options1"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value">
-                    </el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item label="设备名称">
-                <el-select v-model="query.title" placeholder="请选择">
-                    <el-option
-                    v-for="item in options2"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value">
-                    </el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item label="设备状态">
-                <el-select v-model="query.title" placeholder="请选择">
-                    <el-option
-                    v-for="item in options3"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value">
-                    </el-option>
-                </el-select>
-            </el-form-item>
+        <el-form-item label="设备类别">
+          <el-select v-model="query.title" placeholder="请选择">
+            <el-option
+              v-for="item in options1"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="设备名称">
+          <el-select v-model="query.title" placeholder="请选择">
+            <el-option
+              v-for="item in options2"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="设备状态">
+          <el-select v-model="query.title" placeholder="请选择">
+            <el-option
+              v-for="item in options3"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
 
-          <el-form-item>
-          <el-button type="info" class="iconfont iconclear" plain @click="clear">清空</el-button>
-          <el-button type="success" icon="el-icon-search" plain @click="search">查询</el-button>
-          </el-form-item>
-          <el-form-item  style="float:right">
-          <el-button type="success" icon="el-icon-circle-plus" v-if="$tools.IsPermission(263)" plain @click="addBtn()">新建公告</el-button>
-          </el-form-item>
+        <el-form-item>
+          <el-button type="info" class="iconfont iconclear" plain @click="clear"
+            >清空</el-button
+          >
+          <el-button type="success" icon="el-icon-search" plain @click="search"
+            >查询</el-button
+          >
+        </el-form-item>
+        <el-form-item style="float: right">
+          <el-button
+            type="success"
+            icon="el-icon-circle-plus"
+            v-if="$tools.IsPermission(263)"
+            plain
+            @click="addBtn()"
+            >新建公告</el-button
+          >
+        </el-form-item>
       </el-form>
     </div>
     <div class="table">
-      <el-table border stripe :data="tableList" highlight-current-row  :header-cell-style="{background:'#f8f8f8'}">
-        <el-table-column type="index" align="center" label="序号" width="50px" />
-        <el-table-column prop="title" label="设备类别" align="center" />
-        <el-table-column prop="publishUserName" label="设备名称" align="center" />
-        <el-table-column prop="publishOrgName" label="资产编号" align="center" />
-        <el-table-column prop="recvDetailsInfo" label="设备状态" align="center" />
-        <el-table-column prop="operation" label="查看" align="center" width="200px" fixed="right">
+      <el-table
+        border
+        stripe
+        :data="tableList"
+        highlight-current-row
+        :header-cell-style="{ background: '#f8f8f8' }"
+      >
+        <el-table-column
+          type="index"
+          align="center"
+          label="序号"
+          width="50px"
+        />
+        <el-table-column
+          prop="equipmentCategory"
+          label="设备类别"
+          align="center"
+        />
+        <el-table-column prop="equipmentName" label="设备名称" align="center" />
+        <el-table-column
+          prop="equipmentNumber"
+          label="设备编号"
+          align="center"
+        />
+        <el-table-column prop="assetNumber" label="资产编号" align="center" />
+
+        <el-table-column prop="state" label="设备状态" align="center">
+          <template slot-scope="scope">
+            <div v-if="scope.row.state == 0">正常使用</div>
+            <div v-if="scope.row.state == 1">维修</div>
+            <div v-if="scope.row.state == 2">报废</div>
+          </template>
+        </el-table-column>
+
+        <el-table-column
+          prop="operation"
+          label="查看"
+          align="center"
+          width="200px"
+          fixed="right"
+        >
           <template slot-scope="scope">
-            <span class="buttonSpan"  @click="handleDetail(scope.row)">管理记录》</span>
+            <span class="buttonSpan" @click="handleDetail(scope.row)"
+              >管理记录》</span
+            >
           </template>
         </el-table-column>
       </el-table>
       <div class="pagination-container">
-          <el-pagination
-            class="right"
-            background
-            :current-page.sync="listQuery.page"
-            :page-size="listQuery.limit"
-            :page-sizes="[10,20,30,40]"
-            :total="total"
-            @size-change="sizeChange"
-            @current-change="pageChange"
-            layout="total, sizes, prev, pager, next, jumper"
-          ></el-pagination>
-        </div>
+        <el-pagination
+          class="right"
+          background
+          :current-page.sync="listQuery.page"
+          :page-size="listQuery.limit"
+          :page-sizes="[10, 20, 30, 40]"
+          :total="total"
+          @size-change="sizeChange"
+          @current-change="pageChange"
+          layout="total, sizes, prev, pager, next, jumper"
+        ></el-pagination>
+      </div>
     </div>
   </div>
 </template>
 <script>
-import { getList,deleteFun,enableWarn,stopWarn,getAllRole,getDepotAll,getDepotById } from '@/api/system/notice'
-import { getUser } from '@/utils/auth'
+import {
+  getList,
+  deleteFun,
+  enableWarn,
+  stopWarn,
+  getAllRole,
+  getDepotAll,
+  getDepotById,
+} from "@/api/facilitiesEquipment/deviceManagement"
+import { getUser } from "@/utils/auth"
 export default {
   name: "NewNotice",
   data() {
@@ -81,9 +139,9 @@ export default {
       // 列表数据
       tableList: [{}],
       query: {
-        publishTime:[],
-        title:'',
-        annoType:''
+        publishTime: [],
+        title: "",
+        annoType: "",
       },
       // 分页
       total: 0,
@@ -92,95 +150,100 @@ export default {
         page: 1,
         limit: 10,
       },
-      options1:[],
-      options2:[],
-      options3:[],
+      options1: [],
+      options2: [],
+      options3: [],
     }
   },
   created() {
     // this.getList()
   },
   methods: {
-    getList() {
-      console.log(this.query.publishTime)
+    getDeviceList() {
       let condition = {
-        publishTimeStart:'',
-        publishTimeEnd:'',
-        title: this.query.title,
-        annoType: this.query.annoType
-      }
-      if(this.query.publishTime && this.query.publishTime.length>0){
-        condition.publishTimeStart = this.query.publishTime[0]
-        condition.publishTimeEnd = this.query.publishTime[1]
+        equipmentCategory: "",
+        equipmentName: "",
+        state: "",
       }
+      // if(this.query.publishTime && this.query.publishTime.length>0){
+      //   condition.publishTimeStart = this.query.publishTime[0]
+      //   condition.publishTimeEnd = this.query.publishTime[1]
+      // }
       let data = {
         pageIndex: this.listQuery.page,
         pageSize: this.listQuery.limit,
-        condition: JSON.stringify(condition)
+        condition: JSON.stringify(condition),
       }
-      getList(data).then((res) => {
+      getList(data)
+        .then((res) => {
           if (res.code == 200) {
             this.tableList = res.data.records
             this.listQuery.limit = res.data.size
             this.total = res.data.total
-          }else{
+          } else {
             this.$message({
-              type: 'error',
-              message: res.msg
+              type: "error",
+              message: res.msg,
             })
           }
-      }).catch((err) => {
+        })
+        .catch((err) => {
           console.log(err)
         })
     },
     changeRecvDetailsName(list) {
-      list.forEach(item => {
-        if(item.recvType == '20'){
+      list.forEach((item) => {
+        if (item.recvType == "20") {
           let recvDetailsNew = item.recvDetails
-          let recvDetailsarrNew = recvDetailsNew.split(',')
+          let recvDetailsarrNew = recvDetailsNew.split(",")
           let recvDetailsNameNew = []
-          recvDetailsarrNew.forEach(itemId => {
-            getDepotById(itemId).then(response => {
+          recvDetailsarrNew.forEach((itemId) => {
+            getDepotById(itemId).then((response) => {
               recvDetailsNameNew.push(response.data.depot.dname)
-              item.recvDetailsName = recvDetailsNameNew.join(',');
+              item.recvDetailsName = recvDetailsNameNew.join(",")
             })
           })
-        }else{
-          item.recvDetailsName = ''
+        } else {
+          item.recvDetailsName = ""
         }
       })
     },
     search() {
-      this.getList()
+      this.getDeviceList()
     },
     clear() {
       this.query = {
-        publishTime:[],
-        title:'',
-        annoType:''
+        publishTime: [],
+        title: "",
+        annoType: "",
       }
-      this.getList()
+      this.getDeviceList()
     },
     sizeChange(v) {
-      this.listQuery.limit = v;
-      this.getList();
+      this.listQuery.limit = v
+      this.getDeviceList()
     },
     pageChange(v) {
-      this.listQuery.page = v;
-      this.getList();
+      this.listQuery.page = v
+      this.getDeviceList()
     },
     // 新增按钮
     addBtn() {
-      if(JSON.parse(getUser()).depotId == '1'){
-        this.$router.push({ name: "Addnotice",query: { state: 'add',orgType: '1' } })
-      }else{
-        this.$router.push({ name: "Addnotice",query: { state: 'add',orgType: '2' } })
-      } 
+      if (JSON.parse(getUser()).depotId == "1") {
+        this.$router.push({
+          name: "Addnotice",
+          query: { state: "add", orgType: "1" },
+        })
+      } else {
+        this.$router.push({
+          name: "Addnotice",
+          query: { state: "add", orgType: "2" },
+        })
+      }
     },
-    // 查看   
+    // 查看
     handleDetail(row) {
-      this.$router.push({ name: "DeviceManagementDlist",query: { }})
-      
+      this.$router.push({ name: "DeviceManagementDlist", query: {} })
     },
     // // 编辑
     // handleEdit(row) {
@@ -188,42 +251,59 @@ export default {
     // },
     // 删除
     handleDelete(row) {
-      this.$confirm('确定删除该项记录?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
+      this.$confirm("确定删除该项记录?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       }).then(() => {
-          deleteFun(row.id).then((res) => {
+        deleteFun(row.id)
+          .then((res) => {
             if (res.code == 200) {
               this.getList()
               this.$message({
-                type: 'success',
-                message: '删除成功!'
+                type: "success",
+                message: "删除成功!",
               })
             }
           })
           .catch(() => {
             this.$message({
-              type: 'info',
-              message: '已取消删除'
+              type: "info",
+              message: "已取消删除",
             })
           })
-        })
+      })
     },
     dateFormatValue(timedate) {
       if (timedate === null || timedate === undefined) {
         return ""
       } else {
-        let year = timedate.slice(0,4)
-        let month = timedate.slice(5,7)
-        let day = timedate.slice(8,10)
-        let hours = timedate.slice(11,13)
-        let minutes = timedate.slice(14,16)
-        let seconds = timedate.slice(17,19)
-        return (year + '年' + month + '月' + day + '日' + hours + '时' + minutes + '分' + seconds + '秒')
+        let year = timedate.slice(0, 4)
+        let month = timedate.slice(5, 7)
+        let day = timedate.slice(8, 10)
+        let hours = timedate.slice(11, 13)
+        let minutes = timedate.slice(14, 16)
+        let seconds = timedate.slice(17, 19)
+        return (
+          year +
+          "年" +
+          month +
+          "月" +
+          day +
+          "日" +
+          hours +
+          "时" +
+          minutes +
+          "分" +
+          seconds +
+          "秒"
+        )
       }
     },
-  }
+  },
+  mounted() {
+    this.getDeviceList()
+  },
 }
 </script>
 <style scoped>
@@ -231,14 +311,14 @@ export default {
   margin-bottom: 5px;
 }
 .pagination-container {
-  margin-top:10px;
-  margin-right:20px;
+  margin-top: 10px;
+  margin-right: 20px;
   text-align: right;
 }
-.buttonSpan{
-    color: green;
+.buttonSpan {
+  color: green;
 }
-.buttonSpan:hover{
-    cursor: pointer;
+.buttonSpan:hover {
+  cursor: pointer;
 }
 </style>

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

@@ -95,18 +95,22 @@ export default {
                   label: "设备采购",
                   type: "sbcg",
                 },
-                // {
-                //   label: "设备领用归还",
-                //   type: "sblygh",
-                // },
-                // {
-                //   label: "设备维修",
-                //   type: "sbwx",
-                // },
-                // {
-                //   label: "设备报废",
-                //   type: "sbbf",
-                // },
+                {
+                  label: "设备领用",
+                  type: "sbly",
+                },
+                  {
+                  label: "设备归还",
+                  type: "sbgh",
+                },
+                 {
+                  label: "设备维修",
+                  type: "sbwx",
+                },
+                {
+                  label: "设备报废",
+                  type: "sbbf",
+                },
                 {
                   label: "设施维修计划",
                   type: "sswxjh",
@@ -312,17 +316,40 @@ export default {
                 }
             ],
 
-            // 设备领用归还
-            deviceCollectReturn: [
+            // 设备领用
+            deviceCollect: [
                 {
                     step: "1",
+                    type: "container",
+                    title: "制定领用申请",
+                    content: ""
+                },
+                {
+                    step: "2",
                     type: "select",
                     title: "主管科长审批",
                     content: ""
+                }
+            ],
+
+
+            // 设备归还
+            devicetReturn: [
+                {
+                    step: "1",
+                    type: "container",
+                    title: "制定资产转移申请",
+                    content: ""
                 },
                 {
                     step: "2",
                     type: "select",
+                    title: "主管科长审批",
+                    content: ""
+                },
+                 {
+                    step: "3",
+                    type: "select",
                     title: "分管副总经理审批",
                     content: ""
                 }
@@ -340,6 +367,7 @@ export default {
                     step: "2",
                     type: "select",
                     title: "主管科长审核",
+                     
                     content: ""
                 },
                 {
@@ -549,7 +577,7 @@ export default {
                 .catch(err => {
                     console.log(err)
                 })
-            if(this.type == 'xzjh' || this.type == 'yjcg' || this.type == 'sswxjh' || this.type == 'sswxys' || this.type == 'sbcg'){
+            if(this.type == 'xzjh' || this.type == 'yjcg' || this.type == 'sswxjh' || this.type == 'sswxys' || this.type == 'sbcg' ||this.type == 'sbwx'){
                 let paramsNew = {
                     depotId: 1,
                     roleIds: 37
@@ -560,7 +588,7 @@ export default {
                             this.tableData.forEach(item => {
                                 if ( (this.type == 'xzjh' || this.type == 'yjcg') && item.title.indexOf("分公司主管处室") != -1 ) {
                                     this.$set(item, "approverSelect", res.data[37])
-                                }else if((this.type == 'sswxjh' || this.type == 'sswxys' || this.type == 'sbcg') && item.title.indexOf("分公司") != -1){
+                                }else if((this.type == 'sswxjh' || this.type == 'sswxys' || this.type == 'sbcg' ||this.type == 'sbwx') && item.title.indexOf("分公司") != -1){
                                     this.$set(item, "approverSelect", res.data[37])
                                 }
                             })
@@ -591,9 +619,11 @@ export default {
                 this.tableData = this.drugCollect
             } else if (this.type == "sbcg") {
                 this.tableData = this.devicePurchase
-            } else if (this.type == "sblygh") {
-                this.tableData = this.deviceCollectReturn
-            } else if (this.type == "sbwx") {
+            } else if (this.type == "sbly") {
+                this.tableData = this.deviceCollect
+            } else if(this.type == "sbgh"){
+                 this.tableData = this.deviceReturn
+            }else if (this.type == "sbwx") {
                 this.tableData = this.deviceRepair
             } else if (this.type == "sbbf") {
                 // 设备报废