完善

src/views/fill/gather/modules/Detail.vue

@@ -11,8 +11,8 @@
       <detail-list-item term="类型">{{ BaseTool.Object.getField(codeIdMap,model.codeId) }}</detail-list-item>
       <detail-list-item term="使用类型">{{ BaseTool.Object.getField(useTypeMap,model.useType) }}</detail-list-item>
       <detail-list-item term="备注">{{ model.remark }}</detail-list-item>
-      <detail-list-item term="创建人">{{ model.createdUserId }}</detail-list-item>
-      <detail-list-item term="更新人">{{ model.updateUserId }}</detail-list-item>
+      <detail-list-item term="创建人">{{ model.createdUserName }}</detail-list-item>
+<!--      <detail-list-item term="更新人">{{ model.updateUserId }}</detail-list-item>-->
       <detail-list-item term="更新人名称">{{ model.updateUserName }}</detail-list-item>
       <detail-list-item term="更新日期">{{ model.updateTime }}</detail-list-item>
     </detail-list>
@@ -48,6 +48,7 @@ export default {
         'useType': null,
         'remark': null,
         'createdUserId': null,
+        'createdUserName': null,
         'updateUserId': null,
         'updateUserName': null,
         'updateTime': null

src/views/sb/info/SbInfo.vue

@@ -230,7 +230,7 @@
 import { STable, Ellipsis } from '@/components'
 import BaseForm from './modules/BaseForm'
 import BaseFormStatusLog from '@/views/sb/status-log/modules/BaseForm'
-import Detail from './modules/DetailC'
+import Detail from './modules/Detail'
 import DownloadModal from '@/views/download/DownloadModal'
 import PreviewModal from '@/views/preview/PreviewModal'
 import { getSbInfoPage, deleteSbInfos, fetchSbInfo, fetchSbInfos, exportSbInfo } from '@/api/sb/info'

src/views/sb/info/modules/Detail.vue

@@ -1,167 +1,223 @@
-<template xmlns:v-slot="http://www.w3.org/1999/XSL/Transform">
-  <a-card :bordered="false" v-show="visibleDetail" class="card" :title="modalTitle">
+<template>
+  <a-card v-show="visibleDetail" :title="modalTitle">
     <div v-show="visible">
-      <a-row :gutter="48" slot="extra">
-        <a-col :md="48" :sm="48">
-          <span class="table-page-search-submitButtons" style="float: right">
-            <a-badge :count="numChildSbInfo" title="子设备总数" :number-style="{ backgroundColor: '#52c41a' }">
-              <a-button style="margin-left: 16px" type="default" @ok="handleOk" @click="handleViewChildSbInfo()">子设备</a-button>
-            </a-badge>
-            <a-badge :count="numPartInfo" title="设备部位总数" :number-style="{ backgroundColor: '#52c41a' }">
-              <a-button style="margin-left: 16px" type="default" @ok="handleOk" @click="partInfoListView()">设备部位</a-button>
-            </a-badge>
-            <a-badge :count="numModelbom" title="备件总数" :number-style="{ backgroundColor: '#52c41a' }">
-              <a-button style="margin-left: 16px" type="default" @ok="handleOk" @click="handleViewBom()">备件BOM</a-button>
-            </a-badge>
-            <a-badge :count="numCheckStandard" title="维护项目总数" :number-style="{ backgroundColor: '#52c41a' }">
-              <a-button style="margin-left: 16px" type="default" @ok="handleOk" @click="handleViewCheck()">维护项目</a-button>
-            </a-badge>
-            <a-badge :count="numCheckjob" title="保养任务总数" :number-style="{ backgroundColor: '#52c41a' }">
-              <a-button style="margin-left: 8px" type="default" @click="handleViewCheckJob()">保养任务</a-button>
-            </a-badge>
-            <a-button v-show="model.useType==4" style="margin-left: 8px" type="default" @click="handleMeasure()">检定记录</a-button>
-            <a-button style="margin-left: 8px" type="error" @click="handleTuiCalendar(1)">保养日历</a-button>
-            <a-button style="margin-left: 8px" type="default" @click="handleRepairReportSbInfo()">工单分析</a-button>
-            <a-button style="margin-left: 8px" type="default" @click="handleRepairReportSbInfoFee()">费用分析</a-button>
-             <a-button style="margin-left: 8px" type="primary" @click="handleEdit()">修改</a-button>
-             <a-button style="margin-left: 8px" type="primary" @click="handleOk()">刷新</a-button>
-            <a-button style="margin-left: 8px" type="primary" @click="handleCancel()">返回</a-button>
-          </span>
-        </a-col>
-      </a-row>
-      <detail-list title="" :col="3">
-        <!--        <detail-list-item v-for="item in model.sbFileList" term="">
-                  <img :src="BaseTool.Constant.FILE_URL + item.url" width="200px" height="200px"/>
-                </detail-list-item>-->
-        <detail-list-item>
-          <img-code :src="model.qrCode" title="点击重新生成二维码" :code-id="model.id" :width="200"></img-code>
-        </detail-list-item>
-      </detail-list>
+      <div style="padding: 20px;">
+        <a-row :gutter="48" slot="extra">
+          <a-col :md="48" :sm="48">
+            <span style="float: left">
+              <a-badge :count="numChildSbInfo" title="子设备总数" :number-style="{ backgroundColor: '#52c41a' }">
+                <a-button style="margin-left: 20px" type="default" @ok="handleOk" @click="handleViewChildSbInfo()">子设备</a-button>
+              </a-badge>
+              <a-badge :count="numPartInfo" title="设备部位总数" :number-style="{ backgroundColor: '#52c41a' }">
+                <a-button style="margin-left: 20px" type="default" @ok="handleOk" @click="partInfoListView()">设备部位</a-button>
+              </a-badge>
+              <a-badge :count="numModelbom" title="备件总数" :number-style="{ backgroundColor: '#52c41a' }">
+                <a-button style="margin-left: 20px" type="default" @ok="handleOk" @click="handleViewBom()">备件BOM</a-button>
+              </a-badge>
+              <a-badge :count="numCheckStandard" title="维护项目总数" :number-style="{ backgroundColor: '#52c41a' }">
+                <a-button style="margin-left: 20px" type="default" @ok="handleOk" @click="handleViewCheck()">维护项目</a-button>
+              </a-badge>
+              <a-badge :count="numCheckjob" title="保养任务总数" :number-style="{ backgroundColor: '#52c41a' }">
+                <a-button style="margin-left: 20px" type="default" @click="handleViewCheckJob()">保养任务</a-button>
+              </a-badge>
+              <a-button v-show="model.useType==4" style="margin-left: 8px" type="default" @click="handleMeasure()">检定记录</a-button>
+              <a-button style="margin-left: 20px" type="error" @click="handleTuiCalendar(1)">保养日历</a-button>
+              <a-button style="margin-left: 20px" type="default" @click="handleRepairReportSbInfo()">工单分析</a-button>
+              <a-button style="margin-left: 20px" type="default" @click="handleRepairReportSbInfoFee()">费用分析</a-button>
+              <a-button style="margin-left: 8px" type="default" @click="handleEdit()">修改</a-button>
+              <a-button style="margin-left: 8px" type="default" :loading="confirmLoading" @click="handleOk()">刷新</a-button>
+              <a-button style="margin-left: 20px" type="primary" @click="handleCancel()">返回</a-button>
+            </span>
+          </a-col>
+        </a-row>
+      </div>
+      <a-layout>
+        <a-layout-sider :width="335">
 
-      <title-divider title="基本信息" width="90px"></title-divider>
-      <detail-list title="" :col="3">
-        <detail-list-item term="设备编号">{{ model.no }}</detail-list-item>
-        <detail-list-item term="设备（旧号）">{{ model.zbh }}</detail-list-item>
-        <detail-list-item term="设备描述">{{ model.name }}</detail-list-item>
-        <detail-list-item term="规格型号">{{ model.model }}</detail-list-item>
-        <detail-list-item term="ABC 标识">{{ BaseTool.Object.getField(levelMap,model.level) }}</detail-list-item>
-        <detail-list-item term="设备类型">{{ model.typeName }}</detail-list-item>
-        <detail-list-item term="自定义类型">{{ BaseTool.Object.getField(useTypeMap,model.useType) }}</detail-list-item>
-        <detail-list-item term="生产商">{{ model.producerName }}</detail-list-item>
-        <detail-list-item term="大小尺寸">{{ model.zz }}</detail-list-item>
-        <detail-list-item term="系列号(出厂编号)">{{ model.zzh }}</detail-list-item>
-        <detail-list-item term="使用位置">{{ model.cph }}</detail-list-item>
-        <detail-list-item term="设备位置">{{ model.positionName }}</detail-list-item>
-        <detail-list-item term="使用寿命">{{ model.workYear }}</detail-list-item>
-        <detail-list-item term="是否显示">{{ model.isShow?'显示':'不显示' }}</detail-list-item>
-        <detail-list-item v-show="model.isChild == 1" term="是否子设备">子设备</detail-list-item>
-        <detail-list-item v-show="model.isChild == 2" term="是否子设备">父设备</detail-list-item>
-        <detail-list-item v-show="model.isChild == 3" term="是否子设备">独立设备</detail-list-item>
-        <detail-list-item term="状态"><badge :status="DictCache.COLOR.SB_INFO_STATUS[model.status]" :text="statusMap[model.status]"></badge></detail-list-item>
-        <detail-list-item term="备注">{{ model.remark }}</detail-list-item>
-      </detail-list>
-      <title-divider width="120px" title="自定义参数"></title-divider>
-      <detail-list v-for="item in paramList" title="" :key="item.name" :col="3">
-        <detail-list-item :term="item.name">{{ item.content }}</detail-list-item>
-      </detail-list>
-      <title-divider title="资产编号" width="90px"></title-divider>
-      <detail-list title="" :col="3">
-        <detail-list-item term="资产编号1">{{ model.financingNo }}</detail-list-item>
-        <detail-list-item term="资产编号2">{{ model.financingNoTwo }}</detail-list-item>
-        <detail-list-item term="资产编号3">{{ model.financingNoThird }}</detail-list-item>
-        <detail-list-item term="资产编号4">{{ model.financingNoFour }}</detail-list-item>
-        <detail-list-item term="资产编号5">{{ model.financingNoFive }}</detail-list-item>
-      </detail-list>
-      <title-divider title="人员信息" width="90px"></title-divider>
-      <detail-list title="" :col="3">
-        <detail-list-item term="使用人">{{ model.saveUserName }}</detail-list-item>
-        <detail-list-item term="第一维修人">{{ model.repairUserName }}</detail-list-item>
-        <detail-list-item term="第二维修人">{{ model.repairUserNameSecond }}</detail-list-item>
-      </detail-list>
-      <detail-list title="" :col="3">
-        <detail-list-item term="购置日期">{{ model.buyDate }}</detail-list-item>
-        <detail-list-item term="投用日期">{{ model.startDate }}</detail-list-item>
-      </detail-list>
-      <title-divider v-show="model.useType == 5" title="特种信息" width="90px"></title-divider>
-      <detail-list v-show="model.useType == 5" title="" :col="3">
-        <detail-list-item term="注册代码">{{ model.registerNo }}</detail-list-item>
-        <detail-list-item term="介质属性">{{ model.characterType }}</detail-list-item>
-        <detail-list-item term="使用登记证编号">{{ model.usedNo }}</detail-list-item>
-        <detail-list-item term="维护供应商">{{ model.supplier }}</detail-list-item>
-        <detail-list-item term="设备批号">{{ model.batchNo }}</detail-list-item>
-        <detail-list-item term="设计到期年限">{{ model.retirementDate }}</detail-list-item>
-        <detail-list-item term="登记日期">{{ model.registerDate }}</detail-list-item>
-      </detail-list>
-      <title-divider v-show="model.useType == 4" title="计量信息" width="90px"></title-divider>
-      <detail-list v-show="model.useType == 4" title="" :col="3">
-        <detail-list-item term="测量设备编号">{{ model.cardNo }}</detail-list-item>
-        <detail-list-item term="准确度等级">{{ model.fdjxh }}</detail-list-item>
-        <detail-list-item term="检定日期">{{ model.checkDate }}</detail-list-item>
-        <detail-list-item term="检定周期">{{ model.checkPeriod }}</detail-list-item>
-        <detail-list-item term="检定有效期">{{ model.nextCheckDate }}</detail-list-item>
-        <detail-list-item term="检定单位">{{ model.dph }}</detail-list-item>
-        <detail-list-item term="检定人">{{ model.zaiz }}</detail-list-item>
-        <detail-list-item term="检定结论">{{ BaseTool.Object.getField(rlTypeMap,model.rlType) }}</detail-list-item>
-        <detail-list-item term="是否周检查">{{ BaseTool.Object.getField(colorMap,model.color) }}</detail-list-item>
-        <detail-list-item term="检定证书编号">{{ model.sbdh }}</detail-list-item>
-        <detail-list-item term="预警天数">{{ model.seatNumber }}</detail-list-item>
-      </detail-list>
-      <title-divider title="图片信息" width="90px"></title-divider>
-      <detail-list title="" :col="1">
-        <detail-list-item term="" v-if="model.sbFileList != null && model.sbFileList.length > 0">
-          <viewer :images="model.sbFileList" @inited="inited" ref="viewer" :index="1" >
-            <img v-for="item in model.sbFileList" :src="item.url" :key="item.id" class="image">
-          </viewer>
-        </detail-list-item>
-        <detail-list-item term="" v-if="model.sbFileList == null || model.sbFileList.length === 0">
-          暂无
-        </detail-list-item>
-      </detail-list>
-      <title-divider title="文件信息" width="90px"></title-divider>
-      <detail-list title="" :col="4">
-        <detail-list-item term="维保手册">
-          <a-upload
-            :multiple="true"
-            :fileList="BaseTool.UPLOAD.transImg(model.repairFileList)"
-          >
-          </a-upload>
-        </detail-list-item>
-        <detail-list-item term="使用手册">
-          <a-upload
-            :multiple="true"
-            :fileList="BaseTool.UPLOAD.transImg(model.useFileList)"
-          >
-          </a-upload>
-        </detail-list-item>
-        <detail-list-item term="验收文件">
-          <a-upload
-            :multiple="true"
-            :fileList="BaseTool.UPLOAD.transImg(model.recheckFileList)"
-          >
-          </a-upload>
-        </detail-list-item>
-      </detail-list>
-      <title-divider title="相关数据" width="90px"></title-divider>
-      <q-tabs :activeKey="activeKey" @change="changeTab">
-        <q-tab-pane key="2" tab="配件记录">
-          <spare-part-used-select-table :type="2" :table-params="{sbId: model.id, modelId: model.modelId}" ref="sparePartUsedSelectTable"/>
-        </q-tab-pane>
-        <q-tab-pane key="3" tab="保养记录">
-          <check-job-table :type="2" :check-type="2" :table-params="{sbId: model.id}" ref="spotJobTable" />
-        </q-tab-pane>
-        <q-tab-pane key="4" tab="历史故障">
-          <repair-application-form-table :type="2" :table-params="{sbId: model.id, sbName: model.name}" ref="repairApplicationFormTable" />
-        </q-tab-pane>
-        <q-tab-pane key="5" tab="历史费用">
-          <repair-fee-table :table-params="{sbId: model.id}" ref="repairFeeTable" />
-        </q-tab-pane>
-        <q-tab-pane key="6" tab="状态变更记录">
-          <sb-status-log-table :type="2" :table-params="{sbId: model.id, sbName: model.name}" ref="sbStatusLogTable" />
-        </q-tab-pane>
-        <q-tab-pane key="7" tab="停机记录">
-          <sb-stop-log-table :table-params="{sbId: model.id}" ref="sbStopLogTable" />
-        </q-tab-pane>
-      </q-tabs>
+          <img-code
+            style="border: 1px dashed #ccc"
+            :src="model.qrCode"
+            title="点击重新生成二维码"
+            :code-id="model.id"
+            :width="297"
+            :height="297"></img-code>
+          <a-divider style="background: #D6D6D6" />
+          <a-row type="flex" justify="space-between" :gutter="[16,16]">
+            <a-col :span="10">
+              <a-button shape="round" @click="handleRouter(1)" block>
+                配件记录
+              </a-button>
+            </a-col>
+            <a-col :span="10">
+              <a-button shape="round" @click="handleRouter(2)" block>
+                保养记录
+              </a-button>
+            </a-col>
+            <a-col :span="10">
+              <a-button shape="round" @click="handleRouter(3)" block>
+                历史故障
+              </a-button>
+            </a-col>
+            <a-col :span="10">
+              <a-button shape="round" @click="handleRouter(4)" block>
+                历史费用
+              </a-button>
+            </a-col>
+            <a-col :span="10">
+              <a-button shape="round" @click="handleRouter(5)" block>
+                状态变更记录
+              </a-button>
+            </a-col>
+            <a-col :span="10">
+              <a-button shape="round" @click="handleRouter(6)" block>
+                停机记录
+              </a-button>
+            </a-col>
+          </a-row>
+
+        </a-layout-sider>
+        <a-layout-content :style="{ background: '#fff',padding: '20px'}">
+          <a-card >
+            <div style="margin:0; padding:15px 30px; background:#EFEFFB;font-size:16px; color: #1890ff"><b>基本信息</b></div>
+            <a-descriptions bordered :column="3">
+              <a-descriptions-item label="设备编号">
+                {{ model.no }}
+              </a-descriptions-item>
+              <a-descriptions-item label="设备（旧号）">
+                {{ model.zbh }}
+              </a-descriptions-item>
+              <a-descriptions-item label="设备描述">
+                {{ model.name }}
+              </a-descriptions-item>
+              <a-descriptions-item label="规格型号">
+                {{ model.model }}
+              </a-descriptions-item>
+              <a-descriptions-item label="ABC 标识" >
+                {{ BaseTool.Object.getField(levelMap,model.level) }}
+              </a-descriptions-item>
+              <a-descriptions-item label="设备类型">
+                {{ model.typeName }}
+              </a-descriptions-item>
+              <a-descriptions-item label="自定义类型">
+                {{ BaseTool.Object.getField(useTypeMap,model.useType) }}
+              </a-descriptions-item>
+              <a-descriptions-item label="生产商">
+                {{ model.producerName }}
+              </a-descriptions-item>
+              <a-descriptions-item label="大小尺寸">
+                {{ model.zz }}
+              </a-descriptions-item>
+              <a-descriptions-item label="系列号(出厂编号)">{{ model.zzh }}</a-descriptions-item>
+              <a-descriptions-item label="使用位置">{{ model.cph }}</a-descriptions-item>
+              <a-descriptions-item label="设备位置">{{ model.positionName }}</a-descriptions-item>
+              <a-descriptions-item label="使用寿命">{{ model.workYear }}</a-descriptions-item>
+              <a-descriptions-item label="是否显示">{{ model.isShow?'显示':'不显示' }}</a-descriptions-item>
+              <a-descriptions-item v-if="model.isChild == 1" label="是否子设备">子设备</a-descriptions-item>
+              <a-descriptions-item v-else-if="model.isChild == 2" label="是否子设备">父设备</a-descriptions-item>
+              <a-descriptions-item v-else-if="model.isChild == 3" label="是否子设备">独立设备</a-descriptions-item>
+              <a-descriptions-item label="状态"><badge :status="DictCache.COLOR.SB_INFO_STATUS[model.status]" :text="statusMap[model.status]"></badge></a-descriptions-item>
+              <a-descriptions-item label="备注">{{ model.remark }}</a-descriptions-item>
+            </a-descriptions>
+          </a-card>
+          <br>
+          <a-card >
+            <div style="margin:0; padding:15px 30px; background:#EFEFFB;font-size:16px; color: #1890ff"><b>自定义参数</b></div>
+            <a-descriptions bordered :column="3">
+              <a-descriptions-item v-for="item in paramList" :key="item.name" :label="item.name">{{ item.content }}</a-descriptions-item>
+            </a-descriptions>
+          </a-card>
+          <br>
+          <a-card >
+            <div style="margin:0; padding:15px 30px; background:#EFEFFB;font-size:16px; color: #1890ff"><b>资产编号</b></div>
+            <a-descriptions bordered :column="3">
+              <a-descriptions-item label="资产编号1">{{ model.financingNo }}</a-descriptions-item>
+              <a-descriptions-item label="资产编号2">{{ model.financingNoTwo }}</a-descriptions-item>
+              <a-descriptions-item label="资产编号3">{{ model.financingNoThird }}</a-descriptions-item>
+              <a-descriptions-item label="资产编号4">{{ model.financingNoFour }}</a-descriptions-item>
+              <a-descriptions-item label="资产编号5">{{ model.financingNoFive }}</a-descriptions-item>
+            </a-descriptions>
+          </a-card>
+          <br>
+          <a-card >
+            <div style="margin:0; padding:15px 30px; background:#EFEFFB;font-size:16px; color: #1890ff"><b>人员信息</b></div>
+            <a-descriptions bordered :column="3">
+              <a-descriptions-item label="使用人">{{ model.saveUserName }}</a-descriptions-item>
+              <a-descriptions-item label="第一维修人">{{ model.repairUserName }}</a-descriptions-item>
+              <a-descriptions-item label="第二维修人">{{ model.repairUserNameSecond }}</a-descriptions-item>
+              <a-descriptions-item label="购置日期">{{ model.buyDate }}</a-descriptions-item>
+              <a-descriptions-item label="投用日期">{{ model.startDate }}</a-descriptions-item>
+            </a-descriptions>
+          </a-card>
+          <br>
+          <a-card v-show="model.useType == 5">
+            <div style="margin:0; padding:15px 30px; background:#EFEFFB;font-size:16px; color: #1890ff"><b>特种信息</b></div>
+            <a-descriptions bordered :column="3">
+              <a-descriptions-item label="注册代码">{{ model.registerNo }}</a-descriptions-item>
+              <a-descriptions-item label="介质属性">{{ model.characterType }}</a-descriptions-item>
+              <a-descriptions-item label="使用登记证编号">{{ model.usedNo }}</a-descriptions-item>
+              <a-descriptions-item label="维护供应商">{{ model.supplier }}</a-descriptions-item>
+              <a-descriptions-item label="设备批号">{{ model.batchNo }}</a-descriptions-item>
+              <a-descriptions-item label="设计到期年限">{{ model.retirementDate }}</a-descriptions-item>
+              <a-descriptions-item label="登记日期">{{ model.registerDate }}</a-descriptions-item>
+            </a-descriptions>
+          </a-card>
+          <br v-show="model.useType == 5">
+          <a-card v-show="model.useType == 4" >
+            <div style="margin:0; padding:15px 30px; background:#EFEFFB;font-size:16px; color: #1890ff"><b>计量信息</b></div>
+            <a-descriptions bordered :column="3">
+              <a-descriptions-item label="测量设备编号">{{ model.cardNo }}</a-descriptions-item>
+              <a-descriptions-item label="准确度等级">{{ model.fdjxh }}</a-descriptions-item>
+              <a-descriptions-item label="检定日期">{{ model.checkDate }}</a-descriptions-item>
+              <a-descriptions-item label="检定周期">{{ model.checkPeriod }}</a-descriptions-item>
+              <a-descriptions-item label="检定有效期">{{ model.nextCheckDate }}</a-descriptions-item>
+              <a-descriptions-item label="检定单位">{{ model.dph }}</a-descriptions-item>
+              <a-descriptions-item label="检定人">{{ model.zaiz }}</a-descriptions-item>
+              <a-descriptions-item label="检定结论">{{ BaseTool.Object.getField(rlTypeMap,model.rlType) }}</a-descriptions-item>
+              <a-descriptions-item label="是否周检查">{{ BaseTool.Object.getField(colorMap,model.color) }}</a-descriptions-item>
+              <a-descriptions-item label="检定证书编号">{{ model.sbdh }}</a-descriptions-item>
+              <a-descriptions-item label="预警天数">{{ model.seatNumber }}</a-descriptions-item>
+            </a-descriptions>
+          </a-card>
+          <br v-show="model.useType == 4">
+          <a-card >
+            <div style="margin:0; padding:15px 30px; background:#EFEFFB;font-size:16px; color: #1890ff"><b>文件信息</b></div>
+            <a-descriptions bordered :column="3">
+              <a-descriptions-item label="维保手册">
+                <a-upload
+                  :multiple="true"
+                  :fileList="BaseTool.UPLOAD.transImg(model.repairFileList)"
+                >
+                </a-upload>
+              </a-descriptions-item>
+              <a-descriptions-item label="使用手册">
+                <a-upload
+                  :multiple="true"
+                  :fileList="BaseTool.UPLOAD.transImg(model.useFileList)"
+                >
+                </a-upload>
+              </a-descriptions-item>
+              <a-descriptions-item label="验收文件">
+                <a-upload
+                  :multiple="true"
+                  :fileList="BaseTool.UPLOAD.transImg(model.recheckFileList)"
+                >
+                </a-upload>
+              </a-descriptions-item>
+            </a-descriptions>
+          </a-card>
+          <br>
+          <a-card>
+            <div style="margin:0; padding:15px 30px; background:#EFEFFB;font-size:16px; color: #1890ff"><b>图片信息</b></div>
+            <br>
+            <a-row v-if="model.sbFileList != null && model.sbFileList.length > 0" type="flex" justify="space-between" :gutter="[16,16]">
+              <a-col >
+                <img v-for="item in model.sbFileList" :src="item.url" :key="item.id" class="image">
+              </a-col>
+            </a-row>
+            <div v-if="model.sbFileList == null || model.sbFileList.length === 0"> 暂无</div>
+          </a-card>
+        </a-layout-content>
+      </a-layout>
     </div>
     <base-form ref="baseModal" @ok="handleOk"/>
     <detail-sb-bom ref="detailSbBomModal" @ok="handleOk"/>
@@ -172,7 +228,6 @@
     <part-info-list ref="partInfoList" />
     <repair-report-sb-info ref="repairReportSbInfo" :sb-id="model.id" @ok="handleOk"/>
     <repair-report-sb-info-fee ref="repairReportSbInfoFee" :sb-id="model.id" @ok="handleOk"/>
-    <!--    <check-job-table-wait-do :type="2" :check-type="2" ref="checkJobTableWaitDo" @ok="handleOk"/>-->
   </a-card>
 </template>
 
@@ -191,6 +246,7 @@ import { queryNumPartInfo } from '@/api/part/info'
 import { queryNumModelbom } from '@/api/sb/modelbom'
 import { fetchSbInfo, queryChildNumSbInfo } from '@/api/sb/info'
 import SparePartUsedSelectTable from '@/views/sqarepartmanage/sparepartused/modules/SparePartUsedSelectTable'
+// import SbOilPageTable from '@/views/sb/oil/modules/SbOilPageTable'
 import SbRunFillPageTable from '@/views/sb/run-fill/modules/SbRunFillPageTable'
 import SbInspectionFillPageTable from '@/views/sb/inspection-fill/modules/SbInspectionFillPageTable'
 import DetailSbBom from '@/views/sb/modelbom/modules/DetailSbBom'
@@ -213,6 +269,7 @@ export default {
     RepairApplicationFormTable,
     CheckJobTable,
     SparePartUsedSelectTable,
+    // SbOilPageTable,
     SbRunFillPageTable,
     SbInspectionFillPageTable,
     DetailSbBom,
@@ -240,7 +297,6 @@ export default {
       isShowMap: {},
       collapseActiveKey: '1',
       model: {
-        'id': null,
         'no': null,
         'financingNo': null,
         'financingNoTwo': null,
@@ -347,7 +403,7 @@ export default {
     this.levelMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SBINFO_LEVEL)
     this.firmProducerLevelMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.FIRM_PRODUCER_LEVEL)
     this.statusMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SB_INFO_STATUS)
-    this.unitMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SBINFO_UNIT)
+    this.unitMap = this.DictCache.getRepairCheckFormLabelByValueMapByType(this.DictCache.TYPE.SBINFO_UNIT)
     this.colorMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SB_COLOR)
     this.rlTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.RANLIAO_TYPE)
     this.sourceTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SBTYPE_SOURCETYPE)
