sale-client 3.6.56 → 3.6.57

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,85 +1,85 @@
1
- var path = require('path')
2
- const [localUrl, serverRul] = ['http://121.36.106.17:8400', 'http://121.36.106.17: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: true,
14
- stats: {
15
- colors: false, // 配置控制台输出彩色日志
16
- chunks: false, // 不输出构建 chunk 信息
17
- children: false // 不输出子模块构建信息
18
- },
19
- proxy: {
20
- '/rs/file': {
21
- target: serverRul
22
- },
23
- '/invoice': {
24
- target: serverRul
25
- },
26
- // 查找资源服务数据
27
- '/rs/search': {
28
- target: serverRul
29
- },
30
- // 查找资源服务数据
31
- '/rs/logic/getLogin': {
32
- target: serverRul
33
- },
34
- // 查找资源服务数据
35
- '/rs/logic/getInitData': {
36
- target: serverRul
37
- },
38
- '/rs/logic/getSaleInitData': {
39
- target: serverRul
40
- },
41
- // 用户登录服务地址
42
- '/rs/user': {
43
- target: serverRul
44
- },
45
- '/rs/path': {
46
- target: serverRul
47
- },
48
- '/rs/data': {
49
- target: serverRul
50
- },
51
- '/rs/license': {
52
- target: serverRul
53
- },
54
- '/rs/db': {
55
- target: serverRul
56
- },
57
- '/excel': {
58
- target: serverRul
59
- },
60
- '/rs/config': {
61
- target: serverRul
62
- },
63
- '/rs/report': {
64
- target: serverRul
65
- },
66
- '/rs/vue': {
67
- target: serverRul
68
- },
69
- '/rs/logic': {
70
- target: localUrl
71
- },
72
- '/rs/sql': {
73
- target: localUrl
74
- },
75
- '/webmeter': {
76
- target: serverRul
77
- },
78
- '/rs': {
79
- target: serverRul
80
- // changeOrigin: true
81
- }
82
- }
83
- }
84
- }
85
- module.exports = merge(baseConfig, devConfig)
1
+ var path = require('path')
2
+ const [localUrl, serverRul] = ['http://121.36.106.17:8400', 'http://121.36.106.17: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: true,
14
+ stats: {
15
+ colors: false, // 配置控制台输出彩色日志
16
+ chunks: false, // 不输出构建 chunk 信息
17
+ children: false // 不输出子模块构建信息
18
+ },
19
+ proxy: {
20
+ '/rs/file': {
21
+ target: serverRul
22
+ },
23
+ '/invoice': {
24
+ target: serverRul
25
+ },
26
+ // 查找资源服务数据
27
+ '/rs/search': {
28
+ target: serverRul
29
+ },
30
+ // 查找资源服务数据
31
+ '/rs/logic/getLogin': {
32
+ target: serverRul
33
+ },
34
+ // 查找资源服务数据
35
+ '/rs/logic/getInitData': {
36
+ target: serverRul
37
+ },
38
+ '/rs/logic/getSaleInitData': {
39
+ target: serverRul
40
+ },
41
+ // 用户登录服务地址
42
+ '/rs/user': {
43
+ target: serverRul
44
+ },
45
+ '/rs/path': {
46
+ target: serverRul
47
+ },
48
+ '/rs/data': {
49
+ target: serverRul
50
+ },
51
+ '/rs/license': {
52
+ target: serverRul
53
+ },
54
+ '/rs/db': {
55
+ target: serverRul
56
+ },
57
+ '/excel': {
58
+ target: serverRul
59
+ },
60
+ '/rs/config': {
61
+ target: serverRul
62
+ },
63
+ '/rs/report': {
64
+ target: serverRul
65
+ },
66
+ '/rs/vue': {
67
+ target: serverRul
68
+ },
69
+ '/rs/logic': {
70
+ target: localUrl
71
+ },
72
+ '/rs/sql': {
73
+ target: localUrl
74
+ },
75
+ '/webmeter': {
76
+ target: serverRul
77
+ },
78
+ '/rs': {
79
+ target: serverRul
80
+ // changeOrigin: true
81
+ }
82
+ }
83
+ }
84
+ }
85
+ module.exports = merge(baseConfig, devConfig)
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sale-client",
3
- "version": "3.6.56",
3
+ "version": "3.6.57",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
@@ -71,7 +71,7 @@
71
71
  row.type==='卡表收费撤销'||row.type==='物联网补费' || row.type==='物联网扣费'||row.type==='机表补费'||
