webapp / GreenwayWeb

Commit ffe3ff4667cb372665c24ab5f2cdbd22c65556d7

Authored by wesley88
2 parents 86e0b694 b7a88997

Merge branch 'master' of http://39.98.150.180/webapp/GreenwayWeb

Inline Side-by-side
Showing 21 changed files with 716 additions and 462 deletions
admin-web-master/dist.zip 0 → 100644
View file @ffe3ff4
No preview for this file type
admin-web-master/src/api/activityBz.js
  View file @ffe3ff4
@@ -245,3 +245,11 @@ export function lishiDeta(data) { @@ -245,3 +245,11 @@ export function lishiDeta(data) {
245 data 245 data
246 }) 246 })
247 } 247 }
  248 +//效果调整历史方案查询
  249 +export function effectivenessLog(data) {
  250 + return request({
  251 + url: '/cereActivityEffectivenessLog/getAll',
  252 + method: 'post',
  253 + data
  254 + })
  255 +}
admin-web-master/src/assets/images/vs.png 0 → 100644
View file @ffe3ff4

48 KB
admin-web-master/src/utils/request.js
  View file @ffe3ff4
@@ -16,12 +16,12 @@ let hostall = window.location.href; @@ -16,12 +16,12 @@ let hostall = window.location.href;
16 let baseURL = '' 16 let baseURL = ''
17 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) { 17 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) {
18 18
19 - baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'; 19 + // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
20 // baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server'; 20 // baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server';
21 21
22 // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1; 22 // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
23 23
24 - // baseURL = 'http://128.10.249.23:9003'; 24 + baseURL = 'http://128.10.249.13:9003';
25 25
26 } else { 26 } else {
27 console.error('---------------------') 27 console.error('---------------------')
admin-web-master/src/views/activity/activityHis.vue
  View file @ffe3ff4
@@ -69,7 +69,7 @@ @@ -69,7 +69,7 @@
69 <div> 69 <div>
70 <!-- @selection-change="handleSelectionChange" --> 70 <!-- @selection-change="handleSelectionChange" -->
71 <el-table :data="tableData.slice((currentPage - 1) * pageSize, currentPage * pageSize)" 71 <el-table :data="tableData.slice((currentPage - 1) * pageSize, currentPage * pageSize)"
72 - tooltip-effect="dark" align="left" 72 + tooltip-effect="dark" align="left"
73 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}" 73 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
74 ref="mulTable"> 74 ref="mulTable">
75 <!-- <el-table-column type="selection" min-width="5%"> 75 <!-- <el-table-column type="selection" min-width="5%">
@@ -116,7 +116,7 @@ @@ -116,7 +116,7 @@
116 </el-table> 116 </el-table>
117 <div class="fenye"> 117 <div class="fenye">
118 <div> 118 <div>
119 - <!-- <el-button @click="tableAll" class="buttonHover" 119 + <!-- <el-button @click="tableAll" class="buttonHover"
120 style="color: #000;border: 1px solid #DBDBDB;background-color: #fff;">选择全部 120 style="color: #000;border: 1px solid #DBDBDB;background-color: #fff;">选择全部
121 </el-button> 121 </el-button>
122 <el-button @click="toggleSelection(tableData)" class="buttonHover" 122 <el-button @click="toggleSelection(tableData)" class="buttonHover"
@@ -394,7 +394,8 @@ @@ -394,7 +394,8 @@
394 min-width="15%"> 394 min-width="15%">
395 395
396 </el-table-column> 396 </el-table-column>
397 - <el-table-column label="预估费用(/元)" prop="estimatedCost" width="auto" min-width="15%"> 397 + <el-table-column label="预估费用(/元)" prop="estimatedCost" width="auto"
  398 + min-width="15%">
398 </el-table-column> 399 </el-table-column>
399 <el-table-column prop="notes" label="备注" width="auto" min-width="15%"> 400 <el-table-column prop="notes" label="备注" width="auto" min-width="15%">
400 </el-table-column> 401 </el-table-column>
@@ -423,14 +424,14 @@ @@ -423,14 +424,14 @@
423 label-width="120px" style="position: relative"> 424 label-width="120px" style="position: relative">
424 <el-row :gutter="20"> 425 <el-row :gutter="20">
425 <el-col :span="8"> 426 <el-col :span="8">
426 - <el-form-item label="内部人力成本预估(/元)" 427 + <el-form-item label="实际内部人力成本(/元)"
427 class="grid-content bg-purple device-from" prop="name"> 428 class="grid-content bg-purple device-from" prop="name">
428 <el-input v-model="zhixingList.internalLaborCostEstimation" 429 <el-input v-model="zhixingList.internalLaborCostEstimation"
429 placeholder="请输入" :disabled="!zhixingBian" /> 430 placeholder="请输入" :disabled="!zhixingBian" />
430 </el-form-item> 431 </el-form-item>
431 </el-col> 432 </el-col>
432 <el-col :span="8"> 433 <el-col :span="8">
433 - <el-form-item label="外部人力成本预估(/元)" class="grid-content bg-purple" 434 + <el-form-item label="实际外部人力成本(/元)" class="grid-content bg-purple"
434 prop="name"> 435 prop="name">
435 <el-input v-model="zhixingList.externalLaborCostEstimation" 436 <el-input v-model="zhixingList.externalLaborCostEstimation"
436 placeholder="请输入" :disabled="!zhixingBian" /> 437 placeholder="请输入" :disabled="!zhixingBian" />
@@ -438,7 +439,8 @@ @@ -438,7 +439,8 @@
438 </el-col> 439 </el-col>
439 440
440 <el-col :span="8"> 441 <el-col :span="8">
441 - <el-form-item label="商品成本预估(/元)" class="grid-content bg-purple" prop="name"> 442 + <el-form-item label="实际商品成本(/元)" class="grid-content bg-purple"
  443 + prop="name">
442 <el-input v-model="zhixingList.costEstimationGoods" 444 <el-input v-model="zhixingList.costEstimationGoods"
443 placeholder="请输入" :disabled="!zhixingBian" /> 445 placeholder="请输入" :disabled="!zhixingBian" />
444 </el-form-item> 446 </el-form-item>
@@ -447,19 +449,22 @@ @@ -447,19 +449,22 @@
447 449
448 <el-row :gutter="20"> 450 <el-row :gutter="20">
449 <el-col :span="8"> 451 <el-col :span="8">
450 - <el-form-item label="设备成本(/元)" class="grid-content bg-purple" prop="name"> 452 + <el-form-item label="实际设备成本(/元)" class="grid-content bg-purple"
  453 + prop="name">
451 <el-input v-model="zhixingList.setCostEstimate" placeholder="请输入" 454 <el-input v-model="zhixingList.setCostEstimate" placeholder="请输入"
452 :disabled="!zhixingBian" /> 455 :disabled="!zhixingBian" />
453 </el-form-item> 456 </el-form-item>
454 </el-col> 457 </el-col>
455 <el-col :span="8"> 458 <el-col :span="8">
456 - <el-form-item label="宣传费用(/元)" class="grid-content bg-purple" prop="name"> 459 + <el-form-item label="实际宣传费用(/元)" class="grid-content bg-purple"
  460 + prop="name">
457 <el-input v-model="zhixingList.estimatedPromotionalExpenses" 461 <el-input v-model="zhixingList.estimatedPromotionalExpenses"
458 placeholder="请输入" :disabled="!zhixingBian" /> 462 placeholder="请输入" :disabled="!zhixingBian" />
459 </el-form-item> 463 </el-form-item>
460 </el-col> 464 </el-col>
461 <el-col :span="8"> 465 <el-col :span="8">
462 - <el-form-item label="其他成本(/元)" class="grid-content bg-purple" prop="name"> 466 + <el-form-item label="实际其他成本(/元)" class="grid-content bg-purple"
  467 + prop="name">
463 <el-input v-model="zhixingList.otherNecessaryEstimates" 468 <el-input v-model="zhixingList.otherNecessaryEstimates"
464 placeholder="请输入" :disabled="!zhixingBian" /> 469 placeholder="请输入" :disabled="!zhixingBian" />
465 </el-form-item> 470 </el-form-item>
@@ -468,7 +473,8 @@ @@ -468,7 +473,8 @@
468 473
469 <el-row :gutter="20"> 474 <el-row :gutter="20">
470 <el-col :span="8"> 475 <el-col :span="8">
471 - <el-form-item label="总成本(/元)" prop="name" class="grid-content bg-purple"> 476 + <el-form-item label="实际总成本(/元)" prop="name"
  477 + class="grid-content bg-purple">
472 <el-input v-model="zhixingList.totalCostEstimation" 478 <el-input v-model="zhixingList.totalCostEstimation"
473 placeholder="请输入" :disabled="!zhixingBian" /> 479 placeholder="请输入" :disabled="!zhixingBian" />
474 </el-form-item> 480 </el-form-item>
@@ -497,21 +503,22 @@ @@ -497,21 +503,22 @@
497 label-width="120px" style="position: relative"> 503 label-width="120px" style="position: relative">
498 <el-row :gutter="20"> 504 <el-row :gutter="20">
499 <el-col :span="8"> 505 <el-col :span="8">
500 - <el-form-item label="吸引流量" class="grid-content bg-purple device-from" 506 + <el-form-item label="实际吸引流量" class="grid-content bg-purple device-from"
501 prop="name"> 507 prop="name">
502 <el-input v-model="zhixingList.expectedAttractTraffic" 508 <el-input v-model="zhixingList.expectedAttractTraffic"
503 placeholder="请输入" :disabled="!zhixingBian" /> 509 placeholder="请输入" :disabled="!zhixingBian" />
504 </el-form-item> 510 </el-form-item>
505 </el-col> 511 </el-col>
506 <el-col :span="8"> 512 <el-col :span="8">
507 - <el-form-item label="参与人数" class="grid-content bg-purple" prop="name"> 513 + <el-form-item label="实际参与人数" class="grid-content bg-purple" prop="name">
508 <el-input v-model="zhixingList.expectedParticipation" 514 <el-input v-model="zhixingList.expectedParticipation"
509 placeholder="请输入" :disabled="!zhixingBian" /> 515 placeholder="请输入" :disabled="!zhixingBian" />
510 </el-form-item> 516 </el-form-item>
511 </el-col> 517 </el-col>
512 518
513 <el-col :span="8"> 519 <el-col :span="8">
514 - <el-form-item label="直接收益(/元)" class="grid-content bg-purple" prop="name"> 520 + <el-form-item label="实际直接收益(/元)" class="grid-content bg-purple"
  521 + prop="name">
515 <el-input v-model="zhixingList.expectedDirectBenefits" 522 <el-input v-model="zhixingList.expectedDirectBenefits"
516 placeholder="请输入" :disabled="!zhixingBian" /> 523 placeholder="请输入" :disabled="!zhixingBian" />
517 </el-form-item> 524 </el-form-item>
@@ -519,7 +526,8 @@ @@ -519,7 +526,8 @@
519 </el-row> 526 </el-row>
520 <el-row :gutter="20"> 527 <el-row :gutter="20">
521 <el-col :span="8"> 528 <el-col :span="8">
522 - <el-form-item label="间接收益(/元)" class="grid-content bg-purple" prop="name"> 529 + <el-form-item label="实际间接收益(/元)" class="grid-content bg-purple"
  530 + prop="name">
523 <el-input v-model="zhixingList.expectedIndirectBenefits" 531 <el-input v-model="zhixingList.expectedIndirectBenefits"
524 placeholder="请输入" :disabled="!zhixingBian" /> 532 placeholder="请输入" :disabled="!zhixingBian" />
525 </el-form-item> 533 </el-form-item>
@@ -554,116 +562,60 @@ @@ -554,116 +562,60 @@
554 <div style="margin-right:10px;line-height:200%;">历史活动策划方案搜索</div> 562 <div style="margin-right:10px;line-height:200%;">历史活动策划方案搜索</div>
555 <el-select v-model="lishiList" placeholder="请选择" style="margin:0 20px 20px 20px;" 563 <el-select v-model="lishiList" placeholder="请选择" style="margin:0 20px 20px 20px;"
556 @change="lichange"> 564 @change="lichange">
557 - <el-option v-for="(item,index) in liData" :key="item.id" :label="item.operationType" 565 + <el-option v-for="(item,index) in effectivenessList" :key="item.id" :label="item.operationType"
558 :value="index"> 566 :value="index">
559 </el-option> 567 </el-option>
560 </el-select> 568 </el-select>
561 - <el-button @click="tiaozheng" style="background-color: #3F9B6A;color: #fff" 569 + <!-- <el-button @click="tiaozheng" style="background-color: #3F9B6A;color: #fff"
562 v-if="lishiList!=null">调整对比 570 v-if="lishiList!=null">调整对比
563 - </el-button> 571 + </el-button> -->
564 </div> 572 </div>
565 <div style="width: 100%;" v-if="lishiList!=null" ref="lishiRef"> 573 <div style="width: 100%;" v-if="lishiList!=null" ref="lishiRef">
566 <div style="width: 100%;"> 574 <div style="width: 100%;">
567 <div style="padding: 10px 20px;"> 575 <div style="padding: 10px 20px;">
568 <el-descriptions class="margin-top" title="基本信息" :column="2" border 576 <el-descriptions class="margin-top" title="基本信息" :column="2" border
569 - :labelStyle="labelStyle"> 577 + :labelStyle="labelStyle" :contentStyle="contentStyle">
570 <el-descriptions-item> 578 <el-descriptions-item>
571 <template slot="label"> 579 <template slot="label">
572 - 方案编号  
573 - </template>  
574 - {{lixiang.id}}  
575 - </el-descriptions-item>  
576 - <el-descriptions-item>  
577 - <template slot="label">  
578 - 方案名称 580 + 活动名称
579 </template> 581 </template>
580 582
581 - <span  
582 - :style="duibiList.planName == lixiang.planName?'color: red':''">{{lixiang.planName}}</span> 583 + <span>{{duibiList.planName}}</span>
583 </el-descriptions-item> 584 </el-descriptions-item>
584 <el-descriptions-item> 585 <el-descriptions-item>
585 <template slot="label"> 586 <template slot="label">
586 - 类型 587 + 实际举办地点
587 </template> 588 </template>
588 - <span  
589 - :style="duibiList.planType == lixiang.planType?'color: red':''">{{lixiang.planType}}</span> 589 + <span>{{duibiList.eventAddrs}}</span>
590 </el-descriptions-item> 590 </el-descriptions-item>
591 <el-descriptions-item> 591 <el-descriptions-item>
592 <template slot="label"> 592 <template slot="label">
593 - 活动地点 593 + 实际举办时间
594 </template> 594 </template>
595 595
596 - <span  
597 - :style="duibiList.eventAddrs == lixiang.eventAddrs?'color: red':''">{{lixiang.eventAddrs}}</span>  
598 - </el-descriptions-item>  
599 - <el-descriptions-item>  
600 - <template slot="label">  
601 - 活动开始时间  
602 - </template>  
603 -  
604 - <span  
605 - :style="duibiList.eventStartTime == lixiang.eventStartTime?'color: red':''">{{lixiang.eventStartTime}}</span>  
606 - </el-descriptions-item>  
607 - <el-descriptions-item>  
608 - <template slot="label">  
609 - 活动结束时间  
610 - </template>  
611 -  
612 - <span  
613 - :style="duibiList.eventEndTime == lixiang.eventEndTime?'color: red':''">{{lixiang.eventEndTime}}</span>  
614 - </el-descriptions-item>  
615 - <el-descriptions-item>  
616 - <template slot="label">  
617 - 活动主题  
618 - </template>  
619 - <span  
620 - :style="duibiList.eventTheme == lixiang.eventTheme?'color: red':''">{{lixiang.eventTheme}}</span> 596 + <span>{{formatTimestampToDate(duibiList.eventStartTime)}}-{{formatTimestampToDate(duibiList.eventEndTime)}}</span>
621 </el-descriptions-item> 597 </el-descriptions-item>
622 <el-descriptions-item> 598 <el-descriptions-item>
623 <template slot="label"> 599 <template slot="label">
624 活动主办方 600 活动主办方
625 </template> 601 </template>
626 - <span  
627 - :style="duibiList.sponsor == lixiang.sponsor?'color: red':''">{{lixiang.sponsor}}</span>  
628 602
  603 + <span>{{duibiList.participants}}</span>
629 </el-descriptions-item> 604 </el-descriptions-item>
630 <el-descriptions-item> 605 <el-descriptions-item>
631 <template slot="label"> 606 <template slot="label">
632 - 活动参与方 607 + 活动实际参与方
633 </template> 608 </template>
634 609
635 - <span  
636 - :style="duibiList.participants == lixiang.participants?'color: red':''">{{lixiang.participants}}</span>  
637 - </el-descriptions-item>  
638 - <el-descriptions-item>  
639 - <template slot="label">  
640 - 活动主要目的  
641 - </template>  
642 -  
643 - <span  
644 - :style="duibiList.mainPurpose == lixiang.mainPurpose?'color: red':''">{{lixiang.mainPurpose}}</span>  
645 - </el-descriptions-item>  
646 - <el-descriptions-item>  
647 - <template slot="label">  
648 - 范围设置  
649 - </template>  
650 -  
651 - <span  
652 - :style="duibiList.rangeSetting == lixiang.rangeSetting?'color: red':''">{{lixiang.rangeSetting}}</span>  
653 - </el-descriptions-item>  
654 - <el-descriptions-item>  
655 - <template slot="label">  
656 - 状态  
657 - </template>  
658 -  
659 - {{getStatus(lixiang.state)}}  
660 - 610 + <span>{{duibiList.sponsor}}</span>
661 </el-descriptions-item> 611 </el-descriptions-item>
  612 +
  613 +
