sale-client 3.6.304 → 3.6.306

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/.npmignore ADDED
@@ -0,0 +1,12 @@
1
+ src/bootstrap
2
+ .idea/
3
+ .DS_Store
4
+ node_modules/
5
+ dist/
6
+ examples/
7
+ gradle/
8
+ npm-debug.log
9
+ selenium-debug.log
10
+ test/unit/coverage
11
+ test/e2e/reports
12
+ lib/**/lib
package/package.json CHANGED
@@ -1,120 +1,120 @@
1
- {
2
- "name": "sale-client",
3
- "version": "3.6.304",
4
- "description": "收费模块前台组件",
5
- "main": "src/index.js",
6
- "scripts": {
7
- "example": "node build/example-server.js",
8
- "dev": "webpack-dev-server --config ./build/dev-server.js",
9
- "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
10
- "unit": "karma start test/unit/karma.conf.js",
11
- "build": "rimraf lib && mkdirp lib && cross-env webpack --progress --hide-modules --config build/webpack.prod.conf.js",
12
- "e2e": "node test/e2e/runner.js",
13
- "release": "bash build/release.sh"
14
- },
15
- "repository": {
16
- "type": "git",
17
- "url": "https://gitee.com/aote/product.git"
18
- },
19
- "dependencies": {
20
- "crypto-js": "^4.1.1",
21
- "examples": "^0.1.0",
22
- "js-file-download": "0.4.12",
23
- "less-loader": "^2.2.3",
24
- "qrcodejs2": "^0.0.2",
25
- "vue": "^1.0.17",
26
- "webpack-dev-server": "^2.11.5",
27
- "vue-client": "1.24.146",
28
- "yarn": "^1.22.10"
29
- },
30
- "devDependencies": {
31
- "address-client": "3.2.105-yangchun",
32
- "axios": "0.15.3",
33
- "babel-core": "^6.0.0",
34
- "babel-loader": "^6.0.0",
35
- "babel-plugin-transform-runtime": "^6.0.0",
36
- "babel-preset-es2015": "^6.0.0",
37
- "babel-preset-stage-2": "^6.0.0",
38
- "chai": "^3.5.0",
39
- "co": "^4.6.0",
40
- "compression-webpack-plugin": "1.1.2",
41
- "connect-history-api-fallback": "^1.1.0",
42
- "cross-env": "^1.0.7",
43
- "cross-spawn": "^2.1.5",
44
- "css-loader": "^0.23.0",
45
- "echarts": "^4.1.0",
46
- "eslint": "^3.19.0",
47
- "eslint-config-standard": "^10.2.1",
48
- "eslint-friendly-formatter": "^3.0.0",
49
- "eslint-loader": "^1.7.1",
50
- "eslint-plugin-html": "^3.0.0",
51
- "eslint-plugin-import": "^2.7.0",
52
- "eslint-plugin-node": "^5.2.0",
53
- "eslint-plugin-promise": "^3.4.0",
54
- "eslint-plugin-standard": "^3.0.1",
55
- "eventsource-polyfill": "^0.9.6",
56
- "express": "^4.13.3",
57
- "extract-text-webpack-plugin": "^3.0.2",
58
- "terser-webpack-plugin-legacy": "^1.2.5",
59
- "file-loader": "^0.8.4",
60
- "filemanager-webpack-plugin": "^2.0.5",
61
- "function-bind": "^1.0.2",
62
- "html-webpack-plugin": "^2.8.1",
63
- "http-proxy-middleware": "^0.11.0",
64
- "inject-loader": "^2.0.1",
65
- "isparta-loader": "^2.0.0",
66
- "jasmine-core": "^2.4.1",
67
- "jquery": "^3.3.1",
68
- "jsencrypt": "3.0.0-rc.1",
69
- "json-loader": "^0.5.4",
70
- "karma": "^1.4.1",
71
- "karma-chrome-launcher": "^2.2.0",
72
- "karma-coverage": "^1.1.1",
73
- "karma-mocha": "^1.3.0",
74
- "karma-sinon-chai": "^1.3.1",
75
- "karma-sourcemap-loader": "^0.3.7",
76
- "karma-spec-reporter": "0.0.31",
77
- "karma-webpack": "^2.0.2",
78
- "ldap-clients": "3.0.62",
79
- "less": "^2.7.3",
80
- "manage-client": "3.1.8-88",
81
- "mkdirp": "^0.5.1",
82
- "mocha": "^3.2.0",
83
- "moment": "2.24.0",
84
- "ncp": "^2.0.0",
85
- "nightwatch": "^0.8.18",
86
- "qrcodejs2": "0.0.2",
87
- "rimraf": "^2.5.0",
88
- "selenium-server": "2.52.0",
89
- "sinon": "^2.1.0",
90
- "sinon-chai": "^2.8.0",
91
- "style": "0.0.3",
92
- "style-loader": "^0.20.3",
93
- "system-clients": "3.2.61",
94
- "url-loader": "^0.5.7",
95
- "vue-clipboard2": "0.3.1",
96
- "vue-hot-reload-api": "^1.2.0",
97
- "vue-html-loader": "^1.0.0",
98
- "vue-loader": "^8.2.1",
99
- "vue-resource": "^1.5.0",
100
- "vue-router": "^0.7.13",
101
- "vue-strap": "^1.0.9",
102
- "vue-style-loader": "^1.0.0",
103
- "vue-validator": "2.1.7",
104
- "webpack": "^3.12.0",
105
- "webpack-dev-middleware": "^1.4.0",
106
- "webpack-hot-middleware": "^2.6.0",
107
- "webpack-merge": "^0.8.3",
108
- "webpack-parallel-uglify-plugin": "^1.0.0",
109
- "weixin-js-sdk": "^1.2.0"
110
- },
111
- "keywords": [
112
- "selling-clients"
113
- ],
114
- "author": "张桥",
115
- "license": "ISC",
116
- "directories": {
117
- "example": "examples",
118
- "test": "test"
119
- }
120
- }
1
+ {
2
+ "name": "sale-client",
3
+ "version": "3.6.306",
4
+ "description": "收费模块前台组件",
5
+ "main": "src/index.js",
6
+ "scripts": {
7
+ "example": "node build/example-server.js",
8
+ "dev": "webpack-dev-server --config ./build/dev-server.js",
9
+ "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
10
+ "unit": "karma start test/unit/karma.conf.js",
11
+ "build": "rimraf lib && mkdirp lib && cross-env webpack --progress --hide-modules --config build/webpack.prod.conf.js",
12
+ "e2e": "node test/e2e/runner.js",
13
+ "release": "bash build/release.sh"
14
+ },
15
+ "repository": {
16
+ "type": "git",
17
+ "url": "https://gitee.com/aote/product.git"
18
+ },
19
+ "dependencies": {
20
+ "crypto-js": "^4.1.1",
21
+ "examples": "^0.1.0",
22
+ "js-file-download": "0.4.12",
23
+ "less-loader": "^2.2.3",
24
+ "qrcodejs2": "^0.0.2",
25
+ "vue": "^1.0.17",
26
+ "webpack-dev-server": "^2.11.5",
27
+ "vue-client": "1.24.146",
28
+ "yarn": "^1.22.10"
29
+ },
30
+ "devDependencies": {
31
+ "address-client": "3.2.105-yangchun",
32
+ "axios": "0.15.3",
33
+ "babel-core": "^6.0.0",
34
+ "babel-loader": "^6.0.0",
35
+ "babel-plugin-transform-runtime": "^6.0.0",
36
+ "babel-preset-es2015": "^6.0.0",
37
+ "babel-preset-stage-2": "^6.0.0",
38
+ "chai": "^3.5.0",
39
+ "co": "^4.6.0",
40
+ "compression-webpack-plugin": "1.1.2",
41
+ "connect-history-api-fallback": "^1.1.0",
42
+ "cross-env": "^1.0.7",
43
+ "cross-spawn": "^2.1.5",
44
+ "css-loader": "^0.23.0",
45
+ "echarts": "^4.1.0",
46
+ "eslint": "^3.19.0",
47
+ "eslint-config-standard": "^10.2.1",
48
+ "eslint-friendly-formatter": "^3.0.0",
49
+ "eslint-loader": "^1.7.1",
50
+ "eslint-plugin-html": "^3.0.0",
51
+ "eslint-plugin-import": "^2.7.0",
52
+ "eslint-plugin-node": "^5.2.0",
53
+ "eslint-plugin-promise": "^3.4.0",
54
+ "eslint-plugin-standard": "^3.0.1",
55
+ "eventsource-polyfill": "^0.9.6",
56
+ "express": "^4.13.3",
57
+ "extract-text-webpack-plugin": "^3.0.2",
58
+ "terser-webpack-plugin-legacy": "^1.2.5",
59
+ "file-loader": "^0.8.4",
60
+ "filemanager-webpack-plugin": "^2.0.5",
61
+ "function-bind": "^1.0.2",
62
+ "html-webpack-plugin": "^2.8.1",
63
+ "http-proxy-middleware": "^0.11.0",
64
+ "inject-loader": "^2.0.1",
65
+ "isparta-loader": "^2.0.0",
66
+ "jasmine-core": "^2.4.1",
67
+ "jquery": "^3.3.1",
68
+ "jsencrypt": "3.0.0-rc.1",
69
+ "json-loader": "^0.5.4",
70
+ "karma": "^1.4.1",
71
+ "karma-chrome-launcher": "^2.2.0",
72
+ "karma-coverage": "^1.1.1",
73
+ "karma-mocha": "^1.3.0",
74
+ "karma-sinon-chai": "^1.3.1",
75
+ "karma-sourcemap-loader": "^0.3.7",
76
+ "karma-spec-reporter": "0.0.31",
77
+ "karma-webpack": "^2.0.2",
78
+ "ldap-clients": "3.0.62",
79
+ "less": "^2.7.3",
80
+ "manage-client": "3.1.8-88",
81
+ "mkdirp": "^0.5.1",
82
+ "mocha": "^3.2.0",
83
+ "moment": "2.24.0",
84
+ "ncp": "^2.0.0",
85
+ "nightwatch": "^0.8.18",
86
+ "qrcodejs2": "0.0.2",
87
+ "rimraf": "^2.5.0",
88
+ "selenium-server": "2.52.0",
89
+ "sinon": "^2.1.0",
90
+ "sinon-chai": "^2.8.0",
91
+ "style": "0.0.3",
92
+ "style-loader": "^0.20.3",
93
+ "system-clients": "3.2.61",
94
+ "url-loader": "^0.5.7",
95
+ "vue-clipboard2": "0.3.1",
96
+ "vue-hot-reload-api": "^1.2.0",
97
+ "vue-html-loader": "^1.0.0",
98
+ "vue-loader": "^8.2.1",
99
+ "vue-resource": "^1.5.0",
100
+ "vue-router": "^0.7.13",
101
+ "vue-strap": "^1.0.9",
102
+ "vue-style-loader": "^1.0.0",
103
+ "vue-validator": "2.1.7",
104
+ "webpack": "^3.12.0",
105
+ "webpack-dev-middleware": "^1.4.0",
106
+ "webpack-hot-middleware": "^2.6.0",
107
+ "webpack-merge": "^0.8.3",
108
+ "webpack-parallel-uglify-plugin": "^1.0.0",
109
+ "weixin-js-sdk": "^1.2.0"
110
+ },
111
+ "keywords": [
112
+ "selling-clients"
113
+ ],
114
+ "author": "张桥",
115
+ "license": "ISC",
116
+ "directories": {
117
+ "example": "examples",
118
+ "test": "test"
119
+ }
120
+ }
package/src/.npmignore ADDED
@@ -0,0 +1 @@
1
+
@@ -169,8 +169,9 @@
169
169
  <button v-if="row.f_meter_type.includes('物联网表')"
