system-clients 3.2.95 → 3.2.96-tongchuan

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.
Files changed (60) hide show
  1. package/.gradle/7.4/checksums/checksums.lock +0 -0
  2. package/.gradle/7.4/dependencies-accessors/dependencies-accessors.lock +0 -0
  3. package/.gradle/7.4/dependencies-accessors/gc.properties +0 -0
  4. package/.gradle/7.4/executionHistory/executionHistory.bin +0 -0
  5. package/.gradle/7.4/executionHistory/executionHistory.lock +0 -0
  6. package/.gradle/7.4/fileChanges/last-build.bin +0 -0
  7. package/.gradle/7.4/fileHashes/fileHashes.bin +0 -0
  8. package/.gradle/7.4/fileHashes/fileHashes.lock +0 -0
  9. package/.gradle/7.4/gc.properties +0 -0
  10. package/.gradle/buildOutputCleanup/buildOutputCleanup.lock +0 -0
  11. package/.gradle/buildOutputCleanup/cache.properties +2 -0
  12. package/.gradle/buildOutputCleanup/outputFiles.bin +0 -0
  13. package/.gradle/file-system.probe +0 -0
  14. package/.gradle/vcs-1/gc.properties +0 -0
  15. package/package.json +105 -105
  16. package/src/components/Main.vue +5 -17
  17. package/src/components/Util.js +14 -0
  18. package/src/components/equipment/PcAdd.vue +1 -1
  19. package/src/components/equipment/PcList.vue +3 -3
  20. package/src/components/equipment/PhoneAdd.vue +1 -1
  21. package/src/components/equipment/PhoneList.vue +2 -2
  22. package/src/components/equipment/PosAdd.vue +10 -6
  23. package/src/components/equipment/PosList.vue +5 -3
  24. package/src/components/equipment/PosParamAdd.vue +1 -1
  25. package/src/components/equipment/PosParamList.vue +2 -2
  26. package/src/components/parammanage/ParamPage.vue +12 -12
  27. package/src/components/parammanage/SinglePage.vue +8 -8
  28. package/src/components/server/Login.vue +69 -60
  29. package/src/components/server/ModifyPw.vue +0 -1
  30. package/src/components/server/PcdBuildingSelect.vue +0 -2
  31. package/src/components/server/ResSelect.vue +0 -3
  32. package/src/components/server/ResSelectGroup.vue +1 -1
  33. package/src/components/server/RoleSelector.vue +2 -3
  34. package/src/filiale/baole/Login.vue +0 -2
  35. package/src/filiale/chengtou/Login.vue +0 -2
  36. package/src/filiale/dongguan/Login.vue +0 -2
  37. package/src/filiale/dongguan/Main.vue +0 -2
  38. package/src/filiale/furuike/Login.vue +0 -4
  39. package/src/filiale/furuike/Main.vue +827 -840
  40. package/src/filiale/gehua/Main.vue +0 -2
  41. package/src/filiale/konggang/Login.vue +0 -2
  42. package/src/filiale/qianneng/Login.vue +0 -2
  43. package/src/filiale/qianneng/Main.vue +0 -2
  44. package/src/filiale/qianneng/ModifyPw.vue +0 -1
  45. package/src/filiale/rizhao/Login.vue +0 -2
  46. package/src/filiale/rizhao/Main.vue +1 -1
  47. package/src/filiale/shiquan/Login.vue +0 -2
  48. package/src/filiale/tianyi/Login.vue +0 -2
  49. package/src/filiale/tongchuan/Login.vue +272 -120
  50. package/src/filiale/tongchuan/Main.vue +16 -3
  51. package/src/filiale/weinan/Main.vue +1 -2
  52. package/src/filiale/wenxi/Login.vue +0 -2
  53. package/src/filiale/wenxi/Main.vue +0 -2
  54. package/src/filiale/wuhai/Main.vue +0 -3
  55. package/src/filiale/yuchuan/Login.vue +1 -3
  56. package/src/filiale/yuchuan/Main.vue +0 -2
  57. package/src/filiale/zhoukou/Main.vue +0 -2
  58. package/src/plugins/EncryptUtil.js +1 -1
  59. package/src/plugins/GetLoginInfoService.js +101 -20
  60. package/src/stores/AppData.js +1 -1
