维修完善

src/api/customize/fieldTemplateData.js

@@ -87,6 +87,22 @@ export function fetchCustomFieldTemplateData (parameter) {
   })
 }
 
+/**
+ * fetch single func
+ * parameter: { }
+ * @param parameter
+ * @returns {*}
+ */
+export function fetchCustomDataForRepairRecord (parameter) {
+  return axios({
+    url: '/customize/fieldTemplateData/repair/longyan/' + parameter.id,
+    method: 'get',
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
+  })
+}
+
 /**
  * fetch single func
  * parameter: { }

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

@@ -166,12 +166,12 @@
             rowKey="id">
             <span slot="action" slot-scope="record">
               <template>
-                <a @click="handleViewRecord(record)">查看</a>
-                <operation-button
-                  @click="handleEditRecord(record)" >修改</operation-button>
-                <operation-button
-                  title="确认该条维修记录？"
-                  @confirm="deleteRecord(record.id)" >删除</operation-button>
+                <a @click="handleViewRecord(record)">维修详情</a>
+                <!--                 <operation-button
+                                  @click="handleEditRecord(record)" >修改</operation-button>
+                               <operation-button
+                                  title="确认该条维修记录？"
+                                  @confirm="deleteRecord(record.id)" >删除</operation-button>-->
               </template>
             </span>
           </a-table>
@@ -330,6 +330,7 @@
     <edit-form ref="editForm" @ok="handleOk" />
     <resolve-base-form ref='resolveBaseForm' @ok='handleResolveOk'/>
     <resolve-detail ref='resolveDetail' @ok='handleResolveOk'/>
+    <detail-repair-record ref='detailRepairRecord' @ok='handleRepairRecordOk'/>
   </div>
 </template>
 
@@ -359,7 +360,7 @@ import { deleteRepairFees, fetchRepairFee, queryRepairFee } from '@/api/repair/f
 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 } from '@/api/customize/fieldTemplateData'
+import { queryRepairRecord, fetchCustomDataForRepairRecord } 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'
@@ -368,6 +369,7 @@ import BaseForm from '@/views/repair/repairproject/modules/BaseForm'
 import Detail from '@/views/repair/repairproject/modules/Detail'
 import ResolveBaseForm from '@/views/repair/repair/modules/BaseForm'
 import ResolveDetail from '@/views/repair/repair/modules/Detail'
+import DetailRepairRecord from './DetailRepairRecord'
 const DetailListItem = DetailList.Item
 
 export default {
@@ -397,7 +399,8 @@ export default {
     BaseForm,
     Detail,
     ResolveBaseForm,
-    ResolveDetail
+    ResolveDetail,
+    DetailRepairRecord
   },
   data () {
     return {
@@ -743,7 +746,7 @@ export default {
         this.dataReason = res.data
       })
       queryRepairRecord({ objId: this.model.id, remark: 'repair_record' }).then(res => {
-        this.dataRecord = res.data
+        this.dataRecord = res.data.rows
       })
       getRepairSchemePage({ repairId: this.model.id }).then(res => {
         this.dataRepairResolve = res.data.rows
@@ -834,6 +837,13 @@ export default {
         modal.base(data)
       })
     },
+    handleViewRecord (record) {
+      this.visible = false
+      fetchCustomDataForRepairRecord({ id: record.id }).then(res => {
+        const modal = this.$refs.detailRepairRecord
+        modal.base(res.data)
+      })
+    },
     batchDeleteReason (id) {
       let ids = []
       if (this.BaseTool.String.isBlank(id)) {
@@ -906,6 +916,14 @@ export default {
         this.dataRepairResolve = res.data.rows
       })
     },
+    handleRepairRecordOk () {
+      this.loading = true
+      this.visible = true
+      queryRepairRecord({ objId: this.model.id, remark: 'repair_record' }).then(res => {
+        this.loading = false
+        this.dataRecord = res.data.rows
+      })
+    },
     handleFinish () {
       const modal = this.$refs.finishForm
       modal.base(this.model)

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

@@ -0,0 +1,73 @@
+<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-col>
+    </a-row>
+    <detail-list title='' :col='2'>
+      <detail-list-item term='维修人'>{{ model.createdUserName }}</detail-list-item>
+      <detail-list-item term='维修时间'>{{ model.createdTime }}</detail-list-item>
+      <detail-list-item term='结束时间'>{{ model.updateTime }}</detail-list-item>
+      <detail-list-item term='维修意见'>{{ model.dataRemark }}</detail-list-item>
+    </detail-list>
+    <title-divider title="维修图片" width="90px"></title-divider>
+    <detail-list title="" :col="1">
+      <detail-list-item term="" v-if="model.imageList != null && model.imageList.length > 0">
+        <viewer :images="model.imageList" @inited="inited" ref="viewer" :index="1" >
+          <img v-for="item in model.imageList" :src="item.url" :key="item.id" class="image">
+        </viewer>
+      </detail-list-item>
+      <detail-list-item term="" v-if="model.imageList == null || model.imageList.length === 0">
+        暂无
+      </detail-list-item>
+    </detail-list>
+  </a-card>
+</template>
+
+<script>
+import DetailList from '@/components/tools/DetailList'
+
+const DetailListItem = DetailList.Item
+
+export default {
+  name: 'DetailRepairRecord',
+  components: {
+    DetailList,
+    DetailListItem
+  },
+  data () {
+    return {
+      confirmLoading: false,
+      mdl: {},
+      modalTitle: null,
+      visible: false,
+      // 下拉框map
+      model: {
+        'dataRemark': null,
+        'imageList': null,
+        'createdUserName': null,
+        'createdTime': null,
+        'updateTime': null
+      }
+    }
+  },
+  created () {
+    // 下拉框map
+  },
+  methods: {
+    base (record) {
+      this.visible = true
+      this.modalTitle = '记录详情'
+      this.model = record
+    },
+    handleCancel () {
+      this.visible = false
+      this.confirmLoading = false
+      this.$emit('ok')
+    }
+  }
+}
+</script>