170
170
  class="button_search" type="button" @click="openUser">开户
171
171
  </button>
172
- <button v-if="row.f_meter_type.includes('物联网表') && valveLimit && row.f_network_valve === '1'"
173
- class="button_search" type="button" @click="valvecontrol">开关阀
172
+ <button v-if="row.f_meter_type.includes('物联网表') && valveLimit && (row.f_network_valve === '1' || (row.f_table_state === '停用' && row.f_network_valve === null))"
173
+ class="button_search" type="button" @click="valvecontrol">
174
+ 开关阀
174
175
  </button>
175
176
  <button v-if="row.f_meter_type.includes('物联网表') && autoValveLimit"
176
177
  class="button_search" type="button" @click="zdfk">开关自动阀控
@@ -524,7 +525,6 @@ export default {
524
525
  this.operateReason = ''
525
526
  },
526
527
  // 开关阀操作
527
- // 开关阀操作
528
528
  async valveoperate(oper) {
529
529
  let msg = oper ? '开阀' : '关阀';
530
530
  let delaySeconds = 0; // 初始化 delaySeconds 变量
@@ -4,7 +4,6 @@
4
4
  <template partial='head' >
5
5
  <tr>
6
6
  <th><nobr>序号</nobr></th>
7
-
8
7
  <th><nobr>气量</nobr></th>
9
8
  <th><nobr>应交</nobr></th>
10
9
  <th><nobr>付款方式</nobr></th>
@@ -15,6 +14,7 @@
15
14
  <th><nobr>操作时间 </nobr></th>
16
15
  <th><nobr>操作员 </nobr></th>
17
16
  <th><nobr>备注</nobr></th>
17
+ <th><nobr>写卡状态</nobr></th>
18
18
  </tr>
19
19
  </template>
20
20
  <template partial='body' >
@@ -31,6 +31,7 @@
31
31
  <td style="text-align:center;white-space:nowrap;">{{row.operate_date}}</td>
32
32
  <td style="text-align:center;white-space:nowrap;">{{row.f_operator}}</td>
33
33
  <td style="text-align:left;white-space:nowrap;">{{row.note}}{{row.f_write_card}}</td>
34
+ <td style="text-align:center;white-space:nowrap;">{{row.f_write_card}}</td>
34
35
  </tr>
35
36
  </template>
36
37
  </data-grid>
@@ -80,6 +81,7 @@
80
81
  resolveMsg: null
81
82
  })
