huangsanjia 2 vuotta sitten
vanhempi
commit
6a0712c104
1 muutettua tiedostoa jossa 12 lisäystä ja 5 poistoa
  1. 12 5
      public/assets/js/backend/entrust.js

+ 12 - 5
public/assets/js/backend/entrust.js

@@ -33,7 +33,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'name', title: __('Name'), operate: 'LIKE'},
                         {field: 'bach', title: __('Bach'), operate: 'LIKE'},
                         {field: 'sell_bach', title: __('Sell_bach'), operate: 'LIKE'},
-                        {field: 'company', title: __('送样单位')},
                         {field: 'sample_no', title: __('Sample_no'), operate: 'LIKE'},
                         {field: 'is_two', title: __('是否双样'),operate:false,formatter: function (value,row,index) {
                                 if (value == 0){
@@ -44,14 +43,22 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                     return '<span style="color: #f75444">' + value + '</span>';
                                 }
                             }},
+
                         {field: 'standard_name', title: __('Standard_name'), operate:false},
+                        {field: 'data_status', title: __('检测数据'),operate:false,formatter: function (value,row,index) {
+                                if (value == 0){
+                                    value = '';
+                                    return '<span style="color: #f75444">' +value+ '</span>';
+                                }else {
+                                    value = '已有';
+                                    return '<span style="color: #18bc9c">' + value + '</span>';
+                                }
+                            }},
+                        {field: 'status', title: __('Status'), searchList: {"1":__('Status 1'),"2":__('Status 2'),"3":__('Status 3'),"4":__('Status 4'),"5":__('Status 5')}, formatter: Table.api.formatter.status},
+                        {field: 'company', title: __('送样单位')},
                         {field: 'sample_status', title: __('Sample_status'), operate:false, formatter: Table.api.formatter.status},
                         {field: 'create', title: __('Create'), operate:false, addclass:'datetimerange', autocomplete:false},
-                        {field: 'status', title: __('Status'), searchList: {"1":__('Status 1'),"2":__('Status 2'),"3":__('Status 3'),"4":__('Status 4'),"5":__('Status 5')}, formatter: Table.api.formatter.status},
                         {field: 'remark', title: __('Remark'), operate:false},
-                        // {field: 'report_id', title: __('Report_id')},
-                        // {field: 'user_id', title: __('User_id')},
-                        // {field: 'user_name', title: __('User_name'), operate: 'LIKE'},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate,
                             buttons: [
                                 // {