sale-client 3.5.57 → 3.5.59

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 (12) hide show
  1. package/build/dev-server.js +2 -2
  2. package/package.json +1 -1
  3. package/src/components/revenue/HandManager/VolumeAdjustment/VolumeAdjustmentManage.vue +9 -1
  4. package/src/components/revenue/cancelHandplan/IotHandplanCanel.vue +83 -0
  5. package/src/filiale/kelai/CardMeterCenter.vue +9 -9
  6. package/src/filiale/kelai/MeterinfoTest.vue +8 -8
  7. package/src/filiale/kelai/UserEssentialInfoTest.vue +6 -6
  8. package/src/filiale/liaoyuan/FileManage/UserEssentialInfoTest.vue +10 -0
  9. package/src/filiale/rongchuang/HighMeterIdCard.vue +1065 -0
  10. package/src/filiale/rongchuang/sale.js +1 -0
  11. package/src/main.js +22 -22
  12. package/src/sale.js +2 -0
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://117.33.181.102:8400', bendi1 = 'http://121.36.106.17:8400/'
13
+ var bendi = 'http://192.168.50.4:8400', bendi1 = 'http://121.36.106.17:8400/'
14
14
  // 公司测试服务
15
- var fuwu = 'http://117.33.181.102:8400'
15
+ var fuwu = 'http://192.168.50.4:8400'
16
16
  // var fuwu = 'http://121.36.106.17:8400/'
17
17
  // 铜川正式
18
18
  // var fuwu = 'http://61.134.55.234:9999/'
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sale-client",
3
- "version": "3.5.57",
3
+ "version": "3.5.59",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
package/src/components/revenue/HandManager/VolumeAdjustment/VolumeAdjustmentManage.vue CHANGED
@@ -290,7 +290,15 @@ let readySomething = async function (self) {
290
290
  row.f_depname = this.$login.f.deps
291
291
  this.$resetpost('rs/logic/priceAdjustmentOffset', {data: row}).then(() => {
292
292
  this.selfSearch(this.model)
293
- })
293
+ }).catch(
294
+ (error) => {
295
+ if (error.status === 655) {
296
+ this.$showAlert('该记录无效','warning', 2000)
297
+ }else if (error.status === 656){
298
+ this.$showAlert('请先撤销补差收费记录再进行冲正操作','warning', 2000)
299
+ }
300
+ }
301
+ )
294
302
  }
295
303
  })
296
304
  },
package/src/components/revenue/cancelHandplan/IotHandplanCanel.vue ADDED
@@ -0,0 +1,83 @@
1
+ <template>
2
+ <form novalidate class="form-horizontal">
3
+ <div class="row">
4
+ <div class="col-sm-4 form-group">
5
+ <label class="font_normal_body">客户名称</label>
6
+ <input class="input_search" style="width:60%" v-model=model.f_user_name readonly>
7
+ </div>
8
+ <div class="col-sm-4 form-group">
9
+ <label class="font_normal_body">表&emsp;&emsp;号</label>
10
+ <input class="input_search" style="width:60%" v-model=model.f_meternumber readonly>
11
+ </div>
12
+ <div class="col-sm-4 form-group">
13
+ <label class="font_normal_body">应交气量</label>
14
+ <input class="input_search" style="width:60%" v-model=model.f_oughtamount readonly>
15
+ </div>
16
+ <div class="col-sm-4 form-group">
17
+ <label class="font_normal_body">应交金额</label>
18
+ <input class="input_search" style="width:60%" v-model=model.f_oughtfee readonly>
19
+ </div>
20
+ <div class="col-sm-4 form-group">
21
+ <label class="font_normal_body">上期底数</label>
22
+ <input class="input_search" style="width:60%" v-model=model.f_last_tablebase readonly>
23
+ </div>
24
+ <div class="col-sm-4 form-group">
25
+ <label class="font_normal_body">本期底数</label>
26
+ <input class="input_search" style="width:60%" v-model=model.f_tablebase readonly>
27
+ </div>
28
+ <div class="col-sm-4 form-group">
29
+ <label class="font_normal_body">剩余金额</label>
30
+ <input class="input_search" style="width:60%" v-model=model.f_balance_amount readonly>
31
+ </div>
32
+ </div>
33
+ <div style="text-align:right;height:auto;">
34
+ <button class="button_search btn-gn" type="button" @click="cancel()">冲正</button>
35
+ </div>
36
+ </form>
37
+ </template>
38
+ <script>
39
+ let readyGen = async function (self) {
40
+ let param = {
41
+ f_userinfo_id: self.row.f_userinfo_id,
42
+ f_orgid: self.row.f_orgid
43
+ }
44
+ let res = await self.$resetpost(
45
+ 'rs/sql/getNewHandplan',
46
+ {data: param},
47
+ {rejectMsg: null, resolveMsg: null})
48
+ self.model = res.data[0]
49
+ }
50
+ export default {
51
+ title: '物联网抄表冲正',
52
+ props: ['row'],
53
+ data () {
54
+ return {
55
+ model: {},
56
+ }
57
+ },
58
+ ready () {
59
+ readyGen(this)
60
+ },
61
+ methods: {
62
+ cancel (){
63
+ this.$showMessage('确定要对此条抄表记录进行冲正操作吗？',['confirm', 'cancel']).then(res =>{
64
+ if(res === 'confirm') {
65
+ let param = {
66
+ operInfo: {
67
+ f_operator: this.$login.f.name,
68
+ f_operatorid: this.$login.f.id,
69
+ f_orgid: this.$login.f.orgid,
70
+ f_orgname: this.$login.f.orgs,
71
+ f_depid: this.$login.f.depids,
72
+ f_depname: this.$login.f.deps
73
+ },
74
+ f_hand_id: this.model.id
75
+ }
76
+ this.$resetpost('rs/logic/iotHandplanCancel',{data: param}, {resolveMsg: '对该抄表记录冲正成功！', rejectMsg: null})
77
+ readyGen(this)
78
+ }
79
+ })
80
+ }
81
+ }
82
+ }
83
+ </script>
package/src/filiale/kelai/CardMeterCenter.vue CHANGED
@@ -4,7 +4,7 @@
4
4
  <validator name='v'>
