|
|
@ -41,15 +41,6 @@ |
|
|
@row-click="changeData" |
|
|
@row-click="changeData" |
|
|
v-loading="dataListLoading" |
|
|
v-loading="dataListLoading" |
|
|
style="margin-top: 0px; width: 100%;"> |
|
|
style="margin-top: 0px; width: 100%;"> |
|
|
<!-- <el-table-column--> |
|
|
|
|
|
<!-- fixed="left"--> |
|
|
|
|
|
<!-- header-align="center"--> |
|
|
|
|
|
<!-- align="center"--> |
|
|
|
|
|
<!-- width="220"--> |
|
|
|
|
|
<!-- :label="'操作'">--> |
|
|
|
|
|
<!-- <template slot-scope="scope">--> |
|
|
|
|
|
<!-- </template>--> |
|
|
|
|
|
<!-- </el-table-column>--> |
|
|
|
|
|
<el-table-column |
|
|
<el-table-column |
|
|
v-for="(item,index) in columnArray1" :key="index" |
|
|
v-for="(item,index) in columnArray1" :key="index" |
|
|
:sortable="item.columnSortable" |
|
|
:sortable="item.columnSortable" |
|
|
@ -62,8 +53,17 @@ |
|
|
:label="item.columnLabel"> |
|
|
:label="item.columnLabel"> |
|
|
<template slot-scope="scope"> |
|
|
<template slot-scope="scope"> |
|
|
<span v-if="!item.columnHidden"> {{scope.row[item.columnProp]}}</span> |
|
|
<span v-if="!item.columnHidden"> {{scope.row[item.columnProp]}}</span> |
|
|
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" |
|
|
|
|
|
style="width: 100px; height: 80px"/></span> |
|
|
|
|
|
|
|
|
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span> |
|
|
|
|
|
</template> |
|
|
|
|
|
</el-table-column> |
|
|
|
|
|
<el-table-column |
|
|
|
|
|
fixed="right" |
|
|
|
|
|
header-align="center" |
|
|
|
|
|
align="center" |
|
|
|
|
|
width="80" |
|
|
|
|
|
label="操作"> |
|
|
|
|
|
<template slot-scope="scope"> |
|
|
|
|
|
<el-link v-if="scope.row.orderStatus === '待包装'" style="cursor: pointer" @click="handleComplete(scope.row)">完成</el-link> |
|
|
</template> |
|
|
</template> |
|
|
</el-table-column> |
|
|
</el-table-column> |
|
|
</el-table> |
|
|
</el-table> |
|
|
@ -340,7 +340,8 @@ import { |
|
|
deleteSoReceiveCasesData, |
|
|
deleteSoReceiveCasesData, |
|
|
validateAndScanCaseRoll, |
|
|
validateAndScanCaseRoll, |
|
|
saveCaseRollList, |
|
|
saveCaseRollList, |
|
|
searchOutboundNotificationWithDetail |
|
|
|
|
|
|
|
|
searchOutboundNotificationWithDetail, |
|
|
|
|
|
updateOrderStatus |
|
|
} from '../../../api/boxManage/boxManage' |
|
|
} from '../../../api/boxManage/boxManage' |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -1065,6 +1066,34 @@ export default { |
|
|
} |
|
|
} |
|
|
}).catch(() => {}) |
|
|
}).catch(() => {}) |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
// 处理完成操作 |
|
|
|
|
|
async handleComplete(row){ |
|
|
|
|
|
this.$confirm('是否包装完成?', '提示', { |
|
|
|
|
|
confirmButtonText: '是', |
|
|
|
|
|
cancelButtonText: '否', |
|
|
|
|
|
type: 'warning' |
|
|
|
|
|
}).then(async () => { |
|
|
|
|
|
try { |
|
|
|
|
|
const {data} = await updateOrderStatus({ |
|
|
|
|
|
site: row.site, |
|
|
|
|
|
buNo: row.buNo, |
|
|
|
|
|
orderNo: row.orderNo |
|
|
|
|
|
}) |
|
|
|
|
|
if(data && data.code === 0){ |
|
|
|
|
|
this.$message.success('操作成功,单据状态已更新为"待出库"') |
|
|
|
|
|
// 刷新列表 |
|
|
|
|
|
this.getMainData() |
|
|
|
|
|
} else { |
|
|
|
|
|
this.$message.error(data.msg || '操作失败') |
|
|
|
|
|
} |
|
|
|
|
|
} catch (error) { |
|
|
|
|
|
this.$message.error(error.msg || '操作失败,请重试') |
|
|
|
|
|
} |
|
|
|
|
|
}).catch(() => { |
|
|
|
|
|
// 用户点击了"否",不做任何操作 |
|
|
|
|
|
}) |
|
|
|
|
|
}, |
|
|
}, |
|
|
}, |
|
|
created() { |
|
|
created() { |
|
|
//查询报表的类型 |
|
|
//查询报表的类型 |
|
|
|