From 1dc8b7d8ffb82dc76278a6e01bff8a07d8eb756a Mon Sep 17 00:00:00 2001
From: shidongli <shidongli>
Date: Mon, 1 Jul 2024 09:58:43 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=BE=85=E5=8A=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/followup/index.vue        |  2 +
 src/views/system/followupdetails/index.vue |  5 ++-
 src/views/system/followupsee/index.vue     | 45 ++++++++++++++--------
 3 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/src/views/system/followup/index.vue b/src/views/system/followup/index.vue
index 9b93b29..df686df 100644
--- a/src/views/system/followup/index.vue
+++ b/src/views/system/followup/index.vue
@@ -602,6 +602,8 @@ export default {
           departmentName: row.departmentName,
           diseaseTypeId: row.diseaseTypeId ? row.diseaseTypeId : null,
           diseaseTypeName: row.diseaseTypeName ? row.diseaseTypeName : null,
+          followTemplateId:row.followTemplateId?row.followTemplateId:null,
+          phoneId:row.phoneId?row.phoneId:null,
         },
       });
 
diff --git a/src/views/system/followupdetails/index.vue b/src/views/system/followupdetails/index.vue
index 0d6798c..0303888 100644
--- a/src/views/system/followupdetails/index.vue
+++ b/src/views/system/followupdetails/index.vue
@@ -330,7 +330,7 @@ export default {
 
       console.log(this.$route.query, "res");
 
-    } else {
+    } else if(this.$route.query.taskType=="PHONE_OUTBOUND" && this.$route.query.phoneId){
       if (this.$route.query.routeHandleRemark) {
         this.questiondata.routeHandleRemark =
           this.$route.query.routeHandleRemark;
@@ -345,6 +345,9 @@ export default {
           }
         }
       });
