apply-clients 3.0.4 → 3.0.5-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 (64) hide show
  1. package/dist.zip +0 -0
  2. package/index.html +1 -1
  3. package/package.json +4 -3
  4. package/src/App.vue +126 -15
  5. package/src/apply.js +16 -0
  6. package/src/bootstrap/fonts/PingFangSC-Regular.ttf +0 -0
  7. package/src/bootstrap/less/bootstrap.less +1 -2
  8. package/src/bootstrap/less/standard.less +208 -0
  9. package/src/components/Util.js +4 -0
  10. package/src/components/app_apply/FieldExploration.vue +2 -2
  11. package/src/components/app_apply/Ventilation.vue +2 -2
  12. package/src/components/image/doc.jpg +0 -0
  13. package/src/components/image/excel.jpg +0 -0
  14. package/src/components/image/pdf.jpg +0 -0
  15. package/src/components/image//345/233/276/345/261/20212.png +0 -0
  16. package/src/components/image//345/233/276/345/261/20213.png +0 -0
  17. package/src/components/image//345/233/276/345/261/20216.png +0 -0
  18. package/src/components/image//345/244/232/350/276/271/345/275/2422.png +0 -0
  19. package/src/components/image//345/244/232/350/276/271/345/275/2422/346/213/267/350/264/235.png +0 -0
  20. package/src/components/image//346/244/255/345/234/2062.png +0 -0
  21. package/src/components/image//346/244/255/345/234/2065.png +0 -0
  22. package/src/components/image//346/244/255/345/234/2065/346/213/267/350/264/235.png +0 -0
  23. package/src/components/image//346/244/255/345/234/2065/346/213/267/350/264/2352.png +0 -0
  24. package/src/components/image//346/244/255/345/234/2065/346/213/267/350/264/2353.png +0 -0
  25. package/src/components/image//347/273/2044.png +0 -0
  26. package/src/components/image//347/273/2045.png +0 -0
  27. package/src/components/image//347/273/2046.png +0 -0
  28. package/src/components/image//350/257/235/345/212/241/347/273/237/350/256/241/346/225/260/346/215/256/345/261/225/347/244/272.png +0 -0
  29. package/src/components/product/Function/InstallFunction.vue +9 -5
  30. package/src/components/product/Function/InstallInfoSelect.vue +98 -69
  31. package/src/components/product/Function/Service/FunctionServiceControl.vue +47 -4
  32. package/src/components/product/Function/functions/AddContract.vue +161 -139
  33. package/src/components/product/Function/functions/BuyerMessage.vue +285 -137
  34. package/src/components/product/Function/functions/InstallFee.vue +1117 -912
  35. package/src/components/product/MaterialBatchList.vue +109 -0
  36. package/src/components/product/MaterialBatchManage.vue +34 -0
  37. package/src/components/product/Procedures/ProceduresDataGrid.vue +1022 -0
  38. package/src/components/product/Process/ExplorationSelect.vue +208 -73
  39. package/src/components/product/Process/ExplorationUser.vue +94 -39
  40. package/src/components/product/Process/MaterialUseList.vue +159 -0
  41. package/src/components/product/Process/ModifyUserFiles.vue +15 -5
  42. package/src/components/product/Process/ProcessInfo/history_control.vue +139 -110
  43. package/src/components/product/Process/Processes/ApplyUpload.vue +279 -0
  44. package/src/components/product/Process/Processes/CustomerMaterialMessage.vue +499 -210
  45. package/src/components/product/Process/Processes/CustomerRecordMessage.vue +949 -753
  46. package/src/components/product/Process/Processes/ProjectSettlement.vue +535 -24
  47. package/src/components/product/Process/Processes/ReceiveBatch.vue +301 -121
  48. package/src/components/product/Process/Processes/Service/ApplyChangeHistory.vue +105 -0
  49. package/src/components/product/Process/Processes/Service/ApplyChargeSearch.vue +27 -14
  50. package/src/components/product/Process/Processes/Service/ServiceControl.vue +1727 -336
  51. package/src/components/product/Process/Processes/Upload.vue +532 -0
  52. package/src/components/product/Process/ShowBackReason.vue +1 -1
  53. package/src/components/product/ServiceView.vue +359 -122
  54. package/src/components/product/Statistics/ApplyStatisticsROOT.vue +27 -0
  55. package/src/components/product/Supervisory/Service/SupervisoryServiceControl.vue +212 -23
  56. package/src/components/product/Supervisory/SupervisoryControl.vue +79 -26
  57. package/src/components/product/Supervisory/SupervisoryList.vue +182 -41
  58. package/src/components/product/Supervisory/SupervisoryhCart.vue +4 -2
  59. package/src/components/product/VueUtils/Tree.vue +330 -0
  60. package/src/components/product/VueUtils/rightview/InstallCardList2.vue +29 -38
  61. package/src/stores/ApplyLoadParams.js +1 -1
  62. package/src/stores/PagedListLogic.js +173 -0
  63. package/.npmignore +0 -12
  64. package/yarn.lock +0 -9008
