system-clients 3.1.74-xianyang → 3.1.79-xianyang

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 (10) hide show
  1. package/package.json +1 -1
  2. package/src/components/equipment/PcAdd.vue +40 -55
  3. package/src/components/equipment/PcList.vue +5 -5
  4. package/src/components/equipment/PhoneAdd.vue +4 -4
  5. package/src/components/equipment/PhoneList.vue +4 -4
  6. package/src/components/equipment/PosAdd.vue +299 -315
  7. package/src/components/equipment/PosList.vue +254 -315
  8. package/src/components/equipment/PosManage.vue +150 -68
  9. package/src/components/server/ResSelect.vue +154 -150
  10. package/src/components/server/RightTree.vue +314 -315
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "system-clients",
3
- "version": "3.1.74-xianyang",
3
+ "version": "3.1.79-xianyang",
4
4
  "description": "系统基础框架",
5
5
  "main": "src/index.js",
6
6
  "directories": {
package/src/components/equipment/PcAdd.vue CHANGED
@@ -1,45 +1,45 @@
1
1
  <template>
2
- <div class="auto select-overspread">
2
+ <div class="row select-overspread">
3
3
  <validator name='v'>
4
- <ul class="nav nav-tabs">
4
+ <ul class="nav nav-tabs" >
5
5
  <li role="presentation" class="active"><a href="#">PC端MAC</a></li>
6
6
  </ul>
7
7
  <form class="form-horizontal">
8
- <div class="col-sm-6">
9
- <label class="font_normal_body">使用人员</label>
10
- <input type="text" style="width: 60%" class="input_search" v-model="model.f_username" placeholder="使用人员">
11
- </div>
12
- <div class="col-sm-6">
13
- <label class="font_normal_body">所属地址</label>
14
- <input type="text" style="width: 60%" class="input_search" v-model="model.f_mac_outlets" placeholder="所属地址">
15
- </div>
16
- <div class="col-sm-6">
17
- <label class="font_normal_body">mac地址</label>
18
- <input type="text" style="width: 60%" class="input_search" v-model="model.f_mac_number" placeholder="mac地址"
19
- @blur="cx()">
20
- </div>
21
- <div class="col-sm-6">
22
- <label class="font_normal_body">使用公司</label>
8
+ <div class="col-sm-6 form-group">
9
+ <label class="font_normal_body">使用人员</label>
10
+ <input type="text" style="width: 60%" class="input_search" v-model="model.f_username" placeholder="使用人员" >
11
+ </div>
12
+ <div class="col-sm-6 form-group">
13
+ <label class="font_normal_body">所属地址</label>
14
+ <input type="text" style="width: 60%" class="input_search" v-model="model.f_mac_outlets" placeholder="所属地址" >
15
+ </div>
16
+ <div class="col-sm-6 form-group">
17
+ <label class="font_normal_body">mac地址</label>
18
+ <input type="text" style="width: 60%" class="input_search" v-model="model.f_mac_number" placeholder="mac地址" >
19
+ </div>
20
+ <div class="col-sm-6 form-group">
21
+ <label class="font_normal_body">使用公司</label>
23
22
 
24
- <res-select restype='organization'
25
- is-mul="false"
26
- @res-select="getorg"
27
- :initresid="curorgid">
28
- </res-select>
23
+ <res-select restype='organization'
24
+ is-mul="false"
25
+ @res-select="getorg"
26
+ :initresid="curorgid">
27
+ </res-select>
29
28
 
30
29
  </div>
31
30
  </form>
32
31
  <div style="text-align:right;height:auto;">
33
- <button class="btn button_search" @click="confirm()" :disabled="cs" >确认</button>
34
- <button class="btn button_clear " @click="cancel()">取消</button>
32
+ <button class="btn button_search" @click="confirm()" >确认</button>
33
+ <button class="btn button_clear " @click="cancel()" >取消</button>
35
34
  </div>
36
35
  </validator>
37
36
  </div>
38
37
  </template>
39
38
  <script>
40
- import {PagedList} from "vue-client";
39
+
40
+
41
41
  export default {
42
- data() {
42
+ data () {
43
43
  return {
44
44
  model: {
45
45
  f_username: '',
@@ -49,42 +49,27 @@
49
49
  f_state: '正常'
50
50
  },
51
51
  curorgid: this.$login.f.orgid,
52
- f_orgid: '',
53
- cs: false
52
+ f_orgid: ''
54
53
  }
55
54
  },
56
55
  props: ['data'],
57
56
  watch: {
58
- 'data'(val) {
59
- if (val) {
60
- this.edit(val)
61
- } else {
62
- this.initModel()
63
- }
57
+ 'data' (val) {
58
+ if (val) {
59
+ this.edit(val)
60
+ } else {
61
+ this.initModel()
62
+ }
64
63
  }
65
64
  },
66
- ready() {
65
+ ready () {
67
66
  console.log('mac信息：', this.data)
68
67
  if (this.data) {
69
- this.edit(this.data)
68
+ this.edit(this.data)
70
69
  }
71
70
  },
72
71
  methods: {
73
- async cx() {
74
- this.cs = false
75
- console.log('mac===>', this.model.f_mac_number)
76
- let xc = await this.$resetpost('rs/sql/equipmentQuery', {
77
- data: {
78
- condition: `f_mac_number = '${this.model.f_mac_number}'`
79
- }
80
- }, {resolveMsg: null, rejectMsg: '获取表信息出错'})
81
- console.log('xc=====>', xc)
82
- if (xc.data.length > 0) {
83
- this.$showAlert('MAC地址已存在, 请重新输入', 'danger', 2000)
84
- this.cs = true
85
- }
86
- },
87
- confirm() {
72
+ confirm () {
88
73
  this.model.f_operator = this.$login.f.name
89
74
  this.model.f_operatorid = this.$login.f.id
90
75
  this.model.f_orgid = this.f_orgid
@@ -95,7 +80,7 @@
95
80
  this.$dispatch('refresh')
96
81
  })
97
82
  },
98
- edit(row) {
83
+ edit (row) {
99
84
  console.log('修改，，。。', row)
100
85
  this.model.f_username = row.f_username
101
86
  this.model.f_mac_outlets = row.f_mac_outlets
@@ -103,16 +88,16 @@
103
88
  this.model.id = row.id
104
89
  this.f_orgid = row.f_orgid
105
90
  },
106
- initModel() {
91
+ initModel () {
107
92
  delete this.model.id
108
93
  this.model.f_username = ''
109
94
  this.model.f_mac_outlets = ''
110
95
  this.model.f_mac_number = ''
111
96
  },
112
- cancel() {
97
+ cancel () {
113
98
  this.$dispatch('close')
114
99
  },
115
- getorg(val) {
100
+ getorg (val) {
116
101
  this.f_orgid = val[0]
117
102
  }
118
103
  }
package/src/components/equipment/PcList.vue CHANGED
@@ -4,7 +4,7 @@
4
4
  <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
5
5
  <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
6
6
  <div class="row">
7
- <div class="col-sm-3">
7
+ <div class="col-sm-3 form-group">
8
8
  <label class="font_normal_body">使用公司</label>
9
9
  <res-select restype='organization'
10
10
  is-mul="false"
@@ -13,12 +13,12 @@
13
13
  </res-select>
14
14
  </div>
15
15
 
16
- <div class="col-sm-3" >
16
+ <div class="col-sm-3 form-group" >
17
17
  <label class="font_normal_body">使用人员</label>
18
18
  <input type="text" class="input_search" style="width:60%" v-model="model.f_username"
19
19
  condition="f_username like '%{}%'" placeholder="使用人员">
20
20
  </div>
21
- <div class="col-sm-3" >
21
+ <div class="col-sm-3 form-group" >
22
22
  <label class="font_normal_body">所属地址</label>
23
23
  <input type="text" class="input_search" style="width:60%" v-model="model.f_mac_outlets"
24
24
  condition="f_mac_outlets like '%{}%'" placeholder="所属地址">
@@ -31,7 +31,7 @@
31
31
  </div>
32
32
  </div>
33
33
  <div class="row" v-show="$parent.$parent.criteriaShow">
34
- <div class="col-sm-3" >
34
+ <div class="col-sm-3 form-group" >
35
35
  <label class="font_normal_body">MAC地址</label>
36
36
  <input type="text" class="input_search" style="width:60%" v-model="model.f_mac_number"
37
37
  condition="f_mac_number like '%{}%'" placeholder="MAC地址">
@@ -58,7 +58,7 @@
58
58
  <td style="text-align:center">{{row.f_mac_outlets}}</td>
59
59
  <td style="text-align:center">{{row.f_mac_number}}</td>
60
60
  <td style="text-align:center">
61
- <button class="btn btn-link" @click.stop="$parent.$parent.$parent.del(row)">删除</button>
61
+ <button class="btn btn-danger" @click.stop="$parent.$parent.$parent.del(row)">删除</button>
62
62
  </td>
63
63
  </tr>
64
64
  </template>
package/src/components/equipment/PhoneAdd.vue CHANGED
@@ -1,20 +1,20 @@
1
1
  <template>
2
- <div class="auto select-overspread">
2
+ <div class="row select-overspread">
3
3
  <validator name='v'>
4
4
  <ul class="nav nav-tabs" >
5
5
  <li role="presentation" class="active"><a href="#">Phone端设备号</a></li>
6
6
  </ul>
7
7
  <form class="form-horizontal">
8
8
 
9
- <div class="col-sm-6">
9
+ <div class="col-sm-6 form-group">
10
10
  <label class="font_normal_body">使用人员</label>
11
11
  <input type="text" style="width: 60%" class="input_search" v-model="model.f_username" placeholder="使用人员" >
12
12
  </div>
13
- <div class="col-sm-6">
13
+ <div class="col-sm-6 form-group">
14
14
  <label class="font_normal_body">设备号</label>
15
15
  <input type="text" style="width: 60%" class="input_search" v-model="model.f_terminal_number" placeholder="设备号" >
16
16
  </div>
17
- <div class="col-sm-6">
17
+ <div class="col-sm-6 form-group">
18
18
  <label class="font_normal_body">使用公司</label>
19
19
  <right-tree :userid.sync='userid' :source.sync='source' @re-res="getRes"></right-tree>
20
20
  </div>
package/src/components/equipment/PhoneList.vue CHANGED
@@ -4,17 +4,17 @@
4
4
  <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
5
5
  <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
6
6
  <div class="row">
7
- <div class="col-sm-3">
7
+ <div class="col-sm-3 form-group">
8
8
  <label class="font_normal_body">使用公司</label>
9
9
  <right-tree :userid.sync='$parent.$parent.userid' :source.sync='$parent.$parent.source' @re-res="$parent.$parent.getRes" > </right-tree>
10
10
  </div>
11
11
 
12
- <div class="col-sm-3" >
12
+ <div class="col-sm-3 form-group" >
13
13
  <label class="font_normal_body">使用人员</label>
14
14
  <input type="text" class="input_search" style="width:60%" v-model="model.f_username"
15
15
  condition="f_username like '%{}%'" placeholder="使用人员">
16
16
  </div>
17
- <div class="col-sm-3" >
17
+ <div class="col-sm-3 form-group" >
18
18
  <label class="font_normal_body">设备号</label>
19
19
  <input type="text" class="input_search" style="width:60%" v-model="model.f_terminal_number"
20
20
  condition="f_terminal_number like '%{}%'" placeholder="设备号">
@@ -41,7 +41,7 @@
41
41
  <td style="text-align:center">{{row.f_username}}</td>
42
42
  <td style="text-align:center">{{row.f_terminal_number}}</td>
43
43
  <td style="text-align:center">
44
- <button class="btn btn-link" @click.stop="$parent.$parent.$parent.del(row)">删除</button>
44
+ <button class="btn btn-danger" @click.stop="$parent.$parent.$parent.del(row)">删除</button>
45
45
  </td>
46
46
  </tr>
47
47
  </template>