sale-client 3.5.29 → 3.5.32

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 (24) hide show
  1. package/build/dev-server.js +3 -3
  2. package/package.json +1 -1
  3. package/src/components/FilesManage/MeterinfoTest.vue +13 -13
  4. package/src/components/FilesManage/UserGeneralInfoTest.vue +2 -1
  5. package/src/components/charge/ChargeManage.vue +13 -13
  6. package/src/components/chargeBatch/ChargeManageBatch.vue +1 -1
  7. package/src/components/chargeBatch/ChargeManageGroup.vue +1 -1
  8. package/src/components/chargeNew/ChargeManageNew.vue +1 -1
  9. package/src/components/webMeter/paramSave/ParamSetForm.vue +1 -0
  10. package/src/filiale/dongguan/components/FilesManage/FileUserFiles.vue +26 -15
  11. package/src/filiale/gaomi/components/charge/ChargeManage.vue +5 -5
  12. package/src/filiale/gaomi/plugins/LogicService.js +425 -425
  13. package/src/filiale/gongyi/charge/ChargeManage.vue +1 -1
  14. package/src/filiale/guangxi/sale.js +1 -1
  15. package/src/filiale/jinjiang/ChargeManage.vue +1 -1
  16. package/src/filiale/liaoyuan/ChargeManage.vue +13 -13
  17. package/src/filiale/macheng/ChargeManage.vue +1 -1
  18. package/src/filiale/meihekou/ChargeManage.vue +2 -2
  19. package/src/filiale/qianneng/revenue/ChargeManage.vue +1 -1
  20. package/src/filiale/rongcheng/ChargeManage.vue +2 -2
  21. package/src/filiale/shaoguan/charge/ChargeManage.vue +1 -1
  22. package/src/filiale/tongchuan/ChargeManage.vue +3 -4
  23. package/src/filiale/wuan/charge/ChargeManage.vue +2 -2
  24. package/src/main.js +22 -22
package/build/dev-server.js CHANGED
@@ -10,9 +10,9 @@ var compiler = webpack(config)
10
10
 
11
11
  // Define HTTP proxies to your custom API backend
12
12
  // https://github.com/chimurai/http-proxy-middleware
13
- var bendi = 'http://39.108.82.124:8400/', bendi1 = 'http://121.36.106.17:8400/'
13
+ var bendi = 'http://117.33.181.102:8400/', bendi1 = 'http://121.36.106.17:8400/'
14
14
  // 公司测试服务
15
- var fuwu = 'http://39.108.82.124:8400/'
15
+ var fuwu = 'http://117.33.181.102:8400/'
16
16
  // var fuwu = 'http://121.36.106.17:8400/'
17
17
  // 铜川正式
18
18
  // var fuwu = 'http://61.134.55.234:9999/'
@@ -95,7 +95,7 @@ var proxyTable = {
95
95
  target: fuwu
96
96
  },
97
97
  '/webmeter': {
98
- target: fuwu
98
+ target: 'http://192.168.50.4:8450'
99
99
  },
