sale-client 4.3.74 → 4.3.76

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 (9) hide show
  1. package/build/dev-server.js +16 -10
  2. package/package.json +1 -1
  3. package/src/filiale/dexin/AsyncImg.vue +33 -0
  4. package/src/filiale/dexin/cardsHand.vue +5 -3
  5. package/src/filiale/dexin/sale.js +2 -1
  6. package/src/filiale/hongYa/HandQueryUser.vue +4 -4
  7. package/src/filiale/hongYa/HistoryHandQueryUser.vue +4 -4
  8. package/src/filiale/hongYa/WebHandQueryUser.vue +4 -4
  9. package/src/main.js +1 -1
package/build/dev-server.js CHANGED
@@ -1,7 +1,7 @@
1
1
  var path = require('path')
2
2
  var checkVersion = require('./versionCheck.js')
3
3
  checkVersion()
4
- const [ serverRul, localUrl ] = ['http://192.168.50.67:31567/', 'http://192.168.50.67:31567/']
4
+ const [ serverRul, V4URL ] = ['https://222.83.114.229:31785', 'https://222.83.114.229:31467/']
5
5
  var merge = require('webpack-merge')
6
6
  var baseConfig = require('./webpack.dev.conf')
7
7
  var devConfig = {
@@ -50,20 +50,26 @@ var devConfig = {
50
50
  '/rs/pay': {
51
51
  target: 'http://localhost:8080'
52
52
  },
53
- '/api/af-revenue': {
54
- pathRewrite: {
55
- '/api/af-revenue': '/'
56
- },
57
- target: "http://localhost:9026"
58
- },
53
+ // '/api/af-revenue': {
54
+ // pathRewrite: {
55
+ // '/api/af-revenue': '/'
56
+ // },
57
+ // target: "http://localhost:9026"
58
+ // },
59
59
  '/api': {
60
- target: serverRul
60
+ target: V4URL,
61
+ secure: false,
62
+ changeOrigin: true,
61
63
  },
62
64
  '/resource': {
63
- target: serverRul
65
+ target: V4URL,
66
+ secure: false,
67
+ changeOrigin: true
64
68
  },
65
69
  '/rs': {
66
- target: serverRul
70
+ target: V4URL,
71
+ secure: false,
72
+ changeOrigin: true,
67
73
  }
68
74
  }
69
75
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sale-client",
3
- "version": "4.3.74",
3
+ "version": "4.3.76",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
package/src/filiale/dexin/AsyncImg.vue ADDED
@@ -0,0 +1,33 @@
1
+ <template>
2
+ <img-self :src="imageUrl" :width="width" :height="height" v-if="imageUrl"></img-self>
3
+ </template>
4
+
5
+ <script>
6
+ export default {
7
+ props: {
8
+ path: {
9
+ type: String,
10
+ required: true
11
+ },
12
+ width: [Number, String],
13
+ height: [Number, String]
14
+ },
15
+ data () {
16
+ return {
17
+ imageUrl: ''
18
+ }
19
+ },
20
+ ready () {
21
+ this.loadImage(this.path)
22
+ },
23
+ methods: {
24
+ loadImage (path) {
25
+ this.$resetpost('api/af-telephone/logic/getImageFileLogic', {
26
+ data: { filename: path }
27
+ },{newly: true}).then((res) => {
28
+ this.imageUrl = res.data.filepath
29
+ })
30
+ }
31
+ }
32
+ }
33
+ </script>
package/src/filiale/dexin/cardsHand.vue CHANGED
@@ -359,15 +359,15 @@
359
359
  </td>
360
360
  <td style="text-align:center">
361
361
  <img-self :src="row.f_handplan_image" v-if="row.f_handplan_image" :width="100" :height="100"></img-self>
362
- <img-self :src="`api/af-revenue/file/image/${row.f_notified_path}`" v-if="row.f_notified_path" :width="100" :height="100"></img-self>
362
+ <async-img :path="`${row.f_notified_path}`" v-if="row.f_notified_path" :width="100" :height="100"></async-img>
363
363
  </td>
364
364
  <td style="text-align:center">
365
365
  <img-self :src="row.f_handplan_image" v-if="row.f_handplan_image" :width="100" :height="100"></img-self>
366
- <img-self :src="`api/af-revenue/file/image/${row.f_second_notified_path}`" v-if="row.f_second_notified_path" :width="100" :height="100"></img-self>
366
+ <async-img :path="`${row.f_second_notified_path}`" v-if="row.f_second_notified_path" :width="100" :height="100"></async-img>
367
367
  </td>
368
368
  <td style="text-align:center">
369
369
  <img-self :src="row.f_sign_path" v-if="row.f_sign_path.indexOf('http:') > -1" :width="100" :height="100"></img-self>
370
- <img-self :src="`api/af-revenue/file/image/${row.f_sign_path}`" v-else :width="100" :height="100"></img-self>
370
+ <async-img :path="`${row.f_sign_path}`" v-else :width="100" :height="100"></async-img>
371
371
  </td>
372
372
 
373
373
  <td style="text-align: center;">{{ row.f_actualtablebase }}</td>
@@ -444,6 +444,7 @@ import Vue from 'vue'
444
444
  import AppData from '../../stores/AppData'
445
445
  import * as Util from '../../Util'
446
446
  import co from 'co'
447
+ import AsyncImg from './AsyncImg.vue';
447
448
 
448
449
  let loadParamGem = async function (self) {
449
450
  await self.$LoadParams.loadParam(self.f_filialeid)
@@ -468,6 +469,7 @@ let modifyGen = function* (self, row, url) {
468
469
  }
469
470
 
470
471
  export default {
472
+ components: {AsyncImg},
471
473
  title: '卡表抄表',
472
474
  data () {
473
475
  return {
package/src/filiale/dexin/sale.js CHANGED
@@ -10,7 +10,8 @@ export default function () {
10
10
  Vue.component('no-card-meter-center', (resolve) => { require(['./NoCardMeterCenter.vue'], resolve) })
11
11
  // 换表
12
12
  Vue.component('change-meter', (resolve) => { require(['./ChangeMeter.vue'], resolve) })
13
-
13
+ // 换表
14
+ Vue.component('async-img', (resolve) => { require(['./AsyncImg.vue'], resolve) })
14
15
  // 无卡收费
15
16
  Vue.component('sale-userinfo', (resolve) => { require(['./Userinfo.vue'], resolve) })
16
17
  // 待处理报警/已处理报警
package/src/filiale/hongYa/HandQueryUser.vue CHANGED
@@ -108,10 +108,10 @@
108
108
  <td style="text-align:center">{{row.f_input_date}}</td>
109
109
  <td style="text-align:center">{{row.f_last_tablebase}}</td>
110
110
  <td style="text-align:center">{{row.f_tablebase}}</td>
111
- <td style="text-align:center">{{row.f_balance}}</td>
112
- <td style="text-align:center">{{row.f_oughtamount}}</td>
113
- <td style="text-align:center">{{row.f_oughtfee}}</td>
114
- <td style="text-align:center">{{row.f_curbalance}}</td>
111
+ <td style="text-align:center">{{row.f_balance.toFixed(2)}}</td>
112
+ <td style="text-align:center">{{row.f_oughtamount.toFixed(2)}}</td>
113
+ <td style="text-align:center">{{row.f_oughtfee.toFixed(2)}}</td>
114
+ <td style="text-align:center">{{row.f_curbalance.toFixed(2)}}</td>
115
115
  <td style="text-align:center">{{row.f_whether_pay}}</td>
116
116
  <td style="text-align:center" v-if="!$parent.$parent.$parent.f_calculation.includes('表端结算')">{{row.f_stair1price}}</td>
117
117
  <td style="text-align:center" v-if="!$parent.$parent.$parent.f_calculation.includes('表端结算')">{{row.f_stairamount1}}</td>
package/src/filiale/hongYa/HistoryHandQueryUser.vue CHANGED
@@ -100,10 +100,10 @@
100
100
  <td style="text-align:center">{{row.f_input_date}}</td>
101
101
  <td style="text-align:center">{{row.f_last_tablebase}}</td>
102
102
  <td style="text-align:center">{{row.f_tablebase}}</td>
103
- <td style="text-align:center">{{row.f_balance}}</td>
104
- <td style="text-align:center">{{row.f_oughtamount}}</td>
105
- <td style="text-align:center">{{row.f_oughtfee}}</td>
106
- <td style="text-align:center">{{row.f_curbalance}}</td>
103
+ <td style="text-align:center">{{row.f_balance.toFixed(2)}}</td>
104
+ <td style="text-align:center">{{row.f_oughtamount.toFixed(2)}}</td>
105
+ <td style="text-align:center">{{row.f_oughtfee.toFixed(2)}}</td>
106
+ <td style="text-align:center">{{row.f_curbalance.toFixed(2)}}</td>
107
107
  <td style="text-align:center">{{row.f_meter_classify}}</td>
108
108
  <td style="text-align:center">{{row.f_meter_state}}</td>
109
109
  <td style="text-align:center">{{row.f_result_state?row.f_result_state:''}}</td>
package/src/filiale/hongYa/WebHandQueryUser.vue CHANGED
@@ -106,10 +106,10 @@
106
106
  <td style="text-align:center">{{row.f_input_date}}</td>
107
107
  <td style="text-align:center">{{row.f_last_tablebase}}</td>
108
108
  <td style="text-align:center">{{row.f_tablebase}}</td>
109
- <td style="text-align:center">{{row.f_balance}}</td>
110
- <td style="text-align:center">{{row.f_oughtamount}}</td>
111
- <td style="text-align:center">{{row.f_oughtfee}}</td>
112
- <td style="text-align:center">{{row.f_curbalance}}</td>
109
+ <td style="text-align:center">{{row.f_balance.toFixed(2)}}</td>
110
+ <td style="text-align:center">{{row.f_oughtamount.toFixed(2)}}</td>
111
+ <td style="text-align:center">{{row.f_oughtfee.toFixed(2)}}</td>
112
+ <td style="text-align:center">{{row.f_curbalance.toFixed(2)}}</td>
113
113
  <td style="text-align:center" v-if="!row.f_meter_type.includes('物联网表')">{{row.f_whether_pay}}</td>
114
114
  <td style="text-align:center" v-if="!f_calculation.includes('表端结算')">{{row.f_stair1price}}</td>
115
115
  <td style="text-align:center" v-if="!f_calculation.includes('表端结算')">{{row.f_stairamount1}}</td>
package/src/main.js CHANGED
@@ -2,7 +2,7 @@ import Vue from 'vue'
2
2
  import all from 'vue-client/src/all'
3
3
  import App from './App'
4
4
  import system from 'system-clients/src/system'
5
- import FilialeSale from './filiale/liaoyuan/sale'
5
+ import FilialeSale from './filiale/dexin/sale'
6
6
  import sale from './sale'
7
7
  import address from 'address-client/src/address'
8
8
  import ldap from 'ldap-clients/src/ldap'