From 0f50ac0bc85b9c4bea01832d06b11e5306cc4bef Mon Sep 17 00:00:00 2001
From: apan <apan_youxiang@163.com>
Date: Fri, 5 Aug 2022 16:34:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E6=94=B6=E5=88=97=E8=A1=A8=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/drug/views.py  | 25 ++++++++++++++++++++++++-
 apps/power/views.py | 18 +++++++++---------
 2 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/apps/drug/views.py b/apps/drug/views.py
index 06d95c2..0118bc9 100644
--- a/apps/drug/views.py
+++ b/apps/drug/views.py
@@ -6,6 +6,7 @@
 import datetime
 from flask import jsonify, request, g
 from flask import Blueprint
+from sqlalchemy import and_
 from db_logic.client import BllClient
 
 
@@ -144,7 +145,29 @@ def get_drug_manage():
 
 
 
-
+# 编辑/新增数据
+@drug_router.route("/add_update", methods=["GET", "POST"])
+@token_auth.login_required
+def drug_add_update():
+    finds_list = [
+        "name", "english_name", "bar_code", "cas_number",
+        "purity", "shelf_life", "production_date", "expiration_date",
+        "use_days_warning_value", "shelf_life_warning_value",
+        "inventory_warning_value", "speci", "net_weight_unit", "net_weight",
+        # 缺少说明字段
+        "is_supervise", "is_weigh"
+    ]
+    medicament_id = request.values.get("medicament_id")
+    bar_code = request.values.get("bar_code")
+    medicament_obj = BllMedicament().findEntity(medicament_id)
+    if medicament_id:
+        obj = BllMedicament().findEntity(
+            and_(
+            EntityMedicament.bar_code == bar_code)
+        )
+    return Utils.true_return()
+
+# 流转记录
 
 
 
diff --git a/apps/power/views.py b/apps/power/views.py
index f001336..2711497 100644
--- a/apps/power/views.py
+++ b/apps/power/views.py
@@ -40,10 +40,10 @@ def get_user_power_list():
 @token_auth.login_required
 def add_user_power_list():
     user_id = request.values.get("user_id")
-    drug_module = request.values.getlist("drug_module_id")
-    standard_module = request.values.getlist("standard_module_id")
-    consumables_module = request.values.getlist("consumables_module_id")
-    instrument_modulet = request.values.getlist("instrument_module_id")
+    drug_module = request.values.getlist("drug_module_id[]")
+    standard_module = request.values.getlist("standard_module_id[]")
+    consumables_module = request.values.getlist("consumables_module_id[]")
+    instrument_modulet = request.values.getlist("instrument_module_id[]")
     inster_dic = {
         "2": drug_module if drug_module else [],
         "3": standard_module if standard_module else [],
@@ -125,11 +125,11 @@ def add_role():
     role_name = request.values.get("role_name")
     # sys_module_list = request.values.getlist("sys_module")
     # client_module_list = request.values.getlist("client_module")
-    client_module = request.values.getlist("client_module_id")
-    drug_module = request.values.getlist("drug_module_id")
-    standard_module = request.values.getlist("standard_module_id")
-    consumables_module = request.values.getlist("consumables_module_id")
-    instrument_modulet = request.values.getlist("instrument_module_id")
+    client_module = request.values.getlist("client_module_id[]")
+    drug_module = request.values.getlist("drug_module_id[]")
+    standard_module = request.values.getlist("standard_module_id[]")
+    consumables_module = request.values.getlist("consumables_module_id[]")
+    instrument_modulet = request.values.getlist("instrument_module_id[]")
     inster_dic = {
         "1": client_module if client_module else [],
         "2": drug_module if drug_module else [],