apply-clients 3.4.15 → 3.4.17

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 (4) hide show
  1. package/build/dev-server.js +2 -2
  2. package/package.json +1 -1
  3. package/src/android.js +1 -1
  4. package/src/filiale/guangxi/pc/Process/Service/ServiceControl.vue +15 -106
package/build/dev-server.js CHANGED
@@ -8,8 +8,8 @@ var compiler = webpack(config)
8
8
  // var proxy = httpProxy.createProxyServer()
9
9
  // var ldap = 'http://121.36.79.201:8400'
10
10
  // var applyinstall = 'http://121.36.79.201:8400'
11
- var ldap = 'http://117.33.181.102:8401/'
12
- var applyinstall = 'http://117.33.181.102:8401/'
11
+ var ldap = 'http://117.33.181.102:8400'
12
+ var applyinstall = 'http://117.33.181.102:8400'
13
13
 
14
14
  var proxyTable = {
15
15
  '/rs/logic/getSaleInitData': {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "apply-clients",
3
- "version": "3.4.15",
3
+ "version": "3.4.17",
4
4
  "description": "报建前端模块",
5
5
  "main": "src/index.js",
6
6
  "directories": {
package/src/android.js CHANGED
@@ -7,7 +7,7 @@ import applyAndroid from './applyAndroid'
7
7
 
8
8
  all()
9
9
  apply()
10
- applyAndroid('guangxi')
10
+ // applyAndroid('guangxi')
11
11
  systemphonegrid()
12
12
 
13
13
  require('./android-bootstrap/less/bootstrap.less')
package/src/filiale/guangxi/pc/Process/Service/ServiceControl.vue CHANGED
@@ -42,11 +42,10 @@
42
42
  ready () {
43
43
  this.refurbish()
44
44
  this.servicer()
45
-
45
+ this.ceshi()
46
46
  },
47
47
  methods: {
48
48
  async servicer(){
49
- debugger
50
49
  let data = {
51
50
  tablename: 't_user',
52
51
  condition: `1=1`
@@ -58,7 +57,6 @@
58
57
  {data: data},
59
58
  {resolveMsg: null, rejectMsg: '服务人查询失败！！！'}
60
59
  )
61
- debugger
62
60
  this.setLabelOptions('服务人', res.data.map(item => {
63
61
  return {
64
62
  label: item.name,
@@ -68,111 +66,21 @@
68
66
  },
69
67
  async ceshi(){
70
68
  for (let i = 0; i < this.show_data.fields.length; i++) {
71
- //新用户时处理逻辑
72
- if (this.selectdata.f_apply_type == '新用户') {
73
- this.show_data.fields[i].required = false
74
- }
75
-
76
- //对勘察时间进行转换
77
- /* if (this.selectdata.defname == '现场勘察') {
78
- if (this.show_data.fields[i].label === '勘察时间') {
79
- this.show_data.fields[i].value = new Date().Format("yyyy-MM-dd HH:mm:ss")
80
- }
81
- } */
82
-
83
-
84
- //所属公司和自动生成项目编号
85
- debugger
86
- if (this.selectdata.defname == '用户建档') {
87
- if (this.show_data.fields[i].label === '所属公司') {
88
- this.show_data.fields[i].value = this.$login.f.orgs
89
- }
90
- console.log("预约的id为："+this.selectdata.f_order_id)
91
- console.dir("推送的数据："+JSON.stringify(this.selectdata))
92
- if (this.show_data.fields[i].label === '项目编号') {
93
-
94
- if(this.selectdata.f_order_id !=''&&this.selectdata.f_order_id !=null ){
95
- console.log("生成的项目编号为：" + this.selectdata.f_entry_num)
96
- this.show_data.fields[i].value = this.selectdata.f_entry_num
97
- }else{
98
- let http2 = new HttpResetClass()
99
- let entryNum = await http2.load('POST', 'rs/logic/getProjectNo', {
100
- data: {
101
- f_filiale: this.$login.f.orgs,
102
- f_order_id: this.selectdata.f_order_id
103
- }
104
- }, {resolveMsg: null, rejectMsg: null})
105
- console.log("生成的项目编号为：" + entryNum.data)
106
- this.show_data.fields[i].value = entryNum.data
107
- }
108
-
109
-
110
- }
111
- if (this.show_data.fields[i].label === '报建编号') {
112
- if(this.selectdata.f_order_id !=''&&this.selectdata.f_order_id !=null ){
113
- console.log("生成的报建编号为：" + this.selectdata.f_apply_num)
114
- this.show_data.fields[i].value = this.selectdata.f_apply_num
115
- }else{
116
- let http2 = new HttpResetClass()
117
- let applyNum = await http2.load('POST', 'rs/logic/getConstructionNo', {
118
- data: {
119
- f_filiale: this.$login.f.orgs,
120
- f_order_id: this.selectdata.f_order_id
121
- }
122
- }, {resolveMsg: null, rejectMsg: null})
123
- console.log("生成的报建编号为：" + applyNum.data)
124
- this.show_data.fields[i].value = applyNum.data
125
- }
126
-
127
-
128
- }
129
- //placeholder required
130
- if (this.selectdata.f_apply_type == '新用户') {
131
- if (this.show_data.fields[i].label === '项目名称' ||
132
- this.show_data.fields[i].label === '营业所' ||
133
- this.show_data.fields[i].label === '项目编号' ||
134
- this.show_data.fields[i].label === '用气性质' ||
135
- this.show_data.fields[i].label === '项目类型' ||
136
- this.show_data.fields[i].label === '花名册') {
137
- this.show_data.fields[i].required = true
138
- }
139
- }
140
-
141
- }
142
-
143
- //如果报建类型是新用户到了核对时的逻辑
144
- // if (this.selectdata.f_apply_type == '新用户' && this.selectdata.defname == '核对'
145
- // && this.show_data.fields[i].label != '用气性质' && this.show_data.fields[i].label != '报建类型'
146
- // && this.show_data.fields[i].label != '项目名称' && this.show_data.fields[i].label != '项目编号'
147
- // && this.show_data.fields[i].label != '所属公司' && this.selectdata.f_roster == '有') {
148
- // this.show_data.fields[i].hidden = true
149
- // }
150
- // if (this.selectdata.f_apply_type == '新用户' && this.selectdata.defname == '核对' && this.selectdata.f_roster == '有'
151
- // && this.show_data.fields[i].label == '应交金额合计') {
152
- // this.show_data.fields[i].value = this.sum.toFixed(2)
153
- // this.show_data.fields[i].hidden = false
154
- // }
155
- // if (this.selectdata.f_apply_type == '新用户' && this.selectdata.defname == '核对' && this.selectdata.f_roster == '有'
156
- // && this.show_data.fields[i].label == '累计交费金额合计') {
157
- // this.show_data.fields[i].value = this.$refs.charge.f_cumulative_money_sum()
158
- // console.log(this.show_data.fields[i].value + "-------------------------累计交费金额合计-------------------------:" + this.$refs.charge.f_cumulative_money_sum())
159
- // this.show_data.fields[i].hidden = false
160
- // }
161
- // 工商业处理逻辑
162
- if (this.selectdata.defname == '报建缴费' && this.selectdata.f_apply_type == '工商业') {
163
- if (this.show_data.fields[i].label == '超长距离' || this.show_data.fields[i].label != '超长费') {
164
- this.show_data.fields[i].required = false
69
+ if (this.show_data.fields[i].label === '合同编号') {
70
+ debugger
71
+ let http2 = new HttpResetClass()
72
+ let applyNum = await http2.load('POST', 'rs/logic/getProjectNo', {
73
+ data: {
74
+ f_filiale: this.$login.f.orgs,
75
+ f_order_id: this.selectdata.f_order_id
76
+ }
77
+ }, {resolveMsg: null, rejectMsg: null})
78
+ debugger
79
+ console.log("生成的合同编号为：" + applyNum.data)
80
+ this.show_data.fields[i].value = applyNum.data
165
81
  }
166
82
  }
167
- // if (this.selectdata.defname == '核对' && this.selectdata.f_apply_type == '工商业') {
168
- // if (this.show_data.fields[i].label == '超长距离' || this.show_data.fields[i].label != '超长费') {
169
- // this.show_data.fields[i].required = false
170
- // this.show_data.fields[i].readonly = false
171
- // }
172
- // }
173
-
174
-
175
- }},
83
+ },
176
84
  // async servicer(){
177
85
  // debugger
178
86
  // let data = {
@@ -419,6 +327,7 @@
419
327
  this.$nextTick(() => {
420
328
  this.showview = true
421
329
  })
330
+ this.ceshi()
422
331
  },
423
332
  // 金额转大写
424
333
  smalltoBIG(n) {