sale-client 3.6.237 → 3.6.239

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 (39) hide show
  1. package/build/dev-server.js +97 -97
  2. package/package.json +1 -1
  3. package/src/components/FilesManage/UserMeterInfoTest.vue +9 -2
  4. package/src/components/revenue/comprehen/Bill/EticketV4/CustQueryEticket.vue +2 -3
  5. package/src/components/revenue/comprehen/Bill/EticketV4/EticketOpenCard.vue +41 -12
  6. package/src/components/revenue/comprehen/Bill/EticketV4/EticketOpenJBPage.vue +2 -3
  7. package/src/components/revenue/comprehen/Bill/EticketV4/EticketOpenPage.vue +3 -3
  8. package/src/filiale/lixianV3/machineHand.vue +51 -47
  9. package/src/filiale/shanxian/UserDeviceInfoTest.vue +13 -8
  10. package/src/filiale/tongchuan/bill/CustQueryEticketQueryV4.vue +334 -0
  11. package/src/filiale/tongchuan/bill/EticketOpenCard.vue +310 -0
  12. package/src/filiale/tongchuan/bill/EticketOpenJBPage.vue +341 -0
  13. package/src/filiale/tongchuan/bill/EticketOpenPage.vue +333 -0
  14. package/src/filiale/tongchuan/bill/EticketPrint.vue +1 -0
  15. package/src/filiale/tongchuan/sale.js +8 -0
  16. package/src/filiale/yangchun/BlackList/BlackList.vue +335 -0
  17. package/src/filiale/yangchun/BlackList/BlackListList.vue +288 -0
  18. package/src/filiale/yangchun/BlackList/BlackListManage.vue +101 -0
  19. package/src/filiale/yangchun/BlackList/BlackRecordQuery.vue +245 -0
  20. package/src/filiale/yangchun/SpecialUserManage.vue +64 -0
  21. package/src/filiale/yangchun/sale.js +12 -0
  22. package/src/main.js +35 -33
  23. package/src/plugins/ChangeMeterService.js +1 -0
  24. package/.gradle/5.2.1/fileChanges/last-build.bin +0 -0
  25. package/.gradle/5.2.1/fileHashes/fileHashes.lock +0 -0
  26. package/.gradle/5.2.1/gc.properties +0 -0
  27. package/.gradle/7.4/checksums/checksums.lock +0 -0
  28. package/.gradle/7.4/dependencies-accessors/dependencies-accessors.lock +0 -0
  29. package/.gradle/7.4/dependencies-accessors/gc.properties +0 -0
  30. package/.gradle/7.4/executionHistory/executionHistory.bin +0 -0
  31. package/.gradle/7.4/executionHistory/executionHistory.lock +0 -0
  32. package/.gradle/7.4/fileChanges/last-build.bin +0 -0
  33. package/.gradle/7.4/fileHashes/fileHashes.bin +0 -0
  34. package/.gradle/7.4/fileHashes/fileHashes.lock +0 -0
  35. package/.gradle/7.4/gc.properties +0 -0
  36. package/.gradle/buildOutputCleanup/buildOutputCleanup.lock +0 -0
  37. package/.gradle/buildOutputCleanup/cache.properties +0 -2
  38. package/.gradle/file-system.probe +0 -0
  39. package/.gradle/vcs-1/gc.properties +0 -0
