Merge branch 'demo_' of http://124.71.196.186:8888/hfxc226/hitch-antd into demo_

src/api/idle-assets/idle-assets.js

@@ -57,3 +57,18 @@ export function getUnusedUsers () {
     }
   })
 }
+/**
+ * page func
+ * parameter: { }
+ * @param parameter
+ * @returns {*}
+ */
+export function getUnusedInfo (parameter) {
+  return axios({
+    url: '/sbUnused/unused/queryById/' + parameter.id,
+    method: 'get',
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
+  })
+}

src/views/idle-assets/IdleAssets.vue

@@ -1,12 +1,12 @@
-      nn m <template>
+<template>
   <a-card :bordered="false">
     <div v-show="visible">
       <div class="table-page-search-wrapper" @keyup.enter="handleEnter">
         <a-form layout="inline">
           <a-row :gutter="48">
             <a-col :md="8" :sm="24">
-              <a-form-item label="申请人">
-                <a-input v-model.trim="queryParam.keyword" placeholder="请输入申请人"/>
+              <a-form-item label="闲置名称">
+                <a-input v-model.trim="queryParam.name" placeholder="请输入闲置名称"/>
               </a-form-item>
             </a-col>
             <a-col :md="8 || 24" :sm="24">
@@ -47,9 +47,9 @@
       >
         <span slot="action" slot-scope="record">
           <a @click="handleView(record)">查看</a>
-          <operation-button
+          <!-- <operation-button
             @click="handleEdit(record)"
-          >修改</operation-button>
+          >修改</operation-button> -->
           <operation-button
             v-if="record.status===1||record.status===2"
             @click="handleAudit(record)"
@@ -62,21 +62,24 @@
     </div>
     <BaseForm ref="baseForm" @ok="handleOk"/>
     <AuditForm ref="auditForm" @ok="handleOk"/>
+    <Detail ref="detail" @ok="handleOk" />
   </a-card>
 </template>
 
 <script>
 import { STable, Ellipsis } from '@/components'
-import { getSbUnusedPage } from '@/api/idle-assets/idle-assets'
+import { getSbUnusedPage, getUnusedInfo } from '@/api/idle-assets/idle-assets'
 import BaseForm from './modules/BaseForm.vue'
 import AuditForm from './modules/AuditForm.vue'
+import Detail from './modules/Detail.vue'
 export default {
   name: 'IdleAssets',
   components: {
     STable,
     Ellipsis,
     BaseForm,
-    AuditForm
+    AuditForm,
+    Detail
   },
   data () {
     return {
@@ -103,7 +106,13 @@ export default {
         },
         {
           title: '审核人',
-          dataIndex: 'verityUserId',
+          dataIndex: 'verifyUserName',
+          checked: true,
+          width: 130
+        },
+        {
+          title: '申请时间',
+          dataIndex: 'createdTime',
           checked: true,
           width: 130
         },
@@ -204,7 +213,10 @@ export default {
 
     },
     handleView (record) {
-
+      getUnusedInfo({ id: record.id }).then(res => {
+        this.$refs.detail.base(res.data)
+        this.visible = false
+      })
     }
   }
 }

src/views/idle-assets/modules/Detail.vue

@@ -0,0 +1,99 @@
+<template>
+  <a-card title="详情" v-show="visible" :bordered="false">
+    <div slot="extra">
+      <a-button type="primary" v-show="modal.status===1||modal===2" @click="handleAudit">审核</a-button>&nbsp;
+      <a-button @click="handleCancel">返回</a-button>
+    </div>
+    <title-divider title="基本信息" width="90px"></title-divider>
+    <detail-list title="" :col="2">
+      <detail-list-item term="闲置名称">{{ modal.name }}</detail-list-item>
+      <detail-list-item term="闲置单号">{{ modal.no }}</detail-list-item>
+      <detail-list-item term="申请时间">{{ modal.createdTime }}</detail-list-item>
+      <detail-list-item term="状态">{{ BaseTool.Object.getField(statusMap,modal.status) }}</detail-list-item>
+      <detail-list-item term="审核人">{{ modal.verifyUserName }}</detail-list-item>
+    </detail-list>
+    <title-divider title="设备集合" width="90px"></title-divider>
+    <a-table
+      :columns="columns"
+      bordered
+      :data-source="modal.sbUnusedDetailVOS"
+    >
+
+    </a-table>
+    <title-divider title="审核流程" width="90px"></title-divider>
+    <a-steps :current="modal.sbUnusedVerifyRecordVOS.length-1" direction="vertical">
+      <a-step v-for="item in modal.sbUnusedVerifyRecordVOS" :key="item.id" :title="item.realName" :sub-title="item.createdTime" :description="item.advice" />
+    </a-steps>
+    <AuditForm ref="auditForm" @ok="handleOk"/>
+
+  </a-card>
+</template>
+
+<script>
+import AuditForm from './AuditForm.vue'
+import DetailList from '@/components/tools/DetailList'
+const DetailListItem = DetailList.Item
+
+export default {
+  name: 'Detail',
+  components: {
+    AuditForm,
+    DetailList,
+    DetailListItem
+  },
+  data () {
+    return {
+      modal: {
+        sbUnusedVerifyRecordVOS: []
+      },
+      visible: false,
+      statusMap: {},
+      columns: [
+        {
+          title: '设备名称',
+          dataIndex: 'sbName',
+          key: 'sbName'
+        },
+        {
+          title: '设备位号',
+          dataIndex: 'positionNo',
+          key: 'positionNo'
+        },
+        {
+          title: '设备编号',
+          dataIndex: 'sbNo',
+          key: 'sbNo'
+        }
+      ]
+    }
+  },
+  created () {
+    this.statusMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SB_UNUSED_STATUS)
+  },
+  methods: {
+    base (record) {
+      this.modal = record
+      this.visible = true
+    },
+    handleAudit (record) {
+      this.$refs.auditForm.base(this.modal)
+    },
+    handleOk () {
+      this.visible = true
+      this.$refs.table.refresh()
+    },
+    handleCancel () {
+      this.visible = false
+      this.$emit('ok')
+
+      this.modal = {
+        sbUnusedVerifyRecordVOS: []
+      }
+    }
+  }
+}
+</script>
+
+<style>
+
+</style>