sale-client 3.5.58 → 3.5.60

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 (47) hide show
  1. package/build/dev-server.js +10 -3
  2. package/package.json +1 -1
  3. package/src/components/FilesManage/UserGeneralInfoTest.vue +13 -2
  4. package/src/components/FilesManageNew/FileUserFiles.vue +756 -756
  5. package/src/components/MaterialsManage/MaterialsBase.vue +23 -8
  6. package/src/components/MaterialsManage/MaterialsList.vue +3 -3
  7. package/src/components/MaterialsManage/MaterialsManage.vue +3 -3
  8. package/src/components/revenue/Common/PrintBill.vue +132 -132
  9. package/src/components/revenue/HandManager/VolumeAdjustment/VolumeAdjustmentManage.vue +9 -1
  10. package/src/components/revenue/cancelHandplan/IotHandplanCanel.vue +83 -83
  11. package/src/components/revenue/changeInsurance/InsuranceList.vue +271 -271
  12. package/src/components/revenue/machineHandManage/machineHandAudit.vue +22 -10
  13. package/src/filiale/chengtou/components/FilesManage/FileUserFiles.vue +1018 -1018
  14. package/src/filiale/chengtou/components/FilesManage/UserGeneralInfoTest.vue +672 -672
  15. package/src/filiale/chengtou/plugins/FileManageService.js +388 -388
  16. package/src/filiale/chengtou/sale.js +11 -11
  17. package/src/filiale/kelai/CardMeterCenter.vue +9 -9
  18. package/src/filiale/kelai/MeterinfoTest.vue +8 -8
  19. package/src/filiale/kelai/UserEssentialInfoTest.vue +6 -6
  20. package/src/filiale/liaoyuan/FileManage/UserEssentialInfoTest.vue +10 -0
  21. package/src/filiale/qianneng/eticket/EticketPrint.vue +8 -6
  22. package/src/filiale/rongcheng/FileUserFiles.vue +881 -881
  23. package/src/filiale/rongcheng/MeterinfoTest.vue +611 -611
  24. package/src/filiale/rongcheng/UserEssentialInfoTest.vue +332 -332
  25. package/src/filiale/rongcheng/sale.js +101 -101
  26. package/src/filiale/rongchuang/HighMeterIdCard.vue +1065 -0
  27. package/src/filiale/rongchuang/MeterinfoTest.vue +752 -752
  28. package/src/filiale/rongchuang/sale.js +1 -0
  29. package/src/main.js +22 -22
  30. package/src/plugins/FileManageService.js +389 -389
  31. package/src/sale.js +1135 -1135
  32. package/yarn-error.log +9224 -0
  33. package/.gradle/5.2.1/fileChanges/last-build.bin +0 -0
  34. package/.gradle/5.2.1/fileHashes/fileHashes.lock +0 -0
  35. package/.gradle/5.2.1/gc.properties +0 -0
  36. package/.gradle/7.1/dependencies-accessors/dependencies-accessors.lock +0 -0
  37. package/.gradle/7.1/dependencies-accessors/gc.properties +0 -0
  38. package/.gradle/7.1/executionHistory/executionHistory.bin +0 -0
  39. package/.gradle/7.1/executionHistory/executionHistory.lock +0 -0
  40. package/.gradle/7.1/fileChanges/last-build.bin +0 -0
  41. package/.gradle/7.1/fileHashes/fileHashes.bin +0 -0
  42. package/.gradle/7.1/fileHashes/fileHashes.lock +0 -0
  43. package/.gradle/7.1/gc.properties +0 -0
  44. package/.gradle/buildOutputCleanup/buildOutputCleanup.lock +0 -0
  45. package/.gradle/buildOutputCleanup/cache.properties +0 -2
  46. package/.gradle/checksums/checksums.lock +0 -0
  47. package/.gradle/vcs-1/gc.properties +0 -0
@@ -10,8 +10,7 @@ var compiler = webpack(config)
10
10
 
11
11
  // Define HTTP proxies to your custom API backend
12
12
  // https://github.com/chimurai/http-proxy-middleware
13
- var bendi = 'http://121.36.106.17:8400', bendi1 = 'http://121.36.106.17:8400/'
14
- // 公司测试服务
13
+ var bendi = 'http://121.36.106.17:8400', bendi1 = 'http://127.0.0.1:8080/'// 公司测试服务
15
14
  var fuwu = 'http://121.36.106.17:8400'
16
15
  // var fuwu = 'http://121.36.106.17:8400/'
17
16
  // 铜川正式
@@ -54,6 +53,14 @@ var proxyTable = {
54
53
  '/rs/logic/getInitData': {
55
54
  target: fuwu
56
55
  },
56
+ // 查找资源服务数据
57
+ '/rs/entity/t_material_info': {
58
+ target: bendi1
59
+ },
60
+ // 查找资源服务数据
61
+ '/rs/logic/query_material': {
62
+ target: bendi1
63
+ },
57
64
  '/rs/logic/getSaleInitData': {
58
65
  target: fuwu
59
66
  },
@@ -103,7 +110,7 @@ var proxyTable = {
103
110
  '/rs': {
104
111
  // target: 'http://192.168.30.63:8081/'
105
112
  // target: 'http://121.36.106.17:8400/'
106
- target: 'http://127.0.0.1:8080'
113
+ target: bendi
107
114
  }
108
115
  }
109
116
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sale-client",
3
- "version": "3.5.58",
3
+ "version": "3.5.60",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
@@ -93,7 +93,7 @@
93
93
  </div>
94
94
  <div class="row">
95
95
  <div class="col-sm-2"></div>
96
- <input v-if="fileSaveData.reason==='其他'" class="input_search" style="width:60%" placeholder='修改原因' v-model="fileSaveData.modifyReason"/>
96
+ <input v-if="fileSaveData.reason ==='其他'" class="input_search" style="width:60%" placeholder='修改原因' v-model="fileSaveData.modifyReason"/>
97
97
  </div>
98
98
  </article>
99
99
  <footer slot="modal-footer" class="modal-footer">
@@ -153,7 +153,7 @@ export default {
153
153
  base: {
154
154
  f_user_name: '',
155
155
  f_user_state: '',
156
- f_user_type:'',
156
+ f_user_type: '',
157
157
  f_credentials: '',
158
158
  f_cost_type: '',
159
159
  f_bz_type: '',
@@ -337,6 +337,17 @@ export default {
337
337
  if (this.fileSaveData.reason && this.fileSaveData.reason !== '其他') {
338
338
  this.fileSaveData.modifyReason = this.fileSaveData.reason
339
339
  }
340
+ console.log('row-------->',this.row)
341
+ for (let item in this.filechangeDetails.rows){
342
+ if (item.f_field_name === '通气日期') {
343
+ let name = this.$login.f.name
344
+ let parentname = this.$login.f.f_parentname
345
+ console.log('验证进来了--------------->',name,parentname)
346
+ this.fileSaveData.userinfo.f_operator = name
347
+ this.fileSaveData.userinfo.f_depname = parentname
348
+ }
349
+ }
350
+
340
351
  this.$FileManageService.fileSave(this.fileSaveData).then((res) => {
341
352
  this.$parent.resdata = res.data.result[0].f_userinfo_code
342
353
  if (!this.row) {