5
5
  <form novalidate class="form-horizontal">
6
6
  <div class="row">
7
- <div class="col-sm-4" :class="[$v.payment.required ? 'has-error' : '']">
7
+ <div class="col-sm-4" :class="[$v.payment.required ? 'has-error col' : '']">
8
8
  <label class=" font_normal_body" title="参数名称：付款方式">收款方式</label>
9
9
  <input type="text" v-show="false" v-model="$refs.payment.selectedItems"
10
10
  v-validate:payment='{required: true }'>
@@ -15,7 +15,7 @@
15
15
  </div>
16
16
 
17
17
  <div class="col-sm-4" v-if="row.f_collection_type == '按气量'"
18
- :class="[$v.f_pregas.required || $v.f_pregas.dctest? 'has-error' : 'has-success']">
18
+ :class="[$v.f_pregas.required || $v.f_pregas.dctest? 'has-error col' : 'has-success']">
19
19
  <label for="f_pregas" class=" font_normal_body">*预购气量</label>
20
20
  <input class="input_search" style="width:60%" type="number"
21
21
  @blur="pregas()" v-model="model.f_pregas" v-el:fpregas
@@ -29,7 +29,7 @@
29
29
  v-next-el='fcollection'>
30
30
  </div>
31
31
  <div class="col-sm-4"
32
- :class="[$v.f_pregas.required || $v.f_pregas.dctest? 'has-error' : 'has-success']">
32
+ :class="[$v.f_pregas.required || $v.f_pregas.dctest? 'has-error col' : 'has-success']">
33
33
  <label for="f_pregas" class=" font_normal_body">*预购金额</label>
34
34
  <input class="input_search" style="width:60%" type="number"
35
35
  @blur="preamount()" v-model="model.f_preamount"
@@ -44,7 +44,7 @@
44
44
 
45
45
  </div>
46
46
  <div class="row" style="margin-top:6px;">
47
- <div class="col-sm-4" :class="[$v.printstyle.required ? 'has-error' : '']">
47
+ <div class="col-sm-4" :class="[$v.printstyle.required ? 'has-error col' : '']">
48
48
  <label for="f_print" class="font_normal_body">打印格式</label>
49
49
  <input type="text" v-show="false" v-model="$refs.printstyle.selectedItems"
50
50
  v-validate:printstyle='{required: true }'>
@@ -71,7 +71,7 @@
71
71
  </div>
72
72
 
73
73
  <div class="col-sm-4"
