|
@@ -84,7 +84,7 @@
|
|
<div class="ftext" slot="message">
|
|
<div class="ftext" slot="message">
|
|
产品总数量:<strong>{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</strong>;
|
|
产品总数量:<strong>{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</strong>;
|
|
<div style="display: inline-block;" v-if="$hasPermissions('M_ShowAllCost')">
|
|
<div style="display: inline-block;" v-if="$hasPermissions('M_ShowAllCost')">
|
|
- 退货总成本:<strong>{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</strong>;
|
|
|
|
|
|
+ 退货总成本:<strong>{{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? toThousands(totalData.totalCost) : '--' }}</strong>;
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</a-alert>
|
|
</a-alert>
|
|
@@ -111,7 +111,7 @@ import ProductBrand from '../../common/productBrand.js'
|
|
import { downloadExcel } from '@/libs/JGPrint.js'
|
|
import { downloadExcel } from '@/libs/JGPrint.js'
|
|
import supplier from '@/views/common/supplier'
|
|
import supplier from '@/views/common/supplier'
|
|
import { purchaseReturnDetailList, purchaseReturnDetailQueryCount, purchaseReturnDetailExport } from '@/api/reportData'
|
|
import { purchaseReturnDetailList, purchaseReturnDetailQueryCount, purchaseReturnDetailExport } from '@/api/reportData'
|
|
-import { purchaseTargetList } from '@/api/purchase'
|
|
|
|
|
|
+import { queryReturnSupplierList } from '@/api/purchaseReturn'
|
|
export default {
|
|
export default {
|
|
components: { STable, rangeDate, ProductType, ProductBrand, supplier },
|
|
components: { STable, rangeDate, ProductType, ProductBrand, supplier },
|
|
mixins: [commonMixin],
|
|
mixins: [commonMixin],
|
|
@@ -197,7 +197,7 @@ export default {
|
|
{ title: '出库时间', dataIndex: 'outStockTime', width: '16%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
|
|
{ title: '出库时间', dataIndex: 'outStockTime', width: '16%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
|
|
]
|
|
]
|
|
if (this.$hasPermissions('M_ShowAllCost')) { // 售价权限
|
|
if (this.$hasPermissions('M_ShowAllCost')) { // 售价权限
|
|
- arr.splice(7, 0, { title: '成本', dataIndex: 'cost', width: '7%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
|
|
|
|
|
|
+ arr.splice(7, 0, { title: '成本', dataIndex: 'totalCost', width: '7%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
|
|
}
|
|
}
|
|
return arr
|
|
return arr
|
|
}
|
|
}
|
|
@@ -210,7 +210,7 @@ export default {
|
|
},
|
|
},
|
|
// 获取供应商数据
|
|
// 获取供应商数据
|
|
getSupperList () {
|
|
getSupperList () {
|
|
- purchaseTargetList({}).then(res => {
|
|
|
|
|
|
+ queryReturnSupplierList({}).then(res => {
|
|
if (res.status == 200) {
|
|
if (res.status == 200) {
|
|
this.supplierList = res.data
|
|
this.supplierList = res.data
|
|
} else {
|
|
} else {
|