sale-client 3.6.242 → 3.6.243

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": "sale-client",
3
- "version": "3.6.242",
3
+ "version": "3.6.243",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
@@ -1,47 +1,56 @@
1
1
  <template>
2
- <div class="flex" >
2
+ <div class="flex" style="flex: 1;">
3
3
  <criteria-paged :model="model" v-ref:paged>
4
- <criteria partial='criteria' @condition-changed='$parent.search' v-ref:cri>
5
- <div novalidate class="form-inline" partial>
6
- <div >
7
- <input type="number" class="form-control" v-model="model.f_userinfo_id" placeholder='客户编号'
8
- condition="f_userinfo_id = '{}'" v-next-el='yhxm'
9
- :size="model.f_userinfo_id ? model.f_userinfo_id.length : 4">
4
+ <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
5
+ <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
6
+ <div class="row">
7
+ <div class="form-group col-sm-4">
8
+ <label class="font_normal_body">组织机构</label>
9
+ <res-select
10
+ restype='organization'
11
+ @res-select="$parent.$parent.getorg"
12
+ is-mul="false"
13
+ :initresid='$parent.$parent.curorgid'
14
+ >
15
+ </res-select>
16
+ </div>
17
+ <div class="form-group col-sm-4">
18
+ <label class="font_normal_body">客户编号</label>
19
+ <input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code" placeholder='客户编号'
20
+ condition="f_userinfo_code = '{}'">
21
+ </div>
22
+ <div class="span" style="float:right;">
23
+ <button class="button_search button_spacing" @click="search()">查询</button>
24
+ <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
25
+ <div style="float: right" class="button_spacing"
26
+ :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
27
+ @click="$parent.$parent.hidden()"></div>
28
+ </div>
10
29
  </div>
11
- <div >
12
- <input type="text" class="form-control" v-model="model.f_user_name" placeholder='客户名称'
13
- condition="f_user_name = '{}'" v-next-el='resentialarea' v-el:yhxm
14
- :size="model.f_user_name ? model.f_user_name.length : 4">
15
- </div>
16
- <div >
17
- <input type="text" class="form-control" v-model="model.f_area" placeholder='区域'
18
- condition="f_area like '%{}%'" v-el:xq v-next-el='cx' v-el:resentialarea
19
- :size="model.f_area ? model.f_area.length : 2">
20
- </div>
21
- <div >
22
- <input type="text" class="form-control" v-model="model.f_address" placeholder='客户地址'
23
- condition="f_address like '%{}%'" v-next-el='cx' v-el:resentialarea
24
- :size="model.f_address ? model.f_address.length * 2 : 4">
25
- </div>
26
- <div >
27
- <input type="text" class="form-control" v-model="model.f_meterbook_id" placeholder='表册号'
28
- condition="f_meterbook_id = '{}'"
29
- :size="model.f_meterbook_id ? model.f_meterbook_id.length : 2">
30
- </div>
31
- <div >
32
- <button class="btn btn-success" @click="search()" v-el:cx>查询</button>
30
+ <div class="row" v-show="$parent.$parent.criteriaShow">
31
+ <div class="form-group col-sm-4">
32
+ <label class="font_normal_body">客户名称</label>
33
+ <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name" placeholder='客户名称'
34
+ condition="f_user_name like '%{}%'">
35
+ </div>
36
+ <div class="form-group col-sm-4">
37
+ <label class="font_normal_body">客户地址</label>
38
+ <input type="text" style="width:60%" class="input_search" v-model="model.f_address" placeholder='客户地址'
39
+ condition="f_address like '%{}%'">
40
+ </div>
41
+
33
42
  </div>
34
43
  </div>
35
44
  </criteria>
36
- <data-grid :model="model" partial='list' v-ref:grid>
45
+ <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
37
46
  <template partial='head'>
38
47
  <tr>
39
- <th>序号</th>
40
- <th>客户名称</th>
41
- <th>表编号</th>
42
- <th>表品牌</th>
43
- <th>表型号</th>
44
- <th>是否总表</th>
48
+ <th><nobr>序号</nobr></th>
49
+ <th><nobr>客户名称</nobr></th>
50
+ <th><nobr>表编号</nobr></th>
51
+ <th><nobr>表品牌</nobr></th>
52
+ <th><nobr>表型号</nobr></th>
53
+ <th><nobr>是否总表</nobr></th>
45
54
  </tr>
