fengdong777 2 years ago
parent
commit
7195235490
  1. 2
      warehousing-system/project_web_ui/src/views/component/instorehouse/purchase.vue
  2. 1
      warehousing-system/project_web_ui/src/views/component/instorehouse/putIn.vue
  3. 243
      warehousing-system/project_web_ui/src/views/component/instorehouse/putInManagement.vue
  4. 26
      warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/outList.vue
  5. 28
      warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/picking.vue
  6. 167
      warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/pickingManagement.vue

2
warehousing-system/project_web_ui/src/views/component/instorehouse/purchase.vue

@ -228,7 +228,7 @@ export default {
},
async deletePurchase (purchase) {
if(purchase.state=='已入库'){
this.$message.error('已经入库的采购订单不能编辑')
this.$message.error('已经入库的采购订单不能删除')
}else{
const sids = []
sids.push(purchase.sid)

1
warehousing-system/project_web_ui/src/views/component/instorehouse/putIn.vue

@ -164,6 +164,7 @@ export default {
return ;
}
this.$message.success('操作成功')
this.getOptions();
this.$refs.onPutInRuleForm.resetFields();
});

243
warehousing-system/project_web_ui/src/views/component/instorehouse/putInManagement.vue

@ -9,7 +9,7 @@
<div v-show="isSearchShow" class="search">
<el-form ref="queryInfo" :inline="true" :model="queryInfo" class="tab-header">
<el-form-item label="入库单号">
<el-input v-model="queryInfo.query" placeholder="请输入入库单号" clearable />
<el-input v-model="queryInfo.params.no" placeholder="请输入入库单号" clearable />
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
@ -18,67 +18,60 @@
</div>
</div>
</div>
<el-table :data="inStorehouseList.slice((queryInfo.pageNum-1)*queryInfo.pageSize,queryInfo.pageNum*queryInfo.pageSize)"
style="width: 100%"
stripe border fixed
@selection-change="handleSelectionChange">
<el-table-column
fixed="left"
type="selection"
width="55">
</el-table-column>
<el-table-column
prop="inStorehouseId"
label="入库单号"
width="180">
</el-table-column>
<el-table-column
prop="locationId"
label="货位编号"
width="180">
</el-table-column>
<el-table-column
prop="receivingId"
label="接货单号"
width="180">
</el-table-column>
<el-table-column
prop="createPerson"
label="创建者"
width="180">
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
width="180">
</el-table-column>
<el-table-column
prop="checkPerson"
label="审批人"
width="180">
</el-table-column>
<el-table-column
prop="checkTime"
label="审批时间"
width="180">
</el-table-column>
<el-table-column
prop="status"
label="状态"
width="180">
</el-table-column>
<el-table-column
prop="remarks"
label="备注">
</el-table-column>
<el-table :data="inStorehouseList"
style="width: 100%" border>
<el-table-column label="序号" type="index" width="60" :index="indexMethod" align="center" />
<el-table-column
prop="createTime"
label="入库日期"
align="center"
width="180">
</el-table-column>
<el-table-column
prop="custerName"
label="客户名称"
align="center"
width="180">
</el-table-column>
<el-table-column
prop="no"
label="订单编号"
align="center"
width="180">
</el-table-column>
<el-table-column
prop="applicationDate"
label="订单日期"
align="center"
width="180">
</el-table-column>
<el-table-column
prop="locationName"
label="货位名称"
align="center"
width="180">
</el-table-column>
<el-table-column
prop="storeHouseName"
label="仓库名称"
align="center"
width="180">
</el-table-column>
<el-table-column
prop="state"
label="状态"
align="center"
:formatter="formatorderdegree"
width="180">
</el-table-column>
</el-table>
<div class="pages">
<div class="tit" />
<pagination
v-show="inStorehouseList.length > 0"
:total="total"
:page.sync="queryInfo.pageNum"
:limit.sync="queryInfo.pageSize"
:total="queryInfo.total"
:page.sync="queryInfo.current"
:limit.sync="queryInfo.size"
class="pagination"
@pagination="getInStorehouseList"
/>
@ -105,9 +98,12 @@ export default {
btndisabled: false,
isSearchShow: false,
queryInfo: {
query: '',
pageNum: 1,
pageSize: 10
total: 0,
current: 1,
size: 10,
params: {
no:''
}
},
total: 0,
user: '',
@ -115,27 +111,6 @@ export default {
selectList: '',
data: '',
btnList: [
{
type: 'success',
size: 'small',
icon: 'submit',
btnKey: 'check',
btnLabel: '审核'
},
{
type: 'danger',
size: 'small',
icon: 'cross',
btnKey: 'cancel',
btnLabel: '撤销审核'
},
{
type: 'danger',
size: 'small',
icon: 'cross',
btnKey: 'cancelInStorehouse',
btnLabel: '撤销入库'
},
{
type: 'info',
size: 'small',
@ -149,15 +124,6 @@ export default {
methods: {
btnHandle(btnKey) {
switch (btnKey) {
case 'check':
this.check()
break
case 'cancel':
this.cancel()
break
case 'cancelInStorehouse':
this.cancelInStorehouse()
break
case 'doClose': //
this.doClose()
break
@ -167,85 +133,39 @@ export default {
},
resetQuery() {
this.queryInfo={
query: '',
pageNum: 1,
pageSize: 10
total: 0,
current: 1,
size: 10,
params: {
no:''
}
},
this.getInStorehouseList()
},
handleSizeChange (val) {
this.queryInfo.pageSize = val
this.getInStorehouseList()
},
handleCurrentChange (val) {
this.queryInfo.pageNum = val
this.getInStorehouseList()
},
handleSelectionChange (val) {
this.selectList = val
},
//
indexMethod(index) {
var pagestart = (this.queryInfo.current - 1) * this.queryInfo.size
var pageindex = index + 1 + pagestart
return pageindex
},
async getInStorehouseList () {
const { data: result } = await this.$http.get('/putIn/list', { params: this.queryInfo })
if (result.status === 201) return this.$message.error('获取列表失败')
this.inStorehouseList = result.data.rows
this.total = result.data.total
},
check () {
for (var i = 0; i < this.selectList.length; i++) {
if (this.selectList[i].status === '待审核') {
this.selectList[i].status = '已审核'
this.selectList[i].checkPerson = this.user
this.updataInStorehouse(this.selectList[i])
this.$message.success('入库单' + this.selectList[i].inStorehouseId + '审核成功')
} else if (this.selectList[i].status === '已审核') {
this.$message.error('入库单' + this.selectList[i].inStorehouseId + '已审核')
} else {
this.$message.error('入库单' + this.selectList[i].inStorehouseId + '进行中')
}
}
},
cancel () {
for (var i = 0; i < this.selectList.length; i++) {
if (this.selectList[i].status === '已审核') {
this.selectList[i].status = '待审核'
this.updataInStorehouse(this.selectList[i])
this.$message.success('入库单' + this.selectList[i].inStorehouseId + '撤销审核成功')
} else if (this.selectList[i].status === '待审核') {
this.$message.error('入库单' + this.selectList[i].inStorehouseId + '未审核')
} else {
this.$message.error('入库单' + this.selectList[i].inStorehouseId + '进行中')
}
}
},
async cancelInStorehouse () {
for (var i = 0; i < this.selectList.length; i++) {
if (this.selectList[i].status === '待审核') {
this.deleteInStorehouse(this.selectList[i])
this.$message.success('入库单' + this.selectList[i].inStorehouseId + this.data)
} else {
this.$message.error('入库单' + this.selectList[i].inStorehouseId + '进行中')
}
const { data: result } = await this.$http.post('/input/listPage', this.queryInfo )
if (result.code == 200){
this.inStorehouseList = result.data.records
this.queryInfo.total = result.data.total
}
},
async updataInStorehouse (inStorehouse) {
const { data: result } = await this.$http.put('/putIn/updataInStorehouse', inStorehouse)
if (result.status !== 200) return this.$message.error('修改失败')
this.getInStorehouseList()
},
async deleteInStorehouse (inStorehouse) {
const { data: result } = await this.$http.delete(`/putIn/deleteInStorehouse/${inStorehouse.inStorehouseId}/${inStorehouse.receivingId}`)
if (result.status !== 200) return this.$message.error('撤销失败')
this.data = result.data
this.getInStorehouseList()
},
formatorderdegree: function( row, column) {
if(row.state === '1'){
return '已出库'
} else if(row.state === '2') {
return '重要'
} else{
return ''
}
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
@ -256,7 +176,6 @@ export default {
mounted () {
this.$refs['btnbar'].setButtonList(this.btnList)
this.getInStorehouseList()
// this.user = window.sessionStorage.getItem('token').substr(32)
}
}
</script>

26
warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/outList.vue

@ -1,7 +1,7 @@
<template>
<div class="app-container">
<div v-show="viewState == 1">
<button-bar ref="btnbar" view-title="采购订单管理" :btndisabled="btndisabled" @btnhandle="btnHandle" />
<button-bar ref="btnbar" view-title="出库订单管理" :btndisabled="btndisabled" @btnhandle="btnHandle" />
<div class="main-content">
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="isSearchShow = !isSearchShow">{{ isSearchShow ? '隐藏查询条件' : '显示查询条件' }}</el-button>
@ -56,6 +56,7 @@
prop="state"
label="状态"
align="center"
:formatter="formatorderdegree"
width="180">
</el-table-column>
<el-table-column
@ -185,8 +186,8 @@ methods: {
current: 1,
size: 10,
params: {
purchaseNo:''
}
no:''
},
},
this.getPurchaseList()
},
@ -221,8 +222,8 @@ methods: {
}
},
async deletePurchase (purchase) {
if(purchase.state=='已入库'){
this.$message.error('已经入库的采购订单不能编辑')
if(purchase.state=='2'){
this.$message.error('已经拣货的出库订单不能删除')
}else{
const sids = []
sids.push(purchase.sid)
@ -238,11 +239,20 @@ methods: {
this.getPurchaseList()
}
},
formatorderdegree: function( row, column) {
if(row.state === '1'){
return '未拣货'
} else if(row.state === '2') {
return '已拣货'
} else{
return ''
}
},
async open (row) {
if(row.state=='已入库'){
console.log(row.state);
if(row.state=='2'){
this.$message({
message: '已经入库的采购订单不能编辑',
message: '已经拣货的出库订单不能编辑',
type: 'warning'
});
}else{

28
warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/picking.vue

@ -8,10 +8,10 @@
<span class="item_text">出库订单号</span>
<el-select v-model="outStorehouseId" class="item_input" placeholder="请选择" clearable>
<el-option
v-for="item in outStorehouseIdList"
:key="item"
:label="item"
:value="item"
v-for="(item,i) in outStorehouseIdList"
:key="i"
:label="item.no"
:value="item.sid"
>
</el-option>
</el-select>
@ -62,16 +62,22 @@ export default {
}
},
async getOptions () {
const { data: result } = await this.$http.get('/picking/getOptions')
if (result.status !== 200) return this.$message.error('获取列表失败')
this.outStorehouseIdList = result.data
const { data: result } = await this.$http.post('/output/listAllForPicking')
if (result.code == 200){
this.outStorehouseIdList = result.data
}
},
async picking () {
const { data: result } = await this.$http.put('/picking/picking', { outStorehouseId: this.outStorehouseId, user: this.user })
if (result.status !== 200) return this.$message.error('领取任务失败')
this.$message.success('成功领取任务')
this.$refs.onPickingRuleForm.resetfields()
const { data: result } = await this.$http.put('/picking/picking', { outStorehouseId: this.outStorehouseId})
if (result.code == 200){
this.$message.success('拣货成功')
this.outStorehouseId=''
this.getOptions()
}else{
this.$message.error('拣货失败')
}
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)

167
warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/pickingManagement.vue

@ -8,7 +8,7 @@
<div v-show="isSearchShow" class="search">
<el-form ref="queryInfo" :inline="true" :model="queryInfo" class="tab-header">
<el-form-item label="拣货单号">
<el-input v-model="queryInfo.query" placeholder="请输入拣货单号" clearable />
<el-input v-model="queryInfo.params.no" placeholder="请输入拣货单号" clearable />
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
@ -17,67 +17,61 @@
</div>
</div>
</div>
<el-table :data="pickingList.slice((queryInfo.pageNum-1)*queryInfo.pageSize,queryInfo.pageNum*queryInfo.pageSize)"
style="width: 100%"
stripe border fixed
@selection-change="handleSelectionChange">
<el-table-column
fixed="left"
type="selection"
width="55">
</el-table-column>
<el-table-column
prop="pickingId"
label="拣货单号"
<el-table :data="pickingList"
style="width: 100%"
border>
<el-table-column label="序号" type="index" width="60" :index="indexMethod" align="center" />
<el-table-column
prop="modifyTime"
label="拣货日期"
align="center"
width="180">
</el-table-column>
<el-table-column
prop="outStorehouseId"
label="出库单号"
width="180">
<el-table-column
prop="custerName"
label="客户名称"
align="center"
>
</el-table-column>
<el-table-column
prop="recipientPerson"
label="领取人"
prop="no"
label="订单编号"
align="center"
width="180">
</el-table-column>
<el-table-column
prop="recipientTime"
label="领取时间"
width="180">
prop="applicationDate"
label="订单日期"
align="center"
width="150">
</el-table-column>
<el-table-column
prop="createPerson"
label="创建人"
width="180">
prop="creatorName"
label="采购申请人"
align="center"
width="150">
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
width="180">
</el-table-column>
<el-table-column
prop="status"
label="状态">
prop="storeHouseName"
label="仓库名称"
align="center"
>
</el-table-column>
<el-table-column
fixed="right"
prop="operate"
label="操作"
width="95">
<template slot-scope="scope" >
<el-button type="primary" icon="el-icon-edit" size="small" @click="open(scope.row)">修改</el-button>
<!-- <el-button type="danger" icon="el-icon-delete" size="small" @click="delete(scope.row)">删除</el-button> -->
</template>
prop="state"
label="状态"
:formatter="formatorderdegree"
align="center"
width="120">
</el-table-column>
</el-table>
</el-table>
<div class="pages">
<div class="tit" />
<pagination
v-show="pickingList.length > 0"
:total="total"
:page.sync="queryInfo.pageNum"
:limit.sync="queryInfo.pageSize"
:total="queryInfo.total"
:page.sync="queryInfo.current"
:limit.sync="queryInfo.size"
class="pagination"
@pagination="getPickingList"
/>
@ -103,21 +97,17 @@ export default {
btndisabled: false,
isSearchShow: false,
queryInfo: {
query: '',
pageNum: 1,
pageSize: 10
},
total: 0,
current: 1,
size: 10,
params: {
no:''
}
},
total: 0,
user: '',
pickingList: [],
btnList: [
{
type: 'success',
size: 'small',
icon: 'submit',
btnKey: 'finish',
btnLabel: '完成拣货'
},
{
type: 'info',
size: 'small',
@ -131,12 +121,6 @@ export default {
methods: {
btnHandle(btnKey) {
switch (btnKey) {
case 'finish':
this.finish()
break
case 'cancel':
this.cancel()
break
case 'doClose': //
this.doClose()
break
@ -146,55 +130,40 @@ export default {
},
resetQuery() {
this.queryInfo={
query: '',
pageNum: 1,
pageSize: 10
total: 0,
current: 1,
size: 10,
params: {
no:''
}
},
this.getPickingList()
},
handleSizeChange (val) {
this.queryInfo.pageSize = val
this.getPickingList()
},
handleCurrentChange (val) {
this.queryInfo.pageNum = val
this.getPickingList()
},
handleSelectionChange (val) {
this.selectList = val
indexMethod(index) {
var pagestart = (this.queryInfo.current - 1) * this.queryInfo.size
var pageindex = index + 1 + pagestart
return pageindex
},
async getPickingList () {
const { data: result } = await this.$http.get('/picking/list', { params: this.queryInfo })
if (result.status !== 200) return this.$message.error('获取列表失败')
this.total = result.data.total
this.pickingList = result.data.rows
},
const { data: result } = await this.$http.post('/picking/listPage', this.queryInfo )
if (result.code == 200){
this.queryInfo.total = result.data.total
this.pickingList = result.data.records
async finish () {
for (var i = 0; i < this.selectList.length; i++) {
if (this.selectList[i].status === '拣货中') {
this.selectList[i].status = '已完成'
const { data: result } = await this.$http.put('/picking/finish', this.selectList[i])
this.$message.success('订单' + this.selectList[i].outStorehouseId + '拣货成功')
} else if (this.selectList[i].status === '待拣货') {
this.$message.error('订单' + this.selectList[i].outStorehouseId + '未被领取')
} else {
this.$message.error('订单' + this.selectList[i].outStorehouseId + '已完成')
}
}
},
formatorderdegree: function( row, column) {
if(row.state === '1'){
return '未拣货'
} else if(row.state === '2') {
return '已拣货'
} else{
return ''
}
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
},
cancel(){
},
open(row){
}
},

Loading…
Cancel
Save