74
- :class="[$v.f_totalcost.required || $v.f_totalcost.dctest ? 'has-error' : 'has-success']">
74
+ :class="[$v.f_totalcost.required || $v.f_totalcost.dctest ? 'has-error col' : 'has-success']">
75
75
  <label for="f_temp_amount"
76
76
  class=" font_normal_body">&nbsp;应收金额</label>
77
77
  <input class="input_search" style="width:60%" type="number"
@@ -95,14 +95,14 @@
95
95
  </div>
96
96
 
97
97
  <div class="col-sm-3" v-if="row.f_collection_type === '按气量' && model.f_payment!='赠气'"
98
- :class="[$v.f_collection.required || $v.f_collection.dctest ? 'has-error' : 'has-success']">
98
+ :class="[$v.f_collection.required || $v.f_collection.dctest ? 'has-error col' : 'has-success']">
99
99
  <label for="f_collection" class=" font_normal_body">*收&emsp;&emsp;款</label>
100
100
  <input id="f_collection" class="input_search" style="width:60%" type="number" v-model="model.f_collection"
101
101
  v-validate:f_collection='{required: true, dctest: [(model.f_totalcost - 0), ">=" ] }'
102
102
  v-el:fcollection @keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))" v-scale="[model.f_totalcost, 4]" :disabled="$refs.givechange.promptText != ''">
103
103
  </div>
104
104
  <div class="col-sm-3" v-if="row.f_collection_type === '按气量' && model.f_payment=='赠气'"
105
- :class="[$v.f_collection.required || $v.f_collection.dctest ? 'has-error' : 'has-success']">
105
+ :class="[$v.f_collection.required || $v.f_collection.dctest ? 'has-error col' : 'has-success']">
106
106
  <label for="f_collection" class=" font_normal_body"><font size="4px" style="font-weight:bold">*收&emsp;款</font></label>
107
107
  <input id="f_collection" class="input_search" style="width:60%;font-size: 18px;font-weight:bold;" type="number" v-model="model.f_collection"
108
108
  v-el:fcollection @keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))" v-scale="[model.f_totalcost, 4]" :disabled="$refs.givechange.promptText != ''">
@@ -172,7 +172,7 @@
172
172
  v-model="model.f_serial_number" placeholder="业务单号">
173
173
  </div>
174
174
  <div class="col-sm-4" v-if="mjshow"
175
- :class="[$v.f_serial_number.required || $v.f_serial_number.dctest ? 'has-error' : 'has-success']">
175
+ :class="[$v.f_serial_number.required || $v.f_serial_number.dctest ? 'has-error col' : 'has-success']">
176
176
  <label for="f_serial_number" class=" font_normal_body">业务单号</label>
177
177
  <input class="input_search" style="width:60%" type="text" v-validate:f_serial_number='{required: true }'
178
178
  v-model="model.f_serial_number" placeholder="业务单号">
@@ -916,7 +916,7 @@
916
916
  </script>
917
917
 
918
918
  <style lang="less" scoped>