+    }else if(this.$route.query.taskType=="PHONE_OUTBOUND" && this.$route.query.followTemplateId){
+      console.log('6666666666666666666========')
+      this.questioninfo();
     }
   },
   methods: {
diff --git a/src/views/system/followupsee/index.vue b/src/views/system/followupsee/index.vue
index 3fc8664..6e60a0a 100644
--- a/src/views/system/followupsee/index.vue
+++ b/src/views/system/followupsee/index.vue
@@ -47,14 +47,10 @@
     <div class="bottomheader">
       <div style="display: flex">
         <!-- 问卷模板 -->
-        <div
-          class="right"
-          v-if="
-            $route.query.taskType == 'QUESTIONNAIRE_SCALE' ||
-            $route.query.taskType == 'ARTIFICIAL_FOLLOW_UP'
-          "
-        >
-          <div
+        <div class="right" v-if="$route.query.taskType == 'QUESTIONNAIRE_SCALE' ||
+          $route.query.taskType == 'ARTIFICIAL_FOLLOW_UP'
+          ">
+             <div
             style="float: right; margin-top: 20px"
             v-if="
               $route.query.taskType == 'QUESTIONNAIRE_SCALE' ||
@@ -77,10 +73,8 @@
               </el-form-item>
             </el-form>
           </div>
-          <div
-            class="sport"
-            v-if="$route.query.taskType == 'QUESTIONNAIRE_SCALE'"
-          >
+
+          <div class="sport" v-if="$route.query.taskType == 'QUESTIONNAIRE_SCALE'">
             问卷模板: Barthel指数评定问卷
           </div>
           <div
@@ -232,6 +226,19 @@
             </div>
           </div>
         </div>
+        <!-- <div class="right_top" v-if="$route.query.taskType == 'QUESTIONNAIRE_SCALE' ||
+          $route.query.taskType == 'ARTIFICIAL_FOLLOW_UP'
+          ">
+          <div style="float: right; margin-top: 20px" v-if="$route.query.taskType == 'QUESTIONNAIRE_SCALE' ||
+          $route.query.taskType == 'ARTIFICIAL_FOLLOW_UP'
+          ">
+            <el-form :inline="true" class="demo-form-inline" :model="questiondata" :rules="rules" ref="questiondata">
+              <el-form-item label="任务处理信息" prop="routeHandleRemark">
+                <el-input type="textarea" placeholder="请输入任务处理信息" v-model="questiondata.routeHandleRemark" />
+              </el-form-item>
+            </el-form>
+          </div>
+        </div> -->
         <!-- 电话外呼 -->
         <div v-if="$route.query.taskType == 'PHONE_OUTBOUND'">
           <div class="sport">电话外呼</div>
@@ -304,7 +311,7 @@
               <!-- <div style="background:red;width:200px;height:1600px"> -->
               <el-form-item label="重复次数" prop="phoneRedialTimes">
                 <!-- <div   v-for="(item,index) in optionslistS"  :key="index">
-                   <div>{{ item.label }}</div> 
+                   <div>{{ item.label }}</div>
                 </div> -->
                 <el-input
                   disabled
@@ -440,8 +447,9 @@ export default {
       this.$route.query.taskType == "ARTIFICIAL_FOLLOW_UP"
     ) {
       this.questioninfo();
-    } else {
-      selectPhonePush(this.$route.query.manageRouteNodeId).then((response) => {
+    } else if(this.$route.query.taskType=="PHONE_OUTBOUND" && this.$route.query.phoneId){
+        selectPhonePush(this.$route.query.manageRouteNodeId).then((response) => {
+          console.log('===================')
         if (response.data) {
           this.formlist = response.data;
           this.formlist.phoneRedialTimes = response.data.phoneRedialTimes;
@@ -457,6 +465,10 @@ this.infolistword()
           }
         }
       });
+    }else if(this.$route.query.taskType=="PHONE_OUTBOUND" && this.$route.query.followTemplateId){
+      console.log('6666666666666666666========')
+
+      this.questioninfo();
     }
   },
   methods: {
@@ -805,6 +817,7 @@ this.infolistword()
 .right {
   width: 100%;
   height: 500px;
+  // overflow-y: auto;
   // background: yellow;
 }
 
@@ -823,7 +836,7 @@ this.infolistword()
   .bottomheader {
     overflow-y: scroll;
     width: 99%;
-    height: 60vh;
+    height: 65vh;
     background-color: #fff;
     margin: 10px auto;
     padding: 10px 20px;

From ec41b6db53196cf94b3be85f780a1abfa95537dd Mon Sep 17 00:00:00 2001
From: shidongli <shidongli>
Date: Mon, 1 Jul 2024 09:59:19 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/manage/labelfieldinfo/index.vue | 169 +++++++++++++++-------
 1 file changed, 114 insertions(+), 55 deletions(-)

diff --git a/src/views/manage/labelfieldinfo/index.vue b/src/views/manage/labelfieldinfo/index.vue
index a7b1046..4c4e04a 100644
--- a/src/views/manage/labelfieldinfo/index.vue
+++ b/src/views/manage/labelfieldinfo/index.vue
@@ -222,21 +222,7 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item
-            label="字段排序"
-            :rules="rules.labelFieldInfoList.fieldSort"
-            :prop="`labelFieldInfoList.${index}.fieldSort`"
-          >
-            <el-input-number
-              v-model="aitem.fieldSort"
-              controls-position="right"
-              :min="0"
-              placeholder="请输入字段排序"
-              style="width: 210px"
-            />
-            <!-- <el-input v-model="aitem.fieldSort" placeholder="请输入字段排序" oninput="value=value.replace(/[^\d]/g,'')"
-              maxlength="5"/> -->
-          </el-form-item>
+
           <el-form-item label="任务类型" prop="taskTypeId">
             <el-button
               type=""
@@ -293,6 +279,21 @@
               >{{ aitem.taskPartitionDictName }}</el-button
             >
           </el-form-item>
+          <el-form-item
+            label="字段排序"
+            :rules="rules.labelFieldInfoList.fieldSort"
+            :prop="`labelFieldInfoList.${index}.fieldSort`"
+          >
+            <el-input-number
+              v-model="aitem.fieldSort"
+              controls-position="right"
+              :min="0"
+              placeholder="请输入字段排序"
+              style="width: 210px"
+            />
+            <!-- <el-input v-model="aitem.fieldSort" placeholder="请输入字段排序" oninput="value=value.replace(/[^\d]/g,'')"
+              maxlength="5"/> -->
+          </el-form-item>
           <el-form-item
             label="字段编码"
             :rules="rules.labelFieldInfoList.fieldCode"
@@ -308,7 +309,7 @@
           </el-form-item>
           <el-form-item label="字段备注信息" prop="fieldRemark">
             <el-input
-              style="width: 210px"
+              style="width: 530px"
               v-model="aitem.fieldRemark"
               placeholder="请输入字段备注信息"
               type="textarea"
@@ -375,14 +376,33 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="字段排序" prop="fieldSort">
-          <el-input-number
-            v-model="form.fieldSort"
-            controls-position="right"
-            :min="0"
-            placeholder="请输入字段排序"
-            style="width: 210px"
-          />
+        <el-form-item label="任务类型" prop="taskTypeId">
+          <el-button
+            type=""
+            v-if="form.taskTypeName == '请选择任务类型'"
+            @click="clicktypexg()"
+            style="
+              width: 210px;
+              text-align: left;
+              height: 36px;
+              color: #c0c4cc;
+              overflow: hidden;
+            "
+            >{{ form.taskTypeName }}</el-button
+          >
+          <el-button
+            @click="clicktypexg()"
+            type=""
+            v-else
+            style="
+              width: 210px;
+              text-align: left;
+              height: 36px;
+              padding-left: -10px;
+              overflow: hidden;
+            "
+            >{{ form.taskTypeName }}</el-button
+          >
         </el-form-item>
         <el-form-item label="任务细分" prop="taskPartitionDictId">
           <el-button
@@ -412,6 +432,15 @@
             >{{ form.taskPartitionDictName }}</el-button
           >
         </el-form-item>
+        <el-form-item label="字段排序" prop="fieldSort">
+          <el-input-number
+            v-model="form.fieldSort"
+            controls-position="right"
+            :min="0"
+            placeholder="请输入字段排序"
+            style="width: 210px"
+          />
+        </el-form-item>
         <el-form-item label="字段编码" prop="fieldCode">
           <el-input
             maxlength="50"
@@ -423,7 +452,7 @@
         </el-form-item>
         <el-form-item label="字段备注信息" prop="fieldRemark">
           <el-input
-            style="width: 210px"
+            style="width: 530px"
             v-model="form.fieldRemark"
             placeholder="请输入字段备注信息"
             type="textarea"
@@ -595,7 +624,7 @@
         :data="taskTypeList"
         @selection-change="handleSelectionChange"
       >
-      <el-table-column label="请选择" width="100" align="center">
+        <el-table-column label="请选择" width="100" align="center">
           <template slot-scope="scope">
             <el-button
               type="primary"
@@ -663,7 +692,7 @@ export default {
       queryParamstask: {
         pageNum: 1,
         pageSize: 10,
-        
+
         taskTypeId: null,
         taskTypeName: null,
         taskPartitionName: null,
@@ -675,13 +704,13 @@ export default {
       },
       nnerVisibleindex: '',
       taskPartitionDictId: '',
-      taskTypeId:'',
+      taskTypeId: '',
       maxTableHeight: undefined,
       totaltask: 0,
       // 任务类型
       innertype: false,
-      totaltype:0,
-      taskTypeList:[],
+      totaltype: 0,
+      taskTypeList: [],
 
       queryType: {
         pageNum: 1,
@@ -849,22 +878,38 @@ export default {
       });
     },
     // 任务类型弹框
-    clicktype(aitem, index){
-      console.log(aitem,'0000000')
+    clicktype(aitem, index) {
+      console.log(aitem, '0000000')
       this.getListType();
       this.taskTypeId = aitem.taskTypeId ? aitem.taskTypeId : '';
       this.nnerVisibleindex = index;
       this.innertype = true;
-      this.form.taskPartitionDictName= '请选择任务细分';
-      this.form.taskPartitionDictId='';
-  
+      this.form.taskPartitionDictName = '请选择任务细分';
+      this.form.taskPartitionDictId = '';
+
     },
     // 任务细分弹框
     clickinnerVisible(aitem, index) {
+      if (this.taskTypeId == '') {
+        this.$modal.msgError("请先选择任务类型");
+      } else {
+        this.taskTypeId = aitem.taskTypeId ? aitem.taskTypeId : '';
+        this.nnerVisibleindex = index;
+        this.innerVisible = true;
+      }
       // this.getListpartit();
-      this.taskTypeId = aitem.taskTypeId ? aitem.taskTypeId : '';
-      this.nnerVisibleindex = index;
-      this.innerVisible = true;
+
+    },
+    // 修改任务类型
+    clicktypexg() {
+      if (this.form.taskTypeId) {
+        this.taskTypeId = this.form.taskTypeId
+
+
+      }
+      this.getListType();
+      this.innertype = true;
+
     },
     // 修改任务细分弹框
     clickinnerVisiblexg() {
@@ -883,11 +928,10 @@ export default {
     innerVisiblecancel() {
       this.innerVisible = false;
     },
-    typeecancel(){
+    typeecancel() {
       this.innertype = false;
     },
     nurseclickzx(row) {
-
       if (this.title == '添加标签字段信息') {
         this.form.labelFieldInfoList[this.nnerVisibleindex].taskPartitionDictName =
           row.taskPartitionName;
@@ -903,8 +947,8 @@ export default {
     },
     // 任务类型
     nurseclicktype(row) {
-      console.log(row,'row')
-      this.queryParamstask.taskTypeId=row.id
+      console.log(row, 'row')
+      this.queryParamstask.taskTypeId = row.id
       this.getListpartit()
       if (this.title == '添加标签字段信息') {
         this.form.labelFieldInfoList[this.nnerVisibleindex].taskTypeName =
@@ -913,8 +957,9 @@ export default {
           row.id;
       } else if (this.titleup == '修改标签字段信息') {
         this.form.taskTypeName = row.taskTypeName;
-        this.form.taskTypeId =
-          row.id;
+        this.form.taskTypeId =row.id;
+        this.form.taskPartitionDictName = "请选择任务细分";
+        this.form.taskPartitionDictId ='';
       }
       this.innertype = false;
     },
@@ -937,8 +982,8 @@ export default {
         fieldSort: undefined,
         taskPartitionDictName: '请选择任务细分',
         taskPartitionDictId: '',
-        taskTypeName:'请选择任务类型',
-        taskTypeId:'',
+        taskTypeName: '请选择任务类型',
+        taskTypeId: '',
         fieldCode: null,
 
       };
@@ -979,8 +1024,8 @@ export default {
         updateTime: null,
         taskPartitionDictName: null,
         taskPartitionDictId: null,
-        taskTypeId:null,
-        taskTypeName:null,
+        taskTypeId: null,
+        taskTypeName: null,
 
 
       };
@@ -1024,8 +1069,8 @@ export default {
             fieldSort: undefined,
             taskPartitionDictName: '请选择任务细分',
             taskPartitionDictId: '',
-            taskTypeName:'请选择任务类型',
-            taskTypeId:'',
+            taskTypeName: '请选择任务类型',
+            taskTypeId: '',
 
 
           },
@@ -1045,14 +1090,20 @@ export default {
         if (!this.form.taskPartitionDictName || this.form.taskPartitionDictName == "") {
           this.form.taskPartitionDictName = '请选择任务细分'
         }
+        if (!this.form.taskTypeName || this.form.taskTypeName == "") {
+          this.form.taskTypeName = '请选择任务类型'
+        }
+        if (this.form.taskTypeId) {
+          this.queryParamstask.taskTypeId = this.form.taskTypeId
+          this.getListpartit();
+        }
+
         this.openup = true;
         this.titleup = "修改标签字段信息";
       });
     },
     /** 提交按钮 */
     submitForm() {
-
-      console.log(this.form)
       // return
       this.$refs["form"].validate(valid => {
         var obj = JSON.parse(JSON.stringify(this.form))
@@ -1060,21 +1111,29 @@ export default {
           if (this.form.id != null) {
             if (obj.taskPartitionDictName == '请选择任务细分') {
               obj.taskPartitionDictName = ""
-
             }
-            console.log(obj, 'obj')
-            // return
+            if (obj.taskTypeName == '请选择任务类型') {
+              obj.taskTypeName = ""
+            }
+
             updateLabelfieldinfo(obj).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.openup = false;
               this.getList();
             });
           } else {
+
             obj.labelFieldInfoList.forEach(e => {
               if (e.taskPartitionDictName == '请选择任务细分') {
                 e.taskPartitionDictName = ""
               }
+              if (e.taskTypeName == '请选择任务类型') {
+                e.taskTypeName = ""
+              }
+
             });
+            console.log(obj, 'obj')
+            // return
             addLabelfieldinfo(obj).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;