From 61607fcc448e76b21a2a959ff727ea89dceb321f Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Mon, 17 Mar 2025 18:07:55 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E7=A7=AF=E5=88=86?=
=?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3=E4=BC=A0=E5=8F=82userId?=
=?UTF-8?q?=E6=94=B9=E4=B8=BAshopUserId=EF=BC=8C=E4=BF=AE=E6=94=B9?=
=?UTF-8?q?=E8=80=97=E6=9D=90=E5=87=BA=E5=85=A5=E5=BA=93=E5=B1=95=E7=A4=BA?=
=?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E7=82=B9=E6=AD=8C=E9=A1=B5=E9=9D=A2?=
=?UTF-8?q?=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/application/list/song/index.vue | 2 +-
src/views/inventory/consumables/index.vue | 2 +-
.../components/consumableList.vue | 6 ++---
src/views/inventory/operation_in/index.vue | 26 ++++++++++++++++---
src/views/tool/Instead/components/order.vue | 4 +--
5 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/src/views/application/list/song/index.vue b/src/views/application/list/song/index.vue
index 017cdea..c3a24d6 100644
--- a/src/views/application/list/song/index.vue
+++ b/src/views/application/list/song/index.vue
@@ -104,7 +104,7 @@ export default {
const res = await shopSongApi.url();
console.log(res);
const baseUrl =
- location.hostname === "localhost" ? "https://admintestweb.sxczgkj.cn" : location.origin;
+ location.hostname === "localhost" ? "https://tapi.cashier.sxczgkj.cn" : location.origin;
this.singgerUrl = baseUrl + "/song-H5/index.html?t=" + res;
},
jumpUrl(url) {
diff --git a/src/views/inventory/consumables/index.vue b/src/views/inventory/consumables/index.vue
index 0cf2c32..83cfd3d 100644
--- a/src/views/inventory/consumables/index.vue
+++ b/src/views/inventory/consumables/index.vue
@@ -88,7 +88,7 @@
-
+
diff --git a/src/views/inventory/operation_in/components/consumableList.vue b/src/views/inventory/operation_in/components/consumableList.vue
index f35d6a4..ce45809 100644
--- a/src/views/inventory/operation_in/components/consumableList.vue
+++ b/src/views/inventory/operation_in/components/consumableList.vue
@@ -81,7 +81,7 @@ export default {
},
resetSearchForm: "",
tableData: {
- page: 0,
+ page: 1,
size: 10,
total: 0,
loading: false,
@@ -131,7 +131,7 @@ export default {
// 重置查询
resetHandle() {
this.searchForm = { ...this.resetSearchForm };
- this.tableData.page = 0;
+ this.tableData.page = 1;
this.tableData.size = 10;
this.tableData.list = [];
this.getTableData();
@@ -143,7 +143,7 @@ export default {
},
// 分页回调
paginationChange(e) {
- this.tableData.page = e - 1;
+ this.tableData.page = e;
this.getTableData();
},
// 耗材列表
diff --git a/src/views/inventory/operation_in/index.vue b/src/views/inventory/operation_in/index.vue
index d6b90b6..ee8dce6 100644
--- a/src/views/inventory/operation_in/index.vue
+++ b/src/views/inventory/operation_in/index.vue
@@ -200,7 +200,28 @@
controls-position="right"
@change="consCountTotal($event, scope.row, 'stockNumber')"
>
- 入库前：
+
+ {{ type == "in" ? "入库" : "出库" }}前：
+ {{
+ !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
+ }}
+
@@ -625,7 +646,6 @@ export default {
this.queryForm.paymentTime = this.queryForm.paymentDate;
this.queryForm.supplierId = this.queryForm.vendorId;
const bodyList = this.tableData.list.map((v) => {
- console.log(v);
return {
conId: v.id,
conName: v.conName,
@@ -665,7 +685,7 @@ export default {
selectConsumable(res) {
console.log(res);
let arr = res.map((item) => {
- item.number = formatDecimal(item.stockNumber - item.stockConsume, 2, true);
+ item.number = item.stockNumber;
item.stockNumber = 0;
item.costPrice = item.price;
item.conInfoId = item.id;
diff --git a/src/views/tool/Instead/components/order.vue b/src/views/tool/Instead/components/order.vue
index 8304607..dfcc25d 100644
--- a/src/views/tool/Instead/components/order.vue
+++ b/src/views/tool/Instead/components/order.vue
@@ -379,7 +379,7 @@ async function pointsInit() {
return;
}
const res = await PointsApi.calcOrderUsablePoints({
- userId: props.user.id,
+ shopUserId: props.user.id,
orderAmount: currentpayMoney.value - pointsDiscountAmount.value,
});
pointsRes.value = res;
@@ -394,7 +394,7 @@ async function pointsInit() {
// 根据积分计算可抵扣金额
async function pointsToMoney() {
const res = await PointsApi.calcPointsToMoney({
- userId: props.user.id,
+ shopUserId: props.user.id,
orderAmount: currentpayMoney.value - pointsDiscountAmount.value,
points: usePointsNumber.value,
});