From b5cd694baf1d004b5f8cd5756269f99fd4dd9ed4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AD=8F=E5=95=BE?= <1144797966@qq.com> Date: Thu, 28 Nov 2024 14:04:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=93=8D=E4=BD=9C=E8=AE=B0?= =?UTF-8?q?=E5=BD=95IP=E5=B1=95=E7=A4=BA=20=E4=BE=9B=E5=BA=94=E5=95=86?= =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93=E8=AE=B0=E5=BD=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/invoicing/operation_in.vue | 41 ++++++++----- .../supplier_manage/purchase_detail.vue | 59 ++++++++++++------- src/views/monitor/log/index.vue | 2 +- 3 files changed, 67 insertions(+), 35 deletions(-) diff --git a/src/views/invoicing/operation_in.vue b/src/views/invoicing/operation_in.vue index 416b867..0b5b09e 100644 --- a/src/views/invoicing/operation_in.vue +++ b/src/views/invoicing/operation_in.vue @@ -123,13 +123,14 @@
原价￥ - {{ !scope.row.unit ? - (scope.row.defaultUnit ? - scope.row.defaultUnit== scope.row.conUnitTwo? - ((scope.row.costPrice*scope.row.conUnitTwoConvert).toFixed(2)): scope.row.costPrice:scope.row.costPrice) - : scope.row.unit== scope.row.conUnitTwo? - ((scope.row.costPrice*scope.row.conUnitTwoConvert).toFixed(2)): scope.row.costPrice}} - / + {{ !scope.row.unit ? + (scope.row.defaultUnit ? + scope.row.defaultUnit == scope.row.conUnitTwo ? + ((scope.row.costPrice * scope.row.conUnitTwoConvert).toFixed(2)) : + scope.row.costPrice : scope.row.costPrice) + : scope.row.unit == scope.row.conUnitTwo ? + ((scope.row.costPrice * scope.row.conUnitTwoConvert).toFixed(2)) : scope.row.costPrice }} + / {{ !scope.row.unit ? (scope.row.defaultUnit ? scope.row.defaultUnit : scope.row.conUnit) : scope.row.unit }} @@ -154,13 +155,13 @@ controls-position="right" @change="consCountTotal($event, scope.row, 'stockNumber')">
入库前： - {{ !scope.row.unit ? - (scope.row.defaultUnit ? - scope.row.defaultUnit== scope.row.conUnitTwo? - (scope.row.number/scope.row.conUnitTwoConvert): scope.row.number:scope.row.number) - : scope.row.unit== scope.row.conUnitTwo? - (scope.row.number/scope.row.conUnitTwoConvert): scope.row.number}} - + {{ !scope.row.unit ? + (scope.row.defaultUnit ? + scope.row.defaultUnit == scope.row.conUnitTwo ? + (scope.row.number / scope.row.conUnitTwoConvert) : scope.row.number : scope.row.number) + : scope.row.unit == scope.row.conUnitTwo ? + (scope.row.number / scope.row.conUnitTwoConvert) : scope.row.number }} + {{ !scope.row.unit ? (scope.row.defaultUnit ? scope.row.defaultUnit : scope.row.conUnit) : scope.row.unit }}
@@ -343,6 +344,17 @@ export default { mounted() { this.resetForm = { ...this.queryForm } this.tbShopPurveyorGet() + console.log(this.$route.query.consdata) + if (this.$route.query.consdata) { + let arr = this.$route.query.consdata.map(item => { + item.number = formatDecimal(item.stockNumber - item.stockConsume, 2, true) + item.stockNumber = 0 + item.costPrice = item.price + item.conInfoId = item.id + return item + }) + this.tableData.list = [...this.tableData.list, ...arr] + } }, methods: { async querySearchAsync(queryString, cb) {//快捷搜索 @@ -556,6 +568,7 @@ export default { }, // 选择耗材 selectConsumable(res) { + console.log(res) let arr = res.map(item => { item.number = formatDecimal(item.stockNumber - item.stockConsume, 2, true) item.stockNumber = 0 diff --git a/src/views/invoicing/supplier_manage/purchase_detail.vue b/src/views/invoicing/supplier_manage/purchase_detail.vue index 1251f87..1711d61 100644 --- a/src/views/invoicing/supplier_manage/purchase_detail.vue +++ b/src/views/invoicing/supplier_manage/purchase_detail.vue @@ -126,8 +126,8 @@ 付款 账单付款记录 - 出入库记录 + 货单记录 @@ -175,10 +175,10 @@ - +
- + + + + + +
-
- + +
+
转出库单
@@ -315,6 +322,7 @@ export default { total: 0, id: '' }, + consdata: []//回填跳转到入库 } }, filters: { @@ -463,29 +471,40 @@ export default { this.stockData.page = e - 1; this.gettbConsInfoFlowstock(); }, + func() { + this.$router.push({ + name: 'operation_in', + query: { + consdata: this.consdata + } + }) + }, async gettbConsInfoFlowstock(item) { + console.log(item) if (item) { this.stockData.id = item.id + this.consdata = item.cons + this.stockData.data = item.conFlows } this.variabilityshow = true - this.stockData.loading = true; + // this.stockData.loading = true; let arr = [] // if (this.query.createdAt.length) { // arr = [this.query.createdAt[0] + ' 00:00:00', this.query.createdAt[1] + ' 23:59:59'] // } else { // arr = [] // } - let res = await tbProductStockOperatepage({ - page: this.stockData.page, - size: this.stockData.size, - shopId: localStorage.getItem("shopId"), - type: ["cons_in", "cons_out"],//预留耗材id - purveyorId: this.stockData.id,//列名 - createdAt: arr//耗材id - }) - this.stockData.loading = false; - this.stockData.data = res.content; - this.stockData.total = res.totalElements; + // let res = await tbProductStockOperatepage({ + // page: this.stockData.page, + // size: this.stockData.size, + // shopId: localStorage.getItem("shopId"), + // type: ["cons_in", "cons_out"],//预留耗材id + // purveyorId: this.stockData.id,//列名 + // createdAt: arr//耗材id + // }) + // this.stockData.loading = false; + // this.stockData.data = res.content; + // this.stockData.total = res.totalElements; }, } } diff --git a/src/views/monitor/log/index.vue b/src/views/monitor/log/index.vue index 41a00dc..230e256 100644 --- a/src/views/monitor/log/index.vue +++ b/src/views/monitor/log/index.vue @@ -31,7 +31,7 @@ - +