@@ -362,30 +418,50 @@ export default {
       this.$viewer = viewer
     },
     handleViewBom (record) {
-      this.visible = false
-      const modal = this.$refs.detailSbBomModal
-      modal.base(this.model)
+      const routeUrl = this.$router.resolve({ path: '/sb/modelbom', query: { id: this.model.id } })
+      window.open(routeUrl.href, '_blank')
     },
     handleViewChildSbInfo () {
-      /* this.visible = false
-      const modal = this.$refs.detailSbInfoModal
-      modal.base(this.model) */
-      const text = this.$router.resolve({
-        name: 'SbInfo',
-        query: { parentId: this.model.id, parentName: this.model.name }
-      })
-      // 打开一个新的页面
-      window.open(text.href, '_blank')
+      // this.visible = false
+      // const modal = this.$refs.detailSbInfoModal
+      console.log(this.model)
+      // modal.base(this.model)
+      const routeUrl = this.$router.resolve({ path: '/sb/info/company', query: { parentId: this.model.id, parentName: this.model.name } })
+      // let routeUrl = this.$router.resolve(`/share/${96}`)
+      window.open(routeUrl.href, '_blank')
     },
     handleViewCheck (record) {
-      this.visible = false
-      const modal = this.$refs.detailSbCheckModal
-      modal.base(this.model)
+      const routeUrl = this.$router.resolve({ path: '/check/polling-standard', query: { id: this.model.id } })
+      // let routeUrl = this.$router.resolve(`/share/${96}`)
+      window.open(routeUrl.href, '_blank')
     },
     handleViewCheckJob (record) {
-      this.visible = false
-      const modal = this.$refs.detailSbCheckJobModal
-      modal.base(this.model)
+      const routeUrl = this.$router.resolve({ path: '/check/polling-job', query: { id: this.model.id } })
+      window.open(routeUrl.href, '_blank')
+    },
+    // 根据keyNum路由相关页面
+    handleRouter (keyNum) {
+      const id = this.model.id
+      var routeUrl = ''
+      if (keyNum === 1) {
+        routeUrl = this.$router.resolve({ path: '/spare/used/record', query: { id: id } })
+      }
+      if (keyNum === 2) {
+        routeUrl = this.$router.resolve({ path: '/check/polling-job/finish', query: { id: id } })
+      }
+      if (keyNum === 3) {
+        routeUrl = this.$router.resolve({ path: '/repair/form', query: { id: id } })
+      }
+      if (keyNum === 4) {
+        routeUrl = this.$router.resolve({ path: '/repair/form', query: { id: id } })
+      }
+      if (keyNum === 5) {
+        routeUrl = this.$router.resolve({ path: '/status/log', query: { id: id } })
+      }
+      if (keyNum === 6) {
+        routeUrl = this.$router.resolve({ path: '/stop/log', query: { id: id } })
+      }
+      window.open(routeUrl.href, '_blank')
     },
     handleMeasure (record) {
       this.visible = false
@@ -469,8 +545,10 @@ export default {
       this.$emit('ok', values)
     },
     handleOk () {
+      this.confirmLoading = true
       this.visible = true
       fetchSbInfo({ id: this.model.id }).then(res => {
+        this.confirmLoading = false
         this.base(res.data)
       })
     },
@@ -482,8 +560,10 @@ export default {
       })
     },
     partInfoListView () {
-      const modal = this.$refs.partInfoList
-      modal.base({ sbId: this.model.id }, { sbId: this.model.id })
+      // const modal = this.$refs.partInfoList
+      // modal.base({ sbId: this.model.id }, { sbId: this.model.id })
+      const routeUrl = this.$router.resolve({ path: '/part/info', query: { id: this.model.id } })
+      window.open(routeUrl.href, '_blank')
     },
     checkJobTableWaitDoListView () {
       const modal = this.$refs.checkJobTableWaitDo
@@ -508,27 +588,13 @@ export default {
   }
 }
 </script>
