|
@@ -60,13 +60,6 @@
|
|
>批量操作<a-icon type="down" /> </a-button>
|
|
>批量操作<a-icon type="down" /> </a-button>
|
|
</a-dropdown>
|
|
</a-dropdown>
|
|
<span v-if="selectTotal" style="margin-left:10px;">已选{{ selectTotal }}项</span>
|
|
<span v-if="selectTotal" style="margin-left:10px;">已选{{ selectTotal }}项</span>
|
|
- </a-col>
|
|
|
|
- <a-col :md="12" :sm="24" style="text-align:right;">
|
|
|
|
- <a-button
|
|
|
|
- :id="'salesEdit-searchBox-'+id"
|
|
|
|
- type="link"
|
|
|
|
- class="button-info"
|
|
|
|
- @click="showSearchBox=!showSearchBox" ><a-icon :type="showSearchBox?'close':'search'"/> 筛选</a-button>
|
|
|
|
<a-button
|
|
<a-button
|
|
:id="'salesEdit-setAllWarehouse-'+id"
|
|
:id="'salesEdit-setAllWarehouse-'+id"
|
|
type="link"
|
|
type="link"
|
|
@@ -84,6 +77,13 @@
|
|
<a-icon type="delete" /> 全部删除
|
|
<a-icon type="delete" /> 全部删除
|
|
</a-button>
|
|
</a-button>
|
|
</a-col>
|
|
</a-col>
|
|
|
|
+ <a-col :md="12" :sm="24" style="text-align:right;">
|
|
|
|
+ <a-button
|
|
|
|
+ :id="'salesEdit-searchBox-'+id"
|
|
|
|
+ type="link"
|
|
|
|
+ class="button-info"
|
|
|
|
+ @click="showSearchBox=!showSearchBox" ><a-icon :type="showSearchBox?'close':'search'"/> 筛选</a-button>
|
|
|
|
+ </a-col>
|
|
</a-row>
|
|
</a-row>
|
|
</div>
|
|
</div>
|
|
|
|
|
|
@@ -349,11 +349,7 @@ export default {
|
|
if (this.$hasPermissions('B_salesEdit_salesPrice')) {
|
|
if (this.$hasPermissions('B_salesEdit_salesPrice')) {
|
|
arr.splice(3, 0, { title: '售价', dataIndex: 'price', width: '6%', align: 'right', scopedSlots: { customRender: 'price' } })
|
|
arr.splice(3, 0, { title: '售价', dataIndex: 'price', width: '6%', align: 'right', scopedSlots: { customRender: 'price' } })
|
|
arr.splice(4, 0, { title: '价格级别', dataIndex: 'priceLevelDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } })
|
|
arr.splice(4, 0, { title: '价格级别', dataIndex: 'priceLevelDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } })
|
|
- let idx = 0
|
|
|
|
- // 如果是特价活动,显示折扣
|
|
|
|
- idx = idx + 1
|
|
|
|
- arr.splice(5, 0, { title: '折扣', dataIndex: 'discountPrice', width: '6%', align: 'right', scopedSlots: { customRender: 'discountPrice' } })
|
|
|
|
- arr.splice((this.showStockCol ? 9 : 8) + idx, 0, { title: '售价小计', dataIndex: 'totalAmount', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
|
|
|
|
|
|
+ arr.splice((this.showStockCol ? 9 : 8), 0, { title: '售价小计', dataIndex: 'totalAmount', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
|
|
}
|
|
}
|
|
return arr
|
|
return arr
|
|
}
|
|
}
|