From ad70f145e8bea957b41043b4a1e37ce37cc5ed1e Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期二, 16 一月 2024 18:39:24 +0800
Subject: [PATCH] 指标完成

---
 src/views/followvisit/outpatient/index.vue               |   40 +
 src/views/patient/patient/physical.vue                   |    4 
 src/views/repositoryai/templateku/configurat/index.vue   |  226 ++++++++-
 src/views/patient/patient/outpatient.vue                 |   12 
 src/views/shortmessage/healthinformation/index.vue       |    3 
 src/views/knowledge/questionnaire/compilequer/index.vue  |   94 +++
 src/views/patient/patient/index.vue                      |    7 
 src/views/patient/subsequent/index.vue                   |   35 
 src/views/patient/propaganda/index.vue                   |  215 +-------
 src/views/repositoryai/verbaltrick/particulars/index.vue |   13 
 src/views/knowledge/questionbank/particulars/index.vue   |   80 ++
 src/api/AiCentre/Hetask.js                               |    4 
 src/views/patient/patient/behospitalized.vue             |   15 
 src/views/knowledge/education/compilequer/index.vue      |   77 +-
 src/components/SFtable/index.vue                         |   39 +
 src/views/followvisit/tasklist/index.vue                 |   21 
 src/views/repositoryai/verbaltrick/index.vue             |    4 
 src/views/patient/physical/index.vue                     |   35 
 src/api/AiCentre/publicity.js                            |    3 
 src/views/knowledge/questionbank/index.vue               |   10 
 src/views/knowledge/education/index.vue                  |   40 +
 src/views/patient/questionnaire/index.vue                |   80 +-
 src/views/followvisit/record/index.vue                   |   37 
 src/components/Regular/index.vue                         |    7 
 src/views/knowledge/questionnaire/index.vue              |    3 
 src/views/patient/medtechnician/index.vue                |   37 
 src/views/repositoryai/intention/index.vue               |   40 +
 src/views/patient/propaganda/particty.vue                |  178 +++++-
 src/views/followvisit/discharge/index.vue                |   41 +
 src/views/repositoryai/templateku/index.vue              |    4 
 30 files changed, 908 insertions(+), 496 deletions(-)

diff --git a/src/api/AiCentre/Hetask.js b/src/api/AiCentre/Hetask.js
index b495da4..72280de 100644
--- a/src/api/AiCentre/Hetask.js
+++ b/src/api/AiCentre/Hetask.js
@@ -3,7 +3,7 @@
 // 鏌ヨ瀹f暀浠诲姟鍒楄〃
 export function gethetasklist(data) {
   return request({
-    url: "/smartor/hetask/list",
+    url: "/smartor/hetask/getPatHeTaskList",
     method: "post",
     data: data,
   });
@@ -19,7 +19,7 @@
     // 鏌ヨ瀹f暀浠诲姟璇︽儏鍒楄〃
     export function gethetaskinfo(Id) {
     return request({
-      url: "/smartor/hetask/" + Id,
+      url: "/smartor/hetask/getInfo" + Id,
       method: "get",
     });
   }
diff --git a/src/api/AiCentre/publicity.js b/src/api/AiCentre/publicity.js
index 76c553c..085b23c 100644
--- a/src/api/AiCentre/publicity.js
+++ b/src/api/AiCentre/publicity.js
@@ -32,9 +32,6 @@
       data: data,
     });
   }
-
-
-
   // 鏂板瀹f暀妯$増鍒嗙被鏍�
   export function addheLibraryAssort(data) {
     return request({
diff --git a/src/components/Regular/index.vue b/src/components/Regular/index.vue
index f9f20de..58e60ca 100644
--- a/src/components/Regular/index.vue
+++ b/src/components/Regular/index.vue
@@ -53,6 +53,7 @@
             type="success"
             v-for="crux in dynamiccruxs"
             closable
+            effect="dark"
             :disable-transitions="false"
             @close="handleClosecrux(crux)"
           >
@@ -64,6 +65,7 @@
             @change="handleInputConfirm"
             filterable
             remote
+            allow-create
             reserve-keyword
             default-first-option
             :loading="loading"
@@ -93,6 +95,7 @@
             type="warning"
             v-for="crux in nodynamiccruxs"
             closable
+            effect="dark"
             :disable-transitions="false"
             @close="handleClosecrux(crux)"
           >
@@ -104,6 +107,7 @@
             @change="handleInputConfirm"
             filterable
             remote
+            allow-create
             reserve-keyword
             default-first-option
             :loading="loading"
@@ -264,6 +268,9 @@
       this.whether = 2;
       console.log(2);
     },
+    handleSelectionChange(selection) {
+      $emit("handleSelectionChange", selection);
+    },
   },
 };
 </script>
diff --git a/src/components/SFtable/index.vue b/src/components/SFtable/index.vue
index 1e06198..18e3057 100644
--- a/src/components/SFtable/index.vue
+++ b/src/components/SFtable/index.vue
@@ -12,7 +12,12 @@
     :highlight-current-row="true"
     empty-text="鏆傛棤鏁版嵁"
   >
-    <el-table-column v-if="multiplechoice" type="selection" width="50" align="center" />
+    <el-table-column
+      v-if="multiplechoice"
+      type="selection"
+      width="50"
+      align="center"
+    />
     <el-table-column label="搴忓彿" align="center" key="id" prop="id" />
     <el-table-column
       v-for="(item, index) in tableLabel"
@@ -24,8 +29,20 @@
     >
     </el-table-column>
     <el-table-column
-    v-if="center"
+      label="鏄惁鍙敤"
+      align="center"
+      key="isavailable"
+      prop="isavailable"
+      width="120"
+    >
+      <template slot-scope="scope">
+        <dict-tag :options="usable" :value="scope.row.isavailable" />
+      </template>
+    </el-table-column>
+    <el-table-column
+      v-if="center"
       label="鎿嶄綔"
+      fixed="right"
       align="center"
       width="120"
       class-name="small-padding fixed-width"
@@ -60,6 +77,11 @@
   data() {
     return {
       ids: [],
+      mode: [],
+      languagelist: [],
+      editabshape: [],
+      usable: [],
+      precedencetype: [],
     };
   },
   props: {
@@ -83,13 +105,18 @@
       type: Boolean,
       default: true,
     },
-    multiplechoice:{
+    multiplechoice: {
       type: Boolean,
       default: true,
-    }
-
+    },
   },
-  created() {},
+  created() {
+    this.mode = store.getters.mode;
+    this.languagelist = store.getters.languagelist;
+    this.usable = store.getters.usable;
+    this.precedencetype = store.getters.precedencetype;
+    this.editabshape = store.getters.editabshape;
+  },
 
   methods: {
     //   鏁版嵁杩囨护
diff --git a/src/views/followvisit/discharge/index.vue b/src/views/followvisit/discharge/index.vue
index 2020f3d..985d804 100644
--- a/src/views/followvisit/discharge/index.vue
+++ b/src/views/followvisit/discharge/index.vue
@@ -183,11 +183,18 @@
         <el-table-column type="selection" width="50" align="center" />
         <el-table-column
           label="搴忓彿"
+          fixed
           align="center"
           key="userId"
           prop="userId"
         />
-
+        <el-table-column
+          label="濮撳悕"
+          fixed
+          align="center"
+          key="types"
+          prop="types"
+        />
         <el-table-column
           label="鐥呭巻鍙�"
           align="center"
@@ -196,7 +203,7 @@
           prop="userName"
           width="120"
         />
-        <el-table-column label="濮撳悕" align="center" key="types" prop="types" />
+
         <el-table-column
           label="骞撮緞"
           align="center"
@@ -228,18 +235,6 @@
         >
           <template slot-scope="scope">
             <div>杞诲害楠ㄨ</div>
-          </template>
-        </el-table-column>
-        <el-table-column
-          label="闅忚鐘舵��"
-          align="center"
-          key="topicnumber"
-          prop="topicnumber"
-          width="120"
-          :show-overflow-tooltip="true"
-        >
-          <template slot-scope="scope">
-            <div>鏈畬鎴�</div>
           </template>
         </el-table-column>
         <el-table-column
@@ -304,9 +299,23 @@
             <span>{{ parseTime(scope.row.createTime) }}</span>
           </template>
         </el-table-column>
+        <el-table-column
+          label="闅忚鐘舵��"
+          fixed="right"
+          align="center"
+          key="topicnumber"
+          prop="topicnumber"
+          width="120"
+          :show-overflow-tooltip="true"
+        >
+          <template slot-scope="scope">
+            <div>鏈畬鎴�</div>
+          </template>
+        </el-table-column>
 
         <el-table-column
           label="鎿嶄綔"
+          fixed="right"
           align="center"
           width="200"
           class-name="small-padding fixed-width"
@@ -840,10 +849,10 @@
     handleAdd() {
       this.$router.push({
         path: "/followvisit/particty",
-        query: { type: 3, },
+        query: { type: 3 },
       });
     },
- 
+
     /** 閲嶇疆瀵嗙爜鎸夐挳鎿嶄綔 */
     handleResetPwd(row) {
       this.$prompt('璇疯緭鍏�"' + row.userName + '"鐨勬柊瀵嗙爜', "鎻愮ず", {
diff --git a/src/views/followvisit/outpatient/index.vue b/src/views/followvisit/outpatient/index.vue
index 3527647..790aa9c 100644
--- a/src/views/followvisit/outpatient/index.vue
+++ b/src/views/followvisit/outpatient/index.vue
@@ -184,9 +184,17 @@
         <el-table-column type="selection" width="50" align="center" />
         <el-table-column
           label="搴忓彿"
+          fixed
           align="center"
           key="userId"
           prop="userId"
+        />
+        <el-table-column
+          label="濮撳悕"
+          fixed
+          align="center"
+          key="types"
+          prop="types"
         />
 
         <el-table-column
@@ -197,7 +205,6 @@
           prop="userName"
           width="120"
         />
-        <el-table-column label="濮撳悕" align="center" key="types" prop="types" />
         <el-table-column
           label="骞撮緞"
           align="center"
@@ -225,18 +232,7 @@
             <div>杞诲害楠ㄨ</div>
           </template>
         </el-table-column>
-        <el-table-column
-          label="闅忚鐘舵��"
-          align="center"
-          key="topicnumber"
-          prop="topicnumber"
-          width="120"
-          :show-overflow-tooltip="true"
-        >
-          <template slot-scope="scope">
-            <div>鏈畬鎴�</div>
-          </template>
-        </el-table-column>
+
         <el-table-column
           label="闅忚鏂规"
           align="center"
@@ -300,9 +296,22 @@
           </template>
         </el-table-column>
 
-
+        <el-table-column
+          label="闅忚鐘舵��"
+          fixed="right"
+          align="center"
+          key="topicnumber"
+          prop="topicnumber"
+          width="120"
+          :show-overflow-tooltip="true"
+        >
+          <template slot-scope="scope">
+            <div>鏈畬鎴�</div>
+          </template>
+        </el-table-column>
         <el-table-column
           label="鎿嶄綔"
+          fixed="right"
           align="center"
           width="200"
           class-name="small-padding fixed-width"
@@ -836,7 +845,7 @@
     handleAdd() {
       this.$router.push({
         path: "/followvisit/particty",
-        query: { type: 2, },
+        query: { type: 2 },
       });
     },
 
@@ -940,7 +949,6 @@
         path: "/followvisit/record/detailpage/",
         query: { id: "1" },
       });
-
     },
     // 瀵煎叆鎸夐挳
     toleadExport() {},
diff --git a/src/views/followvisit/record/index.vue b/src/views/followvisit/record/index.vue
index 6581aa5..9159b14 100644
--- a/src/views/followvisit/record/index.vue
+++ b/src/views/followvisit/record/index.vue
@@ -135,11 +135,19 @@
         <el-table-column type="selection" width="50" align="center" />
         <el-table-column
           label="搴忓彿"
+          fixed
           align="center"
           key="userId"
           prop="userId"
         />
 
+        <el-table-column
+          label="濮撳悕"
+          fixed
+          align="center"
+          key="types"
+          prop="types"
+        />
         <el-table-column
           label="鐥呭巻鍙�"
           align="center"
@@ -148,7 +156,6 @@
           prop="userName"
           width="120"
         />
-        <el-table-column label="濮撳悕" align="center" key="types" prop="types" />
         <el-table-column
           label="骞撮緞"
           align="center"
@@ -180,18 +187,6 @@
         >
           <template slot-scope="scope">
             <div>杞诲害楠ㄨ</div>
-          </template>
-        </el-table-column>
-        <el-table-column
-          label="閫氱煡鐘舵��"
-          align="center"
-          key="topicnumber"
-          prop="topicnumber"
-          width="120"
-          :show-overflow-tooltip="true"
-        >
-          <template slot-scope="scope">
-            <div>鏈畬鎴�</div>
           </template>
         </el-table-column>
         <el-table-column
@@ -258,7 +253,21 @@
         </el-table-column>
 
         <el-table-column
+          label="閫氱煡鐘舵��"
+          fixed="right"
+          align="center"
+          key="topicnumber"
+          prop="topicnumber"
+          width="120"
+          :show-overflow-tooltip="true"
+        >
+          <template slot-scope="scope">
+            <div>鏈畬鎴�</div>
+          </template>
+        </el-table-column>
+        <el-table-column
           label="浠诲姟璇︽儏"
+          fixed="right"
           align="center"
           width="200"
           class-name="small-padding fixed-width"
@@ -705,7 +714,7 @@
     handleAdd() {
       this.$router.push({
         path: "/followvisit/particty",
-        query: { type: 1, },
+        query: { type: 1 },
       });
     },
     /** 淇敼鎸夐挳鎿嶄綔 */
diff --git a/src/views/followvisit/tasklist/index.vue b/src/views/followvisit/tasklist/index.vue
index 430caa0..b5a18c6 100644
--- a/src/views/followvisit/tasklist/index.vue
+++ b/src/views/followvisit/tasklist/index.vue
@@ -149,10 +149,11 @@
         @selection-change="handleSelectionChange"
       >
         <el-table-column type="selection" width="50" align="center" />
-        <el-table-column label="搴忓彿" align="center" key="id" prop="id" />
+        <el-table-column label="搴忓彿" fixed align="center" key="id" prop="id" />
 
         <el-table-column
           label="浠诲姟鍚嶇О"
+          fixed
           align="center"
           sortable
           key="name"
@@ -170,13 +171,6 @@
           align="center"
           key="nickName"
           prop="nickName"
-        />
-        <el-table-column
-          label="鐘舵��"
-          align="center"
-          key="phonenumber"
-          prop="phonenumber"
-          width="120"
         />
 
         <el-table-column
@@ -219,7 +213,16 @@
         </el-table-column>
 
         <el-table-column
+          label="鐘舵��"
+          fixed="right"
+          align="center"
+          key="phonenumber"
+          prop="phonenumber"
+          width="120"
+        />
+        <el-table-column
           label="鎿嶄綔"
+          fixed="right"
           align="center"
           width="120"
           class-name="small-padding fixed-width"
@@ -238,6 +241,7 @@
         </el-table-column>
         <el-table-column
           label="浠诲姟璇︽儏"
+          fixed="right"
           align="center"
           width="200"
           class-name="small-padding fixed-width"
@@ -349,7 +353,6 @@
   resetUserPwd,
   changeUserStatus,
 } from "@/api/system/user";
