Browse Source

完善调拨

master
guoxing 10 months ago
parent
commit
c88176ffcd
  1. 20
      yxt-as-ui/src/api/Common/dictcommons.js
  2. 54
      yxt-as-ui/src/api/storage/allocation.js
  3. 17
      yxt-as-ui/src/views/storage/adjustment/relation/editPriceStrategy.vue
  4. 390
      yxt-as-ui/src/views/storage/allocation/allocationAdd.vue
  5. 198
      yxt-as-ui/src/views/storage/allocation/allocationInfo.vue
  6. 465
      yxt-as-ui/src/views/storage/allocation/index.vue
  7. 14
      yxt-as-ui/src/views/storage/deliveryNotice/receiptAdd.vue

20
yxt-as-ui/src/api/Common/dictcommons.js

@ -26,6 +26,15 @@ export function selectOrgSidList(data) {
})
}
// 获取分公司
export function getListOrg(data) {
return request({
url: '/portal/v1/sysorganization/getListOrg',
method: 'get',
params: data
})
}
// 根据当前登录人orgSidPath(全路径sid)查询分公司
export function getOrgSidByPath(data) {
@ -39,11 +48,20 @@ export function getOrgSidByPath(data) {
// 根据分公司sid查询分公司名称
export function fetchBySid(sid) {
return request({
url: 'portal/v1/sysorganization/fetchBySid/' + sid,
url: '/portal/v1/sysorganization/fetchBySid/' + sid,
method: 'get'
})
}
// 根据分公司Sid获取分公司下所有的部门
export function getListDeptByOrgSid(data) {
return request({
url: '/portal/v1/sysorganization/getListDeptByOrgSid/' + data,
method: 'GET'
})
}
// 根据当前登录用户sid获取本分公司下的销售部门和销售专员
export function selectOrgList(data) {
return request({

54
yxt-as-ui/src/api/storage/allocation.js

@ -8,17 +8,43 @@ export default {
url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/listPage',
method: 'post',
data: params,
headers: { 'Content-Type': 'application/json' }
headers: {
'Content-Type': 'application/json'
}
})
},
deleteBySids: function(data) {
return request({
url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/delBySids',
method: 'DELETE',
data: data,
headers: {
'Content-Type': 'application/json'
}
})
},
// 保存物流信息
saveLogisticsInfo: function(data) {
return request({
url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/saveLogisticsInfo',
method: 'post',
data: data,
headers: {
'Content-Type': 'application/json'
}
});
},
// 新增、保存
save: function(data) {
return request({
url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/save',
method: 'post',
data: data,
headers: { 'Content-Type': 'application/json' }
headers: {
'Content-Type': 'application/json'
}
});
},
@ -36,7 +62,9 @@ export default {
url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/allocation',
method: 'post',
data: data,
headers: { 'Content-Type': 'application/json' }
headers: {
'Content-Type': 'application/json'
}
});
},
@ -47,7 +75,9 @@ export default {
url: '/wms/apiadmin/inventory/wmsinventory/alloGoodsListPage',
method: 'post',
data: params,
headers: { 'Content-Type': 'application/json' }
headers: {
'Content-Type': 'application/json'
}
})
},
@ -55,12 +85,12 @@ export default {
getWarehouses: function(params) {
return request({
url: '/wms/apiadmin/base/wmswarehouseinfo/listAll',
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json'
}
})
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json'
}
})
},
@ -70,7 +100,9 @@ export default {
url: '/wms/apiadmin/base/wmswarehousearea/selectAll',
method: 'get',
params: data,
headers: { 'Content-Type': 'application/json' }
headers: {
'Content-Type': 'application/json'
}
});
},

17
yxt-as-ui/src/views/storage/adjustment/relation/editPriceStrategy.vue

