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

src/api/manage/script.js

@@ -69,3 +69,12 @@ export function delScript(id) {
         method: 'delete'
     })
 }
+// 左侧科室
+export function listScriptNum(query) {
+    return request({
+        url: '/system/department/listScriptNum',
+        method: 'get',
+        params: query
+    })
+}
+

src/api/manage/servicepackage.js

@@ -0,0 +1,78 @@
+import request from '@/utils/request'
+
+// 查询服务包基础信息列表
+export function listServicepackage(query) {
+    return request({
+        url: '/manage/servicepackage/list',
+        method: 'get',
+        params: query
+    })
+}
+// 查询服务方式
+
+export function serviceWayList(query) {
+    return request({
+        url: '/manage/servicewaycontent/serviceWayList',
+        method: 'get',
+        params: query
+    })
+}
+// 查询服务内容
+export function serviccontent(serviceWayId) {
+    return request({
+        url: `/manage/servicewaycontent/list?serviceWayId=${serviceWayId}`,
+        method: 'get',
+    })
+}
+// 发布
+
+
+export function editReleaseStatus(id,whetherRelease) {
+    return request({
+        url: `/manage/servicepackage/editReleaseStatus?id=${id}&whetherRelease=${whetherRelease}`,
+        method: 'put',
+    })
+}
+// 查询服务包基础信息详细
+export function getServicepackage(id) {
+    return request({
+        url: '/manage/servicepackage/' + id,
+        method: 'get'
+    })
+}
+
+// 新增服务包基础信息
+export function addServicepackage(data) {
+    return request({
+        url: '/manage/servicepackage/add',
+        method: 'post',
+        data: data
+    })
+}
+
+// 修改服务包基础信息
+export function updateServicepackage(data) {
+    return request({
+        url: '/manage/servicepackage/edit',
+        method: 'put',
+        data: data
+    })
+}
+
+// 删除服务包基础信息
+export function delServicepackage(id) {
+    return request({
+        url: '/manage/servicepackage/remove/' + id,
+        method: 'delete'
+    })
+}
+// 左侧列表
+export function listServicePackageNum(query) {
+    return request({
+        url: '/system/department/listServicePackageNum',
+        method: 'get',
+        params: query
+    })
+}
+
+

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/api/system/departmentDisease.js

@@ -15,6 +15,14 @@ export function getDepartmentList(query) {
         params: query
     })
 }
+export function selectDiseaseCount(departmentName) {
+    return request({
+        url: `/system/departmentDisease/selectDiseaseCount?departmentName=${departmentName}`,
+        method: 'get',
+      
+    })
+}
+//  get 搜索条件传departmentName
 
 // 查询科室病种信息详细
 export function getDepartmentDisease(id) {
@@ -33,6 +41,7 @@ export function addDepartmentDisease(data) {
     })
 }
 
+
 // 修改科室病种信息
 export function updateDepartmentDisease(data) {
     return request({

src/api/system/stationAvatar.js

@@ -15,6 +15,15 @@ export function uploadFilefm(data) {
         data: data
     })
 }
+// 话术图片
+export function uploadScriptInfo(data) {
+    return request({
+        url: '/manage/script/uploadScriptInfo',
+        method: 'post',
+        data: data
+    })
+}
+
 
 //海报视频上传
 export function updatePoserHeads(data) {

src/api/system/user.js

@@ -18,6 +18,15 @@ export function selectUserAgencyleft(query) {
   
   })
 }
