sale-client 4.0.6-preview → 4.0.7-preview
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/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, v4Url ] = ['http://
|
|
4
|
+
const [ serverRul, localUrl, v4Url ] = ['http://61.163.123.47:30785/', 'http://61.163.123.47:30785/', 'http://61.163.123.47:30785/']
|
|
5
5
|
var merge = require('webpack-merge')
|
|
6
6
|
var baseConfig = require('./webpack.dev.conf')
|
|
7
7
|
var devConfig = {
|
|
@@ -19,26 +19,9 @@ var devConfig = {
|
|
|
19
19
|
children: false // 不输出子模块构建信息
|
|
20
20
|
},
|
|
21
21
|
proxy: {
|
|
22
|
-
|
|
23
|
-
pathRewrite: {
|
|
24
|
-
'/api/af-revenue/logic': '/logic'
|
|
25
|
-
},
|
|
26
|
-
target: 'http://localhost:9026/'
|
|
27
|
-
},
|
|
28
|
-
'/api/af-revenue/file': {
|
|
29
|
-
pathRewrite: {
|
|
30
|
-
'/api/af-revenue/file': '/file'
|
|
31
|
-
},
|
|
32
|
-
target: 'http://localhost:9026/'
|
|
33
|
-
},
|
|
34
|
-
'/api/af-revenue/sql': {
|
|
35
|
-
pathRewrite: {
|
|
36
|
-
'/api/af-revenue/sql': '/sql'
|
|
37
|
-
},
|
|
38
|
-
target: 'http://localhost:9026/'
|
|
39
|
-
},
|
|
22
|
+
|
|
40
23
|
'/api': {
|
|
41
|
-
target: 'http://
|
|
24
|
+
target: 'http://61.163.123.47:30785/'
|
|
42
25
|
},
|
|
43
26
|
'/invoice/rs/logic/getInvoice': {
|
|
44
27
|
target: serverRul
|
|
@@ -107,8 +90,14 @@ var devConfig = {
|
|
|
107
90
|
'/rs/logic/webHandReverse': {
|
|
108
91
|
target: 'http://localhost:8085'
|
|
109
92
|
},
|
|
93
|
+
// '/rs/logic': {
|
|
94
|
+
// target: localUrl
|
|
95
|
+
// },
|
|
110
96
|
'/rs/logic': {
|
|
111
|
-
|
|
97
|
+
pathRewrite: {
|
|
98
|
+
'/rs/logic': '/logic'
|
|
99
|
+
},
|
|
100
|
+
target: 'http://61.163.123.47:30785/'
|
|
112
101
|
},
|
|
113
102
|
'/rs/sql': {
|
|
114
103
|
target: localUrl
|
package/package.json
CHANGED
|
@@ -29,7 +29,7 @@
|
|
|
29
29
|
<div v-show="remanentfalg">
|
|
30
30
|
<strong style="font-size: large" >【补气提示】:{{remanentstr}}</strong><br/>
|
|
31
31
|
</div>
|
|
32
|
-
<div v-
|
|
32
|
+
<div v-if="false">
|
|
33
33
|
<div class="row" style="margin-top:5px;">
|
|
34
34
|
<div class="col-sm-4">
|
|
35
35
|
<label class=" font_normal_body" title="参数名称：付款方式">收款方式</label>
|
|
@@ -94,13 +94,6 @@
|
|
|
94
94
|
v-scale="[model.f_preamount, 4]" :disabled="showGas">
|
|
95
95
|
</div>
|
|
96
96
|
</div>
|
|
97
|
-
<div class="row" style="margin-top:5px;">
|
|
98
|
-
<div class="col-sm-12" :class="[$v.f_comments.required ? 'has-error' : 'has-success']">
|
|
99
|
-
<label for="f_curbalance" class="font_normal_body"> 备注 </label>
|
|
100
|
-
<input class="input_search" style="width:53.5%" v-model="model.f_comments"
|
|
101
|
-
v-validate:f_comments='{required: true }'>
|
|
102
|
-
</div>
|
|
103
|
-
</div>
|
|
104
97
|
</div>
|
|
105
98
|
<div v-if="paymentModel.length >1">
|
|
106
99
|
<div class="row" style="margin-top:10px;" >
|
|
@@ -116,6 +109,13 @@
|
|
|
116
109
|
</div>
|
|
117
110
|
</div>
|
|
118
111
|
</div>
|
|
112
|
+
<div class="row" style="margin-top:5px;">
|
|
113
|
+
<div class="col-sm-12" :class="[$v.f_comments.required ? 'has-error' : 'has-success']">
|
|
114
|
+
<label for="f_curbalance" class="font_normal_body"> 备注 </label>
|
|
115
|
+
<input class="input_search" style="width:53.5%" v-model="model.f_comments"
|
|
116
|
+
v-validate:f_comments='{required: true }'>
|
|
117
|
+
</div>
|
|
118
|
+
</div>
|
|
119
119
|
</form>
|
|
120
120
|
<validate-bill v-if="hasValidateBill" :data="model" @validate-bill="validateBill"></validate-bill>
|
|
121
121
|
<print-bill :show="print" :bill-data='billData' v-ref:printbill :bill-config='config'
|
package/src/main.js
CHANGED
|
@@ -2,9 +2,8 @@ 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/dexin/sale'
|
|
6
5
|
import sale from './sale'
|
|
7
|
-
import FilialeSale from './filiale/
|
|
6
|
+
import FilialeSale from './filiale/fugou/sale'
|
|
8
7
|
import address from 'address-client/src/address'
|
|
9
8
|
import ldap from 'ldap-clients/src/ldap'
|
|
10
9
|
import VueClipboard from 'vue-clipboard2'
|
|
@@ -23,7 +22,6 @@ Vue.config.silent = true
|
|
|
23
22
|
all()
|
|
24
23
|
system(false)
|
|
25
24
|
sale()
|
|
26
|
-
FilialeSale()
|
|
27
25
|
address()
|
|
28
26
|
ldap()
|
|
29
27
|
FilialeSale()
|