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

src/views/components/SearchForm.vue

@@ -24,7 +24,7 @@ export default {
     props: {
         labelWidth: {
             type: String,
-            default: '80px',
+            default: '85px',
         },
         widths: {
             type: Number,

src/views/manage/blacklist/index.vue

@@ -1,7 +1,8 @@
 <template>
   <div class="app-container" ref="layout">
     <div ref="topform" class="form">
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="70px">
+      <SearchFilter :labelWidths="280" style="width: calc(100% - 80px);" size="mini" @search="handleQuery"
+        @reset="resetQuery" @minShowCtrol="getMaxTableHeight">
         <el-form-item label="姓名" prop="patientName">
           <el-input v-model="queryParams.patientName" placeholder="请输入患者姓名" clearable
             @keyup.enter.native="handleQuery" />
@@ -45,11 +46,8 @@
             :value="dict.value" />
         </el-select>
       </el-form-item> -->
-        <el-form-item>
+
-          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+      </SearchFilter>
-          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-        </el-form-item>
-      </el-form>
     </div>
     <div ref="mb8" class="mb8">
       <el-row :gutter="10" class="">
@@ -176,10 +174,14 @@
 <script>
 import { listBlacklist, getBlacklist, delBlacklist, addBlacklist, updateBlacklist, causegetlist } from "@/api/manage/blacklist";
 import { selectAgencyList, getDepartmentList, getAgencyList } from "@/api/manage/selectAgencyList";
+import SearchFilter from '../../components/SearchForm.vue'
+
 
 export default {
   name: "Blacklist",
   dicts: ['blacklist_source'],
+  components: { SearchFilter },
+
   data() {
     //验证身份证
     var isCardId = (rule, value, callback) => {
@@ -337,7 +339,11 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10
+      }
+      // this.resetForm("queryForm");
       this.handleQuery();
     },
     // 多选框选中数据

src/views/manage/labelfieldinfo/index.vue

@@ -515,6 +515,7 @@
       append-to-body
       :before-close="innerVisiblecancel"
     >
+    <div style="padding-bottom: 23px;">
       <el-form
         :model="queryParamstask"
         ref="queryForm"
@@ -614,9 +615,8 @@
           :show-overflow-tooltip="true"
         />
       </el-table>
-      <!-- <pagination class="pag" v-show="totaltask > 0" :total="totaltask" :page.sync="queryParamstask.pageNum"
+    </div>
-        :limit.sync="queryParamstask.pageSize" @pagination="getListpartit" />
+       <div>
-       -->
       <myPagination
         v-show="totaltask > 0"
         :total="totaltask"
@@ -624,6 +624,7 @@
         :indexFromWrap="queryParamstask.pageNum"
         @updateCPage="updateCPagetwo"
       ></myPagination>
+    </div>
     </el-dialog>
     <!-- 任务类型 -->
     <el-dialog
@@ -633,6 +634,7 @@
       append-to-body
       :before-close="typeecancel"
     >
+    <div style="padding-bottom: 23px;">
       <el-form
         :model="queryType"
         ref="queryForm"
@@ -708,6 +710,7 @@
           :show-overflow-tooltip="true"
         />
       </el-table>
+    </div>
       <myPagination
         v-show="totaltype > 0"
         :total="totaltype"

src/views/manage/manualReview/index.vue

@@ -6,7 +6,8 @@
       <el-tab-pane label="已忽略" name="DISAGREE"></el-tab-pane>
     </el-tabs>
     <div ref="topform" class="form">
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="80px">
+      <SearchFilter :labelWidths="280" style="width: calc(100% - 80px);" size="mini" @search="handleQuery"
+        @reset="resetQuery" @minShowCtrol="getMaxTableHeight">
         <el-form-item label="患者姓名" prop="patientName">
           <el-input v-model="queryParams.patientName" placeholder="请输入患者姓名" clearable @keyup.enter.native="handleQuery"
             style="width: 200px" />
@@ -57,11 +58,8 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item>
+     
-          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+      </SearchFilter>
-          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-        </el-form-item>
-      </el-form>
     </div>
     <div ref="table">
       <el-table :max-height="maxTableHeight" v-loading="loading" :data="patientInfoList">
@@ -130,9 +128,12 @@ import {
   getAgencyList,
 } from "@/api/manage/selectAgencyList";
 import { usergetList } from "@/api/unitconfig/patientConfiguration";
+import SearchFilter from '../../components/SearchForm.vue'
+
 export default {
   name: "manualReview",
   dicts: ["patient_type", "visit_method", "sign_status", "patient_source"],
+  components: { SearchFilter },
   data() {
     return {
       maxTableHeight: undefined,
@@ -293,16 +294,42 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      // 未审核
+      if(this.queryParams.routeCheckStatus == "UNAUDITED"){
+        this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+       routeCheckStatus:'UNAUDITED',
+       serviceStatus:'SERVICE_CENTER',
+
+      }
+      }else if(this.queryParams.routeCheckStatus == "AGREE"){//已审核
+        this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+       routeCheckStatus:'AGREE',
+       serviceStatus:'SERVICE_CENTER',
+
+      }
+      }else if(this.queryParams.routeCheckStatus == "DISAGREE"){//易忽略
+        this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+       routeCheckStatus:'DISAGREE',
+       serviceStatus:'SERVICE_CENTER',
+
+      }
+      }
       this.signTime = [];
       this.admissionTime = [];
-      this.queryParams.signTimeStart = null;
+      // this.queryParams.signTimeStart = null;
-      this.queryParams.signTimeEnd = null;
+      // this.queryParams.signTimeEnd = null;
-      this.queryParams.admissionTimeStart = null;
+      // this.queryParams.admissionTimeStart = null;
-      this.queryParams.admissionTimeEnd = null;
+      // this.queryParams.admissionTimeEnd = null;
       this.dischargeTime = [];
-      this.queryParams.dischargeTimeStart = null;
+      // this.queryParams.dischargeTimeStart = null;
-      this.queryParams.dischargeTimeEnd = null;
+      // this.queryParams.dischargeTimeEnd = null;
-      this.resetForm("queryForm");
+
       this.handleQuery();
     },
     selectAgencyinfo() {

src/views/manage/preHospitalized/index.vue

@@ -1,7 +1,9 @@
 <template>
   <div class="app-container" ref="layout">
     <div ref="topform" class="form">
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
+      <SearchFilter :labelWidths="280" style="width: calc(100% - 80px);"  size="mini" @search="handleQuery"
+        @reset="resetQuery" @minShowCtrol="getMaxTableHeight" v-show="showSearch">
+      <!-- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px"> -->
         <el-form-item label="患者姓名" prop="patientName">
           <el-input v-model="queryParams.patientName" placeholder="请输入患者姓名" clearable @keyup.enter.native="handleQuery"
             style="width: 200px" />
@@ -34,7 +36,7 @@
         <el-input v-model="queryParams.mainDiagnosis" placeholder="请选择诊断" clearable style="width:200px"
           @keyup.enter.native="handleQuery" />
       </el-form-item> -->
-        <el-form-item label="预约治疗组" prop="appointmentTreatmentGroup">
+        <el-form-item label="预约治疗组" prop="appointmentTreatmentGroup" >
           <el-input v-model="queryParams.appointmentTreatmentGroup" placeholder="请输入预约治疗组" clearable
             style="width: 200px" @keyup.enter.native="handleQuery" />
         </el-form-item>
@@ -102,11 +104,13 @@
           <el-option v-for="dict in dict.type.patient_type" :key="dict.value" :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item> -->
-        <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>
-        </el-form-item>
+        </el-form-item> -->
-      </el-form>
+      <!-- </el-form> -->
+    </SearchFilter>
+
     </div>
     <div ref="mb8" class="mb8">
       <el-row :gutter="10" class="">
@@ -466,6 +470,7 @@
 </template>
 
 <script>
+import SearchFilter from '../../components/SearchForm.vue'
 import { usergetList } from "@/api/unitconfig/patientConfiguration";
 import { listPatientInfo, getPatientInfo, delPatientInfo, addPatientInfo, updatePatientInfo, saveRecord } from "@/api/manage/preHospitalized";
 import { getAge } from "@/utils/age";
@@ -475,6 +480,7 @@ import { getToken } from '@/utils/auth'
 export default {
   name: "preHospitalized",
   dicts: ['patient_type', 'visit_method', 'sign_status', 'patient_source'],
+  components: { SearchFilter },
   data() {
     return {
       maxTableHeight: undefined,
@@ -780,10 +786,14 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10
+      }
       this.appointmentDate = []
       this.queryParams.appointmentDateStart = ''
       this.queryParams.appointmentDateEnd = ''
-      this.resetForm("queryForm");
+      // this.resetForm("queryForm");
       this.handleQuery();
     },
     // 多选框选中数据

src/views/manage/visitin/index.vue

@@ -1,7 +1,9 @@
 <template>
   <div class="app-container" ref="layout">
     <div ref="topform" class="form">
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
+      <SearchFilter :labelWidths="280" style="width: calc(100% - 80px);"  size="mini" @search="handleQuery"
+        @reset="resetQuery" @minShowCtrol="getMaxTableHeight" v-show="showSearch">
+      <!-- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px"> -->
         <el-form-item label="患者姓名" prop="patientName">
           <el-input v-model="queryParams.patientName" placeholder="请输入患者姓名" clearable @keyup.enter.native="handleQuery"
             style="width: 200px" />
@@ -100,11 +102,13 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <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>
-        </el-form-item>
+        </el-form-item> -->
-      </el-form>
+      <!-- </el-form> -->
+    </SearchFilter>
+
     </div>
     <div ref="mb8" class="mb8">
       <el-row :gutter="10" class="">
@@ -484,6 +488,7 @@
 </template>
 
 <script>
+import SearchFilter from '../../components/SearchForm.vue'
 import { usergetList } from "@/api/unitconfig/patientConfiguration";
 import { listPatientInfo, delPatientInfo } from "@/api/manage/patientInfo";
 import { addPatientInfo, updatePatientInfo, getPatientInfo, updateRecord } from "@/api/manage/visit";
@@ -494,6 +499,7 @@ import { getToken } from '@/utils/auth'
 export default {
   name: "visitin",
   dicts: ['patient_type', 'visit_method', 'sign_status', 'patient_source'],
+  components: { SearchFilter },
   data() {
     return {
       maxTableHeight: undefined,
@@ -855,10 +861,14 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10
+      }
       this.admissionTime = []
       this.queryParams.admissionTimeStart = ''
       this.queryParams.admissionTimeEnd = ''
-      this.resetForm("queryForm");
+      // this.resetForm("queryForm");
       this.handleQuery();
     },
     // 多选框选中数据

src/views/manage/visitout/index.vue

@@ -1,7 +1,9 @@
 <template>
   <div class="app-container" ref="layout">
     <div ref="topform" class="form">
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
+      <SearchFilter :labelWidths="280" style="width: calc(100% - 80px);"  size="mini" @search="handleQuery"
+        @reset="resetQuery" @minShowCtrol="getMaxTableHeight" v-show="showSearch">
+      <!-- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px"> -->
         <el-form-item label="患者姓名" prop="patientName">
           <el-input v-model="queryParams.patientName" placeholder="请输入患者姓名" clearable @keyup.enter.native="handleQuery"
             style="width:200px" />
@@ -10,11 +12,7 @@
           <el-input v-model="queryParams.patientPhone" placeholder="请输入患者电话" clearable @keyup.enter.native="handleQuery"
             style="width:200px" />
         </el-form-item>
-        <el-form-item label="门诊/出院时间" prop="dischargeTimeStart" label-width="120px">
+       
-          <el-date-picker v-model="dischargeTime" type="daterange" range-separator="至" start-placeholder="开始日期"
-            style="width:300px" value-format="yyyy-MM-dd" end-placeholder="结束日期">
-          </el-date-picker>
-        </el-form-item>
         <!-- <el-form-item label="入院时间" prop="admissionTime">
         <el-date-picker v-model="queryParams.admissionTime" value-format="yyyy-MM-dd" style="width:300px" type="daterange"
           range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
@@ -29,6 +27,11 @@
           <el-input v-model="queryParams.mainDiagnosis" placeholder="请选择诊断" clearable style="width:200px"
             @keyup.enter.native="handleQuery" />
         </el-form-item>
+        <el-form-item label="门诊/出院时间" prop="dischargeTimeStart" label-width="120px">
+          <el-date-picker v-model="dischargeTime" type="daterange" range-separator="至" start-placeholder="开始日期"
+            style="width:300px" value-format="yyyy-MM-dd" end-placeholder="结束日期">
+          </el-date-picker>
+        </el-form-item>
         <el-form-item label="就诊流水号" prop="visitSerialNumber">
           <el-input v-model="queryParams.visitSerialNumber" placeholder="请输入就诊流水号" style="width:200px" />
         </el-form-item>
@@ -98,11 +101,13 @@
         <el-input v-model="queryParams.dischargeMethod" placeholder="请输入出院方式" clearable style="width:200px"
           @keyup.enter.native="handleQuery" />
       </el-form-item> -->
-        <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>
         </el-form-item>
-      </el-form>
+      </el-form> -->
+    </SearchFilter>
+
     </div>
     <div ref="mb8" class="mb8">
       <el-row :gutter="10" class="">
@@ -449,6 +454,7 @@
 </template>
 
 <script>
+import SearchFilter from '../../components/SearchForm.vue'
 import { listPatientInfo, delPatientInfo } from "@/api/manage/patientInfo";
 import { addPatientInfo, updatePatientInfo, getPatientInfo, intentionalSign } from "@/api/manage/visit";
 import { getAge } from "@/utils/age";
@@ -459,6 +465,7 @@ import { usergetList } from "@/api/unitconfig/patientConfiguration";
 export default {
   name: "visitout",
   dicts: ['patient_type', 'visit_method', 'sign_status', 'patient_source'],
+  components: { SearchFilter },
   data() {
     return {
       maxTableHeight: undefined,
@@ -759,6 +766,10 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10
+      }
       this.dischargeTime = []
       this.queryParams.dischargeTimeStart = ''
       this.queryParams.dischargeTimeEnd = ''

src/views/system/ManuallyCreatingTasks/index.vue

@@ -623,27 +623,36 @@ export default {
     messageontemplateMESSAGE(item) {
       this.formInline.phoneMessageTemplateId = item.templateId;
       this.formInline.phoneMessageTemplateName = item.templateName;
+      this.list[this.listindex].messageTemplateCode=item.messageTemplateCode
+
     },
     messageontemplateMESSAGEtwo(item) {
       this.formInline.messageTemplateId = item.templateId;
       this.formInline.messageTemplateName = item.templateName;
+      this.list[this.listindex].messageTemplateCode=item.messageTemplateCode
+
     },
     // 话术
     messageontemplateword(item) {
       this.formInline.phoneId = item.templateId;
       this.formInline.phoneTemplateName = item.templateName;
+      this.list[this.listindex].scriptInfoId=item.scriptInfoId
+      this.list[this.listindex].phoneTemplateId=item.phoneTemplateId
     },
     //公众号传值
     officialAccountontemplate(item) {
       this.formInline.officialTemplateId = item.templateId;
       this.formInline.officialTemplateName = item.templateName;
       this.formInline.officialRemindContent = item.templateContent;
+      this.list[this.listindex].officialTemplateCode=item.officialTemplateCode
+
     },
     //小程序传值
     miniProgramtemplate(item) {
       this.formInline.appletTemplateId = item.templateId;
       this.formInline.appletTemplateName = item.templateName;
       this.formInline.appletRemindContent = item.templateContent;
+      this.list[this.listindex].appletTemplateCode=item.appletTemplateCode
     },
     clicktimelineitem(item, index) {
       this.formInline = item;
@@ -690,22 +699,6 @@ export default {
         cancelButtonText: '取消',
       }).then(() => {
         this.updata.routeNodeList = this.list;
-        // this.updata.routeNodeList.forEach((el) => {
-        //   if (el.phoneDialMethod == "COMMON" && el.questionInfoId) {
-        //     el.templateType = "QUESTIONNAIRE";
-        //   } else if (el.phoneDialMethod == "COMMON" && el.phoneId) {
-        //     el.templateType = "SCRIPT";
-        //   } else if (el.phoneDialMethod == "AI" && el.phoneId) {
-        //     el.templateType = "SCRIPT";
-        //   }
-        // });
-        // this.updata.triggerConditionList.forEach((e) => {
-        //   e.routeId = this.$route.query.id;
-        //   e.routeName = this.$route.query.routeName;
-        //   delete e.optionstriggerConditionOperator
-        // });
-        // delete this.updata.triggerConditionList.optionstriggerConditionOperator
-        // return
         signrouteadd(this.updata).then((res) => {
           this.$notify({
             type: "success",
@@ -748,6 +741,10 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+::v-deep .el-form--inline .el-form-item__label{
+  display: inline-block !important;
+  float: inline-start !important;
+}
 .titlemengt {
   width: 98.5%;
   border-radius: 10px;

src/views/system/components/message.vue

@@ -156,6 +156,7 @@ export default {
         templateId: "",
         templateName: "",
         templateContent: "",
+        messageTemplateCode:"",
       });
     },
     handleselect(item) {
@@ -165,6 +166,7 @@ export default {
         templateId: item.id,
         templateName: item.textMessageName,
         templateContent: item.templateContent,
+        messageTemplateCode:item.messageTemplateCode
       });
       this.classificationOpen = false;
     },

src/views/system/components/miniProgram.vue

@@ -164,6 +164,8 @@ export default {
         templateId: "",
         templateName: "",
         templateContent: "",
+        appletTemplateCode:""
+
       });
     },
     handleselect(item) {
@@ -173,6 +175,9 @@ export default {
         templateId: item.id,
         templateName: item.wechatTemplateName,
         templateContent: item.textMessageContent,
+        appletTemplateCode:item.appletTemplateCode
+
+
       });
       this.classificationOpen = false;
     },

src/views/system/components/officialAccount.vue

@@ -1,244 +1,345 @@
 <template>
-    <div class="app-container">
+  <div class="app-container">
-        <el-button size="small" @click="classificationOpen = true"
+    <el-button
-            style="width: 200px;font-size:14px;text-align:left;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;"
+      size="small"
-            :style="handleselectName ? 'color:black' : 'color:#C0C4CC'">{{ handleselectName ? handleselectName :
+      @click="classificationOpen = true"
-                '选择公众号模板' }}</el-button>
+      style="
-        <el-dialog title="公众号模板选择" :visible.sync="classificationOpen" width="70%"
+        width: 200px;
-            :before-close="classificationOpenfalse">
+        font-size: 14px;
-            <el-row :gutter="20">
+        text-align: left;
-                <!--部门数据-->
+        white-space: nowrap;
-                <el-col :span="6" :xs="24">
+        text-overflow: ellipsis;
-                    <DepartmentList ref="DepartmentList" :modal="false" @clickdepartment="clickdepartment"
+        overflow: hidden;
-                        :methods="'listWechatTemplateNumtwo'">
+      "
-                    </DepartmentList>
+      :style="handleselectName ? 'color:black' : 'color:#C0C4CC'"
-                </el-col>
+      >{{ handleselectName ? handleselectName : "选择公众号模板" }}</el-button
-                <!--用户数据-->
+    >
-                <el-col :span="18" :xs="24">
+    <el-dialog
-                    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+      title="公众号模板选择"
-                        label-width="68px">
+      :visible.sync="classificationOpen"
-                        <el-form-item label="微信模版名称" prop="wechatTemplateName" label-width="100px">
+      width="70%"
-                            <el-input v-model="queryParams.wechatTemplateName" placeholder="请输入模版名称" clearable
+      :before-close="classificationOpenfalse"
-                                @keyup.enter.native="handleQuery" />
+    >
-                        </el-form-item>
+      <el-row :gutter="20">
-                        <el-form-item label="模板ID" prop="templateId">
+        <!--部门数据-->
-                            <el-input v-model="queryParams.templateId" placeholder="请输入模板ID" clearable
+        <el-col :span="6" :xs="24">
-                                @keyup.enter.native="handleQuery" />
+          <DepartmentList
-                        </el-form-item>
+            ref="DepartmentList"
-                        <el-form-item>
+            :modal="false"
-                            <el-button type="primary" icon="el-icon-search" size="mini"
+            @clickdepartment="clickdepartment"
-                                @click="handleQuery">搜索</el-button>
+            :methods="'listWechatTemplateNumtwo'"
-                            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          >
-                        </el-form-item>
+          </DepartmentList>
-                    </el-form>
+        </el-col>
-                    <el-table v-loading="loading" :data="templateList" @row-dblclick="handleselect">
+        <!--用户数据-->
-                        <el-table-column type="index" width="55" align="center" label="序号" />
+        <el-col :span="18" :xs="24">
-                        <el-table-column label="微信模版名称" align="center" prop="wechatTemplateName" />
+          <el-form
-                        <el-table-column label="模板ID" align="center" prop="templateId" />
+            :model="queryParams"
-                        <el-table-column label="模板来源" align="center" prop="templateSource">
+            ref="queryForm"
-                            <template slot-scope="scope">
+            size="small"
-                                {{ scope.row.templateSource == "WE_CHAT_APPLET" ? "小程序" : "" }}
+            :inline="true"
-                                {{ scope.row.templateSource == "WE_CHAT_OFFICIAL_ACCOUNT" ? "公众号" : "" }}
+            v-show="showSearch"
-                            </template>
+            label-width="68px"
-                        </el-table-column>
+          >
-                        <el-table-column label="适用任务类型" align="center" prop="suitTaskTypeName"
+            <el-form-item
-                            :show-overflow-tooltip="true" />
+              label="微信模版名称"
-                        <el-table-column label="病种名称" align="center" prop="diseaseTypeName" />
+              prop="wechatTemplateName"
-                        <el-table-column label="模板内容" align="center" prop="templateContent" />
+              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
+                v-model="queryParams.templateId"
+                placeholder="请输入模板ID"
+                clearable
+                @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
+              >
+            </el-form-item>
+          </el-form>
+          <el-table
+            v-loading="loading"
+            :data="templateList"
+            @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
+              label="模板来源"
+              align="center"
+              prop="templateSource"
+            >
+              <template slot-scope="scope">
+                {{
+                  scope.row.templateSource == "WE_CHAT_APPLET" ? "小程序" : ""
+                }}
+                {{
+                  scope.row.templateSource == "WE_CHAT_OFFICIAL_ACCOUNT"
+                    ? "公众号"
+                    : ""
+                }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="适用任务类型"
+              align="center"
+              prop="suitTaskTypeName"
+              :show-overflow-tooltip="true"
+            />
+            <el-table-column
+              label="病种名称"
+              align="center"
+              prop="diseaseTypeName"
+            />
+            <el-table-column
+              label="模板内容"
+              align="center"
+              prop="templateContent"
+            />
 
-
+            <el-table-column
-                        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+              label="操作"
-                            <template slot-scope="scope">
+              align="center"
-                                <el-button size="mini" type="text" @click="handleselect(scope.row)"
+              class-name="small-padding fixed-width"
-                                    v-if="handleselectId != scope.row.templateId">选择</el-button>
+            >
-                                <el-button size="mini" type="text" @click="nohandleselect(scope.row)"
+              <template slot-scope="scope">
-                                    v-if="handleselectId == scope.row.templateId">取消选择</el-button>
+                <el-button
-                            </template>
+                  size="mini"
-                        </el-table-column>
+                  type="text"
-                    </el-table>
+                  @click="handleselect(scope.row)"
-                </el-col>
+                  v-if="handleselectId != scope.row.templateId"
-            </el-row>
+                  >选择</el-button
-            <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+                >
-                :limit.sync="queryParams.pageSize" @pagination="getList" />
+                <el-button
-        </el-dialog>
+                  size="mini"
-    </div>
+                  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
+        v-show="total > 0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
+    </el-dialog>
+  </div>
 </template>
 
 <script>
 import { listTemplate, getTemplate, delTemplate, addTemplate, updateTemplate, listWechatTemplateNum, typelist } from "@/api/manage/template";
 import DepartmentList from '../../components/DepartmentList.vue'
 export default {
-    props: ['templateId', 'templateName'],
+  props: ['templateId', 'templateName'],
-    name: "officialAccount",
+  name: "officialAccount",
-    components: {
+  components: {
-        DepartmentList
+    DepartmentList
+  },
+  data() {
+    return {
+      handleselectName: '',
+      handleselectId: '',
+      classificationOpen: false,
+      // 遮罩层
+      loading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 微信模板信息表格数据
+      templateList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        wechatTemplateName: null,
+        departmentId: null,
+        departmentName: null,
+        diseaseTypeId: null,
+        diseaseTypeName: null,
+        templateId: null,
+        templateContent: null,
+        templateSource: null,
+        templateSort: null,
+        templateRemark: null,
+      },
+    };
+  },
+  watch: {
+    templateId(newValue, oldValue) {
+      this.handleselectId = newValue;
     },
-    data() {
+    templateName(newValue, oldValue) {
-        return {
+      this.handleselectName = newValue;
-            handleselectName: '',
-            handleselectId: '',
-            classificationOpen: false,
-            // 遮罩层
-            loading: false,
-            // 选中数组
-            ids: [],
-            // 非单个禁用
-            single: true,
-            // 非多个禁用
-            multiple: true,
-            // 显示搜索条件
-            showSearch: true,
-            // 总条数
-            total: 0,
-            // 微信模板信息表格数据
-            templateList: [],
-            // 弹出层标题
-            title: "",
-            // 是否显示弹出层
-            open: false,
-            // 查询参数
-            queryParams: {
-                pageNum: 1,
-                pageSize: 10,
-                wechatTemplateName: null,
-                departmentId: null,
-                departmentName: null,
-                diseaseTypeId: null,
-                diseaseTypeName: null,
-                templateId: null,
-                templateContent: null,
-                templateSource: null,
-                templateSort: null,
-                templateRemark: null,
-            },
-        };
-    },
-    watch: {
-        templateId(newValue, oldValue) {
-            this.handleselectId = newValue;
-        },
-        templateName(newValue, oldValue) {
-            this.handleselectName = newValue;
-        }
-    },
-    mounted() {
-        this.handleselectId = this.templateId;
-        this.handleselectName = this.templateName;
-    },
-    created() {
-        // 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.handleQuery();
-            }
-            this.$forceUpdate()
-        },
-        classificationOpenfalse() {
-            this.classificationOpen = false
-        },
-        nohandleselect() {
-            this.handleselectId = ''
-            this.handleselectName = ''
-            this.$emit("on-template", { templateId: '', templateName: '', templateContent: "" });
-        },
-        handleselect(item) {
-            this.handleselectId = item.id
-            this.handleselectName = item.wechatTemplateName
-            this.$emit("on-template", { templateId: item.id, templateName: item.wechatTemplateName, templateContent: item.textMessageContent });
-            this.classificationOpen = false
-        },
-        /** 查询微信模板信息列表 */
-        getList() {
-            this.loading = true;
-            this.queryParams.templateSource = "WE_CHAT_OFFICIAL_ACCOUNT"
-            listTemplate(this.queryParams).then(response => {
-                console.log(response.rows)
-                this.templateList = response.rows;
-                this.total = response.total;
-                this.loading = false;
-            });
-        },
-        /** 搜索按钮操作 */
-        handleQuery() {
-            this.queryParams.pageNum = 1;
-            this.getList();
-        },
-        /** 重置按钮操作 */
-        resetQuery() {
-            this.queryParams.departmentId = null;
-            this.resetForm("queryForm");
-            this.$refs.DepartmentList.resetQuery()
-            // this.handleQuery();
-        },
     }
+  },
+  mounted() {
+    this.handleselectId = this.templateId;
+    this.handleselectName = this.templateName;
+  },
+  created() {
+    // 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.handleQuery();
+      }
+      this.$forceUpdate()
+    },
+    classificationOpenfalse() {
+      this.classificationOpen = false
+    },
+    nohandleselect() {
+      this.handleselectId = ''
+      this.handleselectName = ''
+      this.$emit("on-template", { templateId: '', templateName: '', templateContent: "",officialTemplateCode:"" });
+    },
+    handleselect(item) {
+      this.handleselectId = item.id
+      this.handleselectName = item.wechatTemplateName
+      this.$emit("on-template", { 
+        templateId: item.id,
+         templateName: item.wechatTemplateName, 
+         templateContent: item.textMessageContent,
+         officialTemplateCode: item.officialTemplateCode,
+        });
+      this.classificationOpen = false
+    },
+    /** 查询微信模板信息列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.templateSource = "WE_CHAT_OFFICIAL_ACCOUNT"
+      listTemplate(this.queryParams).then(response => {
+        console.log(response.rows)
+        this.templateList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.queryParams.departmentId = null;
+      this.resetForm("queryForm");
+      this.$refs.DepartmentList.resetQuery()
+      // this.handleQuery();
+    },
+  }
 };
 </script>
 <style lang="scss" scoped>
 ::v-deep .el-input-number .el-input__inner {
-    text-align: left;
+  text-align: left;
 }
 
 ::v-deep .el-dialog__body {
-    padding-bottom: 60px;
+  padding-bottom: 60px;
 }
 
 .app-container {
-    display: inline-block;
+  display: inline-block;
-    padding: 0 !important;
+  padding: 0 !important;
-    height: 42px;
+  height: 42px;
 }
 
 .left {
-    height: 530px;
+  height: 530px;
-    overflow: auto;
+  overflow: auto;
 
-    .name {
+  .name {
-        font-weight: 700;
+    font-weight: 700;
-        margin-bottom: 10px;
+    margin-bottom: 10px;
+  }
+
+  .listitem {
+    width: 100%;
+    height: 50px;
+    border-bottom: 1px solid #dcdfe6;
+    position: relative;
+
+    .count {
+      display: inline-block;
+      position: absolute;
+      left: 210px;
+      color: #a4a6aa;
+      top: 10px;
+      font-size: 13px;
     }
 
-    .listitem {
+    .all {
-        width: 100%;
+      height: 50px;
-        height: 50px;
+      line-height: 50px;
-        border-bottom: 1px solid #dcdfe6;
+      padding-left: 13px;
-        position: relative;
-
-        .count {
-            display: inline-block;
-            position: absolute;
-            left: 210px;
-            color: #a4a6aa;
-            top: 10px;
-            font-size: 13px;
-        }
-
-        .all {
-            height: 50px;
-            line-height: 50px;
-            padding-left: 13px;
-        }
-
-        .allactive {
-            background: #e8f4ff;
-            height: 50px;
-            line-height: 50px;
-            padding-left: 13px;
-            border-left: 3px solid #4d9de7;
-        }
     }
+
+    .allactive {
+      background: #e8f4ff;
+      height: 50px;
+      line-height: 50px;
+      padding-left: 13px;
+      border-left: 3px solid #4d9de7;
+    }
+  }
 }
 
 .button {
-    display: inline-block;
+  display: inline-block;
-    position: relative;
+  position: relative;
-    left: 20px;
+  left: 20px;
-    top: -11px;
+  top: -11px;
 }
 </style>

src/views/system/components/script.vue

@@ -9,7 +9,7 @@
         overflow: hidden;
       " :style="handleselectName ? 'color:black' : 'color:#C0C4CC'">{{ 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">
@@ -184,6 +184,8 @@ export default {
         templateId: "",
         templateName: "",
         templateContent: "",
+        scriptInfoId:'',
+        phoneTemplateId:'',
       });
     },
     handleselect(item) {

src/views/system/followup/index.vue

@@ -9,13 +9,8 @@
       <el-tab-pane label="已执行" name="EXECUTED"></el-tab-pane>
     </el-tabs>
     <div ref="topform" class="form">
-      <el-form
+      <SearchFilter :labelWidths="280" style="width: calc(100% - 80px);" size="mini" @search="handleQuery"
-        :model="queryParams"
+        @reset="resetQuery" @minShowCtrol="getMaxTableHeight">
-        ref="queryForm"
-        size="small"
-        :inline="true"
-        v-show="showSearch"
-      >
         <el-form-item label="执行时间" prop="startDate">
           <el-date-picker
             v-model="intentionalTime"
@@ -206,20 +201,7 @@
             @change="changeswitch"
           />
         </el-form-item>
-
+      </SearchFilter>
-        <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
-          >
-        </el-form-item>
-      </el-form>
     </div>
     <div ref="table">
       <el-table
@@ -484,9 +466,12 @@ import { manualFollowUpList } from "@/api/system/followup";
 import { usergetList } from "@/api/unitconfig/patientConfiguration";
 import { getAge } from "@/utils/age";
 import { selectAgencyList, getAgencyList } from "@/api/manage/selectAgencyList";
+import SearchFilter from '../../components/SearchForm.vue'
+
 export default {
   name: "Followup22",
   dicts: ["visit_method"],
+  components:{SearchFilter},
 
   data() {
     return {
@@ -532,6 +517,8 @@ export default {
         pageSize: 10,
         timeSign: "TODAY",
         nodeExecuteStatus: "UNEXECUTED",
+        patientPhone:null,
+        
         followStartTime: null,
         followEndTime: null,
         clinicalStartTime: null,

src/views/system/taskExecuteRecord/index.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="app-container" ref="layout">
     <div ref="topform" class="form">
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px"
+      <SearchFilter :labelWidths="280" style="width: calc(100% - 80px);" size="mini" @search="handleQuery"
-        class="form">
+        @reset="resetQuery" @minShowCtrol="getMaxTableHeight">
         <el-form-item label="执行时间" prop="startDate" label-width="110px">
           <el-date-picker v-model="intentionalTime" @change="pickerChangeFn" type="daterange" range-separator="至"
             start-placeholder="开始日期" style="width: 300px" value-format="yyyy-MM-dd" clearable end-placeholder="结束日期">
@@ -33,11 +33,7 @@
           <el-input v-model="queryParams.manageRouteName" placeholder="请输入任务名称" clearable style="width: 200px"
             @keyup.enter.native="handleQuery" />
         </el-form-item>
-        <el-form-item>
+      </SearchFilter>
-          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-        </el-form-item>
-      </el-form>
     </div>
     <div ref="table">
       <el-table v-loading="loading" :data="taskExecuteRecordList" @selection-change="handleSelectionChange"
@@ -142,9 +138,12 @@ import {
 } from "@/api/system/taskExecuteRecord";
 import { getAge } from "@/utils/age";
 import { selectAgencyList } from "@/api/manage/selectAgencyList";
+import SearchFilter from '../../components/SearchForm.vue'
+
 export default {
   name: "TaskExecuteRecord",
   dicts: ["visit_method"],
+  components: { SearchFilter },
   data() {
     return {
       maxTableHeight: undefined,
@@ -306,10 +305,11 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+      }
       this.intentionalTime = [];
-      this.queryParams.startDate = null;
-      this.queryParams.endDate = null;
       this.getList();
     },
     // 多选框选中数据