apply-clients 5.0.35-99 → 5.0.35-ezhou-2

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 (43) hide show
  1. package/dist.7z +0 -0
  2. package/package.json +111 -111
  3. package/src/apply.js +1 -13
  4. package/src/components/app_apply/ApplyToDoList.vue +2586 -76
  5. package/src/components/app_apply/PlaceControler.vue +0 -12
  6. package/src/components/app_apply/ServiceControl.vue +348 -687
  7. package/src/components/app_apply/ezhou/ServiceView.vue +57 -139
  8. package/src/components/product/Common/ApplyValidateBill.vue +6 -13
  9. package/src/components/product/Common/PrintBill.vue +6 -7
  10. package/src/components/product/Function/InstallInfoSelect.vue +2 -3
  11. package/src/components/product/Function/Service/FunctionServiceControl.vue +1 -37
  12. package/src/components/product/Function/functions/BuyerMessage.vue +1 -1
  13. package/src/components/product/Function/functions/InstallFee.vue +22 -103
  14. package/src/components/product/Function/functions/InstallFeeInfo.vue +1 -6
  15. package/src/components/product/Process/ExplorationSelect.vue +678 -653
  16. package/src/components/product/Process/Processes/CustomerRecordMessage.vue +907 -907
  17. package/src/components/product/Process/Processes/Service/ApplyChargeSearch.vue +39 -126
  18. package/src/components/product/Process/Processes/Service/PaperTicketBill.vue +1 -1
  19. package/src/components/product/Process/Processes/Service/ServiceControl.vue +1495 -1880
  20. package/src/components/product/ServiceView.vue +5 -15
  21. package/src/components/product/Supervisory/Service/SupervisoryServiceControl.vue +10 -56
  22. package/src/components/product/Supervisory/SupervisoryList.vue +12 -76
  23. package/src/components/product/stopInfo/ApplyStopInfo.vue +1 -2
  24. package/src/ezhouAndroid.js +0 -4
  25. package/src/plugins/commonService.js +1 -1
  26. package/yarn-error.log +8796 -9048
  27. package/src/components/app_apply/Gongcheng.vue +0 -3631
  28. package/src/components/app_apply/OneToMany.vue +0 -194
  29. package/src/components/image/doc.jpg +0 -0
  30. package/src/components/image/dwg.png +0 -0
  31. package/src/components/image/dxf.png +0 -0
  32. package/src/components/image/excel.jpg +0 -0
  33. package/src/components/image/pdf.jpg +0 -0
  34. package/src/components/product/EngineeringManagement/EngineerUpload.vue +0 -304
  35. package/src/components/product/EngineeringManagement/EngineeringManagement.vue +0 -137
  36. package/src/components/product/EngineeringManagement/EngineeringSelect.vue +0 -586
  37. package/src/components/product/EngineeringSupervisory/EngineeringApplyStopInfo.vue +0 -281
  38. package/src/components/product/EngineeringSupervisory/EngineeringSupervisoryControl.vue +0 -132
  39. package/src/components/product/EngineeringSupervisory/EngineeringSupervisoryList.vue +0 -340
  40. package/src/components/product/EngineeringSupervisory/EngineeringSupervisoryServiceControl.vue +0 -490
  41. package/src/components/product/Function/functions/ApplyUpload.vue +0 -556
  42. package/src/components/product/applyReport/ApplyReport.vue +0 -205
  43. package/src/components/product/applyReport/PrintApplyReport.vue +0 -116
@@ -1,5 +1,5 @@
1
1
  <template>
2
- <div class="auto select-overspread" v-if="refresh">
2
+ <div class="auto select-overspread">
3
3
  <div v-if="data.back_reason" class="panel panel-info">
4
4
  <span style="color: red"> 请注意被退回原因为:{{ data.back_reason }}</span>
5
5
  </div>
@@ -8,12 +8,10 @@
8
8
  <div class="col-sm-11 form-group">
9
9
  <div v-for="(index,item) in data.fields">
10
10
  <!--input-->
11
- <div v-if="item.type==='input' ||item.type === 'tel' " v-show="!item.hidden"
11
+ <div v-if="item.type==='input'" v-show="!item.hidden"
12
12
  :class="[data.fields[index].required&&!(data.fields[index].value) ? 'has-error' : '',data.fields[index].bootstraped?data.fields[index].bootstraped+' form-group':'col-sm-4 form-group']">
