sale-client 3.6.115 → 3.6.117

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 (6) hide show
  1. package/package.json +1 -1
  2. package/src/components/FilesManage/FileUserFiles.vue +5 -2
  3. package/src/filiale/kelai/GarbageList.vue +0 -12
  4. package/src/filiale/kelai/GarbageOperateMain.vue +0 -16
  5. package/src/filiale/liaoyuan/ChangeMeter.vue +18 -0
  6. package/src/filiale/liaoyuan/comprehen/StairPrice/GasPriceList.vue +4 -0
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sale-client",
3
- "version": "3.6.115",
3
+ "version": "3.6.117",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
package/src/components/FilesManage/FileUserFiles.vue CHANGED
@@ -302,6 +302,9 @@
302
302
  <th>
303
303
  <nobr>客户编号</nobr>
304
304
  </th>
305
+ <th>
306
+ <nobr>旧档案编号</nobr>
307
+ </th>
305
308
  <th>
306
309
  <nobr>客户名称</nobr>
307
310
  </th>
@@ -354,8 +357,8 @@
354
357
  </template>
355
358
  <template partial='body'>
356
359
  <td style="text-align: center;">{{$index + 1}}</td>
357
- <td style="text-align: center;">{{row.f_userinfo_code}}
358
- </td>
360
+ <td style="text-align: center;">{{row.f_userinfo_code}}</td>
361
+ <td style="text-align: center;">{{row.f_olduserinfo_code}}</td>
359
362
  <td style="text-align: center;">
360
363
  <span @click="$parent.$parent.$parent.dealmsg(row)"><a><b>{{row.f_user_name}}</b></a></span>
361
364
  </td>
package/src/filiale/kelai/GarbageList.vue CHANGED
@@ -69,11 +69,7 @@
69
69
  <th><nobr>序号</nobr></th>
70
70
  <th><nobr>用户编号</nobr></th>
71
71
  <th><nobr>用户姓名</nobr></th>
72
- <th><nobr>单价</nobr></th>
73
- <th><nobr>金额</nobr></th>
74
72
  <th><nobr>付款方式</nobr></th>
75
- <th><nobr>跨月数</nobr></th>
76
- <th><nobr>所属日期</nobr></th>
77
73
  <th><nobr>操作时间</nobr></th>
78
74
  <th><nobr>操作员</nobr></th>
79
75
  <th><nobr>所属部门</nobr></th>
@@ -88,11 +84,7 @@
88
84
  <td style="text-align: center;">{{ $index + 1 }}</td>
89
85
  <td style="text-align: center;"><nobr>{{row.f_userinfo_code}}</nobr></td>
90
86
  <td style="text-align: center;"><nobr>{{row.f_user_name}}</nobr></td>
91
- <td style="text-align: center;"><nobr>{{row.f_price}}</nobr></td>
92
- <td style="text-align: center;"><nobr>{{row.f_money}}</nobr></td>
93
87
  <td style="text-align: center;"><nobr>{{row.f_payment}}</nobr></td>
94
- <td style="text-align: center;"><nobr>{{row.f_month}}</nobr></td>
95
- <td style="text-align: center;"><nobr>{{row.f_hand_date}}</nobr></td>
96
88
  <td style="text-align: center;"><nobr>{{row.f_operate_date}}</nobr></td>
97
89
  <td style="text-align: center;"><nobr>{{row.f_operator}}</nobr></td>
98
90
  <td style="text-align: center;"><nobr>{{row.f_depname}}</nobr></td>
