|
@@ -60,15 +60,15 @@
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :md="6" :sm="24" v-show="isShowWarehouse">
|
|
|
- <a-form-item label="调出仓库">
|
|
|
- <warehouse
|
|
|
- v-model="queryParam.warehouseSn"
|
|
|
- isPermission
|
|
|
- id="allocateBillList-warehouseSn"
|
|
|
- placeholder="请选择调出仓库"
|
|
|
- />
|
|
|
- </a-form-item>
|
|
|
- </a-col>
|
|
|
+ <a-form-item label="调出仓库">
|
|
|
+ <warehouse
|
|
|
+ v-model="queryParam.warehouseSn"
|
|
|
+ isPermission
|
|
|
+ id="allocateBillList-warehouseSn"
|
|
|
+ placeholder="请选择调出仓库"
|
|
|
+ />
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
<a-col :md="6" :sm="24">
|
|
|
<a-form-item label="所在区域">
|
|
|
<subarea id="allocateBillList-subarea" ref="subarea" @change="subareaChange"></subarea>
|
|
@@ -219,7 +219,7 @@ export default {
|
|
|
checkStatus: undefined,
|
|
|
warehouseSn: undefined,
|
|
|
printState: 'NO_PRINT',
|
|
|
- subareaArea:{
|
|
|
+ subareaArea: {
|
|
|
subareaSn: undefined,
|
|
|
subareaAreaSn: undefined
|
|
|
},
|
|
@@ -258,10 +258,10 @@ export default {
|
|
|
{ title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
|
|
|
{ title: '创建时间', dataIndex: 'createDate', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '调拨单号', scopedSlots: { customRender: 'allocateNo' }, align: 'center', width: '10%' },
|
|
|
- { title: '调往对象', dataIndex: 'targetName', width: '9%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
- { title: '发货编号', dataIndex: 'sendNo', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
- { title: '发货说明', dataIndex: 'explainInfo', width: '9%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
- { title: '收货客户名称', dataIndex: 'receiverName', width: '9%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
+ { title: '调往对象', dataIndex: 'targetName', width: '10%', align: 'left', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '发货编号', dataIndex: 'sendNo', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
+ { title: '发货说明', dataIndex: 'explainInfo', width: '8%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
+ { title: '收货客户名称', dataIndex: 'receiverName', width: '8%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
{ title: '总数量', dataIndex: 'totalQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
// { slots: { title: 'costTitle' }, dataIndex: 'receiveTotalAmount', width: '90px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
// { title: '易损件售价', dataIndex: 'receiveYsjTotalAmount', width: '70px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
@@ -273,8 +273,8 @@ export default {
|
|
|
{ title: '打印次数', dataIndex: 'printCount', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
{ title: '操作', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }
|
|
|
]
|
|
|
- if(this.isShowWarehouse){
|
|
|
- arr.splice(4,0,{ title: '调出仓库', dataIndex: 'warehouseName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } })
|
|
|
+ if (this.isShowWarehouse) {
|
|
|
+ arr.splice(4, 0, { title: '调出仓库', dataIndex: 'warehouseName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } })
|
|
|
}
|
|
|
|
|
|
if (this.$hasPermissions('M_transfersPrintList_salesPrice')) { // 售价权限
|
|
@@ -283,7 +283,7 @@ export default {
|
|
|
arr.splice(11, 0, { title: '电池售价', dataIndex: 'receiveDcTotalAmount', width: '70px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
|
|
|
arr.splice(12, 0, { title: '机油售价', dataIndex: 'receiveJyTotalAmount', width: '70px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
return arr
|
|
|
}
|
|
|
},
|
|
@@ -306,8 +306,8 @@ export default {
|
|
|
this.queryParam.beginDate = date[0]
|
|
|
this.queryParam.endDate = date[1]
|
|
|
},
|
|
|
- subareaChange(val){
|
|
|
- this.queryParam.subareaArea={
|
|
|
+ subareaChange (val) {
|
|
|
+ this.queryParam.subareaArea = {
|
|
|
subareaSn: val[0] ? val[0] : undefined,
|
|
|
subareaAreaSn: val[1] ? val[1] : undefined
|
|
|
}
|
|
@@ -327,7 +327,7 @@ export default {
|
|
|
this.queryParam.subareaArea.subareaAreaSn = undefined
|
|
|
this.queryParam.shippingAddrProvinceSn = undefined
|
|
|
this.$refs.receiverSn.resetForm()
|
|
|
- if(this.advanced){
|
|
|
+ if (this.advanced) {
|
|
|
this.$refs.subarea.clearData()
|
|
|
}
|
|
|
this.queryParam.printState = this.currentTab == 2 ? 'NO_PRINT' : undefined
|
|
@@ -361,10 +361,10 @@ export default {
|
|
|
(res) => {
|
|
|
_this.spinning = false
|
|
|
_this.$store.state.app.curActionPermission = ''
|
|
|
- if (res&&res.status == 200) {
|
|
|
+ if (res && res.status == 200) {
|
|
|
_this.$refs.table.refresh()
|
|
|
_this.$message.info(res.message)
|
|
|
- }
|
|
|
+ }
|
|
|
}, {
|
|
|
billType: 'ALLOCATE',
|
|
|
billSn: objs.allocateSn,
|