@@ -1,5 +1,5 @@
1
1
  <template>
2
- <div class="flex" style="height: auto;">
2
+ <div class="flex col-sm-12" style="height: auto;margin-top: 15px;min-height: 200px">
3
3
  <div class="form-inline auto" style="margin-bottom: 5px;"style="height: auto;">
4
4
  <form novalidate class="" partial>
5
5
  <div class="col-sm-10">
@@ -40,12 +40,12 @@
40
40
  </center>
41
41
  </div>
42
42
  <!--<div class="col-sm-1">-->
43
- <!--<center>-->
43
+ <!--<center>-->
44
44
 
45
- <!--<div class="col-sm-12 pull-right">-->
46
- <!--<button type="button" class="btn btn-warning add-postition" @click="impexcel()" v-show="edit">导入</button>-->
47
- <!--</div>-->
48
- <!--</center>-->
45
+ <!--<div class="col-sm-12 pull-right">-->
46
+ <!--<button type="button" class="btn btn-warning add-postition" @click="impexcel()" v-show="edit">导入</button>-->
47
+ <!--</div>-->
48
+ <!--</center>-->
49
49
  <!--</div>-->
50
50
  </div>
51
51
  </form>
@@ -77,15 +77,16 @@
77
77
  <td @click="$parent.$parent.$parent.showdetail(row.id,$index,row.f_effective_state)">{{row.f_material_operator}}</td>
78
78
  <td @click="$parent.$parent.$parent.showdetail(row.id,$index,row.f_effective_state)">{{row.f_batch_importdate}}</td>
79
79
  <td >
80
- <button class="btn btn-link" @click="$parent.$parent.$parent.showReceiptSheet(row.id)">打印</button>
80
+ <!--<button class="btn btn-link" v-if="showprint" @click="$parent.$parent.$parent.showReceiptSheet(row.id)">打印</button>-->
81
+ <button class="btn btn-link" v-if="$parent.$parent.$parent.showprint" @click="$parent.$parent.$parent.stamp(row.id,$index,row.f_effective_state)">打印</button>
81
82
  </td>
82
83
  <!--<td>{{row.f_remarks}}</td>-->
83
84
  <!--<td v-show="edit"><input type="checkbox" v-model="row.f_pay" @click="$parent.$parent.$parent.paychange(row)"/></td>-->
84
85
  <!--<td class="flex-around">-->
85
- <!--<button type="button" name="button" class="btn btn-link"-->
86
- <!--@click.stop="$parent.$parent.$parent.tovoid(row)">作废-->
87
- <!--</button>-->
88
- <!---->
86
+ <!--<button type="button" name="button" class="btn btn-link"-->
87
+ <!--@click.stop="$parent.$parent.$parent.tovoid(row)">作废-->
88
+ <!--</button>-->
89
+ <!---->
89
90
  <!--</td>-->
90
91
  </template>
91
92
  </data-grid>
@@ -102,14 +103,19 @@
102
103
 
103
104
 
104
105
 
