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

src/views/components/DepartmentList.vue

@@ -62,6 +62,8 @@ import {
 } from "@/api/manage/template";
 import { listScriptNum } from "@/api/manage/script";
 import { listMessageNum } from "@/api/manage/message";
+import { selectNumByDept } from "@/api/manage/propaganda";
+import { listServicePackageNum } from "@/api/manage/servicepackage";
 export default {
     props: ['methods'],
     name: "DepartmentList",
@@ -97,11 +99,6 @@ export default {
     created() {
         this.querydepartmen.hospitalAgencyId = JSON.parse(localStorage.getItem('user')).hospitalAgencyId
         this.Departmentlist();
-        this.$emit("clickdepartment", {
-            itemid: '',
-            itemName: '',
-            hospitalAgencyId: JSON.parse(localStorage.getItem('user')).hospitalAgencyId
-        });
     },
     methods: {
         opentrue() {
@@ -120,22 +117,20 @@ export default {
             this.querydepartmen.hospitalAgencyId = item.id
             this.Departmentlist();
             this.open = false
-            this.$emit("clickdepartment", {
-                hospitalAgencyId: this.querydepartmen.hospitalAgencyId,
-                itemid: '',
-                itemName: ''
-            });
         },
         changeswitch(e) {
             let hospitalAgencyId = ''
+            let hospitalAgencyName = ''
             if (e) {
                 hospitalAgencyId = this.querydepartmen.hospitalAgencyId
+                hospitalAgencyName = this.hospitalAgencyName
             }
             this.itemid = ''
             this.$emit("clickdepartment", {
                 hospitalAgencyId: hospitalAgencyId,
                 itemid: '',
-                itemName: ''
+                itemName: '',
+                hospitalAgencyName: hospitalAgencyName
             });
         },
         resetQuery() {
@@ -143,11 +138,6 @@ export default {
             this.switchvalue = true
             this.querydepartmen.departmentName = ''
             this.querydepartmen.hospitalAgencyId = JSON.parse(localStorage.getItem('user')).hospitalAgencyId
-            this.$emit("clickdepartment", {
-                hospitalAgencyId: this.querydepartmen.hospitalAgencyId,
-                itemid: '',
-                itemName: ''
-            });
             this.Departmentlist();
         },
         // 左侧科室
@@ -159,14 +149,16 @@ export default {
                 obj = {
                     itemid: this.itemid,
                     itemName: item.departmentName,
-                    hospitalAgencyId: this.querydepartmen.hospitalAgencyId
+                    hospitalAgencyId: this.querydepartmen.hospitalAgencyId,
+                    hospitalAgencyName: this.hospitalAgencyName
                 }
             } else {
                 this.itemid = null
                 obj = {
                     itemid: '',
                     itemName: '',
-                    hospitalAgencyId: this.querydepartmen.hospitalAgencyId
+                    hospitalAgencyId: this.querydepartmen.hospitalAgencyId,
+                    hospitalAgencyName: this.hospitalAgencyName
                 }
             }
             this.$emit("clickdepartment", obj);
@@ -182,6 +174,10 @@ export default {
                 method = listWechatTemplateNum(this.querydepartmen)
             } else if (this.methods == 'listMessageNum') {
                 method = listMessageNum(this.querydepartmen)
+            } else if (this.methods == 'selectNumByDept') {
+                method = selectNumByDept(this.querydepartmen)
+            } else if (this.methods == 'listServicePackageNum') {
+                method = listServicePackageNum(this.querydepartmen)
             }
             method.then(response => {
                 this.DepartmentoList = response.data.deptNumList;
@@ -192,6 +188,12 @@ export default {
                         this.count += item.countNum;
                     }
                 });
+                this.$emit("clickdepartment", {
+                    hospitalAgencyId: this.querydepartmen.hospitalAgencyId,
+                    itemid: '',
+                    itemName: '',
+                    hospitalAgencyName: this.hospitalAgencyName
+                });
             });
         },
     }

src/views/manage/message/index.vue

@@ -33,6 +33,7 @@
           <el-row :gutter="10" class="">
             <el-col :span="1.5">
               <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+                :disabled="queryParams.hospitalAgencyId ? false : true"
                 v-hasPermi="['manage:template:add']">新增短信模版</el-button>
             </el-col>
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -335,12 +336,14 @@ export default {
     //接收科室列表传值
     clickdepartment(item) {
       this.queryParams.hospitalAgencyId = item.hospitalAgencyId
+      this.queryParams.hospitalAgencyName = item.hospitalAgencyName
       this.queryParams.departmentId = item.itemid
       this.departmentName = item.itemName
       this.informationqueryParams.hospitalAgencyId = item.hospitalAgencyId
       if (item.hospitalAgencyId) {
         this.getList();
       }
+      this.$forceUpdate()
     },
     /** 查询微信模板信息列表 */
     getList() {
@@ -406,7 +409,7 @@ export default {
     },
     // 点击病种
     clickdisease() {
-      if (this.departmentName == '请选择科室') {
+      if (this.form.departmentName == '请选择科室') {
         this.$modal.msgError("请先选择科室");
       } else {
         this.diseaseshowst = true;
@@ -483,6 +486,12 @@ export default {
     handleAdd() {
       this.reset();
       this.form.diseaseTypeName = "请选择病种"
+      if (this.queryParams.departmentId) {
+        this.form.departmentName = this.departmentName
+        this.form.departmentId = this.queryParams.departmentId
+      } else {
+        this.form.departmentName = '请选择科室'
+      }
       this.title = "新增短信模版";
       this.open = true;
     },
@@ -493,6 +502,7 @@ export default {
       // this.getDisease();
       getMessage(id).then(response => {
         this.form = response.data;
+        this.departmentName = response.data.departmentName
         if (!this.form.textMessageSort) {
           this.form.textMessageSort = undefined
         }
@@ -503,6 +513,7 @@ export default {
     /** 提交按钮 */
     submitForm() {
       this.form.hospitalAgencyId = this.queryParams.hospitalAgencyId
+      this.form.hospitalAgencyName = this.queryParams.hospitalAgencyName
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.obj.length > 10) {

src/views/manage/propaganda/index.vue

@@ -2,24 +2,8 @@
   <div class="app-container" ref="layout">
     <el-row :gutter="20">
       <el-col :span="5">
-        <div class="leftpro" ref="box">
+        <DepartmentList ref="DepartmentList" @clickdepartment="clickdepartment" :methods="'selectNumByDept'">
-          <div class="name">科室名称</div>
+        </DepartmentList>
-          <div>
-            <el-input v-model="name" placeholder="请输入科室名称" clearable @keyup.enter.native="handleQuery" />
-          </div>
-          <div class="listitem">
-            <div :class="itemname == null ? 'allactive' : 'all'" @click="itemdata()">
-              全部
-            </div>
-            <span class="count">{{ count }}</span>
-          </div>
-          <div class="listitem" v-for="(item, index) in DepartmentoList" :key="index" @click="itemdata(item)">
-            <div :class="itemname == item.id ? 'allactive' : 'all'">
-              {{ item.departmentName }}
-            </div>
-            <span class="count">{{ item.countNum }}</span>
-          </div>
-        </div>
       </el-col>
       <el-col :span="19" :xs="24">
         <div ref="topform" class="form">
@@ -40,19 +24,13 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="宣教来源" prop="hospitalAgencyId">
+            <!-- <el-form-item label="宣教来源" prop="hospitalAgencyId">
               <el-select v-model="queryParams.hospitalAgencyId" filterable placeholder="请选择医院" style="width: 200px"
                 clearable>
                 <el-option v-for="item in hospitalAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
                 </el-option>
               </el-select>
-              <!-- <el-input
+            </el-form-item> -->
-          v-model="queryParams.hospitalAgencyId"
-          placeholder="请输入宣教来源"
-          clearable
-          @keyup.enter.native="handleQuery"
-        /> -->
-            </el-form-item>
             <el-form-item label="宣教状态" prop="propagandaStatus">
               <el-select v-model="queryParams.propagandaStatus" placeholder="请选择">
                 <el-option v-for="item in optionsstate" :key="item.value" :label="item.label" :value="item.value">
@@ -65,7 +43,6 @@
           @keyup.enter.native="handleQuery"
         /> -->
             </el-form-item>
-
             <el-form-item>
               <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>
@@ -76,6 +53,7 @@
           <el-row :gutter="10" class="">
             <el-col :span="1.5">
               <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+                :disabled="queryParams.hospitalAgencyId ? false : true"
                 v-hasPermi="['manage:propaganda:add']">新增</el-button>
             </el-col>
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -90,47 +68,21 @@
             </el-table-column>
             <el-table-column label="宣教类型" align="center" prop="propagandaType">
               <template slot-scope="scope">
-                {{
+                {{ scope.row.propagandaType == "MEDICATION_KNOWLEDGE" ? "用药知识" : "" }}
-      scope.row.propagandaType == "MEDICATION_KNOWLEDGE"
+                {{ scope.row.propagandaType == "DISEASE_POPULARIZATION" ? "疾病科普" : "" }}
-        ? "用药知识"
+                {{ scope.row.propagandaType == "SPORT_NUTRITION" ? "运动营养" : "" }}
-        : ""
+                {{ scope.row.propagandaType == "OTHER_KNOWLEDGE" ? "其他知识" : "" }}
-    }}
+                {{ scope.row.propagandaType == "CUSTOMIZED_CONTENT" ? "定制内容" : "" }}
-                {{
-        scope.row.propagandaType == "DISEASE_POPULARIZATION"
-          ? "疾病科普"
-          : ""
-      }}
-                {{
-        scope.row.propagandaType == "SPORT_NUTRITION" ? "运动营养" : ""
-      }}
-                {{
-        scope.row.propagandaType == "OTHER_KNOWLEDGE" ? "其他知识" : ""
-      }}
-                {{
-        scope.row.propagandaType == "CUSTOMIZED_CONTENT"
-          ? "定制内容"
-          : ""
-      }}
               </template>
             </el-table-column>
             <el-table-column label="宣教ID" align="center" prop="propagandaCode" :show-overflow-tooltip="true" />
             <el-table-column label="宣教状态" align="center" prop="propagandaStatus">
               <template slot-scope="scope">
-                {{
+                {{ scope.row.propagandaStatus == "CREATE_PROCESS" ? "创作中" : "" }}
-      scope.row.propagandaStatus == "CREATE_PROCESS" ? "创作中" : ""
+                {{ scope.row.propagandaStatus == "CREATE_COMPLETE" ? "创作完成" : "" }}
-    }}
-                {{
-        scope.row.propagandaStatus == "CREATE_COMPLETE"
-          ? "创作完成"
-          : ""
-      }}
                 {{ scope.row.propagandaStatus == "IN_REVIEW" ? "审核中" : "" }}
                 {{ scope.row.propagandaStatus == "APPROVED" ? "审核通过" : "" }}
-                {{
+                {{ scope.row.propagandaStatus == "REVIEW_FAILED" ? "审核不通过" : "" }}
-      scope.row.propagandaStatus == "REVIEW_FAILED"
-        ? "审核不通过"
-        : ""
-    }}
                 <div></div>
               </template>
             </el-table-column>
@@ -141,7 +93,6 @@
               <template slot-scope="scope">
                 <el-button type="text" icon="el-icon-zoom-in" size="mini" @click="Preview(scope.row)">预览</el-button>
                 <el-button type="text" icon="el-icon-tickets" size="mini" @click="copyUrl(scope.row)">复制</el-button>
-
                 <el-button size="mini" type="text" icon="el-icon-aim"
                   v-if="scope.row.propagandaStatus == 'CREATE_COMPLETE'" @click="examine(scope.row)">审核</el-button>
                 <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
@@ -165,7 +116,6 @@
           :indexFromWrap="queryParams.pageNum" @updateCPage="updateCPage"></myPagination>
       </el-col>
     </el-row>
-
     <!-- 添加或修改患者宣教信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px" :inline="true">
@@ -181,69 +131,38 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="医院名称" prop="hospitalAgencyName">
+        <!-- <el-form-item label="医院名称" prop="hospitalAgencyId">
-          <el-select v-model="form.hospitalAgencyName" filterable placeholder="请选择医院" style="width: 200px" clearable
+          <el-select v-model="form.hospitalAgencyId" filterable placeholder="请选择医院" style="width: 208px" clearable
             @change="changehospitalAgency">
             <el-option v-for="item in hospitalAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
             </el-option>
           </el-select>
-          <!-- <el-input
+        </el-form-item> 
-            v-model="form.hospitalAgencyName"
-            placeholder="请输入医院名称"
-          /> -->
-        </el-form-item>
-
         <el-form-item label="科室名称" prop="departmentId">
-          <el-select v-model="form.departmentName" filterable placeholder="请选择医院" style="width: 200px" clearable
+          <el-select v-model="form.departmentName" filterable placeholder="请选择科室" style="width: 208px" clearable
             @change="changeDepartment" @focus="onBlur">
             <el-option v-for="item in Departmentdata" :key="item.id" :label="item.departmentName" :value="item.id">
             </el-option>
           </el-select>
-
+        </el-form-item>-->
-          <!-- <el-button
+        <el-form-item label="科室名称" prop="departmentId">
-            type=""
+          <el-button type="" @click="clickinnerVisible()"
-            v-if="departmentName == '请选择科室'"
+            :style="form.departmentName == '请选择科室' ? 'color: #c0c4cc;' : ''" style="
-            @click="clickinnerVisible()"
-            style="
               width: 206px;
               text-align: left;
               height: 36px;
-              color: #c0c4cc;
               overflow: hidden;
-            "
+            ">{{ form.departmentName }}</el-button>
-            >{{ departmentName }}</el-button
-          >
-          <el-button
-            @click="clickinnerVisible()"
-            type=""
-            v-else
-            style="
-              width: 206px;
-              text-align: left;
-              height: 36px;
-              padding-left: -10px;
-              overflow: hidden;
-            "
-            >{{ departmentName }}</el-button
-          > -->
         </el-form-item>
         <el-form-item label="病种名称" prop="diseaseTypeName">
-          <el-button type="" v-if="diseaseTypeName == '请选择病种'" @click="clickdisease()" style="
+          <el-button type="" @click="clickdisease()" :style="form.diseaseTypeName == '请选择病种' ? 'color: #c0c4cc;' : ''"
+            style="
               width: 206px;
               text-align: left;
               height: 36px;
-              color: #c0c4cc;
               overflow: hidden;
-            ">{{ diseaseTypeName }}</el-button>
+            ">{{ form.diseaseTypeName }}</el-button>
-          <el-button @click="clickdisease()" type="" v-else style="
-              width: 206px;
-              text-align: left;
-              height: 36px;
-              padding-left: -10px;
-              overflow: hidden;
-            ">{{ diseaseTypeName }}</el-button>
         </el-form-item>
-
         <el-form-item label="语音播报" prop="voicebroadcast">
           <el-input v-model="form.voicebroadcast" type="textarea" style="width: 206px" placeholder="请输入语音播报" />
         </el-form-item>
@@ -258,8 +177,8 @@
           <div class="propagandaselect" @click="material" v-if="!form.imgPath">
             <div class="add">+</div>
           </div>
-          <img @click="material" class="propagandaselect" :src="baseUrl + form.imgPath" alt="" v-else-if="form.imgPath && querymaterial.materialsType == 'IMAGE_TEXT'
+          <img @click="material" class="propagandaselect" :src="baseUrl + form.imgPath" alt=""
-      " />
+            v-else-if="form.imgPath && querymaterial.materialsType == 'IMAGE_TEXT'" />
           <video @click="material" style="height: 200px; width: 300px"
             v-else-if="form.imgPath && querymaterial.materialsType == 'VIDEO'" ref="myVideo"
             :src="baseUrl + form.imgPath" controls></video>
@@ -280,13 +199,11 @@
         <el-form-item label="科室名称" prop="departmentName" label-width="120">
           <el-input v-model="informationqueryParams.departmentName" placeholder="请输入科室名称" clearable />
         </el-form-item>
-
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="informationInfoinfo">搜索</el-button>
           <el-button icon="el-icon-refresh" size="mini" @click="addresetQuerylist">重置</el-button>
         </el-form-item>
       </el-form>
-
       <el-table :data="infolist" @cell-dblclick="nurseclick" v-loading="loading">
         <el-table-column label="请选择" width="100" align="center">
           <template slot-scope="scope">
@@ -309,13 +226,11 @@
         <el-form-item label="病种名称" prop="diseaseTypeName" label-width="120">
           <el-input v-model="querydisease.diseaseTypeName" placeholder="请输入病种名称" clearable />
         </el-form-item>
-
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="infodisease">搜索</el-button>
           <el-button icon="el-icon-refresh" size="mini" @click="resetdisease">重置</el-button>
         </el-form-item>
       </el-form>
-
       <el-table :data="listdisease" @cell-dblclick="nurseclickdisease" v-loading="loading">
         <el-table-column label="请选择" width="100" align="center">
           <template slot-scope="scope">
@@ -370,7 +285,6 @@
           <el-button icon="el-icon-refresh" size="mini" @click="resetQuerysc">重置</el-button>
         </el-form-item>
       </el-form>
-
       <el-tabs v-model="querymaterial.materialsType" type="card" @tab-click="handleClick">
         <el-tab-pane label="图片" name="IMAGE_TEXT"></el-tab-pane>
         <el-tab-pane label="视频" name="VIDEO"></el-tab-pane>
@@ -392,15 +306,9 @@
             </div>
             <!-- <div class="dataliat">素材来源：</div> -->
             <!-- <div class="dataliat">标签：暂无</div> -->
-            <div class="dataliat bq" v-if="item.indications ||
+            <div class="dataliat bq"
-      item.drugName ||
+              v-if="item.indications || item.drugName || item.applicableDiseases || item.surgicalName || item.inspectionItems || item.checkItems">
-      item.applicableDiseases ||
-      item.surgicalName ||
-      item.inspectionItems ||
-      item.checkItems
-      ">
               标签：
-
               <span v-if="item.indications">{{ item.indications }}，</span>
               <span v-if="item.drugName">{{ item.drugName }}，</span>
               <span v-if="item.applicableDiseases">{{ item.applicableDiseases }}，</span>
@@ -410,11 +318,9 @@
             </div>
             <div class="dataliat bq" v-else>标签：暂无</div>
           </div>
-
           <div class="label" @click.stop="labelchange(item)">加到文章</div>
         </div>
       </div>
-
       <!--  <pagination v-show="totalmaterial > 0" :total="totalmaterial" :page.sync="querymaterial.pageNum"
         :limit.sync="querymaterial.pageSize" @pagination="getmaterial" /> -->
       <myPagination v-show="totalmaterial > 0" :total="totalmaterial" :pageSize="querymaterial.pageSize"
@@ -457,13 +363,13 @@
 import { listPropaganda, getPropaganda, delPropaganda, addPropaganda, updatePropaganda, selectNumByDept, copy, updateStatus } from "@/api/manage/propaganda";
 import { listMaterials } from "@/api/manage/materials";
 import { selectAgencyList, getDepartmentList } from "@/api/manage/selectAgencyList";
-
 import stationAcatar from "../../system/stationAvatar/index.vue";
 import Editorxj from "../../system/Editorxj/index.vue";
 import { department, listDisease } from "@/api/manage/script";
+import DepartmentList from '../../components/DepartmentList.vue'
 export default {
   name: "Propaganda",
-  components: { stationAcatar, Editorxj },
+  components: { stationAcatar, Editorxj, DepartmentList },
   data() {
     //验证身份证
     var isimgPath = (rule, value, callback) => {
@@ -476,26 +382,12 @@ export default {
     };
     return {
       maxLength: 20000,
-      itemname: null,
       departmentName: null,
       diseaseTypeName: null,
       name: '',
       departmentId: null,
       count: '',//全部
       DepartmentoList: [],//左侧数组
-      // 左侧传值
-      querydepartmen: {
-        departmentName: "",
-        materialsType: null,
-        materialsName: null,
-        materialsStatus: null,
-        createTime: null,
-        // pageNum: 1,
-        // pageSize: 10,
-
-      },
-
-
       innerVisibleshow: false, //科室弹框
       // 科室
       informationqueryParams: {
@@ -505,7 +397,6 @@ export default {
       },
       infolist: [],
       totaldepartment: 0,
-
       diseaseshowst: false,//病种弹框
       querydisease: {
         pageNum: 1,
@@ -515,18 +406,14 @@ export default {
       },
       listdisease: [],
       diseasetotal: 0,
-
-
       dialogexamine: false,//审核
       dialogview: false,//预览
       formview: {
         articleSummary: null,
         propagandaTitle: null,
-
       },//预览数据
       copyid: null,//复制id
       examineid: null,//审核id
-
       optionstype: [{
         value: 'MEDICATION_KNOWLEDGE',
         label: '用药知识'
@@ -582,9 +469,7 @@ export default {
       Departmentdata: [],
       value: '',
       // 遮罩层
-      // loading: true,
       loading: false,
-
       // 选中数组
       ids: [],
       // 非单个禁用
@@ -630,10 +515,8 @@ export default {
       rules: {
         propagandaTitle: [
           { required: true, message: "宣教标题不能为空", trigger: "blur" }
-
-
         ],
-        hospitalAgencyName: [
+        hospitalAgencyId: [
           { required: true, message: "医院名称不能为空", trigger: "blur" }
         ],
         departmentId: [
@@ -678,19 +561,25 @@ export default {
     },
   },
   created() {
-    this.Departmentlist();
     this.getList();
-    this.selectAgencyinfo();
+    // this.selectAgencyinfo();
   },
   watch: {
-    name(val) {
-      this.querydepartmen.departmentName = val
-      this.Departmentlist();
-    }
   },
   methods: {
+    //接收科室列表传值
+    clickdepartment(item) {
+      this.queryParams.hospitalAgencyId = item.hospitalAgencyId
+      this.queryParams.hospitalAgencyName = item.hospitalAgencyName
+      this.queryParams.departmentId = item.itemid
+      this.departmentName = item.itemName
+      this.informationqueryParams.hospitalAgencyId = item.hospitalAgencyId
+      if (item.hospitalAgencyId) {
+        this.getList();
+      }
+      this.$forceUpdate()
+    },
     checkContentLength() {
-      // console.log(this.form.propagandaContent.length, 'this.form.propagandaContent.length')
       if (this.form.propagandaContent.length - 7 > this.maxLength) {
         this.$message({
           type: "error",
@@ -709,12 +598,11 @@ export default {
     },
     // 医院
     changehospitalAgency(e) {
-      console.log(e, '00000')
       this.form.hospitalAgencyName = this.hospitalAgencylist.find(f => f.id == e).agencyName
       this.form.hospitalAgencyId = e
       this.form.departmentName = ''
       this.form.departmentId = ''
-      this.diseaseTypeName = '请选择病种'
+      this.form.diseaseTypeName = '请选择病种'
       this.form.diseaseTypeId = '';
       let query = {
         nodeType: 'DEPARTMENT',
@@ -728,26 +616,19 @@ export default {
     changeDepartment(e) {
       this.form.departmentId = e
       this.form.departmentName = this.Departmentdata.find(f => f.id == e).departmentName
-      this.diseaseTypeName = '请选择病种'
+      this.form.diseaseTypeName = '请选择病种'
       this.form.diseaseTypeId = '';
-      console.log(this.form)
-
-
-
     },
     onBlur() {
-      console.log(this.form, '------------------')
+      if (!this.form.hospitalAgencyId) {
-      if (!this.form.hospitalAgencyName) {
         this.$modal.msgError("请先选择医院");
       }
-
     },
     // 素材选择
     material() {
       this.dialogmaterial = true
-      this.querymaterial.materialsType = 'IMAGE_TEXT',
+      this.querymaterial.materialsType = 'IMAGE_TEXT'
-        this.getmaterial()
+      this.getmaterial()
-
     },
     // 关闭素材
     materialClose() {
@@ -772,16 +653,12 @@ export default {
       this.form.materialsInfoList = []
       this.form.imgPath = item.materialsFilePath
       this.form.materialsInfoList.push(item)
-
       this.dialogmaterial = false
-      console.log(item)
-
     },
     // 预览
     viewshow(item) {
       this.openview = true
       this.viewform = item
-
     },
     /** 查询素材信息列表 */
     getmaterial() {
@@ -796,8 +673,6 @@ export default {
     // 开始时间
     changecreateTimeStart(e) {
       this.queryParams.createTimeStart = e
-      console.log(e)
-
     },
     // 结束时间
     changecreateTimeEnd(e) {
@@ -806,21 +681,17 @@ export default {
     // 复制
     copyUrl(row) {
       this.copyid = row.id
-      console.log(this.copyid, '00000')
       this.$confirm('确定复制该文章内容?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        console.log(this.copyid)
         copy(this.copyid).then(response => {
           this.$message({
             type: "success",
             message: "复制成功"
           });
           this.getList()
-          this.Departmentlist()
-
         });
       }).catch(() => {
         this.$message({
@@ -831,17 +702,13 @@ export default {
     },
     // 复制链接
     copylink() {
-
     },
     // 预览
     Preview(row) {
-      console.log(row)
       const id = row.id || this.ids
       getPropaganda(id).then(response => {
         this.formview = response.data;
         this.dialogview = true
-
-
       });
     },
     // 关闭预览
@@ -854,12 +721,10 @@ export default {
       this.dialogexamine = true
     },
     // 审核同意按钮
-
     cancelamine() {
       var formexmine = {
         id: this.examineid,
         propagandaStatus: 'APPROVED'
-
       }
       updateStatus(formexmine).then(response => {
         this.$message({
@@ -869,20 +734,16 @@ export default {
         this.getList()
       });
       this.dialogexamine = false
-
     },
     // 审核关闭按钮
-
     handleClose() {
       this.dialogexamine = false
     },
     // 审核不同意按钮
-
     submitamine() {
       var formexmine = {
         id: this.examineid,
         propagandaStatus: 'REVIEW_FAILED'
-
       }
       updateStatus(formexmine).then(response => {
         this.$message({
@@ -891,42 +752,8 @@ export default {
         });
         this.getList()
       });
-
       this.dialogexamine = false
     },
-    // 左侧科室列表
-    Departmentlist() {
-      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;
-      });
-    },
-    // 左侧科室
-    itemdata(item) {
-      if (item) {
-        this.itemname = item.id
-        // this.departmentName = item.departmentName
-        this.loading = true;
-        this.queryParams.departmentId = item.id
-        this.getList()
-      } else {
-        this.queryParams.departmentId = ''
-        this.itemname = null
-        this.getList()
-
-      }
-    },
-
-
     /** 查询患者宣教信息列表 */
     getList() {
       this.loading = true;
@@ -939,12 +766,6 @@ export default {
     // 点击科室
     clickinnerVisible() {
       this.innerVisibleshow = true;
-      if (this.itemname) {
-        this.informationqueryParams.departmentId = this.itemname
-
-      } else {
-        this.informationqueryParams.departmentId = null
-      }
       this.informationInfoinfo();
     },
     // 科室列表
@@ -970,12 +791,12 @@ export default {
     // 科室名称圆点按钮
     nurseclick(row) {
       this.form.departmentId = row.departmentCode;
+      this.form.departmentName = row.departmentName;
       this.departmentName = row.departmentName;
       this.form.diseaseTypeId = '';
-      this.diseaseTypeName = '请选择病种';
+      this.form.diseaseTypeName = '请选择病种';
       this.innerVisibleshow = false;
     },
-
     // 病种列表
     infodisease() {
       listDisease(this.querydisease).then((response) => {
@@ -997,18 +818,17 @@ export default {
     // 病种名称圆点按钮
     nurseclickdisease(row) {
       this.form.diseaseTypeId = row.id;
-      this.diseaseTypeName = row.diseaseTypeName;
+      this.form.diseaseTypeName = row.diseaseTypeName;
       this.diseaseshowst = false;
     },
     // 重置
     resetdisease() {
-      querydisease = {
+      this.querydisease = {
         pageNum: 1,
         pageSize: 10,
       };
       this.infodisease()
     },
-
     canceldiseases() {
       this.diseaseshowst = false;
     },
@@ -1052,12 +872,6 @@ export default {
     handleQuery() {
       this.queryParams.pageNum = 1;
       this.getList();
-      this.querydepartmen.createTimeStart = this.queryParams.createTimeStart
-      this.querydepartmen.createTimeEnd = this.queryParams.createTimeEnd
-      this.querydepartmen.propagandaType = this.queryParams.propagandaType
-      this.querydepartmen.hospitalAgencyId = this.queryParams.hospitalAgencyId
-      this.querydepartmen.propagandaStatus = this.queryParams.propagandaStatus
-      this.Departmentlist();
     },
     handleQuerysc() {
       this.querymaterial.pageNum = 1;
@@ -1066,15 +880,14 @@ export default {
     resetQuerysc() {
       this.querymaterial.materialsName = null
       this.handleQuerysc()
-
     },
-
     /** 重置按钮操作 */
     resetQuery() {
-      // this.queryParams.departmentId = null;
+      this.queryParams.createTimeEnd = null
-      this.queryParams.createTimeEnd = null,
+      this.queryParams.createTimeStart = null
-        this.queryParams.createTimeStart = null,
+      this.informationqueryParams.hospitalAgencyId = JSON.parse(localStorage.getItem('user')).hospitalAgencyId
-        this.itemname = null;
+      this.queryParams.hospitalAgencyId = JSON.parse(localStorage.getItem('user')).hospitalAgencyId
+      this.$refs.DepartmentList.resetQuery()
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -1087,34 +900,32 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
-      this.selectAgencyinfo();
+      // this.selectAgencyinfo();
       this.form.propagandaStatus = 'CREATE_COMPLETE'
-      this.diseaseTypeName = "请选择病种"
+      this.form.diseaseTypeName = "请选择病种"
+      if (this.queryParams.departmentId) {
+        this.form.departmentName = this.departmentName
+        this.form.departmentId = this.queryParams.departmentId
+      } else {
+        this.form.departmentName = '请选择科室'
+      }
       this.Departmentdata = []
-      this.open = true;
       this.title = "新增宣教";
-      console.log(this.form, '90909090')
+      this.open = true;
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-
       this.reset();
       const id = row.id || this.ids
       getPropaganda(id).then(response => {
         this.form = response.data;
         this.form.suitTaskTypeIds = response.data.suitTaskTypeIds
-        if (!response.data.diseaseTypeName || response.data.diseaseTypeName == "") {
-          this.diseaseTypeName = "请选择病种"
-        } else {
-          this.diseaseTypeName = response.data.diseaseTypeName
-        }
-        // this.form.agencyName = response.data.hospitalAgencyName
         this.form.imgPath = response.data.materialsInfoList[0]?.materialsFilePath
         this.querymaterial.materialsType = response.data.materialsInfoList[0]?.materialsType
         this.open = true;
+        this.departmentName = response.data.departmentName
         this.title = "修改患者宣教信息";
       });
-      // }
     },
     // 上传封面
     imgUrl(imgUrl) {
@@ -1122,46 +933,35 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      // return
+      this.form.hospitalAgencyId = this.queryParams.hospitalAgencyId
-      console.log(this.form)
+      this.form.hospitalAgencyName = this.queryParams.hospitalAgencyName
       if (this.form.propagandaContent && this.form.propagandaContent.length - 7 > this.maxLength) {
         // if (this.form.propagandaContent.length - 7 > this.maxLength) {
         this.$message({
           type: "error",
           message: "已达到最大输入长度"
         });
-
         // }
-
       } else {
-
         this.$refs["form"].validate(valid => {
           if (valid) {
+            if (!this.form.diseaseTypeId) {
+              this.form.diseaseTypeName = ''
+            }
             if (this.form.id != null) {
-              if (this.diseaseTypeName == "请选择病种") {
-                this.form.diseaseTypeName = null
-
-              } else {
-                this.form.diseaseTypeName = this.diseaseTypeName
-              }
               updatePropaganda(this.form).then(response => {
                 this.$modal.msgSuccess("修改成功");
+                this.$refs.DepartmentList.Departmentlist()
                 this.open = false;
                 this.getList();
               });
             } else {
-              if (this.diseaseTypeName == '请选择病种') {
-                this.form.diseaseTypeName = null
-              } else if (this.diseaseTypeName) {
-                this.form.diseaseTypeName = this.diseaseTypeName
-              }
               addPropaganda(this.form).then(response => {
                 this.$modal.msgSuccess("新增成功");
+                this.$refs.DepartmentList.Departmentlist()
                 this.open = false;
                 this.getList();
-                this.Departmentlist()
               });
-
             }
           }
         });
@@ -1194,8 +994,8 @@ export default {
         return delPropaganda(ids);
       }).then(() => {
         this.getList();
-        this.Departmentlist()
         this.$modal.msgSuccess("删除成功");
+        this.$refs.DepartmentList.Departmentlist()
       }).catch(() => { });
     },
     /** 导出按钮操作 */

src/views/manage/script/index.vue

@@ -41,6 +41,7 @@
           <el-row :gutter="10" class="">
             <el-col :span="1.5">
               <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+               :disabled="queryParams.hospitalAgencyId ? false : true"
                 v-hasPermi="['manage:script:add']">新增</el-button>
             </el-col>
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -446,12 +447,14 @@ export default {
     //接收科室列表传值
     clickdepartment(item) {
       this.queryParams.hospitalAgencyId = item.hospitalAgencyId
+      this.queryParams.hospitalAgencyName = item.hospitalAgencyName
       this.queryParams.departmentId = item.itemid
       this.departmentName = item.itemName
       this.informationqueryParams.hospitalAgencyId = item.hospitalAgencyId
       if (item.hospitalAgencyId) {
         this.getList();
       }
+      this.$forceUpdate()
     },
     // 科室列表
     informationInfoinfo() {
@@ -629,6 +632,7 @@ export default {
     /** 提交按钮 */
     submitForm() {
       this.form.hospitalAgencyId = this.queryParams.hospitalAgencyId
+      this.form.hospitalAgencyName = this.queryParams.hospitalAgencyName
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.obj.length > 10) {

src/views/manage/servicepackage/index.vue

@@ -2,24 +2,8 @@
   <div class="app-container" ref="layout">
     <el-row :gutter="20">
       <el-col :span="5">
-        <div class="leftserv" ref="box">
+        <DepartmentList ref="DepartmentList" @clickdepartment="clickdepartment" :methods="'listServicePackageNum'">
-          <div class="name">科室名称</div>
+        </DepartmentList>
-          <div>
-            <el-input v-model="name" placeholder="请输入科室名称" clearable @keyup.enter.native="handleQuery" />
-          </div>
-          <div class="listitem">
-            <div :class="itemname == null ? 'allactive' : 'all'" @click="itemdata()">
-              全部
-            </div>
-            <span class="count">{{ count }}</span>
-          </div>
-          <div class="listitem" v-for="(item, index) in DepartmentoList" :key="index" @click="itemdata(item)">
-            <div :class="itemname == item.id ? 'allactive' : 'all'">
-              {{ item.departmentName }}
-            </div>
-            <span class="count">{{ item.countNum }}</span>
-          </div>
-        </div>
       </el-col>
       <el-col :span="19" :xs="24">
         <div ref="topform" class="form">
@@ -42,12 +26,6 @@
                 <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
-              <!-- <el-input
-          v-model="queryParams.whetherRelease"
-          placeholder="请输入是否发布，0：否，1：是"
-          clearable
-          @keyup.enter.native="handleQuery"
-        /> -->
             </el-form-item>
             <el-form-item label="服务包价格" prop="packagePrice">
               <el-input oninput="value=value.replace(/[^\d.]/g,'')" v-model="queryParams.packagePrice"
@@ -63,43 +41,9 @@
           <el-row :gutter="10" class="">
             <el-col :span="1.5">
               <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+                :disabled="queryParams.hospitalAgencyId ? false : true"
                 v-hasPermi="['manage:servicepackage:add']">新增服务包</el-button>
             </el-col>
-            <!-- <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['manage:servicepackage:edit']"
-          >修改</el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['manage:servicepackage:remove']"
-          >删除</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:servicepackage:export']"
-          >导出</el-button
-        >
-      </el-col> -->
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
           </el-row>
         </div>
@@ -139,41 +83,25 @@
           :indexFromWrap="queryParams.pageNum" @updateCPage="updateCPage"></myPagination>
       </el-col>
     </el-row>
-
     <!-- 添加或修改服务包基础信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px" :inline="true">
         <el-form-item label="科室名称" prop="departmentId">
-          <el-button type="" v-if="departmentName == '请选择科室'" @click="clickinnerVisible()" style="
+          <el-button @click="clickinnerVisible()" style="
-              width: 204px;
+              width: 379px;
               text-align: left;
               height: 36px;
-              color: #c0c4cc;
               overflow: hidden;
-            ">{{ departmentName }}</el-button>
+            " :style="form.departmentName == '请选择科室' ? 'color: #c0c4cc;' : ''">{{ form.departmentName }}</el-button>
-          <el-button @click="clickinnerVisible()" type="" v-else style="
-              width: 204px;
-              text-align: left;
-              height: 36px;
-              padding-left: -10px;
-              overflow: hidden;
-            ">{{ departmentName }}</el-button>
         </el-form-item>
         <el-form-item label="病种名称" prop="diseaseTypeName">
-          <el-button type="" v-if="diseaseTypeName == '请选择病种'" @click="clickdisease()" style="
+          <el-button type="" @click="clickdisease()" :style="form.diseaseTypeName == '请选择病种' ? 'color: #c0c4cc;' : ''"
-              width: 204px;
+            style="
+              width: 206px;
               text-align: left;
               height: 36px;
-              color: #c0c4cc;
               overflow: hidden;
-            ">{{ diseaseTypeName }}</el-button>
+            ">{{ form.diseaseTypeName }}</el-button>
-          <el-button @click="clickdisease()" type="" v-else style="
-              width: 204px;
-              text-align: left;
-              height: 36px;
-              padding-left: -10px;
-              overflow: hidden;
-            ">{{ diseaseTypeName }}</el-button>
         </el-form-item>
         <el-form-item label="服务包名称" prop="packageName">
           <el-input v-model="form.packageName" placeholder="请输入服务包名称" />
@@ -237,7 +165,6 @@
             v-if="index != 0" @click="delnurseClassifyitem(index)"></el-button>
         </div>
         <br />
-
         <el-form-item label="服务包备注" prop="packageRemark">
           <el-input style="width: 835px" type="textarea" v-model="form.packageRemark" placeholder="请输入服务包备注" />
         </el-form-item>
@@ -255,13 +182,11 @@
         <el-form-item label="科室名称" prop="departmentName" label-width="120">
           <el-input v-model="informationqueryParams.departmentName" placeholder="请输入科室名称" clearable />
         </el-form-item>
-
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="informationInfoinfo">搜索</el-button>
           <el-button icon="el-icon-refresh" size="mini" @click="addresetQuerylist">重置</el-button>
         </el-form-item>
       </el-form>
-
       <el-table :data="infolist" @cell-dblclick="nurseclick" v-loading="loading">
         <el-table-column label="请选择" width="100" align="center">
           <template slot-scope="scope">
@@ -284,13 +209,11 @@
         <el-form-item label="病种名称" prop="diseaseTypeName" label-width="120">
           <el-input v-model="querydisease.diseaseTypeName" placeholder="请输入病种名称" clearable />
         </el-form-item>
-
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="infodisease">搜索</el-button>
           <el-button icon="el-icon-refresh" size="mini" @click="resetdisease">重置</el-button>
         </el-form-item>
       </el-form>
-
       <el-table :data="listdisease" @cell-dblclick="nurseclickdisease" v-loading="loading">
         <el-table-column label="请选择" width="100" align="center">
           <template slot-scope="scope">
@@ -312,9 +235,8 @@
     <el-dialog title="详情" :visible.sync="detailshow" width="50%" :before-close="handleClose">
       <el-form ref="form" :model="formdetail" label-width="150px" :inline="true">
         <el-form-item label="病种名称:" prop="packageVersion">
-          <span style="display: inline-block; width: 80px">{{
+          <span style="display: inline-block; width: 80px">
-      formdetail.diseaseTypeName
+            {{ formdetail.diseaseTypeName }}</span>
-    }}</span>
         </el-form-item>
         <el-form-item label="服务包名称:" prop="packageVersion">
           <div class="container">
@@ -322,43 +244,26 @@
               <span>{{ formdetail.packageName }}</span>
             </el-tooltip>
           </div>
-
-          <!-- <span class="container" v-tooltip="formdetail.packageName">{{ formdetail.packageName }}</span> -->
-          <!-- <span class="container">
-                <el-tooltip>
-
-                          <template slot="title">
-                                {{ formdetail.packageName ? formdetail.packageName : '-' }}
-                          </template>
-
-                      {{ formdetail.packageName ? formdetail.packageName : '-' }}
-                        </el-tooltip>
-         </span> -->
         </el-form-item>
-        <!-- <el-form-item label="服务包名称:" prop="packageVersion">
-          <span
-            >{{ formdetail.packageName }}</span
-          >
-        </el-form-item> -->
         <el-form-item label="价格:" prop="packageVersion">
           <span>{{ formdetail.packagePrice }}元</span>
         </el-form-item>
         <br />
         <el-form-item label="服务期限:" prop="packageVersion">
-          <span style="display: inline-block; width: 80px">{{
+          <span style="display: inline-block; width: 80px">
-      formdetail.packageTermAndUnit
+            {{ formdetail.packageTermAndUnit }}
-    }}</span>
+          </span>
         </el-form-item>
         <el-form-item label="硬件类型:" prop="packageVersion">
-          <span>{{
+          <span>
-        formdetail.hardwareType == "BLOOD_PRESSURE" ? "血压仪" : ""
+            {{ formdetail.hardwareType == "BLOOD_PRESSURE" ? "血压仪" : "" }}
-      }}</span>
+          </span>
-          <span>{{
+          <span>
-        formdetail.hardwareType == "GLUCOSE_METER" ? "血糖仪" : ""
+            {{ formdetail.hardwareType == "GLUCOSE_METER" ? "血糖仪" : "" }}
-      }}</span>
+          </span>
-          <span>{{
+          <span>
-        formdetail.hardwareType == "ELECTROCARDIOGRA" ? "心电仪" : ""
+            {{ formdetail.hardwareType == "ELECTROCARDIOGRA" ? "心电仪" : "" }}
-      }}</span>
+          </span>
         </el-form-item>
       </el-form>
       <el-table v-loading="loading" :data="datailList">
@@ -381,16 +286,17 @@
     </el-dialog>
   </div>
 </template>
-
 <script>
 import { listServicepackage, getServicepackage, delServicepackage, addServicepackage, updateServicepackage, serviceWayList, serviccontent, editReleaseStatus, listServicePackageNum } from "@/api/manage/servicepackage";
 import { department, listDisease } from "@/api/manage/script";
-
+import DepartmentList from '../../components/DepartmentList.vue'
 export default {
+  components: {
+    DepartmentList,
+  },
   name: "Servicepackage",
   data() {
     return {
-      itemname: null,
       departmentName: null,
       diseaseTypeName: null,
       name: '',
@@ -402,7 +308,6 @@ export default {
         departmentName: "",
         // pageNum: 1,
         // pageSize: 10,
-
       },
       maxTableHeight: undefined,
       innerVisibleshow: false, //科室弹框
@@ -579,16 +484,26 @@ export default {
   },
   created() {
     this.getList();
-    this.Departmentlist();
   },
   mounted() {
     this.getMaxTableHeight()
     this.screenChange()
   },
   methods: {
+    //接收科室列表传值
+    clickdepartment(item) {
+      this.queryParams.hospitalAgencyId = item.hospitalAgencyId
+      this.queryParams.hospitalAgencyName = item.hospitalAgencyName
+      this.queryParams.departmentId = item.itemid
+      this.departmentName = item.itemName
+      this.informationqueryParams.hospitalAgencyId = item.hospitalAgencyId
+      if (item.hospitalAgencyId) {
+        this.getList();
+      }
+      this.$forceUpdate()
+    },
     changepackageTermUnit(e) {
       this.$set(this.form, 'packageTermUnit', e);
-      // this.form.packageTermUnit=e
     },
     // 详情
     detail(row) {
@@ -599,10 +514,8 @@ export default {
         this.datailList.forEach(el => {
           if (el.serviceFrequencyEnd) {
             el.serviceFrequencyText = el.serviceFrequencyStart + '~' + el.serviceFrequencyEnd
-
           } else {
             el.serviceFrequencyText = el.serviceFrequencyText
-
           }
         })
       });
@@ -627,17 +540,14 @@ export default {
         this.getList()
       });
       this.dialogexamine = false
-
     },
     // 发布关闭按钮
     amineClose() {
       this.dialogexamine = false
     },
     // 发布不同意按钮
-
     submitamine() {
       var propagandaStatus = 0
-
       editReleaseStatus(this.examineid, propagandaStatus).then(response => {
         this.$message({
           type: "success",
@@ -645,14 +555,11 @@ export default {
         });
         this.getList()
       });
-
       this.dialogexamine = false
     },
     //添加时删除item
     delnurseClassifyitem(index) {
       this.form.voList.splice(index, 1);
-      // console.log(this.form.voList,'[[[[]]]]')
-      // console.log(this.optionscontent)
       var optionscontentPlus = []
       this.optionscontent[index] = []
       for (var i = 0; i < 5; i++) {
@@ -660,8 +567,6 @@ export default {
           optionscontentPlus.push(this.optionscontent[i])
         }
       }
-      // console.log(optionscontentPlus,'打印optionscontentPlus')
-      // console.log(this.optionscontent,'optionscontent')
       this.optionscontent = {
         '0': [],
         '1': [],
@@ -703,7 +608,6 @@ export default {
         this.$message.error("最多批量添加5条");
       } else {
         this.form.voList.push(obj);
-        // console.log(this.form)
       }
     },
     /** 查询服务包基础信息列表 */
@@ -729,9 +633,7 @@ export default {
       });
       this.form.voList[index].serviceContent = null
       this.form.voList[index].serviceFrequencyText = null
-
     },
-
     // 服务内容点击事件
     changcontent(e, index) {
       var id = null
@@ -747,45 +649,9 @@ export default {
         }
       })
     },
-
-    // 左侧科室列表
-    Departmentlist() {
-      this.loading = true;
-      listServicePackageNum(this.querydepartmen).then(response => {
-        this.DepartmentoList = response.data;
-        let sum = 0;
-        this.DepartmentoList.forEach((item) => {
-          if (item.countNum != null) {
-            sum += item.countNum;
-          }
-          this.count = sum;
-        });
-        this.loading = false;
-      });
-    },
-    // 左侧科室
-    itemdata(item) {
-      if (item) {
-        this.itemname = item.id
-        this.departmentName = item.departmentName
-        this.loading = true;
-        this.queryParams.departmentId = item.id
-        this.getList()
-      } else {
-        this.queryParams.departmentId = ''
-        this.itemname = null
-        this.getList()
-      }
-    },
     // 点击科室
     clickinnerVisible() {
       this.innerVisibleshow = true;
-      if (this.itemname) {
-        this.informationqueryParams.departmentId = this.itemname
-
-      } else {
-        this.informationqueryParams.departmentId = null
-      }
       this.informationInfoinfo();
     },
     // 科室列表
@@ -795,7 +661,6 @@ export default {
         this.totaldepartment = response.total;
         this.loading = false;
       });
-      // this.informationqueryParams.page = 1;
     },
     // 科室名称重置
     addresetQuerylist() {
@@ -825,15 +690,13 @@ export default {
     },
     // 科室名称圆点按钮
     nurseclick(row) {
-      this.form.departmentId = row.id;
+      this.form.departmentId = row.departmentCode;
+      this.form.departmentName = row.departmentName;
       this.departmentName = row.departmentName;
       this.form.diseaseTypeId = '';
-      this.diseaseTypeName = '请选择病种';
+      this.form.diseaseTypeName = '请选择病种';
       this.innerVisibleshow = false;
-      // this.form.diseaseTypeId = null;
-      // this.diseaseTypeName = '请选择科室';
     },
-
     // 病种列表
     infodisease() {
       listDisease(this.querydisease).then((response) => {
@@ -844,18 +707,18 @@ export default {
     },
     // 点击病种
     clickdisease() {
-      if (this.departmentName == '请选择科室') {
+      if (!this.form.departmentName) {
         this.$modal.msgError("请先选择科室");
       } else {
-        this.diseaseshowst = true;
         this.querydisease.departmentId = this.form.departmentId
         this.infodisease()
+        this.diseaseshowst = true;
       }
     },
     // 病种名称圆点按钮
     nurseclickdisease(row) {
       this.form.diseaseTypeId = row.id;
-      this.diseaseTypeName = row.diseaseTypeName;
+      this.form.diseaseTypeName = row.diseaseTypeName;
       this.diseaseshowst = false;
     },
     // 重置
@@ -866,7 +729,6 @@ export default {
       };
       this.infodisease()
     },
-
     canceldiseases() {
       this.diseaseshowst = false;
     },
@@ -900,7 +762,6 @@ export default {
       };
       this.optionsway = [],
         // 服务内容
-
         // this.optionscontent = [],
         this.optionscontent = {
           '0': [],
@@ -932,6 +793,9 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.informationqueryParams.hospitalAgencyId = JSON.parse(localStorage.getItem('user')).hospitalAgencyId
+      this.queryParams.hospitalAgencyId = JSON.parse(localStorage.getItem('user')).hospitalAgencyId
+      this.$refs.DepartmentList.resetQuery()
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -944,35 +808,28 @@ export default {
     // 新增
     handleAdd() {
       this.reset();
-
       this.getserviceWayList()
-      this.form = {
+      this.form.voList = [
-        voList: [
+        {
-          {
+          serviceWayName: null,
-            serviceWayName: null,
+          serviceContent: null,
-            serviceContent: null,
+          serviceFrequencyText: null,
-            serviceFrequencyText: null,
+          serviceFrequencyStart: null,
-            serviceFrequencyStart: null,
+          serviceFrequencyEnd: null,
-            serviceFrequencyEnd: null,
+          idd: this.idd,
-            idd: this.idd,
+        },
-          },
+      ]
-        ],
+      if (this.queryParams.departmentId) {
-      };
+        this.form.departmentName = this.departmentName
+        this.form.departmentId = this.queryParams.departmentId
+      } else {
+        this.form.departmentName = '请选择科室'
+      }
+      this.form.diseaseTypeName = "请选择病种"
       this.form.whetherRelease = 0
       this.form.packageTermUnit = '年'
-      if (this.itemname) {
-        this.form.departmentName = this.departmentName
-        this.form.departmentId = this.itemname
-      } else if (this.itemname == null) {
-        this.departmentName = "请选择科室"
-      }
-      else {
-        this.departmentName = "请选择科室"
-      }
-      this.diseaseTypeName = "请选择病种"
-
-      this.open = true;
       this.title = "添加服务包基础信息";
+      this.open = true;
     },
     // 修改
     handleUpdate(row) {
@@ -987,11 +844,6 @@ export default {
             el.serviceFrequencyText = el.serviceFrequencyText
           }
         })
-        if (!response.data.diseaseTypeName || response.data.diseaseTypeName == "") {
-          this.diseaseTypeName = "请选择病种"
-        } else {
-          this.diseaseTypeName = response.data.diseaseTypeName
-        }
         this.departmentName = response.data.departmentName
         this.open = true;
         this.title = "修改服务包基础信息";
@@ -1005,23 +857,19 @@ export default {
         this.form.voList.forEach(el => {
           if (!el.serviceFrequencyText) {
             el.serviceFrequencyText = el.serviceFrequencyStart + '~' + el.serviceFrequencyEnd
-
           } else {
             el.serviceFrequencyText = el.serviceFrequencyText
           }
         })
-        this.diseaseTypeName = response.data.diseaseTypeName
         this.departmentName = response.data.departmentName
         this.open = true;
         this.title = "复制服务包基础信息";
-        this.Departmentlist();
       });
     },
     // 复制确定
     submitFormadd() {
       this.form.whetherRelease = 0
       var obj = JSON.parse(JSON.stringify(this.form))
-
       obj.voList.forEach(e => {
         if (e.serviceFrequencyText.includes('~')) {
           const str = e.serviceFrequencyText;
@@ -1033,19 +881,8 @@ export default {
           e.serviceFrequencyText = e.serviceFrequencyText
         }
       })
-      if (this.diseaseTypeName == "请选择病种") {
+      if (this.form.diseaseTypeName == "请选择病种") {
-        this.form.diseaseTypeName == null
+        this.form.diseaseTypeName = null
-      } else {
-        this.form.diseaseTypeName = this.diseaseTypeName
-      }
-      if (this.itemname) {
-
-        this.form.departmentName = this.departmentName
-        this.form.departmentId = this.itemname
-
-      } else {
-        this.form.departmentName = this.departmentName
-
       }
       addServicepackage(obj).then(response => {
         this.$modal.msgSuccess("复制成功");
@@ -1053,20 +890,12 @@ export default {
         this.getList();
         this.getlistcount()
       });
-
     },
     // 提交
     submitForm() {
-      // return
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
-            this.form.departmentName = this.departmentName
-            if (this.diseaseTypeName == "请选择病种") {
-              this.form.diseaseTypeName = null
-            } else {
-              this.form.diseaseTypeName = this.diseaseTypeName
-            }
             if (this.form.voList) {
               var obj = JSON.parse(JSON.stringify(this.form))
               obj.voList.forEach(e => {
@@ -1087,19 +916,6 @@ export default {
               });
             }
           } else {
-
-            if (this.diseaseTypeName == "请选择病种") {
-              this.form.diseaseTypeName = null
-            } else {
-              this.form.diseaseTypeName = this.diseaseTypeName
-            }
-            if (this.itemname) {
-              this.form.departmentName = this.departmentName
-              this.form.departmentId = this.itemname
-
-            } else {
-              this.form.departmentName = this.departmentName
-            }
             if (this.form.voList) {
               var obj = JSON.parse(JSON.stringify(this.form))
               obj.voList.forEach(e => {
@@ -1117,9 +933,7 @@ export default {
                 this.$modal.msgSuccess("新增成功");
                 this.open = false;
                 this.getList();
-                this.Departmentlist()
               });
-
             }
           }
         }
@@ -1132,7 +946,6 @@ export default {
         return delServicepackage(ids);
       }).then(() => {
         this.getList();
-        this.Departmentlist();
         this.$modal.msgSuccess("删除成功");
       }).catch(() => { });
     },

src/views/manage/template/index.vue

@@ -27,6 +27,7 @@
           <el-row :gutter="10" class="">
             <el-col :span="1.5">
               <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+               :disabled="queryParams.hospitalAgencyId ? false : true"
                 v-hasPermi="['manage:template:add']">新增微信模版</el-button>
             </el-col>
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -331,12 +332,14 @@ export default {
     //接收科室列表传值
     clickdepartment(item) {
       this.queryParams.hospitalAgencyId = item.hospitalAgencyId
+      this.queryParams.hospitalAgencyName = item.hospitalAgencyName
       this.queryParams.departmentId = item.itemid
       this.departmentName = item.itemName
       this.informationqueryParams.hospitalAgencyId = item.hospitalAgencyId
       if (item.hospitalAgencyId) {
         this.getList();
       }
+      this.$forceUpdate()
     },
     /** 查询微信模板信息列表 */
     getList() {
@@ -523,6 +526,7 @@ export default {
     /** 提交按钮 */
     submitForm() {
       this.form.hospitalAgencyId = this.queryParams.hospitalAgencyId
+      this.form.hospitalAgencyName = this.queryParams.hospitalAgencyName
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.obj.length > 10) {

src/views/operationInfo/operationInfo/index.vue

@@ -23,6 +23,7 @@
           <el-row :gutter="10" class="">
             <el-col :span="1.5">
               <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+                :disabled="queryParams.hospitalAgencyId ? false : true"
                 v-hasPermi="['operationInfo:operationInfo:add']">新增手术</el-button>
             </el-col>
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -307,12 +308,14 @@ export default {
     //接收科室列表传值
     clickdepartment(item) {
       this.queryParams.hospitalAgencyId = item.hospitalAgencyId
+      this.queryParams.hospitalAgencyName = item.hospitalAgencyName
       this.queryParams.departmentId = item.itemid
       this.departmentName = item.itemName
       this.informationqueryParams.hospitalAgencyId = item.hospitalAgencyId
       if (item.hospitalAgencyId) {
         this.getList();
       }
+      this.$forceUpdate()
     },
     /** 新增按钮操作 */
     handleAdd() {
@@ -336,6 +339,7 @@ export default {
         if (!this.form.sort) {
           this.form.sort = undefined
         }
+        this.departmentName = response.data.departmentName
         this.open = true;
         this.title = "修改手术信息";
         if (this.title == "修改手术信息") {
@@ -346,6 +350,7 @@ export default {
     /** 提交按钮 */
     submitForm() {
       this.form.hospitalAgencyId = this.queryParams.hospitalAgencyId
+      this.form.hospitalAgencyName = this.queryParams.hospitalAgencyName
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.obj.length > 10) {