From 0ae7fbb32dc7997d48c2b2ede3a200a1ad19aa89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AD=8F=E5=95=BE?= <1144797966@qq.com>
Date: Fri, 28 Jun 2024 10:18:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=97=E6=9D=90=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../invoicing/consumable/information.vue | 12 +++---
.../invoicing/consumable/specifications.vue | 37 +++++++++++++++----
2 files changed, 36 insertions(+), 13 deletions(-)
diff --git a/src/views/invoicing/consumable/information.vue b/src/views/invoicing/consumable/information.vue
index 30dfaca..5fefb23 100644
--- a/src/views/invoicing/consumable/information.vue
+++ b/src/views/invoicing/consumable/information.vue
@@ -105,9 +105,9 @@
去选择
-
+
取 消
确 定
@@ -248,7 +248,7 @@ export default {
conCode: '',
conName: '',
conTypeId: '',
- surplusStock: '',
+ // surplusStock: '',
conUnit: '',
shopId: localStorage.getItem('shopId'),
},
@@ -406,7 +406,7 @@ export default {
this.ruleForm.conTypeId = item.conTypeId
this.ruleForm.conCode = item.conCode
this.ruleForm.conName = item.conName
- this.ruleForm.surplusStock = item.surplusStock
+ // this.ruleForm.surplusStock = item.surplusStock
this.ruleForm.conUnit = item.conUnit
console.log(this.ruleForm, item)
}
@@ -421,7 +421,7 @@ export default {
conCode: this.ruleForm.conCode,
conName: this.ruleForm.conName,
conTypeId: this.ruleForm.conTypeId,
- surplusStock: this.ruleForm.surplusStock,
+ // surplusStock: this.ruleForm.surplusStock,
conUnit: this.ruleForm.conUnit,
shopId: this.ruleForm.shopId
})
@@ -431,7 +431,7 @@ export default {
conCode: this.ruleForm.conCode,
conName: this.ruleForm.conName,
conTypeId: this.ruleForm.conTypeId,
- surplusStock: this.ruleForm.surplusStock,
+ // surplusStock: this.ruleForm.surplusStock,
conUnit: this.ruleForm.conUnit,
shopId: this.ruleForm.shopId
})
diff --git a/src/views/invoicing/consumable/specifications.vue b/src/views/invoicing/consumable/specifications.vue
index 4f0d552..886bb03 100644
--- a/src/views/invoicing/consumable/specifications.vue
+++ b/src/views/invoicing/consumable/specifications.vue
@@ -92,8 +92,11 @@
去选择耗材信息
-
+
+
+
取 消
@@ -102,10 +105,13 @@
-
+
+
+
+
取 消
确 定
@@ -136,7 +142,7 @@
-
+
确定
@@ -248,6 +254,7 @@ export default {
productSkuId: "",
productSkuIdname: "",
shopId: localStorage.getItem('shopId'),
+ surplusStock: '',
status: false
},
rules: {
@@ -257,6 +264,17 @@ export default {
productSkuIdname: [
{ required: true, message: '请输入商品规格', trigger: 'blur' }
],
+ surplusStock: [
+ { required: true, message: '请输入单位耗材值', trigger: 'blur' }
+ ],
+ status: [
+ { required: true, message: '选择状态', trigger: 'blur' }
+ ]
+ },
+ rulesdialogshows: {
+ surplusStock: [
+ { required: true, message: '请输入单位耗材值', trigger: 'blur' }
+ ],
status: [
{ required: true, message: '选择状态', trigger: 'blur' }
]
@@ -416,7 +434,10 @@ export default {
} else {
this.dialogshows = true
this.dialogtitle = '编辑'
+ this.ruleForm.id = item.productSkuId
+ this.ruleForm.conInfoId = item.conInfoId
this.ruleForm.id = item.id
+ this.ruleForm.surplusStock = item.surplusStock
this.ruleForm.status = item.status == 0 ? true : false
}
},
@@ -426,10 +447,11 @@ export default {
if (this.dialogtitle == '编辑') {
await puttbProskuCon({
id: this.ruleForm.id,
- productSkuId: this.ruleForm.productSkuId,
- conInfoId: this.ruleForm.conInfoId,
+ // productSkuId: this.ruleForm.productSkuId,
+ // conInfoId: this.ruleForm.conInfoId,
shopId: this.ruleForm.shopId,
- status: this.ruleForm.status ? '0' : '1'
+ status: this.ruleForm.status ? '0' : '1',
+ surplusStock: this.ruleForm.surplusStock
})
this.dialogshows = false
@@ -439,7 +461,8 @@ export default {
productSkuId: this.ruleForm.productSkuId,
conInfoId: this.ruleForm.conInfoId,
shopId: this.ruleForm.shopId,
- status: this.ruleForm.status ? '0' : '1'
+ status: this.ruleForm.status ? '0' : '1',
+ surplusStock: this.ruleForm.surplusStock
})
this.dialogshow = false
}