105
- <div class="col-sm-12 span recordTable " style="margin-top: 10px;height:auto;" v-if="isShowdetail" >
106
- <p>材料清单
107
- <button type="button" class="close" @click="isShowdetail=false" aria-hidden="true">&times;</button>
108
- </p>
109
- <partial-view v-ref:single-load>
110
- <data-grid :model="batchmodel" v-ref:batchgrid>
111
- <template partial='head'>
112
- <tr>
106
+ <!--<div class="col-sm-12 span recordTable " style="margin-top: 10px;height:auto;" v-if="isShowdetail" >-->
107
+ <!--<p>材料清单-->
108
+ <!--<button type="button" class="close" @click="isShowdetail=false" aria-hidden="true">&times;</button>-->
109
+ <!--</p>-->
110
+ <!--<partial-view v-ref:single-load>-->
111
+ <!--<data-grid :model="batchmodel" v-ref:batchgrid>-->
112
+ <!--<template partial='head'>-->
113
+
114
+ <div class="col-sm-12" v-if="isShowdetail">
115
+ <h5 style="text-align: center;color: darkcyan;">
116
+ 材料清单</h5>
117
+ <table class="table table-bordered table-striped table-hover">
118
+ <tr style="background-color:#88C78E">
113
119
  <th>序号</th>
114
120
  <th>材料名称</th>
115
121
  <th>材料类型</th>
@@ -119,53 +125,30 @@
119
125
  <th>累计领取数量</th>
120
126
  <th>剩余数量</th>
121
127
  <th>材料单位</th>
122
- <th >领取</th>
128
+ <!--<th ><button type="button" @click="$parent.$parent.$parent.lowerhair()" class="btn btn-warning add-postition" style="width:80px; margin-left:40px;">-->
129
+ <!--领取材料-->
130
+ <!--</button> </th>-->
123
131
  <!--<th >操作</th>-->
124
132
  </tr>
125
- </template>
126
- <template partial='body'style="min-height: 100px;max-height:200px;">
127
- <td>{{$index+1}}</td>
128
- <td>{{row.f_batch_name}}</td>
129
- <td>{{row.f_batch_type}}</td>
130
- <td>{{row.f_batch_code}}</td>
131
- <td>{{row.f_batch_norms}}</td>
132
- <td>{{row.f_budget_num}}</td>
133
- <td>{{row.f_add_receive}}</td>
134
- <td>{{row.f_surplus_num}}</td>
135
- <td>{{row.f_batch_company}}</td>
136
- <!--<td>{{row.f_remarks}}</td>-->
137
- <!--<td v-show="edit"><input type="checkbox" v-model="row.f_pay" @click="$parent.$parent.$parent.paychange(row)"/></td>-->
138
- <td><input type="text" class="form-control" v-model="row.f_receive_num"/></td>
139
- <!--<td class="flex-around">-->
140
- <!--<button type="button" name="button" class="btn btn-link"-->
141
- <!--@click.stop="$parent.$parent.$parent.receiveBatch(row)">领取-->
142
- <!--</button>-->
143
- <!---->
144
- <!--</td>-->
145
- </template>
146
- </data-grid>
147
-
148
- </partial-view>
133
+ <tr v-for="(j,row) in batchmodel.rows">
134
+ <td>{{$index+1}}</td>
135
+ <td>{{row.f_batch_name}}</td>
136
+ <td>{{row.f_batch_type}}</td>
137
+ <td>{{row.f_batch_code}}</td>
138
+ <td>{{row.f_batch_norms}}</td>
139
+ <td>{{row.f_budget_num}}</td>
140
+ <td>{{row.f_add_receive}}</td>
141
+ <td>{{row.f_surplus_num}}</td>
142
+ <td>{{row.f_batch_company}}</td>
143
+ <!--<td>{{row.f_remarks}}</td>-->
144
+ <!--<td v-show="edit"><input type="checkbox" v-model="row.f_pay" @click="$parent.$parent.$parent.paychange(row)"/></td>-->
145
+ <td><input type="hidden" class="form-control" v-model="row.f_receive_num" :readonly="!showprint"/></td>
146
+ </tr>
147
+ </table>
149
148
  </div>
150
149
 
151
150
 
152
151
 
153
- <div class="from-group col-sm-11" v-show="edit">
154
- <center>
155
- <!-- <button type="button" @click="confirm()" class="btn btn-primary" style="width:80px; margin-left:40px;" >
156
- 保存
157
- </button>-->
158
- <button type="button" @click="commit()" class="btn btn-primary" style="width:80px; margin-left:40px;">
159
- 提交
160
- </button>
161
- <button type="button" @click="lowerhair()" class="btn btn-primary" style="width:80px; margin-left:40px;">
162
- 下发
163
- </button>
164
- <button type="button" @click="reset()" class="btn btn-warning" style="width:80px; margin-left:40px;">
165
- 取消
166
- </button>
167
- </center>
168
- </div>
169
152
  </div>
