From b83554ea2e512f6f277f6e048259a050505da856 Mon Sep 17 00:00:00 2001
From: mch <1332099529@qq.com>
Date: Thu, 3 Aug 2023 11:53:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E6=9C=AC=E5=AE=B9=E5=99=A8=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Home.vue                            |  6 ++---
 .../basic-dictionary/SampleContainer.vue      | 22 +++++++++++++++----
 src/views/fee-settings/Item.vue               |  2 +-
 src/views/user-list/UserList.vue              |  2 ++
 4 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/src/views/Home.vue b/src/views/Home.vue
index d1e2566..b6c0dbd 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -279,13 +279,13 @@
           label-width="100px"
         >
           <el-form-item label="旧密码" prop="oldPassWord">
-            <el-input v-model="form.oldPassWord"></el-input>
+            <el-input v-model="form.oldPassWord" autocomplete='new-password'  show-password></el-input>
           </el-form-item>
           <el-form-item label="新密码" prop="newPassWord">
-            <el-input v-model="form.newPassWord"></el-input>
+            <el-input v-model="form.newPassWord" autocomplete='new-password'  show-password></el-input>
           </el-form-item>
           <el-form-item label="确认密码" prop="newPassWord">
-            <el-input v-model="confirmpassword" type="password"></el-input>
+            <el-input v-model="confirmpassword" type="password" autocomplete='new-password'  show-password></el-input>
           </el-form-item>
         </el-form>
         <span slot="footer" class="dialog-footer">
diff --git a/src/views/basic-dictionary/SampleContainer.vue b/src/views/basic-dictionary/SampleContainer.vue
index 80acc89..f793e46 100644
--- a/src/views/basic-dictionary/SampleContainer.vue
+++ b/src/views/basic-dictionary/SampleContainer.vue
@@ -93,7 +93,12 @@
                   prop="containerColor"
                   style="width: 90%; margin-top: -40px"
                 >
-                  <el-input v-model="form.containerColor"></el-input>
+                  <el-input
+                    v-model="form.containerColor"
+                    maxlength="8"
+                    minlength="6"
+                    @change="colorchange"
+                  ></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="5">
@@ -231,8 +236,17 @@ export default {
   },
   methods: {
     colorchange(v) {
-      this.form.containerColor = parseInt(v)
+      var hexColor = v;
+
+      // 去除开头的#号
+      hexColor = hexColor.substring(1);
+
+      // 转换为十进制
+      this.form.containerColor = parseInt(hexColor, 16);
+
       console.log(this.form.containerColor);
+      // this.form.containerColor = parseInt(v)
+      // console.log(this.form.containerColor);
     },
     //取消排序
     cancellation() {
@@ -360,7 +374,7 @@ export default {
             newlyspecimen({
               displayName: this.form.displayName,
               containerColorName: this.form.containerColorName,
-              containerColor: Number(this.form.containerColor),
+              containerColor: this.form.containerColor,
             }).then((res) => {
               this.$message.success("新增成功");
               this.getlist();
@@ -370,7 +384,7 @@ export default {
             specimenediting(this.form.id, {
               displayName: this.form.displayName,
               containerColorName: this.form.containerColorName,
-              containerColor: Number(this.form.containerColor),
+              containerColor: this.form.containerColor,
             }).then((res) => {
               this.$message.success("修改成功");
               this.getlist();
diff --git a/src/views/fee-settings/Item.vue b/src/views/fee-settings/Item.vue
index 5cbbb27..c494c3d 100644
--- a/src/views/fee-settings/Item.vue
+++ b/src/views/fee-settings/Item.vue
@@ -308,7 +308,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="结果模板" prop="resultTemplateTypeFlag">
+            <el-form-item label="项目结果模板" prop="resultTemplateTypeFlag">
               <!-- <el-input v-model="form.resultTemplateTypeFlag">resulttemp</el-input> -->
               <el-select
                 v-model="form.resultTemplateTypeFlag"
diff --git a/src/views/user-list/UserList.vue b/src/views/user-list/UserList.vue
index d475107..c472cc0 100644
--- a/src/views/user-list/UserList.vue
+++ b/src/views/user-list/UserList.vue
@@ -264,8 +264,10 @@
                     v-if="title == 1 ? true : false"
                   >
                     <el-input
+                    show-password
                       v-model="form.password"
                       type="password"
+                      autocomplete='new-password' 
                     ></el-input> </el-form-item
                 ></el-col>