sale-client 3.5.237 → 3.5.238

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/.project CHANGED
@@ -5,7 +5,30 @@
5
5
  <projects>
6
6
  </projects>
7
7
  <buildSpec>
8
+ <buildCommand>
9
+ <name>org.eclipse.jdt.core.javabuilder</name>
10
+ <arguments>
11
+ </arguments>
12
+ </buildCommand>
13
+ <buildCommand>
14
+ <name>org.eclipse.buildship.core.gradleprojectbuilder</name>
15
+ <arguments>
16
+ </arguments>
17
+ </buildCommand>
8
18
  </buildSpec>
9
19
  <natures>
20
+ <nature>org.eclipse.jdt.core.javanature</nature>
21
+ <nature>org.eclipse.buildship.core.gradleprojectnature</nature>
10
22
  </natures>
23
+ <filteredResources>
24
+ <filter>
25
+ <id>1671099057782</id>
26
+ <name></name>
27
+ <type>30</type>
28
+ <matcher>
29
+ <id>org.eclipse.core.resources.regexFilterMatcher</id>
30
+ <arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
31
+ </matcher>
32
+ </filter>
33
+ </filteredResources>
11
34
  </projectDescription>
@@ -1,81 +1,81 @@
1
- var path = require('path')
2
- const [localUrl, serverRul] = ['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
- port: 8089,
12
- open: true,
13
- stats: {
14
- colors: false, // 配置控制台输出彩色日志
15
- chunks: false, // 不输出构建 chunk 信息
16
- children: false // 不输出子模块构建信息
17
- },
18
- proxy: {
19
- '/rs/file': {
20
- target: serverRul
21
- },
22
- // 查找资源服务数据
23
- '/rs/search': {
24
- target: serverRul
25
- },
26
- // 查找资源服务数据
27
- '/rs/logic/getLogin': {
28
- target: serverRul
29
- },
30
- // 查找资源服务数据
31
- '/rs/logic/getInitData': {
32
- target: serverRul
33
- },
34
- '/rs/logic/getSaleInitData': {
35
- target: serverRul
36
- },
37
- // 用户登录服务地址
38
- '/rs/user': {
39
- target: serverRul
40
- },
41
- '/rs/path': {
42
- target: serverRul
43
- },
44
- '/rs/data': {
45
- target: serverRul
46
- },
47
- '/rs/license': {
48
- target: serverRul
49
- },
50
- '/rs/db': {
51
- target: serverRul
52
- },
53
- '/excel': {
54
- target: serverRul
55
- },
56
- '/rs/config': {
57
- target: serverRul
58
- },
59
- '/rs/report': {
60
- target: serverRul
61
- },
62
- '/rs/vue': {
63
- target: serverRul
64
- },
65
- '/rs/logic': {
66
- target: localUrl
67
- },
68
- '/rs/sql': {
69
- target: localUrl
70
- },
71
- '/webmeter': {
72
- target: serverRul
73
- },
74
- '/rs': {
75
- target: serverRul
76
- // changeOrigin: true
77
- }
78
- }
79
- }
80
- }
81
- module.exports = merge(baseConfig, devConfig)
1
+ var path = require('path')
2
+ const [localUrl, serverRul] = ['http://61.240.138.248:8400', 'http://61.240.138.248: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
+ port: 8089,
12
+ open: true,
13
+ stats: {
14
+ colors: false, // 配置控制台输出彩色日志
15
+ chunks: false, // 不输出构建 chunk 信息
16
+ children: false // 不输出子模块构建信息
17
+ },
18
+ proxy: {
19
+ '/rs/file': {
20
+ target: serverRul
21
+ },
22
+ // 查找资源服务数据
23
+ '/rs/search': {
24
+ target: serverRul
25
+ },
26
+ // 查找资源服务数据
27
+ '/rs/logic/getLogin': {
28
+ target: serverRul
29
+ },
30
+ // 查找资源服务数据
31
+ '/rs/logic/getInitData': {
32
+ target: serverRul
33
+ },
34
+ '/rs/logic/getSaleInitData': {
35
+ target: serverRul
36
+ },
37
+ // 用户登录服务地址
38
+ '/rs/user': {
39
+ target: serverRul
40
+ },
41
+ '/rs/path': {
42
+ target: serverRul
43
+ },
44
+ '/rs/data': {
45
+ target: serverRul
46
+ },
47
+ '/rs/license': {
48
+ target: serverRul
49
+ },
50
+ '/rs/db': {
51
+ target: serverRul
52
+ },
53
+ '/excel': {
54
+ target: serverRul
55
+ },
56
+ '/rs/config': {
57
+ target: serverRul
58
+ },
59
+ '/rs/report': {
60
+ target: serverRul
61
+ },
62
+ '/rs/vue': {
63
+ target: serverRul
64
+ },
65
+ '/rs/logic': {
66
+ target: localUrl
67
+ },
68
+ '/rs/sql': {
69
+ target: localUrl
70
+ },
71
+ '/webmeter': {
72
+ target: serverRul
73
+ },
74
+ '/rs': {
75
+ target: serverRul
76
+ // changeOrigin: true
77
+ }
78
+ }
79
+ }
80
+ }
81
+ module.exports = merge(baseConfig, devConfig)
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sale-client",
3
- "version": "3.5.237",
3
+ "version": "3.5.238",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
@@ -0,0 +1,63 @@
1
+ <template>
2
+ <!-- <div v-if="listpage">-->
3
+ <tab-button v-ref:list>
4
+ <tabs header="发票管理">
5
+ <e-ticket-manage @deal-msg="dealMsg"></e-ticket-manage>
6
+ </tabs>
7
+ <tabs header="抬头录入">
8
+ <company-info-manage @deal-msg="dealMsg"></company-info-manage>
9
+ </tabs>
10
+ <tabs header="商品信息录入">
11
+ <goods-info-manage @deal-msg="dealMsg"></goods-info-manage>
12
+ </tabs>
13
+ </tab-button>
14
+ <!-- </div>-->
15
+ <!-- <div v-if="!listpage">-->
16
+ <!-- <meter-info-manage :row="rowData" :f_start_date="f_start_date" :f_end_date="f_end_date"></meter-info-manage>-->
17
+ <!-- </div>-->
18
+ </template>
19
+
20
+ <script>
21
+ import TabButton from '../../common/TabButton.vue'
22
+ import Tabs from '../../common/Tabs.vue'
23
+
24
+ export default {
25
+ name: 'EticketCommon',
26
+ title: '发票公共管理',
27
+ data () {
28
+ return {// 页面开关
29
+ f_start_date: '',
30
+ f_end_date: '',
31
+ listpage: true,
32
+ width: {
33
+ left: '100%',
34
+ right: '0%'
35
+ },
36
+ // searchNumber:'',
37
+ rowData: {},
38
+ show: [true]
39
+ }
40
+ },
41
+ components: {Tabs, TabButton},
42
+ ready () {
43
+ console.log(this.$refs.list)
44
+ console.log('发票管理')
45
+ },
46
+ methods: {
47
+ cancel (obj) {
48
+ this.listpage = true
49
+ },
50
+ dealMsg (obj) {
51
+ this.rowData = obj
52
+ this.listpage = false
53
+ console.log(obj.model)
54
+ this.f_start_date = obj.model.startDate
55
+ this.f_end_date = obj.model.endDate
56
+ }
57
+ }
58
+ }
59
+ </script>
60
+
61
+ <style scoped>
62
+
63
+ </style>
@@ -24,7 +24,7 @@ import Tabs from '../../../comprehen/common/Tabs'
24
24
  export default {
25
25
  name: 'eticket',
26
26
  title: '发票管理',
27
- components: {Tabs, TabButton },
27
+ components: { Tabs, TabButton },
28
28
  data () {
29
29
  return {// 页面开关
30
30
  f_start_date: '',
@@ -149,7 +149,6 @@
149
149
  f_outlets: this.$login.f.f_parentname,
150
150
  f_orgstr: this.$login.f.orgpathstr,
151
151
  f_filialeids: this.$login.f.orgid
152
-
153
152
  },
154
153
  billstate: [{label: '全部', value: ''}, {label: '启用', value: '启用'}, {label: '停用', value: '停用'}],
155
154
  billusers: this.$appdata.getParam('票据使用人')
@@ -10,7 +10,6 @@
10
10
  <div class="binary-right" v-if="usershow" :style="{width: usershow ? '50%' : 'auto'}">
11
11
  <gasprice-user :priceid="priceid" :pricename="pricename" :priceorgid="priceorgid"></gasprice-user>
12
12
  </div>
13
-
14
13
  </div>
15
14
  <div v-if="!listpage">
16
15
  <!-- <user-info-detail-manage :f_userinfo_id="f_userinfo_id" @cancel-main="cancel" ></user-info-detail-manage>-->
@@ -30,7 +29,6 @@ let readGen = async function (self) {
30
29
  Object.assign(self.config, self.config, getConfig.data)
31
30
  }
32
31
  }
33
-
34
32
  export default {
35
33
  title: '气价管理',
36
34
  data () {
@@ -52,7 +50,6 @@ export default {
52
50
  priceorgid: '',
53
51
  gasPriceShow: false,
54
52
  usershow: false,
55
-
56
53
  // 控制气价信息界面和变更操作记录界面的展示
57
54
  changeView: false
58
55
  }
@@ -0,0 +1,205 @@
1
+ <template>
2
+ <criteria-paged :model="model" v-ref:paged>
3
+ <criteria partial='criteria' v-ref:criteria @condition-changed='$parent.selfSearch'>
4
+ <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
5
+ <div class="row">
6
+ <div class="col-sm-3 form-group">
7
+ <label class="font_normal_body">用户编号</label>
8
+ <input type="text" class="input_search"
9
+ style="width:60%"
10
+ v-model="model.f_userinfo_code"
11
+ condition="f_userinfo_code = '{}'"
12
+ placeholder="用户编号"/>
13
+ </div>
14
+ <div class="col-sm-3 form-group">
15
+ <label class="font_normal_body">旧用户姓名</label>
16
+ <input type="text" class="input_search"
17
+ style="width:60%"
18
+ v-model="model.f_user_name"
19
+ condition="f_user_name like '%{}%'"
20
+ placeholder="用户姓名"/>
21
+ </div>
22
+ <div class="col-sm-2 form-group">
23
+ <label class="font_normal_body">处理状态</label>
24
+ <v-select v-model="model.f_order_state" style="width:60%"
25
+ placeholder='处理状态'
26
+ :value.sync="model.f_order_state"
27
+ :options='$parent.$parent.getState'
28
+ :value-single="true"
29
+ close-on-select value-single>
30
+ </v-select>
31
+ </div>
32
+ <div class="span col-sm-3 form-group button-range" style="float: right">
33
+ <button class="button_search button_spacing" @click="search()" v-el:cx>查询</button>
34
+ <button class="button_clear button_spacing" @click="clear">清空</button>
35
+ <div style="float: right" class="button_spacing"
36
+ :class="{'button_shrink_top': criteriaShow,'button_shrink_bottom': !criteriaShow}"
37
+ @click="criteriaShow = !criteriaShow"></div>
38
+ </div>
39
+ <div class="row" v-show="criteriaShow">
40
+ <div class="col-sm-3 form-group">
41
+ <label class="font_normal_body">旧联系电话</label>
42
+ <input type="text" class="input_search"
43
+ style="width:60%"
44
+ v-model="model.f_user_phone"
45
+ condition="f_user_phone = '{}'"
46
+ placeholder="联系电话"/>
47
+ </div>
48
+ <div class="col-sm-4 form-group">
49
+ <label class="font_normal_body">起始时间</label>
50
+ <datepicker placeholder='预约时间'
51
+ v-model="model.f_orderdate_start"
52
+ :value.sync="model.f_orderdate_start"
53
+ :format="'yyyy-MM-dd 00:00:00'"
54
+ :show-reset-button="true"
55
+ condition="f_order_date >= '{}'">
56
+ </datepicker>
57
+ </div>
58
+ <div class="col-sm-4 form-group">
59
+ <label class="font_normal_body">结束时间</label>
60
+ <datepicker placeholder='预约时间'
61
+ v-model="model.f_orderdate_end"
62
+ :value.sync="model.f_orderdate_end"
63
+ :format="'yyyy-MM-dd 00:00:00'"
64
+ :show-reset-button="true"
65
+ condition="f_order_date <= '{}'">
66
+ </datepicker>
67
+ </div>
68
+ </div>
69
+ </div>
70
+ </div>
71
+ </criteria>
72
+ <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
73
+ <template partial='head'>
74
+ <tr>
75
+ <th>
76
+ <nobr>用户编号</nobr>
77
+ </th>
78
+ <th>
79
+ <nobr>旧用户姓名</nobr>
80
+ </th>
81
+ <th>
82
+ <nobr>旧联系电话</nobr>
83
+ </th>
84
+ <th>
85
+ <nobr>旧身份证号</nobr>
86
+ </th>
87
+ <th>
88
+ <nobr>新用户姓名</nobr>
89
+ </th>
90
+ <th>
91
+ <nobr>新联系电话</nobr>
92
+ </th>
93
+ <th>
94
+ <nobr>新身份证号</nobr>
95
+ </th>
96
+ <th>
97
+ <nobr>备注信息</nobr>
98
+ </th>
99
+ <th>
100
+ <nobr>预约类型</nobr>
101
+ </th>
102
+ <th>
103
+ <nobr>预约时间</nobr>
104
+ </th>
105
+ <th>
106
+ <nobr>处理状态</nobr>
107
+ </th>
108
+ <th>
109
+ <nobr>处理时间</nobr>
110
+ </th>
111
+ <th>
112
+ <nobr>处&ensp;理&ensp;人</nobr>
113
+ </th>
114
+ </tr>
115
+ </template>
116
+ <template partial='body'>
117
+ <tr>
118
+ <td style="text-align:center">{{ row.f_userinfo_code }}</td>
119
+ <td style="text-align:center">{{ row.f_user_name }}</td>
120
+ <td style="text-align:center">{{ row.f_user_phone}}</td>
121
+ <td style="text-align:center">{{ row.f_idnumber }}</td>
122
+
123
+ <td style="text-align:center">{{ row.f_newuser_name }}</td>
124
+ <td style="text-align:center">{{ row.f_newuser_phone}}</td>
125
+ <td style="text-align:center">{{ row.f_newidnumber }}</td>
126
+
127
+ <td style="text-align:center">{{ row.f_comments }}</td>
128
+ <td style="text-align:center">{{ row.f_operate_type }}</td>
129
+ <td style="text-align:center">{{ row.f_order_date }}</td>
130
+ <td style="text-align:center">{{ row.f_order_state ? row.f_order_state : '待处理' }}</td>
131
+ <td style="text-align:center">{{ row.f_operate_date }}</td>
132
+ <td style="text-align:center">{{ row.f_dispose_operator }}</td>
133
+ </tr>
134
+ </template>
135
+ <template partial='foot'></template>
136
+ </data-grid>
137
+ </criteria-paged>
138
+
139
+
140
+ </template>
141
+
142
+ <script>
143
+ import {PagedList} from 'vue-client'
144
+
145
+ export default {
146
+ data () {
147
+ return {
148
+ model: new PagedList('rs/sql/singleTable_OrderBy', 20,
149
+ {
150
+ tablename: '"t_transfer_midorder"',
151
+ items: '"*"',
152
+ orderitem: '"f_order_date desc"'
153
+ }),
154
+ criteriaShow: false
155
+ }
156
+ },
157
+ ready () {
158
+ // 默认查询待处理状态预约
159
+ this.search()
160
+ },
161
+ methods: {
162
+ getorg (val) {
163
+ this.f_orgid = this.$login.convertToIn(val)
164
+ this.f_filialeids = val[0]
165
+ this.initAreas(this.f_filialeids)
166
+ },
167
+ search () {
168
+ this.$refs.paged.$refs.criteria.search()
169
+ },
170
+ selfSearch (args) {
171
+ if (this.$refs.paged.$refs.criteria.model.f_order_state) {
172
+ if (this.$refs.paged.$refs.criteria.model.f_order_state === '待处理') {
173
+ args.condition += ` and f_order_state = '待处理 '`
174
+ }
175
+ if (this.$refs.paged.$refs.criteria.model.f_order_state === '预约成功') {
176
+ args.condition += ` and f_order_state = '预约成功' `
177
+ }
178
+ if (this.$refs.paged.$refs.criteria.model.f_order_state === '预约失败') {
179
+ args.condition += ` and f_order_state = '预约失败' `
180
+ }
181
+ }
182
+ args.condition = `${args.condition} and f_operate_type='预约过户' and f_state = '有效'`
183
+ this.model.search(args.condition, args.model)
184
+ }
185
+ },
186
+ computed: {
187
+ getState () {
188
+ return [{label: '全部', value: ''}, {label: '待处理', value: ''}, {
189
+ label: '预约成功',
190
+ value: '预约成功'
191
+ }, {label: '预约失败', value: '预约失败'}]
192
+ },
193
+ orderType () {
194
+ return [{label: '全部', value: ''}, ...this.$appdata.getParam('预约类型')]
195
+ }
196
+ },
197
+ watch: {
198
+ 'sliceArea' () {
199
+ this.model.model.f_slice_area = ''
200
+ }
201
+ }
202
+ }
203
+ </script>
204
+ <style lang="less">
205
+ </style>
@@ -0,0 +1,75 @@
1
+ <template>
2
+ <div id="unit" class="flex-row" style="width: 100%">
3
+ <div class="flex binary-left" style="flex: 1; width:50%">
4
+ <transfer-audit v-ref:list @select-changed="selected"></transfer-audit>
5
+ </div>
6
+ <div class="flex binary-left" style="width:50%">
7
+ <transfer-audit-dispose-basics
8
+ :row="row"
9
+ :images="images"
10
+ :user-info="userInfo"
11
+ :title="title">
12
+ </transfer-audit-dispose-basics>
13
+ </div>
14
+ </div>
15
+ </template>
16
+
17
+ <script>
18
+ import Json from 'vue-resource/src/http/interceptor/json'
19
+
20
+ export default {
21
+ title: '第三方过户预约审核',
22
+ data () {
23
+ return {
24
+ row: {},
25
+ title: '',
26
+ imgInfo: [],
27
+ userInfo: [],
28
+ images: []
29
+ }
30
+ },
31
+ ready () {
32
+ },
33
+ methods: {
34
+ async selected(data) {
35
+ console.log("data?", data)
36
+ this.userInfo = []
37
+ this.imgInfo = []
38
+ this.title = data.val.f_operate_type + '处理'
39
+ this.row = data.val
40
+ // 普通预约信息字段
41
+ this.userInfo.push({
42
+ key: data.val.f_describe,
43
+ value: data.val
44
+ })
45
+ try {
46
+ await this.$resetget(`http://127.0.0.1:8091/rs/content/images?path=${data.val.f_userinfo_code}`, {resolveMsg: null, rejectMsg: '获取数据错误!'})
47
+ .then(res => {
48
+ console.log('离谱啊', res)
49
+ let img = res.data.replace('[', '')
50
+ img = img.replace(']', '')
51
+ this.images = img.split(',')
52
+ console.log('离谱到家了', this.images)
53
+ }
54
+ )
55
+ } catch (e) {
56
+ console.log(e.message)
57
+ }
58
+ },
59
+ init () {
60
+ this.row = {},
61
+ this.title = '',
62
+ this.imgInfo= [],
63
+ this.userInfo= []
64
+ }
65
+ },
66
+ events: {
67
+ 'refresh' () {
68
+ this.$refs.list.$refs.paged.$refs.criteria.search()
69
+ this.init()
70
+ }
71
+ }
72
+ }
73
+ </script>
74
+ <style>
75
+ </style>