170
153
 
171
154
  <modal :show.sync="show" v-ref:modal backdrop="false">
@@ -265,12 +248,12 @@
265
248
  <data-grid :model="receiptSheetData" v-ref:grid1 partial='list'>
266
249
  <template partial='head'>
267
250
  <tr>
268
- <th><nobr>序号</nobr></th>
269
- <th><nobr>流程编号</nobr></th>
270
- <th><nobr>操作部门</nobr></th>
271
- <th><nobr>领料批次操作人</nobr></th>
272
- <th><nobr>领料时间</nobr></th>
273
- <th><nobr>操作</nobr></th>
251
+ <th><font color="white"><nobr>序号</nobr></font></th>
252
+ <th><font color="white"><nobr>流程编号</nobr></font></th>
253
+ <th><font color="white"><nobr>操作部门</nobr></font></th>
254
+ <th><font color="white"><nobr>领料批次操作人</nobr></font></th>
255
+ <th><font color="white"><nobr>领料时间</nobr></font></th>
256
+ <th><font color="white"><nobr>操作</nobr></font></th>
274
257
  </tr>
275
258
  </template>
276
259
  <template partial='body'>
@@ -338,8 +321,8 @@
338
321
  }else{
339
322
  self.$showMessage('作废后不可恢复,确认删除吗?', ['confirm', 'cancel']).then((res) => {
340
323
  if (res === 'confirm') {
341
- self.$resetpost('rs/logic/tovoidbatch',{id: row.id}).then((res) => {
342
- getInfo(self,0,0)
324
+ self.$resetpost('rs/logic/tovoidbatch',{id: row.id}).then(async (res) => {
325
+ await getInfo(self,0,0)
343
326
  })
344
327
  }
345
328
  })
@@ -401,7 +384,21 @@
401
384
  }
402
385
  export default {
403
386
  title: '材料信息',
404
- props: ['selectdata','edit'],
387
+ props: {
388
+ selectdata: {
389
+ type: Object
390
+ },
391
+ edit: {
392
+ type: Boolean
393
+ },
394
+ state: {
395
+ type: Number
396
+ },
397
+ showprint: {
398
+ type: Boolean,
399
+ default: true
400
+ }
401
+ },
405
402
  data() {
406
403
  return {
407
404
  fmaterialtype: [],
@@ -447,9 +444,10 @@
447
444
  f_sheet_operator: '' ,// 打印显示的领料人
448
445
  pgd:'',
449
446
  bill: '' // 票数据
450
- }
447
+ }
451
448
  },
452
449
  async ready() {
450
+ this.isShowdetail = false
453
451
  this.load()
454
452
  getInfo(this,0,0)
455
453
  },
@@ -458,7 +456,9 @@
458
456
  this.$dispatch('get-pgd', this.pgd)
459
457
  },
460
458
  'selectdata.f_process_id'() {
459
+ this.isShowdetail=false
461
460
  this.headers.blodid = this.selectdata.f_process_id
461
+ this.load()
462
462
  getInfo(this,0,0)
463
463
  },
464
464
  deep:true
@@ -534,6 +534,171 @@
534
534
  }
535
535
  },
