From 7eaee92ee52e1501480adbbe8a1af9ddecc04275 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期三, 04 九月 2024 11:05:23 +0800
Subject: [PATCH] 测试完成

---
 src/components/OptionalForm/index.vue                          |    2 
 src/views/followvisit/outpatient/index.vue                     |   68 +--
 dist.zip                                                       |    0 
 vue.config.js                                                  |    2 
 src/views/repositoryai/templateku/configurat/index.vue         |   32 
 src/views/sfstatistics/statement/index.vue                     |    2 
 src/api/AiCentre/Qtemplate.js                                  |   22 
 src/views/knowledge/questionnaire/compilequer/index.vue        |  120 ++++--
 src/views/patient/patient/index.vue                            |    2 
 src/views/patient/subsequent/index.vue                         |    2 
 src/views/patient/propaganda/QuestionnaireTask.vue             |  138 ++++--
 src/views/patient/patient/PatientChart.vue                     |    2 
 src/views/sfstatistics/propaganda/index.vue                    |    2 
 src/api/AiCentre/general.js                                    |   29 
 src/views/patient/propaganda/index.vue                         |    4 
 src/views/followvisit/record/detailpage/index.vue              |  252 ++++++++++---
 src/views/followvisit/satisfaction/particulars/index.vue       |   16 
 src/views/patient/propaganda/Missionotice.vue                  |    4 
 src/views/knowledge/questionbank/particulars/index.vue         |    8 
 src/views/outsideChainwt.vue                                   |   92 +++-
 src/views/Intelligentcenter/centercontrol/index.vue            |    2 
 src/views/knowledge/education/compilequer/index.vue            |    2 
 src/views/patient/propaganda/Missioncreation.vue               |   30 
 src/api/AiCentre/Followup.js                                   |   20 
 src/components/SFtable/index.vue                               |    4 
 src/api/AiCentre/external.js                                   |    9 
 src/views/followvisit/tasklist/index.vue                       |   22 
 src/views/repositoryai/templateku/configurat/measurement.vue   |    2 
 src/views/patient/physical/index.vue                           |   19 
 src/views/followvisit/tasklist/FollowupDetails/index.vue       |   16 
 src/api/AiCentre/SingleTask.js                                 |    6 
 src/api/AiCentre/publicity.js                                  |   18 
 src/views/knowledge/education/index.vue                        |    4 
 src/views/patient/questionnaire/index.vue                      |   14 
 src/views/followvisit/record/index.vue                         |    2 
 src/views/shortmessage/messagebank/compile/index.vue           |    2 
 src/views/repositoryai/general/particulars/index.vue           |    8 
 src/views/knowledge/questionnaire/index.vue                    |    2 
 src/views/patient/medtechnician/index.vue                      |    2 
 src/views/repositoryai/matching/index.vue                      |    4 
 src/views/patient/propaganda/particty.vue                      |   41 +
 src/views/shortmessage/healthinformation/compilequer/index.vue |    2 
 src/views/followvisit/discharge/index.vue                      |   65 +-
 src/views/repositoryai/templateku/index.vue                    |   14 
 44 files changed, 682 insertions(+), 427 deletions(-)

diff --git a/dist.zip b/dist.zip
index c5f51d0..9ba762d 100644
--- a/dist.zip
+++ b/dist.zip
Binary files differ
diff --git a/src/api/AiCentre/Followup.js b/src/api/AiCentre/Followup.js
index e15db97..1a4ea01 100644
--- a/src/api/AiCentre/Followup.js
+++ b/src/api/AiCentre/Followup.js
@@ -1,6 +1,6 @@
 import request from "@/utils/request";
 
-// 鏌ヨ闅忚妯$増鍒楄〃
+// 鏌ヨ闅忚妯℃澘鍒楄〃
 export function getFollowuplist(data) {
   return request({
     url: "/smartor/template/list",
@@ -8,21 +8,21 @@
     data: data,
   });
 }
-// 闅忚妯$増璇︽儏
+// 闅忚妯℃澘璇︽儏
 export function Followupinfo(Id) {
   return request({
     url: "/smartor/template/" + Id,
     method: "get",
   });
 }
-// 鍒犻櫎闅忚妯$増
+// 鍒犻櫎闅忚妯℃澘
 export function delFollowupinfo(Id) {
     return request({
       url: "/smartor/template/remove/" + Id,
       method: "get",
     });
   }
-// 鏂板鎴栦慨鏀归殢璁挎ā鐗�
+// 鏂板鎴栦慨鏀归殢璁挎ā鏉�
 export function compileFollowup(data) {
     return request({
       url: "/smartor/template/saveOrUpdateScript",
@@ -30,7 +30,7 @@
       data: data,
     });
   }
-    // 鏌ヨ闅忚妯$増璇︽儏鍒楄〃
+    // 鏌ヨ闅忚妯℃澘璇︽儏鍒楄〃
 export function getvFollowup(data) {
     return request({
         url: "/smartor/template/selectInfoByCondition",
@@ -39,7 +39,7 @@
     });
   }
 
-  // 鏂板闅忚妯$増鍒嗙被鏍�
+  // 鏂板闅忚妯℃澘鍒嗙被鏍�
   export function addFollowupclassify(data) {
     return request({
       url: "/smartor/templateassort/addtree",
@@ -47,7 +47,7 @@
       data: data,
     });
   }
-  // 鏂板闅忚妯$増鍒嗙被鏍�
+  // 鏂板闅忚妯℃澘鍒嗙被鏍�
   export function editFollowupclassify(data) {
     return request({
       url: "/smartor/templateassort/edit",
@@ -55,18 +55,18 @@
       data: data,
     });
   }
-  // 鍒犻櫎闅忚妯$増鍒嗙被
+  // 鍒犻櫎闅忚妯℃澘鍒嗙被
 export function delFollowupclassify(Id) {
   return request({
     url: "/smartor/templateassort/remove/" + Id,
     method: "get",
   });
 }
-  // 鏌ヨ闅忚妯$増鍒嗙被鏍�
+  // 鏌ヨ闅忚妯℃澘鍒嗙被鏍�
   export function getFollowupclassify(data) {
     return request({
       url: "/smartor/templateassort/selectIvrLibaTemplateAssortList",
       method: "post",
       data: data,
     });
-  }
\ No newline at end of file
+  }
diff --git a/src/api/AiCentre/Qtemplate.js b/src/api/AiCentre/Qtemplate.js
index 76d3463..ffd5fbd 100644
--- a/src/api/AiCentre/Qtemplate.js
+++ b/src/api/AiCentre/Qtemplate.js
@@ -1,7 +1,7 @@
 import request from "@/utils/request";
 import { param } from "jquery";
 
-// 鏌ヨ闂嵎妯$増鍒楄〃
+// 鏌ヨ闂嵎妯℃澘鍒楄〃
 export function getQtemplateobj(data) {
   return request({
     url: "/smartor/svyLibTemplate/selectSvyLibTemplatelist",
@@ -9,7 +9,7 @@
     data: data,
   });
 }
-// 闂嵎妯$増鍒楄〃
+// 闂嵎妯℃澘鍒楄〃
 export function getQtemplatelist(data) {
   return request({
     url: "/smartor/svyLibTemplate/list",
@@ -17,21 +17,21 @@
     params: data,
   });
 }
-// 闂嵎妯$増璇︽儏
+// 闂嵎妯℃澘璇︽儏
 export function Qtemplateinfo(Id) {
   return request({
     url: "/smartor/svyLibTemplate/" + Id,
     method: "get",
   });
 }
-// 鍒犻櫎闂嵎妯$増
+// 鍒犻櫎闂嵎妯℃澘
 export function delQtemplateinfo(Id) {
     return request({
       url: "/smartor/svyLibTemplate/remove/" + Id,
       method: "get",
     });
   }
