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

src/views/components/DepartmentList.vue

@@ -26,7 +26,7 @@
             </div>
             <span class="count">{{ item.countNum }}</span>
         </div>
-        <el-dialog title="切换医院" :visible.sync="open" width="50%" @close="openfalse">
+        <el-dialog title="切换医院" :visible.sync="open" width="50%" @close="openfalse" :modal="vmodal">
             <div class="opentable">
                 <el-form :model="opentablequery" label-width="80px" :inline="true">
                     <el-form-item label="科室名称" prop="hospitalAgencyName" label-width="120">
@@ -69,10 +69,11 @@ import {
     selectDiseaseCount
 } from "@/api/system/specialDiseaseRoute";
 export default {
-    props: ['methods'],
+    props: ['methods', 'modal', 'servicePackageId'],
     name: "DepartmentList",
     data() {
         return {
+            vmodal: false,
             roleKey: localStorage.getItem('roleKey'),
             open: false,
             switchvalue: true,
@@ -99,6 +100,9 @@ export default {
             this.querydepartmen.departmentName = val
             this.Departmentlist();
         },
+        modal(val) {
+            this.vmodal = val
+        },
     },
     created() {
         this.querydepartmen.hospitalAgencyId = JSON.parse(localStorage.getItem('user')).hospitalAgencyId
@@ -182,18 +186,40 @@ export default {
                 method = listOperationNum(this.querydepartmen)
             } else if (this.methods == 'listScriptNum') {
                 method = listScriptNum(this.querydepartmen)
+            } else if (this.methods == 'listScriptNumtwo') {
+                this.querydepartmen.scriptStatus = "NORMAL";
+                method = listScriptNum(this.querydepartmen)
             } else if (this.methods == 'listWechatTemplateNum') {
                 method = listWechatTemplateNum(this.querydepartmen)
+            } else if (this.methods == 'listWechatTemplateNumtwo') {
+                this.querydepartmen.templateSource = "WE_CHAT_OFFICIAL_ACCOUNT"
+                method = listWechatTemplateNum(this.querydepartmen)
+            } else if (this.methods == 'listWechatTemplateNumthree') {
+                this.querydepartmen.templateSource = "WE_CHAT_APPLET";
+                method = listWechatTemplateNum(this.querydepartmen)
             } else if (this.methods == 'listMessageNum') {
                 method = listMessageNum(this.querydepartmen)
+            } else if (this.methods == 'listMessageNumtwo') {
+                this.querydepartmen.textMessageStatus = "GROUNDING";
+                method = listMessageNum(this.querydepartmen)
             } else if (this.methods == 'selectNumByDept') {
                 method = selectNumByDept(this.querydepartmen)
+            } else if (this.methods == 'selectNumByDepttwo') {
+                this.querydepartmen.propagandaStatus = "APPROVED";
+                method = selectNumByDept(this.querydepartmen)
             } else if (this.methods == 'listServicePackageNum') {
                 method = listServicePackageNum(this.querydepartmen)
             } else if (this.methods == 'getDepartmentList') {
                 method = getDepartmentList(this.querydepartmen)
+            } else if (this.methods == 'getDepartmentListtwo') {
+                this.querydepartmen.questionnaireStatus = "PUBLISHED"
+                method = getDepartmentList(this.querydepartmen)
             } else if (this.methods == 'selectDiseaseCount') {
                 method = selectDiseaseCount(this.querydepartmen)
+            } else if (this.methods == 'selectDiseaseCounttwo') {
+                this.querydepartmen.releaseStatus = 'PUBLISHED'
+                this.querydepartmen.servicePackageId = this.servicePackageId
+                method = selectDiseaseCount(this.querydepartmen)
             }
             this.DepartmentoList = []
             method.then(response => {

src/views/manage/components/specialDiseaseRoute.vue

@@ -5,20 +5,10 @@
         '请选择专病管理路径' }}</el-button>
     <el-dialog title="专病管理路径选择" :visible.sync="classificationOpen" width="70%" :before-close="classificationOpenfalse">
       <el-row :gutter="20">
-        <el-col :span="6">
+        <el-col :span="6" :xs="24">
-          <div class="left" ref="box">
+          <DepartmentList ref="DepartmentList" :modal="true" @clickdepartment="clickdepartment"
-            <div class="name">科室名称</div>
+            :servicePackageId="servicePackageId" :methods="'selectDiseaseCounttwo'">
-            <div style="padding: 10px 0;">
+          </DepartmentList>
-              <el-input v-model="departmentName" placeholder="请输入科室名称" clearable @keyup.enter.native="handleQuery" />
-            </div>
-            <div class="listitem" v-for="(item, index) in DepartmentoList" :key="index"
-              @click="clickDepartmenitem(item)">
-              <div :class="queryParams.departmentId == item.id ? 'allactive' : 'all'">
-                {{ item.departmentName }}
-              </div>
-              <span class="count">{{ item.countNum }}</span>
-            </div>
-          </div>
         </el-col>
         <el-col :span="18">
           <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
@@ -73,7 +63,11 @@ import {
   listSpecialDiseaseRoute,
   selectDiseaseCount,
 } from "@/api/system/specialDiseaseRoute";
+import DepartmentList from '../../components/DepartmentList.vue'
 export default {
+  components: {
+    DepartmentList
+  },
   props: ['routeId', 'routeName', 'servicePackageId'],
   name: "SpecialDiseaseRoute",
   data() {
@@ -116,24 +110,19 @@ export default {
       },
       // 表单校验
       rules: {},
-      DepartmentoList: [],
-      departmentName: '',
       handleselectName: '',
       handleselectId: '',
     };
   },
   created() {
     this.queryParams.servicePackageId = this.servicePackageId
-    this.getList();
+    // this.getList();
   },
   mounted() {
     this.handleselectId = this.routeId
     this.handleselectName = this.routeName
   },
   watch: {
-    departmentName(val) {
-      this.infolists();
-    },
     routeId(newValue, oldValue) {
       this.handleselectId = newValue;
     },
@@ -148,6 +137,17 @@ export default {
     }
   },
   methods: {
+    //接收科室列表传值
+    clickdepartment(item) {
+      this.queryParams.hospitalAgencyId = item.hospitalAgencyId
+      this.queryParams.hospitalAgencyName = item.hospitalAgencyName
+      this.queryParams.departmentId = item.itemid
+      this.queryParams.departmentName = item.itemName
+      if (item.hospitalAgencyId) {
+        this.getList();
+      }
+      this.$forceUpdate()
+    },
     nohandleselect() {
       this.handleselectId = ''
       this.handleselectName = ''
@@ -159,17 +159,6 @@ export default {
       this.$emit("on-template", { routeId: item.id, routeName: item.routeName });
       this.classificationOpen = false
     },
-    clickDepartmenitem(item) {
-      this.loading = true;
-      this.queryParams.departmentId = item.id;
-      this.getList();
-    },
-    //科室
-    infolists() {
-      selectDiseaseCount(this.departmentName, 'PUBLISHED', this.queryParams.servicePackageId).then((res) => {
-        this.DepartmentoList = res.data;
-      });
-    },
     /** 查询专病路径信息列表 */
     getList() {
       this.loading = true;
@@ -179,7 +168,6 @@ export default {
         this.total = response.total;
         this.loading = false;
       });
-      this.infolists();
     },
     // 取消按钮
     cancel() {
@@ -192,6 +180,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.$refs.DepartmentList.resetQuery()
       this.resetForm("queryForm");
       this.handleQuery();
     },

src/views/system/components/message.vue

@@ -1,195 +1,68 @@
 <template>
   <div class="app-container">
-    <el-button
+    <el-button size="small" @click="classificationOpen = true" style="
-      size="small"
-      @click="classificationOpen = true"
-      style="
         width: 200px;
         font-size: 14px;
         text-align: left;
         white-space: nowrap;
         text-overflow: ellipsis;
         overflow: hidden;
-      "
+      " :style="handleselectName ? 'color:black' : 'color:#C0C4CC'">{{ handleselectName ? handleselectName : "选择短信模板"
-      :style="handleselectName ? 'color:black' : 'color:#C0C4CC'"
+      }}</el-button>
-      >{{ handleselectName ? handleselectName : "选择短信模板" }}</el-button
+    <el-dialog title="短信库模板选择" :visible.sync="classificationOpen" width="70%" :before-close="classificationOpenfalse">
-    >
-    <el-dialog
-      title="短信库模板选择"
-      :visible.sync="classificationOpen"
-      width="70%"
-      :before-close="classificationOpenfalse"
-    >
       <el-row :gutter="20">
         <!--部门数据-->
         <el-col :span="6" :xs="24">
-          <div class="leftmessage" ref="box">
+          <DepartmentList ref="DepartmentList" :modal="true" @clickdepartment="clickdepartment"
-            <div class="name">科室名称</div>
+            :methods="'listMessageNumtwo'">
-            <div>
+          </DepartmentList>
-              <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="18" :xs="24">
-          <el-form
+          <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
-            :model="queryParams"
+            label-width="68px">
-            ref="queryForm"
+            <el-form-item label="短信模板名称" prop="textMessageName" label-width="100px">
-            size="small"
+              <el-input v-model="queryParams.textMessageName" placeholder="请输入模版名称" clearable
-            :inline="true"
+                @keyup.enter.native="handleQuery" />
-            v-show="showSearch"
-            label-width="68px"
-          >
-            <el-form-item
-              label="短信模板名称"
-              prop="textMessageName"
-              label-width="100px"
-            >
-              <el-input
-                v-model="queryParams.textMessageName"
-                placeholder="请输入模版名称"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
             </el-form-item>
             <el-form-item label="模板ID" prop="textMessageId">
-              <el-input
+              <el-input v-model="queryParams.textMessageId" placeholder="请输入模板ID" clearable
-                v-model="queryParams.textMessageId"
+                @keyup.enter.native="handleQuery" />
-                placeholder="请输入模板ID"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
             </el-form-item>
             <el-form-item>
-              <el-button
+              <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-                type="primary"
+              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-                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>
-          <el-table
+          <el-table v-loading="loading" :data="templateList" @row-dblclick="handleselect">
-            v-loading="loading"
+            <el-table-column type="index" width="55" align="center" label="序号" />
-            :data="templateList"
+            <el-table-column label="短信模板名称" align="center" prop="textMessageName" :show-overflow-tooltip="true" />
-            @row-dblclick="handleselect"
+            <el-table-column label="短信ID" align="center" prop="textMessageId" />
-          >
+            <el-table-column label="短信内容" align="center" prop="textMessageContent" :show-overflow-tooltip="true" />
-            <el-table-column
+            <el-table-column :show-overflow-tooltip="true" label="适用任务类型" align="center" prop="suitTaskTypeName">
-              type="index"
-              width="55"
-              align="center"
-              label="序号"
-            />
-            <el-table-column
-              label="短信模板名称"
-              align="center"
-              prop="textMessageName"
-              :show-overflow-tooltip="true"
-            />
-            <el-table-column
-              label="短信ID"
-              align="center"
-              prop="textMessageId"
-            />
-            <el-table-column
-              label="短信内容"
-              align="center"
-              prop="textMessageContent"
-              :show-overflow-tooltip="true"
-            />
-            <el-table-column
-              :show-overflow-tooltip="true"
-              label="适用任务类型"
-              align="center"
-              prop="suitTaskTypeName"
-            >
               <template slot-scope="scope">
-                {{
+                {{ scope.row.suitTaskTypeName != "null" ? scope.row.suitTaskTypeName : "" }}
-                  scope.row.suitTaskTypeName != "null"
-                    ? scope.row.suitTaskTypeName
-                    : ""
-                }}
               </template>
             </el-table-column>
-            <el-table-column
+            <el-table-column label="短信通道" align="center" prop="textMessageChannel">
-              label="短信通道"
-              align="center"
-              prop="textMessageChannel"
-            >
               <template slot-scope="scope">
-                {{
+                {{ scope.row.textMessageChannel == "WATER_DROPLET_PLATFORM" ? "水滴平台" : "" }}
-                  scope.row.textMessageChannel == "WATER_DROPLET_PLATFORM"
-                    ? "水滴平台"
-                    : ""
-                }}
               </template>
             </el-table-column>
-            <el-table-column
+            <el-table-column label="病种名称" align="center" prop="diseaseTypeName" />
-              label="病种名称"
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-              align="center"
-              prop="diseaseTypeName"
-            />
-            <el-table-column
-              label="操作"
-              align="center"
-              class-name="small-padding fixed-width"
-            >
               <template slot-scope="scope">
-                <el-button
+                <el-button size="mini" type="text" @click="handleselect(scope.row)"
-                  size="mini"
+                  v-if="handleselectId != scope.row.id">选择</el-button>
-                  type="text"
+                <el-button size="mini" type="text" @click="nohandleselect(scope.row)"
-                  @click="handleselect(scope.row)"
+                  v-if="handleselectId == scope.row.id">取消选择</el-button>
-                  v-if="handleselectId != scope.row.id"
-                  >选择</el-button
-                >
-                <el-button
-                  size="mini"
-                  type="text"
-                  @click="nohandleselect(scope.row)"
-                  v-if="handleselectId == scope.row.id"
-                  >取消选择</el-button
-                >
               </template>
             </el-table-column>
           </el-table>
         </el-col>
       </el-row>
-      <pagination
+      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-        v-show="total > 0"
+        @pagination="getList" />
-        :total="total"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
     </el-dialog>
   </div>
 </template>
@@ -205,8 +78,11 @@ import {
 } from "@/api/manage/message";
 import { typelist } from "@/api/manage/template";
 import { department, listDisease } from "@/api/manage/script";
-
+import DepartmentList from '../../components/DepartmentList.vue'
 export default {
+  components: {
+    DepartmentList
+  },
   props: ["templateId", "templateName"],
   name: "Template",
   data() {
@@ -214,25 +90,6 @@ export default {
       handleselectName: "",
       handleselectId: "",
       classificationOpen: false,
-      itemname: null,
-      departmentName: null,
-      diseaseTypeName: null,
-      name: "",
-      departmentId: null,
-      count: "", //全部
-      DepartmentoList: [], //左侧数组
-      // 左侧传值
-      querydepartmen: {
-        departmentName: "",
-        // pageNum: 1,
-        // pageSize: 10,
-      },
-      options: [
-        {
-          value: "WATER_DROPLET_PLATFORM",
-          label: "水滴平台",
-        },
-      ],
       // 遮罩层
       loading: false,
       // 选中数组
@@ -263,14 +120,9 @@ export default {
         textMessageSort: null,
         textMessageRemark: null,
       },
-      // 表单参数
-      form: {},
     };
   },
   watch: {
-    name(val) {
-      this.querydepartmen.departmentName = val;
-    },
     templateId(newValue, oldValue) {
       this.handleselectId = newValue;
     },
@@ -283,9 +135,20 @@ export default {
     this.handleselectName = this.templateName;
   },
   created() {
-    this.getList();
+    // this.getList();
   },
   methods: {
+    //接收科室列表传值
+    clickdepartment(item) {
+      this.queryParams.hospitalAgencyId = item.hospitalAgencyId
+      this.queryParams.hospitalAgencyName = item.hospitalAgencyName
+      this.queryParams.departmentId = item.itemid
+      this.queryParams.departmentName = item.itemName
+      if (item.hospitalAgencyId) {
+        this.getList();
+      }
+      this.$forceUpdate()
+    },
     nohandleselect() {
       this.handleselectId = "";
       this.handleselectName = "";
@@ -296,7 +159,6 @@ export default {
       });
     },
     handleselect(item) {
-      console.log(item.id, "id");
       this.handleselectId = item.id;
       this.handleselectName = item.textMessageName;
       this.$emit("on-template", {
@@ -319,36 +181,6 @@ export default {
         this.loading = false;
       });
     },
-    // 左侧科室列表
-    Departmentlist() {
-      this.loading = true;
-      this.querydepartmen.textMessageStatus = "GROUNDING";
-      listMessageNum(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();
-      }
-    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
@@ -356,6 +188,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.$refs.DepartmentList.resetQuery()
       this.queryParams.departmentId = null;
       this.itemname = null;
       this.resetForm("queryForm");
@@ -365,7 +198,6 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-
 .app-container {
   display: inline-block;
   padding: 0 !important;

src/views/system/components/miniProgram.vue

@@ -1,125 +1,44 @@
 <template>
   <div class="app-container">
-    <el-button
+    <el-button size="small" @click="classificationOpen = true" style="
-      size="small"
-      @click="classificationOpen = true"
-      style="
         width: 200px;
         font-size: 14px;
         text-align: left;
         white-space: nowrap;
         text-overflow: ellipsis;
         overflow: hidden;
-      "
+      " :style="handleselectName ? 'color:black' : 'color:#C0C4CC'">{{ handleselectName ? handleselectName : "选择小程序模板"
-      :style="handleselectName ? 'color:black' : 'color:#C0C4CC'"
+      }}</el-button>
-      >{{ handleselectName ? handleselectName : "选择公众号模板" }}</el-button
+    <el-dialog title="小程序模板选择" :visible.sync="classificationOpen" width="70%" :before-close="classificationOpenfalse">
-    >
-    <el-dialog
-      title="公众号模板选择"
-      :visible.sync="classificationOpen"
-      width="70%"
-      :before-close="classificationOpenfalse"
-    >
       <el-row :gutter="20">
         <!--部门数据-->
         <el-col :span="6" :xs="24">
-          <div class="left" ref="box">
+          <DepartmentList ref="DepartmentList" :modal="true" @clickdepartment="clickdepartment"
-            <div class="name">科室名称</div>
+            :methods="'listWechatTemplateNumthree'">
-            <div>
+          </DepartmentList>
-              <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="18" :xs="24">
-          <el-form
+          <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
-            :model="queryParams"
+            label-width="68px">
-            ref="queryForm"
+            <el-form-item label="微信模版名称" prop="wechatTemplateName" label-width="100px">
-            size="small"
+              <el-input v-model="queryParams.wechatTemplateName" placeholder="请输入模版名称" clearable
-            :inline="true"
+                @keyup.enter.native="handleQuery" />
-            v-show="showSearch"
-            label-width="68px"
-          >
-            <el-form-item
-              label="微信模版名称"
-              prop="wechatTemplateName"
-              label-width="100px"
-            >
-              <el-input
-                v-model="queryParams.wechatTemplateName"
-                placeholder="请输入模版名称"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
             </el-form-item>
             <el-form-item label="模板ID" prop="templateId">
-              <el-input
+              <el-input v-model="queryParams.templateId" placeholder="请输入模板ID" clearable
-                v-model="queryParams.templateId"
+                @keyup.enter.native="handleQuery" />
-                placeholder="请输入模板ID"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
             </el-form-item>
             <el-form-item>
-              <el-button
+              <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-                type="primary"
+              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-                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>
-          <el-table
+          <el-table v-loading="loading" :data="templateList" @row-dblclick="handleselect">
-            v-loading="loading"
+            <el-table-column type="index" width="55" align="center" label="序号" />
-            :data="templateList"
+            <el-table-column label="微信模版名称" align="center" prop="wechatTemplateName" />
-            @row-dblclick="handleselect"
-          >
-            <el-table-column
-              type="index"
-              width="55"
-              align="center"
-              label="序号"
-            />
-            <el-table-column
-              label="微信模版名称"
-              align="center"
-              prop="wechatTemplateName"
-            />
             <el-table-column label="模板ID" align="center" prop="templateId" />
-            <el-table-column
+            <el-table-column label="模板来源" align="center" prop="templateSource">
-              label="模板来源"
-              align="center"
-              prop="templateSource"
-            >
               <template slot-scope="scope">
                 {{
         scope.row.templateSource == "WE_CHAT_APPLET" ? "小程序" : ""
@@ -131,56 +50,22 @@
         }}
               </template>
             </el-table-column>
-            <el-table-column
+            <el-table-column label="适用任务类型" align="center" prop="suitTaskTypeName" :show-overflow-tooltip="true" />
-              label="适用任务类型"
+            <el-table-column label="病种名称" align="center" prop="diseaseTypeName" />
-              align="center"
+            <el-table-column label="模板内容" align="center" prop="templateContent" :show-overflow-tooltip="true" />
-              prop="suitTaskTypeName"
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-              :show-overflow-tooltip="true"
-            />
-            <el-table-column
-              label="病种名称"
-              align="center"
-              prop="diseaseTypeName"
-            />
-            <el-table-column
-              label="模板内容"
-              align="center"
-              prop="templateContent"
-              :show-overflow-tooltip="true"
-
-            />
-            <el-table-column
-              label="操作"
-              align="center"
-              class-name="small-padding fixed-width"
-            >
               <template slot-scope="scope">
-                <el-button
+                <el-button size="mini" type="text" @click="handleselect(scope.row)"
-                  size="mini"
+                  v-if="handleselectId != scope.row.templateId">选择</el-button>
-                  type="text"
+                <el-button size="mini" type="text" @click="nohandleselect(scope.row)"
-                  @click="handleselect(scope.row)"
+                  v-if="handleselectId == scope.row.templateId">取消选择</el-button>
-                  v-if="handleselectId != scope.row.templateId"
-                  >选择</el-button
-                >
-                <el-button
-                  size="mini"
-                  type="text"
-                  @click="nohandleselect(scope.row)"
-                  v-if="handleselectId == scope.row.templateId"
-                  >取消选择</el-button
-                >
               </template>
             </el-table-column>
           </el-table>
         </el-col>
       </el-row>
-      <pagination
+      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-        v-show="total > 0"
+        @pagination="getList" />
-        :total="total"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
     </el-dialog>
   </div>
 </template>
@@ -195,7 +80,11 @@ import {
   listWechatTemplateNum,
   typelist,
 } from "@/api/manage/template";
+import DepartmentList from '../../components/DepartmentList.vue'
 export default {
+  components: {
+    DepartmentList
+  },
   props: ["templateId", "templateName"],
   name: "miniProgram",
   data() {
@@ -203,27 +92,6 @@ export default {
       handleselectName: "",
       handleselectId: "",
       classificationOpen: false,
-      count: "", //全部
-      itemname: null,
-      departmentName: null,
-      diseaseTypeName: null,
-      name: "",
-      departmentId: null,
-      DepartmentoList: [], //左侧数组
-      // 左侧传值
-      querydepartmen: {
-        departmentName: "",
-      },
-      options: [
-        {
-          value: "WE_CHAT_APPLET",
-          label: "小程序",
-        },
-        {
-          value: "WE_CHAT_OFFICIAL_ACCOUNT",
-          label: "公众号",
-        },
-      ],
       // 遮罩层
       loading: false,
       // 选中数组
@@ -260,9 +128,6 @@ export default {
     };
   },
   watch: {
-    name(val) {
-      this.querydepartmen.departmentName = val;
-    },
     templateId(newValue, oldValue) {
       this.handleselectId = newValue;
     },
@@ -275,9 +140,20 @@ export default {
     this.handleselectName = this.templateName;
   },
   created() {
-    this.getList();
+    // this.getList();
   },
   methods: {
+    //接收科室列表传值
+    clickdepartment(item) {
+      this.queryParams.hospitalAgencyId = item.hospitalAgencyId
+      this.queryParams.hospitalAgencyName = item.hospitalAgencyName
+      this.queryParams.departmentId = item.itemid
+      this.queryParams.departmentName = item.itemName
+      if (item.hospitalAgencyId) {
+        this.getList();
+      }
+      this.$forceUpdate()
+    },
     classificationOpenfalse() {
       this.classificationOpen = false;
     },
@@ -310,36 +186,6 @@ export default {
         this.loading = false;
       });
     },
-    // 左侧科室列表
-    Departmentlist() {
-      this.loading = true;
-      this.querydepartmen.templateSource = "WE_CHAT_APPLET";
-      listWechatTemplateNum(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();
-      }
-    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
@@ -347,8 +193,8 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.$refs.DepartmentList.resetQuery()
       this.queryParams.departmentId = null;
-      this.itemname = null;
       this.resetForm("queryForm");
       this.handleQuery();
     },

src/views/system/components/officialAccount.vue

@@ -3,32 +3,15 @@
         <el-button size="small" @click="classificationOpen = true"
             style="width: 200px;font-size:14px;text-align:left;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;"
             :style="handleselectName ? 'color:black' : 'color:#C0C4CC'">{{ handleselectName ? handleselectName :
-                '选择小程序模板' }}</el-button>
+                '选择公众号模板' }}</el-button>
-        <el-dialog title="小程序模板选择" :visible.sync="classificationOpen" width="70%"
+        <el-dialog title="公众号模板选择" :visible.sync="classificationOpen" width="70%"
             :before-close="classificationOpenfalse">
             <el-row :gutter="20">
                 <!--部门数据-->
                 <el-col :span="6" :xs="24">
-                    <div class="left" ref="box">
+                    <DepartmentList ref="DepartmentList" :modal="true" @clickdepartment="clickdepartment"
-                        <div class="name">科室名称</div>
+                        :methods="'listWechatTemplateNumtwo'">
-                        <div>
+                    </DepartmentList>
-                            <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="18" :xs="24">
@@ -83,32 +66,18 @@
 
 <script>
 import { listTemplate, getTemplate, delTemplate, addTemplate, updateTemplate, listWechatTemplateNum, typelist } from "@/api/manage/template";
+import DepartmentList from '../../components/DepartmentList.vue'
 export default {
     props: ['templateId', 'templateName'],
     name: "officialAccount",
+    components: {
+        DepartmentList
+    },
     data() {
         return {
             handleselectName: '',
             handleselectId: '',
             classificationOpen: false,
-            count: '',//全部
-            itemname: null,
-            departmentName: null,
-            diseaseTypeName: null,
-            name: '',
-            departmentId: null,
-            DepartmentoList: [],//左侧数组
-            // 左侧传值
-            querydepartmen: {
-                departmentName: "",
-            },
-            options: [{
-                value: 'WE_CHAT_APPLET',
-                label: '小程序'
-            }, {
-                value: 'WE_CHAT_OFFICIAL_ACCOUNT',
-                label: '公众号'
-            },],
             // 遮罩层
             loading: false,
             // 选中数组
@@ -145,9 +114,6 @@ export default {
         };
     },
     watch: {
-        name(val) {
-            this.querydepartmen.departmentName = val
-        },
         templateId(newValue, oldValue) {
             this.handleselectId = newValue;
         },
@@ -160,9 +126,20 @@ export default {
         this.handleselectName = this.templateName;
     },
     created() {
-        this.getList();
+        // this.getList();
     },
     methods: {
+        //接收科室列表传值
+        clickdepartment(item) {
+            this.queryParams.hospitalAgencyId = item.hospitalAgencyId
+            this.queryParams.hospitalAgencyName = item.hospitalAgencyName
+            this.queryParams.departmentId = item.itemid
+            this.queryParams.departmentName = item.itemName
+            if (item.hospitalAgencyId) {
+                this.getList();
+            }
+            this.$forceUpdate()
+        },
         classificationOpenfalse() {
             this.classificationOpen = false
         },
@@ -188,36 +165,6 @@ export default {
                 this.loading = false;
             });
         },
-        // 左侧科室列表
-        Departmentlist() {
-            this.loading = true;
-            this.querydepartmen.templateSource = "WE_CHAT_OFFICIAL_ACCOUNT"
-            listWechatTemplateNum(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()
-            }
-        },
         /** 搜索按钮操作 */
         handleQuery() {
             this.queryParams.pageNum = 1;
@@ -225,8 +172,8 @@ export default {
         },
         /** 重置按钮操作 */
         resetQuery() {
+            this.$refs.DepartmentList.resetQuery()
             this.queryParams.departmentId = null;
-            this.itemname = null;
             this.resetForm("queryForm");
             this.handleQuery();
         },

src/views/system/components/propaganda.vue

@@ -1,215 +1,74 @@
 <template>
   <div class="app-container">
-    <el-button
+    <el-button size="small" @click="classificationOpen = true" style="
-      size="small"
-      @click="classificationOpen = true"
-      style="
         width: 200px;
         font-size: 14px;
         text-align: left;
         white-space: nowrap;
         text-overflow: ellipsis;
         overflow: hidden;
-      "
+      " :style="handleselectName ? 'color:black' : 'color:#C0C4CC'">{{ handleselectName ? handleselectName : "选择宣教模板"
-      :style="handleselectName ? 'color:black' : 'color:#C0C4CC'"
+      }}</el-button>
-      >{{ handleselectName ? handleselectName : "选择宣教模板" }}</el-button
+    <el-dialog title="宣教库模板选择" :visible.sync="classificationOpen" width="70%" :before-close="classificationOpenfalse">
-    >
-    <el-dialog
-      title="宣教库模板选择"
-      :visible.sync="classificationOpen"
-      width="70%"
-      :before-close="classificationOpenfalse"
-    >
       <el-row :gutter="20">
         <!--部门数据-->
         <el-col :span="6" :xs="24">
-          <div class="leftpro" ref="box">
+          <DepartmentList ref="DepartmentList" :modal="true" @clickdepartment="clickdepartment"
-            <div class="name">科室名称</div>
+            :methods="'selectNumByDepttwo'">
-            <div>
+          </DepartmentList>
-              <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="18" :xs="24">
-          <el-form
+          <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
-            :model="queryParams"
+            label-width="68px">
-            ref="queryForm"
-            size="small"
-            :inline="true"
-            v-show="showSearch"
-            label-width="68px"
-          >
             <el-form-item label="宣教名称" prop="propagandaTitle">
-              <el-input
+              <el-input v-model="queryParams.propagandaTitle" placeholder="请输入宣教名称" clearable
-                v-model="queryParams.propagandaTitle"
+                @keyup.enter.native="handleQuery" />
-                placeholder="请输入宣教名称"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
             </el-form-item>
             <el-form-item label="宣教类型" prop="propagandaType">
-              <el-select
+              <el-select v-model="queryParams.propagandaType" placeholder="请选择">
-                v-model="queryParams.propagandaType"
+                <el-option v-for="item in optionstype" :key="item.value" :label="item.label" :value="item.value">
-                placeholder="请选择"
-              >
-                <el-option
-                  v-for="item in optionstype"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                >
                 </el-option>
               </el-select>
             </el-form-item>
             <el-form-item>
-              <el-button
+              <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-                type="primary"
+              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-                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>
-          <el-table
+          <el-table v-loading="loading" :data="propagandaList" @row-dblclick="handleselect">
-            v-loading="loading"
+            <el-table-column label="序号" align="center" prop="id" type="index" />
-            :data="propagandaList"
+            <el-table-column label="病种名称" align="center" prop="diseaseTypeName" />
-            @row-dblclick="handleselect"
+            <el-table-column label="宣教名称" align="center" prop="propagandaTitle" :show-overflow-tooltip="true">
-          >
-            <el-table-column
-              label="序号"
-              align="center"
-              prop="id"
-              type="index"
-            />
-            <el-table-column
-              label="病种名称"
-              align="center"
-              prop="diseaseTypeName"
-            />
-            <el-table-column
-              label="宣教名称"
-              align="center"
-              prop="propagandaTitle"
-              :show-overflow-tooltip="true"
-            >
             </el-table-column>
-            <el-table-column
+            <el-table-column label="宣教ID" align="center" prop="propagandaCode" :show-overflow-tooltip="true" />
-              label="宣教ID"
+            <el-table-column label="宣教类型" align="center" prop="propagandaType">
-              align="center"
-              prop="propagandaCode"
-              :show-overflow-tooltip="true"
-            />
-            <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
+            <el-table-column label="创建时间" align="center" prop="createTime" />
-              label="创建时间"
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-              align="center"
-              prop="createTime"
-            />
-            <el-table-column
-              label="操作"
-              align="center"
-              class-name="small-padding fixed-width"
-            >
               <template slot-scope="scope">
-                <el-button size="mini" type="text" @click="Preview(scope.row)"
+                <el-button size="mini" type="text" @click="Preview(scope.row)">预览</el-button>
-                  >预览</el-button
+                <el-button size="mini" type="text" @click="handleselect(scope.row)"
-                >
+                  v-if="handleselectId != scope.row.id">选择</el-button>
-                <el-button
+                <el-button size="mini" type="text" @click="nohandleselect(scope.row)"
-                  size="mini"
+                  v-if="handleselectId == scope.row.id">取消选择</el-button>
-                  type="text"
-                  @click="handleselect(scope.row)"
-                  v-if="handleselectId != scope.row.id"
-                  >选择</el-button
-                >
-                <el-button
-                  size="mini"
-                  type="text"
-                  @click="nohandleselect(scope.row)"
-                  v-if="handleselectId == scope.row.id"
-                  >取消选择</el-button
-                >
               </template>
             </el-table-column>
           </el-table>
         </el-col>
       </el-row>
-      <pagination
+      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-        v-show="total > 0"
+        @pagination="getList" />
-        :total="total"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
     </el-dialog>
     <!-- 预览弹框 -->
-    <el-dialog
+    <el-dialog title="预览" :visible.sync="dialogview" width="50%" :before-close="handleview">
-      title="预览"
-      :visible.sync="dialogview"
-      width="50%"
-      :before-close="handleview"
-    >
       <div class="titletop">文章模板:{{ formview.propagandaTitle }}</div>
       <div class="bodytop">
         <div class="titledata">{{ formview.propagandaTitle }}</div>
@@ -240,31 +99,19 @@ import {
   updateStatus,
 } from "@/api/manage/propaganda";
 import Editorxj from "../Editorxj/index.vue";
-
 import stationAcatar from "../../system/stationAvatar/index.vue";
+import DepartmentList from '../../components/DepartmentList.vue'
 export default {
   name: "propaganda",
   props: ["templateId", "templateName"],
-  components: { stationAcatar, Editorxj },
+  components: { stationAcatar, Editorxj, DepartmentList },
   data() {
     return {
       dialogview: false, //预览
       baseUrl: process.env.VUE_APP_BASE_API,
-
       handleselectName: "",
       handleselectId: "",
       classificationOpen: false,
-      itemname: null,
-      departmentName: null,
-      name: "",
-      count: "", //全部
-      DepartmentoList: [], //左侧数组
-      // 左侧传值
-      querydepartmen: {
-        departmentName: "",
-        // pageNum: 1,
-        // pageSize: 10,
-      },
       optionstype: [
         {
           value: "MEDICATION_KNOWLEDGE",
@@ -330,7 +177,6 @@ export default {
     this.handleselectId = this.templateId;
     this.handleselectName = this.templateName;
   },
- 
   computed: {
     pickerStartTime() {
       return {
@@ -354,14 +200,10 @@ export default {
     },
   },
   created() {
-    this.getList();
+    // this.getList();
   },
   watch: {
-    name(val) {
-      this.querydepartmen.departmentName = val;
-    },
     templateId(newValue, oldValue) {
-        // console.log(newValue,'222222222222222222')
       this.handleselectId = newValue;
     },
     templateName(newValue, oldValue) {
@@ -369,12 +211,21 @@ export default {
     },
   },
   methods: {
+    //接收科室列表传值
+    clickdepartment(item) {
+      this.queryParams.hospitalAgencyId = item.hospitalAgencyId
+      this.queryParams.hospitalAgencyName = item.hospitalAgencyName
+      this.queryParams.departmentId = item.itemid
+      this.queryParams.departmentName = item.itemName
+      if (item.hospitalAgencyId) {
+        this.getList();
+      }
+      this.$forceUpdate()
+    },
     // 预览
     Preview(row) {
-      console.log(row);
       const id = row.id || this.ids;
       this.dialogview = true;
-
       getPropaganda(id).then((response) => {
         this.formview = response.data;
       });
@@ -393,7 +244,6 @@ export default {
         // this.formview = response.data;
         this.handleselectId = item.id;
         this.handleselectName = item.propagandaTitle;
-
         this.$emit("on-template", {
           templateId: item.id,
           templateName: item.propagandaTitle,
@@ -413,36 +263,6 @@ export default {
     changecreateTimeEnd(e) {
       this.queryParams.createTimeEnd = e;
     },
-    // 左侧科室列表
-    Departmentlist() {
-      this.loading = true;
-      this.querydepartmen.propagandaStatus = "APPROVED";
-      selectNumByDept(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();
-      }
-    },
     /** 查询患者宣教信息列表 */
     getList() {
       this.loading = true;
@@ -460,6 +280,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.$refs.DepartmentList.resetQuery()
       this.resetForm("queryForm");
       this.handleQuery();
     },

src/views/system/components/question.vue

@@ -14,7 +14,8 @@
       <el-row :gutter="20">
         <!--部门数据-->
         <el-col :span="6" :xs="24">
-          <DepartmentList ref="DepartmentList" @clickdepartment="clickdepartment" :methods="'getDepartmentList'">
+          <DepartmentList ref="DepartmentList" :modal="true" @clickdepartment="clickdepartment"
+            :methods="'getDepartmentListtwo'">
           </DepartmentList>
         </el-col>
         <!--用户数据-->
@@ -96,12 +97,6 @@ export default {
     return {
       showquestion: false,
       classificationOpen: false,
-      //科室名称
-      departmentName: "",
-      defaultProps: {
-        children: "children",
-        label: "label",
-      },
       // 遮罩层
       loading: true,
       // 总条数
@@ -147,7 +142,7 @@ export default {
       this.queryParams.hospitalAgencyId = item.hospitalAgencyId
       this.queryParams.hospitalAgencyName = item.hospitalAgencyName
       this.queryParams.departmentId = item.itemid
-      this.departmentName = item.itemName
+      this.queryParams.departmentName = item.itemName
       if (item.hospitalAgencyId) {
         this.getList();
       }
@@ -184,11 +179,6 @@ export default {
     classificationOpenfalse() {
       this.classificationOpen = false;
     },
-    // 节点单击事件
-    handleNodeClick(data) {
-      this.queryParams.departmentId = data.id;
-      this.handleQuery();
-    },
     /** 查询问卷基本信息列表 */
     getList() {
       this.loading = true;

src/views/system/components/script.vue

@@ -1,204 +1,72 @@
 <template>
   <div class="app-container">
-    <el-button
+    <el-button size="small" @click="classificationOpen = true" style="
-      size="small"
-      @click="classificationOpen = true"
-      style="
         width: 200px;
         font-size: 14px;
         text-align: left;
         white-space: nowrap;
         text-overflow: ellipsis;
         overflow: hidden;
-      "
+      " :style="handleselectName ? 'color:black' : 'color:#C0C4CC'">{{ handleselectName ? handleselectName : "请选择"
-      :style="handleselectName ? 'color:black' : 'color:#C0C4CC'"
+      }}</el-button>
-      >{{ handleselectName ? handleselectName : "请选择" }}</el-button
+    <el-dialog title="话书库模板选择" :visible.sync="classificationOpen" width="70%" :before-close="classificationOpenfalse">
-    >
-    <el-dialog
-      title="话书库模板选择"
-      :visible.sync="classificationOpen"
-      width="70%"
-      :before-close="classificationOpenfalse"
-    >
       <el-row :gutter="20">
         <!--部门数据-->
         <el-col :span="6" :xs="24">
-          <div class="leftscript" ref="box">
+          <DepartmentList ref="DepartmentList" :modal="true" @clickdepartment="clickdepartment"
-            <div class="name">科室名称</div>
+            :methods="'listScriptNumtwo'">
-            <div>
+          </DepartmentList>
-              <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="18" :xs="24">
-          <el-form
+          <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
-            :model="queryParams"
+            label-width="100px">
-            ref="queryForm"
-            size="small"
-            :inline="true"
-            v-show="showSearch"
-            label-width="100px"
-          >
             <el-form-item label="通用话术名称" prop="commonScriptName">
-              <el-input
+              <el-input v-model="queryParams.commonScriptName" placeholder="请输入通用话术名称" clearable
-                v-model="queryParams.commonScriptName"
+                @keyup.enter.native="handleQuery" />
-                placeholder="请输入通用话术名称"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
             </el-form-item>
             <el-form-item label="话术名称" prop="scriptName">
-              <el-input
+              <el-input v-model="queryParams.scriptName" placeholder="请输入话术名称" clearable
-                v-model="queryParams.scriptName"
+                @keyup.enter.native="handleQuery" />
-                placeholder="请输入话术名称"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
             </el-form-item>
             <el-form-item label="话术ID" prop="scriptId">
-              <el-input
+              <el-input v-model="queryParams.scriptId" placeholder="请输入话术ID" clearable
-                v-model="queryParams.scriptId"
+                @keyup.enter.native="handleQuery" />
-                placeholder="请输入话术ID"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
             </el-form-item>
             <el-form-item label="平台ID" prop="platformId">
-              <el-input
+              <el-input v-model="queryParams.platformId" placeholder="请输入平台ID" clearable
-                v-model="queryParams.platformId"
+                @keyup.enter.native="handleQuery" />
-                placeholder="请输入平台ID"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
             </el-form-item>
             <el-form-item>
-              <el-button
+              <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-                type="primary"
+              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-                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>
-          <el-table
+          <el-table v-loading="loading" :data="scriptList" @row-dblclick="handleselect">
-            v-loading="loading"
+            <el-table-column label="序号" align="center" prop="sort" type="index" />
-            :data="scriptList"
+            <el-table-column label="通用话术名称" align="center" prop="commonScriptName" :show-overflow-tooltip="true" />
-            @row-dblclick="handleselect"
+            <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
+            <el-table-column label="平台ID" align="center" prop="platformId" :show-overflow-tooltip="true" />
-              label="序号"
+            <el-table-column label="话术简介" align="center" prop="scriptIntroduction" :show-overflow-tooltip="true" />
-              align="center"
+            <el-table-column label="病种名称" align="center" prop="diseaseTypeName" :show-overflow-tooltip="true" />
-              prop="sort"
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-              type="index"
-            />
-            <el-table-column
-              label="通用话术名称"
-              align="center"
-              prop="commonScriptName"
-              :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="scriptIntroduction"
-              :show-overflow-tooltip="true"
-            />
-            <el-table-column
-              label="病种名称"
-              align="center"
-              prop="diseaseTypeName"
-              :show-overflow-tooltip="true"
-            />
-            <el-table-column
-              label="操作"
-              align="center"
-              class-name="small-padding fixed-width"
-            >
               <template slot-scope="scope">
-                <el-button size="mini" type="text" @click="handlesee(scope.row)"
+                <el-button size="mini" type="text" @click="handlesee(scope.row)">预览</el-button>
-                  >预览</el-button
+                <el-button size="mini" type="text" @click="handleselect(scope.row)"
-                >
+                  v-if="handleselectId != scope.row.id">选择</el-button>
-                <el-button
+                <el-button size="mini" type="text" @click="nohandleselect(scope.row)"
-                  size="mini"
+                  v-if="handleselectId == scope.row.id">取消选择</el-button>
-                  type="text"
-                  @click="handleselect(scope.row)"
-                  v-if="handleselectId != scope.row.id"
-                  >选择</el-button
-                >
-                <el-button
-                  size="mini"
-                  type="text"
-                  @click="nohandleselect(scope.row)"
-                  v-if="handleselectId == scope.row.id"
-                  >取消选择</el-button
-                >
               </template>
             </el-table-column>
           </el-table>
         </el-col>
       </el-row>
-      <pagination
+      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-        v-show="total > 0"
+        @pagination="getList" />
-        :total="total"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
     </el-dialog>
     <el-dialog title="话术预览" :visible.sync="lookshow" width="90%">
-      <Scriptpreview
+      <Scriptpreview :phoneNodeContent="phoneNodeContent" v-if="lookshow"></Scriptpreview>
-        :phoneNodeContent="phoneNodeContent"
-        v-if="lookshow"
-      ></Scriptpreview>
-
       <span slot="footer" class="dialog-footer">
         <el-button type="primary" @click="lookshow = false">确 定</el-button>
       </span>
@@ -208,7 +76,6 @@
 
 <script>
 import Scriptpreview from ".././components/Scriptpreviewopen.vue";
-
 import {
   listScript,
   getScript,
@@ -221,9 +88,10 @@ import {
   listScriptNum,
 } from "@/api/manage/script";
 import stationAcatar from "../../system/stationAvatar/index.vue";
+import DepartmentList from '../../components/DepartmentList.vue'
 export default {
   props: ["templateId", "templateName"],
-  components: { stationAcatar, Scriptpreview },
+  components: { stationAcatar, Scriptpreview, DepartmentList },
   name: "Script",
   data() {
     return {
@@ -237,12 +105,6 @@ export default {
       handleselectName: "",
       handleselectId: "",
       classificationOpen: false,
-      itemname: null,
-      departmentName: null,
-      diseaseTypeName: null,
-      name: "",
-      departmentId: null,
-      count: "", //全部
       // 遮罩层
       loading: true,
       // 选中数组
@@ -257,12 +119,10 @@ export default {
       total: 0,
       // 话术信息表格数据
       scriptList: [],
-      DepartmentoList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
       open: false,
-      //分类管理
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -280,24 +140,16 @@ export default {
         scriptSort: null,
         scriptRemark: null,
       },
-      querydepartmen: {
-        departmentName: "",
-        // pageNum: 1,
-        // pageSize: 10,
-      },
     };
   },
   created() {
-    this.getList();
+    // this.getList();
   },
   mounted() {
     this.handleselectId = this.templateId;
     this.handleselectName = this.templateName;
   },
   watch: {
-    name(val) {
-      this.querydepartmen.departmentName = val;
-    },
     templateName(newValue, oldValue) {
       this.handleselectName = newValue;
     },
@@ -306,8 +158,18 @@ export default {
     },
   },
   methods: {
+    //接收科室列表传值
+    clickdepartment(item) {
+      this.queryParams.hospitalAgencyId = item.hospitalAgencyId
+      this.queryParams.hospitalAgencyName = item.hospitalAgencyName
+      this.queryParams.departmentId = item.itemid
+      this.queryParams.departmentName = item.itemName
+      if (item.hospitalAgencyId) {
+        this.getList();
+      }
+      this.$forceUpdate()
+    },
     handlesee(row) {
-      console.log(row, "eeeeee");
       if (row.flowScheme == null || row.flowScheme == "") {
         this.$message.error("暂无话术图");
       } else {
@@ -315,7 +177,6 @@ export default {
         this.lookshow = true;
       }
     },
-
     nohandleselect() {
       this.handleselectId = "";
       this.handleselectName = "";
@@ -339,37 +200,6 @@ export default {
     classificationOpenfalse() {
       this.classificationOpen = false;
     },
-    // 左侧科室
-    Departmentlist() {
-      this.loading = true;
-      this.querydepartmen.scriptStatus = "NORMAL";
-      listScriptNum(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();
-      }
-    },
     /** 查询话术信息列表 */
     getList() {
       this.loading = true;
@@ -388,7 +218,6 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.queryParams.departmentId = null;
-      this.itemname = null;
       this.queryParams = {
         pageNum: 1,
         pageSize: 10,
@@ -405,6 +234,7 @@ export default {
         scriptSort: null,
         scriptRemark: null,
       };
+      this.$refs.DepartmentList.resetQuery()
       this.resetForm("queryForm");
       this.getList();
     },

src/views/system/components/wangEditor.vue

@@ -1,42 +1,18 @@
 <template>
   <div style="border: 1px solid #ccc">
-    <Toolbar
+    <Toolbar style="border-bottom: 1px solid #ccc" :editor="editor" :defaultConfig="toolbarConfig" :mode="mode" />
-      style="border-bottom: 1px solid #ccc"
+    <Editor style="height: 500px; overflow-y: hidden;" v-model="html" :defaultConfig="editorConfig" :mode="mode"
-      :editor="editor"
+      @onChange="onChange" @onCreated="onCreated" @onFocus="handleFocus" />
-      :defaultConfig="toolbarConfig"
+    <el-dialog title="添加画像标签字段" :visible.sync="labelshow" width="40%" :before-close="beforeClose"
-      :mode="mode"
+      class="category-cascader-panel">
-    />
+      <el-cascader-panel :key="isResouceShow" :options="labeloptions" @change="panelchange" v-if="labelshow"
-    <Editor
+        ref="cascaderAddaddlist" v-model="selectedOptions" :props="{
-      style="height: 500px; overflow-y: hidden;"
-      v-model="html"
-      :defaultConfig="editorConfig"
-      :mode="mode"
-      @onChange="onChange"
-      @onCreated="onCreated"
-      @onFocus="handleFocus"
-    />
-    <el-dialog
-      title="添加画像标签字段"
-      :visible.sync="labelshow"
-      width="40%"
-      :before-close="beforeClose"
-      class="category-cascader-panel"
-    >
-      <el-cascader-panel
-        :key="isResouceShow"
-        :options="labeloptions"
-        @change="panelchange"
-        v-if="labelshow"
-        ref="cascaderAddaddlist"
-        v-model="selectedOptions"
-        :props="{
       value: 'value',
       label: 'label',
       children: 'children',
       checkStrictly: false,
       multiple: true,
-        }"
+    }"></el-cascader-panel>
-      ></el-cascader-panel>
       <div>
         <div style="margin: 20px 0">结果预览:</div>
         <div v-for="(item, index) of addlist" :key="index">
@@ -47,25 +23,15 @@
         <el-button @click="labelclick" type="primary">确定</el-button>
       </div>
     </el-dialog>
-    <el-dialog
+    <el-dialog title="添加知识库字段" :visible.sync="fieldshow" width="50%" :before-close="beforeClose"
-      title="添加知识库字段"
+      class="category-cascader-panel">
-      :visible.sync="fieldshow"
+      <el-cascader-panel :options="fieldoptions" @change="handleChange($event)" :props="{
-      width="50%"
-      :before-close="beforeClose"
-      class="category-cascader-panel"
-    >
-      <el-cascader-panel
-        :options="fieldoptions"
-        @change="handleChange($event)"
-        :props="{
       value: 'termCode',
       label: 'termContent',
       children: 'children',
       checkStrictly: false,
       multiple: true,
-        }"
+    }" ref="cascaderAddr">
-        ref="cascaderAddr"
-      >
       </el-cascader-panel>
 
       <div style="margin: 20px 0">结果预览:</div>
@@ -252,6 +218,7 @@ export default {
           this.editor.deleteBackward();
         }
         this.addlist.forEach((e) => {
+          this.editor.insertText('           ')
           const resume = {
             // JS 语法
             type: "attachment",
@@ -262,18 +229,18 @@ export default {
             children: [{ text: "" }], // void 元素必须有一个 children ，其中只有一个空字符串，重要！！！
           };
           this.editor.insertNode(resume);
+          this.editor.insertText('           ')
+          this.editor.focus();
         });
         ++this.isResouceShow;
         this.selectedOptions = [];
         this.addlist = [];
-        console.log(this.html,'this.html')
-     
         setTimeout(() => {
-          console.log(22222222)
+          console.log(this.html, 'this.html')
           this.editor.focus({ toEnd: true });
           // this.editor.focus();
           this.$forceUpdate()
-      }, 30);
+        }, 100);
       }, 100);
     },
     fieldclick() {
@@ -569,6 +536,7 @@ function renderAttachment(elem, children, editor) {
       props: { contentEditable: false }, // HTML 属性，驼峰式写法
       style: {
         color: "#22343C",
+        margin: "0 0 0 0",
         background: "#E5F5F2",
         padding: "5px 10px" /* 其他... */,
       }, // style ，驼峰式写法
@@ -585,7 +553,7 @@ function renderAttachment(elem, children, editor) {
       props: { contentEditable: false }, // HTML 属性，驼峰式写法
       style: {
         color: "#fff",
-        margin: "0 0 0 20px",
+        margin: "0 0 0 0",
         background: "#009A82",
         padding: "5px 10px" /* 其他... */,
       }, // style ，驼峰式写法
@@ -839,8 +807,10 @@ Boot.registerModule(parseHtmlConfmodule);
 <style lang="scss">
 .category-cascader-panel {
   .el-cascader-panel {
+
     // background-color: red !important;
     .el-scrollbar:first-child {
+
       // li[aria-haspopup="true"] {
       .el-checkbox {
         display: none !important;
@@ -848,6 +818,7 @@ Boot.registerModule(parseHtmlConfmodule);
     }
   }
 }
+
 ::v-deep .el-textarea__inner {
   color: black !important;
   background-color: #fff !important;
@@ -860,10 +831,11 @@ Boot.registerModule(parseHtmlConfmodule);
   border-radius: 5px;
   margin-left: 20px;
 }
+
 .finame {
-margin-left: 20px
+  margin-left: 20px;
-;
 }
+
 ::v-deep .el-textarea__inner {
   color: black !important;
   background-color: #fff !important;
@@ -886,8 +858,7 @@ margin-left: 20px
 //   font-size: 18px;
 //   line-height: 32px;
 //   border-radius: 5px;
-// }
+// }</style>
-</style>
 // ::v-deep .el-textarea__inner {
 // color: black !important;
 // background-color: #fff !important;