46
55
  </template>
47
56
  <template partial='body'>
@@ -67,37 +76,37 @@
67
76
  export default {
68
77
  data () {
69
78
  return {
70
- model: new PagedList('rs/sql/singleTableOrderBy_WithView', 50, {orderitem: '"' + this.orderitem + '"',
71
- items: '"' + this.items + '"',
72
- tablename: '"' + this.tablename + '"'})
73
- }
74
- },
75
- props: {
76
- orderitem: {
77
- type: String,
78
- default: 'f_userinfo_id'
79
- },
80
- tablename: {
81
- type: String,
82
- default: 'V_user_table'
83
- },
84
- items: {
85
- type: String,
86
- default: "f_user_name, f_user_id, f_meter_brand, f_meter_style, case when f_totalsplit_type is null then '分表' else f_totalsplit_type end f_totalsplit_type"
79
+ model: new PagedList('rs/sql/getUserAndMeter', 30, {items: '"f_user_name, f_user_id, f_meter_brand, f_meter_style, case when f_totalsplit_type is null then \'分表\' else f_totalsplit_type end f_totalsplit_type"'}),
80
+ criteriaShow: false,
81
+ curorgid: [this.$login.f.orgid],
82
+ f_filialeid: this.$login.convertToIn(this.$login.f.orgid)
87
83
  }
88
84
  },
89
85
  ready () {
90
- this.search({condition: '1=1', model: this.model})
86
+ this.search()
91
87
  },
92
88
  methods: {
93
- // search () {
94
- // this.$refs.paged.$refs.criteria.search()
95
- // },
96
- search (args) {
97
- args.condition = `${args.condition} and f_user_state = '正常'`
98
- if (!this.$login.f.parent.parent.name.includes('统一资源管理')) {
99
- args.condition = `${args.condition} and f_filialeids = '${this.$login.f.f_orgids}'`
89
+ getorg (val) {
90
+ this.f_filialeid = this.$login.convertToIn(val)
91
+ },
92
+ hidden () {
93
+ this.criteriaShow = !this.criteriaShow
94
+ },
95
+ clear () {
96
+ Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
97
+ this.$refs.paged.$refs.cri.model[key] = []
98
+ })
99
+ },
100
+ search () {
101
+ this.$refs.paged.$refs.cri.search()
102
+ },
103
+ async selfSearch (args) {
104
+ if (this.f_filialeid) {
105
+ args.condition = `f_filialeid in ${this.f_filialeid} and ${args.condition}`
100
106
  }
107
+ console.log('----------2222222---------------')
108
+ console.log(args)
109
+ console.log('------------22222222-------------')
101
110
  this.model.search(args.condition, args.model)
102
111
  },
103
112
  defined () {
@@ -1,45 +1,60 @@
1
1
  <template>
2
2
  <div class="span" >
3
3
  <criteria-paged :model="model" v-ref:paged>
4
- <criteria partial='criteria' @condition-changed='$parent.search' v-ref:cri>
5
- <div novalidate class="form-inline" partial>
6
- <div >
7
- <input type="number" class="form-control" v-model="model.f_userinfo_id" placeholder='客户编号'
8
- condition="f_userinfo_id = '{}'" v-next-el='yhxm'
9
- :size="model.f_userinfo_id ? model.f_userinfo_id.length : 4">
10
- </div>
11
- <div >
12
- <input type="text" class="form-control" v-model="model.f_user_name" placeholder='客户名称'
13
- condition="f_user_name = '{}'" v-next-el='resentialarea' v-el:yhxm
14
- :size="model.f_user_name ? model.f_user_name.length : 4">
15
- </div>
16
- <div >
17
- <input type="text" class="form-control" v-model="model.f_address" placeholder='客户地址'
18
- condition="f_address like '%{}%'" v-next-el='cx' v-el:resentialarea
19
- :size="model.f_address ? model.f_address.length * 2 : 4">
20
- </div>
21
- <div >
22
- <input type="text" class="form-control" v-model="model.f_meterbook_id" placeholder='表册号'
23
- condition="f_meterbook_id = '{}'"
24
- :size="model.f_meterbook_id ? model.f_meterbook_id.length : 2">
4
+ <criteria partial='criteria' @condition-changed='$parent.selfSearchsplit' v-ref:cri>
5
+ <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
6
+ <div class="row">
7
+ <div class="form-group col-sm-4">
8
+ <label class="font_normal_body">组织机构</label>
9
+ <res-select
10
+ restype='organization'
11
+ @res-select="$parent.$parent.getorgfen"
12
+ is-mul="false"
13
+ :initresid='$parent.$parent.curorgidfen'
14
+ >
15
+ </res-select>
16
+ </div>
17
+
18
+ <div class="span" style="float:right;">
19
+ <button class="button_search button_spacing" @click="search()">查询</button>
20
+ <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
21
+ <button class="button_clear button_spacing" @click="$parent.$parent.addToTotal()" >添加至总表</button>
22
+ <div style="float: right" class="button_spacing"
23
+ :class="{'button_shrink_top':$parent.$parent.criteriaShowfen,'button_shrink_bottom':!$parent.$parent.criteriaShowfen}"
24
+ @click="$parent.$parent.hiddenfen()"></div>
25
+ </div>
25
26
  </div>
26
- <div >
27
- <button class="btn btn-success" @click="search()" >查询</button>
28
- <button class="btn btn-primary" @click="$parent.$parent.addToTotal()" >添加至总表</button>
27
+
28
+ <div class="row" v-show="$parent.$parent.criteriaShowfen">
29
+ <div class="form-group col-sm-4">
30
+ <label class="font_normal_body">客户编号</label>
31
+ <input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code" placeholder='客户编号'
32
+ condition="f_userinfo_code = '{}'">
33
+ </div>
34
+ <div class="form-group col-sm-4">
35
+ <label class="font_normal_body">客户名称</label>
36
+ <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name" placeholder='客户名称'
37
+ condition="f_user_name like '%{}%'">
38
+ </div>
39
+ <div class="form-group col-sm-4">
40
+ <label class="font_normal_body">客户地址</label>
41
+ <input type="text" style="width:60%" class="input_search" v-model="model.f_address" placeholder='客户地址'
42
+ condition="f_address like '%{}%'">
43
+ </div>
29
44
  </div>
30
45
  </div>
31
46
  </criteria>
32
- <data-grid :model="model" partial='list' v-ref:grid>
47
+ <data-grid :model="model" class="list_area table_sy" partial='list' v-ref:grid>
33
48
  <template partial='head'>
34
49
  <tr>
35
50
  <th>
36
51
  <input type="checkbox" @click="$parent.$parent.$parent.isAll(model.pageIndex)">
37
52
  </th>
38
- <th>序号</th>
39
- <th>客户名称</th>
40
- <th>表编号</th>
41
- <th>表品牌</th>
42
- <th>表型号</th>
53
+ <th><nobr>序号</nobr></th>
54
+ <th><nobr>客户名称</nobr></th>
55
+ <th><nobr>表编号</nobr></th>
56
+ <th><nobr>表品牌</nobr></th>
57
+ <th><nobr>表型号</nobr></th>
43
58
  <!-- <th>是否总表</th> -->
44
59
  </tr>
45
60
  </template>
@@ -139,38 +154,43 @@
139
154
  export default {
140
155
  data () {
141
156
  return {
142
- model: new PagedList('rs/sql/singleTableOrderBy_WithView', 50, {orderitem: '"' + this.orderitem + '"',
143
- items: '"' + this.items + '"',
144
- tablename: '"' + this.tablename + '"'}),
157
+ model: new PagedList('rs/sql/getUserAndMeter', 30, {items: '"f_address,f_userinfo_code,f_user_name,f_user_id,f_meter_brand,f_meter_style"'}),
145
158
  shareratio: false,
146
159
  selectedDatas: [],
147
- pages: []
160
+ pages: [],
161
+ criteriaShowfen: false,
162
+ curorgidfen: [this.$login.f.orgid],
163
+ f_filialeid: this.$login.convertToIn(this.$login.f.orgid)
148
164
  }
149
165
  },
150
166
  props: {
151
- data: ['data'],
152
- orderitem: {
153
- type: String,
154
- default: 'f_userinfo_id'
155
- },
156
- tablename: {
157
- type: String,
158
- default: 'V_user_table'
159
- },
160
- items: {
161
- type: String,
162
- default: 'f_user_name,f_user_id,f_meter_brand,f_meter_style'
163
- }
167
+ data: ['data']
164
168
  },
165
169
  ready () {
166
- this.search({condition: '1=1', model: this.model})
170
+ this.search()
167
171
  },
168
172
  methods: {
169
- search (args) {
170
- args.condition = `${args.condition} and f_totalsplit_type is null`
171
- if (!this.$login.f.parent.parent.name.includes('统一资源管理')) {
172
- args.condition = `${args.condition} and f_filialeids = '${this.$login.f.f_orgids}'`
173
+ getorgfen (val) {
174
+ this.f_filialeid = this.$login.convertToIn(val)
175
+ },
176
+ clear () {
177
+ Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
178
+ this.$refs.paged.$refs.cri.model[key] = []
179
+ })
180
+ },
181
+ hiddenfen () {
182
+ this.criteriaShowfen = !this.criteriaShowfen
183
+ },
184
+ search () {
185
+ this.$refs.paged.$refs.cri.search()
186
+ },
187
+ async selfSearchsplit (args) {
188
+ if (this.f_filialeid) {
189
+ args.condition = `f_filialeid in ${this.f_filialeid} and ${args.condition}`
173
190
  }
191
+ console.log('-------------------------')
192
+ console.log(args)
193
+ console.log('-------------------------')
174
194
  this.model.search(args.condition, args.model)
175
195
  },
176
196
  isAll (page) {
@@ -1,16 +1,16 @@
1
1
  <template>
2
2
  <div class="span">
3
- <data-grid :model="model" partial='list' v-ref:grid>
3
+ <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
4
4
  <template partial='head'>
5
5
  <tr>
6
- <th>序号</th>
7
- <th>总表编号</th>
8
- <th>客户名称</th>
9
- <th>表编号</th>
10
- <th>表品牌</th>
11
- <th>表型号</th>
12
- <th>承担比率</th>
13
- <th>操作</th>
6
+ <th><nobr>序号</nobr></th>
7
+ <th><nobr>总表编号</nobr></th>
8
+ <th><nobr>客户名称</nobr></th>
9
+ <th><nobr>表编号</nobr></th>
10
+ <th><nobr>表品牌</nobr></th>
11
+ <th><nobr>表型号</nobr></th>
12
+ <th><nobr>承担比率</nobr></th>
13
+ <th><nobr>操作</nobr></th>
14
14
  </tr>
15
15
  </template>
16
16
  <template partial='body'>
@@ -51,11 +51,9 @@
51
51
  let getUpdateGen = function * (self, id, direct) {
52
52
  let data = {
53
53
  items: 'f_user_id,f_user_name,f_meter_brand,f_meter_style,f_share_ratio',
54
- condition: 'f_meter_id =' + "'" + id + "'",
55
- tablename: 'V_user_table',
56
- orderitem: 'f_user_id'
54
+ condition: 'f_meter_id =' + "'" + id + "'"
57
55
  }
58
- let queryData = yield self.$SqlService.singleTableOrderBy(data)
56
+ let queryData = yield self.$SqlService.getUserAndMeter(data)
59
57
  console.log('总表查询分表数据,,,,', queryData)
60
58
  queryData.data.forEach((item) => {
61
59
  item.total_id = id
@@ -28,6 +28,7 @@
28
28
  },
29
29
  methods: {
30
30
  selected (obj) {
31
+ console.log(obj)
31
32
  console.log('我还没选你就给我默认了???')
32
33
  this.row = obj.val
33
34
  },
@@ -37,7 +38,7 @@
37
38
  },
38
39
  refreshAllUser () {
39
40
  this.$refs.alluser.$refs.paged.$refs.cri.search()
40
- this.$refs.split.search({items: '*', condition: '1=1', tablename: 'V_user_table', orderitem: 'f_userinfo_id'})
41
+ this.$refs.split.search()
41
42
  this.$refs.split.ids = []
42
43
  }
43
44
  }
@@ -145,11 +145,14 @@
145
145
  close-on-select v-ref:type>
146
146
  </v-select>
147
147
  </div>
148
- <div class="col-sm-2 form-group">
148
+ <div class="form-group col-sm-2">
149
149
  <label class="font_normal_body">气价名称</label>
150
- <v-select :value.sync="model.f_price_name"
151
- v-model="model.f_price_name"
152
- :options="$parent.$parent.getPricenames"
150
+ <v-select id="f_price_name"
151
+ v-model="model.price_name"
152
+ placeholder='气价名称'
153
+ style="width: 60%"
154
+ :value.sync="model.price_name"
155
+ :options='$parent.$parent.priceNames'
153
156
  condition="f_price_name = '{}'"
154
157
  close-on-select></v-select>
155
158
  </div>
@@ -721,6 +724,7 @@
721
724
  self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
722
725
  await self.$LoadParams.loadParam()
723
726
  self.initParams()
727
+ self.getPricenames()
724
728
  console.log('开始查询')
725
729
  self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
726
730
  }
@@ -761,6 +765,7 @@
761
765
  modelval: [],
762
766
  gasproperties: [],
763
767
  inputtouPerson: [],
768
+ priceNames: [],
764
769
  meterbrands: [],
765
770
  printshow: false,
766
771
  f_filialeid: this.$login.f.f_orgid,
@@ -865,6 +870,22 @@
865
870
  })
866
871
  },
867
872
  methods: {
873
+ getPricenames () {
874
+ let filialeid = this.$login.f.orgid
875
+ let result = [{label: '全部', value: ''}]
876
+ console.log('this.$GetSaleParam.prices', this.$GetSaleParam)
877
+ console.log('filialeid', filialeid)
878
+ this.$GetSaleParam.prices.forEach((item) => {
879
+ if (item.f_state === '有效' && filialeid == item.f_filialeid) {
880
+ let value = {
881
+ label: item.f_price_name,
882
+ value: item
883
+ }
884
+ result.push(value)
885
+ }
886
+ })
887
+ this.priceNames = Array.from(new Set(result))
888
+ },
868
889
  loadMeterBooks () {
869
890
  this.meterbooks = [...this.meterbooks, ...this.$GetSaleParam.getMeterBooks()]
870
891
  },
@@ -163,17 +163,17 @@
163
163
  condition="f_oughtamount <= {} " placeholder="">
164
164
  </div>
165
165
  </div>
166
- <div class="col-sm-2 form-group">
167
- <label class="font_normal_body">审核状态</label>
168
- <v-select :value.sync="model.f_audit_state_1"
169
- class="select_list select"
170
- v-model="model.f_audit_state_1"
171
- style="width: 60%"
172
- condition="f_audit_state = '{}'"
173
- :options='$parent.$parent.auditState1' placeholder='请选择'
174
- close-on-select v-el:cc>
175
- </v-select>
176
- </div>
166
+ <!-- <div class="col-sm-2 form-group">-->
167
+ <!-- <label class="font_normal_body">审核状态</label>-->
168
+ <!-- <v-select :value.sync="model.f_audit_state_1"-->
169
+ <!-- class="select_list select"-->
170
+ <!-- v-model="model.f_audit_state_1"-->
171
+ <!-- style="width: 60%"-->
172
+ <!-- condition="f_audit_state = '{}'"-->
173
+ <!-- :options='$parent.$parent.auditState1' placeholder='请选择'-->
174
+ <!-- close-on-select v-el:cc>-->
175
+ <!-- </v-select>-->
176
+ <!-- </div>-->
177
177
  <!-- <div class="col-sm-2 form-group">-->
178
178
  <!-- <label class="font_normal_body">调压箱名</label>-->
179
179
  <!-- <v-select :value.sync="model.f_adjustable_name" v-model="model.f_adjustable_name"-->