662 </el-descriptions> 614 </el-descriptions>
663 615
664 </div> 616 </div>
665 </div> 617 </div>
666 - <div style="width: 100%;"> 618 + <!-- <div style="width: 100%;">
667 <div style="font-size: 14px;padding: 10px 20px 0px 20px;">活动明细信息</div> 619 <div style="font-size: 14px;padding: 10px 20px 0px 20px;">活动明细信息</div>
668 <div style="padding: 10px 20px;"> 620 <div style="padding: 10px 20px;">
669 <el-table :data="tableData2" 621 <el-table :data="tableData2"
@@ -686,74 +638,67 @@ @@ -686,74 +638,67 @@
686 </el-table-column> 638 </el-table-column>
687 </el-table> 639 </el-table>
688 </div> 640 </div>
689 - </div> 641 + </div> -->
690 <div style="width: 100%;"> 642 <div style="width: 100%;">
691 <div style="padding:10px 20px;"> 643 <div style="padding:10px 20px;">
692 - <el-descriptions class="margin-top" title="活动成本信息" :column="2" border  
693 - :labelStyle="labelStyle"> 644 + <el-descriptions class="margin-top" title="实际花费成本" :column="2" border
  645 + :labelStyle="labelStyle" :contentStyle="contentStyle">
694 <el-descriptions-item> 646 <el-descriptions-item>
695 <template slot="label"> 647 <template slot="label">
696 - 内部人力成本预估(/元) 648 + 实际内部人力成本(/元)
697 </template> 649 </template>
698 650
699 - <span  
700 - :style="duibiList.internalLaborCostEstimation == lixiang.internalLaborCostEstimation?'color: red':''">{{lixiang.internalLaborCostEstimation}}</span> 651 + <span>{{duibiList.internalLaborCostEstimation}}</span>
701 </el-descriptions-item> 652 </el-descriptions-item>
702 <el-descriptions-item> 653 <el-descriptions-item>
703 <template slot="label"> 654 <template slot="label">
704 - 外部人力成本预估(/元) 655 + 实际外部人力成本(/元)
705 </template> 656 </template>
706 -  
707 - <span  
708 - :style="duibiList.externalLaborCostEstimation == lixiang.externalLaborCostEstimation?'color: red':''">{{lixiang.externalLaborCostEstimation}}</span> 657 +<span>{{duibiList.externalLaborCostEstimation}}</span>
  658 +
  659 +
709 </el-descriptions-item> 660 </el-descriptions-item>
710 <el-descriptions-item> 661 <el-descriptions-item>
711 <template slot="label"> 662 <template slot="label">
712 - 商品成本预估(/元) 663 + 实际商品成本(/元)
713 </template> 664 </template>
714 -  
715 - <span  
716 - :style="duibiList.costEstimationGoods == lixiang.costEstimationGoods?'color: red':''">{{lixiang.costEstimationGoods}}</span> 665 +<span>{{duibiList.costEstimationGoods}}</span>
  666 +
717 </el-descriptions-item> 667 </el-descriptions-item>
718 <el-descriptions-item> 668 <el-descriptions-item>
719 <template slot="label"> 669 <template slot="label">
720 - 设备成本预估(/元) 670 + 实际设备成本(/元)
721 </template> 671 </template>
722 -  
723 - <span  
724 - :style="duibiList.setCostEstimate == lixiang.setCostEstimate?'color: red':''">{{lixiang.setCostEstimate}}</span> 672 +<span>{{duibiList.setCostEstimate}}</span>
  673 +
725 </el-descriptions-item> 674 </el-descriptions-item>
726 <el-descriptions-item> 675 <el-descriptions-item>
727 <template slot="label"> 676 <template slot="label">
728 - 宣传费用预估(/元) 677 + 实际宣传费用(/元)
729 </template> 678 </template>
730 -  
731 - <span  
732 - :style="duibiList.estimatedPromotionalExpenses == lixiang.estimatedPromotionalExpenses?'color: red':''">{{lixiang.estimatedPromotionalExpenses}}</span> 679 +<span>{{duibiList.estimatedPromotionalExpenses}}</span>
  680 +
733 </el-descriptions-item> 681 </el-descriptions-item>
734 <el-descriptions-item> 682 <el-descriptions-item>
735 <template slot="label"> 683 <template slot="label">
736 - 其他必要成本预估(/元) 684 + 实际其他成本(/元)
737 </template> 685 </template>
738 -  
739 - <span  
740 - :style="duibiList.otherNecessaryEstimates == lixiang.otherNecessaryEstimates?'color: red':''">{{lixiang.otherNecessaryEstimates}}</span> 686 +<span>{{duibiList.otherNecessaryEstimates}}</span>
  687 +
741 </el-descriptions-item> 688 </el-descriptions-item>
742 <el-descriptions-item> 689 <el-descriptions-item>
743 <template slot="label"> 690 <template slot="label">
744 - 总成本预估(/元) 691 + 实际总成本(/元)
745 </template> 692 </template>
746 -  
747 - <span  
748 - :style="duibiList.totalCostEstimation == lixiang.totalCostEstimation?'color: red':''">{{lixiang.totalCostEstimation}}</span> 693 +<span>{{duibiList.totalCostEstimation}}</span>
  694 +
749 </el-descriptions-item> 695 </el-descriptions-item>
750 <el-descriptions-item> 696 <el-descriptions-item>
751 <template slot="label"> 697 <template slot="label">
752 备注 698 备注
753 </template> 699 </template>
754 -  
755 - <span  
756 - :style="duibiList.notes == lixiang.notes?'color: red':''">{{lixiang.notes}}</span> 700 +<span>{{duibiList.notes}}</span>
  701 +
757 </el-descriptions-item> 702 </el-descriptions-item>
758 </el-descriptions> 703 </el-descriptions>
759 </div> 704 </div>
@@ -761,91 +706,43 @@ @@ -761,91 +706,43 @@
761 <div style="width: 100%;"> 706 <div style="width: 100%;">
762 707
763 <div style="padding:10px 20px;"> 708 <div style="padding:10px 20px;">
764 - <el-descriptions class="margin-top" title="预估效果" :column="2" border  
765 - :labelStyle="labelStyle"> 709 + <el-descriptions class="margin-top" title="活动执行效果" :column="2" border
  710 + :labelStyle="labelStyle" :contentStyle="contentStyle">
766 <el-descriptions-item> 711 <el-descriptions-item>
767 <template slot="label"> 712 <template slot="label">
768 - 预计吸引流量 713 + 实际吸引流量
769 </template> 714 </template>
770 -  
771 - <span  
772 - :style="duibiList.expectedAttractTraffic == lixiang.expectedAttractTraffic?'color: red':''">{{lixiang.expectedAttractTraffic}}</span> 715 +<span>{{duibiList.expectedAttractTraffic}}</span>
  716 +
773 </el-descriptions-item> 717 </el-descriptions-item>
774 <el-descriptions-item> 718 <el-descriptions-item>
775 <template slot="label"> 719 <template slot="label">
776 - 预计参与人数 720 + 实际参与人数
777 </template> 721 </template>
778 -  
779 - <span  
780 - :style="duibiList.expectedParticipation == lixiang.expectedParticipation?'color: red':''">{{lixiang.expectedParticipation}}</span> 722 +<span>{{duibiList.expectedParticipation}}</span>
  723 +
781 </el-descriptions-item> 724 </el-descriptions-item>
782 <el-descriptions-item> 725 <el-descriptions-item>
783 <template slot="label"> 726 <template slot="label">
784 - 预计直接收益(/元) 727 + 实际直接收益(/元)
785 </template> 728 </template>
786 -  
787 - <span  
788 - :style="duibiList.expectedDirectBenefits == lixiang.expectedDirectBenefits?'color: red':''">{{lixiang.expectedDirectBenefits}}</span> 729 +<span>{{duibiList.expectedDirectBenefits}}</span>
  730 +
789 </el-descriptions-item> 731 </el-descriptions-item>
790 <el-descriptions-item> 732 <el-descriptions-item>
791 <template slot="label"> 733 <template slot="label">
792 - 预计间接收益(/元) 734 + 实际间接收益(/元)
793 </template> 735 </template>
794 -  
795 - <span  
796 - :style="duibiList.expectedIndirectBenefits == lixiang.expectedIndirectBenefits?'color: red':''">{{lixiang.expectedIndirectBenefits}}</span> 736 +<span>{{duibiList.expectedIndirectBenefits}}</span>
  737 +
797 </el-descriptions-item> 738 </el-descriptions-item>
798 739
799 </el-descriptions> 740 </el-descriptions>
800 741
801 </div> 742 </div>
802 </div> 743 </div>
803 - <div style="width: 100%;">  
804 - <div style="font-size: 14px;padding: 10px 20px 0px 20px;">相关附件信息</div>  
805 - <div style="padding:10px 20px;">  
806 - <el-table :data="tableData6"  
807 - :header-cell-style="{fontSize: '14px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}"  
808 - style="width: 100%;margin: auto;">  
809 - <el-table-column label="序号" min-width="5%" align='center'>  
810 - <template slot-scope="scope">  
811 - <span style="">{{ scope.$index + 1 }}</span>  
812 - </template>  
813 - </el-table-column>  
814 - <el-table-column label="附件名称" prop="attachmentName" min-width="75%">  
815 - </el-table-column>  
816 - <el-table-column label="操作" min-width="20%">  
817 - <template slot-scope="scope">  
818 - <!-- <div class="tableBtn greens" @click="Down(scope.row)">下载</div> -->  
819 - <a class="tableBtn greens" :href="scope.row.attachmentUrl"  
820 - target="_blank" download>下载</a>  
821 - </template>  
822 - </el-table-column>  
823 -  
824 - </el-table>  
825 - </div>  
826 - </div>  
827 - <div style="width: 100%;">  
828 - <div style="font-size: 14px;padding: 10px 20px 0px 20px;">系统信息</div>  
829 - <div style="padding:10px 20px;">  
830 - <el-table :data="tableData5"  
831 - :header-cell-style="{fontSize: '14px', backgroundColor: '#fff',color:'#000',fontWeight: 'normal'}"  
832 - style="width: 100%;margin: auto;">  
833 - <el-table-column class-name="first-column-bg" label="创建人" prop="name"  
834 - min-width="15%">  
835 - </el-table-column>  
836 - <el-table-column :label="createUser" prop="eventTheme" min-width="35%">  
837 -  
838 - </el-table-column>  
839 - <el-table-column class-name="first-column-bg" label="创建时间" prop="text"  
840 - min-width="15%">  
841 -  
842 - </el-table-column>  
843 - <el-table-column :label="createDate" prop="planName" min-width="35%">  
844 -  
845 - </el-table-column>  
846 - </el-table>  
847 - </div>  
848 - </div> 744 +
  745 +
849 </div> 746 </div>
850 </div> 747 </div>
851 <div v-if="activeName=='five'"> 748 <div v-if="activeName=='five'">
@@ -1306,10 +1203,158 @@ @@ -1306,10 +1203,158 @@
1306 </div> 1203 </div>
1307 </el-dialog> 1204 </el-dialog>
1308 <!-- 效果对比 --> 1205 <!-- 效果对比 -->
1309 - <el-dialog :visible.sync="xiaoDui" title="效果对比" width="60%" center :close-on-click-modal="false" 1206 + <el-dialog :visible.sync="xiaoDui" title="效果对比" width="65%" center :close-on-click-modal="false"
1310 :close-on-press-escape="false"> 1207 :close-on-press-escape="false">
1311 - <div style="padding: 0 50px;display:flex;justify-content: space-evenly;">  
1312 - <div style="width:30%"> 1208 + <div style="display:flex;padding: 20px;width:100%;justify-content: center;">
  1209 + <el-select v-model="ListOne" placeholder="请选择" style="margin:0 20px 20px 20px;" @change="lichangeOne">
  1210 + <el-option v-for="(item,index) in effectivenessList" :key="item.id" :label="item.operationType"
  1211 + :value="item">
  1212 + </el-option>
  1213 + </el-select>
  1214 + <div style="line-height:200%;">
  1215 + <img src="../../assets/images/vs.png" alt="" style="height: 32px;">
  1216 + </div>
  1217 + <el-select v-model="ListTwo" placeholder="请选择" style="margin:0 20px 20px 20px;" @change="lichangeTwo">
  1218 + <el-option v-for="(item,index) in effectivenessList" :key="item.id" :label="item.operationType"
  1219 + :value="item">
  1220 + </el-option>
  1221 + </el-select>
  1222 + <!-- <el-button @click="tiaozheng" style="background-color: #3F9B6A;color: #fff"
  1223 + >对比
  1224 + </el-button> -->
  1225 + </div>
  1226 + <div style="display:flex;width:100%;justify-content: center;padding: 0 20px;">
  1227 + <div style="width: 20%;">
  1228 + <div style="color:#3F9B6A;text-align: center;padding: 10px 0;">实际成本</div>
  1229 + <div
  1230 + style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
  1231 + <div>内部人力</div>
  1232 + <div>
  1233 + {{effectivenessListOne.internalLaborCostEstimation?effectivenessListOne.internalLaborCostEstimation:0}}元
  1234 + </div>
  1235 + </div>
  1236 + <div
  1237 + style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
  1238 + <div>外部人力</div>
  1239 + <div>
  1240 + {{effectivenessListOne.externalLaborCostEstimation?effectivenessListOne.externalLaborCostEstimation:0}}元
  1241 + </div>
  1242 + </div>
  1243 + <div
  1244 + style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
  1245 + <div>商品成本</div>
  1246 + <div>{{effectivenessListOne.costEstimationGoods?effectivenessListOne.costEstimationGoods:0}}元
  1247 + </div>
  1248 + </div>
  1249 + <div
  1250 + style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
  1251 + <div>设备成本</div>
  1252 + <div>{{effectivenessListOne.setCostEstimate?effectivenessListOne.setCostEstimate:0}}元</div>
  1253 + </div>
  1254 + <div
  1255 + style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
  1256 + <div>宣传费用</div>
  1257 + <div>
  1258 + {{effectivenessListOne.estimatedPromotionalExpenses?effectivenessListOne.estimatedPromotionalExpenses:0}}元
  1259 + </div>
  1260 + </div>
  1261 + <div
  1262 + style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
  1263 + <div>其他成本</div>
  1264 + <div>
  1265 + {{effectivenessListOne.otherNecessaryEstimates?effectivenessListOne.otherNecessaryEstimates:0}}元
  1266 + </div>
  1267 + </div>
  1268 + <div
  1269 + style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
  1270 + <div>总成本</div>
  1271 + <div>{{effectivenessListOne.totalCostEstimation?effectivenessListOne.totalCostEstimation:0}}元
  1272 + </div>
  1273 + </div>
  1274 + </div>
  1275 + <div style="width: 15%;">
  1276 + <div style="color:#3F9B6A;text-align: center;padding: 10px 0;">增长率</div>
  1277 + <div
  1278 + style="padding:10px 0px;text-align: center;margin:10px;border: 1px solid #3F9B6A;border-radius: 5px;background-color: #3F9B6A;color: #fff;">
  1279 + {{effectivenessListOne.sumNei?effectivenessListOne.sumNei:0}}%
  1280 + </div>
  1281 + <div
  1282 + style="padding:10px 0px;text-align: center;margin:10px;border: 1px solid #3F9B6A;border-radius: 5px;background-color: #3F9B6A;color: #fff;">
  1283 + {{effectivenessListOne.sumWai?effectivenessListOne.sumWai:0}}%
  1284 + </div>
  1285 + <div
  1286 + style="padding:10px 0px;text-align: center;margin:10px;border: 1px solid #3F9B6A;border-radius: 5px;background-color: #3F9B6A;color: #fff;">
  1287 + {{effectivenessListOne.sumShop?effectivenessListOne.sumShop:0}}%
  1288 + </div>
  1289 + <div
  1290 + style="padding:10px 0px;text-align: center;margin:10px;border: 1px solid #3F9B6A;border-radius: 5px;background-color: #3F9B6A;color: #fff;">
  1291 + {{effectivenessListOne.sumSe?effectivenessListOne.sumSe:0}}%
  1292 + </div>
  1293 + <div
  1294 + style="padding:10px 0px;text-align: center;margin:10px;border: 1px solid #3F9B6A;border-radius: 5px;background-color: #3F9B6A;color: #fff;">
  1295 + {{effectivenessListOne.sumXuan?effectivenessListOne.sumXuan:0}}%
  1296 + </div>
  1297 + <div
  1298 + style="padding:10px 0px;text-align: center;margin:10px;border: 1px solid #3F9B6A;border-radius: 5px;background-color: #3F9B6A;color: #fff;">
  1299 + {{effectivenessListOne.sumQi?effectivenessListOne.sumQi:0}}%
  1300 + </div>
  1301 + <div
  1302 + style="padding:10px 0px;text-align: center;margin:10px;border: 1px solid #3F9B6A;border-radius: 5px;background-color: #3F9B6A;color: #fff;">
  1303 + {{effectivenessListOne.sumAll?effectivenessListOne.sumAll:0}}%
  1304 + </div>
  1305 +
  1306 +
  1307 + </div>
  1308 + <div style="width: 20%;">
  1309 + <div style="color:#3F9B6A;text-align: center;padding: 10px 0;">实际成本</div>
  1310 + <div
  1311 + style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
  1312 + <div>内部人力</div>
  1313 + <div>
  1314 + {{effectivenessListTwo.internalLaborCostEstimation?effectivenessListTwo.internalLaborCostEstimation:0}}元
  1315 + </div>
  1316 + </div>
  1317 + <div
  1318 + style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
  1319 + <div>外部人力</div>
  1320 + <div>
  1321 + {{effectivenessListTwo.externalLaborCostEstimation?effectivenessListTwo.externalLaborCostEstimation:0}}元
  1322 + </div>
  1323 + </div>
  1324 + <div
  1325 + style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
  1326 + <div>商品成本</div>
  1327 + <div>{{effectivenessListTwo.costEstimationGoods?effectivenessListTwo.costEstimationGoods:0}}元
  1328 + </div>
  1329 + </div>
  1330 + <div
  1331 + style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
  1332 + <div>设备成本</div>
  1333 + <div>{{effectivenessListTwo.setCostEstimate?effectivenessListTwo.setCostEstimate:0}}元</div>
  1334 + </div>
  1335 + <div
  1336 + style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
  1337 + <div>宣传费用</div>
  1338 + <div>
  1339 + {{effectivenessListTwo.estimatedPromotionalExpenses?effectivenessListTwo.estimatedPromotionalExpenses:0}}元
  1340 + </div>
  1341 + </div>
  1342 + <div
  1343 + style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
  1344 + <div>其他成本</div>
  1345 + <div>
  1346 + {{effectivenessListTwo.otherNecessaryEstimates?effectivenessListTwo.otherNecessaryEstimates:0}}元
  1347 + </div>
  1348 + </div>
  1349 + <div
  1350 + style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
  1351 + <div>总成本</div>
  1352 + <div>{{effectivenessListTwo.totalCostEstimation?effectivenessListTwo.totalCostEstimation:0}}元
  1353 + </div>
  1354 + </div>
  1355 + </div>
  1356 + </div>
  1357 + <!-- <div style="width:30%">
