Merge branch 'yang'

resources/views/kpi/workCoefficientDayStat/index.blade.php

@@ -57,6 +57,14 @@
                 <td class="td-warm text-muted"><span>@{{ item.hourWorkAmount.toFixed(2) }}</span></td>
                 <td class="td-warm text-muted"><span>@{{ item.workCostTotal.toFixed(2) }}</span></td>
                 <td class="td-warm text-muted"><span>@{{ item.workEfficiency.toFixed(2) }}</span></td>
+                <td class="td-warm text-muted">
+                    <button @click="showDetail(item.id)" type="button"
+                            class="btn btn-primary" data-toggle="modal"
+                            data-target="#staticBackdrop">
+                        查看明细
+                    </button>
+                </td>
+
             </tr>
         </table>
         <nav aria-label="...">
@@ -69,6 +77,42 @@
                 </li>
             </ul>
         </nav>
+
+        <!-- Modal -->
+        <div class="modal fade" id="staticBackdrop" tabindex="-1" aria-labelledby="staticBackdropLabel"
+             aria-hidden="true">
+            <div class="modal-dialog modal-lg">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <h5 class="modal-title" id="staticBackdropLabel">明细</h5>
+
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                            <span aria-hidden="true">&times;</span>
+                        </button>
+                    </div>
+                    <div class="modal-body">
+                        <div class="modal-dialog-scrollable justify-content-center">
+                            <table class="table table-sm text-nowrap"
+                                   style="background: #fff;" id="tableDetail">
+                                <tr v-for="(item,i) in resData.detail.data" :key="i">
+                                    <td class="td-warm text-muted text-center"><span>@{{ i+1 }}</span></td>
+                                    <td class="td-warm text-muted text-center"><span>@{{ item.date }}</span>
+                                    </td>
+                                    <td class="td-warm text-muted text-center"><span>@{{ item.ownerName }}</span></td>
+                                    <td class="td-warm text-muted text-center"><span>@{{ item.type }}</span>
+                                    </td>
+                                    <td class="td-warm text-muted text-center"><span>@{{ item.coefficient }}</span></td>
+                                    <td class="td-warm text-muted text-center"><span>@{{ item.typeDetail }}</span></td>
+                                    <td class="td-warm text-muted text-center"><span>@{{ item.amount }}</span></td>
+                                    <td class="td-warm text-muted text-center"><span>@{{ item.score }}</span></td>
+                                </tr>
+                            </table>
+                        </div>
+
+                    </div>
+                </div>
+            </div>
+        </div>
     </div>
 
 
@@ -90,6 +134,15 @@
                     },
                     @endforeach
                 ],
+                resData: {
+                    detail: {
+                        data: [],
+                        total: 0,
+                        current: 1,
+                        pages: 0,
+                        size: 50,
+                    }
+                },
                 details: {
                     data: [],
                     total: null,
@@ -107,11 +160,7 @@
             },
             created() {
                 let url = this.getBaseUrl();
-                url += `/api/kpiDayWorkCoefficient/listPage?size=${this.size}&current=${this.current}`;
-                let parameters = {
-                    current: this.current,
-                    size: this.size,
-                };
+                url += `/api/kpiDayWorkCoefficient/list?size=${this.size}&current=${this.current}`;
                 axios.post(url, this.searchBody).then(res => {
                     this.details.data = res.data.data.list;
                     this.details.total = res.data.data.page.total;
@@ -123,9 +172,30 @@
             mounted: function () {
                 $('#list').removeClass('d-none');
                 this.rendingHeader();
+                this.rendingHeader2();
 
             },
             methods: {
+                showDetail(id) {
+                    let url = this.getBaseUrl() + `/api/kpiDayWorkCoefficient/${id}`
+                    axios.get(url).then(res => {
+                        tempTip.showSuccess('查询成功!');
+                        if (res.data.code !== 200) {
+                            tempTip.show('接口异常!');
+                            this.resData.detail.data = [];
+                            this.resData.detail.total = 0;
+                            this.resData.detail.current = 1;
+                            this.resData.detail.pages = 0;
+                            this.resData.detail.size = 50;
+                        } else {
+                            this.resData.detail.data = res.data.data.list;
+                            this.resData.detail.total = res.data.data.page.total;
+                            this.resData.detail.current = res.data.data.page.pageNum;
+                            this.resData.detail.pages = res.data.data.page.pages
+                            this.resData.detail.size = res.data.data.page.pageSize;
+                        }
+                    });
+                },
                 resetSearch() {
                     this.current = 1;
                     this.size = 50;
@@ -164,7 +234,7 @@
                         current: this.current,
                         size: this.size,
                     };
-                    url += `/api/kpiDayWorkCoefficient/listPage?size=${this.size}&current=${this.current}`;
+                    url += `/api/kpiDayWorkCoefficient/list?size=${this.size}&current=${this.current}`;
                     axios.post(url, this.searchBody).then(res => {
                         this.details.data = res.data.data.list;
                         this.details.total = res.data.data.page.total;
@@ -187,6 +257,7 @@
                         {name: 'quaque_hour_work', value: '每人小时工作量', neglect: true, class: "td-warm"},
                         {name: 'work_cost_total', value: '用工总成本', neglect: true, class: "td-warm"},
                         {name: 'cost_efficiency', value: '能效系数', neglect: true, class: "td-warm"},
+                        {name: 'action', value: '操作', neglect: true, class: "td-warm"},
                     ];
                     new Header({
                         el: "table",
@@ -198,10 +269,31 @@
                         before: [
                             {colspan: '8', value: '工时', class: "table-header-layer-1"},
 
-                            {colspan: '4', value: '工作量', class: "table-header-layer-1"},
+                            {colspan: '5', value: '工作量', class: "table-header-layer-1"},
                         ],
                     }).init();
                 },
+                rendingHeader2() {
+                    let column = [
+                        {name: 'id', value: '序号'},
+                        {name: 'date', value: '日期'},
+                        {name: 'ownerName', value: '货主'},
+                        {name: 'type', value: '类型'},
+                        {name: 'coefficient', value: '计分'},
+                        {name: 'typeDetail', value: '单据类型'},
+                        {name: 'amount', value: '完成数量'},
+                        {name: 'score', value: '总分'},
+                    ];
+                    new Header({
+                        el: "tableDetail",
+                        name: "details",
+                        column: column,
+                        data: this.resData.detail.data,
+                        restorationColumn: 'addtime',
+                        isCheckAllBox: false,
+                        fixedTop: ($('#form_div').height()) + ($('#btn').height()) + 1,
+                    }).init();
+                },
             },
         });
     </script>