manage-client 3.2.57-aode → 3.2.58-aode

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "manage-client",
3
- "version": "3.2.57-aode",
3
+ "version": "3.2.58-aode",
4
4
  "description": "经营管控模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "directories": {
@@ -64,6 +64,14 @@
64
64
  condition="f_change_state = '{}'"
65
65
  close-on-select></v-select>
66
66
  </div>
67
+ <div class="col-sm-2 form-group">
68
+ <label class="font_normal_body">数据来源</label>
69
+ <v-select :value.sync="model.f_operate_resource"
70
+ v-model="model.f_operate_resource"
71
+ :options='$parent.$parent.source' placeholder='请选择'
72
+ condition="f_operate_resource = '{}'"
73
+ close-on-select></v-select>
74
+ </div>
67
75
  <div class="col-sm-2 form-group">
68
76
  <label class="font_normal_body">增值服务类型</label>
69
77
  <v-select :value.sync="model.f_field_name"
@@ -132,6 +140,9 @@
132
140
  <th>
133
141
  <nobr>变更后</nobr>
134
142
  </th>
143
+ <th>
144
+ <nobr>数据来源</nobr>
145
+ </th>
135
146
  <th>
136
147
  <nobr>操作人</nobr>
137
148
  </th>
@@ -177,6 +188,9 @@
177
188
  <td :style="{background:(row.istrue=='1'? '#f1dec2':'')}" style="text-align: center;">
178
189
  <nobr>{{row.f_new_content}}</nobr>
179
190
  </td>
191
+ <td :style="{background:(row.istrue=='1'? '#f1dec2':'')}" style="text-align: center;">
192
+ <nobr>{{row.f_operate_resource}}</nobr>
193
+ </td>
180
194
  <td :style="{background:(row.istrue=='1'? '#f1dec2':'')}" style="text-align: center;">
181
195
  <nobr>{{row.f_operator}}</nobr>
182
196
  </td>
@@ -396,6 +410,9 @@
396
410
  usertypes() {
397
411
  return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
398
412
  },
413
+ source(){
414
+ return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('数据来源')]
415
+ },
399
416
  pricetypeoptions(){
400
417
  return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('气价类型')]
401
418
  },
@@ -27,7 +27,7 @@
27
27
  <v-select :value.sync="model.f_field_name"
28
28
  v-model="model.f_field_name"
29
29
  :options='$parent.$parent.valuetypeoptions' placeholder='请选择'
30
- condition="itemname = '{}'"
30
+ condition="f_value_name = '{}'"
31
31
  close-on-select></v-select>
32
32
  </div>
33
33
 
@@ -114,6 +114,12 @@
114
114
  <th>
115
115
  <nobr>最后操作时间</nobr>
116
116
  </th>
117
+ <th>
118
+ <nobr>最后操作人</nobr>
119
+ </th>
120
+ <th>
121
+ <nobr>来源</nobr>
122
+ </th>
117
123
  <th>
118
124
  <nobr>所属公司</nobr>
119
125
  </th>
@@ -142,7 +148,7 @@
142
148
  <nobr>{{row.f_meternumber}}</nobr>
143
149
  </td>
144
150
  <td :style="{background:(row.istrue=='1'? '#f1dec2':'')}" style="text-align: center;">
145
- <nobr>{{row.itemname}}</nobr>
151
+ <nobr>{{row.f_value_name}}</nobr>
146
152
  </td>
147
153
  <td :style="{background:(row.istrue=='1'? '#f1dec2':'')}" style="text-align: center;">
148
154
  <nobr>{{row.ishas}}</nobr>
@@ -153,6 +159,12 @@
153
159
  <td :style="{background:(row.istrue=='1'? '#f1dec2':'')}" style="text-align: center;">
154
160
  <nobr>{{row.f_operate_date}}</nobr>
155
161
  </td>
162
+ <td :style="{background:(row.istrue=='1'? '#f1dec2':'')}" style="text-align: center;">
163
+ <nobr>{{row.f_operator}}</nobr>
164
+ </td>
165
+ <td :style="{background:(row.istrue=='1'? '#f1dec2':'')}" style="text-align: center;">
166
+ <nobr>{{row.f_resource}}</nobr>
167
+ </td>
156
168
  <td :style="{background:(row.istrue=='1'? '#f1dec2':'')}" style="text-align: center;">
157
169
  <nobr>{{row.f_orgname}}</nobr>
158
170
  </td>