1313 <div style="display: flex;"> 1358 <div style="display: flex;">
1314 <div style="margin-right: 10px;padding: 10px 0;"> 1359 <div style="margin-right: 10px;padding: 10px 0;">
1315 <div>调整前方案</div> 1360 <div>调整前方案</div>
@@ -1324,48 +1369,45 @@ @@ -1324,48 +1369,45 @@
1324 <div style="padding:30px 0">计划任务（完成度）</div> 1369 <div style="padding:30px 0">计划任务（完成度）</div>
1325 <div class="jindutiao"> 1370 <div class="jindutiao">
1326 <div style="margin-right:10px;width:56px">直接收入</div> 1371 <div style="margin-right:10px;width:56px">直接收入</div>
1327 - <!-- <el-progress :text-inside="true" :stroke-width="26" :format="format(xiaoduiObj.shou)" :percentage="xiaoduiObj.shouBi"></el-progress> -->  
1328 <el-progress style="width: 150px;" :text-inside="true" :stroke-width="20" 1372 <el-progress style="width: 150px;" :text-inside="true" :stroke-width="20"
1329 :percentage="baifenbi(duibiOne.expectedDirectBenefits)" status="success" 1373 :percentage="baifenbi(duibiOne.expectedDirectBenefits)" status="success"
1330 :format="() => customFormat(duibiOne.expectedDirectBenefits)"></el-progress> 1374 :format="() => customFormat(duibiOne.expectedDirectBenefits)"></el-progress>
1331 </div> 1375 </div>
1332 <div class="jindutiao"> 1376 <div class="jindutiao">
1333 <div style="margin-right:10px;width:56px">间接收入</div> 1377 <div style="margin-right:10px;width:56px">间接收入</div>
1334 - <!-- <el-progress :text-inside="true" :stroke-width="26" :format="format(xiaoduiObj.shou)" :percentage="xiaoduiObj.shouBi"></el-progress> --> 1378 +
1335 <el-progress style="width: 150px;" :text-inside="true" :stroke-width="20" 1379 <el-progress style="width: 150px;" :text-inside="true" :stroke-width="20"
1336 :percentage="baifenbi(duibiOne.expectedIndirectBenefits)" status="success" 1380 :percentage="baifenbi(duibiOne.expectedIndirectBenefits)" status="success"
1337 :format="() => customFormat(duibiOne.expectedIndirectBenefits)"></el-progress> 1381 :format="() => customFormat(duibiOne.expectedIndirectBenefits)"></el-progress>
1338 </div> 1382 </div>
1339 <div class="jindutiao"> 1383 <div class="jindutiao">
1340 <div style="margin-right:10px;width:56px">人力</div> 1384 <div style="margin-right:10px;width:56px">人力</div>
1341 - <!-- <el-progress :text-inside="true" :stroke-width="26" :format="format(xiaoduiObj.shou)" :percentage="xiaoduiObj.shouBi"></el-progress> -->  
1342 <el-progress style="width: 150px;" :text-inside="true" :stroke-width="20" 1385 <el-progress style="width: 150px;" :text-inside="true" :stroke-width="20"
1343 :percentage="baifenbi(duibiOne.internalLaborCostEstimation)" status="success" 1386 :percentage="baifenbi(duibiOne.internalLaborCostEstimation)" status="success"
1344 :format="() => customFormat(duibiOne.internalLaborCostEstimation)"></el-progress> 1387 :format="() => customFormat(duibiOne.internalLaborCostEstimation)"></el-progress>
1345 </div> 1388 </div>
1346 <div class="jindutiao"> 1389 <div class="jindutiao">
1347 <div style="margin-right:10px;width:56px">设备</div> 1390 <div style="margin-right:10px;width:56px">设备</div>
1348 - <!-- <el-progress :text-inside="true" :stroke-width="26" :format="format(xiaoduiObj.shou)" :percentage="xiaoduiObj.shouBi"></el-progress> -->  
1349 <el-progress style="width: 150px;" :text-inside="true" :stroke-width="20" 1391 <el-progress style="width: 150px;" :text-inside="true" :stroke-width="20"
1350 :percentage="baifenbi(duibiOne.setCostEstimate)" status="success" 1392 :percentage="baifenbi(duibiOne.setCostEstimate)" status="success"
1351 :format="() => customFormat(duibiOne.setCostEstimate)"></el-progress> 1393 :format="() => customFormat(duibiOne.setCostEstimate)"></el-progress>
1352 </div> 1394 </div>
1353 <div class="jindutiao"> 1395 <div class="jindutiao">
1354 <div style="margin-right:10px;width:56px">宣传</div> 1396 <div style="margin-right:10px;width:56px">宣传</div>
1355 - <!-- <el-progress :text-inside="true" :stroke-width="26" :format="format(xiaoduiObj.shou)" :percentage="xiaoduiObj.shouBi"></el-progress> --> 1397 +
1356 <el-progress style="width: 150px;" :text-inside="true" :stroke-width="20" 1398 <el-progress style="width: 150px;" :text-inside="true" :stroke-width="20"
1357 :percentage="baifenbi(duibiOne.estimatedPromotionalExpenses)" status="success" 1399 :percentage="baifenbi(duibiOne.estimatedPromotionalExpenses)" status="success"
1358 :format="() => customFormat(duibiOne.estimatedPromotionalExpenses)"></el-progress> 1400 :format="() => customFormat(duibiOne.estimatedPromotionalExpenses)"></el-progress>
1359 </div> 1401 </div>
1360 <div class="jindutiao"> 1402 <div class="jindutiao">
1361 <div style="margin-right:10px;width:56px">其他</div> 1403 <div style="margin-right:10px;width:56px">其他</div>
1362 - <!-- <el-progress :text-inside="true" :stroke-width="26" :format="format(xiaoduiObj.shou)" :percentage="xiaoduiObj.shouBi"></el-progress> --> 1404 +
1363 <el-progress style="width: 150px;" :text-inside="true" :stroke-width="20" 1405 <el-progress style="width: 150px;" :text-inside="true" :stroke-width="20"
1364 :percentage="baifenbi(duibiOne.otherNecessaryEstimates)" status="success" 1406 :percentage="baifenbi(duibiOne.otherNecessaryEstimates)" status="success"
1365 :format="() => customFormat(duibiOne.otherNecessaryEstimates)"></el-progress> 1407 :format="() => customFormat(duibiOne.otherNecessaryEstimates)"></el-progress>
1366 </div> 1408 </div>
1367 - </div>  
1368 - <div style="width:30%"> 1409 + </div> -->
  1410 + <!-- <div style="width:30%">
1369 <div style="display: flex;"> 1411 <div style="display: flex;">
1370 <div style="margin-right: 10px;padding: 10px 0;"> 1412 <div style="margin-right: 10px;padding: 10px 0;">
1371 <div>调整后方案</div> 1413 <div>调整后方案</div>
@@ -1380,7 +1422,7 @@ @@ -1380,7 +1422,7 @@
1380 <div style="padding:30px 0">计划任务（完成度）</div> 1422 <div style="padding:30px 0">计划任务（完成度）</div>
1381 <div class="jindutiao"> 1423 <div class="jindutiao">
1382 <div style="margin-right:10px;width:56px">直接收入</div> 1424 <div style="margin-right:10px;width:56px">直接收入</div>
1383 - <!-- <el-progress :text-inside="true" :stroke-width="26" :format="format(xiaoduiObj.shou)" :percentage="xiaoduiObj.shouBi"></el-progress> --> 1425 +
1384 <el-progress style="width: 150px;" :text-inside="true" :stroke-width="20" 1426 <el-progress style="width: 150px;" :text-inside="true" :stroke-width="20"
1385 :percentage="baifenbi(duibiTwo.expectedDirectBenefits==undefined?'':duibiTwo.expectedDirectBenefits)" 1427 :percentage="baifenbi(duibiTwo.expectedDirectBenefits==undefined?'':duibiTwo.expectedDirectBenefits)"
1386 status="success" 1428 status="success"
@@ -1388,7 +1430,7 @@ @@ -1388,7 +1430,7 @@
1388 </div> 1430 </div>
1389 <div class="jindutiao"> 1431 <div class="jindutiao">
1390 <div style="margin-right:10px;width:56px">间接收入</div> 1432 <div style="margin-right:10px;width:56px">间接收入</div>
1391 - <!-- <el-progress :text-inside="true" :stroke-width="26" :format="format(xiaoduiObj.shou)" :percentage="xiaoduiObj.shouBi"></el-progress> --> 1433 +
1392 <el-progress style="width: 150px;" :text-inside="true" :stroke-width="20" 1434 <el-progress style="width: 150px;" :text-inside="true" :stroke-width="20"
1393 :percentage="baifenbi(duibiTwo.expectedIndirectBenefits==undefined?'':duibiTwo.expectedIndirectBenefits)" 1435 :percentage="baifenbi(duibiTwo.expectedIndirectBenefits==undefined?'':duibiTwo.expectedIndirectBenefits)"
1394 status="success" 1436 status="success"
@@ -1396,7 +1438,7 @@ @@ -1396,7 +1438,7 @@
1396 </div> 1438 </div>
1397 <div class="jindutiao"> 1439 <div class="jindutiao">
1398 <div style="margin-right:10px;width:56px">人力</div> 1440 <div style="margin-right:10px;width:56px">人力</div>
1399 - <!-- <el-progress :text-inside="true" :stroke-width="26" :format="format(xiaoduiObj.shou)" :percentage="xiaoduiObj.shouBi"></el-progress> --> 1441 +
1400 <el-progress style="width: 150px;" :text-inside="true" :stroke-width="20" 1442 <el-progress style="width: 150px;" :text-inside="true" :stroke-width="20"
1401 :percentage="baifenbi(duibiTwo.internalLaborCostEstimation==undefined?'':duibiTwo.internalLaborCostEstimation)" 1443 :percentage="baifenbi(duibiTwo.internalLaborCostEstimation==undefined?'':duibiTwo.internalLaborCostEstimation)"
1402 status="success" 1444 status="success"
@@ -1404,7 +1446,7 @@ @@ -1404,7 +1446,7 @@
1404 </div> 1446 </div>
1405 <div class="jindutiao"> 1447 <div class="jindutiao">
1406 <div style="margin-right:10px;width:56px">设备</div> 1448 <div style="margin-right:10px;width:56px">设备</div>
1407 - <!-- <el-progress :text-inside="true" :stroke-width="26" :format="format(xiaoduiObj.shou)" :percentage="xiaoduiObj.shouBi"></el-progress> --> 1449 +
1408 <el-progress style="width: 150px;" :text-inside="true" :stroke-width="20" 1450 <el-progress style="width: 150px;" :text-inside="true" :stroke-width="20"
1409 :percentage="baifenbi(duibiTwo.setCostEstimate==undefined?'':duibiTwo.setCostEstimate)" 1451 :percentage="baifenbi(duibiTwo.setCostEstimate==undefined?'':duibiTwo.setCostEstimate)"
1410 status="success" 1452 status="success"
@@ -1412,7 +1454,7 @@ @@ -1412,7 +1454,7 @@
1412 </div> 1454 </div>
1413 <div class="jindutiao"> 1455 <div class="jindutiao">
1414 <div style="margin-right:10px;width:56px">宣传</div> 1456 <div style="margin-right:10px;width:56px">宣传</div>
1415 - <!-- <el-progress :text-inside="true" :stroke-width="26" :format="format(xiaoduiObj.shou)" :percentage="xiaoduiObj.shouBi"></el-progress> --> 1457 +
1416 <el-progress style="width: 150px;" :text-inside="true" :stroke-width="20" 1458 <el-progress style="width: 150px;" :text-inside="true" :stroke-width="20"
1417 :percentage="baifenbi(duibiTwo.estimatedPromotionalExpenses==undefined?'':duibiTwo.estimatedPromotionalExpenses)" 1459 :percentage="baifenbi(duibiTwo.estimatedPromotionalExpenses==undefined?'':duibiTwo.estimatedPromotionalExpenses)"
1418 status="success" 1460 status="success"
@@ -1425,8 +1467,8 @@ @@ -1425,8 +1467,8 @@
1425 status="success" 1467 status="success"
1426 :format="() => customFormat(duibiTwo.otherNecessaryEstimates==undefined?'':duibiTwo.otherNecessaryEstimates)"></el-progress> 1468 :format="() => customFormat(duibiTwo.otherNecessaryEstimates==undefined?'':duibiTwo.otherNecessaryEstimates)"></el-progress>
1427 </div> 1469 </div>
1428 - </div>  
1429 - </div> 1470 + </div> -->
  1471 +
1430 </el-dialog> 1472 </el-dialog>
1431 1473
1432 1474
@@ -1516,7 +1558,8 @@ @@ -1516,7 +1558,8 @@
1516 excelQueryByPage, 1558 excelQueryByPage,
1517 excelAdd, 1559 excelAdd,
1518 effectEvaluation, 1560 effectEvaluation,
1519 - lishiDeta 1561 + lishiDeta,
  1562 + effectivenessLog
1520 } from '../../api/activityBz' 1563 } from '../../api/activityBz'
1521 import actbians from "./activityBian" 1564 import actbians from "./activityBian"
1522 import * as echarts from 'echarts' 1565 import * as echarts from 'echarts'
@@ -1691,7 +1734,8 @@ @@ -1691,7 +1734,8 @@
1691 pageNumber: 1, 1734 pageNumber: 1,
1692 pageSize: 10, 1735 pageSize: 10,
1693 dataOwnership: '1', 1736 dataOwnership: '1',
1694 - isDraft: 0 1737 + isDraft: 0,
  1738 + state: '5'
1695 }, 1739 },
1696 multipleSelection: [], 1740 multipleSelection: [],
1697 options: [], 1741 options: [],
@@ -1731,9 +1775,14 @@ @@ -1731,9 +1775,14 @@
1731 }, 1775 },
1732 lishiList: null, 1776 lishiList: null,
1733 labelStyle: { 1777 labelStyle: {
1734 - width: '197px', 1778 + width: '250px',
1735 height: '42px', 1779 height: '42px',
1736 }, 1780 },
  1781 + contentStyle: {
  1782 + width: '300px',
  1783 +
  1784 + // height:'42px',
  1785 + },
1737 labelStyleOne: { 1786 labelStyleOne: {
1738 width: '94px', 1787 width: '94px',
1739 height: '42px', 1788 height: '42px',
@@ -1751,7 +1800,12 @@ @@ -1751,7 +1800,12 @@
1751 jiucuoShow: false, 1800 jiucuoShow: false,
1752 jiuMsg: '', 1801 jiuMsg: '',
1753 editId: '', 1802 editId: '',
1754 - zhixingqingk: '' 1803 + zhixingqingk: '',
  1804 + effectivenessList: [],
  1805 + ListOne: '',
  1806 + ListTwo: '',
  1807 + effectivenessListOne: {},
  1808 + effectivenessListTwo: {}
1755 } 1809 }
1756 }, 1810 },
1757 created() { 1811 created() {
@@ -1853,6 +1907,16 @@ @@ -1853,6 +1907,16 @@
1853 const res = await danqueryById(this.formSear) 1907 const res = await danqueryById(this.formSear)
1854 this.tableData = res.data.content 1908 this.tableData = res.data.content
1855 }, 1909 },
  1910 + formatTimestampToDate(timestamp) {
  1911 + const date = new Date(timestamp);
  1912 + const year = date.getFullYear();
  1913 + const month = String(date.getMonth() + 1).padStart(2, '0');
  1914 + const day = String(date.getDate()).padStart(2, '0');
  1915 + const hours = String(date.getHours()).padStart(2, '0');
  1916 + const minutes = String(date.getMinutes()).padStart(2, '0');
  1917 + const seconds = String(date.getSeconds()).padStart(2, '0');
  1918 + return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
  1919 + },
