From bcd17f4691538a12b37b6d3d700e7ff61d85c99e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BD=97=E6=96=8C=E6=9D=B0?= <>
Date: Wed, 8 May 2024 18:06:35 +0800
Subject: [PATCH] ui

---
 src/views/common-settings/ItemType.vue | 39 ++++++++++++++++++++++----
 src/views/user-list/UserList.vue       |  6 ++--
 2 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/src/views/common-settings/ItemType.vue b/src/views/common-settings/ItemType.vue
index af3b037..c8a6a7d 100644
--- a/src/views/common-settings/ItemType.vue
+++ b/src/views/common-settings/ItemType.vue
@@ -151,8 +151,12 @@
       width="40%"
       :close-on-click-modal="false"
     >
-      <span v-if="title == 2 ? true : false">上级部门</span>
-      <el-cascader
+      
+      <el-form :model="form" label-width="80px" :rules="rules" ref="ruleForm">
+        <el-row v-if="title == 2 ? true : false">
+          <el-col :span="12">
+            <el-form-item label="上级部门">
+              <el-cascader
         v-if="title == 2"
         ref="depref"
         @change="cascaderchang"
@@ -169,7 +173,9 @@
         clearable
         size="small"
       ></el-cascader>
-      <el-form :model="form" label-width="80px" :rules="rules" ref="ruleForm">
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="名称" prop="displayName">
@@ -235,7 +241,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item label="合并组合" prop="isMergeAsbitem">
               <!-- <el-select v-model="form.isMergeAsbitem" placeholder="请选择" style="width: 100%" size="small">
                 <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
@@ -248,7 +254,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item
               label="结果是否换行"
               prop="isWrap"
@@ -261,6 +267,19 @@
               />
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item
+              label="支持检查申请"
+              prop="isCheckRequest"
+              label-width="100px"
+            >
+              <el-checkbox
+                v-model="form.isCheckRequest"
+                true-label="Y"
+                false-label="N"
+              />
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -302,6 +321,9 @@ export default {
         isWrap: [
           { required: true, message: "请选择结果是否换行", trigger: "blur" },
         ],
+        isCheckRequest: [
+          { required: true, message: "请选择是否支持检查申请", trigger: "blur" },
+        ],
         checkTypeFlag: [
           { required: true, message: "请选择检查类别", trigger: "blur" },
         ],
@@ -360,6 +382,7 @@ export default {
         medicalReportTypeId: "",
         isWrap: "N", // 是否换行
         lineModeFlagBox: false, // 是否换行box
+        isCheckRequest:"N"
       },
       value: "", //指引类别选择的数据
       dialogVisible: false,
@@ -658,10 +681,12 @@ export default {
                 guidTypeId: this.form.guidTypeId,
                 medicalReportTypeId: this.form.medicalReportTypeId,
                 isWrap: this.form.isWrap,
+                isCheckRequest:this.form.isCheckRequest
               }).then((res) => {
                 if (res.code != -1) {
                   //this.$message.success("新增成功");
                   this.getlist();
+                  this.$refs["tableData"].setCurrentRow("");
                   this.dialogVisible = false;
                   this.isshow = true;
                 }
@@ -675,10 +700,12 @@ export default {
                 guidTypeId: this.form.guidTypeId,
                 medicalReportTypeId: this.form.medicalReportTypeId,
                 isWrap: this.form.isWrap,
+                isCheckRequest:this.form.isCheckRequest
               }).then((res) => {
                 if (res.code != -1) {
                   //this.$message.success("新增成功");
                   this.getlist();
+                  this.$refs["tableData"].setCurrentRow("");
                   this.dialogVisible = false;
                   this.isshow = true;
                 }
@@ -695,10 +722,12 @@ export default {
               guidTypeId: this.form.guidTypeId,
               medicalReportTypeId: this.form.medicalReportTypeId,
               isWrap: this.form.isWrap,
+              isCheckRequest:this.form.isCheckRequest
             }).then((res) => {
               if (res.code != -1) {
                 //this.$message.success("修改成功");
                 this.getlist();
+                this.$refs["tableData"].setCurrentRow("");
                 this.dialogVisible = false;
                 this.isshow = true;
               }
diff --git a/src/views/user-list/UserList.vue b/src/views/user-list/UserList.vue
index aa8ea36..8a6772b 100644
--- a/src/views/user-list/UserList.vue
+++ b/src/views/user-list/UserList.vue
@@ -539,7 +539,7 @@
       </el-dialog>
       <!-- 修改密码弹框 -->
       <el-dialog
-        :title="'修改密码' + '用户' + usersName"
+        :title="`修改用户${usersName}密码`"
         :visible.sync="editpassworddialogVisible"
         width="30%"
         :close-on-click-modal="false"
@@ -888,8 +888,8 @@ export default {
         this.$message.warning("请选择操作的数据");
       } else {
         this.editpassworddialogVisible = true;
-        this.passwordid = curRow.id;
-        this.usersName = curRow.userName;
+        this.passwordid = this.curRow.id;
+        this.usersName = this.curRow.surname;
       }
     },
     // 查看用户菜单权限