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

src/views/manage/components/Taskprocess.vue

@@ -590,7 +590,6 @@ export default {
                 }
               }
             });
-            // console.log(score, 'score')
             this.questiondata.totalScore = score;
           }
         });
@@ -607,7 +606,6 @@ export default {
           // this.$delete(this.obj, '0', '')
           delete e.questionSubjectOptionList;
         });
-        // console.log(this.obj, 'obj')
       } else if (this.$route.query.taskNodeType == "ARTIFICIAL_FOLLOW_UP") {
         console.log(this.questiondata, "questiondata");
         // 对象.新名字=对象.原数组
@@ -630,8 +628,6 @@ export default {
       }
       // 问卷
       if (this.$route.query.taskNodeType == "QUESTIONNAIRE_SCALE") {
-        console.log(this.obj, 'objobj')
-        // return
         this.$refs["questiondata"].validate((valid) => {
           if (valid) {
             addPatientQuestionResult(this.obj).then((response) => {
@@ -677,8 +673,7 @@ export default {
             this.form.phoneTemplateId = this.formlist.phoneTemplateId
             this.form.patientPhone = this.formlist.patientPhone
             var formlists = JSON.parse(JSON.stringify(this.form));
-            console.log(formlists)
+
-            return;
             addPatientQuestionResult(formlists).then((response) => {
               this.$confirm("保存成功, 是否返回上一页?", "提示", {
                 confirmButtonText: "确定",
@@ -831,7 +826,7 @@ export default {
     padding: 10px 20px;
 
     .sport {
-      padding: 10px 50px 10px 10px;
+      padding: 0px 5px 10px 0px;
       font-size: 20px;
       font-weight: 600;
       .login-code-img {
@@ -897,4 +892,3 @@ export default {
   }
 }
 </style>
-  

src/views/system/followup/index.vue

@@ -947,8 +947,6 @@ export default {
       this.$router.push({
         path: "/task/followupsee",
         query: {
-          dataile:'handel',
-
           path: "/task/followup",
           patientId: row.patientId,
           taskNodeType: row.taskNodeType,
@@ -982,7 +980,6 @@ export default {
       this.$router.push({
         path: "/task/followupdetails",
         query: {
-          dataile:'dataile',
           path: "/task/followup",
           patientId: row.patientId,
           taskNodeType: row.taskNodeType,

src/views/system/followupsee/index.vue

@@ -27,7 +27,7 @@
         <div class="gender">患者电话：{{ list.patientPhone }}</div>
         <div class="gender">出生日期：{{ list.birthDate }}</div>
 
-        <div class="source" v-if="activeName == 'six' && $route.query.dataile=='handel'">
+        <div class="source" v-if="activeName == 'six'">
           <div class="item" @click="submitbut">
             <el-button plain>保存</el-button>
           </div>
@@ -63,16 +63,6 @@
         <el-tab-pane
           label="任务处理"
           name="six"
-          v-if="$route.query.dataile == 'handel'"
-        >
-          <keep-alive>
-            <Taskprocess v-if="activeName == 'six'" ref="process"></Taskprocess>
-          </keep-alive>
-        </el-tab-pane>
-        <el-tab-pane
-          label="任务详情"
-          name="six"
-          v-if="$route.query.dataile == 'dataile'"
         >
           <keep-alive>
             <Taskprocess v-if="activeName == 'six'" ref="process"></Taskprocess>