13
13
  <label
14
- :class="item.label_bootstraped?item.label_bootstraped+' control-label':'control-label col-sm-6'">{{
15
- item.label
16
- }}:</label>
14
+ :class="item.label_bootstraped?item.label_bootstraped+' control-label':'control-label col-sm-6'">{{ item.label }}:</label>
17
15
  <div :class="item.value_bootstraped?item.value_bootstraped:'col-sm-6'">
18
16
  <input class="form-control"
19
17
  :type="item.type"
@@ -22,7 +20,7 @@
22
20
  :value="data.fields[index].value"
23
21
  :readonly="item.readonly"
24
22
  :disable="item.disable"
25
- @change="select_change(index),disabled_check(index,data.fields[index].required,data.fields[index].value)"
23
+ @change="disabled_check(index,data.fields[index].required,data.fields[index].value)"
26
24
  @blur="check_disable"
27
25
  />
28
26
  </div>
@@ -31,9 +29,7 @@
31
29
  <div v-if="item.type==='number'" v-show="!item.hidden"
32
30
  :class="[data.fields[index].required&&!(data.fields[index].value) ? 'has-error' : '',data.fields[index].bootstraped?data.fields[index].bootstraped+' form-group':'col-sm-4 form-group']">
33
31
  <label
34
- :class="item.label_bootstraped?item.label_bootstraped+' control-label':'control-label col-sm-6'">{{
35
- item.label
36
- }}:</label>
32
+ :class="item.label_bootstraped?item.label_bootstraped+' control-label':'control-label col-sm-6'">{{ item.label }}:</label>
37
33
  <div :class="item.value_bootstraped?item.value_bootstraped:'col-sm-6'">
38
34
  <input class="form-control"
39
35
  :type="item.type"
@@ -52,9 +48,7 @@
52
48
  <div v-if="item.type==='datepicker'"
53
49
  :class="[data.fields[index].required&&!(data.fields[index].value) ? 'has-error' : '',data.fields[index].bootstraped?data.fields[index].bootstraped+' form-group':'col-xs-12 form-group']">
54
50
  <label style="margin-top: 0.7em"
55
- :class="item.label_bootstraped?item.label_bootstraped +' control-label':'control-label col-sm-6'">{{
56
- item.label
57
- }}:</label>
51
+ :class="item.label_bootstraped?item.label_bootstraped +' control-label':'control-label col-sm-6'">{{ item.label }}:</label>
58
52
  <div :class="item.value_bootstraped?item.value_bootstraped:'col-sm-6'">
59
53
  <datepicker
60
54
  :placeholder="item.placeholder"
@@ -76,9 +70,7 @@
76
70
  <div v-if="item.type==='textarea'"
77
71
  :class="[data.fields[index].required&&!(data.fields[index].value) ? 'has-error' : '',data.fields[index].bootstraped?data.fields[index].bootstraped+' form-group':'col-sm-12 form-group']">
78
72
  <label
79
- :class="item.label_bootstraped?item.label_bootstraped+' control-label':'control-label col-sm-2'">{{
80
- item.label
81
- }}:</label>
73
+ :class="item.label_bootstraped?item.label_bootstraped+' control-label':'control-label col-sm-2'">{{ item.label }}:</label>
82
74
  <div :class="item.value_bootstraped?item.value_bootstraped:'col-sm-10'">
83
75
  <textarea
84
76
  :readonly="item.readonly"
@@ -97,9 +89,7 @@
97
89
  <div v-if="item.type==='radio'"
98
90
  :class="[data.fields[index].required&&!(data.fields[index].value) ? 'has-error' : '',data.fields[index].bootstraped?data.fields[index].bootstraped+' form-group':'col-sm-12 form-group']">
99
91
  <label v-if="item.label"
100
- :class="item.label_bootstraped?item.label_bootstraped+' control-label':'control-label col-sm-2'">{{
101
- item.label
102
- }}:</label>
92
+ :class="item.label_bootstraped?item.label_bootstraped+' control-label':'control-label col-sm-2'">{{ item.label }}:</label>
103
93
  <div class="col-xs-12">