82
83
  this.model.rows = record.data
84
+ console.log('record.data------------>',record.data)
83
85
  this.hasCardCental = this.$appdata.getSingleValue('多收提示') ? this.$appdata.getSingleValue('多收提示') : false
84
86
  if (this.hasCardCental && this.model.rows.length > 0 && (this.model.rows[0].type == '发卡售气' || this.model.rows[0].type == '卡表收费')) {
85
87
  let checkdata = this.model.rows[0].operate_date.substr(0, 10)
@@ -332,9 +332,6 @@
332
332
  <th>
333
333
  <nobr>用气量</nobr>
334
334
  </th>
335
- <th>
336
- <nobr>违约金</nobr>
337
- </th>
338
335
  <th>
339
336
  <nobr>用气金额</nobr>
340
337
  </th>
@@ -489,9 +486,6 @@
489
486
  <td style="text-align: center;">
490
487
  <nobr>{{row.f_oughtamount}}</nobr>
491
488
  </td>
492
- <td style="text-align: center;">
493
- <nobr>{{row.overdue}}</nobr>
494
- </td>
495
489
  <td style="text-align: center;">
496
490
  <nobr>{{row.f_oughtfee}}</nobr>
497
491
  </td>
@@ -799,7 +793,6 @@
799
793
  'f_last_tablebase': '上期底数',
800
794
  'f_tablebase': '本期底数',
801
795
  'f_oughtamount': '用气量',
802
- 'overdue': '违约金',
803
796
  'f_oughtfee': '用气金额',
804
797
  'f_debt_money': '已交金额',
805
798
  'f_actual_arrears': '欠费金额',
@@ -317,9 +317,6 @@
317
317
  <th>
318
318
  <nobr>用气量</nobr>
319
319
  </th>
320
- <th>
321
- <nobr>违约金</nobr>
322
- </th>
323
320
  <th>
324
321
  <nobr>用气金额</nobr>
325
322
  </th>
@@ -459,9 +456,6 @@
459
456
  <td style="text-align: center;">
460
457
  <nobr>{{row.f_oughtamount}}</nobr>
461
458
  </td>
462
- <td style="text-align: center;">
463
- <nobr>{{row.overdue}}</nobr>
464
- </td>
465
459
  <td style="text-align: center;">
466
460
  <nobr>{{row.f_oughtfee}}</nobr>
467
461
  </td>
@@ -753,7 +747,7 @@
753
747
  ],
