up

src/views/daily/index.vue

@@ -27,7 +27,7 @@
               <div v-else-if="column.type=='format'">
                 <div v-if="column.field=='task_departments_report'">
                   <el-link type="primary" @click="show(scope.row)">
-                    {{scope.row["safety_task_departments_count"]+"/"+scope.row["safety_task_departments_report_count"]}}
+                    {{scope.row["safety_task_departments_report_count"]+"/"+scope.row["safety_task_departments_count"]}}
                   </el-link>
                 </div>
                 <div v-if="column.field=='title'">
@@ -38,8 +38,8 @@
                 </div>
                 <div v-if="column.field=='task_departments'">
                   <block v-for="(tag, tIndex) in scope.row['task_name']">
-                    <el-tag style="margin-right: 5px;margin-bottom: 5px;" v-if="tag.id">
+                    <el-tag style="margin-right: 5px;margin-bottom: 5px;" :type="tag.status==2?'success':'info'" v-if="tag.id">
-                      {{tag.name}}
+                      {{tag.departments.name}}
                     </el-tag>
                   </block>
                 </div>
@@ -257,7 +257,7 @@
           },
           {
             field: "task_departments",
-            title: "科室",
+            title: "科室情况",
             type: "format",
             align: "left",
             width: 300
@@ -265,7 +265,7 @@
 
           {
             field: "task_departments_report",
-            title: "上报（全部/已上报）",
+            title: "上报情况",
             type: "format",
             width: 120,
             align: "center"
@@ -394,8 +394,7 @@
             if (m.safety_task_departments) {
               let task_list = []
               for (var k of m.safety_task_departments) {
-                let dep = Object.assign({}, k.departments)
+                task_list.push(k)
-                task_list.push(dep)
               }
               m.task_name = task_list
             }