1856 //重置按钮 1920 //重置按钮
1857 resetting() { 1921 resetting() {
1858 this.formSear = { 1922 this.formSear = {
@@ -1885,7 +1949,13 @@ @@ -1885,7 +1949,13 @@
1885 } else if (val == 3) { 1949 } else if (val == 3) {
1886 this.zhixingBian = flag 1950 this.zhixingBian = flag
1887 this.activeName = 'fourd' 1951 this.activeName = 'fourd'
  1952 +
1888 } 1953 }
  1954 + effectivenessLog({
  1955 + activityEffectivenessId: item.id
  1956 + }).then(res => {
  1957 + this.effectivenessList = res.data
  1958 + })
1889 this.liData = [] 1959 this.liData = []
1890 1960
1891 this.editId = item.id 1961 this.editId = item.id
@@ -1972,7 +2042,7 @@ @@ -1972,7 +2042,7 @@
1972 }).then(res => { 2042 }).then(res => {
1973 this.secondData = res.data.content[0] 2043 this.secondData = res.data.content[0]
1974 //基本信息 2044 //基本信息
1975 - that.id=res.data.content[0].id 2045 + that.id = res.data.content[0].id
1976 that.text = res.data.content[0].planName 2046 that.text = res.data.content[0].planName
1977 that.tableData1[0].eventTheme = res.data.content[0].planType 2047 that.tableData1[0].eventTheme = res.data.content[0].planType
1978 that.tableData1[0].planName = res.data.content[0].eventAddrs 2048 that.tableData1[0].planName = res.data.content[0].eventAddrs
@@ -1999,10 +2069,10 @@ @@ -1999,10 +2069,10 @@
1999 that.tableData4[0].eventTheme = res.data.content[0].expectedDirectBenefits 2069 that.tableData4[0].eventTheme = res.data.content[0].expectedDirectBenefits
2000 that.tableData4[0].planName = res.data.content[0].expectedIndirectBenefits 2070 that.tableData4[0].planName = res.data.content[0].expectedIndirectBenefits
2001 //系统信息 2071 //系统信息
2002 - that.createUser = res.data.content[0].createUser  
2003 - that.createDate = res.data.content[0].createDate  
2004 - that.tableData5[0].planName = res.data.content[0].updateDate  
2005 - that.tableData5[0].eventTheme = res.data.content[0].updateUser 2072 + that.createUser = res.data.content[0].createUser
  2073 + that.createDate = res.data.content[0].createDate
  2074 + that.tableData5[0].planName = res.data.content[0].updateDate
  2075 + that.tableData5[0].eventTheme = res.data.content[0].updateUser
2006 2076
2007 }).catch(err => { 2077 }).catch(err => {
2008 console.log(err) 2078 console.log(err)
@@ -2228,32 +2298,43 @@ @@ -2228,32 +2298,43 @@
2228 this.duibiOne = item 2298 this.duibiOne = item
2229 console.log(item) 2299 console.log(item)
2230 let that = this 2300 let that = this
2231 - actPage({  
2232 - detailsId: item.id,  
2233 - pageNumber: 1,  
2234 - pageSize: 10, 2301 + effectivenessLog({
  2302 + activityEffectivenessId: item.id
2235 }).then(res => { 2303 }).then(res => {
2236 - this.duibiTwo = res.data.content[0] === undefined ? {} : res.data.content[0];  
2237 - if (res.data.content[0] === undefined || res.data.content[0].totalCostEstimation == '') {  
2238 - that.xiaoduiObj.biliTwo = '0%'  
2239 - that.xiaoduiObj.biliT = 0  
2240 - } else {  
2241 - that.xiaoduiObj.biliT = that.duibiTwo.internalLaborCostEstimation / that.duibiTwo  
2242 - .totalCostEstimation * 100  
2243 - that.xiaoduiObj.biliTwo =  
2244 - `${Math.round(that.duibiTwo.internalLaborCostEstimation / that.duibiTwo.totalCostEstimation*100)}%`  
2245 - }  
2246 - 2304 + console.log(res.data, 'effectivenessListeffectivenessList')
  2305 + this.effectivenessList = res.data
2247 }) 2306 })
2248 - if (that.duibiOne.totalCostEstimation == '') {  
2249 - that.xiaoduiObj.biliOne = '0%'  
2250 - that.xiaoduiObj.bilis = 0  
2251 - } else {  
2252 - that.xiaoduiObj.bilis = that.duibiOne.internalLaborCostEstimation / that.duibiOne  
2253 - .totalCostEstimation * 100  
2254 - that.xiaoduiObj.biliOne =  
2255 - `${Math.round(that.duibiOne.internalLaborCostEstimation / that.duibiOne.totalCostEstimation*100)}%`  
2256 - } 2307 + this.ListOne =''
  2308 + this.ListTwo = ''
  2309 + this.effectivenessListOne ={}
  2310 + this.effectivenessListTwo = {}
  2311 +
  2312 + // actPage({
  2313 + // detailsId: item.id,
  2314 + // pageNumber: 1,
  2315 + // pageSize: 10,
  2316 + // }).then(res => {
  2317 + // this.duibiTwo = res.data.content[0] === undefined ? {} : res.data.content[0];
  2318 + // if (res.data.content[0] === undefined || res.data.content[0].totalCostEstimation == '') {
  2319 + // that.xiaoduiObj.biliTwo = '0%'
  2320 + // that.xiaoduiObj.biliT = 0
  2321 + // } else {
  2322 + // that.xiaoduiObj.biliT = that.duibiTwo.internalLaborCostEstimation / that.duibiTwo
  2323 + // .totalCostEstimation * 100
  2324 + // that.xiaoduiObj.biliTwo =
  2325 + // `${Math.round(that.duibiTwo.internalLaborCostEstimation / that.duibiTwo.totalCostEstimation*100)}%`
  2326 + // }
  2327 +
  2328 + // })
  2329 + // if (that.duibiOne.totalCostEstimation == '') {
  2330 + // that.xiaoduiObj.biliOne = '0%'
  2331 + // that.xiaoduiObj.bilis = 0
  2332 + // } else {
  2333 + // that.xiaoduiObj.bilis = that.duibiOne.internalLaborCostEstimation / that.duibiOne
  2334 + // .totalCostEstimation * 100
  2335 + // that.xiaoduiObj.biliOne =
  2336 + // `${Math.round(that.duibiOne.internalLaborCostEstimation / that.duibiOne.totalCostEstimation*100)}%`
  2337 + // }
2257 2338
2258 2339
2259 2340
@@ -2289,14 +2370,14 @@ @@ -2289,14 +2370,14 @@
2289 }, 2370 },
2290 2371
2291 2372
2292 - customFormat(percentage) {  
2293 - let zong  
2294 - if (percentage == undefined || percentage === null || percentage == '') {  
2295 - percentage = 0  
2296 - zong = 10000  
2297 - }  
2298 - return `${percentage} / ${percentage==''?zong:parseInt(percentage) *10}`;  
2299 - }, 2373 + // customFormat(percentage) {
  2374 + // let zong
  2375 + // if (percentage == undefined || percentage === null || percentage == '') {
  2376 + // percentage = 0
  2377 + // zong = 10000
  2378 + // }
  2379 + // return `${percentage} / ${percentage==''?zong:parseInt(percentage) *10}`;
  2380 + // },
