|
@@ -58,10 +58,9 @@
|
|
|
bordered>
|
|
|
<!-- 产品编码 -->
|
|
|
<template slot="productCode" slot-scope="text, record">
|
|
|
- <a-badge count="促" v-if="record.promotionFlag == 1">
|
|
|
- <div style="padding-right: 15px;">{{ text }}</div>
|
|
|
- </a-badge>
|
|
|
- <span v-else>{{ text }}</span>
|
|
|
+ <span>{{ text }}</span>
|
|
|
+ <a-badge count="促" v-if="record.promotionFlag=='GIFT'" :number-style="{ backgroundColor: '#52c41a', zoom:'80%' }"></a-badge>
|
|
|
+ <a-badge count="特" v-if="record.promotionFlag=='DISCOUNT'" :number-style="{ backgroundColor: '#faad14', zoom:'80%' }"></a-badge>
|
|
|
</template>
|
|
|
</s-table>
|
|
|
</a-card>
|
|
@@ -76,7 +75,7 @@ import { commonMixin } from '@/utils/mixin'
|
|
|
import { STable, VSelect } from '@/components'
|
|
|
import moment from 'moment'
|
|
|
import { exportExcel } from '@/libs/JGPrint.js'
|
|
|
-import { queryPageForWarehouseDetail, queryCountForWarehouseDetail, salesDetailBySn, salesDetailExcel } from '@/api/sales'
|
|
|
+import { queryPageForWarehouseDetail, queryCountForWarehouseDetail, salesDetailBySn, salesDetailExcel } from '@/api/salesNew'
|
|
|
import printModal from './printModal.vue'
|
|
|
export default {
|
|
|
name: 'SalesOrderWarehouseDetail',
|