telephone-clients 3.0.103-94 → 3.0.103-96

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.
Files changed (3) hide show
  1. package/package.json +1 -1
  2. package/src/components/temp/HandplanInfo.vue +1 -1
  3. package/src/filiale/wenxi/pc/TelFindUser.vue +2 -2
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "telephone-clients",
3
- "version": "3.0.103-94",
3
+ "version": "3.0.103-96",
4
4
  "description": "呼叫模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "directories": {
package/src/components/temp/HandplanInfo.vue CHANGED
@@ -21,7 +21,7 @@
21
21
  </tr>
22
22
  </template>
23
23
  <template partial='body'>
24
- <td><nobr>{{row.f_userinfo_id}}</nobr></td>
24
+ <td><nobr>{{row.f_userinfo_code}}</nobr></td>
25
25
  <td><nobr>{{row.f_user_name}}</nobr></td>
26
26
  <td><nobr>{{row.f_meternumber}}</nobr></td>
27
27
  <td><nobr>{{row.f_meter_brand}}</nobr></td>
package/src/filiale/wenxi/pc/TelFindUser.vue CHANGED
@@ -206,9 +206,9 @@
206
206
  if(args.model.is_prepare && args.model.is_prepare.length>0 && args.model.is_prepare[0]=='是'){
207
207
  args.condition += ` and ti.f_filialeid = '${this.$login.f.orgid}' and ti.f_user_state = '预备' and tu.f_table_state = '待开通'`
208
208
  }else if(args.model.is_prepare && args.model.is_prepare.length>0 && args.model.is_prepare[0]=='否'){
209
- args.condition += ` and ti.f_filialeid = '${this.$login.f.orgid}' and ti.f_user_state in('正常','停用') and tu.f_table_state = '正常'`
209
+ args.condition += ` and ti.f_filialeid = '${this.$login.f.orgid}' and ti.f_user_state = '预备' and tu.f_table_state != '待开通'`
210
210
  }else {
211
- args.condition += ` and ti.f_filialeid = '${this.$login.f.orgid}' and ti.f_user_state in('正常','停用','预备')`
211
+ args.condition += ` and ti.f_filialeid = '${this.$login.f.orgid}'`
212
212
  }
213
213
  this.model.search(args.condition, args.model)
214
214
  },