sale-client 3.5.259 → 3.5.260

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 (6) hide show
  1. package/build/dev-server.js +82 -104
  2. package/package.json +1 -1
  3. package/src/filiale/wenxi/FilesManageNew/UserEssentialInfoTest.vue +0 -1
  4. package/src/filiale/wenxi/UserGeneralInfoTest.vue +12 -4
  5. package/src/filiale/yuansheng/MeterinfoTest.vue +3 -3
  6. package/src/plugins/FileManageService.js +1 -0
package/build/dev-server.js CHANGED
@@ -1,104 +1,82 @@
1
- var path = require('path')
2
- const [localUrl, serverRul] = ['http://192.168.50.4:8400', 'http://192.168.50.4: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
- '/rs/sql/sale_getUser': {
27
- target: localUrl
28
- },
29
- '/rs/logic/chargeCancel': {
30
- target: localUrl
31
- },
32
- '/rs/sql/gasCancel': {
33
- target: localUrl
34
- },
35
-
36
- '/rs/logic/marginCharge': {
37
- target: localUrl
38
- },
39
- '/rs/logic/sale_cardCharge_logic': {
40
- target: localUrl
41
- },
42
-
43
- '/rs/logic/getOperBtns': {
44
- target: localUrl
45
- },
46
- '/rs/logic/commonCal': {
47
- target: localUrl
48
- },
49
- // 查找资源服务数据
50
- '/rs/logic/getLogin': {
51
- target: serverRul
52
- },
53
- // 查找资源服务数据
54
- '/rs/logic/getInitData': {
55
- target: serverRul
56
- },
57
- '/rs/logic/getSaleInitData': {
58
- target: serverRul
59
- },
60
- // 用户登录服务地址
61
- '/rs/user': {
62
- target: serverRul
63
- },
64
- '/rs/path': {
65
- target: serverRul
66
- },
67
- '/rs/data': {
68
- target: serverRul
69
- },
70
- '/rs/license': {
71
- target: serverRul
72
- },
73
- '/rs/db': {
74
- target: serverRul
75
- },
76
- '/excel': {
77
- target: serverRul
78
- },
79
- '/rs/config': {
80
- target: serverRul
81
- },
82
- '/rs/report': {
83
- target: serverRul
84
- },
85
- '/rs/vue': {
86
- target: serverRul
87
- },
88
- '/rs/logic': {
89
- target: localUrl
90
- },
91
- '/rs/sql': {
92
- target: localUrl
93
- },
94
- '/webmeter': {
95
- target: serverRul
96
- },
97
- '/rs': {
98
- target: serverRul
99
- // changeOrigin: true
100
- }
101
- }
102
- }
103
- }
104
- module.exports = merge(baseConfig, devConfig)
1
+ var path = require('path')
2
+ const [localUrl, serverRul] = ['http://192.168.50.4:8400', 'http://192.168.50.4: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
+ host: "127.0.0.1",
12
+ port: 8089,
13
+ open: true,
14
+ stats: {
15
+ colors: false, // 配置控制台输出彩色日志
16
+ chunks: false, // 不输出构建 chunk 信息
17
+ children: false // 不输出子模块构建信息
18
+ },
19
+ proxy: {
20
+ '/rs/file': {
21
+ target: serverRul
22
+ },
23
+ // 查找资源服务数据
24
+ '/rs/search': {
25
+ target: serverRul
26
+ },
27
+ // 查找资源服务数据
28
+ '/rs/logic/getLogin': {
29
+ target: serverRul
30
+ },
31
+ // 查找资源服务数据
32
+ '/rs/logic/getInitData': {
33
+ target: serverRul
34
+ },
35
+ '/rs/logic/getSaleInitData': {
36
+ target: serverRul
37
+ },
38
+ // 用户登录服务地址
39
+ '/rs/user': {
40
+ target: serverRul
41
+ },
42
+ '/rs/path': {
43
+ target: serverRul
44
+ },
45
+ '/rs/data': {
46
+ target: serverRul
47
+ },
48
+ '/rs/license': {
49
+ target: serverRul
50
+ },
51
+ '/rs/db': {
52
+ target: serverRul
53
+ },
54
+ '/excel': {
55
+ target: serverRul
56
+ },
57
+ '/rs/config': {
58
+ target: serverRul
59
+ },
60
+ '/rs/report': {
61
+ target: serverRul
62
+ },
63
+ '/rs/vue': {
64
+ target: serverRul
65
+ },
66
+ '/rs/logic': {
67
+ target: localUrl
68
+ },
69
+ '/rs/sql': {
70
+ target: localUrl
71
+ },
72
+ '/webmeter': {
73
+ target: serverRul
74
+ },
75
+ '/rs': {
76
+ target: serverRul
77
+ // changeOrigin: true
78
+ }
79
+ }
80
+ }
81
+ }
82
+ module.exports = merge(baseConfig, devConfig)
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sale-client",
3
- "version": "3.5.259",
3
+ "version": "3.5.260",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
package/src/filiale/wenxi/FilesManageNew/UserEssentialInfoTest.vue CHANGED
@@ -249,7 +249,6 @@
249
249
  }
250
250
  },