@@ -1,97 +1,97 @@
1
- var path = require('path')
2
- const [ serverRul, localUrl ] = ['http://192.168.50.4:8400/', 'http://192.168.50.4:8400/']
3
- var merge = require('webpack-merge')
4
- var baseConfig = require('./webpack.dev.conf')
5
- var devConfig = {
6
- devServer: {
7
- contentBase: path.join(__dirname, 'src'),
8
- hot: true,
9
- publicPath: baseConfig.output.publicPath,
10
- historyApiFallback: true,
11
- host: '127.0.0.1',
12
- port: 8089,
13
- open: false,
14
- stats: {
15
- colors: false, // 配置控制台输出彩色日志
16
- chunks: false, // 不输出构建 chunk 信息
17
- children: false // 不输出子模块构建信息
18
- },
19
- proxy: {
20
- '/invoice/rs/logic/getInvoice': {
21
- target: serverRul
22
- },
23
- '/rs/file': {
24
- target: serverRul
25
- },
26
- '/webapps': {
27
- target: serverRul
28
- },
29
- '/rs/sql/singleTable': {
30
- target: serverRul
31
- },
32
- '/invoice': {
33
- target: serverRul
34
- },
35
- // 查找资源服务数据
36
- '/rs/search': {
37
- target: serverRul
38
- },
39
- // 查找资源服务数据
40
- '/rs/logic/getLogin': {
41
- target: serverRul
42
- },
43
- // 查找资源服务数据
44
- '/rs/logic/getInitData': {
45
- target: serverRul
46
- },
47
- '/rs/logic/getSaleInitData': {
48
- target: serverRul
49
- },
50
- // 用户登录服务地址
51
- '/rs/user': {
52
- target: serverRul
53
- },
54
- '/rs/path': {
55
- target: serverRul
56
- },
57
- '/rs/data': {
58
- target: serverRul
59
- },
60
- '/rs/license': {
61
- target: serverRul
62
- },
63
- '/rs/db': {
64
- target: serverRul
65
- },
66
- '/excel': {
67
- target: serverRul
68
- },
69
- '/rs/config': {
70
- target: serverRul
71
- },
72
- '/rs/report': {
73
- target: serverRul
74
- },
75
- '/rs/vue': {
76
- target: serverRul
77
- },
78
- '/rs/logic/webHandReverse': {
79
- target: 'http://localhost:8085'
80
- },
81
- '/rs/logic': {
82
- target: localUrl
83
- },
84
- '/rs/sql': {
85
- target: localUrl
86
- },
87
- '/webmeter': {
88
- target: serverRul
89
- },
90
- '/rs': {
91
- target: serverRul
92
- // changeOrigin: true
93
- }
94
- }
95
- }
96
- }
97
- module.exports = merge(baseConfig, devConfig)
1
+ var path = require('path')
2
+ const [ serverRul, localUrl ] = ['http://192.168.50.4:8400/', 'http://127.0.0.1:8080']
3
+ var merge = require('webpack-merge')
4
+ var baseConfig = require('./webpack.dev.conf')
5
+ var devConfig = {
6
+ devServer: {
7
+ contentBase: path.join(__dirname, 'src'),
8
+ hot: true,
9
+ publicPath: baseConfig.output.publicPath,
10
+ historyApiFallback: true,
11
+ host: '127.0.0.1',
12
+ port: 8089,
13
+ open: false,
14
+ stats: {
15
+ colors: false, // 配置控制台输出彩色日志
16
+ chunks: false, // 不输出构建 chunk 信息
17
+ children: false // 不输出子模块构建信息
18
+ },
19
+ proxy: {
20
+ '/invoice/rs/logic/getInvoice': {
21
+ target: serverRul
22
+ },
23
+ '/rs/file': {
24
+ target: serverRul
25
+ },
26
+ '/webapps': {
27
+ target: serverRul
28
+ },
29
+ '/rs/sql/singleTable': {
30
+ target: serverRul
31
+ },
32
+ '/invoice': {
33
+ target: serverRul
34
+ },
35
+ // 查找资源服务数据
36
+ '/rs/search': {
37
+ target: serverRul
38
+ },
39
+ // 查找资源服务数据
40
+ '/rs/logic/getLogin': {
41
+ target: serverRul
42
+ },
43
+ // 查找资源服务数据
44
+ '/rs/logic/getInitData': {
45
+ target: serverRul
46
+ },
47
+ '/rs/logic/getSaleInitData': {
48
+ target: serverRul
49
+ },
50
+ // 用户登录服务地址
51
+ '/rs/user': {
52
+ target: serverRul
53
+ },
54
+ '/rs/path': {
55
+ target: serverRul
56
+ },
57
+ '/rs/data': {
58
+ target: serverRul
59
+ },
60
+ '/rs/license': {
61
+ target: serverRul
62
+ },
63
+ '/rs/db': {
64
+ target: serverRul
65
+ },
66
+ '/excel': {
67
+ target: serverRul
68
+ },
69
+ '/rs/config': {
70
+ target: serverRul
71
+ },
72
+ '/rs/report': {
73
+ target: serverRul
74
+ },
75
+ '/rs/vue': {
76
+ target: serverRul
77
+ },
78
+ // '/rs/logic/webHandReverse': {
79
+ // target: 'http://localhost:8085'
80
+ // },
81
+ '/rs/logic': {
82
+ target: localUrl
83
+ },
84
+ '/rs/sql': {
85
+ target: localUrl
86
+ },
87
+ '/webmeter': {
88
+ target: serverRul
89
+ },
90
+ '/rs': {
91
+ target: serverRul
92
+ // changeOrigin: true
93
+ }
94
+ }
95
+ }
96
+ }
97
+ module.exports = merge(baseConfig, devConfig)
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sale-client",
3
- "version": "3.6.237",
3
+ "version": "3.6.239",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
@@ -19,7 +19,7 @@
19
19
  <!-- <span class="glyphicon glyphicon-plus"></span>-->