2300 baifenbi(item) { 2381 baifenbi(item) {
2301 2382
2302 let zong 2383 let zong
@@ -2414,11 +2495,107 @@ @@ -2414,11 +2495,107 @@
2414 this.searchShow = true 2495 this.searchShow = true
2415 }, 2496 },
2416 lichange(e) { 2497 lichange(e) {
2417 - this.lishiList = e  
2418 - let msg = this.liData[e]  
2419 - this.duibiList = JSON.parse(msg.modifyContent)  
2420 - this.lixiang = JSON.parse(msg.originalData)  
2421 - 2498 +
  2499 + // this.lishiList = e
  2500 + let msg = this.effectivenessList[e]
  2501 + // this.duibiList = JSON.parse(msg.modifyContent)
  2502 +
  2503 + this.duibiList = JSON.parse(msg.modifiedData)
  2504 +console.log(this.duibiList,'msgmsgmsg')
  2505 + },
  2506 + lichangeOne(e) {
  2507 + this.effectivenessListOne = JSON.parse(e.modifiedData)
  2508 + if (this.effectivenessListOne.internalLaborCostEstimation != '' && this.effectivenessListTwo
  2509 + .internalLaborCostEstimation != '') {
  2510 + this.effectivenessListOne.sumNei = Number(this.effectivenessListOne.internalLaborCostEstimation) /
  2511 + Number(this.effectivenessListTwo.internalLaborCostEstimation) * 100
  2512 + }
  2513 + if (this.effectivenessListOne.externalLaborCostEstimation != '' && this.effectivenessListTwo
  2514 + .externalLaborCostEstimation != '') {
  2515 + this.effectivenessListOne.sumWai = Number(this.effectivenessListOne.externalLaborCostEstimation) /
  2516 + Number(this.effectivenessListTwo.externalLaborCostEstimation) * 100
  2517 + }
  2518 + if (this.effectivenessListOne.costEstimationGoods != '' && this.effectivenessListTwo
  2519 + .costEstimationGoods != '') {
  2520 + this.effectivenessListOne.sumShop = Number(this.effectivenessListOne.costEstimationGoods) /
  2521 + Number(this.effectivenessListTwo.costEstimationGoods) * 100
  2522 + }
  2523 + if (this.effectivenessListOne.setCostEstimate != '' && this.effectivenessListTwo
  2524 + .setCostEstimate != '') {
  2525 + this.effectivenessListOne.sumSe = Number(this.effectivenessListOne.setCostEstimate) /
  2526 + Number(this.effectivenessListTwo.setCostEstimate) * 100
  2527 + }
  2528 + if (this.effectivenessListOne.estimatedPromotionalExpenses != '' && this.effectivenessListTwo
  2529 + .estimatedPromotionalExpenses != '') {
  2530 + this.effectivenessListOne.sumXuan = Number(this.effectivenessListOne.estimatedPromotionalExpenses) /
  2531 + Number(this.effectivenessListTwo.estimatedPromotionalExpenses) * 100
  2532 + }
  2533 + if (this.effectivenessListOne.otherNecessaryEstimates != '' && this.effectivenessListTwo
  2534 + .otherNecessaryEstimates != '') {
  2535 + this.effectivenessListOne.sumQi = Number(this.effectivenessListOne.otherNecessaryEstimates) /
  2536 + Number(this.effectivenessListTwo.otherNecessaryEstimates) * 100
  2537 + }
  2538 + if (this.effectivenessListOne.totalCostEstimation != '' && this.effectivenessListTwo
  2539 + .totalCostEstimation != '') {
  2540 +
  2541 + this.effectivenessListOne.sumAll = Number(this.effectivenessListOne.totalCostEstimation) /
  2542 + Number(this.effectivenessListTwo.totalCostEstimation) * 100
  2543 + }
  2544 + // sumNei
  2545 + // sumWai
  2546 + // sumShop
  2547 + // sumSe
  2548 + // sumXuan
  2549 + // sumQi
  2550 + // sumAll
  2551 + // internalLaborCostEstimation
  2552 + // externalLaborCostEstimation
  2553 + // costEstimationGoods
  2554 + // setCostEstimate
  2555 + // estimatedPromotionalExpenses
  2556 + // otherNecessaryEstimates
  2557 + // totalCostEstimation
  2558 +
  2559 + console.log(JSON.parse(e.modifiedData))
  2560 + },
  2561 + lichangeTwo(e) {
  2562 + this.effectivenessListTwo = JSON.parse(e.modifiedData)
  2563 + if (this.effectivenessListOne.internalLaborCostEstimation != '' && this.effectivenessListTwo
  2564 + .internalLaborCostEstimation != '') {
  2565 + this.effectivenessListOne.sumNei = Number(this.effectivenessListOne.internalLaborCostEstimation) /
  2566 + Number(this.effectivenessListTwo.internalLaborCostEstimation) * 100
  2567 + }
  2568 + if (this.effectivenessListOne.externalLaborCostEstimation != '' && this.effectivenessListTwo
  2569 + .externalLaborCostEstimation != '') {
  2570 + this.effectivenessListOne.sumWai = Number(this.effectivenessListOne.externalLaborCostEstimation) /
  2571 + Number(this.effectivenessListTwo.externalLaborCostEstimation) * 100
  2572 + }
  2573 + if (this.effectivenessListOne.costEstimationGoods != '' && this.effectivenessListTwo
  2574 + .costEstimationGoods != '') {
  2575 + this.effectivenessListOne.sumShop = Number(this.effectivenessListOne.costEstimationGoods) /
  2576 + Number(this.effectivenessListTwo.costEstimationGoods) * 100
  2577 + }
  2578 + if (this.effectivenessListOne.setCostEstimate != '' && this.effectivenessListTwo
  2579 + .setCostEstimate != '') {
  2580 + this.effectivenessListOne.sumSe = Number(this.effectivenessListOne.setCostEstimate) /
  2581 + Number(this.effectivenessListTwo.setCostEstimate) * 100
  2582 + }
  2583 + if (this.effectivenessListOne.estimatedPromotionalExpenses != '' && this.effectivenessListTwo
  2584 + .estimatedPromotionalExpenses != '') {
  2585 + this.effectivenessListOne.sumXuan = Number(this.effectivenessListOne.estimatedPromotionalExpenses) /
  2586 + Number(this.effectivenessListTwo.estimatedPromotionalExpenses) * 100
  2587 + }
  2588 + if (this.effectivenessListOne.otherNecessaryEstimates != '' && this.effectivenessListTwo
  2589 + .otherNecessaryEstimates != '') {
  2590 + this.effectivenessListOne.sumQi = Number(this.effectivenessListOne.otherNecessaryEstimates) /
  2591 + Number(this.effectivenessListTwo.otherNecessaryEstimates) * 100
  2592 + }
  2593 + if (this.effectivenessListOne.totalCostEstimation != '' && this.effectivenessListTwo
  2594 + .totalCostEstimation != '') {
  2595 +
  2596 + this.effectivenessListOne.sumAll = Number(this.effectivenessListOne.totalCostEstimation) /
  2597 + Number(this.effectivenessListTwo.totalCostEstimation) * 100
  2598 + }
2422 }, 2599 },
2423 tiaozheng() { 2600 tiaozheng() {
2424 this.tiaozhengShow = true 2601 this.tiaozhengShow = true
admin-web-master/src/views/activity/activitySp.vue
  View file @ffe3ff4
@@ -848,11 +848,11 @@ @@ -848,11 +848,11 @@
848 min-width="22%"> 848 min-width="22%">
849 849
850 </el-table-column> 850 </el-table-column>
851 - <el-table-column label="预估数量" prop="estimatedQuantity" width="auto" 851 + <el-table-column label="实际数量" prop="estimatedQuantity" width="auto"
852 min-width="15%"> 852 min-width="15%">
853 853
854 </el-table-column> 854 </el-table-column>
855 - <el-table-column label="预估费用(/元)" prop="estimatedCost" width="auto" min-width="15%"> 855 + <el-table-column label="实际费用(/元)" prop="estimatedCost" width="auto" min-width="15%">
856 </el-table-column> 856 </el-table-column>
857 <el-table-column prop="notes" label="备注" width="auto" min-width="15%"> 857 <el-table-column prop="notes" label="备注" width="auto" min-width="15%">
858 </el-table-column> 858 </el-table-column>
@@ -880,7 +880,7 @@ @@ -880,7 +880,7 @@
880 label-width="120px" style="position: relative"> 880 label-width="120px" style="position: relative">
881 <el-row :gutter="20"> 881 <el-row :gutter="20">
882 <el-col :span="8"> 882 <el-col :span="8">
883 - <el-form-item label="内部人力成本预估(/元)" 883 + <el-form-item label="实际内部人力成本(/元)"
884 class="grid-content bg-purple device-from" prop="name"> 884 class="grid-content bg-purple device-from" prop="name">
885 <el-input v-model="zhixingList.internalLaborCostEstimation" 885 <el-input v-model="zhixingList.internalLaborCostEstimation"
886 placeholder="请输入" v-if="zhixingBian" /> 886 placeholder="请输入" v-if="zhixingBian" />
@@ -888,7 +888,7 @@ @@ -888,7 +888,7 @@
888 </el-form-item> 888 </el-form-item>
889 </el-col> 889 </el-col>
890 <el-col :span="8"> 890 <el-col :span="8">
891 - <el-form-item label="外部人力成本预估(/元)" class="grid-content bg-purple" 891 + <el-form-item label="实际外部人力成本(/元)" class="grid-content bg-purple"
892 prop="name"> 892 prop="name">
893 <el-input v-model="zhixingList.externalLaborCostEstimation" 893 <el-input v-model="zhixingList.externalLaborCostEstimation"
894 placeholder="请输入" v-if="zhixingBian" /> 894 placeholder="请输入" v-if="zhixingBian" />
@@ -897,7 +897,7 @@ @@ -897,7 +897,7 @@
897 </el-col> 897 </el-col>
898 898
899 <el-col :span="8"> 899 <el-col :span="8">
900 - <el-form-item label="商品成本预估(/元)" class="grid-content bg-purple" prop="name"> 900 + <el-form-item label="实际商品成本(/元)" class="grid-content bg-purple" prop="name">
901 <el-input v-model="zhixingList.costEstimationGoods" 901 <el-input v-model="zhixingList.costEstimationGoods"
902 placeholder="请输入" v-if="zhixingBian" /> 902 placeholder="请输入" v-if="zhixingBian" />
903 <div v-else>{{ zhixingList.costEstimationGoods }}</div> 903 <div v-else>{{ zhixingList.costEstimationGoods }}</div>
@@ -907,21 +907,21 @@ @@ -907,21 +907,21 @@
907 907
908 <el-row :gutter="20"> 908 <el-row :gutter="20">
909 <el-col :span="8"> 909 <el-col :span="8">
910 - <el-form-item label="设备成本(/元)" class="grid-content bg-purple" prop="name"> 910 + <el-form-item label="实际设备成本(/元)" class="grid-content bg-purple" prop="name">
911 <el-input v-model="zhixingList.setCostEstimate" placeholder="请输入" 911 <el-input v-model="zhixingList.setCostEstimate" placeholder="请输入"
912 v-if="zhixingBian" /> 912 v-if="zhixingBian" />
913 <div v-else>{{ zhixingList.setCostEstimate }}</div> 913 <div v-else>{{ zhixingList.setCostEstimate }}</div>
914 </el-form-item> 914 </el-form-item>
915 </el-col> 915 </el-col>
916 <el-col :span="8"> 916 <el-col :span="8">
917 - <el-form-item label="宣传费用(/元)" class="grid-content bg-purple" prop="name"> 917 + <el-form-item label="实际宣传费用(/元)" class="grid-content bg-purple" prop="name">
918 <el-input v-model="zhixingList.estimatedPromotionalExpenses" 918 <el-input v-model="zhixingList.estimatedPromotionalExpenses"
919 placeholder="请输入" v-if="zhixingBian" /> 919 placeholder="请输入" v-if="zhixingBian" />
920 <div v-else>{{ zhixingList.estimatedPromotionalExpenses }}</div> 920 <div v-else>{{ zhixingList.estimatedPromotionalExpenses }}</div>
921 </el-form-item> 921 </el-form-item>
922 </el-col> 922 </el-col>
923 <el-col :span="8"> 923 <el-col :span="8">
924 - <el-form-item label="其他成本(/元)" class="grid-content bg-purple" prop="name"> 924 + <el-form-item label="实际其他成本(/元)" class="grid-content bg-purple" prop="name">
925 <el-input v-model="zhixingList.otherNecessaryEstimates" 925 <el-input v-model="zhixingList.otherNecessaryEstimates"
926 placeholder="请输入" v-if="zhixingBian" /> 926 placeholder="请输入" v-if="zhixingBian" />
927 <div v-else>{{ zhixingList.otherNecessaryEstimates }}</div> 927 <div v-else>{{ zhixingList.otherNecessaryEstimates }}</div>
@@ -931,7 +931,7 @@ @@ -931,7 +931,7 @@
931 931
932 <el-row :gutter="20"> 932 <el-row :gutter="20">
933 <el-col :span="8"> 933 <el-col :span="8">
934 - <el-form-item label="总成本(/元)" prop="name" class="grid-content bg-purple"> 934 + <el-form-item label="实际总成本(/元)" prop="name" class="grid-content bg-purple">
935 <el-input v-model="zhixingList.totalCostEstimation" 935 <el-input v-model="zhixingList.totalCostEstimation"
936 placeholder="请输入" v-if="zhixingBian" /> 936 placeholder="请输入" v-if="zhixingBian" />
937 <div v-else>{{ zhixingList.totalCostEstimation }}</div> 937 <div v-else>{{ zhixingList.totalCostEstimation }}</div>
@@ -962,7 +962,7 @@ @@ -962,7 +962,7 @@
962 label-width="120px" style="position: relative"> 962 label-width="120px" style="position: relative">
963 <el-row :gutter="20"> 963 <el-row :gutter="20">
964 <el-col :span="8"> 964 <el-col :span="8">
965 - <el-form-item label="吸引流量" class="grid-content bg-purple device-from" 965 + <el-form-item label="实际吸引流量" class="grid-content bg-purple device-from"
966 prop="name"> 966 prop="name">
967 <el-input v-model="zhixingList.expectedAttractTraffic" 967 <el-input v-model="zhixingList.expectedAttractTraffic"
968 placeholder="请输入" v-if="zhixingBian" /> 968 placeholder="请输入" v-if="zhixingBian" />
@@ -970,7 +970,7 @@ @@ -970,7 +970,7 @@
970 </el-form-item> 970 </el-form-item>
971 </el-col> 971 </el-col>
972 <el-col :span="8"> 972 <el-col :span="8">
973 - <el-form-item label="参与人数" class="grid-content bg-purple" prop="name"> 973 + <el-form-item label="实际参与人数" class="grid-content bg-purple" prop="name">
974 <el-input v-model="zhixingList.expectedParticipation" 974 <el-input v-model="zhixingList.expectedParticipation"
975 placeholder="请输入" v-if="zhixingBian" /> 975 placeholder="请输入" v-if="zhixingBian" />
976 <div v-else>{{ zhixingList.expectedParticipation }}</div> 976 <div v-else>{{ zhixingList.expectedParticipation }}</div>
@@ -978,7 +978,7 @@ @@ -978,7 +978,7 @@
978 </el-col> 978 </el-col>
979 979
980 <el-col :span="8"> 980 <el-col :span="8">
981 - <el-form-item label="直接收益(/元)" class="grid-content bg-purple" prop="name"> 981 + <el-form-item label="实际直接收益(/元)" class="grid-content bg-purple" prop="name">
982 <el-input v-model="zhixingList.expectedDirectBenefits" 982 <el-input v-model="zhixingList.expectedDirectBenefits"
983 placeholder="请输入" v-if="zhixingBian" /> 983 placeholder="请输入" v-if="zhixingBian" />
984 <div v-else>{{ zhixingList.expectedDirectBenefits }}</div> 984 <div v-else>{{ zhixingList.expectedDirectBenefits }}</div>
@@ -987,7 +987,7 @@ @@ -987,7 +987,7 @@
987 </el-row> 987 </el-row>
988 <el-row :gutter="20"> 988 <el-row :gutter="20">
989 <el-col :span="8"> 989 <el-col :span="8">
990 - <el-form-item label="间接收益(/元)" class="grid-content bg-purple" prop="name"> 990 + <el-form-item label="实际间接收益(/元)" class="grid-content bg-purple" prop="name">
991 <el-input v-model="zhixingList.expectedIndirectBenefits" 991 <el-input v-model="zhixingList.expectedIndirectBenefits"
992 placeholder="请输入" v-if="zhixingBian" /> 992 placeholder="请输入" v-if="zhixingBian" />
993 <div v-else>{{ zhixingList.expectedIndirectBenefits }}</div> 993 <div v-else>{{ zhixingList.expectedIndirectBenefits }}</div>
admin-web-master/src/views/activity/index.vue
  View file @ffe3ff4
@@ -848,10 +848,10 @@ @@ -848,10 +848,10 @@
848 <el-table-column label="明细项名称" prop="detailLtemName" width="auto" min-width="22%"> 848 <el-table-column label="明细项名称" prop="detailLtemName" width="auto" min-width="22%">
849 849
850 </el-table-column> 850 </el-table-column>
851 - <el-table-column label="预估数量" prop="estimatedQuantity" width="auto" min-width="15%"> 851 + <el-table-column label="实际数量" prop="estimatedQuantity" width="auto" min-width="15%">
852 852
853 </el-table-column> 853 </el-table-column>
854 - <el-table-column label="预估费用(/元)" prop="estimatedCost" width="auto" min-width="15%"> 854 + <el-table-column label="实际费用(/元)" prop="estimatedCost" width="auto" min-width="15%">
855 </el-table-column> 855 </el-table-column>
856 <el-table-column prop="notes" label="备注" width="auto" min-width="15%"> 856 <el-table-column prop="notes" label="备注" width="auto" min-width="15%">
857 </el-table-column> 857 </el-table-column>
@@ -879,7 +879,7 @@ @@ -879,7 +879,7 @@
879 label-width="120px" style="position: relative"> 879 label-width="120px" style="position: relative">
880 <el-row :gutter="20"> 880 <el-row :gutter="20">
881 <el-col :span="8"> 881 <el-col :span="8">
882 - <el-form-item label="内部人力成本预估(/元)" class="grid-content bg-purple device-from" 882 + <el-form-item label="实际内部人力成本(/元)" class="grid-content bg-purple device-from"
883 prop="name"> 883 prop="name">
884 884
885 <el-input v-model="zhixingList.internalLaborCostEstimation" 885 <el-input v-model="zhixingList.internalLaborCostEstimation"
@@ -888,7 +888,7 @@ @@ -888,7 +888,7 @@
888 </el-form-item> 888 </el-form-item>
889 </el-col> 889 </el-col>
890 <el-col :span="8"> 890 <el-col :span="8">
891 - <el-form-item label="外部人力成本预估(/元)" class="grid-content bg-purple" prop="name"> 891 + <el-form-item label="实际外部人力成本(/元)" class="grid-content bg-purple" prop="name">
892 <el-input v-model="zhixingList.externalLaborCostEstimation" 892 <el-input v-model="zhixingList.externalLaborCostEstimation"
893 placeholder="请输入" v-if="zhixingBian" /> 893 placeholder="请输入" v-if="zhixingBian" />
894 <div v-else>{{ zhixingList.externalLaborCostEstimation }}</div> 894 <div v-else>{{ zhixingList.externalLaborCostEstimation }}</div>
@@ -896,7 +896,7 @@ @@ -896,7 +896,7 @@
896 </el-col> 896 </el-col>
897 897
898 <el-col :span="8"> 898 <el-col :span="8">
899 - <el-form-item label="商品成本预估(/元)" class="grid-content bg-purple" prop="name"> 899 + <el-form-item label="实际商品成本(/元)" class="grid-content bg-purple" prop="name">
900 <el-input v-model="zhixingList.costEstimationGoods" placeholder="请输入" 900 <el-input v-model="zhixingList.costEstimationGoods" placeholder="请输入"
901 v-if="zhixingBian" /> 901 v-if="zhixingBian" />
902 <div v-else>{{ zhixingList.costEstimationGoods }}</div> 902 <div v-else>{{ zhixingList.costEstimationGoods }}</div>
@@ -906,21 +906,21 @@ @@ -906,21 +906,21 @@
906 906
907 <el-row :gutter="20"> 907 <el-row :gutter="20">
908 <el-col :span="8"> 908 <el-col :span="8">
909 - <el-form-item label="设备成本(/元)" class="grid-content bg-purple" prop="name"> 909 + <el-form-item label="实际设备成本(/元)" class="grid-content bg-purple" prop="name">
910 <el-input v-model="zhixingList.setCostEstimate" placeholder="请输入" 910 <el-input v-model="zhixingList.setCostEstimate" placeholder="请输入"
911 v-if="zhixingBian" /> 911 v-if="zhixingBian" />
912 <div v-else>{{ zhixingList.setCostEstimate }}</div> 912 <div v-else>{{ zhixingList.setCostEstimate }}</div>
913 </el-form-item> 913 </el-form-item>
914 </el-col> 914 </el-col>
915 <el-col :span="8"> 915 <el-col :span="8">
916 - <el-form-item label="宣传费用(/元)" class="grid-content bg-purple" prop="name"> 916 + <el-form-item label="实际宣传费用(/元)" class="grid-content bg-purple" prop="name">
917 <el-input v-model="zhixingList.estimatedPromotionalExpenses" 917 <el-input v-model="zhixingList.estimatedPromotionalExpenses"
918 placeholder="请输入" v-if="zhixingBian" /> 918 placeholder="请输入" v-if="zhixingBian" />
919 <div v-else>{{ zhixingList.estimatedPromotionalExpenses }}</div> 919 <div v-else>{{ zhixingList.estimatedPromotionalExpenses }}</div>
920 </el-form-item> 920 </el-form-item>
921 </el-col> 921 </el-col>
922 <el-col :span="8"> 922 <el-col :span="8">
923 - <el-form-item label="其他成本(/元)" class="grid-content bg-purple" prop="name"> 923 + <el-form-item label="实际其他成本(/元)" class="grid-content bg-purple" prop="name">
924 <el-input v-model="zhixingList.otherNecessaryEstimates" 924 <el-input v-model="zhixingList.otherNecessaryEstimates"
925 placeholder="请输入" v-if="zhixingBian" /> 925 placeholder="请输入" v-if="zhixingBian" />
926 <div v-else>{{ zhixingList.otherNecessaryEstimates }}</div> 926 <div v-else>{{ zhixingList.otherNecessaryEstimates }}</div>
@@ -930,7 +930,7 @@ @@ -930,7 +930,7 @@
930 930
931 <el-row :gutter="20"> 931 <el-row :gutter="20">
932 <el-col :span="8"> 932 <el-col :span="8">
933 - <el-form-item label="总成本(/元)" prop="name" class="grid-content bg-purple"> 933 + <el-form-item label="实际总成本(/元)" prop="name" class="grid-content bg-purple">
934 <el-input v-model="zhixingList.totalCostEstimation" placeholder="请输入" 934 <el-input v-model="zhixingList.totalCostEstimation" placeholder="请输入"
935 v-if="zhixingBian" /> 935 v-if="zhixingBian" />
936 <div v-else>{{ zhixingList.totalCostEstimation }}</div> 936 <div v-else>{{ zhixingList.totalCostEstimation }}</div>
@@ -961,7 +961,7 @@ @@ -961,7 +961,7 @@
961 label-width="120px" style="position: relative"> 961 label-width="120px" style="position: relative">
962 <el-row :gutter="20"> 962 <el-row :gutter="20">
963 <el-col :span="8"> 963 <el-col :span="8">
964 - <el-form-item label="吸引流量" class="grid-content bg-purple device-from" 964 + <el-form-item label="实际吸引流量" class="grid-content bg-purple device-from"
965 prop="name"> 965 prop="name">
966 <el-input v-model="zhixingList.expectedAttractTraffic" placeholder="请输入" 966 <el-input v-model="zhixingList.expectedAttractTraffic" placeholder="请输入"
967 v-if="zhixingBian" /> 967 v-if="zhixingBian" />
@@ -969,7 +969,7 @@ @@ -969,7 +969,7 @@
969 </el-form-item> 969 </el-form-item>
970 </el-col> 970 </el-col>
971 <el-col :span="8"> 971 <el-col :span="8">
972 - <el-form-item label="参与人数" class="grid-content bg-purple" prop="name"> 972 + <el-form-item label="实际参与人数" class="grid-content bg-purple" prop="name">
973 <el-input v-model="zhixingList.expectedParticipation" placeholder="请输入" 973 <el-input v-model="zhixingList.expectedParticipation" placeholder="请输入"
974 v-if="zhixingBian" /> 974 v-if="zhixingBian" />
975 <div v-else>{{ zhixingList.expectedParticipation }}</div> 975 <div v-else>{{ zhixingList.expectedParticipation }}</div>
@@ -977,7 +977,7 @@ @@ -977,7 +977,7 @@
977 </el-col> 977 </el-col>
978 978
979 <el-col :span="8"> 979 <el-col :span="8">
980 - <el-form-item label="直接收益(/元)" class="grid-content bg-purple" prop="name"> 980 + <el-form-item label="实际直接收益(/元)" class="grid-content bg-purple" prop="name">
981 <el-input v-model="zhixingList.expectedDirectBenefits" placeholder="请输入" 981 <el-input v-model="zhixingList.expectedDirectBenefits" placeholder="请输入"
982 v-if="zhixingBian" /> 982 v-if="zhixingBian" />
983 <div v-else>{{ zhixingList.expectedDirectBenefits }}</div> 983 <div v-else>{{ zhixingList.expectedDirectBenefits }}</div>
@@ -986,7 +986,7 @@ @@ -986,7 +986,7 @@
986 </el-row> 986 </el-row>
987 <el-row :gutter="20"> 987 <el-row :gutter="20">
988 <el-col :span="8"> 988 <el-col :span="8">
989 - <el-form-item label="间接收益(/元)" class="grid-content bg-purple" prop="name"> 989 + <el-form-item label="实际间接收益(/元)" class="grid-content bg-purple" prop="name">
990 <el-input v-model="zhixingList.expectedIndirectBenefits" 990 <el-input v-model="zhixingList.expectedIndirectBenefits"
991 placeholder="请输入" v-if="zhixingBian" /> 991 placeholder="请输入" v-if="zhixingBian" />
992 <div v-else>{{ zhixingList.expectedIndirectBenefits }}</div> 992 <div v-else>{{ zhixingList.expectedIndirectBenefits }}</div>
@@ -1858,6 +1858,7 @@ @@ -1858,6 +1858,7 @@
1858 }).then(res => { 1858 }).then(res => {
1859 1859
1860 this.fenxiData = res.data 1860 this.fenxiData = res.data
  1861 + this.fenxiData.incomeAnalysis = Number(res.data.incomeAnalysis).toFixed(2)
1861 this.xiaoguoBox = true 1862 this.xiaoguoBox = true
1862 this.$nextTick(() => { 1863 this.$nextTick(() => {
1863 // this.shopLiu(this.$refs.shopL); 1864 // this.shopLiu(this.$refs.shopL);
admin-web-master/src/views/atmosphere/atmosphereBian.vue
  View file @ffe3ff4
@@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
29 </el-col> 29 </el-col>
30 30
31 <el-col :span="8"> 31 <el-col :span="8">
32 - <el-form-item label="活动地点" class="grid-content bg-purple" prop="eventAddrs"> 32 + <el-form-item label="氛围地点" class="grid-content bg-purple" prop="eventAddrs">
33 <el-input v-model="secondData.eventAddrs" placeholder="请输入" /> 33 <el-input v-model="secondData.eventAddrs" placeholder="请输入" />
34 </el-form-item> 34 </el-form-item>
35 </el-col> 35 </el-col>
@@ -37,7 +37,7 @@ @@ -37,7 +37,7 @@
37 37
38 <el-row :gutter="20"> 38 <el-row :gutter="20">
39 <el-col :span="8"> 39 <el-col :span="8">
40 - <el-form-item label="活动时间" class="grid-content bg-purple" prop="planTime" 40 + <el-form-item label="氛围时间" class="grid-content bg-purple" prop="planTime"
41 style="position: relative"> 41 style="position: relative">
42 <el-date-picker style="width: 100%;" v-model="planTime" value-format="yyyy-MM-dd HH:mm:ss" 42 <el-date-picker style="width: 100%;" v-model="planTime" value-format="yyyy-MM-dd HH:mm:ss"
43 type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" 43 type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
@@ -46,24 +46,24 @@ @@ -46,24 +46,24 @@
46 </el-form-item> 46 </el-form-item>
47 </el-col> 47 </el-col>
48 <el-col :span="8"> 48 <el-col :span="8">
49 - <el-form-item label="活动主题" class="grid-content bg-purple" prop="eventTheme"> 49 + <el-form-item label="氛围主题" class="grid-content bg-purple" prop="eventTheme">
50 <el-input v-model="secondData.eventTheme" placeholder="请输入" /> 50 <el-input v-model="secondData.eventTheme" placeholder="请输入" />
51 </el-form-item> 51 </el-form-item>
52 </el-col> 52 </el-col>
53 <el-col :span="8"> 53 <el-col :span="8">
54 - <el-form-item label="活动主办方" class="grid-content bg-purple" prop="sponsor"> 54 + <el-form-item label="氛围主办方" class="grid-content bg-purple" prop="sponsor">
55 <el-input v-model="secondData.sponsor" placeholder="请输入" /> 55 <el-input v-model="secondData.sponsor" placeholder="请输入" />
56 </el-form-item> 56 </el-form-item>
57 </el-col> 57 </el-col>
58 </el-row> 58 </el-row>
59 <el-row :gutter="20"> 59 <el-row :gutter="20">
60 <el-col :span="8"> 60 <el-col :span="8">
61 - <el-form-item label="活动参与方" prop="participants" class="grid-content bg-purple"> 61 + <el-form-item label="氛围参与方" prop="participants" class="grid-content bg-purple">
62 <el-input v-model="secondData.participants" placeholder="请输入" /> 62 <el-input v-model="secondData.participants" placeholder="请输入" />
63 </el-form-item> 63 </el-form-item>
64 </el-col> 64 </el-col>
65 <el-col :span="16"> 65 <el-col :span="16">
66 - <el-form-item label="活动主要目的" prop="mainPurpose" class="grid-content bg-purple"> 66 + <el-form-item label="氛围主要目的" prop="mainPurpose" class="grid-content bg-purple">
67 <el-input v-model="secondData.mainPurpose" placeholder="请输入" /> 67 <el-input v-model="secondData.mainPurpose" placeholder="请输入" />
68 </el-form-item> 68 </el-form-item>
69 </el-col> 69 </el-col>
@@ -82,7 +82,7 @@ @@ -82,7 +82,7 @@
82 <div style="padding: 10px"> 82 <div style="padding: 10px">
83 <el-row :gutter="20"> 83 <el-row :gutter="20">
84 <el-col :span="24"> 84 <el-col :span="24">
85 - <el-form-item label="活动封面海报" prop="coverPoster" class="grid-content bg-purple"> 85 + <el-form-item label="氛围封面海报" prop="coverPoster" class="grid-content bg-purple">
86 <upimg filePath="act" :value="secondData.coverPoster==''?'':secondData.coverPoster" inputtype="coverPoster" :limit="1" @changimg="e=>changimg(e,'coverPoster')"></upimg> 86 <upimg filePath="act" :value="secondData.coverPoster==''?'':secondData.coverPoster" inputtype="coverPoster" :limit="1" @changimg="e=>changimg(e,'coverPoster')"></upimg>
87 </el-form-item> 87 </el-form-item>
88 </el-col> 88 </el-col>
admin-web-master/src/views/atmosphere/atmosphereBz.vue
  View file @ffe3ff4
@@ -51,7 +51,7 @@ @@ -51,7 +51,7 @@
51 </el-col> 51 </el-col>
52 52
53 <el-col :span="12"> 53 <el-col :span="12">
54 - <el-form-item label="活动地点" class="grid-content bg-purple" prop="eventAddrs"> 54 + <el-form-item label="氛围地点" class="grid-content bg-purple" prop="eventAddrs">
55 <el-input v-model="ruleForm.eventAddrs" placeholder="请输入" /> 55 <el-input v-model="ruleForm.eventAddrs" placeholder="请输入" />
56 </el-form-item> 56 </el-form-item>
57 </el-col> 57 </el-col>
@@ -59,7 +59,7 @@ @@ -59,7 +59,7 @@
59 59
60 <el-row :gutter="20"> 60 <el-row :gutter="20">
61 <el-col :span="12"> 61 <el-col :span="12">
62 - <el-form-item label="活动时间" class="grid-content bg-purple" prop="plan_Time" 62 + <el-form-item label="氛围时间" class="grid-content bg-purple" prop="plan_Time"
63 style="position: relative"> 63 style="position: relative">
64 <el-date-picker style="width: 100%;" v-model="ruleForm.plan_Time" 64 <el-date-picker style="width: 100%;" v-model="ruleForm.plan_Time"
65 value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" 65 value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange"
@@ -69,7 +69,7 @@ @@ -69,7 +69,7 @@
69 </el-form-item> 69 </el-form-item>
70 </el-col> 70 </el-col>
71 <el-col :span="12"> 71 <el-col :span="12">
72 - <el-form-item label="活动主题" class="grid-content bg-purple" prop="eventTheme"> 72 + <el-form-item label="氛围主题" class="grid-content bg-purple" prop="eventTheme">
73 <el-input v-model="ruleForm.eventTheme" placeholder="请输入" /> 73 <el-input v-model="ruleForm.eventTheme" placeholder="请输入" />
74 </el-form-item> 74 </el-form-item>
75 </el-col> 75 </el-col>
@@ -77,12 +77,12 @@ @@ -77,12 +77,12 @@
77 77
78 <el-row :gutter="20"> 78 <el-row :gutter="20">
79 <el-col :span="12"> 79 <el-col :span="12">
80 - <el-form-item label="活动主办方" class="grid-content bg-purple" prop="sponsor"> 80 + <el-form-item label="氛围主办方" class="grid-content bg-purple" prop="sponsor">
81 <el-input v-model="ruleForm.sponsor" placeholder="请输入" /> 81 <el-input v-model="ruleForm.sponsor" placeholder="请输入" />
82 </el-form-item> 82 </el-form-item>
83 </el-col> 83 </el-col>
84 <el-col :span="12"> 84 <el-col :span="12">
85 - <el-form-item label="活动参与方" prop="participants" class="grid-content bg-purple"> 85 + <el-form-item label="氛围参与方" prop="participants" class="grid-content bg-purple">
86 <el-input v-model="ruleForm.participants" placeholder="请输入" /> 86 <el-input v-model="ruleForm.participants" placeholder="请输入" />
87 </el-form-item> 87 </el-form-item>
88 </el-col> 88 </el-col>
@@ -99,7 +99,7 @@ @@ -99,7 +99,7 @@
99 </el-form-item> 99 </el-form-item>
100 </el-col> 100 </el-col>
101 <el-col :span="12"> 101 <el-col :span="12">
102 - <el-form-item label="历史活动方案" class="grid-content bg-purple device-from"> 102 + <el-form-item label="历史氛围方案" class="grid-content bg-purple device-from">
103 <el-select v-model="lishiList" placeholder="请选择" style="width:100%" 103 <el-select v-model="lishiList" placeholder="请选择" style="width:100%"
104 @change="lichange"> 104 @change="lichange">
105 <el-option v-for="(item,index) in fenxiData" :key="item.id" 105 <el-option v-for="(item,index) in fenxiData" :key="item.id"
@@ -112,14 +112,14 @@ @@ -112,14 +112,14 @@
112 <el-row :gutter="20"> 112 <el-row :gutter="20">
113 113
114 <el-col :span="12"> 114 <el-col :span="12">
115 - <el-form-item label="活动主要目的" prop="mainPurpose" class="grid-content bg-purple"> 115 + <el-form-item label="氛围主要目的" prop="mainPurpose" class="grid-content bg-purple">
116 <el-input v-model="ruleForm.mainPurpose" placeholder="请输入" /> 116 <el-input v-model="ruleForm.mainPurpose" placeholder="请输入" />
117 </el-form-item> 117 </el-form-item>
118 </el-col> 118 </el-col>
119 </el-row> 119 </el-row>
120 <el-row :gutter="20"> 120 <el-row :gutter="20">
121 <el-col :span="24"> 121 <el-col :span="24">
122 - <el-form-item label="活动封面海报" prop="coverPoster" class="grid-content bg-purple"> 122 + <el-form-item label="氛围封面海报" prop="coverPoster" class="grid-content bg-purple">
123 <upimg filePath="act" :value="ruleForm.coverPoster" inputtype="coverPoster" 123 <upimg filePath="act" :value="ruleForm.coverPoster" inputtype="coverPoster"
124 :limit="1" @changimg="e=>changimg(e,'coverPoster')"></upimg> 124 :limit="1" @changimg="e=>changimg(e,'coverPoster')"></upimg>
125 </el-form-item> 125 </el-form-item>
admin-web-master/src/views/atmosphere/atmosphereGl.vue
  View file @ffe3ff4
@@ -907,10 +907,10 @@ @@ -907,10 +907,10 @@
907 <el-table-column label="明细项名称" prop="detailLtemName" width="auto" min-width="22%"> 907 <el-table-column label="明细项名称" prop="detailLtemName" width="auto" min-width="22%">
908 908
909 </el-table-column> 909 </el-table-column>
910 - <el-table-column label="预估数量" prop="estimatedQuantity" width="auto" min-width="15%"> 910 + <el-table-column label="实际数量" prop="estimatedQuantity" width="auto" min-width="15%">
911 911
912 </el-table-column> 912 </el-table-column>
913 - <el-table-column label="预估费用(/元)" prop="estimatedCost" width="auto" min-width="15%"> 913 + <el-table-column label="实际费用(/元)" prop="estimatedCost" width="auto" min-width="15%">
914 </el-table-column> 914 </el-table-column>
915 <el-table-column prop="notes" label="备注" width="auto" min-width="15%"> 915 <el-table-column prop="notes" label="备注" width="auto" min-width="15%">
916 </el-table-column> 916 </el-table-column>
@@ -937,14 +937,14 @@ @@ -937,14 +937,14 @@
937 label-width="120px" style="position: relative"> 937 label-width="120px" style="position: relative">
938 <el-row :gutter="20"> 938 <el-row :gutter="20">
939 <el-col :span="8"> 939 <el-col :span="8">
940 - <el-form-item label="内部人力成本预估(/元)" 940 + <el-form-item label="实际内部人力成本(/元)"
941 class="grid-content bg-purple device-from" prop="name"> 941 class="grid-content bg-purple device-from" prop="name">
942 <el-input v-model="zhixingList.internalLaborCostEstimation" 942 <el-input v-model="zhixingList.internalLaborCostEstimation"
943 placeholder="请输入" :disabled="!zhixingBian" /> 943 placeholder="请输入" :disabled="!zhixingBian" />
944 </el-form-item> 944 </el-form-item>
945 </el-col> 945 </el-col>
946 <el-col :span="8"> 946 <el-col :span="8">
947 - <el-form-item label="外部人力成本预估(/元)" class="grid-content bg-purple" 947 + <el-form-item label="实际外部人力成本(/元)" class="grid-content bg-purple"
948 prop="name"> 948 prop="name">
949 <el-input v-model="zhixingList.externalLaborCostEstimation" 949 <el-input v-model="zhixingList.externalLaborCostEstimation"
950 placeholder="请输入" :disabled="!zhixingBian" /> 950 placeholder="请输入" :disabled="!zhixingBian" />
@@ -952,7 +952,7 @@ @@ -952,7 +952,7 @@
952 </el-col> 952 </el-col>
953 953
954 <el-col :span="8"> 954 <el-col :span="8">
955 - <el-form-item label="商品成本预估(/元)" class="grid-content bg-purple" prop="name"> 955 + <el-form-item label="实际商品成本(/元)" class="grid-content bg-purple" prop="name">
956 <el-input v-model="zhixingList.costEstimationGoods" placeholder="请输入" 956 <el-input v-model="zhixingList.costEstimationGoods" placeholder="请输入"
957 :disabled="!zhixingBian" /> 957 :disabled="!zhixingBian" />
958 </el-form-item> 958 </el-form-item>
@@ -961,19 +961,19 @@ @@ -961,19 +961,19 @@
961 961
962 <el-row :gutter="20"> 962 <el-row :gutter="20">
963 <el-col :span="8"> 963 <el-col :span="8">
964 - <el-form-item label="设备成本(/元)" class="grid-content bg-purple" prop="name"> 964 + <el-form-item label="实际设备成本(/元)" class="grid-content bg-purple" prop="name">
965 <el-input v-model="zhixingList.setCostEstimate" placeholder="请输入" 965 <el-input v-model="zhixingList.setCostEstimate" placeholder="请输入"
966 :disabled="!zhixingBian" /> 966 :disabled="!zhixingBian" />
967 </el-form-item> 967 </el-form-item>
968 </el-col> 968 </el-col>
969 <el-col :span="8"> 969 <el-col :span="8">
970 - <el-form-item label="宣传费用(/元)" class="grid-content bg-purple" prop="name"> 970 + <el-form-item label="实际宣传费用(/元)" class="grid-content bg-purple" prop="name">
971 <el-input v-model="zhixingList.estimatedPromotionalExpenses" 971 <el-input v-model="zhixingList.estimatedPromotionalExpenses"
972 placeholder="请输入" :disabled="!zhixingBian" /> 972 placeholder="请输入" :disabled="!zhixingBian" />
973 </el-form-item> 973 </el-form-item>
974 </el-col> 974 </el-col>
975 <el-col :span="8"> 975 <el-col :span="8">
976 - <el-form-item label="其他成本(/元)" class="grid-content bg-purple" prop="name"> 976 + <el-form-item label="实际其他成本(/元)" class="grid-content bg-purple" prop="name">
977 <el-input v-model="zhixingList.otherNecessaryEstimates" 977 <el-input v-model="zhixingList.otherNecessaryEstimates"
978 placeholder="请输入" :disabled="!zhixingBian" /> 978 placeholder="请输入" :disabled="!zhixingBian" />
979 </el-form-item> 979 </el-form-item>
@@ -982,7 +982,7 @@ @@ -982,7 +982,7 @@
982 982
983 <el-row :gutter="20"> 983 <el-row :gutter="20">
984 <el-col :span="8"> 984 <el-col :span="8">
985 - <el-form-item label="总成本(/元)" prop="name" class="grid-content bg-purple"> 985 + <el-form-item label="实际总成本(/元)" prop="name" class="grid-content bg-purple">
986 <el-input v-model="zhixingList.totalCostEstimation" placeholder="请输入" 986 <el-input v-model="zhixingList.totalCostEstimation" placeholder="请输入"
987 :disabled="!zhixingBian" /> 987 :disabled="!zhixingBian" />
988 </el-form-item> 988 </el-form-item>
@@ -1011,21 +1011,21 @@ @@ -1011,21 +1011,21 @@
1011 label-width="120px" style="position: relative"> 1011 label-width="120px" style="position: relative">
1012 <el-row :gutter="20"> 1012 <el-row :gutter="20">
1013 <el-col :span="8"> 1013 <el-col :span="8">
1014 - <el-form-item label="吸引流量" class="grid-content bg-purple device-from" 1014 + <el-form-item label="实际吸引流量" class="grid-content bg-purple device-from"
1015 prop="name"> 1015 prop="name">
1016 <el-input v-model="zhixingList.expectedAttractTraffic" placeholder="请输入" 1016 <el-input v-model="zhixingList.expectedAttractTraffic" placeholder="请输入"
1017 :disabled="!zhixingBian" /> 1017 :disabled="!zhixingBian" />
1018 </el-form-item> 1018 </el-form-item>
1019 </el-col> 1019 </el-col>
1020 <el-col :span="8"> 1020 <el-col :span="8">
1021 - <el-form-item label="参与人数" class="grid-content bg-purple" prop="name"> 1021 + <el-form-item label="实际参与人数" class="grid-content bg-purple" prop="name">
1022 <el-input v-model="zhixingList.expectedParticipation" placeholder="请输入" 1022 <el-input v-model="zhixingList.expectedParticipation" placeholder="请输入"
1023 :disabled="!zhixingBian" /> 1023 :disabled="!zhixingBian" />
1024 </el-form-item> 1024 </el-form-item>
1025 </el-col> 1025 </el-col>
1026 1026
1027 <el-col :span="8"> 1027 <el-col :span="8">
1028 - <el-form-item label="直接收益(/元)" class="grid-content bg-purple" prop="name"> 1028 + <el-form-item label="实际直接收益(/元)" class="grid-content bg-purple" prop="name">
1029 <el-input v-model="zhixingList.expectedDirectBenefits" placeholder="请输入" 1029 <el-input v-model="zhixingList.expectedDirectBenefits" placeholder="请输入"
1030 :disabled="!zhixingBian" /> 1030 :disabled="!zhixingBian" />
1031 </el-form-item> 1031 </el-form-item>
@@ -1033,7 +1033,7 @@ @@ -1033,7 +1033,7 @@
1033 </el-row> 1033 </el-row>
1034 <el-row :gutter="20"> 1034 <el-row :gutter="20">
1035 <el-col :span="8"> 1035 <el-col :span="8">
1036 - <el-form-item label="间接收益(/元)" class="grid-content bg-purple" prop="name"> 1036 + <el-form-item label="实际间接收益(/元)" class="grid-content bg-purple" prop="name">
1037 <el-input v-model="zhixingList.expectedIndirectBenefits" 1037 <el-input v-model="zhixingList.expectedIndirectBenefits"
1038 placeholder="请输入" :disabled="!zhixingBian" /> 1038 placeholder="请输入" :disabled="!zhixingBian" />
1039 </el-form-item> 1039 </el-form-item>
@@ -1855,6 +1855,7 @@ @@ -1855,6 +1855,7 @@
1855 id: item.id 1855 id: item.id
1856 }).then(res => { 1856 }).then(res => {
1857 this.fenxiData = res.data 1857 this.fenxiData = res.data
  1858 + this.fenxiData.incomeAnalysis = Number(res.data.incomeAnalysis).toFixed(2)
1858 this.xiaoguoBox = true 1859 this.xiaoguoBox = true
1859 this.$nextTick(() => { 1860 this.$nextTick(() => {
1860 this.jiaoLiu(this.$refs.jiaoL, this.fenxiData); 1861 this.jiaoLiu(this.$refs.jiaoL, this.fenxiData);
admin-web-master/src/views/atmosphere/atmosphereHis.vue
  View file @ffe3ff4
@@ -1675,7 +1675,8 @@ @@ -1675,7 +1675,8 @@
1675 pageNumber: 1, 1675 pageNumber: 1,
1676 pageSize: 10, 1676 pageSize: 10,
1677 dataOwnership: '2', 1677 dataOwnership: '2',
1678 - isDraft: 0 1678 + isDraft: 0,
  1679 + state:'5'
1679 }, 1680 },
1680 multipleSelection: [], 1681 multipleSelection: [],
1681 options: [], 1682 options: [],
admin-web-master/src/views/atmosphere/atmosphereSp.vue
  View file @ffe3ff4
@@ -987,10 +987,10 @@ @@ -987,10 +987,10 @@
987 <el-table-column label="明细项名称" prop="detailLtemName" width="auto" min-width="22%"> 987 <el-table-column label="明细项名称" prop="detailLtemName" width="auto" min-width="22%">
988 988
989 </el-table-column> 989 </el-table-column>
990 - <el-table-column label="预估数量" prop="estimatedQuantity" width="auto" min-width="15%"> 990 + <el-table-column label="实际数量" prop="estimatedQuantity" width="auto" min-width="15%">
991 991
992 </el-table-column> 992 </el-table-column>
993 - <el-table-column label="预估费用(/元)" prop="estimatedCost" width="auto" min-width="15%"> 993 + <el-table-column label="实际费用(/元)" prop="estimatedCost" width="auto" min-width="15%">
994 </el-table-column> 994 </el-table-column>
995 <el-table-column prop="notes" label="备注" width="auto" min-width="15%"> 995 <el-table-column prop="notes" label="备注" width="auto" min-width="15%">
996 </el-table-column> 996 </el-table-column>
@@ -1016,18 +1016,18 @@ @@ -1016,18 +1016,18 @@
1016 style="position: relative"> 1016 style="position: relative">
1017 <el-row :gutter="20"> 1017 <el-row :gutter="20">
1018 <el-col :span="8"> 1018 <el-col :span="8">
1019 - <el-form-item label="内部人力成本预估(/元)" class="grid-content bg-purple device-from" prop="name"> 1019 + <el-form-item label="实际内部人力成本(/元)" class="grid-content bg-purple device-from" prop="name">
1020 <el-input v-model="zhixingList.internalLaborCostEstimation" placeholder="请输入" :disabled="!zhixingBian"/> 1020 <el-input v-model="zhixingList.internalLaborCostEstimation" placeholder="请输入" :disabled="!zhixingBian"/>
1021 </el-form-item> 1021 </el-form-item>
1022 </el-col> 1022 </el-col>
1023 <el-col :span="8"> 1023 <el-col :span="8">
1024 - <el-form-item label="外部人力成本预估(/元)" class="grid-content bg-purple" prop="name"> 1024 + <el-form-item label="实际外部人力成本(/元)" class="grid-content bg-purple" prop="name">
1025 <el-input v-model="zhixingList.externalLaborCostEstimation" placeholder="请输入" :disabled="!zhixingBian"/> 1025 <el-input v-model="zhixingList.externalLaborCostEstimation" placeholder="请输入" :disabled="!zhixingBian"/>
1026 </el-form-item> 1026 </el-form-item>
1027 </el-col> 1027 </el-col>
1028 1028
1029 <el-col :span="8"> 1029 <el-col :span="8">
1030 - <el-form-item label="商品成本预估(/元)" class="grid-content bg-purple" prop="name"> 1030 + <el-form-item label="实际商品成本(/元)" class="grid-content bg-purple" prop="name">
1031 <el-input v-model="zhixingList.costEstimationGoods" placeholder="请输入" :disabled="!zhixingBian"/> 1031 <el-input v-model="zhixingList.costEstimationGoods" placeholder="请输入" :disabled="!zhixingBian"/>
1032 </el-form-item> 1032 </el-form-item>
1033 </el-col> 1033 </el-col>
@@ -1035,17 +1035,17 @@ @@ -1035,17 +1035,17 @@
1035 1035
1036 <el-row :gutter="20"> 1036 <el-row :gutter="20">
1037 <el-col :span="8"> 1037 <el-col :span="8">
1038 - <el-form-item label="设备成本(/元)" class="grid-content bg-purple" prop="name"> 1038 + <el-form-item label="实际设备成本(/元)" class="grid-content bg-purple" prop="name">
1039 <el-input v-model="zhixingList.setCostEstimate" placeholder="请输入" :disabled="!zhixingBian"/> 1039 <el-input v-model="zhixingList.setCostEstimate" placeholder="请输入" :disabled="!zhixingBian"/>
1040 </el-form-item> 1040 </el-form-item>
1041 </el-col> 1041 </el-col>
1042 <el-col :span="8"> 1042 <el-col :span="8">
1043 - <el-form-item label="宣传费用(/元)" class="grid-content bg-purple" prop="name"> 1043 + <el-form-item label="实际宣传费用(/元)" class="grid-content bg-purple" prop="name">
1044 <el-input v-model="zhixingList.estimatedPromotionalExpenses" placeholder="请输入" :disabled="!zhixingBian"/> 1044 <el-input v-model="zhixingList.estimatedPromotionalExpenses" placeholder="请输入" :disabled="!zhixingBian"/>
1045 </el-form-item> 1045 </el-form-item>
1046 </el-col> 1046 </el-col>
1047 <el-col :span="8"> 1047 <el-col :span="8">
1048 - <el-form-item label="其他成本(/元)" class="grid-content bg-purple" prop="name"> 1048 + <el-form-item label="实际其他成本(/元)" class="grid-content bg-purple" prop="name">
1049 <el-input v-model="zhixingList.otherNecessaryEstimates" placeholder="请输入" :disabled="!zhixingBian"/> 1049 <el-input v-model="zhixingList.otherNecessaryEstimates" placeholder="请输入" :disabled="!zhixingBian"/>
1050 </el-form-item> 1050 </el-form-item>
1051 </el-col> 1051 </el-col>
@@ -1053,7 +1053,7 @@ @@ -1053,7 +1053,7 @@
1053 1053
1054 <el-row :gutter="20"> 1054 <el-row :gutter="20">
1055 <el-col :span="8"> 1055 <el-col :span="8">
1056 - <el-form-item label="总成本(/元)" prop="name" class="grid-content bg-purple"> 1056 + <el-form-item label="实际总成本(/元)" prop="name" class="grid-content bg-purple">
1057 <el-input v-model="zhixingList.totalCostEstimation" placeholder="请输入" :disabled="!zhixingBian"/> 1057 <el-input v-model="zhixingList.totalCostEstimation" placeholder="请输入" :disabled="!zhixingBian"/>
1058 </el-form-item> 1058 </el-form-item>
1059 </el-col> 1059 </el-col>
@@ -1080,25 +1080,25 @@ @@ -1080,25 +1080,25 @@
1080 style="position: relative"> 1080 style="position: relative">
1081 <el-row :gutter="20"> 1081 <el-row :gutter="20">
1082 <el-col :span="8"> 1082 <el-col :span="8">
1083 - <el-form-item label="吸引流量" class="grid-content bg-purple device-from" prop="name"> 1083 + <el-form-item label="实际吸引流量" class="grid-content bg-purple device-from" prop="name">
1084 <el-input v-model="zhixingList.expectedAttractTraffic" placeholder="请输入" :disabled="!zhixingBian"/> 1084 <el-input v-model="zhixingList.expectedAttractTraffic" placeholder="请输入" :disabled="!zhixingBian"/>
1085 </el-form-item> 1085 </el-form-item>
1086 </el-col> 1086 </el-col>
1087 <el-col :span="8"> 1087 <el-col :span="8">
1088 - <el-form-item label="参与人数" class="grid-content bg-purple" prop="name"> 1088 + <el-form-item label="实际参与人数" class="grid-content bg-purple" prop="name">
1089 <el-input v-model="zhixingList.expectedParticipation" placeholder="请输入" :disabled="!zhixingBian"/> 1089 <el-input v-model="zhixingList.expectedParticipation" placeholder="请输入" :disabled="!zhixingBian"/>
1090 </el-form-item> 1090 </el-form-item>
1091 </el-col> 1091 </el-col>
1092 1092
1093 <el-col :span="8"> 1093 <el-col :span="8">
1094 - <el-form-item label="直接收益(/元)" class="grid-content bg-purple" prop="name"> 1094 + <el-form-item label="实际直接收益(/元)" class="grid-content bg-purple" prop="name">
1095 <el-input v-model="zhixingList.expectedDirectBenefits" placeholder="请输入" :disabled="!zhixingBian"/> 1095 <el-input v-model="zhixingList.expectedDirectBenefits" placeholder="请输入" :disabled="!zhixingBian"/>
1096 </el-form-item> 1096 </el-form-item>
1097 </el-col> 1097 </el-col>
1098 </el-row> 1098 </el-row>
1099 <el-row :gutter="20"> 1099 <el-row :gutter="20">
1100 <el-col :span="8"> 1100 <el-col :span="8">
1101 - <el-form-item label="间接收益(/元)" class="grid-content bg-purple" prop="name"> 1101 + <el-form-item label="实际间接收益(/元)" class="grid-content bg-purple" prop="name">
1102 <el-input v-model="zhixingList.expectedIndirectBenefits" placeholder="请输入" :disabled="!zhixingBian"/> 1102 <el-input v-model="zhixingList.expectedIndirectBenefits" placeholder="请输入" :disabled="!zhixingBian"/>
1103 </el-form-item> 1103 </el-form-item>
1104 </el-col> 1104 </el-col>
admin-web-master/src/views/renovation/commoditySystem/addCommodity.vue
  View file @ffe3ff4
@@ -51,19 +51,26 @@ @@ -51,19 +51,26 @@
51 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}" 51 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
52 > 52 >
53 <el-table-column 53 <el-table-column
54 - v-for="(skuAttr, index) in skuAttrName"  
55 - :key="index"  
56 - :label="skuAttr.skuName" 54 + label="规格"
57 > 55 >
  56 + <!-- v-for="(skuAttr, index) in skuAttrName"
  57 + :key="index"
  58 + :label="skuAttr.skuName" -->
58 <template slot-scope="scope"> 59 <template slot-scope="scope">
59 - {{  
60 - scope.row.skuAttrCodeDTOList &&  
61 - scope.row.skuAttrCodeDTOList[index]  
62 - | attrValueFilter(productItem.skuAttrList)  
63 - }} 60 + <div v-for="(skuAttr, index) in skuAttrName"
  61 + :key="index"
  62 + >
  63 + {{skuAttr.skuName}}
  64 + <!-- {{
  65 + scope.row.skuAttrCodeDTOList &&
  66 + scope.row.skuAttrCodeDTOList[index]
  67 + | attrValueFilter(productItem.skuAttrList)
  68 + }} -->
  69 + </div>
  70 +
64 </template> 71 </template>
65 </el-table-column> 72 </el-table-column>
66 - <el-table-column label="售价"> 73 + <el-table-column label="售价(/元)">
67 <template slot-scope="scope"> 74 <template slot-scope="scope">
68 <el-input 75 <el-input
69 v-model="scope.row.price" 76 v-model="scope.row.price"
@@ -73,7 +80,7 @@ @@ -73,7 +80,7 @@
73 /> 80 />
74 </template> 81 </template>
75 </el-table-column> 82 </el-table-column>
76 - <el-table-column label="原价"> 83 + <el-table-column label="原价(/元)">
77 <template slot-scope="scope"> 84 <template slot-scope="scope">
78 <el-input 85 <el-input
79 v-model="scope.row.originalPrice" 86 v-model="scope.row.originalPrice"
@@ -103,7 +110,7 @@ @@ -103,7 +110,7 @@
103 /> 110 />
104 </template> 111 </template>
105 </el-table-column> 112 </el-table-column>
106 - <el-table-column label="SKU"> 113 + <el-table-column label="国际条码">
107 <template slot-scope="scope"> 114 <template slot-scope="scope">
108 <el-input v-model="scope.row.sku" disabled /> 115 <el-input v-model="scope.row.sku" disabled />
109 </template> 116 </template>
admin-web-master/src/views/shopRental/manage/index.vue
  View file @ffe3ff4
@@ -297,12 +297,14 @@ @@ -297,12 +297,14 @@
297 // return 297 // return
298 const file = new File([response.data], 'filename.txt', { type: 'text/plain' }); 298 const file = new File([response.data], 'filename.txt', { type: 'text/plain' });
299 console.log(file); 299 console.log(file);
  300 + let userData = JSON.parse(localStorage.getItem('user'));
300 let fd = new FormData(); 301 let fd = new FormData();
301 fd.append('files', file); // 假设 formData 包含文件 302 fd.append('files', file); // 假设 formData 包含文件
302 fd.append('reviewers', this.ruleForm.reviewers); 303 fd.append('reviewers', this.ruleForm.reviewers);
303 fd.append('fileNames', '合同.docx'); 304 fd.append('fileNames', '合同.docx');
304 - fd.append('title', '合同审批'); 305 + fd.append('title', `${row.contractName}审批`);
305 fd.append('contractNumber', row.contractNumber); 306 fd.append('contractNumber', row.contractNumber);
  307 + fd.append('sponsor', userData.user.id);
306 console.log(fd); 308 console.log(fd);
307 // return 309 // return
308 // let c1 ={ 310 // let c1 ={
ceres-uniapp-master/pages/tabbar/user/index.data.js
  View file @ffe3ff4
@@ -56,12 +56,12 @@ export const fastCardOneList = [ @@ -56,12 +56,12 @@ export const fastCardOneList = [
56 icon:'../../../static/images/llzj.png', 56 icon:'../../../static/images/llzj.png',
57 jumpUrl:'../../../pages_category_page2/userModule/footprintList' 57 jumpUrl:'../../../pages_category_page2/userModule/footprintList'
58 }, 58 },
59 - {  
60 - id:3,  
61 - label:'分销中心',  
62 - icon:'../../../static/images/fxzx.png',  
63 - jumpUrl:'../../../pages_category_page1/distributionModule/index'  
64 - }, 59 + // {
  60 + // id:3,
  61 + // label:'分销中心',
  62 + // icon:'../../../static/images/fxzx.png',
  63 + // jumpUrl:'../../../pages_category_page1/distributionModule/index'
  64 + // },
65 { 65 {
66 id:4, 66 id:4,
67 label:'我的评价', 67 label:'我的评价',
ceres-uniapp-master/pages_category_page1/orderModule/index.vue
  View file @ffe3ff4
@@ -197,9 +197,11 @@ export default { @@ -197,9 +197,11 @@ export default {
197 if (options.type) { 197 if (options.type) {
198 this.tabCurrentType = options.type 198 this.tabCurrentType = options.type
199 this.orderState = options.type 199 this.orderState = options.type
  200 +
200 }else{ 201 }else{
201 this.orderState = '' 202 this.orderState = ''
202 } 203 }
  204 + this.handleGetOrderList()
203 }, 205 },
204 onShow() { 206 onShow() {
205 // #ifdef H5 207 // #ifdef H5
lvdao-miniapp/pagesA/myZiyuan/addMyshop.vue
  View file @ffe3ff4
@@ -344,6 +344,8 @@ @@ -344,6 +344,8 @@
344 if(this.ids == ''){ 344 if(this.ids == ''){
345 info.storePrimaryKey = this.getTimestampWithRandom() 345 info.storePrimaryKey = this.getTimestampWithRandom()
346 } 346 }
  347 + // console.log(this.ids,info.storePrimaryKey,'ids')
  348 + // return
347 this.$http.sendRequest('/cereAssetShopInformation/add', 'POST', info, 1).then(res => { 349 this.$http.sendRequest('/cereAssetShopInformation/add', 'POST', info, 1).then(res => {
348 uni.showToast({ 350 uni.showToast({
349 title: '提交成功', 351 title: '提交成功',
lvdao-miniapp/utils/request.js
  View file @ffe3ff4
@@ -21,17 +21,17 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; { @@ -21,17 +21,17 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; {
21 // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/admin-server' + url; 21 // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/admin-server' + url;
22 // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' + url; 22 // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' + url;
23 23
24 - // bases = 'http://128.10.249.23:9003'+ url; 24 + bases = 'http://128.10.249.23:9003'+ url;
25 // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url; 25 // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url;
26 26
27 - bases = c1 + 'cdwlMall/meserver/admin-server' + url; 27 + // bases = c1 + 'cdwlMall/meserver/admin-server' + url;
28 28
29 }else if(baseUrl == 3){ 29 }else if(baseUrl == 3){
30 // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' + url; 30 // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' + url;
31 // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/api' + url; 31 // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/api' + url;
32 // bases = 'http://128.10.249.22:9003:9007' + url; 32 // bases = 'http://128.10.249.22:9003:9007' + url;
33 - // bases = 'http://128.10.249.46:9007' + url;  
34 - bases = c1 + 'cdwlMall/meserver/api' + url; 33 + bases = 'http://128.10.249.23:9007' + url;
  34 + // bases = c1 + 'cdwlMall/meserver/api' + url;
35 35
36 }else{ 36 }else{
37 // bases = 'http://128.10.249.22:9004' + url; 37 // bases = 'http://128.10.249.22:9004' + url;
@@ -39,9 +39,9 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; { @@ -39,9 +39,9 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; {
39 // bases = 'http://172.16.61.123/cdwlMall/business-server' + url; 39 // bases = 'http://172.16.61.123/cdwlMall/business-server' + url;
40 // bases = 'https://jy.scjysm.asia:18086/cdwlMall/business-server' + url; 40 // bases = 'https://jy.scjysm.asia:18086/cdwlMall/business-server' + url;
41 // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/business-server' + url; 41 // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/business-server' + url;
42 - // bases = 'http://128.10.249.46:9004' + url; 42 + bases = 'http://128.10.249.23:9004' + url;
43 // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/business-server' + url; 43 // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/business-server' + url;
44 - bases = c1 + 'cdwlMall/business-server' + url; 44 + // bases = c1 + 'cdwlMall/business-server' + url;
45 45
46 } 46 }
47 var token = uni.getStorageSync('token') || ''; 47 var token = uni.getStorageSync('token') || '';
merchant-web-master/src/views/commodity/commoditySystem/addCommodity.vue
  View file @ffe3ff4
@@ -30,7 +30,7 @@ @@ -30,7 +30,7 @@
30 <!-- 商品 --> 30 <!-- 商品 -->
31 <div class="addCom common"> 31 <div class="addCom common">
32 <div v-if="active"> 32 <div v-if="active">
33 - <el-form ref="form" :model="form" :rules="rules" label-width="80px" style="padding:10px 20px;"> 33 + <el-form ref="form" :model="form" :rules="rules" label-width="120px" style="padding:10px 20px;">
34 <div class="leftCom"> 34 <div class="leftCom">
35 <el-form-item label="商品名称" prop="productName"> 35 <el-form-item label="商品名称" prop="productName">
36 <el-input v-model="form.productName" maxlength="50" show-word-limit /> 36 <el-input v-model="form.productName" maxlength="50" show-word-limit />
@@ -85,7 +85,7 @@ @@ -85,7 +85,7 @@
85 <el-form-item class="form-item-long" label="供应商"> 85 <el-form-item class="form-item-long" label="供应商">
86 <el-input v-model="form.supplierName" maxlength="30" show-word-limit placeholder="请输入供应商名称" /> 86 <el-input v-model="form.supplierName" maxlength="30" show-word-limit placeholder="请输入供应商名称" />
87 </el-form-item> 87 </el-form-item>
88 - <el-form-item class="form-item-long" label="成本价" prop="cost"> 88 + <el-form-item class="form-item-long" label="成本价(/元)" prop="cost">
89 <el-input v-model.number="form.cost" type="number" maxlength="10" show-word-limit placeholder="请输入成本价" /> 89 <el-input v-model.number="form.cost" type="number" maxlength="10" show-word-limit placeholder="请输入成本价" />
90 </el-form-item> 90 </el-form-item>
91 <el-form-item label="需要物流" prop="ifLogistics"> 91 <el-form-item label="需要物流" prop="ifLogistics">
merchant-web-master/src/views/commodity/commoditySystem/addComponent.vue
  View file @ffe3ff4
@@ -47,13 +47,13 @@ @@ -47,13 +47,13 @@
47 <el-input v-model="singleStyle.skuValue" :sss="scope" maxlength="40" /> 47 <el-input v-model="singleStyle.skuValue" :sss="scope" maxlength="40" />
48 </template> 48 </template>
49 </el-table-column> 49 </el-table-column>
50 - <el-table-column label="售价"> 50 + <el-table-column label="售价(/元)">
51 <template slot-scope="scope"> 51 <template slot-scope="scope">
52 <!-- <el-input v-model="scope.row.price" type="number" oninput="value=value.replace(/-/, '')" /> --> 52 <!-- <el-input v-model="scope.row.price" type="number" oninput="value=value.replace(/-/, '')" /> -->
53 <el-input-number v-model="scope.row.price" :controls="false" :min="0" :precision="2" :step="0.01" /> 53 <el-input-number v-model="scope.row.price" :controls="false" :min="0" :precision="2" :step="0.01" />
54 </template> 54 </template>
55 </el-table-column> 55 </el-table-column>
56 - <el-table-column label="原价"> 56 + <el-table-column label="原价(/元)">
57 <template slot-scope="scope"> 57 <template slot-scope="scope">
58 <!-- <el-input v-model="scope.row.originalPrice" type="number" oninput="value=value.replace(/-/, '')" /> --> 58 <!-- <el-input v-model="scope.row.originalPrice" type="number" oninput="value=value.replace(/-/, '')" /> -->
59 <el-input-number v-model="scope.row.originalPrice" :controls="false" :min="0" :precision="2" :step="0.01" /> 59 <el-input-number v-model="scope.row.originalPrice" :controls="false" :min="0" :precision="2" :step="0.01" />
@@ -132,7 +132,7 @@ @@ -132,7 +132,7 @@
132 </div> 132 </div>
133 </div> 133 </div>
134 </div> 134 </div>
135 - <el-button type="text" style="margin-left: 10px;" @click="addAttrValue(index)">添加</el-button> 135 + <el-button type="primary" style="margin-left: 10px;" @click="addAttrValue(index)">添加</el-button>
136 </div> 136 </div>
137 </el-form-item> 137 </el-form-item>
138 </div> 138 </div>
@@ -140,7 +140,7 @@ @@ -140,7 +140,7 @@
140 <el-table 140 <el-table
141 :data="skuList" 141 :data="skuList"
142 style="width: 100%" 142 style="width: 100%"
143 - :header-cell-style="{ background: '#EEF3FF', color: '#333333' }" 143 + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
144 > 144 >
145 <el-table-column 145 <el-table-column
146 v-for="(skuAttr, index) in skuAttrName" 146 v-for="(skuAttr, index) in skuAttrName"
merchant-web-master/src/views/dashboard/index.vue
  View file @ffe3ff4
@@ -63,7 +63,7 @@ export default { @@ -63,7 +63,7 @@ export default {
63 return { 63 return {
64 empty: empty, 64 empty: empty,
65 form: { 65 form: {
66 - condition: 1 66 + condition: 3
67 }, 67 },
68 dataList: [ 68 dataList: [
69 { name: '店铺访问次数 (次)', value: '', field: 'total' }, 69 { name: '店铺访问次数 (次)', value: '', field: 'total' },
@@ -73,12 +73,12 @@ export default { @@ -73,12 +73,12 @@ export default {
73 ], 73 ],
74 tabList: [ 74 tabList: [
75 { name: '最近30天', type: 4, date: '30' }, 75 { name: '最近30天', type: 4, date: '30' },
76 - { name: '最近7天', type: 3, date: '7' },  
77 - { name: '昨天', type: 2, date: '1' },  
78 - { name: '今天', type: 1, show: true, date: '0' } 76 + { name: '最近7天', type: 3, date: '7', show: true },
  77 + // { name: '昨天', type: 2, date: '1' },
  78 + // { name: '今天', type: 1, show: true, date: '0' }
79 ], 79 ],
80 info: {}, 80 info: {},
81 - date: '0', 81 + date: '7',
82 orderData: {} 82 orderData: {}
83 } 83 }
84 }, 84 },
@@ -175,6 +175,21 @@ export default { @@ -175,6 +175,21 @@ export default {
175 175
176 const option = { 176 const option = {
177 color: "#3F9B6A", 177 color: "#3F9B6A",
  178 + tooltip: {
  179 + trigger: 'axis', // 触发类型为坐标轴触发
  180 + axisPointer: {
  181 + type: 'cross', // 指示器类型为十字准星
  182 + crossStyle: {
  183 + color: '#999'
  184 + }
  185 + },
  186 + formatter: function (params) {
  187 + const data = params[0];
  188 + const name = data.name;
  189 + const value = data.value;
  190 + return `${value}`; // 自定义提示框内容
  191 + }
  192 + },
178 xAxis: { 193 xAxis: {
179 type: 'category', 194 type: 'category',
180 data: arr.time 195 data: arr.time
@@ -194,117 +209,155 @@ export default { @@ -194,117 +209,155 @@ export default {
194 myEchart.setOption(option) 209 myEchart.setOption(option)
195 }, 210 },
196 draws(arr) { 211 draws(arr) {
197 - const myEchart = echarts.init(this.$refs.myEcharts, 'light')  
198 - // const o = this.chartData  
199 - const option = {  
200 - // color: ["#74d1fd", "#009ae4", "#0071c1"],  
201 - // 设置图表的位置  
202 - grid: {  
203 - x: 110, // 左间距  
204 - y: 0, // 上间距  
205 - x2: 60, // 右间距  
206 - y2: 40 // 下间距  
207 - },  
208 - // 提示框组件  
209 - tooltip: {  
210 - trigger: 'axis', // 触发类型, axis: 坐标轴触发  
211 - axisPointer: {  
212 - // 指示器类型 'line' 直线指示器 'shadow' 阴影指示器 'none' 无指示器  
213 - // 'cross' 十字准星指示器 其实是种简写，表示启用两个正交的轴的 axisPointer  
214 - type: 'none'  
215 - },  
216 - textStyle: {  
217 - color: '#cdd3ee' // 文字颜色  
218 - },  
219 - // 提示框浮层内容格式器，支持字符串模板和回调函数两种形式 折线（区域）图、柱状（条形）图、K线图  
220 - // {a}（系列名称），{b}（类目值），{c}（数值）, {d}（无）  
221 - formatter: '{b}<br />{a0}: {c0}%'  
222 - },  
223 - // // 图例组件  
224 - // legend: {  
225 - // textStyle: {  
226 - // // 文本样式  
227 - // fontSize: 16,  
228 - // color: "#cdd3ee"  
229 - // },  
230 - // top: 13, // 定位  
231 - // data: ["已完成", "进行中", "未完成"] // 图例的数据数组  
232 - // },  
233 - // X轴  
234 - xAxis: {  
235 - type: 'value', // 坐标轴类型, 'value' 数值轴，适用于连续数据  
236 - // 坐标轴刻度  
237 - axisTick: {  
238 - show: false // 是否显示坐标轴刻度 默认显示  
239 - },  
240 - // 坐标轴轴线  
241 - axisLine: {  
242 - // 是否显示坐标轴轴线 默认显示  
243 - show: false // 是否显示坐标轴轴线 默认显示  
244 - },  
245 - // 坐标轴在图表区域中的分隔线  
246 - splitLine: {  
247 - show: false // 是否显示分隔线。默认数值轴显示  
248 - },  
249 - // 坐标轴刻度标签  
250 - axisLabel: {  
251 - show: false // 是否显示刻度标签 默认显示  
252 - }  
253 - },  
254 - yAxis: [  
255 - // 左侧Y轴  
256 - {  
257 - // 坐标轴类型, 'category' 类目轴，适用于离散的类目数据  
258 - // 为该类型时必须通过 data 设置类目数据  
259 - type: 'category',  
260 - // 坐标轴刻度  
261 - axisTick: {  
262 - show: false // 是否显示坐标轴刻度 默认显示  
263 - },  
264 - // 坐标轴轴线  
265 - axisLine: {  
266 - // 是否显示坐标轴轴线 默认显示  
267 - show: false, // 是否显示坐标轴轴线 默认显示  
268 - lineStyle: {  
269 - // 坐标轴线线的颜色  
270 - color: '#cdd3ee'  
271 - }  
272 - },  
273 - // 坐标轴在图表区域中的分隔线  
274 - splitLine: {  
275 - show: false // 是否显示分隔线。默认数值轴显示  
276 - },  
277 - // 坐标轴刻度标签  
278 - axisLabel: {  
279 - show: true, // 是否显示刻度标签 默认显示  
280 - fontSize: 16, // 文字的字体大小  
281 - color: '#cdd3ee', // 刻度标签文字的颜色  
282 - // 使用字符串模板，模板变量为刻度默认标签 {value}  
283 - formatter: '{value}'  
284 - },  
285 - // 类目数据，在类目轴（type: 'category'）中有效  
286 - data: arr.names.reverse()  
287 - }  
288 - ],  
289 - // 系列列表  
290 - series: [  
291 - {  
292 - type: 'bar', // 系列类型  
293 - name: '已完成',  
294 - barMaxWidth: 20, // 柱条的最大宽度，不设时自适应  
295 - // label: {  
296 - // show: true,  
297 - // position: "inside"  
298 - // },  
299 - itemStyle: {  
300 - barBorderRadius: [10, 0, 0, 10] // 圆角半径, 单位px, 支持传入数组分别指定 4 个圆角半径  
301 - },  
302 - data: arr.rates.reverse() // 系列中的数据内容数组  
303 - }  
304 - ]  
305 - } 212 + console.log(arr,'arr.ratesarr.ratesarr.rates')
  213 + const myEchart = echarts.init(this.$refs.myEcharts, 'light')
  214 + const option = {
  215 + color: "#3F9B6A",
  216 + tooltip: {
  217 + trigger: 'axis', // 触发类型为坐标轴触发
  218 + axisPointer: {
  219 + type: 'cross', // 指示器类型为十字准星
  220 + crossStyle: {
  221 + color: '#999'
  222 + }
  223 + },
  224 + formatter: function (params) {
  225 + const data = params[0];
  226 + const name = data.name; // 获取 arr.names 中的名称
  227 + const value = data.value; // 获取 arr.rates 中的次数
  228 + return `${name}: ${value} 次`; // 自定义提示框内容
  229 + }
  230 + },
  231 + xAxis: {
  232 + type: 'category',
  233 + data: arr.names
  234 + },
  235 + yAxis: {
  236 + type: 'value',
  237 + name: '次数',
  238 + },
  239 + series: [
  240 + {
  241 + data: arr.rates,
  242 + type: 'line'
  243 + }
  244 + ]
  245 + }
  246 +
  247 + myEchart.setOption(option)
  248 +
  249 +
  250 + // const myEchart = echarts.init(this.$refs.myEcharts, 'light')
  251 + // // const o = this.chartData
  252 + // const option = {
  253 + // // color: ["#74d1fd", "#009ae4", "#0071c1"],
  254 + // // 设置图表的位置
  255 + // grid: {
  256 + // x: 110, // 左间距
  257 + // y: 0, // 上间距
  258 + // x2: 60, // 右间距
  259 + // y2: 40 // 下间距
  260 + // },
  261 + // // 提示框组件
  262 + // tooltip: {
  263 + // trigger: 'axis', // 触发类型, axis: 坐标轴触发
  264 + // axisPointer: {
  265 + // // 指示器类型 'line' 直线指示器 'shadow' 阴影指示器 'none' 无指示器
  266 + // // 'cross' 十字准星指示器 其实是种简写，表示启用两个正交的轴的 axisPointer
  267 + // type: 'none'
  268 + // },
  269 + // textStyle: {
  270 + // color: '#cdd3ee' // 文字颜色
  271 + // },
  272 + // // 提示框浮层内容格式器，支持字符串模板和回调函数两种形式 折线（区域）图、柱状（条形）图、K线图
  273 + // // {a}（系列名称），{b}（类目值），{c}（数值）, {d}（无）
  274 + // formatter: '{b}<br />{a0}: {c0}%'
  275 + // },
  276 + // // // 图例组件
  277 + // // legend: {
  278 + // // textStyle: {
  279 + // // // 文本样式
  280 + // // fontSize: 16,
  281 + // // color: "#cdd3ee"
  282 + // // },
  283 + // // top: 13, // 定位
  284 + // // data: ["已完成", "进行中", "未完成"] // 图例的数据数组
  285 + // // },
  286 + // // X轴
  287 + // xAxis: {
  288 + // type: 'value', // 坐标轴类型, 'value' 数值轴，适用于连续数据
  289 + // // 坐标轴刻度
  290 + // axisTick: {
  291 + // show: false // 是否显示坐标轴刻度 默认显示
  292 + // },
  293 + // // 坐标轴轴线
  294 + // axisLine: {
  295 + // // 是否显示坐标轴轴线 默认显示
  296 + // show: false // 是否显示坐标轴轴线 默认显示
  297 + // },
  298 + // // 坐标轴在图表区域中的分隔线
  299 + // splitLine: {
  300 + // show: false // 是否显示分隔线。默认数值轴显示
  301 + // },
  302 + // // 坐标轴刻度标签
  303 + // axisLabel: {
  304 + // show: false // 是否显示刻度标签 默认显示
  305 + // }
  306 + // },
  307 + // yAxis: [
  308 + // // 左侧Y轴
  309 + // {
  310 + // // 坐标轴类型, 'category' 类目轴，适用于离散的类目数据
  311 + // // 为该类型时必须通过 data 设置类目数据
  312 + // type: 'category',
  313 + // // 坐标轴刻度
  314 + // axisTick: {
  315 + // show: false // 是否显示坐标轴刻度 默认显示
  316 + // },
  317 + // // 坐标轴轴线
  318 + // axisLine: {
  319 + // // 是否显示坐标轴轴线 默认显示
  320 + // show: false, // 是否显示坐标轴轴线 默认显示
  321 + // lineStyle: {
  322 + // // 坐标轴线线的颜色
  323 + // color: '#cdd3ee'
  324 + // }
  325 + // },
  326 + // // 坐标轴在图表区域中的分隔线
  327 + // splitLine: {
  328 + // show: false // 是否显示分隔线。默认数值轴显示
  329 + // },
  330 + // // 坐标轴刻度标签
  331 + // axisLabel: {
  332 + // show: true, // 是否显示刻度标签 默认显示
  333 + // fontSize: 16, // 文字的字体大小
  334 + // color: '#cdd3ee', // 刻度标签文字的颜色
  335 + // // 使用字符串模板，模板变量为刻度默认标签 {value}
  336 + // formatter: '{value}'
  337 + // },
  338 + // // 类目数据，在类目轴（type: 'category'）中有效
  339 + // data: arr.names.reverse()
  340 + // }
  341 + // ],
  342 + // // 系列列表
  343 + // series: [
  344 + // {
  345 + // type: 'bar', // 系列类型
  346 + // name: '已完成',
  347 + // barMaxWidth: 20, // 柱条的最大宽度，不设时自适应
  348 + // // label: {
  349 + // // show: true,
  350 + // // position: "inside"
  351 + // // },
  352 + // itemStyle: {
  353 + // barBorderRadius: [10, 0, 0, 10] // 圆角半径, 单位px, 支持传入数组分别指定 4 个圆角半径
  354 + // },
  355 + // data: arr.rates.reverse() // 系列中的数据内容数组
  356 + // }
  357 + // ]
  358 + // }
306 359
307 - myEchart.setOption(option) 360 + // myEchart.setOption(option)
308 }, 361 },
309 MoneyUnit(v) { 362 MoneyUnit(v) {
310 if (!v) return 0 363 if (!v) return 0