huojin
/
Byd_Dg_Web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

出库单管理模块中的界面调整

main
HUOJIN\92525 2024-06-26 10:30:11 +08:00
parent fb352011d0
commit be227e6b9f
4 changed files with 41 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/business-data/businessTask/asnTask.vue
View File

@ -133,7 +133,7 @@ const defaultForm = {
updateTime: null
}
export default {
name: 'Task',
name: 'asnTask',
components: {DateRangePicker, pagination, crudOperation, rrOperation, udOperation},
mixins: [presenter(), header(), form(defaultForm), crud()],
dicts: ['task_status'],

7
src/views/business-data/pick/index.vue
View File

@ -93,17 +93,20 @@
<el-table-column prop="station" label="需求工位"/>
<el-table-column prop="point.code" label="翻包点位"/>
<el-table-column prop="createTime" label="创建时间"/>
<el-table-column v-if="checkPer(['admin','pick:edit','pick:del'])" label="操作" width="150px" align="center">
<el-table-column v-if="checkPer(['admin','pick:edit','pick:del'])" label="操作" align="center">
<template slot-scope="scope">
<udOperation
:data="scope.row"
:permission="permission"
:showDle="false"
/>
</template>
</el-table-column>
</el-table>
<!--分页组件-->
<pagination/>
<div style="float: right;">
<pagination/>
</div>
</div>
</div>
</template>

107
src/views/business-data/pickDetail/index.vue
View File

@ -2,60 +2,48 @@
<div class="app-container">
<!--工具栏-->
<div class="head-container">
<!-- 查询操作-->
<el-form ref="form" :inline="true" :model="form" label-width="70px">
<el-form-item label="物料编码">
<el-select v-model="query.itemCode" filterable placeholder="物料编码" style="width: 140px;"
class="filter-item">
<el-option
@keyup.enter.native="crud.toQuery"
v-for="item in this.itemListData"
:key="item.code"
:label="item.code"
:value="item.code">
<span style="float: left">{{ item.code }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
<div v-if="crud.props.searchToggle">
<!-- 查询操作-->
<label class="el-form-item-label">物料编码</label>
<el-select v-model="query.itemCode" filterable clearable placeholder="物料编码" style="width: 140px;"
class="filter-item">
<el-option
@keyup.enter.native="crud.toQuery"
v-for="item in this.itemListData"
:key="item.code"
:label="item.code"
:value="item.code">
<span style="float: left">{{ item.code }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</span>
</el-option>
</el-select>
<el-form-item label="物料名称">
<el-input v-model="query.itemName" clearable placeholder="请输入物料名称" style="width: 140px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"/>
</el-form-item>
<label class="el-form-item-label">物料名称</label>
<el-input v-model="query.itemName" clearable placeholder="请输入物料名称" style="width: 140px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"/>
<el-form-item label="任务号">
<el-input v-model="query.po" clearable placeholder="请输入任务号" style="width: 140px;" class="filter-item"
@keyup.enter.native="crud.toQuery"/>
</el-form-item>
<label class="el-form-item-label">出库单号</label>
<el-input v-model="query.po" clearable placeholder="请输入出库单号" style="width: 140px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"/>
<label class="el-form-item-label">日期</label>
<date-range-picker v-model="query.createTime" class="date-item" style="width: 100px"/>
<!-- 搜索-->
<rrOperation :crud="crud"/>
<!-- 重置-->
<el-button class="filter-item" size="mini" type="warning" icon="el-icon-refresh-left" @click="resetQuery">重置
</el-button>
</el-form>
<div class="statusButton" style="border-bottom: solid lightgray 1px;">
<el-radio-group v-model="radio3" @change="clickChange" size="small">
<el-radio-button label="全部"> 全部</el-radio-button>
<el-radio-button label="打开"> 打开</el-radio-button>
<el-radio-button label="已分配">已分配</el-radio-button>
<el-radio-button label="拣货完成"> 拣货完成</el-radio-button>
</el-radio-group>
</div>
<!-- 业务操作-->
<crudOperation :permission="permission" :tableKey="this.$options.name">
<el-button
v-if="false"
slot="left"
class="filter-item"
type="info"
@ -67,6 +55,7 @@
</el-button>
<el-button
v-if="false"
slot="left"
class="filter-item"
type="primary"
@ -79,6 +68,7 @@
</el-button>
<el-button
v-if="false"
slot="left"
class="filter-item"
type="success"
@ -92,6 +82,7 @@
</el-button>
<el-button
v-if="false"
slot="left"
class="filter-item"
type="danger"
@ -113,17 +104,8 @@
height="58vh"
@selection-change="selectionChangeHandlerTwo">
<el-table-column type="selection" width="50"/>
<el-table-column
prop="date"
align="center"
label="序号"
:resizable="false"
type="index"
width="50"
/>
<el-table-column prop="pickCode" width="120" label="任务号">
<el-table-column prop="xh" label="序号" type="index" width="50"/>
<el-table-column prop="pickCode" width="120" label="出库单号">
<template slot-scope="scope">
<div>{{ scope.row.pick.code }}</div>
</template>
@ -143,15 +125,11 @@
{{ dict.label.pick_status[scope.row.status] }}
</template>
</el-table-column>
<el-table-column prop="lineNo" label="封包系数"/>
<el-table-column prop="orderQty" label="订单数量"/>
<el-table-column prop="allocatedQty" label="分配数量"/>
<el-table-column prop="pickedQty" label="拣货数量"/>
<el-table-column prop="remark" label="备注"/>
<el-table-column prop="createBy" label="创建人"/>
<el-table-column prop="createTime" width="150px" label="创建时间"/>
<el-table-column label="操作" width="150px" align="center">
<el-table-column label="操作" align="center">
<template slot-scope="scope">
<el-button size="mini" :disabled="scope.row.status!='OPEN'" type="primary" icon="el-icon-edit"
@ -163,7 +141,7 @@
icon-color='red'
@confirm="deletePick(scope.row)"
>
<el-button slot="reference" :disabled="scope.row.status!='OPEN'" size="mini" type="danger"
<el-button slot="reference" v-if="false" :disabled="scope.row.status!='OPEN'" size="mini" type="danger"
icon="el-icon-delete"/>
</el-popconfirm>
</template>
@ -281,7 +259,6 @@ export default {
show_fp: true,
show_jh: true,
show_cancelfp: true,
radio3: '全部',
items: [],
permission: {
add: ['admin', 'pickDetail:add'],
@ -411,23 +388,7 @@ export default {
shuaxin() {
this.crud.toQuery();
},
clickChange(lab) {
if (lab === "全部") {
this.crud.resetQuery();
this.crud.toQuery();
} else if (lab === "打开") {
this.query.status = 'OPEN'
this.crud.toQuery();
} else if (lab === "已分配") {
this.query.status = 'ALLOCATE'
this.crud.toQuery();
} else if (lab === "拣货完成") {
this.query.status = 'PICK_ALL'
this.crud.toQuery();
}
},
resetQuery() {
this.radio3 = '全部';
this.crud.resetQuery()
},
editPick(data) {
@ -456,7 +417,7 @@ export default {
});
})
},
toItemOut(){
toItemOut() {
this.$refs.itemOut.dialog = true
}
}

2
src/views/business-data/pickDetail/pickTask.vue
View File

@ -112,7 +112,7 @@ import crudPickDetail from "@/api/pickDetail";
const defaultForm = { id: null, itemId: null, itemKeyId: null, billCode: null, taskType: null, asnDetailId: null, moveDetailId: null, waveDetailId: null, pickDetailId: null, srcStockId: null, dstStockId: null, srcPointId: null, dstPointId: null, srcStockCode: null, dstStockCode: null, srcPointCode: null, dstPointCode: null, invStatus: null, taskStatus: null, beSkip: null, beBack: null, planQty: null, moveQty: null, putCode: null, invId: null, deptId: null, createBy: null, updateBy: null, createTime: null, updateTime: null }
export default {
name: 'Task',
name: 'pickTask',
components: {DateRangePicker, pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
dicts: ['task_status'],