From bdf8c4c2abfc555ecd9936cd5036dba9103de72d Mon Sep 17 00:00:00 2001
From: "yunpeng.zhang" <zhangyp1015@163.com>
Date: Wed, 3 Jan 2024 17:26:49 +0800
Subject: [PATCH] =?UTF-8?q?[feat]=E6=96=B0=E5=A2=9E=E8=80=97=E6=9D=90?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=E9=BB=98=E8=AE=A4=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/equipments/consumables.vue | 16 +++++++++++++---
 src/views/login.vue                  |  4 ++--
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/views/equipments/consumables.vue b/src/views/equipments/consumables.vue
index a0edee0..39e5686 100644
--- a/src/views/equipments/consumables.vue
+++ b/src/views/equipments/consumables.vue
@@ -59,7 +59,7 @@
       </el-form-item> -->
       <el-form-item label="负责人" prop="chargeUser">
         <el-select
-          v-model="form.chargeUser"
+          v-model="queryParams.chargeUser"
           placeholder="请选择负责人"
           @keyup.enter="handleQuery"
         >
@@ -212,7 +212,7 @@
         label-width="120px"
       >
         <el-form-item label="设备" prop="equipmentId">
-          <el-select v-model="form.equipmentId" placeholder="请选择设备">
+          <el-select v-model="form.equipmentId" placeholder="请选择设备" disabled>
             <el-option
               v-for="item in equipmentOptions"
               :key="item.equipmentId"
@@ -309,6 +309,8 @@ import {
 } from "@/api/equipments/consumables";
 import { optionSelect as getEquipmentOptionSelect } from "@/api/equipments/equipments";
 import { userOptionsSelect as getUserOptionSelect } from "@/api/system/user";
+import useUserStore from '@/store/modules/user';
+import { ref } from "vue";
 const { proxy } = getCurrentInstance();
 
 const consumablesList = ref([]);
@@ -321,7 +323,6 @@ const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
 const title = ref("");
-const defaultEquipment = ref("");
 const equipmentOptions = ref([]);
 const userOptions = ref([]);
 const route = useRoute();
@@ -329,6 +330,10 @@ const { sys_time_unit, consumable_status } = proxy.useDict(
   "sys_time_unit",
   "consumable_status"
 );
+const defaultEquipment = ref("");
+const defaultValidityUint = ref("M");
+const defaultStatus = ref("0");
+const defaultChargeUser = useUserStore().id;
 
 const data = reactive({
   form: {},
@@ -440,6 +445,7 @@ function handleQuery() {
 /** 重置按钮操作 */
 function resetQuery() {
   proxy.resetForm("queryRef");
+  queryParams.value.equipmentId = defaultEquipment;
   handleQuery();
 }
 
@@ -455,6 +461,10 @@ function handleAdd() {
   reset();
   open.value = true;
   title.value = "添加设备耗材";
+  form.value.equipmentId = queryParams.value.equipmentId;
+  form.value.status = defaultStatus;
+  form.value.validityUint = defaultValidityUint;
+  form.value.chargeUser = defaultChargeUser;
 }
 
 /** 修改按钮操作 */
diff --git a/src/views/login.vue b/src/views/login.vue
index f4e7f2a..f1d6e1f 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -75,8 +75,8 @@ const router = useRouter();
 const { proxy } = getCurrentInstance();
 
 const loginForm = ref({
-  username: "admin",
-  password: "admin123",
+  username: "",
+  password: "",
   rememberMe: false,
   code: "",
   uuid: ""