webapp / GreenwayWeb

Commit 3d9acc2b9bb236d5791269ebd5891a138da4577b

Authored by 杨鑫
1 parent 3b62b012

'最新'

Inline Side-by-side
Showing 14 changed files with 958 additions and 684 deletions
admin-web-master/dist.zip deleted
View file @3b62b01
No preview for this file type
admin-web-master/src/api/orderany.js
  View file @3d9acc2
... ... @@ -8,6 +8,23 @@ export function orderGetAll(data) {
8 8 data
9 9 })
10 10 }
  11 +// 不分页订单查询
  12 +export function getAllNotPage(data) {
  13 + return request({
  14 + url: '/order/getAllNotPage',
  15 + method: 'post',
  16 + data
  17 + })
  18 +}
  19 +
  20 +// 订单支付趋势
  21 +export function orderIndex(data) {
  22 + return request({
  23 + url: '/order/index',
  24 + method: 'post',
  25 + data
  26 + })
  27 +}
11 28  
12 29 //导出订单模型
13 30 export function exportOrderModel(data) {
... ...
admin-web-master/src/utils/request.js
  View file @3d9acc2
... ... @@ -21,11 +21,9 @@ if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost
21 21  
22 22 // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
23 23  
24   -<<<<<<< HEAD
  24 +
25 25 baseURL = 'http://128.10.249.23:9003';
26   -=======
27   - // baseURL = 'http://128.10.249.13:9003';
28   ->>>>>>> 89bb9f2b58e667e7b1bc81a97a5c37f15bfe7980
  26 +
29 27  
30 28 } else {
31 29 console.error('---------------------')
... ...
admin-web-master/src/views/activity/activityHis.vue
  View file @3d9acc2
... ... @@ -562,8 +562,8 @@
562 562 <div style="margin-right:10px;line-height:200%;">历史活动策划方案搜索</div>
563 563 <el-select v-model="lishiList" placeholder="请选择" style="margin:0 20px 20px 20px;"
564 564 @change="lichange">
565   - <el-option v-for="(item,index) in effectivenessList" :key="item.id" :label="item.operationType"
566   - :value="index">
  565 + <el-option v-for="(item,index) in effectivenessList" :key="item.id"
  566 + :label="item.operationType" :value="index">
567 567 </el-option>
568 568 </el-select>
569 569 <!-- <el-button @click="tiaozheng" style="background-color: #3F9B6A;color: #fff"
... ... @@ -586,31 +586,31 @@
586 586 <template slot="label">
587 587 实际举办地点
588 588 </template>
589   - <span>{{duibiList.eventAddrs}}</span>
  589 + <span>{{duibiList.eventAddrs}}</span>
590 590 </el-descriptions-item>
591 591 <el-descriptions-item>
592 592 <template slot="label">
593 593 实际举办时间
594 594 </template>
595 595  
596   - <span>{{formatTimestampToDate(duibiList.eventStartTime)}}-{{formatTimestampToDate(duibiList.eventEndTime)}}</span>
  596 + <span>{{formatTimestampToDate(duibiList.eventStartTime)}}-{{formatTimestampToDate(duibiList.eventEndTime)}}</span>
597 597 </el-descriptions-item>
598 598 <el-descriptions-item>
599 599 <template slot="label">
600 600 活动主办方
601 601 </template>
602 602  
603   - <span>{{duibiList.participants}}</span>
  603 + <span>{{duibiList.participants}}</span>
604 604 </el-descriptions-item>
605 605 <el-descriptions-item>
606 606 <template slot="label">
607 607 活动实际参与方
608 608 </template>
609 609  
610   - <span>{{duibiList.sponsor}}</span>
  610 + <span>{{duibiList.sponsor}}</span>
611 611 </el-descriptions-item>
612   -
613   -
  612 +
  613 +
614 614 </el-descriptions>
615 615  
616 616 </div>
... ... @@ -648,57 +648,57 @@
648 648 实际内部人力成本(/元)
649 649 </template>
650 650  
651   - <span>{{duibiList.internalLaborCostEstimation}}</span>
  651 + <span>{{duibiList.internalLaborCostEstimation}}</span>
652 652 </el-descriptions-item>
653 653 <el-descriptions-item>
654 654 <template slot="label">
655 655 实际外部人力成本(/元)
656 656 </template>
657   -<span>{{duibiList.externalLaborCostEstimation}}</span>
658   -
659   -
  657 + <span>{{duibiList.externalLaborCostEstimation}}</span>
  658 +
  659 +
660 660 </el-descriptions-item>
661 661 <el-descriptions-item>
662 662 <template slot="label">
663 663 实际商品成本(/元)
664 664 </template>
665   -<span>{{duibiList.costEstimationGoods}}</span>
666   -
  665 + <span>{{duibiList.costEstimationGoods}}</span>
  666 +
667 667 </el-descriptions-item>
668 668 <el-descriptions-item>
669 669 <template slot="label">
670 670 实际设备成本(/元)
671 671 </template>
672   -<span>{{duibiList.setCostEstimate}}</span>
673   -
  672 + <span>{{duibiList.setCostEstimate}}</span>
  673 +
674 674 </el-descriptions-item>
675 675 <el-descriptions-item>
676 676 <template slot="label">
677 677 实际宣传费用(/元)
678 678 </template>
679   -<span>{{duibiList.estimatedPromotionalExpenses}}</span>
680   -
  679 + <span>{{duibiList.estimatedPromotionalExpenses}}</span>
  680 +
681 681 </el-descriptions-item>
682 682 <el-descriptions-item>
683 683 <template slot="label">
684 684 实际其他成本(/元)
685 685 </template>
686   -<span>{{duibiList.otherNecessaryEstimates}}</span>
687   -
  686 + <span>{{duibiList.otherNecessaryEstimates}}</span>
  687 +
688 688 </el-descriptions-item>
689 689 <el-descriptions-item>
690 690 <template slot="label">
691 691 实际总成本(/元)
692 692 </template>
693   -<span>{{duibiList.totalCostEstimation}}</span>
694   -
  693 + <span>{{duibiList.totalCostEstimation}}</span>
  694 +
695 695 </el-descriptions-item>
696 696 <el-descriptions-item>
697 697 <template slot="label">
698 698 备注
699 699 </template>
700   -<span>{{duibiList.notes}}</span>
701   -
  700 + <span>{{duibiList.notes}}</span>
  701 +
702 702 </el-descriptions-item>
703 703 </el-descriptions>
704 704 </div>
... ... @@ -712,37 +712,37 @@
712 712 <template slot="label">
713 713 实际吸引流量
714 714 </template>
715   -<span>{{duibiList.expectedAttractTraffic}}</span>
716   -
  715 + <span>{{duibiList.expectedAttractTraffic}}</span>
  716 +
717 717 </el-descriptions-item>
718 718 <el-descriptions-item>
719 719 <template slot="label">
720   - 实际参与人数
  720 + 实际参与人数
721 721 </template>
722   -<span>{{duibiList.expectedParticipation}}</span>
723   -
  722 + <span>{{duibiList.expectedParticipation}}</span>
  723 +
724 724 </el-descriptions-item>
725 725 <el-descriptions-item>
726 726 <template slot="label">
727 727 实际直接收益(/元)
728 728 </template>
729   -<span>{{duibiList.expectedDirectBenefits}}</span>
730   -
  729 + <span>{{duibiList.expectedDirectBenefits}}</span>
  730 +
731 731 </el-descriptions-item>
732 732 <el-descriptions-item>
733 733 <template slot="label">
734 734 实际间接收益(/元)
735 735 </template>
736   -<span>{{duibiList.expectedIndirectBenefits}}</span>
737   -
  736 + <span>{{duibiList.expectedIndirectBenefits}}</span>
  737 +
738 738 </el-descriptions-item>
739 739  
740 740 </el-descriptions>
741 741  
742 742 </div>
743 743 </div>
744   -
745   -
  744 +
  745 +
746 746 </div>
747 747 </div>
748 748 <div v-if="activeName=='five'">
... ... @@ -1223,133 +1223,135 @@
1223 1223 >对比
1224 1224 </el-button> -->
1225 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}}元
  1226 + <div style="padding: 15px 40px;">
  1227 + <div style="display:flex;width:100%;justify-content: center;border: 1px solid #DEDEDE;border-radius: 5px;padding: 0px 10px;">
  1228 + <div style="width: 38%;">
  1229 + <div style="color:#3F9B6A;text-align: center;padding: 10px 0;">实际成本</div>
  1230 + <div
  1231 + style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
  1232 + <div>内部人力</div>
  1233 + <div>
  1234 + {{effectivenessListOne.internalLaborCostEstimation?effectivenessListOne.internalLaborCostEstimation:0}}元
  1235 + </div>
1234 1236 </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}}元
  1237 + <div
  1238 + style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
  1239 + <div>外部人力</div>
  1240 + <div>
  1241 + {{effectivenessListOne.externalLaborCostEstimation?effectivenessListOne.externalLaborCostEstimation:0}}元
  1242 + </div>
1241 1243 </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}}元
  1244 + <div
  1245 + style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
  1246 + <div>商品成本</div>
  1247 + <div>{{effectivenessListOne.costEstimationGoods?effectivenessListOne.costEstimationGoods:0}}元
  1248 + </div>
1247 1249 </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}}元
  1250 + <div
  1251 + style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
  1252 + <div>设备成本</div>
  1253 + <div>{{effectivenessListOne.setCostEstimate?effectivenessListOne.setCostEstimate:0}}元</div>
1259 1254 </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}}元
  1255 + <div
  1256 + style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
  1257 + <div>宣传费用</div>
  1258 + <div>
  1259 + {{effectivenessListOne.estimatedPromotionalExpenses?effectivenessListOne.estimatedPromotionalExpenses:0}}元
  1260 + </div>
1266 1261 </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}}元
  1262 + <div
  1263 + style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
  1264 + <div>其他成本</div>
  1265 + <div>
  1266 + {{effectivenessListOne.otherNecessaryEstimates?effectivenessListOne.otherNecessaryEstimates:0}}元
  1267 + </div>
1272 1268 </div>
1273   - </div>
1274   - </div>
1275   - <div style="width: 15%;margin: 0 20px;">
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}}元
  1269 + <div
  1270 + style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
  1271 + <div>总成本</div>
  1272 + <div>{{effectivenessListOne.totalCostEstimation?effectivenessListOne.totalCostEstimation:0}}元
  1273 + </div>
1315 1274 </div>
1316 1275 </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}}元
  1276 + <div style="width: 15%;margin: 0 20px;">
  1277 + <div style="color:#3F9B6A;text-align: center;padding: 10px 0;">增长率</div>
  1278 + <div
  1279 + style="padding:10px 0px;text-align: center;margin:10px;border: 1px solid #3F9B6A;border-radius: 5px;background-color: #3F9B6A;color: #fff;">
  1280 + {{effectivenessListOne.sumNei?effectivenessListOne.sumNei:0}}%
1322 1281 </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}}元
  1282 + <div
  1283 + style="padding:10px 0px;text-align: center;margin:10px;border: 1px solid #3F9B6A;border-radius: 5px;background-color: #3F9B6A;color: #fff;">
  1284 + {{effectivenessListOne.sumWai?effectivenessListOne.sumWai:0}}%
1328 1285 </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}}元
  1286 + <div
  1287 + style="padding:10px 0px;text-align: center;margin:10px;border: 1px solid #3F9B6A;border-radius: 5px;background-color: #3F9B6A;color: #fff;">
  1288 + {{effectivenessListOne.sumShop?effectivenessListOne.sumShop:0}}%
1340 1289 </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}}元
  1290 + <div
  1291 + style="padding:10px 0px;text-align: center;margin:10px;border: 1px solid #3F9B6A;border-radius: 5px;background-color: #3F9B6A;color: #fff;">
  1292 + {{effectivenessListOne.sumSe?effectivenessListOne.sumSe:0}}%
  1293 + </div>
  1294 + <div
  1295 + style="padding:10px 0px;text-align: center;margin:10px;border: 1px solid #3F9B6A;border-radius: 5px;background-color: #3F9B6A;color: #fff;">
  1296 + {{effectivenessListOne.sumXuan?effectivenessListOne.sumXuan:0}}%
  1297 + </div>
  1298 + <div
  1299 + style="padding:10px 0px;text-align: center;margin:10px;border: 1px solid #3F9B6A;border-radius: 5px;background-color: #3F9B6A;color: #fff;">
  1300 + {{effectivenessListOne.sumQi?effectivenessListOne.sumQi:0}}%
  1301 + </div>
  1302 + <div
  1303 + style="padding:10px 0px;text-align: center;margin:10px;border: 1px solid #3F9B6A;border-radius: 5px;background-color: #3F9B6A;color: #fff;">
  1304 + {{effectivenessListOne.sumAll?effectivenessListOne.sumAll:0}}%
1347 1305 </div>
  1306 +
  1307 +