@@ -164,11 +156,7 @@ const myMap = new Map()
164
156
  getfield: {
165
157
  'f_userinfo_code': '用户编号',
166
158
  'f_user_name': '用户姓名',
167
- 'f_price': '单价',
168
- 'f_money': '金额',
169
159
  'f_payment': '收费形式',
170
- 'f_month': '跨月数',
171
- 'f_hand_date': '所属时间',
172
160
  'f_operate_date': '收费时间',
173
161
  'f_operator': '操作员',
174
162
  'f_depname': '所属部门',
package/src/filiale/kelai/GarbageOperateMain.vue CHANGED
@@ -20,22 +20,6 @@
20
20
  close-on-select>
21
21
  </v-select>
22
22
  </div>
23
- <div class="col-sm-4 form-group">
24
- <label class="font_normal_body">购买单价</label>
25
- <input type="text" v-model="model.f_price" disabled=disabled style="width: 60%" class="input_search">
26
- </div>
27
- <div class="col-sm-4 form-group">
28
- <label class="font_normal_body">收款金额</label>
29
- <input type="text" v-model="model.f_money" disabled=disabled style="width: 60%" class="input_search">
30
- </div>
31
- <div class="col-sm-4 form-group">
32
- <label class="font_normal_body">所跨月数</label>
33
- <input type="text" v-model="model.f_month" disabled=disabled style="width: 60%" class="input_search">
34
- </div>
35
- <div class="col-sm-6 form-group">
36
- <label class="form-group">所属日期</label>
37
- <input type="text" v-model="model.f_hand_date" disabled=disabled style="width: 60%" class="input_search">
38
- </div>
39
23
  <div class="col-sm-6 form-group">
40
24
  <label class="form-group">操作日期</label>
41
25
  <input type="text" v-model="model.f_operate_date" disabled=disabled style="width: 60%" class="input_search">
package/src/filiale/liaoyuan/ChangeMeter.vue CHANGED
@@ -319,6 +319,24 @@ export default {
319
319
  this.$dispatch('success', '换表', this.row)
320
320
  },
321
321
  async confirmbefore () {
322
+ if (this.model.metermessage.f_meter_type[0] === '物联网表') {
323
+ let param = {
324
+ f_userfiles_id: this.row.f_userfiles_id,
325
+ f_meternumber: this.model.metermessage.f_meternumber,
326
+ f_gasbrand_id: this.model.metermessage.gasbrand[0].id
327
+ }
328
+
329
+ let res = await this.$resetpost('rs/logic/meternumberValidate', param, {
330
+ resolveMsg: null,
331
+ rejectMsg: '表号验证失败！！'
332
+ })
333
+ console.log('标号验证返回：', res)
334
+ if (res.data) {
335
+ this.metermessage.f_meternumber = ''
336
+ this.$showAlert('表号已存在！！', 'warning', 3000)
337
+ return
338
+ }
339
+ }
322
340
  if (this.model.metermessage.f_meter_type[0] != '机表') {
323
341
  console.log('进来了')
324
342
  if (this.books.data.length > 0) {
package/src/filiale/liaoyuan/comprehen/StairPrice/GasPriceList.vue CHANGED
@@ -97,6 +97,9 @@
97
97
  <th>
98
98
  <nobr>气价编号</nobr>
99
99
  </th>
100
+ <th>
101
+ <nobr>气价ID</nobr>
102
+ </th>
100
103
  <th v-show="!$parent.$parent.$parent.$parent.usershow && !($parent.$parent.$parent.$parent.isdetail && !$parent.$parent.$parent.$parent.usershow)">
101
104
  <nobr>气价名称</nobr>
102
105
  </th>
@@ -139,6 +142,7 @@
139
142
  <tr>
140
143
  <td style="text-align:center">{{$index + 1}}</td>
141
144
  <td style="text-align:center">{{row.f_price_id}}</td>
145
+ <td style="text-align:center">{{row.id}}</td>
142
146
  <td style="text-align:center" v-show="!$parent.$parent.$parent.$parent.usershow && !($parent.$parent.$parent.$parent.isdetail && !$parent.$parent.$parent.$parent.usershow)"><nobr>{{row.f_price_name}}</nobr></td>
143
147
  <td style="text-align:center" v-show="!$parent.$parent.$parent.$parent.usershow && !($parent.$parent.$parent.$parent.isdetail && !$parent.$parent.$parent.$parent.usershow)">{{row.f_user_type}}</td>
144
148
  <td style="text-align:center" v-show="!$parent.$parent.$parent.$parent.usershow && !($parent.$parent.$parent.$parent.isdetail && !$parent.$parent.$parent.$parent.usershow)">{{row.f_gasproperties}}</td>