sale-client 3.6.260 → 3.6.261-test

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.
@@ -1,94 +1,97 @@
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/getWarningMsg': {
79
- target: localUrl
80
- },
81
- '/rs/sql': {
82
- target: serverRul
83
- },
84
- '/webmeter': {
85
- target: serverRul
86
- },
87
- '/rs': {
88
- target: serverRul
89
- // changeOrigin: true
90
- }
91
- }
92
- }
93
- }
94
- module.exports = merge(baseConfig, devConfig)
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)
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sale-client",
3
- "version": "3.6.260",
3
+ "version": "3.6.261-test",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
@@ -163,9 +163,9 @@
163
163
  <input class="input_search" style="width:60%" type="text" v-validate:f_serial_number='{required: true }'
164
164
  v-model="model.f_serial_number" placeholder="业务单号">
165
165
  </div>
166
- <div class="col-sm-4" v-if="model.f_payment == '银行转账'" :class="[$v.f_serial_number.required || $v.f_serial_number.dctest ? 'has-error' : 'has-success']">
166
+ <div class="col-sm-4" v-if="model.f_payment == '银行转账'" >
167
167
  <label for="f_serial_number" class=" font_normal_body">银行流水</label>
168
- <input class="input_search" style="width:60%" type="text" v-validate:f_serial_number='{required: true }'
168
+ <input class="input_search" style="width:60%" type="text"
169
169
  v-model="model.f_serial_number" placeholder="银行流水">
170
170
  </div>
171
171
 
@@ -160,7 +160,7 @@
160
160
  class="button_search" type="button" @click="clearBarrier">清除障碍</button>
161
161
  <button v-if="row.f_meter_type.includes('物联网表')"
162
162
  class="button_search" type="button" @click="openUser">开户</button>
163
- <button v-if="row.f_meter_type.includes('物联网表')"
163
+ <button v-if="row.f_meter_type.includes('物联网表') && valveLimit"
164
164
  class="button_search" type="button" @click="valvecontrol">开关阀</button>
165
165
  <button v-if="row.f_meter_type.includes('物联网表')"
166
166
  class="button_search" type="button" @click="zdfk">开关自动阀控</button>
@@ -13,13 +13,13 @@
13
13
  <input class="form-control col-sm-2"
14
14
  v-model="row.f_paper_name" placeholder="开票名称">
15
15
  </div>
16
- <div class="col-sm-6 form-group form-input-group">
16
+ <div class="col-sm-6 form-group form-input-group" :class="[ row.invoice_is_pax.length < 1 ? 'has-error' : '']">
17
17
  <nobr class="col-sm-4"><label class="control-label">是否征税:</label></nobr>
18
18
  <v-select v-model="row.invoice_is_pax"
19
19
  placeholder='请选择'
20
20
  :value.sync="row.invoice_is_pax"
21
21
  close-on-select
22
- :width="60" disabled
22
+ :width="60"
23
23
  :value-single="true"
24
24
  :search="false"
25
25
  :options='is_pax' clear-button>
@@ -56,7 +56,7 @@
56
56
  </article>
57
57
  <footer slot="modal-footer" class="modal-footer">
58
58
  <button type="button" class="btn button_search"
59
- :disabled="!(row.f_paper_name&&row.f_address_phone&&row.f_taxpayer_id.length>=16 && row.f_taxpayer_id.length<=18)"
59
+ :disabled="!(row.f_paper_name&&row.f_address_phone&&row.f_taxpayer_id.length>=16 && row.f_taxpayer_id.length<=18&&row.invoice_is_pax.length >0)"
60
60
  @click='confirm'>确认收费
61
61
  </button>
62
62
  </footer>
@@ -85,7 +85,7 @@ export default {
85
85
  },
86
86
  watch: {
87
87
  'row'(){
88
- this.row.invoice_is_pax=['征税']
88
+ this.row.invoice_is_pax = '征税'
89
89
  }
90
90
  },
91
91
  events: {}
