manage-client-xy 3.1.86 → 3.1.87
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
|
@@ -11,8 +11,8 @@ var compiler = webpack(config)
|
|
|
11
11
|
// Define HTTP proxies to your custom API backend
|
|
12
12
|
// https://github.com/chimurai/http-proxy-middleware
|
|
13
13
|
// var bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
|
|
14
|
-
var bendi = 'http://
|
|
15
|
-
,fuwu ='http://172.16.16.
|
|
14
|
+
var bendi = 'http://172.16.16.163:8300/'
|
|
15
|
+
,fuwu ='http://172.16.16.163:8300/'
|
|
16
16
|
// ,fuwu = 'http://172.16.16.163:8300/'
|
|
17
17
|
var proxyTable = {
|
|
18
18
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "manage-client-xy",
|
|
3
|
-
"version": "3.1.
|
|
3
|
+
"version": "3.1.87",
|
|
4
4
|
"description": "经营管控模块前台组件",
|
|
5
5
|
"main": "src/index.js",
|
|
6
6
|
"directories": {
|
|
@@ -63,7 +63,7 @@
|
|
|
63
63
|
"sinon-chai": "^2.8.0",
|
|
64
64
|
"style": "0.0.3",
|
|
65
65
|
"style-loader": "^0.20.3",
|
|
66
|
-
"system-clients": "3.1.
|
|
66
|
+
"system-clients": "3.1.85-xianyang",
|
|
67
67
|
"url-loader": "^0.5.7",
|
|
68
68
|
"vue-amap": "0.5.10",
|
|
69
69
|
"vue-client": "1.22.38-xy",
|
|
@@ -51,7 +51,10 @@
|
|
|
51
51
|
</div>
|
|
52
52
|
<div class="col-sm-4">
|
|
53
53
|
<label class="font_normal_body">用户所属公司:</label>
|
|
54
|
-
<
|
|
54
|
+
<res-select restype='organization'
|
|
55
|
+
@res-select="$parent.$parent.getRess"
|
|
56
|
+
:initresid="$parent.$parent.curorgid">
|
|
57
|
+
</res-select>
|
|
55
58
|
</div>
|
|
56
59
|
<div class="col-sm-4">
|
|
57
60
|
<label class="font_normal_body" title="参数:付款方式查询">付款方式</label>
|
|
@@ -167,6 +170,7 @@
|
|
|
167
170
|
depresid: [],
|
|
168
171
|
userresid: [],
|
|
169
172
|
f_orgid: this.$login.f.orgid,
|
|
173
|
+
curorgid: [this.$login.f.orgid],
|
|
170
174
|
f_depid: this.$login.f.depids,
|
|
171
175
|
f_operatorid: this.$login.f.id,
|
|
172
176
|
jurisdiction: this.$login.r,
|
|
@@ -194,8 +198,8 @@
|
|
|
194
198
|
},
|
|
195
199
|
methods: {
|
|
196
200
|
getRess(obj){
|
|
197
|
-
if (obj.
|
|
198
|
-
this.userCondition = ` info.f_orgid in ${Util.convertToIn(obj
|
|
201
|
+
if (obj.length > 0){
|
|
202
|
+
this.userCondition = ` info.f_orgid in ${Util.convertToIn(obj)} `
|
|
199
203
|
}else {
|
|
200
204
|
this.userCondition = ' 1 = 1 '
|
|
201
205
|
}
|
|
@@ -51,7 +51,10 @@
|
|
|
51
51
|
</div>
|
|
52
52
|
<div class="col-sm-4">
|
|
53
53
|
<label class="font_normal_body">用户所属公司:</label>
|
|
54
|
-
<
|
|
54
|
+
<res-select restype='organization'
|
|
55
|
+
@res-select="$parent.$parent.getRess"
|
|
56
|
+
:initresid="$parent.$parent.curorgid">
|
|
57
|
+
</res-select>
|
|
55
58
|
</div>
|
|
56
59
|
<div class="col-sm-4" style="float:right;">
|
|
57
60
|
<label class="font_normal_body">    </label>
|
|
@@ -130,6 +133,7 @@
|
|
|
130
133
|
import { DataModel } from 'vue-client'
|
|
131
134
|
import co from 'co'
|
|
132
135
|
import * as Util from "../../Util";
|
|
136
|
+
import Vue from "vue";
|
|
133
137
|
let saveFile = function * (self) {
|
|
134
138
|
// 线验证文件是否重名
|
|
135
139
|
let count = yield self.$resetpost('rs/sql/manageSingleTable',
|
|
@@ -162,6 +166,7 @@
|
|
|
162
166
|
f_depid: this.$login.f.depids,
|
|
163
167
|
f_operatorid: this.$login.f.id,
|
|
164
168
|
jurisdiction: this.$login.r,
|
|
169
|
+
curorgid: [this.$login.f.orgid],
|
|
165
170
|
operatorid: [],
|
|
166
171
|
depid: [],
|
|
167
172
|
orgname: '',
|
|
@@ -186,8 +191,8 @@
|
|
|
186
191
|
},
|
|
187
192
|
methods: {
|
|
188
193
|
getRess(obj){
|
|
189
|
-
if (obj.
|
|
190
|
-
this.userCondition = ` info.f_orgid in ${Util.convertToIn(obj
|
|
194
|
+
if (obj.length > 0){
|
|
195
|
+
this.userCondition = ` info.f_orgid in ${Util.convertToIn(obj)} `
|
|
191
196
|
}else {
|
|
192
197
|
this.userCondition = ' 1 = 1 '
|
|
193
198
|
}
|
|
@@ -32,7 +32,10 @@
|
|
|
32
32
|
</div>
|
|
33
33
|
<div class="col-sm-3">
|
|
34
34
|
<label class="font_normal_body">用户所属公司</label>
|
|
35
|
-
<
|
|
35
|
+
<res-select restype='organization'
|
|
36
|
+
@res-select="$parent.$parent.getRess"
|
|
37
|
+
:initresid="$parent.$parent.curorgid">
|
|
38
|
+
</res-select>
|
|
36
39
|
</div>
|
|
37
40
|
</div>
|
|
38
41
|
<div class="row" style="text-align: right">
|
|
@@ -146,6 +149,7 @@
|
|
|
146
149
|
printTime: this.$login.toStandardTimeString(),
|
|
147
150
|
depresid: [],
|
|
148
151
|
userresid: [],
|
|
152
|
+
curorgid: [this.$login.f.orgid],
|
|
149
153
|
f_orgid: this.$login.f.orgid,
|
|
150
154
|
f_depid: this.$login.f.depids,
|
|
151
155
|
f_operatorid: this.$login.f.id,
|
|
@@ -190,8 +194,8 @@
|
|
|
190
194
|
this.f_operatorid = obj
|
|
191
195
|
},
|
|
192
196
|
getRess(obj){
|
|
193
|
-
if (obj.
|
|
194
|
-
this.userCondition = ` info.f_orgid in ${Util.convertToIn(obj
|
|
197
|
+
if (obj.length > 0){
|
|
198
|
+
this.userCondition = ` info.f_orgid in ${Util.convertToIn(obj)} `
|
|
195
199
|
}else {
|
|
196
200
|
this.userCondition = ' 1 = 1 '
|
|
197
201
|
}
|