system-clients 3.2.1-24 → 3.2.1-27

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 (28) hide show
  1. package/.eslintrc.js +16 -16
  2. package/build/webpack.base.conf.js +85 -85
  3. package/package.json +1 -1
  4. package/src/App.vue +24 -24
  5. package/src/components/Main.vue +771 -645
  6. package/src/components/TabButton.vue +201 -201
  7. package/src/components/addressManage/AddressCascadingMenu.vue +145 -0
  8. package/src/components/equipment/EquipmentManage.vue +65 -65
  9. package/src/components/equipment/PhoneAdd.vue +25 -12
  10. package/src/components/equipment/PhoneList.vue +30 -20
  11. package/src/components/equipment/PosAdd.vue +323 -323
  12. package/src/components/equipment/PosList.vue +294 -294
  13. package/src/components/equipment/PosManage.vue +138 -138
  14. package/src/components/equipment/PosManageBoth.vue +125 -125
  15. package/src/components/equipment/PosParamAdd.vue +236 -236
  16. package/src/components/equipment/PosParamList.vue +121 -121
  17. package/src/components/equipment/PosParamManage.vue +51 -51
  18. package/src/components/server/LoadData.vue +55 -55
  19. package/src/components/server/Login.vue +835 -828
  20. package/src/filiale/rizhao/LeftTree.vue +111 -111
  21. package/src/filiale/rizhao/Login.vue +10 -11
  22. package/src/filiale/rizhao/Main.vue +606 -606
  23. package/src/filiale/rizhao/system.js +14 -14
  24. package/src/styles/less/aofeng/themeOne/systemStyle.less +2650 -2650
  25. package/src/system.js +109 -109
  26. package/yarn-error.log +128 -128
  27. package/.gradle/3.5.1/file-changes/last-build.bin +0 -0
  28. package/.gradle/3.5.1/taskHistory/taskHistory.lock +0 -0
package/src/components/equipment/PhoneAdd.vue CHANGED
@@ -6,18 +6,23 @@
6
6
  </ul>
7
7
  <form class="form-horizontal">
8
8
 
9
- <div class="col-sm-6 form-group">
10
- <label class="font_normal_body">使用人员</label>
11
- <input type="text" style="width: 60%" class="input_search" v-model="model.f_username" placeholder="使用人员" >
12
- </div>
13
- <div class="col-sm-6 form-group">
14
- <label class="font_normal_body">设备号</label>
15
- <input type="text" style="width: 60%" class="input_search" v-model="model.f_terminal_number" placeholder="设备号" >
16
- </div>
17
- <div class="col-sm-6 form-group">
18
- <label class="font_normal_body">使用公司</label>
19
- <right-tree :userid.sync='userid' :source.sync='source' @re-res="getRes"></right-tree>
20
- </div>
9
+ <div class="col-sm-6 form-group">
10
+ <label class="font_normal_body">使用人员</label>
11
+ <input type="text" style="width: 60%" class="input_search" v-model="model.f_username" placeholder="使用人员" >
12
+ </div>
13
+ <div class="col-sm-6 form-group">
14
+ <label class="font_normal_body">设备号</label>
15
+ <input type="text" style="width: 60%" class="input_search" v-model="model.f_terminal_number" placeholder="设备号" >
16
+ </div>
17
+ <div class="col-sm-6 form-group">
18
+ <label class="font_normal_body">使用公司</label>
19
+ <!--<right-tree :userid.sync='userid' :source.sync='source' @re-res="getRes"></right-tree>-->
20
+ <res-select restype='organization'
21
+ is-mul="false"
22
+ @res-select="getorg"
23
+ :initresid="curorgid">
24
+ </res-select>
25
+ </div>
21
26
 
22
27
  </form>
23
28
  <div style="text-align:right;height:auto;">
@@ -42,6 +47,8 @@
42
47
  filialeCodeStr: this.$login.f.f_orgids,
43
48
  userid: this.$login.f.id,
44
49
  source: `tool.getFullTree(this.getRights().where(row.getType() == $organization$))`,
50
+ curorgid: this.$login.f.orgid,
51
+ f_orgid: ''
45
52
  }
46
53
  },
47
54
  props: ['data'],