754
748
  defaultPrint: ['f_userinfo_code', 'f_address', 'f_user_name', 'f_meternumber'],
755
749
  excelHeaders:{'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_address': '客户地址', 'f_zones': '片区','phone': '客户手机', 'f_meternumber': '表号','ym_data': '数据年月',
756
- 'f_last_tablebase': '上期底数', 'f_tablebase': '本期底数', 'f_oughtamount': '用气量', 'overdue': '违约金', 'f_oughtfee': '用气金额', 'f_debt_money': '已交金额',
750
+ 'f_last_tablebase': '上期底数', 'f_tablebase': '本期底数', 'f_oughtamount': '用气量', 'f_oughtfee': '用气金额', 'f_debt_money': '已交金额',
757
751
  'f_actual_arrears': '欠费金额','f_balance': '上期余额','f_curbalance': '本期余额',
758
752
  'f_accounts_state': '下账状态', 'f_sellinggas_operate_date': '收费时间', 'f_inputtor': '抄表员', 'f_book_slice_area': '表册片区',
759
753
  'f_hand_date': '下发日期', 'f_input_date': '录入日期', 'f_meter_state': '抄表状态', 'f_hand_state': '记录状态',
@@ -317,9 +317,6 @@
317
317
  <th>
318
318
  <nobr>用气量</nobr>
319
319
  </th>
320
- <th>
321
- <nobr>违约金</nobr>
322
- </th>
323
320
  <th>
324
321
  <nobr>用气金额</nobr>
325
322
  </th>
@@ -459,9 +456,6 @@
459
456
  <td style="text-align: center;">
460
457
  <nobr>{{row.f_oughtamount}}</nobr>
461
458
  </td>
462
- <td style="text-align: center;">
463
- <nobr>{{row.overdue}}</nobr>
464
- </td>
465
459
  <td style="text-align: center;">
466
460
  <nobr>{{row.f_oughtfee}}</nobr>
467
461
  </td>
@@ -708,7 +702,7 @@
708
702
  ],
