完善

src/utils/dict.js

@@ -364,7 +364,8 @@ DictCache.VALUE = {
   CUSTOM_TEMPLATE_SB_REMARK: {
     SB_SCRAP_FORM: 'sb_info_scrap',
     SB_ALLOCATE_FORM: 'sb_info_allocate',
-    SB_STOP_FORM: 'sb_info_stop'
+    SB_STOP_FORM: 'sb_info_stop',
+    OUT_STORE_BACK: 'out_store_back'
   },
   SB_INFO_AUDIT_MODEL_NAME: {
     'sb_info_scrap': '设备报废审批', // 报废

src/views/activiti/task/MyTask.vue

@@ -57,7 +57,8 @@ export default {
   components: {
     STable,
     Ellipsis,
-    DetailAuditScrap,DetailYYAudit,
+    DetailAuditScrap,
+    DetailYYAudit,
     AssignForm
   },
   data () {
@@ -159,9 +160,9 @@ export default {
           const templateData = res.data.detailList
           const recordTemp = res.data
           recordTemp.taskId = record.taskId
+          recordTemp.remark = record.targetCode
           this.$refs.detailAuditScrapModal.base(recordTemp, templateData)
         })
-        this.$refs.detailYYAuditModal.base(record)
       } else {
         fetchCustomFieldTemplateVOData({ id: record.targetId }).then(res => {
           const templateData = JSON.parse(res.data.data)

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

@@ -13,7 +13,7 @@
       <detail-list-item term="申请人">{{ model.createdUserName }}</detail-list-item>
       <detail-list-item term="申请日期">{{ model.createdTime }}</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="标题">{{ model.title }}</detail-list-item>
       <detail-list-item term="申请部门">{{ model.currentDeptName }}</detail-list-item>
@@ -22,13 +22,13 @@
       <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 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 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>
@@ -36,13 +36,26 @@
       <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 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.dataRemark }}</detail-list-item>
     </detail-list>
+    <detail-list v-show="storeInfo" title="" :col="2">
+      <detail-list-item term="单号">{{ model.outNo }}</detail-list-item>
+      <detail-list-item term="仓库名称">{{ model.storeName }}</detail-list-item>
+    </detail-list>
+    <title-divider v-show="storeInfo" title="备件明细" width="90px"></title-divider>
+    <a-table
+      v-if="storeInfo"
+      bordered
+      :data-source="model.detailList"
+      :columns="columns"
+      tableLayout="auto"
+      rowKey="cbatch">
+    </a-table>
     <history ref="history" :audit="audit" @ok="handleCancel"></history>
   </a-card>
 </template>
@@ -74,6 +87,7 @@ export default {
       sbInfoStop: false,
       sbInfoScrap: false,
       visible: false,
+      storeInfo: false,
       // 下拉框map
       statusMap: {},
       task: {},
@@ -96,7 +110,46 @@ export default {
         'no': null,
         'sbNo': null
       },
-      sbInfos: []
+      sbInfos: [],
+      columns: [
+        {
+          title: '序号',
+          dataIndex: 'index',
+          customRender: (text, record, index) => {
+            return index + 1
+          }
+        },
+        {
+          title: '备件名称',
+          dataIndex: 'spareName'
+        },
+        {
+          title: '编号',
+          dataIndex: 'no'
+        },
+        {
+          title: '规格',
+          dataIndex: 'ggxh'
+        },
+        {
+          title: '仓库',
+          dataIndex: 'storeName'
+        },
+        {
+          title: '批次',
+          dataIndex: 'cbatch'
+        },
+        {
+          title: '申请数量',
+          dataIndex: 'num',
+          width: 150
+        },
+        {
+          title: '实际数量',
+          dataIndex: 'realNum',
+          width: 150
+        }
+      ]
     }
   },
   created () {
@@ -118,6 +171,8 @@ export default {
         this.sbInfoScrap = true
       } else if (record.remark === this.DictCache.VALUE.CUSTOM_TEMPLATE_SB_REMARK.SB_STOP_FORM) {
         this.sbInfoStop = true
+      } else if (record.remark === this.DictCache.VALUE.CUSTOM_TEMPLATE_SB_REMARK.OUT_STORE_BACK) {
+        this.storeInfo = true
       }
       if (record.targetId === undefined) {
         model.id = record.id // 将targetId赋给model,带入history，用作提交