From 5504233baae78e2c387ea740adf17c3bce22cd26 Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期一, 12 八月 2024 11:33:42 +0800
Subject: [PATCH] 1.增加页面缓存2.工资统计精度问题

---
 src/views/statistic/workOrderProcess.vue |   22 +++++++++++++++++++---
 1 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/views/statistic/workOrderProcess.vue b/src/views/statistic/workOrderProcess.vue
index 581ffb9..0e5cf45 100644
--- a/src/views/statistic/workOrderProcess.vue
+++ b/src/views/statistic/workOrderProcess.vue
@@ -15,6 +15,11 @@
           style="display: flex;"
         >
           <div class="elForm">
+
+            <el-form-item label="閿�鍞崟鍙�" style=" display: flex;">
+              <el-input v-model="form.socode" placeholder="璇疯緭鍏�" style="width: 200px" />
+            </el-form-item>
+
             <el-form-item label="杞﹂棿鍚嶇О" style=" display: flex;">
               <el-select
                 v-model="form.wkshopcode"
@@ -48,7 +53,7 @@
             <!--            <el-form-item label="杞﹂棿鍚嶇О" style=" display: flex;">-->
             <!--              <el-input v-model="form.wkshopname" 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.partcode" placeholder="璇疯緭鍏�" style="width: 200px" />
             </el-form-item>
             <el-form-item v-show="isExpandForm" label="浜у搧鍚嶇О" style=" display: flex;">
@@ -143,6 +148,13 @@
             sortable="custom"
           />
           <el-table-column
+            prop="saleOrderCode"
+            label="閿�鍞崟鍙�"
+            width="135"
+            show-tooltip-when-overflow
+            sortable="custom"
+          />
+          <el-table-column
             prop="partcode"
             label="浜у搧缂栫爜"
             width="105"
@@ -198,7 +210,7 @@
             <!--            show-tooltip-when-overflow-->
 
             <template slot-scope="{row}">
-              <div style="min-width: 900px;display: flex;overflow-x: auto;overflow-y: hidden;height: 65px;">
+              <div style="min-width:500px;display: flex;overflow-x: auto;overflow-y: hidden;height: 65px;">
                 <div
                   v-for="item in row.concat_name.split(',')"
                   :key="item+row.wo_code"
@@ -277,7 +289,7 @@
 import { PrentOrganizationNoCompany } from '@/api/GeneralBasicData'
 
 export default {
-  name: 'Zzjg',
+  name: 'WorkOrderProcess',
   components: {
     Pagination
   },
@@ -289,6 +301,7 @@
       mainHeight: 0,
       tableHeight: 0,
       form: {
+        socode: '', // 閿�鍞崟鍙�
         status: '', // 宸ュ崟鐘舵��
         wocode: '', // 宸ュ崟缂栧彿
         wkshopcode: '', // 宸ヨ壓璺嚎缂栫爜
@@ -334,6 +347,7 @@
         tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
       }
       const data = {
+        socode: this.form.socode,
         status: this.form.status,
         wocode: this.form.wocode,
         wkshopcode: this.form.wkshopcode,
@@ -360,6 +374,7 @@
         tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
       }
       const data = {
+        socode: this.form.socode,
         status: this.form.status,
         wocode: this.form.wocode,
         wkshopcode: this.form.wkshopcode,
@@ -393,6 +408,7 @@
     },
     // 閲嶇疆
     reset() {
+      this.form.socode = ''
       this.form.status = ''
       this.form.wocode = ''
       this.form.wkshopcode = ''

--
Gitblit v1.9.3