@@ -73,6 +73,7 @@ export default {
73
73
  let result = await axios.post('/invoice/rs/logic/getInvoice', Object.assign({
74
74
  id,
75
75
  f_charge_type,
76
+ isTax: model.invoice_is_pax === '征税' ? '1' : '0',
76
77
  bill_type: model.f_print ? model.f_print : null,
77
78
  f_paper_name: model.f_paper_name,
78
79
  f_taxpayer_id: model.f_taxpayer_id,
@@ -167,7 +167,7 @@
167
167
  <footer slot="modal-footer" class="modal-footer">
168
168
  <button type="button" class="btn button_search"
169
169
  :disabled="!(row.f_paper_name&&row.f_address_phone)"
170
- @click='confirm'>确认收费
170
+ @click='confirm'>确认开票
171
171
  </button>
172
172
  </footer>
173
173
  </modal>
@@ -278,6 +278,7 @@
278
278
  },
279
279
  confirm () {
280
280
  this.row.f_print = this.row.f_print[0]
281
+ this.row.invoice_is_pax = this.invoice_is_pax
281
282
  this.eticket_msg = false
282
283
  this.disabled = false
283
284
  this.eticket_show = true
@@ -1,18 +1,18 @@
1
1
  <template>
2
2
  <tab-button v-ref:list>
3
- <tabs header="开票记录">
3
+ <tabs header="开票记录" v-if="permission('开票记录查询')">
4
4
  <e-ticket-record-list-query-v4></e-ticket-record-list-query-v4>
5
5
  </tabs>
6
- <tabs header="物联网表结算">
6
+ <tabs header="物联网表结算" v-if="permission('物联网表结算开票')">
7
7
  <e-ticket-open-iot-query-v4></e-ticket-open-iot-query-v4>
8
8
  </tabs>
9
- <tabs header="卡表结算">
9
+ <tabs header="卡表结算" v-if="permission('卡表结算开票')">
10
10
  <e-ticket-open-card-query-v4></e-ticket-open-card-query-v4>
11
11
  </tabs>
12
- <tabs header="机表抄表结算">
12
+ <tabs header="机表抄表结算" v-if="permission('机表抄表结算开票')">
13
13
  <e-ticket-open-hand-query-v4></e-ticket-open-hand-query-v4>
14
14
  </tabs>
15
- <tabs header="自定义开票">
15
+ <tabs header="自定义开票" v-if="permission('自定义开票')">
16
16
  <cust-query-eticket-query-v4></cust-query-eticket-query-v4>
17
17
  </tabs>
18
18
  </tab-button>
@@ -41,6 +41,13 @@ export default {
41
41
  },
42
42
  ready () {},
43
43
  methods: {
44
+ permission (name) {
45
+ if (!this.$login.r.find(value => value == name)) {
46
+ return false
47
+ } else {
48
+ return true
49
+ }
50
+ },
44
51
  cancel (obj) {
45
52
  this.listpage = true
46
53
  },
@@ -68,6 +68,10 @@
68
68
  @click="$parent.$parent.hidden()" class="button_spacing" style="float: right"></div>
69
69
  </div>
70
70
 
71
+ <export-excel :data="$parent.$parent.getCondition"
72
+ :field="$parent.$parent.getfield"
73
+ sqlurl="rs/logic/saleExport" sql-name="getIotHand" template-name='泰鹏抄表导出'
74
+ :choose-col="true"></export-excel>
71
75
  <div class="row" v-show="$parent.$parent.criteriaShow">
72
76
 
73
77
 
@@ -255,7 +259,20 @@ export default {
255
259
  orderFields: {
256
260
  f_userinfo_id: 'no'
257
261
  },
258
- getfield: {},
262
+ getfield: {
263
+ 'f_userinfo_code': '客户编号',
264
+ 'f_user_name': '客户姓名',
265
+ 'f_address': '客户地址',
266
+ 'f_user_phone': '用户电话',
267
+ 'f_idnumber': '身份证号',
268
+ 'f_card_id': '卡号',
269
+ 'f_meternumber': '表号',
270
+ 'f_table_state': '表具状态',
271
+ 'f_meter_base': '上期底数',
272
+ 'f_tablebase': '本期底数',
273
+ 'f_last_input_date': '最近一次抄表时间',
274
+ 'f_inputtor': '抄表员'
275
+ },
259
276
  outlet: '',
260
277
  filiale: '',
261
278
  condition2: '',
@@ -7,13 +7,13 @@
7
7
  <!-- <e-ticket-open-iot></e-ticket-open-iot>-->
8
8
  <!-- </tabs>-->
9
9
  <tabs header="卡表结算">
10
- <e-ticket-open-card></e-ticket-open-card>
10
+ <e-ticket-open-card-query-v4></e-ticket-open-card-query-v4>
11
11
  </tabs>
12
12
  <tabs header="抄表结算">
13
- <e-ticket-open-hand></e-ticket-open-hand>
13
+ <e-ticket-open-hand-query-v4></e-ticket-open-hand-query-v4>
14
14
  </tabs>
15
15
  <tabs header="自定义开票">
16
- <cust-query-eticket></cust-query-eticket>
16
+ <cust-query-eticket-query-v4></cust-query-eticket-query-v4>
17
17
  </tabs>
18
18
  </tab-button>
19
19
  </template>
@@ -291,7 +291,8 @@ export default {
291
291
  confirm () {
292
292
  this.eticket_msg = false
293
293
  this.eticket_show = true
294
- this.$refs.eticketbill.openETicket(this.row.id, this.row, '机表结算')
294
+ console.log('>>> 机表结算开票')
295
+ this.$refs.eticketbill.openETicket(this.row.id, this.row, this.invoice_show_gas, this.invoice_is_pax, '机表结算')
295
296
  },
296
297
  selfSearch (args) {
297
298
  this.selecteds = []
@@ -56,6 +56,7 @@ export default {
56
56
  await this.$resetpost('rs/entity/t_eticket', model, {resolveMsg: null, rejectMsg: '保存发票记录失败'})
57
57
  },
58
58
  async openETicket (sellId, row, show_gas, is_pax, type, invoice_kind = '电子发票', retry = false) {
59
+ console.log('>>> 看看 openETicket 的参数是什么', sellId, row, show_gas, is_pax, type, invoice_kind, retry)
59
60
  try {
60
61
  let model = {
61
62
  id: sellId,
@@ -130,6 +130,8 @@ export default function () {
130
130
  // 抄表列表
131
131
  Vue.component('hand-list', (resolve) => { require(['./handList'], resolve) })
132
132
  Vue.component('e-ticket-open-hand', (resolve) => { require(['./EticketOpenJBPage.vue'], resolve) })
133
+ // 电子发票管理
134
+ Vue.component('e-ticket-manage-query-v4', (resolve) => { require(['./EticketManage'], resolve) })
133
135
  // 物联网表结算
134
136
  Vue.component('e-ticket-open-iot-query-v4', (resolve) => { require(['./bill/EticketOpenPage'], resolve) })
135
137
  // 卡表结算
package/src/main.js CHANGED
@@ -1,33 +1,33 @@
1
- import Vue from 'vue'
2
- import all from 'vue-client/src/all'
3
- import App from './App'
4
- import system from 'system-clients/src/system'
5
- import sale from './sale'
6
- import FilialeSale from './filiale/fugu/sale'
7
- import address from 'address-client/src/address'
8
- import ldap from 'ldap-clients/src/ldap'
9
- import VueClipboard from 'vue-clipboard2'
10
-
11
- // 开启 nginx 加密
12
- // Vue.mmType = 'nginx'
13
- // Vue.HWQMM = [51, 150, 231, 300, 565, 708, 721, 952, 738, 560, 935, 912, 1274, 1148, 840, 1440]
14
-
15
- // 开启 AES 加密
16
- // Vue.mmType = 'AES'
17
- // Vue.mm = '3KMKqvgwR8ULbR8Z'
18
-
19
- Vue.use(VueClipboard)
20
- Vue.config.silent = true
21
-
22
- all()
23
- system(false)
24
- sale()
25
- FilialeSale()
26
- address()
27
- ldap()
28
- require('system-clients/src/styles/less/bootstrap.less')
29
-
30
- new Vue({
31
- el: 'body',
32
- components: { App }
33
- })
1
+ import Vue from 'vue'
2
+ import all from 'vue-client/src/all'
3
+ import App from './App'
4
+ import system from 'system-clients/src/system'
5
+ import sale from './sale'
6
+ import FilialeSale from './filiale/tongchuan/sale'
7
+ import address from 'address-client/src/address'
8
+ import ldap from 'ldap-clients/src/ldap'
9
+ import VueClipboard from 'vue-clipboard2'
10
+
11
+ // 开启 nginx 加密
12
+ // Vue.mmType = 'nginx'
13
+ // Vue.HWQMM = [51, 150, 231, 300, 565, 708, 721, 952, 738, 560, 935, 912, 1274, 1148, 840, 1440]
14
+
15
+ // 开启 AES 加密
16
+ // Vue.mmType = 'AES'
17
+ // Vue.mm = '3KMKqvgwR8ULbR8Z'
18
+
19
+ Vue.use(VueClipboard)
20
+ Vue.config.silent = true
21
+
22
+ all()
23
+ system(false)
24
+ sale()
25
+ FilialeSale()
26
+ address()
27
+ ldap()
28
+ require('system-clients/src/styles/less/bootstrap.less')
29
+
30
+ new Vue({
31
+ el: 'body',
32
+ components: { App }
33
+ })