sale-client 3.5.4 → 3.5.7

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 (9) hide show
  1. package/build/dev-server.js +8 -2
  2. package/package.json +1 -1
  3. package/src/components/charge/business/OtherChargeNew.vue +2 -1
  4. package/src/components/revenue/base/rightview/CardList.vue +7 -7
  5. package/src/components/revenue/comprehen/SpecialUser/BasicLiving/BasicLivingList.vue +21 -0
  6. package/src/components/webMeter/webInfo/WebMeterList.vue +26 -13
  7. package/src/filiale/tongchuan/HandManager.vue +1854 -1842
  8. package/src/main.js +6 -2
  9. package/src/sale.js +1094 -1099
package/build/dev-server.js CHANGED
@@ -11,9 +11,15 @@ var compiler = webpack(config)
11
11
  // Define HTTP proxies to your custom API backend
12
12
  // https://github.com/chimurai/http-proxy-middleware
13
13
  var bendi = 'http://127.0.0.1:8080',bendi1 = 'http://121.36.106.17:8400/'
14
+ // var bendi = 'http://192.168.50.4:8300/',bendi1 = 'http://121.36.106.17:8400/'
15
+ // var bendi = 'http://192.168.50.4:8400/',bendi1 = 'http://121.36.106.17:8400/'
16
+ // var bendi = 'http://139.214.92.34:8301/',bendi1 = 'http://121.36.106.17:8400/'
14
17
  // 公司测试服务
15
- var fuwu = 'http://192.168.50.4:8400'
18
+ // var fuwu = 'http://192.168.89.62:8400'
16
19
  // var fuwu = 'http://121.36.106.17:8400/'
20
+ var fuwu = 'http://192.168.50.4:8400/'
21
+ // var fuwu = 'http://192.168.50.4:8300/'
22
+ // var fuwu = 'http://139.214.92.34:8301/'
17
23
  //铜川正式
18
24
  // var fuwu = 'http://61.134.55.234:9999/'
19
25
  //铜川测试
@@ -100,7 +106,7 @@ var proxyTable = {
100
106
  '/rs': {
101
107
  // target: 'http://192.168.30.63:8081/'
102
108
  // target: 'http://121.36.106.17:8400/'
103
- target: fuwu
109
+ target: bendi
104
110
  }
105
111
  }
106
112
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sale-client",
3
- "version": "3.5.4",
3
+ "version": "3.5.7",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
package/src/components/charge/business/OtherChargeNew.vue CHANGED
@@ -163,7 +163,7 @@
163
163
  <button class="button_search btn-gn" v-if="authArr.includes('其它欠费生成')" @click="createQianfei()"
164
164
  :disabled=' validflag || validateOk'>生成欠费
165
165
  </button>
166
- <button class="button_search btn-gn" @click="checkInvoiceMsg()" :disabled=' validflag || validateOk'>确认
166
+ <button class="button_search btn-gn" @click="checkInvoiceMsg()" :disabled='config.checkFlag?false:(validflag || validateOk)'>确认
167
167
  </button>
168
168
  <button class="button_clear btn-gn" @click="clean()">取消</button>
169
169
  </div>
