Authored by htoooth

fix

... ... @@ -7,6 +7,7 @@
<layout-action>
<Button type="primary" @click="back">返回入库物流列表</Button>
<Button type="primary" @click="print">打印</Button>
</layout-action>
<layout-list>
... ... @@ -115,6 +116,11 @@
this.$router.push({
name: 'repository.express.list'
});
},
print() {
const href = `/trade/printDetail.html?expressNo=${this.id}`;
window.open(href, '_blank');
}
}
... ...
... ... @@ -26,7 +26,7 @@
<div slot="footer" style="text-align: center">
<Button type="primary" size="large" :loading="modal_loading" @click="submit">保存</Button>
<Button type="primary" size="large" :loading="modal_loading" @click="submitAnd">保存并添加商品</Button>
<Button type="primary" size="large" @click="cancel">取消</Button>
<Button type="ghost" size="large" @click="cancel">取消</Button>
</div>
</Modal>
</template>
... ...
... ... @@ -4,10 +4,10 @@
<div>品牌:<span>{{this.data.brandName || '-'}}</span>
&nbsp;|&nbsp; 店铺:<span>{{this.data.shopName || '-'}}</span>
&nbsp;|&nbsp; 供应商:<span>{{this.data.supplierName || '-'}}</span>
&nbsp;|&nbsp; 进项税率:<span>{{this.inputTaxRate || '-'}}</span>
&nbsp;|&nbsp; 数量:<span>{{this.totalNum || '-'}}</span>
&nbsp;|&nbsp; 总吊牌金额:<span>{{this.totalRetailPrice || '-'}}</span>
&nbsp;|&nbsp; 总进货金额:<span>{{this.totalPurchasePrice || '-'}}</span>
&nbsp;|&nbsp; 进项税率:<span>{{this.data.inputTaxRate || '-'}}</span>
&nbsp;|&nbsp; 数量:<span>{{this.data.totalNum || '-'}}</span>
&nbsp;|&nbsp; 总吊牌金额:<span>{{this.data.totalRetailPrice || '-'}}</span>
&nbsp;|&nbsp; 总进货金额:<span>{{this.data.totalPurchasePrice || '-'}}</span>
</div>
</div>
</template>
... ...
<template>
<layout-body>
<layout-filter v-if="!show" :inline="true">
<filter-item label="商品条码">
<Input v-model="skuFactoryCode" placeholder="请输入"></Input>
</filter-item>
<filter-item v-if="!show" :inline="true">
<Button type="primary" @click="search">筛选</Button>
<Button @click="clearFilters">清空条件</Button>
</filter-item>
</layout-filter>
<layout-list>
<Table ref="goodsList" border :columns="tableCols" :data="tableData"></Table>
<Page v-if="!selected" :total="pageData.total" :current="pageData.current"
... ... @@ -39,7 +48,8 @@
total: 0,
current: 1,
pageSize: 20
}
},
skuFactoryCode: null
};
},
created() {
... ... @@ -51,7 +61,8 @@
filterSearch() {
this.search();
},
clearFilter() {
clearFilters() {
this.skuFactoryCode = null;
this.pageData.current = 1;
this.search();
... ... @@ -60,7 +71,8 @@
if (!this.selected) {
return this.invoiceService.listAvailableProduct({
proRequisitionFormId: this.oid,
brandId: this.brandId
brandId: this.brandId,
skuFactoryCode: this.skuFactoryCode
}).then((res) => {
if (res.code === 200) {
this.tableData = (res.data.records || []).map((i) => {
... ... @@ -74,7 +86,8 @@
} else {
return this.invoiceService.listProduct({
proRequisitionFormId: this.oid,
brandId: this.brandId
brandId: this.brandId,
skuFactoryCode: this.skuFactoryCode
}).then((res) => {
if (res.code === 200) {
this.tableData = (res.data.goodsList || []).map((i) => {
... ...