72
72
  row.type==='机表扣费'||row.type==='物联网补气'||row.type==='物联网扣气'||row.type==='气损收费' ||
73
73
  row.type === '气表清零' || row.type === '掉气补气' || row.type === '其他补气' || row.type === '清零补气' ||
74
- row.type === '换表补气' || row.type === '过户') && row.type!=='新增户档案' && row.type!=='转气转出' && row.type!=='转气转入'">
74
+ row.type === '换表补气' || row.type === '过户'|| row.type ==='价格补差' || row.type ==='价格补差撤销') && row.type!=='新增户档案' && row.type!=='转气转出' && row.type!=='转气转入'">
75
75
  <button data-toggle="dropdown" style="border: 0px;background: none;" type="button"
76
76
  v-if="row.f_user_state==='正常'||row.f_user_state==='预备'||row.type==='气损收费' ">
77
77
  <span class="glyphicon glyphicon-th-list"></span>
@@ -144,6 +144,7 @@
144
144
  <blacklist-detail :data="row" v-if="row.type ==='拉黑' ||row.type === '取消拉黑' "></blacklist-detail>
145
145
  <advance-delivery-detail :data="row" v-if="row.type ==='卡表预交' "></advance-delivery-detail>
146
146
  <machinemetercenter-detail :data="row" v-if="row.type === '预存缴费'||row.type == '调价预存'"></machinemetercenter-detail>
147
+ <price-adjustment-detail :data="row" v-if="row.type === '价格补差'"></price-adjustment-detail>
147
148
  <gasloss-detail :data="row" v-if="row.type === '气损收费' || row.type === '气损收费撤销'"></gasloss-detail>
148
149
  <garbage-detail :data="row" v-if="row.type === '垃圾费收费'"></garbage-detail>
149
150
  </div>
