Browse Source

no message

linwenxin 9 tháng trước cách đây
mục cha
commit
8ce8e35b38

+ 10 - 2
src/views/workOrder/workOrderPool/detailModule/CompletionDetails/index.vue

@@ -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>
+                      )
                     }
                   },
                   {

+ 1 - 1
src/views/workOrder/workOrderPool/detailModule/workOrderInfo/buttons/processFeedback.vue

@@ -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}应付货款必须填写!`