seimin 11 місяців тому
батько
коміт
35e25dd7aa

+ 1 - 1
assets/css/styles.css

@@ -12228,7 +12228,7 @@ fieldset[disabled] .btn-gray.active {
12228 12228
 
12229 12229
 .ui-select-multiple.ui-select-bootstrap {
12230 12230
     height: auto;
12231
-    padding: 1px 3px 0!important;
12231
+    padding: 1px 3px 1px!important;
12232 12232
 }
12233 12233
 
12234 12234
 .btn-xs,

+ 22 - 14
assets/js/controllers/system/thirdPartyCompanyCtrl.js

@@ -55,8 +55,7 @@ app.controller('thirdPartyCompanyCtrl', ["$rootScope", "$scope", "$state", "$tim
55 55
     $scope.gridOptions.columnDefs = [{
56 56
             name: 'item',
57 57
             displayName: '序号',
58
-            width: '5%',
59
-            minWidth: '70',
58
+            width: '50',
60 59
             enableFiltering: false,
61 60
             cellTemplate: '<div>' +
62 61
                 '<div class="ui-grid-cell-contents">{{row.entity.item}}</div>' +
@@ -65,29 +64,37 @@ app.controller('thirdPartyCompanyCtrl', ["$rootScope", "$scope", "$state", "$tim
65 64
         {
66 65
             name: 'name',
67 66
             displayName: '公司名称',
68
-            width: '20%',
69
-            minWidth: '100',
67
+            width: '300',
68
+            enableFiltering: false
69
+        },
70
+        {
71
+            name: 'duty.dept',
72
+            displayName: '责任科室',
73
+            width: '200',
74
+            enableFiltering: false
75
+        },
76
+        {
77
+            name: 'code',
78
+            displayName: '公司编码',
79
+            width: '200',
70 80
             enableFiltering: false
71 81
         },
72 82
         {
73 83
             name: 'contacts',
74 84
             displayName: '公司联系人',
75
-            width: '20%',
76
-            minWidth: '100',
85
+            width: '100',
77 86
             enableFiltering: false
78 87
         },
79 88
         {
80
-            name: 'phone',
89
+            name: 'mphone',
81 90
             displayName: '联系人电话',
82
-            width: '20%',
83
-            minWidth: '120',
91
+            width: '200',
84 92
             enableFiltering: false
85 93
         },
86 94
         {
87 95
             name: 'serviceTypeNames',
88 96
             displayName: '公司服务种类',
89
-            width: '20%',
90
-            minWidth: '120',
97
+            width: '100',
91 98
             enableFiltering: false,
92 99
             // cellTemplate: '<div>' +
93 100
             //     '<div class="ui-grid-cell-contents">{{row.entity.userType.value == 2 ?row.entity.company.name:row.entity.userType.name}}</div>' +
@@ -95,8 +102,7 @@ app.controller('thirdPartyCompanyCtrl', ["$rootScope", "$scope", "$state", "$tim
95 102
         },
96 103
         {
97 104
             name: '操作',
98
-            width: '10%',
99
-            minWidth: '100',
105
+            width: '100',
100 106
             cellTemplate: '<div><div class="cl-effect-1 ui-grid-cell-contents pull-left">' +
101 107
                 '<a ng-click="grid.appScope.saveData(row.entity)" ng-show="grid.appScope.bianji" class="bianjifont">编辑</a>' +
102 108
                 '</div></div>',
@@ -119,7 +125,9 @@ app.controller('thirdPartyCompanyCtrl', ["$rootScope", "$scope", "$state", "$tim
119 125
             categoryTypeIds: data.categoryTypeIds,//故障现象
120 126
             contacts: data.contacts,//联系人
121 127
             id: data.id,//id
122
-            phone: data.phone,//联系电话
128
+            code: data.code,//code
129
+            duty: data.duty,//duty
130
+            mphone: data.mphone,//联系电话
123 131
             name: data.name,//公司名称
124 132
             startTime: data.startTime,//开始时间
125 133
             endTime: data.endTime,//结束时间