-// 鏂板鎴栦慨鏀归棶鍗锋ā鐗堣鎯�
+// 鏂板鎴栦慨鏀归棶鍗锋ā鏉胯鎯�
 export function compileQtemplate(data) {
     return request({
       url: "/smartor/svyLibTemplate/saveOrUpdateTemplate",
@@ -41,7 +41,7 @@
   }
 
 
-  // 鏂板闂嵎妯$増鍒嗙被
+  // 鏂板闂嵎妯℃澘鍒嗙被
   export function addQtemplateclassify(data) {
     return request({
       url: "/smartor/svyLibTemplateCategory/addtree",
@@ -49,7 +49,7 @@
       data: data,
     });
   }
-    // 鏂板闂嵎妯$増鍒嗙被
+    // 鏂板闂嵎妯℃澘鍒嗙被
     export function editQtemplateclassify(data) {
       return request({
         url: "/smartor/svyLibTemplateCategory/edit",
@@ -57,14 +57,14 @@
         data: data,
       });
     }
-  // 鍒犻櫎闂嵎妯$増鍒嗙被
+  // 鍒犻櫎闂嵎妯℃澘鍒嗙被
 export function delQtemplateclassify(Id) {
   return request({
     url: "/smartor/svyLibTemplateCategory/remove/" + Id,
     method: "get",
   });
 }
-  // 鏌ヨ闂嵎妯$増鍒嗙被鏍�
+  // 鏌ヨ闂嵎妯℃澘鍒嗙被鏍�
   export function getQtemplateclassify(data) {
     return request({
       url: "/smartor/svyLibTemplateCategory/list",
@@ -72,7 +72,7 @@
       data: data,
     });
   }
-  // 鏌ヨ闂嵎妯$増鍒嗙被鏍�
+  // 鏌ヨ闂嵎妯℃澘鍒嗙被鏍�
   export function getQRcode(data) {
     return request({
       url: "/qrcode/getQRcode",
@@ -112,7 +112,7 @@
         data: data,
       });
     }
-    // 闂嵎浠诲姟妯$増鏂板淇敼
+    // 闂嵎浠诲姟妯℃澘鏂板淇敼
    export function TaskQuestioncomit(data) {
     return request({
       url: "/smartor/svytemplateTask/saveOrUpdateTaskTemp",
diff --git a/src/api/AiCentre/SingleTask.js b/src/api/AiCentre/SingleTask.js
index 6273f1f..b3820ca 100644
--- a/src/api/AiCentre/SingleTask.js
+++ b/src/api/AiCentre/SingleTask.js
@@ -23,7 +23,7 @@
       method: "get",
     });
   }
-// 鏂板妯$増
+// 鏂板妯℃澘
 export function addhetask(data) {
     return request({
       url: "/smartor/serviceSubtask/add",
@@ -96,14 +96,14 @@
       });
     }
 
-    // 鑾峰彇浠诲姟妯$増璇︽儏
+    // 鑾峰彇浠诲姟妯℃澘璇︽儏
   export function TaskTemplategetinfo(id) {
     return request({
       url: "/smartor/ivrTaskTemplate/getInfo/"+id,
       method: "get",
     });
   }
-   // 浠诲姟妯$増鏂板淇敼
+   // 浠诲姟妯℃澘鏂板淇敼
    export function TaskTemplatecomit(data) {
     return request({
       url: "/smartor/ivrTaskTemplate/saveOrUpdateTempScript",
diff --git a/src/api/AiCentre/external.js b/src/api/AiCentre/external.js
index d81eb34..f44fa60 100644
--- a/src/api/AiCentre/external.js
+++ b/src/api/AiCentre/external.js
@@ -44,3 +44,12 @@
     data: data
   });
 }
+
+// 鎻愪氦闂嵎
+export function getsearchrResult(data) {
+  return request({
+    url: "/smartor/subtaskAnswer/selectPatQuestionResult",
+    method: "post",
+    data: data
+  });
+}
diff --git a/src/api/AiCentre/general.js b/src/api/AiCentre/general.js
index 08cb9a4..c5a6b90 100644
--- a/src/api/AiCentre/general.js
+++ b/src/api/AiCentre/general.js
@@ -1,6 +1,6 @@
 import request from "@/utils/request";
 
-// 鏌ヨ閫氱敤妯$増鍒楄〃
+// 鏌ヨ閫氱敤妯℃澘鍒楄〃
 export function getgenerallist(data) {
   return request({
     url: "/smartor/extemplate/list",
@@ -9,21 +9,21 @@
   });
 }
 
-// 鍒犻櫎閫氱敤妯$増
+// 鍒犻櫎閫氱敤妯℃澘
 export function delgeneralinfo(Id) {
     return request({
       url: "/smartor/extemplate/remove/" + Id,
       method: "get",
     });
   }
-    // 鏌ヨ閫氱敤妯$増璇︽儏鍒楄〃
+    // 鏌ヨ閫氱敤妯℃澘璇︽儏鍒楄〃
     export function getgeneralinfo(Id) {
     return request({
       url: "/smartor/extemplate/" + Id,
       method: "get",
     });
   }
-// 鏂板妯$増
+// 鏂板妯℃澘
 export function addgeneral(data) {
     return request({
       url: "/smartor/extemplate/add",
@@ -31,7 +31,7 @@
       data: data,
     });
   }
-//   淇敼閫氱敤妯$増
+//   淇敼閫氱敤妯℃澘
   export function editgeneral(data) {
     return request({
       url: "/smartor/extemplate/edit",
@@ -41,7 +41,7 @@
   }
 
 
-  // 鏂板閫氱敤妯$増鍒嗙被鏍�
+  // 鏂板閫氱敤妯℃澘鍒嗙被鏍�
   export function addgeneralclassify(data) {
     return request({
       url: "/smartor/category/add",
@@ -49,14 +49,14 @@
       data: data,
     });
   }
-  // 鍒犻櫎閫氱敤妯$増鍒嗙被
+  // 鍒犻櫎閫氱敤妯℃澘鍒嗙被
 export function delgeneralclassify(Id) {
   return request({
     url: "/smartor/category/remove/" + Id,
     method: "get",
   });
 }
-  // 鏌ヨ閫氱敤妯$増鍒嗙被鏍�
+  // 鏌ヨ閫氱敤妯℃澘鍒嗙被鏍�
   export function getgeneralclassify(data) {
     return request({
       url: "/smartor/category/list",
@@ -64,7 +64,7 @@
       data: data,
     });
   }
-  // 鏌ヨ閫氱敤妯$増璇濇湳鍒楄〃
+  // 鏌ヨ閫氱敤妯℃澘璇濇湳鍒楄〃
 export function getgeneravaluellist(data) {
     return request({
       url: "/smartor/extemplatescript/list",
@@ -72,22 +72,22 @@
       data: data,
     });
   }
-  
-  // 鍒犻櫎閫氱敤妯$増璇濇湳
+
+  // 鍒犻櫎閫氱敤妯℃澘璇濇湳
   export function delgeneravaluelinfo(Id) {
       return request({
         url: "/smartor/extemplatescript/remove/" + Id,
         method: "get",
       });
     }
-      // 鏌ヨ閫氱敤妯$増璇濇湳璇︽儏
+      // 鏌ヨ閫氱敤妯℃澘璇濇湳璇︽儏
       export function getgeneravaluelinfo(Id) {
       return request({
         url: "/smartor/extemplatescript/" + Id,
         method: "get",
       });
     }
-  // 鏂板妯$増璇濇湳
+  // 鏂板妯℃澘璇濇湳
   export function addgeneravaluel(data) {
       return request({
         url: "/smartor/extemplatescript/add",
@@ -95,7 +95,7 @@
         data: data,
       });
     }
-  //   淇敼閫氱敤妯$増璇濇湳
+  //   淇敼閫氱敤妯℃澘璇濇湳
     export function editgeneravaluel(data) {
       return request({
         url: "/smartor/extemplatescript/edit",
@@ -103,4 +103,3 @@
         data: data,
       });
     }
-  
\ No newline at end of file
diff --git a/src/api/AiCentre/publicity.js b/src/api/AiCentre/publicity.js
index 09a142c..06097d8 100644
--- a/src/api/AiCentre/publicity.js
+++ b/src/api/AiCentre/publicity.js
@@ -1,6 +1,6 @@
 import request from "@/utils/request";
 
-// 鏌ヨ瀹f暀妯$増鍒楄〃
+// 鏌ヨ瀹f暀妯℃澘鍒楄〃
 export function getlibrarylist(data) {
   return request({
     url: "/smartor/library/list",
@@ -9,14 +9,14 @@
   });
 }
 
-// 鍒犻櫎瀹f暀妯$増
+// 鍒犻櫎瀹f暀妯℃澘
 export function dellibraryinfo(Id) {
     return request({
       url: "/smartor/library/remove/" + Id,
       method: "get",
     });
   }
-    // 鏌ヨ瀹f暀妯$増璇︽儏鍒楄〃
+    // 鏌ヨ瀹f暀妯℃澘璇︽儏鍒楄〃
     export function getlibraryinfo(data) {
     return request({
       url: "/smartor/library/selectInfoByCondition",
@@ -24,7 +24,7 @@
       data: data,
     });
   }
-// 鏂板鎴栦慨鏀瑰鏁欐ā鐗�
+// 鏂板鎴栦慨鏀瑰鏁欐ā鏉�
 export function compilelibrary(data) {
     return request({
       url: "/smartor/library/saveOrUpdateHeLibrary",
@@ -32,7 +32,7 @@
       data: data,
     });
   }
-  // 鏂板鎴栦慨鏀瑰鏁欐ā鐗�
+  // 鏂板鎴栦慨鏀瑰鏁欐ā鏉�
 export function getcompiletask(data) {
   return request({
     url: "/smartor/heTaskSingle/queryHeTaskByCondition",
@@ -47,7 +47,7 @@
       data: data,
     });
   }
-  // 鏂板瀹f暀妯$増鍒嗙被鏍�
+  // 鏂板瀹f暀妯℃澘鍒嗙被鏍�
   export function addheLibraryAssort(data) {
     return request({
       url: "/smartor/heLibraryAssort/addtree",
@@ -55,7 +55,7 @@
       data: data,
     });
   }
-   // 鏂板瀹f暀妯$増鍒嗙被鏍�
+   // 鏂板瀹f暀妯℃澘鍒嗙被鏍�
    export function editheLibraryAssort(data) {
     return request({
       url: "/smartor/heLibraryAssort/edit",
@@ -63,14 +63,14 @@
       data: data,
     });
   }
-  // 鍒犻櫎瀹f暀妯$増鍒嗙被
+  // 鍒犻櫎瀹f暀妯℃澘鍒嗙被
 export function delheLibraryAssort(Id) {
   return request({
     url: "/smartor/heLibraryAssort/remove/" + Id,
     method: "get",
   });
 }
-  // 鏌ヨ瀹f暀妯$増鍒嗙被鏍�
+  // 鏌ヨ瀹f暀妯℃澘鍒嗙被鏍�
   export function getheLibraryAssort(data) {
     return request({
       url: "/smartor/heLibraryAssort/selectHeLibraryAssortList",
diff --git a/src/components/OptionalForm/index.vue b/src/components/OptionalForm/index.vue
index 853d4d4..c00251a 100644
--- a/src/components/OptionalForm/index.vue
+++ b/src/components/OptionalForm/index.vue
@@ -136,7 +136,7 @@
       required: true,
       default: () => [],
     },
-    // 5闂嵎妯$増銆�3闅忚妯$増銆�6瀹f暀
+    // 5闂嵎妯℃澘銆�3闅忚妯℃澘銆�6瀹f暀
     type: {
       type: Number,
       default: () => {
diff --git a/src/components/SFtable/index.vue b/src/components/SFtable/index.vue
index 723207c..f54eb81 100644
--- a/src/components/SFtable/index.vue
+++ b/src/components/SFtable/index.vue
@@ -159,7 +159,7 @@
       type: Boolean,
       default: true,
     },
-    // 1妯$増鍒楄〃 2閫変腑鎮h�� 3鎮h�呭垪琛�
+    // 1妯℃澘鍒楄〃 2閫変腑鎮h�� 3鎮h�呭垪琛�
     typeinfo: {
       type: Number,
       default: 1,
@@ -209,7 +209,7 @@
     clearSelection() {
       // 鍦ㄨ繖閲岀紪鍐欐竻闄ら�夋嫨鐨勯�昏緫
       this.$refs.multipleTableson.clearSelection();
-      
+
     },
   },
 };
diff --git a/src/views/Intelligentcenter/centercontrol/index.vue b/src/views/Intelligentcenter/centercontrol/index.vue
index 2456672..0ec428e 100644
--- a/src/views/Intelligentcenter/centercontrol/index.vue
+++ b/src/views/Intelligentcenter/centercontrol/index.vue
@@ -48,7 +48,7 @@
           <el-menu-item-group>
             <el-menu-item index="3-1">璇濇湳搴�</el-menu-item>
             <el-menu-item index="3-2">鎰忓浘绠$悊</el-menu-item>
-            <el-menu-item index="3-3">妯$増搴�</el-menu-item>
+            <el-menu-item index="3-3">妯℃澘搴�</el-menu-item>
           </el-menu-item-group>
           <!-- <el-submenu index="1-4">
             <template slot="title">閫夐」4</template>
diff --git a/src/views/followvisit/discharge/index.vue b/src/views/followvisit/discharge/index.vue
index 0fc2f84..3d30a2e 100644
--- a/src/views/followvisit/discharge/index.vue
+++ b/src/views/followvisit/discharge/index.vue
@@ -11,12 +11,12 @@
         label-width="98px"
       >
         <el-form-item label="浠诲姟鍚嶇О">
-          <el-input v-model="topqueryParams.name"></el-input>
+          <el-input v-model="topqueryParams.taskName"></el-input>
         </el-form-item>
-        <el-form-item label="瀹℃牳浜�">
-          <el-input v-model="topqueryParams.name"></el-input>
+        <el-form-item label="鍙戣捣浜�">
+          <el-input v-model="topqueryParams.createBy"></el-input>
         </el-form-item>
-        <el-form-item label="瀹℃牳鏃堕棿">
+        <!-- <el-form-item label="瀹℃牳鏃堕棿">
           <el-date-picker
             v-model="dateRange"
             style="width: 240px"
@@ -37,20 +37,12 @@
             >
             </el-option>
           </el-select>
-        </el-form-item>
-        <el-form-item label="妯$増" prop="status">
-          <el-select v-model="topqueryParams.topic" placeholder="璇烽�夋嫨">
-            <el-option
-              v-for="item in topicoptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option>
-          </el-select>
+        </el-form-item> -->
+        <el-form-item label="妯℃澘鍚嶇О" prop="status">
+          <el-input v-model="topqueryParams.templatename"></el-input>
         </el-form-item>
         <el-form-item label="鍑洪櫌闅忚鐘舵��" prop="status">
-          <el-select v-model="topqueryParams.topic" placeholder="璇烽�夋嫨">
+          <el-select v-model="topqueryParams.sendstate" placeholder="璇烽�夋嫨">
             <el-option
               v-for="item in topicoptions"
               :key="item.value"
@@ -86,7 +78,7 @@
             >鏂板</el-button
           >
         </el-col>
-        <el-col :span="1.5">
+        <!-- <el-col :span="1.5">
           <div class="documentf">
             <div class="document">
               <el-button
@@ -171,7 +163,7 @@
               >
             </div>
           </div>
-        </el-col>
+        </el-col> -->
 
         <!-- <el-col :span="1.5"> </el-col> -->
       </el-row>
@@ -300,7 +292,7 @@
           class-name="small-padding fixed-width"
         >
           <template slot-scope="scope">
-            <el-tooltip
+            <!-- <el-tooltip
               class="item"
               effect="dark"
               content="閲嶆柊闅忚"
@@ -314,8 +306,8 @@
                 ><span class="button-bb"
                   ><i class="el-icon-s-promotion"></i></span
               ></el-button>
-            </el-tooltip>
-            <el-tooltip
+            </el-tooltip> -->
+            <!-- <el-tooltip
               class="item"
               effect="dark"
               content="鍋滄"
@@ -328,8 +320,8 @@
                 v-hasPermi="['system:user:edit']"
                 ><span class="button-sc"><i class="el-icon-delete"></i></span
               ></el-button>
-            </el-tooltip>
-            <el-tooltip
+            </el-tooltip> -->
+            <!-- <el-tooltip
               class="item"
               effect="dark"
               content="鏌ョ湅浠诲姟璇︽儏"
@@ -342,7 +334,16 @@
                 v-hasPermi="['system:user:edit']"
                 ><span class="button-zx"><i class="el-icon-s-order"></i></span
               ></el-button>
-            </el-tooltip>
+            </el-tooltip> -->
+            <el-button
+              size="medium"
+              type="text"
+              @click="Seedetails(scope.row)"
+              v-hasPermi="['system:user:edit']"
+              ><span class="button-zx"
+                ><i class="el-icon-s-order"></i>鏌ョ湅璇︽儏</span
+              ></el-button
+            >
           </template>
         </el-table-column>
       </el-table>
@@ -649,7 +650,7 @@
       topqueryParams: {
         pageNum: 1,
         pageSize: 10,
-        hospType: 1,
+        serviceType:2,
       },
       propss: { multiple: true },
       options: [],
@@ -657,19 +658,15 @@
       topicoptions: [
         {
           value: 1,
-          label: "寰呭鏍�",
+          label: "琚鍙�",
         },
         {
           value: 2,
-          label: "鎵ц涓�",
+          label: "寰呭彂閫�",
         },
         {
           value: 3,
-          label: "鎵ц瀹屾垚",
-        },
-        {
-          value: 4,
-          label: "宸插仠姝�",
+          label: "宸插彂閫�",
         },
       ],
       serviceState: [],
@@ -902,10 +899,10 @@
       this.modificationVisible = true;
     },
     // 璺宠浆璇︽儏椤�
-    Seedetails() {
+    Seedetails(row) {
       this.$router.push({
         path: "/followvisit/record/detailpage/",
-        query: { id: "1" },
+        query: { taskid: row.taskid, patid: row.patid },
       });
     },
     // 瀵煎叆鎸夐挳
diff --git a/src/views/followvisit/outpatient/index.vue b/src/views/followvisit/outpatient/index.vue
index 9e1be79..ed8f323 100644
--- a/src/views/followvisit/outpatient/index.vue
+++ b/src/views/followvisit/outpatient/index.vue
@@ -12,12 +12,12 @@
         label-width="98px"
       >
         <el-form-item label="浠诲姟鍚嶇О">
-          <el-input v-model="topqueryParams.name"></el-input>
+          <el-input v-model="topqueryParams.taskName"></el-input>
         </el-form-item>
-        <el-form-item label="瀹℃牳浜�">
-          <el-input v-model="topqueryParams.name"></el-input>
+        <el-form-item label="鍙戣捣浜�">
+          <el-input v-model="topqueryParams.createBy"></el-input>
         </el-form-item>
-        <el-form-item label="瀹℃牳鏃堕棿">
+        <!-- <el-form-item label="瀹℃牳鏃堕棿">
           <el-date-picker
             v-model="dateRange"
             style="width: 240px"
@@ -27,31 +27,14 @@
             start-placeholder="寮�濮嬫棩鏈�"
             end-placeholder="缁撴潫鏃ユ湡"
           ></el-date-picker>
-        </el-form-item>
-        <el-form-item label="闅忚绫诲瀷" prop="status">
-          <el-select v-model="topqueryParams.topic" placeholder="璇烽�夋嫨">
-            <el-option
-              v-for="item in topicoptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="妯$増" prop="status">
-          <el-select v-model="topqueryParams.topic" placeholder="璇烽�夋嫨">
-            <el-option
-              v-for="item in topicoptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option>
-          </el-select>
+        </el-form-item> -->
+
+        <el-form-item label="妯℃澘鍚嶇О" prop="status">
+          <el-input v-model="topqueryParams.templatename"></el-input>
+
         </el-form-item>
         <el-form-item label="闂ㄨ瘖闅忚鐘舵��" prop="status">
-          <el-select v-model="topqueryParams.topic" placeholder="璇烽�夋嫨">
+          <el-select v-model="topqueryParams.sendstate" placeholder="璇烽�夋嫨">
             <el-option
               v-for="item in topicoptions"
               :key="item.value"
@@ -87,7 +70,7 @@
             >鏂板</el-button
           >
         </el-col>
-        <el-col :span="1.5">
+        <!-- <el-col :span="1.5">
           <div class="documentf">
             <div class="document">
               <el-button
@@ -101,8 +84,8 @@
               >
             </div>
           </div>
-        </el-col>
-        <el-col :span="1.5">
+        </el-col> -->
+        <!-- <el-col :span="1.5">
           <div class="documentf">
             <div class="document">
               <el-button
@@ -172,7 +155,7 @@
               >
             </div>
           </div>
-        </el-col>
+        </el-col> -->
 
         <!-- <el-col :span="1.5"> </el-col> -->
       </el-row>
@@ -299,7 +282,7 @@
           class-name="small-padding fixed-width"
         >
           <template slot-scope="scope">
-            <el-button
+            <!-- <el-button
               size="medium"
               type="text"
               @click="followupvisit(scope.row)"
@@ -316,7 +299,7 @@
               ><span class="button-sc"
                 ><i class="el-icon-delete"></i>鍋滄</span
               ></el-button
-            >
+            > -->
             <el-button
               size="medium"
               type="text"
@@ -633,28 +616,23 @@
       topqueryParams: {
         pageNum: 1,
         pageSize: 10,
-        hospType:2
-
+        serviceType:3,
       },
       propss: { multiple: true },
       options: [],
 
       topicoptions: [
-        {
+      {
           value: 1,
-          label: "寰呭鏍�",
+          label: "琚鍙�",
         },
         {
           value: 2,
-          label: "鎵ц涓�",
+          label: "寰呭彂閫�",
         },
         {
           value: 3,
-          label: "鎵ц瀹屾垚",
-        },
-        {
-          value: 4,
-          label: "宸插仠姝�",
+          label: "宸插彂閫�",
         },
       ],
       serviceState:[],
@@ -891,10 +869,10 @@
       this.modificationVisible = true;
     },
     // 璺宠浆璇︽儏椤�
-    Seedetails() {
+    Seedetails(row) {
       this.$router.push({
         path: "/followvisit/record/detailpage/",
-        query: { id: "1" },
+        query: { taskid: row.taskid, patid: row.patid },
       });
     },
     // 瀵煎叆鎸夐挳
diff --git a/src/views/followvisit/record/detailpage/index.vue b/src/views/followvisit/record/detailpage/index.vue
index a58cf82..58ee792 100644
--- a/src/views/followvisit/record/detailpage/index.vue
+++ b/src/views/followvisit/record/detailpage/index.vue
@@ -3,39 +3,44 @@
   <div class="Followupdetailspage">
     <div class="Followuserinfo">
       <div>
-        <div class="userinfo-text"><span>闅忚璇︽儏</span> <el-button type="success">闅忚鍚庣煭淇�</el-button></div>
-        
+        <div class="userinfo-text">{{ sendname }}<span>鎮h�呮湇鍔¤鎯呰鎯�</span>
+          <!-- <el-button type="success">闅忚鍚庣煭淇�</el-button> -->
+        </div>
       </div>
       <div>
-        <el-table :data="tableDatatop" style="width: 100%">
+        <el-table :data="logsheetlist" style="width: 100%">
           <el-table-column
-            prop="beneficiaryname"
+            prop="sendname"
             align="center"
             label="濮撳悕"
           >
           </el-table-column>
           <el-table-column
-            prop="beneficiaryname"
+            prop="sendstate"
             align="center"
-            label="閫氱煡鐘舵��"
+            label="鏈嶅姟鐘舵��"
           >
           </el-table-column>
           <el-table-column
-            prop="title"
+            prop="updateTime"
             align="center"
             label="瀹屾垚鏃堕棿"
-            
+            width="200"
+            show-overflow-tooltip
           >
+          </el-table-column>
+          <el-table-column prop="taskName" align="center" width="200"
+          show-overflow-tooltip label="浠诲姟鍚嶇О">
           </el-table-column>
           <el-table-column
-            prop="idcardno"
+            prop="templatename"
             align="center"
-            label="瀹℃牳鎰忚"
-           
+            label="鏈嶅姟妯℃澘"
+            width="200"
+            show-overflow-tooltip
           >
           </el-table-column>
-          <el-table-column prop="depositbank" align="center" label="闅忚鏂规">
-          </el-table-column>
+
           <el-table-column
             prop="bankcardno"
             align="center"
@@ -43,14 +48,25 @@
             width="210"
           >
           </el-table-column>
-          <el-table-column prop="price" align="center" label="琚彨鍙风爜">
-          </el-table-column>
-          <el-table-column prop="quantity"  width="200" align="center" label="瀹℃牳鎰忚">
-          </el-table-column>
-          <el-table-column prop="amount"  width="200" align="center" label="閫氱煡缁撴灉">
-          </el-table-column>
-          <el-table-column prop="taxedamount"  width="200" align="center" label="鍖荤敓鎰忚">
-          </el-table-column>
+          <el-table-column
+          label="鎿嶄綔"
+          fixed="right"
+          align="center"
+          width="200"
+          class-name="small-padding fixed-width"
+        >
+          <template slot-scope="scope">
+            <el-button
+              size="medium"
+              type="text"
+              @click="Seedetails(scope.row)"
+              v-hasPermi="['system:user:edit']"
+              ><span class="button-zx"
+                ><i class="el-icon-s-order"></i>鏌ョ湅鏈嶅姟</span
+              ></el-button
+            >
+          </template>
+        </el-table-column>
         </el-table>
       </div>
     </div>
@@ -58,52 +74,102 @@
       <el-tabs type="border-card">
         <el-tab-pane>
           <span class="mulsz" slot="label"
-            ><i class="el-icon-headset"></i> 璇煶璇︽儏1</span
+            ><i class="el-icon-notebook-1"></i> 闂嵎闅忚缁撴灉</span
+          >
+          <div class="CONTENT">
+      <div class="title">{{ taskname ? taskname : "闂嵎" }}</div>
+      <div class="preview-left">
+        <!-- 鍗曢�� -->
+        <div
+          class="topic-dev"
+          v-for="(item, index) in tableDatatop"
+          :key="item.aaa"
+        >
+          <div class="scriptTopic-dev" :key="index" v-if="item.scriptType == 1">
+            <div class="dev-text">
+              {{ index + 1 }}銆乕鍗曢�塢<span>{{ item.scriptContent }}</span>
+            </div>
+            <div class="dev-xx">
+              <el-radio-group
+                v-model="item.scriptResult"
+                @change="handleOptionChange($event, index, item)"
+              >
+                <el-radio
+                  v-for="(items, index) in item.svyLibTemplateTargetoptions"
+                  :key="index"
+                  :label="items.optioncontent"
+                  >{{ items.optioncontent }}</el-radio
+                >
+              </el-radio-group>
+            </div>
+            <div v-show="item.prompt">
+              <el-alert :title="item.prompt" type="warning"> </el-alert>
+            </div>
+          </div>
+          <!-- 澶氶�� -->
+          <div class="scriptTopic-dev" :key="index" v-if="item.scriptType == 2">
+            <div class="dev-text">
+              {{ index + 1 }}銆乕澶氶�塢<span>{{ item.scriptContent }}</span>
+            </div>
+            <div class="dev-xx">
+              <el-checkbox-group
+                v-model="item.scriptResult"
+                @change="updateScore($event, index, item)"
+              >
+                <el-checkbox
+                  @change="$forceUpdate()"
+                  v-for="(items, indexs) in item.svyLibTemplateTargetoptions"
+                  :key="indexs"
+                  :label="items.optioncontent"
+                >
+                  {{ items.optioncontent }}
+                </el-checkbox>
+              </el-checkbox-group>
+            </div>
+            <div v-show="item.prompt && item.scriptResult[0]">
+              <el-alert :title="item.prompt" type="warning"> </el-alert>
+            </div>
+          </div>
+          <!-- 濉┖ -->
+          <div class="scriptTopic-dev" :key="index" v-if="item.scriptType == 4">
+            <div class="dev-text">
+              {{ index + 1 }}銆乕闂瓟]<span>{{ item.scriptContent }}</span>
+            </div>
+            <div class="dev-xx">
+              <el-input
+                type="textarea"
+                :rows="2"
+                placeholder="璇疯緭鍏ョ瓟妗�"
+                v-model="item.scriptResult"
+                clearable
+              >
+              </el-input>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+        </el-tab-pane>
+        <el-tab-pane>
+          <span class="mulsz" slot="label"
+            ><i class="el-icon-headset"></i> 璇煶闅忚璇︽儏</span
           >
           <div class="borderdiv">
             <div>
               <div class="leftside">
-                <i class="el-icon-phone-outline"></i><span>璇存拻鍟婂皬璇�</span>
+                <i class="el-icon-phone-outline"></i><span>鎮ㄤ粖澶╄韩浣撴儏鍐垫�庝箞鏍�</span>
               </div>
               <div class="offside">
                 <i class="el-icon-user"></i>
                 <div class="offside-value">
                   <el-input v-model="input"></el-input>
-                  <el-radio v-model="radio" label="1">澶囬�夐」</el-radio>
-                  <el-radio v-model="radio" label="2">澶囬�夐」2</el-radio>
-                  <el-radio v-model="radio" label="3">澶囬�夐」3</el-radio>
-                  <el-radio v-model="radio" label="4">澶囬�夐」4</el-radio>
+                  <el-radio v-model="radio" label="1">寰堟</el-radio>
+                  <el-radio v-model="radio" label="2">杩樺彲浠�</el-radio>
+                  <el-radio v-model="radio" label="3">涓嶅お濂�</el-radio>
+                  <el-radio v-model="radio" label="4">姣旇緝宸�</el-radio>
                 </div>
               </div>
             </div>
-          </div>
-        </el-tab-pane>
-        <el-tab-pane>
-          <span class="mulsz" slot="label"
-            ><i class="el-icon-headset"></i> 璇煶璇︽儏2</span
-          >
-          <div class="borderdiv">璇煶璇︽儏2</div>
-        </el-tab-pane>
-        <el-tab-pane>
-          <span class="mulsz" slot="label"
-            ><i class="el-icon-notebook-1"></i> 璇煶淇℃伅</span
-          >
-          <div class="borderdiv">璇煶淇℃伅</div>
-        </el-tab-pane>
-        <el-tab-pane>
-          <span class="mulsz" slot="label"
-            ><i class="el-icon-phone-outline"></i> 澶栧懠淇℃伅</span
-          >
-          <div class="borderdiv">澶栧懠淇℃伅</div>
-        </el-tab-pane>
-        <el-tab-pane>
-          <span class="mulsz" slot="label"
-            ><i class="el-icon-s-operation"></i> 鏍囩鐘舵��</span
-          >
-          <div class="borderdiv">
-            <el-radio v-model="radio" label="1">涓嶅鐞�</el-radio>
-            <el-radio v-model="radio" label="2">缁х画璺熻釜</el-radio
-            ><el-radio v-model="radio" label="3">閫氱煡鍖婚櫌灏辫瘖</el-radio>
           </div>
         </el-tab-pane>
       </el-tabs>
@@ -112,20 +178,63 @@
 </template>
 
 <script>
+import {
+  getsearchrResult,
+  getTaskservelist,
+
+} from "@/api/AiCentre/index";
 export default {
   data() {
     return {
       radio: "1",
       userid: "",
-      input: "",
+      input: "浠婂ぉ韬綋杩樹笉閿�",
       radio: "2",
-      tableDatatop: [],
+      taskname:'',
+      tableDatatop: [],//棰樼洰琛�
+      logsheetlist:[],
+      sendname:null,
+      serviceType:null,
+      taskid:null,
+      patid:null,
     };
   },
 
-  created() {},
+  created() {
+    this.taskid=this.$route.query.taskid;
+    this.sendname=this.$route.query.sendname;
+    this.patid=this.$route.query.patid;
+    this.serviceType=this.$route.query.serviceType;
+    this.getsearchrResult();
+    this.getTaskservelist();
+  },
 
-  methods: {},
+
+  methods: {
+    // 鑾峰彇闂嵎鏁版嵁
+    getsearchrResult(){
+      getsearchrResult({
+        taskid:this.taskid,
+        patid:this.patid,
+      }).then((res) => {
+        if (res.code === 200) {
+          this.tableDatatop = res.data.scriptResult.script;
+          this.taskname = res.data.taskName;
+        }
+      });
+    },
+    // 鑾峰彇鎮h�呰褰�
+    getTaskservelist(){
+      getTaskservelist({
+        patid:this.patid,
+      }).then((res) => {
+        if (res.code == 200) {
+          this.logsheetlist = res.rows;
+        }
+      });
+    },
+    Seedetails(){},
+  },
 };
 </script>
 
@@ -180,6 +289,31 @@
     }
   }
 }
+.CONTENT {
+    padding: 10px;
+    .title {
+      font-size: 22px;
+      font-weight: bold;
+      margin-bottom: 20px;
+      text-align: center;
+    }
+  }
+  .preview-left {
+  margin: 20px;
+  //   margin: 20px;
+  padding: 30px;
+  // background: #ffff;
+  border: 1px solid #dcdfe6;
+  -webkit-box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.12),
+    0 0 6px 0 rgba(0, 0, 0, 0.04);
+  .topic-dev {
+    margin-bottom: 25px;
+    font-size: 20px !important;
+    .dev-text {
+      margin-bottom: 10px;
+    }
+  }
+}
 ::v-deep.offside-value .el-radio__label {
   color: #fff;
 }
diff --git a/src/views/followvisit/record/index.vue b/src/views/followvisit/record/index.vue
index 89eea43..cd65bf0 100644
--- a/src/views/followvisit/record/index.vue
+++ b/src/views/followvisit/record/index.vue
@@ -38,7 +38,7 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="妯$増" prop="status">
+        <el-form-item label="妯℃澘" prop="status">
           <el-select v-model="topqueryParams.topic" placeholder="璇烽�夋嫨">
             <el-option
               v-for="item in topicoptions"
diff --git a/src/views/followvisit/satisfaction/particulars/index.vue b/src/views/followvisit/satisfaction/particulars/index.vue
index d9c0b3f..5b14aaf 100644
--- a/src/views/followvisit/satisfaction/particulars/index.vue
+++ b/src/views/followvisit/satisfaction/particulars/index.vue
@@ -7,7 +7,7 @@
           <el-step
             icon="el-icon-edit"
             title="鍩虹淇℃伅"
-            description="閫夋嫨瀹f暀妯$増銆佸舰寮忕瓑鍩虹淇℃伅"
+            description="閫夋嫨瀹f暀妯℃澘銆佸舰寮忕瓑鍩虹淇℃伅"
           ></el-step>
           <el-step
             icon="el-icon-user"
@@ -22,7 +22,7 @@
       <!-- 鍩烘湰淇℃伅 -->
       <div v-if="Editprogress == 1">
         <el-alert
-          title="閫夋嫨瀹f暀妯$増銆佸舰寮忕瓑鍩虹淇℃伅"
+          title="閫夋嫨瀹f暀妯℃澘銆佸舰寮忕瓑鍩虹淇℃伅"
           type="success"
           effect="dark"
         >
@@ -65,10 +65,10 @@
                     <el-radio :label="6">澶氫汉</el-radio>
                   </el-radio-group>
                 </el-form-item>
-                <el-form-item label="璇煶妯$増" prop="region">
-                  <el-select v-model="form.region" placeholder="璇烽�夋嫨妯$増">
-                    <el-option label="涓�鍙锋ā鐗�" value="shanghai"></el-option>
-                    <el-option label="浜屽彿妯$増" value="beijing"></el-option>
+                <el-form-item label="璇煶妯℃澘" prop="region">
+                  <el-select v-model="form.region" placeholder="璇烽�夋嫨妯℃澘">
+                    <el-option label="涓�鍙锋ā鏉�" value="shanghai"></el-option>
+                    <el-option label="浜屽彿妯℃澘" value="beijing"></el-option>
                   </el-select>
                 </el-form-item>
               </el-form>
@@ -540,7 +540,7 @@
       // 闈炲涓鐢�
       multiple: true,
       // 鐢ㄦ埛琛ㄦ牸鏁版嵁
-      userList: [], //妯$増鍒楄〃
+      userList: [], //妯℃澘鍒楄〃
       patientuserList: [], //閫夋嫨鎮h�呭垪琛�
       sonuserList: [], //閫変腑鎮h�呭垪琛�
       tasktopic: null, //鏂板绫诲瀷
@@ -676,7 +676,7 @@
     resetForm(formName) {
       this.$refs[formName].resetFields();
     },
-    // 棰勮妯$増
+    // 棰勮妯℃澘
     PreviewTemplate() {},
     Acknowledgereference() {
       this.quote = true;
diff --git a/src/views/followvisit/tasklist/FollowupDetails/index.vue b/src/views/followvisit/tasklist/FollowupDetails/index.vue
index f4b132f..4a9248b 100644
--- a/src/views/followvisit/tasklist/FollowupDetails/index.vue
+++ b/src/views/followvisit/tasklist/FollowupDetails/index.vue
@@ -54,7 +54,7 @@
             <div class="headline">浠诲姟璁剧疆</div>
             <div class="jic-value">
               <el-form ref="form" :model="form" label-width="80px">
-                <el-form-item label="寮曠敤妯$増" prop="desc">
+                <el-form-item label="寮曠敤妯℃澘" prop="desc">
                   <el-cascader
                     class="demo-cascader"
                     v-model="form.templatevalue"
@@ -72,7 +72,7 @@
                   </el-select>
                   <div style="display: flex; margin-top: 20px">
                     <div class="PreviewTemplate" @click="PreviewTemplate()">
-                      棰勮妯$増
+                      棰勮妯℃澘
                     </div>
                     <el-button type="primary" @click="Acknowledgereference"
                       >纭寮曠敤</el-button
@@ -429,7 +429,7 @@
             <el-form-item label="閫夋嫨闂嵎:">
               <el-row :gutter="20">
                 <el-col :span="6"
-                  ><el-select v-model="form.region" placeholder="璇烽�夋嫨妯$増">
+                  ><el-select v-model="form.region" placeholder="璇烽�夋嫨妯℃澘">
                     <el-option label="鍖哄煙涓�" value="shanghai"></el-option>
                     <el-option
                       label="鍖哄煙浜�"
@@ -534,7 +534,7 @@
                   ></el-col>
                 </el-row>
               </el-form-item>
-              <el-form-item label="Ai澶栧懠妯$増">
+              <el-form-item label="Ai澶栧懠妯℃澘">
                 <el-select v-model="form.value" placeholder="璇烽�夋嫨">
                   <el-option
                     v-for="item in options"
@@ -581,12 +581,12 @@
                   <el-radio label="AI鐢佃瘽"></el-radio>
                 </el-radio-group>
               </el-form-item>
-              <el-form-item label="鎺ㄩ�佹ā鐗�">
+              <el-form-item label="鎺ㄩ�佹ā鏉�">
                 <el-row :gutter="20">
                   <el-col :span="6"
                     ><el-select
                       v-model="form.value"
-                      placeholder="璇烽�夋嫨鐭俊妯$増"
+                      placeholder="璇烽�夋嫨鐭俊妯℃澘"
                     >
                       <el-option
                         v-for="item in options"
@@ -599,7 +599,7 @@
                   <el-col :span="6"
                     ><el-select
                       v-model="form.value"
-                      placeholder="璇烽�夋嫨寰俊妯$増"
+                      placeholder="璇烽�夋嫨寰俊妯℃澘"
                     >
                       <el-option
                         v-for="item in options"
@@ -1153,7 +1153,7 @@
     resetForm(formName) {
       this.$refs[formName].resetFields();
     },
-    // 棰勮妯$増
+    // 棰勮妯℃澘
     PreviewTemplate() {},
     Acknowledgereference() {
       this.quote = true;
diff --git a/src/views/followvisit/tasklist/index.vue b/src/views/followvisit/tasklist/index.vue
index 5f91eea..e1e59cb 100644
--- a/src/views/followvisit/tasklist/index.vue
+++ b/src/views/followvisit/tasklist/index.vue
@@ -811,13 +811,21 @@
     },
     // 鍒犻櫎浠诲姟
     deletefn(row) {
-      delTaskInfo(row.taskid).then((res) => {
-        console.log(2);
-        if (res.code == 200) {
-          this.getList();
-          this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
-        }
-      });
+      this.$modal
+        .confirm(
+          '鏄惁鍒犻櫎浠诲姟鍚嶇О涓�"' +
+            row.taskName +
+            '"鐨勬暟鎹」锛屽垹闄ゅ悗涓嶅彲鎾ゅ洖锛佹槸鍚︾户缁�'
+        )
+        .then(() => {
+          delTaskInfo(row.taskid).then((res) => {
+            if (res.code == 200) {
+              this.getList();
+              this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+            }
+          });
+        })
+        .catch(() => {});
     },
     // 浠诲姟鍙戣捣
     sponsor(row) {
diff --git a/src/views/knowledge/education/compilequer/index.vue b/src/views/knowledge/education/compilequer/index.vue
index 860ede0..ca6bc22 100644
--- a/src/views/knowledge/education/compilequer/index.vue
+++ b/src/views/knowledge/education/compilequer/index.vue
@@ -828,7 +828,7 @@
 
     // --------------------------
 
-    // 棰勮妯$増
+    // 棰勮妯℃澘
     PreviewTemplate() {
       this.drawer = true;
     },
diff --git a/src/views/knowledge/education/index.vue b/src/views/knowledge/education/index.vue
index 9216623..1dde0b4 100644
--- a/src/views/knowledge/education/index.vue
+++ b/src/views/knowledge/education/index.vue
@@ -444,13 +444,13 @@
         <div class="qrcode-img"></div>
       </div>
     </el-dialog>
-    <el-dialog title="妯$増棰勮" :visible.sync="previewtf" width="60%">
+    <el-dialog title="妯℃澘棰勮" :visible.sync="previewtf" width="60%">
       <div class="preview-left">
         <!-- 鍗曢�� -->
         <div v-html="richText"></div>
       </div>
       <!-- <span slot="footer" class="dialog-footer">
-        <el-button @click="previewGo">鍓嶅線妯$増璇︽儏淇敼</el-button>
+        <el-button @click="previewGo">鍓嶅線妯℃澘璇︽儏淇敼</el-button>
         <el-button type="primary" @click="previewFn">纭浣跨敤</el-button>
       </span> -->
     </el-dialog>
diff --git a/src/views/knowledge/questionbank/particulars/index.vue b/src/views/knowledge/questionbank/particulars/index.vue
index a615daf..0adb83f 100644
--- a/src/views/knowledge/questionbank/particulars/index.vue
+++ b/src/views/knowledge/questionbank/particulars/index.vue
@@ -103,6 +103,7 @@
                   ><el-form-item label="鏄惁鍙敤">
                     <el-radio-group v-model="topicobj.isavailable">
                       <el-radio
+                      @change="$forceUpdate()"
                         v-for="(item, index) in usable"
                         :label="item.value"
                         >{{ item.label }}</el-radio
@@ -114,6 +115,7 @@
                   <el-form-item label="鏄惁蹇呭~">
                     <el-radio-group v-model="topicobj.ismandatory">
                       <el-radio
+                      @change="$forceUpdate()"
                         v-for="(item, index) in required"
                         :label="item.value"
                         >{{ item.label }}</el-radio
@@ -842,12 +844,10 @@
       if (this.$route.query.categoryid) {
         this.topicobj.categoryid = Number(this.$route.query.categoryid);
       }
-      this.topicobj.isavailable = "1";
-      this.topicobj.language = "鏅�氳瘽";
+
       // 鍒嗙被
       getissueclassify({}).then((res) => {
         this.classifylist = res.rows;
-        console.log(this.classifylist, "鍒嗙被");
       });
       if (!this.id) {
         return;
@@ -1060,8 +1060,6 @@
           this.topicobj.scriptContent = row.targetdesc;
           this.topicobj.targetid = row.id;
           this.topicobj.targetname = row.targetname;
-          this.topicobj.isavailable = "0";
-          this.topicobj.language = "鏅�氳瘽";
           this.topicobj.svyLibScriptOptions = [];
           const labellist = row.targetoptionList;
           labellist.forEach((item) => {
diff --git a/src/views/knowledge/questionnaire/compilequer/index.vue b/src/views/knowledge/questionnaire/compilequer/index.vue
index 83ebd65..f8218e2 100644
--- a/src/views/knowledge/questionnaire/compilequer/index.vue
+++ b/src/views/knowledge/questionnaire/compilequer/index.vue
@@ -198,37 +198,56 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="閫傜敤闄㈠尯" prop="region">
-            <el-select
-              v-model="ruleForm.campus"
-              size="medium"
-              filterable
-              placeholder="璇烽�夋嫨鍒嗙被"
+          <el-row>
+            <el-col :span="10"
+              ><el-form-item label="閫傜敤闄㈠尯" prop="region">
+                <el-select
+                  v-model="ruleForm.campus"
+                  size="medium"
+                  filterable
+                  placeholder="璇烽�夋嫨鍒嗙被"
+                >
+                  <el-option
+                    class="ruleFormaa"
+                    v-for="item in courtyardlist"
+                    :key="item.label"
+                    :label="item.label"
+                    :value="item.label"
+                  >
+                  </el-option>
+                </el-select> </el-form-item
+            ></el-col>
+            <el-col :span="12"
+              ><el-form-item label="閫傜敤绉戝" prop="region">
+                <el-cascader
+                style="width: 400px;"
+                  v-model="tempDetpRelevanceslist"
+                  :options="deptList"
+                  :props="props"
+                  :show-all-levels="false"
+                  clearable
+                >
+                  <template slot-scope="{ node, data }">
+                    <span>{{ data.deptName }}</span>
+                    <span v-if="!node.isLeaf">
+                      ({{ data.children.length }})
+                    </span>
+                  </template>
+                </el-cascader>
+              </el-form-item></el-col
             >
-              <el-option
-                class="ruleFormaa"
-                v-for="item in courtyardlist"
-                :key="item.label"
-                :label="item.label"
-                :value="item.label"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="閫傜敤绉戝" prop="region">
-            <el-cascader
-              v-model="tempDetpRelevanceslist"
-              :options="deptList"
-              :props="props"
-              :show-all-levels="false"
-              clearable
+          </el-row>
+          <el-form-item label="闂嵎缁撴潫璇�">
+            <el-input
+              style="width: 40vw"
+              type="textarea"
+              autosize
+              placeholder="璇疯緭鍏ュ唴瀹�"
+              v-model="ruleForm.conclusion"
             >
-              <template slot-scope="{ node, data }">
-                <span>{{ data.deptName }}</span>
-                <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
-              </template>
-            </el-cascader>
-          </el-form-item>
+            </el-input
+          ></el-form-item>
+
           <el-form-item>
             <el-button type="success" @click="nextstep('ruleForm')"
               >涓嬩竴姝�</el-button
@@ -497,6 +516,16 @@
                     <el-radio :label="0">鍚�</el-radio>
                   </el-radio-group>
                 </el-form-item>
+                <el-form-item label="閫変腑鎻愮ず" v-if="topicobj.scriptType != 1">
+                  <el-input
+                    style="width: 24vw"
+                    type="textarea"
+                    autosize
+                    placeholder="璇疯緭鍏ュ唴瀹�"
+                    v-model="topicobj.prompt"
+                  >
+                  </el-input
+                ></el-form-item>
                 <div
                   v-if="topicobj.scriptType == 1 || topicobj.scriptType == 2"
                 >
@@ -565,10 +594,10 @@
                           </el-input> </el-form-item
                       ></el-col>
                     </el-row>
-                    <el-row :gutter="10">
+                    <el-row :gutter="10" v-if="topicobj.scriptType == 1">
                       <el-form-item label="閫変腑鎻愮ず">
                         <el-input
-                          style="width: 20vw"
+                          style="width: 24vw"
                           type="textarea"
                           autosize
                           placeholder="璇疯緭鍏ュ唴瀹�"
@@ -1069,7 +1098,7 @@
                         </el-radio-group>
                       </el-form-item>
                     </el-row>
-                    <el-row :gutter="10">
+                    <el-row :gutter="10" v-if="item.scriptType == 1">
                       <el-form-item label="閫変腑鎻愮ず">
                         <el-input
                           style="width: 400px"
@@ -1277,9 +1306,23 @@
     };
   },
   activated() {
+    console.log(this.id);
+
     if (this.id != this.$route.query.id) {
       this.getissueinfo();
       this.gettabList();
+    } else {
+      this.ruleForm.svyTemplateLibScripts =
+        this.ruleForm.svyTemplateLibScripts.filter(
+          (item) => item.isoperation != 3
+        );
+      this.ruleForm.svyLibTemplateTagList =
+        this.ruleForm.svyLibTemplateTagList.filter(
+          (item) => item.isoperation != 3
+        );
+      this.delScriptVOList = [];
+      this.$forceUpdate();
+      console.log(this.ruleForm.svyTemplateLibScripts);
     }
   },
   created() {
@@ -1342,6 +1385,7 @@
         tempDetpRelevances: [],
         svyLibTemplateTagList: [],
       };
+      this.topicobj = {};
 
       if (this.id) {
         getQtemplateobj({ svyid: this.id }).then((res) => {
@@ -1372,7 +1416,9 @@
     },
     submitForm(formName) {
       this.$modal.loading("姝e湪淇淇濆瓨鏁版嵁锛岃绋嶅��...");
-      this.ruleForm.suitway = this.ruleForm.suitway.join(",");
+      if (this.ruleForm.suitway) {
+        this.ruleForm.suitway = this.ruleForm.suitway.join(",");
+      }
       if (!this.ruleForm.categoryid) {
         this.ruleForm.categoryid = -1;
       }
@@ -1471,7 +1517,6 @@
     // 鏂板棰樼洰
     addtopic(row) {
       row.isoperation = 1;
-      console.log(row, "row");
       row.svyLibScriptOptions.forEach((item) => {
         item.isoperation = 1;
       });
@@ -1490,7 +1535,6 @@
     handleUpdate(row) {
       this.topicobj = row;
       this.radioas = "";
-      console.log(this.topicobj, "鐪嬫暟鎹�");
       // getissuelist({ svyid: row.svyid }).then((res) => {
       // });
     },
@@ -1545,7 +1589,7 @@
           this.drawer = false;
 
           this.sortFn();
-          this.$modal.msgSuccess("棰樼洰鏂板鎴愬姛锛屼繚瀛樻ā鐗堝け鏁�");
+          this.$modal.msgSuccess("棰樼洰鏂板鎴愬姛锛屼繚瀛樻ā鏉垮け鏁�");
         });
     },
     // 鏂板鍙橀噺
@@ -1799,7 +1843,7 @@
     sumArray(arr) {
       // const arrsum = arr;
       // arrsum.forEach((item) => {
-      //   // 鍒ゆ柇棰樼洰鍜屾ā鐗堝眰绾�
+      //   // 鍒ゆ柇棰樼洰鍜屾ā鏉垮眰绾�
       //   console.log(item, "涓�鏉¢摼璺�");
 
       //   const totalScore = item.reduce((accumulator, current) => {
@@ -1826,7 +1870,7 @@
       if (allGreaterThanTen) {
         this.$modal.msgSuccess("鍒嗗�兼牎楠屾垚鍔�");
       } else {
-        this.$modal.msgError("棰樼洰鍒嗗�肩疮鍔犲拰妯$増鍒嗗�间笉绗�");
+        this.$modal.msgError("棰樼洰鍒嗗�肩疮鍔犲拰妯℃澘鍒嗗�间笉绗�");
       }
     },
 
diff --git a/src/views/knowledge/questionnaire/index.vue b/src/views/knowledge/questionnaire/index.vue
index 51cef71..dccfa92 100644
--- a/src/views/knowledge/questionnaire/index.vue
+++ b/src/views/knowledge/questionnaire/index.vue
@@ -401,7 +401,7 @@
         </div>
       </div>
     </el-dialog> -->
-    <!-- 闂嵎妯$増棰勮 -->
+    <!-- 闂嵎妯℃澘棰勮 -->
     <el-dialog title="闅忚棰樼洰棰勮" :visible.sync="topicVisible" width="50%">
       <div class="preview-left">
         <!-- 鍗曢�� -->
diff --git a/src/views/outsideChainwt.vue b/src/views/outsideChainwt.vue
index 2215dc2..483c35e 100644
--- a/src/views/outsideChainwt.vue
+++ b/src/views/outsideChainwt.vue
@@ -14,7 +14,10 @@
               {{ index + 1 }}銆乕鍗曢�塢<span>{{ item.scriptContent }}</span>
             </div>
             <div class="dev-xx">
-              <el-radio-group v-model="item.scriptResult" @change="handleOptionChange($event, index, item)">
+              <el-radio-group
+                v-model="item.scriptResult"
+                @change="handleOptionChange($event, index, item)"
+              >
                 <el-radio
                   v-for="(items, index) in item.svyLibTemplateTargetoptions"
                   :key="index"
@@ -23,6 +26,9 @@
                 >
               </el-radio-group>
             </div>
+            <div v-show="item.prompt">
+              <el-alert :title="item.prompt" type="warning"> </el-alert>
+            </div>
           </div>
           <!-- 澶氶�� -->
           <div class="scriptTopic-dev" :key="index" v-if="item.scriptType == 2">
@@ -30,7 +36,10 @@
               {{ index + 1 }}銆乕澶氶�塢<span>{{ item.scriptContent }}</span>
             </div>
             <div class="dev-xx">
-              <el-checkbox-group v-model="item.scriptResult">
+              <el-checkbox-group
+                v-model="item.scriptResult"
+                @change="updateScore($event, index, item)"
+              >
                 <el-checkbox
                   @change="$forceUpdate()"
                   v-for="(items, indexs) in item.svyLibTemplateTargetoptions"
@@ -40,6 +49,9 @@
                   {{ items.optioncontent }}
                 </el-checkbox>
               </el-checkbox-group>
+            </div>
+            <div v-show="item.prompt && item.scriptResult[0]">
+              <el-alert :title="item.prompt" type="warning"> </el-alert>
             </div>
           </div>
           <!-- 濉┖ -->
@@ -63,10 +75,18 @@
       <el-form :model="formData" label-width="80px">
         <el-form-item>
           <el-button type="primary" @click="cache(true)">鎻愪氦闂嵎</el-button>
-          <el-button type="primary" @click="cache">缂撳瓨闂嵎</el-button>
+          <!-- <el-button type="primary" @click="cache">缂撳瓨闂嵎</el-button> -->
         </el-form-item>
       </el-form>
     </div>
+    <el-dialog
+      :visible.sync="dialogVisible"
+      width="50%"
+    >
+      <div>
+        <el-alert :title="revisitAfter" type="success"> </el-alert>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -84,6 +104,8 @@
       taskid: 355,
       patid: 265823,
       questionList: null,
+      revisitAfter: null,
+      dialogVisible:false,
       // 鍓嶇鍏挜
       publicKey:
         "MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKR0yHv0rbJWQE+Sc7/FwpW66qMd9qX2k6z+SDgkSdxWh/1GbBoAP7bDQQRF6vXmoKsD2ya42H6XRLSDXAoayuMCAwEAAQ== ",
@@ -97,7 +119,12 @@
       },
     };
   },
-
+  mounted() {
+    window.addEventListener("beforeunload", this.cache);
+  },
+  beforeDestroy() {
+    window.removeEventListener("beforeunload", this.cache);
+  },
   created() {
     this.getQuestionnaire();
   },
@@ -113,13 +140,8 @@
       //   "CVk0j8O86AeCqhV5WPsBBYDg9fec0wDoDlP9imYK4wDBNIkxywZzMJEGlPagOxnq6qr2WYZo0U8MUGWRGnq8ZA==";
       // this.taskid = this.decrypt(taskid);
       // this.patid = this.decrypt(patid);
-
-      // this.$modal.msgSuccess("鐢ㄦ埛id涓�" + this.patid);
-      // this.$modal.msgSuccess("浠诲姟id涓�" + this.taskid);
       // let taskids = this.encrypt(this.taskid);
       // let patids = this.encrypt(this.patid);
-      console.log(this.$route.query.param1);
-      console.log(this.$route.query.param2);
       // 鍏堝彇缂撳瓨
       getCachequestionnaire({ param1: this.taskid, param2: this.patid }).then(
         (res) => {
@@ -127,8 +149,10 @@
             this.questionList = res.data;
             if (this.questionList[0]) {
               this.questionList.forEach((item) => {
-                if (item.scriptResult) {
+                if (item.scriptResult && item.scriptType != 2) {
                   item.scriptResult = JSON.parse(item.scriptResult);
+                } else if (item.scriptResult && item.scriptType == 2) {
+                  item.scriptResult = item.scriptResult.split("&");
                 }
               });
               return;
@@ -146,7 +170,8 @@
       getExternalfollowup({ param1: this.taskid, param2: this.patid }).then(
         (res) => {
           if (res.code == 200) {
-            this.questionList = res.rows;
+            this.questionList = res.data.script;
+            this.revisitAfter = res.data.revisitAfter;
             // 澶勭悊棰樼洰鏀堕泦缁撴灉鏍煎紡
             this.questionList.forEach((item) => {
               item.nextScriptno = Number(item.nextScriptno);
@@ -158,14 +183,12 @@
         }
       );
     },
-
     // 鍔犲瘑鍑芥暟
     encrypt(txt) {
       const encryptor = new JSEncrypt();
       encryptor.setPublicKey(this.publicKey); // 璁剧疆鍏挜
       return encryptor.encrypt(txt); // 瀵规暟鎹繘琛屽姞瀵�
     },
-
     // 瑙e瘑鍑芥暟
     decrypt(txt) {
       const encryptor = new JSEncrypt();
@@ -181,22 +204,25 @@
         serviceSubtaskDetailList: [],
       };
       const arr = structuredClone(this.questionList);
-      arr.forEach((item) => {
-        item.asrtext = JSON.stringify(item.scriptResult);
-        if (item.scriptType == 2 && item.scriptResult[0]) {
-          item.asrtext = item.scriptResult.join("&");
-        }
-      });
+      // arr.forEach((item) => {
+      //   item.asrtext = JSON.stringify(item.scriptResult);
+      //   if (item.scriptType == 2 && item.scriptResult[0]) {
+      //     item.scriptResult = item.scriptResult.join("&");
+      //   }
+      // });
       form.serviceSubtaskDetailList = arr;
       Submitaquestionnaire(form).then((res) => {
         if (res.code == 200) {
+          if (this.revisitAfter) {
+            this.dialogVisible=true
+          }
           this.$modal.msgSuccess("鎻愪氦鎴愬姛");
         }
       });
-      // 鍙互灏嗘暟鎹彁浜ゅ埌鍚庣鎴栬�呰繘琛屽叾浠栧鐞�
     },
     // 缂撳瓨
     cache(subm) {
+      console.log("杩涘叆缂撳瓨");
       let form = {
         param1: this.taskid,
         param2: this.patid,
@@ -204,7 +230,11 @@
       };
       const arr = structuredClone(this.questionList);
       arr.forEach((item) => {
-        item.scriptResult = JSON.stringify(item.scriptResult);
+        if (item.scriptType == 2 && item.scriptResult[0]) {
+          item.scriptResult = item.scriptResult.join("&");
+        } else if (item.scriptType != 2 && item.scriptResult) {
+          item.scriptResult = JSON.stringify(item.scriptResult);
+        }
       });
       form.svyLibTemplateScriptVOS = arr;
       Cachequestionnaire(form).then((res) => {
@@ -216,8 +246,8 @@
         }
       });
     },
-    // 澶勭悊閫夐」
-    handleOptionChange(selectedvalue, index,arr) {
+    // 澶勭悊鍗曢�夐�夐」
+    handleOptionChange(selectedvalue, index, arr) {
       // 鏌ユ壘閫変腑鐨勯�夐」瀵硅薄
       const selectedOption = arr.svyLibTemplateTargetoptions.find(
         (option) => option.optioncontent == selectedvalue
@@ -225,8 +255,24 @@
       if (selectedOption) {
         // 灏嗛�変腑鐨勯�夐」瀵硅薄鐨� id 璧嬪�肩粰 obj.sonId
         this.questionList[index].nextScriptno = selectedOption.nextQuestion;
+        this.questionList[index].score = selectedOption.score;
+        this.questionList[index].prompt = selectedOption.prompt;
       }
     },
+    // 澶勭悊澶氶�夐�夐」
+    updateScore(selectedvalues, index, arr) {
+      // 锟斤拷鍔犲垎鏁�
+      let score = 0;
+      selectedvalues.forEach((value) => {
+        const selectedOption = arr.svyLibTemplateTargetoptions.find(
+          (option) => option.optioncontent == value
+        );
+        if (selectedOption) {
+          score += Number(selectedOption.score);
+        }
+      });
+      this.questionList[index].score = score;
+    },
   },
 };
 </script>
diff --git a/src/views/patient/medtechnician/index.vue b/src/views/patient/medtechnician/index.vue
index 106b242..9317a85 100644
--- a/src/views/patient/medtechnician/index.vue
+++ b/src/views/patient/medtechnician/index.vue
@@ -38,7 +38,7 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="妯$増" prop="status">
+        <el-form-item label="妯℃澘" prop="status">
           <el-select v-model="topqueryParams.topic" placeholder="璇烽�夋嫨">
             <el-option
               v-for="item in topicoptions"
diff --git a/src/views/patient/patient/PatientChart.vue b/src/views/patient/patient/PatientChart.vue
index 554f4dc..5e77196 100644
--- a/src/views/patient/patient/PatientChart.vue
+++ b/src/views/patient/patient/PatientChart.vue
@@ -500,7 +500,7 @@
               href="http://m.qpic.cn/psc?/V50ZTolo1AIhq00dqrJP2169QM2VHGTU/ruAMsa53pVQWN7FLK88i5qfmCJclyMduqqL6kjE4h7TXDAjimVtmLmTyGVfF4qlkyOISsYQ4Mxx705X2tkXEIUPrfCS4L4yK.f11SmO8Tq0!/b&bo=twb0AgAAAAADB2U!&rf=viewer_4"
               target="_blank"
             >
-              鏌ョ湅妯$増</el-link
+              鏌ョ湅妯℃澘</el-link
             >
           </div>
         </el-upload>
diff --git a/src/views/patient/patient/index.vue b/src/views/patient/patient/index.vue
index 10d6830..f9cc682 100644
--- a/src/views/patient/patient/index.vue
+++ b/src/views/patient/patient/index.vue
@@ -677,7 +677,7 @@
               href="http://m.qpic.cn/psc?/V50ZTolo1AIhq00dqrJP2169QM2VHGTU/ruAMsa53pVQWN7FLK88i5qfmCJclyMduqqL6kjE4h7TXDAjimVtmLmTyGVfF4qlkyOISsYQ4Mxx705X2tkXEIUPrfCS4L4yK.f11SmO8Tq0!/b&bo=twb0AgAAAAADB2U!&rf=viewer_4"
               target="_blank"
             >
-              鏌ョ湅妯$増</el-link
+              鏌ョ湅妯℃澘</el-link
             >
           </div>
         </el-upload>
diff --git a/src/views/patient/physical/index.vue b/src/views/patient/physical/index.vue
index 66bc411..e1b5b4a 100644
--- a/src/views/patient/physical/index.vue
+++ b/src/views/patient/physical/index.vue
@@ -298,7 +298,7 @@
           class-name="small-padding fixed-width"
         >
           <template slot-scope="scope">
-            <el-button
+            <!-- <el-button
               size="medium"
               type="text"
               @click="followupvisit(scope.row)"
@@ -315,7 +315,7 @@
               ><span class="button-sc"
                 ><i class="el-icon-delete"></i>鍋滄</span
               ></el-button
-            >
+            > -->
             <el-button
               size="medium"
               type="text"
@@ -479,6 +479,9 @@
   resetUserPwd,
   changeUserStatus,
 } from "@/api/system/user";
+import {
+  getTaskservelist
+} from "@/api/AiCentre/index";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
@@ -604,9 +607,7 @@
       topqueryParams: {
         pageNum: 1,
         pageSize: 10,
-        userName: undefined,
-        tagid: undefined,
-        topic: undefined,
+        serviceType:1,
       },
       propss: { multiple: true },
       options: [],
@@ -694,9 +695,9 @@
     /** 鏌ヨ闂ㄨ瘖闅忚鍒楄〃 */
     getList() {
       this.loading = true;
-      listUser(this.addDateRange(this.topqueryParams, this.dateRange)).then(
+      getTaskservelist(this.topqueryParams).then(
         (response) => {
-          this.userList = [];
+          this.userList = response.rows;
           this.total = response.total;
           this.loading = false;
         }
@@ -903,10 +904,10 @@
       this.modificationVisible = true;
     },
     // 璺宠浆璇︽儏椤�
-    Seedetails() {
+    Seedetails(row) {
       this.$router.push({
         path: "/followvisit/record/detailpage/",
-        query: { id: "1" },
+        query: { taskid: row.taskid, patid: row.patid },
       });
     },
     // 瀵煎叆鎸夐挳
diff --git a/src/views/patient/propaganda/Missioncreation.vue b/src/views/patient/propaganda/Missioncreation.vue
index 94cc4ac..bf53714 100644
--- a/src/views/patient/propaganda/Missioncreation.vue
+++ b/src/views/patient/propaganda/Missioncreation.vue
@@ -7,7 +7,7 @@
           <el-step
             icon="el-icon-edit"
             title="鍩虹淇℃伅"
-            description="閫夋嫨妯$増銆佸舰寮忕瓑鍩虹淇℃伅"
+            description="閫夋嫨妯℃澘銆佸舰寮忕瓑鍩虹淇℃伅"
           ></el-step>
           <el-step
             icon="el-icon-user"
@@ -21,7 +21,7 @@
     <div class="leftvlue" style="margin: 0 20px">
       <!-- 鍩烘湰淇℃伅 -->
       <div v-if="Editprogress == 1">
-        <el-alert title="閫夋嫨妯$増銆佸舰寮忕瓑鍩虹淇℃伅" type="success" effect="dark">
+        <el-alert title="閫夋嫨妯℃澘銆佸舰寮忕瓑鍩虹淇℃伅" type="success" effect="dark">
         </el-alert>
         <div class="leftvlue-jbxx">
           <!-- 鍩虹淇℃伅 -->
@@ -41,7 +41,7 @@
                       /> </el-form-item
                   ></el-col>
                   <el-col :span="8"
-                    ><el-form-item label="妯$増鍚嶇О">
+                    ><el-form-item label="妯℃澘鍚嶇О">
                       <el-input
                         style="width: 220px"
                         :disabled="true"
@@ -434,13 +434,13 @@
         >
       </span>
     </el-dialog>
-    <el-dialog title="妯$増棰勮" :visible.sync="previewtf" width="60%">
+    <el-dialog title="妯℃澘棰勮" :visible.sync="previewtf" width="60%">
       <div class="preview-left">
         <!-- 鍗曢�� -->
         <div v-html="richText"></div>
       </div>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="previewGo">鍓嶅線妯$増璇︽儏淇敼</el-button>
+        <el-button @click="previewGo">鍓嶅線妯℃澘璇︽儏淇敼</el-button>
         <el-button type="primary" @click="previewFn">纭浣跨敤</el-button>
       </span>
     </el-dialog>
@@ -532,7 +532,7 @@
               </el-form-item>
             </el-form>
             <el-divider></el-divider>
-            <!-- 閫夋嫨妯$増鍒楄〃 -->
+            <!-- 閫夋嫨妯℃澘鍒楄〃 -->
             <SFtable
               @selectfn="selectfn"
               :currentList="userList"
@@ -584,13 +584,13 @@
       title: "瀹f暀鍐呭鍒楄〃",
       currenttype: 1, //1瀹f暀2闂ㄨ瘖3鍑洪櫌4澶嶈瘖5浣撴6闂嵎
       id: "", //
-      previewid: "", //浠诲姟妯$増浼犻�抜d
+      previewid: "", //浠诲姟妯℃澘浼犻�抜d
       libName: "",
       overallCase: [], //閫夋嫨鎮h�呮��
       allpids: [],
-      libId: null, //妯℃澘搴撴ā鐗坕d
+      libId: null, //妯℃澘搴撴ā鏉縤d
       Editprogress: 1, //缂栬緫杩涘害
-      drawermb: false, //閫夋嫨妯$増寮圭獥
+      drawermb: false, //閫夋嫨妯℃澘寮圭獥
       previewtf: false, //棰勮
       loading: false, // 閬僵灞�
       patientloading: false, // 閬僵灞�
@@ -666,7 +666,7 @@
       // 闈炲涓鐢�
       multiple: true,
       // 鐢ㄦ埛琛ㄦ牸鏁版嵁
-      userList: [], //妯$増鍒楄〃
+      userList: [], //妯℃澘鍒楄〃
       patientuserList: [], //閫夋嫨鎮h�呭垪琛�
       sonuserList: [], //閫変腑鎮h�呭垪琛�
       delvariableList: [], //鍒犻櫎鍙橀噺涓存椂瀛樺偍
@@ -895,9 +895,9 @@
       });
     },
     // ----------------------琛ㄦ牸瀛愮粍浠朵簨浠�
-    // 纭閫夋嫨妯$増鏀惧叆浠诲姟妯$増
+    // 纭閫夋嫨妯℃澘鏀惧叆浠诲姟妯℃澘
     selectfn(row, type) {
-      // 妯$増鎯呭喌涓嬭幏鍙栨ā鐗堜俊鎭�
+      // 妯℃澘鎯呭喌涓嬭幏鍙栨ā鏉夸俊鎭�
       this.libName = row.preachname;
       this.richText = null;
       this.libId = row.id;
@@ -1078,7 +1078,7 @@
     resetForm(formName) {
       this.$refs[formName].resetFields();
     },
-    // 棰勮妯$増
+    // 棰勮妯℃澘
     PreviewTemplate() {},
     Acknowledgereference() {
       this.quote = true;
@@ -1222,7 +1222,7 @@
       if (this.time3) this.form.showTimeNight = this.time3.join(",");
       console.log(combinedData, "combinedData");
     },
-    // 鏌ョ湅妯$増
+    // 鏌ョ湅妯℃澘
     previewGo() {
       this.$router.push({
         path: "/knowledge/tpuconfigurat/",
@@ -1240,7 +1240,7 @@
         this.form.templateid = response.data;
         this.form.libtemplateid = this.libId;
         this.form.templatename = this.libName;
-        this.$modal.msgSuccess("閫夋嫨妯$増鎴愬姛");
+        this.$modal.msgSuccess("閫夋嫨妯℃澘鎴愬姛");
       });
     },
     // 澶勭悊鏈嶅姟褰㈠紡
diff --git a/src/views/patient/propaganda/Missionotice.vue b/src/views/patient/propaganda/Missionotice.vue
index e917465..60a681c 100644
--- a/src/views/patient/propaganda/Missionotice.vue
+++ b/src/views/patient/propaganda/Missionotice.vue
@@ -38,7 +38,7 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="妯$増" prop="status">
+        <el-form-item label="妯℃澘" prop="status">
           <el-select v-model="topqueryParams.topic" placeholder="璇烽�夋嫨">
             <el-option
               v-for="item in topicoptions"
@@ -172,7 +172,7 @@
         </el-table-column>
 
         <el-table-column
-          label="閫氱煡妯$増"
+          label="閫氱煡妯℃澘"
           align="center"
           key="templatename"
           prop="templatename"
diff --git a/src/views/patient/propaganda/QuestionnaireTask.vue b/src/views/patient/propaganda/QuestionnaireTask.vue
index 49e6951..1573ba4 100644
--- a/src/views/patient/propaganda/QuestionnaireTask.vue
+++ b/src/views/patient/propaganda/QuestionnaireTask.vue
@@ -7,7 +7,7 @@
           <el-step
             icon="el-icon-edit"
             title="鍩虹淇℃伅"
-            description="閫夋嫨妯$増銆佸舰寮忕瓑鍩虹淇℃伅"
+            description="閫夋嫨妯℃澘銆佸舰寮忕瓑鍩虹淇℃伅"
           ></el-step>
           <el-step
             icon="el-icon-user"
@@ -21,7 +21,7 @@
     <div class="leftvlue" style="margin: 0 20px">
       <!-- 鍩烘湰淇℃伅 -->
       <div v-if="Editprogress == 1">
-        <el-alert title="閫夋嫨妯$増銆佸舰寮忕瓑鍩虹淇℃伅" type="success" effect="dark">
+        <el-alert title="閫夋嫨妯℃澘銆佸舰寮忕瓑鍩虹淇℃伅" type="success" effect="dark">
         </el-alert>
         <div class="leftvlue-jbxx">
           <!-- 鍩虹淇℃伅 -->
@@ -40,23 +40,6 @@
                         placeholder="璇疯緭鍏ヤ换鍔″悕绉�"
                       /> </el-form-item
                   ></el-col>
-                  <el-col :span="8"
-                    ><el-form-item label="妯$増鍚嶇О">
-                      <el-input
-                        style="width: 220px"
-                        :disabled="true"
-                        v-model="form.templatename"
-                        placeholder="璇峰湪涓嬪垪閫夋嫨"
-                      /> </el-form-item
-                  ></el-col>
-                  <el-col :span="4">
-                    <el-button
-                      type="primary"
-                      icon="el-icon-edit"
-                      @click="drawermb = true"
-                      circle
-                    ></el-button>
-                  </el-col>
                 </el-row>
 
                 <el-form-item label="浠诲姟鎻忚堪">
@@ -167,6 +150,33 @@
                     >
                   </el-checkbox-group>
                 </el-form-item>
+                <el-row :gutter="20">
+                  <el-col :span="10"
+                    ><el-form-item label="妯℃澘鍚嶇О">
+                      <el-input
+                        style="width: 300px"
+                        :disabled="true"
+                        v-model="form.templatename"
+                        placeholder="璇峰湪涓嬪垪閫夋嫨"
+                      /> </el-form-item
+                  ></el-col>
+                  <el-col :span="4">
+                    <el-button
+                      type="primary"
+                      icon="el-icon-edit"
+                      @click="drawermb = true"
+                      circle
+                    ></el-button>
+
+                    <el-button
+                    v-if="this.form.libtemplateid"
+                      type="success"
+                      icon="el-icon-search"
+                      @click="previewfnmb"
+                      circle
+                    ></el-button>
+                  </el-col>
+                </el-row>
               </el-form>
             </div>
           </div>
@@ -376,7 +386,7 @@
         >
       </span>
     </el-dialog>
-    <el-dialog title="妯$増棰勮" :visible.sync="previewtf" width="60%">
+    <el-dialog title="妯℃澘棰勮" :visible.sync="previewtf" width="60%">
       <div class="preview-left">
         <!-- 鍗曢�� -->
         <div
@@ -437,7 +447,7 @@
         </div>
       </div>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="previewGo">鍓嶅線妯$増璇︽儏淇敼</el-button>
+        <el-button @click="previewGo">鍓嶅線妯℃澘璇︽儏淇敼</el-button>
         <el-button type="primary" @click="previewFn">纭浣跨敤</el-button>
       </span>
     </el-dialog>
@@ -462,17 +472,10 @@
               label-width="98px"
             >
               <el-form-item label="闂嵎鍚嶇О">
-                <el-input
-                  v-model="topqueryParams.name"
-                ></el-input> </el-form-item
-              ><el-form-item label="閫氱煡鍚嶇О">
-                <el-input v-model="topqueryParams.name"></el-input>
-              </el-form-item>
-              <el-form-item label="闂嵎涓婚">
-                <el-input v-model="topqueryParams.name"></el-input>
+                <el-input v-model="topqueryParams.svyname"></el-input>
               </el-form-item>
 
-              <el-form-item label="闂嵎绫诲瀷" prop="status">
+              <!-- <el-form-item label="闂嵎绫诲瀷" prop="status">
                 <el-select v-model="topqueryParams.topic" placeholder="璇烽�夋嫨">
                   <el-option
                     v-for="item in taskoptions"
@@ -482,7 +485,7 @@
                   >
                   </el-option>
                 </el-select>
-              </el-form-item>
+              </el-form-item> -->
               <el-form-item label="閫傜敤褰㈠紡" prop="status">
                 <el-select v-model="topqueryParams.topica" placeholder="璇烽�夋嫨">
                   <el-option
@@ -495,7 +498,7 @@
                 </el-select>
               </el-form-item>
 
-              <el-form-item label="閫傜敤绉戝" prop="status">
+              <!-- <el-form-item label="閫傜敤绉戝" prop="status">
                 <el-select v-model="topqueryParams.topicd" placeholder="璇烽�夋嫨">
                   <el-option
                     v-for="item in topicoptions"
@@ -505,13 +508,13 @@
                   >
                   </el-option>
                 </el-select>
-              </el-form-item>
+              </el-form-item> -->
               <el-form-item>
                 <el-button
                   type="primary"
                   icon="el-icon-search"
                   size="medium"
-                  @click="handleQuery"
+                  @click="handleQuerymb"
                   >鎼滅储</el-button
                 >
                 <el-button
@@ -523,7 +526,7 @@
               </el-form-item>
             </el-form>
             <el-divider></el-divider>
-            <!-- 閫夋嫨妯$増鍒楄〃 -->
+            <!-- 閫夋嫨妯℃澘鍒楄〃 -->
             <SFtable
               @selectfn="selectfn"
               :currentList="userList"
@@ -572,13 +575,13 @@
       title: "瀹f暀鍐呭鍒楄〃",
       currenttype: 1, //1瀹f暀2闂ㄨ瘖3鍑洪櫌4澶嶈瘖5浣撴6闂嵎
       id: "", //
-      previewid: "", //浠诲姟妯$増浼犻�抜d
+      previewid: "", //浠诲姟妯℃澘浼犻�抜d
       libName: "",
       overallCase: [], //閫夋嫨鎮h�呮��
       allpids: [],
-      libId: null, //妯℃澘搴撴ā鐗坕d
+      libId: null, //妯℃澘搴撴ā鏉縤d
       Editprogress: 1, //缂栬緫杩涘害
-      drawermb: false, //閫夋嫨妯$増寮圭獥
+      drawermb: false, //閫夋嫨妯℃澘寮圭獥
       previewtf: false, //棰勮
       loading: false, // 閬僵灞�
       patientloading: false, // 閬僵灞�
@@ -656,7 +659,7 @@
       // 闈炲涓鐢�
       multiple: true,
       // 鐢ㄦ埛琛ㄦ牸鏁版嵁
-      userList: [], //妯$増鍒楄〃
+      userList: [], //妯℃澘鍒楄〃
       multiplechoice: [], //澶氶�夌粨鏋�
       patientuserList: [], //閫夋嫨鎮h�呭垪琛�
       sonuserList: [], //閫変腑鎮h�呭垪琛�
@@ -726,6 +729,7 @@
         },
       ],
       quote: false,
+      serviceType:null,
     };
   },
   components: { SFtable },
@@ -734,10 +738,18 @@
     this.id = this.$route.query.id;
     this.form.type = this.$route.query.type;
     this.form.typename = this.$route.query.typename;
+    this.serviceType = Number(this.$route.query.serviceType);
     this.form.serviceType = Number(this.$route.query.serviceType);
     this.listDept();
     this.Acquisitiontype();
     this.Getdetails();
+  },
+  activated() {
+    if (this.id != this.$route.query.id) {
+      this.listDept();
+      this.Acquisitiontype();
+      this.Getdetails();
+    }
   },
 
   methods: {
@@ -846,7 +858,7 @@
             label: "寰俊灏忕▼搴�",
           },
         ];
-      }else if (this.form.serviceType == 2 || this.form.serviceType == 3) {
+      } else if (this.form.serviceType == 2 || this.form.serviceType == 3) {
         this.checkboxlist = [
           {
             value: "1",
@@ -875,7 +887,7 @@
           },
         ];
       }