@@ -64,6 +71,7 @@
64
71
  confirm () {
65
72
  this.model.f_operator = this.$login.f.name
66
73
  this.model.f_filialeids = this.filialeCodeStr
74
+ this.model.f_orgid = this.f_orgid
67
75
  console.log('保存', this.model)
68
76
  this.$resetpost('rs/entity/t_equipment', this.model, {resolveMsg: '保存成功', rejectMsg: '保存失败'}).then((res) => {
69
77
  this.$dispatch('refresh')
@@ -77,6 +85,8 @@
77
85
  this.model.f_terminal_number = row.f_terminal_number
78
86
  this.model.id = row.id
79
87
  this.filialeCodeStr = row.f_filialeids
88
+ this.f_orgid = row.f_orgid
89
+ this.curorgid= [row.f_orgid]
80
90
  },
81
91
  initModel () {
82
92
  delete this.model.id
@@ -89,6 +99,9 @@
89
99
  getRes(obj) {
90
100
  this.filialeCodeStr = obj.resids
91
101
  },
102
+ getorg (val) {
103
+ this.f_orgid = val[0]
104
+ }
92
105
  }
93
106
  }
94
107
  </script>
package/src/components/equipment/PhoneList.vue CHANGED
@@ -4,27 +4,32 @@
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 form-group">
8
- <label class="font_normal_body">使用公司</label>
9
- <right-tree :userid.sync='$parent.$parent.userid' :source.sync='$parent.$parent.source' @re-res="$parent.$parent.getRes" > </right-tree>
10
- </div>
7
+ <div class="col-sm-3 form-group">
8
+ <label class="font_normal_body">使用公司</label>
9
+ <!--<right-tree :userid.sync='$parent.$parent.userid' :source.sync='$parent.$parent.source' @re-res="$parent.$parent.getRes" > </right-tree>-->
10
+ <res-select restype='organization'
11
+ is-mul="false"
12
+ @res-select="$parent.$parent.getorg"
13
+ :initresid="$parent.$parent.curorgid">
14
+ </res-select>
15
+ </div>
11
16
 
12
- <div class="col-sm-3 form-group" >
13
- <label class="font_normal_body">使用人员</label>
14
- <input type="text" class="input_search" style="width:60%" v-model="model.f_username"
15
- condition="f_username like '%{}%'" placeholder="使用人员">
16
- </div>
17
- <div class="col-sm-3 form-group" >
18
- <label class="font_normal_body">设备号</label>
19
- <input type="text" class="input_search" style="width:60%" v-model="model.f_terminal_number"
20
- condition="f_terminal_number like '%{}%'" placeholder="设备号">
21
- </div>
22
- <div class="span" style="float:right;">
23
- <button class="button_search" @click="$parent.$parent.search()" v-el:cx>查询</button>
24
- <button class="button_search" @click="$parent.$parent.add()" v-el:cx>新增</button>
17
+ <div class="col-sm-3 form-group" >
18
+ <label class="font_normal_body">使用人员</label>
19
+ <input type="text" class="input_search" style="width:60%" v-model="model.f_username"
20
+ condition="f_username like '%{}%'" placeholder="使用人员">
21
+ </div>
22
+ <div class="col-sm-3 form-group" >
23
+ <label class="font_normal_body">设备号</label>
24
+ <input type="text" class="input_search" style="width:60%" v-model="model.f_terminal_number"
25
+ condition="f_terminal_number like '%{}%'" placeholder="设备号">
26
+ </div>
27
+ <div class="span" style="float:right;">
28
+ <button class="button_search" @click="$parent.$parent.search()" v-el:cx>查询</button>
29
+ <button class="button_search" @click="$parent.$parent.add()" v-el:cx>新增</button>
30
+ </div>
25
31
  </div>
26
32
  </div>
27
- </div>
28
33
  </criteria>
29
34
  <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid >
30
35
  <template partial='head'>
@@ -62,7 +67,9 @@
62
67
  filialeNameStr: this.$login.f.f_fengongsi,
63
68
  filialeCodeStr: this.$login.f.f_orgids,
64
69
  userid:this.$login.f.id,
65
- source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() != $role$))`
70
+ curorgid: [this.$login.f.orgid],
71
+ source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() != $role$))`,
72
+ f_orgid:''
66
73
  }
67
74
  },
68
75
  ready () {
@@ -75,7 +82,7 @@
75
82
  },
76
83
 
77
84
  selfSearch (args) {
78
- args.condition = `${args.condition} and f_equipment_type = 'PHONE' and f_state = '正常' and f_orgid like '${this.filialeCodeStr}%'`
85
+ args.condition = `${args.condition} and f_equipment_type = 'PHONE' and f_state = '正常' and f_orgid = '${this.f_orgid ? this.f_orgid: this.$login.f.orgid}'`
79
86
  this.model.search(args.condition, this.model)
80
87
  },
81
88
  add () {
@@ -94,6 +101,9 @@
94
101
  this.filialeNameStr = obj.res
95
102
  this.filialeCodeStr = obj.resids
96
103
  },
104
+ getorg (val) {
105
+ this.f_orgid = val[0]
106
+ }
97
107
  },
98
108
  computed: {
99
109