From 5e9b8430ccee210cbcf5c0ef14b548765f668a7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com>
Date: Thu, 7 Mar 2024 10:55:50 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/departmentDisease.js          | 4 ++--
 src/views/manage/servicewaycontent/index.vue | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/api/system/departmentDisease.js b/src/api/system/departmentDisease.js
index e7db3c9..987d2fa 100644
--- 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
     })
diff --git a/src/views/manage/servicewaycontent/index.vue b/src/views/manage/servicewaycontent/index.vue
index 836cdcd..4b3373d 100644
--- a/src/views/manage/servicewaycontent/index.vue
+++ b/src/views/manage/servicewaycontent/index.vue
@@ -313,7 +313,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>

From 5ad3159e6a8ebfcab99877f5979273cc8d9c8d5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com>
Date: Thu, 7 Mar 2024 11:14:20 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/manage/servicewaycontent/index.vue | 88 +++++++++++---------
 1 file changed, 47 insertions(+), 41 deletions(-)

diff --git a/src/views/manage/servicewaycontent/index.vue b/src/views/manage/servicewaycontent/index.vue
index 4b3373d..98b21ce 100644
--- 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
@@ -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 (
@@ -915,17 +920,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;

From 5c0d22c4c1a8bf44357c84c16e990160a19985fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com>
Date: Thu, 7 Mar 2024 11:42:30 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/manage/servicewaycontent/index.vue | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/views/manage/servicewaycontent/index.vue b/src/views/manage/servicewaycontent/index.vue
index 98b21ce..103427b 100644
--- a/src/views/manage/servicewaycontent/index.vue
+++ b/src/views/manage/servicewaycontent/index.vue
@@ -826,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("修改成功");
@@ -846,6 +851,8 @@ export default {
               });
             }
           }
+
+          // }
         }
       });
     },

From d188e634ae1519dff7c4b0d94ab1c73e91e14f28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com>
Date: Thu, 7 Mar 2024 13:34:27 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=BA=E6=9E=84?=
 =?UTF-8?q?=E7=B1=BB=E5=88=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/agencyCategory/index.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/views/system/agencyCategory/index.vue b/src/views/system/agencyCategory/index.vue
index eaf96b5..f856d7e 100644
--- 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()
             });
           }
         }