fix 导出

src/main/resources/static/app/srm/deliveryOrder/query/query.js

@@ -417,6 +417,7 @@ angular.module('IOne').controller('DeliveryOrderQueryController', function ($sco
                     doDtlRow: item.doDtlRow || ' ',
                     purchaseOrderUid: item.poMst.purchaseOrderUid || ' ',
                     poDtlRow: item.poDtl.poDtlRow || ' ',
+                    confirm: Constants.CONFIRM[item.doMst.confirm] || ' ',
                     releaseStatus: Constants.RELEASE_STATUS[item.doMst.released] || ' ',
                     supplierUid: item.poMst.supplier.supplierUid || ' ',
                     supplierName: item.poMst.supplier.name || ' ',

src/main/resources/static/app/srm/purchaseOrder/query/query.js

@@ -205,12 +205,14 @@ angular.module('IOne').controller('PurchaseOrderQueryController', function ($sco
                     relationAmount: item.relationAmount || '0',
                     earliestDeliveryDate: item.earliestDeliveryDate ? moment(item.earliestDeliveryDate).format('YYYY-MM-DD') : ' ',
                     requiredDeliveryDate: item.requiredDeliveryDate ? moment(item.requiredDeliveryDate).format('YYYY-MM-DD') : ' ',
-                    confirmedDeliveryDate: item.confirmedDeliveryDate ? moment(item.confirmedDeliveryDate).format('YYYY-MM-DD') : ' ',
+                    supplierReturnedDate: item.supplierReturnedDate ? moment(item.supplierReturnedDate).format('YYYY-MM-DD') : ' ',
+                    returnRemark: item.returnRemark || ' ',
                     deliveryStatus: $scope.getDeliveryStatus(item) || ' ',
                     statusCode: $scope.getStatusCode(item) || ' ',
                     receivedAmount: item.receivedAmount || '0',
                     unverifiedAmount: item.unverifiedAmount || '0',
                     whunverifiedAmount: item.whunverifiedAmount || '0',
+                    remark: item.remark ||' ',
                     supplierUid: item.poMst.supplier.supplierUid || ' ',
                     supplierName: item.poMst.supplier.name || ' ',
                     factoryName: item.factory.name || ' ',