sale-client 3.6.68-s → 3.6.69
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,5 +1,5 @@
|
|
|
1
1
|
var path = require('path')
|
|
2
|
-
const [localUrl, serverRul] = ['http://
|
|
2
|
+
const [localUrl, serverRul] = ['http://127.0.0.1:8080/', 'http://192.168.50.4:8400/']
|
|
3
3
|
var merge = require('webpack-merge')
|
|
4
4
|
var baseConfig = require('./webpack.dev.conf')
|
|
5
5
|
var devConfig = {
|
package/package.json
CHANGED
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
<criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
|
|
8
8
|
<div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
|
|
9
9
|
<div class="row">
|
|
10
|
-
|
|
10
|
+
<res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
|
|
11
11
|
<div class="col-sm-2 form-group">
|
|
12
12
|
<label for="startDate" class="font_normal_body">抄表日期</label>
|
|
13
13
|
<datepicker id="startDate" placeholder="开始日期" style="width:60%"
|
|
@@ -101,9 +101,9 @@
|
|
|
101
101
|
<td style="text-align: center;">
|
|
102
102
|
<nobr>{{row.f_no_hand}}</nobr>
|
|
103
103
|
</td>
|
|
104
|
-
<td style="text-align: center;"
|
|
105
|
-
<nobr>{{row.f_no_hand}}</nobr
|
|
106
|
-
</td
|
|
104
|
+
<!-- <td style="text-align: center;">-->
|
|
105
|
+
<!-- <nobr>{{row.f_no_hand}}</nobr>-->
|
|
106
|
+
<!-- </td>-->
|
|
107
107
|
<td style="text-align: center;">
|
|
108
108
|
<nobr>{{row.f_out_hand}}</nobr>
|
|
109
109
|
</td>
|
|
@@ -117,7 +117,7 @@
|
|
|
117
117
|
<nobr>{{row.f_oughtfee}}</nobr>
|
|
118
118
|
</td>
|
|
119
119
|
<td style="text-align: center;">
|
|
120
|
-
<nobr>{{row.
|
|
120
|
+
<nobr>{{row.f_hand_lv}}</nobr>
|
|
121
121
|
</td>
|
|
122
122
|
</template>
|
|
123
123
|
<template partial='foot'></template>
|
|
@@ -210,6 +210,11 @@ export default {
|
|
|
210
210
|
})
|
|
211
211
|
},
|
|
212
212
|
methods: {
|
|
213
|
+
async getRes (condition, obj) {
|
|
214
|
+
console.log('condition:----------', condition)
|
|
215
|
+
console.log('obj:----------', obj)
|
|
216
|
+
this.orgCondtionStr = condition
|
|
217
|
+
},
|
|
213
218
|
getotherfooter () {
|
|
214
219
|
this.other = []
|
|
215
220
|
this.footer = []
|
|
@@ -280,11 +285,6 @@ export default {
|
|
|
280
285
|
show () {
|
|
281
286
|
this.criteriaShow = true
|
|
282
287
|
},
|
|
283
|
-
async getRes (condition, obj) {
|
|
284
|
-
console.log('condition:----------', condition)
|
|
285
|
-
console.log('obj:----------', obj)
|
|
286
|
-
this.orgCondtionStr = condition
|
|
287
|
-
}
|
|
288
288
|
},
|
|
289
289
|
watch: {
|
|
290
290
|
'model.rows' (val) {
|
|
@@ -2,97 +2,98 @@
|
|
|
2
2
|
<div class="auto">
|
|
3
3
|
<form class="form-horizontal select-overspread ">
|
|
4
4
|
<div v-if="!usertype">
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
</div>
|
|
17
|
-
<div class="row">
|
|
18
|
-
<div class="col-sm-8 form-group">
|
|
19
|
-
<label class="font_normal_body" for="f_address_phone">地址电话  </label>
|
|
20
|
-
<input class="input_search" placeholder="地址-电话" style="width:70%" type="text" v-el:addressphone
|
|
21
|
-
v-model="baseinfo.base.f_address_phone" v-next-el="papername">
|
|
5
|
+
<div class="row">
|
|
6
|
+
<div class="col-sm-8 form-group">
|
|
7
|
+
<label class="font_normal_body" for="f_taxpayer_id">纳税人识别号</label>
|
|
8
|
+
<input class="input_search" placeholder="纳税人识别号" style="width:70%" type="text"
|
|
9
|
+
v-model="baseinfo.base.f_taxpayer_id" v-next-el="addressphone">
|
|
10
|
+
</div>
|
|
11
|
+
<div class="col-sm-4 form-group">
|
|
12
|
+
<label class="font_normal_body" for="f_paper_name">名  称</label>
|
|
13
|
+
<input class="input_search" placeholder="名称" style="width:60%" type="text" v-el:papername
|
|
14
|
+
v-model="baseinfo.base.f_paper_name" v-next-el="paperaccount">
|
|
15
|
+
</div>
|
|
22
16
|
</div>
|
|
23
|
-
<div class="
|
|
24
|
-
<
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
17
|
+
<div class="row">
|
|
18
|
+
<div class="col-sm-8 form-group">
|
|
19
|
+
<label class="font_normal_body" for="f_address_phone">地址电话  </label>
|
|
20
|
+
<input class="input_search" placeholder="地址-电话" style="width:70%" type="text" v-el:addressphone
|
|
21
|
+
v-model="baseinfo.base.f_address_phone" v-next-el="papername">
|
|
22
|
+
</div>
|
|
23
|
+
<div class="col-sm-4 form-group">
|
|
24
|
+
<label class="font_normal_body" for="f_paper_type">票据类型</label>
|
|
25
|
+
<v-select :options='papertype'
|
|
26
|
+
:value-single="true"
|
|
27
|
+
:value.sync="baseinfo.base.f_paper_type" close-on-select
|
|
28
|
+
placeholder='票据类型'></v-select>
|
|
29
|
+
</div>
|
|
29
30
|
</div>
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
31
|
+
<div class="row">
|
|
32
|
+
<div class="col-sm-8 form-group">
|
|
33
|
+
<label class="font_normal_body " for="f_paper_account">开户行及账号</label>
|
|
34
|
+
<input class="input_search" placeholder="银行名称" style="width:70%" type="text" v-el:paperaccount
|
|
35
|
+
v-model="baseinfo.base.f_paper_account">
|
|
36
|
+
</div>
|
|
36
37
|
</div>
|
|
37
38
|
</div>
|
|
38
|
-
<div class="row">
|
|
39
|
-
<div class="col-sm-8 form-group">
|
|
40
|
-
<label class="font_normal_body " for="f_paper_account"> 邮  箱 </label>
|
|
41
|
-
<input class="input_search" placeholder="邮箱" style="width:70%" type="text"
|
|
42
|
-
v-model="baseinfo.base.f_email">
|
|
43
|
-
</div>
|
|
44
|
-
</div>
|
|
45
|
-
</div>
|
|
46
39
|
<div v-if="usertype">
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
40
|
+
<div class="row">
|
|
41
|
+
<div class="col-sm-8 form-group">
|
|
42
|
+
<label class="font_normal_body" for="f_paper_name">企业名称</label>
|
|
43
|
+
<input class="input_search" placeholder="名称" style="width:60%" type="text" v-el:papername
|
|
44
|
+
v-model="baseinfo.base.f_paper_name" v-next-el="contactuser">
|
|
45
|
+
</div>
|
|
46
|
+
<div class="col-sm-4 form-group">
|
|
47
|
+
<label class="font_normal_body" for="f_contact_user">企业联系人</label>
|
|
48
|
+
<input class="input_search" placeholder="企业联系人" style="width:60%" type="text" v-el:contactuser
|
|
49
|
+
v-model="baseinfo.base.f_contact_user" v-next-el="addressphone">
|
|
50
|
+
</div>
|
|
51
|
+
|
|
57
52
|
</div>
|
|
53
|
+
<div class="row">
|
|
58
54
|
|
|
59
|
-
|
|
60
|
-
|
|
55
|
+
<div class="col-sm-8 form-group">
|
|
56
|
+
<label class="font_normal_body" for="f_address_phone">联系方式</label>
|
|
57
|
+
<input class="input_search" placeholder="联系方式" style="width:70%" type="text" v-el:addressphone
|
|
58
|
+
v-model="baseinfo.base.f_address_phone" v-next-el="f_address_str">
|
|
59
|
+
</div>
|
|
61
60
|
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
61
|
+
<div class="col-sm-8 form-group">
|
|
62
|
+
<label class="font_normal_body" for="f_address_str">详细地址</label>
|
|
63
|
+
<input class="input_search" placeholder="详细地址" style="width:70%" type="text" v-el:f_address_str
|
|
64
|
+
v-model="baseinfo.base.f_address_str" v-next-el="taxpayerid">
|
|
65
|
+
</div>
|
|
67
66
|
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
67
|
+
<div class="col-sm-8 form-group">
|
|
68
|
+
<label class="font_normal_body" for="f_taxpayer_id">纳税人识别号</label>
|
|
69
|
+
<input class="input_search" placeholder="纳税人识别号" style="width:70%" type="text" v-el:taxpayerid
|
|
70
|
+
v-model="baseinfo.base.f_taxpayer_id" v-next-el="addressphone">
|
|
71
|
+
</div>
|
|
73
72
|
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
73
|
+
<div class="col-sm-4 form-group">
|
|
74
|
+
<label class="font_normal_body" for="f_paper_type">票据类型</label>
|
|
75
|
+
<v-select :options='papertype'
|
|
76
|
+
:value-single="true"
|
|
77
|
+
:value.sync="baseinfo.base.f_paper_type" close-on-select
|
|
78
|
+
placeholder='票据类型'></v-select>
|
|
79
|
+
</div>
|
|
78
80
|
</div>
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
placeholder='票据类型'></v-select>
|
|
81
|
+
<div class="row">
|
|
82
|
+
<div class="col-sm-8 form-group">
|
|
83
|
+
<label class="font_normal_body " for="f_paper_account">开户行及账号</label>
|
|
84
|
+
<input class="input_search" placeholder="银行名称" style="width:70%" type="text" v-el:paperaccount
|
|
85
|
+
v-model="baseinfo.base.f_paper_account">
|
|
86
|
+
</div>
|
|
86
87
|
</div>
|
|
87
|
-
|
|
88
|
+
</div>
|
|
89
|
+
|
|
88
90
|
<div class="row">
|
|
89
91
|
<div class="col-sm-8 form-group">
|
|
90
|
-
<label class="font_normal_body " for="f_paper_account"
|
|
91
|
-
<input class="input_search" placeholder="
|
|
92
|
-
v-model="baseinfo.base.
|
|
92
|
+
<label class="font_normal_body " for="f_paper_account"> 邮  箱 </label>
|
|
93
|
+
<input class="input_search" placeholder="邮箱" style="width:70%" type="text"
|
|
94
|
+
v-model="baseinfo.base.f_email">
|
|
93
95
|
</div>
|
|
94
96
|
</div>
|
|
95
|
-
</div>
|
|
96
97
|
</form>
|
|
97
98
|
</div>
|
|
98
99
|
</template>
|
package/src/main.js
CHANGED
|
@@ -3,7 +3,7 @@ import all from 'vue-client/src/all'
|
|
|
3
3
|
import App from './App'
|
|
4
4
|
import system from 'system-clients/src/system'
|
|
5
5
|
import sale from './sale'
|
|
6
|
-
import wenxi from './filiale/
|
|
6
|
+
import wenxi from './filiale/tongchuan/sale'
|
|
7
7
|
// import FilialeSale from './filiale/yuansheng/sale'
|
|
8
8
|
import address from 'address-client/src/address'
|
|
9
9
|
import ldap from 'ldap-clients/src/ldap'
|
|
@@ -116,7 +116,7 @@ let FileManageService = {
|
|
|
116
116
|
meter.f_show_way = meter.f_show_way ? meter.f_show_way[0] : null
|
|
117
117
|
meter.f_inputtor = meter.f_inputtor.length > 0 ? meter.f_inputtor[0] : null
|
|
118
118
|
meter.f_gongye_type = meter.f_gongye_type ? meter.f_gongye_type[0] : null
|
|
119
|
-
meter.f_userfiles_address = meter.f_userfiles_address ? meter.f_userfiles_address
|
|
119
|
+
meter.f_userfiles_address = meter.f_userfiles_address ? meter.f_userfiles_address : null
|
|
120
120
|
meter.f_install_person = meter.f_install_person.length > 0 ? meter.f_install_person[0] : null
|
|
121
121
|
meter.f_limit_sms = meter.f_limit_sms == '' ? meter.f_limit_sms = 30 : parseInt(meter.f_limit_sms)
|
|
122
122
|
meter.f_card_id = meter.f_card_id ? meter.f_card_id : null
|