@ -40,7 +40,8 @@
<el-col :span="24">
<div class="span-sty"><span class="must">*</span> 加价比例(%)</div>
<el-form-item>
<el-input v-model="formobj.gdMarkupRate" placeholder="" class="addinputw addinputInfo" clearable @input="gdMarkupRateInput"
<el-input v-model="formobj.gdMarkupRate" placeholder="" class="addinputw addinputInfo" clearable
@input="gdMarkupRateInput"
oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
</el-form-item>
</el-col>
@ -66,7 +67,7 @@
<el-table-column label="区间开始" align="center">
<template slot-scope="scope">
<el-input ref="focusAssumptionInput" v-model="scope.row.rangeStart" clearable placeholder=""
oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
</template>
</el-table-column>
@ -74,7 +75,7 @@
<el-table-column label="区间截止" align="center">
<template slot-scope="scope">
<el-input ref="focusAssumptionInput" v-model="scope.row.rangeEnd" clearable placeholder=""
oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
</template>
</el-table-column>
@ -82,7 +83,7 @@
<el-table-column label="加价比例(%)" align="center">
<template slot-scope="scope">
<el-input ref="focusAssumptionInput" v-model="scope.row.markupRate" clearable placeholder=""
oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
</template>
</el-table-column>
@ -133,9 +134,9 @@
}
},
methods: {
gdMarkupRateInput(val){
console.log("gdMarkupRateInput》》》》", val)
console.log("gdMarkupRateInput》》》》", this.formobj.gdMarkupRate)
gdMarkupRateInput(val) {
console.log("gdMarkupRateInput》》》》", val)
console.log("gdMarkupRateInput》》》》", this.formobj.gdMarkupRate)
},
indexMethod(index) {
return index + 1
@ -151,7 +152,7 @@
this.$message({
showClose: true,
type: 'error',
message: '加价比例不能为空222'
message: '加价比例不能为空'
})
return

390
yxt-as-ui/src/views/storage/allocation/allocationAdd.vue

@ -10,8 +10,9 @@
</div>
</div>
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<div style="display: flex;flex-direction: row;align-items: center;padding: 10px;">
<!-- <div style="display: flex;flex-direction: row;align-items: center;padding: 10px;">
<div>
<span>调出门店</span>
@ -28,17 +29,76 @@
</el-select>
</div>
</div>
</div> -->
<div
style="display: flex;flex-direction: row;align-items: center;justify-content: space-between;padding: 10px;">
<div>商品列表</div>
<div v-if="formobj.billNo!=''">单号{{formobj.billNo}}</div>
</div>
<el-row class="first_row">
<el-col :span="8">
<div class="span-sty">申请人</div>
<el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请部门</div>
<el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请日期</div>
<el-form-item> <el-date-picker v-model="formobj.createTime" type="date" class="addinputw addinputInfo"
value-format="yyyy-MM-dd" placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">调出站</div>
<el-form-item><span class="addinputInfo">{{ formobj.outPlatName }}</span></el-form-item>
</el-col>
<el-col :span="5">
<div class="span-sty">调入站</div>
<el-form-item> <el-select v-model="formobj.inOrgName" placeholder="请选择分公司" @change="selectInOrg"
class="addinputInfo">
<el-option v-for="(item,i) in orgList" :key="i" :label="item.name" :value="item.sid">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="3">
<el-form-item> <el-select v-model="formobj.inPlatName" placeholder="请选择调入站" @change="selectInDeptName"
style="width:100%">
<el-option v-for="(item,i) in deptList" :key="i" :label="item.name" :value="item.sid">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">经办人</div>
<el-form-item> <el-select v-model="formobj.confirmName" placeholder="请选择经办人" clearable
@change="selectOperatorName" class="addinputInfo addinputw">
<el-option v-for="(item,i) in operatorNameList" :key="i" :label="item.name" :value="item.sid">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item> <el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo"
type="textarea" :rows="4" clearable /></el-form-item>
</el-col>
</el-row>
<div class="title titleOne">
<div>调拨商品列表</div>
</div>
<el-table :key="commodityKey" :data="formobj.wmsInventoryAllocateBillDetailNewList" :index="index" border
style="width: 100%;">
style="width: 100%;" show-summary :summary-method="getSummaries">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
<el-table-column align="center" width="70" :render-header="commodityHeader">
<template slot-scope="scope">
@ -72,10 +132,12 @@
<el-table-column prop="unit" 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="warehouseRackCode" label="单价" align="center" />
<el-table-column prop="stockCount" 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(scope.row,$event)">
<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>
@ -83,14 +145,15 @@
</el-table-column>
<el-table-column label="调入库位" align="center" width="120">
<template slot-scope="scope">
<el-select v-model="scope.row.inWarehouseRackCode" placeholder="请选择" @change="selectWarehouseAreaCode(scope.row,$event)">
<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>
</template>
</el-table-column>
<el-table-column label="调拨数量" align="center">
<el-table-column prop="count" label="调拨数量" align="center">
<template slot-scope="scope">
<el-input @input="commodityComputeYHAndXSJE(scope.row,$event)" v-model="scope.row.count" clearable
placeholder="" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
@ -98,7 +161,7 @@
</el-table-column>
<el-table-column prop="amount" label="调拨金额" align="center" width="100" />
</el-table>
<el-row>
<!-- <el-row>
<el-col :span="24">
<el-form-item><span>调拨数量{{ totalQuantity }} , 调拨金额{{ materialCost }}</span></el-form-item>
</el-col>
@ -108,7 +171,7 @@
<el-col :span="23">
<el-form-item><el-input v-model="formobj.remarks" clearable placeholder="请填写备注..." /></el-form-item>
</el-col>
</el-row>
</el-row> -->
</el-form>
</div>
</div>
@ -118,8 +181,14 @@
<script>
import req from '@/api/storage/allocation.js'
import {
getCurrentDate
} from '@/utils/index.js'
import {
fetchBySid,
getOrgSidByPath,
selectOrgSidList,
getListDeptByOrgSid,
selAllByOrgSidPath
} from '@/api/Common/dictcommons'
export default {
data() {
@ -127,7 +196,6 @@
viewTitle: '',
viewState: 1,
submitdisabled: false,
settleVisible: false, //
activeNames: '1',
index: 0,
@ -140,30 +208,39 @@
total: 0,
params: {
name: '',
inOrg: "",
outOrg: ""
}
},
commodityData: [],
formobj: {
"sid": "",
"billNo": "",
"useOrgSid": "",
"createBySid": window.sessionStorage.getItem('userSid'),
"createDate": "",
"createUserSid": window.sessionStorage.getItem('userSid'),
"createByName": window.sessionStorage.getItem('name'),
"outOrgSid": "",
"deptName": window.sessionStorage.getItem('defaultOrgPathName').substring(window
.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
"deptSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
.getItem('defaultOrgPath').lastIndexOf('/') + 1),
"createTime": getCurrentDate(),
"outOrgName": "",
"outOrgSid": '',
"outPlatName": window.sessionStorage.getItem('defaultOrgPathName').substring(window
.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
"outPlatSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
.getItem('defaultOrgPath').lastIndexOf('/') + 1),
"inOrgName": "",
"inOrgSid": "",
"count": "",
"amount": "",
"confirmSid": "",
"inPlatName": "",
"inPlatSid": "",
"confirmName": "",
"finishTime": "",
"useOrgSid": '',
"confirmSid": "",
"remarks": "",
"wmsInventoryAllocateBillDetailNewList": []
},
rules: {},
orgList: [],
deptList: [],
operatorNameList: [],
warehouseList: [],
warehouseRackList: []
}
@ -198,27 +275,40 @@
},
methods: {
selectInOrg(val) {
console.log("selectInOrg", val);
init() {
getOrgSidByPath({
orgPath: window.sessionStorage.getItem('defaultOrgPath')
}).then((res) => {
if (res.success) {
this.formobj.outOrgSid = res.data
this.formobj.useOrgSid = res.data
const choose = this.orgList.filter((item) => item.sid == val)
console.log('>>>>>>>>>selectInOrg', choose)
this.formobj.inOrgSid = choose[0].sid
this.formobj.inOrgName = choose[0].name
},
fetchBySid(res.data).then((res) => {
if (res.success) {
this.formobj.outOrgName = res.data
}
})
selectOutOrg(val) {
console.log("selectOutOrg", val);
this.formobj.inOrgSid = val
}
})
const choose = this.orgList.filter((item) => item.sid == val)
console.log('>>>>>>>>>selectOutOrg', choose)
this.formobj.outOrgSid = choose[0].sid
this.formobj.outOrgName = choose[0].name
},
selectOrgSidList().then((res) => {
if (res.success) {
console.log("selectOrgSidList", res);
this.orgList = res.data
}
})
selAllByOrgSidPath({
orgSidPath: window.sessionStorage.getItem('defaultOrgPath')
}).then((res) => {
if (res.success) {
console.log("selAllByOrgSidPath", res);
this.operatorNameList = res.data
}
})
getWarehouseList() {
var parpams = {
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
}
@ -230,7 +320,84 @@
}
})
},
//
getSummaries(param) {
const {
columns,
data
} = param
const sums = []
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '合计'
return
}
const values = data.map(item => Number(item[column.property]))
if (column.property === 'count') {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return prev + curr
} else {
return prev
}
}, 0)
sums[index] += ''
} else if (column.property === 'amount') {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return prev + curr
} else {
return prev
}
}, 0)
sums[index] += ''
}
})
return sums
},
selectInOrg(val) {
console.log("selectInOrg", val);
const choose = this.orgList.filter((item) => item.sid == val)
console.log('>>>>>>>>>selectInOrg', choose)
this.formobj.inOrgSid = choose[0].sid
this.formobj.inOrgName = choose[0].name
getListDeptByOrgSid(choose[0].sid).then((res) => {
if (res.success) {
this.formobj.inDeptSid = ''
this.formobj.inDeptName = ''
console.log("getListDeptByOrgSid", res);
this.deptList = res.data
}
})
},
selectInDeptName(val) {
console.log("selectInDeptName", val);
const choose = this.deptList.filter((item) => item.sid == val)
console.log('>>>>>>>>>selectInDeptName', choose)
this.formobj.inPlatSid = choose[0].sid
this.formobj.inPlatName = choose[0].name
},
selectOperatorName(val) {
console.log("selectOperatorName", val);
const choose = this.operatorNameList.filter((item) => item.sid == val)
console.log('>>>>>>>>>selectOutOrg', choose)
this.formobj.confirmSid = choose[0].sid
this.formobj.confirmName = choose[0].name
},
getWarehouseAreaList(sid) {
var query = {
ckSid: sid
@ -244,85 +411,51 @@
}
})
},
selectWarehouseName(row,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
row.inWarehouseSid = choose[0].sid
row.inWarehouseName = choose[0].warehouseName
row.inWarehouseRackSid = ''
row.inWarehouseRackCode = ''
this.getWarehouseAreaList(val)
},
selectWarehouseAreaCode(row,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
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.init(),
this.viewTitle = '【新增】调拨记录'
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
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
}
})
showEdit(sid) {
this.init()
this.viewTitle = '【修改】调拨记录'
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
req.init(row.sid).then((res) => {
req.init(sid).then((res) => {
if (res.success) {
this.formobj = res.data
this.commodityQuery.params.inOrg = this.formobj.inOrgName
this.commodityQuery.params.outOrg = this.formobj.outOrgName
}
})
this.getWarehouseList()
},
//
commodityHeader(h, {
@ -470,26 +603,32 @@
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.formobj = {
"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": []
"sid": "",
"billNo": "",
"useOrgSid": "",
"createBySid": window.sessionStorage.getItem('userSid'),
"createByName": window.sessionStorage.getItem('name'),
"deptName": window.sessionStorage.getItem('defaultOrgPathName').substring(window
.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
"deptSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
.getItem('defaultOrgPath').lastIndexOf('/') + 1),
"createTime": getCurrentDate(),
"outOrgName": "",
"outOrgSid": '',
"outPlatName": window.sessionStorage.getItem('defaultOrgPathName').substring(window
.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
"outPlatSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
.getItem('defaultOrgPath').lastIndexOf('/') + 1),
"inOrgName": "",
"inOrgSid": "",
"inPlatName": "",
"inPlatSid": "",
"confirmName": "",
"confirmSid": "",
"remarks": "",
"wmsInventoryAllocateBillDetailNewList": []
}
this.commodityQuery.params.inOrg = ''
this.commodityQuery.params.outOrg = ''
this.submitdisabled = false
this.settleVisible = false
this.$emit('doback')
}
}
@ -497,16 +636,47 @@
</script>
<style scoped>
/deep/ .el-form-item__error {
margin-left: 120px !important;
}
.must {
color: #f00;
}
.span-sty {
width: 130px !important;
width: 100px !important;
}
.addinputInfo {
margin-left: 120px !important;
margin-left: 90px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
margin-left: 120px !important;
width: calc(100% - 115px);
margin-left: 90px !important;
width: calc(100% - 80px);
}
.first_row {
border-top: 1px solid #E0E3EB;
}
.titleOne {
padding: 7px;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
/deep/ .el-form-item__error {
margin-left: 180px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .el-radio-group {
display: inline;
line-height: 1px;
vertical-align: middle;
}
</style>

198
yxt-as-ui/src/views/storage/allocation/allocationInfo.vue

@ -0,0 +1,198 @@
<template>
<div class="app-container">
<div class="tab-header webtop">
<div>调拨详情</div>
<div>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
</div>
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" class="formaddcopy02">
<el-row class="first_row">
<el-col :span="8">
<div class="span-sty">申请人</div>
<el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请部门</div>
<el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.createTimeoutOrgName }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">调出站</div>
<el-form-item><span class="addinputInfo">{{ formobj.outPlatName }}</span></el-form-item>
</el-col>
<el-col :span="5">
<div class="span-sty">调入站</div>
<el-form-item><span class="addinputInfo">{{ formobj.inOrgName }}</span></el-form-item>
</el-col>
<el-col :span="3">
<el-form-item><span class="addinputInfo">{{ formobj.inPlatName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">经办人</div>
<el-form-item><span class="addinputInfo">{{ formobj.confirmName }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
<div class="title titleOne">
<div>调拨商品列表</div>
</div>
<el-table :data="formobj.wmsInventoryAllocateBillDetailNewList" :index="index" border style="width: 100%;"
show-summary :summary-method="getSummaries">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
<el-table-column prop="goodsSpuName" label="商品名称" align="center" />
<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="仓库" width="150" align="center" />
<el-table-column prop="warehouseRackCode" label="库位" align="center" />
<el-table-column prop="warehouseRackCode" label="单价" align="center" />
<el-table-column prop="stockCount" label="库存数量" align="center" />
<el-table-column prop="inWarehouseName" label="调入仓库" align="center" />
<el-table-column prop="inWarehouseRackCode" label="调入库位" align="center" />
<el-table-column prop="count" label="调拨数量" align="center" />
<el-table-column prop="amount" label="调拨金额" align="center" width="100" />
</el-table>
</el-form>
</div>
</div>
</template>
<script>
import req from '@/api/storage/allocation.js'
export default {
data() {
return {
index: 0,
formobj: {},
}
},
methods: {
//
getSummaries(param) {
const {
columns,
data
} = param
const sums = []
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '合计'
return
}
const values = data.map(item => Number(item[column.property]))
if (column.property === 'count') {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return prev + curr
} else {
return prev
}
}, 0)
sums[index] += ''
} else if (column.property === 'amount') {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return prev + curr
} else {
return prev
}
}, 0)
sums[index] += ''
}
})
return sums
},
showAdd(sid) {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
req.init(sid).then((res) => {
if (res.success) {
this.formobj = res.data
}
})
},
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.formobj = {
}
this.$emit('doback')
}
}
}
</script>
<style scoped>
/deep/ .el-form-item__error {
margin-left: 120px !important;
}
.must {
color: #f00;
}
.span-sty {
width: 130px !important;
}
.addinputInfo {
margin-left: 120px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
margin-left: 120px !important;
width: calc(100% - 115px);
}
.first_row {
border-top: 1px solid #E0E3EB;
}
.titleOne {
padding: 7px;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
/deep/ .el-form-item__error {
margin-left: 180px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .el-radio-group {
display: inline;
line-height: 1px;
vertical-align: middle;
}
</style>

465
yxt-as-ui/src/views/storage/allocation/index.vue

@ -10,25 +10,48 @@
<div v-show="isSearchShow" class="search">
<el-form :inline="true" class="tab-header">
<el-form-item label="开始日期">
<el-date-picker v-model="queryParams.params.createDateStart" @change="selectTime1" type="date"
placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
<el-form-item label="申请部门">
<el-input v-model="queryParams.params.deptName" placeholder="" clearable />
</el-form-item>
<el-form-item label="申请人">
<el-input v-model="queryParams.params.createByName" placeholder="" clearable />
</el-form-item>
<el-form-item label="单据编号">
<el-input v-model="queryParams.params.billNo" placeholder="" clearable />
</el-form-item>
<el-form-item label="单据日期">
<el-date-picker v-model="queryParams.params.createStartTime" type="date" placeholder="选择日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
</el-date-picker>
<el-date-picker v-model="queryParams.params.createDateStart" type="date" placeholder="选择日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
</el-date-picker>
</el-form-item>
<el-form-item label="结束日期">
<el-date-picker v-model="queryParams.params.createDateEnd" @change="selectTime2" type="date"
placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
<el-form-item label="办结日期">
<el-date-picker v-model="queryParams.params.finishStartTime" type="date" placeholder="选择日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
</el-date-picker>
<el-date-picker v-model="queryParams.params.finishEndTime" type="date" placeholder="选择日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
</el-date-picker>
</el-form-item>
<!-- <el-form-item label="单据编号">
<el-input v-model="queryParams.params.billNo" placeholder="" clearable />
<el-form-item label="调出分公司">
<el-input v-model="queryParams.params.outOrgName" placeholder="" clearable />
</el-form-item>
<el-form-item label="制单人">
<el-input v-model="queryParams.params.createByName" placeholder="" clearable />
<el-form-item label="调出站">
<el-input v-model="queryParams.params.outPlatName" placeholder="" clearable />
</el-form-item>
<el-form-item label="调入分公司">
<el-input v-model="queryParams.params.inOrgName" placeholder="" clearable />
</el-form-item>
<el-form-item label="调入站">
<el-input v-model="queryParams.params.inPlatName" placeholder="" clearable />
</el-form-item>
<el-form-item label="经办人">
<el-input v-model="queryParams.params.confirmName" placeholder="" clearable />
</el-form-item>
<el-form-item label="库管操作人">
<el-input v-model="queryParams.params.warehouseManager" placeholder="" clearable />
</el-form-item> -->
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button>
@ -47,21 +70,29 @@
@selection-change="selectionLineChangeHandle">
<el-table-column fixed width="50" type="selection" align="center" />
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column fixed label="操作" align="center" width="150">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="toRelevancy(scope.row)">办理</el-button>
<el-button type="primary" size="mini" @click="toDetails(scope.row)">查看</el-button>
</template>
</el-table-column>
<el-table-column prop="billNo" label="单据编号" align="center" />
<el-table-column prop="createDate" label="单据日期" align="center" />
<el-table-column prop="createByName" label="制单人姓名" align="center" />
<el-table-column prop="createByName" label="申请人" align="center" />
<el-table-column prop="createTime" label="申请日期" align="center" />
<!-- <el-table-column prop="state" label="完成标志" align="center" /> -->
<el-table-column label="完成标志" align="center" width="180">
<!-- <el-table-column label="完成标志" align="center" width="180">
<template slot-scope="scope">
<span>{{scope.row.state=='1'?'未完成':'已完成'}}</span>
</template>
</el-table-column>
<el-table-column prop="finishTime" label="完成时间" align="center" />
<el-table-column prop="outOrgName" label="调出门店" align="center" />
<el-table-column prop="inOrgName" label="调入门店" align="center" />
</el-table-column> -->
<el-table-column prop="finishTime" label="办结日期" align="center" />
<el-table-column prop="createOrgName" label="调出分公司" align="center" />
<el-table-column prop="outPlatName" label="调出站" align="center" />
<el-table-column prop="inOrgName" label="调入分公司" align="center" />
<el-table-column prop="inPlatName" label="调入站" align="center" />
<el-table-column prop="confirmName" label="经办人" align="center" />
<el-table-column prop="count" label="调拨数量" align="center" />
<el-table-column prop="amount" label="调拨金额" align="center" />
<el-table-column prop="createOrgName" label="门店" align="center" />
</el-table>
</div>
<!-- End 项目列表 -->
@ -76,6 +107,90 @@
<!-- End 查询和其列表部分 -->
<!-- 新增修改部分组件 -->
<divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
<divInfo v-show="viewState == 4" ref="divinfo" @doback="resetState" @reloadlist="loadList" />
<el-dialog title="补充物流信息" :visible.sync="dialogVisible" :before-close="handleClose"
style="width:120%;margin-left: -10%;">
<el-form ref="dataForm" class="formaddcopy02" style="margin-top: -40px;" :model="formobj">
<el-row class="first_row">
<el-col :span="24">
<div class="span-sty">送货方式</div>
<el-form-item> <el-select v-model="formobj.deliveryKey" placeholder="请选择送货方式" @change="selectDeliveryKey"
class="addinputInfo">
<el-option v-for="(item,i) in deliveryKeyList" :key="i" :label="item.name" :value="item.sid">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row v-show="formobj.deliveryKey==1">
<el-col :span="8">
<div class="span-sty">快递单号</div>
<el-form-item><el-input v-model="formobj.expressBillNo" placeholder="" class="addinputw addinputInfo"
clearable /></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">快递公司</div>
<el-form-item><el-input v-model="formobj.expressCompany" placeholder="" class="addinputw addinputInfo"
clearable /></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">备注</div>
<el-form-item><el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo"
clearable /></el-form-item>
</el-col>
</el-row>
<el-row v-show="formobj.deliveryKey==2">
<el-col :span="8">
<div class="span-sty">取货人</div>
<el-form-item><el-input v-model="formobj.pickUpName" placeholder="" class="addinputw addinputInfo"
clearable /></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">取货日期</div>
<el-form-item> <el-date-picker v-model="formobj.pickUpDate" type="date" class="addinputw addinputInfo"
value-format="yyyy-MM-dd" placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">备注</div>
<el-form-item><el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo"
clearable /></el-form-item>
</el-col>
</el-row>
<el-row v-show="formobj.deliveryKey==3">
<el-col :span="8">
<div class="span-sty">送货人</div>
<el-form-item><el-input v-model="formobj.deliveryPerson" placeholder="" class="addinputw addinputInfo"
clearable /></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">送达日期</div>
<el-form-item> <el-date-picker v-model="formobj.deliveryDate" type="date" class="addinputw addinputInfo"
value-format="yyyy-MM-dd" placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">备注</div>
<el-form-item><el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo"
clearable /></el-form-item>
</el-col>
</el-row>
</el-form>
<div style="display: flex;flex-direction: row;width: 100%;justify-content: center;align-items: center;">
<el-button type="primary" style="margin-top: 20px;" @click="saveData"> </el-button>
</div>
</el-dialog>
</div>
</template>
@ -85,15 +200,18 @@
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import divAdd from './allocationAdd.vue'
import divInfo from './allocationInfo.vue'
export default {
components: {
ButtonBar,
Pagination,
pageye,
divAdd
divAdd,
divInfo
},
data() {
return {
dialogVisible: false,
btndisabled: false,
viewState: 1, // 1 2 3 4
isSearchShow: false,
@ -107,12 +225,20 @@
btnKey: 'toAdd',
btnLabel: '新增'
},
{
type: 'danger',
size: 'small',
icon: 'el-icon-delete',
btnKey: 'doDel',
btnLabel: '删除'
},
{
type: 'primary',
size: 'small',
icon: 'edit',
btnKey: 'toEdit',
btnLabel: '编辑'
btnKey: 'toSupplement',
btnLabel: '补充物流信息'
},
{
type: 'info',
@ -127,12 +253,47 @@
size: 10,
total: 0,
params: {
"createDateStart": "",
"createDateEnd": "",
"outOrgName": "",
"deptName": "",
"createByName": "",
"billNo": "",
"createStartTime": "",
"createEndTime": "",
"finishStartTime": "",
"finishEndTime": "",
"outPlatName": "",
"inOrgName": "",
"inPlatName": "",
"confirmName": ""
}
},
sids: [],
selectionList:[]
selectionList: [],
deliveryKeyList: [{
name: '快递',
sid: 1
},
{
name: '对方自取',
sid: 2
},
{
name: '我方送货',
sid: 3
}
],
formobj: {
"sids": [],
"remarks": "",
"deliveryKey": "",
"deliveryName": "",
"expressBillNo": "",
"expressCompany": "",
"pickUpName": "",
"pickUpDate": "",
"deliveryPerson": "",
"deliveryDate": ""
}
}
},
mounted() {
@ -156,9 +317,12 @@
case 'toAdd':
this.toAdd()
break
case 'toEdit':
this.toEdit()
break
case 'doDel':
this.doDel()
break
case 'toSupplement':
this.toSupplement()
break
case 'doClose':
this.doClose()
break
@ -207,8 +371,18 @@
size: 10,
total: 0,
params: {
"createDateStart": "",
"createDateEnd": "",
"outOrgName": "",
"deptName": "",
"createByName": "",
"billNo": "",
"createStartTime": "",
"createEndTime": "",
"finishStartTime": "",
"finishEndTime": "",
"outPlatName": "",
"inOrgName": "",
"inPlatName": "",
"confirmName": ""
}
}
this.loadList()
@ -217,123 +391,166 @@
this.viewState = 2
this.$refs['divadd'].showAdd()
},
doDel() {
if (this.sids.length > 0) {
const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
this.$confirm(tip, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
const loading = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
req.deleteBySids(this.sids).then((resp) => {
loading.close()
if (resp.success) {
this.$message({
type: 'success',
message: resp.msg,
showClose: true
})
this.loadList()
} else {
loading.close()
// resp.code
}
}).catch(e => {
loading.close()
})
}).catch(() => {})
} else {
this.$message({
type: "warning",
showClose: true,
message: '请至少选择一条记录进行删除操作'
})
}
},
selectionLineChangeHandle(val) {
console.log("val", val);
this.selectionList = val
const aa = []
val.forEach(element => {
aa.push(element.sid)
})
this.sids = aa
},
toRelevancy(row) {
this.viewState = 3
this.$refs['divadd'].showEdit(row.sid)
},
toDetails(row) {
this.viewState = 4
this.$refs['divinfo'].showAdd(row.sid)
},
toEdit(){
if(this.selectionList.length!=1){
this.$message({
type: 'warning',
message: "请选择一条数据。",
showClose: true
})
return
}
if(this.selectionList[0].state=='2'){
toSupplement() {
if (this.sids.length > 0) {
this.dialogVisible = true
console.log("toSupplement", this.sids);
} else {
this.$message({
type: 'warning',
message: "此记录已完成,不可重复编辑。",
showClose: true
type: "warning",
showClose: true,
message: '请至少选择一条记录进行操作'
})
return
}
},
saveData() {
this.formobj.sids = this.sids
this.viewState = 3
this.$refs['divadd'].showEdit(this.selectionList[0])
},
req.saveLogisticsInfo(this.formobj).then((resp) => {
loading.close()
if (resp.success) {
this.dialogVisible = false
this.$message({
type: 'success',
message: resp.msg,
showClose: true
})
this.loadList()
} else {
// resp.code
}
}).catch(e => {})
toBuild() {
const loading = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
},
handleClose() {
this.dialogVisible = false
},
selectDeliveryKey(val) {
console.log("selectDeliveryKey", val);
const choose = this.deliveryKeyList.filter((item) => item.sid == val)
console.log('>>>>>>>>>selectDeliveryKey', choose)
this.formobj.deliveryName = choose[0].warehouseName
this.formobj.deliveryKey = choose[0].sid
req.exportExcel(this.queryParams.params).then((resp) => {
loading.close()
const blob = new Blob([resp], {
type: 'application/vnd.ms-excel'
})
const fileName = '出入库明细_' + this.queryParams.params.createDateStart + '.xls'
const elink = document.createElement('a')
elink.download = fileName
elink.style.display = 'nonde'
elink.href = URL.createObjectURL(blob)
document.body.appendChild(elink)
elink.click()
URL.revokeObjectURL(elink.href)
document.body.removeChild(elink)
}).catch(() => {
loading.close()
})
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
},
toRelevancy(row) {
this.viewState = 3
this.$refs['divadd'].showEdit(row)
},
toRelevancyInfo(row) {
const tip = '请确认是否删除所选品牌?'
this.$confirm(tip, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
const loading = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
req.deleteGoods(row.sid).then((resp) => {
loading.close()
if (resp.success) {
this.$message({
type: 'success',
message: resp.msg,
showClose: true
})
this.loadList()
} else {
// resp.code
}
}).catch(e => {
loading.close()
})
}).catch(() => {})
},
resetState() {
this.viewState = 1
},
enableChange(sid, state) {
console.log('sid', sid)
console.log('state', state)
req.updateIsEnable(sid, state).then((resp) => {
if (resp.success) {
this.$message({
type: 'success',
message: '状态已更新',
showClose: true
})
} else { // resp.code
}
}).catch(e => {
console.log(e)
})
}
}
}
</script>
<style scoped>
/deep/ .el-form-item__error {
margin-left: 120px !important;
}
.must {
color: #f00;
}
.span-sty {
width: 90px !important;
}
.addinputInfo {
margin-left: 80px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
margin-left: 80px !important;
width: calc(100% - 70px);
}
.first_row {
border-top: 1px solid #E0E3EB;
}
.titleOne {
padding: 7px;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
/deep/ .el-form-item__error {
margin-left: 180px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .el-radio-group {
display: inline;
line-height: 1px;
vertical-align: middle;
}
</style>

14
yxt-as-ui/src/views/storage/deliveryNotice/receiptAdd.vue

@ -47,13 +47,13 @@
</el-col>
<el-col :span="8">
<div class="span-sty">供应商</div>
<el-select v-model="formobj.supplierName" placeholder="请选择" clearable @change="selectSupplierName"
class="addinputInfo addinputw">
<el-option v-for="(item,i) in supplierNameList" :key="item.sid" :label="item.supplierName"
:value="item.sid">
</el-option>
</el-select>
<el-form-item> <el-select v-model="formobj.supplierName" placeholder="请选择" clearable
@change="selectSupplierName" class="addinputInfo addinputw">
<el-option v-for="(item,i) in supplierNameList" :key="item.sid" :label="item.supplierName"
:value="item.sid">
</el-option>
</el-select>
</el-form-item>
<!-- <el-form-item><span class="addinputInfo">{{ formobj.supplierName }}</span></el-form-item> -->
</el-col>
</el-row>

Loading…
Cancel
Save