File without changes
@@ -0,0 +1,2 @@
1
+ #Thu Aug 03 14:29:00 CST 2023
2
+ gradle.version=7.4
Binary file
File without changes
package/package.json CHANGED
@@ -1,105 +1,105 @@
1
- {
2
- "name": "system-clients",
3
- "version": "3.2.95",
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.145-1",
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
- }
1
+ {
2
+ "name": "system-clients",
3
+ "version": "3.2.96-tongchuan",
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
+ }
@@ -189,7 +189,6 @@ let getwartermakr = async function (self) {
189
189
  tablename: 't_singlevalue',
190
190
  condition: " 1=1 and name=\'水印内容\'"
191
191
  };
192
- // todo v4
193
192
  let result = await self.$resetpost('rs/sql/saleSingleTable', {data: param}, {resolveMsg: null, rejectMsg: null});
194
193
  if (result && result.data.length > 0) {
195
194
  self.showwatermakeflag = true;
@@ -259,6 +258,7 @@ let createWaterMark = function (userName) {
259
258
  qrCode:false,
260
259
  isManger: false,
261
260
  show: false,
261
+ orgpathnames: `${this.$login.f.orgs}-${this.$login.f.deps}-${this.$login.f.name}`,
262
262
  systemname: '客服系统',
263
263
  date: this.$login.toStandardDateString(),
264
264
  tabs: [], //已初始化页签数组
@@ -321,7 +321,9 @@ let createWaterMark = function (userName) {
321
321
  // }
322
322
  this.changeShow()
323
323
  const istelRemindTimes =this.$appdata.getSingleValue("是否开启工单提醒定时器")
324
+ this.getDaiBan()
324
325
  if(istelRemindTimes=='是'){
326
+ this.getOrderList()
325
327
  this.getTimesgotoWorkOrderSite()
326
328
  }
327
329
  const isapplyRemind =this.$appdata.getSingleValue("是否开启提醒")
@@ -470,6 +472,7 @@ let createWaterMark = function (userName) {
470
472
  res.data.forEach(itre => {
471
473
  let band = null
472
474
  if ('f_dynamic_expire' in itre) {
475
+ console.log(itre.f_dynamic_expire)
473
476
  if (itre.f_dynamic_expire !== null && itre.f_dynamic_expire !== '') {
474
477
  let todayold = new Date(itre.f_dynamic_expire)
475
478
  todayold.setDate(todayold.getDate() - parseInt(this.$appdata.getSingleValue('动态库提醒天数设置')))
@@ -599,28 +602,13 @@ let createWaterMark = function (userName) {
599
602
  username: this.$login.f.name,
600
603
  usertelephone: this.$login.f.f_user_telephone
601
604
  }
602
- // todo v4
603
- try {
604
- await this.$resetget('api/af-system/user/logout', {resolveMsg: '退出成功', rejectMsg: null})
605
- }catch(e){
606
- }
605
+ await this.$resetpost('rs/logic/logOut', data, {resolveMsg: '退出成功', rejectMsg: null})
607
606
  window.location.reload()
608
607
  }
609
608
  })
610
609
  }
611
610
  },
612
611
  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
612
  nowDate() {
625
613
  return this.$login.getNowDate()
626
614
  }
@@ -76,6 +76,20 @@ export function parse3339String (strDate) {
76
76
  strDate.substr(11, 2), strDate.substr(14, 2), strDate.substr(17, 2)
77
77
  )
78
78
  }
79
+ // 判断密码最后修改时间是否超过两个半月(2个月零15天)
80
+ export function isPasswordModificationExpired (lastModificationTime) {
81
+ if (!lastModificationTime) {
82
+ return true
83
+ }
84
+ const lastMod = parse3339String(lastModificationTime)
85
+ if (isNaN(lastMod.getTime())) {
86
+ return true
87
+ }
88
+ const expireDate = new Date(lastMod)
89
+ expireDate.setMonth(expireDate.getMonth() + 2)
90
+ expireDate.setDate(expireDate.getDate() + 15)
91
+ return new Date() > expireDate
92
+ }
79
93
 
80
94
  export function format3339TimeString (dt) {
81
95
  let month = dt.getMonth() + 1
@@ -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('api/af-system/logic/save_equipment', this.model, {resolveMsg: '保存成功', rejectMsg: '保存失败'}).then((res) => {
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('api/af-system/sql/equipmentQuery', 20),
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 = '${this.f_orgid ? this.f_orgid: this.$login.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('api/af-system/logic/save_equipment', row, {warnMsg: '确定要删除这条信息吗?', resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
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('api/af-system/logic/save_equipment', this.model, {resolveMsg: '保存成功', rejectMsg: '保存失败'}).then((res) => {
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('api/af-system/sql/equipmentQuery', 20),
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('api/af-system/logic/save_equipment', row, {warnMsg: '确定要删除这条信息吗?', resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
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 || $v.f_phone.minlength || $v.f_phone.maxlength}">
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
- this.$resetpost('api/af-system/logic/batchPos',{data: {tasks: [this.data], taskState: 0}}, {rejectMsg: null, resolveMsg: null})
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
- this.$resetpost('api/af-system/logic/batchPos',{data: {tasks: [this.data], taskState: 1}}, {rejectMsg: null, resolveMsg: null})
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
- // todo v4
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('api/af-system/sql/equipmentQuery', 20),
169
- model2: new PagedList('api/af-system/sql/singleTable', 30, {tablename: '`t_poshistory`'}),
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('api/af-system/logic/batchPos', {data: {tasks: arrs, taskState: val}}, {
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('api/af-system/logic/Pos_saveParam',
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('api/af-system/sql/get_posParam', 20),
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('api/af-system/logic/deletePosParam', {data: row}, {rejectMsg: null, resolveMsg: null})
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-row col-sm-5">
68
- <button type="button" name="button" class="button_search button_spacing width-60" @click.stop="$parent.$parent.modifyParam(row, 't_paramvalue')">修改</button>
69
- <button type="button" name="button" class="button_search button_spacing width-60" v-if="$index!=0" @click.stop="$parent.$parent.move(row,$index)">上移</button>
70
- <button type="button" name="button" class="btn btn-danger button_spacing width-60" @click.stop="$parent.$parent.deleteParam(row, 't_paramvalue')">删除</button>
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', 'api/af-system/logic/system_saveParamValue', param1, {resolveMsg: null, rejectMsg: null})
183
- await http.load('POST', 'api/af-system/logic/system_saveParamValue', param2, {resolveMsg: null, rejectMsg: null})
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', 'api/af-system/sql/system_getParam', {data: condition}, {resolveMsg: null, rejectMsg: '获取参数出错!!'})
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', 'api/af-system/sql/system_getParamValue', {data: {param_id: obj.id}}, {resolveMsg: null, rejectMsg: '获取参数出错!!'})
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('api/af-system/logic/deleteParam', row).then((res) => {
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('api/af-system/logic/deleteValue', {tablename: 't_paramvalue', id: row.id}).then((res) => {
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('api/af-system/logic/system_saveParam', data).then((res) => {
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('api/af-system/logic/system_saveParamValue', data).then((res) => {
313
+ this.$resetpost('rs/entity/t_paramvalue', data).then((res) => {
314
314
  this.show = false
315
315
  // 如果没有id,需要在数组中添加
316
316
  this.getParamValue(this.selectItem)