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

2 years ago · 9a1e2b7707
12 changed files with 140 additions and 92 deletions
--- a/src/views/basic-dictionary/CommonChar.vue
+++ b/src/views/basic-dictionary/CommonChar.vue
@ -335,31 +335,38 @@ export default {
    },
    //确定新增或者编辑
    addoredit() {
-      if (this.title == 1) {
-        addingwordes({
-          displayName: this.form.displayName,
-          commonCharTypeId: this.form.ids,
-        }).then((res) => {
-          this.$message.success("新增成功");
-          this.getlist();
-          this.dialogVisible = false;
-          this.form = {};
-        });
-      } else if (this.title == 2) {
-        commoneditors(this.form.id, {
-          displayName: this.form.displayName,
-          commonCharTypeId: this.form.ids,
-        }).then((res) => {
-          this.$message.success("修改成功");
-          this.getlist();
-          this.dialogVisible = false;
-        });
+      if (this.form.displayName == undefined) {
+        this.$message.warning("请输入名称");
+      } else if (this.value == "") {
+        this.$message.warning("请选择项目"); //测试时校验选择项目不为空
+      } else {
+        if (this.title == 1) {
+          addingwordes({
+            displayName: this.form.displayName,
+            commonCharTypeId: this.form.ids,
+          }).then((res) => {
+            this.$message.success("新增成功");
+            this.getlist();
+            this.dialogVisible = false;
+            this.form = {};
+          });
+        } else if (this.title == 2) {
+          commoneditors(this.form.id, {
+            displayName: this.form.displayName,
+            commonCharTypeId: this.form.ids,
+          }).then((res) => {
+            this.$message.success("修改成功");
+            this.getlist();
+            this.dialogVisible = false;
+          });
+        }
      }
    },
    //新增弹框
    add() {
      this.title = 1;
      this.dialogVisible = true;
+      this.form = {};
      categorytype(this.pages).then((res) => {
        this.ars = res.data.items;
        console.log(res);
--- a/src/views/basic-dictionary/CommonCharType.vue
+++ b/src/views/basic-dictionary/CommonCharType.vue
@ -321,20 +321,24 @@ export default {
    },
    //确定新增或者编辑
    addoredit() {
-      if (this.title == 1) {
-        newCharacters({ displayName: this.form.displayName }).then((res) => {
-          this.$message.success("新增成功");
-          this.getlist();
-          this.dialogVisible = false;
-        });
-      } else if (this.title == 2) {
-        modifycharacters(this.form.id, {
-          displayName: this.form.displayName,
-        }).then((res) => {
-          this.$message.success("修改成功");
-          this.getlist();
-          this.dialogVisible = false;
-        });
+      if (this.form.displayName == undefined) {
+        this.$message.warning("请输入名称");
+      } else {
+        if (this.title == 1) {
+          newCharacters({ displayName: this.form.displayName }).then((res) => {
+            this.$message.success("新增成功");
+            this.getlist();
+            this.dialogVisible = false;
+          });
+        } else if (this.title == 2) {
+          modifycharacters(this.form.id, {
+            displayName: this.form.displayName,
+          }).then((res) => {
+            this.$message.success("修改成功");
+            this.getlist();
+            this.dialogVisible = false;
+          });
+        }
      }
    },
    //新增弹框
--- a/src/views/basic-dictionary/CustomerOrgType.vue
+++ b/src/views/basic-dictionary/CustomerOrgType.vue
@ -315,21 +315,25 @@ export default {
    },
    //确定新增或者编辑
    addoredit() {
-      if (this.title == 1) {
-        newcustomers({ displayName: this.form.displayName }).then((res) => {
-          console.log(res);
-          this.$message.success("新增成功");
-          this.getlist();
-          this.dialogVisible = false;
-        });
-      } else if (this.title == 2) {
-        edatcustomer(this.form.id, { displayName: this.form.displayName }).then(
-          (res) => {
+      if (this.form.displayName == undefined) {
+        this.$message.warning("请输入名称");
+      } else {
+        if (this.title == 1) {
+          newcustomers({ displayName: this.form.displayName }).then((res) => {
+            console.log(res);
+            this.$message.success("新增成功");
+            this.getlist();
+            this.dialogVisible = false;
+          });
+        } else if (this.title == 2) {
+          edatcustomer(this.form.id, {
+            displayName: this.form.displayName,
+          }).then((res) => {
            this.$message.success("修改成功");
            this.getlist();
            this.dialogVisible = false;
-          }
-        );
+          });
+        }
      }
    },
    //新增弹框
--- a/src/views/basic-dictionary/DeviceType.vue
+++ b/src/views/basic-dictionary/DeviceType.vue
@ -401,6 +401,7 @@ export default {
    add() {
      this.dialogVisible = true;
      this.title = 1;
+      this.form={}
    },
    //获取列表
    getlist() {
--- a/src/views/basic-dictionary/DiagnosisLevel.vue
+++ b/src/views/basic-dictionary/DiagnosisLevel.vue
@ -314,6 +314,11 @@ export default {
    },
    //确定新增或者编辑
    addoredit() {
+      if(this.form.displayName==undefined){
+           this.$message.warning('请输入名称')        
+      }else{
+
+    
      if (this.title == 1) {
        adddignsic({
          displayName: this.form.displayName,
@ -332,6 +337,7 @@ export default {
          this.dialogVisible = false;
        });
      }
+        }
    },
    //新增弹框
    add() {
--- a/src/views/basic-dictionary/GuideType.vue
+++ b/src/views/basic-dictionary/GuideType.vue
@ -708,7 +708,7 @@ export default {
            console.log(res);
            this.$message.success("删除成功");
            this.getlists();
-            this.form = {};
+          
          });
        });
        // deletion(this.form.id).then((res) => {
@ -721,7 +721,7 @@ export default {
    //新增弹框
    guideadd() {
      this.dialogVisible = true;
-    
+    this.form={}
      this.title = 1;
    },
    //编辑弹框
--- a/src/views/basic-dictionary/ItemDefaultResult.vue
+++ b/src/views/basic-dictionary/ItemDefaultResult.vue
@ -233,7 +233,6 @@ export default {
        Sortable.create(tbody, {
          handle: ".move",
          animation: 300,
-
          onEnd({ newIndex, oldIndex }) {
            _this.isshow = false;
            const currRow = _this.tableData.splice(oldIndex, 1)[0];
@ -313,20 +312,26 @@ export default {
    },
    //确定新增或者编辑
    addoredit() {
-      if (this.title == 1) {
-        addprojecreuitd({ displayName: this.form.displayName }).then((res) => {
-          this.$message.success("新增成功");
-          this.getlist();
-          this.dialogVisible = false;
-        });
-      } else if (this.title == 2) {
-        editprojectresult(this.form.id, {
-          displayName: this.form.displayName,
-        }).then((res) => {
-          this.$message.success("修改成功");
-          this.getlist();
-          this.dialogVisible = false;
-        });
+      if (this.form.displayName == undefined) {
+        this.$message.warning("请输入名称");
+      } else {
+        if (this.title == 1) {
+          addprojecreuitd({ displayName: this.form.displayName }).then(
+            (res) => {
+              this.$message.success("新增成功");
+              this.getlist();
+              this.dialogVisible = false;
+            }
+          );
+        } else if (this.title == 2) {
+          editprojectresult(this.form.id, {
+            displayName: this.form.displayName,
+          }).then((res) => {
+            this.$message.success("修改成功");
+            this.getlist();
+            this.dialogVisible = false;
+          });
+        }
      }
    },
    //新增弹框
--- a/src/views/basic-dictionary/MedicalConclusion.vue
+++ b/src/views/basic-dictionary/MedicalConclusion.vue
@ -471,6 +471,8 @@ export default {
    add() {
      this.title = 1;
      this.dialogVisible = true;
+      this.form={}
+      this.selars=''
      medicalconclusionlist(this.pages).then((res) => {
        this.ars = res.data.items;
        console.log(res);
--- a/src/views/common-settings/ItemType.vue
+++ b/src/views/common-settings/ItemType.vue
@ -274,11 +274,11 @@ export default {
      console.log(node, data);
    },
    append(node, data) {
-      this.form.parentId = data.id;
-      console.log(data);
+      console.log(node,data);
+      this.form={}
+      this.form.parentId = data.id;   
      this.dialogVisible = true;
      basicsetings().then((res) => {
-        console.log(res);
        this.guideoptions = res.data.items;
      });
      physicalexaminationlist().then((res) => {
--- a/src/views/common-settings/SampleGroup.vue
+++ b/src/views/common-settings/SampleGroup.vue
@ -56,7 +56,7 @@
          :visible.sync="dialogVisible"
          width="53%"
        >
-          <el-form ref="form" :model="form" label-width="80px">
+          <el-form ref="form" :model="form" label-width="80px" :rules="rules">
            <el-row>
              <el-col :span="12">
                <el-form-item label="编号">
@ -64,12 +64,12 @@
                </el-form-item>
              </el-col>
              <el-col :span="12">
-                <el-form-item label="名称">
+                <el-form-item label="名称" prop="displayName">
                  <el-input v-model="form.displayName"></el-input>
                </el-form-item>
              </el-col>
              <el-col :span="12">
-                <el-form-item label="标本类型">
+                <el-form-item label="标本类型" prop="sampleTypeId">
                  <el-select v-model="form.sampleTypeId" placeholder="请选择">
                    <el-option
                      v-for="item in sampleTypeId"
@ -82,7 +82,7 @@
                </el-form-item>
              </el-col>
              <el-col :span="12">
-                <el-form-item label="标本容器">
+                <el-form-item label="标本容器" prop="sampleContainerId">
                  <el-select
                    v-model="form.sampleContainerId"
                    placeholder="请选择"
@ -264,8 +264,18 @@ import { specimenlist, containerlist } from "@/request/systemapi";
 export default {
  data() {
    return {
+      rules: {
+        displayName: [
+          { required: true, message: "请输入活动名称", trigger: "blur" },
+        ],
+        sampleTypeId: [
+          { required: true, message: "请选择标本类型", trigger: "change" },
+        ],
+        sampleContainerId: [
+          { required: true, message: "请选择标本容器", trigger: "change" },
+        ],
+      },
      isdislob: true,
-
      filetelists: [],
      flitvalues: [],
      checked: [],
@ -585,27 +595,31 @@ export default {
    },
    //确定新增或者编辑
    addoredit() {
-      if (this.title == 1) {
-        samplegroup({
-          displayName: this.form.displayName,
-          sampleTypeId: this.form.sampleTypeId,
-          sampleContainerId: this.form.sampleContainerId,
-        }).then((res) => {
-          this.$message.success("新增成功");
-          this.getlist();
-          this.dialogVisible = false;
-        });
-      } else if (this.title == 2) {
-        barcodeediting(this.form.id, {
-          displayName: this.form.displayName,
-          sampleTypeId: this.form.sampleTypeId,
-          sampleContainerId: this.form.sampleContainerId,
-        }).then((res) => {
-          this.$message.success("修改成功");
-          this.dialogVisible = false;
-          this.getlist();
-        });
-      }
+      this.$refs.form.validate((v) => {
+        if (v) {
+          if (this.title == 1) {
+            samplegroup({
+              displayName: this.form.displayName,
+              sampleTypeId: this.form.sampleTypeId,
+              sampleContainerId: this.form.sampleContainerId,
+            }).then((res) => {
+              this.$message.success("新增成功");
+              this.getlist();
+              this.dialogVisible = false;
+            });
+          } else if (this.title == 2) {
+            barcodeediting(this.form.id, {
+              displayName: this.form.displayName,
+              sampleTypeId: this.form.sampleTypeId,
+              sampleContainerId: this.form.sampleContainerId,
+            }).then((res) => {
+              this.$message.success("修改成功");
+              this.dialogVisible = false;
+              this.getlist();
+            });
+          }
+        }
+      });
    },
    //新增弹框
    addll() {
--- a/src/views/fee-settings/InvoiceItemType.vue
+++ b/src/views/fee-settings/InvoiceItemType.vue
@ -307,6 +307,9 @@ export default {
    },
    // 确定新增或者编辑
    async addoredit() {
+      if(this.form.displayName==undefined){
+        this.$message.warning('请输入名称')
+      }else {   
      if (this.title == 1) {
        let res = await addinvoice({ displayName: this.form.displayName });
        if (res.code == 1) {
@ -323,11 +326,13 @@ export default {
          this.dialogVisible = false;
        });
      }
+        }
    },
    //新增弹框
    addll() {
      this.dialogVisible = true;
      this.title = 1;
+      this.form={}
    },
    // 点击每一列根据id获取并调用接口
    rowick(row) {
--- a/src/views/fee-settings/PayMode.vue
+++ b/src/views/fee-settings/PayMode.vue
@ -38,7 +38,7 @@
            <el-row>
              <el-col :span="12">
                <el-form-item label="编号">
-                  <el-input v-model="form.payModeId" disabled></el-input>
+                  <el-input v-model="form.id" disabled></el-input>
                </el-form-item>
              </el-col>
              <el-col :span="12">