sale-client 3.6.326 → 3.6.327

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.326",
3
+ "version": "3.6.327",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
@@ -261,6 +261,7 @@
261
261
  new_metertitles: this.newmetertitles,
262
262
  f_userinfo_id: this.data.f_userinfo_id,
263
263
  f_user_id: this.data.f_user_id,
264
+ f_userfiles_id: this.data.f_userfiles_id,
264
265
  f_operator: this.$login.f.name,
265
266
  f_operatorid: this.$login.f.id,
266
267
  f_orgid: this.$login.f.orgid,
@@ -369,10 +369,11 @@
369
369
  <!-- <td style="text-align: center;">{{Math.round(row.avggas)}}</td>-->
370
370
  <td><nobr>{{row.f_meternumber}}</nobr></td>
371
371
  <td style="text-align: center;"><nobr>
372
- <img-self :src="row.f_handplan_image" v-if="row.f_handplan_image" :width="50" :height="50"></img-self>
373
-
372
+ <!-- <img-self :src="row.f_handplan_image" v-if="row.f_handplan_image" :width="50" :height="50"></img-self>-->
374
373
  <!-- <button v-if="row.is_has_file=='是'" class="btn btn-link" @click.stop="$parent.$parent.$parent.view(row)">查看</button>-->
375
- <button v-if="row.f_notified_path" class="btn btn-link" @click.stop="$parent.$parent.$parent.imgShow(row.f_notified_path)">图像识别</button>
374
+ <button v-if="row.f_notified_path" class="btn btn-link" @click.stop="$parent.$parent.$parent.imgShow(row.f_notified_path)">图像识别1</button>
375
+ <br>
376
+ <button v-if="row.f_handplan_image" class="btn btn-link" @click.stop="$parent.$parent.$parent.imgShow(row.f_handplan_image)">图像识别2</button>
376
377
  </nobr></td>
377
378
  <td><nobr>{{row.f_meter_base}}</nobr></td>
378
379
  <td id="hand-creat" style="display: flex;justify-content: space-between;align-items: center">
@@ -730,9 +731,7 @@
730
731
  this.imgshow = false
731
732
  },
732
733
  imgShow (val) {
733
- console.log('-----------val2:', val)
734
734
  this.imgfilename = `rs/image/file/` + val
735
- console.log('-----------imgfilename2:', this.imgfilename)
736
735
  this.imgshow = true
737
736
  },
