apply-clients 3.4.88-7 → 3.4.88-71

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 (90) hide show
  1. package/build/dev-server.js +4 -0
  2. package/package.json +2 -2
  3. package/src/apply.js +4 -1
  4. package/src/components/android/AppSign.vue +0 -1
  5. package/src/components/android/Ignition/VentilationIgnition.vue +3 -99
  6. package/src/components/android/Ignition/VentilationIgnitionHandle.vue +1 -103
  7. package/src/components/android/Process/AppServiceControl.vue +10 -4
  8. package/src/components/product/ApplyCharge/ApplyChargeList.vue +7 -1
  9. package/src/components/product/Function/InstallInfoSelect.vue +7 -1
  10. package/src/components/product/Function/Service/FunctionServiceControl.vue +53 -1
  11. package/src/components/product/Material/MaterialDetailed.vue +7 -1
  12. package/src/components/product/Material/Materiallist.vue +74 -0
  13. package/src/components/product/Material/Materialmanger.vue +58 -0
  14. package/src/components/product/Material/Materialuser.vue +222 -0
  15. package/src/components/product/Process/ExplorationSelect.vue +7 -1
  16. package/src/components/product/Process/Processes/addressAndUserinfoManagement.vue +0 -1
  17. package/src/components/product/Process/Service/ServiceControl.vue +1 -3
  18. package/src/components/product/ServiceView.vue +1 -1
  19. package/src/components/product/Stop/StopApplyList.vue +8 -2
  20. package/src/components/product/Supervisory/Service/SupervisoryServiceControl.vue +0 -1
  21. package/src/components/product/Supervisory/SupervisoryList.vue +9 -2
  22. package/src/filiale/ganquan/pc/ExplorationSelect.vue +494 -0
  23. package/src/filiale/ganquan/pc/ServiceControl.vue +1986 -0
  24. package/src/filiale/ganquan/pc/ServiceView.vue +995 -0
  25. package/src/filiale/ganquan/pc/addMaterialScience.vue +454 -0
  26. package/src/filiale/ganquan/pc/addressAndUserinfoManagement.vue +409 -0
  27. package/src/filiale/ganquan/pc/chargeManagement.vue +657 -0
  28. package/src/filiale/ganquan/pc.js +11 -0
  29. package/src/filiale/hongda/android/AppAddMaterialScience.vue +195 -196
  30. package/src/filiale/hongda/android/AppExplorationUser.vue +1 -1
  31. package/src/filiale/hongda/android/AppInstallationDetails.vue +3 -2
  32. package/src/filiale/hongda/pc/ApplyChargeList.vue +44 -42
  33. package/src/filiale/hongda/pc/CollectivelyList.vue +122 -0
  34. package/src/filiale/hongda/pc/ExplorationSelect.vue +48 -36
  35. package/src/filiale/hongda/pc/FunctionServiceControl.vue +504 -0
  36. package/src/filiale/hongda/pc/InstallInfoSelect.vue +331 -0
  37. package/src/filiale/hongda/pc/InstallationDetails.vue +612 -0
  38. package/src/filiale/hongda/pc/MaterialDetailed.vue +268 -0
  39. package/src/filiale/hongda/pc/Materialuser.vue +246 -0
  40. package/src/filiale/hongda/pc/ServiceControl.vue +28 -4
  41. package/src/filiale/hongda/pc/ServiceView.vue +7 -28
  42. package/src/filiale/hongda/pc/StopApplyList.vue +280 -0
  43. package/src/filiale/hongda/pc/SupervisoryList.vue +417 -0
  44. package/src/filiale/hongda/pc/addMaterialScience.vue +83 -29
  45. package/src/filiale/hongda/pc/addressAndUserinfoManagement.vue +202 -0
  46. package/src/filiale/hongda/pc/chargeManagement.vue +3 -1
  47. package/src/filiale/hongda/pc/printChargepc.vue +15 -33
  48. package/src/filiale/hongda/pc/printactivatecard.vue +3 -5
  49. package/src/filiale/hongda/pc/printinstall.vue +4 -26
  50. package/src/filiale/hongda/pc.js +19 -1
  51. package/src/filiale/linzhou/pc/ApplyChargeList.vue +486 -0
  52. package/src/filiale/linzhou/pc/ServiceControl.vue +12 -5
  53. package/src/filiale/linzhou/pc/devicesManagement.vue +494 -0
  54. package/src/filiale/linzhou/pc.js +3 -1
  55. package/src/filiale/qianneng/android/AppAddMaterialScience.vue +477 -0
  56. package/src/filiale/qianneng/android.js +6 -0
  57. package/src/filiale/qianneng/pc/FunctionServiceControl.vue +517 -0
  58. package/src/filiale/qianneng/pc/InstallationDetails.vue +630 -0
  59. package/src/filiale/qianneng/pc/ServiceControl.vue +1947 -0
  60. package/src/filiale/qianneng/pc/ServiceView.vue +1016 -0
  61. package/src/filiale/qianneng/pc/SupervisoryList.vue +351 -0
  62. package/src/filiale/qianneng/pc/addMaterialScience.vue +454 -0
  63. package/src/filiale/qianneng/pc/addressAndUserinfoManagement.vue +344 -0
  64. package/src/filiale/qianneng/pc/chargeManagement.vue +599 -0
  65. package/src/filiale/qianneng/pc/printactivatecard.vue +160 -0
  66. package/src/filiale/qianneng/pc.js +14 -0
  67. package/src/filiale/shexian/android/AppDevicesManagement.vue +531 -0
  68. package/src/filiale/shexian/android/AppExplorationUser.vue +681 -630
  69. package/src/filiale/shexian/android/AppInstallationDetails.vue +498 -498
  70. package/src/filiale/shexian/android/AppProcessSupervisory.vue +346 -0
  71. package/src/filiale/shexian/android/AppServiceControl.vue +15 -8
  72. package/src/filiale/shexian/android/AppServiceView.vue +807 -745
  73. package/src/filiale/shexian/android/AppSign.vue +152 -0
  74. package/src/filiale/shexian/android/AppTakePic.vue +140 -0
  75. package/src/filiale/shexian/android.js +5 -1
  76. package/src/filiale/shexian/pc/ApplyChargeList.vue +471 -0
  77. package/src/filiale/shexian/pc/ExplorationSelect.vue +87 -5
  78. package/src/filiale/shexian/pc/InstallInfoSelect.vue +320 -0
  79. package/src/filiale/shexian/pc/InstallationDetails.vue +639 -637
  80. package/src/filiale/shexian/pc/ReportAcceptanceList.vue +127 -0
  81. package/src/filiale/shexian/pc/ServiceControl.vue +84 -19
  82. package/src/filiale/shexian/pc/ServiceView.vue +26 -5
  83. package/src/filiale/shexian/pc/StopApplyList.vue +271 -0
  84. package/src/filiale/shexian/pc/SupervisoryList.vue +447 -0
  85. package/src/filiale/shexian/pc/SupervisoryServiceControl.vue +14 -7
  86. package/src/filiale/shexian/pc/addressAndUserinfoManagement.vue +373 -0
  87. package/src/filiale/shexian/pc/chargeManagement.vue +654 -654
  88. package/src/filiale/shexian/pc/devicesManagement.vue +496 -0
  89. package/src/filiale/shexian/pc.js +8 -1
  90. package/src/main.js +23 -23
