@@ -222,10 +222,18 @@ export default {
{
columnAttributes: {
label: '属性',
- prop: 'isRecyc'
+ prop: 'pgOrderProductRecycles'
},
render: (h, { row, column, index }) => {
- return <div style="padding-left:10px">{row.isRecyc ? '回收' : '不回收'}</div>
+ return (
+ <div style="padding-left:10px">
+ {row.pgOrderProductRecycles
+ .map(item => {
+ return `${item.categoryName}-${item.dictName}`
+ })
+ .join(',')}
+ </div>
+ )
}
@@ -405,7 +405,7 @@ export default {
})
new thrown('error')
- if (!item.recycPayAmount) {
+ if (!item.recycPayAmount && Number(item.recycPayAmount) > 0) {
this.$message({
type: 'warning',
message: `产品信息${index + 1}应付货款必须填写!`