-      getQtemplatelist(queryParams).then((response) => {
+      getQtemplatelist(this.topqueryParams).then((response) => {
         this.userList = response.rows;
         this.total = response.total;
       });
@@ -907,6 +919,7 @@
       if (!this.form.type) {
         this.form.type = this.$route.query.type;
       }
+      this.form.serviceType=this.serviceType;
       Editsingletask(this.form).then((res) => {
         if (res.code == 200) {
           if (this.form.taskid) {
@@ -922,13 +935,13 @@
       });
     },
     // ----------------------琛ㄦ牸瀛愮粍浠朵簨浠�
-    // 纭閫夋嫨妯$増鏀惧叆浠诲姟妯$増
+
+    // 纭閫夋嫨妯℃澘鏀惧叆浠诲姟妯℃澘
     selectfn(row, type) {
-      // 妯$増鎯呭喌涓嬭幏鍙栨ā鐗堜俊鎭�
+      // 妯℃澘鎯呭喌涓嬭幏鍙栨ā鏉夸俊鎭�
       if (type == 1) {
         this.libName = row.svyname;
         this.libId = row.svyid;
-        console.log(row, "row");
         this.Tasktemplate = row;
         this.questionList = row.svyTemplateLibScripts;
         this.previewtf = true;
@@ -937,6 +950,19 @@
       } else if (type == 2) {
       } else if (type == 3) {
       }
+    },
+    // 棰勮
+    previewfnmb() {
+      console.log(this.form);
+
+      getQtemplatelist({ svyid: this.form.libtemplateid }).then((res) => {
+        if (res.code == 200) {
+          console.log();
+
+          this.questionList = res.rows[0].svyTemplateLibScripts;
+          this.previewtf = true;
+        }
+      });
     },
     // 澶勭悊闂灞傚彉閲�
     Variablehandling(arr, type) {
@@ -1077,6 +1103,12 @@
       this.handleAddpatient();
     },
     resetQuery() {},
+    handleQuerymb() {
+      getQtemplatelist(this.topqueryParams).then((response) => {
+        this.userList = response.rows;
+        this.total = response.total;
+      });
+    },
     handleClosehz() {
       this.dialogVisiblepatient = false;
     },
@@ -1088,20 +1120,27 @@
     resetForm(formName) {
       this.$refs[formName].resetFields();
     },
-    // 棰勮妯$増
+    // 棰勮妯℃澘
     PreviewTemplate() {},
     Acknowledgereference() {
       this.quote = true;
     },
     // 鑾峰彇璇︽儏
     Getdetails() {
+      this.form= {
+        patTaskRelevances: [],
+        sendType: 1,
+        templatename: "",
+        templateid: null,
+        libtemplateid: null,
+      };
+      this.questionList=[];
       if (this.id) {
         Questionnairetaskget({ taskid: this.id }).then((res) => {
           let filteredArray = "";
-          console.log(2233);
           if (res.code == 200) {
             this.form = res.data;
-
+            this.form.serviceType=this.serviceType;
             this.form.patTaskRelevances = this.form.patTaskRelevances
               ? this.form.patTaskRelevances
               : [];
@@ -1224,7 +1263,7 @@
       if (this.time3) this.form.showTimeNight = this.time3.join(",");
       console.log(combinedData, "combinedData");
     },
-    // 鏌ョ湅妯$増
+    // 鏌ョ湅妯℃澘
     previewGo() {
       this.$router.push({
         path: "/knowledge/tpuconfigurat/",
@@ -1244,12 +1283,11 @@
       this.Tasktemplate.templateid = id;
       this.Tasktemplate.isoperation = 1;
       TaskQuestioncomit(this.Tasktemplate).then((response) => {
-        console.log(response);
         this.previewtf = false;
         this.form.templateid = response.data;
         this.form.libtemplateid = this.libId;
         this.form.templatename = this.libName;
-        this.$modal.msgSuccess("閫夋嫨妯$増鎴愬姛");
+        this.$modal.msgSuccess("閫夋嫨妯℃澘鎴愬姛");
       });
     },
     // 澶勭悊鏈嶅姟褰㈠紡
diff --git a/src/views/patient/propaganda/index.vue b/src/views/patient/propaganda/index.vue
index be8ce00..2e435ec 100644
--- a/src/views/patient/propaganda/index.vue
+++ b/src/views/patient/propaganda/index.vue
@@ -38,7 +38,7 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="妯$増" prop="status">
+        <el-form-item label="妯℃澘" prop="status">
           <el-select v-model="topqueryParams.topic" placeholder="璇烽�夋嫨">
             <el-option
               v-for="item in topicoptions"
@@ -172,7 +172,7 @@
         </el-table-column>
 
         <el-table-column
-          label="瀹f暀妯$増"
+          label="瀹f暀妯℃澘"
           align="center"
           key="templatename"
           prop="templatename"
diff --git a/src/views/patient/propaganda/particty.vue b/src/views/patient/propaganda/particty.vue
index feff433..e10301d 100644
--- a/src/views/patient/propaganda/particty.vue
+++ b/src/views/patient/propaganda/particty.vue
@@ -7,7 +7,7 @@
           <el-step
             icon="el-icon-edit"
             title="鍩虹淇℃伅"
-            description="閫夋嫨妯$増銆佸舰寮忕瓑鍩虹淇℃伅"
+            description="閫夋嫨妯℃澘銆佸舰寮忕瓑鍩虹淇℃伅"
           ></el-step>
           <el-step
             icon="el-icon-user"
@@ -21,7 +21,7 @@
     <div class="leftvlue" style="margin: 0 20px">
       <!-- 鍩烘湰淇℃伅 -->
       <div v-if="Editprogress == 1">
-        <el-alert title="閫夋嫨妯$増銆佸舰寮忕瓑鍩虹淇℃伅" type="success" effect="dark">
+        <el-alert title="閫夋嫨妯℃澘銆佸舰寮忕瓑鍩虹淇℃伅" type="success" effect="dark">
         </el-alert>
         <div class="leftvlue-jbxx">
           <!-- 鍩虹淇℃伅 -->
@@ -41,7 +41,7 @@
                       /> </el-form-item
                   ></el-col>
                   <el-col :span="8"
-                    ><el-form-item label="妯$増鍚嶇О">
+                    ><el-form-item label="妯℃澘鍚嶇О">
                       <el-input
                         style="width: 220px"
                         :disabled="true"
@@ -390,7 +390,7 @@
         >
       </span>
     </el-dialog>
-    <el-dialog title="妯$増棰勮" :visible.sync="previewtf" width="60%">
+    <el-dialog title="妯℃澘棰勮" :visible.sync="previewtf" width="60%">
       <div class="preview-left">
         <!-- 鍗曢�� -->
         <div
@@ -423,7 +423,7 @@
         </div>
       </div>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="previewGo">鍓嶅線妯$増璇︽儏淇敼</el-button>
+        <el-button @click="previewGo">鍓嶅線妯℃澘璇︽儏淇敼</el-button>
         <el-button type="primary" @click="previewFn">纭浣跨敤</el-button>
       </span>
     </el-dialog>
@@ -462,7 +462,7 @@
                   </el-option>
                 </el-select>
               </el-form-item>
-              <el-form-item label="闅忚妯$増鍒嗙被" prop="region">
+              <el-form-item label="闅忚妯℃澘鍒嗙被" prop="region">
                 <el-select
                   v-model="topqueryParams.assortid"
                   size="medium"
@@ -501,7 +501,7 @@
               </el-form-item>
             </el-form>
             <el-divider></el-divider>
-            <!-- 閫夋嫨妯$増鍒楄〃 -->
+            <!-- 閫夋嫨妯℃澘鍒楄〃 -->
             <SFtable
               @selectfn="selectfn"
               :currentList="userList"
@@ -545,7 +545,7 @@
 import SFtable from "@/components/SFtable"; //琛ㄦ牸缁勪欢
 
 export default {
-  name: "ServiceDetails",
+  name: "serviceDetailsa",
   data() {
     const endDate = new Date();
     const startDate = new Date();
@@ -554,16 +554,16 @@
       title: "闅忚鍐呭鍒楄〃",
       currenttype: 1, //1闅忚2闂嵎3閫氱煡瀹f暀
       id: "", //
-      previewid: "", //浠诲姟妯$増浼犻�抜d
+      previewid: "", //浠诲姟妯℃澘浼犻�抜d
       libName: "",
       overallCase: [], //閫夋嫨鎮h�呮��
       // 鏃ユ湡鑼冨洿
       dateRange: [startDate, endDate],
       allpids: [],
-      libId: null, //妯℃澘搴撴ā鐗坕d
+      libId: null, //妯℃澘搴撴ā鏉縤d
       nhh: null, //鏄惁渚濈収鏂板
       Editprogress: 1, //缂栬緫杩涘害
-      drawermb: false, //閫夋嫨妯$増寮圭獥
+      drawermb: false, //閫夋嫨妯℃澘寮圭獥
       previewtf: false, //棰勮
       loading: false, // 閬僵灞�
       patientloading: false, // 閬僵灞�
@@ -631,7 +631,7 @@
       // 闈炲涓鐢�
       multiple: true,
       // 鐢ㄦ埛琛ㄦ牸鏁版嵁
-      userList: [], //妯$増鍒楄〃
+      userList: [], //妯℃澘鍒楄〃
       patientuserList: [], //閫夋嫨鎮h�呭垪琛�
       sonuserList: [], //閫変腑鎮h�呭垪琛�
       delvariableList: [], //鍒犻櫎鍙橀噺涓存椂瀛樺偍
@@ -702,6 +702,8 @@
         },
       ],
       quote: false,
+      serviceType:null,
+
     };
   },
   components: { SFtable },
@@ -709,6 +711,7 @@
   created() {
     this.id = this.$route.query.id;
     this.form.type = this.$route.query.type;
+    this.serviceType = Number(this.$route.query.serviceType);
     this.form.serviceType = Number(this.$route.query.serviceType);
     this.form.nhh = this.$route.query.nhh;
     this.listDept();
@@ -840,6 +843,7 @@
       } else {
         this.form.isoperation = 1;
       }
+      this.form.serviceType=this.serviceType;
       Editsingletask(this.form).then((res) => {
         if (res.code == 200) {
           if (this.form.taskid) {
@@ -855,10 +859,10 @@
       });
     },
     // ----------------------琛ㄦ牸瀛愮粍浠朵簨浠�
-    // 纭閫夋嫨妯$増鏀惧叆浠诲姟妯$増
+    // 纭閫夋嫨妯℃澘鏀惧叆浠诲姟妯℃澘
     selectfn(row, type) {
-      // 妯$増鎯呭喌涓嬭幏鍙栨ā鐗堜俊鎭�
-      console.log(row, "閫夋嫨妯$増");
+      // 妯℃澘鎯呭喌涓嬭幏鍙栨ā鏉夸俊鎭�
+      console.log(row, "閫夋嫨妯℃澘");
       this.libName = row.templateName;
       this.libId = row.id;
       getvFollowup({ id: row.id }).then((res) => {
@@ -1042,7 +1046,7 @@
     resetForm(formName) {
       this.$refs[formName].resetFields();
     },
-    // 棰勮妯$増
+    // 棰勮妯℃澘
     PreviewTemplate() {},
     Acknowledgereference() {
       this.quote = true;
@@ -1055,6 +1059,7 @@
           console.log(2233);
           if (res.code == 200) {
             this.form = res.data;
+      this.form.serviceType=this.serviceType;
             this.overallCase = this.form.patTaskRelevances.concat();
             this.checkList = this.form.preachform.split(",");
             console.log(this.form.showDate, "this.form");
@@ -1182,7 +1187,7 @@
       if (this.time3) this.form.showTimeNight = this.time3.join(",");
       console.log(combinedData, "combinedData");
     },
-    // 鏌ョ湅妯$増
+    // 鏌ョ湅妯℃澘
     previewGo() {
       this.$router.push({
         path: "/knowledge/tpuconfigurat/",
@@ -1213,7 +1218,7 @@
         this.form.libtemplateid = this.libId;
         this.form.templatename = this.libName;
         console.log(this.form.templatename, "ss");
-        this.$modal.msgSuccess("閫夋嫨妯$増鎴愬姛", this.form.templatename);
+        this.$modal.msgSuccess("閫夋嫨妯℃澘鎴愬姛", this.form.templatename);
       });
     },
     // 澶勭悊鏈嶅姟褰㈠紡
diff --git a/src/views/patient/questionnaire/index.vue b/src/views/patient/questionnaire/index.vue
index 2cc5fc5..eeef602 100644
--- a/src/views/patient/questionnaire/index.vue
+++ b/src/views/patient/questionnaire/index.vue
@@ -282,7 +282,7 @@
           class-name="small-padding fixed-width"
         >
           <template slot-scope="scope">
-            <el-button
+            <!-- <el-button
               size="medium"
               type="text"
               @click="followupvisit(scope.row)"
@@ -299,7 +299,7 @@
               ><span class="button-sc"
                 ><i class="el-icon-delete"></i>鍋滄</span
               ></el-button
-            >
+            > -->
             <el-button
               size="medium"
               type="text"
@@ -589,10 +589,8 @@
       topqueryParams: {
         pageNum: 1,
         pageSize: 10,
-        type: 6,
-        userName: undefined,
-        tagid: undefined,
-        topic: undefined,
+        serviceType:7,
+
       },
       propss: { multiple: true },
       options: [],
@@ -887,10 +885,10 @@
       this.modificationVisible = true;
     },
     // 璺宠浆璇︽儏椤�
-    Seedetails() {
+    Seedetails(row) {
       this.$router.push({
         path: "/followvisit/QuestionnaireTask",
-        query: { type: 6 },
+        query: { taskid: row.taskid, patid: row.patid },
       });
     },
     // 瀵煎叆鎸夐挳
diff --git a/src/views/patient/subsequent/index.vue b/src/views/patient/subsequent/index.vue
index 3557c62..5980a04 100644
--- a/src/views/patient/subsequent/index.vue
+++ b/src/views/patient/subsequent/index.vue
@@ -39,7 +39,7 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="妯$増" prop="status">
+        <el-form-item label="妯℃澘" prop="status">
           <el-select v-model="topqueryParams.topic" placeholder="璇烽�夋嫨">
             <el-option
               v-for="item in topicoptions"
diff --git a/src/views/repositoryai/general/particulars/index.vue b/src/views/repositoryai/general/particulars/index.vue
index 6a71a31..48608e6 100644
--- a/src/views/repositoryai/general/particulars/index.vue
+++ b/src/views/repositoryai/general/particulars/index.vue
@@ -10,14 +10,14 @@
       >
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="妯$増鍚嶇О" prop="extName">
+            <el-form-item label="妯℃澘鍚嶇О" prop="extName">
               <el-input
                 v-model="baseForm.extName"
                 placeholder="璇疯緭鍏�"
               ></el-input> </el-form-item
           ></el-col>
           <el-col :span="12">
-            <el-form-item label="妯$増鍒嗙被" prop="groupID">
+            <el-form-item label="妯℃澘鍒嗙被" prop="groupID">
               <el-select v-model="baseForm.groupID" placeholder="璇烽�夋嫨鍒嗙被">
                 <el-option
                   v-for="item in deptOptions"
@@ -31,7 +31,7 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="妯$増姒傝堪" prop="name">
+            <el-form-item label="妯℃澘姒傝堪" prop="name">
               <el-input
                 v-model="baseForm.note"
                 placeholder="璇疯緭鍏�"
@@ -267,7 +267,7 @@
               </el-form-item>
               <el-form-item>
                 <el-button type="primary" @click="submitForm('ruleForm')"
-                  >淇濆瓨妯$増</el-button
+                  >淇濆瓨妯℃澘</el-button
                 >
                 <el-button
                   v-if="ruleForm.id"
diff --git a/src/views/repositoryai/matching/index.vue b/src/views/repositoryai/matching/index.vue
index bd334f3..747d114 100644
--- a/src/views/repositoryai/matching/index.vue
+++ b/src/views/repositoryai/matching/index.vue
@@ -149,7 +149,7 @@
             prop="phonenumber"
           />
           <el-table-column
-            label="妯$増鍚嶇О"
+            label="妯℃澘鍚嶇О"
             align="center"
             key="templateName"
             prop="templateName"
@@ -263,7 +263,7 @@
           >
           <el-button type="primary" icon="el-icon-s-claim">淇濆瓨</el-button>
           <el-button type="primary" icon="el-icon-document"
-            >鏇存柊鎸囨爣瑙勫垯鑷虫ā鐗�</el-button
+            >鏇存柊鎸囨爣瑙勫垯鑷虫ā鏉�</el-button
           >
         </div>
       </div>
diff --git a/src/views/repositoryai/templateku/configurat/index.vue b/src/views/repositoryai/templateku/configurat/index.vue
index 48d4926..8cc1a63 100644
--- a/src/views/repositoryai/templateku/configurat/index.vue
+++ b/src/views/repositoryai/templateku/configurat/index.vue
@@ -14,13 +14,13 @@
           <el-step>
             <template slot="title">
               <span style="cursor: pointer" @click="Editprogress = 2"
-                >闅忚妯$増棰樼洰</span
+                >闅忚妯℃澘棰樼洰</span
               >
             </template>
           </el-step>
-          <el-step description="鏌ョ湅闅忚妯$増棰勮锛屽彲瀵煎嚭PDF">
+          <el-step description="鏌ョ湅闅忚妯℃澘棰勮锛屽彲瀵煎嚭PDF">
             <template slot="title">
-              <span style="cursor: pointer" @click="preview">闅忚妯$増棰勮</span>
+              <span style="cursor: pointer" @click="preview">闅忚妯℃澘棰勮</span>
             </template>
           </el-step>
         </el-steps>
@@ -41,7 +41,7 @@
         >
           <el-row>
             <el-col :span="12">
-              <el-form-item label="妯$増鍚嶇О" prop="region">
+              <el-form-item label="妯℃澘鍚嶇О" prop="region">
                 <div>
                   <el-input
                     v-model="ruleForm.templateName"
@@ -51,7 +51,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="闅忚妯$増鍒嗙被" prop="region">
+              <el-form-item label="闅忚妯℃澘鍒嗙被" prop="region">
                 <el-select
                   v-model="ruleForm.assortid"
                   size="medium"
@@ -77,7 +77,7 @@
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="妯$増绠�浠�" prop="note">
+              <el-form-item label="妯℃澘绠�浠�" prop="note">
                 <div>
                   <el-input
                     type="textarea"
@@ -335,14 +335,14 @@
             <el-button
               type="success"
               @click="Departmenttreatment('ruleForm')"
-              >{{ task ? "淇濆瓨鍒颁换鍔℃ā鐗�" : "淇濆瓨闅忚妯$増鍩虹淇℃伅" }}</el-button
+              >{{ task ? "淇濆瓨鍒颁换鍔℃ā鏉�" : "淇濆瓨闅忚妯℃澘鍩虹淇℃伅" }}</el-button
             >
           </el-form-item>
         </el-form>
       </div>
-      <!-- 闅忚妯$増璁剧疆 -->
+      <!-- 闅忚妯℃澘璁剧疆 -->
       <div v-if="Editprogress == 2">
-        <div class="leftvlue-jbxx">闅忚妯$増棰樼洰璁剧疆</div>
+        <div class="leftvlue-jbxx">闅忚妯℃澘棰樼洰璁剧疆</div>
         <el-divider></el-divider>
         <div class="addtopic">
           <el-button
@@ -794,7 +794,7 @@
         </div>
 
         <el-button type="success" @click="Departmenttreatment('ruleForm')">{{
-          task ? "淇濆瓨鍒颁换鍔℃ā鐗�" : "淇濆瓨棰樼洰鏁版嵁"
+          task ? "淇濆瓨鍒颁换鍔℃ā鏉�" : "淇濆瓨棰樼洰鏁版嵁"
         }}</el-button>
         <el-button type="primary" plain @click="laststep()">涓婁竴姝�</el-button>
         <el-button type="success" plain @click="preview('ruleForm')"
@@ -802,9 +802,9 @@
         >
         <el-button type="info" @click="closeFm('ruleForm')">鍏抽棴</el-button>
       </div>
-      <!-- 闅忚妯$増棰勮 -->
+      <!-- 闅忚妯℃澘棰勮 -->
       <div v-if="Editprogress == 3">
-        <div class="leftvlue-jbxx">闅忚妯$増闂棰勮</div>
+        <div class="leftvlue-jbxx">闅忚妯℃澘闂棰勮</div>
         <el-divider></el-divider>
 
         <div class="preview-left">
@@ -1892,7 +1892,7 @@
           row.isoperation = 3;
           this.delScriptVOList.push(row);
           this.sortFn();
-          this.$modal.msgSuccess("宸插垹闄わ紝淇濆瓨妯$増鐢熸晥");
+          this.$modal.msgSuccess("宸插垹闄わ紝淇濆瓨妯℃澘鐢熸晥");
         })
         .catch(() => {});
     },
@@ -1979,7 +1979,7 @@
           this.drawer = false;
 
           this.sortFn();
-          this.$modal.msgSuccess("棰樼洰鏂板鎴愬姛锛屼繚瀛樻ā鐗堝け鏁�");
+          this.$modal.msgSuccess("棰樼洰鏂板鎴愬姛锛屼繚瀛樻ā鏉垮け鏁�");
         });
     },
 
@@ -1997,7 +1997,7 @@
     // 鍓嶅線娴嬭瘯
     measurement() {
       this.$modal
-        .confirm("鍗冲皢鍓嶅線妯$増娴嬭瘯椤甸潰锛岃纭妯$増鏁版嵁宸蹭繚瀛樸��")
+        .confirm("鍗冲皢鍓嶅線妯℃澘娴嬭瘯椤甸潰锛岃纭妯℃澘鏁版嵁宸蹭繚瀛樸��")
         .then((res) => {
           this.$router.push({
             path: "/knowledge/tpuconfigurat/measurement",
@@ -2006,7 +2006,7 @@
         })
         .catch(() => {});
     },
-    // 鏂板缓妯$増涓复鏃堕鐩�
+    // 鏂板缓妯℃澘涓复鏃堕鐩�
     // 棰樼洰绫诲瀷鏇存崲
     typeselection(row) {
       if (row == 1 && !this.indexform.ivrLibaScriptTargetoptionList.length) {
diff --git a/src/views/repositoryai/templateku/configurat/measurement.vue b/src/views/repositoryai/templateku/configurat/measurement.vue
index f5886d3..8c3ac2b 100644
--- a/src/views/repositoryai/templateku/configurat/measurement.vue
+++ b/src/views/repositoryai/templateku/configurat/measurement.vue
@@ -105,7 +105,7 @@
     return {
       answer: "", //鍥炵瓟
       id: null,
-      TemplateName: "闅忚妯$増鍚嶇О", //妯$増鍚�
+      TemplateName: "闅忚妯℃澘鍚嶇О", //妯℃澘鍚�
       radio: "1",
       userid: "",
       input: "杩樹笉閿�",
diff --git a/src/views/repositoryai/templateku/index.vue b/src/views/repositoryai/templateku/index.vue
index 1cd37ef..6e95827 100644
--- a/src/views/repositoryai/templateku/index.vue
+++ b/src/views/repositoryai/templateku/index.vue
@@ -3,7 +3,7 @@
     <!-- 宸︿晶鏍� -->
     <div class="sidecolumn">
       <div class="sidecolumn-top">
-        <div class="top-wj">妯$増绫诲瀷</div>
+        <div class="top-wj">妯℃澘绫诲瀷</div>
         <div class="top-tj" @click="Newcategory">+娣诲姞</div>
       </div>
       <div class="center-ss">
@@ -68,7 +68,7 @@
               v-show="showSearch"
               label-width="98px"
             >
-              <el-form-item label="妯$増鏍囬" prop="templateName">
+              <el-form-item label="妯℃澘鏍囬" prop="templateName">
                 <el-input
                   v-model="queryParams.templateName"
                   placeholder="璇疯緭鍏�"
@@ -151,7 +151,7 @@
               </el-col>
               <!-- <el-col :span="1.5"> </el-col> -->
             </el-row>
-            <!-- 鏍囧噯妯$増 -->
+            <!-- 鏍囧噯妯℃澘 -->
             <el-table
               v-loading="loading"
               :data="userList"
@@ -167,7 +167,7 @@
                 prop="id"
               />
               <el-table-column
-                label="妯$増鍚嶇О"
+                label="妯℃澘鍚嶇О"
                 fixed
                 align="center"
                 key="templateName"
@@ -313,7 +313,7 @@
                 </template>
               </el-table-column>
             </el-table>
-            <!-- 閫氱敤妯$増 -->
+            <!-- 閫氱敤妯℃澘 -->
 
             <!-- 搴曢儴鍒嗛〉 -->
             <pagination
@@ -617,9 +617,9 @@
       });
     },
 
-    // 澶嶅埗妯$増
+    // 澶嶅埗妯℃澘
     copyfn() {},
-    // 涓嬭浇妯$増
+    // 涓嬭浇妯℃澘
     downloadfn() {},
     // 璺宠浆缂栬緫璇濇湳椤甸潰
     compileUpdate(row) {
diff --git a/src/views/sfstatistics/propaganda/index.vue b/src/views/sfstatistics/propaganda/index.vue
index 6d5b549..5c0f8cc 100644
--- a/src/views/sfstatistics/propaganda/index.vue
+++ b/src/views/sfstatistics/propaganda/index.vue
@@ -491,7 +491,7 @@
         tagdescription: "",
       },
       topicvalue: {
-        name: "楠ㄧ闅忚妯$増",
+        name: "楠ㄧ闅忚妯℃澘",
         number: 222,
       },
       classifyform: {
diff --git a/src/views/sfstatistics/statement/index.vue b/src/views/sfstatistics/statement/index.vue
index 72a380e..ec481aa 100644
--- a/src/views/sfstatistics/statement/index.vue
+++ b/src/views/sfstatistics/statement/index.vue
@@ -492,7 +492,7 @@
         tagdescription: "",
       },
       topicvalue: {
-        name: "楠ㄧ闅忚妯$増",
+        name: "楠ㄧ闅忚妯℃澘",
         number: 222,
       },
       classifyform: {
diff --git a/src/views/shortmessage/healthinformation/compilequer/index.vue b/src/views/shortmessage/healthinformation/compilequer/index.vue
index bc75051..f872f3b 100644
--- a/src/views/shortmessage/healthinformation/compilequer/index.vue
+++ b/src/views/shortmessage/healthinformation/compilequer/index.vue
@@ -826,7 +826,7 @@
 
     // --------------------------
 
-    // 棰勮妯$増
+    // 棰勮妯℃澘
     PreviewTemplate() {
       this.drawer = true;
     },
diff --git a/src/views/shortmessage/messagebank/compile/index.vue b/src/views/shortmessage/messagebank/compile/index.vue
index bd742e1..db78891 100644
--- a/src/views/shortmessage/messagebank/compile/index.vue
+++ b/src/views/shortmessage/messagebank/compile/index.vue
@@ -4,7 +4,7 @@
       <div class="basics">闂閰嶇疆</div>
       <div class="headbottom">
         <el-button type="primary" icon="el-icon-notebook-2" @click="addzbiaofn"
-          >鍋ュ悍淇℃伅妯$増</el-button
+          >鍋ュ悍淇℃伅妯℃澘</el-button
         >
         <el-button @click="emptyfn" type="primary" icon="el-icon-refresh-right"
           >娓呯┖鐭俊鍐呭</el-button
diff --git a/vue.config.js b/vue.config.js
index 0746100..2c7ad51 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -35,7 +35,7 @@
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://192.168.2.8:8095`,
+        target: `http://192.168.1.10:8095`,
         // target:`http://localhost:8095`,
         // target: `http://35z1t16164.qicp.vip`,
         changeOrigin: true,

--
Gitblit v1.9.3