Showing
4 changed files
with
28 additions
and
9 deletions
| @@ -7,6 +7,7 @@ | @@ -7,6 +7,7 @@ | ||
| 7 | 7 | ||
| 8 | <layout-action> | 8 | <layout-action> |
| 9 | <Button type="primary" @click="back">返回入库物流列表</Button> | 9 | <Button type="primary" @click="back">返回入库物流列表</Button> |
| 10 | + <Button type="primary" @click="print">打印</Button> | ||
| 10 | </layout-action> | 11 | </layout-action> |
| 11 | 12 | ||
| 12 | <layout-list> | 13 | <layout-list> |
| @@ -115,6 +116,11 @@ | @@ -115,6 +116,11 @@ | ||
| 115 | this.$router.push({ | 116 | this.$router.push({ |
| 116 | name: 'repository.express.list' | 117 | name: 'repository.express.list' |
| 117 | }); | 118 | }); |
| 119 | + }, | ||
| 120 | + print() { | ||
| 121 | + const href = `/trade/printDetail.html?expressNo=${this.id}`; | ||
| 122 | + | ||
| 123 | + window.open(href, '_blank'); | ||
| 118 | } | 124 | } |
| 119 | 125 | ||
| 120 | } | 126 | } |
| @@ -26,7 +26,7 @@ | @@ -26,7 +26,7 @@ | ||
| 26 | <div slot="footer" style="text-align: center"> | 26 | <div slot="footer" style="text-align: center"> |
| 27 | <Button type="primary" size="large" :loading="modal_loading" @click="submit">保存</Button> | 27 | <Button type="primary" size="large" :loading="modal_loading" @click="submit">保存</Button> |
| 28 | <Button type="primary" size="large" :loading="modal_loading" @click="submitAnd">保存并添加商品</Button> | 28 | <Button type="primary" size="large" :loading="modal_loading" @click="submitAnd">保存并添加商品</Button> |
| 29 | - <Button type="primary" size="large" @click="cancel">取消</Button> | 29 | + <Button type="ghost" size="large" @click="cancel">取消</Button> |
| 30 | </div> | 30 | </div> |
| 31 | </Modal> | 31 | </Modal> |
| 32 | </template> | 32 | </template> |
| @@ -4,10 +4,10 @@ | @@ -4,10 +4,10 @@ | ||
| 4 | <div>品牌：<span>{{this.data.brandName || '-'}}</span> | 4 | <div>品牌：<span>{{this.data.brandName || '-'}}</span> |
| 5 | | 店铺：<span>{{this.data.shopName || '-'}}</span> | 5 | | 店铺：<span>{{this.data.shopName || '-'}}</span> |
| 6 | | 供应商：<span>{{this.data.supplierName || '-'}}</span> | 6 | | 供应商：<span>{{this.data.supplierName || '-'}}</span> |
| 7 | - | 进项税率：<span>{{this.inputTaxRate || '-'}}</span> | ||
| 8 | - | 数量：<span>{{this.totalNum || '-'}}</span> | ||
| 9 | - | 总吊牌金额：<span>{{this.totalRetailPrice || '-'}}</span> | ||
| 10 | - | 总进货金额：<span>{{this.totalPurchasePrice || '-'}}</span> | 7 | + | 进项税率：<span>{{this.data.inputTaxRate || '-'}}</span> |
| 8 | + | 数量：<span>{{this.data.totalNum || '-'}}</span> | ||
| 9 | + | 总吊牌金额：<span>{{this.data.totalRetailPrice || '-'}}</span> | ||
| 10 | + | 总进货金额：<span>{{this.data.totalPurchasePrice || '-'}}</span> | ||
| 11 | </div> | 11 | </div> |
| 12 | </div> | 12 | </div> |
| 13 | </template> | 13 | </template> |
| 1 | <template> | 1 | <template> |
| 2 | <layout-body> | 2 | <layout-body> |
| 3 | + <layout-filter v-if="!show" :inline="true"> | ||
| 4 | + <filter-item label="商品条码"> | ||
| 5 | + <Input v-model="skuFactoryCode" placeholder="请输入"></Input> | ||
| 6 | + </filter-item> | ||
| 7 | + <filter-item v-if="!show" :inline="true"> | ||
| 8 | + <Button type="primary" @click="search">筛选</Button> | ||
| 9 | + <Button @click="clearFilters">清空条件</Button> | ||
| 10 | + </filter-item> | ||
| 11 | + </layout-filter> | ||
| 3 | <layout-list> | 12 | <layout-list> |
| 4 | <Table ref="goodsList" border :columns="tableCols" :data="tableData"></Table> | 13 | <Table ref="goodsList" border :columns="tableCols" :data="tableData"></Table> |
| 5 | <Page v-if="!selected" :total="pageData.total" :current="pageData.current" | 14 | <Page v-if="!selected" :total="pageData.total" :current="pageData.current" |
| @@ -39,7 +48,8 @@ | @@ -39,7 +48,8 @@ | ||
| 39 | total: 0, | 48 | total: 0, |
| 40 | current: 1, | 49 | current: 1, |
| 41 | pageSize: 20 | 50 | pageSize: 20 |
| 42 | - } | 51 | + }, |
| 52 | + skuFactoryCode: null | ||
| 43 | }; | 53 | }; |
| 44 | }, | 54 | }, |
| 45 | created() { | 55 | created() { |
| @@ -51,7 +61,8 @@ | @@ -51,7 +61,8 @@ | ||
| 51 | filterSearch() { | 61 | filterSearch() { |
| 52 | this.search(); | 62 | this.search(); |
| 53 | }, | 63 | }, |
| 54 | - clearFilter() { | 64 | + clearFilters() { |
| 65 | + this.skuFactoryCode = null; | ||
| 55 | this.pageData.current = 1; | 66 | this.pageData.current = 1; |
| 56 | 67 | ||
| 57 | this.search(); | 68 | this.search(); |
| @@ -60,7 +71,8 @@ | @@ -60,7 +71,8 @@ | ||
| 60 | if (!this.selected) { | 71 | if (!this.selected) { |
| 61 | return this.invoiceService.listAvailableProduct({ | 72 | return this.invoiceService.listAvailableProduct({ |
| 62 | proRequisitionFormId: this.oid, | 73 | proRequisitionFormId: this.oid, |
| 63 | - brandId: this.brandId | 74 | + brandId: this.brandId, |
| 75 | + skuFactoryCode: this.skuFactoryCode | ||
| 64 | }).then((res) => { | 76 | }).then((res) => { |
| 65 | if (res.code === 200) { | 77 | if (res.code === 200) { |
| 66 | this.tableData = (res.data.records || []).map((i) => { | 78 | this.tableData = (res.data.records || []).map((i) => { |
| @@ -74,7 +86,8 @@ | @@ -74,7 +86,8 @@ | ||
| 74 | } else { | 86 | } else { |
| 75 | return this.invoiceService.listProduct({ | 87 | return this.invoiceService.listProduct({ |
| 76 | proRequisitionFormId: this.oid, | 88 | proRequisitionFormId: this.oid, |
| 77 | - brandId: this.brandId | 89 | + brandId: this.brandId, |
| 90 | + skuFactoryCode: this.skuFactoryCode | ||
| 78 | }).then((res) => { | 91 | }).then((res) => { |
| 79 | if (res.code === 200) { | 92 | if (res.code === 200) { |
| 80 | this.tableData = (res.data.goodsList || []).map((i) => { | 93 | this.tableData = (res.data.goodsList || []).map((i) => { |
-
Please register or login to post a comment