@@ -12,6 +12,10 @@ var ldap = 'http://221.193.244.147:8400'
12
12
  var applyinstall = 'http://221.193.244.147:8400'
13
13
 
14
14
  var proxyTable = {
15
+
16
+ '/webapps/applyinstall/excel': {
17
+ target: applyinstall
18
+ },
15
19
  '/rs/logic/getSaleInitData': {
16
20
  target: ldap
17
21
  },
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "apply-clients",
3
- "version": "3.4.88-7",
3
+ "version": "3.4.88-71",
4
4
  "description": "报建前端模块",
5
5
  "main": "src/index.js",
6
6
  "directories": {
@@ -97,7 +97,7 @@
97
97
  "system-clients": "3.2.63",
98
98
  "system-phone": "1.2.80-49",
99
99
  "url-loader": "^0.5.7",
100
- "vue-client": "1.24.80",
100
+ "vue-client": "1.24.93",
101
101
  "vue-hot-reload-api": "^1.2.0",
102
102
  "vue-html-loader": "^1.0.0",
103
103
  "vue-loader": "^8.2.1",
package/src/apply.js CHANGED
@@ -97,7 +97,10 @@ export default function (filiale) {
97
97
  // 点火界面
98
98
  Vue.component('ignition-list-manage', (resolve) => { require(['./components/product/ignition/IgnitionListManage.vue'], resolve) })
99
99
  Vue.component('ignition-record', (resolve) => { require(['./components/product/ignition/IgnitionRecord.vue'], resolve) })
100
-
100
+ // 材料查看
101
+ Vue.component('material-manger', (resolve) => { require(['./components/product/Material/Materialmanger'], resolve) })
102
+ Vue.component('material-user', (resolve) => { require(['./components/product/Material/Materialuser'], resolve) })
103
+ Vue.component('apply-material-list', (resolve) => { require(['./components/product/Material/Materiallist'], resolve) })
101
104
 
102
105
  Vue.component('business-apply', (resolve) => { require(['./components/product/Business/BusinessApply'], resolve) })
103
106
  Vue.component('civil-apply', (resolve) => { require(['./components/product/Business/CivilApply'], resolve) })
@@ -40,7 +40,6 @@ export default {
40
40
  this.$emit('sign-clean')
41
41
  },
42
42
  sign () {
43
- debugger
44
43
  this.type='手机签字'
45
44
  console.log('==============签字打印this============',this)
46
45
  this.delAudioFile(this.f_sign_path)
@@ -1,25 +1,6 @@
1
1
  <template>
2
2
  <div>
3
3
  <tabset v-ref:tabs :close="false" nav-style="tabs nav-apply-tab" :active.sync="active">
4
- <tab header='任务地图'>
5
- <div class="auto tip">
6
- <p>当前任务数量:{{ tasknumber }}</p>
7
- <p>当前任务点:{{labelmarksarray.length}}</p>
8
- </div>
9
- <amap-location
10
- :islocation="true"
11
- :locationzoomcenter="false"
12
- :usenative="true"
13
- :isshowsearch="false"
14
- :mylocationinfo="false"
15
- :islocationclearmark="false"
16
- :isshowmapmodel="false"
17
- :locationwindow="false"
18
- mapmodel="dragMarker"
19
- :labelmarksarray="labelmarksarray"
20
- @diyspotmouseclick="diyspotmouseclick"
21
- ></amap-location>
22
- </tab>
23
4
  <tab header='任务列表'>
24
5
  <div class="p-10">
25
6
  <criteria-paged :model="model" v-ref:cp>
@@ -122,13 +103,6 @@
122
103
  <p class="col-xs-3 text-left font"><b>地&emsp;&emsp;址:</b></p>
123
104
  <p class="col-xs-9 text-left input-font">{{ row.f_address }}</p>
124
105
  </div>
125
- <div class="col-xs-12">
126
- <p class="col-xs-3 text-left font"><b>定位地址:</b></p>
127
- <p class="col-xs-9 text-left input-font">
128
- {{ row.f_location_address }}
129
- <svg v-if="row.f_location_address" @click.prevent="$parent.$parent.$parent.$parent.$parent.openAmap(row)" style="width: 25px;height: 25px;position: absolute;" t="1628575336648" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3201" width="200" height="200"><path d="M512 956h-1.1c-10.9 0-20.5-6.9-24.7-17L369.9 654.1 85 537.8c-10.1-4.1-16.8-13.7-17.2-24.6-0.4-10.9 5.6-21 15.3-25.9l833-416.5c10.7-5.3 23.6-3.2 32.1 5.2s10.5 21.4 5.2 32.1L536.8 940.9c-4.7 9.4-14.3 15.1-24.8 15.1zM162.7 509.6l239 97.6c6.9 2.8 12.4 8.3 15.2 15.2l97.6 239 351.9-703.8-703.7 352z" fill="#666666" p-id="3202"></path></svg>
130
- </p>
131
- </div>
132
106
  <div class="col-xs-12">
133
107
  <p class="col-xs-3 text-left font"><b>报建类型:</b></p>
134
108
  <p class="col-xs-9 text-left input-font">
@@ -163,8 +137,6 @@ export default {
163
137
  model: new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/getWaitIgnitionTaskApp`, 20, null),
164
138
  // model: new PagedList(`rs/sql/getWaitIgnitionTask`, 20, null),
165
139
  criteriaShow: false,
166
- tasknumber: 0,
167
- labelmarksarray: [],
168
140
  active: 0,
169
141
  f_lat: null,
170
142
  f_lng: null,
@@ -177,7 +149,6 @@ export default {
177
149
  },
178
150
  methods: {
179
151
  refresh () {
180
- this.getWaitIgnitionTaskDot()
181
152
  this.getArea()
182
153
  this.search()
183
154
  },
@@ -193,7 +164,7 @@ export default {
193
164
  row.f_apply_type = '通气点火'
194
165
  // row.f_process_id = row.f_blobid
195
166
  console.log('----------------------++++++++++++++++++',row.f_process_id)
196
- this.$goto('ventilation-ignition-handle', {selectdata: row}, 'self', _this.refresh)
167
+ this.$goto('app-ignition-handle', {selectdata: row}, 'self', _this.refresh)
197
168
  },
198
169
  dialNumber (tel) {
199
170
  this.$showMessage(`是否拨打电话:${tel}`, ['confirm']).then((res) => {
@@ -202,68 +173,6 @@ export default {
202
173
  }
203
174
  })
204
175
  },
205
- // 导航
206
- openAmap (row) {
207
- HostApp.openThirdPartyMap({
208
- lon: row.f_lng,
209
- lat: row.f_lat,
210
- address: row.f_location_address
211
- })
212
- },
213
- diyspotmouseclick (data) {
214
- console.log('************************************')
215
- console.log(data)
216
- this.f_lat = data.f_lat
217
- this.f_lng = data.f_lng
218
- this.search()
219
-
220
- this.active = 1
221
- },
222
- async getWaitIgnitionTaskDot () {
223
- this.tasknumber = 0
224
- let http = new HttpResetClass()
225
- let data = {
226
- userid: Vue.user.id
227
- // userid: this.$login.f.id
228
- }
229
- let res = await http.load(
230
- 'POST',
231
- `${this.$androidUtil.getProxyUrl()}/rs/sql/getWaitIgnitionTaskDot`,
232
- // `rs/sql/getWaitIgnitionTaskDot`,
233
- {data: data},
234
- {
235
- resolveMsg: null,
236
- rejectMsg: '任务点获取失败!!!'
237
- })
238
- this.labelmarksarray = res.data.map(item => {
239
- this.tasknumber += item.count
240
- return {
241
- data: {
242
- data: item,
243
- content: `<p>任务数:${item.count}</p>`
244
- },
245
- position: [item.f_lng, item.f_lat],
246
- isclearmarker: false,
247
- islabel: false
248
- }
249
- })
250
- // for (const item of res.data) {
251
- // this.tasknumber += item.count
252
- // if (isEmpty(item.f_lng) || isEmpty(item.f_lat)) {
253
- // continue
254
- // }
255
- //
256
- // this.labelmarksarray.push({
257
- // data: {
258
- // data: item,
259
- // content: `<p>任务数:${item.count}</p>`
260
- // },
261
- // position: [item.f_lng, item.f_lat],
262
- // isclearmarker: true,
263
- // islabel: false
264
- // })
265
- // }
266
- },
267
176
  searchCondition (args) {
268
177
  args.condition += `and ir.f_ignition_operator_id = '${Vue.user.id}' and ir.f_state = '正在进行'`
269
178
  // args.condition += `and ir.f_ignition_operator_id = '${this.$login.f.id}' and ir.f_state = '正在进行'`
@@ -272,13 +181,8 @@ export default {
272
181
  // args.condition = args.condition.replace(`ir.f_ignition_operator_id = \'${this.$login.f.id}\'`, 'ir.f_shared_dispatch = \'是\'');
273
182
  args.condition = args.condition.replace(`ir.f_ignition_operator_id = \'${Vue.user.id}\'`, 'ir.f_shared_dispatch = \'是\'');
274
183
  }
275
- if (!isEmpty(this.f_lat) && !isEmpty(this.f_lng)) {
276
- args.condition += `and ui.f_lat = '${this.f_lat}' and ui.f_lng = '${this.f_lng}'`
277
- }
278
184
  this.model.search(args.condition, args.model)
279
185
 
280
- this.f_lng = null
281
- this.f_lat = null
282
186
  },
283
187
  // 查询
284
188
  search () {
@@ -313,14 +217,14 @@ export default {
313
217
  async getArea () {
314
218
  let data = {
315
219
  tablename: 't_area_address',
316
- condition: `f_filiale = '${Vue.user.f_fengongsi}' and f_area_status = '启用'`
220
+ condition: `f_filiale = '${Vue.user.orgid}' and f_area_status = '启用'`
317
221
  // condition: `f_filiale = '${this.$login.f.f_fengongsi}' and f_area_status = '启用'`
318
222
  }
319
223
  let http = new HttpResetClass()
320
224
  let res = await http.load(
321
225
  'POST',
322
226
  // `rs/sql/applySingleTable`,
323
- `${this.$androidUtil.getProxyUrl()}/rs/sql/applySingleTable`,
227
+ `${this.$androidUtil.getProxyUrl()}/rs/sql/apply_singleTable`,
324
228
  {data: data},
325
229
  {resolveMsg: null, rejectMsg: '小区查询失败!!!'}
326
230
  )
@@ -113,9 +113,6 @@
113
113
  </div>
114
114
  <div class="col-xs-12 auto">
115
115
  <accordion one-at-a-time="true">
116
- <panel header="设备查看" :is-open="false" type="primary">
117
- <app-devices-management :selectdata="selectdata" :mark = 1 ></app-devices-management>
118
- </panel>
119
116
  <panel header="拍照" :is-open="false" type="primary">
120
117
  <app-take-pic
121
118
  :blobid="selectdata.f_blobid"
@@ -128,14 +125,6 @@
128
125
  </panel>
129
126
  </accordion>
130
127
  </div>
131
- <div class="col-xs-12 form-group auto" v-if="selectdata.f_meter_classify === '物联网表'">
132
- <div class="col-xs-5">
133
- <button style="width: 100%" class="btn btn-success" @click.prevent="openModal('退出强制状态')">退出强制状态</button>
134
- </div>
135
- <div class="col-xs-5 col-xs-offset-2">
136
- <button style="width: 100%" class="btn btn-danger" @click.prevent="openModal('关阀')">强制关阀</button>
137
- </div>
138
- </div>
139
128
  <div class="col-xs-12 auto">
140
129
  <accordion one-at-a-time="true">
141
130
  <panel header="用户签字" :is-open="false" type="primary">
@@ -155,35 +144,6 @@
155
144
  </div>
156
145
 
157
146
  <validator name="v">
158
- <modal v-if="showModal" :show.sync="showModal" v-ref:modal :large="true" :backdrop="false">
159
- <header slot="modal-header" class="modal-header">
160
- <button type="button" class="close" @click="closeModal"><span>&times;</span></button>
161
- <h4 class="modal-title">{{type}}操作</h4>
162
- </header>
163
- <article slot="modal-body" class="modal-body clearfix">
164
- <div class="form-group row vertical-center">
165
- <div class="col-xs-12" v-if="type !== '关阀'" :class="[$v.reason.required ? 'apply-has-error' : '']">
166
- <input
167
- type="checkbox"
168
- class=""
169
- :value.sync="boxReason"
170
- v-model="boxReason"
171
- :value="boxReason"
172
- @change="changeAllChecked()"
173
- ></input>{{ reasonOptions[0].label }}
174
- </div>
175
- <div class="col-xs-12" :class="[$v.reason.required ? 'apply-has-error' : '']">
176
- <textarea rows="2" style="width: 100%;height: 100%"
177
- :placeholder="type+'操作原因'" v-validate:reason = "['required']"
178
- v-model="reason" :value="reason"
179
- ></textarea>
180
- </div>
181
- </div>
182
- </article>
183
- <footer slot="modal-footer" class="modal-footer">
184
- <button type="button" class="btn btn-primary" @click="onOffValve" :disabled="!$v.valid">确认</button>
185
- </footer>
186
- </modal>
187
147
  </validator>
188
148
  </template>
189
149
  <script>
@@ -276,7 +236,6 @@ export default {
276
236
  this.$dispatch('confirm')
277
237
  },
278
238
  async search(){
279
- console.log(">>>>>>>>>>>>>>>>>>>>>>>>>>>", this.selectdata.f_process_id + 'cs' + this.selectdata.defname + 'cs' + this.selectdata.f_apply_type)
280
239
  let data = {
281
240
  tablename: 't_ignition_record',
282
241
  condition: `f_userinfo_id = '${this.selectdata.f_userinfo_id}'`
@@ -284,7 +243,7 @@ export default {
284
243
  let http = new HttpResetClass()
285
244
  let res = await http.load(
286
245
  'POST',
287
- `${this.$androidUtil.getProxyUrl()}/rs/sql/applySingleTable`,
246
+ `${this.$androidUtil.getProxyUrl()}/rs/sql/apply_singleTable`,
288
247
  {data: data},
289
248
  {resolveMsg: null, rejectMsg: '点火记录查询失败!!!'}
290
249
  )
@@ -292,67 +251,6 @@ export default {
292
251
  this.model.f_ignition_trouble = res.data[0].f_ignition_trouble
293
252
  this.model.f_ignition_remarks = res.data[0].f_ignition_remarks
294
253
  }
295
- },
296
- async onOffValve () {
297
- let http = new HttpResetClass()
298
- let data = null
299
- let res = null
300
-
301
- if (this.type !== '退出强制状态') {
302
- data = {
303
- condition: `f_meternumber = '${this.selectdata.f_meternumber}'`,
304
- contentData: {
305
- isOpen: this.type === '开阀' ? 1 : 0
306
- },
307
- inputtor: Vue.user.name,
308
- instructTitle: this.type,
309
- instructType: '阀门控制',
310
- meterBrandName: this.selectdata.f_meter_brand
311
- }
312
- res = await http.load(
313
- 'POST',
314
- `${this.$androidUtil.getProxyUrl()}/rs/logic/saveInstruct`,
315
- {data: data},
316
- {resolveMsg: null, rejectMsg: `${this.type}失败!!!`}
317
- )
318
- }
319
-
320
- data = {
321
- f_user_id: this.selectdata.f_user_id,
322
- f_userinfo_id: this.selectdata.f_userinfo_id,
323
- record: {
324
- f_filiale: Vue.user.f_fengongsi,
325
- f_instruct_meta_data: this.type === '退出强制状态' ? '退出强制阀控' : '进入强制阀控',
326
- f_instruct_title: this.type === '退出强制状态' ? '退出强制阀控' : '进入强制阀控',
327
- f_instruct_type: '阀门控制',
328
- f_meternumber: this.selectdata.f_meternumber,
329
- f_operator: Vue.user.name,
330
- f_outlets: this.selectdata.f_outlets,
331
- f_reason: this.reason,
332
- f_user_id: this.selectdata.f_user_id,
333
- f_userinfo_id: this.selectdata.f_userinfo_id
334
- },
335
- state: this.type === '退出强制状态' ? 0 : 1
336
- }
337
-
338
- res = await http.load(
339
- 'POST',
340
- `${this.$androidUtil.getProxyUrl()}/rs/logic/updateNetWorkValve`,
341
- {data: data},
342
- {resolveMsg: '执行成功!!!', rejectMsg: `执行失败!!!`}
343
- )
344
-
345
- this.closeModal()
346
- },
347
- openModal (type) {
348
- this.type = type
349
- this.showModal = true
350
- },
351
- closeModal () {
352
- this.showModal = false
353
- this.type = null
354
-
355
- this.reason = null
356
254
  }
357
255
  },
358
256
  events: {
@@ -606,11 +606,18 @@ export default {
606
606
  })
607
607
  }
608
608
  }
609
-
610
609
  // 消除双向绑定,避免子组件(显示层)数据更改,父组件(控制层)也更改
611
610
  let temp = JSON.parse(JSON.stringify(this.selectdata))
612
-
613
611
  this.show_data = temp
612
+ for (const item of this.show_data.fields) {
613
+ if(item.label=='气价名称' && !isEmpty(this.show_data.f_price_name)){
614
+ item.options.forEach(x=>{
615
+ if(x.label==this.show_data.f_price_name){
616
+ item.value=x.value
617
+ }
618
+ })
619
+ }
620
+ }
614
621
  if(!this.show_data.showfei){
615
622
  this.$set('show_data.showfei', '未收费')
616
623
  }
@@ -1196,8 +1203,7 @@ export default {
1196
1203
  this.setLabelValue('用气性质', stairPrice.f_gasproperties)
1197
1204
  this.setLabelValue('价格', stairPrice.f_price)
1198
1205
  this.setLabelValue('客户类型', stairPrice.f_user_type)
1199
-
1200
- this.show_data.f_price_id = stairPrice.f_price_id
1206
+ this.show_data.f_price_id = stairPrice.id
1201
1207
  this.show_data.f_price_name = stairPrice.f_price_name
1202
1208
  },
1203
1209
  // 是否购买保险
@@ -52,11 +52,17 @@
52
52
  </div>
53
53
  </div>
54
54
  <div class="row" v-show="$parent.$parent.criteriaShow">
55
+ <div class="form-group col-sm-3">
56
+ <label class="font_normal_body">用户编号:</label>
57
+ <input type="text" style="width:60%" class="input_search" placeholder='用户编号' v-model="model.f_userinfo_code"
58
+ v-on:keyup.enter="$parent.$parent.search()"
59
+ condition="f_userinfo_code like '%{}%'">
60
+ </div>
55
61
  <div class="form-group col-sm-3">
56
62
  <label class="font_normal_body">工程编号:</label>
57
63
  <input type="text" style="width: 60%" class="input_search" placeholder='工程编号' v-model="model.f_apply_num"
58
64
  v-on:keyup.enter="$parent.$parent.search()"
59
- condition="a.f_apply_num = '{}'">
65
+ condition="a.f_apply_num like '%{}%'">
60
66
  </div>
61
67
  <div class="form-group col-sm-3">
62
68
  <label class="font_normal_body">合同编号:</label>
@@ -17,7 +17,7 @@
17
17
  <label class="font_normal_body">工程编号:</label>
18
18
  <input type="text" style="width:60%" class="input_search" placeholder='工程编号' v-model="model.f_apply_num"
19
19
  v-on:keyup.enter="$parent.$parent.search()"
20
- condition="f_apply_num = '{}'">
20
+ condition="f_apply_num like '%{}%'">
21
21
  </div>
22
22
  <div class="form-group col-sm-3">
23
23
  <label class="font_normal_body">客户名称:</label>
@@ -37,6 +37,12 @@
37
37
  </div>
38
38
  </div>
39
39
  <div class="row" v-show="$parent.$parent.criteriaShow">
40
+ <div class="form-group col-sm-3">
41
+ <label class="font_normal_body">用户编号:</label>
42
+ <input type="text" style="width:60%" class="input_search" placeholder='用户编号' v-model="model.f_userinfo_code"
43
+ v-on:keyup.enter="$parent.$parent.search()"
44
+ condition="f_userinfo_code like '%{}%'">
45
+ </div>
40
46
  <div class="form-group col-sm-3">
41
47
  <label class="font_normal_body">联系电话:</label>
42
48
  <input type="text" style="width:60%" class="input_search" placeholder='联系电话' v-model="model.f_phone"
@@ -228,9 +228,61 @@
228
228
  item.disabled = false
229
229
  }
230
230
  }
231
- }
231
+ },
232
+ async getPrice (f_price_id) {
233
+ console.log('=======================')
234
+ console.log(f_price_id)
235
+
236
+ let data = {
237
+ condition: `sp.f_filialeid = '${this.$login.f.orgid}'`
238
+ }
239
+ // if(this.Pricetype==='机表'){
240
+ // data.condition=`sp.f_custom = '机表'`
241
+ // }
242
+ // if(this.Pricetype==='非机表'){
243
+ // data.condition=`sp.f_custom = '非机表'`
244
+ // }
245
+
246
+ if (!isEmpty(f_price_id)) {
247
+ data.condition = `sp.f_filialeid = '${this.$login.f.orgid}' and sp.f_price_id = ${f_price_id}`
248
+ }
249
+ let http = new HttpResetClass()
250
+ let res = await http.load(
251
+ 'POST',
252
+ `rs/sql/applyGetPrice`,
253
+ {data: data},
254
+ {resolveMsg: null, rejectMsg: '气价查询失败!!!'}
255
+ )
256
+
257
+ let a= res.data.map(item => {
258
+ return {
259
+ label: item.f_price_name,
260
+ value: item
261
+ }
262
+ })
263
+ this.selectdata.fields.forEach(field => {
264
+ if (field.label === '气价名称') {
265
+ field.options = a}
266
+ })
267
+ return a
268
+ },
232
269
  },