-
 
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
diff --git a/src/views/knowledge/education/compilequer/index.vue b/src/views/knowledge/education/compilequer/index.vue
index fb07522..40afd79 100644
--- a/src/views/knowledge/education/compilequer/index.vue
+++ b/src/views/knowledge/education/compilequer/index.vue
@@ -28,14 +28,19 @@
               filterable
               placeholder="璇烽�夋嫨鍒嗙被"
             >
-              <el-option
-                class="ruleFormaa"
-                v-for="item in sortlist"
-                :key="item.id"
-                :label="item.assortname"
-                :value="item.id"
+              <el-option-group
+                v-for="group in sortlist"
+                :key="group.id"
+                :label="group.assortname"
               >
-              </el-option>
+                <el-option
+                  v-for="item in group.heLibraryAssortList"
+                  :key="item.id"
+                  :label="item.assortname"
+                  :value="item.id"
+                >
+                </el-option>
+              </el-option-group>
             </el-select>
           </el-form-item>
           <el-form-item label="瀹f暀鏍囬" prop="preachname">
@@ -43,9 +48,9 @@
               <el-input v-model="ruleForm.preachname"></el-input>
             </div>
           </el-form-item>
-          <el-form-item label="瀹f暀鎻忚堪" prop="preachdescription">
+          <el-form-item label="瀹f暀鎻忚堪" prop="preachcontent">
             <div style="width: 30%">
-              <el-input v-model="ruleForm.preachdescription"></el-input>
+              <el-input v-model="ruleForm.preachcontent"></el-input>
             </div>
           </el-form-item>
           <el-form-item label="閫氱煡鍙橀噺" prop="name">
@@ -256,7 +261,9 @@
             <el-button type="success" @click="nextstep('ruleForm')"
               >涓嬩竴姝�</el-button
             >
-            <el-button @click="resetForm('ruleForm')">閲嶇疆</el-button>
+            <el-button type="success" @click="Departmenttreatment('ruleForm')"
+              >淇濆瓨</el-button
+            >
             <el-button type="info" @click="closeFm('ruleForm')">鍏抽棴</el-button>
           </el-form-item>
         </el-form>
