From b936fa6f66c7844e29486b369436f124046c6812 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Mon, 3 Apr 2023 16:30:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/stationItem/stationItemjs.js | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/views/system/stationItem/stationItemjs.js b/src/views/system/stationItem/stationItemjs.js
index 9c76986..060a300 100644
--- a/src/views/system/stationItem/stationItemjs.js
+++ b/src/views/system/stationItem/stationItemjs.js
@@ -199,12 +199,12 @@ export default {
     methods: {
         commissionAmountinput(e) {
             if (e.commissionRate) {
-                e.commissionAmount = ''
+                e.commissionAmount = null
             }
         },
         commissionRateoninput(e) {
             if (e.commissionAmount) {
-                e.commissionRate = ''
+                e.commissionRate = null
             }
         },
         //点击上架
@@ -577,9 +577,22 @@ export default {
         },
         /** 提交按钮 */
         submitForm() {
-            this.form.nurseStationItemConsumables.forEach((e) => {
-                e.nurseStationConsumableId = e.id;
-            });
+            if (this.form.nurseStationItemPrices.length > 0) {
+                this.form.nurseStationItemPrices.forEach(e => {
+                    if (!e.commissionAmount || e.commissionAmount == "") {
+                        e.commissionRate = Number(e.commissionRate);
+                    }
+                    if (!e.commissionRate || e.commissionRate == "") {
+                        e.commissionAmount = Number(e.commissionAmount);
+                    }
+                });
+            }
+            if (this.form.nurseStationItemConsumables.length > 0) {
+                this.form.nurseStationItemConsumables.forEach(e => {
+                    e.nurseStationConsumableId = e.id;
+                    e.consumableCount = Number(e.consumableCount);
+                });
+            }
             this.form.nurseStationItem.nurseTypeId = this.form.nurseTypeId;
             if (!this.form.nurseStationItem.appointmentLimitCount) {
                 this.form.nurseStationItem.appointmentLimitCount = null