919
- .has-error{
919
+ .col{
920
920
  color: #ff1600;
921
921
  }
922
922
  </style>
package/src/filiale/kelai/MeterinfoTest.vue CHANGED
@@ -6,7 +6,7 @@
6
6
  <a style="font-size: 16px;font-weight: 500;">表具信息</a>&nbsp;<a style="color: #999999;text-decoration: none"></a>
7
7
  </div>
8
8
  <div class="row">
9
- <div class="col-sm-4 form-group" v-if="isiot" :class="[$m.f_meternumber.required ? 'has-error' : '']">
9
+ <div class="col-sm-4 form-group" v-if="isiot" :class="[$m.f_meternumber.required ? 'has-error col' : '']">
10
10
  <label for="f_meternumber" class="font_normal_body">&ensp;表&emsp;&emsp;号</label>
11
11
  <input type="text" class="input_search" style="width:60%" v-model="row.f_meternumber"
12
12
  @blur="meternumberValidate()" placeholder='表号' v-validate:f_meternumber='{required: true }'
@@ -38,14 +38,14 @@
38
38
  :disabled="!jurisdiction.includes('档案信息查询修改')">
39
39
  </div>
40
40
 
41
- <div class="col-sm-4 form-group" :class="[$m.brand.required ? 'has-error' : '']">
41
+ <div class="col-sm-4 form-group" :class="[$m.brand.required ? 'has-error col' : '']">
42
42
  <label for="gasbrand" class="font_normal_body">气表品牌</label>
43
43
  <input type="text" class="input_search" style="width:60%" v-show="false" v-model="$refs.brand.selectedItems"
44
44
  v-validate:brand='{required: true }'>
45
45
  <v-select :value.sync="row.gasbrand" :options='meterbrands' placeholder='气表品牌' close-on-select
46
46
  search @change='brandChange' v-model='row.gasbrand' :disabled="curuser.f_user_state != '预备'" v-ref:brand></v-select>
47
47
  </div>
48
- <div class="col-sm-4 form-group" :class="[$m.model.required ? 'has-error' : '']">
48
+ <div class="col-sm-4 form-group" :class="[$m.model.required ? 'has-error col' : '']">
49
49
  <label for="gasmodel" class="font_normal_body">气表型号</label>
50
50
  <input type="text" v-show="false" v-model="$refs.model.selectedItems"
51
51
  v-validate:model='{required: true }'>
@@ -118,7 +118,7 @@
118
118
  <a style="font-size: 16px;font-weight: 500;">气价信息</a>&nbsp;<a style="color: #999999;text-decoration: none"></a>
119
119
  </div>
120
120
  <div class="row">
121
- <div class="col-sm-4 form-group" :class="[$m.name.required ? 'has-error' : '']">
121
+ <div class="col-sm-4 form-group" :class="[$m.name.required ? 'has-error col' : '']">
122
122
  <label for="pricename" class="font_normal_body">气价名称</label>
123
123
  <v-select :value.sync="row.pricename" v-model="row.pricename" search
124
124
  placeholder='气价名称' :options="getPricenames" @change="priceChange"
@@ -196,7 +196,7 @@
196
196
  :options='gasperson' placeholder='通气人'
197
197
  close-on-select></v-select> -->
198
198
  </div>
199
- <div class="col-sm-4 form-group" :class="[$m.f_gas_date.required ? 'has-error' : '']">
199
+ <div class="col-sm-4 form-group" :class="[$m.f_gas_date.required ? 'has-error col' : '']">
200
200
  <input type="text" v-model="$refs.f_gas_date.value" v-show="false" v-validate:f_gas_date='{required: true }'>
201
201
  <label for="f_gas_date" class="font_normal_body">&ensp;通气日期</label>
202
202
  <datepicker style="width:60%" placeholder="通气日期"
@@ -233,7 +233,7 @@
233
233
  :options='meterbookoptions' placeholder='抄表册'
234
234
  close-on-select></v-select>
235
235
  </div>
236
- <div class="col-sm-4 form-group" v-show="true" :class="[$m.f_install_date.required ? 'has-error' : '']">
236
+ <div class="col-sm-4 form-group" v-show="true" :class="[$m.f_install_date.required ? 'has-error col' : '']">
237
237
  <input type="text" v-model="$refs.f_install_date.value" v-show="false" v-validate:f_install_date='{required: true }'>
238
238
  <label for="f_install_date" class="font_normal_body">&ensp;安装日期</label>
239
239
  <datepicker style="width:60%" id="startDate" placeholder="安装日期" width='100%'
@@ -261,7 +261,7 @@
261
261
  </datepicker>
262
262
  </div>
263
263
  <div v-if="ratioshow" class="col-sm-4 form-group"
264
- :class="[$m.meternumber.required ? 'has-error' : '']">
264
+ :class="[$m.meternumber.required ? 'has-error col' : '']">
265
265
  <label for="f_ratio" class="font_normal_body">比&emsp;&emsp;率</label>
266
266
  <input type="number" class="input_search" style="width:60%" v-model="row.f_price_ratio"
267
267
  :value.sync="row.f_price_ratio"
@@ -908,7 +908,7 @@
908
908
  }
909
909
  </script>
910
910
  <style lang="less" scoped>