@@ -0,0 +1,76 @@
1
+ <template>
2
+ <div class="auto">
3
+ <partial-view v-ref:pv>
4
+ <div class="row">
5
+ <label class = "col-sm-4">客户名称:</label>
6
+ <span class = "col-sm-8" style="text-align:left">{{model.f_user_name}}</span>
7
+ </div>
8
+ <div class="row" >
9
+ <label class = "col-sm-4">上期结余:</label>
10
+ <span class = "col-sm-2" style="text-align:left">{{model.f_balance}}</span>
11
+ <label class = "col-sm-4">本期结余:</label>
12
+ <span class = "col-sm-2" style="text-align:left">{{model.f_curbalance}}</span>
13
+ </div>
14
+ <!-- <div class="row" v-if="model.f_meter_type == '物联网表'">-->
15
+ <!-- <label class = "col-sm-4">上期结余:</label>-->
16
+ <!-- <span class = "col-sm-2" style="text-align:left">{{model.f_balance_amount}}</span>-->
17
+ <!-- <label class = "col-sm-4">本期结余:</label>-->
18
+ <!-- <span class = "col-sm-2" style="text-align:left">{{model.f_curbalance_amount}}</span>-->
19
+ <!-- </div>-->
20
+ <div class="row">
21
+ <label class = "col-sm-4">气量:</label>
22
+ <span class = "col-sm-2" style="text-align:left">{{model.f_pregas}}</span>
23
+ <label class = "col-sm-4">金额:</label>
24
+ <span class = "col-sm-2" style="text-align:left">{{model.f_preamount}}</span>
25
+ </div>
26
+ <div class="row">
27
+ <label class = "col-sm-4">单价:</label>
28
+ <span class = "col-sm-2" style="text-align:left">{{model.f_stair_price1}}</span>
29
+ </div>
30
+ <div class="row">
31
+ <label class = "col-sm-4">备注:</label>
32
+ <span class = "col-sm-8" style="text-align:left">{{model.f_comments}}</span>
33
+ </div>
34
+ <div class="row">
35
+ <label class = "col-sm-4">操作人:</label>
36
+ <span class = "col-sm-8" style="text-align:left">{{model.f_operator}}</span>
37
+ </div>
38
+ <div class="row">
39
+ <label class = "col-sm-4">操作时间:</label>
40
+ <span class = "col-sm-8" style="text-align:left">{{data.f_operate_date}}</span>
41
+ </div>
42
+ </partial-view>
43
+ </div>
44
+ </template>
45
+
46
+ <script>
47
+ export default {
48
+ title: '价格补差详情',
49
+ props: ['data'],
50
+ data () {
51
+ return {
52
+ model: {}
53
+ }
54
+ },
55
+ ready () {
56
+ let sql = 'singleTable_OrderBy'
57
+ let param = {
58
+ items: '*',
59
+ tablename: 't_sellinggas',
60
+ condition: `id = ${this.data.id}`,
61
+ orderitem: 'id'
62
+ }
63
+ this.$info(`加载数据中..., sql:${sql}`)
64
+ this.$refs.pv.load('rs/logic/getOneData', {data: {sql: sql, params: param}}).then((a) => {
65
+ console.log('获取到的数据', a.data)
66
+ this.model = a.data
67
+ }).catch((error) => {
68
+ if (error.status) {
69
+ this.$warn(`加载数据出错, ${JSON.stringify(error)}`)
70
+ return
71
+ }
72
+ throw error
73
+ })
74
+ }
75
+ }
76
+ </script>
@@ -0,0 +1,124 @@
1
+ <template>
2
+ <div class="auto">
3
+ <validator name='v'>
4
+ <form novalidate class="form-horizontal">
5
+ <div class="row">
6
+ <div class="col-sm-4 form-group"
7
+ :class="[$v.f_pregas.required || $v.f_pregas.dctest ? 'has-error' : 'has-success']">
8
+ <label class="font_normal_body">&nbsp;气量&nbsp;</label>
9
+ <input class="input_search" type="number" v-model="model.f_pregas" style="width:60%"
10
+ v-validate:f_pregas='{required: true}' placeholder="气量">
11
+ </div>
12
+ <div class="col-sm-4 form-group"
13
+ :class="[$v.f_price.required || $v.f_price.dctest ? 'has-error' : 'has-success']">
14
+ <label class="font_normal_body">&nbsp;单价&nbsp;</label>
15
+ <input class="input_search" type="number" v-model="model.f_price" style="width:60%"
16
+ v-validate:f_price='{required: true, dctest: [0, ">" ]}' placeholder="单价">
17
+ </div>
18
+ <div class="col-sm-4 form-group"
19
+ :class="[$v.f_preamount.required || $v.f_preamount.dctest ? 'has-error' : 'has-success']">
20
+ <label class="font_normal_body">&nbsp;金额&nbsp;</label>
21
+ <input class="input_search" type="number" v-model="model.f_preamount" style="width:60%"
22
+ v-validate:f_preamount='{required: true}' placeholder="金额">
23
+ </div>
24
+ </div>
25
+
26
+ <div class="row">
27
+ <div class="col-sm-12">
28
+ <label for="f_paper_account" class="font_normal_body ">&nbsp;备注&nbsp;</label>
29
+ <input class="input_search" style="width:87%" rows="1" v-model="model.f_comments"></input>
30
+ </div>
31
+ </div>
32
+ </form>
33
+ <div style="text-align:right;">
34
+ <button class="btn button_search btn-gn" @click="confirm()" :disabled='!$v.valid'>确认</button>
35
+ <button class="btn button_clear btn-gn" @click="clean()">取消</button>
36
+ </div>
37
+ </validator>
38
+ <!--<validate-bill v-if="hasValidateBill" :data="model" @validate-bill="validateBill"></validate-bill>-->
39
+ <!--<print-bill :show="print" :bill-manager='config.hasBillManage' v-ref:printbill :bill-url='billUrl' v-on:toggle="clean" @printok="printok" :data='printModel'></print-bill>-->
40
+ <!--<print-bill :show="print" :bill-config='config' :bill-data='billData' v-on:toggle="clean" @printok="printok" :data='printModel' v-ref:printbill></print-bill>-->
41
+ </div>
42
+ <upload :blodid="row.f_userinfo_id" v-ref:upload :isremark="true" fusetype="价格补差"></upload>
43
+
44
+ </template>
45
+
46
+
47
+ <script>
48
+ import Vue from 'vue'
49
+
50
+ export default {
51
+ title: '价格补差',
52
+ data () {
53
+ return {
54
+ blodid: '',
55
+ showupload: false,
56
+ model: {
57
+ f_comments: ''
58
+ }
59
+
60
+ }
61
+ },
62
+ props: ['row'],
63
+ ready () {
64
+
65
+ },
66
+ methods: {
67
+ async confirm () {
68
+ console.log('价格补差:', this.row)
69
+ if((this.model.f_preamount>0 && this.model.f_pregas<0) || (this.model.f_preamount<0 && this.model.f_pregas>0)){
70
+ this.$showAlert('输入气量与金额必须同为负数或正数,您的输入有误!','warning',3000)
71
+ return
72
+ }
73
+
74
+ if((this.model.f_pregas*this.model.f_price).toFixed(2) !== (this.model.f_preamount - 0).toFixed(2)){
75
+ this.$showAlert('输入气量乘单价不等于金额,请重新输入!','warning',3000)
76
+ return
77
+ }
78
+ let param = {
79
+ sellinggas: {
80
+ f_userfiles_id: this.row.f_userfiles_id,
81
+ f_userinfo_id: this.row.f_userinfo_id,
82
+ f_user_id: this.row.f_user_id,
83
+ f_user_name: this.row.f_user_name,
84
+ f_user_type: this.row.f_user_type,
85
+ f_gasproperties: this.row.f_gasproperties,
86
+ f_meternumber: this.row.f_meternumber,
87
+ f_card_id: this.row.f_card_id,
88
+ f_payment: '现金缴费',
89
+ f_price_id: this.row.f_price_id,
90
+ f_last_tablebase: this.row.f_meter_base,
91
+ f_tablebase: this.row.f_meter_base,
92
+ f_meter_type: this.row.f_meter_type,
93
+ f_collection_type: this.row.f_collection_type,
94
+ f_pregas: this.model.f_pregas,
95
+ f_address: this.row.f_address,
96
+ f_meter_brand: this.row.f_meter_brand,
97
+ f_preamount: this.model.f_preamount,
98
+ f_charge_type: '价格补差',
99
+ f_comments: this.model.f_comments,
100
+ f_billing: this.row.f_billing,
101
+ f_operator: Vue.$login.f.name,
102
+ f_operatorid: Vue.$login.f.id,
103
+ f_orgid: Vue.$login.f.orgid,
104
+ f_orgname: Vue.$login.f.orgs,
105
+ f_depid: Vue.$login.f.depids,
106
+ f_depname: Vue.$login.f.deps,
107
+ f_operat_type: '价格补差',
108
+ f_stair_price1: this.model.f_price,
109
+ f_describe: `${this.$login.f.name}对用户${this.row.f_user_name}进行价格补差操作`,
110
+ f_state: '有效'
111
+ // f_table_state:'有效'
112
+ }
113
+ }
114
+ console.log(param)
115
+ this.$resetpost('rs/logic/priceJustment', {data: param}, {warnMsg: `确定要对用户${this.row.f_user_name}进行价格补差吗?`, resolveMsg: `价格补差成功!!`, rejectMsg: `价格补差失败!!请重试!!`}).then((res) => {
116
+ this.clean()
117
+ })
118
+ },
119
+ clean () {
120
+ this.$dispatch('refresh')
121
+ }
122
+ }
123
+ }
124
+ </script>
@@ -65,6 +65,14 @@
65
65
  <label class = "col-sm-5 ">户累购金额</label>