@@ -281,6 +281,7 @@ export default {
281
281
  data () {
282
282
  return {
283
283
  config: {
284
+ checkFlag: false,
284
285
  modificationList: false,
285
286
  dispatch: false,
286
287
  hasPrint: true, // 默认打票
package/src/components/revenue/base/rightview/CardList.vue CHANGED
@@ -50,10 +50,10 @@
50
50
  style="cursor: pointer;">
51
51
  <div class="col-sm-11">
52
52
  <!-- <div class="row" v-if="row.f_state==='冲正' " style="color: red">-->
53
- <!-- <strong :title="row.f_userinfo_code" class="col-sm-4" show-overflow-tooltip="true">{{row.f_userinfo_code.length>9?''+row.f_userinfo_code.substring(0,9)+'...':row.f_userinfo_code}}</strong>-->
54
- <!-- <span class="col-sm-4">{{$parent.$parent.$parent.dateDes(row.f_operate_date)}}</span>-->
55
- <!-- <span class="col-sm-4">{{row.type}}</span>-->
56
- <!-- </div>-->
53
+ <!-- <strong :title="row.f_userinfo_code" class="col-sm-4" show-overflow-tooltip="true">{{row.f_userinfo_code.length>9?''+row.f_userinfo_code.substring(0,9)+'...':row.f_userinfo_code}}</strong>-->
54
+ <!-- <span class="col-sm-4">{{$parent.$parent.$parent.dateDes(row.f_operate_date)}}</span>-->
55
+ <!-- <span class="col-sm-4">{{row.type}}</span>-->
56
+ <!-- </div>-->
57
57
  <div class="row">
58
58
  <strong :title="row.f_userinfo_code" class="col-sm-4" show-overflow-tooltip="true">{{row.f_userinfo_code.length>9?''+row.f_userinfo_code.substring(0,9)+'...':row.f_userinfo_code}}</strong>
59
59
  <span class="col-sm-4">{{$parent.$parent.$parent.dateDes(row.f_operate_date)}}</span>
@@ -63,18 +63,18 @@
63
63
  <div class="col-sm-1" v-if="$parent.$parent.$parent.isOperate" title="涉及权限:冲正权限">
64
64
  <dropdown class="auto"
65
65
  v-if="(row.type ==='机表收费撤销' || row.type ==='卡表收费撤销' || row.type ==='物联网收费撤销' || row.type ==='其他收费撤销' || row.type ==='气损收费撤销' ||
66
- row.type ==='预存缴费' || row.type === '补卡' || row.type === '物联网收费' || row.type === '用户退费' || row.type === '机表收费' || row.type === '数码表收费' ||
66
+ row.type ==='预存缴费' || row.type === '补卡' || row.type === '物联网收费' || row.type === '用户退费' || row.type === '机表收费' ||
67
67
  row.type === '卡表收费' || row.type === '超用收费' || row.type === '发卡售气' || row.type === '其他收费' ||
68
68
  row.type === '换表' || row.state === 1 || row.type==='调价补费' || row.type==='卡表赠气' ||
69
69
  row.type==='物联网赠气'|| row.type==='物联网赠费'|| row.type==='卡表赠费'|| row.type==='卡表赠气'||
70
70
  row.type==='卡表收费撤销'||row.type==='物联网补费' || row.type==='物联网扣费'||row.type==='机表补费'||
71
71
  row.type==='机表扣费'||row.type==='物联网补气'||row.type==='物联网扣气'||row.type==='气损收费' ||
72
72
  row.type === '气表清零' || row.type === '掉气补气' || row.type === '其他补气' || row.type === '清零补气' || row.type === '换表补气'
73
- ) && row.type!=='新增户档案' && row.type!=='转气转出' && row.type!=='转气转入'">
73
+ ) && row.type!=='新增户档案' && row.type!=='转气转出' && row.type!=='转气转入'||row.type === '过户'">
74
74
  <button data-toggle="dropdown" style="border: 0px;background: none;" type="button" v-if="row.f_user_state==='正常'||row.f_user_state==='预备'||row.type==='气损收费' ">
75
75
  <span class="glyphicon glyphicon-th-list"></span>
76
76
  </button>
77
- <ul class="dropdown-menu dropdown-menu-right" slot="dropdown-menu" style=" min-width: 60px;" v-if="row.f_user_state==='正常'||row.f_user_state==='预备'||row.type==='气损收费' ">
77
+ <ul class="dropdown-menu dropdown-menu-right" slot="dropdown-menu" style=" min-width: 60px;" v-if="row.f_user_state==='正常'||row.f_user_state==='预备'||row.type==='气损收费' ||row.type === '过户'">
78
78
  <!-- <li-->
79
79
  <!-- v-if="row.type === '换新表' || row.type === '气表清零' || row.type === '掉气补气' || row.type === '其他补气' || row.type === '清零补气' || row.type === '换表补气'-->
80
80
  <!-- || row.type === '补卡' || row.type === '物联网开户' || row.type === '物联网收费' || row.type === '用户退费' || row.type === '机表收费' || row.type === '数码表收费' || row.type === '卡表收费' || row.type === '超用收费' || row.type === '发卡售气' || row.type === '其他收费' || row.type === '换表' || row.type === '过户'|| row.type==='预存缴费'|| row.type==='退费'|| row.type==='调价补费' ||row.type==='卡表收费撤销'||row.type==='物联网补费' || row.type==='物联网扣费'||row.type==='机表补费'||row.type==='机表扣费'||row.type==='物联网补气'||row.type==='物联网扣气'||row.type==='气损收费' ">-->
package/src/components/revenue/comprehen/SpecialUser/BasicLiving/BasicLivingList.vue CHANGED
@@ -41,6 +41,7 @@
41
41
  <!-- v-model="model.f_user_phone">-->
42
42
  <!-- </div>-->
43
43
  <div class="form-group button-range" style="padding-right: 10px">
44
+ <import-excel template-name="低保户导入模板" logic-name="BasicLivingImport" import-json="basicLiving.json"></import-excel>
44
45
  <button @click="$parent.$parent.search()" class="button_search button_spacing" v-el:cx>查询</button>
45
46
  <button @click="$parent.$parent.add()" class="button_export button_spacing" style="width: max-content;"
46
47
  v-el:cx>新增低保户
@@ -129,6 +130,9 @@
129
130
  <th style="text-align: center;" v-show='!$parent.$parent.$parent.$parent.isdetail' >
130
131
  <nobr>结束时间</nobr>
131
132
  </th>
133
+ <th style="text-align: center;" v-show='!$parent.$parent.$parent.$parent.isdetail' >
134
+ <nobr>附件查看</nobr>
135
+ </th>
132
136
  </tr>
133
137
  </template>
134
138
  <template partial='body'>
@@ -140,10 +144,20 @@
140
144
  <td v-show='!$parent.$parent.$parent.$parent.isdetail' style="text-align: center;"><nobr>{{row.f_price_name}}</nobr></td>
141
145
  <td v-show='!$parent.$parent.$parent.$parent.isdetail' style="text-align: center;"><nobr>{{row.f_start_date}}</nobr></td>
142
146
  <td v-show='!$parent.$parent.$parent.$parent.isdetail' style="text-align: center;"><nobr>{{row.f_end_date}}</nobr></td>
147
+ <td v-show='!$parent.$parent.$parent.$parent.isdetail' style="text-align: center;"> <nobr>
148
+ <button class="button_search button_spacing width-60" @click.stop="$parent.$parent.$parent.view(row)">查看</button>
149
+ </nobr></td>
143
150
  </template>
144
151
  <template partial='foot'></template>
145
152
  </data-grid>
146
153
  </criteria-paged>
154
+ <modal :show.sync="showupload" v-if="showupload" width="80%" style="width:auto;" v-ref:modal middle backdrop="false">
155
+ <article slot="modal-body">
156
+ <upload :blodid="selected.f_userinfo_id" isremark="true" :isremark="false" fusetype="低保户" v-ref:upload ></upload>
157
+ </article>
158
+ <footer slot="modal-footer" class="modal-footer">
159
+ </footer>
160
+ </modal>
147
161
  </div>
148
162
  </template>
149
163
 
@@ -171,6 +185,8 @@
171
185
  f_orgid: '',
172
186
  criteriaShow: false,
173
187
  clientWidth: document.body.clientWidth,
188
+ showupload:false,
189
+ selected: {},
174
190
  getfield: {
175
191
  'f_userinfo_code': '用户编号',
176
192
  'f_user_name': '姓名',
@@ -201,6 +217,11 @@
201
217
  this.search()
202
218
  },
203
219
  methods: {
220
+ view (row) {
221
+ this.showupload = true
222
+ this.selected = row
223
+ console.log('11', row)
224
+ },
204
225
  async getRes (condition, obj) {
205
226
  console.log('低保户condition =', condition)
206
227
  console.log('低保户obj =', obj)
package/src/components/webMeter/webInfo/WebMeterList.vue CHANGED
@@ -36,14 +36,15 @@
36
36
  <input type="text" class="input_search" style="width:60%" v-model="model.f_imei"
37
37
  condition="f_imei='{}'" placeholder="IMEI码">
38
38
  </div>
39
- <div :class="$parent.$parent.styles">
40
- <label class="font_normal_body">组织机构</label>
41
- <res-select restype='organization'
42
- :is-mul="false"
43
- :initresid="$parent.$parent.curorgid"
44
- @res-select="$parent.$parent.getorgCur">
45
- </res-select>
46
- </div>
39
+ <res-select-group :show-component="['company']" :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
40
+ <!--<div :class="$parent.$parent.styles">-->
41
+ <!--<label class="font_normal_body">组织机构</label>-->
42
+ <!--<res-select restype='organization'-->
43
+ <!--:is-mul="false"-->
44
+ <!--:initresid="$parent.$parent.curorgid"-->
45
+ <!--@res-select="$parent.$parent.getorgCur">-->
46
+ <!--</res-select>-->
47
+ <!--</div>-->
47
48
  <div :class="$parent.$parent.styles" >
48
49
  <label class="font_normal_body">气表品牌</label>
49
50
  <v-select
@@ -224,7 +225,14 @@
224
225
  meterbrand: [],
225
226
  azstate: [{label: '全部', value: ''}, {label: '已安装', value: '已安装'}, {label: '未安装', value: '未安装'}],
226
227
  isreceived:[{label: '全部', value: ''}, {label: '已领用', value: '是'}, {label: '未领用', value: '否'}],
227
- curorgid: [this.$login.f.orgid],
228
+ // curorgid: [this.$login.f.orgid],
229
+ orgCondtionStr: '',
230
+ // 公司下拉
231
+ initres: {
232
+ org: [],
233
+ dep: [],
234
+ user: []
235
+ },
228
236
  model: new PagedList('rs/sql/webMeterInfo', 20, {items: '"*"', tablename: '"t_meterinfo"', orderitem: '"id"'}),
229
237
  headers: {'username': Vue.$login.f.name, 'blodid': WebmeterUtil.guid()},
230
238
  criteriaShow: false,
@@ -245,6 +253,9 @@
245
253
  },
246
254
 
247
255
  methods: {
256
+ async getRes (condition, obj) {
257
+ this.orgCondtionStr = condition
258
+ },
248
259
  loadGetField () {
249
260
  this.getfield = {
250
261
  'f_meternumber': '表号',
@@ -337,11 +348,13 @@
337
348
  selfSearch (args) {
338
349
  this.$parent.meterinfos = []
339
350
  if (!this.f_orgid) {
340
- this.getorgCur([this.$login.f.orgid])
341
- }
342
- if (this.f_orgid) {
343
- args.condition = `${args.condition} and f_filialeid in ${this.f_orgid}`
351
+ this.f_orgid = this.$login.f.orgid
344
352
  }
353
+ let f_orgstr = this.orgCondtionStr ? this.orgCondtionStr : "and f_filialeid in ('" + this.f_orgid + "')"
354
+ args.condition = `${args.condition} ` + f_orgstr
355
+ // if (this.f_orgid) {
356
+ // args.condition = `${args.condition} and f_filialeid in ${this.f_orgid}`
357
+ // }
345
358
  this.getCondition = {condition: args.condition}
346
359
  this.model.search(args.condition, args.model)
347
360
  },