|
|
|
@ -108,15 +108,6 @@ |
|
|
|
<crudOperation :permission="permission" /> |
|
|
|
<!--表格渲染--> |
|
|
|
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" height="300" @selection-change="crud.selectionChangeHandler"> |
|
|
|
<el-table-column v-permission="[]" label="操作" width="80px" align="center" fixed="right"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<el-button |
|
|
|
type="text" |
|
|
|
icon="el-icon-add" |
|
|
|
@click="handleButtonClick(scope.row)" |
|
|
|
>回温出库</el-button> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column prop="pointCode" label="点位编码" :min-width="flexWidth('pointCode',crud.data,'点位编码')" /> |
|
|
|
<el-table-column prop="regionName" label="区域名称" :min-width="flexWidth('regionName',crud.data,'区域名称')" /> |
|
|
|
<el-table-column prop="subTray" label="子托编码" :min-width="flexWidth('subTray',crud.data,'子托编码')" /> |
|
|
|
@ -134,10 +125,35 @@ |
|
|
|
<span>{{ scope.row.standingTime > scope.row.usedTime ? '未完成' : '已完成' }}</span> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column label="操作" width="95" fixed="right"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<el-button |
|
|
|
class="filter-item" |
|
|
|
type="success" |
|
|
|
size="mini" |
|
|
|
v-if="showButton1(scope.row)" |
|
|
|
> |
|
|
|
正在出库 |
|
|
|
</el-button> |
|
|
|
<el-button |
|
|
|
class="filter-item" |
|
|
|
type="warning" |
|
|
|
size="mini" |
|
|
|
v-if="showButton2(scope.row)" |
|
|
|
@click="handleButtonClick(scope.row)" |
|
|
|
> |
|
|
|
回温出库 |
|
|
|
</el-button> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
</el-table> |
|
|
|
|
|
|
|
<el-dialog |
|
|
|
:visible.sync="dialogVisible" |
|
|
|
:lock-scroll="false" |
|
|
|
width="30%" |
|
|
|
title="选择点位" |
|
|
|
:before-close="handleClose" |
|
|
|
> |
|
|
|
<el-form ref="form" :model="form"> |
|
|
|
<el-form-item label="点位列表"> |
|
|
|
@ -152,7 +168,7 @@ |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<div slot="footer" class="dialog-footer"> |
|
|
|
<el-button @click="dialogVisible = false">取消</el-button> |
|
|
|
<el-button @click="handleCancle">取消</el-button> |
|
|
|
<el-button type="primary" @click="submitSelectedPoint">确认</el-button> |
|
|
|
</div> |
|
|
|
</el-dialog> |
|
|
|
@ -164,14 +180,12 @@ |
|
|
|
|
|
|
|
<script> |
|
|
|
import crudMaterial from './detail' |
|
|
|
import CRUD, { crud, form, header, presenter } from '@crud/crud' |
|
|
|
import CRUD, { crud, header, presenter } from '@crud/crud' |
|
|
|
import rrOperation from '@crud/RR.operation' |
|
|
|
import crudOperation from '@crud/CRUD.operation' |
|
|
|
import udOperation from '@crud/UD.operation' |
|
|
|
import pagination from '@crud/Pagination' |
|
|
|
import crudMdBaseWorkShop from '@/views/wms/basedata/workshop/mdBaseWorkshop' |
|
|
|
import crudSchBasePoint from '@/views/wms/sch/point/schBasePoint' |
|
|
|
import crudSchBaseRegion from '@/views/wms/sch/region/schBaseRegion' |
|
|
|
|
|
|
|
export default { |
|
|
|
name: 'HwDetail', |
|
|
|
@ -218,7 +232,6 @@ export default { |
|
|
|
this.getPointList() |
|
|
|
this.getSupplierNameList() |
|
|
|
this.getIngotBatchList() |
|
|
|
this.fetchPoints() |
|
|
|
this.getProductDescriptionList() |
|
|
|
}, |
|
|
|
methods: { |
|
|
|
@ -246,6 +259,28 @@ export default { |
|
|
|
this.ingotBatchList = res.content |
|
|
|
}) |
|
|
|
}, |
|
|
|
handleClose(done){ |
|
|
|
this.form.selectedPoint = null |
|
|
|
done(); |
|
|
|
}, |
|
|
|
handleCancle(){ |
|
|
|
this.dialogVisible = false |
|
|
|
this.form.selectedPoint = null |
|
|
|
}, |
|
|
|
showButton1(row){ |
|
|
|
if(typeof row.ing_task_code === 'undefined' || row.ing_task_code == null || row.ing_task_code === ''){ |
|
|
|
return false; |
|
|
|
}else{ |
|
|
|
return true; |
|
|
|
} |
|
|
|
}, |
|
|
|
showButton2(row){ |
|
|
|
if(typeof row.ing_task_code === 'undefined' || row.ing_task_code == null || row.ing_task_code === ''){ |
|
|
|
return true; |
|
|
|
}else{ |
|
|
|
return false; |
|
|
|
} |
|
|
|
}, |
|
|
|
handleButtonClick(row) { |
|
|
|
this.selectedRow = row |
|
|
|
this.dialogVisible = true |
|
|
|
@ -263,12 +298,13 @@ export default { |
|
|
|
return |
|
|
|
} |
|
|
|
// Submit the selected point to the backend |
|
|
|
this.$axios.post('/api/pda/task', { |
|
|
|
this.$axios.post('/api/report/hwtask', { |
|
|
|
start_point: this.selectedRow.pointCode, |
|
|
|
next_point: selectedPoint |
|
|
|
}).then(response => { |
|
|
|
this.$message.success('提交成功') |
|
|
|
this.dialogVisible = false |
|
|
|
this.crud.toQuery() |
|
|
|
}).catch(error => { |
|
|
|
this.$message.error('提交失败') |
|
|
|
}) |
|
|
|
|
