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

src/store/modules/tagsView.js

@@ -63,7 +63,7 @@ const mutations = {
       }
     }
   },
-  
+
   DEL_RIGHT_VIEWS: (state, view) => {
     const index = state.visitedViews.findIndex(v => v.path === view.path)
     if (index === -1) {
@@ -112,6 +112,15 @@ const actions = {
   },
 
   delView({ dispatch, state }, view) {
+    if (view.fullPath == '/task/manualReview') {
+      localStorage.removeItem('routeCheckStatus')
+    }
+    if (view.fullPath == "/patient/signRecord") {
+      localStorage.removeItem('serviceStatus')
+    }
+    if (view.fullPath == "/task/followup") {
+      localStorage.removeItem('nodeExecuteStatus')
+    }
     return new Promise(resolve => {
       dispatch('delVisitedView', view)
       dispatch('delCachedView', view)
@@ -135,6 +144,15 @@ const actions = {
   },
 
   delOthersViews({ dispatch, state }, view) {
+    if (view.fullPath != '/task/manualReview') {
+      localStorage.removeItem('routeCheckStatus')
+    }
+    if (view.fullPath != "/patient/signRecord") {
+      localStorage.removeItem('serviceStatus')
+    }
+    if (view.fullPath != "/task/followup") {
+      localStorage.removeItem('nodeExecuteStatus')
+    }
     return new Promise(resolve => {
       dispatch('delOthersVisitedViews', view)
       dispatch('delOthersCachedViews', view)

src/views/manage/Auditing/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div style="background-color: #f1f3f5; padding-top: 16px">
     <div slot="footer" class="topfooter">
-      <el-tabs v-model="activeNametab" @tab-click="handleClick">
+      <el-tabs v-model="activeNametab">
         <el-tab-pane label="画像审核" name="portrait"></el-tab-pane>
         <el-tab-pane label="路径审核" name="route"></el-tab-pane>
       </el-tabs>
@@ -230,9 +230,6 @@ export default {
       this.portraitlistdata = val
       console.log(this.portraitlistdata, '999999999')
     },
-    handleClick(tab, event) {
-      console.log(tab, event, this.activeNametab);
-    },
     // 忽略
     ignore() {
       // let manageRouteNodeIds = []

src/views/manage/components/PathReview.vue

@@ -377,15 +377,24 @@ export default {
                 this.informationlist = res.data
                 loading.close();
             })
-            .catch(()=>{
+                .catch(() => {
-                loading.close();
+                    loading.close();
-            })
+                })
         },
         getlist() {
             if (!this.routelist) {
+                const loading = this.$loading({
+                    lock: true,
+                    text: '加载中',
+                    spinner: 'el-icon-loading',
+                    background: 'rgba(255, 255, 255, 0.7)'
+                });
                 getRouteNodeInfo(this.$route.query.signRecordId).then(res => {
                     this.routelist = res.data
                     this.tab = 2
+                    loading.close();
+                }).catch(err => {
+                    loading.close();
                 })
             } else {
                 this.tab = 2

src/views/manage/manualReview/index.vue

@@ -1,39 +1,19 @@
 <template>
   <div class="app-container" ref="layout">
-    <el-tabs
+    <el-tabs v-model="queryParams.routeCheckStatus" @tab-click="handleClick" style="flex: 1">
-      v-model="queryParams.routeCheckStatus"
-      @tab-click="handleClick"
-      style="flex: 1"
-    >
       <el-tab-pane label="未审核" name="UNAUDITED"></el-tab-pane>
       <el-tab-pane label="已审核" name="AGREE"></el-tab-pane>
       <el-tab-pane label="已忽略" name="DISAGREE"></el-tab-pane>
     </el-tabs>
     <div ref="topform" class="form">
-      <el-form
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="80px">
-        :model="queryParams"
-        ref="queryForm"
-        size="small"
-        :inline="true"
-        label-width="80px"
-      >
         <el-form-item label="患者姓名" prop="patientName">
-          <el-input
+          <el-input v-model="queryParams.patientName" placeholder="请输入患者姓名" clearable @keyup.enter.native="handleQuery"
-            v-model="queryParams.patientName"
+            style="width: 200px" />
-            placeholder="请输入患者姓名"
-            clearable
-            @keyup.enter.native="handleQuery"
-            style="width: 200px"
-          />
         </el-form-item>
         <el-form-item label="患者电话" prop="patientPhone">
-          <el-input
+          <el-input v-model="queryParams.patientPhone" placeholder="请输入患者电话" clearable @keyup.enter.native="handleQuery"
-            v-model="queryParams.patientPhone"
+            style="width: 200px" />
-            placeholder="请输入患者电话"
-            clearable
-            @keyup.enter.native="handleQuery"
-            style="width: 200px"
-          />
         </el-form-item>
         <!-- <el-form-item
           label="出院/就诊时间"
@@ -52,160 +32,58 @@
           </el-date-picker>
         </el-form-item> -->
         <el-form-item label="签约时间" prop="signTimeStart">
-          <el-date-picker
+          <el-date-picker v-model="signTime" type="daterange" range-separator="至" start-placeholder="开始日期"
-            v-model="signTime"
+            style="width: 300px" value-format="yyyy-MM-dd" end-placeholder="结束日期">
-            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="mainDiagnosis">
-          <el-input
+          <el-input v-model="queryParams.mainDiagnosis" placeholder="请选择诊断" clearable style="width: 200px"
-            v-model="queryParams.mainDiagnosis"
+            @keyup.enter.native="handleQuery" />
-            placeholder="请选择诊断"
-            clearable
-            style="width: 200px"
-            @keyup.enter.native="handleQuery"
-          />
         </el-form-item>
         <el-form-item label="患者来源" prop="patientSource">
-          <el-select
+          <el-select v-model="queryParams.patientSource" placeholder="请选择患者来源" clearable style="width: 200px">
-            v-model="queryParams.patientSource"
+            <el-option v-for="dict in dict.type.patient_source" :key="dict.value" :label="dict.label"
-            placeholder="请选择患者来源"
+              :value="dict.value" />
-            clearable
-            style="width: 200px"
-          >
-            <el-option
-              v-for="dict in dict.type.patient_source"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
           </el-select>
         </el-form-item>
         <el-form-item label="医院" prop="hospitalAgencyId">
-          <el-select
+          <el-select v-model="queryParams.hospitalAgencyId" filterable placeholder="请选择医院" style="width: 200px"
-            v-model="queryParams.hospitalAgencyId"
+            clearable @clear="clearhospitalAgency" @change="changehospitalAgency">
-            filterable
+            <el-option v-for="item in hospitalAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
-            placeholder="请选择医院"
-            style="width: 200px"
-            clearable
-            @clear="clearhospitalAgency"
-            @change="changehospitalAgency"
-          >
-            <el-option
-              v-for="item in hospitalAgencylist"
-              :key="item.id"
-              :label="item.agencyName"
-              :value="item.id"
-            >
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item
+        <el-form-item label="院区" prop="campusAgencyId" v-if="queryParams.hospitalAgencyId">
-          label="院区"
+          <el-select v-model="queryParams.campusAgencyId" filterable placeholder="请选择院区" style="width: 200px" clearable
-          prop="campusAgencyId"
+            @clear="clearcampusAgency" @change="changecampusAgency">
-          v-if="queryParams.hospitalAgencyId"
+            <el-option v-for="item in campusAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
-        >
-          <el-select
-            v-model="queryParams.campusAgencyId"
-            filterable
-            placeholder="请选择院区"
-            style="width: 200px"
-            clearable
-            @clear="clearcampusAgency"
-            @change="changecampusAgency"
-          >
-            <el-option
-              v-for="item in campusAgencylist"
-              :key="item.id"
-              :label="item.agencyName"
-              :value="item.id"
-            >
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item
+        <el-form-item label="科室" prop="departmentId" v-if="queryParams.hospitalAgencyId">
-          label="科室"
+          <el-select v-model="queryParams.departmentId" filterable placeholder="请选择科室" style="width: 200px" clearable
-          prop="departmentId"
+            @clear="cleardepartment" @change="changedepartment">
-          v-if="queryParams.hospitalAgencyId"
+            <el-option v-for="item in departmentlist" :key="item.id" :label="item.departmentName" :value="item.id">
-        >
-          <el-select
-            v-model="queryParams.departmentId"
-            filterable
-            placeholder="请选择科室"
-            style="width: 200px"
-            clearable
-            @clear="cleardepartment"
-            @change="changedepartment"
-          >
-            <el-option
-              v-for="item in departmentlist"
-              :key="item.id"
-              :label="item.departmentName"
-              :value="item.id"
-            >
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item
+        <el-form-item label="病区" prop="wardId" v-if="queryParams.hospitalAgencyId">
-          label="病区"
+          <el-select v-model="queryParams.wardId" filterable placeholder="请选择病区" style="width: 200px" clearable>
-          prop="wardId"
+            <el-option v-for="item in wardlist" :key="item.id" :label="item.departmentName" :value="item.id">
-          v-if="queryParams.hospitalAgencyId"
-        >
-          <el-select
-            v-model="queryParams.wardId"
-            filterable
-            placeholder="请选择病区"
-            style="width: 200px"
-            clearable
-          >
-            <el-option
-              v-for="item in wardlist"
-              :key="item.id"
-              :label="item.departmentName"
-              :value="item.id"
-            >
             </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>
     </div>
     <div ref="table">
-      <el-table
+      <el-table :max-height="maxTableHeight" v-loading="loading" :data="patientInfoList">
-        :max-height="maxTableHeight"
-        v-loading="loading"
-        :data="patientInfoList"
-      >
         <el-table-column label="序号" type="index" width="50" align="center" />
-        <el-table-column
+        <el-table-column label="患者姓名" align="center" prop="patientName" width="80" />
-          label="患者姓名"
+        <el-table-column label="患者电话" align="center" prop="patientPhone" width="120" />
-          align="center"
-          prop="patientName"
-          width="80"
-        />
-        <el-table-column
-          label="患者电话"
-          align="center"
-          prop="patientPhone"
-          width="120"
-        />
         <el-table-column label="性别" align="center" prop="sex" width="50">
           <template slot-scope="scope">
             {{ scope.row.sex == "MALE" ? "男" : "" }}
@@ -213,38 +91,13 @@
           </template>
         </el-table-column>
         <el-table-column label="年龄" align="center" prop="age" width="50" />
-        <el-table-column
+        <el-table-column label="出生日期" align="center" prop="birthDate" width="100" />
-          label="出生日期"
+        <el-table-column label="医院" align="center" prop="hospitalAgencyName" :show-overflow-tooltip="true" />
-          align="center"
+        <el-table-column label="院区" align="center" prop="campusAgencyName" :show-overflow-tooltip="true" />
-          prop="birthDate"
+        <el-table-column label="科室名称" align="center" prop="departmentName" :show-overflow-tooltip="true" />
-          width="100"
-        />
-        <el-table-column
-          label="医院"
-          align="center"
-          prop="hospitalAgencyName"
-          :show-overflow-tooltip="true"
-        />
-        <el-table-column
-          label="院区"
-          align="center"
-          prop="campusAgencyName"
-          :show-overflow-tooltip="true"
-        />
-        <el-table-column
-          label="科室名称"
-          align="center"
-          prop="departmentName"
-          :show-overflow-tooltip="true"
-        />
         <el-table-column label="病区名称" align="center" prop="wardName" />
-        <el-table-column
+        <el-table-column label="住院/门诊号" align="center" prop="inHospitalNumber" width="105"
-          label="住院/门诊号"
+          :show-overflow-tooltip="true" />
-          align="center"
-          prop="inHospitalNumber"
-          width="105"
-          :show-overflow-tooltip="true"
-        />
         <!-- <el-table-column label="就诊方式" align="center" prop="visitMethod" width="80"> -->
         <!-- <template slot-scope="scope">
                         <dict-tag :options="dict.type.patient_source" :value="scope.row.visitMethod" />
@@ -252,48 +105,24 @@
         <!-- </el-table-column> -->
         <el-table-column label="就诊方式" align="center" prop="visitMethod">
           <template slot-scope="scope">
-            <dict-tag
+            <dict-tag :options="dict.type.visit_method" :value="scope.row.visitMethod" />
-              :options="dict.type.visit_method"
-              :value="scope.row.visitMethod"
-            />
           </template>
         </el-table-column>
         <!-- <el-table-column label="医生" align="center" prop="attendingPhysicianName" width="80" :show-overflow-tooltip="true"/> -->
-        <el-table-column
+        <el-table-column label="主要诊断" align="center" prop="signDiagnosis" :show-overflow-tooltip="true" width="100" />
-          label="主要诊断"
+        <el-table-column label="签约时间" align="center" prop="signTime" width="100">
-          align="center"
-          prop="signDiagnosis"
-          :show-overflow-tooltip="true"
-          width="100"
-        />
-        <el-table-column
-          label="签约时间"
-          align="center"
-          prop="signTime"
-          width="100"
-        >
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.signTime, "{y}-{m}-{d}") }}</span>
           </template>
         </el-table-column>
-        <el-table-column
+        <el-table-column label="画像审核状态" align="center" prop="portaitCheckStatus" width="100">
-          label="画像审核状态"
-          align="center"
-          prop="portaitCheckStatus"
-          width="100"
-        >
           <template slot-scope="scope">
             {{ scope.row.portaitCheckStatus == "AGREE" ? "审核通过" : "" }}
             {{ scope.row.portaitCheckStatus == "DISAGREE" ? "已忽略" : "" }}
             {{ scope.row.portaitCheckStatus == "" ? "未审核" : "" }}
           </template>
         </el-table-column>
-        <el-table-column
+        <el-table-column label="路径审核状态" align="center" prop="routeCheckStatus" width="100">
-          label="路径审核状态"
-          align="center"
-          prop="routeCheckStatus"
-          width="100"
-        >
           <template slot-scope="scope">
             {{ scope.row.routeCheckStatus == "AGREE" ? "审核通过" : "" }}
             {{ scope.row.routeCheckStatus == "DISAGREE" ? "已忽略" : "" }}
@@ -301,38 +130,18 @@
           </template>
         </el-table-column>
 
-        <el-table-column
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
-          label="操作"
-          align="center"
-          class-name="small-padding fixed-width"
-          fixed="right"
-        >
           <template slot-scope="scope">
-            <el-button
+            <el-button size="mini" type="text" @click="handleAuthRole(scope.row)"
-              size="mini"
+              v-if="queryParams.routeCheckStatus == 'UNAUDITED'">审核</el-button>
-              type="text"
+            <el-button size="mini" type="text" @click="handleLook(scope.row)"
-              @click="handleAuthRole(scope.row)"
+              v-if="queryParams.routeCheckStatus != 'UNAUDITED'">查看</el-button>
-              v-if="queryParams.routeCheckStatus == 'UNAUDITED'"
-              >审核</el-button
-            >
-            <el-button
-              size="mini"
-              type="text"
-              @click="handleLook(scope.row)"
-              v-if="queryParams.routeCheckStatus != 'UNAUDITED'"
-              >查看</el-button
-            >
           </template>
         </el-table-column>
       </el-table>
     </div>
-    <myPagination
+    <myPagination v-show="total > 0" :total="total" :pageSize="queryParams.pageSize"
-      v-show="total > 0"
+      :indexFromWrap="queryParams.pageNum" @updateCPage="updateCPage"></myPagination>
-      :total="total"
-      :pageSize="queryParams.pageSize"
-      :indexFromWrap="queryParams.pageNum"
-      @updateCPage="updateCPage"
-    ></myPagination>
   </div>
 </template>
 
@@ -405,6 +214,9 @@ export default {
     };
   },
   created() {
+    if (localStorage.getItem('routeCheckStatus')) {
+      this.queryParams.routeCheckStatus = localStorage.getItem('routeCheckStatus')
+    }
     this.getList();
     this.selectAgencyinfo();
   },
@@ -419,6 +231,7 @@ export default {
       this.getList();
     },
     handleClick(tab, event) {
+      localStorage.setItem('routeCheckStatus', this.queryParams.routeCheckStatus)
       this.dischargeTime = [];
       this.queryParams.dischargeTimeStart = null;
       this.queryParams.dischargeTimeEnd = null;
@@ -455,7 +268,7 @@ export default {
         query: {
           patientId: row.patientId,
           signRecordId: row.id,
-          routeCheckStatus:row.routeCheckStatus
+          routeCheckStatus: row.routeCheckStatus
         },
       });
     },

src/views/manage/signRecord/index.vue

@@ -355,6 +355,9 @@ export default {
     };
   },
   created() {
+    if (localStorage.getItem('serviceStatus')) {
+      this.queryParams.serviceStatus = localStorage.getItem('serviceStatus')
+    }
     this.selectAgencyinfo();
   },
   mounted() {
@@ -477,18 +480,19 @@ export default {
     //手动创建任务
     addTask() {
       if (this.addTaskitem) {
-        this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => {
+        localStorage.setItem('serviceStatus', this.queryParams.serviceStatus)
-          this.$router.push({
+        // this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => {
-            path: "/patient/ManuallyCreatingTasks",
+        this.$router.push({
-            query: {
+          path: "/patient/ManuallyCreatingTasks",
-              signPatientRecordId: this.addTaskitem.id,
+          query: {
-              patientId: this.addTaskitem.patientId,
+            signPatientRecordId: this.addTaskitem.id,
-              patientName: this.addTaskitem.patientName,
+            patientId: this.addTaskitem.patientId,
-              departmentId: this.addTaskitem.departmentId,
+            patientName: this.addTaskitem.patientName,
-              departmentName: this.addTaskitem.departmentName,
+            departmentId: this.addTaskitem.departmentId,
-            },
+            departmentName: this.addTaskitem.departmentName,
-          });
+          },
-        })
+        });
+        // })
       } else {
         this.$message.error('请先选择一名签约服务中患者');
       }
@@ -538,6 +542,7 @@ export default {
       }, `signRecord_${new Date().getTime()}.xlsx`)
     },
     handleClick(tab, event) {
+      localStorage.setItem('serviceStatus', this.queryParams.serviceStatus)
       this.intentionalTime = []
       this.queryParams.intentionalTimeStart = null
       this.queryParams.intentionalTimeEnd = null
@@ -548,28 +553,28 @@ export default {
       this.getList();
     },
     handlenewsign(row) {
-      this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => {
+      // this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => {
-        this.$router.replace({
+      this.$router.replace({
-          path: "/patient/newSigning",
+        path: "/patient/newSigning",
-          query: {
+        query: {
-            departmentId: row.departmentId,
+          departmentId: row.departmentId,
-            patientName: row.patientName,
+          patientName: row.patientName,
-            patientPhone: row.patientPhone,
+          patientPhone: row.patientPhone,
-            visitMethod: row.visitMethod,
+          visitMethod: row.visitMethod,
-            signDiagnosis: row.signDiagnosis,
+          signDiagnosis: row.signDiagnosis,
-            visitSerialNumber: row.visitSerialNumber,
+          visitSerialNumber: row.visitSerialNumber,
-            hospitalAgencyName: row.hospitalAgencyName,
+          hospitalAgencyName: row.hospitalAgencyName,
-            hospitalAgencyId: row.hospitalAgencyId,
+          hospitalAgencyId: row.hospitalAgencyId,
-            inHospitalNumber: row.inHospitalNumber,
+          inHospitalNumber: row.inHospitalNumber,
-            departmentName: row.departmentName,
+          departmentName: row.departmentName,
-            paymentStatus: row.paymentStatus,
+          paymentStatus: row.paymentStatus,
-            sex: row.sex,
+          sex: row.sex,
-            age: row.birthDate ? getAge(row.birthDate) : '',
+          age: row.birthDate ? getAge(row.birthDate) : '',
-            patientId: row.patientId,
+          patientId: row.patientId,
-            createTime: row.createTime,
+          createTime: row.createTime,
-          },
+        },
-        });
+      });
-      })
+      // })
     },
     selectAgencyinfo() {
       let query = {
@@ -665,16 +670,16 @@ export default {
     },
     //续约
     handleContinue(row) {
-      this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => {
+      // this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => {
-        this.$router.replace({
+      this.$router.replace({
-          path: "/patient/continueSigning",
+        path: "/patient/continueSigning",
-          query: {
+        query: {
-            hospitalAgencyId: row.hospitalAgencyId,
+          hospitalAgencyId: row.hospitalAgencyId,
-            hospitalAgencyName: row.hospitalAgencyName,
+          hospitalAgencyName: row.hospitalAgencyName,
-            patientSignRecordId: row.id,
+          patientSignRecordId: row.id,
-          },
+        },
-        });
+      });
-      })
+      // })
     },
     /** 详情操作 */
     handleAuthRole(row) {

src/views/system/components/message.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="app-container">
-    <el-button size="small" @click="classificationOpen = true" style="width: 200px;font-size:14px;text-align:left;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;"
+    <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-dialog title="短信库模板选择" :visible.sync="classificationOpen" width="70%" :before-close="classificationOpenfalse">
@@ -68,10 +69,10 @@
               </template>
             </el-table-column>
           </el-table>
-          <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
-            :limit.sync="queryParams.pageSize" @pagination="getList" />
         </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>
@@ -168,7 +169,7 @@ export default {
       this.$emit("on-template", { templateId: '', templateName: '', templateContent: "" });
     },
     handleselect(item) {
-      console.log(item.id,'id')
+      console.log(item.id, 'id')
       this.handleselectId = item.id
       this.handleselectName = item.textMessageName
       this.$emit("on-template", { templateId: item.id, templateName: item.textMessageName, templateContent: item.templateContent });
@@ -238,6 +239,10 @@ export default {
   padding: 0 !important;
 }
 
+::v-deep .el-dialog__body {
+  padding-bottom: 60px;
+}
+
 ::v-deep .el-input-number .el-input__inner {
   text-align: left;
 }

src/views/system/components/miniProgram.vue

@@ -1,6 +1,7 @@
 <template>
     <div class="app-container">
-        <el-button size="small" @click="classificationOpen = true" style="width: 200px;font-size:14px;text-align:left;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;"
+        <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-dialog title="公众号模板选择" :visible.sync="classificationOpen" width="70%"
@@ -69,10 +70,10 @@
                             </template>
                         </el-table-column>
                     </el-table>
-                    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
-                        :limit.sync="queryParams.pageSize" @pagination="getList" />
                 </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>
@@ -235,6 +236,10 @@ export default {
     text-align: left;
 }
 
+::v-deep .el-dialog__body {
+    padding-bottom: 60px;
+}
+
 .app-container {
     display: inline-block;
     padding: 0 !important;

src/views/system/components/officialAccount.vue

@@ -70,10 +70,10 @@
                             </template>
                         </el-table-column>
                     </el-table>
-                    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
-                        :limit.sync="queryParams.pageSize" @pagination="getList" />
                 </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>
@@ -236,6 +236,10 @@ export default {
     text-align: left;
 }
 
+::v-deep .el-dialog__body {
+    padding-bottom: 60px;
+}
+
 .app-container {
     display: inline-block;
     padding: 0 !important;

src/views/system/components/propaganda.vue

@@ -1,6 +1,7 @@
 <template>
     <div class="app-container">
-        <el-button size="small" @click="classificationOpen = true" style="width: 200px;font-size:14px;text-align:left;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;"
+        <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-dialog title="宣教库模板选择" :visible.sync="classificationOpen" width="70%"
@@ -77,10 +78,10 @@
                             </template>
                         </el-table-column>
                     </el-table>
-                    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
-                        :limit.sync="queryParams.pageSize" @pagination="getList" />
                 </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>
@@ -284,6 +285,10 @@ export default {
     padding: 0 !important;
 }
 
+::v-deep .el-dialog__body {
+    padding-bottom: 60px;
+}
+
 .propagandaselect {
     width: 100px;
     height: 100px;

src/views/system/components/question.vue

@@ -1,6 +1,7 @@
 <template>
     <div class="app-container">
-        <el-button size="small" @click="classificationOpen = true" style="width: 200px;font-size:14px;text-align:left;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;"
+        <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-dialog title="问卷库模板选择" :visible.sync="classificationOpen" width="70%"
@@ -63,10 +64,10 @@
                             </template>
                         </el-table-column>
                     </el-table>
-                    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
-                        :limit.sync="queryParams.pageSize" @pagination="getList" />
                 </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>
@@ -200,6 +201,10 @@ export default {
 };
 </script>
 <style scoped lang="scss">
+::v-deep .el-dialog__body {
+    padding-bottom: 60px;
+}
+
 .app-container {
     padding: 0 !important;
     display: inline-block;

src/views/system/components/script.vue

@@ -1,53 +1,30 @@
 <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">
             <div class="name">科室名称</div>
             <div>
-              <el-input
+              <el-input v-model="name" placeholder="请输入科室名称" clearable @keyup.enter.native="handleQuery" />
-                v-model="name"
-                placeholder="请输入科室名称"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
             </div>
             <div class="listitem">
-              <div
+              <div :class="itemname == null ? 'allactive' : 'all'" @click="itemdata()">
-                :class="itemname == null ? 'allactive' : 'all'"
-                @click="itemdata()"
-              >
                 全部
               </div>
               <span class="count">{{ count }}</span>
             </div>
-            <div
+            <div class="listitem" v-for="(item, index) in DepartmentoList" :key="index" @click="itemdata(item)">
-              class="listitem"
-              v-for="(item, index) in DepartmentoList"
-              :key="index"
-              @click="itemdata(item)"
-            >
               <div :class="itemname == item.id ? 'allactive' : 'all'">
                 {{ item.departmentName }}
               </div>
@@ -57,138 +34,50 @@
         </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
+                <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>
-          <pagination
-            v-show="total > 0"
-            :total="total"
-            :page.sync="queryParams.pageNum"
-            :limit.sync="queryParams.pageSize"
-            @pagination="getList"
-          />
         </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>
@@ -386,6 +275,10 @@ export default {
   text-align: left;
 }
 
+::v-deep .el-dialog__body {
+  padding-bottom: 60px;
+}
+
 .app-container {
   display: inline-block;
   padding: 0 !important;

src/views/system/followup/index.vue

@@ -270,6 +270,9 @@ export default {
     };
   },
   created() {
+    if (localStorage.getItem('nodeExecuteStatus')) {
+      this.queryParams.nodeExecuteStatus = localStorage.getItem('nodeExecuteStatus')
+    }
     this.getList();
     this.selectAgencyinfo();
   },
@@ -284,10 +287,11 @@ export default {
       this.getList();
     },
     handleClick(tab, event) {
-      this.intentionalTime = [],
+      localStorage.setItem('nodeExecuteStatus', this.queryParams.nodeExecuteStatus)
-        this.mzTime = [],
+      this.intentionalTime = []
-        this.ryTime = [],
+      this.mzTime = []
-        this.queryParams.dischargeStartTime = null
+      this.ryTime = []
+      this.queryParams.dischargeStartTime = null
       this.queryParams.dischargeEndTime = null
       this.queryParams.clinicalStartTime = null
       this.queryParams.clinicalEndTime = null
@@ -642,15 +646,6 @@ export default {
         }
       });
     },
-    // handleClick(tab, event) {
-    //   this.intentionalTime = [];
-    //   this.queryParams.startDate = null;
-    //   this.queryParams.endDate = null;
-    //   // this.signTime = []
-    //   // this.queryParams.signTimeStart = null
-    //   // this.queryParams.signTimeEnd = null
-    //   this.getList();
-    // },
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;