From d20654ba067e5c0621d4d7d95915cbe47a10fe87 Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期四, 08 八月 2024 17:23:48 +0800
Subject: [PATCH] 1.正清和  增加页面缓存处理

---
 src/views/reportManager/personSalaryList.vue |   36 ++++++++++++++++++++++++++++--------
 1 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/src/views/reportManager/personSalaryList.vue b/src/views/reportManager/personSalaryList.vue
index 60d6db9..6b60d1a 100644
--- a/src/views/reportManager/personSalaryList.vue
+++ b/src/views/reportManager/personSalaryList.vue
@@ -50,13 +50,16 @@
                 />
               </el-select>
             </el-form-item>
+            <el-form-item label="閿�鍞崟鍙�" style=" display: flex;">
+              <el-input v-model="form.saleordercode" style="width: 200px" placeholder="璇疯緭鍏�" />
+            </el-form-item>
             <el-form-item label="宸ュ崟缂栧彿" style="display: flex;">
               <el-input v-model="form.wocode" placeholder="璇疯緭鍏�" style="width: 200px" />
             </el-form-item>
             <el-form-item label="浜у搧缂栫爜" style=" display: flex;">
               <el-input v-model="form.partcode" placeholder="璇疯緭鍏�" style="width: 200px" />
             </el-form-item>
-            <el-form-item label="浜у搧鍚嶇О" style=" display: flex;">
+            <el-form-item v-show="isExpandForm" label="浜у搧鍚嶇О" style=" display: flex;">
               <el-input v-model="form.partname" style="width: 200px" placeholder="璇疯緭鍏�" />
             </el-form-item>
             <!--            <el-form-item label="瑙勬牸鍨嬪彿" style=" display: flex;">-->
@@ -75,9 +78,9 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item v-show="isExpandForm" label="鎶ュ伐浜哄憳" style=" display: flex;">
-              <el-input v-model="form.reportname" style="width: 200px" placeholder="璇疯緭鍏�" />
-            </el-form-item>
+            <!--            <el-form-item v-show="isExpandForm" label="鎶ュ伐浜哄憳" style=" display: flex;">-->
+            <!--              <el-input v-model="form.reportname" style="width: 200px" placeholder="璇疯緭鍏�" />-->
+            <!--            </el-form-item>-->
             <el-form-item v-show="isExpandForm" label="鎶ュ伐鏃堕棿" style="display: flex;align-items: center">
               <el-date-picker
                 v-model="form.reportdate"
@@ -145,6 +148,12 @@
                 width="50"
                 fixed
                 label="搴忓彿"
+              />
+              <el-table-column
+                prop="saleOrderCode"
+                label="閿�鍞崟鍙�"
+                width="160"
+                sortable="custom"
               />
               <el-table-column
                 prop="wo_code"
@@ -315,6 +324,12 @@
                 width="50"
                 fixed
                 label="搴忓彿"
+              />
+              <el-table-column
+                prop="saleOrderCode"
+                label="閿�鍞崟鍙�"
+                width="160"
+                sortable="custom"
               />
               <el-table-column
                 prop="wo_code"
@@ -512,7 +527,7 @@
 import { WorkShopSelect } from '@/api/deviceManager'
 
 export default {
-  name: 'Zzjg',
+  name: 'PersonSalaryList',
   components: {
     Pagination, ImportPicker
   },
@@ -525,6 +540,7 @@
       tableHeight: 0,
       StepSelectArr: [], // 鍓旈櫎宸ュ簭鏁扮粍
       form: {
+        saleordercode: '',
         wocode: '', // 宸ュ崟缂栧彿
         partcode: '', // 浜у搧缂栫爜
         partname: '', // 浜у搧鍚嶇О
@@ -611,7 +627,7 @@
       this.WorkShopArr = res
     },
     // 鑾峰彇宸ュ簭涓嬫媺鎺ュ彛
-    async  getStepSelect() {
+    async getStepSelect() {
       const { data: res } = await StepSelect()
       this.StepSelectArr = res
     },
@@ -619,7 +635,7 @@
       const { columns, data } = param
       const sums = []
 
-      const i = this.form.compute === 'last' ? 11 : 10
+      const i = this.form.compute === 'last' ? 13 : 12
 
       columns.forEach((column, index) => {
         if (index === i) {
@@ -661,6 +677,7 @@
         tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
       }
       const data = {
+        saleordercode: this.form.saleordercode,
         wocode: this.form.wocode,
         partcode: this.form.partcode,
         partname: this.form.partname,
@@ -719,6 +736,7 @@
       }
 
       const data = {
+        saleordercode: this.form.saleordercode,
         wocode: this.form.wocode,
         partcode: this.form.partcode,
         partname: this.form.partname,
@@ -732,6 +750,7 @@
       }
 
       const { data: res } = await PeopleSalaryReportExcelSearch(data)
+      // console.log(res, 1)
       window.location.href = res
     },
     // 鏌ヨ
@@ -748,6 +767,7 @@
     },
     // 閲嶇疆
     reset() {
+      this.form.saleordercode = ''
       this.form.wocode = ''
       this.form.partcode = ''
       this.form.partname = ''
@@ -765,7 +785,7 @@
     getHeight() {
       this.$nextTick(() => {
         this.mainHeight = window.innerHeight - 85
-        this.tableHeight = this.mainHeight - 255
+        this.tableHeight = this.mainHeight - 245
         this.$refs.tableDataRef.doLayout()
         this.$refs.tableDataRef2.doLayout()
       })

--
Gitblit v1.9.3