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-29 19:45:20 +08:00
parent ecb0edca29
commit 7ae0c1585c
18 changed files with 345 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue
View File

@@ -58,6 +58,14 @@
:loading="loading"
:customRow="rowAction"
@change="handleTableChange">
<template slot="customRenderEnableSerialNumber" slot-scope="enableSerialNumber">
<a-tag v-if="enableSerialNumber==1" color="green">有</a-tag>
<a-tag v-if="enableSerialNumber==0" color="orange">无</a-tag>
</template>
<template slot="customRenderEnableBatchNumber" slot-scope="enableBatchNumber">
<a-tag v-if="enableBatchNumber==1" color="green">有</a-tag>
<a-tag v-if="enableBatchNumber==0" color="orange">无</a-tag>
</template>
</a-table>
</div>
</a-col>
@@ -94,14 +102,20 @@
categoryTree:[],
columns: [
{dataIndex: 'mBarCode', title: '条码', width: 100, align: 'left'},
{dataIndex: 'name', title: '名称', width: 100},
{dataIndex: 'name', title: '名称', width: 120},
{dataIndex: 'categoryName', title: '类别', width: 80},
{dataIndex: 'standard', title: '规格', width: 80},
{dataIndex: 'model', title: '型号', width: 80},
{dataIndex: 'unit', title: '单位', width: 60},
{dataIndex: 'sku', title: '多属性', width: 100},
{dataIndex: 'stock', title: '库存', width: 100},
{dataIndex: 'expand', title: '扩展信息', width: 80}
{dataIndex: 'sku', title: '多属性', width: 80},
{dataIndex: 'stock', title: '库存', width: 60},
{dataIndex: 'expand', title: '扩展信息', width: 80},
{dataIndex: 'enableSerialNumber', title: '序列号', width: 60, align: "center",
scopedSlots: { customRender: 'customRenderEnableSerialNumber' }
},
{dataIndex: 'enableBatchNumber', title: '批号', width: 60, align: "center",
scopedSlots: { customRender: 'customRenderEnableBatchNumber' }
}
],
scrollTrigger: {},
dataSource: [],