1348 1308 </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}}元
  1309 + <div style="width: 38%;">
  1310 + <div style="color:#3F9B6A;text-align: center;padding: 10px 0;">实际成本</div>
  1311 + <div
  1312 + style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
  1313 + <div>内部人力</div>
  1314 + <div>
  1315 + {{effectivenessListTwo.internalLaborCostEstimation?effectivenessListTwo.internalLaborCostEstimation:0}}元
  1316 + </div>
  1317 + </div>
  1318 + <div
  1319 + style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
  1320 + <div>外部人力</div>
  1321 + <div>
  1322 + {{effectivenessListTwo.externalLaborCostEstimation?effectivenessListTwo.externalLaborCostEstimation:0}}元
  1323 + </div>
  1324 + </div>
  1325 + <div
  1326 + style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
  1327 + <div>商品成本</div>
  1328 + <div>{{effectivenessListTwo.costEstimationGoods?effectivenessListTwo.costEstimationGoods:0}}元
  1329 + </div>
  1330 + </div>
  1331 + <div
  1332 + style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
  1333 + <div>设备成本</div>
  1334 + <div>{{effectivenessListTwo.setCostEstimate?effectivenessListTwo.setCostEstimate:0}}元</div>
  1335 + </div>
  1336 + <div
  1337 + style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
  1338 + <div>宣传费用</div>
  1339 + <div>
  1340 + {{effectivenessListTwo.estimatedPromotionalExpenses?effectivenessListTwo.estimatedPromotionalExpenses:0}}元
  1341 + </div>
  1342 + </div>
  1343 + <div
  1344 + style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
  1345 + <div>其他成本</div>
  1346 + <div>
  1347 + {{effectivenessListTwo.otherNecessaryEstimates?effectivenessListTwo.otherNecessaryEstimates:0}}元
  1348 + </div>
  1349 + </div>
  1350 + <div
  1351 + style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
  1352 + <div>总成本</div>
  1353 + <div>{{effectivenessListTwo.totalCostEstimation?effectivenessListTwo.totalCostEstimation:0}}元
  1354 + </div>
1353 1355 </div>
1354 1356 </div>
1355 1357 </div>
... ... @@ -1591,7 +1593,8 @@
1591 1593 dataOwnership: '1',
1592 1594 pageNumber: 1,
1593 1595 pageSize: 10,
1594   - isDraft: 0
  1596 + isDraft: 0,
  1597 + state:'5'
