完善

src/api/customize/fieldTemplateData.js

@@ -63,7 +63,7 @@ export function addCustomFieldTemplateDataForm (parameter) {
  * @param parameter
  * @returns {*}
  */
-export function updateCustomFieldTemplateData(parameter) {
+export function updateCustomFieldTemplateData (parameter) {
   return axios({
     url: '/customize/fieldTemplateData/' + parameter.id,
     method: 'PUT',
@@ -110,7 +110,21 @@ export function fetchCustomDataForRepairRecord (parameter) {
     }
   })
 }
-
+/**
+ * fetch single func
+ * parameter: { }
+ * @param parameter
+ * @returns {*}
+ */
+export function getSpareList (parameter) {
+  return axios({
+    url: '/store/out-store-details/getSpareList?' + stringify(parameter),
+    method: 'get',
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
+  })
+}
 /**
  * 获取报修的维修票证
  * @param parameter
@@ -148,7 +162,7 @@ export function fetchCustomFieldTemplateVOData (parameter) {
  * @param parameter
  * @returns {*}
  */
-export function queryCustomFieldTemplateData(parameter) {
+export function queryCustomFieldTemplateData (parameter) {
   return axios({
     url: '/customize/fieldTemplateData?' + stringify(parameter),
     method: 'get',
@@ -164,7 +178,7 @@ export function queryCustomFieldTemplateData(parameter) {
  * @param parameter
  * @returns {*}
  */
-export function deleteCustomFieldTemplateDatas(parameter) {
+export function deleteCustomFieldTemplateDatas (parameter) {
   return axios({
     url: '/customize/fieldTemplateData',
     method: 'DELETE',
@@ -186,14 +200,13 @@ export function deleteCustomFieldTemplateData (parameter) {
   })
 }
 
-
 /**
  * export file
  * parameter: { }
  * @param parameter :
   * @returns {*}
  */
-export function exportCustomFieldTemplateData(parameter) {
+export function exportCustomFieldTemplateData (parameter) {
   return axios({
     url: '/customize/fieldTemplateData/export?' + stringify(parameter),
     method: 'get',

src/views/repair/application-form/modules/DetailRepair.vue

@@ -411,7 +411,7 @@ import { getSelfRole } from '@/api/upms/role'
 import ReasonBaseForm from '@/views/repair/repair-reason/modules/BaseForm'
 import ReasonDetail from '@/views/repair/repair-reason/modules/Detail'
 import { deleteRepairReasons, fetchRepairReason, queryRepairReason } from '@/api/repair/repair-reason'
-import { queryRepairRecord, fetchCustomDataForRepairRecord, fetchRepairTicketRecord } from '@/api/customize/fieldTemplateData'
+import { queryRepairRecord, fetchCustomDataForRepairRecord, fetchRepairTicketRecord, getSpareList } from '@/api/customize/fieldTemplateData'
 import DetailSbBom from '@/views/sb/modelbom/modules/DetailSbBom'
 import DetailSbCheck from '@/views/check/checkstandard/modules/DetailSbCheck'
 import { fetchSbInfo } from '@/api/sb/info'
@@ -1132,8 +1132,10 @@ export default {
     handleViewRecord (record) {
       this.visible = false
       fetchCustomDataForRepairRecord({ id: record.id }).then(res => {
-        const modal = this.$refs.detailRepairRecord
-        modal.base(res.data)
+        getSpareList({ repairFormId: this.model.id, createdUserId: record.createdUserId }).then(response => {
+          const modal = this.$refs.detailRepairRecord
+          modal.base(res.data, response.data)
+        })
       })
     },
     handleViewTicket () {

src/views/repair/application-form/modules/DetailRepairRecord.vue

@@ -1,18 +1,18 @@
 <template>
-  <a-card :bordered='false' v-show='visible' class='card' :title='modalTitle'>
-    <a-row :gutter='48' slot='extra'>
-      <a-col :md='48' :sm='48'>
-              <span class='table-page-search-submitButtons' style='float: right'>
-                <a-button style='margin-left: 8px' type='default' @click='handleCancel()'>返回</a-button>
-              </span>
+  <a-card :bordered="false" v-show="visible" class="card" :title="modalTitle">
+    <a-row :gutter="48" slot="extra">
+      <a-col :md="48" :sm="48">
+        <span class="table-page-search-submitButtons" style="float: right">
+          <a-button style="margin-left: 8px" type="default" @click="handleCancel()">返回</a-button>
+        </span>
       </a-col>
     </a-row>
     <a-descriptions :column="3" bordered>
-      <a-descriptions-item label='维修人'>{{ model.createdUserName }}</a-descriptions-item>
-      <a-descriptions-item label='维修时间'>{{ model.createdTime }}</a-descriptions-item>
-      <a-descriptions-item label='结束时间'>{{ model.updateTime }}</a-descriptions-item>
-      <a-descriptions-item label='维修时长'>{{ model.repairHours }}</a-descriptions-item>
-      <a-descriptions-item label='主管建议' :span="2">{{ model.opinion }}</a-descriptions-item>
+      <a-descriptions-item label="维修人">{{ model.createdUserName }}</a-descriptions-item>
+      <a-descriptions-item label="维修时间">{{ model.createdTime }}</a-descriptions-item>
+      <a-descriptions-item label="结束时间">{{ model.updateTime }}</a-descriptions-item>
+      <a-descriptions-item label="维修时长">{{ model.repairHours }}</a-descriptions-item>
+      <a-descriptions-item label="主管建议" :span="2">{{ model.opinion }}</a-descriptions-item>
       <a-descriptions-item label="维修描述" :span="3">{{ model.dataRemark }}</a-descriptions-item>
       <a-descriptions-item label="维修图片" :span="3">
         <div v-if="model.imageList != null && model.imageList.length > 0">
@@ -38,6 +38,18 @@
         <div v-if="model.opinionFiles == null || model.opinionFiles.length === 0"> 暂无</div>
       </a-descriptions-item>
     </a-descriptions>
+    <br>
+    <a-card title="备件清单">
+      <a-table
+        bordered
+        :data-source="dataList"
+        :columns="columns"
+        tableLayout="auto"
+        rowKey="autoId"
+      >
+
+      </a-table>
+    </a-card>
   </a-card>
 </template>
 
@@ -68,14 +80,59 @@ export default {
         'opinion': null,
         'repairHours': null,
         'opinionFiles': null
-      }
+      },
+      dataList: [],
+      columns: [
+        {
+          title: '序号',
+          dataIndex: 'index',
+          customRender: (text, record, index) => {
+            return index + 1
+          }
+        },
+        {
+          title: '名称',
+          dataIndex: 'spareName'
+        },
+        {
+          title: '编号',
+          dataIndex: 'no'
+        },
+        {
+          title: '规格',
+          dataIndex: 'ggxh'
+        },
+        {
+          title: '批次',
+          dataIndex: 'cbatch'
+        },
+        {
+          title: '数量',
+          dataIndex: 'num',
+          width: 150
+        },
+        {
+          title: '单位',
+          dataIndex: 'unit'
+        },
+        {
+          title: '仓库',
+          dataIndex: 'storeName'
+        },
+        {
+          title: '货架号',
+          dataIndex: 'storePosition'
+        }
+      ]
     }
   },
   created () {
     // 下拉框map
   },
   methods: {
-    base (record) {
+    base (record, list) {
+      console.log(list)
+      this.dataList = list
       this.visible = true
       this.modalTitle = '维修详情'
       this.model = record