-<style scoped>
-/* For demo */
-.ant-carousel {
-  width: 300px;
-  height: 300px;
-}
-.ant-carousel >>> .slick-slide {
-  text-align: center;
-  height: 300px;
-  line-height: 300px;
-  overflow: hidden;
-}
 
-.ant-carousel >>> .slick-slide h3 {
-  color: #fff;
+<style scoped>
+.ant-layout-sider {
+  background: #fff !important;
+  padding: 20px 16px !important;
 }
-
-.image {
-  width: calc(20% - 10px);
-  cursor: pointer;
-  margin: 5px;
-  display: inline-block;
+.ant-card-body{
+  padding: 0  !important;
 }
 </style>

src/views/sb/info/modules/DetailC.vue

@@ -27,11 +27,6 @@
               <a-button style="margin-left: 8px" type="default" @click="handleEdit()">修改</a-button>
               <a-button style="margin-left: 8px" type="default" :loading="confirmLoading" @click="handleOk()">刷新</a-button>
               <a-button style="margin-left: 20px" type="primary" @click="handleCancel()">返回</a-button>
-            <!-- <a-button style="margin-left: 20px" type="default" >检定记录</a-button>
-            <a-button style="margin-left: 20px" type="error" >保养日历</a-button>
-            <a-button style="margin-left: 20px" type="default">工单分析</a-button>
-            <a-button style="margin-left: 20px" type="default">费用分析</a-button>
-            <a-button style="margin-left: 20px" type="primary">返回</a-button> -->
             </span>
           </a-col>
         </a-row>

src/views/sqarepartmanage/sparepartinfo/modules/SparePartInfoSelectModal.vue

@@ -1,7 +1,7 @@
 <template>
   <a-modal
     :title="modalTitle"
-    :width="1000"
+    :width="1200"
     :visible="visible"
     :confirmLoading="confirmLoading"
     class="ant-modal2"
@@ -9,37 +9,41 @@
   >
     <a-card :bordered="false">
       <a-row :gutter="8">
-        <a-col :span="5">
-          <a-tree
-            @expand="onExpand"
-            :expandedKeys="expandedKeys"
-            :autoExpandParent="true"
-            @select="onSelect"
-            :selectedKeys="selectedKeys"
-            :treeData="spareTypeTreeData"
-          />
-        </a-col>
-        <a-col :span="19">
+        <a-col :span="24">
           <div class="table-page-search-wrapper">
             <a-form layout="inline">
               <a-row :gutter="48">
                 <a-col :md="6 || 24" :sm="24">
-                  <a-form-item label="">
+                  <a-form-item label="名称/编码">
                     <a-input v-model.trim="queryParam.keyword" placeholder="名称/编码"/>
                   </a-form-item>
                 </a-col>
                 <a-col :md="6 || 24" :sm="24">
-                  <a-form-item label="">
+                  <a-form-item label="规格型号">
                     <a-input v-model="queryParam.ggxh" placeholder="规格型号"/>
                   </a-form-item>
                 </a-col>
                 <a-col :md="6 || 24" :sm="24">
-                  <a-form-item label="">
+                  <a-form-item label="类型">
+                    <a-tree-select
+                      style="width: 100%"
+                      :dropdownStyle="{ maxHeight: '400px', overflow: 'auto' }"
+                      :treeData="spareTypeTreeData"
+                      :treeNodeFilterProp="'title'"
+                      :showSearch="true"
+                      v-model="queryParam.typeId"
+                      placeholder="请选择"
+                    >
+                    </a-tree-select>
+                  </a-form-item>
+                </a-col>
+                <a-col :md="6 || 24" :sm="24">
+                  <a-form-item label="原厂编号">
                     <a-input v-model="queryParam.initNo" placeholder="原厂编号"/>
                   </a-form-item>
                 </a-col>
                 <a-col :md="6 || 24" :sm="24">
-                  <a-form-item label="">
+                  <a-form-item label="是否专用">
                     <a-select v-model="queryParam.isSpecial" placeholder="请选择">
                       <a-select-option
                         v-for="(label,value) in specialMap"
@@ -81,7 +85,7 @@
           >
             <span slot="action" slot-scope="record">
               <template>
-                <a @click="handleView(record)">查看</a>
+<!--                <a @click="handleView(record)">查看</a>-->
               </template>
             </span>
           </s-table>
@@ -169,6 +173,10 @@ export default {
           title: '规格型号',
           dataIndex: 'ggxh'
         },
+        {
+          title: '原厂编号',
+          dataIndex: 'initNo'
+        },
         {
           title: '备件价值',
           dataIndex: 'initialValue',

src/views/sqarepartmanage/sparetype/SpareType.vue

@@ -1,17 +1,7 @@
 <template>
   <a-card :bordered="false">
     <a-row :gutter="8">
-      <a-col :span="4">
-        <a-tree
-          @expand="onExpand"
-          :expandedKeys="expandedKeys"
-          :autoExpandParent="true"
-          @select="onSelect"
-          :selectedKeys="selectedKeys"
-          :treeData="spareTypeTreeData"
-        />
-      </a-col>
-      <a-col :span="20">
+      <a-col :span="24">
         <div class="table-page-search-wrapper">
           <a-form layout="inline">
             <a-row :gutter="48">
@@ -20,7 +10,20 @@
                   <a-input v-model.trim="queryParam.keyword" placeholder="请输入名称/编码"/>
                 </a-form-item>
               </a-col>
-
+              <a-col :md="6 || 24" :sm="24">
+                <a-form-item label="类型">
+                  <a-tree-select
+                    style="width: 100%"
+                    :dropdownStyle="{ maxHeight: '400px', overflow: 'auto' }"
+                    :treeData="spareTypeTreeData"
+                    :treeNodeFilterProp="'title'"
+                    :showSearch="true"
+                    v-model="queryParam.parentId"
+                    placeholder="请选择"
+                  >
+                  </a-tree-select>
+                </a-form-item>
+              </a-col>
               <a-col :md="8 || 24" :sm="24">
                 <span class="table-page-search-submitButtons">
                   <a-button type="primary" @click="$refs.table.refresh()">查询</a-button>
@@ -137,13 +140,13 @@ export default {
             return record.parentName
           }
         },
-        {
+        /* {
           title: '设备型号类别',
           dataIndex: 'modelType',
           customRender: (text, record, index) => {
             return record.modelTypeName
           }
-        },
+        }, */
         // {
         //  title: '排序',
         //  dataIndex: 'sort'
@@ -294,15 +297,6 @@ export default {
       fetchSpareTypeTree({}).then(res => {
         this.spareTypeTreeData = res.data
       })
-    },
-    onSelect: function (selectedKeys, info) {
-      this.selectedKeys = selectedKeys
-      this.queryParam.parentId = selectedKeys.length > 0 ? selectedKeys[0] : ''
-      this.$refs.table.refresh(true)
-    },
-    onExpand (expandedKeys) {
-      this.expandedKeys = expandedKeys
-      this.autoExpandParent = false
     }
   }
 }

src/views/sqarepartmanage/sparetype/modules/BaseForm.vue

@@ -73,7 +73,7 @@
         >
         </a-tree-select>
       </a-form-item>
-      <a-form-item
+<!--      <a-form-item
         label="所属型号"
         :labelCol="BaseTool.Constant.labelCol"
         :wrapperCol="BaseTool.Constant.wrapperCol"
@@ -88,7 +88,7 @@
             :value="id">{{ name + model }}
           </a-select-option>
         </a-select>
-      </a-form-item>
+      </a-form-item>-->
       <a-form-item
         label="排序"
         :labelCol="BaseTool.Constant.labelCol"

src/views/sqarepartmanage/sparetype/modules/Detail.vue

@@ -9,7 +9,7 @@
     <detail-list title="" :col="2">
       <detail-list-item term="编码">{{ model.no }}</detail-list-item>
       <detail-list-item term="名称">{{ model.name }}</detail-list-item>
-      <detail-list-item term="设备型号类型">{{model.modelTypeName }}</detail-list-item>
+<!--      <detail-list-item term="设备型号类型">{{model.modelTypeName }}</detail-list-item>-->
       <detail-list-item term="类型">{{ BaseTool.Object.getField(typeMap,model.type) }}</detail-list-item>
       <detail-list-item term="父类别">{{ model.parentName }}</detail-list-item>
       <detail-list-item term="排序">{{ model.sort }}</detail-list-item>