Merge remote-tracking branch 'origin/dev' into dev

2024-03-07 13:35:51 +08:00 · 2024-03-07 13:35:51 +08:00 · 8427fa5c0d
commit 8427fa5c0d
parent b25eb56f39 d188e634ae
3 changed files with 65 additions and 50 deletions
--- a/src/api/system/departmentDisease.js
+++ b/src/api/system/departmentDisease.js
@ -35,7 +35,7 @@ export function getDepartmentDisease(id) {
 // 新增科室病种信息
 export function addDepartmentDisease(data) {
    return request({
-        url: '/system/departmentDisease',
+        url: '/system/departmentDisease/add',
        method: 'post',
        data: data
    })
@ -45,7 +45,7 @@ export function addDepartmentDisease(data) {
 // 修改科室病种信息
 export function updateDepartmentDisease(data) {
    return request({
-        url: '/system/departmentDisease',
+        url: '/system/departmentDisease/edit',
        method: 'post',
        data: data
    })
--- a/src/views/manage/servicewaycontent/index.vue
+++ b/src/views/manage/servicewaycontent/index.vue
@ -157,25 +157,21 @@
              size="mini"
              @click="handleUpdateserve"
            ></el-button>
-          
+
            <el-button
              v-if="this.itemname"
-            
              plain
              icon="el-icon-s-tools"
              size="mini"
              @click="handleedit"
-              ></el-button
-            >
+            ></el-button>
            <el-button
              v-if="this.itemname"
-            
              plain
              icon="el-icon-delete"
              size="mini"
              @click="handledelete"
-              ></el-button
-            >
+            ></el-button>
          </div>
          <div>
            <el-input
@ -313,7 +309,7 @@

    <!-- 添加或修改服务方式内容对话框 -->
    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="110px">
        <!-- <el-form-item label="服务方式名称" prop="serviceWayName">
          <el-input v-model="form.serviceWayName" placeholder="请输入服务方式名称" />
        </el-form-item>
@ -351,9 +347,9 @@
          prop="serviceFrequencyType"
          label-width="80px"
        >
-        <el-form-item label="" prop="serviceFrequencyType" label-width="">
-          <el-checkbox v-model="DIGIT" @change="DIGITlist">数字</el-checkbox>
-        </el-form-item>
+          <el-form-item label="" prop="serviceFrequencyType" label-width="">
+            <el-checkbox v-model="DIGIT" @change="DIGITlist">数字</el-checkbox>
+          </el-form-item>

          <div style="display: flex; margin: -32px 34px 0 66px">
            <el-form-item label="" prop="serviceFrequencyStart" label-width="">
@ -375,9 +371,10 @@
          <div>
            <div style="position: relative; top: 12px">
              <el-form-item label="" prop="serviceFrequencyType" label-width="">
-              <el-checkbox v-model="TEXT" @change="textlist">文本</el-checkbox>
-            </el-form-item>
-
+                <el-checkbox v-model="TEXT" @change="textlist"
+                  >文本</el-checkbox
+                >
+              </el-form-item>
            </div>
            <div style="margin: -23px 45px 0px 74px">
              <el-form-item label="" prop="serviceFrequencyText" label-width="">
@ -506,8 +503,8 @@ export default {
        // serviceFrequencyType: [
        //   { required: true, message: "请选中服务频次", trigger: "blur" },
        // ],
-        
-         serviceWayId: [
+
+        serviceWayId: [
          { required: true, message: "请选中所属服务方式", trigger: "blur" },
        ],
        serviceContent: [
@ -559,8 +556,8 @@ export default {
    },
    textlist(e) {
      if (e == true) {
-        this.form.serviceFrequencyStart=null
-        this.form.serviceFrequencyEnd=null
+        this.form.serviceFrequencyStart = null;
+        this.form.serviceFrequencyEnd = null;

        this.disableda = true;
        this.disabledb = true;
@ -573,7 +570,7 @@ export default {
    DIGITlist(e) {
      console.log(e, "5");
      if (e == true) {
-        this.form.serviceFrequencyText=null
+        this.form.serviceFrequencyText = null;
        this.disableda = false;
        this.disabledb = false;
        this.disabled = true;
@ -617,13 +614,13 @@ export default {
      serviceWayList(this.querydepartmen).then((response) => {
        this.DepartmentoList = response.data;
        let sum = 0;
-        this.DepartmentoList.forEach(item=>{
+        this.DepartmentoList.forEach((item) => {
          if (item.serviceContentNum) {
-            console.log(item.countNum)
+            console.log(item.countNum);
            sum += item.serviceContentNum;
          }
          this.count = sum;
-        })
+        });
        this.loading = false;
      });
    },
@ -761,9 +758,8 @@ export default {
        this.form = response.data;
        // this.form.serviceWayId=row.serviceWayId
        this.form.id = response.data.serviceFrequencyId;
-        if(response.data.serviceWayId){
+        if (response.data.serviceWayId) {
          this.form.serviceWayId = response.data.serviceWayId;
-
        }
        //  ----------

@ -796,24 +792,33 @@ export default {
      this.$refs["form"].validate((valid) => {
        if (valid) {
          if (
-            this.form.serviceFrequencyType == "DIGIT" &&
-            this.form.serviceFrequencyStart == null &&
-            this.form.serviceFrequencyEnd == null
+            (this.form.serviceFrequencyType == "DIGIT" &&
+              this.form.serviceFrequencyStart == null &&
+              this.form.serviceFrequencyEnd == null) ||
+            (this.form.serviceFrequencyType == "DIGIT" &&
+              this.form.serviceFrequencyEnd == "" &&
+              this.form.serviceFrequencyStart == "")
          ) {
            this.$message.error("请输入服务频次起始值和结束值");
          } else if (
-            this.form.serviceFrequencyType == "DIGIT" &&
-            this.form.serviceFrequencyStart == null
+            (this.form.serviceFrequencyType == "DIGIT" &&
+              this.form.serviceFrequencyStart == null) ||
+            (this.form.serviceFrequencyStart == "" &&
+              this.form.serviceFrequencyType == "DIGIT")
          ) {
            this.$message.error("请输入服务频次起始值");
          } else if (
-            this.form.serviceFrequencyType == "DIGIT" &&
-            this.form.serviceFrequencyEnd == null
+            (this.form.serviceFrequencyType == "DIGIT" &&
+              this.form.serviceFrequencyEnd == null) ||
+            (this.form.serviceFrequencyEnd == "" &&
+              this.form.serviceFrequencyType == "DIGIT")
          ) {
            this.$message.error("请输入服务频次结束值");
          } else if (
-            this.form.serviceFrequencyType == "TEXT" &&
-            this.form.serviceFrequencyText == null
+            (this.form.serviceFrequencyType == "TEXT" &&
+              this.form.serviceFrequencyText == null) ||
+            (this.form.serviceFrequencyText == "" &&
+              this.form.serviceFrequencyType == "TEXT")
          ) {
            this.$message.error("请输入服务频次文本");
          } else if (
@ -821,10 +826,15 @@ export default {
            this.form.serviceFrequencyType != "DIGIT"
          ) {
            this.$message.error("请选择数字还是文本");
+          } else if (
+            this.form.serviceFrequencyStart &&
+            this.form.serviceFrequencyEnd &&
+            Number(this.form.serviceFrequencyStart) >=
+              this.form.serviceFrequencyEnd
+          ) {
+            this.$message.error("结束值必须大于开始值");
+            // }
          } else {
-            console.log(this.form, "555555");
-            console.log(this.form.serviceWayId);
-
            if (this.form.serviceContentId != null) {
              updateServicewaycontent(this.form).then((response) => {
                this.$modal.msgSuccess("修改成功");
@ -841,6 +851,8 @@ export default {
              });
            }
          }
+
+          // }
        }
      });
    },
@ -915,17 +927,18 @@ export default {
 </script>
 <style lang="scss">
 .el-form-item__error {
-    color: #ff4949;
-    font-size: 12px;
-    line-height: 1;
-    padding-top: 4px;
-    padding-left: 80px;
-    position: absolute;
-    top: 100%;
-    left: 0;}
+  color: #ff4949;
+  font-size: 12px;
+  line-height: 1;
+  padding-top: 4px;
+  padding-left: 80px;
+  position: absolute;
+  top: 100%;
+  left: 0;
+}
 .left {
  height: 530px;
- overflow: scroll;
+  overflow: scroll;
  .name {
    font-weight: 700;
    margin-bottom: 10px;
--- a/src/views/system/agencyCategory/index.vue
+++ b/src/views/system/agencyCategory/index.vue
@ -310,9 +310,9 @@ export default {
      form: {},
      // 表单校验
      rules: {
-        // parentCategoryId: [
-        //   { required: true, message: "父级类别id不能为空", trigger: "blur" },
-        // ],
+        categoryName: [
+          { required: true, message: "类别名称不能为空", trigger: "blur" },
+        ],
      },
    };
  },
@ -409,6 +409,7 @@ export default {
              this.open = false;
              ++this.isResouceShow;
              this.getList();
+              this.gettreelistitem()
            });
          } else {
            addAgencyCategory(this.form).then((response) => {
@ -416,6 +417,7 @@ export default {
              this.open = false;
              ++this.isResouceShow;
              this.getList();
+              this.gettreelistitem()
            });
          }
        }