251
251
  ready () {
252
- console.log('f_filialeid222，，，', this.f_filialeid)
253
252
  getEditUserState(this)
254
253
  this.$resetValidation()
255
254
  // this.highMeterPlugin = new HighMeter(this,this.readIDCardCallback)
package/src/filiale/wenxi/UserGeneralInfoTest.vue CHANGED
@@ -11,7 +11,7 @@
11
11
  <button class="button_search" style="width: max-content" @click="openBankAccount()" v-if="data.meterinfo[0].f_user_type[0] === '非民用' && ($login.r.includes('银行开户'))">银行开户</button>
12
12
  </div>
13
13
  <file-user-essential-info :usertype="row?row.f_user_type:null" :userphonelist="data.baseinfo.userphonelist" :baseinfo="data.baseinfo" :addressinfo="data.addressinfo" @valid="essentialInfo = true"
14
- :flag="flag" @invalid="essentialInfo = false" v-ref:useressential :isedit="isedit"></file-user-essential-info>
14
+ :flag="2" @invalid="essentialInfo = false" v-ref:useressential :isedit="isedit"></file-user-essential-info>
15
15
  <file-userinfo-device :userinfodevices.sync="userinfodevices" :show_userinfodevices.sync="show_userinfodevices"
16
16
  :userinfoid='data.baseinfo.base.f_userinfo_id'></file-userinfo-device>
17
17
  </div>
@@ -224,9 +224,9 @@ export default {
224
224
  }
225
225
  },
226
226
  async ready () {
227
- if (this.data.baseinfo.base.f_userinfo_id){
227
+ if (this.data.baseinfo.base.f_userinfo_id) {
228
228
  this.blodid = this.data.baseinfo.base.f_userinfo_id
229
- }else {
229
+ } else {
230
230
  this.blodid = '临时id' + Date.now()
231
231
  }
232
232
  console.log('ready，，，', this.row)
@@ -237,7 +237,7 @@ export default {
237
237
  // 将小区信息转化为综合信息的格式
238
238
  await this.areainfoInUser(this.areainfo)
239
239
  }
240
- console.log('this.blodid------------>',this.blodid)
240
+ console.log('this.blodid------------>', this.blodid)
241
241
  },
242
242
  watch: {
243
243
  async 'row' (val) {
@@ -339,6 +339,7 @@ export default {
339
339
  if (!this.filechangeDetailsShow) this.confirmation()
340
340
  },
341
341
  confirmation () {
342
+ debugger
342
343
  if (this.fileSaveData.reason && this.fileSaveData.reason !== '其他') {
343
344
  this.fileSaveData.modifyReason = this.fileSaveData.reason
344
345
  }
@@ -358,6 +359,13 @@ export default {
358
359
  this.fileSaveData.userinfo.userfiles.f_depid = parentnameId
359
360
  }
360
361
  }
362
+ console.log('打印保存数据', this.fileSaveData)
363
+ console.log('打印id', this.fileSaveData.userinfo.f_userinfo_id)
364
+ // 如果是修改操作则修改建党人
365
+ if (this.fileSaveData.userinfo.f_userinfo_id) {
366
+ this.fileSaveData.userinfo.f_createfile_person = this.$login.f.name
367
+ }
368
+ console.log('二次打印打印保存数据', this.fileSaveData)
361
369
  FileManageService.fileSave(this.fileSaveData).then((res) => {
362
370
  this.$parent.resdata = res.data.result[0].f_userinfo_code
363
371
  if (!this.row) {
package/src/filiale/yuansheng/MeterinfoTest.vue CHANGED
@@ -44,14 +44,14 @@
44
44
  <input type="text" class="input_search" style="width:60%" v-model="row.f_table_state" placeholder='表具状态' disabled>
45
45
  </div>
46
46
  <div class="col-sm-4 form-group">
47
- <label for="f_meter_base" class="font_normal_body">&ensp;表&ensp;读&ensp;数</label>
47
+ <label for="f_meter_base" class="font_normal_body">&ensp;表&ensp;底&ensp;数</label>
48
48
  <input type="number" class="input_search" style="width:60%" v-model="row.f_meter_base" placeholder='表底数'
49
- :disabled="!jurisdiction.includes('档案信息查询修改')" :readonly="!row.f_userfiles_id">
49
+ :disabled="!jurisdiction.includes('档案信息查询修改')">
50
50
  </div>
51
51
  <div class="col-sm-4 form-group" title="涉及权限:【档案信息查询修改】">
52
52
  <label for="f_meter_base" class="font_normal_body">&ensp;初始底数</label>
53
53
  <input type="number" class="input_search" style="width:60%" v-model="row.f_initial_base" placeholder='表底数'
54
- :disabled="!jurisdiction.includes('档案信息查询修改')">
54
+ :disabled="!jurisdiction.includes('档案信息查询修改')" :readonly="!row.f_userfiles_id">
55
55
  </div>
56
56
 
57
57
  <div class="col-sm-4 form-group" title="涉及权限:【档案信息查询修改】">
package/src/plugins/FileManageService.js CHANGED
@@ -347,6 +347,7 @@ let FileManageService = {
347
347
  return {userinfo: result, address: address, limit_gas: data.limit_gas, hasnumber: data.hasnumber, inputcode: data.inputcode}
348
348
  },
349
349
  fileSave (data) {
350
+ data.userinfo.f_user_name = data.userinfo.f_user_name? data.userinfo.f_user_name.trim():null
350
351
  return Vue.resetpost('rs/logic/filemanage_fileSave', {data: data})
351
352
  },
352
353
  batchOperate (model, type) {