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

src/api/manage/servicewaycontent.js

@@ -78,7 +78,7 @@ export function delServicewaycontent(id) {
 // / 删除服务方式
 export function removeServiceWay(id) {
     return request({
-        url: '/manage/servicewaycontent/removeServiceWay/id' ,
+        url: '/manage/servicewaycontent/removeServiceWay/'+id ,
         method: 'delete'
     })
 }

src/views/manage/servicewaycontent/index.vue

@@ -346,7 +346,7 @@
         <el-form-item label="所属服务方式id" prop="serviceWayId">
           <el-input v-model="form.serviceWayId" placeholder="请输入所属服务方式id" />
         </el-form-item> -->
-        <el-form-item label="服务内容" prop="serviceContent">
+        <el-form-item label="服务内容" prop="serviceContent" label-width="80">
           <el-input
             type="textarea"
             style="width: 400px"
@@ -506,9 +506,9 @@ export default {
         serviceFrequencyType: [
           { required: true, message: "请选中服务频次", trigger: "blur" },
         ],
-        // serviceFrequencyStart:[
-        // { required: true, message: "请输入起始值", trigger: "blur" },
-        // ],
+        serviceContent:[
+        { required: true, message: "请输入服务内容", trigger: "blur" },
+        ],
         // serviceFrequencyEnd:[
         // { required: true, message: "请输入结束值", trigger: "blur" },
         // ],
@@ -743,8 +743,23 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
+      console.log(this.form)
+    
           this.$refs["form"].validate((valid) => {
         if (valid) {
+          if(this.form.serviceFrequencyType=="DIGIT"&&this.form.serviceFrequencyStart==null&&this.form.serviceFrequencyEnd==null){
+this.$message.error("请输入服务频次起始值和结束值")
+      }else if(this.form.serviceFrequencyType=="DIGIT"&&this.form.serviceFrequencyStart==null){
+        this.$message.error("请输入服务频次起始值")
+
+      }else if(this.form.serviceFrequencyType=="DIGIT"&&this.form.serviceFrequencyEnd==null){
+        this.$message.error("请输入服务频次结束值")
+
+      }else if(this.form.serviceFrequencyType=="TEXT"&&this.form.serviceFrequencyText==null){
+        this.$message.error("请输入服务频次文本")
+
+      }else if(this.form.serviceFrequencyType!="TEXT"&&this.form.serviceFrequencyType!="DIGIT"){
+        this.$message.error("请选择数字还是文本")}else{
           console.log(this.form.id, "555555");
           if (this.form.serviceContentId != null) {
             updateServicewaycontent(this.form).then((response) => {
@@ -760,7 +775,10 @@ export default {
             });
           }
         }
+      }
+
       });
+    
     },
     // 修改服务方式
     handleedit() {

src/views/system/department/index.vue

@@ -421,6 +421,7 @@
               placeholder="请选择"
               style="width: 205px"
               @change="changeparentDepartment"
+              clearable
             >
               <el-option
                 v-for="item in optionsparentDepartment"

src/views/system/departmentDisease/index.vue

@@ -688,6 +688,7 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
+      
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {