system-clients 3.2.95-ruihua1 → 3.2.95-temp
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/.gradle/7.4/checksums/checksums.lock +0 -0
- package/.gradle/7.4/dependencies-accessors/dependencies-accessors.lock +0 -0
- package/.gradle/7.4/dependencies-accessors/gc.properties +0 -0
- package/.gradle/7.4/executionHistory/executionHistory.bin +0 -0
- package/.gradle/7.4/executionHistory/executionHistory.lock +0 -0
- package/.gradle/7.4/fileChanges/last-build.bin +0 -0
- package/.gradle/7.4/fileHashes/fileHashes.bin +0 -0
- package/.gradle/7.4/fileHashes/fileHashes.lock +0 -0
- package/.gradle/7.4/gc.properties +0 -0
- package/.gradle/buildOutputCleanup/buildOutputCleanup.lock +0 -0
- package/.gradle/buildOutputCleanup/cache.properties +2 -0
- package/.gradle/buildOutputCleanup/outputFiles.bin +0 -0
- package/.gradle/file-system.probe +0 -0
- package/.gradle/vcs-1/gc.properties +0 -0
- package/package.json +105 -105
- package/src/components/Main.vue +42 -18
- package/src/components/equipment/PcAdd.vue +1 -1
- package/src/components/equipment/PcList.vue +3 -3
- package/src/components/equipment/PhoneAdd.vue +1 -1
- package/src/components/equipment/PhoneList.vue +2 -2
- package/src/components/equipment/PosAdd.vue +10 -6
- package/src/components/equipment/PosList.vue +5 -3
- package/src/components/equipment/PosParamAdd.vue +1 -1
- package/src/components/equipment/PosParamList.vue +2 -2
- package/src/components/parammanage/ParamPage.vue +12 -12
- package/src/components/parammanage/SinglePage.vue +8 -8
- package/src/components/server/Login.vue +35 -17
- package/src/components/server/ModifyPw.vue +0 -1
- package/src/components/server/PcdBuildingSelect.vue +0 -2
- package/src/components/server/ResSelect.vue +175 -169
- package/src/components/server/ResSelectGroup.vue +1 -1
- package/src/components/server/RoleSelector.vue +2 -3
- package/src/filiale/baole/Login.vue +0 -2
- package/src/filiale/bayan/PosAdd.vue +369 -0
- package/src/filiale/bayan/PosList.vue +349 -0
- package/src/filiale/bayan/PosManage.vue +138 -0
- package/src/filiale/bayan/system.js +6 -0
- package/src/filiale/chengtou/Login.vue +0 -2
- package/src/filiale/dongguan/Login.vue +0 -2
- package/src/filiale/dongguan/Main.vue +0 -2
- package/src/filiale/furuike/Login.vue +0 -4
- package/src/filiale/furuike/Main.vue +23 -36
- package/src/filiale/gehua/Main.vue +0 -2
- package/src/filiale/konggang/Login.vue +0 -2
- package/src/filiale/qianneng/Login.vue +0 -2
- package/src/filiale/qianneng/Main.vue +2 -4
- package/src/filiale/qianneng/ModifyPw.vue +0 -1
- package/src/filiale/rizhao/Login.vue +0 -2
- package/src/filiale/rizhao/Main.vue +1 -1
- package/src/filiale/shiquan/Login.vue +0 -2
- package/src/filiale/tianyi/Login.vue +0 -2
- package/src/filiale/tongchuan/Login.vue +0 -2
- package/src/filiale/tongchuan/Main.vue +1 -3
- package/src/filiale/weinan/Main.vue +1 -2
- package/src/filiale/wenxi/Login.vue +0 -2
- package/src/filiale/wenxi/Main.vue +0 -2
- package/src/filiale/wuhai/Main.vue +0 -3
- package/src/filiale/yuchuan/Login.vue +1 -3
- package/src/filiale/yuchuan/Main.vue +0 -2
- package/src/filiale/zhoukou/Main.vue +0 -2
- package/src/plugins/GetLoginInfoService.js +75 -13
- package/src/stores/AppData.js +1 -1
- package/src/filiale/ruihua/Login.vue +0 -549
- package/src/filiale/ruihua/system.js +0 -5
Binary file
|
Binary file
|
File without changes
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
File without changes
|
Binary file
|
Binary file
|
Binary file
|
File without changes
|
package/package.json
CHANGED
@@ -1,105 +1,105 @@
|
|
1
|
-
{
|
2
|
-
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
|
63
|
-
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
|
69
|
-
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
|
74
|
-
|
75
|
-
|
76
|
-
|
77
|
-
|
78
|
-
|
79
|
-
|
80
|
-
|
81
|
-
|
82
|
-
|
83
|
-
|
84
|
-
|
85
|
-
|
86
|
-
|
87
|
-
|
88
|
-
|
89
|
-
|
90
|
-
|
91
|
-
|
92
|
-
|
93
|
-
|
94
|
-
|
95
|
-
|
96
|
-
|
97
|
-
|
98
|
-
|
99
|
-
|
100
|
-
|
101
|
-
|
102
|
-
|
103
|
-
|
104
|
-
|
105
|
-
}
|
1
|
+
{
|
2
|
+
"name": "system-clients",
|
3
|
+
"version": "3.2.95-temp",
|
4
|
+
"description": "系统基础框架",
|
5
|
+
"main": "src/index.js",
|
6
|
+
"directories": {
|
7
|
+
"doc": "doc",
|
8
|
+
"example": "examples",
|
9
|
+
"test": "test"
|
10
|
+
},
|
11
|
+
"scripts": {
|
12
|
+
"example": "node build/example-server.js",
|
13
|
+
"dev": "node build/dev-server.js",
|
14
|
+
"lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
|
15
|
+
"build": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prod.conf.js",
|
16
|
+
"e2e": "node test/e2e/runner.js",
|
17
|
+
"unit": "karma start test/unit/karma.conf.js",
|
18
|
+
"makeall": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_OPTIONS=--max_old_space_size=4096 NODE_ENV=production webpack --progress --hide-modules --config build/webpack.example.conf.js",
|
19
|
+
"release": "npm set registry http://registry.npmjs.org && npm publish && npm set registry http://registry.npm.taobao.org"
|
20
|
+
},
|
21
|
+
"dependencies": {
|
22
|
+
"base64-js": "^1.3.0",
|
23
|
+
"js-base64": "^2.4.9",
|
24
|
+
"less": "^2.7.1",
|
25
|
+
"less-loader": "^2.2.3",
|
26
|
+
"nyc": "^15.1.0",
|
27
|
+
"src": "^1.1.2",
|
28
|
+
"vue": "^1.0.17"
|
29
|
+
},
|
30
|
+
"devDependencies": {
|
31
|
+
"babel-core": "^6.0.0",
|
32
|
+
"babel-loader": "^6.0.0",
|
33
|
+
"babel-plugin-transform-runtime": "^6.0.0",
|
34
|
+
"babel-preset-es2015": "^6.0.0",
|
35
|
+
"babel-preset-stage-2": "^6.0.0",
|
36
|
+
"chai": "^3.5.0",
|
37
|
+
"connect-history-api-fallback": "^1.1.0",
|
38
|
+
"cross-env": "^1.0.7",
|
39
|
+
"cross-spawn": "^2.1.5",
|
40
|
+
"css-loader": "^0.23.0",
|
41
|
+
"eslint": "^2.0.0",
|
42
|
+
"eslint-config-standard": "^5.1.0",
|
43
|
+
"eslint-friendly-formatter": "^1.2.2",
|
44
|
+
"eslint-loader": "^1.3.0",
|
45
|
+
"eslint-plugin-html": "^1.3.0",
|
46
|
+
"eslint-plugin-promise": "^1.0.8",
|
47
|
+
"eslint-plugin-standard": "^1.3.2",
|
48
|
+
"eslint-plugin-vue": "^0.1.1",
|
49
|
+
"eventsource-polyfill": "^0.9.6",
|
50
|
+
"express": "^4.13.3",
|
51
|
+
"extract-text-webpack-plugin": "^1.0.1",
|
52
|
+
"file-loader": "^0.8.4",
|
53
|
+
"function-bind": "^1.0.2",
|
54
|
+
"html-webpack-plugin": "^2.8.1",
|
55
|
+
"http-proxy-middleware": "^0.11.0",
|
56
|
+
"inject-loader": "^2.0.1",
|
57
|
+
"isparta-loader": "^2.0.0",
|
58
|
+
"jasmine-core": "^2.4.1",
|
59
|
+
"jquery": "^3.3.1",
|
60
|
+
"jsencrypt": "^3.0.0-rc.1",
|
61
|
+
"json-loader": "^0.5.4",
|
62
|
+
"karma": "^1.4.1",
|
63
|
+
"karma-chrome-launcher": "^2.2.0",
|
64
|
+
"karma-coverage": "^1.1.1",
|
65
|
+
"karma-mocha": "^1.3.0",
|
66
|
+
"karma-sinon-chai": "^1.3.1",
|
67
|
+
"karma-sourcemap-loader": "^0.3.7",
|
68
|
+
"karma-spec-reporter": "0.0.31",
|
69
|
+
"karma-webpack": "^2.0.2",
|
70
|
+
"manage-client": "^1.4.20",
|
71
|
+
"mkdirp": "^0.5.1",
|
72
|
+
"mocha": "^3.2.0",
|
73
|
+
"ncp": "^2.0.0",
|
74
|
+
"nightwatch": "^0.8.18",
|
75
|
+
"rimraf": "^2.5.0",
|
76
|
+
"selenium-server": "2.52.0",
|
77
|
+
"sinon": "^2.1.0",
|
78
|
+
"sinon-chai": "^2.8.0",
|
79
|
+
"style": "0.0.3",
|
80
|
+
"style-loader": "^0.20.3",
|
81
|
+
"url-loader": "^0.5.7",
|
82
|
+
"vue-client": "1.24.107-test",
|
83
|
+
"vue-hot-reload-api": "^1.2.0",
|
84
|
+
"vue-html-loader": "^1.0.0",
|
85
|
+
"vue-loader": "^8.2.1",
|
86
|
+
"vue-resource": "^1.5.0",
|
87
|
+
"vue-router": "^0.7.13",
|
88
|
+
"vue-strap": "^1.0.9",
|
89
|
+
"vue-style-loader": "^1.0.0",
|
90
|
+
"vue-validator": "2.1.7",
|
91
|
+
"webpack": "^1.12.2",
|
92
|
+
"webpack-dev-middleware": "^1.4.0",
|
93
|
+
"webpack-hot-middleware": "^2.6.0",
|
94
|
+
"webpack-merge": "^0.8.3"
|
95
|
+
},
|
96
|
+
"repository": {
|
97
|
+
"type": "git",
|
98
|
+
"url": "https://gitee.com/aotu/System"
|
99
|
+
},
|
100
|
+
"keywords": [
|
101
|
+
"system_clients"
|
102
|
+
],
|
103
|
+
"author": "杨文宇",
|
104
|
+
"license": "ISC"
|
105
|
+
}
|
package/src/components/Main.vue
CHANGED
@@ -160,6 +160,24 @@
|
|
160
160
|
</footer>
|
161
161
|
</modal>
|
162
162
|
|
163
|
+
<modal v-show="notReportShow" :show.sync="notReportShow" :backdrop="false">
|
164
|
+
<header slot="modal-header" class="text-center">
|
165
|
+
<h3>未上报用户提醒</h3>
|
166
|
+
</header>
|
167
|
+
<article slot="modal-body" class="modal-body">
|
168
|
+
<form class="form-horizontal">
|
169
|
+
<div class="row">
|
170
|
+
<div class="col-sm-12">
|
171
|
+
<span style="font-weight:normal">{{ notReportTitle }}</span>
|
172
|
+
</div>
|
173
|
+
</div>
|
174
|
+
</form>
|
175
|
+
</article>
|
176
|
+
<footer slot="modal-footer" style="height: 8vh" class="modal-footer">
|
177
|
+
<button class="button_search" @click="notReportShow = false">确认</button>
|
178
|
+
</footer>
|
179
|
+
</modal>
|
180
|
+
|
163
181
|
<!-- 变更录入 模态框 -->
|
164
182
|
<add-changemsg :show="AddChangeMsgShow" v-on:toggle="AddChangeMsgShow = false"></add-changemsg>
|
165
183
|
<!-- 修改密码组件 -->
|
@@ -189,7 +207,6 @@ let getwartermakr = async function (self) {
|
|
189
207
|
tablename: 't_singlevalue',
|
190
208
|
condition: " 1=1 and name=\'水印内容\'"
|
191
209
|
};
|
192
|
-
// todo v4
|
193
210
|
let result = await self.$resetpost('rs/sql/saleSingleTable', {data: param}, {resolveMsg: null, rejectMsg: null});
|
194
211
|
if (result && result.data.length > 0) {
|
195
212
|
self.showwatermakeflag = true;
|
@@ -256,9 +273,12 @@ let createWaterMark = function (userName) {
|
|
256
273
|
// img2: '/images/lefticon/退出系统.png',
|
257
274
|
},
|
258
275
|
treeOrIcon: false,
|
276
|
+
notReportTitle: '',
|
277
|
+
notReportShow: false,
|
259
278
|
qrCode:false,
|
260
279
|
isManger: false,
|
261
280
|
show: false,
|
281
|
+
orgpathnames: `${this.$login.f.orgs}-${this.$login.f.deps}-${this.$login.f.name}`,
|
262
282
|
systemname: '客服系统',
|
263
283
|
date: this.$login.toStandardDateString(),
|
264
284
|
tabs: [], //已初始化页签数组
|
@@ -335,10 +355,28 @@ let createWaterMark = function (userName) {
|
|
335
355
|
if (this.config.approve) {
|
336
356
|
this.getFlowList()
|
337
357
|
}
|
358
|
+
if (this.config.isGetNotReport) {
|
359
|
+
this.getNotReport()
|
360
|
+
}
|
338
361
|
// 获取卡表动态库到期时间
|
339
362
|
this.getExpireDate()
|
340
363
|
},
|
341
364
|
methods: {
|
365
|
+
async getNotReport(){
|
366
|
+
this.notReportTitle = ''
|
367
|
+
let http = new HttpResetClass()
|
368
|
+
await http.load('POST', 'rs/sql/getNotReportUserCount', {}, {
|
369
|
+
resolveMsg: null,
|
370
|
+
rejectMsg: null
|
371
|
+
}).then((res) => {
|
372
|
+
if (res.data.length > 0){
|
373
|
+
this.notReportTitle = `当前系统物联网表用户有${res.data[0].f_total_web_count}户,超过7天未上报有${res.data[0].f_greater_than_seven_days}户,7天及以内未上报有${res.data[0].f_less_than_orequalto_seven_days}户。如需查询详情,请到物联查询中“失联查询”获取详细信息!`
|
374
|
+
}
|
375
|
+
}).catch((e)=>{})
|
376
|
+
if(this.notReportTitle){
|
377
|
+
this.notReportShow = true
|
378
|
+
}
|
379
|
+
},
|
342
380
|
getOrderList(){
|
343
381
|
let times = this.config.times * 60 * 1000
|
344
382
|
console.log("=定时提示间隔=", times)
|
@@ -470,6 +508,7 @@ let createWaterMark = function (userName) {
|
|
470
508
|
res.data.forEach(itre => {
|
471
509
|
let band = null
|
472
510
|
if ('f_dynamic_expire' in itre) {
|
511
|
+
console.log(itre.f_dynamic_expire)
|
473
512
|
if (itre.f_dynamic_expire !== null && itre.f_dynamic_expire !== '') {
|
474
513
|
let todayold = new Date(itre.f_dynamic_expire)
|
475
514
|
todayold.setDate(todayold.getDate() - parseInt(this.$appdata.getSingleValue('动态库提醒天数设置')))
|
@@ -520,7 +559,7 @@ let createWaterMark = function (userName) {
|
|
520
559
|
}
|
521
560
|
},
|
522
561
|
openUrl() {
|
523
|
-
var url = `http://
|
562
|
+
var url = `http://aote-office.8866.org:8406/submitTicket?contact=${this.$login.f.name}&orgName=${this.$login.f.orgs}&phone=${this.$login.f.f_user_telephone}`
|
524
563
|
window.open(url, '_blank')
|
525
564
|
},
|
526
565
|
hindsetting() {
|
@@ -599,28 +638,13 @@ let createWaterMark = function (userName) {
|
|
599
638
|
username: this.$login.f.name,
|
600
639
|
usertelephone: this.$login.f.f_user_telephone
|
601
640
|
}
|
602
|
-
|
603
|
-
try {
|
604
|
-
await this.$resetget('api/af-system/user/logout', {resolveMsg: '退出成功', rejectMsg: null})
|
605
|
-
}catch(e){
|
606
|
-
}
|
641
|
+
await this.$resetpost('rs/logic/logOut', data, {resolveMsg: '退出成功', rejectMsg: null})
|
607
642
|
window.location.reload()
|
608
643
|
}
|
609
644
|
})
|
610
645
|
}
|
611
646
|
},
|
612
647
|
computed: {
|
613
|
-
orgpathnames(){
|
614
|
-
let names = this.$login.f.name
|
615
|
-
if(this.$login.f.deps){
|
616
|
-
names = `${this.$login.f.deps}-${names}`
|
617
|
-
}
|
618
|
-
if(this.$login.f.orgs){
|
619
|
-
names = `${this.$login.f.orgs}-${names}`
|
620
|
-
}
|
621
|
-
return names
|
622
|
-
},
|
623
|
-
|
624
648
|
nowDate() {
|
625
649
|
return this.$login.getNowDate()
|
626
650
|
}
|
@@ -84,7 +84,7 @@
|
|
84
84
|
this.model.f_operatorid = this.$login.f.id
|
85
85
|
this.model.f_orgid = this.f_orgid
|
86
86
|
console.log('保存', this.model)
|
87
|
-
this.$resetpost('
|
87
|
+
this.$resetpost('rs/entity/t_equipment', this.model, {resolveMsg: '保存成功', rejectMsg: '保存失败'}).then((res) => {
|
88
88
|
this.$dispatch('refresh')
|
89
89
|
}).catch((error) => {
|
90
90
|
this.$dispatch('refresh')
|
@@ -76,7 +76,7 @@
|
|
76
76
|
data () {
|
77
77
|
return {
|
78
78
|
criteriaShow: false,
|
79
|
-
model: new PagedList('
|
79
|
+
model: new PagedList('rs/sql/equipmentQuery', 20),
|
80
80
|
curorgid: [this.$login.f.orgid],
|
81
81
|
f_orgid: ''
|
82
82
|
}
|
@@ -93,7 +93,7 @@
|
|
93
93
|
},
|
94
94
|
|
95
95
|
selfSearch (args) {
|
96
|
-
args.condition = `${args.condition} and f_equipment_type = 'PC' and f_state = '正常' and f_orgid
|
96
|
+
args.condition = `${args.condition} and f_equipment_type = 'PC' and f_state = '正常' and f_orgid like '${this.f_orgid ? this.f_orgid: this.$login.f.orgid}'`
|
97
97
|
this.model.search(args.condition, this.model)
|
98
98
|
},
|
99
99
|
add () {
|
@@ -102,7 +102,7 @@
|
|
102
102
|
del (row) {
|
103
103
|
console.log('要删除了', row)
|
104
104
|
row.f_state = '已删除'
|
105
|
-
this.$resetpost('
|
105
|
+
this.$resetpost('rs/entity/t_equipment', row, {warnMsg: '确定要删除这条信息吗?', resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
|
106
106
|
this.$dispatch('refresh')
|
107
107
|
}).catch((error) => {
|
108
108
|
this.$dispatch('refresh')
|
@@ -84,7 +84,7 @@ import { HttpResetClass } from 'vue-client'
|
|
84
84
|
this.model.f_filialeids = this.$login.f.f_orgids
|
85
85
|
this.model.f_orgid = this.f_orgid
|
86
86
|
console.log('保存', this.model)
|
87
|
-
this.$resetpost('
|
87
|
+
this.$resetpost('rs/entity/t_equipment', this.model, {resolveMsg: '保存成功', rejectMsg: '保存失败'}).then((res) => {
|
88
88
|
this.$dispatch('refresh')
|
89
89
|
}).catch(() => {
|
90
90
|
this.$dispatch('refresh')
|
@@ -64,7 +64,7 @@
|
|
64
64
|
|
65
65
|
data () {
|
66
66
|
return {
|
67
|
-
model: new PagedList('
|
67
|
+
model: new PagedList('rs/sql/equipmentQuery', 20),
|
68
68
|
filialeNameStr: this.$login.f.f_fengongsi,
|
69
69
|
filialeCodeStr: this.$login.f.f_orgids,
|
70
70
|
userid:this.$login.f.id,
|
@@ -92,7 +92,7 @@
|
|
92
92
|
del (row) {
|
93
93
|
console.log('要删除了', row)
|
94
94
|
row.f_state = '已删除'
|
95
|
-
this.$resetpost('
|
95
|
+
this.$resetpost('rs/entity/t_equipment', row, {warnMsg: '确定要删除这条信息吗?', resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
|
96
96
|
this.$dispatch('refresh')
|
97
97
|
}).catch((error) => {
|
98
98
|
this.$dispatch('refresh')
|
@@ -33,7 +33,7 @@
|
|
33
33
|
<label class="font_normal_body" >机器编号</label>
|
34
34
|
<input type="text" class="input_search" style="width: 60%" v-model="model.f_machine_number" placeholder="机器编号" >
|
35
35
|
</div>
|
36
|
-
<div class="col-sm-6 form-group" :class="{'has-error': $v.f_phone.required
|
36
|
+
<div class="col-sm-6 form-group" :class="{'has-error': $v.f_phone.required}">
|
37
37
|
<label class="font_normal_body">联系电话</label>
|
38
38
|
<input type="text" class="input_search" style="width: 60%" v-model="model.f_phone" placeholder="联系电话"
|
39
39
|
v-validate:f_phone="{required: true, minlength:7, maxlength: 11}" title="手机号必须7-11位">
|
@@ -223,7 +223,10 @@ import {HttpResetClass, PagedList} from 'vue-client'
|
|
223
223
|
this.$showAlert(`已向设备号: ${this.model.f_terminal_number}发送停用指令,请稍后查看执行结果!`, 'success', 2500)
|
224
224
|
this.model.f_state = '停用'
|
225
225
|
try {
|
226
|
-
|
226
|
+
// 测试接口
|
227
|
+
// this.$resetpost('rs/logic/updatePosState', {data: {number: this.model.f_terminal_number, state: '停用'}}, {resolveMsg: null, rejectMsg: null}, 0)
|
228
|
+
// .then((res) => {})
|
229
|
+
this.$resetpost('rs/logic/batchPos',{data: {tasks: [this.data], taskState: 0}}, {rejectMsg: null, resolveMsg: null})
|
227
230
|
} catch (error) {
|
228
231
|
this.search()
|
229
232
|
}
|
@@ -235,7 +238,10 @@ import {HttpResetClass, PagedList} from 'vue-client'
|
|
235
238
|
this.$showAlert(`已向设备号: ${this.model.f_terminal_number}发送启用指令,请稍后查看执行结果!`, 'success', 2500)
|
236
239
|
this.model.f_state = '正常'
|
237
240
|
try {
|
238
|
-
|
241
|
+
// 测试接口
|
242
|
+
// this.$resetpost('rs/logic/getEditPosState', {data: {number: this.model.f_terminal_number, state: '正常'}}, {resolveMsg: null, rejectMsg: null}, 0)
|
243
|
+
// .then((res) => {})
|
244
|
+
this.$resetpost('rs/logic/batchPos',{data: {tasks: [this.data], taskState: 1}}, {rejectMsg: null, resolveMsg: null})
|
239
245
|
} catch (error) {
|
240
246
|
this.search()
|
241
247
|
}
|
@@ -253,7 +259,6 @@ import {HttpResetClass, PagedList} from 'vue-client'
|
|
253
259
|
this.show=true
|
254
260
|
},
|
255
261
|
upgradeRoot() {
|
256
|
-
// todo v4
|
257
262
|
this.$resetpost('rs/logic/batchPos',{data: {tasks: [this.data], taskState: 2}}, {rejectMsg: null, resolveMsg: null})
|
258
263
|
this.$dispatch('refresh')
|
259
264
|
},
|
@@ -273,8 +278,7 @@ import {HttpResetClass, PagedList} from 'vue-client'
|
|
273
278
|
this.model.f_depname = this.$login.f.deps
|
274
279
|
this.model.f_orgstr = this.$login.f.fullids
|
275
280
|
}
|
276
|
-
|
277
|
-
this.$resetpost('api/af-system/logic/save_equipment', this.model, {resolveMsg: '保存成功', rejectMsg: '保存失败'}).then((res) => {
|
281
|
+
this.$resetpost('rs/entity/t_equipment', this.model, {resolveMsg: '保存成功', rejectMsg: '保存失败'}).then((res) => {
|
278
282
|
this.$dispatch('refresh')
|
279
283
|
}).catch((error) => {
|
280
284
|
this.$dispatch('refresh')
|
@@ -165,8 +165,8 @@
|
|
165
165
|
data () {
|
166
166
|
return {
|
167
167
|
source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() != $role$))`,
|
168
|
-
model: new PagedList('
|
169
|
-
model2: new PagedList('
|
168
|
+
model: new PagedList('rs/sql/equipmentQuery', 20),
|
169
|
+
model2: new PagedList('rs/sql/singleTable', 30, {tablename: '`t_poshistory`'}),
|
170
170
|
curorgid: [this.f_filialeid],
|
171
171
|
f_orgid: '',
|
172
172
|
f_filialeids: '',
|
@@ -238,7 +238,7 @@
|
|
238
238
|
this.showAlert('出现异常,请重新进操作')
|
239
239
|
return
|
240
240
|
}
|
241
|
-
await this.$resetpost('
|
241
|
+
await this.$resetpost('rs/logic/batchPos', {data: {tasks: arrs, taskState: val}}, {
|
242
242
|
rejectMsg: null,
|
243
243
|
resolveMsg: null
|
244
244
|
})
|
@@ -253,6 +253,7 @@
|
|
253
253
|
this.infoshow = true
|
254
254
|
},
|
255
255
|
search () {
|
256
|
+
console.log("111111111111111111111111111111111111")
|
256
257
|
this.$refs.paged.$refs.cri.search()
|
257
258
|
},
|
258
259
|
|
@@ -277,6 +278,7 @@
|
|
277
278
|
},
|
278
279
|
|
279
280
|
getorg (val) {
|
281
|
+
console.log("====================", val)
|
280
282
|
this.f_orgid = val[0]
|
281
283
|
this.f_filialeid = val[0]
|
282
284
|
// this.search()
|
@@ -124,7 +124,7 @@ export default {
|
|
124
124
|
this.bankmodel = JSON.parse(JSON.stringify(this.bankmodel))
|
125
125
|
},
|
126
126
|
async confirm() {
|
127
|
-
await this.$resetpost('
|
127
|
+
await this.$resetpost('rs/logic/Pos_saveParam',
|
128
128
|
{
|
129
129
|
data: {
|
130
130
|
model: this.model,
|
@@ -73,7 +73,7 @@ export default {
|
|
73
73
|
components: {},
|
74
74
|
data() {
|
75
75
|
return {
|
76
|
-
model: new PagedList('
|
76
|
+
model: new PagedList('rs/sql/get_posParam', 20),
|
77
77
|
curorgid: [this.f_filialeid],
|
78
78
|
}
|
79
79
|
},
|
@@ -93,7 +93,7 @@ export default {
|
|
93
93
|
}
|
94
94
|
},
|
95
95
|
async delete(row) {
|
96
|
-
await this.$resetpost('
|
96
|
+
await this.$resetpost('rs/logic/deletePosParam', {data: row}, {rejectMsg: null, resolveMsg: null})
|
97
97
|
await this.search()
|
98
98
|
},
|
99
99
|
modify(row) {
|
@@ -64,10 +64,10 @@
|
|
64
64
|
<template partial='body'>
|
65
65
|
<td style="text-align:center">{{$index+1}}</td>
|
66
66
|
<td style="text-align:center">{{row.name}}</td>
|
67
|
-
<td class="flex-
|
68
|
-
<button type="button" name="button" class="button_search
|
69
|
-
<button type="button" name="button" class="button_search
|
70
|
-
<button type="button" name="button" class="btn btn-danger
|
67
|
+
<td class="flex-around col-sm-3">
|
68
|
+
<button type="button" name="button" class="button_search" @click.stop="$parent.$parent.modifyParam(row, 't_paramvalue')">修改</button>
|
69
|
+
<button type="button" name="button" class="button_search" v-if="$index!=0" @click.stop="$parent.$parent.move(row,$index)">上移</button>
|
70
|
+
<button type="button" name="button" class="btn btn-danger" @click.stop="$parent.$parent.deleteParam(row, 't_paramvalue')">删除</button>
|
71
71
|
</td>
|
72
72
|
</template>
|
73
73
|
</data-grid>
|
@@ -179,8 +179,8 @@
|
|
179
179
|
var param2=this.params.rows[index-1]
|
180
180
|
let http = new HttpResetClass()
|
181
181
|
try {
|
182
|
-
await http.load('POST', '
|
183
|
-
await http.load('POST', '
|
182
|
+
await http.load('POST', 'rs/entity/t_paramvalue', param1, {resolveMsg: null, rejectMsg: null})
|
183
|
+
await http.load('POST', 'rs/entity/t_paramvalue', param2, {resolveMsg: null, rejectMsg: null})
|
184
184
|
this.$showAlert('上移成功', 'success', 2000)
|
185
185
|
}catch (e) {
|
186
186
|
console.log(e)
|
@@ -198,7 +198,7 @@
|
|
198
198
|
async queryParam (condition) {
|
199
199
|
this.model.rows = []
|
200
200
|
let http = new HttpResetClass()
|
201
|
-
let res = await http.load('POST', '
|
201
|
+
let res = await http.load('POST', 'rs/sql/system_getParam', {data: condition}, {resolveMsg: null, rejectMsg: '获取参数出错!!'})
|
202
202
|
this.model.rows = res.data
|
203
203
|
},
|
204
204
|
selected (val) {
|
@@ -207,7 +207,7 @@
|
|
207
207
|
},
|
208
208
|
async getParamValue(obj) {
|
209
209
|
let http = new HttpResetClass()
|
210
|
-
let res = await http.load('POST', '
|
210
|
+
let res = await http.load('POST', 'rs/sql/system_getParamValue', {data: {param_id: obj.id}}, {resolveMsg: null, rejectMsg: '获取参数出错!!'})
|
211
211
|
this.params.rows = res.data
|
212
212
|
},
|
213
213
|
filter_query (paramName,orgid) {
|
@@ -258,7 +258,7 @@
|
|
258
258
|
if (type === 't_parameter') {
|
259
259
|
this.$showMessage('删除后不可恢复,确认删除吗?', ['confirm', 'cancel']).then((res) => {
|
260
260
|
if (res === 'confirm') {
|
261
|
-
this.$resetpost('
|
261
|
+
this.$resetpost('rs/logic/deleteParam', row).then((res) => {
|
262
262
|
this.filter_query(this.conditionModel.paramName, this.conditionModel.f_cond_orgid)
|
263
263
|
this.selectItem = null
|
264
264
|
})
|
@@ -267,7 +267,7 @@
|
|
267
267
|
} else if (type === 't_paramvalue') {
|
268
268
|
this.$showMessage('删除后不可恢复,确认删除吗?', ['confirm', 'cancel']).then((res) => {
|
269
269
|
if (res === 'confirm') {
|
270
|
-
this.$resetpost('
|
270
|
+
this.$resetpost('rs/logic/deleteValue', {tablename: 't_paramvalue', id: row.id}).then((res) => {
|
271
271
|
this.getParamValue(this.selectItem)
|
272
272
|
})
|
273
273
|
}
|
@@ -291,7 +291,7 @@
|
|
291
291
|
//添加当前分公司
|
292
292
|
}
|
293
293
|
data.f_filialeids = this.modifyItem.f_filialeids
|
294
|
-
this.$resetpost('
|
294
|
+
this.$resetpost('rs/logic/system_saveParam', data).then((res) => {
|
295
295
|
//无id
|
296
296
|
this.filter_query(this.conditionModel.paramName, this.conditionModel.f_cond_orgid)
|
297
297
|
this.show = false
|
@@ -310,7 +310,7 @@
|
|
310
310
|
processid: this.selectItem.id
|
311
311
|
}
|
312
312
|
}
|
313
|
-
this.$resetpost('
|
313
|
+
this.$resetpost('rs/entity/t_paramvalue', data).then((res) => {
|
314
314
|
this.show = false
|
315
315
|
// 如果没有id,需要在数组中添加
|
316
316
|
this.getParamValue(this.selectItem)
|