bonus
/
bonus-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui

This commit is contained in:
hongchao 2024-12-25 16:43:35 +08:00
parent 7e6c2f093a 0525ecd3a6
commit 0242282372
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/material/purchase/goodsBind/component/bindTools.vue
View File

@ -487,7 +487,7 @@ export default {
message: "请输入前缀", message: "请输入前缀",
}, },
{ {
pattern: /^[1-9][0-9]*$/, pattern: /^[0-9][0-9]*$/,
message: "请输入大于0且不能以0开头的正整数", message: "请输入大于0且不能以0开头的正整数",
}, },
], ],
@ -499,7 +499,7 @@ export default {
}, },
{ {
pattern: /^[1-9][0-9]*$/, pattern: /^[0-9][0-9]*$/,
message: "请输入大于0且不能以0开头的正整数", message: "请输入大于0且不能以0开头的正整数",
}, },
], ],

8
src/views/material/purchase/goodsEntry/detail.vue
View File

@ -83,7 +83,13 @@
<el-table-column label="规格型号" align="center" prop="typeName" :show-overflow-tooltip="true"/> <el-table-column label="规格型号" align="center" prop="typeName" :show-overflow-tooltip="true"/>
<el-table-column label="单位" align="center" prop="unitName" :show-overflow-tooltip="true"/> <el-table-column label="单位" align="center" prop="unitName" :show-overflow-tooltip="true"/>
<el-table-column label="采购数量" align="center" prop="purchaseNum" :show-overflow-tooltip="true"/> <el-table-column label="采购数量" align="center" prop="purchaseNum" :show-overflow-tooltip="true"/>
<el-table-column label="入库数量" align="center" prop="checkNum" :show-overflow-tooltip="true"/> <el-table-column label="验收数量" align="center" prop="checkNum" :show-overflow-tooltip="true"/>
<el-table-column label="已入库数量" align="center" prop="inputNum" :show-overflow-tooltip="true"/>
<el-table-column label="待入库" align="center" prop="inputNum" :show-overflow-tooltip="true">
<template slot-scope="scope">
<div>{{ scope.row.checkNum-scope.row.inputNum }}</div>
</template>
</el-table-column>
<el-table-column label="购置单价(元含税)" align="center" prop="purchaseTaxPrice" :show-overflow-tooltip="true"/> <el-table-column label="购置单价(元含税)" align="center" prop="purchaseTaxPrice" :show-overflow-tooltip="true"/>
<el-table-column label="购置单价（元不含税）" align="center" prop="purchasePrice" :show-overflow-tooltip="true"/> <el-table-column label="购置单价（元不含税）" align="center" prop="purchasePrice" :show-overflow-tooltip="true"/>
<!-- <el-table-column label="供应商" align="center" prop="supplierName" /> --> <!-- <el-table-column label="供应商" align="center" prop="supplierName" /> -->