bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化

This commit is contained in:
bb_pan 2025-03-27 11:02:46 +08:00
parent 5ece3f4368
commit 89a9481b04
3 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue
View File

@ -308,14 +308,14 @@
<el-button <el-button
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
v-if="scope.row.taskStatus == 30" v-show="scope.row.taskStatus == 30"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['picking:apply:edit']" v-hasPermi="['picking:apply:edit']"
>编辑</el-button >编辑</el-button
> >
<el-button <el-button
type="text" type="text"
v-if=" v-show="
(scope.row.taskStatus == 98 || (scope.row.taskStatus == 98 ||
scope.row.taskStatus == 99 || scope.row.taskStatus == 99 ||
scope.row.taskStatus == 100) && scope.row.taskStatus == 100) &&
@ -331,7 +331,7 @@
<el-button <el-button
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
v-if="scope.row.taskStatus == 30" v-show="scope.row.taskStatus == 30"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['picking:apply:del']" v-hasPermi="['picking:apply:del']"
style="color: #f56c6c" style="color: #f56c6c"
@ -382,7 +382,7 @@ export default {
data() { data() {
return { return {
// 遮罩层 // 遮罩层
loading: true, loading: false,
// 选中数组 // 选中数组
ids: [], ids: [],
// 非单个禁用 // 非单个禁用

3
sgzb-ui/src/views/claimAndreturn/picking/auditing/component/home1.vue
View File

@ -603,6 +603,9 @@ export default {
{ name: '待出库', id: 33 }, { name: '待出库', id: 33 },
{ name: '出库进行中', id: 34 }, { name: '出库进行中', id: 34 },
{ name: '完成', id: 35 }, { name: '完成', id: 35 },
{ name: '分公司审核驳回', id: 98 },
{ name: '分管审核驳回', id: 99 },
{ name: '内部审核驳回', id: 100 },
], ],
orderStatusList: [ orderStatusList: [
{ name: '申请时间-升序', id: 0 }, { name: '申请时间-升序', id: 0 },

19
sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue
View File

@ -179,7 +179,6 @@
style="color: #67c23a" style="color: #67c23a"
icon="el-icon-tickets" icon="el-icon-tickets"
@click="handleOutboundOrder(row)" @click="handleOutboundOrder(row)"
v-if="row.taskStatus == 35"
> >
出库单 出库单
</el-button> </el-button>
@ -554,7 +553,7 @@
@closeDialogOuter="closeDialogOuter" @closeDialogOuter="closeDialogOuter"
> >
<template slot="outerContent"> <template slot="outerContent">
<VueEasyPrint tableShow ref="remarksPrintRef"> <VueEasyPrint tableShow ref="remarksPrintRef" style="padding: 0 10px; width: 750px;">
<!-- <el-row :gutter="20"> <!-- <el-row :gutter="20">
<el-col span="6">申请人：</el-col> <el-col span="6">申请人：</el-col>
<el-col span="6">领料工程：</el-col> <el-col span="6">领料工程：</el-col>
@ -569,18 +568,19 @@
<li> <li>
领料单位：<span>{{ unitName }}</span> 领料单位：<span>{{ unitName }}</span>
</li> </li>
<li>
领料工程：<span>{{ proName }}</span>
</li>
<li> <li>
领料单号：<span>{{ code }}</span> 领料单号：<span>{{ code }}</span>
</li> </li>
<li>
领料工程：<span>{{ proName }}</span>
</li>
</ul> </ul>
<el-table style="margin: 15px 0" :data="outboundOrderList"> <el-table style="margin: 15px 0; padding: 1px;" :data="outboundOrderList">
<el-table-column <el-table-column
align="center" align="center"
label="序号" label="序号"
type="index" type="index"
width="55"
/> />
<el-table-column <el-table-column
align="center" align="center"
@ -601,11 +601,13 @@
align="center" align="center"
label="申请数量" label="申请数量"
prop="preNum" prop="preNum"
width="55"
/> />
<el-table-column <el-table-column
align="center" align="center"
label="出库数量" label="出库数量"
prop="outNum" prop="outNum"
width="55"
/> />
<el-table-column <el-table-column
align="center" align="center"
@ -634,7 +636,7 @@
领料申请人：<span>{{ applyFor }}</span> 领料申请人：<span>{{ applyFor }}</span>
</li> </li>
<li> 批注人：<span></span> </li> <li> 批注人：<span></span> </li>
<li style="margin-right: 260px"> <li style="margin-right: 200px">
审批人：<span></span> 审批人：<span></span>
</li> </li>
</ul> </ul>
@ -771,7 +773,7 @@ export default {
}, },
// 出库单 弹框配置项 // 出库单 弹框配置项
dialogConfig: { dialogConfig: {
outerWidth: '80%', outerWidth: '800px',
outerVisible: false, outerVisible: false,
center: true, center: true,
}, },
@ -1120,6 +1122,7 @@ export default {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
list-style: none; list-style: none;
flex-wrap: wrap;
padding: 0; padding: 0;
font-size: 16px; font-size: 16px;
font-weight: bold; font-weight: bold;