+export function selectUserDepartment(query) {
+  return request({
+    url: '/system/user/selectUserDepartment',
+    method: 'get',
+    params: query
+  
+  })
+}
+
 export function selectUserAgency(userName) {
   return request({
     url: `/system/user/selectUserBelongAgency?userName=${userName}`,
@@ -25,6 +34,14 @@ export function selectUserAgency(userName) {
   
   })
 }
+export function getBelongDepartment(userName) {
+  return request({
+    url: `/system/user/getBelongDepartment?userName=${userName}`,
+    method: 'get',
+  
+  })
+}
+
 // /system/user/selectUserAgency 这个是右边的接口，传值不变
 // 查询用户详细
 export function getUser(userId) {
@@ -46,8 +63,15 @@ export function addUser(data) {
 // 修改用户
 export function updateUser(data) {
   return request({
-    url: '/system/user',
+    url: '/system/user/editAgency',
-    method: 'put',
+    method: 'post',
+    data: data
+  })
+}
+export function editDepartment(data) {
+  return request({
+    url: '/system/user/editDepartment',
+    method: 'post',
     data: data
   })
 }

src/views/manage/message/index.vue

@@ -139,7 +139,12 @@
             label="适用任务类型"
             align="center"
             prop="suitTaskTypeName"
-          />
+          >
+          <template slot-scope="scope">
+            {{scope.row.suitTaskTypeName!="null"?scope.row.suitTaskTypeName:''}}
+  
+          </template>
+          </el-table-column>
           <el-table-column
             label="短信通道"
             align="center"
@@ -440,9 +445,9 @@
         label-width="80px"
         :inline="true"
       >
-        <el-form-item label="病种名称" prop="departmentName" label-width="120">
+        <el-form-item label="病种名称" prop="diseaseTypeName" label-width="120">
           <el-input
-            v-model="querydisease.departmentName"
+            v-model="querydisease.diseaseTypeName"
             placeholder="请输入病种名称"
             clearable
           />
@@ -558,6 +563,8 @@ export default {
       querydisease: {
         pageNum: 1,
         pageSize: 10,
+        diseaseTypeName:null,
+        departmentId:null,
       },
       listdisease: [],
       diseasetotal: 0,
@@ -639,9 +646,6 @@ export default {
     this.getList();
     this.Departmentlist();
     this.typelistdata();
-    listMessage(this.queryParams).then(response => {
-      this.count = response.total;
-    });
   },
   methods: {
     /** 查询微信模板信息列表 */
@@ -671,10 +675,14 @@ export default {
       this.loading = true;
       listMessageNum(this.querydepartmen).then(response => {
         this.DepartmentoList = response.data;
-        // this.count=this.DepartmentoList.length
+        let sum = 0;
-        console.log(this.DepartmentoList)
+        this.DepartmentoList.forEach((item) => {
-
+          if (item.countNum != null) {
-        // this.total = response.total;
+            console.log(item.countNum)
+            sum += item.countNum;
+          }
+          this.count = sum;
+        });
         this.loading = false;
       });
 
@@ -731,6 +739,8 @@ export default {
     nurseclick(row) {
       this.form.departmentId = row.departmentCode;
       this.departmentName = row.departmentName;
+      this.form.diseaseTypeId = '';
+      this.diseaseTypeName = '请选择病种';
       console.log(this.departmentName, '0000')
       this.innerVisibleshow = false;
     },
@@ -844,10 +854,8 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      if (!this.itemname) {
+
-        this.$modal.msgError("请先选择科室");
+        this.reset();
-      } else {
-        // this.reset();
         const id = row.id || this.ids
         // this.getDisease();
         getMessage(id).then(response => {
@@ -858,7 +866,7 @@ export default {
           this.open = true;
           this.title = "修改短信模板信息";
         });
-      }
+      
     },
     /** 提交按钮 */
     submitForm() {
@@ -906,14 +914,6 @@ export default {
         return delMessage(ids);
       }).then(() => {
         this.getList();
-        var quer = {
-          pageNum: 1,
-          pageSize: 10,
-
-        }
-        listMessage(quer).then(response => {
-          this.count = response.total;
-        });
         this.Departmentlist();
         this.$modal.msgSuccess("删除成功");
       }).catch(() => { });

src/views/manage/propaganda/index.vue

@@ -503,9 +503,9 @@
         label-width="80px"
         :inline="true"
       >
-        <el-form-item label="病种名称" prop="departmentName" label-width="120">
+        <el-form-item label="病种名称" prop="diseaseTypeName" label-width="120">
           <el-input
-            v-model="querydisease.departmentName"
+            v-model="querydisease.diseaseTypeName"
             placeholder="请输入病种名称"
             clearable
           />
@@ -642,6 +642,8 @@ export default {
       querydisease: {
         pageNum: 1,
         pageSize: 10,
+        diseaseTypeName:null,
+        departmentId:null,
       },
       listdisease: [],
       diseasetotal: 0,
@@ -752,7 +754,6 @@ export default {
   created() {
     this.Departmentlist();
     this.getList();
-    this.getlistcount();
   },
   watch: {
     name(val) {
@@ -787,7 +788,7 @@ export default {
             message: "复制成功"
           });
           this.getList()
-          this.getlistcount()
+          this.Departmentlist()
 
         });
       }).catch(() => {
@@ -867,6 +868,14 @@ export default {
       this.loading = true;
       selectNumByDept(this.querydepartmen).then(response => {
         this.DepartmentoList = response.data;
+        let sum = 0;
+        this.DepartmentoList.forEach((item) => {
+          if (item.countNum != null) {
+            console.log(item.countNum)
+            sum += item.countNum;
+          }
+          this.count = sum;
+        });
         this.loading = false;
       });
     },
@@ -885,17 +894,6 @@ export default {
 
       }
     },
-    // 获取总数
-    getlistcount() {
-      var qure={
-        pageNum: 1,
-        pageSize: 10,
-
-      }
-      listPropaganda(qure).then(response => {
-        this.count = response.total;
-      });
-    },
 
 
     /** 查询患者宣教信息列表 */
@@ -942,6 +940,8 @@ export default {
     nurseclick(row) {
       this.form.departmentId = row.departmentCode;
       this.departmentName = row.departmentName;
+      this.form.diseaseTypeId = '';
+      this.diseaseTypeName = '请选择病种';
       this.innerVisibleshow = false;
     },
 
@@ -1093,7 +1093,6 @@ export default {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
-              this.getlistcount()
             });
           } else {
             if (this.diseaseTypeName == "请选择病种") {
@@ -1114,7 +1113,7 @@ export default {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
-              this.getlistcount()
+              this.Departmentlist()
             });
 
           }
@@ -1128,15 +1127,7 @@ export default {
         return delPropaganda(ids);
       }).then(() => {
         this.getList();
-        this.getlistcount()
+        this.Departmentlist()
-        // var quer = {
-        //   pageNum: 1,
-        //   pageSize: 10,
-
-        // }
-        // listPropaganda(quer).then(response => {
-        //   this.count = response.total;
-        // });
         this.$modal.msgSuccess("删除成功");
       }).catch(() => { });
     },

src/views/manage/script/index.vue

@@ -82,19 +82,6 @@
           >新增</el-button
         >
       </el-col>
-
-
-      <!-- <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['manage:script:export']"
-          >导出</el-button
-        >
-      </el-col> -->
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
@@ -102,7 +89,7 @@
     </el-row>
     <el-row :gutter="20">
       <el-col :span="5">
-        <div class="left" ref="box">
+        <div class="leftscript" ref="box">
           <div class="name">科室名称</div>
           <div>
             <el-input
@@ -119,7 +106,7 @@
             >
               全部
             </div>
-               <span class="count">{{count}}</span>
+            <span class="count">{{ count }}</span>
           </div>
           <div
             class="listitem"
@@ -130,8 +117,7 @@
             <div :class="itemname == item.id ? 'allactive' : 'all'">
               {{ item.departmentName }}
             </div>
-            <span class="count">{{item.countNum}}</span>
+            <span class="count">{{ item.countNum }}</span>
-
           </div>
         </div>
       </el-col>
@@ -141,7 +127,6 @@
           :data="scriptList"
           @selection-change="handleSelectionChange"
         >
-          <!-- <el-table-column type="selection" width="55" align="center" /> -->
           <el-table-column
             label="序号"
             align="center"
@@ -153,11 +138,26 @@
             label="通用话术名称"
             align="center"
             prop="commonScriptName"
-            :show-overflow-tooltip="true" 
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="话术名称"
+            align="center"
+            prop="scriptName"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="话术ID"
+            align="center"
+            prop="scriptId"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="平台ID"
+            align="center"
+            prop="platformId"
+            :show-overflow-tooltip="true"
           />
-          <el-table-column label="话术名称" align="center" prop="scriptName"   :show-overflow-tooltip="true" />
-          <el-table-column label="话术ID" align="center" prop="scriptId"   :show-overflow-tooltip="true" />
-          <el-table-column label="平台ID" align="center" prop="platformId"   :show-overflow-tooltip="true" />
           <el-table-column label="话术状态" align="center" prop="scriptStatus">
             <template slot-scope="scope">
               {{ scope.row.scriptStatus == "NORMAL" ? "正常" : "" }}
@@ -169,13 +169,13 @@
             label="话术简介"
             align="center"
             prop="scriptIntroduction"
-            :show-overflow-tooltip="true" 
+            :show-overflow-tooltip="true"
           />
           <el-table-column
             label="病种名称"
             align="center"
             prop="diseaseTypeName"
-            :show-overflow-tooltip="true" 
+            :show-overflow-tooltip="true"
           />
           <el-table-column
             label="操作"
@@ -183,6 +183,13 @@
             class-name="small-padding fixed-width"
           >
             <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-search"
+                @click="handlesee(scope.row)"
+                >预览</el-button
+              >
               <el-button
                 size="mini"
                 type="text"
@@ -191,13 +198,6 @@
                 v-hasPermi="['manage:script:edit']"
                 >修改</el-button
               >
-              <!-- <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-notebook-2"
-                @click="management(scope.row)"
-                >分类管理</el-button
-              > -->
               <el-button
                 size="mini"
                 type="text"
@@ -221,7 +221,7 @@
     />
 
     <!-- 添加或修改话术信息对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body v-if="open">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="通用话术名称" prop="commonScriptName">
           <el-input
@@ -331,20 +331,13 @@
             "
             >{{ diseaseTypeName }}</el-button
           >
-          <!-- <el-select
+        </el-form-item>
-            v-model="form.diseaseTypeId"
+        <el-form-item label="图片" prop="scriptFilePath">
-            placeholder="请选择病种名称"
+          <stationAcatar
-            style="width: 379px"
+            @imgUrl="imgUrl"
-            @change="diseasechange"
+            :img="form.scriptFilePath"
-          >
+            :type="'scriptUrl'"
-            <el-option
+          />
-              v-for="item in optionsDisease"
-              :key="item.diseaseTypeCode"
-              :label="item.diseaseTypeName"
-              :value="item.diseaseTypeCode"
-            >
-            </el-option>
-          </el-select> -->
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -445,9 +438,9 @@
         label-width="80px"
         :inline="true"
       >
-        <el-form-item label="病种名称" prop="departmentName" label-width="120">
+        <el-form-item label="病种名称" prop="diseaseTypeName" label-width="120">
           <el-input
-            v-model="querydisease.departmentName"
+            v-model="querydisease.diseaseTypeName"
             placeholder="请输入病种名称"
             clearable
           />
@@ -505,66 +498,26 @@
         @pagination="infodisease"
       />
     </el-dialog>
-    <!-- 分类管理 -->
+    <!-- 预览弹框 -->
-    <!-- <el-dialog
+    <el-dialog
-      :title="titlemanagement"
+      title="提示"
-      :visible.sync="openmanagement"
+      :visible.sync="dialogsee"
-      width="500px"
+      width="30%"
-      append-to-body
+      :before-close="seeClose"
     >
-      <el-form
+      <img :src="baseUrl + form.scriptFilePath" alt="" />
-        ref="formmanagement"
+      <span slot="footer" class="dialog-footer">
-        :model="formmanagement"
+        <el-button @click="dialogsee = false">取 消</el-button>
-        :rules="rulesmanagement"
+      </span>
-        label-width="80px"
+    </el-dialog>
-      >
-        <el-form-item label="科室名称" prop="departmentName">
-          <el-select
-            v-model="formmanagement.departmentName"
-            placeholder="请选择病种名称"
-            style="width: 379px"
-            disabled
-          >
-            <el-option
-              v-for="item in optionsDisease"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
-
-        <el-form-item label="病种名称" prop="diseaseTypeName">
-          <el-select
-            v-model="formmanagement.diseaseTypeName"
-            placeholder="请选择病种名称"
-            style="width: 379px"
-            @change="diseasechange"
-          >
-            <el-option
-              v-for="item in optionsDisease"
-              :key="item.diseaseTypeCode"
-              :label="item.diseaseTypeName"
-              :value="item.diseaseTypeCode"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitmanagement">确 定</el-button>
-        <el-button @click="cancelmanagement">取 消</el-button>
-      </div>
-    </el-dialog> -->
   </div>
 </template>
 
 <script>
-import { listScript, getScript, delScript, addScript, updateScript, departmentDisease, department, listDisease } from "@/api/manage/script";
+import { listScript, getScript, delScript, addScript, updateScript, departmentDisease, department, listDisease, listScriptNum } from "@/api/manage/script";
-import { getDepartmentLis } from "@/api/operationInfo/operationInfo";
+import stationAcatar from "../../system/stationAvatar/index.vue";
-
 export default {
+  components: { stationAcatar },
   name: "Script",
   data() {
     return {
@@ -573,7 +526,8 @@ export default {
       diseaseTypeName: null,
       name: '',
       departmentId: null,
-      count:'',//全部
+      count: '',//全部
+      sumcount: '',
 
 
 
@@ -595,6 +549,8 @@ export default {
       querydisease: {
         pageNum: 1,
         pageSize: 10,
+        diseaseTypeName:null,
+        departmentId:null,
       },
       listdisease: [],
       diseasetotal: 0,
@@ -647,7 +603,11 @@ export default {
         value: 'SUSPEND',
         label: '暂停'
       },],
+      baseUrl: process.env.VUE_APP_BASE_API,
 
+
+      //预览弹框
+      dialogsee: false,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -689,11 +649,7 @@ export default {
         scriptSort: null,
         scriptRemark: null,
       },
-      queryDisease: {
+
-        pageNum: 1,
-        pageSize: 10,
-        departmentId: null,
-      },
       querydepartmen: {
         departmentName: "",
         // pageNum: 1,
@@ -747,8 +703,8 @@ export default {
         scriptIntroduction: [
           { required: true, message: "话术简介不能为空", trigger: "blur" }
         ],
-        departmentId:[
+        departmentId: [
-        { required: true, message: "科室名称不能为空", trigger: "blur" }
+          { required: true, message: "科室名称不能为空", trigger: "blur" }
 
         ],
 
@@ -759,10 +715,7 @@ export default {
   created() {
     this.getList();
     this.Departmentlist();
-    listScript(this.queryParams).then(response => {
+
-        this.count = response.total;
-    
-      });
   },
   watch: {
     name(val) {
@@ -771,6 +724,23 @@ export default {
     }
   },
   methods: {
+    // 上传图片
+    imgUrl(imgUrl) {
+      this.form.scriptFilePath = imgUrl;
+    },
+    // 预览点击
+    handlesee(row) {
+      const id = row.id
+      getScript(id).then(response => {
+        this.form = response.data;
+        this.dialogsee = true;
+      });
+    },
+
+    // 预览关闭
+    seeClose() {
+      this.dialogsee = false;
+    },
     // 点击科室
     clickinnerVisible() {
       this.innerVisibleshow = true;
@@ -806,6 +776,8 @@ export default {
     nurseclick(row) {
       this.form.departmentId = row.departmentCode;
       this.departmentName = row.departmentName;
+      this.form.diseaseTypeId = '';
+      this.diseaseTypeName = '请选择病种';
       this.innerVisibleshow = false;
     },
 
@@ -853,10 +825,18 @@ export default {
     // 左侧科室
     Departmentlist() {
       this.loading = true;
-      getDepartmentLis(this.querydepartmen).then(response => {
+      listScriptNum(this.querydepartmen).then(response => {
         this.DepartmentoList = response.data;
-        // this.total = response.total;
+        //定义                   
-     
+        let sum = 0;
+        this.DepartmentoList.forEach((item) => {
+          if (item.countNum != null) {
+            console.log(item.countNum)
+            sum += item.countNum;
+
+          }
+          this.count = sum;
+        });
         this.loading = false;
       });
 
@@ -907,6 +887,7 @@ export default {
         diseaseTypeName: null,
         diseaseTypeCode: null,
         commonScriptName: null,
+        scriptFilePath:null,
         scriptName: null,
         scriptId: null,
         platformId: null,
@@ -930,7 +911,7 @@ export default {
     resetQuery() {
       this.queryParams.departmentId = null;
       this.itemname = null;
-      this.queryParams={
+      this.queryParams = {
         pageNum: 1,
         pageSize: 10,
         departmentId: null,
@@ -945,7 +926,6 @@ export default {
         scriptIntroduction: null,
         scriptSort: null,
         scriptRemark: null,
-
       }
       this.resetForm("queryForm");
       this.getList();
@@ -961,9 +941,9 @@ export default {
       this.reset();
       if (this.itemname) {
         this.form.departmentName = this.departmentName
-        this.form.departmentId=this.itemname
+        this.form.departmentId = this.itemname
-      } else if(this.itemname == null){
+      } else if (this.itemname == null) {
-          this.departmentName = "请选择科室"
+        this.departmentName = "请选择科室"
       }
       else {
         this.departmentName = "请选择科室"
@@ -971,7 +951,7 @@ export default {
       this.diseaseTypeName = "请选择病种"
 
       this.open = true;
-   
+
 
       this.title = "添加话术信息";
       // this.getDisease();
@@ -987,20 +967,16 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      if (!this.itemname) {
+      this.reset();
-        this.$modal.msgError("请先选择科室");
+      const id = row.id || this.ids
-      } else {
+      // this.getDisease();
-        // this.reset();
+      getScript(id).then(response => {
-        const id = row.id || this.ids
+        this.form = response.data;
-        // this.getDisease();
+        this.diseaseTypeName = response.data.diseaseTypeName
-        getScript(id).then(response => {
+        this.departmentName = response.data.departmentName
-          this.form = response.data;
+        this.open = true;
-          this.diseaseTypeName = response.data.diseaseTypeName
+        this.title = "修改话术信息";
-          this.departmentName = response.data.departmentName
+      });
-          this.open = true;
-          this.title = "修改话术信息";
-        });
-      }
     },
     /** 提交按钮 */
     submitForm() {
@@ -1008,54 +984,38 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             this.form.departmentName = this.departmentName
-          this.form.diseaseTypeName = this.diseaseTypeName
+            this.form.diseaseTypeName = this.diseaseTypeName
             updateScript(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-          if(this.diseaseTypeName == "请选择病种"){
+            if (this.diseaseTypeName == "请选择病种") {
-            this.form.diseaseTypeName==null
+              this.form.diseaseTypeName == null
 
-          }else{
+            } else {
-          this.form.diseaseTypeName = this.diseaseTypeName
+              this.form.diseaseTypeName = this.diseaseTypeName
-          }
+            }
-          if(this.itemname){
+            if (this.itemname) {
- 
+              this.form.departmentName = this.departmentName
-            this.form.departmentName = this.departmentName
+              this.form.departmentId = this.itemname
-        this.form.departmentId=this.itemname
 
-          }else{
+            } else {
-            this.form.departmentName = this.departmentName
+              this.form.departmentName = this.departmentName
-
-          }
-              addScript(this.form).then(response => {
-                this.$modal.msgSuccess("新增成功");
-                this.open = false;
-                this.getList();
-              });
 
             }
+            addScript(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+              this.Departmentlist();
+            });
+
+          }
         }
       });
     },
-    // 分类管理提交
-    submitmanagement() {
-      this.formmanagement.diseaseTypeId = this.form.diseaseTypeId
-      this.formmanagement.departmentId = this.itemname
-
-      this.$refs["formmanagement"].validate(valid => {
-        if (valid) {
-          updateScript(this.formmanagement).then(response => {
-            this.$modal.msgSuccess("修改成功");
-            this.open = false;
-            this.getList();
-          });
-        }
-      });
-
-    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
@@ -1063,16 +1023,7 @@ export default {
         return delScript(ids);
       }).then(() => {
         this.getList();
-    
+        this.Departmentlist();
-        var quer={
-          pageNum: 1,
-        pageSize: 10,
-        }
-    listScript(quer).then(response => {
-        this.count = response.total;
-    
-      });
-      this.Departmentlist();
         this.$modal.msgSuccess("删除成功");
       }).catch(() => { });
     },
@@ -1086,9 +1037,9 @@ export default {
 };
 </script>
 <style lang="scss">
-.left {
+.leftscript {
   // width: 30%;
-  height: 500px;
+  height: 850px;
   overflow: auto;
   .name {
     font-weight: 700;
@@ -1098,14 +1049,14 @@ export default {
     width: 100%;
     height: 50px;
     border-bottom: 1px solid #dcdfe6;
-    .count{
+    .count {
-    display: inline-block;
+      display: inline-block;
-    position: relative;
+      position: relative;
-    // right: -172px;
+      // right: -172px;
-    left: 210px;
+      left: 210px;
-    color: #a4a6aa;
+      color: #a4a6aa;
-    top: -35px;
+      top: -35px;
-    font-size: 13px;
+      font-size: 13px;
     }
     .all {
       height: 50px;

src/views/manage/servicewaycontent/index.vue

@@ -225,19 +225,19 @@
             label="服务频次"
             align="center"
             prop="serviceWayFrequencyList"
+            :key="keyTable"
           >
-            <template slot-scope="scope">
+            <template  slot-scope="scope">
               <!-- <div
                 v-for="(itemx, index) in scope.row.serviceWayFrequencyList"
                 :key="index"
               > -->
-                <div v-if="scope.row.serviceWayFrequencyList[0].serviceFrequencyType == 'TEXT'">
+                <!-- <div v-if="scope.row.serviceWayFrequencyList[0].serviceFrequencyType == 'TEXT'">
                   <el-select
                     size="mini"
                     @click="getSuppliers()"
-                  @change="blurInputs(scope.row.serviceFrequencyText)"
+                    @change="blurInputs()"
-
+                    v-model="scope.row.valuePlusMax"
-                    v-model="scope.row.serviceFrequencyText"
                     clearable
                     placeholder="请选择"
                   >
@@ -249,29 +249,25 @@
                     >
                     </el-option>
                   </el-select>
-                </div>
+                </div> -->
-                <div v-if="scope.row.serviceWayFrequencyList[0].serviceFrequencyType == 'DIGIT'">
+                <!-- <div v-if="scope.row.serviceWayFrequencyList[0].serviceFrequencyType == 'DIGIT'"> -->
-                  
-                  <!-- itemx.serviceFrequencyStart +
-                      '~' +
-                      itemx.serviceFrequencyEnd
-                     -->
-                     <!-- 对吗我看看 -->
                   <el-select
                     size="mini"
                     @click="getSuppliers()"
-                  @change="blurInput(scope.row.serviceFrequencyText)"
+                    @change="blurInputs(scope.row.valuePlusMax)"
-
+                    v-model="scope.row.valuePlusMax"
-                    v-model="scope.row.serviceFrequencyText"
                     clearable
                     placeholder="请选择"
                   >
-                  <!-- @change="blurInput(itemx)" -->
+                
-                     <!-- 你看一下 整理一下代码  label里面就是展示的值  value是选中的  因为你这的value是拼接的  所以上面的v-mode里面存的就是拼劲明白了我自己改改 -->
+                     <!-- label里面就是展示的值  value是选中的  value是拼接的  这里处理一下为null的情况 为null咋显示呀以后应该不会有null 是必填的 那就先不用管了好-->
+                     <!-- :label="JSON.parse(item.serviceFrequencyStart) +
+                        '~' +
+                        JSON.parse(item.serviceFrequencyEnd)" -->
                     <el-option
                       v-for="item in scope.row.serviceWayFrequencyList"
                       :key="item.id"
-                      :label=" JSON.parse(item.serviceFrequencyStart) +
+                      :label="item.serviceFrequencyType == 'TEXT'?item.serviceFrequencyText:JSON.parse(item.serviceFrequencyStart) +
                         '~' +
                         JSON.parse(item.serviceFrequencyEnd)"
                       :value="
@@ -280,7 +276,7 @@
                     >
                     </el-option>
                   </el-select>
-                </div>
+                <!-- </div> -->
               <!-- </div> -->
             </template>
 
@@ -341,17 +337,31 @@
 
     <!-- 添加或修改服务方式内容对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="70px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <!-- <el-form-item label="服务方式名称" prop="serviceWayName">
           <el-input v-model="form.serviceWayName" placeholder="请输入服务方式名称" />
         </el-form-item>
         <el-form-item label="服务方式编码" prop="serviceWayCode">
           <el-input v-model="form.serviceWayCode" placeholder="请输入服务方式编码" />
-        </el-form-item>
-        <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="serviceWayId">
+          <el-select
+            v-model="form.serviceWayId"
+            clearable
+            placeholder="请选择服务方式"
+            style="width: 250px"
+            @change="change"
+          >
+            <el-option
+              v-for="item in DepartmentoList"
+              :key="item.id"
+              :label="item.serviceWayName"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+          <!-- <el-input v-model="form.serviceWayId" placeholder="请输入所属服务方式id" /> -->
+        </el-form-item>
+        <el-form-item label="服务内容" prop="serviceContent" label-width="80">
           <el-input
             type="textarea"
             style="width: 400px"
@@ -454,7 +464,6 @@ export default {
       list: [],
       serviceFrequencyStart: "",
       serviceFrequencyEnd: "",
-      serviceFrequencyText: "",
       serviceFrequencyType: "",
       // disabled: "",
       titles: "",
@@ -512,8 +521,15 @@ export default {
         serviceFrequencyType: [
           { required: true, message: "请选中服务频次", trigger: "blur" },
         ],
+        serviceContent:[
+        { required: true, message: "请输入服务内容", trigger: "blur" },
+        ],
+        // serviceFrequencyEnd:[
+        // { required: true, message: "请输入结束值", trigger: "blur" },
+        // ],
       },
       itemname: null,
+      serviceWayName:null,
       querydepartmen: {
         serviceWayName: "",
       },
@@ -521,6 +537,8 @@ export default {
       disabledb: false,
       disableda: false,
       valuePlus:'',
+      serviceFrequencyText:'',
+      keyTable:'',
     };
   },
   watch: {
@@ -538,11 +556,11 @@ export default {
       console.log(e);
     },
     blurInput(val) {
-      console.log(val, "555");
+// this.servicewaycontentList.serviceFrequencyText=val
+
     },
-    blurInputs(val) {
+    blurInputs() {
-      console.log(val, "666");
+      this.keyTable = Math.random()
-      this.form.id = val;
     },
     textlist(e) {
       if (e == true) {
@@ -601,11 +619,15 @@ export default {
         this.DepartmentoList = response.data;
         // this.count=this.DepartmentoList.length
         console.log(this.DepartmentoList);
-
+        // this.Option
         // this.total = response.total;
         this.loading = false;
       });
     },
+    change(e){
+console.log(e)
+// this.form.serviceWayId=e
+    },
     // 左侧科室
     itemdata(item) {
       if (item) {
@@ -616,6 +638,9 @@ export default {
         //   this.disabled=true
         // }
         this.itemname = item.id;
+        this.serviceWayName=item.serviceWayName
+        this.form.serviceWayId = item.id;
+
         // this.departmentName = item.serviceWayName;
         this.loading = true;
         this.queryParams.serviceWayId = item.id;
@@ -631,9 +656,30 @@ export default {
       this.loading = true;
       listServicewaycontent(this.queryParams).then((response) => {
         this.servicewaycontentList = response.rows;
+        // this.serviceFrequencyText= this.servicewaycontentList[0].serviceFrequencyText
+        console.log(this.servicewaycontentList,'****')
+        // if(e.serviceWayFrequencyList[0].serviceFrequencyType == 'TEXT'){
         this.servicewaycontentList.forEach((e) => {
-          this.serviceFrequencyType = e.serviceFrequencyType;
+          e.valuePlusMax = e.serviceWayFrequencyList[0].id
         });
+    
+          // }
+          // if(e.serviceWayFrequencyList[0].serviceFrequencyType == 'DIGIT'){
+          //   e.serviceFrequencyText = JSON.parse(e.serviceWayFrequencyList[0].serviceFrequencyStart) +
+          //               '~' +
+          //               JSON.parse(e.serviceWayFrequencyList[0].serviceFrequencyEnd)
+          // }
+
+
+
+
+          // e.serviceWayFrequencyList[0].forEach(el=>{
+          //   console.log(el)
+          //   // this.serviceFrequencyText = el.serviceFrequencyText;
+
+          // })
+        // this.serviceFrequencyText= this.servicewaycontentList[0].serviceFrequencyText
+
 
         this.total = response.total;
         this.loading = false;
@@ -686,26 +732,29 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      console.log(this.itemname,'itemname')
+      if (this.itemname) {
+        this.form.serviceWayName = this.serviceWayName
+        this.form.serviceWayId = this.itemname
+        console.log( this.form,' this.form')
+        
+      } 
+      // else if (this.itemname == null) {
+      //   this.form.serviceWayId = "请选择服务方式"
+      // }
       this.form.serviceFrequencyType = "DIGIT";
       this.open = true;
       this.title = "添加服务方式内容";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.reset();
       console.log(row,'99999');
-      // const id = row.id
+      this.reset();
-
+      getServicewaycontent(row.valuePlusMax).then((response) => {
-      //  --------------
-      if(!this.form.id){
-        row.serviceWayFrequencyList.forEach((e) => {
-        this.form.id = e.id;
-      });
-      }
-  
-      getServicewaycontent(this.form.id).then((response) => {
         this.form = response.data;
+        // this.form.serviceWayId=row.serviceWayId
         this.form.id = response.data.serviceFrequencyId;
+        this.form.serviceWayId=response.data.serviceWayId
         //  ----------
 
         if (response.data.serviceFrequencyType == "DIGIT") {
@@ -726,24 +775,48 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate((valid) => {
+    
+          this.$refs["form"].validate((valid) => {
         if (valid) {
-          console.log(this.form.id, "555555");
+          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, "555555");
+      console.log(this.form.serviceWayId)
+
           if (this.form.serviceContentId != null) {
             updateServicewaycontent(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
+              this.mentlist();
+
             });
           } else {
             addServicewaycontent(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
+              this.mentlist();
+              
+
             });
           }
         }
+      }
+
       });
+    
     },
     // 修改服务方式
     handleedit() {

src/views/manage/template/index.vue

@@ -384,9 +384,9 @@
         label-width="80px"
         :inline="true"
       >
-        <el-form-item label="病种名称" prop="departmentName" label-width="120">
+        <el-form-item label="病种名称" prop="diseaseTypeName" label-width="120">
           <el-input
-            v-model="querydisease.departmentName"
+            v-model="querydisease.diseaseTypeName"
             placeholder="请输入病种名称"
             clearable
           />
@@ -493,6 +493,8 @@ export default {
       querydisease: {
         pageNum: 1,
         pageSize: 10,
+        diseaseTypeName:null,
+        departmentId:null,
       },
       listdisease: [],
       diseasetotal: 0,
@@ -567,9 +569,6 @@ export default {
     this.getList();
     this.Departmentlist();
     this.typelistdata();
-    listTemplate(this.queryParams).then(response => {
-      this.count = response.total;
-    });
   },
   methods: {
     /** 查询微信模板信息列表 */
@@ -599,10 +598,15 @@ export default {
       this.loading = true;
       listWechatTemplateNum(this.querydepartmen).then(response => {
         this.DepartmentoList = response.data;
-        // this.count=this.DepartmentoList.length
+        let sum = 0;
+        this.DepartmentoList.forEach((item) => {
+          if (item.countNum != null) {
+            console.log(item.countNum)
+            sum += item.countNum;
+          }
+          this.count = sum;
+        });
 
-
-        // this.total = response.total;
         this.loading = false;
       });
 
@@ -618,12 +622,8 @@ export default {
         this.getList()
       } else {
         this.queryParams.departmentId = ''
-       
         this.itemname = null
         this.getList()
-        listTemplate(this.queryParams).then(response => {
-          this.count = response.total;
-        });
       }
     },
 
@@ -663,6 +663,8 @@ export default {
     nurseclick(row) {
       this.form.departmentId = row.departmentCode;
       this.departmentName = row.departmentName;
+      this.form.diseaseTypeId = '';
+      this.diseaseTypeName = '请选择病种';
       this.innerVisibleshow = false;
     },
 
@@ -771,22 +773,20 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      if (!this.itemname) {
+
-        this.$modal.msgError("请先选择科室");
+      this.reset();
-      } else {
+      const id = row.id || this.ids
-        // this.reset();
+      // this.getDisease();
-        const id = row.id || this.ids
+      this.typelistdata();
-        // this.getDisease();
+      getTemplate(id).then(response => {
-        this.typelistdata();
+        this.form = response.data;
-        getTemplate(id).then(response => {
+        this.form.suitTaskTypeIds = response.data.suitTaskTypeIds
-          this.form = response.data;
+        this.diseaseTypeName = response.data.diseaseTypeName
-          this.form.suitTaskTypeIds = response.data.suitTaskTypeIds
+        this.departmentName = response.data.departmentName
-          this.diseaseTypeName = response.data.diseaseTypeName
+        this.open = true;
-          this.departmentName = response.data.departmentName
+        this.title = "修改信息";
-          this.open = true;
+      });
-          this.title = "修改信息";
+
-        });
-      }
     },
     /** 提交按钮 */
     submitForm() {
@@ -800,6 +800,8 @@ export default {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
+              this.Departmentlist();
+
             });
           } else {
             if (this.diseaseTypeName == "请选择病种") {
@@ -820,6 +822,9 @@ export default {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
+              this.Departmentlist();
+
+
             });
 
           }
@@ -833,14 +838,6 @@ export default {
         return delTemplate(ids);
       }).then(() => {
         this.getList();
-        var quer = {
-          pageNum: 1,
-          pageSize: 10,
-
-        }
-        listTemplate(quer).then(response => {
-          this.count = response.total;
-        });
         this.Departmentlist();
         this.$modal.msgSuccess("删除成功");
       }).catch(() => { });

src/views/operationInfo/operationInfo/index.vue

@@ -66,9 +66,8 @@
               @click="itemdata()"
             >
               全部
-             
             </div>
-            <span class="count">{{count}}</span>
+            <span class="count">{{ count }}</span>
           </div>
           <div
             class="listitem"
@@ -79,8 +78,7 @@
             <div :class="itemname == item.id ? 'allactive' : 'all'">
               {{ item.departmentName }}
             </div>
-            <span class="count">{{item.countNum}}</span>
+            <span class="count">{{ item.countNum }}</span>
-
           </div>
         </div>
       </el-col>
@@ -186,7 +184,6 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-   
   </div>
 </template>
 
@@ -200,7 +197,7 @@ export default {
       itemname: null,
       disabled: false,
       name: '',
-      count:'',//全部
+      count: '',//全部
       // 用户导入参数
       upload: {
         // 是否显示弹出层（用户导入）
@@ -286,10 +283,6 @@ export default {
   created() {
     this.getList();
     this.Departmentlist();
-    listOperationInfo(this.queryParams).then(response => {
-        this.count = response.total;
-        this.loading = false;
-      });
   },
   watch: {
     name(val) {
@@ -323,10 +316,14 @@ export default {
       this.loading = true;
       listOperationNum(this.querydepartmen).then(response => {
         this.DepartmentoList = response.data;
-        // this.count=this.DepartmentoList.length
+        let sum = 0;
-        console.log(this.DepartmentoList)
+        this.DepartmentoList.forEach((item) => {
-
+          if (item.countNum != null) {
-        // this.total = response.total;
+            console.log(item.countNum)
+            sum += item.countNum;
+          }
+          this.count = sum;
+        });
         this.loading = false;
       });
 
@@ -336,7 +333,7 @@ export default {
       this.loading = true;
       listOperationInfo(this.queryParams).then(response => {
         this.operationInfoList = response.rows;
-        this.operationInfoList.forEach(e=>{
+        this.operationInfoList.forEach(e => {
           console.log(e)
         })
         this.total = response.total;
@@ -353,7 +350,7 @@ export default {
     // 表单重置
     reset() {
       this.form = {
-        // id: null,
+        id: null,
         // departmentId: null,
         // departmentName: null,
         operationName: null,
@@ -384,7 +381,7 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.queryParams.departmentId = null;
-        this.itemname = null;
+      this.itemname = null;
       this.resetForm("queryForm");
       this.getList();
       // this.handleQuery();
@@ -414,41 +411,41 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      if (!this.itemname) {
+      this.reset()
-        this.$modal.msgError("请先选择科室");
+      this.form.operationInfo = '';
-      } else {
+      this.open = true;
-        // this.reset() 
+      const id = row.id || this.ids
-        this.form.operationInfo = '';
+      getOperationInfo(id).then(response => {
+        this.form.operationInfo = response.data.operationInfo;
+        this.form.operationName = response.data.operationName;
+        this.form.departmentId = response.data.departmentId;
+        this.form.departmentName = response.data.departmentName;
+        this.form.id = response.data.id;
         this.open = true;
-        const id = row.id || this.ids
+        this.title = "修改手术信息";
-        getOperationInfo(id).then(response => {
+        if (this.title == "修改手术信息") {
-          this.form.operationInfo= response.data.operationInfo;
+          // this.disabled = true
-          this.form.operationName= response.data.operationName;
+        }
-          this.form.departmentId= response.data.departmentId;
+      });
-          this.open = true;
-          this.title = "修改手术信息";
-          if (this.title == "修改手术信息") {
-            this.disabled = true
-          }
-        });
 
-      }
     },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if (this.form.id != null) {
+          if (this.form.id) {
             updateOperationInfo(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
+              this.Departmentlist();
             });
           } else {
             addOperationInfo(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
+              this.Departmentlist();
             });
           }
         }
@@ -461,15 +458,7 @@ export default {
         return delOperationInfo(ids);
       }).then(() => {
         this.getList();
-        var quer={
+        this.Departmentlist();
-          pageNum: 1,
-        pageSize: 10,
-        }
-        listOperationInfo(quer).then(response => {
-        this.count = response.total;
-        this.loading = false;
-      });
-      this.Departmentlist();
         this.$modal.msgSuccess("删除成功");
       }).catch(() => { });
     },
@@ -494,14 +483,14 @@ export default {
     width: 100%;
     height: 50px;
     border-bottom: 1px solid #dcdfe6;
-    .count{
+    .count {
-    display: inline-block;
+      display: inline-block;
-    position: relative;
+      position: relative;
-    // right: -172px;
+      // right: -172px;
-    left: 210px;
+      left: 210px;
-    color: #a4a6aa;
+      color: #a4a6aa;
-    top: -35px;
+      top: -35px;
-    font-size: 13px;
+      font-size: 13px;
     }
     .all {
       height: 50px;

src/views/system/agency/index.vue

@@ -291,26 +291,19 @@
           />
         </el-form-item> -->
         <el-form-item label="机构名称" prop="agencyName">
-          <el-input v-model="form.agencyName" placeholder="请输入机构名称" />
+          <el-input v-model="form.agencyName" maxlength="100" placeholder="请输入机构名称" />
-        </el-form-item>
-        <el-form-item label="机构状态" prop="agencyStatus">
-          <!-- <el-form-item label="是否并发" prop="concurrent"> -->
-              <el-radio-group v-model="form.agencyStatus" size="small">
-                <el-radio   label="ON">启用</el-radio>
-                <el-radio  label="OFF">禁用</el-radio>
-              </el-radio-group>
-            <!-- </el-form-item> -->
-          <!-- <el-radio v-model="form.agencyStatus" label="ON">启用</el-radio>
-          <el-radio v-model="form.agencyStatus" label="OFF">禁用</el-radio> -->
         </el-form-item>
+       
         <el-form-item label="机构简称" prop="agencyAbbreviation">
           <el-input
+          maxlength="100"
             v-model="form.agencyAbbreviation"
             placeholder="请输入机构简称"
           />
         </el-form-item>
         <el-form-item label="机构代码" prop="agencyCode">
           <el-input
+          maxlength="20"
             v-model="form.agencyCode"
             style="width: 205px"
             placeholder="请输入机构代码"
@@ -327,6 +320,7 @@
             :placeholder="
               form.parentAgencyName ? form.parentAgencyName : '请选择上级机构'
             "
+            clearable
             ref="cascader"
             :key="isResouceShow"
           ></el-cascader>
@@ -347,6 +341,7 @@
             :show-all-levels="false"
             ref="cascader"
             :key="isResouceShows"
+            clearable
           ></el-cascader>
         </el-form-item>
         <el-form-item label="节点类型" prop="nodeType">
@@ -354,6 +349,7 @@
             v-model="form.nodeType"
             placeholder="请选择"
             style="width: 205px"
+            clearable
           >
             <el-option
               v-for="item in nodeTypeoptions"
@@ -370,6 +366,7 @@
         </el-form-item>
         <el-form-item label="组织机构编码" prop="orgAgencyCode">
           <el-input
+          maxlength="30"
             v-model="form.orgAgencyCode"
             placeholder="请输入组织机构编码"
             style="width: 205px"
@@ -380,6 +377,7 @@
             v-model="form.agencyCategoryManageLevel"
             placeholder="请选择"
             style="width: 205px"
+            clearable
           >
             <el-option
               v-for="item in options"
@@ -396,27 +394,40 @@
         </el-form-item>
         <el-form-item label="机构联系人" prop="agencyContacts">
           <el-input
+          maxlength="20"
             v-model="form.agencyContacts"
             placeholder="请输入机构联系人"
           />
         </el-form-item>
         <el-form-item label="机构联系电话" prop="agencyPhone">
           <el-input
+          maxlength="12"
             v-model="form.agencyPhone"
             placeholder="请输入机构联系电话"
           />
         </el-form-item>
         <el-form-item label="机构详细地址" prop="agencyAddress">
           <el-input
+          maxlength="200"
             v-model="form.agencyAddress"
             placeholder="请输入机构详细地址"
           />
         </el-form-item>
         <el-form-item label="机构概述" prop="agencyRemark">
-          <el-input v-model="form.agencyRemark" placeholder="请输入机构概述" />
+          <el-input v-model="form.agencyRemark"  maxlength="100" placeholder="请输入机构概述" />
         </el-form-item>
         <el-form-item label="机构排序" prop="agencySort">
-          <el-input v-model="form.agencySort" placeholder="请输入机构排序" />
+          <el-input v-model="form.agencySort"  maxlength="8" placeholder="请输入机构排序" />
+        </el-form-item>
+        <el-form-item label="机构状态" prop="agencyStatus">
+          <!-- <el-form-item label="是否并发" prop="concurrent"> -->
+              <el-radio-group v-model="form.agencyStatus" size="small">
+                <el-radio   label="ON">启用</el-radio>
+                <el-radio  label="OFF">禁用</el-radio>
+              </el-radio-group>
+            <!-- </el-form-item> -->
+          <!-- <el-radio v-model="form.agencyStatus" label="ON">启用</el-radio>
+          <el-radio v-model="form.agencyStatus" label="OFF">禁用</el-radio> -->
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -628,9 +639,11 @@ export default {
       },
       // 表单校验
       rules: {
-        // parentId: [
+        agencyName: [
-        //   { required: true, message: "上级机构id不能为空", trigger: "blur" },
+          { required: true, message: "机构名称能为空", trigger: "blur" },
-        // ],
+        ],
+        areaCode:[{ required: true, message: "行政区划不能为空", trigger: "blur" },
+        ],
       },
       treeOptionsagencyCategoryId: [],
       treeOptions: [],
@@ -734,7 +747,7 @@ export default {
 
     //点击街道
     clickstreet(item) {
-      // this.form.areaCode = item.areaCode;
+      this.form.communityName =''
       getSecondaryLevelInfo(item.id).then((res) => {
         this.streetlists = res.data;
       });
@@ -747,6 +760,9 @@ export default {
     clickarea(item) {
       this.form.areaCode = "";
       this.form.streetCode = "";
+      // this.form.streetName=''
+      this.form.communityCode =''
+
       getSecondaryLevelInfo(item.id).then((res) => {
         this.streetlist = res.data;
       });
@@ -756,6 +772,10 @@ export default {
       this.form.regionName = "";
       this.form.areaCode = "";
       this.form.streetCode = "";
+      this.form.streetName = "";
+      this.form.communityCode =''
+
+      
       getSecondaryLevelInfo(item.id).then((res) => {
         this.arealist = res.data;
       });
@@ -769,7 +789,8 @@ export default {
     //点击省
     province(item) {
       this.form.cityName = "";
-      this.form.streeName = "";
+      // this.form.streeName = "";
+      // this.form.communityCode =''
 
       this.form.areaName = "";
       this.form.communityName = "";
@@ -822,7 +843,10 @@ export default {
       console.log(e, "78");
       // console.log(this.$refs.cascader)
       // this.form.parentId = e;
-      this.form.parentId = e[e.length - 1];
+      if(e){
+        this.form.parentId = e[e.length - 1];
+
+      }
 
     },
     changeagencyCategoryId(e) {

src/views/system/agencyCategory/index.vue

@@ -180,8 +180,11 @@
             v-model="form.parentCategoryId"
             :show-all-levels="false"
             :placeholder="
-              form.parentCategoryName ? form.parentCategoryName : '请选择父级类别'
+              form.parentCategoryName
+                ? form.parentCategoryName
+                : '请选择父级类别'
             "
+            clearable
             ref="cascader"
             :key="isResouceShow"
           ></el-cascader>
@@ -189,6 +192,7 @@
         </el-form-item>
         <el-form-item label="类别名称" prop="categoryName">
           <el-input
+            maxlength="50"
             v-model="form.categoryName"
             style="width: 250px"
             placeholder="请输入类别名称"
@@ -196,6 +200,7 @@
         </el-form-item>
         <el-form-item label="类别编码" prop="categoryCode">
           <el-input
+            maxlength="50"
             v-model="form.categoryCode"
             style="width: 250px"
             placeholder="请输入类别编码"
@@ -218,6 +223,7 @@
         </el-form-item> -->
         <el-form-item label="类别排序" prop="categorySort">
           <el-input
+            maxlength="8"
             v-model="form.categorySort"
             style="width: 250px"
             placeholder="请输入类别排序"
@@ -225,6 +231,7 @@
         </el-form-item>
         <el-form-item label="类别概述" prop="categoryRemark">
           <el-input
+            maxlength="100"
             v-model="form.categoryRemark"
             style="width: 250px"
             placeholder="请输入类别概述"
@@ -247,7 +254,7 @@ import {
   addAgencyCategory,
   updateAgencyCategory,
 } from "@/api/system/agencyCategory";
-import { agencyCategoryList,  } from "@/api/system/agency";
+import { agencyCategoryList } from "@/api/system/agency";
 export default {
   name: "AgencyCategory",
   data() {
@@ -257,8 +264,7 @@ export default {
       // 遮罩层
       loading: true,
       isResouceShow: 1,
-     
+
-     
       // 选中数组
       ids: [],
       options: [
@@ -312,7 +318,7 @@ export default {
   },
   created() {
     this.getList();
-    this.gettreelistitem()
+    this.gettreelistitem();
   },
   methods: {
     gettreelistitem() {
@@ -324,8 +330,11 @@ export default {
       });
     },
     change(e) {
-      console.log(e,'9')
+      console.log(e, "9");
-      this.form.parentCategoryId = e[e.length - 1];
+      if(e){
+        this.form.parentCategoryId = e[e.length - 1];
+
+      }
     },
     /** 查询机构类别列表 */
     getList() {

src/views/system/compare/index.vue

@@ -140,7 +140,7 @@
 
     <!-- 添加或修改标准科室对照信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px" :inline="true">
+      <el-form ref="form" :model="form" :rules="rules" label-width="110px" :inline="true">
         <!-- <el-form-item label="所属科室id" prop="departmentId">
           <el-input v-model="form.departmentId" placeholder="请输入所属科室id" />
         </el-form-item> -->
@@ -176,16 +176,16 @@
           <el-input v-model="form.departmentName" placeholder="请输入所属科室名称" />
         </el-form-item> -->
         <el-form-item label="标准对照名称" prop="normCompareName">
-          <el-input v-model="form.normCompareName" placeholder="请输入标准对照名称" />
+          <el-input v-model="form.normCompareName" maxlength="100" placeholder="请输入标准对照名称" />
         </el-form-item>
         <el-form-item label="标准对照编码" prop="normCompareCode">
-          <el-input v-model="form.normCompareCode" placeholder="请输入标准对照编码" />
+          <el-input v-model="form.normCompareCode" maxlength="20" placeholder="请输入标准对照编码" />
         </el-form-item>
         <el-form-item label="标准对照排序" prop="normCompareSort">
-          <el-input v-model="form.normCompareSort" placeholder="请输入标准对照排序" />
+          <el-input v-model="form.normCompareSort" maxlength="8" placeholder="请输入标准对照排序" />
         </el-form-item>
         <el-form-item label="标准对照概述" prop="normCompareRemark">
-          <el-input v-model="form.normCompareRemark" placeholder="请输入标准对照概述" />
+          <el-input v-model="form.normCompareRemark" maxlength="100" placeholder="请输入标准对照概述" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -324,6 +324,14 @@ export default {
       innerVisibleshow:false,
       // 表单校验
       rules: {
+        departmentId:[
+        { required: true, message: "所属科室不能为空", trigger: "blur" },
+
+        ],
+        normCompareName:[
+        { required: true, message: "标准对照名称不能为空", trigger: "blur" },
+
+        ]
       }
     };
   },

src/views/system/department/index.vue

@@ -36,6 +36,7 @@
         >
           <el-form-item label="科室名称" prop="departmentName">
             <el-input
+              maxlength="100"
               v-model="queryParams.departmentName"
               placeholder="请输入科室名称"
               clearable
@@ -44,6 +45,7 @@
           </el-form-item>
           <el-form-item label="科室代码" prop="departmentCode">
             <el-input
+              maxlength="30"
               v-model="queryParams.departmentCode"
               placeholder="请输入科室代码"
               clearable
@@ -342,18 +344,21 @@
         <div class="content">
           <el-form-item label="科室名称" prop="departmentName">
             <el-input
+              maxlength="100"
               v-model="form.departmentName"
               placeholder="请输入科室名称"
             />
           </el-form-item>
           <el-form-item label="科室代码" prop="departmentCode">
             <el-input
+              maxlength="30"
               v-model="form.departmentCode"
               placeholder="请输入科室代码"
             />
           </el-form-item>
           <el-form-item label="科室简称" prop="departmentAbbreviation">
             <el-input
+              maxlength="100"
               v-model="form.departmentAbbreviation"
               placeholder="请输入科室简称"
             />
@@ -363,6 +368,7 @@
               v-model="form.departmentType"
               placeholder="请选择"
               style="width: 205px"
+              clearable=""
             >
               <el-option
                 v-for="item in departmentoptions"
@@ -381,6 +387,7 @@
         </el-form-item> -->
           <el-form-item label="科室负责人姓名" prop="departmentPersonName">
             <el-input
+              maxlength="20"
               v-model="form.departmentPersonName"
               placeholder="请输入科室负责人姓名"
             />
@@ -390,6 +397,7 @@
               v-model="form.nodeType"
               placeholder="请选择"
               style="width: 205px"
+              clearable
             >
               <el-option
                 v-for="item in nodeTypeoptions"
@@ -402,6 +410,7 @@
           </el-form-item>
           <el-form-item label="所属机构" prop="agencyName">
             <el-cascader
+              clearable
               :props="{ checkStrictly: true }"
               :options="treeOptions"
               @change="change($event)"
@@ -421,6 +430,7 @@
               placeholder="请选择"
               style="width: 205px"
               @change="changeparentDepartment"
+              clearable
             >
               <el-option
                 v-for="item in optionsparentDepartment"
@@ -451,6 +461,7 @@
         <div class="content">
           <el-form-item label="提供服务类别" prop="provideServiceCategory">
             <el-select
+              clearable
               v-model="form.provideServiceCategory"
               placeholder="请选择"
               style="width: 205px"
@@ -469,6 +480,7 @@
               v-model="form.subdivisionCategoryId"
               placeholder="请选择"
               style="width: 205px"
+              clearable
             >
               <el-option
                 v-for="item in optionsubdivisionCategory"
@@ -490,6 +502,7 @@
               v-model="form.normDepartmentCompareId"
               placeholder="请选择"
               style="width: 205px"
+              clearable
             >
               <el-option
                 v-for="item in compareList"
@@ -512,18 +525,21 @@
         </el-form-item> -->
           <el-form-item label="编制床位数" prop="prepareBedsCount">
             <el-input
+              maxlength="8"
               v-model="form.prepareBedsCount"
               placeholder="请输入编制床位数"
             />
           </el-form-item>
           <el-form-item label="科室电话" prop="departmentPhone">
             <el-input
+              maxlength="12"
               v-model="form.departmentPhone"
               placeholder="请输入科室电话"
             />
           </el-form-item>
           <el-form-item label="科室邮箱" prop="departmentMail">
             <el-input
+              maxlength="20"
               v-model="form.departmentMail"
               placeholder="请输入科室邮箱"
             />
@@ -705,9 +721,9 @@ export default {
       id: "",
       // 表单校验
       rules: {
-        // parentDepartmentId: [
+        departmentName: [
-        //   { required: true, message: "上级科室id不能为空", trigger: "blur" },
+          { required: true, message: "科室名称不能为空", trigger: "blur" },
-        // ],
+        ],
       },
     };
   },

src/views/system/departmentDisease/index.vue

@@ -26,6 +26,7 @@
       </el-form-item> -->
       <el-form-item label="病种名称" prop="diseaseTypeName">
         <el-input
+          maxlength="50"
           v-model="queryParams.diseaseTypeName"
           placeholder="请输入病种名称"
           clearable
@@ -134,7 +135,7 @@
               @keyup.enter.native="handleQuery"
             />
           </div>
-          <div class="listitem">
+          <!-- <div class="listitem">
             <div
               :class="itemname == null ? 'allactive' : 'all'"
               @click="itemdata()"
@@ -142,7 +143,7 @@
               全部
             </div>
             <span class="count">{{ count }}</span>
-          </div>
+          </div> -->
           <div
             class="listitem"
             v-for="(item, index) in DepartmentoList"
@@ -270,12 +271,23 @@
         </el-form-item> -->
         <el-form-item label="对应诊断信息" prop="diagnosisInfo">
           <el-input
-          type="textarea"
+            type="textarea"
+            maxlength="300"
             style="width: 610px"
             v-model="form.diagnosisInfo"
             placeholder="请输入对应诊断信息"
           />
         </el-form-item>
+        <el-form-item label="病种概述" prop="diseaseTypeRemark ">
+          <el-input
+            type="textarea"
+            maxlength="200"
+            style="width: 610px"
+            v-model="form.diseaseTypeRemark"
+            placeholder="请输入病种概述"
+          />
+        </el-form-item>
+
         <!-- <el-button
           type="primary"
           plain
@@ -421,7 +433,8 @@ import {
   delDepartmentDisease,
   addDepartmentDisease,
   updateDepartmentDisease,
-  getDepartmentList
+  getDepartmentList,
+  selectDiseaseCount,
 } from "@/api/system/departmentDisease";
 import { listScript, department } from "@/api/manage/script";
 // import { getDepartmentLis } from "@/api/operationInfo/operationInfo";
@@ -493,32 +506,51 @@ export default {
       },
       querydepartmen: {
         departmentName: "",
-
       },
+      departmentName: "",
       // 表单参数
       form: {},
+      // querydepartment:{}
       // 表单校验
       rules: {
         departmentId: [
           { required: true, message: "所属科室不能为空", trigger: "blur" },
         ],
+        diseaseTypeName:[
+        { required: true, message: "病种名称不能为空", trigger: "blur" },
+        
+        ],
       },
     };
   },
   created() {
     this.getList();
-    this.Departmentlist();
+    // this.Departmentlist();
-    listScript(this.queryParams).then((response) => {
+    // listScript(this.queryParams).then((response) => {
-      this.count = response.total;
+    //   this.count = response.total;
-    });
+    // });
+    this.infolists();
   },
   watch: {
     name(val) {
-      this.querydepartmen.departmentName = val
+      // this.querydepartmen.departmentName = val;
-      this.Departmentlist();
+      this.departmentName = val;
-    }
+
+      this.infolists();
+    },
   },
   methods: {
+    infolists() {
+      selectDiseaseCount(this.departmentName).then((res) => {
+        this.DepartmentoList = res.data;
+
+        console.log(res, "8888");
+        // res.data.forEach((e) => {
+        //   this.count = e.countNum;
+
+        // });
+      });
+    },
     // 科室名称重置
     addresetQuerylist() {
       this.informationqueryParams = {
@@ -593,15 +625,15 @@ export default {
       this.upload.isUploading = true;
     },
     // 左侧科室
-    Departmentlist() {
+    // Departmentlist() {
-      this.loading = true;
+    //   this.loading = true;
-      getDepartmentList(this.querydepartmen).then((response) => {
+    //   getDepartmentList(this.querydepartmen).then((response) => {
-        this.DepartmentoList = response.data;
+    //     this.DepartmentoList = response.data;
-        // this.total = response.total;
+    //     // this.total = response.total;
 
-        this.loading = false;
+    //     this.loading = false;
-      });
+    //   });
-    },
+    // },
     // 左侧科室
     itemdata(item) {
       if (item) {
@@ -670,9 +702,8 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      if(this.itemname == null){
+      if (this.itemname == null) {
-        this.form.departmentName = "请选择科室"
+        this.form.departmentName = "请选择科室";
-
       }
       this.title = "添加科室病种信息";
     },

src/views/system/stationAvatar/index.vue

@@ -128,7 +128,8 @@ import {
   uploadTrainingCategoryPicture,
   updatePoserHeads,
   uploadUrl,
-  uploadFilefm
+  uploadFilefm,
+  uploadScriptInfo
 } from "@/api/system/stationAvatar.js";
 
 export default {
@@ -165,7 +166,7 @@ export default {
   },
   created() {
     this.types = this.type;
-    console.log(this.types)
+
 
     this.items = this.item;
     if (this.tovideo == null) {
@@ -173,7 +174,7 @@ export default {
     } else if (this.tovideo == "") {
       this.video.VideoPath = null;
     } else {
-      console.log(this.tovideo)
+
       this.video.VideoPath = process.env.VUE_APP_BASE_API + this.tovideo;
     }
     if (this.img == null) {
@@ -249,7 +250,7 @@ export default {
     },
     // 上传预处理
     beforeUpload(file) {
-      console.log(file)
+
       if (this.types == "materialsVideoUrl") {
         const reader = new FileReader();
         this.previews.data = file;
@@ -383,6 +384,23 @@ export default {
             }
           });
         }
+        // 话术图片
+        else if(this.types == "scriptUrl"){
+          let formDatanew = new FormData();
+          formDatanew.append("file", this.previews.data);
+          uploadScriptInfo(formDatanew).then(response => {
+            if (response.code == 200) {
+              this.options.img = process.env.VUE_APP_BASE_API + response.imgUrl;
+              this.$emit("imgUrl", response.imgUrl);
+              this.openimg = false;
+            } else {
+              setTimeout(e => {
+                this.openimg = false;
+              }, 1000);
+            }
+          });
+        }
+
 
         else {
           updateNurseStationHeads(formData).then(response => {

src/views/system/subdivision/index.vue

@@ -1,6 +1,13 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="100px"
+    >
       <el-form-item label="细分类别名称" prop="subdivisionCategoryName">
         <el-input
           v-model="queryParams.subdivisionCategoryName"
@@ -26,8 +33,16 @@
         />
       </el-form-item> -->
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
       </el-form-item>
     </el-form>
 
@@ -40,7 +55,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['system:subdivision:add']"
-        >新增</el-button>
+          >新增</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -51,7 +67,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['system:subdivision:edit']"
-        >修改</el-button>
+          >修改</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -62,7 +79,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['system:subdivision:remove']"
-        >删除</el-button>
+          >删除</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -72,19 +90,39 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['system:subdivision:export']"
-        >导出</el-button>
+          >导出</el-button
+        >
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="subdivisionList" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="subdivisionList"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
-      <el-table-column label="细分类别名称" align="center" prop="subdivisionCategoryName" />
+      <el-table-column
-      <el-table-column label="细分类别编码" align="center" prop="subdivisionCategoryCode" />
+        label="细分类别名称"
+        align="center"
+        prop="subdivisionCategoryName"
+      />
+      <el-table-column
+        label="细分类别编码"
+        align="center"
+        prop="subdivisionCategoryCode"
+      />
       <el-table-column label="细分类别排序" align="center" prop="sort" />
       <el-table-column label="细分类别概述" align="center" prop="remark" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -92,20 +130,22 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:subdivision:edit']"
-          >修改</el-button>
+            >修改</el-button
+          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:subdivision:remove']"
-          >删除</el-button>
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -114,18 +154,40 @@
 
     <!-- 添加或修改细分类别信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px" :inline="true">
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="110px"
+        :inline="true"
+      >
         <el-form-item label="细分类别名称" prop="subdivisionCategoryName">
-          <el-input v-model="form.subdivisionCategoryName" placeholder="请输入细分类别名称" />
+          <el-input
+            maxlength="50"
+            v-model="form.subdivisionCategoryName"
+            placeholder="请输入细分类别名称"
+          />
         </el-form-item>
         <el-form-item label="细分类别编码" prop="subdivisionCategoryCode">
-          <el-input v-model="form.subdivisionCategoryCode" placeholder="请输入细分类别编码" />
+          <el-input
+            maxlength="20"
+            v-model="form.subdivisionCategoryCode"
+            placeholder="请输入细分类别编码"
+          />
         </el-form-item>
         <el-form-item label="细分类别排序" prop="sort">
-          <el-input v-model="form.sort" placeholder="请输入细分类别排序" />
+          <el-input
+            maxlength="8"
+            v-model="form.sort"
+            placeholder="请输入细分类别排序"
+          />
         </el-form-item>
         <el-form-item label="细分类别概述" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入细分类别概述" />
+          <el-input
+            v-model="form.remark"
+            maxlength="100"
+            placeholder="请输入细分类别概述"
+          />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -137,7 +199,13 @@
 </template>
 
 <script>
-import { listSubdivision, getSubdivision, delSubdivision, addSubdivision, updateSubdivision } from "@/api/system/subdivision";
+import {
+  listSubdivision,
+  getSubdivision,
+  delSubdivision,
+  addSubdivision,
+  updateSubdivision,
+} from "@/api/system/subdivision";
 
 export default {
   name: "Subdivision",
@@ -173,7 +241,10 @@ export default {
       form: {},
       // 表单校验
       rules: {
-      }
+        subdivisionCategoryName: [
+          { required: true, message: "细分类别名称不能为空", trigger: "blur" },
+        ],
+      },
     };
   },
   created() {
@@ -183,7 +254,7 @@ export default {
     /** 查询细分类别信息列表 */
     getList() {
       this.loading = true;
-      listSubdivision(this.queryParams).then(response => {
+      listSubdivision(this.queryParams).then((response) => {
         this.subdivisionList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -205,7 +276,7 @@ export default {
         createBy: null,
         createTime: null,
         updateBy: null,
-        updateTime: null
+        updateTime: null,
       };
       this.resetForm("form");
     },
@@ -221,9 +292,9 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
+      this.ids = selection.map((item) => item.id);
-      this.single = selection.length!==1
+      this.single = selection.length !== 1;
-      this.multiple = !selection.length
+      this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd() {
@@ -234,8 +305,8 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const id = row.id || this.ids
+      const id = row.id || this.ids;
-      getSubdivision(id).then(response => {
+      getSubdivision(id).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "修改细分类别信息";
@@ -243,16 +314,16 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
-            updateSubdivision(this.form).then(response => {
+            updateSubdivision(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addSubdivision(this.form).then(response => {
+            addSubdivision(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -264,19 +335,27 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除细分类别信息编号为"' + ids + '"的数据项？').then(function() {
+      this.$modal
-        return delSubdivision(ids);
+        .confirm('是否确认删除细分类别信息编号为"' + ids + '"的数据项？')
-      }).then(() => {
+        .then(function () {
-        this.getList();
+          return delSubdivision(ids);
-        this.$modal.msgSuccess("删除成功");
+        })
-      }).catch(() => {});
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('system/subdivision/export', {
+      this.download(
-        ...this.queryParams
+        "system/subdivision/export",
-      }, `subdivision_${new Date().getTime()}.xlsx`)
+        {
-    }
+          ...this.queryParams,
-  }
+        },
+        `subdivision_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
 };
 </script>

src/views/system/user/index.vue

@@ -254,11 +254,19 @@
             <el-button
               size="mini"
               type="text"
-              icon="el-icon-edit"
+              icon="el-icon-mobile"
               @click="handleinnerVisibleshow(scope.row)"
               v-hasPermi="['system:user:edit']"
               >设置机构</el-button
             >
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-star-on"
+              @click="handleinnerVisibleshowdep(scope.row)"
+              v-hasPermi="['system:user:edit']"
+              >设置科室</el-button
+            >
 
             <el-button
               size="mini"
@@ -559,10 +567,9 @@
             ref="multipleTable"
             :data="tableData1"
             height="300"
-          
             tooltip-effect="dark"
             style="width: 100%"
-            @selection-change="handleSelectionChangen"
+            @selection-change="handleSelectionChangenleft"
             class="el-table-dialog"
             row-key="id"
           >
@@ -661,7 +668,146 @@
     :data="datalist">
   </el-transfer> -->
     </el-dialog>
+    <!-- 设置科室 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="innerVisibleshowdep"
+      width="1200px"
+    >
+      <el-row :gutter="20">
+        <el-col :span="10">
+          <div class="table-title">
+            <span v-if="departmentNum">可设置科室:{{ departmentNum }}条</span>
+            <span v-else>可设置科室:0条</span>
+          </div>
+          <div style="margin-top: 3%">
+            <el-form
+              ref="queryForm"
+              :model="formmatdep"
+              :rules="rules"
+              label-width="80px"
+              :inline="true"
+            >
+              <el-form-item
+                label="科室名称"
+                prop="departmentName"
+                label-width="120"
+              >
+                <el-input
+                  v-model="formmatdep.departmentName"
+                  placeholder="请输入科室名称"
+                  clearable
+                />
+              </el-form-item>
 
+              <el-form-item>
+                <el-button
+                  type="primary"
+                  icon="el-icon-search"
+                  size="mini"
+                  @click="infodep"
+                  >搜索</el-button
+                >
+                <el-button
+                  icon="el-icon-refresh"
+                  size="mini"
+                  @click="addresetQuerylistdep"
+                  >重置</el-button
+                >
+              </el-form-item>
+            </el-form>
+          </div>
+          <!-- 穿梭框左边 -->
+          <el-table
+            ref="multipleTabledep"
+            :data="tableDatadep1"
+            height="300"
+            tooltip-effect="dark"
+            style="width: 100%"
+            @selection-change="handleSelectionChangendep"
+            class="el-table-dialog"
+            row-key="id"
+          >
+            <el-table-column type="selection" width="55" align="center">
+            </el-table-column>
+            <!-- <el-table-column type="index" label="序号" align="center">
+            </el-table-column> -->
+
+            <el-table-column label="科室名称" align="center">
+              <template slot-scope="{ row }">
+                <span>{{ row.departmentName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="科室编码" align="center">
+              <template slot-scope="{ row }">
+                <span>{{ row.departmentCode }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+          <pagination
+            :total="totalagdep"
+            :page.sync="formmatdep.pageNum"
+            :limit.sync="formmatdep.pageSize"
+            @pagination="infodep"
+          />
+        </el-col>
+        <el-col :span="4" class="el-btn-dialog">
+          <el-button
+            @click="leftcontentdep"
+            type="primary"
+            :disabled="nowSelectRightDatadep.length ? false : true"
+            icon="el-icon-arrow-left"
+            style="margin-left: 0; margin-top: 10px"
+          ></el-button>
+          <el-button
+            @click="rightcontentdep()"
+            type="primary"
+            :disabled="nowSelectDatadep.length ? false : true"
+            icon="el-icon-arrow-right"
+          ></el-button>
+        </el-col>
+        <el-col :span="10">
+          <div class="table-title">
+            <span v-if="departmentNums != ''"
+              >已设置科室:{{ departmentNums }}条</span
+            >
+            <span v-else>已设置科室:0条</span>
+          </div>
+          <!-- 穿梭框右边 -->
+          <div style="margin-top: 5%">
+            <el-table
+              ref="multipleTablesdep"
+              :data="tableDatadep2"
+              max-height="300"
+              tooltip-effect="dark"
+              style="width: 100%"
+              @selection-change="handleSelectionChangenrightdep"
+              row-key="id"
+              class="el-table-dialog"
+            >
+              <el-table-column
+                type="selection"
+                width="55"
+                align="center"
+              ></el-table-column>
+              <!-- <el-table-column type="index" label="序号" align="center">
+              </el-table-column> -->
+
+              <el-table-column label="科室名称" align="center" width="110">
+                <template slot-scope="{ row }">
+                  <span>{{ row.departmentName }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="科室编码" align="center">
+                <template slot-scope="{ row }">
+                  <span>{{ row.departmentCode }}</span>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+        </el-col>
+      </el-row>
+    </el-dialog>
     <!-- 用户导入对话框 -->
     <el-dialog
       :title="upload.title"
@@ -713,10 +859,13 @@ import {
   delUser,
   addUser,
   updateUser,
+  editDepartment,
   resetUserPwd,
   selectUserAgency,
   changeUserStatus,
   selectUserAgencyleft,
+  selectUserDepartment,
+  getBelongDepartment,
 } from "@/api/system/user";
 import { getToken } from "@/utils/auth";
 import { treeselect } from "@/api/system/dept";
@@ -733,18 +882,33 @@ export default {
       formmat: {
         pageNum: 1,
         pageSize: 10,
-        agencyName: '',
+        agencyName: "",
-        userId: '',
+        userId: "",
+      },
+      formmatdep: {
+        pageNum: 1,
+        pageSize: 10,
+        departmentName: "",
+        userId: "",
       },
 
       totalag2: 0,
+      totalagdep: 0,
+
       agencyNum: "",
       belongAgencyNum: "",
+      departmentNum: "",
+      departmentNums: "",
+      tableDatadep1: [],
+      tableDatadep2: [],
       tableData1: [],
       tableData2: [],
+      nowSelectDatadep: [], // 左边选中列表数据
+      nowSelectRightDatadep: [], // 右边选中列表数据
+      nowSelectRightData: [],
       nowSelectData: [], // 左边选中列表数据
-      nowSelectRightData: [], // 右边选中列表数据
       innerVisibleshow: false,
+      innerVisibleshowdep: false,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -811,6 +975,16 @@ export default {
         agencyId: "",
         userName: "",
       },
+      formlistdep: {
+        userId: "",
+        departmentId: "",
+        userName: "",
+      },
+      formlistdeps: {
+        userId: "",
+        departmentId: "",
+        userName: "",
+      },
       formlists: {
         userId: "",
         agencyId: "",
@@ -882,30 +1056,55 @@ export default {
     });
   },
   methods: {
-    // 左边选中事件
+    //      // 科室左边选中事件
-    handleSelectionChangen(selection) {
+    handleSelectionChangendep(selection) {
-      // console.log(selection, "56");
+      if (selection.length > 1) {
-      //  this.abc=selection
+        this.$refs.multipleTabledep.clearselection(); // 清空所有选择
-      // console.log(data,"9");
+        this.$refs.multipleTabledep.toggleRowSelection(selection.pop()); // 设置选择项
-      // this.selection=[]
-      if (selection.length >1) {
-        this.$refs.multipleTable.clearSelection(); // 清空所有选择
-        this.$refs.multipleTable.toggleRowSelection(selection.pop()); // 设置选择项
-   
       }
+      this.nowSelectDatadep = selection;
+      if(selection.length>0){
+        this.formlistdep.departmentId = selection[0].departmentId;
+
+      }
+    },
+    //    // 科室右边选中事件
+    handleSelectionChangenrightdep(selection) {
+      console.log(selection, "56888");
+      if (selection.length > 1) {
+        this.$refs.multipleTablesdep.clearselection(); // 清空所有选择
+        this.$refs.multipleTablesdep.toggleRowSelection(selection.pop()); // 设置选择项
+      }
+      this.nowSelectRightDatadep = selection;
+      // this.nowSelectData=[]
+    },
+    addresetQuerylist() {
+      this.formmat.agencyName = "";
+      this.info();
+    },
+    // 科室重置
+    addresetQuerylistdep() {
+      this.formmatdep.departmentName = "";
+      this.infodep();
+    },
+    // 机构左边选中事件
+    handleSelectionChangenleft(selection) {
+      console.log(selection,'55555555')
+      this.$nextTick(() => {
+        if (selection.length > 1) {
+          this.$refs.multipleTable.clearSelection(); // 清空所有选择
+          this.$refs.multipleTable.toggleRowSelection(selection.pop()); // 设置选择项
+        }
+      });
 
       this.nowSelectData = selection;
-      this.formlist.agencyId = selection[0].agencyId;
+      if(selection.length>0){
-      // this.nowSelectRightData=[]
+        this.formlist.agencyId = selection[0].agencyId;
-      // this.formlist.agencyCode = selection[0].agencyCode;
+      }
 
-      // console.log(this.formlist.agencyId, "99999999");
-      // console.log(selection, "7474");
-
-      
-     
     },
-    // 右边选中事件
+
+    // 机构右边选中事件
     handleSelectionChangenright(selection) {
       console.log(selection, "56888");
       if (selection.length > 1) {
@@ -919,10 +1118,37 @@ export default {
       this.formmat.agencyName = "";
       this.info();
     },
-    // 点击去右边
+    // 科室点击去右边
+    rightcontentdep() {
+      // console.log("78798",this.abc);
+      console.log(this.tableDatadep2, "85");
+      if (this.tableDatadep2.length == 1) {
+        this.$message.error("只能选择一个科室");
+      } else {
+        editDepartment(this.formlistdep).then((response) => {
+          if (response.code == 200) {
+            this.infodep();
+            this.infodep2();
+          }
+        });
+      }
+    },
+    // 科室点击去左边
+    leftcontentdep() {
+      console.log(this.formlistdeps, "4578");
+      // this.formlistdeps.departmentId = "";
+      editDepartment(this.formlistdeps).then((response) => {
+        if (response.code == 200) {
+          console.log(response.code);
+          this.infodep();
+          this.infodep2();
+        }
+      });
+    },
+    // 机构点击去右边
     rightcontent() {
       // console.log("78798",this.abc);
-      console.log(this.tableData2,'85')
+      console.log(this.tableData2, "85");
       if (this.tableData2.length == 1) {
         this.$message.error("只能选择一个机构");
       } else {
@@ -934,12 +1160,13 @@ export default {
         });
       }
     },
+
     // 点击去左边
     leftcontent() {
-      console.log(this.formlists,'4578')
+      console.log(this.formlists, "4578");
       updateUser(this.formlists).then((response) => {
         if (response.code == 200) {
-          console.log(response.code)
+          console.log(response.code);
           this.info();
           this.info2();
         }
@@ -1039,6 +1266,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
+      console.log(selection);
       this.ids = selection.map((item) => item.userId);
       this.single = selection.length != 1;
       this.multiple = !selection.length;
@@ -1068,25 +1296,42 @@ export default {
         this.form.password = this.initPassword;
       });
     },
+    infodep() {
+      console.log(this.formmatdep);
+      selectUserDepartment(this.formmatdep).then((res) => {
+        this.tableDatadep1 = res.rows;
+        if (res.rows.length > 0) {
+          this.departmentNum = res.rows[0].departmentNum;
+        } else {
+          this.departmentNum = 0;
+        }
+        this.totalagdep = res.total;
+      });
+    },
+    // 机构
     info() {
       console.log(this.formmat);
       selectUserAgencyleft(this.formmat).then((res) => {
-        // console.log(res)
-        // if(res.rows){
-        //   this.tableData1 = res.rows;
-        // }else{
-        // this.tableData1 =[]
-
-        // }
         this.tableData1 = res.rows;
         if (res.rows.length > 0) {
           this.agencyNum = res.rows[0].agencyNum;
-        }else{
+        } else {
-          this.agencyNum=0
+          this.agencyNum = 0;
         }
         this.totalag = res.total;
       });
     },
+    infodep2() {
+      getBelongDepartment(this.userName).then((res) => {
+        this.tableDatadep2 = res.rows;
+        if (res.rows.length > 0) {
+          this.departmentNums = res.rows[0].departmentNum;
+        } else {
+          this.departmentNums = 0;
+        }
+      });
+    },
+
     info2() {
       selectUserAgency(this.userName).then((res) => {
         // console.log(res,"/////////");
@@ -1094,9 +1339,8 @@ export default {
         this.tableData2 = res.rows;
         if (res.rows.length > 0) {
           this.belongAgencyNum = res.rows[0].agencyNum;
-        }else{
+        } else {
-          this.belongAgencyNum=0
+          this.belongAgencyNum = 0;
-
         }
       });
     },
@@ -1122,6 +1366,32 @@ export default {
       //   this.belongAgencyNum = res.data.belongAgencyNum;
       // });
     },
+    handleinnerVisibleshowdep(row) {
+      this.reset();
+      console.log(row);
+      this.title = "设置科室";
+      selectUserAgency(row.userName).then((res) => {
+        this.tableData2 = res.rows;
+        // console.log(this.tableData2,'55899999')
+
+        if (this.tableData2.length < 1) {
+          this.$message.error("当前无科室,请先设置机构");
+        } else {
+          this.innerVisibleshowdep = true;
+          this.userName = row.userName;
+          this.formlistdep.userId = row.userId;
+          this.formlistdep.userName = row.userName;
+          console.log(this.formlistdep, "this.formlistdep");
+
+          this.formlistdeps.userId = row.userId;
+          this.formlistdeps.userName = row.userName;
+          this.formmatdep.userName = row.userName;
+          // console.log(this.formmat.userId, "898");
+          this.infodep();
+          this.infodep2();
+        }
+      });
+    },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();