66
66
  <span class = "col-sm-7" >{{data?data.f_total_fee_all:dafault.f_total_fee_all}}</span>
67
67
  </div>
68
+ <div class="row" v-if="data.f_meter_type.includes('物联网')">
69
+ <label class = "col-sm-5 ">表累购气量</label>
70
+ <span class = "col-sm-7" >{{data?data.f_total_gas_all:dafault.f_total_gas}}</span>
71
+ </div>
72
+ <div class="row" v-if="data.f_meter_type.includes('物联网')">
73
+ <label class = "col-sm-5 ">户累购气量</label>
74
+ <span class = "col-sm-7" >{{data?data.f_total_gas_all:dafault.f_total_gas_all}}</span>
75
+ </div>
68
76
  <div class="row" v-if="(data.f_meter_type === '机表' || data.f_meter_type === '物联网表') && data.f_deduction_gas > 0">
69
77
  <label class = "col-sm-5 " >剩余抵扣量</label>
70
78
  <span class = "col-sm-7" >{{data?data.f_deduction_gas:dafault.f_deduction_gas}}</span>
package/src/main.js CHANGED
@@ -1,27 +1,27 @@
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 wenxi from './filiale/rizhao/sale'
7
- // import FilialeSale from './filiale/yuansheng/sale'
8
- import address from 'address-client/src/address'
9
- import ldap from 'ldap-clients/src/ldap'
10
- import VueClipboard from 'vue-clipboard2'
11
-
12
- Vue.use(VueClipboard)
13
- Vue.config.silent = true
14
-
15
- all()
16
- system(false)
17
- sale()
18
- // wenxi()
19
- // FilialeSale()
20
- address()
21
- ldap()
22
- require('system-clients/src/styles/less/bootstrap.less')
23
-
24
- new Vue({
25
- el: 'body',
26
- components: { App }
27
- })
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 wenxi from './filiale/shexian/sale'
7
+ // import FilialeSale from './filiale/yuansheng/sale'
8
+ import address from 'address-client/src/address'
9
+ import ldap from 'ldap-clients/src/ldap'
10
+ import VueClipboard from 'vue-clipboard2'
11
+
12
+ Vue.use(VueClipboard)
13
+ Vue.config.silent = true
14
+
15
+ all()
16
+ system(false)
17
+ sale()
18
+ wenxi()
19
+ // FilialeSale()
20
+ address()
21
+ ldap()
22
+ require('system-clients/src/styles/less/bootstrap.less')
23
+
24
+ new Vue({
25
+ el: 'body',
26
+ components: { App }
27
+ })
package/src/sale.js CHANGED
@@ -245,6 +245,11 @@ export default function () {
245
245
  Vue.component('sell-record-change', (resolve) => { require(['./components/revenue/comprehen/ComprehenOperation/SellRecordChange/SellRecordChange'], resolve) })
246
246
  // 补费扣费
247
247
  Vue.component('deduction-manage', (resolve) => { require(['./components/revenue/comprehen/ComprehenOperation/FeeDeduction/deductionManage'], resolve) })
248
+
249
+ // 价格补差Price adjustment
250
+ Vue.component('price-justment', (resolve) => { require(['./components/revenue/comprehen/ComprehenOperation/PriceJustment/priceJustment'], resolve) })
251
+
252
+
248
253
  // 物联网赠气
249
254
  Vue.component('iotTable', (resolve) => { require(['./components/revenue/comprehen/ComprehenOperation/GiftFee/iotTable'], resolve) })
250
255
  // 卡表赠气
@@ -427,6 +432,8 @@ export default function () {
427
432
  Vue.component('cardoveruser-detail', (resolve) => { require(['./components/revenue/base/rightview/carddetail/CardOverUserDetail'], resolve) })
428
433
  // 机表收费详情小组件
429
434
  Vue.component('machinemetercenter-detail', (resolve) => { require(['./components/revenue/base/rightview/carddetail/MachineMeterCenterDetail'], resolve) })
435
+ // 价格补差详情小组件
436
+ Vue.component('price-adjustment-detail', (resolve) => { require(['./components/revenue/base/rightview/carddetail/PriceAdjustmentDetail'], resolve) })
430
437
  // 自动下账详情小组件
431
438
  Vue.component('autoaccounts-detail', (resolve) => { require(['./components/revenue/base/rightview/carddetail/AutoAccountsDetail'], resolve) })
432
439
  // 自动下账详情小组件