738
737
  async getaddress () {
@@ -84,10 +84,12 @@
84
84
  <input type="text" v-model="baseinfo.base.f_balance" class="input_search" style="width:60%"
85
85
  placeholder="用户余额" :disabled="!jurisdiction.includes('档案信息查询修改')">
86
86
  </div>
87
- <div style="" class="col-sm-4 form-group">
87
+ <div style="" class="col-sm-4 form-group" :class="[$v.is_mgq.required ? 'has-error' : '']">
88
88
  <label for="f_is_mgq" class="font_normal_body ">煤&ensp;改&ensp;气&ensp;</label>
89
+ <input type="text" v-show="false" v-model="$refs.is_mgq.selectedItems"
90
+ v-validate:is_mgq='{required: true }'>
89
91
  <v-select id="f_is_mgq" :value.sync="baseinfo.base.f_is_mgq" v-model="baseinfo.base.f_is_mgq"
90
- :options='mgq' placeholder='是否煤改气' style="width: 65%" close-on-select></v-select>
92
+ :options='mgq' placeholder='是否煤改气' style="width: 65%" close-on-select v-ref:is_mgq></v-select>
91
93
  </div>
92
94
  <div class="col-sm-4 form-group">
93
95
  <label for="f_contract" class="font_normal_body">&ensp;燃气本号</label>
@@ -0,0 +1,247 @@
1
+ <template>
2
+ <partial-view v-ref:pv>
3
+ <div class="panel panel-info auto" style="margin-top: auto">
4
+ <div class="panel-heading" style="height: 35px">
5
+ <h4 style="display:inline-block;margin-top: auto">表具信息</h4>
6
+ </div>
7
+ <div class="auto ">
8
+ <div class="row" v-if="data.f_customer">
9
+ <label class = "col-sm-5 " style="color: brown">团缴编号</label>
10
+ <span class = "col-sm-7" style="color: brown">{{data.f_customer?data.f_customer:'无'}}</span>
11
+ </div>
12
+ <div class="row">
13
+ <label class = "col-sm-5 " >气表类型</label>
14
+ <span class = "col-sm-7">{{data?data.f_meter_type:dafault.f_meter_brand}}</span>
15
+ </div>
16
+ <div class="row">
17
+ <label class = "col-sm-5 " >气表品牌</label>
18
+ <span class = "col-sm-7">{{data?data.f_meter_brand:dafault.f_meter_brand}}</span>
19
+ </div>
20
+ <div class="row">
21
+ <label class = "col-sm-5 " >气表型号</label>
22
+ <span class = "col-sm-7">{{data?data.f_meter_style:dafault.f_meter_style}}</span>
23
+ </div>
24
+ <div class="row">
25
+ <label class="col-sm-5" style="color: brown">表具状态</label>
26
+ <span class="col-sm-7" style="color: brown">{{data?data.f_table_state:dafault.f_table_state}}</span>
27
+ </div>
28
+ <div class="row" v-if="data.f_meter_type.includes('物联网') && data.f_collection_type === '按金额'">
29
+ <label class = "col-sm-5 " style="color: brown">系统余额</label>
30
+ <span class = "col-sm-7" style="color: brown">{{data?data.f_balance_amount:dafault.f_balance_amount}}</span>
31
+ </div>
32
+ <div class="row" v-if="data.f_meter_type.includes('物联网') && data.f_collection_type === '按气量'">
33
+ <label class = "col-sm-5 " style="color: brown">系统余量</label>
34
+ <span class = "col-sm-7" style="color: brown">{{data?data.f_balance_gas:dafault.f_balance_gas}}</span>
35
+ </div>
36
+ <div class="row" v-if="data.f_meter_type.includes('物联网') && data.f_collection_type === '按金额'">
37
+ <label class = "col-sm-5 " style="color: brown">表上余额</label>
38
+ <span class = "col-sm-7" style="color: brown">{{data?data.f_jval:dafault.f_jval}}</span>
39
+ </div>
40
+ <div class="row" v-if="data.f_meter_type.includes('物联网') && data.f_collection_type === '按气量'">
41
+ <label class = "col-sm-5 " style="color: brown">表上余量</label>
42
+ <span class = "col-sm-7" style="color: brown">{{data?data.f_jval:dafault.f_jval}}</span>
43
+ </div>
44
+ <div class="row">
45
+ <label class = "col-sm-5 " >初始表底数</label>
46
+ <span class = "col-sm-7" >{{data?data.f_initial_base:dafault.f_initial_base}}</span>
47
+ </div>
48
+ <div class="row">
49
+ <label class = "col-sm-5 " >表当前底数</label>
50
+ <span class = "col-sm-7" >{{data?data.f_meter_base:dafault.f_meter_base}}</span>
51
+ </div>
52
+ <div class="row" v-show="data.f_times">
53
+ <label class = "col-sm-5 " >写卡次数</label>
54
+ <span class = "col-sm-7" >{{data?data.f_times:dafault.f_times}}</span>
55
+ </div>
56
+ <div class="row" v-if="data.f_meter_type.includes('物联网')">
57
+ <label class = "col-sm-5 ">物联网次数</label>
58
+ <span class = "col-sm-7" >{{data?data.f_iot_times:dafault.f_iot_times}}</span>
59
+ </div>
60
+ <div class="row" v-if="data.f_meter_type.includes('物联网')">
61
+ <label class = "col-sm-5 ">表累购金额</label>
62
+ <span class = "col-sm-7" >{{data?data.f_total_fee:dafault.f_total_fee}}</span>
63
+ </div>
64
+ <div class="row" v-if="data.f_meter_type.includes('物联网')">
65
+ <label class = "col-sm-5 ">户累购金额</label>
66
+ <span class = "col-sm-7" >{{data?data.f_total_fee_all:dafault.f_total_fee_all}}</span>
67
+ </div>
68
+ <div class="row" v-if="(data.f_meter_type === '机表' || data.f_meter_type === '物联网表') && data.f_deduction_gas > 0">
69
+ <label class = "col-sm-5 " >剩余抵扣量</label>
70
+ <span class = "col-sm-7" >{{data?data.f_deduction_gas:dafault.f_deduction_gas}}</span>
71
+ </div>
72
+ <div class="row" v-if="data.f_meter_type.includes('卡表')">
73
+ <label class = "col-sm-5 " style="color: brown" >户累购气量</label>
74
+ <span class = "col-sm-7" style="color: brown">{{data?data.f_total_gas_all:dafault.f_total_gas_all}}</span>
75
+ </div>
76
+ <div class="row" v-if="(data.f_meter_brand.includes('数码表'))">
77
+ <label class = "col-sm-5 " style="color: brown" >累购气量</label>
78
+ <span class = "col-sm-7" style="color: brown">{{data?data.f_total_gas:dafault.f_total_gas}}</span>
79
+ </div>
80
+ <div class="row" v-if="data.f_meter_type.includes('卡表') && data.f_meter_type === '气量卡表'">
81
+ <label class = "col-sm-5 " style="color: brown" >累购气量</label>
82
+ <span class = "col-sm-7" style="color: brown">{{data?data.f_total_gas:dafault.f_total_gas}}</span>
83
+ </div>
84
+ <div class="row" v-if="data.f_meter_type.includes('卡表')">
85
+ <label class = "col-sm-5 " style="color: brown">累购金额</label>
86
+ <span class = "col-sm-7" style="color: brown">{{data?data.f_total_fee:dafault.f_total_fee}}</span>
87
+ </div>
88
+ <div class="row" v-if="data.f_meter_type.includes('卡表')">
89
+ <label class = "col-sm-5 " style="color: brown">累购写卡金额</label>
90
+ <span class = "col-sm-7" style="color: brown">{{data?data.f_write_totalfee:dafault.f_total_fee}}</span>
91
+ </div>
92
+ <div class="row">
93
+ <label class = "col-sm-5 " >气表表号</label>
94
+ <span class = "col-sm-7">{{data?data.f_meternumber:dafault.f_meternumber}}</span>
95
+ </div>
96
+ <div class="row" v-if="data.f_meter_type.includes('卡表') || (data.f_meter_type.includes('物联网表') && data.f_hascard==='是')">
97
+ <label class = "col-sm-5 " >卡&emsp;&emsp;号</label>
98
+ <span class = "col-sm-7">{{data?data.f_card_id:dafault.f_card_id}}</span>
99
+ </div>
100
+ <!-- <div class="row" v-if="data.f_meter_type.includes('卡表') || data.f_meter_type.includes('物联网表') && data.f_hascard==='是'">-->
101
+ <!-- <label class = "col-sm-5 " >写卡次数</label>-->
102
+ <!-- <span class = "col-sm-7">{{data?data.f_times:dafault.f_times}}</span>-->
103
+ <!-- </div>-->
104
+ <div class="row">
105
+ <label class = "col-sm-5 " >用气性质</label>
106
+ <span class = "col-sm-7">{{data?data.f_gasproperties:dafault.f_gasproperties}}</span>
107
+ </div>
108
+ <div class="row">
109
+ <label class = "col-sm-5 " >气价名称</label>
110
+ <span class = "col-sm-7">{{data?data.f_price_name:dafault.f_price_name}}</span>
111
+ </div>
112
+ <!--<div class="row" v-if="data.f_balance < 0">-->
113
+ <!--<label class = "col-sm-5 " >账户欠费</label>-->
114
+ <!--<span class = "col-sm-7" title="不包含违约金">{{data?0 - (data.f_balance - 0):dafault.f_balance}}</span>-->
115
+ <!--</div>-->
116
+ <!--<div class="row" v-else>-->
117
+ <!--<label class = "col-sm-5 " >账户余额</label>-->
118
+ <!--<span class = "col-sm-7">{{data?data.f_balance:dafault.f_balance}}</span>-->
119
+ <!--</div>-->
120
+ <div class="row" v-if="data.f_remanent_money > 0">
121
+ <label class = "col-sm-5 " >应补金额</label>
122
+ <span class = "col-sm-7">{{data?data.f_remanent_money:dafault.f_remanent_money}}</span>
123
+ </div>
124
+ <div class="row" v-if="data.f_remanent_gas > 0">
125
+ <label class = "col-sm-5 " >应补气量</label>
126
+ <span class = "col-sm-7">{{data?data.f_remanent_gas:dafault.f_remanent_gas}}</span>
127
+ </div>
128
+ <div class="row">
129
+ <label class = "col-sm-5 " >表&emsp;&emsp;向</label>
130
+ <span class = "col-sm-7">{{data?data.f_aroundmeter:dafault.f_hand_date}}</span>
131
+ </div>
132
+ <div class="row">
133
+ <label class = "col-sm-5 " >抄表册名</label>
134
+ <span class = "col-sm-7">{{data?'['+data.f_book_code + '] '+ (data.f_book_name ? data.f_book_name:''):dafault.f_book_name}}</span>
135
+ </div>
136
+ <div class="row">
137
+ <label class = "col-sm-5 " >抄表册册序号</label>
138
+ <span class = "col-sm-7">{{data?data.f_meter_book_sort:dafault.f_meter_book_sort}}</span>
139
+ </div>
140
+ <div class="row">
141
+ <label class = "col-sm-5 " >安装位置</label>
142
+ <span class = "col-sm-7">{{data?data.f_position:dafault.f_position}}</span>
143
+ </div>
144
+ <div class="row">
145
+ <label class = "col-sm-5 " >置换人员</label>
146
+ <span class = "col-sm-7">{{data?data.f_gas_person:dafault.f_hand_date}}</span>
147
+ </div>
148
+ <div class="row">
149
+ <label class = "col-sm-5 " >置换时间</label>
150
+ <span class = "col-sm-7">{{data?data.f_gas_date.substring(0,7):dafault.f_hand_date}}</span>
151
+ </div>
152
+ <div class="row">
153
+ <label class = "col-sm-5 " >抄表员</label>
154
+ <span class = "col-sm-7">{{data?data.f_inputtor:dafault.f_inputtor}}</span>
155
+ </div>
156
+ <div class="row">
157
+ <label class = "col-sm-5 " >上次抄表日</label>
158
+ <span class = "col-sm-7">{{data?data.f_hand_date.substring(0,7):dafault.f_hand_date}}</span>
159
+ </div>
160
+ <div class="row">
161
+ <label class = "col-sm-5 " >建档日期</label>
162
+ <span class = "col-sm-7">{{data?data.f_input_date.substring(0,7):dafault.f_input_date}}</span>
163
+ </div>
164
+ <div class="row">
165
+ <label class = "col-sm-5 " >备&emsp;&emsp;注</label>
166
+ <span class = "col-sm-7">{{data?data.comments:dafault.comments}}</span>
167
+ </div>
168
+ </div>
169
+ </div>
170
+ </partial-view>
171
+ </template>
172
+
173
+ <script>
174
+ /*用户档案相关信息组件*/
175
+ export default {
176
+ ready () {
177
+ console.log('看看userinfo里面接收的data数据', this.data)
178
+ },
179
+ title: '客户基本信息',
180
+ data () {
181
+ return {
182
+ dafault: {
183
+ f_total_gas_all: 0,
184
+ f_total_fee_all:0,
185
+ f_balance_amount: 0,
186
+ f_balance_gas: 0,
187
+ f_initial_base: 0,
188
+ f_meter_base: 0,
189
+ f_deduction_gas: 0,
190
+ f_total_gas: 0,
191
+ f_total_fee: 0,
192
+ f_card_id: '*****',
193
+ f_times: 0,
194
+ f_iot_times: 0,
195
+ f_meternumber: 0,
196
+ f_gasproperties: '****',
197
+ f_price_name: '****',
198
+ f_meter_brand: '****',
199
+ f_balance: 0,
200
+ f_user_type: '**',
201
+ f_remanent_gas: 0,
202
+ f_position: '****',
203
+ f_inputtor: '****',
204
+ f_jval: 0,
205
+ f_table_state: 0
206
+ },
207
+ model: null
208
+ }
209
+ },
210
+ props: ['data'],
211
+ methods: {
212
+ dealmsg (val) {
213
+ this.$dispatch('deal-msg', val)
214
+ }
215
+ },
216
+ watch: {
217
+ 'data' (val) {
218
+ console.log('val========', val)
219
+ }
220
+ }
221
+ }
222
+ </script>
223
+ <style lang="less">
224
+ .row {
225
+ /*border-bottom:1px solid #F2F6FA;*/
226
+ margin-left: 0;
227
+ margin-right: 0;
228
+ }
229
+ // . {
230
+ // height: 23px;
231
+ // border-right: 1px solid #F2F6FA;
232
+ // margin-bottom: 0;
233
+ // text-align: left;
234
+ // }
235
+ // #address {
236
+ // border-left: 1px solid #F2F6FA;
237
+ // }
238
+ // #user-info {
239
+ // padding:6px;
240
+ // span {
241
+ // padding-left: 5px;
242
+ // }
243
+ // }
244
+ // #address1 {
245
+ // border-right: 0;
246
+ // }
247
+ </style>
@@ -37,4 +37,6 @@ export default function () {
37
37
  Vue.component('sale-handplan-query', (resolve) => { require(['./HandplanQuery'], resolve) })
38
38
  // 获取气表信息
39
39
  Vue.component('meter-message', (resolve) => { require(['./Common/MeterMessage'], resolve) })
40
+ // 当前选择用户的表具基本信息
41
+ Vue.component('user-meterinfodetail', (resolve) => { require(['./meterinfodetail'], resolve) })
40
42
  }