1595 1598 },
1596 1599  
1597 1600 planFen: '',
... ... @@ -1780,7 +1783,7 @@
1780 1783 },
1781 1784 contentStyle: {
1782 1785 width: '300px',
1783   -
  1786 +
1784 1787 // height:'42px',
1785 1788 },
1786 1789 labelStyleOne: {
... ... @@ -1806,7 +1809,7 @@
1806 1809 ListTwo: '',
1807 1810 effectivenessListOne: {},
1808 1811 effectivenessListTwo: {},
1809   - zhixingRules:{
  1812 + zhixingRules: {
1810 1813 planName: [{
1811 1814 required: true,
1812 1815 message: '请输入活动名称',
... ... @@ -1915,14 +1918,14 @@
1915 1918 this.tableData = res.data.content
1916 1919 },
1917 1920 formatTimestampToDate(timestamp) {
1918   - const date = new Date(timestamp);
1919   - const year = date.getFullYear();
1920   - const month = String(date.getMonth() + 1).padStart(2, '0');
1921   - const day = String(date.getDate()).padStart(2, '0');
1922   - const hours = String(date.getHours()).padStart(2, '0');
1923   - const minutes = String(date.getMinutes()).padStart(2, '0');
1924   - const seconds = String(date.getSeconds()).padStart(2, '0');
1925   - return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
  1921 + const date = new Date(timestamp);
  1922 + const year = date.getFullYear();
  1923 + const month = String(date.getMonth() + 1).padStart(2, '0');
  1924 + const day = String(date.getDate()).padStart(2, '0');
  1925 + const hours = String(date.getHours()).padStart(2, '0');
  1926 + const minutes = String(date.getMinutes()).padStart(2, '0');
  1927 + const seconds = String(date.getSeconds()).padStart(2, '0');
  1928 + return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
1926 1929 },
1927 1930 //重置按钮
1928 1931 resetting() {
... ... @@ -1932,7 +1935,8 @@
1932 1935 dataOwnership: '1',
1933 1936 pageNumber: 1,
1934 1937 pageSize: 10,
1935   - isDraft: 0
  1938 + isDraft: 0,
  1939 + state:'5'
1936 1940 }
1937 1941 this.getAll()
1938 1942 },
... ... @@ -1956,17 +1960,17 @@
1956 1960 } else if (val == 3) {
1957 1961 this.zhixingBian = flag
1958 1962 this.activeName = 'fourd'
1959   -
  1963 +
1960 1964 }
1961 1965 effectivenessLog({
1962 1966 activityEffectivenessId: item.id
1963 1967 }).then(res => {
1964 1968 this.effectivenessList = res.data
1965 1969 // let actName = this.effectivenessList.operationType.split('')
1966   - this.effectivenessList.map((item,index)=>{
1967   - let actName = item.operationType.split(' ')
1968   - this.effectivenessList[index].operationType = actName[0]
1969   - })
  1970 + this.effectivenessList.map((item, index) => {
  1971 + let actName = item.operationType.split(' ')
  1972 + this.effectivenessList[index].operationType = actName[0]
  1973 + })
1970 1974 // console.log(this.effectivenessList.operationType,'actName')
1971 1975 // this.effectivenessList.operationType = actName[0]
1972 1976 })
... ... @@ -2315,16 +2319,16 @@
2315 2319 effectivenessLog({
2316 2320 activityEffectivenessId: item.id
2317 2321 }).then(res => {
2318   -
  2322 +
2319 2323 this.effectivenessList = res.data
2320   - this.effectivenessList.map((item,index)=>{
2321   - let actName = item.operationType.split(' ')
2322   - this.effectivenessList[index].operationType = actName[0]
2323   - })
  2324 + this.effectivenessList.map((item, index) => {
  2325 + let actName = item.operationType.split(' ')
  2326 + this.effectivenessList[index].operationType = actName[0]
  2327 + })
2324 2328 })
2325   - this.ListOne =''
  2329 + this.ListOne = ''
2326 2330 this.ListTwo = ''
2327   - this.effectivenessListOne ={}
  2331 + this.effectivenessListOne = {}
2328 2332 this.effectivenessListTwo = {}
2329 2333  
2330 2334 // actPage({
... ... @@ -2513,58 +2517,84 @@
2513 2517 this.searchShow = true
2514 2518 },
2515 2519 lichange(e) {
2516   -
  2520 +
2517 2521 // this.lishiList = e
2518 2522 let msg = this.effectivenessList[e]
2519 2523 // this.duibiList = JSON.parse(msg.modifyContent)
2520   -
  2524 +
2521 2525 this.duibiList = JSON.parse(msg.modifiedData)
2522 2526  
2523 2527 },
2524 2528 lichangeOne(e) {
2525 2529 let msg = this.effectivenessList[e]
2526   - if(typeof msg.modifiedData == 'string'){
  2530 + if (typeof msg.modifiedData == 'string') {
2527 2531 this.effectivenessListOne = JSON.parse(msg.modifiedData)
2528   - }else{
  2532 + } else {
2529 2533 this.effectivenessListOne = msg.modifiedData
2530 2534 }
2531   -
2532   - if (this.effectivenessListOne.internalLaborCostEstimation!=undefined&&this.effectivenessListTwo.internalLaborCostEstimation!=undefined && this.effectivenessListOne.internalLaborCostEstimation != '' && this.effectivenessListTwo
2533   - .internalLaborCostEstimation != '') {
2534   - this.effectivenessListOne.sumNei = Number(this.effectivenessListOne.internalLaborCostEstimation) /
2535   - Number(this.effectivenessListTwo.internalLaborCostEstimation) * 100
2536   - }
2537   - if (this.effectivenessListOne.externalLaborCostEstimation!=undefined&&this.effectivenessListTwo.externalLaborCostEstimation!=undefined &&this.effectivenessListOne.externalLaborCostEstimation != '' && this.effectivenessListTwo
2538   - .externalLaborCostEstimation != '') {
2539   - this.effectivenessListOne.sumWai = Number(this.effectivenessListOne.externalLaborCostEstimation) /
2540   - Number(this.effectivenessListTwo.externalLaborCostEstimation) * 100
2541   - }
2542   - if (this.effectivenessListOne.costEstimationGoods!=undefined&&this.effectivenessListTwo.costEstimationGoods!=undefined &&this.effectivenessListOne.costEstimationGoods != '' && this.effectivenessListTwo
2543   - .costEstimationGoods != '') {
2544   - this.effectivenessListOne.sumShop = Number(this.effectivenessListOne.costEstimationGoods) /
2545   - Number(this.effectivenessListTwo.costEstimationGoods) * 100
2546   - }
2547   - if (this.effectivenessListOne.setCostEstimate!=undefined&&this.effectivenessListTwo.setCostEstimate!=undefined &&this.effectivenessListOne.setCostEstimate != '' && this.effectivenessListTwo
2548   - .setCostEstimate != '') {
2549   - this.effectivenessListOne.sumSe = Number(this.effectivenessListOne.setCostEstimate) /
2550   - Number(this.effectivenessListTwo.setCostEstimate) * 100
2551   - }
2552   - if (this.effectivenessListOne.estimatedPromotionalExpenses!=undefined&&this.effectivenessListTwo.estimatedPromotionalExpenses!=undefined &&this.effectivenessListOne.estimatedPromotionalExpenses != '' && this.effectivenessListTwo
2553   - .estimatedPromotionalExpenses != '') {
2554   - this.effectivenessListOne.sumXuan = Number(this.effectivenessListOne.estimatedPromotionalExpenses) /
2555   - Number(this.effectivenessListTwo.estimatedPromotionalExpenses) * 100
2556   - }
2557   - if (this.effectivenessListOne.otherNecessaryEstimates!=undefined&&this.effectivenessListTwo.otherNecessaryEstimates!=undefined &&this.effectivenessListOne.otherNecessaryEstimates != '' && this.effectivenessListTwo
2558   - .otherNecessaryEstimates != '') {
2559   - this.effectivenessListOne.sumQi = Number(this.effectivenessListOne.otherNecessaryEstimates) /
2560   - Number(this.effectivenessListTwo.otherNecessaryEstimates) * 100
2561   - }
2562   - if (this.effectivenessListOne.totalCostEstimation!=undefined&&this.effectivenessListTwo.totalCostEstimation!=undefined &&this.effectivenessListOne.totalCostEstimation != '' && this.effectivenessListTwo
2563   - .totalCostEstimation != '') {
2564   -
2565   - this.effectivenessListOne.sumAll = Number(this.effectivenessListOne.totalCostEstimation) /
2566   - Number(this.effectivenessListTwo.totalCostEstimation) * 100
2567   - }
  2535 +
  2536 + if (this.effectivenessListOne.internalLaborCostEstimation != undefined && this.effectivenessListTwo
  2537 + .internalLaborCostEstimation != undefined && this.effectivenessListOne.internalLaborCostEstimation !=
  2538 + '' && this.effectivenessListTwo
  2539 + .internalLaborCostEstimation != '') {
  2540 + let sum = (Number(this.effectivenessListOne.internalLaborCostEstimation) - Number(this
  2541 + .effectivenessListTwo.internalLaborCostEstimation)) / Number(this.effectivenessListTwo
  2542 + .internalLaborCostEstimation) * 100
  2543 + this.effectivenessListOne.sumNei = sum.toFixed(2)
  2544 + }
  2545 + if (this.effectivenessListOne.externalLaborCostEstimation != undefined && this.effectivenessListTwo
  2546 + .externalLaborCostEstimation != undefined && this.effectivenessListOne.externalLaborCostEstimation !=
  2547 + '' && this.effectivenessListTwo
  2548 + .externalLaborCostEstimation != '') {
  2549 + let sum = (Number(this.effectivenessListOne.externalLaborCostEstimation) - Number(this
  2550 + .effectivenessListTwo.externalLaborCostEstimation)) / Number(this.effectivenessListTwo
  2551 + .externalLaborCostEstimation) * 100
  2552 + this.effectivenessListOne.sumWai = sum.toFixed(2)
  2553 +
  2554 + }
  2555 + if (this.effectivenessListOne.costEstimationGoods != undefined && this.effectivenessListTwo
  2556 + .costEstimationGoods != undefined && this.effectivenessListOne.costEstimationGoods != '' && this
  2557 + .effectivenessListTwo
  2558 + .costEstimationGoods != '') {
  2559 + let sum = (Number(this.effectivenessListOne.costEstimationGoods) - Number(this.effectivenessListTwo
  2560 + .costEstimationGoods)) / Number(this.effectivenessListTwo.costEstimationGoods) * 100
  2561 + this.effectivenessListOne.sumShop = sum.toFixed(2)
  2562 +
  2563 + }
  2564 + if (this.effectivenessListOne.setCostEstimate != undefined && this.effectivenessListTwo.setCostEstimate !=
  2565 + undefined && this.effectivenessListOne.setCostEstimate != '' && this.effectivenessListTwo
  2566 + .setCostEstimate != '') {
  2567 + let sum = (Number(this.effectivenessListOne.setCostEstimate) - Number(this.effectivenessListTwo
  2568 + .setCostEstimate)) / Number(this.effectivenessListTwo.setCostEstimate) * 100
  2569 + this.effectivenessListOne.sumSe = sum.toFixed(2)
  2570 +
  2571 + }
  2572 + if (this.effectivenessListOne.estimatedPromotionalExpenses != undefined && this.effectivenessListTwo
  2573 + .estimatedPromotionalExpenses != undefined && this.effectivenessListOne.estimatedPromotionalExpenses !=
  2574 + '' && this.effectivenessListTwo
  2575 + .estimatedPromotionalExpenses != '') {
  2576 + let sum = (Number(this.effectivenessListOne.estimatedPromotionalExpenses) - Number(this
  2577 + .effectivenessListTwo.estimatedPromotionalExpenses)) / Number(this.effectivenessListTwo
  2578 + .estimatedPromotionalExpenses) * 100
  2579 +
  2580 + this.effectivenessListOne.sumXuan = sum.toFixed(2)
  2581 + }
  2582 + if (this.effectivenessListOne.otherNecessaryEstimates != undefined && this.effectivenessListTwo
  2583 + .otherNecessaryEstimates != undefined && this.effectivenessListOne.otherNecessaryEstimates != '' &&
  2584 + this.effectivenessListTwo
  2585 + .otherNecessaryEstimates != '') {
  2586 + let sum = (Number(this.effectivenessListOne.otherNecessaryEstimates) - Number(this.effectivenessListTwo
  2587 + .otherNecessaryEstimates)) / Number(this.effectivenessListTwo.otherNecessaryEstimates) * 100
  2588 + this.effectivenessListOne.sumQi = sum.toFixed(2)
  2589 + }
  2590 + if (this.effectivenessListOne.totalCostEstimation != undefined && this.effectivenessListTwo
  2591 + .totalCostEstimation != undefined && this.effectivenessListOne.totalCostEstimation != '' && this
  2592 + .effectivenessListTwo
  2593 + .totalCostEstimation != '') {
  2594 + let sum = (Number(this.effectivenessListOne.totalCostEstimation) - Number(this.effectivenessListTwo
  2595 + .totalCostEstimation)) / Number(this.effectivenessListTwo.totalCostEstimation) * 100
  2596 + this.effectivenessListOne.sumAll = sum.toFixed(2)
  2597 + }
2568 2598 // sumNei
2569 2599 // sumWai
2570 2600 // sumShop
... ... @@ -2583,47 +2613,73 @@
2583 2613 },
2584 2614 lichangeTwo(e) {
2585 2615 let msg = this.effectivenessList[e]
2586   - if(typeof msg.modifiedData == 'string'){
  2616 + if (typeof msg.modifiedData == 'string') {
2587 2617 this.effectivenessListTwo = JSON.parse(msg.modifiedData)
2588   - }else{
  2618 + } else {
2589 2619 this.effectivenessListTwo = msg.modifiedData
2590 2620 }
2591   - if (this.effectivenessListOne.internalLaborCostEstimation!=undefined&&this.effectivenessListTwo.internalLaborCostEstimation!=undefined && this.effectivenessListOne.internalLaborCostEstimation != '' && this.effectivenessListTwo
2592   - .internalLaborCostEstimation != '') {
2593   - this.effectivenessListOne.sumNei = Number(this.effectivenessListOne.internalLaborCostEstimation) /
2594   - Number(this.effectivenessListTwo.internalLaborCostEstimation) * 100
2595   - }
2596   - if (this.effectivenessListOne.externalLaborCostEstimation!=undefined&&this.effectivenessListTwo.externalLaborCostEstimation!=undefined &&this.effectivenessListOne.externalLaborCostEstimation != '' && this.effectivenessListTwo
2597   - .externalLaborCostEstimation != '') {
2598   - this.effectivenessListOne.sumWai = Number(this.effectivenessListOne.externalLaborCostEstimation) /
2599   - Number(this.effectivenessListTwo.externalLaborCostEstimation) * 100
2600   - }
2601   - if (this.effectivenessListOne.costEstimationGoods!=undefined&&this.effectivenessListTwo.costEstimationGoods!=undefined &&this.effectivenessListOne.costEstimationGoods != '' && this.effectivenessListTwo
2602   - .costEstimationGoods != '') {
2603   - this.effectivenessListOne.sumShop = Number(this.effectivenessListOne.costEstimationGoods) /
2604   - Number(this.effectivenessListTwo.costEstimationGoods) * 100
2605   - }
2606   - if (this.effectivenessListOne.setCostEstimate!=undefined&&this.effectivenessListTwo.setCostEstimate!=undefined &&this.effectivenessListOne.setCostEstimate != '' && this.effectivenessListTwo
2607   - .setCostEstimate != '') {
2608   - this.effectivenessListOne.sumSe = Number(this.effectivenessListOne.setCostEstimate) /
2609   - Number(this.effectivenessListTwo.setCostEstimate) * 100
2610   - }
2611   - if (this.effectivenessListOne.estimatedPromotionalExpenses!=undefined&&this.effectivenessListTwo.estimatedPromotionalExpenses!=undefined &&this.effectivenessListOne.estimatedPromotionalExpenses != '' && this.effectivenessListTwo
2612   - .estimatedPromotionalExpenses != '') {
2613   - this.effectivenessListOne.sumXuan = Number(this.effectivenessListOne.estimatedPromotionalExpenses) /
2614   - Number(this.effectivenessListTwo.estimatedPromotionalExpenses) * 100
2615   - }
2616   - if (this.effectivenessListOne.otherNecessaryEstimates!=undefined&&this.effectivenessListTwo.otherNecessaryEstimates!=undefined &&this.effectivenessListOne.otherNecessaryEstimates != '' && this.effectivenessListTwo
2617   - .otherNecessaryEstimates != '') {
2618   - this.effectivenessListOne.sumQi = Number(this.effectivenessListOne.otherNecessaryEstimates) /
2619   - Number(this.effectivenessListTwo.otherNecessaryEstimates) * 100
2620   - }
2621   - if (this.effectivenessListOne.totalCostEstimation!=undefined&&this.effectivenessListTwo.totalCostEstimation!=undefined &&this.effectivenessListOne.totalCostEstimation != '' && this.effectivenessListTwo
2622   - .totalCostEstimation != '') {
2623   -
2624   - this.effectivenessListOne.sumAll = Number(this.effectivenessListOne.totalCostEstimation) /
2625   - Number(this.effectivenessListTwo.totalCostEstimation) * 100
2626   - }
  2621 + if (this.effectivenessListOne.internalLaborCostEstimation != undefined && this.effectivenessListTwo
  2622 + .internalLaborCostEstimation != undefined && this.effectivenessListOne.internalLaborCostEstimation !=
  2623 + '' && this.effectivenessListTwo
  2624 + .internalLaborCostEstimation != '') {
  2625 + let sum = (Number(this.effectivenessListOne.internalLaborCostEstimation) - Number(this
  2626 + .effectivenessListTwo.internalLaborCostEstimation)) / Number(this.effectivenessListTwo
  2627 + .internalLaborCostEstimation) * 100
  2628 + this.effectivenessListOne.sumNei = sum.toFixed(2)
  2629 + }
  2630 + if (this.effectivenessListOne.externalLaborCostEstimation != undefined && this.effectivenessListTwo
  2631 + .externalLaborCostEstimation != undefined && this.effectivenessListOne.externalLaborCostEstimation !=
  2632 + '' && this.effectivenessListTwo
  2633 + .externalLaborCostEstimation != '') {
  2634 + let sum = (Number(this.effectivenessListOne.externalLaborCostEstimation) - Number(this
  2635 + .effectivenessListTwo.externalLaborCostEstimation)) / Number(this.effectivenessListTwo
  2636 + .externalLaborCostEstimation) * 100
  2637 + this.effectivenessListOne.sumWai = sum.toFixed(2)
  2638 +
  2639 + }
  2640 + if (this.effectivenessListOne.costEstimationGoods != undefined && this.effectivenessListTwo
  2641 + .costEstimationGoods != undefined && this.effectivenessListOne.costEstimationGoods != '' && this
  2642 + .effectivenessListTwo
  2643 + .costEstimationGoods != '') {
  2644 + let sum = (Number(this.effectivenessListOne.costEstimationGoods) - Number(this.effectivenessListTwo
  2645 + .costEstimationGoods)) / Number(this.effectivenessListTwo.costEstimationGoods) * 100
  2646 + this.effectivenessListOne.sumShop = sum.toFixed(2)
  2647 +
  2648 + }
  2649 + if (this.effectivenessListOne.setCostEstimate != undefined && this.effectivenessListTwo.setCostEstimate !=
  2650 + undefined && this.effectivenessListOne.setCostEstimate != '' && this.effectivenessListTwo
  2651 + .setCostEstimate != '') {
  2652 + let sum = (Number(this.effectivenessListOne.setCostEstimate) - Number(this.effectivenessListTwo
  2653 + .setCostEstimate)) / Number(this.effectivenessListTwo.setCostEstimate) * 100
  2654 + this.effectivenessListOne.sumSe = sum.toFixed(2)
  2655 +
  2656 + }
  2657 + if (this.effectivenessListOne.estimatedPromotionalExpenses != undefined && this.effectivenessListTwo
  2658 + .estimatedPromotionalExpenses != undefined && this.effectivenessListOne.estimatedPromotionalExpenses !=
  2659 + '' && this.effectivenessListTwo
  2660 + .estimatedPromotionalExpenses != '') {
  2661 + let sum = (Number(this.effectivenessListOne.estimatedPromotionalExpenses) - Number(this
  2662 + .effectivenessListTwo.estimatedPromotionalExpenses)) / Number(this.effectivenessListTwo
  2663 + .estimatedPromotionalExpenses) * 100
  2664 +
  2665 + this.effectivenessListOne.sumXuan = sum.toFixed(2)
  2666 + }
  2667 + if (this.effectivenessListOne.otherNecessaryEstimates != undefined && this.effectivenessListTwo
  2668 + .otherNecessaryEstimates != undefined && this.effectivenessListOne.otherNecessaryEstimates != '' &&
  2669 + this.effectivenessListTwo
  2670 + .otherNecessaryEstimates != '') {
  2671 + let sum = (Number(this.effectivenessListOne.otherNecessaryEstimates) - Number(this.effectivenessListTwo
  2672 + .otherNecessaryEstimates)) / Number(this.effectivenessListTwo.otherNecessaryEstimates) * 100
  2673 + this.effectivenessListOne.sumQi = sum.toFixed(2)
  2674 + }
  2675 + if (this.effectivenessListOne.totalCostEstimation != undefined && this.effectivenessListTwo
  2676 + .totalCostEstimation != undefined && this.effectivenessListOne.totalCostEstimation != '' && this
  2677 + .effectivenessListTwo
  2678 + .totalCostEstimation != '') {
  2679 + let sum = (Number(this.effectivenessListOne.totalCostEstimation) - Number(this.effectivenessListTwo
  2680 + .totalCostEstimation)) / Number(this.effectivenessListTwo.totalCostEstimation) * 100
  2681 + this.effectivenessListOne.sumAll = sum.toFixed(2)
  2682 + }
2627 2683 },
2628 2684 tiaozheng() {
2629 2685 this.tiaozhengShow = true
... ... @@ -2642,50 +2698,50 @@
2642 2698 },
2643 2699 //执行效果保存
2644 2700 async bianji() {
2645   - this.$refs.zhixingFormInfo.validate((valid) => {
2646   - if (valid) {
2647   - if (this.fileData.length != 0) {
2648   - this.zhixingList.feedbackContent = this.fileData[0].url
2649   - }
2650   - if (this.zhiXing) {
2651   - this.zhixingList.eventStartTime = this.zhixingList.planTime[0]
2652   - this.zhixingList.eventEndTime = this.zhixingList.planTime[1]
2653   - this.zhixingList.detailsId = this.secondData.id
2654   - this.zhixingList.createDate = this.updateCurrentTime()
2655   - actAdd(this.zhixingList).then(res => {
2656   - for (let i = 0; i < this.tableDa.length; i++) {
2657   - this.tableDa[i].detailsId = res.data.id
2658   - MingAdd(this.tableDa[i]).then(res => {
2659   - this.ggXin = false
2660   - this.getAll()
2661   - })
2662   - }
2663   - })
2664   -
2665   - } else {
2666   - let that = this
2667   - Vue.delete(that.zhixingList, 'createDate')
2668   - this.zhixingList.eventStartTime = this.zhixingList.planTime[0]
2669   - this.zhixingList.eventEndTime = this.zhixingList.planTime[1]
2670   - Vue.delete(that.zhixingList, 'planTime')
2671   - this.zhixingList.updateDate = ''
2672   - actEdit(this.zhixingList).then(()=>{
2673   - this.ggXin = false
2674   - this.getAll()
2675   - })
2676   - }
2677   -
2678   -
2679   - }else{
2680   - this.$message({
2681   - message: '请填写数据',
2682   - type: 'error',
2683   - offset: 100
2684   - })
2685   - return false;
2686   - }
2687   - })
2688   -
  2701 + this.$refs.zhixingFormInfo.validate((valid) => {
  2702 + if (valid) {
  2703 + if (this.fileData.length != 0) {
  2704 + this.zhixingList.feedbackContent = this.fileData[0].url
  2705 + }
  2706 + if (this.zhiXing) {
  2707 + this.zhixingList.eventStartTime = this.zhixingList.planTime[0]
  2708 + this.zhixingList.eventEndTime = this.zhixingList.planTime[1]
  2709 + this.zhixingList.detailsId = this.secondData.id
  2710 + this.zhixingList.createDate = this.updateCurrentTime()
  2711 + actAdd(this.zhixingList).then(res => {
  2712 + for (let i = 0; i < this.tableDa.length; i++) {
  2713 + this.tableDa[i].detailsId = res.data.id
  2714 + MingAdd(this.tableDa[i]).then(res => {
  2715 + this.ggXin = false
  2716 + this.getAll()
  2717 + })
  2718 + }
  2719 + })
  2720 +
  2721 + } else {
  2722 + let that = this
  2723 + Vue.delete(that.zhixingList, 'createDate')
  2724 + this.zhixingList.eventStartTime = this.zhixingList.planTime[0]
  2725 + this.zhixingList.eventEndTime = this.zhixingList.planTime[1]
  2726 + Vue.delete(that.zhixingList, 'planTime')
  2727 + this.zhixingList.updateDate = ''
  2728 + actEdit(this.zhixingList).then(() => {
  2729 + this.ggXin = false
  2730 + this.getAll()
  2731 + })
  2732 + }
  2733 +
  2734 +
  2735 + } else {
  2736 + this.$message({
  2737 + message: '请填写数据',
  2738 + type: 'error',
  2739 + offset: 100
  2740 + })
  2741 + return false;
  2742 + }
  2743 + })
  2744 +
2689 2745 },
2690 2746 searchQuit() {
2691 2747 this.searPei = {
... ...
admin-web-master/src/views/atmosphere/atmosphereHis.vue
  View file @3d9acc2
... ... @@ -1187,7 +1187,7 @@
1187 1187 <div style="display:flex;padding:20px 20px 0px 20px;width:100%;justify-content: center;">
1188 1188 <el-select v-model="ListOne" placeholder="请选择" style="margin:0 20px 20px 20px;" @change="lichangeOne">
1189 1189 <el-option v-for="(item,index) in effectivenessList" :key="item.id" :label="item.operationType"
1190   - :value="item">
  1190 + :value="index">
1191 1191 </el-option>
1192 1192 </el-select>
1193 1193 <div style="line-height:200%;">
... ... @@ -1195,140 +1195,142 @@
1195 1195 </div>
1196 1196 <el-select v-model="ListTwo" placeholder="请选择" style="margin:0 20px 20px 20px;" @change="lichangeTwo">
1197 1197 <el-option v-for="(item,index) in effectivenessList" :key="item.id" :label="item.operationType"
1198   - :value="item">
  1198 + :value="index">
1199 1199 </el-option>
1200 1200 </el-select>
1201 1201 <!-- <el-button @click="tiaozheng" style="background-color: #3F9B6A;color: #fff"
1202 1202 >对比
1203 1203 </el-button> -->
1204 1204 </div>
1205   - <div style="display:flex;width:100%;justify-content: center;padding: 0 20px;">
1206   - <div style="width: 20%;">
1207   - <div style="color:#3F9B6A;text-align: center;padding: 10px 0;">实际成本</div>
1208   - <div
1209   - style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
1210   - <div>内部人力</div>
1211   - <div>
1212   - {{effectivenessListOne.internalLaborCostEstimation?effectivenessListOne.internalLaborCostEstimation:0}}元
  1205 + <div style="padding: 15px 40px;">
  1206 + <div style="display:flex;width:100%;justify-content: center;border: 1px solid #DEDEDE;border-radius: 5px;padding: 0px 10px;">
  1207 + <div style="width: 38%;">
  1208 + <div style="color:#3F9B6A;text-align: center;padding: 10px 0;">实际成本</div>
  1209 + <div
  1210 + style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
  1211 + <div>内部人力</div>
  1212 + <div>
  1213 + {{effectivenessListOne.internalLaborCostEstimation?effectivenessListOne.internalLaborCostEstimation:0}}元
  1214 + </div>
1213 1215 </div>
1214   - </div>
1215   - <div
1216   - style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
1217   - <div>外部人力</div>
1218   - <div>
1219   - {{effectivenessListOne.externalLaborCostEstimation?effectivenessListOne.externalLaborCostEstimation:0}}元
  1216 + <div
  1217 + style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
  1218 + <div>外部人力</div>
  1219 + <div>
  1220 + {{effectivenessListOne.externalLaborCostEstimation?effectivenessListOne.externalLaborCostEstimation:0}}元
  1221 + </div>
1220 1222 </div>
1221   - </div>
1222   - <div
1223   - style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
1224   - <div>商品成本</div>
1225   - <div>{{effectivenessListOne.costEstimationGoods?effectivenessListOne.costEstimationGoods:0}}元
  1223 + <div
  1224 + style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
  1225 + <div>商品成本</div>
  1226 + <div>{{effectivenessListOne.costEstimationGoods?effectivenessListOne.costEstimationGoods:0}}元
  1227 + </div>
1226 1228 </div>
1227   - </div>
1228   - <div
1229   - style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
1230   - <div>设备成本</div>
1231   - <div>{{effectivenessListOne.setCostEstimate?effectivenessListOne.setCostEstimate:0}}元</div>
1232   - </div>
1233   - <div
1234   - style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
1235   - <div>宣传费用</div>
1236   - <div>
1237   - {{effectivenessListOne.estimatedPromotionalExpenses?effectivenessListOne.estimatedPromotionalExpenses:0}}元
  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>{{effectivenessListOne.setCostEstimate?effectivenessListOne.setCostEstimate:0}}元</div>
1238 1233 </div>
1239   - </div>
1240   - <div
1241   - style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
1242   - <div>其他成本</div>
1243   - <div>
1244   - {{effectivenessListOne.otherNecessaryEstimates?effectivenessListOne.otherNecessaryEstimates:0}}元
  1234 + <div
  1235 + style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
  1236 + <div>宣传费用</div>
  1237 + <div>
  1238 + {{effectivenessListOne.estimatedPromotionalExpenses?effectivenessListOne.estimatedPromotionalExpenses:0}}元
  1239 + </div>
1245 1240 </div>
1246   - </div>
1247   - <div
1248   - style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
1249   - <div>总成本</div>
1250   - <div>{{effectivenessListOne.totalCostEstimation?effectivenessListOne.totalCostEstimation:0}}元
  1241 + <div
  1242 + style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
  1243 + <div>其他成本</div>
  1244 + <div>
  1245 + {{effectivenessListOne.otherNecessaryEstimates?effectivenessListOne.otherNecessaryEstimates:0}}元
  1246 + </div>
1251 1247 </div>
1252   - </div>
1253   - </div>
1254   - <div style="width: 15%;margin: 0 20px;">
1255   - <div style="color:#3F9B6A;text-align: center;padding: 10px 0;">增长率</div>
1256   - <div
1257   - style="padding:10px 0px;text-align: center;margin:10px;border: 1px solid #3F9B6A;border-radius: 5px;background-color: #3F9B6A;color: #fff;">
1258   - {{effectivenessListOne.sumNei?effectivenessListOne.sumNei:0}}%
1259   - </div>
1260   - <div
1261   - style="padding:10px 0px;text-align: center;margin:10px;border: 1px solid #3F9B6A;border-radius: 5px;background-color: #3F9B6A;color: #fff;">
1262   - {{effectivenessListOne.sumWai?effectivenessListOne.sumWai:0}}%
1263   - </div>
1264   - <div
1265   - style="padding:10px 0px;text-align: center;margin:10px;border: 1px solid #3F9B6A;border-radius: 5px;background-color: #3F9B6A;color: #fff;">
1266   - {{effectivenessListOne.sumShop?effectivenessListOne.sumShop:0}}%
1267   - </div>
1268   - <div
1269   - style="padding:10px 0px;text-align: center;margin:10px;border: 1px solid #3F9B6A;border-radius: 5px;background-color: #3F9B6A;color: #fff;">
1270   - {{effectivenessListOne.sumSe?effectivenessListOne.sumSe:0}}%
1271   - </div>
1272   - <div
1273   - style="padding:10px 0px;text-align: center;margin:10px;border: 1px solid #3F9B6A;border-radius: 5px;background-color: #3F9B6A;color: #fff;">
1274   - {{effectivenessListOne.sumXuan?effectivenessListOne.sumXuan:0}}%
1275   - </div>
1276   - <div
1277   - style="padding:10px 0px;text-align: center;margin:10px;border: 1px solid #3F9B6A;border-radius: 5px;background-color: #3F9B6A;color: #fff;">
1278   - {{effectivenessListOne.sumQi?effectivenessListOne.sumQi:0}}%
1279   - </div>
1280   - <div
1281   - style="padding:10px 0px;text-align: center;margin:10px;border: 1px solid #3F9B6A;border-radius: 5px;background-color: #3F9B6A;color: #fff;">
1282   - {{effectivenessListOne.sumAll?effectivenessListOne.sumAll:0}}%
1283   - </div>
1284   -
1285   -
1286   - </div>
1287   - <div style="width: 20%;">
1288   - <div style="color:#3F9B6A;text-align: center;padding: 10px 0;">实际成本</div>
1289   - <div
1290   - style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
1291   - <div>内部人力</div>
1292   - <div>
1293   - {{effectivenessListTwo.internalLaborCostEstimation?effectivenessListTwo.internalLaborCostEstimation:0}}元
  1248 + <div
  1249 + style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
  1250 + <div>总成本</div>
  1251 + <div>{{effectivenessListOne.totalCostEstimation?effectivenessListOne.totalCostEstimation:0}}元
  1252 + </div>
1294 1253 </div>
1295 1254 </div>
1296   - <div
1297   - style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
1298   - <div>外部人力</div>
1299   - <div>
1300   - {{effectivenessListTwo.externalLaborCostEstimation?effectivenessListTwo.externalLaborCostEstimation:0}}元
  1255 + <div style="width: 15%;margin: 0 20px;">
  1256 + <div style="color:#3F9B6A;text-align: center;padding: 10px 0;">增长率</div>
  1257 + <div
  1258 + style="padding:10px 0px;text-align: center;margin:10px;border: 1px solid #3F9B6A;border-radius: 5px;background-color: #3F9B6A;color: #fff;">
  1259 + {{effectivenessListOne.sumNei?effectivenessListOne.sumNei:0}}%
1301 1260 </div>
1302   - </div>
1303   - <div
1304   - style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
1305   - <div>商品成本</div>
1306   - <div>{{effectivenessListTwo.costEstimationGoods?effectivenessListTwo.costEstimationGoods:0}}元
  1261 + <div
  1262 + style="padding:10px 0px;text-align: center;margin:10px;border: 1px solid #3F9B6A;border-radius: 5px;background-color: #3F9B6A;color: #fff;">
  1263 + {{effectivenessListOne.sumWai?effectivenessListOne.sumWai:0}}%
1307 1264 </div>
1308   - </div>
1309   - <div
1310   - style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
1311   - <div>设备成本</div>
1312   - <div>{{effectivenessListTwo.setCostEstimate?effectivenessListTwo.setCostEstimate:0}}元</div>
1313   - </div>
1314   - <div
1315   - style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
1316   - <div>宣传费用</div>
1317   - <div>
1318   - {{effectivenessListTwo.estimatedPromotionalExpenses?effectivenessListTwo.estimatedPromotionalExpenses:0}}元
  1265 + <div
  1266 + style="padding:10px 0px;text-align: center;margin:10px;border: 1px solid #3F9B6A;border-radius: 5px;background-color: #3F9B6A;color: #fff;">
  1267 + {{effectivenessListOne.sumShop?effectivenessListOne.sumShop:0}}%
1319 1268 </div>
1320   - </div>
1321   - <div
1322   - style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
1323   - <div>其他成本</div>
1324   - <div>
1325   - {{effectivenessListTwo.otherNecessaryEstimates?effectivenessListTwo.otherNecessaryEstimates:0}}元
  1269 + <div
  1270 + style="padding:10px 0px;text-align: center;margin:10px;border: 1px solid #3F9B6A;border-radius: 5px;background-color: #3F9B6A;color: #fff;">
  1271 + {{effectivenessListOne.sumSe?effectivenessListOne.sumSe:0}}%
1326 1272 </div>
  1273 + <div
  1274 + style="padding:10px 0px;text-align: center;margin:10px;border: 1px solid #3F9B6A;border-radius: 5px;background-color: #3F9B6A;color: #fff;">
  1275 + {{effectivenessListOne.sumXuan?effectivenessListOne.sumXuan:0}}%
  1276 + </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.sumQi?effectivenessListOne.sumQi: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.sumAll?effectivenessListOne.sumAll:0}}%
  1284 + </div>
  1285 +
  1286 +
1327 1287 </div>
1328   - <div
1329   - style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
1330   - <div>总成本</div>
1331   - <div>{{effectivenessListTwo.totalCostEstimation?effectivenessListTwo.totalCostEstimation:0}}元
  1288 + <div style="width: 38%;">
  1289 + <div style="color:#3F9B6A;text-align: center;padding: 10px 0;">实际成本</div>
  1290 + <div
  1291 + style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
  1292 + <div>内部人力</div>
  1293 + <div>
  1294 + {{effectivenessListTwo.internalLaborCostEstimation?effectivenessListTwo.internalLaborCostEstimation:0}}元
  1295 + </div>
  1296 + </div>
  1297 + <div
  1298 + style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
  1299 + <div>外部人力</div>
  1300 + <div>
  1301 + {{effectivenessListTwo.externalLaborCostEstimation?effectivenessListTwo.externalLaborCostEstimation:0}}元
  1302 + </div>
  1303 + </div>
  1304 + <div
  1305 + style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
  1306 + <div>商品成本</div>
  1307 + <div>{{effectivenessListTwo.costEstimationGoods?effectivenessListTwo.costEstimationGoods:0}}元
  1308 + </div>
  1309 + </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>{{effectivenessListTwo.setCostEstimate?effectivenessListTwo.setCostEstimate:0}}元</div>
  1314 + </div>
  1315 + <div
  1316 + style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
  1317 + <div>宣传费用</div>
  1318 + <div>
  1319 + {{effectivenessListTwo.estimatedPromotionalExpenses?effectivenessListTwo.estimatedPromotionalExpenses:0}}元
  1320 + </div>
  1321 + </div>
  1322 + <div
  1323 + style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
  1324 + <div>其他成本</div>
  1325 + <div>
  1326 + {{effectivenessListTwo.otherNecessaryEstimates?effectivenessListTwo.otherNecessaryEstimates:0}}元
  1327 + </div>
  1328 + </div>
  1329 + <div
  1330 + style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
  1331 + <div>总成本</div>
  1332 + <div>{{effectivenessListTwo.totalCostEstimation?effectivenessListTwo.totalCostEstimation:0}}元
  1333 + </div>
1332 1334 </div>
1333 1335 </div>
1334 1336 </div>
... ... @@ -1569,7 +1571,8 @@
1569 1571 dataOwnership: '2',
1570 1572 pageNumber: 1,
1571 1573 pageSize: 10,
1572   - isDraft: 0
  1574 + isDraft: 0,
  1575 + state:'5'
1573 1576 },
1574 1577  
1575 1578 planFen: '',
... ... @@ -1895,7 +1898,8 @@
1895 1898 dataOwnership: '2',
1896 1899 pageNumber: 1,
1897 1900 pageSize: 10,
1898   - isDraft: 0
  1901 + isDraft: 0,
  1902 + state:'5'
1899 1903  
1900 1904 }
1901 1905 this.getAll()
... ... @@ -1926,6 +1930,10 @@
1926 1930 activityEffectivenessId: item.id
1927 1931 }).then(res => {
1928 1932 this.effectivenessList = res.data
  1933 + this.effectivenessList.map((item, index) => {
  1934 + let actName = item.operationType.split(' ')
  1935 + this.effectivenessList[index].operationType = actName[0]
  1936 + })
1929 1937 })
1930 1938 this.liData = []
1931 1939 this.lixiang = {}
... ... @@ -2262,8 +2270,11 @@
2262 2270 effectivenessLog({
2263 2271 activityEffectivenessId: item.id
2264 2272 }).then(res => {
2265   - console.log(res.data, 'effectivenessListeffectivenessList')
2266 2273 this.effectivenessList = res.data
  2274 + this.effectivenessList.map((item, index) => {
  2275 + let actName = item.operationType.split(' ')
  2276 + this.effectivenessList[index].operationType = actName[0]
  2277 + })
2267 2278 })
2268 2279 this.ListOne =''
2269 2280 this.ListTwo = ''
... ... @@ -2466,43 +2477,75 @@
2466 2477 this.duibiList = JSON.parse(msg.modifiedData)
2467 2478 },
2468 2479 lichangeOne(e) {
2469   - this.effectivenessListOne = JSON.parse(e.modifiedData)
2470   - if (this.effectivenessListOne.internalLaborCostEstimation != '' && this.effectivenessListTwo
2471   - .internalLaborCostEstimation != '') {
2472   - this.effectivenessListOne.sumNei = Number(this.effectivenessListOne.internalLaborCostEstimation) /
2473   - Number(this.effectivenessListTwo.internalLaborCostEstimation) * 100
2474   - }
2475   - if (this.effectivenessListOne.externalLaborCostEstimation != '' && this.effectivenessListTwo
2476   - .externalLaborCostEstimation != '') {
2477   - this.effectivenessListOne.sumWai = Number(this.effectivenessListOne.externalLaborCostEstimation) /
2478   - Number(this.effectivenessListTwo.externalLaborCostEstimation) * 100
2479   - }
2480   - if (this.effectivenessListOne.costEstimationGoods != '' && this.effectivenessListTwo
2481   - .costEstimationGoods != '') {
2482   - this.effectivenessListOne.sumShop = Number(this.effectivenessListOne.costEstimationGoods) /
2483   - Number(this.effectivenessListTwo.costEstimationGoods) * 100
2484   - }
2485   - if (this.effectivenessListOne.setCostEstimate != '' && this.effectivenessListTwo
2486   - .setCostEstimate != '') {
2487   - this.effectivenessListOne.sumSe = Number(this.effectivenessListOne.setCostEstimate) /
2488   - Number(this.effectivenessListTwo.setCostEstimate) * 100
2489   - }
2490   - if (this.effectivenessListOne.estimatedPromotionalExpenses != '' && this.effectivenessListTwo
2491   - .estimatedPromotionalExpenses != '') {
2492   - this.effectivenessListOne.sumXuan = Number(this.effectivenessListOne.estimatedPromotionalExpenses) /
2493   - Number(this.effectivenessListTwo.estimatedPromotionalExpenses) * 100
2494   - }
2495   - if (this.effectivenessListOne.otherNecessaryEstimates != '' && this.effectivenessListTwo
2496   - .otherNecessaryEstimates != '') {
2497   - this.effectivenessListOne.sumQi = Number(this.effectivenessListOne.otherNecessaryEstimates) /
2498   - Number(this.effectivenessListTwo.otherNecessaryEstimates) * 100
2499   - }
2500   - if (this.effectivenessListOne.totalCostEstimation != '' && this.effectivenessListTwo
2501   - .totalCostEstimation != '') {
2502   -
2503   - this.effectivenessListOne.sumAll = Number(this.effectivenessListOne.totalCostEstimation) /
2504   - Number(this.effectivenessListTwo.totalCostEstimation) * 100
2505   - }
  2480 + let msg = this.effectivenessList[e]
  2481 + if (typeof msg.modifiedData == 'string') {
  2482 + this.effectivenessListOne = JSON.parse(msg.modifiedData)
  2483 + } else {
  2484 + this.effectivenessListOne = msg.modifiedData
  2485 + }
  2486 +
  2487 + if (this.effectivenessListOne.internalLaborCostEstimation != undefined && this.effectivenessListTwo
  2488 + .internalLaborCostEstimation != undefined && this.effectivenessListOne.internalLaborCostEstimation !=
  2489 + '' && this.effectivenessListTwo
  2490 + .internalLaborCostEstimation != '') {
  2491 + let sum = (Number(this.effectivenessListOne.internalLaborCostEstimation) - Number(this
  2492 + .effectivenessListTwo.internalLaborCostEstimation)) / Number(this.effectivenessListTwo
  2493 + .internalLaborCostEstimation) * 100
  2494 + this.effectivenessListOne.sumNei = sum.toFixed(2)
  2495 + }
  2496 + if (this.effectivenessListOne.externalLaborCostEstimation != undefined && this.effectivenessListTwo
  2497 + .externalLaborCostEstimation != undefined && this.effectivenessListOne.externalLaborCostEstimation !=
  2498 + '' && this.effectivenessListTwo
  2499 + .externalLaborCostEstimation != '') {
  2500 + let sum = (Number(this.effectivenessListOne.externalLaborCostEstimation) - Number(this
  2501 + .effectivenessListTwo.externalLaborCostEstimation)) / Number(this.effectivenessListTwo
  2502 + .externalLaborCostEstimation) * 100
  2503 + this.effectivenessListOne.sumWai = sum.toFixed(2)
  2504 +
  2505 + }
  2506 + if (this.effectivenessListOne.costEstimationGoods != undefined && this.effectivenessListTwo
  2507 + .costEstimationGoods != undefined && this.effectivenessListOne.costEstimationGoods != '' && this
  2508 + .effectivenessListTwo
  2509 + .costEstimationGoods != '') {
  2510 + let sum = (Number(this.effectivenessListOne.costEstimationGoods) - Number(this.effectivenessListTwo
  2511 + .costEstimationGoods)) / Number(this.effectivenessListTwo.costEstimationGoods) * 100
  2512 + this.effectivenessListOne.sumShop = sum.toFixed(2)
  2513 +
  2514 + }
  2515 + if (this.effectivenessListOne.setCostEstimate != undefined && this.effectivenessListTwo.setCostEstimate !=
  2516 + undefined && this.effectivenessListOne.setCostEstimate != '' && this.effectivenessListTwo
  2517 + .setCostEstimate != '') {
  2518 + let sum = (Number(this.effectivenessListOne.setCostEstimate) - Number(this.effectivenessListTwo
  2519 + .setCostEstimate)) / Number(this.effectivenessListTwo.setCostEstimate) * 100
  2520 + this.effectivenessListOne.sumSe = sum.toFixed(2)
  2521 +
  2522 + }
  2523 + if (this.effectivenessListOne.estimatedPromotionalExpenses != undefined && this.effectivenessListTwo
  2524 + .estimatedPromotionalExpenses != undefined && this.effectivenessListOne.estimatedPromotionalExpenses !=
  2525 + '' && this.effectivenessListTwo
  2526 + .estimatedPromotionalExpenses != '') {
  2527 + let sum = (Number(this.effectivenessListOne.estimatedPromotionalExpenses) - Number(this
  2528 + .effectivenessListTwo.estimatedPromotionalExpenses)) / Number(this.effectivenessListTwo
  2529 + .estimatedPromotionalExpenses) * 100
  2530 +
  2531 + this.effectivenessListOne.sumXuan = sum.toFixed(2)
  2532 + }
  2533 + if (this.effectivenessListOne.otherNecessaryEstimates != undefined && this.effectivenessListTwo
  2534 + .otherNecessaryEstimates != undefined && this.effectivenessListOne.otherNecessaryEstimates != '' &&
  2535 + this.effectivenessListTwo
  2536 + .otherNecessaryEstimates != '') {
  2537 + let sum = (Number(this.effectivenessListOne.otherNecessaryEstimates) - Number(this.effectivenessListTwo
  2538 + .otherNecessaryEstimates)) / Number(this.effectivenessListTwo.otherNecessaryEstimates) * 100
  2539 + this.effectivenessListOne.sumQi = sum.toFixed(2)
  2540 + }
  2541 + if (this.effectivenessListOne.totalCostEstimation != undefined && this.effectivenessListTwo
  2542 + .totalCostEstimation != undefined && this.effectivenessListOne.totalCostEstimation != '' && this
  2543 + .effectivenessListTwo
  2544 + .totalCostEstimation != '') {
  2545 + let sum = (Number(this.effectivenessListOne.totalCostEstimation) - Number(this.effectivenessListTwo
  2546 + .totalCostEstimation)) / Number(this.effectivenessListTwo.totalCostEstimation) * 100
  2547 + this.effectivenessListOne.sumAll = sum.toFixed(2)
  2548 + }
2506 2549 // sumNei
2507 2550 // sumWai
2508 2551 // sumShop
... ... @@ -2517,46 +2560,76 @@
2517 2560 // estimatedPromotionalExpenses
2518 2561 // otherNecessaryEstimates
2519 2562 // totalCostEstimation
2520   -
2521   - console.log(JSON.parse(e.modifiedData))
  2563 +
2522 2564 },
2523 2565 lichangeTwo(e) {
2524   - this.effectivenessListTwo = JSON.parse(e.modifiedData)
2525   - if (this.effectivenessListOne.internalLaborCostEstimation != '' && this.effectivenessListTwo
  2566 + let msg = this.effectivenessList[e]
  2567 + if (typeof msg.modifiedData == 'string') {
  2568 + this.effectivenessListTwo = JSON.parse(msg.modifiedData)
  2569 + } else {
  2570 + this.effectivenessListTwo = msg.modifiedData
  2571 + }
  2572 + if (this.effectivenessListOne.internalLaborCostEstimation != undefined && this.effectivenessListTwo
  2573 + .internalLaborCostEstimation != undefined && this.effectivenessListOne.internalLaborCostEstimation !=
  2574 + '' && this.effectivenessListTwo
2526 2575 .internalLaborCostEstimation != '') {
2527   - this.effectivenessListOne.sumNei = Number(this.effectivenessListOne.internalLaborCostEstimation) /
2528   - Number(this.effectivenessListTwo.internalLaborCostEstimation) * 100
  2576 + let sum = (Number(this.effectivenessListOne.internalLaborCostEstimation) - Number(this
  2577 + .effectivenessListTwo.internalLaborCostEstimation)) / Number(this.effectivenessListTwo
  2578 + .internalLaborCostEstimation) * 100
  2579 + this.effectivenessListOne.sumNei = sum.toFixed(2)
2529 2580 }
2530   - if (this.effectivenessListOne.externalLaborCostEstimation != '' && this.effectivenessListTwo
  2581 + if (this.effectivenessListOne.externalLaborCostEstimation != undefined && this.effectivenessListTwo
  2582 + .externalLaborCostEstimation != undefined && this.effectivenessListOne.externalLaborCostEstimation !=
  2583 + '' && this.effectivenessListTwo
2531 2584 .externalLaborCostEstimation != '') {
2532   - this.effectivenessListOne.sumWai = Number(this.effectivenessListOne.externalLaborCostEstimation) /
2533   - Number(this.effectivenessListTwo.externalLaborCostEstimation) * 100
  2585 + let sum = (Number(this.effectivenessListOne.externalLaborCostEstimation) - Number(this
  2586 + .effectivenessListTwo.externalLaborCostEstimation)) / Number(this.effectivenessListTwo
  2587 + .externalLaborCostEstimation) * 100
  2588 + this.effectivenessListOne.sumWai = sum.toFixed(2)
  2589 +
2534 2590 }
2535   - if (this.effectivenessListOne.costEstimationGoods != '' && this.effectivenessListTwo
  2591 + if (this.effectivenessListOne.costEstimationGoods != undefined && this.effectivenessListTwo
  2592 + .costEstimationGoods != undefined && this.effectivenessListOne.costEstimationGoods != '' && this
  2593 + .effectivenessListTwo
2536 2594 .costEstimationGoods != '') {
2537   - this.effectivenessListOne.sumShop = Number(this.effectivenessListOne.costEstimationGoods) /
2538   - Number(this.effectivenessListTwo.costEstimationGoods) * 100
  2595 + let sum = (Number(this.effectivenessListOne.costEstimationGoods) - Number(this.effectivenessListTwo
  2596 + .costEstimationGoods)) / Number(this.effectivenessListTwo.costEstimationGoods) * 100
  2597 + this.effectivenessListOne.sumShop = sum.toFixed(2)
  2598 +
2539 2599 }
2540   - if (this.effectivenessListOne.setCostEstimate != '' && this.effectivenessListTwo
  2600 + if (this.effectivenessListOne.setCostEstimate != undefined && this.effectivenessListTwo.setCostEstimate !=
  2601 + undefined && this.effectivenessListOne.setCostEstimate != '' && this.effectivenessListTwo
2541 2602 .setCostEstimate != '') {
2542   - this.effectivenessListOne.sumSe = Number(this.effectivenessListOne.setCostEstimate) /
2543   - Number(this.effectivenessListTwo.setCostEstimate) * 100
  2603 + let sum = (Number(this.effectivenessListOne.setCostEstimate) - Number(this.effectivenessListTwo
  2604 + .setCostEstimate)) / Number(this.effectivenessListTwo.setCostEstimate) * 100
  2605 + this.effectivenessListOne.sumSe = sum.toFixed(2)
  2606 +
2544 2607 }
2545   - if (this.effectivenessListOne.estimatedPromotionalExpenses != '' && this.effectivenessListTwo
  2608 + if (this.effectivenessListOne.estimatedPromotionalExpenses != undefined && this.effectivenessListTwo
  2609 + .estimatedPromotionalExpenses != undefined && this.effectivenessListOne.estimatedPromotionalExpenses !=
  2610 + '' && this.effectivenessListTwo
2546 2611 .estimatedPromotionalExpenses != '') {
2547   - this.effectivenessListOne.sumXuan = Number(this.effectivenessListOne.estimatedPromotionalExpenses) /
2548   - Number(this.effectivenessListTwo.estimatedPromotionalExpenses) * 100
  2612 + let sum = (Number(this.effectivenessListOne.estimatedPromotionalExpenses) - Number(this
  2613 + .effectivenessListTwo.estimatedPromotionalExpenses)) / Number(this.effectivenessListTwo
  2614 + .estimatedPromotionalExpenses) * 100
  2615 +
  2616 + this.effectivenessListOne.sumXuan = sum.toFixed(2)
2549 2617 }
2550   - if (this.effectivenessListOne.otherNecessaryEstimates != '' && this.effectivenessListTwo
  2618 + if (this.effectivenessListOne.otherNecessaryEstimates != undefined && this.effectivenessListTwo
  2619 + .otherNecessaryEstimates != undefined && this.effectivenessListOne.otherNecessaryEstimates != '' &&
  2620 + this.effectivenessListTwo
2551 2621 .otherNecessaryEstimates != '') {
2552   - this.effectivenessListOne.sumQi = Number(this.effectivenessListOne.otherNecessaryEstimates) /
2553   - Number(this.effectivenessListTwo.otherNecessaryEstimates) * 100
  2622 + let sum = (Number(this.effectivenessListOne.otherNecessaryEstimates) - Number(this.effectivenessListTwo
  2623 + .otherNecessaryEstimates)) / Number(this.effectivenessListTwo.otherNecessaryEstimates) * 100
  2624 + this.effectivenessListOne.sumQi = sum.toFixed(2)
2554 2625 }
2555   - if (this.effectivenessListOne.totalCostEstimation != '' && this.effectivenessListTwo
  2626 + if (this.effectivenessListOne.totalCostEstimation != undefined && this.effectivenessListTwo
  2627 + .totalCostEstimation != undefined && this.effectivenessListOne.totalCostEstimation != '' && this
  2628 + .effectivenessListTwo
2556 2629 .totalCostEstimation != '') {
2557   -
2558   - this.effectivenessListOne.sumAll = Number(this.effectivenessListOne.totalCostEstimation) /
2559   - Number(this.effectivenessListTwo.totalCostEstimation) * 100
  2630 + let sum = (Number(this.effectivenessListOne.totalCostEstimation) - Number(this.effectivenessListTwo
  2631 + .totalCostEstimation)) / Number(this.effectivenessListTwo.totalCostEstimation) * 100
  2632 + this.effectivenessListOne.sumAll = sum.toFixed(2)
2560 2633 }
2561 2634 },
2562 2635 tiaozheng() {
... ...
admin-web-master/src/views/order/orderany/index.vue
  View file @3d9acc2
... ... @@ -91,41 +91,48 @@
91 91 </div>
92 92 </div>
93 93 <!-- 表格 -->
94   - <div class="content_table" style="background-color:#F2F3F5">
95   - <div style="background-color: #fff;padding:20px 0 0 0;">
96   - <div class="table">
97   - <el-table @selection-change="handleSelectionChange"
98   - tooltip-effect="dark" :data="tableData.slice((currentPage - 1) * pageSize, currentPage * pageSize)"
99   - :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
100   - >
101   -<el-table-column prop="name" label="序号" min-width="5%">
102   - <template slot-scope="scope">
103   - {{scope.$index + 1 }}
104   - </template>
105   - </el-table-column>
106   - <el-table-column label="商品名称" prop="productName" min-width="30%"/>
107   - <el-table-column label="订单号" min-width="10%" prop="orderProductId" show-overflow-tooltip>
108   - </el-table-column>
109   - <el-table-column label="商品编号" min-width="15%" prop="productId" show-overflow-tooltip>
110   - </el-table-column>
111   - <!-- <el-table-column prop="name" label="商品类型">
112   -
113   - </el-table-column> -->
114   - <el-table-column prop="productPrice" label="商品价格" min-width="15%"/>
115   - <!-- <el-table-column prop="number" label="下单人数" /> -->
116   -<!-- <el-table-column prop="amount1" label="成交量" >
117   - </el-table-column>
118   - <el-table-column prop="amount2" label="退款人数" />
119   - <el-table-column prop="amount3" label="成交总金额" /> -->
120   - </el-table>
121   - </div>
122   - <!-- 分页 -->
123   - <div class="fenye">
124   - <div>共{{total}}条</div>
125   - <el-pagination class="pagination" :hide-on-single-page="flag" background small :current-page="currentPage"
126   - :page-sizes="[10, 20, 50, 100]" :page-size="pageSize" layout="prev, pager,next"
127   - :total="total " @size-change="handleSizeChange" @current-change="handleCurrentChange" />
128   - </div>
  94 + <div class="tableBox">
  95 + <el-table :data="tableData"
  96 + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
  97 + >
  98 + <el-table-column prop="id" label="排名">
  99 + <template slot-scope="scope">
  100 + {{scope.$index + 1 }}
  101 + </template>
  102 + </el-table-column>
  103 + <!-- <el-table-column prop="shopnum" label="商品编号">
  104 + <template slot-scope="scope">
  105 + {{scope.row.products[0].productId}}
  106 + </template>
  107 + </el-table-column> -->
  108 + <el-table-column prop="shopname" label="商品名称" width="300" show-overflow-tooltip>
  109 + <template slot-scope="scope">
  110 + {{scope.row.products[0].productName}}
  111 + </template>
  112 + </el-table-column>
  113 + <el-table-column prop="fl" label="商品分类">
  114 + <template slot-scope="scope">
  115 + {{scope.row.product.shopGroupName}}
  116 + </template>
  117 + </el-table-column>
  118 +
  119 + <el-table-column prop="createTime" label="商品创建时间" show-overflow-tooltip>
  120 + <template slot-scope="scope">
  121 + {{scope.row.product.createTime}}
  122 + </template>
  123 + </el-table-column>
  124 + <el-table-column prop="bigDecimal" label="销售数量" />
  125 + <el-table-column prop="multiply" label="销售金额" />
  126 + <el-table-column prop="grossProfitRate" label="毛利率" >
  127 + <template slot-scope="scope">
  128 + {{scope.row.grossProfitRate}}%
  129 + </template>
  130 + </el-table-column>
  131 + </el-table>
  132 + <div class="fenye">
  133 + <div>共{{ total }}条</div>
  134 + <el-pagination :current-page="currentPage" :page-size="10" layout="prev, pager, next" :total="total"
  135 + @current-change="handleCurrentChange" />
129 136 </div>
130 137 </div>
131 138 </div>
... ... @@ -140,11 +147,14 @@
140 147 importOrderData,
141 148 orderStatistics,
142 149 orderStatisticsProductInformation,
143   - orderGetAll
  150 + orderGetAll,
  151 + orderIndex,
  152 + getAllNotPage
144 153 } from '@/api/orderany'
145 154 export default {
146 155 data() {
147 156 return {
  157 + flag:false,
148 158 list: [],
149 159 total: 1,
150 160 pageSize: 10,
... ... @@ -200,16 +210,28 @@
200 210 field: 'money'
201 211 }
202 212 ],
  213 + orderPage:{
  214 + startTime:'2000-01-01 00:00:00',
  215 + endTime:'2000-01-01 00:00:00'
  216 + }
203 217  
204 218 }
205 219 },
206 220 mounted() {
207   -
  221 + let time = this.getCurrentTime()
  222 + this.orderPage.endTime =time+' '+'23:59:59'
208 223 this.getTotalData()
209 224  
210 225 },
211 226 methods: {
212 227 search(){
  228 + if(this.formParams.dates.length == 0){
  229 + let time = this.getCurrentTime()
  230 + this.orderPage.endTime =time+' '+'23:59:59'
  231 + }else{
  232 + this.orderPage.startTime =this.formParams.dates[0]+' '+'00:00:00'
  233 + this.orderPage.endTime =this.formParams.dates[1]+' '+'23:59:59'
  234 + }
213 235 this.getTotalData()
214 236 },
215 237 clear(){
... ... @@ -223,12 +245,26 @@
223 245 shopName: '',
224 246 pageSize: 10
225 247 }
  248 + this.orderPage = {
  249 + startTime:'2000-01-01 00:00:00',
  250 + endTime:'2000-01-01 00:00:00'
  251 + }
  252 + let time = this.getCurrentTime()
  253 + this.orderPage.endTime =time+' '+'23:59:59'
226 254 this.getTotalData()
227 255 },
  256 + getCurrentTime() {
  257 + const now = new Date();
  258 + const year = now.getFullYear();
  259 + const month = String(now.getMonth() + 1).padStart(2, '0');
  260 + const hour = String(now.getHours()).padStart(2, '0');
  261 + return `${year}-${month}-${hour}`;
  262 + },
228 263 async getTotalData() {
229   - const res = await orderGetAll(this.formParams)
230   - const Orderlist = await orderStatistics(res.data.list)
231   - const tablelist = await orderStatisticsProductInformation(res.data.list)
  264 +
  265 + const res = await getAllNotPage(this.formParams)
  266 + const Orderlist = await orderStatistics(res.data)
  267 + const tablelist = await orderStatisticsProductInformation(res.data)
232 268  
233 269 // console.log(tablelist.data.commodityInformation)
234 270 this.tableData = Object.values(tablelist.data.commodityInformation).flat();
... ... @@ -258,21 +294,9 @@
258 294  
259 295 }
260 296 this.draw(data)
261   - let lo = {
262   - "names": [
263   - "支付成功",
264   - "调取支付",
265   - "加购",
266   - "访问"
267   - ],
268   - "rates": [
269   - 6,
270   - 9,
271   - 8,
272   - 100
273   - ]
274   - }
275   - this.draws(lo)
  297 + const orderIn = await orderIndex(this.orderPage)
  298 +
  299 + this.draws(orderIn.data.conversion)
276 300  
277 301 // this.info = d
278 302 // }
... ... @@ -292,6 +316,21 @@
292 316  
293 317 const myEchart = echarts.init(this.$refs.myEchart, 'light')
294 318 const option = {
  319 + tooltip: {
  320 + trigger: 'axis', // 触发类型为坐标轴触发
  321 + axisPointer: {
  322 + type: 'cross', // 指示器类型为十字准星
  323 + crossStyle: {
  324 + color: '#999'
  325 + }
  326 + },
  327 + formatter: function (params) {
  328 + const data = params[0];
  329 + const name = data.name; // 获取 arr.names 中的名称
  330 + const value = data.value; // 获取 arr.rates 中的次数
  331 + return ` ${value} 人`; // 自定义提示框内容
  332 + }
  333 + },
295 334 color: "#3F9B6A",
296 335 xAxis: {
297 336 type: 'category',
... ... @@ -299,7 +338,7 @@
299 338 },
300 339 yAxis: {
301 340 type: 'value',
302   - name: '次数'
  341 + name: '人数'
303 342 },
304 343 series: [{
305 344 data: arr.total,
... ... @@ -309,118 +348,171 @@
309 348  
310 349 myEchart.setOption(option)
311 350 },
  351 + filterData(arr) {
  352 + const targetNames = ["加购", "支付成功"];
  353 + const result = {
  354 + names: [],
  355 + rates: []
  356 + };
  357 + for (let i = 0; i < arr.names.length; i++) {
  358 + if (targetNames.includes(arr.names[i])) {
  359 + result.names.push(arr.names[i]);
  360 + result.rates.push(arr.rates[i]);
  361 + }
  362 + }
  363 + return result;
  364 + },
  365 +
312 366 draws(arr) {
313   - // myEchart
314   - const myEchart = echarts.init(this.$refs.myEcharts, 'light')
315   - // const o = this.chartData
316   - const option = {
317   - // color: ["#74d1fd", "#009ae4", "#0071c1"],
318   - // 设置图表的位置
319   - grid: {
320   - x: 110, // 左间距
321   - y: 0, // 上间距
322   - x2: 60, // 右间距
323   - y2: 40 // 下间距
324   - },
325   - // 提示框组件
326   - tooltip: {
327   - trigger: 'axis', // 触发类型, axis: 坐标轴触发
328   - axisPointer: {
329   - // 指示器类型 'line' 直线指示器 'shadow' 阴影指示器 'none' 无指示器
330   - // 'cross' 十字准星指示器 其实是种简写，表示启用两个正交的轴的 axisPointer
331   - type: 'none'
332   - },
333   - textStyle: {
334   - color: '#cdd3ee' ,// 文字颜色
335   - fontSize:'12px'
336   - },
337   - // 提示框浮层内容格式器，支持字符串模板和回调函数两种形式 折线（区域）图、柱状（条形）图、K线图
338   - // {a}（系列名称），{b}（类目值），{c}（数值）, {d}（无）
339   - formatter: '{b}<br />{a0}: {c0}%'
340   - },
341   - // // 图例组件
342   - // legend: {
343   - // textStyle: {
344   - // // 文本样式
345   - // fontSize: 16,
346   - // color: "#cdd3ee"
347   - // },
348   - // top: 13, // 定位
349   - // data: ["已完成", "进行中", "未完成"] // 图例的数据数组
350   - // },
351   - // X轴
352   - xAxis: {
353   - type: 'value', // 坐标轴类型, 'value' 数值轴，适用于连续数据
354   - // 坐标轴刻度
355   - axisTick: {
356   - show: false // 是否显示坐标轴刻度 默认显示
357   - },
358   - // 坐标轴轴线
359   - axisLine: {
360   - // 是否显示坐标轴轴线 默认显示
361   - show: false // 是否显示坐标轴轴线 默认显示
362   - },
363   - // 坐标轴在图表区域中的分隔线
364   - splitLine: {
365   - show: false // 是否显示分隔线。默认数值轴显示
366   - },
367   - // 坐标轴刻度标签
368   - axisLabel: {
369   - show: false // 是否显示刻度标签 默认显示
370   - }
371   - },
372   - yAxis: [
373   - // 左侧Y轴
374   - {
375   - // 坐标轴类型, 'category' 类目轴，适用于离散的类目数据
376   - // 为该类型时必须通过 data 设置类目数据
377   - type: 'category',
378   - // 坐标轴刻度
379   - axisTick: {
380   - show: false // 是否显示坐标轴刻度 默认显示
381   - },
382   - // 坐标轴轴线
383   - axisLine: {
384   - // 是否显示坐标轴轴线 默认显示
385   - show: false, // 是否显示坐标轴轴线 默认显示
386   - lineStyle: {
387   - // 坐标轴线线的颜色
388   - color: '#cdd3ee'
389   - }
390   - },
391   - // 坐标轴在图表区域中的分隔线
392   - splitLine: {
393   - show: false // 是否显示分隔线。默认数值轴显示
394   - },
395   - // 坐标轴刻度标签
396   - axisLabel: {
397   - show: true, // 是否显示刻度标签 默认显示
398   - fontSize: 16, // 文字的字体大小
399   - color: '#cdd3ee', // 刻度标签文字的颜色
400   - // 使用字符串模板，模板变量为刻度默认标签 {value}
401   - formatter: '{value}'
402   - },
403   - // 类目数据，在类目轴（type: 'category'）中有效
404   - data: arr.names.reverse()
405   - }
406   - ],
407   - // 系列列表
408   - series: [{
409   - type: 'bar', // 系列类型
410   - name: '已完成',
411   - barMaxWidth: 20, // 柱条的最大宽度，不设时自适应
412   - // label: {
413   - // show: true,
414   - // position: "inside"
415   - // },
416   - itemStyle: {
417   - barBorderRadius: [10, 0, 0, 10] // 圆角半径, 单位px, 支持传入数组分别指定 4 个圆角半径
418   - },
419   - data: arr.rates.reverse() // 系列中的数据内容数组
420   - }]
421   - }
  367 + const filteredData = this.filterData(arr);
  368 + const myEchart = echarts.init(this.$refs.myEcharts, 'light')
  369 + const option = {
  370 + color: "#3F9B6A",
  371 + tooltip: {
  372 + trigger: 'axis', // 触发类型为坐标轴触发
  373 + axisPointer: {
  374 + type: 'cross', // 指示器类型为十字准星
  375 + crossStyle: {
  376 + color: '#999'
  377 + }
  378 + },
  379 + formatter: function (params) {
  380 + const data = params[0];
  381 + const name = data.name; // 获取 arr.names 中的名称
  382 + const value = data.value; // 获取 arr.rates 中的次数
  383 + return `${name}: ${value} 人`; // 自定义提示框内容
  384 + }
  385 + },
  386 + xAxis: {
  387 + type: 'category',
  388 + data: filteredData.names
  389 + },
  390 + yAxis: {
  391 + type: 'value',
  392 + name: '人数',
  393 + },
  394 + series: [
  395 + {
  396 + data: filteredData.rates,
  397 + type: 'line'
  398 + }
  399 + ]
  400 + }
  401 +
  402 + myEchart.setOption(option)
  403 +
  404 +
  405 + // const myEchart = echarts.init(this.$refs.myEcharts, 'light')
  406 + // // const o = this.chartData
  407 + // const option = {
  408 + // // color: ["#74d1fd", "#009ae4", "#0071c1"],
  409 + // // 设置图表的位置
  410 + // grid: {
  411 + // x: 110, // 左间距
  412 + // y: 0, // 上间距
  413 + // x2: 60, // 右间距
  414 + // y2: 40 // 下间距
  415 + // },
  416 + // // 提示框组件
  417 + // tooltip: {
  418 + // trigger: 'axis', // 触发类型, axis: 坐标轴触发
  419 + // axisPointer: {
  420 + // // 指示器类型 'line' 直线指示器 'shadow' 阴影指示器 'none' 无指示器
  421 + // // 'cross' 十字准星指示器 其实是种简写，表示启用两个正交的轴的 axisPointer
  422 + // type: 'none'
  423 + // },
  424 + // textStyle: {
  425 + // color: '#cdd3ee' // 文字颜色
  426 + // },
  427 + // // 提示框浮层内容格式器，支持字符串模板和回调函数两种形式 折线（区域）图、柱状（条形）图、K线图
  428 + // // {a}（系列名称），{b}（类目值），{c}（数值）, {d}（无）
  429 + // formatter: '{b}<br />{a0}: {c0}%'
  430 + // },
  431 + // // // 图例组件
  432 + // // legend: {
  433 + // // textStyle: {
  434 + // // // 文本样式
  435 + // // fontSize: 16,
  436 + // // color: "#cdd3ee"
  437 + // // },
  438 + // // top: 13, // 定位
  439 + // // data: ["已完成", "进行中", "未完成"] // 图例的数据数组
  440 + // // },
  441 + // // X轴
  442 + // xAxis: {
  443 + // type: 'value', // 坐标轴类型, 'value' 数值轴，适用于连续数据
  444 + // // 坐标轴刻度
  445 + // axisTick: {
  446 + // show: false // 是否显示坐标轴刻度 默认显示
  447 + // },
  448 + // // 坐标轴轴线
  449 + // axisLine: {
  450 + // // 是否显示坐标轴轴线 默认显示
  451 + // show: false // 是否显示坐标轴轴线 默认显示
  452 + // },
  453 + // // 坐标轴在图表区域中的分隔线
  454 + // splitLine: {
  455 + // show: false // 是否显示分隔线。默认数值轴显示
  456 + // },
  457 + // // 坐标轴刻度标签
  458 + // axisLabel: {
  459 + // show: false // 是否显示刻度标签 默认显示
  460 + // }
  461 + // },
  462 + // yAxis: [
  463 + // // 左侧Y轴
  464 + // {
  465 + // // 坐标轴类型, 'category' 类目轴，适用于离散的类目数据
  466 + // // 为该类型时必须通过 data 设置类目数据
  467 + // type: 'category',
  468 + // // 坐标轴刻度
  469 + // axisTick: {
  470 + // show: false // 是否显示坐标轴刻度 默认显示
  471 + // },
  472 + // // 坐标轴轴线
  473 + // axisLine: {
  474 + // // 是否显示坐标轴轴线 默认显示
  475 + // show: false, // 是否显示坐标轴轴线 默认显示
  476 + // lineStyle: {
  477 + // // 坐标轴线线的颜色
  478 + // color: '#cdd3ee'
  479 + // }
  480 + // },
  481 + // // 坐标轴在图表区域中的分隔线
  482 + // splitLine: {
  483 + // show: false // 是否显示分隔线。默认数值轴显示
  484 + // },
  485 + // // 坐标轴刻度标签
  486 + // axisLabel: {
  487 + // show: true, // 是否显示刻度标签 默认显示
  488 + // fontSize: 16, // 文字的字体大小
  489 + // color: '#cdd3ee', // 刻度标签文字的颜色
  490 + // // 使用字符串模板，模板变量为刻度默认标签 {value}
  491 + // formatter: '{value}'
  492 + // },
  493 + // // 类目数据，在类目轴（type: 'category'）中有效
  494 + // data: arr.names.reverse()
  495 + // }
  496 + // ],
  497 + // // 系列列表
  498 + // series: [
  499 + // {
  500 + // type: 'bar', // 系列类型
  501 + // name: '已完成',
  502 + // barMaxWidth: 20, // 柱条的最大宽度，不设时自适应
  503 + // // label: {
  504 + // // show: true,
  505 + // // position: "inside"
  506 + // // },
  507 + // itemStyle: {
  508 + // barBorderRadius: [10, 0, 0, 10] // 圆角半径, 单位px, 支持传入数组分别指定 4 个圆角半径
  509 + // },
  510 + // data: arr.rates.reverse() // 系列中的数据内容数组
  511 + // }
  512 + // ]
  513 + // }
422 514  
423   - myEchart.setOption(option)
  515 + // myEchart.setOption(option)
424 516 },
425 517 //导出
426 518 // async userVisitExport() {
... ...
ceres-uniapp-master/pages_category_page1/orderModule/logisticsInfo.vue
  View file @3d9acc2
1 1 <!-- 物流详情 -->
2 2 <template>
3   - <view>
4   - <view class="content" style="padding-bottom:100upx;" v-if="steps.length >0">
  3 + <view style="">
  4 + <view style="padding: 20px; background-color: #Fff;" v-if="deliverFormid != ''">
  5 + <view style="font-size: 16px;" >
  6 + <view style="font-size: 18px;margin-bottom: 20px;">物流信息</view>
  7 + <view style="margin-bottom: 10px;">物流公司：{{express}}</view>
  8 + <view>物流单号：{{deliverFormid}}</view>
  9 + </view>
  10 + </view>
  11 +
  12 + <!-- <view class="content" style="padding-bottom:100upx;" v-if="steps.length >0">
5 13 <view class="order-details-information mt20">
6 14 <view class="order-title-box">
7 15 <view class="order-title padd-l">
... ... @@ -13,7 +21,7 @@
13 21 <view class="logistics">
14 22 <uni-steps :options="steps" direction="column" :active="0"></uni-steps>
15 23 </view>
16   - </view>
  24 + </view> -->
17 25 <view v-else class="emptyOrder-box flex-items-plus flex-column">
18 26 <image class="emptyOrder-img" src="https://jy.scjysm.asia:18086/cdwlMall/questionnaire/file/static/img//bgnull.png"></image>
19 27 <label class="font-color-999 fs26 mar-top-30">你还没有物流信息哦～</label>
... ...
ceres-uniapp-master/pages_category_page1/orderModule/orderDetails.vue
  View file @3d9acc2
... ... @@ -278,8 +278,13 @@
278 278 </view>
279 279 <!-- 暂无物流 -->
280 280 <view v-if="isShowWuLiu">
281   - <view v-if="steps.length>0" class="logistics">
282   - <uni-steps :options="steps" direction="column" :active="0"></uni-steps>
  281 + <!-- <view v-if="steps.length>0" class="logistics"> -->
  282 + <view v-if="dataList.deliverFormid&& dataList.deliverFormid!=''" class="logistics">
  283 + <view style="padding-left:5px;">
  284 + <view style="margin-bottom:5px;"> 物流公司：{{dataList.express}}</view>
  285 + <view >快递单号：{{dataList.deliverFormid}}</view>
  286 + </view>
  287 + <!-- <uni-steps :options="steps" direction="column" :active="0"></uni-steps> -->
283 288 </view>
284 289 <view v-else class="emptyOrder-box flex-items-plus flex-column">
285 290 <image class="emptyOrder-img" src="https://jy.scjysm.asia:18086/cdwlMall/questionnaire/file/static/img//bgnull.png"></image>
... ... @@ -628,6 +633,8 @@
628 633 this.dataList = data
629 634 this.dataList.receivePhone = hidden(this.dataList.receivePhone, 3, 4)
630 635 this.ifShow = true
  636 + console.log(this.dataList.express,'this.dataList.express')
  637 + console.log(this.dataList.deliverFormid,'this.dataList.express')
631 638 this.getShippingTrace(this.dataList.express, this.dataList.deliverFormid)
632 639 if (this.dataList.state == 1 || this.dataList.state == 6) {
633 640 this.countDown();
... ... @@ -713,6 +720,7 @@
713 720 express: express,
714 721 deliverFormid: deliverFormid
715 722 }, "GET").then(res => {
  723 +
716 724 let traces = res.data
717 725 let len = traces.length
718 726 for (let i = 0; i < len; i++) {
... ... @@ -1020,6 +1028,7 @@
1020 1028  
1021 1029 .logistics {
1022 1030 padding: 20upx 20upx;
  1031 + background-color: #fff;
1023 1032 }
1024 1033  
1025 1034 .content {
... ...
lvdao-miniapp/pages/propertyPay/propertyPayList/propertyPayList.vue
  View file @3d9acc2
... ... @@ -60,7 +60,7 @@
60 60 <view class="" @click="changeitemisshowxz(index,index1)">
61 61 <view class="info-item">周期：{{item1.startDate}} - {{item1.endDate}}</view>
62 62 <view class="info-item" style="margin-top: 6rpx;">
63   - <text style="margin-right: 20rpx;">数量：{{item1.number}}{{item1.itemUnit}}</text>
  63 + <text style="margin-right: 20rpx;">数量：{{item1.source==1?'-':item1.number}}{{item1.itemUnit}}</text>
64 64 <text v-if="item1.houseNumber!=''">门牌号：{{item1.houseNumber}}</text>
65 65 </view>
66 66 </view>
... ...
merchant-web-master/src/api/dataSta.js
  View file @3d9acc2
... ... @@ -7,6 +7,14 @@ import request from &#39;@/utils/request&#39;
7 7 // data
8 8 // })
9 9 // }
  10 +export function getAllNotPage(data) {
  11 + return request({
  12 + url: '/order/getAllNotPage',
  13 + method: 'post',
  14 + data
  15 + })
  16 +}
  17 +
10 18 export function orderGetAll(data) {
11 19 return request({
12 20 url: '/order/getAll',
... ... @@ -14,7 +22,6 @@ export function orderGetAll(data) {
14 22 data
15 23 })
16 24 }
17   -
18 25 //计算毛利
19 26 export function calculateGrossProfit(data) {
20 27 return request({
... ...
merchant-web-master/src/views/comprehensive/pcdetails/index.vue
  View file @3d9acc2
... ... @@ -9,10 +9,10 @@
9 9 <el-form ref="formInline" :inline="true" :model="formInline">
10 10 <el-form-item label="日期">
11 11 <el-date-picker
  12 + popper-class="elDatePicker"
12 13 v-model="formInline.dates"
13   - type="daterange"
14   -
15   - style="width:220px"
  14 + type="monthrange"
  15 + style="width:250px"
16 16 range-separator="至"
17 17 start-placeholder="开始时间"
18 18 end-placeholder="结束时间"
... ... @@ -444,6 +444,9 @@ this.drawsTwo(zhutu.data)
444 444 ::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active {
445 445 background-color: #3F9B6A;
446 446 }
  447 +
  448 +
  449 +
447 450 </style>
448 451 <style scoped>
449 452 .history /deep/ .el-table .cell.el-tooltip img {
... ... @@ -486,6 +489,10 @@ this.drawsTwo(zhutu.data)
486 489 margin-bottom:0px;
487 490 }
488 491 }
  492 +
  493 +
  494 +
  495 +
489 496 </style>
490 497 <style>
491 498 .el-tooltip__popper {
... ...
merchant-web-master/src/views/dashboard/index.vue
  View file @3d9acc2
... ... @@ -187,7 +187,7 @@ export default {
187 187 const data = params[0];
188 188 const name = data.name;
189 189 const value = data.value;
190   - return `${value}`; // 自定义提示框内容
  190 + return `${value}人`; // 自定义提示框内容
191 191 }
192 192 },
193 193 xAxis: {
... ... @@ -196,7 +196,7 @@ export default {
196 196 },
197 197 yAxis: {
198 198 type: 'value',
199   - name: '次数'
  199 + name: '人数'
200 200 },
201 201 series: [
202 202 {
... ... @@ -240,7 +240,7 @@ export default {
240 240 const data = params[0];
241 241 const name = data.name; // 获取 arr.names 中的名称
242 242 const value = data.value; // 获取 arr.rates 中的次数
243   - return `${name}: ${value} 次`; // 自定义提示框内容
  243 + return `${name}: ${value} 人`; // 自定义提示框内容
244 244 }
245 245 },
246 246 xAxis: {
... ... @@ -249,7 +249,7 @@ export default {
249 249 },
250 250 yAxis: {
251 251 type: 'value',
252   - name: '次数',
  252 + name: '人数',
253 253 },
254 254 series: [
255 255 {
... ...
merchant-web-master/src/views/salesSta/dataSta.vue
  View file @3d9acc2
... ... @@ -151,18 +151,18 @@
151 151 </template>
152 152 ￥{{tongji.transactionsCompleted}}
153 153 </el-descriptions-item>
154   - <el-descriptions-item>
  154 + <!-- <el-descriptions-item>
155 155 <template slot="label">
156 156 毛利率排行
157 157 </template>
158 158  
159   - </el-descriptions-item>
160   - <el-descriptions-item v-for="item in maoli.salesRanking" :key="item.id">
  159 + </el-descriptions-item> -->
  160 + <!-- <el-descriptions-item v-for="item in maoli.salesRanking" :key="item.id">
161 161 <template slot="label">
162 162 <span v-for="(value, key) in item" :key="key">{{ key }}</span>
163 163 </template>
164 164 <span v-for="(value, key) in item" :key="key">毛利率：{{ value }}%</span>
165   - </el-descriptions-item>
  165 + </el-descriptions-item> -->
166 166 <!-- <el-descriptions-item>
167 167 <template slot="label">
168 168 商品2
... ... @@ -199,18 +199,19 @@
199 199 <!-- 表格 -->
200 200 <div class="tableBox">
201 201 <el-table :data="tableData"
202   - :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
  202 + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
  203 + >
203 204 <el-table-column prop="id" label="排名">
204 205 <template slot-scope="scope">
205 206 {{scope.$index + 1 }}
206 207 </template>
207 208 </el-table-column>
208   - <el-table-column prop="shopnum" label="商品编号">
  209 + <!-- <el-table-column prop="shopnum" label="商品编号">
209 210 <template slot-scope="scope">
210 211 {{scope.row.products[0].productId}}
211 212 </template>
212   - </el-table-column>
213   - <el-table-column prop="shopname" label="商品名称" width="300">
  213 + </el-table-column> -->
  214 + <el-table-column prop="shopname" label="商品名称" width="300" show-overflow-tooltip>
214 215 <template slot-scope="scope">
215 216 {{scope.row.products[0].productName}}
216 217 </template>
... ... @@ -221,13 +222,18 @@
221 222 </template>
222 223 </el-table-column>
223 224  
224   - <el-table-column prop="createTime" label="商品创建时间">
  225 + <el-table-column prop="createTime" label="商品创建时间" show-overflow-tooltip>
225 226 <template slot-scope="scope">
226 227 {{scope.row.product.createTime}}
227 228 </template>
228 229 </el-table-column>
229 230 <el-table-column prop="bigDecimal" label="销售数量" />
230   - <el-table-column prop="multiply" label="销售金额" :sortable="true" :sort-method="sortMethod" />
  231 + <el-table-column prop="multiply" label="销售金额" />
  232 + <el-table-column prop="grossProfitRate" label="毛利率" >
  233 + <template slot-scope="scope">
  234 + {{scope.row.grossProfitRate}}%
  235 + </template>
  236 + </el-table-column>
231 237 </el-table>
232 238 <div class="fenye">
233 239 <div>共{{ total }}条</div>
... ... @@ -243,7 +249,7 @@
243 249 <script>
244 250 import {
245 251 salesStatistics,
246   - orderGetAll,
  252 + getAllNotPage,
247 253 calculateGrossProfit
248 254 } from '@/api/dataSta'
249 255 import {
... ... @@ -264,7 +270,7 @@
264 270 formInline: {
265 271 searchType: '1',
266 272 search: '', // 搜索字段
267   - state: '4',
  273 + // state: '4',
268 274 // afterState: '', // 售后状态 0-无售后 1-售后中 2-售后成功 3-售后关闭
269 275 dates: [], // 下单时间数组
270 276 page: 1,
... ... @@ -301,9 +307,7 @@
301 307 },
302 308 // 方法集合
303 309 methods: {
304   - sortMethod(before, after) {
305   - return Number(after.multiply) - Number(before.multiply)
306   - },
  310 +
307 311 toggleFilter() {
308 312 this.fut = !this.fut
309 313 },
... ... @@ -341,6 +345,7 @@
341 345 search(val) {
342 346 this.formInline.dates = this.formParams.tongjiTime || []
343 347 this.getAll()
  348 +
344 349 // if(val ==1){
345 350 // this.formInline.dates = this.formParams.tongjiTime
346 351 // this.getAll()
... ... @@ -353,16 +358,17 @@
353 358 },
354 359 // 初始化查询所有数据
355 360 async getAll() {
356   - const res = await orderGetAll(this.formInline)
357   - const Orderlist = await calculateGrossProfit(res.data.list)
358   - const tablelist = await salesStatistics(res.data.list)
  361 + const res = await getAllNotPage(this.formInline)
  362 + const Orderlist = await calculateGrossProfit(res.data)
  363 + const tablelist = await salesStatistics(res.data)
359 364 this.maoli = Orderlist.data
360 365 this.tongji = tablelist.data
361 366 // this.loading = false;
362 367  
363 368  
364   - const list = await salesRanking(res.data.list)
365   - this.tableData = list.data
  369 + const list = await salesRanking(res.data)
  370 + // this.tableData = list.data
  371 + this.tableData = list.data.sort((a, b) => b.multiply - a.multiply);
366 372 // console.log(list.data)
367 373 this.total = list.data.length
368 374  
... ...
merchant-web-master/src/views/stockControl/inventory/index.vue
  View file @3d9acc2
... ... @@ -100,7 +100,7 @@
100 100 style="padding: 5px 10px 5px 20px;border:1px solid #EBEEF5;display: flex;justify-content: space-between;margin-top: 10px;"
101 101 v-if="teble_sel">
102 102 <div style="font-size: 14px;">
103   - <span>已选择{{this.zuheNum}}项</span>
  103 + <span>已选择{{zuheNum}}项</span>
104 104 <div class="tableBtn greens" style="color: #3F9B6A;font-size: 14px;margin-left: 10px;"
105 105 @click="toggleSelection">清楚选项</div>
106 106 </div>
... ... @@ -293,7 +293,7 @@
293 293 getShopData(e){
294 294 const targetProduct = this.tableData.find(item => item.productId === e)
295 295 console.log(targetProduct)
296   - this.num = targetProduct.stockNumber
  296 + this.num = 0
297 297 },
298 298 msgList(list) {
299 299 if (list && list != '') {
... ... @@ -514,6 +514,7 @@
514 514 //清除选项
515 515 toggleSelection() {
516 516 this.$refs.multipleTable.clearSelection();
  517 + this.zuheNum = 0
517 518 },
518 519 selClose() {
519 520 this.teble_sel = false
... ... @@ -670,7 +671,7 @@
670 671 form.productId = this.shopId
671 672 console.log(form, 'form')
672 673 if(form.skus.length>0) {
673   - form.skus[0].stockNumber = this.num
  674 + form.skus[0].stockNumber =Number(form.skus[0].stockNumber)+ this.num
674 675 }
675 676 await getClassifyUpdate(form)
676 677 this.$message.success('保存成功')
... ...