@@ -537,34 +544,27 @@
   methods: {
     getList() {
       this.loading = true;
-      getlibraryinfo({ id: this.$route.query.id }).then((res) => {
-        this.ruleForm = res.data;
-        this.tempDetpRelevanceslist = JSON.parse(this.ruleForm.deptNames);
-        this.ruleForm.suitway = this.ruleForm.suitway.split(",");
-        this.variablelist = JSON.parse(this.ruleForm.otherdata)
+      this.id = this.$route.query.id;
+      getlibraryinfo({ id: this.id }).then((res) => {
+        this.ruleForm = res.data[0];
+
+        if (this.ruleForm.deptNames) {
+          this.tempDetpRelevanceslist = JSON.parse(this.ruleForm.deptNames);
+        }
+        if (this.ruleForm.suitway) {
+          this.ruleForm.suitway = this.ruleForm.suitway.split(",");
+        }
+        this.variablelist = this.ruleForm.otherdata
           ? JSON.parse(this.ruleForm.otherdata)
           : this.variablelist;
       });
       getheLibraryAssort({}).then((res) => {
         this.sortlist = res.rows;
-        console.log(res);
       });
       listDept(this.queryParams).then((response) => {
         this.deptList = this.handleTree(response.data, "deptId");
       });
       this.loading = false;
-    },
-    /** 鏌ヨ鏍囩鍒楄〃 */
-    gettabList() {
-      const tagqueryParams = {
-        pageNum: 1,
-        pageSize: 1000,
-        tagcategoryid: "0",
-      };
-      listtag(tagqueryParams).then((response) => {
-        console.log(response);
-        this.optionstag = response.rows;
-      });
     },
 
     submitForm(formName) {
@@ -572,9 +572,15 @@
       this.dynamicTags.forEach((item) => {
         tgs.push(item.tagname);
       });
-      this.ruleForm.labelInfo = tgs.join(",");
+      console.log(tgs.length, "tgs");
+
+      this.ruleForm.labelInfo = tgs.length != 0 ? tgs.join(", ") : "";
       this.ruleForm.otherdata = JSON.stringify(this.variablelist);
-      this.ruleForm.suitway = this.ruleForm.suitway.join(",");
+      console.log(22);
+      this.ruleForm.suitway =
+        this.ruleForm.suitway.length != 0
+          ? this.ruleForm.suitway.join(",")
+          : "";
       if (this.id) {
         this.ruleForm.isoperation = 2;
         compilelibrary(this.ruleForm).then((response) => {
@@ -619,11 +625,9 @@
     // 绉戝澶勭悊
     Departmenttreatment() {
       this.ruleForm.deptNames = JSON.stringify(this.tempDetpRelevanceslist);
-      console.log(this.tempDetpRelevanceslist);
       const result = this.tempDetpRelevanceslist.map(
         (subArr) => subArr[subArr.length - 1]
       );
-      console.log(result);
       // id鏁扮粍鏌ユ暟缁勫璞�
       result.forEach((item) => {
         const condition = this.ruleForm.tempDetpRelevances.some(
@@ -631,13 +635,11 @@
         );
         if (!condition) {
           listDept({ deptId: item }).then((res) => {
-            console.log(res.data[0]);
             res.data[0].type = 2;
             this.ruleForm.tempDetpRelevances.push(res.data[0]);
           });
         }
       });
-      console.log(this.ruleForm.tempDetpRelevances);
       // 鏁扮粍瀵硅薄鏌d鏁扮粍
       this.ruleForm.tempDetpRelevances.forEach((item) => {
         const condition = result.some((obj) => obj === item.deptId);
@@ -646,7 +648,6 @@
           this.ruleForm.tempDetpRelevances[index].delFlag = 1;
         }
       });
-      console.log(this.ruleForm.tempDetpRelevances);
       setTimeout(() => {
         this.submitForm();
       }, 1000);
@@ -684,13 +685,10 @@
         tagcategoryid: "0",
       };
       listtag(tagqueryParams).then((response) => {
-        console.log(response);
         this.optionstag = response.rows;
       });
     },
     handleClosetag(tag) {
-      console.log(tag);
-      console.log(this.dynamicTags.indexOf(tag));
       const lindex = this.dynamicTags.indexOf(tag);
       this.dynamicTags.splice(this.dynamicTags.indexOf(tag), 1);
       this.ruleForm.heLibraryTagList[lindex].isoperation = 3;
@@ -745,12 +743,10 @@
         pageSize: 100,
       };
       getillnesslist(illnessqueryParams).then((response) => {
-        console.log(response);
         this.optionsillness = response.rows;
       });
       getillness({ outid: this.$route.query.id, type: 6 }).then((res) => {
         this.illnesslist = res.rows;
-        console.log(res);
       });
     },
     handleCloseillness(tag) {
@@ -760,7 +756,6 @@
       }
     },
     remoteMethod(value) {
-      console.log(value);
       const illnessqueryParams = {
         pageNum: 1,
         pageSize: 100,
diff --git a/src/views/knowledge/education/index.vue b/src/views/knowledge/education/index.vue
index 036f7e9..1e984a6 100644
--- a/src/views/knowledge/education/index.vue
+++ b/src/views/knowledge/education/index.vue
@@ -181,9 +181,16 @@
               @selection-change="handleSelectionChange"
             >
               <el-table-column type="selection" width="50" align="center" />
-              <el-table-column label="搴忓彿" align="center" key="id" prop="id" />
+              <el-table-column
+                label="搴忓彿"
+                fixed
+                align="center"
+                key="id"
+                prop="id"
+              />
               <el-table-column
                 label="鏍囬"
+                fixed
                 align="center"
                 key="preachname"
                 prop="preachname"
@@ -233,9 +240,14 @@
                 :show-overflow-tooltip="true"
               >
                 <template slot-scope="scope">
-                  <span v-for="item in scope.row.labelInfo.split(',')"
-                    >{{ item }}銆�
-                  </span>
+                  <div v-if="scope.row.labelInfo">
+                    <span v-for="item in scope.row.labelInfo.split(',')"
+                      >{{ item }}銆�
+                    </span>
+                  </div>
+                  <div v-else>
+                    <span>鏃�</span>
+                  </div>
                 </template>
               </el-table-column>
               <el-table-column
@@ -245,12 +257,17 @@
                 prop="suitway"
                 width="120"
               >
-              <template slot-scope="scope">
-                  <span v-for="item in scope.row.suitway.split(',')"
-                    >{{ item }}銆�
-                  </span>
+                <template slot-scope="scope">
+                  <div v-if="scope.row.suitway">
+                    <span v-for="item in scope.row.suitway.split(',')"
+                      >{{ item }}銆�
+                    </span>
+                  </div>
+                  <div v-else>
+                    <span>鏃�</span>
+                  </div>
                 </template>
-            </el-table-column>
+              </el-table-column>
               <el-table-column
                 label="鍐呭褰㈠紡"
                 align="center"
@@ -286,6 +303,7 @@
 
               <el-table-column
                 label="鎿嶄綔"
+                fixed="right"
                 align="center"
                 width="300"
                 class-name="small-padding fixed-width"
@@ -561,10 +579,12 @@
   methods: {
     /** 鏌ヨ瀹f暀鍒楄〃 */
     getList() {
-      //   this.loading = true;
+      this.loading = true;
       getlibrarylist(this.queryParams).then((response) => {
         console.log(response);
         this.userList = response.rows;
+        this.total = response.total;
+        this.loading = false;
       });
       listDept(this.queryParams).then((response) => {
         this.deptList = this.handleTree(response.data, "deptId");
diff --git a/src/views/knowledge/questionbank/index.vue b/src/views/knowledge/questionbank/index.vue
index 53644ce..437e672 100644
--- a/src/views/knowledge/questionbank/index.vue
+++ b/src/views/knowledge/questionbank/index.vue
@@ -152,15 +152,22 @@
               :border="true"
               @selection-change="handleSelectionChange"
             >
-              <el-table-column type="selection" width="50" align="center" />
+              <el-table-column
+                type="selection"
+                fixed
+                width="50"
+                align="center"
+              />
               <el-table-column
                 label="搴忓彿"
+                fixed
                 align="center"
                 key="topicid"
                 prop="topicid"
               />
               <el-table-column
                 label="棰樼洰鏍囬"
+                fixed
                 align="center"
                 key="topic"
                 prop="topic"
@@ -245,6 +252,7 @@
 
               <el-table-column
                 label="鎿嶄綔"
+                fixed="right"
                 align="center"
                 width="250"
                 class-name="small-padding fixed-width"
diff --git a/src/views/knowledge/questionbank/particulars/index.vue b/src/views/knowledge/questionbank/particulars/index.vue
index ef1020e..63cc423 100644
--- a/src/views/knowledge/questionbank/particulars/index.vue
+++ b/src/views/knowledge/questionbank/particulars/index.vue
@@ -12,6 +12,28 @@
             >
           </div>
           <div style="margin-left: 8%">
+            <el-form-item label="闂鍒嗙被">
+              <el-select
+                v-model="topicobj.assortid"
+                size="medium"
+                filterable
+                placeholder="璇烽�夋嫨鍒嗙被"
+              >
+                <el-option-group
+                  v-for="group in classifylist"
+                  :key="group.id"
+                  :label="group.name"
+                >
+                  <el-option
+                    v-for="item in group.svyLibTopicCategoryList"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
+                  >
+                  </el-option>
+                </el-option-group>
+              </el-select>
+            </el-form-item>
             <el-row :gutter="10">
               <el-col :span="6"
                 ><el-form-item label="棰樼洰鏍囬">
@@ -116,9 +138,9 @@
               <el-input
                 style="width: 40vw"
                 type="textarea"
-                id="questiontext"
+                id="topicContent"
                 v-model="topicobj.topicContent"
-                @focus="handleInput('questiontext')"
+                @focus="handleInput('topicContent')"
                 placeholder="璇疯緭鍏ユ爣棰�"
               ></el-input>
             </el-form-item>
@@ -323,10 +345,10 @@
       </el-card>
     </div>
     <el-drawer
-      title="娣诲姞棰樼洰"
+      title="娣诲姞閫夐」"
       :visible.sync="drawer"
       custom-class="demo-drawer"
-      width="50%"
+      width="66%"
     >
       <div class="preview-left">
         <el-form
@@ -415,6 +437,7 @@
   compileissue,
   delissueinfo,
   Followupinfo,
+  getissueclassify,
   deltargetillness,
   addtargetillness,
   getillnesslist,
@@ -467,7 +490,7 @@
       optionsillness: [],
       illnesslistapi: [],
       illnesslist: [],
-
+      classifylist: [],
       optionstag: [],
       xjxsoptions: [],
       usable: [],
@@ -487,10 +510,26 @@
   },
 
   methods: {
+    // 鍏叡鏂规硶---------------
     getIndexInArray(arr, obj) {
       return arr.indexOf(obj);
     },
-
+    // 閫掑綊鎵佸钩鍖�
+    flattenArray(arr) {
+      let result = [];
+      arr.forEach((item) => {
+        result.push(item);
+        if (item.svyLibTopicCategoryList) {
+          console.log(2);
+          result = result.concat(
+            this.flattenArray(item.svyLibTopicCategoryList)
+          );
+          delete item.svyLibTopicCategoryList;
+        }
+      });
+      return result;
+    },
+    // -----------------------------
     // 鑾峰彇鏁版嵁
     getissueinfo() {
       this.id = this.$route.query.id;
@@ -512,6 +551,10 @@
       });
       getillness({ outid: this.id, type: 4 }).then((res) => {
         this.illnesslist = res.rows;
+      });
+      // 鍒嗙被
+      getissueclassify({}).then((res) => {
+        this.classifylist = res.rows;
       });
     },
     gettargetInfo() {
@@ -720,16 +763,17 @@
       let inputValueArr = "";
       let el = document.querySelector("#" + this.currentInputId);
       //el.selectionStart; 杩欏氨鏄綋鍓嶅厜鏍囨墍鍦ㄧ殑浣嶇疆锛堝瓧绗︿覆涓瓧绗︾殑index锛�
-      if (this.currentInputId == "questiontext") {
-        inputValueArr = this.indexform.questiontext.split("");
+      if (this.currentInputId == "topicContent") {
+        inputValueArr = this.topicobj.topicContent.split("");
+        console.log(123);
       } else if (this.currentInputId == "nomatchtext") {
-        inputValueArr = this.indexform.nomatchtext.split("");
+        inputValueArr = this.topicobj.nomatchtext.split("");
       } else if (this.currentInputId == "sliencetext") {
-        inputValueArr = this.indexform.sliencetext.split("");
+        inputValueArr = this.topicobj.sliencetext.split("");
       } else if (this.currentInputId == "noclearlytext") {
-        inputValueArr = this.indexform.noclearlytext.split("");
+        inputValueArr = this.topicobj.noclearlytext.split("");
       } else if (this.currentInputId == "submoduletext") {
-        inputValueArr = this.indexform.submoduletext.split("");
+        inputValueArr = this.topicobj.submoduletext.split("");
       } else {
         return;
       }
@@ -742,16 +786,16 @@
       // 鎶婃暟缁勯噸鏂拌浆鎹负瀛楃涓插苟璧嬪��
       inputValueArr = inputValueArr.join("");
       console.log(inputValueArr);
-      if (this.currentInputId == "questiontext") {
-        this.indexform.questiontext = inputValueArr;
+      if (this.currentInputId == "topicContent") {
+        this.topicobj.topicContent = inputValueArr;
       } else if (this.currentInputId == "nomatchtext") {
-        this.indexform.nomatchtext = inputValueArr;
+        this.topicobj.nomatchtext = inputValueArr;
       } else if (this.currentInputId == "sliencetext") {
-        this.indexform.sliencetext = inputValueArr;
+        this.topicobj.sliencetext = inputValueArr;
       } else if (this.currentInputId == "noclearlytext") {
-        this.indexform.noclearlytext = inputValueArr;
+        this.topicobj.noclearlytext = inputValueArr;
       } else if (this.currentInputId == "submoduletext") {
-        this.indexform.submoduletext = inputValueArr;
+        this.topicobj.submoduletext = inputValueArr;
       } else {
         return;
       }
diff --git a/src/views/knowledge/questionnaire/compilequer/index.vue b/src/views/knowledge/questionnaire/compilequer/index.vue
index d01a149..6a25a21 100644
--- a/src/views/knowledge/questionnaire/compilequer/index.vue
+++ b/src/views/knowledge/questionnaire/compilequer/index.vue
@@ -33,14 +33,19 @@
               filterable
               placeholder="璇烽�夋嫨鍒嗙被"
             >
-              <el-option
-                class="ruleFormaa"
-                v-for="item in optionsclass"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
+              <el-option-group
+                v-for="group in optionsclass"
+                :key="group.id"
+                :label="group.name"
               >
-              </el-option>
+                <el-option
+                  v-for="item in group.svyLibTitleCategoryList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                >
+                </el-option>
+              </el-option-group>
             </el-select>
           </el-form-item>
           <el-form-item label="闂嵎鏍囬" prop="name">
@@ -265,8 +270,8 @@
                 <el-table-column
                   label="搴忓彿"
                   align="center"
-                  key="topicid"
-                  prop="topicid"
+                  key="guid"
+                  prop="guid"
                 />
                 <el-table-column
                   label="棰樼洰"
@@ -286,22 +291,33 @@
                 <el-table-column
                   label="鎿嶄綔"
                   align="center"
-                  width="200"
+                  width="250"
                   class-name="small-padding fixed-width"
                 >
                   <template slot-scope="scope">
                     <el-button
                       icon="el-icon-edit"
                       type="primary"
-                      round
+                      circle
                       @click="handleUpdate(scope.row)"
-                      >淇敼</el-button
-                    >
+                    ></el-button>
                     <el-button
                       type="danger"
                       icon="el-icon-delete"
                       circle
                       @click="handleDelete(scope.row)"
+                    ></el-button>
+                    <el-button
+                      @click="syioption(scope.row)"
+                      type="success"
+                      icon="el-icon-top"
+                      circle
+                    ></el-button>
+                    <el-button
+                      @click="xiayioption(scope.row)"
+                      type="success"
+                      icon="el-icon-bottom"
+                      circle
                     ></el-button>
                   </template>
                 </el-table-column>
@@ -585,6 +601,7 @@
   compileissue,
   delQtemplateinfo,
   Followupinfo,
+  issueinfo,
   getissuelist,
   deltargetillness,
   addtargetillness,
@@ -597,7 +614,7 @@
   data() {
     return {
       sidecolumnrabs: "left", //鏂瑰悜
-      Editprogress: 2, //缂栬緫杩涘害
+      Editprogress: 1, //缂栬緫杩涘害
       currentVersion: "1.2.3", //褰撳墠鐗堟湰
       loading: false, // 閬僵灞�
       drawer: false, //鎺у埗灞曞紑
@@ -687,9 +704,25 @@
   },
 
   methods: {
+    // 鍏叡鏂规硶---------------
     getIndexInArray(arr, obj) {
       return arr.indexOf(obj);
     },
+    // 閫掑綊鎵佸钩鍖�
+    flattenArray(arr) {
+      let result = [];
+      arr.forEach((item) => {
+        result.push(item);
+        if (item.svyLibTitleCategoryList) {
+          result = result.concat(
+            this.flattenArray(item.svyLibTitleCategoryList)
+          );
+          delete item.svyLibTitleCategoryList;
+        }
+      });
+      return result;
+    },
+    // -----------------------------
     // 鑾峰彇鏁版嵁
     getissueinfo() {
       this.id = this.$route.query.id;
@@ -712,7 +745,9 @@
       listDept(this.queryParams).then((response) => {
         this.deptList = this.handleTree(response.data, "deptId");
       });
+      // 鍒嗙被
       getQtemplateclassify({}).then((res) => {
+        // this.optionsclass = this.flattenArray(res.rows);
         this.optionsclass = res.rows;
       });
     },
@@ -817,10 +852,37 @@
         this.ruleForm.svyLibTopics.indexOf(row),
         1
       );
+      this.sortFn();
     },
     handleUpdate(row) {
-      console.log(row);
-      this.topicobj = row;
+      getissuelist({ svyid: row.svyid }).then((res) => {
+        this.topicobj = res.rows[0];
+      });
+    },
+    syioption(row) {
+      const index = this.getIndexInArray(this.ruleForm.svyLibTopics, row);
+      const item = this.ruleForm.svyLibTopics.splice(index, 1)[0]; // 绉婚櫎鎸囧畾绱㈠紩澶勭殑鍏冪礌锛屽苟淇濆瓨鍒癷tem鍙橀噺涓�
+      this.ruleForm.svyLibTopics.splice(index - 1, 0, item); // 灏唅tem鎻掑叆鍒扮储寮曚綅缃殑鍓嶄竴浣�
+      this.sortFn();
+    },
+    xiayioption(row) {
+      const index = this.getIndexInArray(this.ruleForm.svyLibTopics, row);
+      const item = this.ruleForm.svyLibTopics.splice(index, 1)[0]; // 绉婚櫎鎸囧畾绱㈠紩澶勭殑鍏冪礌锛屽苟淇濆瓨鍒癷tem鍙橀噺涓�
+      this.ruleForm.svyLibTopics.splice(index + 1, 0, item); // 灏唅tem鎻掑叆鍒扮储寮曚綅缃殑鍓嶄竴浣�
+      this.sortFn();
+    },
+    sortFn() {
+      this.ruleForm.svyLibTopics = this.ruleForm.svyLibTopics.map(
+        (item, index) => {
+          return {
+            guid: index + 1,
+            svyid: item.svyid,
+            topic: item.topic,
+            topicContent: item.topicContent,
+          };
+        }
+      );
+      console.log(this.ruleForm.svyLibTopics);
     },
 
     // 淇敼棰樼洰淇℃伅
diff --git a/src/views/knowledge/questionnaire/index.vue b/src/views/knowledge/questionnaire/index.vue
index d6c4277..b65e57a 100644
--- a/src/views/knowledge/questionnaire/index.vue
+++ b/src/views/knowledge/questionnaire/index.vue
@@ -180,12 +180,14 @@
               <el-table-column type="selection" width="50" align="center" />
               <el-table-column
                 label="搴忓彿"
+                fixed
                 align="center"
                 key="svyid"
                 prop="svyid"
               />
               <el-table-column
                 label="闂嵎鏍囬"
+                fixed
                 align="center"
                 key="svyname"
                 prop="svyname"
@@ -261,6 +263,7 @@
 
               <el-table-column
                 label="鎿嶄綔"
+                fixed="right"
                 align="center"
                 width="300"
                 class-name="small-padding fixed-width"
diff --git a/src/views/patient/medtechnician/index.vue b/src/views/patient/medtechnician/index.vue
index ced8d83..cff5b7a 100644
--- a/src/views/patient/medtechnician/index.vue
+++ b/src/views/patient/medtechnician/index.vue
@@ -135,9 +135,17 @@
         <el-table-column type="selection" width="50" align="center" />
         <el-table-column
           label="搴忓彿"
+          fixed
           align="center"
           key="userId"
           prop="userId"
+        />
+        <el-table-column
+          label="濮撳悕"
+          fixed
+          align="center"
+          key="types"
+          prop="types"
         />
 
         <el-table-column
@@ -148,7 +156,6 @@
           prop="userName"
           width="120"
         />
-        <el-table-column label="濮撳悕" align="center" key="types" prop="types" />
         <el-table-column
           label="骞撮緞"
           align="center"
@@ -180,18 +187,6 @@
         >
           <template slot-scope="scope">
             <div>杞诲害楠ㄨ</div>
-          </template>
-        </el-table-column>
-        <el-table-column
-          label="閫氱煡鐘舵��"
-          align="center"
-          key="topicnumber"
-          prop="topicnumber"
-          width="120"
-          :show-overflow-tooltip="true"
-        >
-          <template slot-scope="scope">
-            <div>鏈畬鎴�</div>
           </template>
         </el-table-column>
         <el-table-column
@@ -258,7 +253,21 @@
         </el-table-column>
 
         <el-table-column
+          label="閫氱煡鐘舵��"
+          fixed="right"
+          align="center"
+          key="topicnumber"
+          prop="topicnumber"
+          width="120"
+          :show-overflow-tooltip="true"
+        >
+          <template slot-scope="scope">
+            <div>鏈畬鎴�</div>
+          </template>
+        </el-table-column>
+        <el-table-column
           label="浠诲姟璇︽儏"
+          fixed="right"
           align="center"
           width="200"
           class-name="small-padding fixed-width"
@@ -705,7 +714,7 @@
     handleAdd() {
       this.$router.push({
         path: "/followvisit/particty",
-        query: { type: 1, },
+        query: { type: 1 },
       });
     },
     /** 淇敼鎸夐挳鎿嶄綔 */
diff --git a/src/views/patient/patient/behospitalized.vue b/src/views/patient/patient/behospitalized.vue
index 537d1f2..e497607 100644
--- a/src/views/patient/patient/behospitalized.vue
+++ b/src/views/patient/patient/behospitalized.vue
@@ -166,10 +166,17 @@
         >
           <el-table-column type="selection" width="50" align="center" />
           <el-table-column
+            fixed
             label="搴忓彿"
             align="center"
             key="patid"
             prop="patid"
+          /><el-table-column
+            fixed
+            label="鎮h�呭鍚�"
+            align="center"
+            key="name"
+            prop="name"
           />
           <el-table-column
             label="搴婁綅鍙�"
@@ -183,12 +190,7 @@
             key="Patientnumber"
             prop="Patientnumber"
           />
-          <el-table-column
-            label="鎮h�呭鍚�"
-            align="center"
-            key="name"
-            prop="name"
-          />
+
           <el-table-column label="鎬у埆" align="center" key="sex" prop="sex">
             <template slot-scope="scope">
               <span>{{ scope.row.sex == 1 ? "鐢�" : "濂�" }}</span>
@@ -290,6 +292,7 @@
           />
           <el-table-column
             label="鎿嶄綔"
+            fixed="right"
             align="center"
             width="160"
             class-name="small-padding fixed-width"
diff --git a/src/views/patient/patient/index.vue b/src/views/patient/patient/index.vue
index 468b2c7..8d87872 100644
--- a/src/views/patient/patient/index.vue
+++ b/src/views/patient/patient/index.vue
@@ -212,12 +212,14 @@
             >
               <el-table-column type="selection" width="50" align="center" />
               <el-table-column
+                fixed
                 label="搴忓彿"
                 align="center"
                 key="patid"
                 prop="patid"
               />
               <el-table-column
+                fixed
                 label="濮撳悕"
                 align="center"
                 key="name"
@@ -259,7 +261,9 @@
                 :show-overflow-tooltip="true"
               >
                 <template slot-scope="scope">
-                  <span v-for="item in scope.row.tagList">{{ item.tagname }} </span>
+                  <span v-for="item in scope.row.tagList"
+                    >{{ item.tagname }}
+                  </span>
                 </template>
               </el-table-column>
               <el-table-column
@@ -302,6 +306,7 @@
                 </template>
               </el-table-column>
               <el-table-column
+                fixed="right"
                 label="鎿嶄綔"
                 align="center"
                 width="190"
diff --git a/src/views/patient/patient/outpatient.vue b/src/views/patient/patient/outpatient.vue
index db1a877..111bc0c 100644
--- a/src/views/patient/patient/outpatient.vue
+++ b/src/views/patient/patient/outpatient.vue
@@ -58,7 +58,7 @@
               <el-select
                 v-model="queryParams.tagIds"
                 multiple
-                filterable 
+                filterable
                 placeholder="璇烽�夋嫨"
               >
                 <el-option
@@ -170,9 +170,17 @@
           <el-table-column type="selection" width="50" align="center" />
           <el-table-column
             label="搴忓彿"
+            fixed
             align="center"
             key="patid"
             prop="patid"
+          />
+          <el-table-column
+            label="濮撳悕"
+            fixed
+            align="center"
+            key="name"
+            prop="name"
           />
           <el-table-column
             label="鎮h�呯紪鍙�"
@@ -180,7 +188,6 @@
             key="Patientnumber"
             prop="Patientnumber"
           />
-          <el-table-column label="濮撳悕" align="center" key="name" prop="name" />
           <el-table-column label="鎬у埆" align="center" key="sex" prop="sex">
             <template slot-scope="scope">
               <span>{{ scope.row.sex == 1 ? "鐢�" : "濂�" }}</span>
@@ -271,6 +278,7 @@
           </el-table-column>
           <el-table-column
             label="鎿嶄綔"
+            fixed="right"
             align="center"
             width="160"
             class-name="small-padding fixed-width"
diff --git a/src/views/patient/patient/physical.vue b/src/views/patient/patient/physical.vue
index 9073c8e..c199766 100644
--- a/src/views/patient/patient/physical.vue
+++ b/src/views/patient/patient/physical.vue
@@ -162,17 +162,18 @@
           <el-table-column type="selection" width="50" align="center" />
           <el-table-column
             label="搴忓彿"
+            fixed
             align="center"
             key="patid"
             prop="patid"
           />
+          <el-table-column label="濮撳悕" fixed align="center" key="name" prop="name" />
           <el-table-column
             label="浣撴缂栧彿"
             align="center"
             key="Patientnumber"
             prop="Patientnumber"
           />
-          <el-table-column label="濮撳悕" align="center" key="name" prop="name" />
           <el-table-column label="鎬у埆" align="center" key="sex" prop="sex">
             <template slot-scope="scope">
               <span>{{ scope.row.sex == 1 ? "鐢�" : "濂�" }}</span>
@@ -271,6 +272,7 @@
           </el-table-column>
           <el-table-column
             label="鎿嶄綔"
+            fixed="right"
             align="center"
             width="160"
             class-name="small-padding fixed-width"
diff --git a/src/views/patient/physical/index.vue b/src/views/patient/physical/index.vue
index de46790..679f42a 100644
--- a/src/views/patient/physical/index.vue
+++ b/src/views/patient/physical/index.vue
@@ -166,9 +166,17 @@
         <el-table-column type="selection" width="50" align="center" />
         <el-table-column
           label="搴忓彿"
+          fixed
           align="center"
           key="userId"
           prop="userId"
+        />
+        <el-table-column
+          label="濮撳悕"
+          fixed
+          align="center"
+          key="types"
+          prop="types"
         />
 
         <el-table-column
@@ -179,7 +187,6 @@
           prop="userName"
           width="120"
         />
-        <el-table-column label="濮撳悕" align="center" key="types" prop="types" />
         <el-table-column
           label="骞撮緞"
           align="center"
@@ -217,18 +224,6 @@
         >
           <template slot-scope="scope">
             <div>鍥㈡</div>
-          </template>
-        </el-table-column>
-        <el-table-column
-          label="閫氱煡鐘舵��"
-          align="center"
-          key="topicnumber"
-          prop="topicnumber"
-          width="120"
-          :show-overflow-tooltip="true"
-        >
-          <template slot-scope="scope">
-            <div>鏈畬鎴�</div>
           </template>
         </el-table-column>
         <el-table-column
@@ -288,7 +283,21 @@
         </el-table-column>
 
         <el-table-column
+          label="閫氱煡鐘舵��"
+          fixed="right"
+          align="center"
+          key="topicnumber"
+          prop="topicnumber"
+          width="120"
+          :show-overflow-tooltip="true"
+        >
+          <template slot-scope="scope">
+            <div>鏈畬鎴�</div>
+          </template>
+        </el-table-column>
+        <el-table-column
           label="鎿嶄綔"
+          fixed="right"
           align="center"
           width="200"
           class-name="small-padding fixed-width"
diff --git a/src/views/patient/propaganda/index.vue b/src/views/patient/propaganda/index.vue
index aa7da26..32bfa58 100644
--- a/src/views/patient/propaganda/index.vue
+++ b/src/views/patient/propaganda/index.vue
@@ -134,12 +134,13 @@
       >
         <el-table-column type="selection" width="50" align="center" />
         <el-table-column
+        fixed
           label="搴忓彿"
           align="center"
-          key="userId"
-          prop="userId"
+          key="id"
+          prop="id"
         />
-
+<el-table-column label="濮撳悕" fixed align="center" key="types" prop="types" />
         <el-table-column
           label="鐥呭巻鍙�"
           align="center"
@@ -148,7 +149,7 @@
           prop="userName"
           width="120"
         />
-        <el-table-column label="濮撳悕" align="center" key="types" prop="types" />
+        
         <el-table-column
           label="骞撮緞"
           align="center"
@@ -182,18 +183,7 @@
             <div>杞诲害楠ㄨ</div>
           </template>
         </el-table-column>
-        <el-table-column
-          label="閫氱煡鐘舵��"
-          align="center"
-          key="topicnumber"
-          prop="topicnumber"
-          width="120"
-          :show-overflow-tooltip="true"
-        >
-          <template slot-scope="scope">
-            <div>鏈畬鎴�</div>
-          </template>
-        </el-table-column>
+        
         <el-table-column
           label="瀹f暀鍐呭"
           align="center"
@@ -256,8 +246,21 @@
             <span>{{ parseTime(scope.row.createTime) }}</span>
           </template>
         </el-table-column>
-
+<el-table-column
+          label="閫氱煡鐘舵��"
+          fixed="right"
+          align="center"
+          key="topicnumber"
+          prop="topicnumber"
+          width="120"
+          :show-overflow-tooltip="true"
+        >
+          <template slot-scope="scope">
+            <div>鏈畬鎴�</div>
+          </template>
+        </el-table-column>
         <el-table-column
+        fixed="right"
           label="浠诲姟璇︽儏"
           align="center"
           width="200"
@@ -294,60 +297,6 @@
         @pagination="getList"
       />
     </el-row>
-    <!-- 娣诲姞鎴栦慨鏀归棬璇婂鏁欏璇濇 -->
-    <el-dialog
-      :title="title"
-      :visible.sync="addalteropen"
-      width="700px"
-      append-to-body
-    >
-      <el-form ref="form" :model="form" label-width="100px">
-        <el-row :gutter="20">
-          <el-col :span="12"
-            ><el-form-item label="浠诲姟鍚嶇О">
-              <el-input v-model="form.name"></el-input> </el-form-item
-          ></el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="24"
-            ><el-form-item label="鎵�灞炵瀹�">
-              <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-col
-        ></el-row>
-        <el-row :gutter="20">
-          <el-col :span="24"
-            ><el-form-item label="瀹f暀绫诲瀷">
-              <el-select v-model="form.region" placeholder="璇烽�夋嫨瀹f暀绫诲瀷">
-                <el-option label="鍖哄煙涓�" value="shanghai"></el-option>
-                <el-option label="鍖哄煙浜�" value="beijing"></el-option>
-              </el-select> </el-form-item
-          ></el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="24">
-            <el-form-item label="鏈嶅姟妯″潡">
-              <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-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="24">
-            <el-form-item label="闂ㄨ瘖瀹f暀瑕佹眰">
-              <el-input type="textarea" v-model="form.desc"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">鎻� 浜�</el-button>
-        <el-button @click="cancel">杩� 鍥�</el-button>
-      </div>
-    </el-dialog>
   </div>
 </template>
 
@@ -361,6 +310,7 @@
   resetUserPwd,
   changeUserStatus,
 } from "@/api/system/user";
+import { gethetasklist, delhetaskinfo } from "@/api/AiCentre/index";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
@@ -386,8 +336,7 @@
       userList: null,
       // 寮瑰嚭灞傛爣棰�
       title: "鏂板闂ㄨ瘖瀹f暀",
-      // 鏄惁鏄剧ず淇敼銆佹坊鍔犲脊鍑哄眰
-      addalteropen: false,
+
       // 閮ㄩ棬鍚嶇О
       deptName: undefined,
       // 榛樿瀵嗙爜
@@ -414,58 +363,7 @@
       value: [],
       list: [],
       loading: false,
-      states: [
-        "Alabama",
-        "Alaska",
-        "Arizona",
-        "Arkansas",
-        "California",
-        "Colorado",
-        "Connecticut",
-        "Delaware",
-        "Florida",
-        "Georgia",
-        "Hawaii",
-        "Idaho",
-        "Illinois",
-        "Indiana",
-        "Iowa",
-        "Kansas",
-        "Kentucky",
-        "Louisiana",
-        "Maine",
-        "Maryland",
-        "Massachusetts",
-        "Michigan",
-        "Minnesota",
-        "Mississippi",
-        "Missouri",
-        "Montana",
-        "Nebraska",
-        "Nevada",
-        "New Hampshire",
-        "New Jersey",
-        "New Mexico",
-        "New York",
-        "North Carolina",
-        "North Dakota",
-        "Ohio",
-        "Oklahoma",
-        "Oregon",
-        "Pennsylvania",
-        "Rhode Island",
-        "South Carolina",
-        "South Dakota",
-        "Tennessee",
-        "Texas",
-        "Utah",
-        "Vermont",
-        "Virginia",
-        "Washington",
-        "West Virginia",
-        "Wisconsin",
-        "Wyoming",
-      ],
+      states: ["Alabama", "North Dakota", "Ohio", "Oklahoma", "Oregon", ,],
       pickerOptions: {
         disabledDate(time) {
           return time.getTime() > Date.now();
@@ -508,9 +406,6 @@
       topqueryParams: {
         pageNum: 1,
         pageSize: 10,
-        userName: undefined,
-        tagid: undefined,
-        topic: undefined,
       },
       propss: { multiple: true },
       options: [],
@@ -598,13 +493,11 @@
     /** 鏌ヨ闂ㄨ瘖瀹f暀鍒楄〃 */
     getList() {
       this.loading = true;
-      listUser(this.addDateRange(this.topqueryParams, this.dateRange)).then(
-        (response) => {
-          this.userList = response.rows;
-          this.total = response.total;
-          this.loading = false;
-        }
-      );
+      gethetasklist(this.topqueryParams).then((response) => {
+        this.userList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
     },
     // 鏌ョ湅闂ㄨ瘖瀹f暀璇︽儏
     Referencequestion(row) {
@@ -630,7 +523,7 @@
       this.$modal
         .confirm('纭瑕�"' + text + '""' + row.userName + '"鐢ㄦ埛鍚楋紵')
         .then(function () {
-          return changeUserStatus(row.userId, row.status);
+          return changeUserStatus(row.id, row.status);
         })
         .then(() => {
           this.$modal.msgSuccess(text + "鎴愬姛");
@@ -647,7 +540,7 @@
     // 琛ㄥ崟閲嶇疆
     reset() {
       this.form = {
-        userId: undefined,
+        id: undefined,
         deptId: undefined,
         userName: undefined,
         nickName: undefined,
@@ -705,61 +598,23 @@
     handleAdd() {
       this.$router.push({
         path: "/followvisit/particty",
-        query: { type: 1, },
+        query: { type: 1 },
       });
     },
     /** 淇敼鎸夐挳鎿嶄綔 */
     handleUpdate(row) {
-
-            this.$router.push({
+      this.$router.push({
         path: "/followvisit/record/detailpage/",
         query: { id: "1" },
       });
     },
-    /** 閲嶇疆瀵嗙爜鎸夐挳鎿嶄綔 */
-    handleResetPwd(row) {
-      this.$prompt('璇疯緭鍏�"' + row.userName + '"鐨勬柊瀵嗙爜', "鎻愮ず", {
-        confirmButtonText: "纭畾",
-        cancelButtonText: "鍙栨秷",
-        closeOnClickModal: false,
-        inputPattern: /^.{5,20}$/,
-        inputErrorMessage: "鐢ㄦ埛瀵嗙爜闀垮害蹇呴』浠嬩簬 5 鍜� 20 涔嬮棿",
-      })
-        .then(({ value }) => {
-          resetUserPwd(row.userId, value).then((response) => {
-            this.$modal.msgSuccess("淇敼鎴愬姛锛屾柊瀵嗙爜鏄細" + value);
-          });
-        })
-        .catch(() => {});
-    },
-
-    /** 鎻愪氦鎸夐挳 */
-    submitForm: function () {
-      this.$refs["form"].validate((valid) => {
-        if (valid) {
-          if (this.form.userId != undefined) {
-            updateUser(this.form).then((response) => {
-              this.$modal.msgSuccess("淇敼鎴愬姛");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addUser(this.form).then((response) => {
-              this.$modal.msgSuccess("鏂板鎴愬姛");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
     /** 鍒犻櫎鎸夐挳鎿嶄綔 */
     handleDelete(row) {
-      const userIds = row.userId || this.ids;
+      const userIds = row.id || this.ids;
       this.$modal
-        .confirm('鏄惁纭鍒犻櫎鐢ㄦ埛缂栧彿涓�"' + userIds + '"鐨勬暟鎹」锛�')
+        .confirm('鏄惁纭鍒犻櫎鐢ㄦ埛缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�')
         .then(function () {
-          return delUser(userIds);
+          return delhetaskinfo(ids);
         })
         .then(() => {
           this.getList();
diff --git a/src/views/patient/propaganda/particty.vue b/src/views/patient/propaganda/particty.vue
index 95f9611..d313974 100644
--- a/src/views/patient/propaganda/particty.vue
+++ b/src/views/patient/propaganda/particty.vue
@@ -35,6 +35,13 @@
             </div>
             <div class="jic-value">
               <el-form ref="form" :model="form" label-width="105px">
+                <el-form-item label="妯$増鍚嶇О锛�">
+                  <el-input
+                    style="width: 220px"
+                    v-model="form.bt"
+                    placeholder="璇峰湪涓嬫柟閫夋嫨"
+                  />
+                </el-form-item>
                 <el-form-item label="鍙戦�佹椂闂达細" v-if="currenttype != 2">
                   <el-date-picker
                     v-model="form.name"
@@ -242,7 +249,7 @@
                     @handleUpdate="handleUpdate"
                     @handleSelectionChange="handleSelectionChange"
                     :currentList="userList"
-                    :tableLabel="tableLabelxj"
+                    :tableLabel="tableLabel"
                     :controlsc="false"
                     :multiplechoice="false"
                   />
@@ -269,6 +276,54 @@
         <el-alert title="鍦ㄦ湰闃舵閫夋嫨瀹f暀鐥呬汉" type="success" effect="dark">
         </el-alert>
         <div class="leftvlue-jbxx">
+          <div class="examine-jic">
+            <div class="headline">
+              <div>鍙橀噺鍖归厤閲忓弬</div>
+            </div>
+            <div class="examine-jic">
+              <div class="jic-value">
+                <el-row :gutter="20">
+                  <el-table :data="variableList" style="width: 100%">
+                    <el-table-column
+                      prop="variablename"
+                      align="center"
+                      label="鍙橀噺鍚嶇О"
+                    >
+                    </el-table-column>
+                    <el-table-column
+                      prop="character"
+                      align="center"
+                      label="鍖归厤绗�"
+                    >
+                    </el-table-column>
+                    <el-table-column label="鏇挎崲鍊�" align="center">
+                      <template slot-scope="scope">
+                        <el-input
+                          v-model="scope.row.Replacementvalue"
+                          placeholder="璇疯緭鍏ュ唴瀹�"
+                        ></el-input>
+                      </template>
+                    </el-table-column>
+                    <el-table-column label="鎿嶄綔" align="center">
+                      <template slot-scope="scope">
+                        <el-button
+                          size="mini"
+                          @click="variableEdit(scope.$index, scope.row)"
+                          >缂栬緫</el-button
+                        >
+                        <el-button
+                          size="mini"
+                          type="danger"
+                          @click="variableDelete(scope.$index, scope.row)"
+                          >鍒犻櫎</el-button
+                        >
+                      </template>
+                    </el-table-column>
+                  </el-table>
+                </el-row>
+              </div>
+            </div>
+          </div>
           <div class="examine-jic">
             <div class="headline">
               <div>鎮h�呭垪琛�</div>
@@ -539,6 +594,9 @@
 import { messagelistpatient } from "@/api/patient/homepage";
 import {
   getTaskpatient,
+  getlibrarylist,
+  getFollowuplist,
+  getQtemplatelist,
   edithetask,
   addhetask,
   gethetaskinfo,
@@ -552,6 +610,7 @@
     return {
       title: "瀹f暀鍐呭鍒楄〃",
       currenttype: 1, //1瀹f暀2闂ㄨ瘖3鍑洪櫌4澶嶈瘖5浣撴6闂嵎
+      id: "",
       Editprogress: 1, //缂栬緫杩涘害
       loading: false, // 閬僵灞�
       patientloading: false, // 閬僵灞�
@@ -564,45 +623,52 @@
         { label: "鎬у埆", width: "", prop: "sex" },
         { label: "骞撮緞", width: "", prop: "age" },
         { label: "灏辫瘖绉戝", width: "", prop: "impTemplate" },
-        { label: "鍏ラ櫌鏃ユ湡", width: "", prop: "create_time" },
-        { label: "鍒涘缓浜�", width: "", prop: "update_by" },
+        { label: "鍏ラ櫌鏃ユ湡", width: "", prop: "uploadTime" },
+        { label: "鍒涘缓浜猴紙缂猴級", width: "", prop: "update_by" },
       ],
       tableLabelxj: [
-        { label: "瀹f暀鍚嶇О", width: "", prop: "name" },
-        { label: "瀹f暀绫诲瀷", width: "", prop: "nametype" },
-        { label: "瀹f暀妯$増", width: "", prop: "impTemplate" },
-        { label: "鍒涘缓鏃ユ湡", width: "", prop: "create_time" },
-        { label: "鍒涘缓浜�", width: "", prop: "update_by" },
+        { label: "瀹f暀鍚嶇О", width: "", prop: "preachname" },
+        { label: "瀹f暀鎻忚堪", width: "", prop: "note" },
+        { label: "瀹f暀褰㈠紡", width: "", prop: "playType" },
+        { label: "閫傜敤鏂瑰紡", width: "", prop: "suitway" },
+        { label: "鍒涘缓鏃ユ湡", width: "", prop: "uploadTime" },
+        { label: "鍒涘缓浜猴紙缂猴級", width: "", prop: "update_by" },
       ],
       tableLabelmz: [
-        { label: "闅忚鍚嶇О", width: "118", prop: "name" },
+        { label: "闅忚鍚嶇О", width: "118", prop: "templateName" },
         { label: "闅忚妯$増", width: "130", prop: "impTemplate" },
-        { label: "鍒涘缓鏃ユ湡", width: "136", prop: "create_time" },
-        { label: "鍒涘缓浜�", width: "130", prop: "update_by" },
+        { label: "鍒涘缓鏃ユ湡", width: "136", prop: "uploadTime" },
+        { label: "鍒涘缓浜猴紙缂猴級", width: "130", prop: "update_by" },
       ],
       tableLabelcy: [
-        { label: "闅忚鍚嶇О", width: "118", prop: "name" },
+        { label: "闅忚鍚嶇О", width: "118", prop: "templateName" },
         { label: "闅忚璁″垝", width: "130", prop: "impTemplate" },
-        { label: "鍒涘缓鏃ユ湡", width: "136", prop: "create_time" },
-        { label: "鍒涘缓浜�", width: "130", prop: "update_by" },
+        { label: "鍒涘缓鏃ユ湡", width: "136", prop: "uploadTime" },
+        { label: "鍒涘缓浜猴紙缂猴級", width: "130", prop: "update_by" },
       ],
       tableLabelfz: [
-        { label: "閫氱煡鍚嶇О", width: "118", prop: "name" },
+        { label: "閫氱煡鍚嶇О", width: "118", prop: "templateName" },
         { label: "閫氱煡妯$増", width: "130", prop: "impTemplate" },
-        { label: "鍒涘缓鏃ユ湡", width: "136", prop: "create_time" },
-        { label: "鍒涘缓浜�", width: "130", prop: "update_by" },
+        { label: "鍒涘缓鏃ユ湡", width: "136", prop: "uploadTime" },
+        { label: "鍒涘缓浜猴紙缂猴級", width: "130", prop: "update_by" },
       ],
       tableLabeltj: [
         { label: "閫氱煡鍚嶇О", width: "118", prop: "name" },
         { label: "閫氱煡妯$増", width: "130", prop: "impTemplate" },
-        { label: "鍒涘缓鏃ユ湡", width: "136", prop: "create_time" },
-        { label: "鍒涘缓浜�", width: "130", prop: "update_by" },
+        { label: "鍒涘缓鏃ユ湡", width: "136", prop: "uploadTime" },
+        { label: "鍒涘缓浜猴紙缂猴級", width: "130", prop: "update_by" },
       ],
       tableLabelwj: [
         { label: "闂嵎鍚嶇О", width: "118", prop: "name" },
         { label: "闂嵎妯$増", width: "130", prop: "impTemplate" },
-        { label: "鍒涘缓鏃ユ湡", width: "136", prop: "create_time" },
-        { label: "鍒涘缓浜�", width: "130", prop: "update_by" },
+        { label: "鍒涘缓鏃ユ湡", width: "136", prop: "uploadTime" },
+        { label: "鍒涘缓浜猴紙缂猴級", width: "130", prop: "update_by" },
+      ],
+      // 鍙橀噺
+      tableLabelvariable: [
+        { label: "鍙橀噺鍚嶇О", width: "", prop: "variablename" },
+        { label: "鍖归厤绗�", width: "", prop: "character" },
+        { label: "鏇挎崲鍊�", width: "", prop: "Replacementvalue" },
       ],
       topqueryParams: {
         pageNum: 1, //
@@ -632,6 +698,23 @@
       userList: [], //妯$増鍒楄〃
       patientuserList: [], //閫夋嫨鎮h�呭垪琛�
       sonuserList: [], //閫変腑鎮h�呭垪琛�
+      variableList: [
+        {
+          variablename: "濮撳悕",
+          character: "${name}",
+          Replacementvalue: "榫欏偛澶�",
+        },
+        {
+          variablename: "鍦板潃",
+          character: "${dzz}",
+          Replacementvalue: "榫欏",
+        },
+        {
+          variablename: "鐢佃瘽",
+          character: "${dhh}",
+          Replacementvalue: "鍏釜鍏�",
+        },
+      ], //鍙橀噺鍒楄〃
       tasktopic: null, //鏂板绫诲瀷
       form: {
         name: "",
@@ -643,20 +726,6 @@
         resource: "",
         desc: "",
       },
-      options: [
-        {
-          value: "閫夐」1",
-          label: "榛勯噾绯�",
-        },
-        {
-          value: "閫夐」2",
-          label: "鍙岀毊濂�",
-        },
-        {
-          value: "閫夐」5",
-          label: "鍖椾含鐑ら腑",
-        },
-      ],
       taskoptions: [
         {
           value: "1",
@@ -677,14 +746,21 @@
   components: { SFtable },
 
   created() {
+    this.id = this.$route.query.id;
     this.Addsubtask();
     this.Getsubtask();
     this.Acquisitiontype();
+  
   },
 
   methods: {
     // 鑾峰彇褰撳墠绫诲瀷
     Acquisitiontype() {
+      let queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        isavailable: "",
+      };
       getTaskpatient({ allhosp: 1 }).then((res) => {
         console.log(res);
       });
@@ -705,22 +781,42 @@
           "鏅鸿兘灏忕▼搴�",
           "閽夐拤",
         ];
+        getlibrarylist(queryParams).then((response) => {
+          this.userList = response.rows;
+          this.total = response.total;
+        });
       } else if (this.currenttype == 2) {
         this.title = "闅忚鍐呭鍒楄〃";
         this.tableLabel = this.tableLabelmz;
         this.checkboxlist = ["褰撻潰", "绾歌川", "鐢佃瘽", "鐭俊", "寰俊鍏紬鍙�"];
+        getFollowuplist(queryParams).then((response) => {
+          this.userList = response.rows;
+          this.total = response.total;
+        });
       } else if (this.currenttype == 3) {
         this.title = "闅忚璁″垝鍒楄〃";
         this.tableLabel = this.tableLabelcy;
         this.checkboxlist = ["褰撻潰", "绾歌川", "鐢佃瘽", "鐭俊", "寰俊鍏紬鍙�"];
+        getFollowuplist(queryParams).then((response) => {
+          this.userList = response.rows;
+          this.total = response.total;
+        });
       } else if (this.currenttype == 4) {
         this.title = "閫氱煡鍐呭鍒楄〃";
         this.tableLabel = this.tableLabelfz;
         this.checkboxlist = ["鐢佃瘽", "鐭俊", "寰俊鍏紬鍙�"];
+        getFollowuplist(queryParams).then((response) => {
+          this.userList = response.rows;
+          this.total = response.total;
+        });
       } else if (this.currenttype == 5) {
         this.title = "閫氱煡鍐呭鍒楄〃";
         this.tableLabel = this.tableLabeltj;
         this.checkboxlist = ["绾歌川", "鐢佃瘽", "鐭俊", "寰俊鍏紬鍙�"];
+        getFollowuplist(queryParams).then((response) => {
+          this.userList = response.rows;
+          this.total = response.total;
+        });
       } else if (this.currenttype == 6) {
         this.title = "闂嵎鍐呭鍒楄〃";
         this.tableLabel = this.tableLabelwj;
@@ -734,6 +830,10 @@
           "寰俊灏忕▼搴�",
           "閽夐拤",
         ];
+        getQtemplatelist(queryParams).then((response) => {
+          this.userList = response.rows;
+          this.total = response.total;
+        });
       }
     },
     // 涓嬩竴姝�
@@ -820,7 +920,13 @@
         console.log(this.userList);
       });
     },
-    /** 鏌ヨ鎮h�呭垪琛� */
+    // 鍙橀噺---------------
+    variableEdit(index, row) {
+      console.log(index, row);
+    },
+    variableDelete(index, row) {
+      console.log(index, row);
+    },
   },
 };
 </script>
diff --git a/src/views/patient/questionnaire/index.vue b/src/views/patient/questionnaire/index.vue
index 2419f04..9d12c24 100644
--- a/src/views/patient/questionnaire/index.vue
+++ b/src/views/patient/questionnaire/index.vue
@@ -158,11 +158,13 @@
         <el-table-column type="selection" width="50" align="center" />
         <el-table-column
           label="搴忓彿"
+          fixed
           align="center"
           key="userId"
           prop="userId"
         />
 
+        <el-table-column label="濮撳悕" fixed align="center" key="types" prop="types" /> 
         <el-table-column
           label="搴婂彿"
           align="center"
@@ -171,7 +173,6 @@
           prop="userName"
           width="120"
         />
-        <el-table-column label="濮撳悕" align="center" key="types" prop="types" />
         <el-table-column
           label="骞撮緞"
           align="center"
@@ -225,55 +226,56 @@
           prop="topicnumberaa"
           width="120"
         />
+        
         <el-table-column
-          label="鍙戦�佺姸鎬�"
-          align="center"
-          key="topicnumber"
-          prop="topicnumber"
-          width="120"
-          :show-overflow-tooltip="true"
-        >
-          <template slot-scope="scope">
-            <div>宸插彂閫�</div>
-          </template>
-        </el-table-column>
-
-        <el-table-column
-          label="灏辫瘖鏃堕棿"
-          sortable
-          align="center"
-          prop="createTime"
-          width="160"
+        label="灏辫瘖鏃堕棿"
+        sortable
+        align="center"
+        prop="createTime"
+        width="160"
         >
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.createTime) }}</span>
           </template>
         </el-table-column>
         <el-table-column
-          label="鍙戦�佹椂闂�"
-          sortable
-          align="center"
-          prop="createTime"
-          width="160"
+        label="鍙戦�佹椂闂�"
+        sortable
+        align="center"
+        prop="createTime"
+        width="160"
         >
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.createTime) }}</span>
-          </template>
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
         </el-table-column>
         <el-table-column
-          label="鍥炲鏃堕棿"
-          sortable
-          align="center"
-          prop="createTime"
-          width="160"
+        label="鍥炲鏃堕棿"
+        sortable
+        align="center"
+        prop="createTime"
+        width="160"
         >
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.createTime) }}</span>
-          </template>
-        </el-table-column>
-
-        <el-table-column
-          label="鎿嶄綔"
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      
+      <el-table-column
+        label="鍙戦�佺姸鎬�"
+        align="center"
+        key="topicnumber"
+        prop="topicnumber"
+        width="120"
+        :show-overflow-tooltip="true"
+      >
+        <template slot-scope="scope">
+          <div>宸插彂閫�</div>
+        </template>
+      </el-table-column>
+      <el-table-column
+      label="鎿嶄綔"
+      fixed="right"
           align="center"
           width="200"
           class-name="small-padding fixed-width"
diff --git a/src/views/patient/subsequent/index.vue b/src/views/patient/subsequent/index.vue
index a89e850..1ccd83e 100644
--- a/src/views/patient/subsequent/index.vue
+++ b/src/views/patient/subsequent/index.vue
@@ -169,9 +169,17 @@
         <el-table-column type="selection" width="50" align="center" />
         <el-table-column
           label="搴忓彿"
+          fixed
           align="center"
           key="userId"
           prop="userId"
+        />
+        <el-table-column
+          label="濮撳悕"
+          fixed
+          align="center"
+          key="types"
+          prop="types"
         />
 
         <el-table-column
@@ -182,7 +190,6 @@
           prop="userName"
           width="120"
         />
-        <el-table-column label="濮撳悕" align="center" key="types" prop="types" />
         <el-table-column
           label="骞撮緞"
           align="center"
@@ -214,18 +221,6 @@
         >
           <template slot-scope="scope">
             <div>杞诲害楠ㄨ</div>
-          </template>
-        </el-table-column>
-        <el-table-column
-          label="闅忚鐘舵��"
-          align="center"
-          key="topicnumber"
-          prop="topicnumber"
-          width="120"
-          :show-overflow-tooltip="true"
-        >
-          <template slot-scope="scope">
-            <div>鏈畬鎴�</div>
           </template>
         </el-table-column>
         <el-table-column
@@ -285,7 +280,21 @@
         </el-table-column>
 
         <el-table-column
+          label="闅忚鐘舵��"
+          fixed="right"
+          align="center"
+          key="topicnumber"
+          prop="topicnumber"
+          width="120"
+          :show-overflow-tooltip="true"
+        >
+          <template slot-scope="scope">
+            <div>鏈畬鎴�</div>
+          </template>
+        </el-table-column>
+        <el-table-column
           label="鎿嶄綔"
+          fixed="right"
           align="center"
           width="200"
           class-name="small-padding fixed-width"
diff --git a/src/views/repositoryai/intention/index.vue b/src/views/repositoryai/intention/index.vue
index 9d7591e..c6b3d38 100644
--- a/src/views/repositoryai/intention/index.vue
+++ b/src/views/repositoryai/intention/index.vue
@@ -170,9 +170,16 @@
               @selection-change="handleSelectionChange"
             >
               <el-table-column type="selection" width="50" align="center" />
-              <el-table-column label="搴忓彿" align="center" key="id" prop="id" />
+              <el-table-column
+                label="搴忓彿"
+                fixed
+                align="center"
+                key="id"
+                prop="id"
+              />
               <el-table-column
                 label="鍊肩被鍨�"
+                fixed
                 align="center"
                 key="isenable"
                 prop="isenable"
@@ -261,6 +268,7 @@
 
               <el-table-column
                 label="鎿嶄綔"
+                fixed="right"
                 align="center"
                 width="200"
                 class-name="small-padding fixed-width"
@@ -340,8 +348,33 @@
                 </el-form-item>
               </el-col>
             </el-row>
+            <!-- deptOptions -->
             <el-row v-if="!measurement">
-              <el-col :span="12">
+              <el-col :span="8">
+                <el-form-item label="鎸囨爣鍒嗙被">
+                  <el-select
+                    v-model="indexform.assortid"
+                    size="medium"
+                    filterable
+                    placeholder="璇烽�夋嫨鍒嗙被"
+                  >
+                    <el-option-group
+                      v-for="group in deptOptions"
+                      :key="group.id"
+                      :label="group.indexAssortName"
+                    >
+                      <el-option
+                        v-for="item in group.ivrLibaTargetAssortList"
+                        :key="item.id"
+                        :label="item.indexAssortName"
+                        :value="item.id"
+                      >
+                      </el-option>
+                    </el-option-group>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
                 <el-form-item label="璇█" prop="deptId">
                   <el-select
                     v-model="indexform.language"
@@ -356,7 +389,7 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="8">
                 <el-form-item label="鏄惁鍙敤" prop="isAvailable">
                   <el-select
                     v-model="indexform.isAvailable"
@@ -1003,7 +1036,6 @@
     getDeptTree() {
       selectIvrLibaTargetAssortList({}).then((res) => {
         this.deptOptions = res.rows;
-        console.log(res);
       });
     },
     // 绛涢�夎妭鐐�
diff --git a/src/views/repositoryai/templateku/configurat/index.vue b/src/views/repositoryai/templateku/configurat/index.vue
index 1178af9..004e65d 100644
--- a/src/views/repositoryai/templateku/configurat/index.vue
+++ b/src/views/repositoryai/templateku/configurat/index.vue
@@ -45,14 +45,19 @@
                   filterable
                   placeholder="璇烽�夋嫨鍒嗙被"
                 >
-                  <el-option
-                    class="ruleFormaa"
-                    v-for="item in indexAssortlist"
-                    :key="item.id"
-                    :label="item.indexAssortName"
-                    :value="item.id"
+                  <el-option-group
+                    v-for="group in indexAssortlist"
+                    :key="group.id"
+                    :label="group.indexAssortName"
                   >
-                  </el-option>
+                    <el-option
+                      v-for="item in group.ivrLibaTemplateAssortList"
+                      :key="item.id"
+                      :label="item.indexAssortName"
+                      :value="item.id"
+                    >
+                    </el-option>
+                  </el-option-group>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -372,8 +377,8 @@
                 <el-table-column
                   label="缂栧彿"
                   align="center"
-                  key="id"
-                  prop="id"
+                  key="guid"
+                  prop="guid"
                 />
                 <el-table-column
                   label="鏍囬"
@@ -444,7 +449,8 @@
                 <el-form-item label="棰樼洰鏍囬">
                   <el-input
                     v-model="topicobj.questiontitle"
-                    placeholder="璇疯緭鍏ユ爣棰�"
+                    placeholder="璇蜂粠宸︿晶鍒楄〃閫夋嫨"
+                    :disabled="true"
                   ></el-input>
                 </el-form-item>
                 <el-row :gutter="10">
@@ -573,6 +579,148 @@
                         <el-button type="danger" round>鍒犻櫎</el-button>
                       </div>
                     </el-col>
+                  </el-row>
+                </div>
+                <!-- 鏃犲尮閰嶇被鍨� -->
+                <div class="topicxq">
+                  <el-row :gutter="10">
+                    <el-col :span="12"
+                      ><el-form-item label="鏃犲尮閰嶈瘽鏈�">
+                        <el-input
+                          type="text"
+                          placeholder="璇疯緭鍏�"
+                          v-model="topicobj.nomatchtext"
+                          show-word-limit
+                        >
+                        </el-input> </el-form-item
+                    ></el-col>
+                  </el-row>
+                  <el-row :gutter="10">
+                    <el-col :span="12"
+                      ><el-form-item label="澶勭悊">
+                        <el-input
+                          type="text"
+                          placeholder="(榛樿)鏃犲0"
+                          v-model="topicobj.text"
+                          maxlength="10"
+                          show-word-limit
+                        >
+                        </el-input> </el-form-item
+                    ></el-col>
+                  </el-row>
+
+                  <el-row :gutter="10">
+                    <el-col :span="16">
+                      <el-form-item label="璇煶鏂囦欢">
+                        <el-upload
+                          class="upload-demo"
+                          style="display: flex"
+                          action="https://jsonplaceholder.typicode.com/posts/"
+                          :on-change="handleChange"
+                          :file-list="fileList"
+                          :limit="1"
+                          :on-exceed="handleExceed"
+                        >
+                          <el-button size="small" type="primary"
+                            >鐐瑰嚮涓婁紶</el-button
+                          >
+                        </el-upload>
+                      </el-form-item></el-col
+                    >
+                  </el-row>
+                </div>
+                <div class="topicxq">
+                  <el-row :gutter="10">
+                    <el-col :span="12"
+                      ><el-form-item label="鍚笉娓呰瘽鏈�">
+                        <el-input
+                          type="text"
+                          placeholder="璇疯緭鍏�"
+                          v-model="topicobj.noclearlytext"
+                          show-word-limit
+                        >
+                        </el-input> </el-form-item
+                    ></el-col>
+                  </el-row>
+                  <el-row :gutter="10">
+                    <el-col :span="12"
+                      ><el-form-item label="澶勭悊">
+                        <el-input
+                          type="text"
+                          placeholder="(榛樿)鏃犲0"
+                          v-model="topicobj.text"
+                          maxlength="10"
+                          show-word-limit
+                        >
+                        </el-input> </el-form-item
+                    ></el-col>
+                  </el-row>
+
+                  <el-row :gutter="10">
+                    <el-col :span="16">
+                      <el-form-item label="璇煶鏂囦欢">
+                        <el-upload
+                          class="upload-demo"
+                          style="display: flex"
+                          action="https://jsonplaceholder.typicode.com/posts/"
+                          :on-change="handleChange"
+                          :file-list="fileList"
+                          :limit="1"
+                          :on-exceed="handleExceed"
+                        >
+                          <el-button size="small" type="primary"
+                            >鐐瑰嚮涓婁紶</el-button
+                          >
+                        </el-upload>
+                      </el-form-item></el-col
+                    >
+                  </el-row>
+                </div>
+                <div class="topicxq">
+                  <el-row :gutter="10">
+                    <el-col :span="12"
+                      ><el-form-item label="闈欓粯璇濇湳">
+                        <el-input
+                          type="text"
+                          placeholder="璇疯緭鍏�"
+                          v-model="topicobj.sliencetext"
+                          show-word-limit
+                        >
+                        </el-input> </el-form-item
+                    ></el-col>
+                  </el-row>
+                  <el-row :gutter="10">
+                    <el-col :span="12"
+                      ><el-form-item label="澶勭悊">
+                        <el-input
+                          type="text"
+                          placeholder="(榛樿)鏃犲0"
+                          v-model="topicobj.text"
+                          maxlength="10"
+                          show-word-limit
+                        >
+                        </el-input> </el-form-item
+                    ></el-col>
+                  </el-row>
+
+                  <el-row :gutter="10">
+                    <el-col :span="16">
+                      <el-form-item label="璇煶鏂囦欢">
+                        <el-upload
+                          class="upload-demo"
+                          style="display: flex"
+                          action="https://jsonplaceholder.typicode.com/posts/"
+                          :on-change="handleChange"
+                          :file-list="fileList"
+                          :limit="1"
+                          :on-exceed="handleExceed"
+                        >
+                          <el-button size="small" type="primary"
+                            >鐐瑰嚮涓婁紶</el-button
+                          >
+                        </el-upload>
+                      </el-form-item></el-col
+                    >
                   </el-row>
                 </div>
               </el-form>
@@ -775,6 +923,7 @@
         { value: "1", label: "蹇冨绉�" },
         { value: "2", label: "蹇冨唴绉�" },
       ],
+      standbylist: [],
       themelist: [],
       languagelist: [],
       courtyardlist: [],
@@ -922,9 +1071,6 @@
 
       //   鎻愪氦
 
-      compileFollowup(this.ruleForm).then((res) => {
-        this.$modal.msgSuccess("缂栬緫鎴愬姛");
-      });
       this.illnesslist.forEach((item, index) => {
         if (!item.id) {
           addtargetillness(item).then((res) => {});
@@ -933,6 +1079,10 @@
       if (this.illnesslistapi.length) {
         deltargetillness(this.illnesslistapi.join(",")).then((res) => {});
       }
+      compileFollowup(this.ruleForm).then((res) => {
+        this.$modal.msgSuccess("缂栬緫鎴愬姛");
+        this.$router.go(-1);
+      });
     },
     // 绉戝澶勭悊
     Departmenttreatment() {
@@ -1119,35 +1269,49 @@
       });
     },
     handleDelete(item) {
-      const index = this.userList.indexOf(item);
+      const index = this.ruleForm.ivrLibaTemplateScriptVOList.indexOf(item);
       if (index !== -1) {
-        this.userList.splice(index, 1); // 浠庣储寮曚綅缃垹闄や竴涓厓绱�
+        this.ruleForm.ivrLibaTemplateScriptVOList.splice(index, 1); // 浠庣储寮曚綅缃垹闄や竴涓厓绱�
         this.sortFn();
       } else {
         console.log("鏈壘鍒拌瀵硅薄");
       }
     },
     syioption(row) {
-      const index = this.getIndexInArray(this.userList, row);
-      const item = this.userList.splice(index, 1)[0]; // 绉婚櫎鎸囧畾绱㈠紩澶勭殑鍏冪礌锛屽苟淇濆瓨鍒癷tem鍙橀噺涓�
-      this.userList.splice(index - 1, 0, item); // 灏唅tem鎻掑叆鍒扮储寮曚綅缃殑鍓嶄竴浣�
+      const index = this.getIndexInArray(
+        this.ruleForm.ivrLibaTemplateScriptVOList,
+        row
+      );
+      const item = this.ruleForm.ivrLibaTemplateScriptVOList.splice(
+        index,
+        1
+      )[0]; // 绉婚櫎鎸囧畾绱㈠紩澶勭殑鍏冪礌锛屽苟淇濆瓨鍒癷tem鍙橀噺涓�
+      this.ruleForm.ivrLibaTemplateScriptVOList.splice(index - 1, 0, item); // 灏唅tem鎻掑叆鍒扮储寮曚綅缃殑鍓嶄竴浣�
       this.sortFn();
     },
     xiayioption(row) {
-      const index = this.getIndexInArray(this.userList, row);
-      const item = this.userList.splice(index, 1)[0]; // 绉婚櫎鎸囧畾绱㈠紩澶勭殑鍏冪礌锛屽苟淇濆瓨鍒癷tem鍙橀噺涓�
-      this.userList.splice(index + 1, 0, item); // 灏唅tem鎻掑叆鍒扮储寮曚綅缃殑鍓嶄竴浣�
+      const index = this.getIndexInArray(
+        this.ruleForm.ivrLibaTemplateScriptVOList,
+        row
+      );
+      const item = this.ruleForm.ivrLibaTemplateScriptVOList.splice(
+        index,
+        1
+      )[0]; // 绉婚櫎鎸囧畾绱㈠紩澶勭殑鍏冪礌锛屽苟淇濆瓨鍒癷tem鍙橀噺涓�
+      this.ruleForm.ivrLibaTemplateScriptVOList.splice(index + 1, 0, item); // 灏唅tem鎻掑叆鍒扮储寮曚綅缃殑鍓嶄竴浣�
       this.sortFn();
     },
     sortFn() {
-      this.userList = this.userList.map((item, index) => {
-        return {
-          userid: index + 1,
-          userName: item.userName,
-          verbaltrick: item.verbaltrick,
-        };
-      });
-      console.log(this.userList);
+      this.ruleForm.ivrLibaTemplateScriptVOList =
+        this.ruleForm.ivrLibaTemplateScriptVOList.map((item, index) => {
+          return {
+            guid: index + 1,
+            id: item.id,
+            questiontitle: item.questiontitle,
+            questionText: item.questionText,
+          };
+        });
+      console.log(this.ruleForm.ivrLibaTemplateScriptVOList);
     },
     // ---------------------
     resetForm(formName) {
@@ -1319,8 +1483,10 @@
   .presentation-right {
     width: 55%;
     max-height: 688px;
-    padding: 0 20px;
+    margin: 0 20px;
     font-size: 18px;
+    -webkit-box-shadow: 0 2px 4px 0 rgba(32, 32, 32, 0.12),
+      0 0 6px 0 rgba(58, 57, 57, 0.04);
     overflow: auto;
     .headline {
       display: flex;
diff --git a/src/views/repositoryai/templateku/index.vue b/src/views/repositoryai/templateku/index.vue
index cac920a..e09b99f 100644
--- a/src/views/repositoryai/templateku/index.vue
+++ b/src/views/repositoryai/templateku/index.vue
@@ -168,9 +168,10 @@
               @selection-change="handleSelectionChange"
             >
               <el-table-column type="selection" width="50" align="center" />
-              <el-table-column label="搴忓彿" align="center" key="id" prop="id" />
+              <el-table-column label="搴忓彿" fixed align="center" key="id" prop="id" />
               <el-table-column
                 label="妯$増鍚嶇О"
+                fixed
                 align="center"
                 key="templateName"
                 prop="templateName"
@@ -280,6 +281,7 @@
 
               <el-table-column
                 label="鎿嶄綔"
+                fixed="right"
                 align="center"
                 width="200"
                 class-name="small-padding fixed-width"
diff --git a/src/views/repositoryai/verbaltrick/index.vue b/src/views/repositoryai/verbaltrick/index.vue
index e154f6d..96a7c9e 100644
--- a/src/views/repositoryai/verbaltrick/index.vue
+++ b/src/views/repositoryai/verbaltrick/index.vue
@@ -170,9 +170,10 @@
               @selection-change="handleSelectionChange"
             >
               <el-table-column type="selection" width="50" align="center" />
-              <el-table-column label="搴忓彿" align="center" key="id" prop="id" />
+              <el-table-column label="搴忓彿" fixed align="center" key="id" prop="id" />
               <el-table-column
                 label="闂涓婚"
+                fixed
                 align="center"
                 key="questiontitle"
                 prop="questiontitle"
@@ -266,6 +267,7 @@
 
               <el-table-column
                 label="鎿嶄綔"
+                fixed="right"
                 align="center"
                 width="250"
                 class-name="small-padding fixed-width"
diff --git a/src/views/repositoryai/verbaltrick/particulars/index.vue b/src/views/repositoryai/verbaltrick/particulars/index.vue
index b0a4102..8b3271e 100644
--- a/src/views/repositoryai/verbaltrick/particulars/index.vue
+++ b/src/views/repositoryai/verbaltrick/particulars/index.vue
@@ -60,16 +60,23 @@
               <el-form-item label="闂鍒嗙被" prop="status">
                 <el-select
                   v-model="indexform.assortid"
-                  placeholder="璇烽�夋嫨鐘舵��"
+                  filterable
+                  placeholder="璇烽�夋嫨鍒嗙被"
+                >
+                <el-option-group
+                  v-for="group in questionclass"
+                  :key="group.id"
+                  :label="group.indexAssortName"
                 >
                   <el-option
-                    v-for="item in questionclass"
+                    v-for="item in group.ivrLibaScriptAssortList"
                     :key="item.id"
                     :label="item.indexAssortName"
                     :value="item.id"
                   >
                   </el-option>
-                </el-select>
+                </el-option-group>
+              </el-select>
               </el-form-item>
             </el-col>
 
diff --git a/src/views/shortmessage/healthinformation/index.vue b/src/views/shortmessage/healthinformation/index.vue
index 138c50c..586e8b2 100644
--- a/src/views/shortmessage/healthinformation/index.vue
+++ b/src/views/shortmessage/healthinformation/index.vue
@@ -196,12 +196,14 @@
               <el-table-column type="selection" width="50" align="center" />
               <el-table-column
                 label="搴忓彿"
+                fixed
                 align="center"
                 key="userId"
                 prop="userId"
               />
               <el-table-column
                 label="閫氱煡鏍囬"
+                fixed
                 align="center"
                 key="userName"
                 prop="userName"
@@ -267,6 +269,7 @@
 
               <el-table-column
                 label="鎿嶄綔"
+                fixed="right"
                 align="center"
                 width="300"
                 class-name="small-padding fixed-width"

--
Gitblit v1.9.3