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

src/views/operationInfo/operationInfo/index.vue

@@ -261,7 +261,7 @@
             <el-button
               type="primary"
               style="width: 15px; height: 15px"
-              v-if="form.departmentId == scope.row.departmentCode"
+              v-if="form.departmentId == scope.row.id"
               circle
               @click="nurseclick(scope.row)"
             ></el-button>
@@ -450,7 +450,7 @@ export default {
     },
     // 科室名称圆点按钮
     nurseclick(row) {
-      this.form.departmentId = row.departmentCode;
+      this.form.departmentId = row.id;
       this.departmentName = row.departmentName;
       this.form.diseaseTypeId = '';
       this.diseaseTypeName = '请选择病种';

src/views/system/departmentDisease/index.vue

@@ -687,6 +687,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.diseaseTypeName=''
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -724,6 +725,7 @@ export default {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
+              this.departmentName=''
               this.infolists()
             });
           } else {
@@ -731,6 +733,7 @@ export default {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
+              this.departmentName=''
               this.infolists()
 
             });
@@ -748,6 +751,7 @@ export default {
         })
         .then(() => {
           this.getList();
+          this.departmentName=''
           this.infolists()
 
           this.$modal.msgSuccess("删除成功");