536
536
  methods: {
537
+ async stamp(id,index,f_effective_state){
538
+ console.log("id",id)
539
+ // 点击后显示详情
540
+ // await this.showdetail(id,index,f_effective_state)
541
+ let val = id
542
+ if (f_effective_state === '无效'){
543
+ this.pgd =''
544
+ this.isShowdetail=false
545
+ }else {
546
+ this.pgd = this.selectdata.f_contract_number+'-C'+val
547
+ console.log(val)
548
+ this.isShowdetail=true
549
+ await getInfo(this,1,val)
550
+ this.batchindex=index
551
+ }
552
+ // 点击领料按钮
553
+ // await this.lowerhair()
554
+ console.log('领取了')
555
+ let greater=true//判断领取数量不能大于剩余数量
556
+ let isPicking=true
557
+ if (this.batchmodel.rows.length<=0){
558
+ this.$showMessage('请选择具体批次进行领料!')
559
+ }else{
560
+ for (var i = 0; i < this.batchmodel.rows.length; i++) {
561
+ // console.log('第'+i+'条的值为:'+this.batchmodel.rows[i].f_receive_num)
562
+ if(!this.batchmodel.rows[i].f_receive_num||this.batchmodel.rows[i].f_receive_num<=0){
563
+ this.batchmodel.rows[i].f_receive_num=this.batchmodel.rows[i].f_surplus_num
564
+ }
565
+
566
+ if (this.batchmodel.rows[i].f_surplus_num<this.batchmodel.rows[i].f_receive_num) {
567
+ greater=false
568
+ this.$showMessage('领取数量不能大于剩余数量')
569
+ break
570
+ }
571
+ if(this.batchmodel.rows[i].f_surplus_num == 0 && this.batchmodel.rows[i].f_add_receive !=0) {
572
+ greater=false
573
+ this.$showAlert(this.batchmodel.rows[i].f_batch_type+' 已全部领取。', 'info', 2000)
574
+ }
575
+ this.batchmodel.rows[i].f_receipt_num=Number(this.batchmodel.rows[i].f_receive_num)
576
+ this.batchmodel.rows[i].f_detail_operator=this.$login.f.name
577
+ this.batchmodel.rows[i].f_add_receive=this.accAdd(Number(this.batchmodel.rows[i].f_add_receive),Number(this.batchmodel.rows[i].f_receive_num))
578
+ if (this.batchmodel.rows[i].f_budget_num<this.batchmodel.rows[i].f_add_receive) {
579
+ this.batchmodel.rows[i].f_surplus_num=0
580
+ }else{
581
+ this.batchmodel.rows[i].f_surplus_num=this.accSub(Number(this.batchmodel.rows[i].f_budget_num),Number(this.batchmodel.rows[i].f_add_receive))
582
+ }
583
+ this.batchmodel.rows[i].f_receive_num= this.batchmodel.rows[i].f_surplus_num
584
+
585
+ if ( this.batchmodel.rows[i].f_surplus_num !=0){
586
+ isPicking=false
587
+ }
588
+
589
+ }
590
+ if (isPicking) {
591
+ this.model.rows[this.batchindex].f_picking_state='已领完'
592
+ }
593
+
594
+ let http3 = new HttpResetClass()
595
+ let data3 = {
596
+ tablename: 't_receipt_sheet',
597
+ condition: `f_apply_num = '${this.selectdata.f_apply_num}'`
598
+ }
599
+ let res3 = await http3.load('POST','rs/sql/singleTable', {data:data3},{resolveMsg: '查询成功', rejectMsg: '查询失败'})
600
+ if(res3.data.length==0){
601
+ let data = {
602
+ f_batch_id:this.model.rows[this.batchindex].id,
603
+ f_apply_num:this.model.rows[this.batchindex].f_apply_num,
604
+ processid:this.model.rows[this.batchindex].processid,
605
+ f_filiale:this.model.rows[this.batchindex].f_filiale,
606
+ f_parentname:this.model.rows[this.batchindex].f_parentname,
607
+ f_sheet_operator:this.$login.f.name,
608
+ f_picking_state:this.model.rows[this.batchindex].f_picking_state,
609
+ batchmodel:this.batchmodel.rows
610
+ }
611
+ await this.$resetpost('rs/logic/receipt_batch', data,{resolveMsg: '领取成功', rejectMsg: '领取失败'}).then((res) => {
612
+ if (!this.state){
613
+ this.printReceiptSheet(data.f_batch_id)
614
+ }
615
+ getInfo(this,0,0)
616
+
617
+ })
618
+ }else if (greater){
619
+ let data = {
620
+ f_batch_id:this.model.rows[this.batchindex].id,
621
+ f_apply_num:this.model.rows[this.batchindex].f_apply_num,
622
+ processid:this.model.rows[this.batchindex].processid,
623
+ f_filiale:this.model.rows[this.batchindex].f_filiale,
624
+ f_parentname:this.model.rows[this.batchindex].f_parentname,
625
+ f_sheet_operator:this.$login.f.name,
626
+ f_picking_state:this.model.rows[this.batchindex].f_picking_state,
627
+ batchmodel:this.batchmodel.rows
628
+ }
629
+ await this.$resetpost('rs/logic/receipt_batch', data,{resolveMsg: '领取成功', rejectMsg: '领取失败'}).then((res) => {
630
+ if (!this.state){
631
+ this.printReceiptSheet(data.f_batch_id)
632
+ }
633
+ getInfo(this,0,0)
634
+
635
+ })
636
+
637
+ }
638
+
639
+ }
640
+
641
+ // 点击原打印按钮
642
+ // this.showReceiptSheet(id)
643
+
644
+
645
+
646
+ // 显示该材料批次下的领料批次
647
+ let data = {
648
+ tablename: 't_receipt_sheet',
649
+ condition: `f_batch_id = ${id}`
650
+ }
651
+ let res = await this.$resetpost('rs/sql/singleTable',{data: data}, {resolveMsg: null, rejectMsg: "获取领料记录失败!"})
652
+ if (!res.data.length) {
653
+ this.$showMessage('该材料批次下无领料明细')
654
+ return
655
+ }
656
+ this.receiptSheetData.rows = res.data
657
+ this.receiptSheetShow = true
658
+ // 打印第一个
659
+ // this.printReceiptDetail(this.receiptSheetData[0])
660
+ let row = this.receiptSheetData[0]
661
+ let printdata ={}
662
+ printdata = this.$parent.getmodel()
663
+ // this.$parent.$refs.service_show.getmodel()
664
+ printdata = Object.assign(this.selectdata,printdata)
665
+ for (var k in printdata) {
666
+ if (printdata[k] == null){
667
+ printdata[k] = ''
668
+ }
669
+ }
670
+ printdata.tablename = 't_receipt_detail'
671
+ printdata.condition = `f_sheet_id = ${row.id}`
672
+ if((printdata.f_work_startdate)||(printdata.f_finished_time)||(printdata.f_application_time)){
673
+ if(printdata.f_work_startdate.length>10){
674
+ printdata.f_work_startdate=printdata.f_work_startdate.substring(0,11)
675
+ }
676
+ if(printdata.f_application_time.length>10){
677
+ printdata.f_application_time = printdata.f_application_time.substring(0,11)
678
+ }
679
+ if(printdata.f_finished_time.length>10){
680
+ printdata.f_finished_time=printdata.f_finished_time.substring(0,11)
681
+ }
682
+ }
683
+ res = await this.$resetpost('rs/report/paigongdan',{data: printdata}, {resolveMsg: null, rejectMsg: "提取数据出错,请重试!"})
684
+ this.bill = res.data
685
+ this.$nextTick(()=>{
686
+ this.$refs.reportprint.print()
687
+ })
688
+ },
689
+ async printReceiptSheet(id) {
690
+ let data = {
691
+ tablename: 't_receipt_sheet',
692
+ condition: `id=(select max(id) from t_receipt_sheet where f_batch_id = ${id})`
693
+ }
694
+ await this.$resetpost('rs/sql/singleTable',{data: data}, {resolveMsg: null, rejectMsg: "获取领料记录失败!"}).then((res)=>{
695
+ if (res.data.length < 1) {
696
+ this.$showMessage('该材料批次下无领料明细')
697
+ return
698
+ }
699
+ this.printReceiptDetail(res.data[0])
700
+ })
701
+ },
537
702
  async showReceiptSheet (id) {
538
703
  // 显示该材料批次下的领料批次
539
704
  let data = {
@@ -554,35 +719,41 @@
554
719
  },
555
720
  // 打印领料批次下的领料明细
556
721
  async printReceiptDetail (row) {
557
- /*let data = {
558
- tablename: 't_receipt_detail',
559
- condition: `f_sheet_id = ${row.id}`
722
+ console.log("row:",row)
723
+ let printdata = {}
724
+ if(this.$parent.model){
725
+ printdata = this.$parent.getmodel()
560
726
  }
561
- let res = await this.$resetpost('rs/sql/singleTable',{data: data}, {resolveMsg: null, rejectMsg: "获取领料明细失败!"})
562
- if (!res.data.length) {
563
- this.$showMessage('该领料批次下无领料明细')
564
- return
565
- }
566
- this.f_apply_num = row.f_apply_num
567
- this.f_material_num = `${row.f_apply_num}-C${row.f_batch_id}`
568
- this.f_sheet_operator = row.f_sheet_operator
569
- this.receiptDetailData = res.data
570
- this.$nextTick(()=>{
571
- this.$refs.printreceipt.PrintTable()
572
- })*/
573
- // 将所有null转为空字符串
574
- let printdata = this.selectdata
727
+
728
+ // this.$parent.$refs.service_show.getmodel()
729
+ printdata = Object.assign(this.selectdata,printdata)
575
730
  for (var k in printdata) {
576
- if (printdata[k] == null){
577
- printdata[k] = ''
578
- }
731
+ if (printdata[k] == null){
732
+ printdata[k] = ''
733
+ }
734
+ }
735
+ // 派工单号的处理:
736
+ // 如果t_apply中没有则由生成
737
+ if((!printdata.f_dispatched_number)&&row.f_batch_id){
738
+ printdata.f_dispatched_number = this.selectdata.f_contract_number+'-C'+row.f_batch_id
579
739
  }
580
740
  printdata.tablename = 't_receipt_detail'
581
741
  printdata.condition = `f_sheet_id = ${row.id}`
742
+ if((printdata.f_work_startdate)||(printdata.f_finished_time)||(printdata.f_application_time)){
743
+ if(printdata.f_work_startdate.length>10){
744
+ printdata.f_work_startdate=printdata.f_work_startdate.substring(0,11)
745
+ }
746
+ if(printdata.f_application_time.length>10){
747
+ printdata.f_application_time = printdata.f_application_time.substring(0,11)
748
+ }
749
+ if(printdata.f_finished_time.length>10){
750
+ printdata.f_finished_time=printdata.f_finished_time.substring(0,11)
751
+ }
752
+ }
582
753
  let res = await this.$resetpost('rs/report/paigongdan',{data: printdata}, {resolveMsg: null, rejectMsg: "提取数据出错,请重试!"})
583
754
  this.bill = res.data
584
755
  this.$nextTick(()=>{
585
- this.$refs.reportprint.print()
756
+ this.$refs.reportprint.print()
586
757
  })
587
758
  },
588
759
  // 父组件更新子组件属性
@@ -590,16 +761,16 @@
590
761
  this.headers.blodid = val.f_process_id
591
762
  this.selectdata = val
592
763
  },
593
- showdetail(val,index,f_effective_state) {
764
+ async showdetail(val,index,f_effective_state) {
594
765
 
595
766
  if (f_effective_state === '无效'){
596
767
  this.pgd =''
597
- this.isShowdetail=false
768
+ this.isShowdetail=false
598
769
  }else {
599
770
  this.pgd = this.selectdata.f_contract_number+'-C'+val
600
771
  console.log(val)
601
772
  this.isShowdetail=true
602
- getInfo(this,1,val)
773
+ await getInfo(this,1,val)
603
774
  this.batchindex=index
604
775
  }
605
776
 
@@ -674,12 +845,19 @@
674
845
  }else{
675
846
  for (var i = 0; i < this.batchmodel.rows.length; i++) {
676
847
  // console.log('第'+i+'条的值为:'+this.batchmodel.rows[i].f_receive_num)
848
+ if(!this.batchmodel.rows[i].f_receive_num||this.batchmodel.rows[i].f_receive_num<=0){
849
+ this.batchmodel.rows[i].f_receive_num=this.batchmodel.rows[i].f_surplus_num
850
+ }
677
851
 
678
852
  if (this.batchmodel.rows[i].f_surplus_num<this.batchmodel.rows[i].f_receive_num) {
679
853
  greater=false
680
854
  this.$showMessage('领取数量不能大于剩余数量')
681
855
  break
682
856
  }
857
+ if(this.batchmodel.rows[i].f_surplus_num == 0 && this.batchmodel.rows[i].f_add_receive !=0) {
858
+ greater=false
859
+ this.$showAlert(this.batchmodel.rows[i].f_batch_type+' 已全部领取。', 'info', 2000)
860
+ }
683
861
  this.batchmodel.rows[i].f_receipt_num=Number(this.batchmodel.rows[i].f_receive_num)
684
862
  this.batchmodel.rows[i].f_detail_operator=this.$login.f.name
685
863
  this.batchmodel.rows[i].f_add_receive=this.accAdd(Number(this.batchmodel.rows[i].f_add_receive),Number(this.batchmodel.rows[i].f_receive_num))
@@ -700,40 +878,42 @@
700
878
  }
701
879
 
702
880
 
703
- if (greater){
704
- let data = {
705
- f_batch_id:this.model.rows[this.batchindex].id,
706
- f_apply_num:this.model.rows[this.batchindex].f_apply_num,
707
- processid:this.model.rows[this.batchindex].processid,
708
- f_filiale:this.model.rows[this.batchindex].f_filiale,
709
- f_parentname:this.model.rows[this.batchindex].f_parentname,
710
- f_sheet_operator:this.$login.f.name,
711
- f_picking_state:this.model.rows[this.batchindex].f_picking_state,
712
- batchmodel:this.batchmodel.rows
713
-
714
- }
715
- this.$resetpost('rs/logic/receipt_batch', data,{resolveMsg: '下发成功', rejectMsg: '下发失败'}).then((res) => {
716
- getInfo(this,0,0)
881
+ if (greater){
882
+ let data = {
883
+ f_batch_id:this.model.rows[this.batchindex].id,
884
+ f_apply_num:this.model.rows[this.batchindex].f_apply_num,
885
+ processid:this.model.rows[this.batchindex].processid,
886
+ f_filiale:this.model.rows[this.batchindex].f_filiale,
887
+ f_parentname:this.model.rows[this.batchindex].f_parentname,
888
+ f_sheet_operator:this.$login.f.name,
889
+ f_picking_state:this.model.rows[this.batchindex].f_picking_state,
890
+ batchmodel:this.batchmodel.rows
891
+ }
892
+ this.$resetpost('rs/logic/receipt_batch', data,{resolveMsg: '领取成功', rejectMsg: '领取失败'}).then((res) => {
893
+ if (!this.state){
894
+ this.printReceiptSheet(data.f_batch_id)
895
+ }
896
+ getInfo(this,0,0)
717
897
 
718
- })
898
+ })
719
899
 
720
- }
900
+ }
721
901
 
722
902
  }
723
903
 
724
904
 
725
905
  },
726
- accSub(arg1, arg2) {
727
- var r1, r2, m, n;
728
- try { r1 = arg1.toString().split(".")[1].length } catch (e) { r1 = 0 }
906
+ accSub(arg1, arg2) {
907
+ var r1, r2, m, n;
908
+ try { r1 = arg1.toString().split(".")[1].length } catch (e) { r1 = 0 }
729
909
  try { r2 = arg2.toString().split(".")[1].length } catch (e) { r2 = 0 }
730
- m = Math.pow(10, Math.max(r1, r2));
731
- //last modify by deeka
732
- //动态控制精度长度
733
- n = (r1 >= r2) ? r1 : r2;
910
+ m = Math.pow(10, Math.max(r1, r2));
911
+ //last modify by deeka
912
+ //动态控制精度长度
913
+ n = (r1 >= r2) ? r1 : r2;
734
914
  return ((arg1 * m - arg2 * m) / m).toFixed(n);
735
- },
736
- reset() {
915
+ },
916
+ reset() {
737
917
  this.$dispatch('close')
738
918
  this.$dispatch('selfsearch')
739
919
  },
@@ -790,6 +970,7 @@
790
970
 
791
971
  },
792
972
  filterParams(f_material_operator,f_effective_stated,f_picking_stated) {
973
+ this.isShowdetail = false
793
974
  if ((f_material_operator && f_material_operator !== "")||
794
975
  (f_picking_stated && f_picking_stated !== "")&&(f_effective_stated && f_effective_stated !== "")) {
795
976
  let temp = []
@@ -834,7 +1015,7 @@
834
1015
 
835
1016
  },
836
1017
  receiveBatch(row) {
837
- console.log(row.f_receive_num)
1018
+ console.log(row.f_receive_num)
838
1019
  },
839
1020
  // 缴费情况修改
840
1021
  paychange(row) {
@@ -952,7 +1133,6 @@
952
1133
  .recordTable table tr:hover {
953
1134
  background-color: rgb(230, 230, 230);
954
1135
  }
955
-
956
1136
  td {
957
1137
  text-align: center !important
958
1138
  }