From 744c5862a25bf8eda89ee6bc7afd551a172d66b6 Mon Sep 17 00:00:00 2001
From: shidongli <shidongli>
Date: Fri, 29 Mar 2024 09:33:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9F=A5=E8=AF=86=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/manage/propaganda/index.vue         |  5 --
 src/views/manage/script/index.vue             | 59 ++++++++++++-------
 src/views/manage/servicepackage/index.vue     | 49 ++++++++-------
 .../operationInfo/operationInfo/index.vue     | 10 ++--
 src/views/system/taskPushRecord/index.vue     | 18 ++++--
 5 files changed, 79 insertions(+), 62 deletions(-)

diff --git a/src/views/manage/propaganda/index.vue b/src/views/manage/propaganda/index.vue
index 96ae538..276678f 100644
--- a/src/views/manage/propaganda/index.vue
+++ b/src/views/manage/propaganda/index.vue
@@ -1449,14 +1449,9 @@ export default {
           } else {
             if(this.diseaseTypeName = '请选择病种'){
               this.form.diseaseTypeName=null
-
             }else{
             this.form.diseaseTypeName = this.diseaseTypeName
-
             }
-
-            console.log(this.form)
-
             addPropaganda(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
diff --git a/src/views/manage/script/index.vue b/src/views/manage/script/index.vue
index 383327f..5349fba 100644
--- a/src/views/manage/script/index.vue
+++ b/src/views/manage/script/index.vue
@@ -209,20 +209,31 @@
             </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 :title="title" :visible.sync="open" width="700px" append-to-body v-if="open">
-      <el-form ref="form" :model="form" :rules="rules" label-width="110px" :inline="true">
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="700px"
+      append-to-body
+      v-if="open"
+    >
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="110px"
+        :inline="true"
+      >
         <el-form-item label="通用话术名称" prop="commonScriptName">
           <el-input
             maxlength="100"
@@ -238,8 +249,13 @@
           />
         </el-form-item>
         <el-form-item label="话术排序" prop="scriptSort">
-          <el-input-number v-model="form.scriptSort" controls-position="right" :min="0" placeholder="请输入话术排序"   style="width:206px"/>
-
+          <el-input-number
+            v-model="form.scriptSort"
+            controls-position="right"
+            :min="0"
+            placeholder="请输入话术排序"
+            style="width: 206px"
+          />
         </el-form-item>
         <el-form-item label="话术ID" prop="scriptId">
           <el-input
@@ -271,7 +287,6 @@
           </el-select>
         </el-form-item>
 
-
         <el-form-item label="科室名称" prop="departmentId">
           <el-button
             type=""
@@ -554,8 +569,8 @@ export default {
       querydisease: {
         pageNum: 1,
         pageSize: 10,
-        diseaseTypeName:null,
-        departmentId:null,
+        diseaseTypeName: null,
+        departmentId: null,
       },
       listdisease: [],
       diseasetotal: 0,
@@ -690,7 +705,7 @@ export default {
       },
       // 表单校验
       rules: {
-        scriptSort:[
+        scriptSort: [
           { required: true, message: "话术排序不能为空", trigger: "blur" }
         ],
         commonScriptName: [
@@ -890,13 +905,13 @@ export default {
       this.form = {
         id: null,
         departmentId: null,
-        scriptSort:undefined,
+        scriptSort: undefined,
         departmentName: null,
         diseaseTypeId: null,
         diseaseTypeName: null,
         diseaseTypeCode: null,
         commonScriptName: null,
-        scriptFilePath:null,
+        scriptFilePath: null,
         scriptName: null,
         scriptId: null,
         platformId: null,
@@ -982,8 +997,8 @@ export default {
         this.form = response.data;
         this.diseaseTypeName = response.data.diseaseTypeName
         this.departmentName = response.data.departmentName
-        if(!this.form.scriptSort){
-          this.form.scriptSort=undefined
+        if (!this.form.scriptSort) {
+          this.form.scriptSort = undefined
         }
         this.open = true;
         this.title = "修改话术信息";
@@ -1048,10 +1063,10 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-::v-deep .el-input-number .el-input__inner{
+::v-deep .el-input-number .el-input__inner {
   text-align: left;
 }
-::v-deep .el-textarea__inner{
+::v-deep .el-textarea__inner {
   width: 206px;
 }
 .leftscript {
diff --git a/src/views/manage/servicepackage/index.vue b/src/views/manage/servicepackage/index.vue
index 9720ddf..ee3ae61 100644
--- a/src/views/manage/servicepackage/index.vue
+++ b/src/views/manage/servicepackage/index.vue
@@ -251,17 +251,16 @@
             </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
       :title="title"
@@ -1409,10 +1408,10 @@ export default {
       // return
       this.$refs["form"].validate(valid => {
         if (valid) {
-            if (this.form.id != null) {
-              this.form.departmentName = this.departmentName
-              this.form.diseaseTypeName = this.diseaseTypeName
-              if (this.form.voList) {
+          if (this.form.id != null) {
+            this.form.departmentName = this.departmentName
+            this.form.diseaseTypeName = this.diseaseTypeName
+            if (this.form.voList) {
               var obj = JSON.parse(JSON.stringify(this.form))
               obj.voList.forEach(e => {
                 if (e.serviceFrequencyText.includes('~')) {
@@ -1431,21 +1430,21 @@ export default {
                 this.getList();
               });
             }
+          } else {
+
+            if (this.diseaseTypeName == "请选择病种") {
+              this.form.diseaseTypeName == null
             } else {
+              this.form.diseaseTypeName = this.diseaseTypeName
+            }
+            if (this.itemname) {
+              this.form.departmentName = this.departmentName
+              this.form.departmentId = this.itemname
 
-              if (this.diseaseTypeName == "请选择病种") {
-                this.form.diseaseTypeName == null
-              } else {
-                this.form.diseaseTypeName = this.diseaseTypeName
-              }
-              if (this.itemname) {
-                this.form.departmentName = this.departmentName
-                this.form.departmentId = this.itemname
-
-              } else {
-                this.form.departmentName = this.departmentName
-              }
-              if (this.form.voList) {
+            } else {
+              this.form.departmentName = this.departmentName
+            }
+            if (this.form.voList) {
               var obj = JSON.parse(JSON.stringify(this.form))
               obj.voList.forEach(e => {
                 if (e.serviceFrequencyText.includes('~')) {
diff --git a/src/views/operationInfo/operationInfo/index.vue b/src/views/operationInfo/operationInfo/index.vue
index 6fb307d..8f9ae4b 100644
--- a/src/views/operationInfo/operationInfo/index.vue
+++ b/src/views/operationInfo/operationInfo/index.vue
@@ -132,10 +132,7 @@
             </template>
           </el-table-column>
         </el-table>
-      </el-col>
-    </el-row>
-
-    <pagination
+        <pagination
       v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
@@ -143,6 +140,11 @@
       @pagination="getList"
     />
 
+      </el-col>
+    </el-row>
+
+
+
     <!-- 添加或修改手术信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
diff --git a/src/views/system/taskPushRecord/index.vue b/src/views/system/taskPushRecord/index.vue
index 45db27b..215bfca 100644
--- a/src/views/system/taskPushRecord/index.vue
+++ b/src/views/system/taskPushRecord/index.vue
@@ -303,30 +303,36 @@
               prop="patientId"
               v-if="form.taskType == 'TEXT_REMIND'"
             >
+            <el-input
+                type="textarea"
+                disabled
+                v-model="form.textRemindContent"
+                style="width: 635px"
+              />
               <!-- 短信 -->
-              <el-input
+              <!-- <el-input
                 v-if="form.messagePushSign == 1"
                 type="textarea"
                 disabled
                 v-model="form.messagePreview"
                 style="width: 635px"
-              />
+              /> -->
               <!-- 公众号 -->
-              <el-input
+              <!-- <el-input
                 v-if="form.officialPushSign == 1"
                 type="textarea"
                 disabled
                 v-model="form.officialRemindContent"
                 style="width: 635px"
-              />
+              /> -->
               <!-- 小程序 -->
-              <el-input
+              <!-- <el-input
                 v-if="form.appletPushSign == 1"
                 type="textarea"
                 disabled
                 v-model="form.appletRemindContent"
                 style="width: 635px"
-              />
+              /> -->
             </el-form-item>
           </div>
           <!-- 人工随访 -->