完善

src/api/customize/fieldTemplateData.js

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

src/views/sb/scraps/SbAuditUnifyForm.vue

@@ -129,7 +129,7 @@ import { fetchCustomFieldTemplateByRemark } from '@/api/customize/fieldTemplate'
 import SbCustomFormView from './modules/SbCustomFormView'
 import { deleteSbScrapForms, fetchSbScrapForm, exportSbScrapForm } from '@/api/sb/scraps'
 import { startSbInfoScrap, stopSbInfoScrapForAudit } from '@/api/activiti/activiti-sb-scrap'
-import { getCustomFieldTemplateDataPage } from '@/api/customize/fieldTemplateData'
+import { getCustomFieldTemplateDataPage, fetchCustomFieldTemplateVOData } from '@/api/customize/fieldTemplateData'
 export default {
   name: 'SbAuditUnifyForm',
   components: {
@@ -439,7 +439,9 @@ export default {
     handleView (record) {
       this.visible = false
       const templateData = JSON.parse(record.data)
-      this.$refs.detailAuditScrapModal.base(record, templateData)
+      fetchCustomFieldTemplateVOData({ id: record.id }).then(res => {
+        this.$refs.detailAuditScrapModal.base(res.data, templateData)
+      })
     },
     handleOk (values) {
       this.visible = true

src/views/sb/scraps/modules/DetailAudit.vue

@@ -13,30 +13,48 @@
       <detail-list-item term="申请人">{{ model.createdUserName }}</detail-list-item>
       <detail-list-item term="申请日期">{{ model.createdTime }}</detail-list-item>
     </detail-list>
-    <detail-list title="申请详情" :col="2" v-for="(item, index) in recordData" :key="index">
-      <detail-list-item :term="item.label">{{ item.no }}</detail-list-item>
-      <detail-list-item term="设备Id"><a @click="sbIdhandleDetail">{{ model.sbId }}</a></detail-list-item>
-      <detail-list-item term="设备编号">{{ model.sbNo }}</detail-list-item>
+    <detail-list v-show='sbInfoAllocate' title="设备调拨" :col="2">
+      <detail-list-item term="单号">{{ model.no }}</detail-list-item>
+      <detail-list-item term="标题">{{ model.title }}</detail-list-item>
+      <detail-list-item term="申请部门">{{ model.currentDeptName }}</detail-list-item>
+      <detail-list-item term="目标部门">{{ model.targetDeptName }}</detail-list-item>
+      <detail-list-item term="开始时间">{{ model.startTime }}</detail-list-item>
+      <detail-list-item term="结束时间">{{ model.endTime }}</detail-list-item>
+      <detail-list-item term="备注">{{ model.dataRemark }}</detail-list-item>
+    </detail-list>
+    <detail-list v-show='sbInfoAllocate' title="设备调拨详情" :col="2" v-for="(item, index) in sbInfos" :key="index">
+      <detail-list-item term="设备名称">{{ item.name }}</detail-list-item>
+      <detail-list-item term="设备编号">{{ item.no }}</detail-list-item>
+      <detail-list-item term="设备类型">{{ item.typeName }}</detail-list-item>
+      <detail-list-item term="生成厂商">{{ item.producerName }}</detail-list-item>
+    </detail-list>
+    <detail-list v-show='sbInfoStop' title="设备停用" :col="2">
+      <detail-list-item term="单号">{{ model.no }}</detail-list-item>
+      <detail-list-item term="设备名称">{{ model.sbName }}</detail-list-item>
+      <detail-list-item term="维修单">{{ model.repairId }}</detail-list-item>
+      <detail-list-item term="停用日期">{{ model.stopDate }}</detail-list-item>
+      <detail-list-item term="停用原因">{{ model.reason }}</detail-list-item>
+      <detail-list-item term="备注">{{ model.dataRemark }}</detail-list-item>
+    </detail-list>
+    <detail-list v-show='sbInfoScrap' title="设备报废" :col="2">
+      <detail-list-item term="单号">{{ model.no }}</detail-list-item>
       <detail-list-item term="设备名称">{{ model.sbName }}</detail-list-item>
+      <detail-list-item term="设备编号">{{ model.sbNo }}</detail-list-item>
       <detail-list-item term="报废原因">{{ model.reason }}</detail-list-item>
-      <detail-list-item term="备注">{{ model.remark }}</detail-list-item>
-      <detail-list-item term="状态">{{ BaseTool.Object.getField(this.statusMap,model.status) }}</detail-list-item>
-      <detail-list-item term="申请人">{{ model.applyUserId }}</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>
-    <detail-list v-show='sbInfoAllocate' title="申请详情附件" :col="2">
+<!--    <detail-list v-show='sbInfoAllocate' title="申请详情附件" :col="2">
       <detail-list-item term="单号">{{ model.no }}</detail-list-item>
       <detail-list-item term="设备Id"><a @click="sbIdhandleDetail">{{ model.sbId }}</a></detail-list-item>
       <detail-list-item term="设备编号">{{ model.sbNo }}</detail-list-item>
       <detail-list-item term="设备名称">{{ model.sbName }}</detail-list-item>
       <detail-list-item term="报废原因">{{ model.reason }}</detail-list-item>
       <detail-list-item term="备注">{{ model.remark }}</detail-list-item>
-      <detail-list-item term="状态">{{ BaseTool.Object.getField(this.statusMap,model.status) }}</detail-list-item>
+      <detail-list-item term="状态">{{ BaseTool.Object.getField(statusMap,model.status) }}</detail-list-item>
       <detail-list-item term="申请人">{{ model.applyUserId }}</detail-list-item>
       <detail-list-item term="创建日期">{{ model.createdTime }}</detail-list-item>
       <detail-list-item term="更新日期">{{ model.updateTime }}</detail-list-item>
-    </detail-list>
+    </detail-list>-->
     <history ref="history" :audit="audit" @ok="handleCancel"></history>
   </a-card>
 </template>
@@ -65,6 +83,8 @@ export default {
       mdl: {},
       modalTitle: null,
       sbInfoAllocate: false,
+      sbInfoStop: false,
+      sbInfoScrap: false,
       visible: false,
       // 下拉框map
       statusMap: {},
@@ -74,9 +94,21 @@ export default {
         'remark': null,
         'status': null,
         'createdUserName': null,
-        'createdTime': null
+        'createdTime': null,
+        'dataRemark': null,
+        'startTime': null,
+        'endTime': null,
+        'currentDeptName': null,
+        'targetDeptName': null,
+        'title': null,
+        'reason': null,
+        'stopDate': null,
+        'sbName': null,
+        'repairId': null,
+        'no': null,
+        'sbNo': null
       },
-      recordData: {}
+      sbInfos: []
     }
   },
   created () {
@@ -85,14 +117,20 @@ export default {
   },
   methods: {
     base (record, model) {
-      console.log(record)
-      console.log(model)
       this.visible = true
       this.modalTitle = '详情'
       this.task = record
       this.model = record
+      this.model.no = model.no
       this.model.auditName = this.DictCache.VALUE.SB_INFO_AUDIT_MODEL_NAME[record.remark]
-      this.recordData = model
+      if (record.remark === this.DictCache.VALUE.CUSTOM_TEMPLATE_SB_REMARK.SB_ALLOCATE_FORM) {
+        this.sbInfoAllocate = true
+        this.sbInfos = JSON.parse(model.sbInfos)
+      } else if (record.remark === this.DictCache.VALUE.CUSTOM_TEMPLATE_SB_REMARK.SB_SCRAP_FORM) {
+        this.sbInfoScrap = true
+      } else if (record.remark === this.DictCache.VALUE.CUSTOM_TEMPLATE_SB_REMARK.SB_STOP_FORM) {
+        this.sbInfoStop = true
+      }
       model.id = record.targetId // 将targetId赋给model,带入history，用作提交
       const modal = this.$refs.history
       model.auditModelKey = record.remark