From 1ca47334f66f74593784e3f9f33f5aa862482b6b Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Tue, 23 Jul 2024 10:15:30 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/invoicing/components/addConsTakin.vue | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/views/invoicing/components/addConsTakin.vue b/src/views/invoicing/components/addConsTakin.vue
index 9d57d43..a82672e 100644
--- a/src/views/invoicing/components/addConsTakin.vue
+++ b/src/views/invoicing/components/addConsTakin.vue
@@ -21,7 +21,7 @@
- 取 消
+ 取 消
确 定
@@ -123,7 +123,7 @@ export default {
let res = await tbConCheck({
conInfoId: this.form.conInfoId,
lpNum: this.profitNumber,
- remark:this.form.remark
+ remark: this.form.remark
});
this.detail.num = this.form.lpNum;
this.form.lpNum = 0;
@@ -136,6 +136,7 @@ export default {
message: `添加成功`,
type: "success"
});
+ this.form.remark = ''
this.getTableData();
} catch (error) {
this.loading = false;
From 7b679fb415dd4e477fde8d73bed2783de81c0499 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Tue, 23 Jul 2024 15:01:25 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9C=A8=E6=9F=A5?=
=?UTF-8?q?=E8=AF=A2=E8=80=97=E6=9D=90=E6=B5=81=E6=B0=B4=E4=BF=A1=E6=81=AF?=
=?UTF-8?q?=E9=87=8C=E6=97=B6=E8=BF=94=E5=9B=9E=E7=9A=84=E5=95=86=E5=93=81?=
=?UTF-8?q?id=E4=B8=BAnull=E6=97=B6=E6=8A=A5=E9=94=99=E5=AF=BC=E8=87=B4?=
=?UTF-8?q?=E8=80=97=E6=9D=90=E8=AE=B0=E5=BD=95=E5=88=97=E8=A1=A8=E4=B8=8D?=
=?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=9A=84=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/invoicing/consumable/cons_record.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/invoicing/consumable/cons_record.vue b/src/views/invoicing/consumable/cons_record.vue
index a86accf..a9f3c9e 100644
--- a/src/views/invoicing/consumable/cons_record.vue
+++ b/src/views/invoicing/consumable/cons_record.vue
@@ -158,7 +158,7 @@ export default {
});
this.clickseetableData.loading = false;
this.clickseetableData.data = res.content.map(v=>{
- const productIds=v.productId.split(',')
+ const productIds=v.productId?v.productId.split(','):[]
return{
...v,
product:productIds.map((str,index)=>{
From 6cbf407b88576bc5be4a426bf77f38563de31240 Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Tue, 23 Jul 2024 17:03:16 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=89=A9=E5=B1=95=E8=B5=84=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/product/add_shop.vue | 17 ++++++++---------
src/views/shop/shop_configuration.vue | 2 +-
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/src/views/product/add_shop.vue b/src/views/product/add_shop.vue
index 996c4a5..e19cb64 100644
--- a/src/views/product/add_shop.vue
+++ b/src/views/product/add_shop.vue
@@ -16,7 +16,7 @@
-
+
@@ -108,10 +108,7 @@
-
+
@@ -239,10 +236,7 @@
-
+
@@ -454,6 +448,11 @@ export default {
message: "请输入商品名称"
}
],
+ unitId: [{
+ required: true,
+ trigger: "change",
+ message: "请选择单位"
+ }],
categoryId: [
{
required: true,
diff --git a/src/views/shop/shop_configuration.vue b/src/views/shop/shop_configuration.vue
index 25a5d88..7e53fb1 100644
--- a/src/views/shop/shop_configuration.vue
+++ b/src/views/shop/shop_configuration.vue
@@ -5,7 +5,7 @@
-
+