911
- .has-error{
911
+ .col{
912
912
  color: #ff1600;
913
913
  }
914
914
  #meterInfoTest{
package/src/filiale/kelai/UserEssentialInfoTest.vue CHANGED
@@ -3,7 +3,7 @@
3
3
  <validator name='v' @valid="$emit('valid')" @invalid="$emit('invalid')">
4
4
  <form class="form-horizontal select-overspread ">
5
5
  <div class="row">
6
- <div class="col-sm-4 form-group " :class="[$v.f_user_name.required ? 'has-error' : '']">
6
+ <div class="col-sm-4 form-group " :class="[$v.f_user_name.required ? 'has-error col' : '']">
7
7
  <label for="f_user_name" class="font_normal_body">*客户姓名</label>
8
8
  <input type="text" v-model="baseinfo.base.f_user_name" v-validate:f_user_name='{required: true }'
9
9
  class="input_search" style="width:60%" placeholder="客户名称" v-next-el="phone">
@@ -57,7 +57,7 @@
57
57
  </div>
58
58
  </div>
59
59
  <div class="row">
60
- <div class="col-sm-12 form-group" :class="[$v.f_address.required ? 'has-error' : '']">
60
+ <div class="col-sm-12 form-group" :class="[$v.f_address.required ? 'has-error col' : '']">
61
61
  <label for="f_address" class="font_normal_body">*地址信息</label>
62
62
  <input type="text" v-model="addressinfo.f_address" :value.sync="addressinfo.f_address" v-validate:f_address='{required: true }'
63
63
  class="input_search" disabled="disabled" style="width:75%;" placeholder="用户地址" >
@@ -79,7 +79,7 @@
79
79
  <input type="text" v-model="baseinfo.base.f_rent_phone" class="input_search" style="width:60%"
80
80
  placeholder="备用电话">
81
81
  </div>
82
- <div class="col-sm-4 form-group" :class="[$v.f_people_num.dctest ? 'has-error' : '']">
82
+ <div class="col-sm-4 form-group" :class="[$v.f_people_num.dctest ? 'has-error col' : '']">
83
83
  <label for="f_people_num" class="font_normal_body">&ensp;人&ensp;口&ensp;数</label>
84
84
  <input type="number" v-model="baseinfo.base.f_people_num" v-validate:f_people_num='{dctest: [0, ">=" ]}'
85
85
  :disabled="!jurisdiction.includes('修改人口数')" class="input_search" style="width:60%"
@@ -174,7 +174,7 @@
174
174
  <div v-if="baseinfo.base.f_cost_type[0] === '银行代扣'">
175
175
  <div class="row">
176
176
  <div class="col-sm-4 form-group"
177
- :class="[$v.f_bank_accopen.required ? 'has-error' : '']">
177
+ :class="[$v.f_bank_accopen.required ? 'has-error col' : '']">
178
178
  <label for="f_username" class="font_normal_body">银行户名</label>
179
179
  <input type="text" v-model="baseinfo.bank.f_bank_accopen"
180
180
  class="input_search" style="width:60%" id="f_username" placeholder="客户名称"
@@ -200,7 +200,7 @@
200
200
  aria-describedby="helpBlock" placeholder="身份证号" v-el:bankidnumber>
201
201
  </div>
202
202
  <div class="col-sm-12 form-group"
203
- :class="[$v.f_bank_account.required ? 'has-error' : '']">
203
+ :class="[$v.f_bank_account.required ? 'has-error col' : '']">
204
204
  <label for="f_userid" class="font_normal_body">银行账号</label>
205
205
  <input type="text" v-model="baseinfo.bank.f_bank_account" class="input_search" style="width:54%"
206
206
  v-validate:f_bank_account='{required: true}' placeholder="银行账号" v-el:bankaccount
@@ -340,7 +340,7 @@
340
340
  }
341
341
  </script>
342
342
  <style lang="less" scoped>
343
- .has-error{
343
+ .col{
344
344
  color: #ff1600;
345
345
  }
346
346
  </style>
package/src/filiale/liaoyuan/FileManage/UserEssentialInfoTest.vue CHANGED
@@ -148,6 +148,16 @@
148
148
  :options='userlevel' :disabled="!jurisdiction.includes('档案信息查询修改')" placeholder='用户等级' close-on-select>
149
149
  </v-select>
150
150
  </div>
151
+ <div class="col-sm-4 form-group">
152
+ <label for="f_ins_stop_date" class="font_normal_body">&ensp;结束日期</label>
153
+ <datepicker style="width:60%"
154
+ placeholder="保险结束日期"
155
+ v-model="baseinfo.base.f_ins_stop_date"
156
+ :value.sync="baseinfo.base.f_ins_stop_date"
157
+ :format="'yyyy-MM-dd'"
158
+ :show-reset-button="true"
159
+ ></datepicker>
160
+ </div>
151
161
  </div>
152
162
  <div class="row">
153
163
  <a style="text-decoration: none;font-weight: 300;float: left;color: #333;margin-top: 15px;font-weight: 500"