sale-client 3.5.240 → 3.5.241
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 +81 -81
- package/lib/package_2022-06-30-14-06-19.json +117 -0
- package/package.json +1 -1
- package/src/components/FilesManage/FileAddressManage.vue +1 -1
- package/src/components/FilesManage/UserEssentialInfoTest.vue +1 -1
- package/src/components/FilesManage/UserGeneralInfoTest.vue +1 -1
- package/src/components/revenue/base/leftview/otherinfo.vue +2 -2
- package/src/components/revenue/machineHandManage/machineHandAudit.vue +21 -9
- package/src/filiale/huayin/base/otherinfo.vue +2 -2
- package/src/filiale/qianneng/eticket/EticketPrint.vue +8 -6
- package/src/filiale/rizhao/otherinfo.vue +2 -2
- package/src/filiale/rongcheng/FileAddressManage.vue +1 -1
- package/src/filiale/shanxian/components/FilesManage/FileAddressList.vue +2 -2
- package/src/filiale/tongchuan/base/otherinfo.vue +2 -2
- package/src/filiale/wenxi/DisableManage.vue +105 -105
- package/src/filiale/wenxi/cardsHand.vue +903 -903
- package/src/filiale/wenxi/plugging/UserPlugging.vue +99 -0
- package/src/filiale/wenxi/plugging/UserSecurePlugging.vue +141 -0
- package/src/filiale/wenxi/sale.js +28 -24
- package/src/main.js +24 -24
- package/yarn-error.log +9224 -0
- package/.gradle/5.2.1/fileChanges/last-build.bin +0 -0
- package/.gradle/5.2.1/fileHashes/fileHashes.lock +0 -0
- package/.gradle/5.2.1/gc.properties +0 -0
- package/.gradle/7.5.1/checksums/checksums.lock +0 -0
- package/.gradle/7.5.1/dependencies-accessors/dependencies-accessors.lock +0 -0
- package/.gradle/7.5.1/dependencies-accessors/gc.properties +0 -0
- package/.gradle/7.5.1/executionHistory/executionHistory.bin +0 -0
- package/.gradle/7.5.1/executionHistory/executionHistory.lock +0 -0
- package/.gradle/7.5.1/fileChanges/last-build.bin +0 -0
- package/.gradle/7.5.1/fileHashes/fileHashes.bin +0 -0
- package/.gradle/7.5.1/fileHashes/fileHashes.lock +0 -0
- package/.gradle/7.5.1/gc.properties +0 -0
- package/.gradle/buildOutputCleanup/buildOutputCleanup.lock +0 -0
- package/.gradle/buildOutputCleanup/cache.properties +0 -2
- package/.gradle/file-system.probe +0 -0
- package/.gradle/vcs-1/gc.properties +0 -0
package/build/dev-server.js
CHANGED
|
@@ -1,81 +1,81 @@
|
|
|
1
|
-
var path = require('path')
|
|
2
|
-
const [localUrl, serverRul] = ['http://
|
|
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)
|
|
@@ -0,0 +1,117 @@
|
|
|
1
|
+
{
|
|
2
|
+
"name": "sale-client",
|
|
3
|
+
"version": "3.4.179-1",
|
|
4
|
+
"description": "收费模块前台组件",
|
|
5
|
+
"main": "src/index.js",
|
|
6
|
+
"scripts": {
|
|
7
|
+
"example": "node build/example-server.js",
|
|
8
|
+
"dev": "node build/dev-server.js",
|
|
9
|
+
"lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
|
|
10
|
+
"unit": "karma start test/unit/karma.conf.js",
|
|
11
|
+
"build": "rimraf lib && mkdirp lib && cross-env webpack --progress --hide-modules --config build/webpack.prod.conf.js",
|
|
12
|
+
"e2e": "node test/e2e/runner.js",
|
|
13
|
+
"release": "bash build/release.sh"
|
|
14
|
+
},
|
|
15
|
+
"repository": {
|
|
16
|
+
"type": "git",
|
|
17
|
+
"url": "https://gitee.com/aote/product.git"
|
|
18
|
+
},
|
|
19
|
+
"dependencies": {
|
|
20
|
+
"examples": "^0.1.0",
|
|
21
|
+
"js-file-download": "0.4.12",
|
|
22
|
+
"less-loader": "^2.2.3",
|
|
23
|
+
"qrcodejs2": "0.0.2",
|
|
24
|
+
"vue": "^1.0.17",
|
|
25
|
+
"yarn": "^1.22.10"
|
|
26
|
+
},
|
|
27
|
+
"devDependencies": {
|
|
28
|
+
"address-client": "3.2.27",
|
|
29
|
+
"axios": "0.15.3",
|
|
30
|
+
"babel-core": "^6.0.0",
|
|
31
|
+
"babel-loader": "^6.0.0",
|
|
32
|
+
"babel-plugin-transform-runtime": "^6.0.0",
|
|
33
|
+
"babel-preset-es2015": "^6.0.0",
|
|
34
|
+
"babel-preset-stage-2": "^6.0.0",
|
|
35
|
+
"chai": "^3.5.0",
|
|
36
|
+
"co": "^4.6.0",
|
|
37
|
+
"compression-webpack-plugin": "1.1.2",
|
|
38
|
+
"connect-history-api-fallback": "^1.1.0",
|
|
39
|
+
"cross-env": "^1.0.7",
|
|
40
|
+
"cross-spawn": "^2.1.5",
|
|
41
|
+
"css-loader": "^0.23.0",
|
|
42
|
+
"echarts": "^4.1.0",
|
|
43
|
+
"eslint": "^3.19.0",
|
|
44
|
+
"eslint-config-standard": "^10.2.1",
|
|
45
|
+
"eslint-friendly-formatter": "^3.0.0",
|
|
46
|
+
"eslint-loader": "^1.7.1",
|
|
47
|
+
"eslint-plugin-html": "^3.0.0",
|
|
48
|
+
"eslint-plugin-import": "^2.7.0",
|
|
49
|
+
"eslint-plugin-node": "^5.2.0",
|
|
50
|
+
"eslint-plugin-promise": "^3.4.0",
|
|
51
|
+
"eslint-plugin-standard": "^3.0.1",
|
|
52
|
+
"eventsource-polyfill": "^0.9.6",
|
|
53
|
+
"express": "^4.13.3",
|
|
54
|
+
"extract-text-webpack-plugin": "^1.0.1",
|
|
55
|
+
"file-loader": "^0.8.4",
|
|
56
|
+
"filemanager-webpack-plugin": "^2.0.5",
|
|
57
|
+
"function-bind": "^1.0.2",
|
|
58
|
+
"html-webpack-plugin": "^2.8.1",
|
|
59
|
+
"http-proxy-middleware": "^0.11.0",
|
|
60
|
+
"inject-loader": "^2.0.1",
|
|
61
|
+
"isparta-loader": "^2.0.0",
|
|
62
|
+
"jasmine-core": "^2.4.1",
|
|
63
|
+
"jquery": "^3.3.1",
|
|
64
|
+
"jsencrypt": "3.0.0-rc.1",
|
|
65
|
+
"json-loader": "^0.5.4",
|
|
66
|
+
"karma": "^1.4.1",
|
|
67
|
+
"karma-chrome-launcher": "^2.2.0",
|
|
68
|
+
"karma-coverage": "^1.1.1",
|
|
69
|
+
"karma-mocha": "^1.3.0",
|
|
70
|
+
"karma-sinon-chai": "^1.3.1",
|
|
71
|
+
"karma-sourcemap-loader": "^0.3.7",
|
|
72
|
+
"karma-spec-reporter": "0.0.31",
|
|
73
|
+
"karma-webpack": "^2.0.2",
|
|
74
|
+
"ldap-clients": "3.0.7",
|
|
75
|
+
"less": "^2.7.3",
|
|
76
|
+
"manage-client": "3.1.8-88",
|
|
77
|
+
"mkdirp": "^0.5.1",
|
|
78
|
+
"mocha": "^3.2.0",
|
|
79
|
+
"moment": "2.24.0",
|
|
80
|
+
"ncp": "^2.0.0",
|
|
81
|
+
"nightwatch": "^0.8.18",
|
|
82
|
+
"qrcodejs2": "0.0.2",
|
|
83
|
+
"rimraf": "^2.5.0",
|
|
84
|
+
"selenium-server": "2.52.0",
|
|
85
|
+
"sinon": "^2.1.0",
|
|
86
|
+
"sinon-chai": "^2.8.0",
|
|
87
|
+
"style": "0.0.3",
|
|
88
|
+
"style-loader": "^0.20.3",
|
|
89
|
+
"system-clients": "3.2.0-2",
|
|
90
|
+
"url-loader": "^0.5.7",
|
|
91
|
+
"vue-client": "1.24.52",
|
|
92
|
+
"vue-clipboard2": "0.3.1",
|
|
93
|
+
"vue-hot-reload-api": "^1.2.0",
|
|
94
|
+
"vue-html-loader": "^1.0.0",
|
|
95
|
+
"vue-loader": "^8.2.1",
|
|
96
|
+
"vue-resource": "^1.5.0",
|
|
97
|
+
"vue-router": "^0.7.13",
|
|
98
|
+
"vue-strap": "^1.0.9",
|
|
99
|
+
"vue-style-loader": "^1.0.0",
|
|
100
|
+
"vue-validator": "2.1.7",
|
|
101
|
+
"webpack": "^1.12.2",
|
|
102
|
+
"webpack-dev-middleware": "^1.4.0",
|
|
103
|
+
"webpack-hot-middleware": "^2.6.0",
|
|
104
|
+
"webpack-merge": "^0.8.3",
|
|
105
|
+
"webpack-parallel-uglify-plugin": "^1.0.0",
|
|
106
|
+
"weixin-js-sdk": "^1.2.0"
|
|
107
|
+
},
|
|
108
|
+
"keywords": [
|
|
109
|
+
"selling-clients"
|
|
110
|
+
],
|
|
111
|
+
"author": "张桥",
|
|
112
|
+
"license": "ISC",
|
|
113
|
+
"directories": {
|
|
114
|
+
"example": "examples",
|
|
115
|
+
"test": "test"
|
|
116
|
+
}
|
|
117
|
+
}
|
package/package.json
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
<div :class="{'basic-main':!useraddressShow,'binary-left':useraddressShow}" v-show="isSelect">
|
|
4
4
|
<file-address-list @select-changed="selected" v-ref:addresslist :style="style" :select=select :company=company :f_filialeids.sync="f_filialeids"></file-address-list>
|
|
5
5
|
</div>
|
|
6
|
-
<div v-show="useraddressShow" :class="{'basic-main':!isSelect, 'binary-right': isSelect}">
|
|
6
|
+
<div v-show="useraddressShow" :class="{'basic-main':!isSelect, 'binary-right': isSelect}" style="width:60%">
|
|
7
7
|
<div class="flex">
|
|
8
8
|
<file-user-address :f_filialeids.sync="f_filialeids" :is_pecial="isSpecial" :isedit="isSelect" :row="row" v-ref:fileuseraddress></file-user-address>
|
|
9
9
|
|
|
@@ -205,7 +205,7 @@
|
|
|
205
205
|
</div>
|
|
206
206
|
</form>
|
|
207
207
|
</validator>
|
|
208
|
-
<modal v-if="showselectaddress" :show.sync="showselectaddress" width="
|
|
208
|
+
<modal v-if="showselectaddress" :show.sync="showselectaddress" width="70%" height="80%" title="地址信息" v-ref:modal large backdrop="false">
|
|
209
209
|
<article slot="modal-body" class="modal-body" style="height: 700px;padding: 0!important;">
|
|
210
210
|
<file-address-manage :is-select="isSelect" :fileinfo="addressinfo"
|
|
211
211
|
@address-valid="doNothing" :showselectaddress.sync="showselectaddress" v-ref:fileaddress ></file-address-manage>
|
|
@@ -93,7 +93,7 @@
|
|
|
93
93
|
</div>
|
|
94
94
|
<div class="row">
|
|
95
95
|
<div class="col-sm-2"></div>
|
|
96
|
-
<input v-if="fileSaveData.reason==='其他'" class="input_search" style="width:60%" placeholder='修改原因' v-model="fileSaveData.modifyReason"/>
|
|
96
|
+
<input v-if="fileSaveData.reason ==='其他'" class="input_search" style="width:60%" placeholder='修改原因' v-model="fileSaveData.modifyReason"/>
|
|
97
97
|
</div>
|
|
98
98
|
</article>
|
|
99
99
|
<footer slot="modal-footer" class="modal-footer">
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
<template>
|
|
2
2
|
<div class="flex" style="height: 90%;overflow-y: scroll">
|
|
3
|
-
<mix-price-info :data="data" v-if="data.f_price_type === '固定气价'"></mix-price-info>
|
|
4
|
-
<stairinfo :data="data" v-if="data.f_price_type === '阶梯气价'"></stairinfo>
|
|
3
|
+
<mix-price-info :data="data" v-if="data.f_meter_type && data.f_price_type === '固定气价'"></mix-price-info>
|
|
4
|
+
<stairinfo :data="data" v-if="data.f_meter_type && data.f_price_type === '阶梯气价'"></stairinfo>
|
|
5
5
|
<bill-message @setstate="setstate" :state="state" :data="data"></bill-message>
|
|
6
6
|
<valueaddinfo :data="data" v-ref:valueaddinfo></valueaddinfo>
|
|
7
7
|
<safe-check :data="data"></safe-check>
|
|
@@ -394,7 +394,7 @@
|
|
|
394
394
|
import * as Util from '../../../Util'
|
|
395
395
|
|
|
396
396
|
let readyGen = async function (self) {
|
|
397
|
-
self.$refs.paged.$refs.cri.model.startDate =
|
|
397
|
+
self.$refs.paged.$refs.cri.model.startDate = self.$login.toStartAndEndDateString()[0]
|
|
398
398
|
self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString()
|
|
399
399
|
await self.$LoadParams.loadMeterBook(self.f_filialeid)
|
|
400
400
|
self.loadMeterBooks()
|
|
@@ -414,12 +414,13 @@
|
|
|
414
414
|
dep: [],
|
|
415
415
|
user: []
|
|
416
416
|
},
|
|
417
|
-
config:{
|
|
418
|
-
examine: false
|
|
417
|
+
config: {
|
|
418
|
+
examine: false
|
|
419
419
|
},
|
|
420
420
|
imgfilename: '',
|
|
421
421
|
// 小区
|
|
422
422
|
residentialArea: [],
|
|
423
|
+
inputtouPerson: [],
|
|
423
424
|
imgshow: false,
|
|
424
425
|
criteriaShow: false,
|
|
425
426
|
orgCondtionStr: '',
|
|
@@ -444,8 +445,8 @@
|
|
|
444
445
|
'f_adjustable_name': '调压箱名称',
|
|
445
446
|
'f_inputtor': '抄表员'
|
|
446
447
|
},
|
|
447
|
-
auditState:[{label: '全部', value: ''}, {label: '已审核', value: '已抄表'}, {label: '未审核', value: '待审核'}],
|
|
448
|
-
auditState1:[{label: '全部', value: ''}, {label: '审核失败', value: '审核失败'}],
|
|
448
|
+
auditState: [{label: '全部', value: ''}, {label: '已审核', value: '已抄表'}, {label: '未审核', value: '待审核'}],
|
|
449
|
+
auditState1: [{label: '全部', value: ''}, {label: '审核失败', value: '审核失败'}],
|
|
449
450
|
meters: [{label: '全部', value: ''}, {label: '机表', value: '机表'}, {label: '物联网表', value: '物联网表'}],
|
|
450
451
|
resultstate: this.$appdata.getParam('抄表结果状态'),
|
|
451
452
|
meterstates: this.$appdata.getParam('抄表状态') ? [{
|
|
@@ -475,7 +476,7 @@
|
|
|
475
476
|
methods: {
|
|
476
477
|
// 修正本期底数
|
|
477
478
|
amend (row) {
|
|
478
|
-
let tablebase = window.prompt('请输入你要修正的底数值，上期底数：'+ row.f_meter_base)
|
|
479
|
+
let tablebase = window.prompt('请输入你要修正的底数值，上期底数：' + row.f_meter_base)
|
|
479
480
|
if (!tablebase) return
|
|
480
481
|
if (tablebase < 0) {
|
|
481
482
|
this.$showAlert(`底数不能小于0，请注意!`, 'warning', 2000)
|
|
@@ -596,9 +597,9 @@
|
|
|
596
597
|
this.imgshow = false
|
|
597
598
|
},
|
|
598
599
|
imgShow (val) {
|
|
599
|
-
console.log(
|
|
600
|
+
console.log('-----------val2:', val)
|
|
600
601
|
this.imgfilename = `rs/image/file/` + val
|
|
601
|
-
console.log(
|
|
602
|
+
console.log('-----------imgfilename2:', this.imgfilename)
|
|
602
603
|
this.imgshow = true
|
|
603
604
|
},
|
|
604
605
|
async getaddress () {
|
|
@@ -632,6 +633,17 @@
|
|
|
632
633
|
} else {
|
|
633
634
|
args.condition = `${args.condition}` + this.orgCondtionStr
|
|
634
635
|
}
|
|
636
|
+
// 抄表员查询条件
|
|
637
|
+
this.inputtouPerson = this.$refs.paged.$refs.cri.model.f_inputtor
|
|
638
|
+
if (this.inputtouPerson.length !== 0) {
|
|
639
|
+
let str = JSON.stringify(this.inputtouPerson)
|
|
640
|
+
str = str.replace(/"/g, `'`)
|
|
641
|
+
str = str.replace(/\[/g, ``)
|
|
642
|
+
str = str.replace(/\]/g, ``)
|
|
643
|
+
console.log('=====抄表员model22222222222绑定====', str)
|
|
644
|
+
// 查询多个抄表员时条件
|
|
645
|
+
args.condition += ` and f_inputtor in ( ${str} )`
|
|
646
|
+
}
|
|
635
647
|
this.excelCondition = args.condition
|
|
636
648
|
this.$refs.paged.$refs.grid.selectInit()
|
|
637
649
|
this.model.search(args.condition, args.model)
|
|
@@ -696,7 +708,7 @@
|
|
|
696
708
|
},
|
|
697
709
|
loadMeterBooks () {
|
|
698
710
|
this.meterbooks = this.$GetSaleParam.getMeterBooks()
|
|
699
|
-
}
|
|
711
|
+
}
|
|
700
712
|
|
|
701
713
|
},
|
|
702
714
|
computed: {
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
<template>
|
|
2
2
|
<div class="flex" style="height: 90%;overflow-y: scroll">
|
|
3
|
-
<mix-price-info :data="data" v-if="data.f_price_type === '固定气价'"></mix-price-info>
|
|
4
|
-
<stairinfo :data="data" v-if="data.f_price_type === '阶梯气价'"></stairinfo>
|
|
3
|
+
<mix-price-info :data="data" v-if="data.f_meter_type && data.f_price_type === '固定气价'"></mix-price-info>
|
|
4
|
+
<stairinfo :data="data" v-if="data.f_meter_type && data.f_price_type === '阶梯气价'"></stairinfo>
|
|
5
5
|
<safe-check :data="data"></safe-check>
|
|
6
6
|
<bill-message @setstate="setstate" :state="state" :data="data"></bill-message>
|
|
7
7
|
<valueaddinfo :data="data" v-ref:valueaddinfo></valueaddinfo>
|
|
@@ -132,11 +132,12 @@ export default {
|
|
|
132
132
|
id: ticket_id,
|
|
133
133
|
f_bill_code: req.fpDm,
|
|
134
134
|
f_bill_number: req.fpHm,
|
|
135
|
-
f_bill_url: req.
|
|
136
|
-
|
|
135
|
+
f_bill_url: req.fileUrl.replace('d:\\qianNengInvoiceFile', '/Download'),
|
|
136
|
+
f_sign_url: req.shareurl,
|
|
137
|
+
f_sign_result: req.sharecode,
|
|
137
138
|
f_bill_state: req.status
|
|
138
139
|
}
|
|
139
|
-
this.eticket_src =
|
|
140
|
+
this.eticket_src = 'https://qnjtkf.cn:7400' + model.f_bill_url
|
|
140
141
|
} else if (req.status === '开票中') {
|
|
141
142
|
model = {
|
|
142
143
|
id: ticket_id,
|
|
@@ -303,11 +304,12 @@ export default {
|
|
|
303
304
|
f_eticket_id: ticket_id,
|
|
304
305
|
f_bill_code: req.fpDm,
|
|
305
306
|
f_bill_number: req.fpHm,
|
|
306
|
-
f_bill_url: req.
|
|
307
|
-
|
|
307
|
+
f_bill_url: req.fileUrl.replace('d:\\qianNengInvoiceFile', '/Download'),
|
|
308
|
+
f_sign_url: req.shareurl,
|
|
309
|
+
f_sign_result: req.sharecode,
|
|
308
310
|
f_bill_state: req.status
|
|
309
311
|
})
|
|
310
|
-
this.eticket_src =
|
|
312
|
+
this.eticket_src = 'https://qnjtkf.cn:7400' + req.fileUrl.replace('d:\\qianNengInvoiceFile', '/Download')
|
|
311
313
|
} else if (req && req.status !== '开票中') {
|
|
312
314
|
clearInterval(interval)
|
|
313
315
|
// TODO 失败后保存发票详情
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
<template>
|
|
2
2
|
<div class="flex" style="height: 90%;overflow-y: scroll">
|
|
3
|
-
<mix-price-info :data="data" v-if="data.f_price_type === '固定气价'"></mix-price-info>
|
|
4
|
-
<stairinfo :data="data" v-if="data.f_price_type === '阶梯气价'"></stairinfo>
|
|
3
|
+
<mix-price-info :data="data" v-if="data.f_meter_type && data.f_price_type === '固定气价'"></mix-price-info>
|
|
4
|
+
<stairinfo :data="data" v-if="data.f_meter_type && data.f_price_type === '阶梯气价'"></stairinfo>
|
|
5
5
|
<valueaddinfo :data="data" v-ref:valueaddinfo></valueaddinfo>
|
|
6
6
|
<safe-check :data="data"></safe-check>
|
|
7
7
|
<service-repair :data="data" v-if="name==='维修情况查询'"></service-repair>
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
<div :class="{'basic-main':!useraddressShow,'binary-left':useraddressShow}" v-show="isSelect">
|
|
4
4
|
<file-address-list @select-changed="selected" v-ref:addresslist :style="style" :select=select :company=company :f_filialeids.sync="f_filialeids"></file-address-list>
|
|
5
5
|
</div>
|
|
6
|
-
<div v-show="useraddressShow" :class="{'basic-main':!isSelect, 'binary-right': isSelect}">
|
|
6
|
+
<div v-show="useraddressShow" :class="{'basic-main':!isSelect, 'binary-right': isSelect}" style="width:60%">
|
|
7
7
|
<div class="flex">
|
|
8
8
|
<file-user-address :f_filialeids.sync="f_filialeids" :is_pecial="isSpecial" :isedit="isSelect" :row="row" v-ref:fileuseraddress></file-user-address>
|
|
9
9
|
|
|
@@ -5,14 +5,14 @@
|
|
|
5
5
|
<div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
|
|
6
6
|
|
|
7
7
|
<div class="row">
|
|
8
|
-
<div class="col-sm-
|
|
8
|
+
<div class="col-sm-6 form-group">
|
|
9
9
|
<label class="font_normal_body">地址信息</label>
|
|
10
10
|
<input type="text" class="input_search" style="width:60%" v-model="model.f_address"
|
|
11
11
|
condition="f_address like '%{}%'" placeholder="地址信息"
|
|
12
12
|
@keyup.enter.stop="search()"
|
|
13
13
|
:size="model.f_address ? model.f_address.length*2 : 8"/>
|
|
14
14
|
</div>
|
|
15
|
-
<div class="col-sm-
|
|
15
|
+
<div class="col-sm-6 form-group button-range" >
|
|
16
16
|
<button class="button_search button_spacing" @click="search()" >查询</button>
|
|
17
17
|
<button class="button_new button_spacing" style="width: max-content" @click="$parent.$parent.add('民用')">添加民用地址</button>
|
|
18
18
|
<button class="button_new button_spacing" style="width: max-content" @click="$parent.$parent.add('非民用')">添加特殊地址</button>
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
<template>
|
|
2
2
|
<div class="flex" style="overflow-y: scroll">
|
|
3
|
-
<mix-price-info :data="data" v-if="data.f_price_type === '固定气价'"></mix-price-info>
|
|
4
|
-
<stairinfo :data="data" v-if="data.f_price_type === '阶梯气价'"></stairinfo>
|
|
3
|
+
<mix-price-info :data="data" v-if="data.f_meter_type && data.f_price_type === '固定气价'"></mix-price-info>
|
|
4
|
+
<stairinfo :data="data" v-if="data.f_meter_type && data.f_price_type === '阶梯气价'"></stairinfo>
|
|
5
5
|
<bill-message @setstate="setstate" :state="state" :data="data"></bill-message>
|
|
6
6
|
<valueaddinfo :data="data" v-ref:valueaddinfo></valueaddinfo>
|
|
7
7
|
<safe-check :data="data"></safe-check>
|