20
20
  <!-- &lt;!&ndash;<img :src="imgmeter" alt="图片加载失败" class="img-rounded" style="width: 50px;margin:10px;">&ndash;&gt;-->
21
21
  <!-- </div>-->
22
- <file-user-device-info :devicesinfo.sync="devicesinfo" :show_devices.sync="show_devices"
22
+ <file-user-device-info :devicesinfo.sync="devicesinfo" v-if="show_devices" :show_devices.sync="show_devices" :devicesinfonew.sync="devicesinfo"
23
23
  :f_input_person="f_input_person" :userinfoid='data.baseinfo.base.f_userinfo_id'></file-user-device-info>
24
24
  </div>
25
25
  </template>
@@ -109,11 +109,18 @@ export default {
109
109
 
110
110
  showDevices (index, row) {
111
111
  this.devicesinfo = []
112
- this.show_devices = true
113
112
  this.devicesinfo = row.devicesinfo
114
113
  if (row.f_install_person[0]) {
115
114
  this.f_input_person = row.f_install_person[0]
116
115
  }
116
+ this.devicesinfo.forEach((row) => {
117
+ row.devicetypes = this.$appdata.getParam('设备类型')
118
+ row.pipetypes = []
119
+ row.pipeways = this.$appdata.getParam('连接方式')
120
+ row.devicebrands = [{label:'全部', value: '全部'}]
121
+ })
122
+ console.log('shebei', this.devicesinfo)
123
+ this.show_devices = true
117
124
  console.log('查看设备信息', this.devicesinfo)
118
125
  },
119
126
  showFire (index, row) {
@@ -26,7 +26,7 @@
26
26
  </div>
27
27
  <div style="float: right">
28
28
  <button class="button_search" @click="search()">查 询</button>
29
- <button class="button_search" @click="$parent.$parent.open_eTicket()">开票</button>
29
+ <!--<button class="button_search" @click="$parent.$parent.open_eTicket()">开票</button>-->
30
30
  <div
31
31
  :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
32
32
  @click="$parent.$parent.criteriaShow=!$parent.$parent.criteriaShow"
@@ -98,8 +98,7 @@
98
98
  <td style="text-align:center">{{row.f_type}}</td>
99
99
  <td style="text-align:center">{{row.f_operate_date}}</td>
100
100
  <td>
101
- <button class="btn btn-link" @click="$parent.$parent.$parent.kp(row)">开具发票
102
- </button>
101
+ <button class="btn btn-link" @click="$parent.$parent.$parent.kp(row)">开具发票</button>
103
102
  </td>
104
103
  </template>
105
104
  <template partial='foot'></template>
@@ -50,7 +50,7 @@
50
50
  </div>
51
51
  <div style="float: right">
52
52
  <button class="button_search" @click="search()">查 询</button>
53
- <button class="button_search" @click="$parent.$parent.open_eTicket()">开票</button>
53
+ <!--<button class="button_search" @click="$parent.$parent.open_eTicket()">开票</button>-->
54
54
  </div>
55
55
  </div>
56
56
  </div>
@@ -59,10 +59,10 @@
59
59
  <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
60
60
  <template partial='head'>
61
61
  <tr>
62
- <th>
63
- <input type="checkbox" @click="$parent.$parent.$parent.addOrRemove($parent.$parent.$parent.selectAll)"
64
- style="width: 22px;height: 22px" :checked="$parent.$parent.$parent.selectAll">
65
- </th>
62
+ <!--<th>-->
63
+ <!-- <input type="checkbox" @click="$parent.$parent.$parent.addOrRemove($parent.$parent.$parent.selectAll)"-->
64
+ <!-- style="width: 22px;height: 22px" :checked="$parent.$parent.$parent.selectAll">-->
65
+ <!--</th>-->
66
66
  <th>客户编号</th>
67
67
  <th>客户姓名</th>
68
68
  <th>客户地址</th>
@@ -73,14 +73,15 @@
73
73
  <th>收款部门</th>
74
74
  <th>是否开过票</th>
75
75
  <th>缴费时间</th>
76
+ <th>操作</th>
76
77
  </tr>
77
78
  </template>
78
79
  <template partial='body' :model="model">
79
80
  <tr>
80
- <td style="text-align:center">
81
- <input type="checkbox" v-model="$parent.$parent.$parent.selecteds" :value="row"
82
- style="width: 22px;height: 22px" @click="$parent.$parent.$parent.checkbox($index, $event)">
83
- </td>
81
+ <!--<td style="text-align:center">-->
82
+ <!-- <input type="checkbox" v-model="$parent.$parent.$parent.selecteds" :value="row"-->
83
+ <!-- style="width: 22px;height: 22px" @click="$parent.$parent.$parent.checkbox($index, $event)">-->
84
+ <!--</td>-->
84
85
  <th style="text-align:center">{{ row.f_userinfo_code }}</th>
85
86
  <th style="text-align:center">{{ row.f_user_name }}</th>
86
87
  <th style="text-align:center">{{ row.f_address }}</th>
@@ -91,6 +92,9 @@
91
92
  <th style="text-align:center">{{ row.f_depname }}</th>
92
93
  <th style="text-align:center">{{ row.is_bill }}</th>
93
94
  <th style="text-align:center">{{ row.f_operate_date }}</th>
95
+ <th>
96
+ <button class="btn btn-link" @click="$parent.$parent.$parent.kp(row)">开具发票</button>
97
+ </th>
94
98
  </tr>
95
99
  </template>
96
100
  </data-grid>
@@ -202,6 +206,31 @@ export default {
202
206
  search () {
203
207
  this.$refs.paged.$refs.cri.search()
204
208
  },
209
+ async kp (row) {
210
+ let HttpReset = new HttpResetClass()
211
+ let _row = await HttpReset.load('POST', 'rs/sql/sale_getUser', {
212
+ data: {
213
+ orderitem: 'f_userinfo_code',
214
+ condition: `f_userinfo_code = '${row.f_userinfo_code}'`
215
+ }
216
+ }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
217
+ this.row = _row.data[0]
218
+ this.row.id = row.id
219
+ this.invoice_show_gas = this.row.f_collection_type == '按气量' ? '是' : '否'
220
+ if (!this.row.f_taxpayer_id) {
221
+ this.row.f_taxpayer_id = this.row.f_idnumber
222
+ }
223
+ if (!this.row.f_paper_name) {
224
+ this.row.f_paper_name = this.row.f_user_name
225
+ }
226
+ if (!this.row.f_address_phone) {
227
+ this.row.f_address_phone = this.row.f_address + ' ' + this.row.f_user_phone
228
+ }
229
+ if (!this.row.f_email) {
230
+ this.row.f_email = this.row.f_email
231
+ }
232
+ this.eticket_msg = true
233
+ },
205
234
  async open_eTicket () {
206
235
  if ([...new Set(this.selecteds.map(item => item.f_userinfo_code))].length > 1) {
207
236
  this.$showAlert('所选择用户不是同一用户!!', 'warning', 2000)
@@ -214,7 +243,7 @@ export default {
214
243
  //
215
244
  // }
216
245
  // })
217
- return this.$showAlert('已结算的记录不能再次结算开票','warning',3000)
246
+ return this.$showAlert('已结算的记录不能再次结算开票', 'warning', 3000)
218
247
  }
219
248
  let HttpReset = new HttpResetClass()
220
249
  let row = await HttpReset.load('POST', 'rs/sql/sale_getUser', {
@@ -234,7 +263,7 @@ export default {
234
263
  if (!this.row.f_address_phone) {
235
264
  this.row.f_address_phone = this.row.f_address + ' ' + this.row.f_user_phone
236
265
  }
237
- if(!this.row.f_email){
266
+ if (!this.row.f_email) {
238
267
  this.row.f_email = this.row.f_email
239
268
  }
240
269
  this.eticket_msg = true
@@ -242,7 +271,7 @@ export default {
242
271
  confirm () {
243
272
  this.eticket_msg = false
244
273
  this.eticket_show = true
245
- this.$refs.eticketbill.openETicket(this.selecteds.map(item => item.id), this.row, '是',this.invoice_is_pax, '结算收费')
274
+ this.$refs.eticketbill.openETicket(this.row.id, this.row, '结算收费')
246
275
  },
247
276
  selfSearch (args) {
248
277
  this.selecteds = []
@@ -50,7 +50,7 @@
50
50
  </div>
51
51
  <div style="float: right">
52
52
  <button class="button_search" @click="search()">查 询</button>
53
- <button class="button_search" @click="$parent.$parent.open_eTicket()">开票</button>
53
+ <!--<button class="button_search" @click="$parent.$parent.open_eTicket()">开票</button>-->
54
54
  </div>
55
55
  </div>
56
56
  </div>
@@ -93,8 +93,7 @@
93
93
  <th style="text-align:center">{{ row.is_bill }}</th>
94
94
  <th style="text-align:center">{{ row.f_hand_date }}</th>
95
95
  <th>
96
- <button class="btn btn-link" @click="$parent.$parent.$parent.kp(row)">开具发票
97
- </button>
96
+ <button class="btn btn-link" @click="$parent.$parent.$parent.kp(row)">开具发票</button>
98
97
  </th>
99
98
  </tr>
100
99
  </template>
@@ -50,7 +50,7 @@
50
50
  </div>
51
51
  <div style="float: right">
52
52
  <button class="button_search" @click="search()">查 询</button>
53
- <button class="button_search" @click="$parent.$parent.open_eTicket()">开票</button>
53
+ <!--<button class="button_search" @click="$parent.$parent.open_eTicket()">开票</button>-->
54
54
  </div>
55
55
  </div>
56
56
  </div>
@@ -93,8 +93,8 @@
93
93
  <th style="text-align:center">{{ row.is_bill }}</th>
94
94
  <th style="text-align:center">{{ row.f_operate_date }}</th>
95
95
  <th>
96
- <button class="btn btn-link" @click="$parent.$parent.$parent.kp(row)">开具发票
97
- </button></th>
96
+ <button class="btn btn-link" @click="$parent.$parent.$parent.kp(row)">开具发票</button>
97
+ </th>
98
98
  </tr>
99
99
  </template>
100
100
  </data-grid>
@@ -281,9 +281,9 @@
281
281
  <th>
282
282
  <nobr>上期结余</nobr>
283
283
  </th>
284
- <th>
285
- <nobr>实际结余</nobr>
286
- </th>
284
+ <!-- <th>-->
285
+ <!-- <nobr>实际结余</nobr>-->
286
+ <!-- </th>-->
287
287
  <th>
288
288
  <nobr>表号</nobr>
289
289
  </th>
@@ -307,6 +307,9 @@
307
307
  <th>
308
308
  <nobr>应交金额</nobr>
309
309
  </th>
310
+ <th>
311
+ <nobr>总欠费金额</nobr>
312
+ </th>
310
313
  <th>
311
314
  <nobr>抄表结果状态</nobr>
312
315
  </th>
@@ -379,7 +382,7 @@
379
382
  <!--<td>{{row.f_room}}</td>-->
380
383
  <td>{{row.belongmonth}}</td>
381
384
  <td style="text-align: center;">{{row.f_balance}}</td>
382
- <td style="text-align: center;" >{{row.owefee}}</td>
385
+ <!-- <td style="text-align: center;" >{{row.owefee}}</td>-->
383
386
 
384
387
  <td>{{row.f_meternumber}}</td>
385
388
  <td>{{row.f_user_phone}}</td>
@@ -416,7 +419,7 @@
416
419
  </div>
417
420
  </td>
418
421
  <td style="text-align: center;">{{row.f_oughtfee}}</td>
419
-
422
+ <td style="text-align: center;">{{row.f_all_oughtfee}}</td>
420
423
  <td>
421
424
  <div class="form-group" style="margin-bottom:0px;display: contents;" :class="{
422
425
  'has-success has-feedback': !row.error,
@@ -435,6 +438,7 @@
435
438
  </div>
436
439
  </td>
437
440
  <td style="text-align: center;">{{row.f_whether_pay}}</td>
441
+
438
442
  <td>{{row.f_last_input_date}}</td>
439
443
  <td>{{row.f_hand_date}}</td>
440
444
  <td>
@@ -830,49 +834,49 @@ export default {
830
834
  }),
831
835
  config: {
832
836
 
833
- // 导出列要和查询列相同
834
- excelHeaders: {
835
- 'f_user_id': '表编号',
836
- 'f_meternumber': '表号',
837
- 'f_inputtor': '抄表员',
838
- 'f_balance': '上期结余',
839
- 'owefee': '实际结余',
840
- 'f_last_input_date': '上次抄表',
841
- 'f_hand_date': '下发时间',
842
- 'f_input_date': '抄表日期',
843
- 'f_userinfo_code': '客户编号',
844
- 'f_address': '客户地址',
845
- 'f_residential_area': '小区名称',
846
- 'f_user_name': '客户姓名',
847
- 'f_last_tablebase': '上期底数',
848
- 'f_tablebase': '本期指数',
849
- 'f_oughtfee': '应交金额',
850
- 'f_oughtamount': '应交气量',
851
- 'f_whether_pay': '是否缴费',
852
- 'f_book_name': '抄表册',
853
- 'f_meter_book_sort': '册内排序',
854
- 'f_input_person': '录入人员',
855
- 'f_operator': '下发人员',
856
- 'f_meter_classify': '气表分类',
857
- 'f_meter_style': '气表型号',
858
- 'f_accounts_state': '下账标识',
859
- 'f_user_phone': '客户电话',
860
- 'f_adjustable_id': '表箱号'
837
+ // 导出列要和查询列相同
838
+ excelHeaders: {
839
+ 'f_user_id': '表编号',
840
+ 'f_meternumber': '表号',
841
+ 'f_inputtor': '抄表员',
842
+ 'f_balance': '上期结余',
843
+ 'f_last_input_date': '上次抄表',
844
+ 'f_hand_date': '下发时间',
845
+ 'f_input_date': '抄表日期',
846
+ 'f_userinfo_code': '客户编号',
847
+ 'f_address': '客户地址',
848
+ 'f_residential_area': '小区名称',
849
+ 'f_user_name': '客户姓名',
850
+ 'f_last_tablebase': '上期底数',
851
+ 'f_tablebase': '本期指数',
852
+ 'f_oughtfee': '应交金额',
853
+ 'f_oughtamount': '应交气量',
854
+ 'f_whether_pay': '是否缴费',
855
+ 'f_all_oughtfee': '总欠费金额',
856
+ 'f_book_name': '抄表册',
857
+ 'f_meter_book_sort': '册内排序',
858
+ 'f_input_person': '录入人员',
859
+ 'f_operator': '下发人员',
860
+ 'f_meter_classify': '气表分类',
861
+ 'f_meter_style': '气表型号',
862
+ 'f_accounts_state': '下账标识',
863
+ 'f_user_phone': '客户电话',
864
+ 'f_adjustable_id': '表箱号'
865
+ },
866
+ examine: true,
867
+ customCal: false
861
868
  },
862
- examine: true,
863
- customCal: false
864
- },
865
- meter_state: false, // 是否显示计划下发按钮
866
- downModel: {
867
- downDate: Vue.$login.toStandardTimeString(),
868
- downWay: 'downWithUserfiles',
869
- downInputtor: []
870
- },
871
- inputtorModel: {
872
- inputtor: [],
873
- reason: ''
874
- },
875
- auditState: [{label: '全部', value: ''}, {label: '未抄表', value: '未抄表'}, {label: '待审核', value: '待审核'}, {label: '已抄表', value: '已抄表'}],
869
+ meter_state: false, // 是否显示计划下发按钮
870
+ downModel: {
871
+ downDate: Vue.$login.toStandardTimeString(),
872
+ downWay: 'downWithUserfiles',
873
+ downInputtor: []
874
+ },
875
+ inputtorModel: {
876
+ inputtor: [],
877
+ reason: ''
878
+ },
879
+ auditState: [{label: '全部', value: ''}, {label: '未抄表', value: '未抄表'}, {label: '待审核', value: '待审核'}, {label: '已抄表', value: '已抄表'}],
876
880
 
877
881
  plans: [], // 记录当前行是否被勾选
878
882
  all: false, // 是否全选
@@ -6,7 +6,7 @@
6
6
  </header>
7
7
  <article slot="modal-body" class="modal-body" style="height: auto" v-show="!showTable">
8
8
  <div class="flex-row flex-deviceinfo">
9
- <div class="flex-row flex-two-info panel panel-default" v-for="row in devicesinfo">
9
+ <div class="flex-row flex-two-info panel panel-default" v-for="(index,row) in devicesinfo">
10
10
  <avatar-upload :img-src.sync="row.img.content" :filename.sync="row.img.filename"></avatar-upload>
11
11
  <form class="form-horizontal select-overspread " style="flex: 1;">
12
12
  <div style="margin-top: 2%">
@@ -31,7 +31,7 @@
31
31
  <div class="col-sm-6 form-group" style="padding-right: 5px;" :class="[!row.f_brand && (row.f_devices_type == '燃气壁挂炉' || row.f_devices_type == '燃气热水器') ? 'has-error' : '']">
32
32
  <label class="font_normal_body">设备品牌</label>
33
33
  <v-select :value.sync="row.f_brand" v-model="row.f_brand"
34
- :options='row.devicebrands' placeholder='设备品牌' :value-single="true"
34
+ :options='devicebrands[index]' placeholder='设备品牌' :value-single="true"
35
35
  close-on-select></v-select>
36
36
  </div>
37
37
  <div class="col-sm-6 form-group" style="padding-right: 5px;">
@@ -94,7 +94,7 @@
94
94
  <datepicker placeholder="生产日期" style="width: 60%"
95
95
  v-model="row.f_make_date"
96
96
  :value.sync="row.f_make_date"
97
- :onchange="expireDate($index)"
97
+ :onchange="expireDate(index)"
98
98
  :format="'yyyy-MM-dd HH:mm:ss'">
99
99
  </datepicker>
100
100
  </div>
@@ -102,7 +102,7 @@
102
102
  <label class="font_normal_body">使用年限</label>
103
103
  <input type="number" class="input_search" style="width: 60%" v-model="row.f_service_life"
104
104
  :value.sync="row.f_service_life"
105
- :onchange="expireDate($index)" >
105
+ :onchange="expireDate(index)" >
106
106
  </div>
107
107
  </div>
108
108
  <div class="row auto" style="margin-left: 10px;">
@@ -152,7 +152,7 @@
152
152
  <label class="font_normal_body">管道类型</label>
153
153
  <v-select :value.sync="row.f_pipe_type" v-model="row.f_pipe_type"
154
154
  @change="changepipetpye(row)"
155
- :options='row.pipetypes' placeholder='管道类型' :value-single="true"
155
+ :options='pipetypes[index]' placeholder='管道类型' :value-single="true"
156
156
  close-on-select></v-select>
157
157
  </div>
158
158
  <div class="col-sm-6 form-group" style="padding-right: 5px;" title="参数名称:[连接方式]">
@@ -168,7 +168,7 @@
168
168
  <datepicker placeholder="连接管安装日期" style="width: 60%"
169
169
  v-model="row.f_pipeinstall_date"
170
170
  :value.sync="row.f_pipeinstall_date"
171
- :onchange="pipeExpireDate($index)"
171
+ :onchange="pipeExpireDate(index)"
172
172
  :format="'yyyy-MM-dd HH:mm:ss'">
173
173
  </datepicker>
174
174
  </div>
@@ -186,7 +186,7 @@
186
186
  <label class="font_normal_body">使用年限</label>
187
187
  <input type="number" class="input_search" style="width: 60%" v-model="row.f_service_liferg"
188
188
  :value.sync="row.f_service_liferg"
189
- :onchange="pipeExpireDate($index)" >
189
+ :onchange="pipeExpireDate(index)" >
190
190
  </div>
191
191
  <div class="col-sm-6 form-group" style="padding-right: 5px;">
192
192
  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;米&nbsp;&nbsp;&nbsp;数</label>
@@ -296,6 +296,7 @@ export default {
296
296
  devicetypes: this.$appdata.getParam('设备类型'),
297
297
  devicebrands: [],
298
298
  pipetypes:[],
299
+ devicesinfo: [],
299
300
  pipeways: this.$appdata.getParam('连接方式'),
300
301
  pipetypeparams: this.$appdata.getParam('管道类型'),
301
302
  WatchPurchases: this.$appdata.getParam('购买方式'),
@@ -324,6 +325,9 @@ export default {
324
325
  default: undefined
325
326
  }
326
327
  },
328
+ ready () {
329
+ console.log('设备信息,,,,', this.devicesinfo)
330
+ },
327
331
  computed: {
328
332
  },
329
333
  methods: {
@@ -340,6 +344,7 @@ export default {
340
344
  //品牌根据类型转换
341
345
  if (this.devicesinfo[index].f_devices_type !== '' && this.devicesinfo[index].f_devices_type !== null) {
342
346
  row.devicebrands = this.$appdata.getParam(this.devicesinfo[index].f_devices_type)
347
+ this.$set(`devicebrands[${index}]`,row.devicebrands )
343
348
  if (row.f_devices_type === '燃气计量装置'){
344
349
  row.pipetypes.push(
345
350
  {label: '燃气连接管', value: '燃气连接管'}
@@ -352,6 +357,7 @@ export default {
352
357
  )
353
358
  }
354
359
  }
360
+ this.$set(`pipetypes[${index}]`,row.pipetypes )
355
361
  console.log("筛选之后",row.pipetypes)
356
362
  }
357
363
  },
@@ -379,7 +385,6 @@ export default {
379
385
  }
380
386
  },
381
387
  pipeExpireDate (index) {
382
- debugger
383
388
  if (this.devicesinfo[index].f_pipeinstall_date === '' || this.devicesinfo[index].f_pipeinstall_date === undefined ||
384
389
  this.devicesinfo[index].f_service_liferg === 0 || this.devicesinfo[index].f_service_liferg === undefined) {
385
390