100
100
  '/rs': {
101
101
  // target: 'http://192.168.30.63:8081/'
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sale-client",
3
- "version": "3.5.29",
3
+ "version": "3.5.32",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
package/src/components/FilesManage/MeterinfoTest.vue CHANGED
@@ -186,6 +186,7 @@
186
186
  <div class="col-sm-4 form-group">
187
187
  <label class="font_normal_body">表具使用年限</label>
188
188
  <input type="number" class="input_search" style="width:60%" v-model="row.f_use_limit"
189
+ :value.sync="row.f_use_limit"
189
190
  placeholder='表具使用年限' >
190
191
  </div>
191
192
  <div class="col-sm-4 form-group">
@@ -202,6 +203,7 @@
202
203
  <datepicker style="width:60%" placeholder="通气日期"
203
204
  v-model="row.f_gas_date"
204
205
  v-ref:f_gas_date
206
+ @change="gasDateChange"
205
207
  :value.sync="row.f_gas_date"
206
208
  :format="'yyyy-MM-dd HH:mm:ss'"
207
209
  ></datepicker>
@@ -568,7 +570,7 @@
568
570
  props: ['f_filialeid', 'meter', 'isdecimal', 'valid', 'f_userinfo_id', 'overdueset', 'curuser'],
569
571
  async ready () {
570
572
  console.log('看看meter里面的数据', this.meter, this.row)
571
- this.row = Object.assign(this.row, this.meter, {})
573
+ this.row = Object.assign(this.row, this.meter, {f_use_limit : this.$appdata.getSingleValue('报废年限')})
572
574
  if(this.row.f_meter_classify){
573
575
  if(this.row.f_meter_classify==='物联网表'){
574
576
  this.isiot=true
@@ -586,6 +588,16 @@
586
588
  co(meterBookGen(this))
587
589
  },
588
590
  methods: {
591
+ gasDateChange () {
592
+ if (!this.row.f_scrap_date && this.row.f_gas_date) {
593
+ if (this.row.f_use_limit) {
594
+ let date = new Date(this.row.f_gas_date)
595
+ let year = date.getFullYear() + (this.row.f_use_limit / 1)
596
+ this.$set('row.f_scrap_date', year + this.row.f_gas_date.slice(4))
597
+
598
+ }
599
+ }
600
+ },
589
601
  // 获取集中器下拉框
590
602
  async getConcentrators () {
591
603
  let condition = {
@@ -794,18 +806,6 @@
794
806
  } else {
795
807
  this.ratioshow = false
796
808
  }
797
- },
798
- 'row.f_gas_date' (val) {
799
- if (!this.row.f_use_limit) {
800
- this.row.f_use_limit = this.$appdata.getSingleValue('使用年限')
801
- }
802
- if (!this.row.f_scrap_date && this.row.f_gas_date) {
803
- if (this.row.f_use_limit !== undefined) {
804
- let date = new Date(this.row.f_gas_date)
805
- let year = date.getFullYear() + (this.row.f_use_limit / 1)
806
- this.row.f_scrap_date = year + this.row.f_gas_date.slice(4)
807
- }
808
- }
809
809
  }
810
810
  },
811
811
  computed: {
package/src/components/FilesManage/UserGeneralInfoTest.vue CHANGED
@@ -582,7 +582,8 @@ export default {
582
582
  devicesinfo: [], // 设备信息
583
583
  f_hand_month: '', // 抄表月份
584
584
  fireinfo: {}, // 用气信息
585
- f_meter_book_num: ''
585
+ f_meter_book_num: '',
586
+ f_use_limit:''
586
587
  }],
587
588
  devicesinfo: []
588
589
  }
package/src/components/charge/ChargeManage.vue CHANGED
@@ -56,14 +56,14 @@ export default {
56
56
  f_orgid: '',
57
57
  row: null,
58
58
  cardInfo: null,
59
- warningInfo:null,
59
+ warningInfo: null,
60
60
  modalrow: null,
61
61
  showModal: false,
62
62
  rowData: {},
63
63
  dibao_remind: this.$appdata.getSingleValue('低保快到期提醒') ? this.$appdata.getSingleValue('低保快到期提醒') : 0,
64
64
  show: [true],
65
- selectFiled:'其他信息',
66
- worktype:'其他信息'
65
+ selectFiled: '其他信息',
66
+ worktype: '其他信息'
67
67
  }
68
68
  },
69
69
  ready () {
@@ -73,8 +73,8 @@ export default {
73
73
  setsustainMoney () {
74
74
  this.sustainMoney = window.localStorage.getItem('sustainMoney')
75
75
  },
76
- setField(type){
77
- this.selectFiled=type
76
+ setField (type) {
77
+ this.selectFiled = type
78
78
  this.worktype = type
79
79
  },
80
80
  async toBusiness (obj) {
@@ -83,7 +83,7 @@ export default {
83
83
  // 对此数据进行验证
84
84
  if (await this.validateRow(obj)) {
85
85
  // 获取未写卡或者写卡失败记录
86
- let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card = '未写卡' and f_userfiles_id = '${obj.f_userfiles_id}'`)
86
+ let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card in ('未写卡','写卡失败') and f_userfiles_id = '${obj.f_userfiles_id}'`)
87
87
  console.log('获取未写卡记录', getUnWriteSell)
88
88
  if (getUnWriteSell.data.length > 1) {
89
89
  this.$showAlert('此卡已缴费多次未写卡。请核实后处理！！', 'warning', 5000)
@@ -109,13 +109,13 @@ export default {
109
109
  console.log('查看传进来的参数:', obj)
110
110
  this.warningInfo = await this.$resetpost('rs/logic/getWarningMsg',
111
111
  {data: {
112
- f_userfiles_id: obj.f_userfiles_id,
113
- f_userinfo_code: obj.f_userinfo_code,
114
- f_userinfo_id: obj.f_userinfo_id
115
- }
112
+ f_userfiles_id: obj.f_userfiles_id,
113
+ f_userinfo_code: obj.f_userinfo_code,
114
+ f_userinfo_id: obj.f_userinfo_id
115
+ }
116
116
  }
117
117
  , {resolveMsg: '', rejectMsg: '获取提示失败'})
118
- if (this.warningInfo.data.warningNum>0 && obj.f_user_state !== '预备') {
118
+ if (this.warningInfo.data.warningNum > 0 && obj.f_user_state !== '预备') {
119
119
  this.modalrow = obj
120
120
  this.showModal = true
121
121
  return false
@@ -190,8 +190,8 @@ export default {
190
190
  this.$refs.list.searchNoData()
191
191
  this.$refs.card.search()
192
192
  },
193
- 'resflushvalue'(){
194
- this.$refs.info.$refs.valueaddinfo.reflush();
193
+ 'resflushvalue' () {
194
+ this.$refs.info.$refs.valueaddinfo.reflush()
195
195
  },
196
196
  'refreshrow' (val) {
197
197
  console.log(val)
package/src/components/chargeBatch/ChargeManageBatch.vue CHANGED
@@ -56,7 +56,7 @@ export default {
56
56
  // 对此数据进行验证
57
57
  if (await this.validateRow(obj)) {
58
58
  // 获取未写卡或者写卡失败记录
59
- let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card = '未写卡' and f_userfiles_id = '${obj.f_userfiles_id}'`)
59
+ let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card in ('未写卡','写卡失败') and f_userfiles_id = '${obj.f_userfiles_id}'`)
60
60
  console.log('获取未写卡记录', getUnWriteSell)
61
61
  if (getUnWriteSell.data.length > 1) {
62
62
  this.$showAlert('此卡已缴费多次未写卡。请核实后处理！！', 'warning', 5000)
package/src/components/chargeBatch/ChargeManageGroup.vue CHANGED
@@ -56,7 +56,7 @@ export default {
56
56
  // 对此数据进行验证
57
57
  if (await this.validateRow(obj)) {
58
58
  // 获取未写卡或者写卡失败记录
59
- let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card = '未写卡' and f_userfiles_id = '${obj.f_userfiles_id}'`)
59
+ let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card in ('未写卡','写卡失败') and f_userfiles_id = '${obj.f_userfiles_id}'`)
60
60
  console.log('获取未写卡记录', getUnWriteSell)
61
61
  if (getUnWriteSell.data.length > 1) {
62
62
  this.$showAlert('此卡已缴费多次未写卡。请核实后处理！！', 'warning', 5000)
package/src/components/chargeNew/ChargeManageNew.vue CHANGED
@@ -70,7 +70,7 @@ export default {
70
70
  // 对此数据进行验证
71
71
  if (await this.validateRow(obj)) {
72
72
  // 获取未写卡或者写卡失败记录
73
- let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card = '未写卡' and f_userfiles_id = '${obj.f_userfiles_id}'`)
73
+ let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card in ('未写卡','写卡失败') and f_userfiles_id = '${obj.f_userfiles_id}'`)
74
74
  console.log('获取未写卡记录', getUnWriteSell)
75
75
  if (getUnWriteSell.data.length > 1) {
76
76
  this.$showAlert('此卡已缴费多次未写卡。请核实后处理！！', 'warning', 5000)
package/src/components/webMeter/paramSave/ParamSetForm.vue CHANGED
@@ -237,6 +237,7 @@ export default {
237
237
  let data = {}
238
238
  data.param_group = this.newmeterinfo[i].name
239
239
  data.param_name = this.newmeterinfo[i].params[j].name
240
+ data.tag = this.newmeterinfo[i].params[j].tag
240
241
  data.param_value = this.row[key] ? (this.row[key].code ? this.row[key].code : this.row[key]) : null
241
242
  data.param_content = this.row[key] ? (this.row[key].content ? this.row[key].content : this.row[key]) : null
242
243
  data.param_lname = this.newmeterinfo[i].params[j].title
package/src/filiale/dongguan/components/FilesManage/FileUserFiles.vue CHANGED
@@ -7,7 +7,14 @@
7
7
  <criteria @condition-changed="$parent.selfSearch" partial='criteria' v-ref:criteria>
8
8
  <div class="form-horizontal select-overspread container-fluid auto" novalidate partial>
9
9
  <div class="row">
10
-
10
+ <div
11
+ :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
12
+ class="form-group">
13
+ <label class="font_normal_body">客户电话</label>
14
+ <input class="input_search" condition="f_user_phone = '{}'" placeholder='客户电话' style="width:60%"
15
+ type="text"
16
+ v-model="model.f_user_phone">
17
+ </div>
11
18
  <div
12
19
  :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
13
20
  class="form-group"
@@ -17,8 +24,6 @@
17
24
  placeholder='客户编号'
18
25
  style="width:60%" type="text" v-model="model.f_userinfo_code">
19
26
  </div>
20
- <res-select-group v-if="$parent.$parent.clientWidth<1600&&!$parent.$parent.createFile" :style="$parent.$parent.createFile?'col-sm-4':'col-sm-2'" :initres="$parent.$parent.initres" :show-component="['company','department','operator']" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
21
-
22
27
  <div
23
28
  :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
24
29
  class="form-group"
@@ -28,7 +33,6 @@
28
33
  placeholder='客户编号'
29
34
  style="width:60%" type="text" v-model="model.f_userinfo_code">
30
35
  </div>
31
-
32
36
  <div
33
37
  :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
34
38
  class="form-group" v-if="!$parent.$parent.createFile">
@@ -86,7 +90,6 @@
86
90
  </div>
87
91
  </div>
88
92
  <div class="row" v-if="$parent.$parent.criteriaShow">
89
-
90
93
  <div
91
94
  :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
92
95
  class="form-group"
@@ -96,8 +99,19 @@
96
99
  placeholder='客户编号'
97
100
  style="width:60%" type="text" v-model="model.f_userinfo_code">
98
101
  </div>
99
- <res-select-group v-if="$parent.$parent.clientWidth<1600&&$parent.$parent.createFile" :style="$parent.$parent.createFile?'col-sm-4':'col-sm-2'" :initres="$parent.$parent.initres" :show-component="['company','department','operator']" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
100
- <res-select-group v-if="$parent.$parent.clientWidth>=1600" :style="$parent.$parent.createFile?'col-sm-4':'col-sm-2'" :initres="$parent.$parent.initres" :show-component="['company','department','operator']" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
102
+ <!-- 身份证号-->
103
+ <div
104
+ :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
105
+ class="form-group">
106
+ <label class="font_normal_body">身份证号</label>
107
+ <input class="input_search" condition="f_idnumber = '{}'" placeholder='身份证号'
108
+ style="width:60%"
109
+ type="text"
110
+ v-model="model.f_idnumber">
111
+ </div>
112
+ <!-- <res-select-group v-if="$parent.$parent.clientWidth<1600&&!$parent.$parent.createFile" :style="$parent.$parent.createFile?'col-sm-4':'col-sm-2'" :initres="$parent.$parent.initres" :show-component="['company','department','operator']" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>-->
113
+ <!-- <res-select-group v-if="$parent.$parent.clientWidth<1600&&$parent.$parent.createFile" :style="$parent.$parent.createFile?'col-sm-4':'col-sm-2'" :initres="$parent.$parent.initres" :show-component="['company','department','operator']" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>-->
114
+ <res-select-group :style="$parent.$parent.createFile?'col-sm-4':'col-sm-2'" :initres="$parent.$parent.initres" :show-component="['company','department','operator']" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
101
115
 
102
116
  <div
103
117
  :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
@@ -156,14 +170,6 @@
156
170
  <!-- close-on-select condition="f_meter_brand='{}'"-->
157
171
  <!-- placeholder='气表品牌' v-model="model.f_meter_brand"></v-select>-->
158
172
  <!-- </div>-->
159
- <div
160
- :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
161
- class="form-group">
162
- <label class="font_normal_body">客户电话</label>
163
- <input class="input_search" condition="f_user_phone = '{}'" placeholder='客户电话' style="width:60%"
164
- type="text"
165
- v-model="model.f_user_phone">
166
- </div>
167
173
  <div
168
174
  :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
169
175
  class="form-group">
@@ -298,6 +304,9 @@
298
304
  <th>
299
305
  <nobr>客户名称</nobr>
300
306
  </th>
307
+ <th>
308
+ <nobr>身份证号</nobr>
309
+ </th>
301
310
  <th>
302
311
  <nobr>表号</nobr>
303
312
  </th>
@@ -349,6 +358,8 @@
349
358
  <td style="text-align: center;">
350
359
  <span @click="$parent.$parent.$parent.dealmsg(row)"><a><b>{{row.f_user_name}}</b></a></span>
351
360
  </td>
361
+ <!-- 身份证号-->
362
+ <td style="text-align: center;">{{row.f_idnumber}}</td>
352
363
  <td style="text-align: center;">{{row.f_meternumber}}</td>
353
364
  <td style="text-align: center;">{{row.f_card_id}}</td>
354
365
  <td style="text-align: center;">{{row.f_user_phone}}</td>
package/src/filiale/gaomi/components/charge/ChargeManage.vue CHANGED
@@ -53,7 +53,7 @@ export default {
53
53
  listpage: true,
54
54
  f_orgid: '',
55
55
  row: null,
56
- state:'已领',
56
+ state: '已领',
57
57
  cardInfo: null,
58
58
  modaldata: null,
59
59
  modaldata2: null,
@@ -77,7 +77,7 @@ export default {
77
77
  this.$showMessage(msg, ['confirm', 'cancel']).then((res) => {
78
78
  if (res === 'confirm') {
79
79
  // 获取未写卡或者写卡失败记录
80
- this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card = '未写卡' and f_userfiles_id = '${obj.f_userfiles_id}'`).then((getUnWriteSell) => {
80
+ this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card in ('未写卡','写卡失败') and f_userfiles_id = '${obj.f_userfiles_id}'`).then((getUnWriteSell) => {
81
81
  console.log('获取未写卡记录', getUnWriteSell)
82
82
  if (getUnWriteSell.data.length > 1) {
83
83
  this.$showAlert('此卡已缴费多次未写卡。请核实后处理！！', 'warning', 5000)
@@ -94,7 +94,7 @@ export default {
94
94
  })
95
95
  } else {
96
96
  // 获取未写卡或者写卡失败记录
97
- let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card = '未写卡' and f_userfiles_id = '${obj.f_userfiles_id}'`)
97
+ let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card in ('未写卡','写卡失败') and f_userfiles_id = '${obj.f_userfiles_id}'`)
98
98
  console.log('获取未写卡记录', getUnWriteSell)
99
99
  if (getUnWriteSell.data.length > 1) {
100
100
  this.$showAlert('此卡已缴费多次未写卡。请核实后处理！！', 'warning', 5000)
@@ -120,9 +120,9 @@ export default {
120
120
  this.$refs.list.search()
121
121
  // this.$refs.card.search()
122
122
  },
123
- setstate(state){
123
+ setstate (state) {
124
124
  console.log('-----------state----')
125
- this.state=state?'已领':'未领'
125
+ this.state = state ? '已领' : '未领'
126
126
  },
127
127
  async validateRow (obj) {
128
128
  console.log('查看传进来的参数:', obj)