Merge branch 'master' of http://ver.wh613.com:3000/shentun/peisweb

src/request/systemapi.js

@@ -116,9 +116,9 @@ export const examinationgender = (data) => {
   });
 };
 //性别修改
-export const modifygender = (SexId, data) => {
+export const modifygender = (ID, data) => {
   return request({
-    url: `/api/app/sex?SexId=${SexId}`,
+    url: `/api/app/sex/update=${ID}`,
     method: "put",
     data,
   });
@@ -280,7 +280,7 @@ export const statusaddition = (data) => {
 //状态列表修改
 export const statusmodification = (id, data) => {
   return request({
-    url: `/api/app/result-status?ResultStatusId=${id}`,
+    url: `/api/app/result-status?Id=${id}`,
     method: "put",
     data,
   });

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">

src/views/basic-dictionary/CustomerOrgType.vue

@@ -288,9 +288,11 @@ export default {
         })
           .then(() => {
             customerdelat(this.form.id).then((res) => {
-              this.$message.success("删除成功");
-              this.getlist();
-              this.form = {};
+              if (res.code == 0) {
+                this.$message.success("删除成功");
+                this.getlist();
+                this.form = {};
+              }
             });
           })
           .catch(() => {});
@@ -346,9 +348,9 @@ export default {
       this.title = 1;
       this.dialogVisible = true;
       this.form = {};
-       this.$nextTick(()=>{
-        this.$refs.refinput.focus()
-      })
+      this.$nextTick(() => {
+        this.$refs.refinput.focus();
+      });
     },
     //点击列表通过id查询
     rowick(row) {

src/views/basic-dictionary/DiagnosisLevel.vue

@@ -328,13 +328,17 @@ export default {
             this.dialogVisible = false;
           });
         } else if (this.title == 2) {
-          diagnosisedit(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 {
+            diagnosisedit(this.form.id, {
+              displayName: this.form.displayName,
+            }).then((res) => {
+              this.$message.success("修改成功");
+              this.getlist();
+              this.dialogVisible = false;
+            });
+          }
         }
       }
     },
@@ -343,9 +347,9 @@ export default {
       this.title = 1;
       this.dialogVisible = true;
       this.form = {};
-      this.$nextTick(()=>{
-        this.$refs.refinput.focus()
-      })
+      this.$nextTick(() => {
+        this.$refs.refinput.focus();
+      });
     },
     //点击列表通过id查询
     rowick(row) {

src/views/basic-dictionary/ResultStatus.vue

@@ -103,42 +103,59 @@
                 prop="reportBackgroundColor"
               >
                 <el-color-picker
+                  @change="reportBackgroundColorchange"
                   v-model="form.reportBackgroundColor"
-                ></el-color-picker
-                >{{ form.reportBackgroundColor }}
+                ></el-color-picker>
                 <!-- <el-input></el-input> -->
                 <!-- <input type="text" v-model="form.reportBackgroundColor"> -->
-                <!-- <el-input v-model="form.reportBackgroundColor"></el-input> -->
+                <el-input
+                  v-model="form.reportBackgroundColor"
+                  style="
+                    width: 85%;
+                    position: absolute;
+                    top: 0px;
+                    margin-left: 10px;
+                  "
+                ></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item
-                label="报关单字体色"
+                label="报告单字体色"
                 label-width="120px"
                 prop="reportFontColor"
               >
                 <!-- <el-input v-model="form.reportFontColor"></el-input> -->
                 <el-color-picker
                   v-model="form.reportFontColor"
-                ></el-color-picker
-                >{{ form.reportFontColor }}
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="数据录入背景" label-width="100px">
+                  @change="reportFontColorchange"
+                ></el-color-picker>
                 <el-input
-                  v-model="form.dataInputBackgroundColor"
-                  maxlength="6"
+                  v-model="form.reportFontColor"
+                  style="
+                    width: 85%;
+                    position: absolute;
+                    top: 0px;
+                    margin-left: 10px;
+                  "
                 ></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="6" style="margin-left: -20px">
-              <el-form-item label="选择" prop="dataInputBackgroundColor">
+            <el-col :span="12">
+              <el-form-item label="数据录入背景" label-width="100px">
+                <el-color-picker
+                  v-model="form.dataInputBackgroundColor"
+                  @change="dataInputBackgroundColorchange"
+                ></el-color-picker>
                 <el-input
                   v-model="form.dataInputBackgroundColor"
                   maxlength="6"
-                  type="color"
-                  @input="haxadecimal"
+                  style="
+                    width: 85%;
+                    position: absolute;
+                    top: 0px;
+                    margin-left: 10px;
+                  "
                 ></el-input>
               </el-form-item>
             </el-col>
@@ -151,10 +168,16 @@
               >
                 <el-color-picker
                   v-model="form.dataInputFontColor"
+                  @change="dataInputFontColorchange"
                 ></el-color-picker>
                 <el-input
                   v-model="form.dataInputFontColor"
-                  style="width: 50%;margin-left:10px"
+                  style="
+                    width: 85%;
+                    margin-left: 10px;
+                    position: absolute;
+                    top: 0px;
+                  "
                 ></el-input>
               </el-form-item>
             </el-col>
@@ -166,8 +189,10 @@
         </span>
       </el-dialog>
     </el-card>
-    <div style="margin-left:10px">
-      <el-button type="primary" @click="editpopup" style="margin-top:60px">编辑</el-button>
+    <div style="margin-left: 10px">
+      <el-button type="primary" @click="editpopup" style="margin-top: 60px"
+        >编辑</el-button
+      >
     </div>
   </div>
 </template>
@@ -242,6 +267,33 @@ export default {
     this.rowDrop();
   },
   methods: {
+    //数据录入字体
+    dataInputFontColorchange(v) {
+      var hexColor = v;
+      hexColor = hexColor.substring(1);
+      this.form.dataInputFontColor = parseInt(hexColor, 16);
+    },
+    //数据录入背景
+    dataInputBackgroundColorchange(v) {
+      var hexColor = v;
+      hexColor = hexColor.substring(1);
+      this.form.dataInputBackgroundColor = parseInt(hexColor, 16);
+    },
+    //报告单字体色
+    reportFontColorchange(v) {
+      var hexColor = v;
+      hexColor = hexColor.substring(1);
+      this.form.reportFontColor = parseInt(hexColor, 16);
+    },
+    //报告单背景色
+    reportBackgroundColorchange(v) {
+      var hexColor = v;
+      // 去除开头的#号
+      hexColor = hexColor.substring(1);
+      // 转换为十进制
+      this.form.reportBackgroundColor = parseInt(hexColor, 16);
+      console.log(this.form.reportBackgroundColor);
+    },
     rowclick(row) {
       this.form = row;
       console.log(row);
@@ -347,12 +399,10 @@ export default {
               // displayName: this.form.displayName,
               dataInputPrompt: this.form.dataInputPrompt,
               reportPrompt: this.form.reportPrompt,
-              reportBackgroundColor: Number(this.form.reportBackgroundColor),
-              reportFontColor: Number(this.form.reportFontColor),
-              dataInputBackgroundColor: Number(
-                this.form.dataInputBackgroundColor
-              ),
-              dataInputFontColor: Number(this.form.dataInputFontColor),
+              reportBackgroundColor: this.form.reportBackgroundColor,
+              reportFontColor: this.form.reportFontColor,
+              dataInputBackgroundColor: this.form.dataInputBackgroundColor,
+              dataInputFontColor: this.form.dataInputFontColor,
             };
             statusmodification(this.form.id, obj).then((res) => {
               this.$message.success("修改成功");

src/views/basic-dictionary/SampleContainer.vue

@@ -71,7 +71,7 @@
           <el-form ref="form" :model="form" label-width="80px" :rules="rules">
             <el-row>
               <el-col :span="8">
-                <el-form-item label="编号" prop="displayName">
+                <el-form-item label="编号" prop="">
                   <el-input v-model="form.id" disabled></el-input>
                 </el-form-item>
               </el-col>
@@ -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();

src/views/basic-dictionary/Sex.vue

@@ -35,7 +35,12 @@
         </el-table>
         <div class="cancelorconfirm"></div>
         <!--  -->
-        <el-dialog title="修改" :visible.sync="dialogVisible" width="40%">
+        <el-dialog
+          title="修改"
+          :visible.sync="dialogVisible"
+          width="40%"
+          :before-close="handleClose"
+        >
           <el-form ref="form" :model="form">
             <el-row>
               <el-col :span="12">
@@ -95,6 +100,7 @@ import {
   genderbottomtotop,
   modifydraganddrop,
 } from "../../request/systemapi";
+import { postapi } from "@/api/api";
 export default {
   data() {
     return {
@@ -114,6 +120,13 @@ export default {
     this.rowDrop();
   },
   methods: {
+    handleClose(done) {
+      this.$confirm("确认关闭？")
+        .then((_) => {
+          done();
+        })
+        .catch((_) => {});
+    },
     rowick(row) {
       this.form = row;
     },
@@ -194,14 +207,32 @@ export default {
     },
     //确定修改
     confirmmodification() {
-      modifygender(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.form.simpleCode == "") {
+        this.$message.warning("请输入快捷码");
+      } else {
+        // modifygender(this.form.id, {
+        //   displayName: this.form.displayName,
+        //   simpleCode: this.form.simpleCode,
+        // }).then((res) => {
+        //   if (res.code == 1) {
+        //     this.$message.success("修改成功");
+        //     this.getlist();
+        //     this.dialogVisible = false;
+        //   }
+        // });
+        postapi(`/api/app/sex/update/${this.form.id}`, {
+          displayName: this.form.displayName,
+          simpleCode: this.form.simpleCode,
+        }).then((res) => {
+          if (res.code == 1) {
+            this.$message.success("修改成功");
+            this.getlist();
+            this.dialogVisible = false;
+          }
+        });
+      }
     },
     //编辑弹框
     eddte() {
@@ -209,6 +240,7 @@ export default {
         this.$message.warning("请选择操作的数据");
       } else {
         let obj = Object.assign({}, this.form);
+        console.log(obj);
         this.form = obj;
         this.dialogVisible = true;
       }

src/views/fee-settings/Item.vue

@@ -261,7 +261,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="诊断函数" prop="diagnosisFunction">
+            <el-form-item label="诊断函数" prop="">
               <el-input
                 v-model="form.diagnosisFunction"
                 :disabled="disableddiagnosisFunction"
@@ -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"
@@ -1012,6 +1012,7 @@ export default {
         inputCheck: "",
         isActive: "",
       },
+      
       referenceRangeTypeFlag: [
         {
           value: "0",

src/views/user-list/AuditLog.vue

@@ -90,7 +90,7 @@ export default {
       pages: {
         skipCount: 0,
         maxResultCount: 20,
-        sorting
+        // sorting
       },
       dialogVisible: false,
       detailedinformationdata: [],

src/views/user-list/UserList.vue

@@ -138,14 +138,12 @@
                   </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">
@@ -265,7 +263,12 @@
                     prop="password"
                     v-if="title == 1 ? true : false"
                   >
-                    <el-input v-model="form.password" type="password"></el-input> </el-form-item
+                    <el-input
+                    show-password
+                      v-model="form.password"
+                      type="password"
+                      autocomplete='new-password' 
+                    ></el-input> </el-form-item
                 ></el-col>
 
                 <!-- <el-col :span="12">
@@ -803,9 +806,9 @@ export default {
               this.$message.success("请选择角色");
             } else {
               newlists(obj).then((res) => {
-                this.dialogVisible = false;
-                this.$message.success("新增成功");
                 if (res.code == 1) {
+                  this.dialogVisible = false;
+                  this.$message.success("新增成功");
                   // selectbinding({orgId:this.nodekes}).then(r=>{
                   //   this.$message.success('绑定成功')
                   // })
@@ -836,11 +839,12 @@ export default {
               // let tempArr=[]
 
               editmodify(this.form.id, obj).then((res) => {
-                if (res.status == 200) {
+                if (res.code == 1) {
+                  this.$message.success("修改成功");
+                  this.dialogVisible = false;
+                  this.getlist();
                 }
-                this.$message.success("修改成功");
-                this.dialogVisible = false;
-                this.getlist();
+
                 console.log(res);
                 if (res.code == 1) {
                   selectbinding({