From 6cf73d57f85fcb07749d86776acdee92f2d9a773 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Sun, 19 Nov 2023 15:02:55 +0800
Subject: [PATCH] upup

---
 src/views/task/list/components/addPlan.vue | 12 ++++-----
 src/views/task/list/components/addUnit.vue | 12 ++++-----
 src/views/task/list/study.vue              | 20 ++++++++++++++-
 src/views/task/list/unit.vue               | 29 ++++++++++++++++++++--
 4 files changed, 58 insertions(+), 15 deletions(-)

diff --git a/src/views/task/list/components/addPlan.vue b/src/views/task/list/components/addPlan.vue
index 99649bd..2aeadcd 100644
--- a/src/views/task/list/components/addPlan.vue
+++ b/src/views/task/list/components/addPlan.vue
@@ -49,7 +49,7 @@
           </div>
         </div>
       </template>
-      <template v-slot:count>
+     <!-- <template v-slot:count>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
             <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>任务数量：
@@ -59,8 +59,8 @@
 
           </div>
         </div>
-      </template>
-      <template v-slot:is_audit>
+      </template> -->
+      <!-- <template v-slot:is_audit>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
             <span style="color: red;font-weight: 600;padding-right: 4px;"></span>是否审批：
@@ -85,8 +85,8 @@
             </el-select>
           </div>
         </div>
-      </template>
-      <template v-slot:file_id>
+      </template> -->
+      <template v-slot:file_ids>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
             <span style="color: red;font-weight: 600;padding-right: 4px;"></span>附件：
@@ -106,7 +106,7 @@
               <span style="color: red;font-weight: 600;padding-right: 4px;"></span>说明：
             </div>
             <div class="xy-table-item-content">
-              <el-input v-model="form.content" :rows='5' type='textarea' placeholder="请输入说明" clearable
+              <el-input v-model="form.content" :rows='8' type='textarea' placeholder="请输入说明" clearable
                 style="width:400px"></el-input>
             </div>
           </div>
diff --git a/src/views/task/list/components/addUnit.vue b/src/views/task/list/components/addUnit.vue
index d5a18de..2a77584 100644
--- a/src/views/task/list/components/addUnit.vue
+++ b/src/views/task/list/components/addUnit.vue
@@ -2,7 +2,7 @@
   <div>
     <xy-dialog ref="dialog" :is-show.sync="isShow" type="form" :title="type === 'add' ? '发起任务' : '编辑任务'" :form="form"
       :rules='rules' @submit="submit">
-      <template v-slot:mission_name>
+      <!-- <template v-slot:mission_name>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
             <span style="color: red;font-weight: 600;padding-right: 4px;"></span>计划名称：
@@ -11,7 +11,7 @@
             <el-input v-model="form.mission_name" placeholder="请输入计划名称" clearable style="width: 400px;"></el-input>
           </div>
         </div>
-      </template>
+      </template> -->
       <template v-slot:name>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
@@ -110,7 +110,7 @@
               <span style="color: red;font-weight: 600;padding-right: 4px;"></span>说明：
             </div>
             <div class="xy-table-item-content">
-              <el-input v-model="form.content" :rows='5' type='textarea' placeholder="请输入说明" clearable
+              <el-input v-model="form.content" :rows='8' type='textarea' placeholder="请输入说明" clearable
                 style="width:400px"></el-input>
             </div>
           </div>
@@ -142,7 +142,7 @@
               <span style="color: red;font-weight: 600;padding-right: 4px;"></span>{{mission_type==2?'学习要求':'完成详情'}}：
             </div>
             <div class="xy-table-item-content">
-              <el-input v-model="form.end_content" :rows='5' type='textarea' placeholder="请输入完成详情" clearable
+              <el-input v-model="form.end_content" :rows='8' type='textarea' placeholder="请输入完成详情" clearable
                 style="width: 400px;"></el-input>
             </div>
           </div>
@@ -449,7 +449,7 @@
         }],
         form: {
           type: '',
-          mission_name:'',
+          // mission_name:'',
           name: '',
           unit_type: '',
           start_date: '',
@@ -606,7 +606,7 @@
         this.form = {
           type: res?.type,
           name: res?.name,
-          mission_name:res?.mission_name,
+          // mission_name:res?.mission_name,
           unit_type: res?.unit_type,
           start_date: res?.start_date,
           end_date: res?.end_date,
diff --git a/src/views/task/list/study.vue b/src/views/task/list/study.vue
index 6f751d0..0a3671b 100644
--- a/src/views/task/list/study.vue
+++ b/src/views/task/list/study.vue
@@ -57,6 +57,24 @@
                 </span>
               </div>
             </div>
+          </div>
+          <div v-else-if="props.row.ask_log.length>0">
+            <div align="left" v-for='(item,index) in props.row.ask_log' class="expenditem">
+              <!-- </div> -->
+              {{index+1}}、
+              <div>
+                <span class="label">答题人：</span>
+                <span>{{item.user_id?item.user_id:''}}</span>
+              </div>
+              <div>
+                <span class="label">答题时间：</span>
+                <span>{{item.created_at?item.created_at:''}}</span>
+              </div>
+              <div>
+                <span class="label">正确率：</span>
+                <span>{{item.correct?parseFloat(item.correct/item.data.length).toFixed(2)*100 + "%":''}}</span>
+              </div>
+            </div>
           </div>
           <div v-else class="expenditem">
             暂无检查问题
@@ -240,7 +258,7 @@
             prop: 'audit_status',
             width: 180,
             formatter: (cell, data, value, index) => {
-              return value == 1 ? '通过' : (value == 2 ? '不通过' : (value == 0 ? '待审核' : ''))
+              return value == 1 ? '开展中' : (value == 2 ? '不通过' : (value == 0 ? '待审核' : ''))
             }
           },{
             label: "开始日期",
diff --git a/src/views/task/list/unit.vue b/src/views/task/list/unit.vue
index e0b78f4..6f1fb15 100644
--- a/src/views/task/list/unit.vue
+++ b/src/views/task/list/unit.vue
@@ -59,6 +59,24 @@
                 </span>
               </div>
             </div>
+          </div>
+          <div v-else-if="props.row.ask_log.length>0">
+            <div align="left" v-for='(item,index) in props.row.ask_log' class="expenditem">
+              <!-- </div> -->
+              {{index+1}}、
+              <div>
+                <span class="label">答题人：</span>
+                <span>{{item.user_id?item.user_id:''}}</span>
+              </div>
+              <div>
+                <span class="label">答题时间：</span>
+                <span>{{item.created_at?item.created_at:''}}</span>
+              </div>
+              <div>
+                <span class="label">正确率：</span>
+                <span>{{item.correct?parseFloat(item.correct/item.data.length).toFixed(2)*100 + "%":''}}</span>
+              </div>
+            </div>
           </div>
           <div v-else class="expenditem">
             暂无检查问题
@@ -405,11 +423,18 @@
                 this.type_name = item.name
               }
             })
-            if(path[1]==5){
+            if(path[2]&&path[2]==5){
               this.select.type = ''
               this.select.myself = 1
+              // this.select.myself_department = 1
+              this.type_name = '专项任务'
+              this.path_type = path[1]
+            }
+            if(path[2]&&path[2]==4){
+              this.select.type = ''
+              // this.select.myself = 1
               this.select.myself_department = 1
-              this.type_name = '我的任务'
+              this.type_name = '科室任务'
               this.path_type = path[1]
             }
           }