Commit eeaefd1e authored by 顾俭's avatar 顾俭

Merge branch '#4'

parents 3b6cab72 132d5fb0
...@@ -421,7 +421,9 @@ angular.module('IOne').controller('DeliveryOrderQueryController', function ($sco ...@@ -421,7 +421,9 @@ angular.module('IOne').controller('DeliveryOrderQueryController', function ($sco
productName: item.product.name || ' ', productName: item.product.name || ' ',
productStandard: item.product.standard || ' ', productStandard: item.product.standard || ' ',
unit: item.unit || ' ', unit: item.unit || ' ',
sourceArea: item.sourceArea|| ' ',
batchId: item.batchId || ' ', batchId: item.batchId || ' ',
manufacturingDate: item.doMst.manufacturingDate ? moment(item.doMst.manufacturingDate).format('YYYY-MM-DD') : ' ',
deliveryAmount: item.deliveryAmount || '0', deliveryAmount: item.deliveryAmount || '0',
releasedDate: item.doMst.releasedDate ? moment(item.doMst.releasedDate).format('YYYY-MM-DD') : ' ', releasedDate: item.doMst.releasedDate ? moment(item.doMst.releasedDate).format('YYYY-MM-DD') : ' ',
estimatedDate: item.doMst.estimatedDate ? moment(item.doMst.estimatedDate).format('YYYY-MM-DD') : ' ', estimatedDate: item.doMst.estimatedDate ? moment(item.doMst.estimatedDate).format('YYYY-MM-DD') : ' ',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment