标本容器，修改密码,婚姻状况,仪器类别

src/views/Home.vue

@@ -12,6 +12,18 @@
                   @click.native="$router.push({ path: '/organization-units' })"
                   >组织架构</el-dropdown-item
                 >
+<<<<<<< HEAD
+=======
+                <el-dropdown-item
+                  @click.native="$router.push({ path: '/role' })"
+                  >角色管理</el-dropdown-item
+                >
+                <el-dropdown-item
+                  @click.native="$router.push({ path: '/user-list' })"
+                  >用户管理</el-dropdown-item
+                >
+
+>>>>>>> 99be594 (婚姻状况，标本容器,修改密码组织架构)
                 <el-dropdown-item
                   @click.native="$router.push({ path: '/role' })"
                   >角色管理</el-dropdown-item
@@ -284,6 +296,9 @@
           <el-form-item label="新密码" prop="newPassWord">
             <el-input v-model="form.newPassWord"></el-input>
           </el-form-item>
+          <el-form-item label="确认密码" prop="newPassWord">
+            <el-input v-model="confirmpassword" type="password"></el-input>
+          </el-form-item>
         </el-form>
         <span slot="footer" class="dialog-footer">
           <el-button @click="dialogVisible = false">取 消</el-button>
@@ -521,6 +536,7 @@ export default {
         oldPassWord: "",
         newPassWord: "",
       },
+      confirmpassword: "",
       rules: {
         oldPassWord: [
           { required: true, message: "请输入旧密码", trigger: "blur" },
@@ -547,6 +563,8 @@ export default {
         if (valid) {
           if (this.form.oldPassWord != this.password) {
             this.$message.warning("旧密码输入错误");
+          } else if (this.confirmpassword != this.form.newPassWord) {
+            this.$message.warning("二次输入的密码不一致");
           } else {
             postapi("/api/identity/users/updatepassword", this.form).then(
               (res) => {

src/views/basic-dictionary/CommonCharType.vue

@@ -332,7 +332,10 @@ export default {
             this.dialogVisible = false;
           });
         } else if (this.title == 2) {
-          modifycharacters(this.form.id, {
+          if(this.form.displayName==''){
+            this.$message.warning('请输入名称')
+          }else{
+  modifycharacters(this.form.id, {
             displayName: this.form.displayName,
           }).then((res) => {
             this.$message.success("修改成功");
@@ -340,6 +343,8 @@ export default {
             this.dialogVisible = false;
           });
         }
+          }
+        
       }
     },
     //新增弹框

src/views/basic-dictionary/DeviceType.vue

@@ -88,7 +88,7 @@
           >
             <el-row>
               <el-col :span="9">
-                <el-form-item label="编号" prop="displayName">
+                <el-form-item label="编号" prop="">
                   <el-input
                     v-model="form.id"
                     style="width: 90%"
@@ -128,7 +128,7 @@
                 <el-divider></el-divider>
               </div>
               <el-col :span="4" style="margin-left: 15px">
-                <el-form-item label="创建者" prop="displayName">
+                <el-form-item label="创建者" prop="">
                   <el-input v-model="form.creatorName" disabled></el-input>
                 </el-form-item>
               </el-col>

src/views/basic-dictionary/GuideType.vue

@@ -180,7 +180,7 @@
               <el-col :span="12">
                 <el-form-item label="名称">
                   <el-input
-                ref="refinput"
+                    ref="refinput"
                     v-model="form.displayName"
                     style="width: 65%"
                   ></el-input>
@@ -375,7 +375,6 @@ export default {
     this.getlists();
   },
   mounted() {
-   
     window.onresize = () => {
       return (() => {
         // window.innerHeight:浏览器的可用高度
@@ -708,9 +707,13 @@ export default {
           type: "warning",
         }).then(() => {
           deletion(this.form.id).then((res) => {
-            console.log(res);
-            this.$message.success("删除成功");
-            this.getlists();
+            if (res.Code == -1) {
+              // this.$message.warning(res.Message);
+            } else {
+              console.log(res);
+              this.$message.success("删除成功");
+              this.getlists();
+            }
           });
         });
         // deletion(this.form.id).then((res) => {
@@ -725,11 +728,10 @@ export default {
       this.dialogVisible = true;
       this.form = {};
       this.title = 1;
-      this.$nextTick(()=>{
-        this.$refs.refinput.focus()
-      })
+      this.$nextTick(() => {
+        this.$refs.refinput.focus();
+      });
       // this.$refs.refinput.focus()
-      
     },
     //编辑弹框
     editandmofin(row) {

src/views/basic-dictionary/MaritalStatus.vue

@@ -208,9 +208,11 @@ export default {
     //编辑修改弹框
     editreport(row) {
       console.log(this.form);
-      if (this.form.displayName == "") {
+      if (this.form.id == "") {
         this.$message.warning("请选择");
       } else {
+        let obj = Object.assign({}, this.form);
+        this.form = obj;
         this.dialogVisible = true;
       }
 
@@ -219,14 +221,20 @@ export default {
     },
     //确定修改
     confirmmodification() {
-      modificationstatus(this.form.id, {
-        displayName: this.form.displayName,
-        simpleCode: this.form.simpleCode,
-      }).then((res) => {
-        this.$message.success("修改成功");
-        this.getlist();
-        this.dialogVisible = false;
-      });
+      if (this.form.displayName == "") {
+        this.$message.warning("请输入名称");
+      } else if (this.simpleCode == "") {
+        this.$message.warning("请输入快捷吗");
+      } else {
+        modificationstatus(this.form.id, {
+          displayName: this.form.displayName,
+          simpleCode: this.form.simpleCode,
+        }).then((res) => {
+          this.$message.success("修改成功");
+          this.getlist();
+          this.dialogVisible = false;
+        });
+      }
     },
     //
     getlist() {

src/views/basic-dictionary/SampleContainer.vue

@@ -77,15 +77,26 @@
               </el-col>
               <el-col :span="5">
                 <el-form-item label="名称" prop="displayName">
-                  <el-input v-model="form.displayName" ref="refinput"></el-input>
+                  <el-input
+                    v-model="form.displayName"
+                    ref="refinput"
+                  ></el-input>
                 </el-form-item>
               </el-col>
-              <el-col :span="5">
-                <el-form-item label="颜色" prop="containerColor">
+              <el-col :span="6">
+                <el-color-picker
+                  v-model="form.containerColor"
+                  @change="colorchange"
+                ></el-color-picker>
+                <el-form-item
+                  label="颜色"
+                  prop="containerColor"
+                  style="width: 90%; margin-top: -40px"
+                >
                   <el-input v-model="form.containerColor"></el-input>
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
+              <el-col :span="5">
                 <el-form-item label="容器名称" prop="containerColorName">
                   <el-input v-model="form.containerColorName"></el-input>
                 </el-form-item>
@@ -219,6 +230,10 @@ export default {
     this.rowDrop();
   },
   methods: {
+    colorchange(v) {
+      this.form.containerColor = parseInt(v)
+      console.log(this.form.containerColor);
+    },
     //取消排序
     cancellation() {
       this.$message.info("取消操作");
@@ -370,9 +385,9 @@ export default {
       this.title = 1;
       this.dialogVisible = true;
       this.form = {};
-      this.$nextTick(()=>{
-        this.$refs.refinput.focus()
-      })
+      this.$nextTick(() => {
+        this.$refs.refinput.focus();
+      });
     },
     getlist() {
       containerlist(this.pages).then((res) => {

src/views/basic-dictionary/SampleType.vue

@@ -81,6 +81,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
+              
                 <el-form-item label="名称">
                   <el-input
                     ref="refinput"
@@ -339,7 +340,10 @@ export default {
           this.$message.warning("请输入名称");
         }
       } else if (this.title == 2) {
-        editingspecimens(this.form.id, {
+        if(this.form.displayName==''){
+          this.$message.warning('请输入名称')
+        }else{
+  editingspecimens(this.form.id, {
           displayName: this.form.displayName,
         }).then((res) => {
           this.$message.success("修改成功");
@@ -348,6 +352,8 @@ export default {
           this.form = {};
         });
       }
+        }
+      
     },
     //新增弹框
     add() {

src/views/basic-dictionary/Sex.vue

@@ -39,7 +39,7 @@
           <el-form ref="form" :model="form">
             <el-row>
               <el-col :span="12">
-                <el-form-item label="性别">
+                <el-form-item label="性别" label-width="80px">
                   <el-input
                     v-model="form.displayName"
                     style="width: 80%"
@@ -47,7 +47,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="快捷码">
+                <el-form-item label="快捷码" label-width="80px">
                   <el-input
                     v-model="form.simpleCode"
                     style="width: 80%"
@@ -208,6 +208,8 @@ export default {
       if (this.form.id == undefined) {
         this.$message.warning("请选择操作的数据");
       } else {
+        let obj = Object.assign({}, this.form);
+        this.form = obj;
         this.dialogVisible = true;
       }
     },

src/views/basic-dictionary/Unit.vue

@@ -98,7 +98,7 @@
               <el-col :span="12">
                 <el-form-item label="名称">
                   <el-input
-                  ref="refinput"
+                    ref="refinput"
                     v-model="form.displayName"
                     style="width: 70%"
                   ></el-input>
@@ -367,13 +367,17 @@ export default {
             this.dialogVisible = false;
           });
         } else if (this.title == 2) {
-          editunit(this.form.id, { displayName: this.form.displayName }).then(
-            (res) => {
-              this.$message.success("修改成功");
-              this.getlist();
-              this.dialogVisible = false;
-            }
-          );
+          if (this.form.displayName == "") {
+            this.$message.warning("请输入名称");
+          } else {
+            editunit(this.form.id, { displayName: this.form.displayName }).then(
+              (res) => {
+                this.$message.success("修改成功");
+                this.getlist();
+                this.dialogVisible = false;
+              }
+            );
+          }
         }
       }
     },
@@ -382,9 +386,9 @@ export default {
       this.dialogVisible = true;
       this.title = 1;
       this.form = {};
-      this.$nextTick(()=>{
-        this.$refs.refinput.focus()
-      })
+      this.$nextTick(() => {
+        this.$refs.refinput.focus();
+      });
     },
     getlist() {
       unitlist(this.pages).then((res) => {

src/views/fee-settings/MedicalPackage.vue

@@ -663,9 +663,9 @@ export default {
       this.dialogVisible = true;
       this.title = 1;
       this.form = {};
-      this.$nextTick(()=>{
-        this.$refs.refinput.focus()
-      })
+      this.$nextTick(() => {
+        this.$refs.refinput.focus();
+      });
     },
     getlist() {
       getapi("/api/app/medical-package/in-filter", this.pages).then((res) => {

src/views/fee-settings/PayMode.vue

@@ -198,13 +198,17 @@ export default {
     },
     // 确定修改编辑
     addoredit() {
-      paymentediting(this.form.id, {
-        displayName: this.form.displayName,
-      }).then((res) => {
-        this.$message.success("修改成功");
-        this.getlist();
-        this.dialogVisible = false;
-      });
+      if (this.form.displayName == "") {
+        this.$message.warning("请输入名称");
+      } else {
+        paymentediting(this.form.id, {
+          displayName: this.form.displayName,
+        }).then((res) => {
+          this.$message.success("修改成功");
+          this.getlist();
+          this.dialogVisible = false;
+        });
+      }
     },
     //编辑弹框
     editpopup() {
@@ -212,6 +216,8 @@ export default {
         this.$message.warning("请点击选择操作的数据");
       } else {
         this.dialogVisible = true;
+        let copy = Object.assign({}, this.form);
+        this.form = copy;
         // invoiceidquery(this.form.payModeId).then((res) => {
         //   console.log(res);
         //   this.form = res.data;

src/views/login/Login.vue

@@ -106,6 +106,7 @@ export default {
               window.localStorage.setItem("user", this.form.Username);
               this.$message.success(msgs,+"登录成功");
               this.$router.push({ path: "home" });
+              this.$store.state.changepassword = this.form.Password;
             })
             .catch((err) => {});
 

src/views/user-list/OrganizationUnits.vue

@@ -147,7 +147,7 @@ export default {
           }).then((res) => {
             this.$message.success("新增成功");
             this.dialogVisible = false;
-            // this.form = {};
+          this.form.displayName=''
             this.getonorganization();
           });
         }
@@ -211,7 +211,7 @@ export default {
       if (this.title == 3) {
         this.dialogVisible = true;
         this.form.parentId = data.id;
-        this.form.displayName = "";
+        // this.form.displayName = "";
         console.log(this.form.parentId);
         console.log(this.form);
       }

src/views/user-list/UserList.vue

@@ -138,12 +138,14 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
+                    
                   <el-form-item
                     label="密码"
                     prop="password"
                     v-if="title == 1 ? true : false"
                   >
-                    <el-input v-model="form.password"></el-input> </el-form-item
+               
+                    <el-input v-model="form.password" ></el-input> </el-form-item
                 ></el-col>
 
                 <!-- <el-col :span="12">
@@ -263,7 +265,7 @@
                     prop="password"
                     v-if="title == 1 ? true : false"
                   >
-                    <el-input v-model="form.password"></el-input> </el-form-item
+                    <el-input v-model="form.password" type="password"></el-input> </el-form-item
                 ></el-col>
 
                 <!-- <el-col :span="12">
@@ -407,7 +409,7 @@
       </el-dialog>
       <!-- 修改密码弹框 -->
       <el-dialog
-        :title="'修改密码' + '当前用户' + usersName"
+        :title="'修改密码' + '用户' + usersName"
         :visible.sync="editpassworddialogVisible"
         width="30%"
       >
@@ -416,6 +418,11 @@
             <el-input v-model="newPassWord" max="16" min="6"></el-input>
           </el-form-item>
         </el-form>
+        <el-form ref="form" :model="form" label-width="80px">
+          <el-form-item label="确认密码">
+            <el-input v-model="confarmPassWord" max="16" min="6"></el-input>
+          </el-form-item>
+        </el-form>
         <span slot="footer" class="dialog-footer">
           <el-button @click="editpassworddialogVisible = false"
             >取 消</el-button
@@ -462,6 +469,7 @@ let validatePassword = /^[a-zA-Z0-9@\$\^\.\*\\?]\{6,15}$/;
 export default {
   data() {
     return {
+      confarmPassWord: "", //确认密码
       usersName: "", //用户名
       defaultchekedKeys: [], //默认选中的科室
       department: [], //选中的科室
@@ -516,6 +524,13 @@ export default {
             trigger: ["blur", "change"],
           },
         ],
+        phoneNumber: [
+          { required: true, message: "请输入手机号", trigger: "blur" },
+        ],
+
+        userName: [
+          { required: true, message: "请输入用户名", trigger: "blur" },
+        ],
         surname: [
           { required: true, message: "请输入用户名称", trigger: "change" },
         ],
@@ -587,6 +602,10 @@ export default {
     Changepassword() {
       if (this.newPassWord == "") {
         this.$message.warning("请输入新密码");
+      } else if (this.confarmPassWord == "") {
+        this.$message.warning("请输入确认密码");
+      } else if (this.newPassWord != this.confarmPassWord) {
+        this.$message.warning("二次输入密码不一致");
       } else {
         postapi("/api/identity/users/resetpassword", {
           userId: this.passwordid,