This commit is contained in:
parent
5ece3f4368
commit
89a9481b04
|
|
@ -308,14 +308,14 @@
|
|||
<el-button
|
||||
type="text"
|
||||
icon="el-icon-edit"
|
||||
v-if="scope.row.taskStatus == 30"
|
||||
v-show="scope.row.taskStatus == 30"
|
||||
@click="handleUpdate(scope.row)"
|
||||
v-hasPermi="['picking:apply:edit']"
|
||||
>编辑</el-button
|
||||
>
|
||||
<el-button
|
||||
type="text"
|
||||
v-if="
|
||||
v-show="
|
||||
(scope.row.taskStatus == 98 ||
|
||||
scope.row.taskStatus == 99 ||
|
||||
scope.row.taskStatus == 100) &&
|
||||
|
|
@ -331,7 +331,7 @@
|
|||
<el-button
|
||||
type="text"
|
||||
icon="el-icon-delete"
|
||||
v-if="scope.row.taskStatus == 30"
|
||||
v-show="scope.row.taskStatus == 30"
|
||||
@click="handleDelete(scope.row)"
|
||||
v-hasPermi="['picking:apply:del']"
|
||||
style="color: #f56c6c"
|
||||
|
|
@ -382,7 +382,7 @@ export default {
|
|||
data() {
|
||||
return {
|
||||
// 遮罩层
|
||||
loading: true,
|
||||
loading: false,
|
||||
// 选中数组
|
||||
ids: [],
|
||||
// 非单个禁用
|
||||
|
|
|
|||
|
|
@ -603,6 +603,9 @@ export default {
|
|||
{ name: '待出库', id: 33 },
|
||||
{ name: '出库进行中', id: 34 },
|
||||
{ name: '完成', id: 35 },
|
||||
{ name: '分公司审核驳回', id: 98 },
|
||||
{ name: '分管审核驳回', id: 99 },
|
||||
{ name: '内部审核驳回', id: 100 },
|
||||
],
|
||||
orderStatusList: [
|
||||
{ name: '申请时间-升序', id: 0 },
|
||||
|
|
|
|||
|
|
@ -179,7 +179,6 @@
|
|||
style="color: #67c23a"
|
||||
icon="el-icon-tickets"
|
||||
@click="handleOutboundOrder(row)"
|
||||
v-if="row.taskStatus == 35"
|
||||
>
|
||||
出库单
|
||||
</el-button>
|
||||
|
|
@ -554,7 +553,7 @@
|
|||
@closeDialogOuter="closeDialogOuter"
|
||||
>
|
||||
<template slot="outerContent">
|
||||
<VueEasyPrint tableShow ref="remarksPrintRef">
|
||||
<VueEasyPrint tableShow ref="remarksPrintRef" style="padding: 0 10px; width: 750px;">
|
||||
<!-- <el-row :gutter="20">
|
||||
<el-col span="6">申请人：</el-col>
|
||||
<el-col span="6">领料工程：</el-col>
|
||||
|
|
@ -569,18 +568,19 @@
|
|||
<li>
|
||||
领料单位：<span>{{ unitName }}</span>
|
||||
</li>
|
||||
<li>
|
||||
领料工程：<span>{{ proName }}</span>
|
||||
</li>
|
||||
<li>
|
||||
领料单号：<span>{{ code }}</span>
|
||||
</li>
|
||||
<li>
|
||||
领料工程：<span>{{ proName }}</span>
|
||||
</li>
|
||||
</ul>
|
||||
<el-table style="margin: 15px 0" :data="outboundOrderList">
|
||||
<el-table style="margin: 15px 0; padding: 1px;" :data="outboundOrderList">
|
||||
<el-table-column
|
||||
align="center"
|
||||
label="序号"
|
||||
type="index"
|
||||
width="55"
|
||||
/>
|
||||
<el-table-column
|
||||
align="center"
|
||||
|
|
@ -601,11 +601,13 @@
|
|||
align="center"
|
||||
label="申请数量"
|
||||
prop="preNum"
|
||||
width="55"
|
||||
/>
|
||||
<el-table-column
|
||||
align="center"
|
||||
label="出库数量"
|
||||
prop="outNum"
|
||||
width="55"
|
||||
/>
|
||||
<el-table-column
|
||||
align="center"
|
||||
|
|
@ -634,7 +636,7 @@
|
|||
领料申请人：<span>{{ applyFor }}</span>
|
||||
</li>
|
||||
<li> 批注人：<span></span> </li>
|
||||
<li style="margin-right: 260px">
|
||||
<li style="margin-right: 200px">
|
||||
审批人：<span></span>
|
||||
</li>
|
||||
</ul>
|
||||
|
|
@ -771,7 +773,7 @@ export default {
|
|||
},
|
||||
// 出库单 弹框配置项
|
||||
dialogConfig: {
|
||||
outerWidth: '80%',
|
||||
outerWidth: '800px',
|
||||
outerVisible: false,
|
||||
center: true,
|
||||
},
|
||||
|
|
@ -1120,6 +1122,7 @@ export default {
|
|||
display: flex;
|
||||
justify-content: space-between;
|
||||
list-style: none;
|
||||
flex-wrap: wrap;
|
||||
padding: 0;
|
||||
font-size: 16px;
|
||||
font-weight: bold;
|
||||
|
|
|
|||
Loading…
Reference in New Issue