|
|
|
@ -5,7 +5,7 @@ |
|
|
|
<div>{{ viewTitle }}</div> |
|
|
|
<div> |
|
|
|
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate()">保存</el-button> |
|
|
|
<el-button type="primary" size="small" :disabled="submitdisabled" @click="settle()">调拨</el-button> |
|
|
|
<el-button type="primary" size="small" :disabled="submitdisabled" @click="confirm()">调拨</el-button> |
|
|
|
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
@ -70,20 +70,20 @@ |
|
|
|
<el-table-column prop="goodsSkuCode" label="商品编码" align="center" /> |
|
|
|
<el-table-column prop="goodsSkuOwnSpec" label="型号" align="center" /> |
|
|
|
<el-table-column prop="unit" label="单位" align="center" /> |
|
|
|
<el-table-column prop="warehouseName" label="仓库" align="center" /> |
|
|
|
<el-table-column prop="warehouseArea" label="库位" align="center" /> |
|
|
|
<el-table-column prop="warehouseName" label="仓库" width="150" align="center" /> |
|
|
|
<el-table-column prop="warehouseRackCode" label="库位" align="center" /> |
|
|
|
<el-table-column prop="stockCount" label="库存数量" align="center" /> |
|
|
|
<el-table-column label="调入仓库" align="center"> |
|
|
|
<el-table-column label="调入仓库" align="center" width="200"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<el-select v-model="scope.row.inWarehouseName" placeholder="请选择" @change="selectWarehouseName"> |
|
|
|
<el-select v-model="scope.row.inWarehouseName" placeholder="请选择" @change="selectWarehouseName(scope.row,$event)"> |
|
|
|
<el-option v-for="(item,i) in warehouseList" :key="i" :label="item.warehouseName" :value="item.sid"> |
|
|
|
</el-option> |
|
|
|
</el-select> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column label="调入库位" align="center"> |
|
|
|
<el-table-column label="调入库位" align="center" width="120"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<el-select v-model="scope.row.inWarehouseRackCode" placeholder="请选择" @change="selectWarehouseAreaCode"> |
|
|
|
<el-select v-model="scope.row.inWarehouseRackCode" placeholder="请选择" @change="selectWarehouseAreaCode(scope.row,$event)"> |
|
|
|
<el-option v-for="(item,i) in warehouseRackList" :key="i" :label="item.areaCode" :value="item.sid"> |
|
|
|
</el-option> |
|
|
|
</el-select> |
|
|
|
@ -117,6 +117,10 @@ |
|
|
|
|
|
|
|
<script> |
|
|
|
import req from '@/api/storage/allocation.js' |
|
|
|
import { |
|
|
|
getOrgSidByPath, |
|
|
|
selectOrgSidList, |
|
|
|
} from '@/api/Common/dictcommons' |
|
|
|
export default { |
|
|
|
data() { |
|
|
|
return { |
|
|
|
@ -146,7 +150,8 @@ |
|
|
|
"billNo": "", |
|
|
|
"createBySid": window.sessionStorage.getItem('userSid'), |
|
|
|
"createDate": "", |
|
|
|
"createUserSid":window.sessionStorage.getItem('userSid'), |
|
|
|
"createUserSid": window.sessionStorage.getItem('userSid'), |
|
|
|
"createByName": window.sessionStorage.getItem('name'), |
|
|
|
"outOrgSid": "", |
|
|
|
"inOrgSid": "", |
|
|
|
"count": "", |
|
|
|
@ -154,32 +159,11 @@ |
|
|
|
"confirmSid": "", |
|
|
|
"confirmName": "", |
|
|
|
"finishTime": "", |
|
|
|
"useOrgSid": window.sessionStorage.getItem('orgSid'), |
|
|
|
"createOrgName": window.sessionStorage.getItem('Orgname'), |
|
|
|
"useOrgSid": '', |
|
|
|
"wmsInventoryAllocateBillDetailNewList": [] |
|
|
|
}, |
|
|
|
rules: {}, |
|
|
|
orgList: [{ |
|
|
|
name: "撒记得", |
|
|
|
sid: "123" |
|
|
|
}, |
|
|
|
{ |
|
|
|
name: "阿萨德", |
|
|
|
sid: "12323" |
|
|
|
}, |
|
|
|
{ |
|
|
|
name: "我饿请问请问", |
|
|
|
sid: "23423" |
|
|
|
}, |
|
|
|
{ |
|
|
|
name: "特尔味道", |
|
|
|
sid: "1234" |
|
|
|
}, |
|
|
|
{ |
|
|
|
name: "提问额外撒大声地", |
|
|
|
sid: "12324233" |
|
|
|
} |
|
|
|
], |
|
|
|
orgList: [], |
|
|
|
warehouseList: [], |
|
|
|
warehouseRackList: [] |
|
|
|
} |
|
|
|
@ -260,15 +244,46 @@ |
|
|
|
} |
|
|
|
}) |
|
|
|
}, |
|
|
|
selectWarehouseName(val) { |
|
|
|
selectWarehouseName(row,val) { |
|
|
|
console.log("selectWarehouseName", row); |
|
|
|
console.log("selectWarehouseName", val); |
|
|
|
|
|
|
|
const choose = this.warehouseList.filter((item) => item.sid == val) |
|
|
|
console.log('>>>>>>>>>selectInOrg', choose) |
|
|
|
row.inWarehouseSid= choose[0].sid |
|
|
|
row.inWarehouseName = choose[0].warehouseName |
|
|
|
|
|
|
|
this.getWarehouseAreaList(val) |
|
|
|
}, |
|
|
|
selectWarehouseAreaCode(val) { |
|
|
|
selectWarehouseAreaCode(row,val) { |
|
|
|
console.log("selectWarehouseAreaCode", row); |
|
|
|
console.log("selectWarehouseAreaCode", val); |
|
|
|
|
|
|
|
const choose = this.warehouseRackList.filter((item) => item.sid == val) |
|
|
|
console.log('>>>>>>>>>selectInOrg', choose) |
|
|
|
row.inWarehouseRackSid = choose[0].sid |
|
|
|
row.inWarehouseRackCode = choose[0].areaCode |
|
|
|
|
|
|
|
}, |
|
|
|
showAdd() { |
|
|
|
getOrgSidByPath({ |
|
|
|
orgPath: window.sessionStorage.getItem('defaultOrgPath') |
|
|
|
}).then((res) => { |
|
|
|
if (res.success) { |
|
|
|
this.formobj.createOrgSid = res.data |
|
|
|
this.formobj.useOrgSid = res.data |
|
|
|
} |
|
|
|
}) |
|
|
|
|
|
|
|
|
|
|
|
selectOrgSidList().then((res) => { |
|
|
|
if (res.success) { |
|
|
|
console.log("selectOrgSidList", res); |
|
|
|
this.orgList = res.data |
|
|
|
} |
|
|
|
}) |
|
|
|
|
|
|
|
|
|
|
|
this.viewTitle = '【新增】调拨记录' |
|
|
|
this.$nextTick(() => { |
|
|
|
this.$refs['form_obj'].clearValidate() |
|
|
|
@ -276,6 +291,25 @@ |
|
|
|
this.getWarehouseList() |
|
|
|
}, |
|
|
|
showEdit(row) { |
|
|
|
|
|
|
|
getOrgSidByPath({ |
|
|
|
orgPath: window.sessionStorage.getItem('defaultOrgPath') |
|
|
|
}).then((res) => { |
|
|
|
if (res.success) { |
|
|
|
this.formobj.createOrgSid = res.data |
|
|
|
this.formobj.useOrgSid = res.data |
|
|
|
} |
|
|
|
}) |
|
|
|
|
|
|
|
|
|
|
|
selectOrgSidList().then((res) => { |
|
|
|
if (res.success) { |
|
|
|
console.log("selectOrgSidList", res); |
|
|
|
this.orgList = res.data |
|
|
|
} |
|
|
|
}) |
|
|
|
|
|
|
|
|
|
|
|
this.viewTitle = '【修改】调拨记录' |
|
|
|
this.$nextTick(() => { |
|
|
|
this.$refs['form_obj'].clearValidate() |
|
|
|
@ -284,8 +318,8 @@ |
|
|
|
if (res.success) { |
|
|
|
this.formobj = res.data |
|
|
|
|
|
|
|
this.commodityQuery.params.inOrg = this.formobj.inOrgName |
|
|
|
this.commodityQuery.params.outOrg = this.formobj.outOrgName |
|
|
|
this.commodityQuery.params.inOrg = this.formobj.inOrgName |
|
|
|
this.commodityQuery.params.outOrg = this.formobj.outOrgName |
|
|
|
} |
|
|
|
}) |
|
|
|
this.getWarehouseList() |
|
|
|
@ -320,8 +354,8 @@ |
|
|
|
"unit": "", |
|
|
|
"warehouseSid": "", |
|
|
|
"warehouseName": "", |
|
|
|
"warehouseAreasid": "", |
|
|
|
"warehouseArea": "", |
|
|
|
"warehouseRackSid": "", |
|
|
|
"warehouseRackCode": "", |
|
|
|
"taxPrice": "", |
|
|
|
"stockCount": "", |
|
|
|
"inWarehouseSid": "", |
|
|
|
@ -358,20 +392,25 @@ |
|
|
|
row.unit = value.unit |
|
|
|
row.warehouseName = value.warehouseName |
|
|
|
row.warehouseSid = value.warehouseSid |
|
|
|
row.warehouseArea = value.warehouseRackCode |
|
|
|
row.warehouseAreasid = value.warehouseRackSid |
|
|
|
row.warehouseRackCode = value.warehouseRackCode |
|
|
|
row.warehouseRackSid = value.warehouseRackSid |
|
|
|
row.taxPrice = value.taxPrice |
|
|
|
row.stockCount = value.count |
|
|
|
row.count = '' |
|
|
|
row.amount = '' |
|
|
|
// row.count = '' |
|
|
|
// row.amount = '' |
|
|
|
document.body.click() |
|
|
|
this.commodityComputeYHAndXSJE(row, row.count) |
|
|
|
|
|
|
|
}, |
|
|
|
// 计算优惠、销售金额 |
|
|
|
commodityComputeYHAndXSJE(row, val) { |
|
|
|
|
|
|
|
console.log("aaaaaaaaa", row); |
|
|
|
console.log("aaaaaaaaa", val); |
|
|
|
Number() |
|
|
|
|
|
|
|
|
|
|
|
row.count = val |
|
|
|
|
|
|
|
if (Number(row.stockCount) < Number(row.count)) { |
|
|
|
row.count = '' |
|
|
|
row.amount = '' |
|
|
|
@ -411,12 +450,12 @@ |
|
|
|
this.$refs['form_obj'].validate((valid) => { |
|
|
|
if (valid) { |
|
|
|
this.submitdisabled = true |
|
|
|
req.settlement(this.formobj).then((res) => { |
|
|
|
req.allocation(this.formobj).then((res) => { |
|
|
|
if (res.success) { |
|
|
|
this.$message({ |
|
|
|
showClose: true, |
|
|
|
type: 'success', |
|
|
|
message: '结算成功' |
|
|
|
message: '调拨成功' |
|
|
|
}) |
|
|
|
this.handleReturn('true') |
|
|
|
} else { |
|
|
|
@ -431,21 +470,21 @@ |
|
|
|
handleReturn(isreload) { |
|
|
|
if (isreload === 'true') this.$emit('reloadlist') |
|
|
|
this.formobj = { |
|
|
|
"sid": "", |
|
|
|
"billNo": "", |
|
|
|
"createBySid": "", |
|
|
|
"createDate": "", |
|
|
|
"createUserSid": "", |
|
|
|
"outOrgSid": "", |
|
|
|
"inOrgSid": "", |
|
|
|
"count": "", |
|
|
|
"amount": "", |
|
|
|
"confirmSid": "", |
|
|
|
"confirmName": "", |
|
|
|
"finishTime": "", |
|
|
|
"useOrgSid": "", |
|
|
|
"createOrgName": "", |
|
|
|
"wmsInventoryAllocateBillDetailNewList": [] |
|
|
|
"sid": "", |
|
|
|
"billNo": "", |
|
|
|
"createBySid": window.sessionStorage.getItem('userSid'), |
|
|
|
"createDate": "", |
|
|
|
"createUserSid": window.sessionStorage.getItem('userSid'), |
|
|
|
"createByName": window.sessionStorage.getItem('name'), |
|
|
|
"outOrgSid": "", |
|
|
|
"inOrgSid": "", |
|
|
|
"count": "", |
|
|
|
"amount": "", |
|
|
|
"confirmSid": "", |
|
|
|
"confirmName": "", |
|
|
|
"finishTime": "", |
|
|
|
"useOrgSid": '', |
|
|
|
"wmsInventoryAllocateBillDetailNewList": [] |
|
|
|
} |
|
|
|
this.commodityQuery.params.inOrg = '' |
|
|
|
this.commodityQuery.params.outOrg = '' |
|
|
|
|