233
270
  events: {
271
+ // 选择气价
272
+ 'priceChange' (index) {
273
+ if (isEmpty(this.show_data.stairPrice)) {
274
+ return
275
+ }
276
+
277
+ let stairPrice = this.getLableValue('气价名称')
278
+
279
+ this.setLabelValue('气价类型', stairPrice.f_price_type)
280
+ this.setLabelValue('用气性质', stairPrice.f_gasproperties)
281
+ this.setLabelValue('价格', stairPrice.f_price)
282
+ this.setLabelValue('客户类型', stairPrice.f_user_type)
283
+ this.show_data.f_price_id = stairPrice.id
284
+ this.show_data.f_price_name = stairPrice.f_price_name
285
+ },
234
286
  // 信息修改初始化
235
287
  'modifyInfoReadyEvent' () {
236
288
  this.$getConfig(this, 'UserAddress')
@@ -18,7 +18,7 @@
18
18
  <label class="font_normal_body">工程编号:</label>
19
19
  <input type="text" style="width: 60%" class="input_search" placeholder='工程编号' v-model="model.f_apply_num"
20
20
  v-on:keyup.enter="$parent.$parent.search()"
21
- condition="a.f_apply_num = '{}'">
21
+ condition="a.f_apply_num like '%{}%'">
22
22
  </div>
23
23
  <div class="form-group col-sm-3">
24
24
  <label class="font_normal_body">操&ensp;作&ensp;人:</label>
@@ -44,6 +44,12 @@
44
44
  </div>
45
45
  </div>
46
46
  <div class="row" v-show="$parent.$parent.criteriaShow">
47
+ <div class="form-group col-sm-3">
48
+ <label class="font_normal_body">用户编号:</label>
49
+ <input type="text" style="width:60%" class="input_search" placeholder='用户编号' v-model="model.f_userinfo_code"
50
+ v-on:keyup.enter="$parent.$parent.search()"
51
+ condition="a.f_userinfo_code like '%{}%'">
52
+ </div>
47
53
  <div class="form-group col-sm-3">
48
54
  <label class="font_normal_body">客户名称:</label>
49
55
  <input type="text" style="width: 60%" class="input_search" placeholder='客户名称' v-model="model.f_user_name"
@@ -0,0 +1,74 @@
1
+ <template>
2
+ <div class="flex-row">
3
+ <div style="height: 95%" class="basic-main" >
4
+ <criteria-paged :model="model" v-ref:cp>
5
+ <data-grid :model="model" partial='list' v-ref:grid style="overflow: auto" class="list_area table_sy">
6
+ <template partial='head'>
7
+ <tr>
8
+ <th>序号</th>
9
+ <th>材料名称</th>
10
+ <th>材料型号</th>
11
+ <th>材料单位</th>
12
+ <th>材料数量</th>
13
+ </tr>
14
+ </template>
15
+ <template partial='body'>
16
+ <tr >
17
+ <td style="text-align: center;">
18
+ <nobr><font>{{$index+1}}</font></nobr>
19
+ </td>
20
+ <td style="text-align: center;">
21
+ <nobr><font>{{row.f_material_name}}</font></nobr>
22
+ </td>
23
+ <td style="text-align: center;">
24
+ <nobr><font>{{row.f_material_style}}</font></nobr>
25
+ </td>
26
+ <td style="text-align: center;">
27
+ <nobr><font>{{row.f_material_unit}}</font></nobr>
28
+ </td>
29
+ <td style="text-align: center;">
30
+ <nobr><font>{{row.f_material_number}}</font></nobr>
31
+ </td>
32
+ </tr>
33
+ </template>
34
+ </data-grid>
35
+
36
+ </criteria-paged>
37
+ </div>
38
+
39
+ </div>
40
+ </template>
41
+
42
+ <script>
43
+ import {PagedList} from 'vue-client'
44
+ export default {
45
+ title: '材料明细',
46
+ props: ['materialuser'],
47
+ data () {
48
+ return {
49
+ model: new PagedList('rs/sql/applyGetMaterial', 30, null),
50
+ }
51
+ },
52
+ ready () {
53
+ // 调用查询
54
+ this.search()
55
+ },
56
+ methods: {
57
+ // 查询
58
+ search () {
59
+ let condition = ` ma.f_process_id = '${this.materialuser.f_process_id}' `
60
+ this.model.search(condition)
61
+ }
62
+ },
63
+ computed: {
64
+ },
65
+ watch: {
66
+ 'materialuser' () {
67
+ this.search()
68
+ }
69
+ }
70
+ }
71
+ </script>
72
+
73
+ <style scoped>
74
+ </style>
@@ -0,0 +1,58 @@
1
+ <template>
2
+ <div id="unit" class="flex-row" :class="{'binary':showItem}">
3
+ <div :class="{'basic-main':!showItem,'binary-left':showItem}">
4
+ <material-user @select-changed="selected" :style="style" :style2="style2" v-ref:check></material-user>
5
+ </div>
6
+ <div class="binary-right" v-if="showItem">
7
+ <div class="flex">
8
+ <apply-material-list v-ref:detail :materialuser="materialuser" ></apply-material-list>
9
+ </div>
10
+ </div>
11
+ </div>
12
+ </template>
13
+
14
+ <script>
15
+ export default {
16
+ title: '材料查看',
17
+ props: [],
18
+ data () {
19
+ return {
20
+ showItem: false,
21
+ materialuser: '',
22
+ style: 'col-sm-2 form-group',
23
+ style2: 'col-sm-4 form-group'
24
+ }
25
+ },
26
+ methods: {
27
+ selected (obj) {
28
+ this.materialuser = obj.val
29
+ this.showItem = true
30
+ }
31
+ },
32
+ watch: {
33
+ 'showItem' (val) {
34
+ if (val) {
35
+ this.style = 'col-sm-3 form-group'
36
+ this.style2 = 'col-sm-6 form-group'
37
+ } else {
38
+ this.style = 'col-sm-2 form-group'
39
+ this.style2 = 'col-sm-4 form-group'
40
+ }
41
+ }
42
+ }
43
+ }
44
+ </script>
45
+ <style>
46
+ .form-input-group label {
47
+ text-align: right;
48
+ width: auto;
49
+ }
50
+
51
+ .datapanel {
52
+ color: #333;
53
+ background-color: white;
54
+ box-shadow: darkgrey 0.5px 0.5px 0.5px 0.5px;
55
+ padding: 5px 7px 5px 7px;
56
+ border-radius: 10px;
57
+ }
58
+ </style>