104
94
  <div
105
95
  :class="item.value_bootstraped?item.value_bootstraped:item.items.length%2 == 0?'col-xs-5': 'col-xs-3'"
@@ -118,9 +108,7 @@
118
108
  <div v-if="item.type==='select'"
119
109
  :class="[data.fields[index].required&&!(data.fields[index].value) ? 'has-error' : '',data.fields[index].bootstraped?data.fields[index].bootstraped+' form-group':'col-sm-4 form-group']">
120
110
  <label
121
- :class="item.label_bootstraped?item.label_bootstraped+' control-label':'control-label col-sm-6'">{{
122
- item.label
123
- }}:</label>
111
+ :class="item.label_bootstraped?item.label_bootstraped+' control-label':'control-label col-sm-6'">{{ item.label }}:</label>
124
112
  <input-select :class="item.value_bootstraped?item.value_bootstraped:'col-sm-6'" @blur="check_disable"
125
113
  @change="select_change(index),disabled_check(index,data.fields[index].required,data.fields[index].value)"
126
114
  :readonly="item.readonly" :disable="item.disabled" :value.sync="data.fields[index].value"
@@ -133,20 +121,20 @@
133
121
  <div v-if="item.type==='checkbox'"
134
122
  :class="[data.fields[index].required&&!(data.fields[index].value) ? 'has-error' : '',data.fields[index].bootstraped?data.fields[index].bootstraped+' form-group':'col-sm-12 form-group']">
135
123
  <label v-if="item.label"
136
- :class="item.label_bootstraped?item.label_bootstraped+' control-label':'control-label col-sm-2'">{{item.label }}</label>
137
- <div style="margin-top: 6px"
124
+ :class="item.label_bootstraped?item.label_bootstraped+' control-label':'control-label col-sm-2'">{{ item.label }}:</label>
125
+ <div style="margin-top: 0.7em"
138
126
  :class="item.value_bootstraped?item.value_bootstraped:'control-label col-sm-2'"
139
127
  v-for="(index2,row) in item.items">
140
128
  <label class="font-size form-group col-sm-6">{{ row.label }}</label>
141
129
  <input :readonly="item.readonly" :disabled="item.disabled" type="checkbox" class="col-sm-6"
142
- :id="row.label" v-model="data.fields[index].items[index2].value" @click="checkboxSelect(index,index2)">
130
+ :id="row.label" v-model="data.fields[index].items[index2].value">
143
131
  </div>
144
132
  </div>
145
133
 
146
134
 
147
135
  </div>
148
136
  </div>
149
- <div class="form-group col-sm-11">
137
+ <div class="form-group col-sm-11" v-show="isshow">
150
138
  <label class="text-left font">现场照片</label>
151
139
 
152
140
  <div class="auto">
@@ -172,7 +160,7 @@
172
160
  </div>
173
161
  </div>
174
162
  </div>
175
- <div class="form-group col-sm-11" v-show="true">
163
+ <div class="form-group col-sm-11" v-show="isshow">
176
164
  <label class="text-left font">用户签名</label>
177
165
  <div class="auto">
178
166
  <div class="panel">
@@ -214,15 +202,6 @@
214
202
 
215
203
 
216
204
  </div>
217
-
218
-
219
-
220
- <div class="col-sm-11 form-group" v-for="item in onetomany" style="text-align: center">
221
-
222
- <button type="button" name="button" class="btn btn-primary" style="background-color:#499edf;" @click="gotoOneToMany(item)">前往{{item.title}}</button>
223
-
224
- </div>
225
-
226
205
  <div class="col-sm-11 form-group">
227
206
  <div class="form-group col-sm-6">
228
207
  <label class=" col-sm-4 control-label">分公司:</label>
@@ -298,8 +277,6 @@
298
277
  <script>
299
278
 
300
279
  // Date格式化
