sale-client 3.6.241 → 3.6.243
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/package.json +120 -120
- package/src/components/revenue/comprehen/TotalSplit/AllUserFiles.vue +70 -61
- package/src/components/revenue/comprehen/TotalSplit/SplitList.vue +72 -52
- package/src/components/revenue/comprehen/TotalSplit/TotalSplitList.vue +11 -13
- package/src/components/revenue/comprehen/TotalSplit/TotalSplitManage.vue +2 -1
- package/src/components/revenue/machineHandManage/HandplanQuery.vue +25 -4
- package/src/components/revenue/machineHandManage/machineHandAudit.vue +11 -11
- package/src/filiale/shaoguan/HandplanQuery.vue +1336 -0
- package/src/filiale/shaoguan/base/UserBaseInfoNew.vue +470 -0
- package/src/filiale/shaoguan/sale.js +1 -0
- package/src/filiale/tongchuan/UserBaseInfoNew.vue +2 -2
- package/src/filiale/yuncheng/HandplanQuery.vue +37 -30
- package/src/filiale/yuncheng/machineHandAudit.vue +20 -27
- package/src/plugins/SelectService.js +3 -0
package/package.json
CHANGED
|
@@ -1,120 +1,120 @@
|
|
|
1
|
-
{
|
|
2
|
-
"name": "sale-client",
|
|
3
|
-
"version": "3.6.
|
|
4
|
-
"description": "收费模块前台组件",
|
|
5
|
-
"main": "src/index.js",
|
|
6
|
-
"scripts": {
|
|
7
|
-
"example": "node build/example-server.js",
|
|
8
|
-
"dev": "webpack-dev-server --config ./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
|
-
"crypto-js": "^4.1.1",
|
|
21
|
-
"examples": "^0.1.0",
|
|
22
|
-
"js-file-download": "0.4.12",
|
|
23
|
-
"less-loader": "^2.2.3",
|
|
24
|
-
"qrcodejs2": "0.0.2",
|
|
25
|
-
"vue": "^1.0.17",
|
|
26
|
-
"webpack-dev-server": "^2.11.5",
|
|
27
|
-
"vue-client": "1.24.116",
|
|
28
|
-
"yarn": "^1.22.10"
|
|
29
|
-
},
|
|
30
|
-
"devDependencies": {
|
|
31
|
-
"address-client": "3.2.56",
|
|
32
|
-
"axios": "0.15.3",
|
|
33
|
-
"babel-core": "^6.0.0",
|
|
34
|
-
"babel-loader": "^6.0.0",
|
|
35
|
-
"babel-plugin-transform-runtime": "^6.0.0",
|
|
36
|
-
"babel-preset-es2015": "^6.0.0",
|
|
37
|
-
"babel-preset-stage-2": "^6.0.0",
|
|
38
|
-
"chai": "^3.5.0",
|
|
39
|
-
"co": "^4.6.0",
|
|
40
|
-
"compression-webpack-plugin": "1.1.2",
|
|
41
|
-
"connect-history-api-fallback": "^1.1.0",
|
|
42
|
-
"cross-env": "^1.0.7",
|
|
43
|
-
"cross-spawn": "^2.1.5",
|
|
44
|
-
"css-loader": "^0.23.0",
|
|
45
|
-
"echarts": "^4.1.0",
|
|
46
|
-
"eslint": "^3.19.0",
|
|
47
|
-
"eslint-config-standard": "^10.2.1",
|
|
48
|
-
"eslint-friendly-formatter": "^3.0.0",
|
|
49
|
-
"eslint-loader": "^1.7.1",
|
|
50
|
-
"eslint-plugin-html": "^3.0.0",
|
|
51
|
-
"eslint-plugin-import": "^2.7.0",
|
|
52
|
-
"eslint-plugin-node": "^5.2.0",
|
|
53
|
-
"eslint-plugin-promise": "^3.4.0",
|
|
54
|
-
"eslint-plugin-standard": "^3.0.1",
|
|
55
|
-
"eventsource-polyfill": "^0.9.6",
|
|
56
|
-
"express": "^4.13.3",
|
|
57
|
-
"extract-text-webpack-plugin": "^3.0.2",
|
|
58
|
-
"terser-webpack-plugin-legacy": "^1.2.5",
|
|
59
|
-
"file-loader": "^0.8.4",
|
|
60
|
-
"filemanager-webpack-plugin": "^2.0.5",
|
|
61
|
-
"function-bind": "^1.0.2",
|
|
62
|
-
"html-webpack-plugin": "^2.8.1",
|
|
63
|
-
"http-proxy-middleware": "^0.11.0",
|
|
64
|
-
"inject-loader": "^2.0.1",
|
|
65
|
-
"isparta-loader": "^2.0.0",
|
|
66
|
-
"jasmine-core": "^2.4.1",
|
|
67
|
-
"jquery": "^3.3.1",
|
|
68
|
-
"jsencrypt": "3.0.0-rc.1",
|
|
69
|
-
"json-loader": "^0.5.4",
|
|
70
|
-
"karma": "^1.4.1",
|
|
71
|
-
"karma-chrome-launcher": "^2.2.0",
|
|
72
|
-
"karma-coverage": "^1.1.1",
|
|
73
|
-
"karma-mocha": "^1.3.0",
|
|
74
|
-
"karma-sinon-chai": "^1.3.1",
|
|
75
|
-
"karma-sourcemap-loader": "^0.3.7",
|
|
76
|
-
"karma-spec-reporter": "0.0.31",
|
|
77
|
-
"karma-webpack": "^2.0.2",
|
|
78
|
-
"ldap-clients": "3.0.62",
|
|
79
|
-
"less": "^2.7.3",
|
|
80
|
-
"manage-client": "3.1.8-88",
|
|
81
|
-
"mkdirp": "^0.5.1",
|
|
82
|
-
"mocha": "^3.2.0",
|
|
83
|
-
"moment": "2.24.0",
|
|
84
|
-
"ncp": "^2.0.0",
|
|
85
|
-
"nightwatch": "^0.8.18",
|
|
86
|
-
"qrcodejs2": "0.0.2",
|
|
87
|
-
"rimraf": "^2.5.0",
|
|
88
|
-
"selenium-server": "2.52.0",
|
|
89
|
-
"sinon": "^2.1.0",
|
|
90
|
-
"sinon-chai": "^2.8.0",
|
|
91
|
-
"style": "0.0.3",
|
|
92
|
-
"style-loader": "^0.20.3",
|
|
93
|
-
"system-clients": "3.2.61",
|
|
94
|
-
"url-loader": "^0.5.7",
|
|
95
|
-
"vue-clipboard2": "0.3.1",
|
|
96
|
-
"vue-hot-reload-api": "^1.2.0",
|
|
97
|
-
"vue-html-loader": "^1.0.0",
|
|
98
|
-
"vue-loader": "^8.2.1",
|
|
99
|
-
"vue-resource": "^1.5.0",
|
|
100
|
-
"vue-router": "^0.7.13",
|
|
101
|
-
"vue-strap": "^1.0.9",
|
|
102
|
-
"vue-style-loader": "^1.0.0",
|
|
103
|
-
"vue-validator": "2.1.7",
|
|
104
|
-
"webpack": "^3.12.0",
|
|
105
|
-
"webpack-dev-middleware": "^1.4.0",
|
|
106
|
-
"webpack-hot-middleware": "^2.6.0",
|
|
107
|
-
"webpack-merge": "^0.8.3",
|
|
108
|
-
"webpack-parallel-uglify-plugin": "^1.0.0",
|
|
109
|
-
"weixin-js-sdk": "^1.2.0"
|
|
110
|
-
},
|
|
111
|
-
"keywords": [
|
|
112
|
-
"selling-clients"
|
|
113
|
-
],
|
|
114
|
-
"author": "张桥",
|
|
115
|
-
"license": "ISC",
|
|
116
|
-
"directories": {
|
|
117
|
-
"example": "examples",
|
|
118
|
-
"test": "test"
|
|
119
|
-
}
|
|
120
|
-
}
|
|
1
|
+
{
|
|
2
|
+
"name": "sale-client",
|
|
3
|
+
"version": "3.6.243",
|
|
4
|
+
"description": "收费模块前台组件",
|
|
5
|
+
"main": "src/index.js",
|
|
6
|
+
"scripts": {
|
|
7
|
+
"example": "node build/example-server.js",
|
|
8
|
+
"dev": "webpack-dev-server --config ./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
|
+
"crypto-js": "^4.1.1",
|
|
21
|
+
"examples": "^0.1.0",
|
|
22
|
+
"js-file-download": "0.4.12",
|
|
23
|
+
"less-loader": "^2.2.3",
|
|
24
|
+
"qrcodejs2": "0.0.2",
|
|
25
|
+
"vue": "^1.0.17",
|
|
26
|
+
"webpack-dev-server": "^2.11.5",
|
|
27
|
+
"vue-client": "1.24.116",
|
|
28
|
+
"yarn": "^1.22.10"
|
|
29
|
+
},
|
|
30
|
+
"devDependencies": {
|
|
31
|
+
"address-client": "3.2.56",
|
|
32
|
+
"axios": "0.15.3",
|
|
33
|
+
"babel-core": "^6.0.0",
|
|
34
|
+
"babel-loader": "^6.0.0",
|
|
35
|
+
"babel-plugin-transform-runtime": "^6.0.0",
|
|
36
|
+
"babel-preset-es2015": "^6.0.0",
|
|
37
|
+
"babel-preset-stage-2": "^6.0.0",
|
|
38
|
+
"chai": "^3.5.0",
|
|
39
|
+
"co": "^4.6.0",
|
|
40
|
+
"compression-webpack-plugin": "1.1.2",
|
|
41
|
+
"connect-history-api-fallback": "^1.1.0",
|
|
42
|
+
"cross-env": "^1.0.7",
|
|
43
|
+
"cross-spawn": "^2.1.5",
|
|
44
|
+
"css-loader": "^0.23.0",
|
|
45
|
+
"echarts": "^4.1.0",
|
|
46
|
+
"eslint": "^3.19.0",
|
|
47
|
+
"eslint-config-standard": "^10.2.1",
|
|
48
|
+
"eslint-friendly-formatter": "^3.0.0",
|
|
49
|
+
"eslint-loader": "^1.7.1",
|
|
50
|
+
"eslint-plugin-html": "^3.0.0",
|
|
51
|
+
"eslint-plugin-import": "^2.7.0",
|
|
52
|
+
"eslint-plugin-node": "^5.2.0",
|
|
53
|
+
"eslint-plugin-promise": "^3.4.0",
|
|
54
|
+
"eslint-plugin-standard": "^3.0.1",
|
|
55
|
+
"eventsource-polyfill": "^0.9.6",
|
|
56
|
+
"express": "^4.13.3",
|
|
57
|
+
"extract-text-webpack-plugin": "^3.0.2",
|
|
58
|
+
"terser-webpack-plugin-legacy": "^1.2.5",
|
|
59
|
+
"file-loader": "^0.8.4",
|
|
60
|
+
"filemanager-webpack-plugin": "^2.0.5",
|
|
61
|
+
"function-bind": "^1.0.2",
|
|
62
|
+
"html-webpack-plugin": "^2.8.1",
|
|
63
|
+
"http-proxy-middleware": "^0.11.0",
|
|
64
|
+
"inject-loader": "^2.0.1",
|
|
65
|
+
"isparta-loader": "^2.0.0",
|
|
66
|
+
"jasmine-core": "^2.4.1",
|
|
67
|
+
"jquery": "^3.3.1",
|
|
68
|
+
"jsencrypt": "3.0.0-rc.1",
|
|
69
|
+
"json-loader": "^0.5.4",
|
|
70
|
+
"karma": "^1.4.1",
|
|
71
|
+
"karma-chrome-launcher": "^2.2.0",
|
|
72
|
+
"karma-coverage": "^1.1.1",
|
|
73
|
+
"karma-mocha": "^1.3.0",
|
|
74
|
+
"karma-sinon-chai": "^1.3.1",
|
|
75
|
+
"karma-sourcemap-loader": "^0.3.7",
|
|
76
|
+
"karma-spec-reporter": "0.0.31",
|
|
77
|
+
"karma-webpack": "^2.0.2",
|
|
78
|
+
"ldap-clients": "3.0.62",
|
|
79
|
+
"less": "^2.7.3",
|
|
80
|
+
"manage-client": "3.1.8-88",
|
|
81
|
+
"mkdirp": "^0.5.1",
|
|
82
|
+
"mocha": "^3.2.0",
|
|
83
|
+
"moment": "2.24.0",
|
|
84
|
+
"ncp": "^2.0.0",
|
|
85
|
+
"nightwatch": "^0.8.18",
|
|
86
|
+
"qrcodejs2": "0.0.2",
|
|
87
|
+
"rimraf": "^2.5.0",
|
|
88
|
+
"selenium-server": "2.52.0",
|
|
89
|
+
"sinon": "^2.1.0",
|
|
90
|
+
"sinon-chai": "^2.8.0",
|
|
91
|
+
"style": "0.0.3",
|
|
92
|
+
"style-loader": "^0.20.3",
|
|
93
|
+
"system-clients": "3.2.61",
|
|
94
|
+
"url-loader": "^0.5.7",
|
|
95
|
+
"vue-clipboard2": "0.3.1",
|
|
96
|
+
"vue-hot-reload-api": "^1.2.0",
|
|
97
|
+
"vue-html-loader": "^1.0.0",
|
|
98
|
+
"vue-loader": "^8.2.1",
|
|
99
|
+
"vue-resource": "^1.5.0",
|
|
100
|
+
"vue-router": "^0.7.13",
|
|
101
|
+
"vue-strap": "^1.0.9",
|
|
102
|
+
"vue-style-loader": "^1.0.0",
|
|
103
|
+
"vue-validator": "2.1.7",
|
|
104
|
+
"webpack": "^3.12.0",
|
|
105
|
+
"webpack-dev-middleware": "^1.4.0",
|
|
106
|
+
"webpack-hot-middleware": "^2.6.0",
|
|
107
|
+
"webpack-merge": "^0.8.3",
|
|
108
|
+
"webpack-parallel-uglify-plugin": "^1.0.0",
|
|
109
|
+
"weixin-js-sdk": "^1.2.0"
|
|
110
|
+
},
|
|
111
|
+
"keywords": [
|
|
112
|
+
"selling-clients"
|
|
113
|
+
],
|
|
114
|
+
"author": "张桥",
|
|
115
|
+
"license": "ISC",
|
|
116
|
+
"directories": {
|
|
117
|
+
"example": "examples",
|
|
118
|
+
"test": "test"
|
|
119
|
+
}
|
|
120
|
+
}
|
|
@@ -1,47 +1,56 @@
|
|
|
1
1
|
<template>
|
|
2
|
-
<div class="flex" >
|
|
2
|
+
<div class="flex" style="flex: 1;">
|
|
3
3
|
<criteria-paged :model="model" v-ref:paged>
|
|
4
|
-
<criteria partial='criteria' @condition-changed='$parent.
|
|
5
|
-
<div novalidate class="form-
|
|
6
|
-
<div >
|
|
7
|
-
<
|
|
8
|
-
|
|
9
|
-
|
|
4
|
+
<criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
|
|
5
|
+
<div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
|
|
6
|
+
<div class="row">
|
|
7
|
+
<div class="form-group col-sm-4">
|
|
8
|
+
<label class="font_normal_body">组织机构</label>
|
|
9
|
+
<res-select
|
|
10
|
+
restype='organization'
|
|
11
|
+
@res-select="$parent.$parent.getorg"
|
|
12
|
+
is-mul="false"
|
|
13
|
+
:initresid='$parent.$parent.curorgid'
|
|
14
|
+
>
|
|
15
|
+
</res-select>
|
|
16
|
+
</div>
|
|
17
|
+
<div class="form-group col-sm-4">
|
|
18
|
+
<label class="font_normal_body">客户编号</label>
|
|
19
|
+
<input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code" placeholder='客户编号'
|
|
20
|
+
condition="f_userinfo_code = '{}'">
|
|
21
|
+
</div>
|
|
22
|
+
<div class="span" style="float:right;">
|
|
23
|
+
<button class="button_search button_spacing" @click="search()">查询</button>
|
|
24
|
+
<button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
|
|
25
|
+
<div style="float: right" class="button_spacing"
|
|
26
|
+
:class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
|
|
27
|
+
@click="$parent.$parent.hidden()"></div>
|
|
28
|
+
</div>
|
|
10
29
|
</div>
|
|
11
|
-
<div >
|
|
12
|
-
<
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
<
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
condition="f_address like '%{}%'" v-next-el='cx' v-el:resentialarea
|
|
24
|
-
:size="model.f_address ? model.f_address.length * 2 : 4">
|
|
25
|
-
</div>
|
|
26
|
-
<div >
|
|
27
|
-
<input type="text" class="form-control" v-model="model.f_meterbook_id" placeholder='表册号'
|
|
28
|
-
condition="f_meterbook_id = '{}'"
|
|
29
|
-
:size="model.f_meterbook_id ? model.f_meterbook_id.length : 2">
|
|
30
|
-
</div>
|
|
31
|
-
<div >
|
|
32
|
-
<button class="btn btn-success" @click="search()" v-el:cx>查询</button>
|
|
30
|
+
<div class="row" v-show="$parent.$parent.criteriaShow">
|
|
31
|
+
<div class="form-group col-sm-4">
|
|
32
|
+
<label class="font_normal_body">客户名称</label>
|
|
33
|
+
<input type="text" style="width:60%" class="input_search" v-model="model.f_user_name" placeholder='客户名称'
|
|
34
|
+
condition="f_user_name like '%{}%'">
|
|
35
|
+
</div>
|
|
36
|
+
<div class="form-group col-sm-4">
|
|
37
|
+
<label class="font_normal_body">客户地址</label>
|
|
38
|
+
<input type="text" style="width:60%" class="input_search" v-model="model.f_address" placeholder='客户地址'
|
|
39
|
+
condition="f_address like '%{}%'">
|
|
40
|
+
</div>
|
|
41
|
+
|
|
33
42
|
</div>
|
|
34
43
|
</div>
|
|
35
44
|
</criteria>
|
|
36
|
-
<data-grid :model="model" partial='list' v-ref:grid>
|
|
45
|
+
<data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
|
|
37
46
|
<template partial='head'>
|
|
38
47
|
<tr>
|
|
39
|
-
<th>序号</th>
|
|
40
|
-
<th>客户名称</th>
|
|
41
|
-
<th>表编号</th>
|
|
42
|
-
<th>表品牌</th>
|
|
43
|
-
<th>表型号</th>
|
|
44
|
-
<th>是否总表</th>
|
|
48
|
+
<th><nobr>序号</nobr></th>
|
|
49
|
+
<th><nobr>客户名称</nobr></th>
|
|
50
|
+
<th><nobr>表编号</nobr></th>
|
|
51
|
+
<th><nobr>表品牌</nobr></th>
|
|
52
|
+
<th><nobr>表型号</nobr></th>
|
|
53
|
+
<th><nobr>是否总表</nobr></th>
|
|
45
54
|
</tr>
|
|
46
55
|
</template>
|
|
47
56
|
<template partial='body'>
|
|
@@ -67,37 +76,37 @@
|
|
|
67
76
|
export default {
|
|
68
77
|
data () {
|
|
69
78
|
return {
|
|
70
|
-
model: new PagedList('rs/sql/
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
},
|
|
75
|
-
props: {
|
|
76
|
-
orderitem: {
|
|
77
|
-
type: String,
|
|
78
|
-
default: 'f_userinfo_id'
|
|
79
|
-
},
|
|
80
|
-
tablename: {
|
|
81
|
-
type: String,
|
|
82
|
-
default: 'V_user_table'
|
|
83
|
-
},
|
|
84
|
-
items: {
|
|
85
|
-
type: String,
|
|
86
|
-
default: "f_user_name, f_user_id, f_meter_brand, f_meter_style, case when f_totalsplit_type is null then '分表' else f_totalsplit_type end f_totalsplit_type"
|
|
79
|
+
model: new PagedList('rs/sql/getUserAndMeter', 30, {items: '"f_user_name, f_user_id, f_meter_brand, f_meter_style, case when f_totalsplit_type is null then \'分表\' else f_totalsplit_type end f_totalsplit_type"'}),
|
|
80
|
+
criteriaShow: false,
|
|
81
|
+
curorgid: [this.$login.f.orgid],
|
|
82
|
+
f_filialeid: this.$login.convertToIn(this.$login.f.orgid)
|
|
87
83
|
}
|
|
88
84
|
},
|
|
89
85
|
ready () {
|
|
90
|
-
this.search(
|
|
86
|
+
this.search()
|
|
91
87
|
},
|
|
92
88
|
methods: {
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
89
|
+
getorg (val) {
|
|
90
|
+
this.f_filialeid = this.$login.convertToIn(val)
|
|
91
|
+
},
|
|
92
|
+
hidden () {
|
|
93
|
+
this.criteriaShow = !this.criteriaShow
|
|
94
|
+
},
|
|
95
|
+
clear () {
|
|
96
|
+
Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
|
|
97
|
+
this.$refs.paged.$refs.cri.model[key] = []
|
|
98
|
+
})
|
|
99
|
+
},
|
|
100
|
+
search () {
|
|
101
|
+
this.$refs.paged.$refs.cri.search()
|
|
102
|
+
},
|
|
103
|
+
async selfSearch (args) {
|
|
104
|
+
if (this.f_filialeid) {
|
|
105
|
+
args.condition = `f_filialeid in ${this.f_filialeid} and ${args.condition}`
|
|
100
106
|
}
|
|
107
|
+
console.log('----------2222222---------------')
|
|
108
|
+
console.log(args)
|
|
109
|
+
console.log('------------22222222-------------')
|
|
101
110
|
this.model.search(args.condition, args.model)
|
|
102
111
|
},
|
|
103
112
|
defined () {
|
|
@@ -1,45 +1,60 @@
|
|
|
1
1
|
<template>
|
|
2
2
|
<div class="span" >
|
|
3
3
|
<criteria-paged :model="model" v-ref:paged>
|
|
4
|
-
<criteria partial='criteria' @condition-changed='$parent.
|
|
5
|
-
<div novalidate class="form-
|
|
6
|
-
<div >
|
|
7
|
-
<
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
4
|
+
<criteria partial='criteria' @condition-changed='$parent.selfSearchsplit' v-ref:cri>
|
|
5
|
+
<div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
|
|
6
|
+
<div class="row">
|
|
7
|
+
<div class="form-group col-sm-4">
|
|
8
|
+
<label class="font_normal_body">组织机构</label>
|
|
9
|
+
<res-select
|
|
10
|
+
restype='organization'
|
|
11
|
+
@res-select="$parent.$parent.getorgfen"
|
|
12
|
+
is-mul="false"
|
|
13
|
+
:initresid='$parent.$parent.curorgidfen'
|
|
14
|
+
>
|
|
15
|
+
</res-select>
|
|
16
|
+
</div>
|
|
17
|
+
|
|
18
|
+
<div class="span" style="float:right;">
|
|
19
|
+
<button class="button_search button_spacing" @click="search()">查询</button>
|
|
20
|
+
<button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
|
|
21
|
+
<button class="button_clear button_spacing" @click="$parent.$parent.addToTotal()" >添加至总表</button>
|
|
22
|
+
<div style="float: right" class="button_spacing"
|
|
23
|
+
:class="{'button_shrink_top':$parent.$parent.criteriaShowfen,'button_shrink_bottom':!$parent.$parent.criteriaShowfen}"
|
|
24
|
+
@click="$parent.$parent.hiddenfen()"></div>
|
|
25
|
+
</div>
|
|
25
26
|
</div>
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
<
|
|
27
|
+
|
|
28
|
+
<div class="row" v-show="$parent.$parent.criteriaShowfen">
|
|
29
|
+
<div class="form-group col-sm-4">
|
|
30
|
+
<label class="font_normal_body">客户编号</label>
|
|
31
|
+
<input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code" placeholder='客户编号'
|
|
32
|
+
condition="f_userinfo_code = '{}'">
|
|
33
|
+
</div>
|
|
34
|
+
<div class="form-group col-sm-4">
|
|
35
|
+
<label class="font_normal_body">客户名称</label>
|
|
36
|
+
<input type="text" style="width:60%" class="input_search" v-model="model.f_user_name" placeholder='客户名称'
|
|
37
|
+
condition="f_user_name like '%{}%'">
|
|
38
|
+
</div>
|
|
39
|
+
<div class="form-group col-sm-4">
|
|
40
|
+
<label class="font_normal_body">客户地址</label>
|
|
41
|
+
<input type="text" style="width:60%" class="input_search" v-model="model.f_address" placeholder='客户地址'
|
|
42
|
+
condition="f_address like '%{}%'">
|
|
43
|
+
</div>
|
|
29
44
|
</div>
|
|
30
45
|
</div>
|
|
31
46
|
</criteria>
|
|
32
|
-
<data-grid :model="model" partial='list' v-ref:grid>
|
|
47
|
+
<data-grid :model="model" class="list_area table_sy" partial='list' v-ref:grid>
|
|
33
48
|
<template partial='head'>
|
|
34
49
|
<tr>
|
|
35
50
|
<th>
|
|
36
51
|
<input type="checkbox" @click="$parent.$parent.$parent.isAll(model.pageIndex)">
|
|
37
52
|
</th>
|
|
38
|
-
<th>序号</th>
|
|
39
|
-
<th>客户名称</th>
|
|
40
|
-
<th>表编号</th>
|
|
41
|
-
<th>表品牌</th>
|
|
42
|
-
<th>表型号</th>
|
|
53
|
+
<th><nobr>序号</nobr></th>
|
|
54
|
+
<th><nobr>客户名称</nobr></th>
|
|
55
|
+
<th><nobr>表编号</nobr></th>
|
|
56
|
+
<th><nobr>表品牌</nobr></th>
|
|
57
|
+
<th><nobr>表型号</nobr></th>
|
|
43
58
|
<!-- <th>是否总表</th> -->
|
|
44
59
|
</tr>
|
|
45
60
|
</template>
|
|
@@ -139,38 +154,43 @@
|
|
|
139
154
|
export default {
|
|
140
155
|
data () {
|
|
141
156
|
return {
|
|
142
|
-
model: new PagedList('rs/sql/
|
|
143
|
-
items: '"' + this.items + '"',
|
|
144
|
-
tablename: '"' + this.tablename + '"'}),
|
|
157
|
+
model: new PagedList('rs/sql/getUserAndMeter', 30, {items: '"f_address,f_userinfo_code,f_user_name,f_user_id,f_meter_brand,f_meter_style"'}),
|
|
145
158
|
shareratio: false,
|
|
146
159
|
selectedDatas: [],
|
|
147
|
-
pages: []
|
|
160
|
+
pages: [],
|
|
161
|
+
criteriaShowfen: false,
|
|
162
|
+
curorgidfen: [this.$login.f.orgid],
|
|
163
|
+
f_filialeid: this.$login.convertToIn(this.$login.f.orgid)
|
|
148
164
|
}
|
|
149
165
|
},
|
|
150
166
|
props: {
|
|
151
|
-
data: ['data']
|
|
152
|
-
orderitem: {
|
|
153
|
-
type: String,
|
|
154
|
-
default: 'f_userinfo_id'
|
|
155
|
-
},
|
|
156
|
-
tablename: {
|
|
157
|
-
type: String,
|
|
158
|
-
default: 'V_user_table'
|
|
159
|
-
},
|
|
160
|
-
items: {
|
|
161
|
-
type: String,
|
|
162
|
-
default: 'f_user_name,f_user_id,f_meter_brand,f_meter_style'
|
|
163
|
-
}
|
|
167
|
+
data: ['data']
|
|
164
168
|
},
|
|
165
169
|
ready () {
|
|
166
|
-
this.search(
|
|
170
|
+
this.search()
|
|
167
171
|
},
|
|
168
172
|
methods: {
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
+
getorgfen (val) {
|
|
174
|
+
this.f_filialeid = this.$login.convertToIn(val)
|
|
175
|
+
},
|
|
176
|
+
clear () {
|
|
177
|
+
Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
|
|
178
|
+
this.$refs.paged.$refs.cri.model[key] = []
|
|
179
|
+
})
|
|
180
|
+
},
|
|
181
|
+
hiddenfen () {
|
|
182
|
+
this.criteriaShowfen = !this.criteriaShowfen
|
|
183
|
+
},
|
|
184
|
+
search () {
|
|
185
|
+
this.$refs.paged.$refs.cri.search()
|
|
186
|
+
},
|
|
187
|
+
async selfSearchsplit (args) {
|
|
188
|
+
if (this.f_filialeid) {
|
|
189
|
+
args.condition = `f_filialeid in ${this.f_filialeid} and ${args.condition}`
|
|
173
190
|
}
|
|
191
|
+
console.log('-------------------------')
|
|
192
|
+
console.log(args)
|
|
193
|
+
console.log('-------------------------')
|
|
174
194
|
this.model.search(args.condition, args.model)
|
|
175
195
|
},
|
|
176
196
|
isAll (page) {
|
|
@@ -1,16 +1,16 @@
|
|
|
1
1
|
<template>
|
|
2
2
|
<div class="span">
|
|
3
|
-
<data-grid :model="model" partial='list' v-ref:grid>
|
|
3
|
+
<data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
|
|
4
4
|
<template partial='head'>
|
|
5
5
|
<tr>
|
|
6
|
-
<th>序号</th>
|
|
7
|
-
<th>总表编号</th>
|
|
8
|
-
<th>客户名称</th>
|
|
9
|
-
<th>表编号</th>
|
|
10
|
-
<th>表品牌</th>
|
|
11
|
-
<th>表型号</th>
|
|
12
|
-
<th>承担比率</th>
|
|
13
|
-
<th>操作</th>
|
|
6
|
+
<th><nobr>序号</nobr></th>
|
|
7
|
+
<th><nobr>总表编号</nobr></th>
|
|
8
|
+
<th><nobr>客户名称</nobr></th>
|
|
9
|
+
<th><nobr>表编号</nobr></th>
|
|
10
|
+
<th><nobr>表品牌</nobr></th>
|
|
11
|
+
<th><nobr>表型号</nobr></th>
|
|
12
|
+
<th><nobr>承担比率</nobr></th>
|
|
13
|
+
<th><nobr>操作</nobr></th>
|
|
14
14
|
</tr>
|
|
15
15
|
</template>
|
|
16
16
|
<template partial='body'>
|
|
@@ -51,11 +51,9 @@
|
|
|
51
51
|
let getUpdateGen = function * (self, id, direct) {
|
|
52
52
|
let data = {
|
|
53
53
|
items: 'f_user_id,f_user_name,f_meter_brand,f_meter_style,f_share_ratio',
|
|
54
|
-
condition: 'f_meter_id =' + "'" + id + "'"
|
|
55
|
-
tablename: 'V_user_table',
|
|
56
|
-
orderitem: 'f_user_id'
|
|
54
|
+
condition: 'f_meter_id =' + "'" + id + "'"
|
|
57
55
|
}
|
|
58
|
-
let queryData = yield self.$SqlService.
|
|
56
|
+
let queryData = yield self.$SqlService.getUserAndMeter(data)
|
|
59
57
|
console.log('总表查询分表数据，，，，', queryData)
|
|
60
58
|
queryData.data.forEach((item) => {
|
|
61
59
|
item.total_id = id
|
|
@@ -28,6 +28,7 @@
|
|
|
28
28
|
},
|
|
29
29
|
methods: {
|
|
30
30
|
selected (obj) {
|
|
31
|
+
console.log(obj)
|
|
31
32
|
console.log('我还没选你就给我默认了？？？')
|
|
32
33
|
this.row = obj.val
|
|
33
34
|
},
|
|
@@ -37,7 +38,7 @@
|
|
|
37
38
|
},
|
|
38
39
|
refreshAllUser () {
|
|
39
40
|
this.$refs.alluser.$refs.paged.$refs.cri.search()
|
|
40
|
-
this.$refs.split.search(
|
|
41
|
+
this.$refs.split.search()
|
|
41
42
|
this.$refs.split.ids = []
|
|
42
43
|
}
|
|
43
44
|
}
|