709
703
  defaultPrint: ['f_userinfo_code', 'f_address', 'f_user_name', 'f_meternumber'],
710
704
  excelHeaders:{'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_address': '客户地址', 'f_zones': '片区','phone': '客户手机', 'f_meternumber': '表号','ym_data': '数据年月',
711
- 'f_last_tablebase': '上期底数', 'f_tablebase': '本期底数', 'f_oughtamount': '用气量', 'overdue': '违约金', 'f_oughtfee': '用气金额', 'f_debt_money': '已交金额',
705
+ 'f_last_tablebase': '上期底数', 'f_tablebase': '本期底数', 'f_oughtamount': '用气量', 'f_oughtfee': '用气金额', 'f_debt_money': '已交金额',
712
706
  'f_actual_arrears': '欠费金额','f_balance': '上期余额','f_curbalance': '本期余额',
713
707
  'f_accounts_state': '下账状态', 'f_sellinggas_operate_date': '收费时间', 'f_inputtor': '抄表员', 'f_book_slice_area': '表册片区',
714
708
  'f_hand_date': '下发日期', 'f_input_date': '录入日期', 'f_meter_state': '抄表状态', 'f_hand_state': '记录状态',
@@ -1,92 +1,92 @@
1
- <template>
2
- <div class="flex" style="height: 90%;overflow-y: scroll">
3
- <mix-price-info :data="data" v-if="data.f_price_type === '固定气价'"></mix-price-info>
4
- <stairinfo :data="data" v-if="data.f_price_type === '阶梯气价'"></stairinfo>
5
- <!-- <valueaddinfo :data="data" v-ref:valueaddinfo></valueaddinfo>-->
6
- <safe-check :data="data"></safe-check>
7
- <service-repair :data="data" v-if="name==='维修情况查询'"></service-repair>
8
- <bill-message @setstate="setstate" :state="state" :data="data"></bill-message>
9
- </div>
10
- </template>
11
-
12
- <script>
13
- /**
14
- *客户相关信息
15
- */
16
-
17
- import MixPriceInfo from '../../components/revenue/base/leftview/MixPriceInfo'
18
- import SafeCheck from '../../components/revenue/base/leftview/SafeCheck'
19
- import ServiceRepair from '../../components/revenue/base/leftview/ServiceRepair'
20
- export default {
21
- title: '客户相关信息',
22
- data () {
23
- return {
24
- name: ''
25
- }
26
- },
27
- components: {MixPriceInfo, SafeCheck, ServiceRepair},
28
- props: {
29
- data: {
30
- type: Object
31
- },
32
- cardData: {
33
- type: Object,
34
- default: function () {
35
- return {}
36
- }
37
- },
38
- state:{
39
- type: String,
40
- default:null
41
- }
42
- },
43
- ready () {
44
- this.getAuthority()
45
- },
46
- methods: {
47
- getAuthority () {
48
- if (this.$login.r.find(value => value == '维修情况查询')) {
49
- this.name = '维修情况查询'
50
- console.log(this.name)
51
- }
52
- console.log('查看权限', this.$login.r)
53
- },
54
- dealMsg (obj) {
55
- this.$dispatch('deal-msg', obj)
56
- },
57
- setstate(state){
58
- this.$dispatch('setstate',state)
59
- }
60
- }
61
- }
62
- </script>
63
- <style lang="less">
64
- #mulit-info-class {
65
- width: 280px;
66
- margin-right: 20px;
67
- overflow-y: auto;
68
- > div {
69
- height: auto;
70
- margin-bottom: 8px;
71
- }
72
- }
73
- // 内容显示样式
74
- .control-label {
75
- height: 23px;
76
- border-right: 1px solid #F2F6FA;
77
- margin-bottom: 0;
78
- text-align: left;
79
- }
80
-
81
- .info-content {
82
- padding:6px;
83
- span {
84
- padding-left: 5px;
85
- }
86
- }
87
- // 信息区域的表格显示紧凑
88
- .self-table > tbody > tr > td {
89
- padding: 3px;
90
- text-align: center;
91
- }
92
- </style>
1
+ <template>
2
+ <div class="flex" style="height: 90%;overflow-y: scroll">
3
+ <mix-price-info :data="data" v-if="data.f_price_type === '固定气价'"></mix-price-info>
4
+ <stairinfo :data="data" v-if="data.f_price_type === '阶梯气价'"></stairinfo>
5
+ <!-- <valueaddinfo :data="data" v-ref:valueaddinfo></valueaddinfo>-->
6
+ <safe-check :data="data"></safe-check>
7
+ <service-repair :data="data" v-if="name==='维修情况查询'"></service-repair>
8
+ <bill-message @setstate="setstate" :state="state" :data="data"></bill-message>
9
+ </div>
10
+ </template>
11
+
12
+ <script>
13
+ /**
14
+ *客户相关信息
15
+ */
16
+
17
+ import MixPriceInfo from '../../components/revenue/base/leftview/MixPriceInfo'
18
+ import SafeCheck from '../../components/revenue/base/leftview/SafeCheck'
19
+ import ServiceRepair from '../../components/revenue/base/leftview/ServiceRepair'
20
+ export default {
21
+ title: '客户相关信息',
22
+ data () {
23
+ return {
24
+ name: ''
25
+ }
26
+ },
27
+ components: {MixPriceInfo, SafeCheck, ServiceRepair},
28
+ props: {
29
+ data: {
30
+ type: Object
31
+ },
32
+ cardData: {
33
+ type: Object,
34
+ default: function () {
35
+ return {}
36
+ }
37
+ },
38
+ state:{
39
+ type: String,
40
+ default:null
41
+ }
42
+ },
43
+ ready () {
44
+ this.getAuthority()
45
+ },
46
+ methods: {
47
+ getAuthority () {
48
+ if (this.$login.r.find(value => value == '维修情况查询')) {
49
+ this.name = '维修情况查询'
50
+ console.log(this.name)
51
+ }
52
+ console.log('查看权限', this.$login.r)
53
+ },
54
+ dealMsg (obj) {
55
+ this.$dispatch('deal-msg', obj)
56
+ },
57
+ setstate(state){
58
+ this.$dispatch('setstate',state)
59
+ }
60
+ }
61
+ }
62
+ </script>
63
+ <style lang="less">
64
+ #mulit-info-class {
65
+ width: 280px;
66
+ margin-right: 20px;
67
+ overflow-y: auto;
68
+ > div {
69
+ height: auto;
70
+ margin-bottom: 8px;
71
+ }
72
+ }
73
+ // 内容显示样式
74
+ .control-label {
75
+ height: 23px;
76
+ border-right: 1px solid #F2F6FA;
77
+ margin-bottom: 0;
78
+ text-align: left;
79
+ }
80
+
81
+ .info-content {
82
+ padding:6px;
83
+ span {
84
+ padding-left: 5px;
85
+ }
86
+ }
87
+ // 信息区域的表格显示紧凑
88
+ .self-table > tbody > tr > td {
89
+ padding: 3px;
90
+ text-align: center;
91
+ }
92
+ </style>
@@ -329,9 +329,6 @@
329
329
  <th>
