From a9fa58b552dbd8df7cadfccc0b66dbb125ce9f98 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期一, 06 三月 2023 16:37:39 +0800
Subject: [PATCH] 1.节拍工价计件单价控制修改2.班组、人员报表红字添加

---
 src/views/bbgl/rygz.vue |   64 +++++++++++++++++++++++++++++--
 1 files changed, 59 insertions(+), 5 deletions(-)

diff --git a/src/views/bbgl/rygz.vue b/src/views/bbgl/rygz.vue
index 79a8ad6..6ed1adb 100644
--- a/src/views/bbgl/rygz.vue
+++ b/src/views/bbgl/rygz.vue
@@ -1,8 +1,34 @@
 <template>
   <div>
     <div class="body" :style="{height:mainHeight+'px'}">
-      <div class="bodyTopButtonGroup">
+      <div class="bodyTopButtonGroup" style="justify-content: space-between">
         <el-button v-waves type="primary" icon="el-icon-download" @click="download">瀵煎嚭</el-button>
+
+        <div
+          style="color: red;margin: 10px 5px 0 0;"
+        >褰撳墠鎶ヨ〃鍙粺璁¤嚜鍒朵欢宸ュ簭
+        </div>
+
+        <!--        <div class="topRight" style="display: flex;align-items: center">-->
+        <!--          &lt;!&ndash;          <div style="font-size: 14px;margin-right: 15px;color: #a7a7a7">鍓旈櫎宸ュ簭</div>&ndash;&gt;-->
+        <!--          <el-select-->
+        <!--            v-model="form.rejectstepcode"-->
+        <!--            style="width: 170px;"-->
+        <!--            multiple-->
+        <!--            placeholder="璇烽�夋嫨鍓旈櫎宸ュ簭"-->
+        <!--            collapse-tags-->
+        <!--            filterable-->
+        <!--            clearable-->
+        <!--            @change="getPeopleSalaryReportSearch"-->
+        <!--          >-->
+        <!--            <el-option-->
+        <!--              v-for="item in StepSelectArr"-->
+        <!--              :key="item.stepcode"-->
+        <!--              :label="item.stepname"-->
+        <!--              :value="item.stepcode"-->
+        <!--            />-->
+        <!--          </el-select>-->
+        <!--        </div>-->
       </div>
 
       <div class="bodyTopFormGroup">
@@ -199,7 +225,7 @@
               </el-table-column>
               <el-table-column
                 prop="ratio"
-                label="宸ュ簭鍗曚环"
+                label="鍒嗛厤姣斾緥"
                 width="110"
                 sortable="custom"
               >
@@ -448,6 +474,7 @@
 import { MesOrderStepReportSelectUserGroup } from '@/api/scgl'
 import elDragDialog from '@/directive/el-drag-dialog'
 import waves from '@/directive/waves'
+import { StepSelect } from '@/api/zzmx'
 
 export default {
   name: 'Zzjg',
@@ -461,6 +488,7 @@
       isExpandForm: false,
       mainHeight: 0,
       tableHeight: 0,
+      StepSelectArr: [], // 鍓旈櫎宸ュ簭鏁扮粍
       form: {
         wocode: '', // 宸ュ崟缂栧彿
         partcode: '', // 浜у搧缂栫爜
@@ -470,6 +498,7 @@
         groupcode: '', // 鐢熶骇鐝粍
         reportname: '', // 鎿嶄綔浜哄憳
         reportdate: '', // 鎿嶄綔鏃堕棿
+        rejectstepcode: [], // 鍓旈櫎宸ュ簭(鍥哄畾钖祫宸ュ簭涓嶅弬涓庤绠�
         compute: 'last', // 璁′欢鏂瑰紡
         prop: 'partcode', // 鎺掑簭瀛楁
         order: 'desc', // 鎺掑簭瀛楁
@@ -533,15 +562,21 @@
       this.getPeopleSalaryReportSearch().then(res => {
         if (res.code === '200') {
           this.getMesOrderStepReportSelectUserGroup()
+          this.getStepSelect()
         }
       })
+    },
+    // 鑾峰彇宸ュ簭涓嬫媺鎺ュ彛
+    async  getStepSelect() {
+      const { data: res } = await StepSelect()
+      this.StepSelectArr = res
     },
     getSummaries(param) {
       const { columns, data } = param
       const sums = []
 
       columns.forEach((column, index) => {
-        if (index === 10) {
+        if (index === 11) {
           sums[index] = '鎬讳环'
           return
         }
@@ -550,9 +585,10 @@
           sums[index] = values.reduce((prev, curr) => {
             const value = Number(curr)
             if (!isNaN(value)) {
-              return prev + curr
+              // return prev + curr
+              return Math.round(prev * 100) / 100 + Math.round(curr * 100) / 100
             } else {
-              return prev
+              return Math.round(prev * 100) / 100
             }
           }, 0)
 
@@ -567,7 +603,10 @@
         this.$refs.tableDataRef.doLayout()
         this.$refs.tableDataRef2.doLayout()
       })
+      // (Math.round(sums * 100) / 100).toS
 
+      // console.log(typeof sums)
+      // console.log(sums[11].split(' '))
       return sums
     },
     async getPeopleSalaryReportSearch() {
@@ -584,6 +623,7 @@
         groupcode: this.form.groupcode,
         compute: this.form.compute,
         reportname: this.form.reportname,
+        rejectstepcode: this.form.rejectstepcode.join(','),
         reportdate: tempDate,
         prop: this.form.prop,
         order: this.form.order,
@@ -890,6 +930,20 @@
     height: 100% !important;
   }
 }
+
+.topRight ::v-deep {
+  input::-webkit-input-placeholder {
+    color: $main_color;
+  }
+
+  //input::-moz-input-placeholder {
+  //  color: rgba(0, 204, 254, 1);
+  //}
+
+  input::-ms-input-placeholder {
+    color: $main_color;
+  }
+}
 </style>
 <style>
 

--
Gitblit v1.9.3