|
@@ -83,7 +83,7 @@
|
|
|
<Area id="stockPrint-shippingAddrProvinceSn" v-model="queryParam.shippingAddrProvinceSn" placeholder="请选择省"></Area>
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
- <a-col :md="6" :sm="24" v-if="!isShowWarehouse">
|
|
|
+ <a-col :md="6" :sm="24" v-if="isShowWarehouse">
|
|
|
<a-form-model-item label="仓库">
|
|
|
<chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn" :isPermission="true"></chooseWarehouse>
|
|
|
</a-form-model-item>
|
|
@@ -295,7 +295,7 @@ export default {
|
|
|
{ title: '打印次数', dataIndex: 'stockUpPrintTimes', width: '70px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
{ title: '操作', scopedSlots: { customRender: 'action' }, width: '100px', align: 'center', fixed: 'right' }
|
|
|
]
|
|
|
- if (!this.isShowWarehouse) {
|
|
|
+ if (this.isShowWarehouse) {
|
|
|
arr.splice(7, 0, { title: '仓库', dataIndex: 'warehouseName', width: '130px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true })
|
|
|
}
|
|
|
if (this.$hasPermissions('M_stockPrintList_salesPrice')) { // 售价权限
|