330
330
  <nobr>用气量</nobr>
331
331
  </th>
332
- <th>
333
- <nobr>违约金</nobr>
334
- </th>
335
332
  <th>
336
333
  <nobr>用气金额</nobr>
337
334
  </th>
@@ -486,9 +483,6 @@
486
483
  <td style="text-align: center;">
487
484
  <nobr>{{row.f_oughtamount}}</nobr>
488
485
  </td>
489
- <td style="text-align: center;">
490
- <nobr>{{row.overdue}}</nobr>
491
- </td>
492
486
  <td style="text-align: center;">
493
487
  <nobr>{{row.f_oughtfee}}</nobr>
494
488
  </td>
@@ -794,7 +788,6 @@
794
788
  'f_last_tablebase': '上期底数',
795
789
  'f_tablebase': '本期底数',
796
790
  'f_oughtamount': '用气量',
797
- 'overdue': '违约金',
798
791
  'f_oughtfee': '用气金额',
799
792
  'f_debt_money': '已交金额',
800
793
  'f_actual_arrears': '欠费金额',
@@ -326,7 +326,23 @@
326
326
  {{ row.f_input_date }}
327
327
  </div>
328
328
  </td>
329
- <td style="text-align: center;">{{ row.f_last_tablebase }}</td>
329
+ <td style="text-align: center;">
330
+ <div v-if="!(row.f_user_type==='非民用')">
331
+ {{ row.f_last_tablebase }}
332
+ </div>
333
+ <div v-if="row.f_user_type==='非民用' && row.f_meter_state === '未抄表' && row.states !== 0">
334
+ <input type="text" class="form-control" v-model="row.f_last_tablebase"
335
+ @blur="$parent.$parent.$parent.enter(row)"
336
+ v-next-el="{id: $index+1}" :id="$index" style="width: 100px;padding: 6px;"
337
+ :disabled="row.state === '开始'"
338
+ @change="row.f_card_reason = '替换表抄表'"
339
+ @focus="$parent.$parent.$parent.clearError(row)">
340
+ </div>
341
+ <div v-if="row.f_user_type==='非民用' && (row.f_meter_state !== '未抄表' || row.states === 0)">
342
+ {{ row.f_last_tablebase }}
343
+ </div>
344
+
345
+ </td>
330
346
  <td style="text-align: center;">
331
347
  <div class="form-group" style="margin-bottom:0px;" :class="{
332
348
  'has-success has-feedback': row.f_tablebase ? ((row.f_last_tablebase-0) <= (row.f_tablebase -0)) : false,
@@ -362,7 +378,7 @@
362
378
  </td>
363
379
 
364
380
 
365
- <td style="text-align: center;">{{ row.f_actualtablebase }}</td>
381
+ <td style="text-align: center;">{{row.f_tablebase - row.f_last_tablebase}}</td>
366
382
  <td style="text-align: center;">{{ row.total_gas - (row.f_tablebase - row.f_initial_base) }}</td>
367
383
  <td style="text-align: center;">
368
384
  <div class="form-group" style="margin-bottom:0px;"