301
-
302
-
303
280
  Date.prototype.Format = function (fmt) {
304
281
  var o = {
305
282
  "M+": this.getMonth() + 1, //月份
@@ -318,7 +295,7 @@ Date.prototype.Format = function (fmt) {
318
295
 
319
296
  import Vue from 'vue'
320
297
  import * as Util from '../../Util'
321
- import {HttpResetClass} from 'vue-client'
298
+
322
299
  export default {
323
300
  title: '报建业务通用组件',
324
301
  props: ['data', 'model'],
@@ -328,12 +305,11 @@ export default {
328
305
  isshow: true,
329
306
  kchege: false,
330
307
  kcbuhege: false,
308
+
331
309
  countmoney: [0, 0, 0],
332
310
  data: null,
333
311
  showmodal: false,
334
- disable_button: true,
335
- onetomany: [],
336
- refresh: true // 控制重新渲染
312
+ disable_button: true
337
313
  }
338
314
  },
339
315
  created() {
@@ -342,18 +318,12 @@ export default {
342
318
  this.initializtion()
343
319
  },
344
320
  methods: {
345
- gotoOneToMany (item){
346
- item.f_process_id = this.data.f_process_id
347
- item.f_filiale = this.data.f_filiale
348
- item.f_apply_num = this.data.f_apply_num
349
- this.$dispatch('onetomany', item)
350
- },
351
- gotohetong (val) {
321
+ gotohetong(val) {
352
322
  console.log(val)
353
323
  console.log("进入goto")
354
324
  this.$dispatch('gotonewpage', val)
355
325
  },
356
- cameraCallBack (prop, fileName) {
326
+ cameraCallBack(prop, fileName) {
357
327
  if (prop == 'f_overall_path') {
358
328
  let f_overall_path = fileName + '?' + Math.random()
359
329
  HostApp.__this__.model.f_overall_imgs.push({
@@ -366,7 +336,7 @@ export default {
366
336
  HostApp.__callback__ = null
367
337
  HostApp.__this__ = null
368
338
  },
369
- takePic (prop, title, index) {
339
+ takePic(prop, title, index) {
370
340
  HostApp.__callback__ = this.cameraCallBack
371
341
  HostApp.__this__ = this
372
342
  console.log("prop:" + prop)
@@ -397,13 +367,13 @@ export default {
397
367
  }
398
368
  })
399
369
  },
400
- signCallback (prop, fileName) {
370
+ signCallback(prop, fileName) {
401
371
  // HostApp.alert('绑定属性:' + prop + ' 文件全路径如file:///storage/sdcard0/safecheck/abc.jpg:' + fullFileName)
402
372
  HostApp.__this__.$set('model.f_sign_path', fileName)
403
373
  HostApp.__callback__ = null
404
374
  HostApp.__this__ = null
405
375
  },
406
- delAudioFile (prop, fileName) {
376
+ delAudioFile(prop, fileName) {
407
377
  if (!fileName)
408
378
  return
409
379
  else {
@@ -411,7 +381,11 @@ export default {
411
381
  this.model[prop] = null
412
382
  }
413
383
  },
414
- sign () {
384
+ sign() {
385
+ // if(!this.model.f_read_instructions){
386
+ // this.$showMessage('请先阅读并勾选用户须知内容后进行签名!')
387
+ // return
388
+ // }
415
389
  this.delAudioFile('f_sign_path', this.model.f_sign_path)
416
390
  let prop = 'f_sign_path'
417
391
  let idx = 'aofeng'
@@ -429,7 +403,7 @@ export default {
429
403
  callback: 'javascript:HostApp.__callback__("' + prop + '", "%s");'
430
404
  })
431
405
  },
432
- delfile (prop, fileName, index) {
406
+ delfile(prop, fileName, index) {
433
407
  if (fileName == Vue.nopic)
434
408
  return
435
409
  else {
@@ -443,13 +417,12 @@ export default {
443
417
  }
444
418
  },
445
419
  // 初始化数据
446
- initializtion () {
447
- if (this.data.title == '现场勘查' || this.data.title == '现场勘查定价') {
420
+ initializtion() {
421
+
422
+ if (this.data.title == '安装通气') {
448
423
  this.isshow = false
449
424
  }
450
425
  console.log("5555555555555")
451
- console.log("f_apply_num",this.data.f_apply_num)
452
- console.log("f_filiale",this.data.f_filiale)
453
426
  console.log(this.data.f_user_type)
454
427
  console.log(this.isshow)
455
428
  Vue.nopic = 'file:///android_asset/nopic.png'
@@ -458,15 +431,16 @@ export default {
458
431
  console.log('!this.model.f_overall_imgs==>' + !this.model.f_overall_imgs)
459
432
  if (!this.model.f_overall_imgs) {
460
433
  let imgs = []
434
+ // imgs.push({f_overall_path:Vue.nopic})
461
435
  this.$set('model.f_overall_imgs', imgs)
462
436
  console.log('进入setmodel.f_overall_imgs')
463
437
  }
464
438
  console.log('进入serviceview的initializtion方法')
465
439
  console.log(JSON.stringify(this.data))
466
- if(this.data.onetomany){
467
- console.log(JSON.stringify(this.data.onetomany))
468
- this.onetomany = this.data.onetomany
469
- }
440
+ // let temp = this.data
441
+ // let temp = JSON.parse()
442
+ // this.data = temp
443
+ // datepicker 没有值给当时值
470
444
  if (this.data.fields) {
471
445
  for (let i = 0; i < this.data.fields.length; i++) {
472
446
  if (this.data.fields[i].value) {
@@ -479,15 +453,6 @@ export default {
479
453
  if (this.data.fields[i].type === 'datepicker' && !this.data.fields[i].value) {
480
454
  this.data.fields[i].value = new Date().Format("yyyy-MM-dd HH:mm:ss")
481
455
  }
482
- if(this.data.f_user_type ==='非民用'){
483
- this.data.fields[i].required = false
484
- }
485
- if (this.data.fields[i].label==='气价名称'){
486
- this.data.fields[i].options=Vue.prototype.$qijia
487
- }
488
- if (this.data.fields[i].label==='气表品牌'){
489
- this.data.fields[i].options=Vue.prototype.$pinpai
490
- }
491
456
  }
492
457
  }
493
458
 
@@ -517,7 +482,7 @@ export default {
517
482
  }
518
483
  },
519
484
  // 模态框点击确定按钮
520
- acknowledge () {
485
+ acknowledge() {
521
486
  for (let i = 0; i < this.data.buttons[this.model.button.button_index].button_fields.length; i++) {
522
487
  this.model.button.button_fields[this.data.buttons[this.model.button.button_index].button_fields[i].field] = this.data.buttons[this.model.button.button_index].button_fields[i].value
523
488
  }
@@ -525,39 +490,17 @@ export default {
525
490
  this.$dispatch('button', this.model)
526
491
  },
527
492
  // 关闭模态框
528
- closemodal () {
493
+ closemodal() {
529
494
  this.showmodal = false
530
495
  },
531
- watchmoney (val1, val2) {
496
+ watchmoney(val1, val2) {
532
497
  console.log("监听改变的值")
533
498
  console.log(val1)
534
499
  console.log(val2)
535
500
  },
536
501
  // 点击按钮
537
- clicked (index, button) {
502
+ clicked(index, button) {
538
503
  console.log(`点击了按钮index:${index}+button:${JSON.stringify(button)}`);
539
- if (button.button_name=='提交') {
540
- if (!this.model.f_overall_imgs || this.model.f_overall_imgs.length == 0){
541
- this.$showMessage("必须有现场照片")
542
- return;
543
- }
544
- if(Vue.nopic==this.model.f_sign_path){
545
- this.$showMessage("必须有签名照片")
546
- return;
547
- }
548
- this.model.f_overall_imgs.push({
549
- f_overall_path: this.model.f_sign_path,
550
- f_overall_name: this.data.title
551
- })
552
- }
553
-
554
-
555
- // if ((this.data.title == '现场勘查' || this.data.title == '现场勘查定价') && button.button_name=='提交') {
556
- // if (!this.model.f_overall_imgs || this.model.f_overall_imgs.length == 0){
557
- // this.$showMessage("必须有现场照片")
558
- // return;
559
- // }
560
- // }
561
504
  if (this.kchege == 'true') {
562
505
  console.log(this.model.f_hege)
563
506
  if (this.model.f_hege != 'true') {
@@ -609,22 +552,16 @@ export default {
609
552
  }
610
553
  },
611
554
  // 级联操作预留
612
- select_change (index) {
555
+ select_change(index) {
613
556
  this.$dispatch('select_cascade', index)
614
557
  },
615
558
  // 检测按钮的disable
616
- disabled_check (index, required, value) {
559
+ disabled_check(index, required, value) {
617
560
  console.log("被检测到的值是什么")
618
561
  console.log(index)
619
562
  console.log(required)
620
563
  console.log(value)
621
564
  console.log(this.data.title)
622
- if (this.data.fields[index].label=='气表品牌'){
623
- console.log("进入改变气表型号")
624
- const pinpai = Vue.prototype.$pinpai.filter(res=>res.value===value);
625
- const arr = Vue.prototype.$xinghao.filter(res=>res.id==pinpai[0].id)
626
- this.$set(`data.fields[${index+1}].options`,arr)
627
- }
628
565
  if (this.data.title == '现场勘查') {
629
566
  if (index == 4) {
630
567
  if (value == '合格') {
@@ -639,19 +576,19 @@ export default {
639
576
  }
640
577
  }
641
578
  if (this.data.title == '现场勘查定价') {
642
- // if (index == 6 || index == 7 || index == 5) {
643
- // this.countmoney[index - 5] = parseInt(this.data.fields[index].value)
644
- // console.log(this.data.fields[index].value)
645
- // console.log("做出了改变")
646
- // }
647
- // console.log(JSON.stringify(this.countmoney))
648
- // let money = 0
649
- // for (let i = 0; i < this.countmoney.length; i++) {
650
- // money += this.countmoney[i]
651
- // }
652
- // this.$set('data.fields[8].value', money)
653
- // this.$set('data.fields[9].value', money)
654
- if (index == 7) {
579
+ if (index == 6 || index == 7 || index == 5) {
580
+ this.countmoney[index - 5] = parseInt(this.data.fields[index].value)
581
+ console.log(this.data.fields[index].value)
582
+ console.log("做出了改变")
583
+ }
584
+ console.log(JSON.stringify(this.countmoney))
585
+ let money = 0
586
+ for (let i = 0; i < this.countmoney.length; i++) {
587
+ money += this.countmoney[i]
588
+ }
589
+ this.$set('data.fields[8].value', money)
590
+ this.$set('data.fields[9].value', money)
591
+ if (index == 10) {
655
592
  console.log("1111111111" + value)
656
593
  if (value == '合格') {
657
594
  this.kchege = true
@@ -676,19 +613,7 @@ export default {
676
613
  }
677
614
  this.disable_button = flag
678
615
  }
679
- },
680
- checkboxSelect (index,index1){
681
- console.log("chufa事件");
682
- this.$dispatch('checkboxSelectControl', index, index1)
683
- },
684
- // 强制刷新
685
- update (){
686
- this.refresh = false
687
- this.$nextTick(() => {
688
- this.refresh = true
689
- })
690
- this.initializtion()
691
- },
616
+ }
692
617
  },
693
618
  watch: {
694
619
  'data.filed[12].value'(val) {
@@ -697,7 +622,7 @@ export default {
697
622
 
698
623
  }
699
624
  },
700
- 'data.operate_date' () {
625
+ 'data.operate_date'() {
701
626
  if (this.data.filiale) {
702
627
  this.model.f_filiale = this.data.filiale
703
628
  } else {
@@ -719,13 +644,6 @@ export default {
719
644
  this.model.f_operator = Vue.user.name
720
645
  }
721
646
  },
722
- 'data.fields' () {
723
- this.refresh = false
724
- this.$nextTick(() => {
725
- this.refresh = true
726
- })
727
- this.initializtion()
728
- },
729
647
  deep: true
730
648
  },
731
649
  computed: {
@@ -13,7 +13,6 @@
13
13
 
14
14
  let http = new HttpResetClass()
15
15
  let param = {
16
- f_process_id:self.data.f_process_id,
17
16
  f_bill_user: self.$login.f.name, // 票据使用人
18
17
  f_bill_type: self.data.f_bill_type, // 票据类型
19
18
  f_filialeids: self.$login.f.f_orgids, //所属分公司
@@ -38,23 +37,17 @@
38
37
  }
39
38
  },
40
39
  props: ['data','show'],
41
- async ready () {
42
- /*debugger
40
+ ready () {
41
+
43
42
  console.log(this.data.f_bill_type)
44
43
  if (this.data.f_bill_type) {
45
- await getCurrentBill(this)
46
- console.log('打印参数',this.data.f_process_id)
44
+ getCurrentBill(this)
47
45
 
48
- }*/
46
+ }
49
47
  },
50
48
  watch : {
51
- data:{
52
- deep:true,
53
- immediate:true,
54
- async handler(){
55
- console.log('1111155555')
56
- await getCurrentBill(this)
57
- }
49
+ 'show' (val) {
50
+ getCurrentBill(this)
58
51
  }
59
52
  }
60
53
  }
@@ -1,6 +1,6 @@
1
1
  <template>
2
2
  <div class="auto form-horizontal" >
3
- <modal :show.sync="show" v-if="show" v-ref:modal large backdrop="false">
3
+ <modal :show.sync="show" v-ref:modal large backdrop="false">
4
4
  <header slot="modal-header" class="modal-header">
5
5
  <h3 style="color:black" class="modal-title" >{{billConfig.billtype}}</h3>
6
6
  <button type="button" class="close" @click="closebuyerinfo"><span>&times;</span></button>
@@ -11,8 +11,8 @@
11
11
  <!-- </div>-->
12
12
  <validator name='v'>
13
13
  <form class="form-horizontal select-overspread">
14
- <div class="row" style="display: flex;justify-content: center;" id='normal-bill_xx' v-if="bill.data" v-html="bill.data">
15
-
14
+ <div class="row" style="display: flex;justify-content: center;" id='normal-bill' v-if="bill.data">
15
+ {{{bill.data}}}
16
16
  </div>
17
17
  </form>
18
18
  </validator>
@@ -24,7 +24,7 @@
24
24
  </div>
25
25
  </div>
26
26
  <button type="button" class="btn btn-success" @click='print()'>打印</button>
27
- <report-print :id="'normal-bill_xx'" top='15mm' left='5mm' width='90%' height='70%' :notrepeat="false" :showbtn="false" v-ref:reportprint></report-print>
27
+ <report-print id='normal-bill' top='15mm' left='5mm' width='90%' height='70%' :notrepeat="false" :showbtn="false" v-ref:reportprint></report-print>
28
28
  <button type="button" class="btn btn-default" @click='cancel()' v-if="!billConfig.hasBillManage">取消</button>
29
29
  </footer>
30
30
  </modal>
@@ -35,7 +35,6 @@
35
35
  import Vue from "vue";
36
36
 
37
37
  let getBillData = async function(self, val) {
38
- debugger
39
38
  self.bill = new DataModel(self.billData.url, {reprint: "'正常'"})
40
39
  await self.bill.search(self.data.chargeid)
41
40
  // self.bill.condition=
@@ -51,11 +50,11 @@
51
50
  model: {
52
51
  f_using_number: null
53
52
  },
54
- bill: {data:''},
53
+ bill: {},
55
54
  messShow: false
56
55
  }
57
56
  },
58
- props: ['show', 'data', 'billData', 'billConfig','titleName','billDataantai'],
57
+ props: ['show', 'data', 'billData', 'billConfig','titleName'],
59
58
  ready () {
60
59
  console.log('打票!!!!!!!!!!!!!!!!!')
61
60
 
@@ -181,7 +181,7 @@
181
181
  <nobr>{{row.f_install_num}}</nobr>
182
182
  </td>
183
183
  <td style="text-align: center;">
184
- <dropdown>
184
+ <dropdown v-if="row.defname != '完工'">
185
185
  <button type="button" data-toggle="dropdown" style="border: 0px;background: none;">
186
186
  <span class="glyphicon glyphicon-th-list" style="position: inherit;"></span>
187
187
  </button>
@@ -217,8 +217,7 @@
217
217
  model: new PagedList('rs/sql/checkuserfunction', 20, {
218
218
  data: {
219
219
  id: this.$login.f.id,
220
- fengongsi: this.$login.f.f_fengongsi,
221
- f_product_id: 0
220
+ fengongsi: this.$login.f.f_fengongsi
222
221
  }
223
222
  }),
224
223
  condition: ''
@@ -20,8 +20,6 @@
20
20
  <stop-install :stopapply="selectdata" v-if="showstop"></stop-install>
21
21
  <!-- 领料记录 -->
22
22
  <material_recording :infee="selectdata" v-if="show_material"></material_recording>
23
- <!-- APP附件 -->
24
- <apply-upload :appupload="selectdata" v-if="show_upload"></apply-upload>
25
23
  </div>
26
24
  </template>
27
25
  <script>
@@ -44,8 +42,7 @@
44
42
  showstop: false, // 终止报建
45
43
  showbill: false, // 打印票据
46
44
  showpreparation: false, // 预付款
47
- show_material:false,//报建材料
48
- show_upload: false //APP附件
45
+ show_material:false//报建材料
49
46
  }
50
47
  },
51
48
  methods: {
@@ -68,7 +65,6 @@
68
65
  this.showcontract = false
69
66
  this.showbill = false
70
67
  this.showpreparation = false
71
- this.show_upload = false
72
68
  },
73
69
  // 派工单
74
70
  receiveBatch(){
@@ -89,7 +85,6 @@
89
85
  this.showcontract = false
90
86
  this.showbill = false
91
87
  this.showpreparation = false
92
- this.show_upload = false
93
88
  },
94
89
  // 领料记录
95
90
  materialRecord(){
@@ -110,7 +105,6 @@
110
105
  this.showcontract = false
111
106
  this.showbill = false
112
107
  this.showpreparation = false
113
- this.show_upload = false
114
108
  },
115
109
  // 预付款
116
110
  preparation(){
@@ -131,7 +125,6 @@
131
125
  this.showcontract = false
132
126
  this.showbill = false
133
127
  this.showpreparation = true
134
- this.show_upload = false
135
128
  },
136
129
  // 票据打印
137
130
  bill(){
@@ -152,7 +145,6 @@
152
145
  this.showpreparation = false
153
146
  this.showbill = true
154
147
  this.show_material = false
155
- this.show_upload = false
156
148
  },
157
149
  // 补充合同
158
150
  contract() {
@@ -173,7 +165,6 @@
173
165
  this.showpreparation = false
174
166
  this.showcontract = true
175
167
  this.show_material = false
176
- this.show_upload = false
177
168
  },
178
169
  // 收费
179
170
  instalfee(str) {
@@ -194,7 +185,6 @@
194
185
  this.showprestorefee = false
195
186
  this.showinfee = false
196
187
  this.show_material = false
197
- this.show_upload = false
198
188
  // 采用开发商预付款方式收费
199
189
  if(str==='预付扣款'){
200
190
  this.showprestorefee = true
@@ -221,28 +211,6 @@
221
211
  this.showpreparation = false
222
212
  this.showstop = true
223
213
  this.show_material = false
224
- this.show_upload = false
225
- },
226
- // APP附件
227
- appUpload() {
228
- this.$parent.$refs.installselect.clifun(this.selectdata)
229
- // this.selectdata = row
230
- this.$parent.clishow= true
231
- this.$parent.show = false
232
-
233
- this.showreceivebatch = false
234
- this.showbuyer = false
235
- this.showview = false
236
- this.showbill = false
237
- this.showinfee = false
238
- this.showprestorefee = false
239
- this.showupfee = false
240
- this.showreducefee = false
241
- this.showcontract = false
242
- this.showpreparation = false
243
- this.showstop = false
244
- this.show_material = false
245
- this.show_upload = true
246
214
  },
247
215
 
248
216
 
@@ -282,7 +250,6 @@
282
250
  this.showreceivebatch = false
283
251
  this.showbuyer = false
284
252
  this.show_material = false
285
- this.show_upload = false
286
253
  }else{
287
254
  if(this.funcdata.title==='终止报建'){
288
255
  this.stopInstall()
@@ -311,9 +278,6 @@
311
278
  if(this.funcdata.title==='派工单'){
312
279
  this.receiveBatch()
313
280
  }
314
- if(this.funcdata.title==='APP附件'){
315
- this.appUpload()
316
- }
317
281
  }
318
282
  }
319
283
  },
@@ -162,7 +162,7 @@
162
162
  bootstraped: "col-sm-4",
163
163
  label_bootstraped: "col-sm-3",
164
164
  value_bootstraped: "col-sm-9",
165
- field: "f_user_name",
165
+ field: "f_buyer_name",
166
166
  placeholder: "请输入",
167
167
  required: true,
168
168
  readonly: false