Skip to content

S
srm
Commit b5a73972 authored by 顾俭's avatar 顾俭
Browse files
Options

fix 导出

parent 2c755452
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 1 deletion
src/main/resources/static/app/srm/deliveryOrder/query/query.js
View file @ b5a73972
...@@ -417,6 +417,7 @@ angular.module('IOne').controller('DeliveryOrderQueryController', function ($sco ...@@ -417,6 +417,7 @@ angular.module('IOne').controller('DeliveryOrderQueryController', function ($sco
doDtlRow: item.doDtlRow || ' ', doDtlRow: item.doDtlRow || ' ',
purchaseOrderUid: item.poMst.purchaseOrderUid || ' ', purchaseOrderUid: item.poMst.purchaseOrderUid || ' ',
poDtlRow: item.poDtl.poDtlRow || ' ', poDtlRow: item.poDtl.poDtlRow || ' ',
confirm: Constants.CONFIRM[item.doMst.confirm] || ' ',
releaseStatus: Constants.RELEASE_STATUS[item.doMst.released] || ' ', releaseStatus: Constants.RELEASE_STATUS[item.doMst.released] || ' ',
supplierUid: item.poMst.supplier.supplierUid || ' ', supplierUid: item.poMst.supplier.supplierUid || ' ',
supplierName: item.poMst.supplier.name || ' ', supplierName: item.poMst.supplier.name || ' ',
......
src/main/resources/static/app/srm/purchaseOrder/query/query.js
View file @ b5a73972
...@@ -205,12 +205,14 @@ angular.module('IOne').controller('PurchaseOrderQueryController', function ($sco ...@@ -205,12 +205,14 @@ angular.module('IOne').controller('PurchaseOrderQueryController', function ($sco
relationAmount: item.relationAmount || '0', relationAmount: item.relationAmount || '0',
earliestDeliveryDate: item.earliestDeliveryDate ? moment(item.earliestDeliveryDate).format('YYYY-MM-DD') : ' ', earliestDeliveryDate: item.earliestDeliveryDate ? moment(item.earliestDeliveryDate).format('YYYY-MM-DD') : ' ',
requiredDeliveryDate: item.requiredDeliveryDate ? moment(item.requiredDeliveryDate).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) || ' ', deliveryStatus: $scope.getDeliveryStatus(item) || ' ',
statusCode: $scope.getStatusCode(item) || ' ', statusCode: $scope.getStatusCode(item) || ' ',
receivedAmount: item.receivedAmount || '0', receivedAmount: item.receivedAmount || '0',
unverifiedAmount: item.unverifiedAmount || '0', unverifiedAmount: item.unverifiedAmount || '0',
whunverifiedAmount: item.whunverifiedAmount || '0', whunverifiedAmount: item.whunverifiedAmount || '0',
remark: item.remark ||' ',
supplierUid: item.poMst.supplier.supplierUid || ' ', supplierUid: item.poMst.supplier.supplierUid || ' ',
supplierName: item.poMst.supplier.name || ' ', supplierName: item.poMst.supplier.name || ' ',
factoryName: item.factory.name || ' ', factoryName: item.factory.name || ' ',
......
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