凌云集团更改公司

admin-ui/app/whepi/lingyun/dialogDetail7.js

@@ -44,7 +44,7 @@ define(function (require) {
             },
             {
               field: 'msStatus', title: '上报状态', maxWidth: 100, align: 'center', formatter: function (value, row) {
-                if (row.rowData.reportStatus  == 0) {
+                if (row.rowData.reportStatus == 0) {
                   return "<span style='color: #ffb717;'>未上报<span>";
                 } else if (value == 1) {
                   return "<span style='color: green;'>正常<span>";
@@ -55,9 +55,30 @@ define(function (require) {
             },
             {field: 'temperature', title: '温度', maxWidth: 100, align: 'right',},
             {field: 'bingqingDesc', title: '病情表述', maxWidth: 300, align: 'left',},
+            {
+              field: 'isContactDesc', title: '家人确诊或接触', align: 'left', formatter: function (value) {
+                if (value == "否") {
+                  return "<span style='color: green;'>否<span>";
+                } else {
+                  return "<span style='color: red;'>是<span>";
+                }
+              }
+            },
+            {
+              field: 'isSuspectedDesc', title: '家人健康异常', align: 'left', formatter: function (value) {
+                if (value == "否") {
+                  return "<span style='color: green;'>否<span>";
+                } else {
+                  return "<span style='color: red;'>是<span>";
+                }
+              }
+            },
             {field: 'workLoalDesc', title: '工作驻地', maxWidth: 100, align: 'left',},
             {field: 'todayLoalDesc', title: '今晚住地', maxWidth: 100, align: 'left',},
-            {field: 'isTrip', title: '是否出行', maxWidth: 100, align: 'center',formatter: function (value) {
+            {field: 'autoLocal', title: '定位地区', maxWidth: 200, align: 'left',},
+            {field: 'autoAddr', title: '定位地址', maxWidth: 200, align: 'left',},
+            {
+              field: 'isTrip', title: '是否出行', maxWidth: 100, align: 'center', formatter: function (value) {
                 if (value == 0) {
                   return "<span style='color: green;'>否<span>";
                 } else {
@@ -65,8 +86,7 @@ define(function (require) {
                 }
               }
             },
-            {field: 'tripDetDesc', title: '出行详细', align: 'left'}
-
+            {field: 'tripDetDesc', title: '出行详细', align: 'left'},
           ]],
         }
       },

admin-ui/app/whepi/lingyun/lingyunUser7.js

@@ -175,6 +175,11 @@ define(function (require) {
                     }
                   },
                   {
+                    text: '导出正常复工人员', iconCls: 'fa fa-cloud-upload', onClick: function () {
+                      window.open(api('/returnWork/exReturnWork'));
+                    }
+                  },
+                  {
                     text: '查看人员上报情况', iconCls: 'fa fa-search', onClick: function () {
                       var row = $grid1.rowData();
                       if ( row == null || row == undefined || row.userId == null || row.userId == "") {
@@ -225,8 +230,26 @@ define(function (require) {
                     {field: 'phone', title: '联系电话', maxWidth: 200, align: 'left',},
                     {field: 'doorplate', title: '工号', maxWidth: 200, align: 'left',},
                     {field: 'bingqingDesc', title: '病情表述', align: 'left',},
+                    {field: 'isContactDesc', title: '家人确诊或接触', align: 'left',formatter: function (value) {
+                        if (value == "否") {
+                          return "<span style='color: green;'>否<span>";
+                        } else {
+                          return "<span style='color: red;'>是<span>";
+                        }
+                      }
+                    },
+                    {field: 'isSuspectedDesc', title: '家人健康异常', align: 'left',formatter: function (value) {
+                        if (value == "否") {
+                          return "<span style='color: green;'>否<span>";
+                        } else {
+                          return "<span style='color: red;'>是<span>";
+                        }
+                      }
+                    },
                     {field: 'workLoalDesc', title: '工作驻地', maxWidth: 200, align: 'left',},
                     {field: 'todayLoalDesc', title: '今晚住地', maxWidth: 200, align: 'left',},
+                    {field: 'autoLocal', title: '定位地区', maxWidth: 200, align: 'left',},
+                    {field: 'autoAddr', title: '定位地址', maxWidth: 200, align: 'left',},
                     {field: 'isTripDesc', title: '是否出行', maxWidth: 200, align: 'left',},
                     {field: 'tripDetDesc', title: '出行详细', align: 'left',},
                   ]