完善

src/api/repair/repair.js

@@ -164,7 +164,6 @@ export function getRepairSpare (parameter) {
     method: 'get',
     headers: {
       'Content-Type': 'application/json;charset=UTF-8'
-    },
-    responseType: 'blob'
+    }
   })
 }

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

@@ -172,19 +172,30 @@
           </div>
           <a-table
             :data-source="dataSpare"
-            :columns="columnsSpare"
-            :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+            :columns="columnsOutStore"
             tableLayout="auto"
             rowKey="id">
+            <span slot="status" slot-scope="text">
+
+              <badge
+                :status="DictCache.COLOR.OUT_STORE_FORM_STATUS[text]"
+                :text="outStoreStatusMap[text]" />
+            </span>
             <span slot="actionSpare" slot-scope="record">
               <template>
-                <a v-if="$auth('repair-application-forms-finish') && record.isSpecial === 0" @click="handleEditSpare(record)">修改</a>
-                <a-divider type="vertical" />
-                <a-popconfirm v-if="$auth('repair-application-forms-finish')" title="是否要删除该条数据？" @confirm="batchDeleteSpare(record.id)">
-                  <a>删除</a>
+                <a-popconfirm v-if=" userInfo.realName===record.updateUserName&& record.status==0" title="是否提交审核？" @confirm="updateStore(record.id)">
+                  <a>提交审核</a>
                 </a-popconfirm>
               </template>
             </span>
+            <div slot="expandedRowRender" slot-scope="record" style="margin: 0">
+              <a-table
+                :data-source="record.detailList"
+                :columns="columnsSpare"
+                tableLayout="auto"
+                rowKey="id">
+              </a-table>
+            </div>
           </a-table>
         </div>
         <div class="main gutter-color" v-show="current == 5">
@@ -412,6 +423,7 @@ import TicketForm from './TicketForm'
 import LongYanSelectSpareForm from './LongYanSelectSpareForm'
 import ReportPauseForm from './ReportPauseForm'
 import BigRepairForm from './BigRepairForm'
+import { startSbInfoScrap } from '@/api/activiti/activiti-sb-scrap'
 
 import OutStroeForm from '@/views/store/outstoreform/modules/BaseFormYY.vue'
 const DetailListItem = DetailList.Item
@@ -466,6 +478,7 @@ export default {
       current: 0,
       modalTitle: null,
       needStopMap: {},
+      userInfo: this.$store.getters.userInfo,
       planFlagMap: {},
       dispatchList: [],
       visible: false,
@@ -474,11 +487,13 @@ export default {
       // 下拉框map
       sourceMap: {},
       typeMap: {},
+      outStoreMap: {},
       repairStatus: [],
       levelMap: {},
       descripitionMap: {},
       selectedRowKeys: [],
       statusMap: {},
+      outStoreStatusMap: {},
       repairProjectMap: {},
       repairTechnologyMap: {},
       activeKey: 'a',
@@ -515,57 +530,99 @@ export default {
           title: '序号',
           dataIndex: 'index',
           customRender: (text, record, index) => {
-            return `${index + 1}`
+            return index + 1
           }
         },
         {
-          title: '备件名称',
+          title: '名称',
           dataIndex: 'spareName'
         },
         {
-          title: '备件编码',
-          dataIndex: 'spareId'
+          title: '编号',
+          dataIndex: 'no'
         },
         {
-          title: '规格型号',
+          title: '规格',
           dataIndex: 'ggxh'
         },
         {
-          title: '更换数量',
+          title: '批次',
+          dataIndex: 'cbatch'
+        },
+        {
+          title: '数量',
           dataIndex: 'num'
         },
         {
-          title: '更换日期',
-          dataIndex: 'startDate'
+          title: '库存',
+          dataIndex: 'storeNum',
+          width: 150
         },
-        /* {
-          title: '下次更换日期',
-          dataIndex: 'startDate'
-        }, */
         {
-          title: '更换备注',
-          dataIndex: 'remark'
+          title: '单位',
+          dataIndex: 'unit'
+        },
+        {
+          title: '仓库',
+          dataIndex: 'storeName'
+        },
+        {
+          title: '货架号',
+          dataIndex: 'storePosition'
         },
         {
-          title: '是否关联设备',
-          dataIndex: 'isSpecial',
-          checked: true,
+          title: '备注',
+          dataIndex: 'remark',
+          width: 150
+        }
+      ],
+      columnsOutStore: [
+        {
+          title: '序号',
+          dataIndex: 'index',
           customRender: (text, record, index) => {
-            if (text === 1) {
-              return '是'
-            } else {
-              return '否'
-            }
+            return `${index + 1}`
           }
-        }
-        /*
+        },
+        {
+          title: '出库单号',
+          dataIndex: 'outNo'
+        },
+        {
+          title: '用友单号',
+          dataIndex: 'yyId'
+        },
+        {
+          title: '出库类型',
+          dataIndex: 'type',
+          customRender: (text, record, index) => {
+            return this.BaseTool.Object.getField(this.outStoreMap, text)
+          }
+        },
+        {
+          title: '状态',
+          dataIndex: 'status',
+          scopedSlots: { customRender: 'status' }
+        },
+        {
+          title: '领用日期',
+          dataIndex: 'createdTime'
+        },
+        {
+          title: '领用人',
+          dataIndex: 'updateUserName'
+        },
+        {
+          title: '仓库',
+          dataIndex: 'storeName'
+        },
         {
           title: '操作',
           key: 'action',
           width: '200px',
           align: 'center',
           scopedSlots: { customRender: 'actionSpare' }
-        } */
+        }
       ],
       columnsFee: [
         {
@@ -877,6 +934,9 @@ export default {
     this.typeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_FEE_TYPE)
     this.typeReasonMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_REASON_TYPE)
     this.planFlagMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_APPLICATION_FORM_CATEGORY)
+    this.outStoreMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.OUT_STORE_FORM_TYPE)
+    this.outStoreStatusMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.OUT_STORE_FORM_STATUS)
+    this.tableOption()
   },
   methods: {
     base (record) {
@@ -906,6 +966,7 @@ export default {
       // })
       getRepairSpare({ id: this.model.id }).then(res => {
         console.log(res)
+        console.log(this.userInfo)
         this.dataSpare = res.data
       })
       queryRepairFee({ repairId: this.model.id }).then(res => {
@@ -1429,8 +1490,21 @@ export default {
         this.$message.info('操作成功！')
         this.handleCancel()
       })
+    },
+    updateStore (id) {
+      const params = {}
+      params.id = id
+      params.processInstanceId = ''
+      params.auditModelName = '仓库审批'
+      params.auditModelKey = 'out_store_back'
+      startSbInfoScrap(params).then(res => {
+        this.$message.info('已提交，请等待主管审核')
+        getRepairSpare({ id: this.model.id }).then(res => {
+          console.log(res)
+          this.dataSpare = res.data
+        })
+      })
     }
-
   }
 }
 </script>