purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

给采购和销售单据支持分批操作

Browse Source
This commit is contained in:
季圣华
2021-09-25 22:10:07 +08:00
parent 1604a3fde5
commit 89574dfc39
8 changed files with 66 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jshERP-web/src/views/bill/dialog/BillDetail.vue
View File

@@ -1005,6 +1005,7 @@
{ title: '单位', dataIndex: 'unit', width: '4%'},
{ title: '多属性', dataIndex: 'sku', width: '4%'},
{ title: '数量', dataIndex: 'operNumber', width: '5%'},
{ title: '已入库', dataIndex: 'finishNumber', width: '5%'},
{ title: '单价', dataIndex: 'unitPrice', width: '5%'},
{ title: '金额', dataIndex: 'allPrice', width: '5%'},
{ title: '备注', dataIndex: 'remark', width: '5%'}
@@ -1068,6 +1069,7 @@
{ title: '单位', dataIndex: 'unit', width: '4%'},
{ title: '多属性', dataIndex: 'sku', width: '4%'},
{ title: '数量', dataIndex: 'operNumber', width: '5%'},
{ title: '已入库', dataIndex: 'finishNumber', width: '5%'},
{ title: '单价', dataIndex: 'unitPrice', width: '5%'},
{ title: '金额', dataIndex: 'allPrice', width: '5%'},
{ title: '备注', dataIndex: 'remark', width: '5%'}

17
jshERP-web/src/views/bill/dialog/LinkBillList.vue
View File

@@ -21,6 +21,14 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type: getType}"
:customRow="rowAction"
@change="handleTableChange">
<template slot="customRenderStatus" slot-scope="status">
<a-tag v-if="status === '0'" color="red">未审核</a-tag>
<a-tag v-if="status === '1'" color="green">已审核</a-tag>
<a-tag v-if="status === '2' && queryParam.subType === '采购订单'" color="cyan">完成采购</a-tag>
<a-tag v-if="status === '2' && queryParam.subType === '销售订单'" color="cyan">完成销售</a-tag>
<a-tag v-if="status === '3' && queryParam.subType === '采购订单'" color="blue">部分采购</a-tag>
<a-tag v-if="status === '3' && queryParam.subType === '销售订单'" color="blue">部分销售</a-tag>
</template>
</a-table>
<!-- table区域-end -->
</a-modal>
@@ -61,7 +69,7 @@
},
{ title: '', dataIndex: 'organName',width:120},
{ title: '单据编号', dataIndex: 'number',width:150},
{ title: '商品信息', dataIndex: 'materialsList',width:220, ellipsis:true,
{ title: '商品信息', dataIndex: 'materialsList',width:280, ellipsis:true,
customRender:function (text,record,index) {
if(text) {
return text.replace(",","，");
@@ -69,8 +77,11 @@
}
},
{ title: '单据日期', dataIndex: 'operTimeStr',width:145},
{ title: '操作员', dataIndex: 'userName',width:60},
{ title: '金额合计', dataIndex: 'totalPrice',width:70}
{ title: '操作员', dataIndex: 'userName',width:70},
{ title: '金额合计', dataIndex: 'totalPrice',width:70},
{ title: '状态', dataIndex: 'status', width: 70, align: "center",
scopedSlots: { customRender: 'customRenderStatus' }
}
],
url: {
list: "/depotHead/list"